From f7786426133e0e53c750dfb81272191b08b03652 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 11 Apr 2024 08:46:19 +0000
Subject: [PATCH 001/486] 8330024: [AIX] replace my_disclaim64 helper by direct
 call to disclaim64

Reviewed-by: mdoerr, lucy
---
 src/hotspot/os/aix/os_aix.cpp | 47 +++--------------------------------
 1 file changed, 4 insertions(+), 43 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 3309d3aa77e..9e9e2575b0f 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -291,46 +291,6 @@ julong os::physical_memory() {
   return Aix::physical_memory();
 }
 
-// Helper function, emulates disclaim64 using multiple 32bit disclaims
-// because we cannot use disclaim64() on old AIX releases.
-static bool my_disclaim64(char* addr, size_t size) {
-
-  if (size == 0) {
-    return true;
-  }
-
-  // Maximum size 32bit disclaim() accepts. (Theoretically 4GB, but I just do not trust that.)
-  const unsigned int maxDisclaimSize = 0x40000000;
-
-  const unsigned int numFullDisclaimsNeeded = (size / maxDisclaimSize);
-  const unsigned int lastDisclaimSize = (size % maxDisclaimSize);
-
-  char* p = addr;
-
-  for (unsigned int i = 0; i < numFullDisclaimsNeeded; i ++) {
-    if (::disclaim(p, maxDisclaimSize, DISCLAIM_ZEROMEM) != 0) {
-      ErrnoPreserver ep;
-      log_trace(os, map)("disclaim failed: " RANGEFMT " errno=(%s)",
-                         RANGEFMTARGS(p, maxDisclaimSize),
-                         os::strerror(ep.saved_errno()));
-      return false;
-    }
-    p += maxDisclaimSize;
-  }
-
-  if (lastDisclaimSize > 0) {
-    if (::disclaim(p, lastDisclaimSize, DISCLAIM_ZEROMEM) != 0) {
-      ErrnoPreserver ep;
-      log_trace(os, map)("disclaim failed: " RANGEFMT " errno=(%s)",
-                         RANGEFMTARGS(p, lastDisclaimSize),
-                         os::strerror(ep.saved_errno()));
-      return false;
-    }
-  }
-
-  return true;
-}
-
 // Cpu architecture string
 #if defined(PPC32)
 static char cpu_arch[] = "ppc";
@@ -1597,10 +1557,11 @@ static bool uncommit_shmated_memory(char* addr, size_t size) {
   trcVerbose("uncommit_shmated_memory [" PTR_FORMAT " - " PTR_FORMAT "].",
     p2i(addr), p2i(addr + size - 1));
 
-  const bool rc = my_disclaim64(addr, size);
+  const int rc = disclaim64(addr, size, DISCLAIM_ZEROMEM);
 
-  if (!rc) {
-    log_warning(os)("my_disclaim64(" PTR_FORMAT ", " UINTX_FORMAT ") failed.\n", p2i(addr), size);
+  if (rc != 0) {
+    ErrnoPreserver ep;
+    log_warning(os)("disclaim64(" PTR_FORMAT ", " UINTX_FORMAT ") failed, %s\n", p2i(addr), size, os::strerror(ep.saved_errno()));
     return false;
   }
   return true;

From 8817ba450c0eac6f7c1ff19b16c11a26ff2ed109 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Thu, 11 Apr 2024 08:52:01 +0000
Subject: [PATCH 002/486] 8330000: ZGC: ZObjArrayAllocator may unnecessarily
 clear TypeArrays twice

Reviewed-by: stefank, eosterlund
---
 src/hotspot/share/gc/z/zObjArrayAllocator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
index b5aaed3a274..45f65f0e7e5 100644
--- a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
+++ b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
@@ -126,7 +126,7 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
       yield_for_safepoint();
 
       // Deal with safepoints
-      if (!seen_gc_safepoint && gc_safepoint_happened()) {
+      if (is_reference_type(element_type) && !seen_gc_safepoint && gc_safepoint_happened()) {
         // The first time we observe a GC safepoint in the yield point,
         // we have to restart processing with 11 remembered bits.
         seen_gc_safepoint = true;

From f0cd866a375082e14c69ccd3bf5e3d4d18edaebf Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 11 Apr 2024 09:40:12 +0000
Subject: [PATCH 003/486] 8329704: Implement framework for proper handling of
 JDK_LIBS

Reviewed-by: erikj, jwaters
---
 make/autoconf/flags-cflags.m4                 |  11 +-
 make/autoconf/flags-ldflags.m4                |  24 +--
 make/autoconf/libraries.m4                    |  10 +-
 make/autoconf/spec.gmk.template               |   4 -
 make/common/JdkNativeCompilation.gmk          | 201 ++++++++++++++++--
 make/common/NativeCompilation.gmk             |   1 +
 make/common/TestFilesCompilation.gmk          |   7 +-
 make/common/modules/LauncherCommon.gmk        |  25 +--
 make/common/modules/LibCommon.gmk             |  11 -
 make/common/native/Link.gmk                   |   4 +-
 make/common/native/LinkMicrosoft.gmk          |   7 +-
 make/hotspot/lib/CompileGtest.gmk             |  11 +-
 make/modules/java.base/Lib.gmk                |  19 +-
 make/modules/java.base/lib/CoreLibraries.gmk  |  22 +-
 make/modules/java.desktop/Lib.gmk             |  18 +-
 .../java.desktop/lib/Awt2dLibraries.gmk       | 138 +++---------
 make/modules/java.instrument/Lib.gmk          |  16 +-
 make/modules/java.management/Lib.gmk          |   5 +-
 make/modules/java.prefs/Lib.gmk               |   7 +-
 make/modules/java.rmi/Lib.gmk                 |   6 +-
 make/modules/java.security.jgss/Lib.gmk       |   7 +-
 make/modules/java.smartcardio/Lib.gmk         |   4 +-
 make/modules/jdk.accessibility/Lib.gmk        |   4 +-
 make/modules/jdk.attach/Lib.gmk               |   5 +-
 make/modules/jdk.crypto.cryptoki/Lib.gmk      |   1 +
 make/modules/jdk.crypto.mscapi/Lib.gmk        |   1 +
 make/modules/jdk.hotspot.agent/Lib.gmk        |   4 +-
 make/modules/jdk.internal.le/Lib.gmk          |   4 +-
 make/modules/jdk.jdi/Lib.gmk                  |   1 -
 make/modules/jdk.jdwp.agent/Lib.gmk           |   9 +-
 make/modules/jdk.management.agent/Lib.gmk     |   5 +-
 make/modules/jdk.management/Lib.gmk           |   5 +-
 make/modules/jdk.net/Lib.gmk                  |   7 +-
 make/modules/jdk.sctp/Lib.gmk                 |   7 +-
 make/modules/jdk.security.auth/Lib.gmk        |   3 +-
 make/test/JtregNativeHotspot.gmk              |  21 +-
 make/test/JtregNativeJdk.gmk                  |  38 ++--
 make/test/JtregNativeLibTest.gmk              |   6 +-
 38 files changed, 312 insertions(+), 367 deletions(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index bcfda0cf51a..97a3ec14ecd 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -476,15 +476,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   # Always enable optional macros for VM.
   ALWAYS_CFLAGS_JVM="-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS"
 
-  # Setup some hard coded includes
-  ALWAYS_CFLAGS_JDK=" \
-      -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
-      -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base/\$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
-      -I${TOPDIR}/src/java.base/share/native/libjava \
-      -I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/libjava \
-      -I${TOPDIR}/src/hotspot/share/include \
-      -I${TOPDIR}/src/hotspot/os/${HOTSPOT_TARGET_OS_TYPE}/include"
-
   ###############################################################################
 
   # Adjust flags according to debug level.
@@ -871,7 +862,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
       $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
 
-  CFLAGS_JDK_COMMON="$ALWAYS_CFLAGS_JDK $ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
+  CFLAGS_JDK_COMMON="$ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
       $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
       $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
       $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index bf9b817ee72..acb815515a2 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -31,22 +31,11 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS],
   FLAGS_SETUP_LDFLAGS_HELPER
 
   # Setup the target toolchain
-
-  # The target dir matches the name of VM variant
-  TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN
-
-  # On some platforms (mac) the linker warns about non existing -L dirs.
   FLAGS_SETUP_LDFLAGS_CPU_DEP([TARGET])
 
   # Setup the build toolchain
-
-  # When building a buildjdk, it's always only the server variant
-  BUILD_JVM_VARIANT_PATH=server
-
   FLAGS_SETUP_LDFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
 
-  LDFLAGS_TESTEXE="${TARGET_LDFLAGS_JDK_LIBPATH}"
-  AC_SUBST(LDFLAGS_TESTEXE)
   AC_SUBST(ADLC_LDFLAGS)
 ])
 
@@ -155,7 +144,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
   fi
 
   # Export some intermediate variables for compatibility
-  LDFLAGS_CXX_JDK="$BASIC_LDFLAGS_ONLYCXX $BASIC_LDFLAGS_ONLYCXX_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY"
+  LDFLAGS_CXX_JDK="$DEBUGLEVEL_LDFLAGS_JDK_ONLY"
   AC_SUBST(LDFLAGS_CXX_JDK)
   AC_SUBST(LDFLAGS_CXX_PARTIAL_LINKING)
 ])
@@ -197,20 +186,11 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
     fi
   fi
 
-  # JVM_VARIANT_PATH depends on if this is build or target...
-  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    $1_LDFLAGS_JDK_LIBPATH="-libpath:\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base"
-  else
-    $1_LDFLAGS_JDK_LIBPATH="-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
-        -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/${$1_JVM_VARIANT_PATH}"
-  fi
-
   # Export variables according to old definitions, prefix with $2 if present.
   LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY \
       $OS_LDFLAGS $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"
   $2LDFLAGS_JDKLIB="$LDFLAGS_JDK_COMMON $BASIC_LDFLAGS_JDK_LIB_ONLY \
-      ${$1_LDFLAGS_JDK_LIBPATH} $SHARED_LIBRARY_FLAGS \
-      $REPRODUCIBLE_LDFLAGS $FILE_MACRO_LDFLAGS"
+      $SHARED_LIBRARY_FLAGS $REPRODUCIBLE_LDFLAGS $FILE_MACRO_LDFLAGS"
   $2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS \
       ${$1_CPU_EXECUTABLE_LDFLAGS} $REPRODUCIBLE_LDFLAGS $FILE_MACRO_LDFLAGS"
 
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
index 0aa42070a71..e29ef2221a6 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -129,12 +129,6 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
 
   LIB_TESTS_SETUP_GTEST
 
-  BASIC_JDKLIB_LIBS=""
-  BASIC_JDKLIB_LIBS_TARGET=""
-  if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
-    BASIC_JDKLIB_LIBS="-ljava -ljvm"
-  fi
-
   # Math library
   BASIC_JVM_LIBS="$LIBM"
 
@@ -170,12 +164,10 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   LIB_SETUP_JVM_LIBS(BUILD)
   LIB_SETUP_JVM_LIBS(TARGET)
 
-  JDKLIB_LIBS="$BASIC_JDKLIB_LIBS"
   JVM_LIBS="$BASIC_JVM_LIBS $BASIC_JVM_LIBS_TARGET"
-  OPENJDK_BUILD_JDKLIB_LIBS="$BASIC_JDKLIB_LIBS"
+  OPENJDK_BUILD_JDKLIB_LIBS=""
   OPENJDK_BUILD_JVM_LIBS="$BASIC_JVM_LIBS $BASIC_JVM_LIBS_BUILD"
 
-  AC_SUBST(JDKLIB_LIBS)
   AC_SUBST(JVM_LIBS)
   AC_SUBST(OPENJDK_BUILD_JDKLIB_LIBS)
   AC_SUBST(OPENJDK_BUILD_JVM_LIBS)
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 25fd98b5ee7..e90d9aabf04 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -555,7 +555,6 @@ SYSROOT := @SYSROOT@
 
 # LDFLAGS used to link the jdk native libraries (C-code)
 LDFLAGS_JDKLIB := @LDFLAGS_JDKLIB@
-JDKLIB_LIBS := @JDKLIB_LIBS@
 
 # LDFLAGS used to link the jdk native launchers (C-code)
 LDFLAGS_JDKEXE := @LDFLAGS_JDKEXE@
@@ -571,9 +570,6 @@ LDCXX := @LDCXX@
 # The flags for linking libstdc++ linker.
 LIBCXX := @LIBCXX@
 
-# Compiler and linker flags used when building native tests
-LDFLAGS_TESTEXE := @LDFLAGS_TESTEXE@
-
 # BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the
 # build platform.
 BUILD_CC := @BUILD_ICECC@ @BUILD_CC@
diff --git a/make/common/JdkNativeCompilation.gmk b/make/common/JdkNativeCompilation.gmk
index 49a1eb033a1..b425bdbae2b 100644
--- a/make/common/JdkNativeCompilation.gmk
+++ b/make/common/JdkNativeCompilation.gmk
@@ -76,18 +76,161 @@ endif
 GetJavaHeaderDir = \
   $(if $(strip $1),$(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)))
 
-# Process a dir description such as "java.base:headers" into a set of proper absolute paths.
-ProcessDir = \
+HOTSPOT_INCLUDE_DIR := $(TOPDIR)/src/hotspot/share/include \
+    $(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include
+
+# Preprocess a source dir destination. Pass on absolute paths unchanged. Expand
+# description such as "java.base:headers" into a set of proper absolute paths,
+# by looking in $MODULE/[shared|$OS|$OSTYPE]/native.
+# Treat *:libjvm as a special case, and replace it with the proper hotspot
+# include directories.
+ProcessSrcDir = \
   $(if $(findstring :, $1), \
-    $(call FindSrcDirsForComponent, $(firstword $(subst :, , $1)), $(lastword $(subst :, , $1))) \
+    $(if $(filter %:libjvm, $1), \
+      $(HOTSPOT_INCLUDE_DIR) \
+    , \
+      $(call FindSrcDirsForComponent, $(firstword $(subst :, , $1)), \
+          $(lastword $(subst :, , $1))) \
+    ) \
   , \
     $(if $(filter /%, $1), \
       $1 \
     , \
-      $(call FindSrcDirsForComponent, $(MODULE), $1) \
+      $(if $(filter libjvm, $1), \
+        $(HOTSPOT_INCLUDE_DIR) \
+      , \
+        $(call FindSrcDirsForComponent, $(MODULE), $1) \
+      ) \
     ) \
   )
 
+# Create a proper LIBPATH for the given library. Sets result in $1_$2_LIBPATH.
+# $1: The name of the rule (namespace)
+# $2: The safe namespace of the library
+define ResolveLibPath
+  # Determine proper LIBPATH. This is quite messy due to historical reasons,
+  # and because we need to have special treatment for "gtest:" and ":jvm".
+  ifneq ($$($1_$2_MODULE), gtest)
+    ifneq ($$($1_$2_NAME), jvm)
+      # This is the common case
+      ifeq ($$(call isTargetOs, windows), true)
+        $1_$2_LIBPATH := $$(SUPPORT_OUTPUTDIR)/native/$$($1_$2_MODULE)/lib$$($1_$2_NAME)
+      else
+        ifeq ($(STATIC_LIBS), true)
+          $1_$2_LIBPATH := $$(SUPPORT_OUTPUTDIR)/native/$$($1_$2_MODULE)/lib$$($1_$2_NAME)/static
+        else
+          $1_$2_LIBPATH := $$(SUPPORT_OUTPUTDIR)/modules_libs/$$($1_$2_MODULE)
+        endif
+      endif
+    else
+      # Special treatment for hotspot
+      ifeq ($(CREATING_BUILDJDK), true)
+        # When building a buildjdk, it's always only the server variant
+        $1_$2_JVM_VARIANT_PATH := server
+      else
+        $1_$2_JVM_VARIANT_PATH := $(JVM_VARIANT_MAIN)
+      endif
+      ifeq ($$(call isTargetOs, windows), true)
+        ifeq ($(STATIC_LIBS), true)
+          $1_$2_LIBPATH := $$(HOTSPOT_OUTPUTDIR)/variant-$$($1_$2_JVM_VARIANT_PATH)/libjvm/objs/static
+        else
+          $1_$2_LIBPATH := $$(SUPPORT_OUTPUTDIR)/modules_libs/$$($1_$2_MODULE)
+        endif
+      else
+        ifeq ($(STATIC_LIBS), true)
+          $1_$2_LIBPATH := $$(HOTSPOT_OUTPUTDIR)/variant-$$($1_$2_JVM_VARIANT_PATH)/libjvm/objs/static
+        else
+          $1_$2_LIBPATH := $$(SUPPORT_OUTPUTDIR)/modules_libs/$$($1_$2_MODULE)/$$($1_$2_JVM_VARIANT_PATH)
+        endif
+      endif
+    endif
+  else
+    # Special treatment for virtual module "gtest"
+    ifeq ($$($1_$2_NAME), jvm)
+      ifeq ($$(call isTargetOs, windows), true)
+        ifeq ($(STATIC_LIBS), true)
+          $1_$2_LIBPATH := $$(JVM_OUTPUTDIR)/gtest/objs/static
+        else
+          $1_$2_LIBPATH := $$(JVM_OUTPUTDIR)/gtest/objs
+        endif
+      else
+        ifeq ($(STATIC_LIBS), true)
+          $1_$2_LIBPATH := $$(JVM_OUTPUTDIR)/gtest/objs/static
+        else
+          $1_$2_LIBPATH := $$(JVM_OUTPUTDIR)/gtest
+        endif
+      endif
+    else ifeq ($$($1_$2_NAME), gtest)
+      $1_$2_LIBPATH := $$(JVM_OUTPUTDIR)/libgtest
+      ifeq ($(STATIC_LIBS), true)
+        $1_$2_LIBPATH := $$(JVM_OUTPUTDIR)/libgtest/objs/static
+      else
+        $1_$2_LIBPATH := $$(JVM_OUTPUTDIR)/libgtest
+      endif
+    endif
+  endif
+endef
+
+# Process a JDK library designation such as "java.desktop:jawt" into the needed
+# additions to EXTRA_LINK_DEPS, LDFLAGS, LIBS and EXTRA_HEADER_DIRS.
+# $1: The name of the rule (namespace)
+# $2: The safe namespace of the library
+# $3: The actual string given to represent the library
+define AddJdkLibrary
+  $1_$2_NAME := $$(strip $$(lastword $$(subst :, , $3)))
+  $1_$2_MODULE := $$(strip $$(patsubst %$$($1_$2_NAME), %, $3))
+
+  ifeq ($$(filter lib%, $$($1_$2_NAME)),)
+    $$(error Library name $$($1_$2_NAME) missing lib prefix in $1)
+  endif
+  $1_$2_NAME := $$(strip $$(patsubst lib%, %, $$($1_$2_NAME)))
+
+  ifeq ($$($1_$2_MODULE),)
+    $1_$2_MODULE := $$(MODULE)
+  else
+    $1_$2_MODULE := $$(strip $$(patsubst %:, %, $$($1_$2_MODULE)))
+  endif
+
+  # Determine if the library in question is static.
+  ifeq ($(STATIC_BUILD), true)
+     $1_$2_STATIC_LIBRARY := true
+  endif
+  # Ideally, we should not hardcode these
+  ifeq ($(call isTargetOs, aix)+$$($1_$2_MODULE):$$($1_$2_NAME), true+java.base:jli)
+     $1_$2_STATIC_LIBRARY := true
+  endif
+  ifeq ($$($1_$2_MODULE):$$($1_$2_NAME), gtest:gtest)
+     $1_$2_STATIC_LIBRARY := true
+  endif
+
+  # Setup $1_$2_LIBPATH.
+  $$(eval $$(call ResolveLibPath,$1,$2))
+
+  $1_EXTRA_HEADER_DIRS += $$($1_$2_MODULE):lib$$($1_$2_NAME)
+
+  ifneq ($(STATIC_LIBS), true)
+    ifeq ($$(call isTargetOs, windows), true)
+      ifeq ($$(filter -libpath:$$($1_$2_LIBPATH), $$($1_LDFLAGS)), )
+        $1_LDFLAGS += -libpath:$$($1_$2_LIBPATH)
+      endif
+      $1_LIBS += $$($1_$2_NAME)$(STATIC_LIBRARY_SUFFIX)
+      $1_$2_LIBFILE := $(LIBRARY_PREFIX)$$($1_$2_NAME)$(STATIC_LIBRARY_SUFFIX)
+    else
+      ifeq ($$(filter -L$$($1_$2_LIBPATH), $$($1_LDFLAGS)), )
+        $1_LDFLAGS += -L$$($1_$2_LIBPATH)
+      endif
+      $1_LIBS += -l$$($1_$2_NAME)
+      ifeq ($$($1_$2_STATIC_LIBRARY), true)
+        $1_$2_LIBFILE := $(LIBRARY_PREFIX)$$($1_$2_NAME)$(STATIC_LIBRARY_SUFFIX)
+      else
+        $1_$2_LIBFILE := $(LIBRARY_PREFIX)$$($1_$2_NAME)$(SHARED_LIBRARY_SUFFIX)
+      endif
+    endif
+
+    $1_EXTRA_LINK_DEPS += $$($1_$2_LIBPATH)/$$($1_$2_LIBFILE)
+  endif
+endef
+
 GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 
 JDK_RCFLAGS=$(RCFLAGS) \
@@ -109,19 +252,32 @@ JDK_RCFLAGS=$(RCFLAGS) \
 # SetupNativeCompilation. This macro also adds the following additional
 # arguments:
 #
-#   EXTRA_RCFLAGS -- additional RCFLAGS to append.
-#   EXTRA_HEADER_DIRS -- additional directories to look for headers in
-#   EXTRA_SRC -- additional directories to look for source in
+#   SRC -- this is passed on after preprocessing. The preprocessing will pass on
+#     absolute paths unchanged, but relative paths will be expanded to include
+#     all directories with this name in $MODULE/[shared|$OS|$OSTYPE]/native.
+#   EXTRA_SRC -- additional directories to look for source in. This is processed
+#     like SRC.
 #   EXCLUDE_SRC_PATTERNS -- exclude source dirs matching these patterns from
 #     appearing in SRC.
+#   EXTRA_HEADER_DIRS -- additional directories to look for headers in. This can
+#     be specified either as an absolute path, or relative directory names which
+#     are preprocessed like SRC, or in the format <module>:<directory>, which
+#     will be processed like SRC but for the given module. The names
+#     "java.base:libjvm" and "gtest:libjvm" symbolise virtual libraries that
+#     will be replaced with proper values for hotspot.
 #   HEADERS_FROM_SRC -- if false, does not add source dirs automatically as
 #     header include dirs. (Defaults to true.)
-#   SRC -- this is passed on, but preprocessed to accept source dir designations
-#   RC_FILEDESC -- override the default FILEDESC for Windows version.rc
-#     such as "java.base:headers".
-#   JDK_LIBS -- libraries generated by the JDK build system to link against
+#   JDK_LIBS -- libraries generated by the JDK build system to link against.
+#     These take the form <module>:<basename>. For the current module, the
+#     module name and colon can be omitted. The basename should be specified
+#     as the source directory, e.g. "libjava". The gtest module is a virtual
+#     module that will be replaced with correct values for gtest. When
+#     specifying JDK_LIBS, suitable values for EXTRA_LINK_DEPS, LDFLAGS, LIBS
+#     and EXTRA_HEADER_DIRS will be added.
 #   JDK_LIBS_<os> or JDK_LIBS_<osType> -- additional JDK_LIBS for the given OS
 #     or OS type only
+#   EXTRA_RCFLAGS -- additional RCFLAGS to append.
+#   RC_FILEDESC -- override the default FILEDESC for Windows version.rc
 #   DEFAULT_LIBCXX -- if false, do not add LIBCXX to LIBS for C++ compilations
 #   DEFAULT_CFLAGS -- if false, do not add default CFLAGS and CXXFLAGS
 #   DEFAULT_LDFLAGS -- if false, do not add default LDFLAGS
@@ -183,10 +339,10 @@ define SetupJdkNativeCompilationBody
       endif
     endif
   else
-    $1_SRC := $$(foreach dir, $$($1_SRC), $$(call ProcessDir, $$(dir)))
+    $1_SRC := $$(foreach dir, $$($1_SRC), $$(call ProcessSrcDir, $$(dir)))
   endif
   ifneq ($$($1_EXTRA_SRC), )
-    $1_SRC += $$(foreach dir, $$($1_EXTRA_SRC), $$(call ProcessDir, $$(dir)))
+    $1_SRC += $$(foreach dir, $$($1_EXTRA_SRC), $$(call ProcessSrcDir, $$(dir)))
   endif
 
   ifneq ($$($1_EXCLUDE_SRC_PATTERNS), )
@@ -224,14 +380,19 @@ define SetupJdkNativeCompilationBody
 
   $1_JDK_LIBS += $$($1_JDK_LIBS_$$(OPENJDK_TARGET_OS))
   $1_JDK_LIBS += $$($1_JDK_LIBS_$$(OPENJDK_TARGET_OS_TYPE))
-  # Prepend JDK libs before external libs
-  $1_LIBS := $$($1_JDK_LIBS) $$($1_LIBS)
+  $$(foreach lib, $$($1_JDK_LIBS), \
+    $$(eval $$(call AddJdkLibrary,$1,$$(subst :,_,$$(lib)),$$(lib))) \
+  )
 
-  ifneq ($$($1_EXTRA_HEADER_DIRS), )
-    $1_PROCESSED_EXTRA_HEADER_DIRS := $$(foreach dir, $$($1_EXTRA_HEADER_DIRS), \
-        $$(call ProcessDir, $$(dir)))
-    $1_EXTRA_HEADER_FLAGS := $$(addprefix -I, $$($1_PROCESSED_EXTRA_HEADER_DIRS))
-  endif
+  # Add the include path for jni.h to all native compilations
+  $1_EXTRA_HEADER_DIRS += \
+      $(SUPPORT_OUTPUTDIR)/modules_include/java.base \
+      java.base:include \
+      #
+
+  $1_PROCESSED_EXTRA_HEADER_DIRS := $$(foreach dir, $$($1_EXTRA_HEADER_DIRS), \
+      $$(call ProcessSrcDir, $$(dir)))
+  $1_EXTRA_HEADER_FLAGS := $$(addprefix -I, $$($1_PROCESSED_EXTRA_HEADER_DIRS))
 
   ifneq ($$($1_DEFAULT_CFLAGS), false)
     ifeq ($$($1_TYPE), EXECUTABLE)
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index f58976e34e0..afae920f755 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -84,6 +84,7 @@ include native/Paths.gmk
 #   EXTRA_FILES List of extra files not in any of the SRC dirs
 #   EXTRA_OBJECT_FILES List of extra object files to include when linking
 #   EXTRA_DEPS List of extra dependencies to be added to each compiled file
+#   EXTRA_LINK_DEPS List of extra dependencies to be added to the link stage
 #   VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
 #   RCFLAGS flags for RC.
 #   EMBED_MANIFEST if true, embed manifest on Windows.
diff --git a/make/common/TestFilesCompilation.gmk b/make/common/TestFilesCompilation.gmk
index 5fc850d1d8b..8060a45fc68 100644
--- a/make/common/TestFilesCompilation.gmk
+++ b/make/common/TestFilesCompilation.gmk
@@ -69,7 +69,6 @@ define SetupTestFilesCompilationBody
     $1_COMPILATION_TYPE := EXECUTABLE
     $1_LOG_TYPE := executable
     $1_LD_SET_ORIGIN := false
-    $1_LDFLAGS := $(LDFLAGS_TESTEXE)
   else
     $$(error Unknown type: $$($1_TYPE))
   endif
@@ -103,17 +102,21 @@ define SetupTestFilesCompilationBody
         NAME := $$(unprefixed_name), \
         TYPE := $$($1_COMPILATION_TYPE), \
         LINK_TYPE := $(if $$(filter %.cpp, $$(file)), C++, C), \
+        EXTRA_HEADER_DIRS := \
+            java.base:libjava \
+            java.base:libjvm, \
         EXTRA_FILES := $$(file) $$($1_EXTRA_FILES), \
         OBJECT_DIR := $$($1_OUTPUT_DIR)/support/$$(name), \
         OUTPUT_DIR := $$($1_OUTPUT_DIR)/$$($1_OUTPUT_SUBDIR), \
         CFLAGS := $$(TEST_CFLAGS) $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \
         CXXFLAGS := $$(TEST_CFLAGS) $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \
         LD_SET_ORIGIN := $$($1_LD_SET_ORIGIN), \
-        LDFLAGS := $$($1_LDFLAGS) $$($1_LDFLAGS_$$(name)), \
+        LDFLAGS := $$($1_LDFLAGS_$$(name)), \
         DISABLED_WARNINGS_gcc := format undef unused-function unused-value, \
         DISABLED_WARNINGS_clang := undef format-nonliteral \
             missing-field-initializers sometimes-uninitialized, \
         DEFAULT_LIBCXX := false, \
+        JDK_LIBS := $$($1_JDK_LIBS_$$(name)), \
         LIBS := $$($1_LIBS_$$(name)), \
         DEFAULT_VERSIONINFO_RESOURCE := false, \
         OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)),$$($1_OPTIMIZATION_$$(name)),LOW), \
diff --git a/make/common/modules/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk
index df8b4c36ffe..f072cbfb9bf 100644
--- a/make/common/modules/LauncherCommon.gmk
+++ b/make/common/modules/LauncherCommon.gmk
@@ -122,8 +122,6 @@ define SetupBuildLauncherBody
     endif
   endif
 
-  $1_WINDOWS_JLI_LIB := $(call FindStaticLib, java.base, jli, /libjli)
-
   $1_EXTRA_FILES := $(LAUNCHER_SRC)/main.c
 
   ifeq ($(ASAN_ENABLED), true)
@@ -148,17 +146,13 @@ define SetupBuildLauncherBody
           -DPROGNAME='"$1"' \
           $$($1_CFLAGS), \
       CFLAGS_windows := $$($1_CFLAGS_windows), \
+      EXTRA_HEADER_DIRS := java.base:libjvm, \
       DISABLED_WARNINGS_gcc := unused-function, \
       LDFLAGS := $$($1_LDFLAGS), \
-      LDFLAGS_linux := $$(call SET_EXECUTABLE_ORIGIN,/../lib) \
-          -L$(call FindLibDirForModule, java.base), \
-      LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN,/../lib) \
-          -L$(call FindLibDirForModule, java.base), \
-      LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \
-      JDK_LIBS_unix := -ljli, \
-      JDK_LIBS_windows := \
-          $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib \
-          $$($1_WINDOWS_JLI_LIB), \
+      LDFLAGS_linux := $$(call SET_EXECUTABLE_ORIGIN,/../lib), \
+      LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN,/../lib), \
+      JDK_LIBS := java.base:libjli, \
+      JDK_LIBS_windows := java.base:libjava, \
       LIBS := $$($1_LIBS), \
       LIBS_unix := $(LIBZ_LIBS), \
       LIBS_linux := $(LIBDL) -lpthread, \
@@ -178,15 +172,6 @@ define SetupBuildLauncherBody
 
   $$(BUILD_LAUNCHER_$1): $$(BUILD_PLIST_$1)
 
-  ifeq ($(call isTargetOs, aix), true)
-    $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli)
-  endif
-
-  ifeq ($(call isTargetOs, windows), true)
-    $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, java, /libjava) \
-        $$($1_WINDOWS_JLI_LIB)
-  endif
-
   ifeq ($(call isTargetOs, macosx), true)
     $$(BUILD_LAUNCHER_$1): $$($1_PLIST_FILE)
   endif
diff --git a/make/common/modules/LibCommon.gmk b/make/common/modules/LibCommon.gmk
index bb23ca125f6..4e3570d9cd7 100644
--- a/make/common/modules/LibCommon.gmk
+++ b/make/common/modules/LibCommon.gmk
@@ -24,14 +24,3 @@
 #
 
 include JdkNativeCompilation.gmk
-
-################################################################################
-
-# Absolute paths to lib files on windows for use in LIBS. Should figure out a more
-# elegant solution to this.
-WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
-
-# Put the libraries here.
-INSTALL_LIBRARIES_HERE := $(call FindLibDirForModule, $(MODULE))
-
-################################################################################
diff --git a/make/common/native/Link.gmk b/make/common/native/Link.gmk
index 03bc04963c4..d9c566011a9 100644
--- a/make/common/native/Link.gmk
+++ b/make/common/native/Link.gmk
@@ -86,7 +86,7 @@ define CreateStaticLibrary
   $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
       $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
 
-  $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_VARDEPS_FILE)
+  $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_EXTRA_LINK_DEPS) $$($1_VARDEPS_FILE)
 
   $1_AR_OBJ_ARG := $$($1_LD_OBJ_ARG)
   # With clang on linux, partial linking is enabled and 'AR' takes the output
@@ -141,7 +141,7 @@ define CreateDynamicLibraryOrExecutable
   $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
       $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
 
-  $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_VARDEPS_FILE)
+  $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_EXTRA_LINK_DEPS) $$($1_VARDEPS_FILE)
 
   $$($1_TARGET): $$($1_TARGET_DEPS)
         ifneq ($$($1_OBJ_FILE_LIST), )
diff --git a/make/common/native/LinkMicrosoft.gmk b/make/common/native/LinkMicrosoft.gmk
index d49553c15e2..a85ee1379df 100644
--- a/make/common/native/LinkMicrosoft.gmk
+++ b/make/common/native/LinkMicrosoft.gmk
@@ -43,7 +43,10 @@ define CreateStaticLibraryMicrosoft
   $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
       $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
 
-  $$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_VARDEPS_FILE)
+  $1_TARGET_DEPS :=  $$($1_ALL_OBJS) $$($1_RES) $$($1_EXTRA_LINK_DEPS) \
+      $$($1_VARDEPS_FILE)
+
+  $$($1_TARGET): $$($1_TARGET_DEPS)
         ifneq ($$($1_OBJ_FILE_LIST), )
 	  $$(eval $$(call ListPathsSafely, $1_ALL_OBJS, $$($1_OBJ_FILE_LIST)))
         endif
@@ -87,7 +90,7 @@ define CreateDynamicLibraryOrExecutableMicrosoft
       $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
 
   $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_RES) $$($1_MANIFEST) \
-      $$($1_VARDEPS_FILE)
+      $$($1_EXTRA_LINK_DEPS) $$($1_VARDEPS_FILE)
 
   $$($1_TARGET): $$($1_TARGET_DEPS)
         ifneq ($$($1_OBJ_FILE_LIST), )
diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index 58e6f1bb2ef..b59ed049cbc 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -110,9 +110,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
     LD_SET_ORIGIN := false, \
     DEFAULT_LDFLAGS := false, \
     LDFLAGS := $(JVM_LDFLAGS), \
-    LDFLAGS_unix := -L$(JVM_OUTPUTDIR)/libgtest, \
-    JDK_LIBS_unix := -lgtest, \
-    JDK_LIBS_windows := $(JVM_OUTPUTDIR)/libgtest/gtest.lib, \
+    JDK_LIBS := gtest:libgtest, \
     LIBS := $(JVM_LIBS), \
     OPTIMIZATION := $(JVM_OPTIMIZATION), \
     COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
@@ -151,15 +149,12 @@ $(eval $(call SetupJdkExecutable, BUILD_GTEST_LAUNCHER, \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock/include, \
     LD_SET_ORIGIN := false, \
-    LDFLAGS_unix := -L$(JVM_OUTPUTDIR)/gtest $(call SET_SHARED_LIBRARY_ORIGIN), \
-    JDK_LIBS_unix := -ljvm, \
-    JDK_LIBS_windows := $(JVM_OUTPUTDIR)/gtest/objs/jvm.lib, \
+    LDFLAGS_unix := $(call SET_SHARED_LIBRARY_ORIGIN), \
+    JDK_LIBS := gtest:libjvm, \
     COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
     ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \
 ))
 
-$(BUILD_GTEST_LAUNCHER): $(BUILD_GTEST_LIBJVM)
-
 TARGETS += $(BUILD_GTEST_LAUNCHER)
 
 ################################################################################
diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
index bd0c8cc666b..d09e33d489f 100644
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -53,8 +53,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
     DISABLED_WARNINGS_microsoft_ResolverConfigurationImpl.c := 4996, \
     LDFLAGS_windows := -delayload:iphlpapi.dll -delayload:secur32.dll \
         -delayload:winhttp.dll, \
-    JDK_LIBS_unix := -ljava -ljvm, \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+    JDK_LIBS := libjava libjvm, \
     LIBS_linux := $(LIBDL), \
     LIBS_aix := $(LIBDL),\
     LIBS_windows := advapi32.lib delayimp.lib iphlpapi.lib secur32.lib \
@@ -64,8 +63,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
         -framework CoreServices, \
 ))
 
-$(BUILD_LIBNET): $(BUILD_LIBJAVA)
-
 TARGETS += $(BUILD_LIBNET)
 
 ################################################################################
@@ -78,10 +75,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     EXTRA_HEADER_DIRS := \
         libnio/ch \
         libnio/fs \
-        libnet, \
-    JDK_LIBS_unix := -ljava -lnet, \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib \
-        $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnet/net.lib, \
+        libjvm, \
+    JDK_LIBS := libjava libnet, \
     LIBS_linux := $(LIBDL) -lpthread, \
     LIBS_aix := $(LIBDL), \
     LIBS_macosx := \
@@ -92,8 +87,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
 
 TARGETS += $(BUILD_LIBNIO)
 
-$(BUILD_LIBNIO): $(BUILD_LIBNET)
-
 ifeq ($(call isTargetOs, macosx), true)
   ##############################################################################
   ## Build libosxsecurity
@@ -103,16 +96,13 @@ ifeq ($(call isTargetOs, macosx), true)
       NAME := osxsecurity, \
       OPTIMIZATION := LOW, \
       DISABLED_WARNINGS_clang_KeystoreImpl.m := deprecated-declarations, \
-      LDFLAGS := -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base,\
-      JDK_LIBS := $(JDKLIB_LIBS), \
+      JDK_LIBS := libjava, \
       LIBS_macosx := -lobjc \
           -framework CoreServices \
           -framework Foundation \
           -framework Security, \
   ))
 
-  $(BUILD_LIBOSXSECURITY): $(BUILD_LIBJAVA)
-
   TARGETS += $(BUILD_LIBOSXSECURITY)
 endif
 
@@ -204,6 +194,7 @@ ifeq ($(ENABLE_FALLBACK_LINKER), true)
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBFALLBACKLINKER, \
       NAME := fallbackLinker, \
+      EXTRA_HEADER_DIRS := java.base:libjava, \
       CFLAGS := $(LIBFFI_CFLAGS), \
       LIBS := $(LIBFFI_LIBS), \
       LIBS_windows := ws2_32.lib, \
diff --git a/make/modules/java.base/lib/CoreLibraries.gmk b/make/modules/java.base/lib/CoreLibraries.gmk
index 75cd0328db8..7fed18491d1 100644
--- a/make/modules/java.base/lib/CoreLibraries.gmk
+++ b/make/modules/java.base/lib/CoreLibraries.gmk
@@ -35,8 +35,8 @@ endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \
     NAME := verify, \
     OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
-    JDK_LIBS_unix := -ljvm, \
-    JDK_LIBS_windows := jvm.lib, \
+    EXTRA_HEADER_DIRS := libjava, \
+    JDK_LIBS := libjvm, \
 ))
 
 TARGETS += $(BUILD_LIBVERIFY)
@@ -58,9 +58,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
     java_props_md.c_CFLAGS := \
         -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"', \
     DISABLED_WARNINGS_gcc_ProcessImpl_md.c := unused-result, \
-    LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \
-    JDK_LIBS_unix := -ljvm, \
-    JDK_LIBS_windows := jvm.lib, \
+    JDK_LIBS := libjvm, \
     LIBS_linux := $(LIBDL), \
     LIBS_aix := $(LIBDL) $(LIBM),\
     LIBS_macosx := \
@@ -72,8 +70,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
 
 TARGETS += $(BUILD_LIBJAVA)
 
-$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
-
 ################################################################################
 ## Build libzip
 ################################################################################
@@ -96,13 +92,10 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \
     DISABLED_WARNINGS_gcc_zip_util.c := unused-function, \
     DISABLED_WARNINGS_clang := deprecated-non-prototype, \
     DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \
-    JDK_LIBS_unix := -ljava -ljvm, \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+    JDK_LIBS := libjava libjvm, \
     LIBS_unix := $(LIBZ_LIBS), \
 ))
 
-$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
-
 TARGETS += $(BUILD_LIBZIP)
 
 ################################################################################
@@ -113,15 +106,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \
     NAME := jimage, \
     LINK_TYPE := C++, \
     OPTIMIZATION := LOW, \
+    EXTRA_HEADER_DIRS := libjava, \
     CFLAGS_unix := -UDEBUG, \
     LDFLAGS := $(LDFLAGS_CXX_JDK), \
-    JDK_LIBS_unix := -ljvm, \
-    JDK_LIBS_windows := jvm.lib, \
+    JDK_LIBS := libjvm, \
     LIBS_unix := $(LIBDL), \
 ))
 
-$(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA)
-
 TARGETS += $(BUILD_LIBJIMAGE)
 
 ################################################################################
@@ -173,6 +164,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
     TYPE := $(BUILD_LIBJLI_TYPE), \
     EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
     EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
+    EXTRA_HEADER_DIRS := libjvm, \
     OPTIMIZATION := HIGH, \
     CFLAGS := $(LIBJLI_CFLAGS) $(LIBZ_CFLAGS), \
     DISABLED_WARNINGS_gcc := unused-function, \
diff --git a/make/modules/java.desktop/Lib.gmk b/make/modules/java.desktop/Lib.gmk
index f4cb41d6411..011e8375105 100644
--- a/make/modules/java.desktop/Lib.gmk
+++ b/make/modules/java.desktop/Lib.gmk
@@ -60,12 +60,11 @@ ifeq ($(call isTargetOs, aix), false)
       NAME := jsound, \
       LINK_TYPE := $(LIBJSOUND_LINK_TYPE), \
       OPTIMIZATION := LOW, \
+      EXTRA_HEADER_DIRS := java.base:libjava, \
       CFLAGS := $(LIBJSOUND_CFLAGS), \
       CXXFLAGS := $(LIBJSOUND_CFLAGS), \
       DISABLED_WARNINGS_gcc := undef, \
       DISABLED_WARNINGS_clang := undef, \
-      JDK_LIBS_unix := -ljava -ljvm, \
-      JDK_LIBS_windows := $(WIN_JAVA_LIB), \
       LIBS_linux := $(ALSA_LIBS), \
       LIBS_macosx := \
           -framework AudioToolbox \
@@ -77,8 +76,6 @@ ifeq ($(call isTargetOs, aix), false)
       LIBS_windows := advapi32.lib dsound.lib ole32.lib user32.lib winmm.lib, \
   ))
 
-  $(BUILD_LIBJSOUND): $(call FindLib, java.base, java)
-
   TARGETS += $(BUILD_LIBJSOUND)
 endif
 
@@ -94,7 +91,7 @@ ifeq ($(call isTargetOs, macosx), true)
           format-nonliteral, \
       DISABLED_WARNINGS_clang_QueuingApplicationDelegate.m := \
           objc-method-access, \
-      JDK_LIBS_macosx := -ljava, \
+      JDK_LIBS := java.base:libjava, \
       LIBS_macosx := \
           -framework Accelerate \
           -framework ApplicationServices \
@@ -109,8 +106,6 @@ ifeq ($(call isTargetOs, macosx), true)
           -framework Security, \
   ))
 
-  $(BUILD_LIBOSXAPP): $(call FindLib, java.base, java)
-
   TARGETS += $(BUILD_LIBOSXAPP)
 
   ##############################################################################
@@ -120,10 +115,9 @@ ifeq ($(call isTargetOs, macosx), true)
   $(eval $(call SetupJdkLibrary, BUILD_LIBOSX, \
       NAME := osx, \
       OPTIMIZATION := LOW, \
-      EXTRA_HEADER_DIRS := libosxapp, \
+      EXTRA_HEADER_DIRS := java.base:libjava, \
       DISABLED_WARNINGS_clang_CFileManager.m := deprecated-declarations, \
-      LDFLAGS := -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop, \
-      JDK_LIBS_macosx := $(JDKLIB_LIBS) -losxapp, \
+      JDK_LIBS := libosxapp, \
       LIBS_macosx := \
           -framework ApplicationServices \
           -framework Cocoa \
@@ -132,8 +126,4 @@ ifeq ($(call isTargetOs, macosx), true)
   ))
 
   TARGETS += $(BUILD_LIBOSX)
-
-  $(BUILD_LIBOSX): $(call FindLib, java.desktop, osxapp)
-
-  $(BUILD_LIBOSX): $(call FindLib, java.base, java)
 endif
diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
index bc50106fd46..c30901e1543 100644
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -23,8 +23,6 @@
 # questions.
 #
 
-WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
-
 LIBAWT_DEFAULT_HEADER_DIRS := \
     common/awt/utility \
     libawt/awt/image \
@@ -45,17 +43,15 @@ endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
     NAME := mlib_image, \
     EXTRA_SRC := common/awt/medialib, \
+    EXTRA_HEADER_DIRS := java.base:libjava, \
     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
     OPTIMIZATION := HIGHEST, \
     CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH \
         $(LIBMLIB_IMAGE_CFLAGS), \
     DISABLED_WARNINGS_gcc := unused-function, \
-    JDK_LIBS := $(JDKLIB_LIBS), \
     LIBS_unix := $(LIBDL) $(LIBM), \
 ))
 
-$(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBMLIB_IMAGE)
 
 ################################################################################
@@ -99,7 +95,6 @@ LIBAWT_EXTRA_HEADER_DIRS := \
     common/awt/medialib \
     libmlib_image \
     include \
-    java.base:libjava \
     #
 
 LIBAWT_CFLAGS := -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES -DMLIB_NO_LIBSUNMATH
@@ -138,14 +133,11 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     DISABLED_WARNINGS_clang_TransformHelper.c := sign-compare, \
     DISABLED_WARNINGS_microsoft := 4244 4996, \
     DISABLED_WARNINGS_microsoft_awt_Toolkit.cpp := 4267, \
-    LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
     LDFLAGS_windows := -delayload:comctl32.dll -delayload:comdlg32.dll \
         -delayload:gdi32.dll -delayload:imm32.dll -delayload:ole32.dll \
         -delayload:shell32.dll -delayload:shlwapi.dll -delayload:user32.dll \
         -delayload:winmm.dll -delayload:winspool.drv, \
-    JDK_LIBS_unix := -ljava -ljvm, \
-    JDK_LIBS_macosx := -lmlib_image, \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+    JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_unix := $(LIBM), \
     LIBS_linux := $(LIBDL), \
     LIBS_aix := $(LIBDL),\
@@ -163,12 +155,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     EXTRA_RCFLAGS := $(LIBAWT_RCFLAGS), \
 ))
 
-$(BUILD_LIBAWT): $(call FindLib, java.base, java)
-
-ifeq ($(call isTargetOs, macosx), true)
-  $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
-endif
-
 TARGETS += $(BUILD_LIBAWT)
 
 ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
@@ -192,6 +178,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       common/java2d/opengl \
       common/java2d/x11 \
       libpipewire/include \
+      java.base:libjvm \
       #
 
   ifeq ($(call isTargetOs, linux), true)
@@ -251,18 +238,13 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       DISABLED_WARNINGS_clang_aix_sun_awt_X11_GtkFileDialogPeer.c := \
           parentheses, \
       DISABLED_WARNINGS_clang_aix_awt_InputMethod.c := sign-compare, \
-      LDFLAGS := -L$(INSTALL_LIBRARIES_HERE), \
-      JDK_LIBS_unix := -lawt -ljava -ljvm, \
+      JDK_LIBS := libawt java.base:libjava, \
       LIBS_unix := $(LIBDL) $(LIBM) $(X_LIBS) -lX11 -lXext -lXi -lXrender \
           -lXtst, \
       LIBS_linux := -lpthread, \
       STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_XAWT_STATIC_EXCLUDE_OBJS), \
   ))
 
-  $(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
-
-  $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
-
   TARGETS += $(BUILD_LIBAWT_XAWT)
 endif
 
@@ -296,21 +278,18 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
     EXTRA_HEADER_DIRS := \
         common/awt/debug \
-        libawt/java2d, \
+        libawt/java2d \
+        java.base:libjvm, \
     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
     DISABLED_WARNINGS_gcc := format-nonliteral type-limits \
         stringop-truncation, \
     DISABLED_WARNINGS_clang := format-nonliteral, \
-    LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
-    JDK_LIBS_unix := -lawt -ljava -ljvm, \
-    JDK_LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
+    JDK_LIBS := libawt java.base:libjava, \
     LIBS_unix := $(LCMS_LIBS) $(LIBM), \
 ))
 
 TARGETS += $(BUILD_LIBLCMS)
 
-$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
-
 ################################################################################
 ## Build libjavajpeg
 ################################################################################
@@ -339,13 +318,10 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \
     DISABLED_WARNINGS_gcc_imageioJPEG.c := clobbered array-bounds, \
     DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
     DISABLED_WARNINGS_gcc_jdphuff.c := shift-negative-value, \
-    JDK_LIBS := $(JDKLIB_LIBS), \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+    JDK_LIBS := java.base:libjava, \
     LIBS := $(LIBJPEG_LIBS), \
 ))
 
-$(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBJAVAJPEG)
 
 
@@ -366,6 +342,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
       common/awt/debug \
       common/font \
       common/java2d/opengl \
+      java.base:libjvm \
       #
 
   # These are the object files provided by the awt native
@@ -386,14 +363,11 @@ ifeq ($(call isTargetOs, windows macosx), false)
       EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
       DISABLED_WARNINGS_gcc_X11Renderer.c := unused-function, \
       DISABLED_WARNINGS_gcc_X11SurfaceData.c := unused-function, \
-      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
-      JDK_LIBS_unix := -lawt -ljava -ljvm, \
+      JDK_LIBS := libawt java.base:libjava, \
       LIBS_linux := $(LIBDL) $(LIBM), \
       STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_HEADLESS_STATIC_EXCLUDE_OBJS), \
   ))
 
-  $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
-
   TARGETS += $(BUILD_LIBAWT_HEADLESS)
 endif
 
@@ -467,7 +441,6 @@ else
 endif
 
 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
-    libharfbuzz \
     common/awt \
     common/awt/utility \
     common/font \
@@ -481,13 +454,7 @@ ifeq ($(FREETYPE_TO_USE), system)
   LIBFONTMANAGER_LIBS += $(FREETYPE_LIBS)
 else
   LIBFONTMANAGER_EXTRA_HEADER_DIRS += libfreetype/include
-
-  ifeq ($(call isTargetOs, windows), true)
-    LIBFONTMANAGER_JDK_LIBS += \
-        $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib
-  else
-    LIBFONTMANAGER_JDK_LIBS += -lfreetype
-  endif
+  LIBFONTMANAGER_JDK_LIBS += libfreetype
 endif
 
 LIBFONTMANAGER_OPTIMIZATION := HIGHEST
@@ -533,12 +500,9 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
     DISABLED_WARNINGS_microsoft := $(HARFBUZZ_DISABLED_WARNINGS_microsoft), \
     LDFLAGS := $(LDFLAGS_CXX_JDK), \
     LDFLAGS_FILTER_OUT :=-Wl$(COMMA)-z$(COMMA)defs, \
-    LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
     LDFLAGS_aix := -Wl$(COMMA)-berok, \
-    JDK_LIBS := $(LIBFONTMANAGER_JDK_LIBS), \
-    JDK_LIBS_unix := -lawt -ljava -ljvm, \
-    JDK_LIBS_macosx := -lawt_lwawt, \
-    JDK_LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
+    JDK_LIBS := libawt java.base:libjava $(LIBFONTMANAGER_JDK_LIBS), \
+    JDK_LIBS_macosx := libawt_lwawt, \
     LIBS := $(LIBFONTMANAGER_LIBS), \
     LIBS_unix := $(LIBM), \
     LIBS_macosx := \
@@ -548,16 +512,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
     LIBS_windows := advapi32.lib gdi32.lib user32.lib, \
 ))
 
-$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
-
-ifeq ($(call isTargetOs, macosx), true)
-  $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt)
-endif
-
-ifeq ($(FREETYPE_TO_USE), bundled)
-  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE)
-endif
-
 TARGETS += $(BUILD_LIBFONTMANAGER)
 
 ################################################################################
@@ -566,6 +520,7 @@ TARGETS += $(BUILD_LIBFONTMANAGER)
 
 LIBJAWT_EXTRA_HEADER_DIRS := \
     include \
+    java.base:libjava \
     #
 
 ifeq ($(call isTargetOs, windows), true)
@@ -576,7 +531,7 @@ ifeq ($(call isTargetOs, windows), true)
       libawt/java2d \
       libawt/java2d/windows \
       libawt/windows \
-      java.base:libjava \
+      java.base:libjvm \
       #
 else
   LIBJAWT_EXTRA_HEADER_DIRS += \
@@ -598,11 +553,11 @@ ifeq ($(call isTargetOs, windows)+$(call isTargetCpu, x86), true+true)
 endif
 
 ifeq ($(call isTargetOsType, unix)+$(call isTargetOs, macosx), true+false)
-  LIBJAWT_JDK_LIBS_unix := -lawt
+  LIBJAWT_JDK_LIBS_unix := libawt
   ifeq ($(ENABLE_HEADLESS_ONLY), false)
-    LIBJAWT_JDK_LIBS_unix += -lawt_xawt
+    LIBJAWT_JDK_LIBS_unix += libawt_xawt
   else
-    LIBJAWT_JDK_LIBS_unix += -lawt_headless
+    LIBJAWT_JDK_LIBS_unix += libawt_headless
   endif
 endif
 
@@ -616,27 +571,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
     DISABLED_WARNINGS_clang_jawt.m := sign-compare, \
     EXTRA_HEADER_DIRS := $(LIBJAWT_EXTRA_HEADER_DIRS), \
     LDFLAGS_windows := $(LDFLAGS_CXX_JDK), \
-    LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
     LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
-    JDK_LIBS_unix := $(LIBJAWT_JDK_LIBS_unix) $(JDKLIB_LIBS), \
-    JDK_LIBS_macosx := -lawt_lwawt, \
-    JDK_LIBS_windows := $(WIN_AWT_LIB), \
+    JDK_LIBS_unix := $(LIBJAWT_JDK_LIBS_unix), \
+    JDK_LIBS_windows := libawt, \
+    JDK_LIBS_macosx := libawt_lwawt, \
     LIBS_macosx := -framework Cocoa, \
     LIBS_windows := advapi32.lib $(LIBJAWT_LIBS_windows), \
 ))
 
-ifeq ($(call isTargetOs, windows), true)
-  $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
-else ifeq ($(call isTargetOs, macosx), true)
-   $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_lwawt)
-else
-  ifeq ($(ENABLE_HEADLESS_ONLY), false)
-    $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
-  else
-    $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_headless)
-  endif
-endif
-
 TARGETS += $(BUILD_LIBJAWT)
 
 ifeq ($(call isTargetOs, windows), true)
@@ -663,6 +605,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       common/awt/utility \
       libosxapp \
       java.base:libjava \
+      java.base:libjvm \
       #
 
   ifeq ($(USE_EXTERNAL_LIBGIF), false)
@@ -758,11 +701,9 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       DISABLED_WARNINGS_microsoft_splashscreen_impl.c := 4018 4267 4244, \
       DISABLED_WARNINGS_microsoft_splashscreen_png.c := 4267, \
       DISABLED_WARNINGS_microsoft_splashscreen_sys.c := 4267 4244, \
-      LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
       LDFLAGS_windows := -delayload:user32.dll, \
-      JDK_LIBS := $(JDKLIB_LIBS), \
-      JDK_LIBS_macosx := -losxapp, \
-      JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+      JDK_LIBS_windows := java.base:libjava, \
+      JDK_LIBS_macosx := libosxapp, \
       LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS), \
       LIBS_unix := $(LIBM) -lpthread, \
       LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
@@ -777,10 +718,6 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
   ))
 
   TARGETS += $(BUILD_LIBSPLASHSCREEN)
-
-  ifeq ($(call isTargetOs, macosx), true)
-    $(BUILD_LIBSPLASHSCREEN): $(call FindLib, $(MODULE), osxapp)
-  endif
 endif
 
 ifeq ($(call isTargetOs, macosx), true)
@@ -803,7 +740,7 @@ ifeq ($(call isTargetOs, macosx), true)
       include \
       common/awt/debug \
       common/java2d/opengl \
-      libosxapp \
+      java.base:libjvm \
       #
 
   LIBAWT_LWAWT_EXCLUDE_FILES := fontpath.c awt_Font.c X11Color.c
@@ -833,8 +770,7 @@ ifeq ($(call isTargetOs, macosx), true)
       DISABLED_WARNINGS_clang_OGLBufImgOps.c := format-nonliteral, \
       DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
       DISABLED_WARNINGS_clang_PrinterView.m := enum-conversion, \
-      LDFLAGS := -L$(INSTALL_LIBRARIES_HERE), \
-      JDK_LIBS_macosx := -lawt -ljava -ljvm -lmlib_image -losxapp, \
+      JDK_LIBS := libawt java.base:libjava libosxapp, \
       LIBS_macosx := $(LIBM) \
           -framework Accelerate \
           -framework ApplicationServices \
@@ -851,14 +787,6 @@ ifeq ($(call isTargetOs, macosx), true)
 
   TARGETS += $(BUILD_LIBAWT_LWAWT)
 
-  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
-
-  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
-
-  $(BUILD_LIBAWT_LWAWT): $(call FindLib, $(MODULE), osxapp)
-
-  $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java)
-
   ##############################################################################
   ## Build libosxui
   ##############################################################################
@@ -867,7 +795,7 @@ ifeq ($(call isTargetOs, macosx), true)
       $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/shaders.metal
   SHADERS_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/native/java.desktop/libosxui
   SHADERS_AIR := $(SHADERS_SUPPORT_DIR)/shaders.air
-  SHADERS_LIB := $(INSTALL_LIBRARIES_HERE)/shaders.metallib
+  SHADERS_LIB := $(call FindLibDirForModule, $(MODULE))/shaders.metallib
 
   $(eval $(call SetupExecute, metal_shaders, \
       INFO := Running metal on $(notdir $(SHADERS_SRC)) (for libosxui.dylib), \
@@ -893,14 +821,12 @@ ifeq ($(call isTargetOs, macosx), true)
       NAME := osxui, \
       OPTIMIZATION := LOW, \
       EXTRA_HEADER_DIRS := \
-          libawt_lwawt/awt \
-          libosxapp, \
+          libawt_lwawt/awt, \
       DISABLED_WARNINGS_clang_AquaFileView.m := deprecated-declarations \
           sign-compare, \
       DISABLED_WARNINGS_clang_ScreenMenu.m := deprecated-declarations, \
       APPEND_LDFLAGS := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
-      LDFLAGS := -L$(INSTALL_LIBRARIES_HERE), \
-      JDK_LIBS_macosx := -lawt -lawt_lwawt -ljava -ljvm -losxapp, \
+      JDK_LIBS := java.base:libjava libosxapp, \
       LIBS_macosx := \
           -framework ApplicationServices \
           -framework Carbon \
@@ -912,10 +838,4 @@ ifeq ($(call isTargetOs, macosx), true)
   TARGETS += $(BUILD_LIBOSXUI)
 
   $(BUILD_LIBOSXUI): $(SHADERS_LIB)
-
-  $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
-
-  $(BUILD_LIBOSXUI): $(call FindLib, $(MODULE), osxapp)
-
-  $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
 endif
diff --git a/make/modules/java.instrument/Lib.gmk b/make/modules/java.instrument/Lib.gmk
index a6c1da8dfd3..675c1d8ccd3 100644
--- a/make/modules/java.instrument/Lib.gmk
+++ b/make/modules/java.instrument/Lib.gmk
@@ -36,14 +36,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
     CFLAGS_windows := -Dstrcasecmp=stricmp, \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
-    EXTRA_HEADER_DIRS := java.base:libjli, \
-    LDFLAGS_linux := -L$(call FindLibDirForModule, java.base), \
-    LDFLAGS_macosx := -L$(call FindLibDirForModule, java.base), \
-    LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \
-    JDK_LIBS := $(JDKLIB_LIBS), \
-    JDK_LIBS_unix := -ljli, \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) \
-        $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib jvm.lib, \
+    JDK_LIBS := java.base:libjava java.base:libjli java.base:libjvm, \
     LIBS_unix := $(LIBZ_LIBS), \
     LIBS_linux := $(LIBDL), \
     LIBS_aix := $(LIBDL) -liconv, \
@@ -54,11 +47,4 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
     LIBS_windows := advapi32.lib, \
 ))
 
-ifeq ($(call isTargetOs, aix), true)
-  $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli)
-else
-  $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli)
-endif
-$(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBINSTRUMENT)
diff --git a/make/modules/java.management/Lib.gmk b/make/modules/java.management/Lib.gmk
index 9f93c368c69..3d2e42e42ec 100644
--- a/make/modules/java.management/Lib.gmk
+++ b/make/modules/java.management/Lib.gmk
@@ -37,12 +37,9 @@ endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
     NAME := management, \
     OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
-    JDK_LIBS := $(JDKLIB_LIBS), \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+    JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_aix := -lperfstat,\
     LIBS_windows := advapi32.lib psapi.lib, \
 ))
 
-$(BUILD_LIBMANAGEMENT): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBMANAGEMENT)
diff --git a/make/modules/java.prefs/Lib.gmk b/make/modules/java.prefs/Lib.gmk
index 7c5d6dbb615..033768ffa1d 100644
--- a/make/modules/java.prefs/Lib.gmk
+++ b/make/modules/java.prefs/Lib.gmk
@@ -38,16 +38,11 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBPREFS, \
     NAME := prefs, \
     EXCLUDE_SRC_PATTERNS := $(LIBPREFS_EXCLUDE_SRC_PATTERNS), \
     OPTIMIZATION := HIGH, \
-    JDK_LIBS_unix := -ljvm, \
-    JDK_LIBS_linux := -ljava, \
-    JDK_LIBS_aix := -ljava, \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+    JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_macosx := \
         -framework CoreFoundation \
         -framework Foundation, \
     LIBS_windows := advapi32.lib, \
 ))
 
-$(BUILD_LIBPREFS): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBPREFS)
diff --git a/make/modules/java.rmi/Lib.gmk b/make/modules/java.rmi/Lib.gmk
index 45b3067caca..3f4a5bed893 100644
--- a/make/modules/java.rmi/Lib.gmk
+++ b/make/modules/java.rmi/Lib.gmk
@@ -31,11 +31,9 @@ include LibCommon.gmk
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBRMI, \
     NAME := rmi, \
+    EXTRA_HEADER_DIRS := java.base:libjava, \
     OPTIMIZATION := LOW, \
-    JDK_LIBS_unix := -ljvm, \
-    JDK_LIBS_windows := jvm.lib, \
+    JDK_LIBS := java.base:libjvm, \
 ))
 
-$(BUILD_LIBRMI): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBRMI)
diff --git a/make/modules/java.security.jgss/Lib.gmk b/make/modules/java.security.jgss/Lib.gmk
index f5250c43999..4cef4576dea 100644
--- a/make/modules/java.security.jgss/Lib.gmk
+++ b/make/modules/java.security.jgss/Lib.gmk
@@ -32,6 +32,7 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBJ2GSS, \
     NAME := j2gss, \
     OPTIMIZATION := LOW, \
+    EXTRA_HEADER_DIRS := java.base:libjava, \
     DISABLED_WARNINGS_gcc := undef, \
     DISABLED_WARNINGS_clang := undef, \
     LIBS_unix := $(LIBDL), \
@@ -47,7 +48,9 @@ ifeq ($(call isTargetOs, windows), true)
   $(eval $(call SetupJdkLibrary, BUILD_LIBSSPI_BRIDGE, \
       NAME := sspi_bridge, \
       OPTIMIZATION := LOW, \
-      EXTRA_HEADER_DIRS := libj2gss, \
+      EXTRA_HEADER_DIRS := \
+          libj2gss \
+          java.base:libjava, \
       LIBS_windows := secur32.lib, \
   ))
 
@@ -63,6 +66,7 @@ ifneq ($(BUILD_CRYPTO), false)
     $(eval $(call SetupJdkLibrary, BUILD_LIBW2K_LSA_AUTH, \
         NAME := w2k_lsa_auth, \
         OPTIMIZATION := LOW, \
+        EXTRA_HEADER_DIRS := java.base:libjava, \
         LIBS_windows := advapi32.lib kernel32.lib secur32.lib ws2_32.lib, \
     ))
 
@@ -79,6 +83,7 @@ ifneq ($(BUILD_CRYPTO), false)
     $(eval $(call SetupJdkLibrary, BUILD_LIBOSXKRB5, \
         NAME := osxkrb5, \
         OPTIMIZATION := LOW, \
+        EXTRA_HEADER_DIRS := java.base:libjava, \
         DISABLED_WARNINGS_clang_nativeccache.c := deprecated-declarations, \
         LIBS_macosx := \
             -framework Cocoa \
diff --git a/make/modules/java.smartcardio/Lib.gmk b/make/modules/java.smartcardio/Lib.gmk
index 7e7b8e5f009..1e647fd7e24 100644
--- a/make/modules/java.smartcardio/Lib.gmk
+++ b/make/modules/java.smartcardio/Lib.gmk
@@ -32,7 +32,9 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBJ2PCSC, \
     NAME := j2pcsc, \
     CFLAGS_unix := -D__sun_jdk, \
-    EXTRA_HEADER_DIRS := libj2pcsc/MUSCLE, \
+    EXTRA_HEADER_DIRS := \
+        libj2pcsc/MUSCLE \
+        java.base:libjava, \
     OPTIMIZATION := LOW, \
     LIBS_unix := $(LIBDL), \
     LIBS_windows := winscard.lib, \
diff --git a/make/modules/jdk.accessibility/Lib.gmk b/make/modules/jdk.accessibility/Lib.gmk
index 64cb77821ce..657eec2ad4e 100644
--- a/make/modules/jdk.accessibility/Lib.gmk
+++ b/make/modules/jdk.accessibility/Lib.gmk
@@ -48,7 +48,7 @@ ifeq ($(call isTargetOs, windows), true)
         EXTRA_HEADER_DIRS := \
             include/bridge \
             java.desktop:include, \
-        JDK_LIBS_windows := $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib, \
+        JDK_LIBS := java.desktop:libjawt, \
         LIBS_windows := advapi32.lib comdlg32.lib gdi32.lib kernel32.lib \
             odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib \
             user32.lib uuid.lib winspool.lib, \
@@ -56,8 +56,6 @@ ifeq ($(call isTargetOs, windows), true)
             $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
     )
 
-    $$(BUILD_LIBJAVAACCESSBRIDGE$1): $(call FindStaticLib, java.desktop, jawt, /libjawt)
-
     TARGETS += $$(BUILD_LIBJAVAACCESSBRIDGE$1)
   endef
 
diff --git a/make/modules/jdk.attach/Lib.gmk b/make/modules/jdk.attach/Lib.gmk
index 4298bc80097..8eefe7a4ec0 100644
--- a/make/modules/jdk.attach/Lib.gmk
+++ b/make/modules/jdk.attach/Lib.gmk
@@ -41,11 +41,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBATTACH, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(LIBATTACH_CFLAGS), \
     CFLAGS_windows := -Gy, \
-    JDK_LIBS := $(JDKLIB_LIBS), \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB), \
+    JDK_LIBS := java.base:libjava, \
     LIBS_windows := advapi32.lib psapi.lib, \
 ))
 
-$(BUILD_LIBATTACH): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBATTACH)
diff --git a/make/modules/jdk.crypto.cryptoki/Lib.gmk b/make/modules/jdk.crypto.cryptoki/Lib.gmk
index a71e4f01882..9a21177af4f 100644
--- a/make/modules/jdk.crypto.cryptoki/Lib.gmk
+++ b/make/modules/jdk.crypto.cryptoki/Lib.gmk
@@ -32,6 +32,7 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBJ2PKCS11, \
     NAME := j2pkcs11, \
     OPTIMIZATION := LOW, \
+    EXTRA_HEADER_DIRS := java.base:libjava, \
     DISABLED_WARNINGS_clang_p11_util.c := format-nonliteral, \
     LIBS_unix := $(LIBDL), \
 ))
diff --git a/make/modules/jdk.crypto.mscapi/Lib.gmk b/make/modules/jdk.crypto.mscapi/Lib.gmk
index f9089258699..39b83a21ae9 100644
--- a/make/modules/jdk.crypto.mscapi/Lib.gmk
+++ b/make/modules/jdk.crypto.mscapi/Lib.gmk
@@ -33,6 +33,7 @@ ifeq ($(call isTargetOs, windows), true)
   $(eval $(call SetupJdkLibrary, BUILD_LIBSUNMSCAPI, \
       NAME := sunmscapi, \
       OPTIMIZATION := LOW, \
+      EXTRA_HEADER_DIRS := java.base:libjava, \
       LDFLAGS := $(LDFLAGS_CXX_JDK), \
       LIBS_windows := advapi32.lib crypt32.lib ncrypt.lib, \
   ))
diff --git a/make/modules/jdk.hotspot.agent/Lib.gmk b/make/modules/jdk.hotspot.agent/Lib.gmk
index 326536878c9..48429a9004d 100644
--- a/make/modules/jdk.hotspot.agent/Lib.gmk
+++ b/make/modules/jdk.hotspot.agent/Lib.gmk
@@ -57,6 +57,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSAPROC, \
     NAME := saproc, \
     LINK_TYPE := $(LIBSAPROC_LINK_TYPE), \
     OPTIMIZATION := HIGH, \
+    EXTRA_HEADER_DIRS := java.base:libjvm, \
     DISABLED_WARNINGS_gcc := sign-compare, \
     DISABLED_WARNINGS_gcc_ps_core.c := pointer-arith, \
     DISABLED_WARNINGS_clang_ps_core.c := pointer-arith, \
@@ -66,8 +67,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSAPROC, \
     CFLAGS := $(LIBSAPROC_CFLAGS), \
     CXXFLAGS := $(LIBSAPROC_CFLAGS) $(LIBSAPROC_CXXFLAGS), \
     EXTRA_SRC := $(LIBSAPROC_EXTRA_SRC), \
-    JDK_LIBS_unix := -ljava, \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB), \
+    JDK_LIBS := java.base:libjava, \
     LIBS_linux := $(LIBDL), \
     LIBS_macosx := \
         -framework CoreFoundation \
diff --git a/make/modules/jdk.internal.le/Lib.gmk b/make/modules/jdk.internal.le/Lib.gmk
index 8c04107e0f5..e81137e0d53 100644
--- a/make/modules/jdk.internal.le/Lib.gmk
+++ b/make/modules/jdk.internal.le/Lib.gmk
@@ -34,8 +34,10 @@ ifeq ($(call isTargetOs, aix), false)
       NAME := le, \
       LINK_TYPE := C++, \
       OPTIMIZATION := LOW, \
+      EXTRA_HEADER_DIRS := \
+          java.base:libjava \
+          java.base:libjvm, \
       LD_SET_ORIGIN := false, \
-      JDK_LIBS := $(JDKLIB_LIBS), \
       LIBS_windows := user32.lib, \
   ))
 
diff --git a/make/modules/jdk.jdi/Lib.gmk b/make/modules/jdk.jdi/Lib.gmk
index 8c620bf90e2..80a5664289b 100644
--- a/make/modules/jdk.jdi/Lib.gmk
+++ b/make/modules/jdk.jdi/Lib.gmk
@@ -36,7 +36,6 @@ ifeq ($(call isTargetOs, windows), true)
       EXTRA_HEADER_DIRS := \
           jdk.jdwp.agent:include \
           jdk.jdwp.agent:libjdwp/export, \
-      JDK_LIBS := $(JDKLIB_LIBS), \
   ))
 
   TARGETS += $(BUILD_LIBDT_SHMEM)
diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk
index 17735dfe3d7..03fab3c39ea 100644
--- a/make/modules/jdk.jdwp.agent/Lib.gmk
+++ b/make/modules/jdk.jdwp.agent/Lib.gmk
@@ -40,8 +40,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
     LIBS_windows := iphlpapi.lib ws2_32.lib, \
 ))
 
-$(BUILD_LIBDT_SOCKET): $(call FindLib, java.base, java)
-
 # Include socket transport with JDWP agent to allow for remote debugging
 TARGETS += $(BUILD_LIBDT_SOCKET)
 
@@ -61,15 +59,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
     DISABLED_WARNINGS_clang_log_messages.c := format-nonliteral, \
     EXTRA_HEADER_DIRS := \
         include \
-        libjdwp/export, \
-    JDK_LIBS := $(JDKLIB_LIBS), \
+        libjdwp/export \
+        java.base:libjava \
+        java.base:libjvm, \
     LIBS_linux := $(LIBDL), \
     LIBS_macosx := -liconv, \
     LIBS_aix := -liconv, \
 ))
 
-$(BUILD_LIBJDWP): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBJDWP)
 
 ################################################################################
diff --git a/make/modules/jdk.management.agent/Lib.gmk b/make/modules/jdk.management.agent/Lib.gmk
index 7a578adc301..89de59d7fec 100644
--- a/make/modules/jdk.management.agent/Lib.gmk
+++ b/make/modules/jdk.management.agent/Lib.gmk
@@ -32,11 +32,8 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_AGENT, \
     NAME := management_agent, \
     OPTIMIZATION := LOW, \
-    JDK_LIBS := $(JDKLIB_LIBS), \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB), \
+    JDK_LIBS := java.base:libjava, \
     LIBS_windows := advapi32.lib, \
 ))
 
-$(BUILD_LIBMANAGEMENT_AGENT): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBMANAGEMENT_AGENT)
diff --git a/make/modules/jdk.management/Lib.gmk b/make/modules/jdk.management/Lib.gmk
index 4e5c44a781a..8d7fae64872 100644
--- a/make/modules/jdk.management/Lib.gmk
+++ b/make/modules/jdk.management/Lib.gmk
@@ -46,12 +46,9 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
     OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
     DISABLED_WARNINGS_clang_UnixOperatingSystem.c := format-nonliteral, \
     CFLAGS := $(LIBMANAGEMENT_EXT_CFLAGS), \
-    JDK_LIBS := $(JDKLIB_LIBS), \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+    JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_aix := -lperfstat,\
     LIBS_windows := advapi32.lib psapi.lib, \
 ))
 
-$(BUILD_LIBMANAGEMENT_EXT): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBMANAGEMENT_EXT)
diff --git a/make/modules/jdk.net/Lib.gmk b/make/modules/jdk.net/Lib.gmk
index a0a9aff8cb8..e43d8427f5a 100644
--- a/make/modules/jdk.net/Lib.gmk
+++ b/make/modules/jdk.net/Lib.gmk
@@ -32,12 +32,9 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBEXTNET, \
     NAME := extnet, \
     OPTIMIZATION := LOW, \
-    JDK_LIBS_unix := -ljava, \
-    JDK_LIBS_linux := -ljvm, \
-    JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+    EXTRA_HEADER_DIRS := java.base:libjvm, \
+    JDK_LIBS := java.base:libjava, \
     LIBS_windows := ws2_32.lib, \
 ))
 
-$(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBEXTNET)
diff --git a/make/modules/jdk.sctp/Lib.gmk b/make/modules/jdk.sctp/Lib.gmk
index 57b52b3cb11..a6d95a25154 100644
--- a/make/modules/jdk.sctp/Lib.gmk
+++ b/make/modules/jdk.sctp/Lib.gmk
@@ -35,13 +35,12 @@ ifeq ($(call isTargetOs, linux), true)
       OPTIMIZATION := LOW, \
       EXTRA_HEADER_DIRS := \
           $(call GetJavaHeaderDir, java.base) \
-          java.base:libnet \
+          java.base:libjvm \
+          java.base:libnio \
           java.base:libnio/ch, \
-      JDK_LIBS_unix := -ljava -ljvm -lnet -lnio, \
+      JDK_LIBS := java.base:libjava java.base:libnet, \
       LIBS_linux := $(LIBDL) -lpthread, \
   ))
 
   TARGETS += $(BUILD_LIBSCTP)
-
-  $(BUILD_LIBSCTP): $(call FindLib, java.base, nio)
 endif
diff --git a/make/modules/jdk.security.auth/Lib.gmk b/make/modules/jdk.security.auth/Lib.gmk
index dad60be2376..a0d41004489 100644
--- a/make/modules/jdk.security.auth/Lib.gmk
+++ b/make/modules/jdk.security.auth/Lib.gmk
@@ -32,9 +32,8 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
     NAME := jaas, \
     OPTIMIZATION := LOW, \
+    EXTRA_HEADER_DIRS := java.base:libjava, \
     LIBS_windows := advapi32.lib mpr.lib netapi32.lib user32.lib, \
 ))
 
-$(BUILD_LIBJAAS): $(call FindLib, java.base, java)
-
 TARGETS += $(BUILD_LIBJAAS)
diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index 2c86ea2ddd0..33532f77974 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -842,9 +842,11 @@ ifeq ($(call isTargetOs, linux), true)
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstepBreakPopReturn := -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIndyRedefineClass := -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefineClasses := -lpthread
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeinvoke := -ljvm -lpthread
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exestack-gap := -ljvm -lpthread
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exestack-tls := -ljvm
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeinvoke := java.base:libjvm
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exestack-gap := java.base:libjvm
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exestack-tls := java.base:libjvm
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeinvoke := -lpthread
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exestack-gap := -lpthread
   BUILD_TEST_exeinvoke_exeinvoke.c_OPTIMIZATION := NONE
   BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeFPRegs := -ldl
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAsyncGetCallTraceTest := -ldl
@@ -859,16 +861,15 @@ ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), false
 endif
 
 
-BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
+BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exesigtest := java.base:libjvm
+BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libatExit := java.base:libjvm
+BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exedaemonDestroy := java.base:libjvm
 
 ifeq ($(call isTargetOs, windows), true)
   BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
   BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c libCompleteExit.c libMonitorWithDeadObjectTest.c libTestPsig.c exeGetCreatedJavaVMs.c
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit := jvm.lib
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativeStack := jvm.lib
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exedaemonDestroy := jvm.lib
+  BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libnativeStack := java.base:libjvm
 else
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exedaemonDestroy := -ljvm
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprop001 += -lpthread
@@ -1503,11 +1504,11 @@ else
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase001 += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase002 += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libterminatedThread += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit += -ljvm
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCompleteExit += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libMonitorWithDeadObjectTest += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativeStack += -lpthread
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeGetCreatedJavaVMs := -ljvm -lpthread
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeGetCreatedJavaVMs := -lpthread
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeGetCreatedJavaVMs := java.base:libjvm
 
   BUILD_HOTSPOT_JTREG_EXCLUDE += libNativeException.c
 endif
diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
index 7cffc7311c7..ae830501635 100644
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -53,28 +53,26 @@ BUILD_JDK_JTREG_EXECUTABLES_CFLAGS_exeJliLaunchTest := \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli
 
+BUILD_JDK_JTREG_EXECUTABLES_JDK_LIBS_exeJliLaunchTest := java.base:libjli
+BUILD_JDK_JTREG_EXECUTABLES_JDK_LIBS_exeCallerAccessTest := java.base:libjvm
+BUILD_JDK_JTREG_EXECUTABLES_JDK_LIBS_exeNullCallerTest := java.base:libjvm
+
+BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libstringPlatformChars := java.base:libjava
+BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libTracePinnedThreads := java.base:libjvm
+BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libNewDirectByteBuffer := java.base:libjava
+BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libGetXSpace := java.base:libjava
+
 # Platform specific setup
 ifeq ($(call isTargetOs, windows), true)
   BUILD_JDK_JTREG_EXCLUDE += libDirectIO.c libInheritedChannel.c \
       libExplicitAttach.c libImplicitAttach.c \
       exelauncher.c
 
-  WIN_LIB_JAVA := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA)
-  WIN_LIB_JLI := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
-  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := $(WIN_LIB_JLI)
-  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := jvm.lib
-  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerTest := $(LIBCXX) jvm.lib
+  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerTest := $(LIBCXX)
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exerevokeall := advapi32.lib
   BUILD_JDK_JTREG_EXECUTABLES_CFLAGS_exeNullCallerTest := /EHsc
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libTracePinnedThreads := jvm.lib
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libNewDirectByteBuffer := $(WIN_LIB_JAVA)
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libGetXSpace := $(WIN_LIB_JAVA)
 else
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libNewDirectByteBuffer := -ljava
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libGetXSpace := -ljava
+  BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libDirectIO := java.base:libjava
   BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libNativeThread := -pthread
 
   # java.lang.foreign tests
@@ -84,28 +82,22 @@ else
   BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libLinkerInvokerModule := -pthread
   BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libLoaderLookupInvoker := -pthread
 
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libExplicitAttach := -ljvm
+  BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libExplicitAttach := java.base:libjvm
   BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libExplicitAttach := -pthread
   BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libImplicitAttach := -pthread
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libTracePinnedThreads := -ljvm
   BUILD_JDK_JTREG_EXCLUDE += exerevokeall.c
   ifeq ($(call isTargetOs, linux), true)
-    BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava
+    BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libInheritedChannel := java.base:libjava
     BUILD_JDK_JTREG_EXECUTABLES_LIBS_exelauncher := -ldl
   endif
-  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := -ljli
-  ifeq ($(call isTargetOs, aix), true)
-    BUILD_JDK_JTREG_EXECUTABLES_LDFLAGS_exeJliLaunchTest := -L$(SUPPORT_OUTPUTDIR)/native/java.base
-  endif
-  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := -ljvm
-  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerTest := $(LIBCXX) -ljvm
+  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerTest := $(LIBCXX)
 endif
 
 ifeq ($(call isTargetOs, macosx), true)
   BUILD_JDK_JTREG_EXCLUDE += exelauncher.c
   BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := \
       -framework Cocoa
-  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJniInvocationTest := -ljli
+  BUILD_JDK_JTREG_EXECUTABLES_JDK_LIBS_exeJniInvocationTest := java.base:libjli
   BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestDynamicStore := \
       -framework Cocoa -framework SystemConfiguration
 else
diff --git a/make/test/JtregNativeLibTest.gmk b/make/test/JtregNativeLibTest.gmk
index 4bae9d9189c..7ab45cce878 100644
--- a/make/test/JtregNativeLibTest.gmk
+++ b/make/test/JtregNativeLibTest.gmk
@@ -48,11 +48,7 @@ BUILD_LIBTEST_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/lib-test/jtreg/nativ
 
 BUILD_LIBTEST_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/lib-test/jtreg
 
-ifeq ($(call isTargetOs, windows), true)
-    BUILD_LIBTEST_JTREG_EXECUTABLES_LIBS_exejvm-test-launcher := jvm.lib
-else
-    BUILD_LIBTEST_JTREG_EXECUTABLES_LIBS_exejvm-test-launcher := -ljvm
-endif
+BUILD_LIBTEST_JTREG_EXECUTABLES_JDK_LIBS_exejvm-test-launcher := java.base:libjvm
 
 # This evaluation is expensive and should only be done if this target was
 # explicitly called.

From 9acce7a6f326543c302ca0408213cf333f5f778a Mon Sep 17 00:00:00 2001
From: Ludvig Janiuk <lujaniuk@openjdk.org>
Date: Thu, 11 Apr 2024 10:33:19 +0000
Subject: [PATCH 004/486] 8329774: Break long lines in
 jdk/src/jdk.hotspot.agent/doc /transported_core.html

Reviewed-by: kevinw
---
 .../doc/transported_core.html                 | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/jdk.hotspot.agent/doc/transported_core.html b/src/jdk.hotspot.agent/doc/transported_core.html
index 272e9598757..7d8b2804d0a 100644
--- a/src/jdk.hotspot.agent/doc/transported_core.html
+++ b/src/jdk.hotspot.agent/doc/transported_core.html
@@ -87,18 +87,28 @@ to the debugger machine and included in <b>PATH</b>.
 </p>
 
 <p>
-By default symbols are also located using <b>PATH</b>. However, there are also Java properties that can be used to specify both the location of the binaries, and also separately the location of symbols. Use <b>sun.jvm.hotspot.debugger.windbg.imagePath</b> for the location of binaries, and use <b>sun.jvm.hotspot.debugger.windbg.symbolPath</b> for the location of symbols. <b>imagePath</b> defaults to <b>PATH</b> if not set, and <b>symbolPath</b> defaults to <b>imagePath</b>. The advantage of using these propeties is that you don't need to change your <b>PATH</b> setting, and they allow for binaries to be located separately from symbols.
+By default symbols are also located using <b>PATH</b>. However, there are also Java properties that
+can be used to specify both the location of the binaries, and also separately the location of
+symbols. Use <b>sun.jvm.hotspot.debugger.windbg.imagePath</b> for the location of binaries, and use
+<b>sun.jvm.hotspot.debugger.windbg.symbolPath</b> for the location of symbols. <b>imagePath</b>
+defaults to <b>PATH</b> if not set, and <b>symbolPath</b> defaults to <b>imagePath</b>. The
+advantage of using these propeties is that you don't need to change your <b>PATH</b> setting, and
+they allow for binaries to be located separately from symbols.
 </p>
 
 <p>
-How you set these properties will depend on the SA tool being used. The following example demonstrates how to set one of the properties when launching the clhsdb tool:
+How you set these properties will depend on the SA tool being used. The following example
+demonstrates how to set one of the properties when launching the clhsdb tool:
 </p>
 
 <code>
 jhsdb -J-Dsun.jvm.hotspot.debugger.windbg.imagePath="%PATH%;D:\SomePath" clhsdb
 </code>
 
-<p>If you are not seeing symbols for Windows libraries, try setting <b>sun.jvm.hotspot.debugger.windbg.symbolPath</b> to include "<b>srv*https://msdl.microsoft.com/download/symbols</b>". Also include <b>PATH</b> so SA will still find your JVM and JNI symbols. For example:
+<p>If you are not seeing symbols for Windows libraries, try setting
+<b>sun.jvm.hotspot.debugger.windbg.symbolPath</b> to include
+"<b>srv*https://msdl.microsoft.com/download/symbols</b>". Also include <b>PATH</b> so SA will still
+find your JVM and JNI symbols. For example:
 </p>
 
 <code>
@@ -117,13 +127,13 @@ jhsdb -J-Dsun.jvm.hotspot.debugger.windbg.symbolPath="%PATH%;srv*https://msdl.mi
 <p>
  For locating the user JNI libraries, SA uses <b>DYLD_LIBRARY_PATH</b>. It can contain
  more than one directory separated by a colon. <b>DYLD_LIBRARY_PATH</b> can also be
- used for locating the JDK libraries, but it needs to specify the full path to the libraries. SA will
- not automatically search subdirs such as <b>lib/server</b> as it does for <b>JAVA_HOME</b>.
+ used for locating the JDK libraries, but it needs to specify the full path to the libraries. SA
+ will not automatically search subdirs such as <b>lib/server</b> as it does for <b>JAVA_HOME</b>.
 </p>
 
 <p>
  For locating the macOS libraries, SA uses <b>SA_ALTROOT</b> similar to the linux support,
- except it does not use it to map all the subdirs. It just appends <b>SA_ALTROOT</b> to the
+ except it does not use it to map all the subdirs. It just prepends <b>SA_ALTROOT</b> to the
  full path of each macOS library. So if you specify <b>SA_ALTROOT=/altroot</b>, SA will
  prepend <b>/altroot</b> to the full path of each macOS library. Note however, due to
  <a href="https://bugs.openjdk.org/browse/JDK-8249779">JDK-8249779</a> , SA will not

From ff5c9a4ddecbe3ee453a30fcfd49fd677c174f06 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 11 Apr 2024 11:35:07 +0000
Subject: [PATCH 005/486] 8329528: G1 does not update TAMS correctly when
 dropping retained regions during Concurrent Start pause

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  |  2 +-
 src/hotspot/share/gc/g1/g1YoungCollector.cpp  | 13 ++--
 .../share/gc/g1/g1YoungGCPreEvacuateTasks.hpp |  1 +
 .../pinnedobjs/TestDroppedRetainedTAMS.java   | 72 +++++++++++++++++++
 4 files changed, 80 insertions(+), 8 deletions(-)
 create mode 100644 test/hotspot/jtreg/gc/g1/pinnedobjs/TestDroppedRetainedTAMS.java

diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index f9ebc74805b..4b20bb43317 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -869,7 +869,7 @@ public:
   NoteStartOfMarkHRClosure() : HeapRegionClosure(), _cm(G1CollectedHeap::heap()->concurrent_mark()) { }
 
   bool do_heap_region(HeapRegion* r) override {
-    if (r->is_old_or_humongous() && !r->is_collection_set_candidate()) {
+    if (r->is_old_or_humongous() && !r->is_collection_set_candidate() && !r->in_collection_set()) {
       _cm->update_top_at_mark_start(r);
     }
     return false;
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index 4fa3b928763..906d9854d8d 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -484,13 +484,8 @@ void G1YoungCollector::set_young_collection_default_active_worker_threads(){
 }
 
 void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info) {
-
-  // Must be before collection set calculation, requires collection set to not
-  // be calculated yet.
-  if (collector_state()->in_concurrent_start_gc()) {
-    concurrent_mark()->pre_concurrent_start(_gc_cause);
-  }
-
+  // Flush various data in thread-local buffers to be able to determine the collection
+  // set
   {
     Ticks start = Ticks::now();
     G1PreEvacuateCollectionSetBatchTask cl;
@@ -501,6 +496,10 @@ void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info)
   // Needs log buffers flushed.
   calculate_collection_set(evacuation_info, policy()->max_pause_time_ms());
 
+  if (collector_state()->in_concurrent_start_gc()) {
+    concurrent_mark()->pre_concurrent_start(_gc_cause);
+  }
+
   // Please see comment in g1CollectedHeap.hpp and
   // G1CollectedHeap::ref_processing_init() to see how
   // reference processing currently works in G1.
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.hpp b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.hpp
index effefa7a1eb..912941fa2a2 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.hpp
@@ -29,6 +29,7 @@
 
 // Set of pre evacuate collection set tasks containing ("s" means serial):
 // - Retire TLAB and Flush Logs (Java threads)
+// - Flush pin count cache (Java threads)
 // - Flush Logs (s) (Non-Java threads)
 class G1PreEvacuateCollectionSetBatchTask : public G1BatchedTask {
   class JavaThreadRetireTLABAndFlushLogs;
diff --git a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestDroppedRetainedTAMS.java b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestDroppedRetainedTAMS.java
new file mode 100644
index 00000000000..f650e53a25f
--- /dev/null
+++ b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestDroppedRetainedTAMS.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2024, 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
+ * @summary Check that TAMSes are correctly updated for regions dropped from
+ *          the retained collection set candidates during a Concurrent Start pause.
+ * @requires vm.gc.G1
+ * @requires vm.flagless
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
+                     -XX:+WhiteBoxAPI -Xbootclasspath/a:. -Xmx32m -XX:G1NumCollectionsKeepPinned=1
+                     -XX:+VerifyBeforeGC -XX:+VerifyAfterGC -XX:G1MixedGCLiveThresholdPercent=100
+                     -XX:G1HeapWastePercent=0 -Xlog:gc,gc+ergo+cset=trace gc.g1.pinnedobjs.TestDroppedRetainedTAMS
+ */
+
+package gc.g1.pinnedobjs;
+
+import jdk.test.whitebox.WhiteBox;
+
+public class TestDroppedRetainedTAMS {
+
+    private static final WhiteBox wb = WhiteBox.getWhiteBox();
+
+    private static final char[] dummy = new char[100];
+
+    public static void main(String[] args) {
+        wb.fullGC(); // Move the target dummy object to old gen.
+
+        wb.pinObject(dummy);
+
+        // After this concurrent cycle the pinned region will be in the the (marking)
+        // collection set candidates.
+        wb.g1RunConcurrentGC();
+
+        // Pass the Prepare mixed gc which will not do anything about the marking
+        // candidates.
+        wb.youngGC();
+        // Mixed GC. Will complete. That pinned region is now retained. The mixed gcs
+        // will end here.
+        wb.youngGC();
+
+        // The pinned region will be dropped from the retained candidates during the
+        // Concurrent Start GC, leaving that region's TAMS broken.
+        wb.g1RunConcurrentGC();
+
+        // Verification will find a lot of broken objects.
+        wb.youngGC();
+        System.out.println(dummy);
+    }
+}

From ecc603ca9b441cbb7ad27fbc2529fcb0b1da1992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Thu, 11 Apr 2024 12:42:24 +0000
Subject: [PATCH 006/486] 8201183: sjavac build failures: "Connection attempt
 failed: Connection refused"

Reviewed-by: erikj, ihse
---
 .../tools/javacserver/shared/PortFile.java    | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/make/langtools/tools/javacserver/shared/PortFile.java b/make/langtools/tools/javacserver/shared/PortFile.java
index 2e4283a22b3..b31e97cfeea 100644
--- a/make/langtools/tools/javacserver/shared/PortFile.java
+++ b/make/langtools/tools/javacserver/shared/PortFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -50,17 +50,16 @@ public class PortFile {
     // Followed by a 4 byte int, with the port nr.
     // Followed by a 8 byte long, with cookie nr.
 
-    private String filename;
-    private File file;
-    private File stopFile;
+    private final String filename;
+    private final File file;
+    private final File stopFile;
     private RandomAccessFile rwfile;
-    private FileChannel channel;
 
     // FileLock used to solve inter JVM synchronization, lockSem used to avoid
     // JVM internal OverlappingFileLockExceptions.
     // Class invariant: lock.isValid() <-> lockSem.availablePermits() == 0
     private FileLock lock;
-    private Semaphore lockSem = new Semaphore(1);
+    private final Semaphore lockSem = new Semaphore(1);
 
     private boolean containsPortInfo;
     private int serverPort;
@@ -89,17 +88,18 @@ public class PortFile {
         }
         // The rwfile should only be readable by the owner of the process
         // and no other! How do we do that on a RandomAccessFile?
-        channel = rwfile.getChannel();
     }
 
     /**
      * Lock the port file.
      */
     public void lock() throws IOException, InterruptedException {
-        if (channel == null) {
-            initializeChannel();
-        }
         lockSem.acquire();
+        if (rwfile != null) {
+            throw new IllegalStateException("rwfile not null");
+        }
+        initializeChannel();
+        FileChannel channel = rwfile.getChannel();
         lock = channel.lock();
     }
 
@@ -110,8 +110,7 @@ public class PortFile {
     public void getValues()  {
         containsPortInfo = false;
         if (lock == null) {
-            // Not locked, remain ignorant about port file contents.
-            return;
+            throw new IllegalStateException("Must lock before calling getValues");
         }
         try {
             if (rwfile.length()>0) {
@@ -156,6 +155,9 @@ public class PortFile {
      * Store the values into the locked port file.
      */
     public void setValues(int port, long cookie) throws IOException {
+        if (lock == null) {
+            throw new IllegalStateException("Must lock before calling setValues");
+        }
         rwfile.seek(0);
         // Write the magic nr that identifies a port file.
         rwfile.writeInt(magicNr);
@@ -169,19 +171,19 @@ public class PortFile {
      * Delete the port file.
      */
     public void delete() throws IOException, InterruptedException {
-        // Access to file must be closed before deleting.
-        rwfile.close();
-
-        file.delete();
-
-        // Wait until file has been deleted (deletes are asynchronous on Windows!) otherwise we
+        if (!file.exists()) { // file deleted already
+            return;
+        }
+        // Keep trying until file has been deleted, otherwise we
         // might shutdown the server and prevent another one from starting.
-        for (int i = 0; i < 10 && file.exists(); i++) {
+        for (int i = 0; i < 10 && file.exists() && !file.delete(); i++) {
             Thread.sleep(1000);
         }
         if (file.exists()) {
             throw new IOException("Failed to delete file.");
         }
+        // allow some time for late clients to connect
+        Thread.sleep(1000);
     }
 
     /**
@@ -210,10 +212,12 @@ public class PortFile {
      */
     public void unlock() throws IOException {
         if (lock == null) {
-            return;
+            throw new IllegalStateException("Not locked");
         }
         lock.release();
         lock = null;
+        rwfile.close();
+        rwfile = null;
         lockSem.release();
     }
 

From 63684cd18300d862f3128bd13995e5c82307b50c Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Thu, 11 Apr 2024 13:17:48 +0000
Subject: [PATCH 007/486] 8327250: assert(!method->is_old()) failed: Should not
 be installing old methods

Reviewed-by: eosterlund, sspitsyn
---
 .../share/interpreter/interpreterRuntime.cpp  |  9 ++++---
 .../share/interpreter/linkResolver.cpp        | 24 ++++++++++++++++++-
 .../share/interpreter/linkResolver.hpp        |  6 ++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index ff7c453e01e..5f8dcbbf2ad 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -864,13 +864,12 @@ void InterpreterRuntime::resolve_invoke(JavaThread* current, Bytecodes::Code byt
       return;
     }
 
-    if (JvmtiExport::can_hotswap_or_post_breakpoint() && info.resolved_method()->is_old()) {
-      resolved_method = methodHandle(current, info.resolved_method()->get_new_method());
-    } else {
-      resolved_method = methodHandle(current, info.resolved_method());
-    }
+    resolved_method = methodHandle(current, info.resolved_method());
   } // end JvmtiHideSingleStepping
 
+  // Don't allow safepoints until the method is cached.
+  NoSafepointVerifier nsv;
+
   // check if link resolution caused cpCache to be updated
   if (cache->resolved_method_entry_at(method_index)->is_resolved(bytecode)) return;
 
diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
index 38bef3e1e98..7b5b62ac075 100644
--- a/src/hotspot/share/interpreter/linkResolver.cpp
+++ b/src/hotspot/share/interpreter/linkResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -50,6 +50,7 @@
 #include "oops/oop.inline.hpp"
 #include "oops/resolvedIndyEntry.hpp"
 #include "oops/symbolHandle.hpp"
+#include "prims/jvmtiExport.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/frame.inline.hpp"
@@ -112,6 +113,27 @@ void CallInfo::set_handle(Klass* resolved_klass,
   _resolved_appendix = resolved_appendix;
 }
 
+// Redefinition safepoint may have updated the method. Make sure the new version of the method is returned.
+// Callers are responsible for not safepointing and storing this method somewhere safe where redefinition
+// can replace it if runs again.  Safe places are constant pool cache and code cache metadata.
+// The old method is safe in CallInfo since its a methodHandle (it won't get deleted), and accessed with these
+// accessors.
+Method* CallInfo::resolved_method() const {
+  if (JvmtiExport::can_hotswap_or_post_breakpoint() && _resolved_method->is_old()) {
+    return _resolved_method->get_new_method();
+  } else {
+    return _resolved_method();
+  }
+}
+
+Method* CallInfo::selected_method() const {
+  if (JvmtiExport::can_hotswap_or_post_breakpoint() && _selected_method->is_old()) {
+    return _selected_method->get_new_method();
+  } else {
+    return _selected_method();
+  }
+}
+
 void CallInfo::set_common(Klass* resolved_klass,
                           const methodHandle& resolved_method,
                           const methodHandle& selected_method,
diff --git a/src/hotspot/share/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp
index c7a4c0eaba7..e18749cd6a5 100644
--- a/src/hotspot/share/interpreter/linkResolver.hpp
+++ b/src/hotspot/share/interpreter/linkResolver.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,8 +92,8 @@ class CallInfo : public StackObj {
   CallInfo(Method* resolved_method, Klass* resolved_klass, TRAPS);
 
   Klass*  resolved_klass() const                 { return _resolved_klass; }
-  Method* resolved_method() const                { return _resolved_method(); }
-  Method* selected_method() const                { return _selected_method(); }
+  Method* resolved_method() const;
+  Method* selected_method() const;
   Handle       resolved_appendix() const         { return _resolved_appendix; }
   Handle       resolved_method_name() const      { return _resolved_method_name; }
   // Materialize a java.lang.invoke.ResolvedMethodName for this resolved_method

From 2e3682a7f2983cd58b9564253dc698760faba4b8 Mon Sep 17 00:00:00 2001
From: Mahendra Chhipa <mchhipa@openjdk.org>
Date: Thu, 11 Apr 2024 13:51:07 +0000
Subject: [PATCH 008/486] 8319678: Several tests from corelibs areas ignore VM
 flags

Reviewed-by: naoto, jpai
---
 .../lang/Thread/UncaughtExceptionsTest.java   | 16 ++--
 .../java/lang/annotation/LoaderLeakTest.java  |  4 +-
 .../reliability/benchmark/bench/rmi/Main.java | 51 +++++------
 .../java/time/chrono/HijrahConfigTest.java    | 18 ++--
 .../spi/providers/InitialContextTest.java     | 85 +++++++++----------
 test/jdk/sun/misc/EscapePath.java             | 38 ++++++---
 6 files changed, 105 insertions(+), 107 deletions(-)

diff --git a/test/jdk/java/lang/Thread/UncaughtExceptionsTest.java b/test/jdk/java/lang/Thread/UncaughtExceptionsTest.java
index 42d85593088..915d1cb6b76 100644
--- a/test/jdk/java/lang/Thread/UncaughtExceptionsTest.java
+++ b/test/jdk/java/lang/Thread/UncaughtExceptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,13 @@
 
 import java.util.stream.Stream;
 
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.Arguments;
-
 import static java.lang.System.err;
 import static java.lang.System.out;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -85,7 +83,7 @@ class UncaughtExceptionsTest {
     @MethodSource("testCases")
     void test(String className, int exitValue, String stdOutMatch, String stdErrMatch) throws Throwable {
         String cmd = "UncaughtExitSimulator$" + className;
-        ProcessBuilder processBuilder = ProcessTools.createLimitedTestJavaProcessBuilder(cmd);
+        ProcessBuilder processBuilder = ProcessTools.createTestJavaProcessBuilder(cmd);
         OutputAnalyzer outputAnalyzer = ProcessTools.executeCommand(processBuilder);
         outputAnalyzer.shouldHaveExitValue(exitValue);
         outputAnalyzer.stderrShouldMatch(stdErrMatch);
diff --git a/test/jdk/java/lang/annotation/LoaderLeakTest.java b/test/jdk/java/lang/annotation/LoaderLeakTest.java
index ed230d8df0e..762a08f9990 100644
--- a/test/jdk/java/lang/annotation/LoaderLeakTest.java
+++ b/test/jdk/java/lang/annotation/LoaderLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, 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
@@ -55,7 +55,7 @@ public class LoaderLeakTest {
     }
 
     private void runJavaProcessExpectSuccessExitCode(String ... command) throws Throwable {
-        var processBuilder = ProcessTools.createLimitedTestJavaProcessBuilder(command)
+        var processBuilder = ProcessTools.createTestJavaProcessBuilder(command)
                                                       .directory(Paths.get(Utils.TEST_CLASSES).toFile());
         ProcessTools.executeCommand(processBuilder).shouldHaveExitValue(0);
     }
diff --git a/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java
index b4d8e289075..6e7405df896 100644
--- a/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java
+++ b/test/jdk/java/rmi/reliability/benchmark/bench/rmi/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @summary The RMI benchmark test. This java class is used to run the test
  *          under JTREG.
- * @library ../../../../testlibrary ../../
+ * @library ../../../../testlibrary ../../ /test/lib
  * @modules java.desktop
  *          java.rmi/sun.rmi.registry
  *          java.rmi/sun.rmi.server
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary bench.BenchInfo bench.HtmlReporter bench.Util
+ * @build TestLibrary bench.BenchInfo bench.HtmlReporter bench.Util jdk.test.lib.process.ProcessTools
  * bench.Benchmark bench.Reporter bench.XmlReporter bench.ConfigFormatException
  * bench.Harness bench.TextReporter bench.rmi.BenchServer
  * bench.rmi.DoubleArrayCalls bench.rmi.LongCalls bench.rmi.ShortCalls
@@ -51,19 +51,12 @@
 
 package bench.rmi;
 
-import bench.ConfigFormatException;
-import bench.Harness;
-import bench.HtmlReporter;
-import bench.Reporter;
-import bench.TextReporter;
-import bench.XmlReporter;
-import static bench.rmi.Main.OutputFormat.*;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.rmi.AlreadyBoundException;
@@ -77,6 +70,18 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import bench.ConfigFormatException;
+import bench.Harness;
+import bench.HtmlReporter;
+import bench.Reporter;
+import bench.TextReporter;
+import bench.XmlReporter;
+import static bench.rmi.Main.OutputFormat.HTML;
+import static bench.rmi.Main.OutputFormat.TEXT;
+import static bench.rmi.Main.OutputFormat.XML;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
 /**
  * RMI/Serialization benchmark tests.
  */
@@ -234,13 +239,6 @@ public class Main {
                     //Setup for client mode, server will fork client process
                     //after its initiation.
                     List<String> clientProcessStr = new ArrayList<>();
-                    clientProcessStr.add(System.getProperty("test.jdk") +
-                            File.separator + "bin" + File.separator + "java");
-                    String classpath = System.getProperty("java.class.path");
-                    if (classpath != null) {
-                        clientProcessStr.add("-cp");
-                        clientProcessStr.add(classpath);
-                    }
                     clientProcessStr.add("-Djava.security.policy=" + TEST_SRC_PATH + "policy.all");
                     clientProcessStr.add("-Djava.security.manager=allow");
                     clientProcessStr.add("-Dtest.src=" + TEST_SRC_PATH);
@@ -276,20 +274,13 @@ public class Main {
                     }
 
                     try {
-                        Process client = new ProcessBuilder(clientProcessStr).
-                                inheritIO().start();
-                        try {
-                            client.waitFor();
-                            int exitValue = client.exitValue();
-                            if (0 != exitValue) {
-                                die("Error: error happened in client process, exitValue = " + exitValue);
-                            }
-                        } finally {
-                            client.destroyForcibly();
-                        }
+                        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(clientProcessStr);
+                        OutputAnalyzer outputAnalyzer = ProcessTools.executeProcess(pb);
+                        System.out.println(outputAnalyzer.getOutput());
+                        outputAnalyzer.shouldHaveExitValue(0);
                     } catch (IOException ex) {
                         die("Error: Unable start client process, ex=" + ex.getMessage());
-                    } catch (InterruptedException ex) {
+                    } catch (Exception ex) {
                         die("Error: Error happening to client process, ex=" + ex.getMessage());
                     }
                     break;
diff --git a/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java b/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java
index 1caaf68153b..b76848e4bb1 100644
--- a/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java
+++ b/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 import tests.Helper;
 import tests.JImageGenerator;
 
@@ -32,12 +34,12 @@ import tests.JImageGenerator;
  * @summary Tests whether a custom Hijrah configuration properties file works correctly
  * @bug 8187987
  * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library /tools/lib
+ * @library /tools/lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
- * @build HijrahConfigCheck tests.*
+ * @build HijrahConfigCheck tests.* jdk.test.lib.compiler.CompilerUtils jdk.test.lib.process.ProcessTools
  * @run main/othervm -Xmx1g HijrahConfigTest
  */
 public class HijrahConfigTest {
@@ -66,13 +68,7 @@ public class HijrahConfigTest {
 
         // Run tests
         Path launcher = outputPath.resolve("bin").resolve("java");
-        ProcessBuilder builder = new ProcessBuilder(
-                launcher.toAbsolutePath().toString(), "-ea", "-esa", "HijrahConfigCheck");
-        Process p = builder.inheritIO().start();
-        p.waitFor();
-        int exitValue = p.exitValue();
-        if (exitValue != 0) {
-            throw new RuntimeException("HijrahConfigTest failed. Exit value: " + exitValue);
-        }
+        OutputAnalyzer analyzer =  ProcessTools.executeCommand(launcher.toAbsolutePath().toString(), "-ea", "-esa", "HijrahConfigCheck");
+        analyzer.shouldHaveExitValue(0);
     }
 }
diff --git a/test/jdk/javax/naming/spi/providers/InitialContextTest.java b/test/jdk/javax/naming/spi/providers/InitialContextTest.java
index 054365878a1..f1858586d17 100644
--- a/test/jdk/javax/naming/spi/providers/InitialContextTest.java
+++ b/test/jdk/javax/naming/spi/providers/InitialContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,23 +21,38 @@
  * questions.
  */
 
-import javax.naming.Context;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.SequenceInputStream;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static java.lang.String.format;
+import javax.naming.Context;
+
 import static java.util.Arrays.asList;
 import static java.util.Collections.singleton;
 import static java.util.Collections.singletonMap;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 /*
  * @test
@@ -45,6 +60,9 @@ import static java.util.Collections.singletonMap;
  * @summary Examines different ways JNDI providers can hook up themselves and
  *          become available. Each case mimics the most straightforward way of
  *          executing scenarios.
+ * @library /test/lib
+ * @build jdk.test.lib.process.ProcessTools
+ * @run main InitialContextTest
  */
 public class InitialContextTest {
 
@@ -243,9 +261,13 @@ public class InitialContextTest {
 
     private static void jar(Path jarName, Path jarRoot) {
         String jar = getJDKTool("jar");
-        ProcessBuilder p = new ProcessBuilder(jar, "cf", jarName.toString(),
-                "-C", jarRoot.toString(), ".");
-        quickFail(run(p));
+        String [] commands = {jar, "cf", jarName.toString(),"-C", jarRoot.toString(), "."};
+        try {
+            OutputAnalyzer outputAnalyzer = ProcessTools.executeCommand(commands);
+            outputAnalyzer.shouldHaveExitValue(0);
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
     }
 
     private static void javac(Path compilationOutput, Path... sourceFiles) {
@@ -256,22 +278,18 @@ public class InitialContextTest {
         commands.addAll(paths.stream()
                 .map(Path::toString)
                 .collect(Collectors.toList()));
-        quickFail(run(new ProcessBuilder(commands)));
-    }
-
-    private static void quickFail(Result r) {
-        if (r.exitValue != 0)
-            throw new RuntimeException(r.output);
+        try {
+            OutputAnalyzer outputAnalyzer = ProcessTools.executeCommand(commands.toArray(new String[commands.size()]));
+            outputAnalyzer.shouldHaveExitValue(0);
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
     }
 
     private static Result java(Map<String, String> properties,
                                Collection<Path> classpath,
                                String classname) {
-
-        String java = getJDKTool("java");
-
         List<String> commands = new ArrayList<>();
-        commands.add(java);
         commands.addAll(properties.entrySet()
                 .stream()
                 .map(e -> "-D" + e.getKey() + "=" + e.getValue())
@@ -283,35 +301,14 @@ public class InitialContextTest {
         commands.add("-cp");
         commands.add(cp);
         commands.add(classname);
-
-        return run(new ProcessBuilder(commands));
-    }
-
-    private static Result run(ProcessBuilder b) {
-        Process p = null;
-        try {
-            p = b.start();
-        } catch (IOException e) {
-            throw new RuntimeException(
-                    format("Couldn't start process '%s'", b.command()), e);
-        }
-
-        String output;
-        try {
-            output = toString(p.getInputStream(), p.getErrorStream());
-        } catch (IOException e) {
-            throw new RuntimeException(
-                    format("Couldn't read process output '%s'", b.command()), e);
-        }
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(commands);
 
         try {
-            p.waitFor();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(
-                    format("Process hasn't finished '%s'", b.command()), e);
+            OutputAnalyzer outputAnalyzer = ProcessTools.executeProcess(pb);
+            return new Result(outputAnalyzer.getExitValue(), outputAnalyzer.getOutput());
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
         }
-
-        return new Result(p.exitValue(), output);
     }
 
     private static String getJDKTool(String name) {
diff --git a/test/jdk/sun/misc/EscapePath.java b/test/jdk/sun/misc/EscapePath.java
index ced4fc54475..bbe7e62db5a 100644
--- a/test/jdk/sun/misc/EscapePath.java
+++ b/test/jdk/sun/misc/EscapePath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,19 @@
 /* @test
  * @bug 4359123
  * @summary  Test loading of classes with # in the path
+ * @library /test/lib
+ * @build jdk.test.lib.process.ProcessTools
+ * @run main EscapePath
  */
-import java.io.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 public class EscapePath {
 
@@ -75,14 +86,19 @@ public class EscapePath {
         fos.close();
     }
 
-    private static void invokeJava() throws Exception {
-        String command = System.getProperty("java.home") +
-                         File.separator + "bin" + File.separator +
-                         "java -classpath " + "a#b/ Hello";
-        Process p = Runtime.getRuntime().exec(command);
-        p.waitFor();
-        int result = p.exitValue();
-        if (result != 0)
-            throw new RuntimeException("Path encoding failure.");
+    private static void invokeJava() {
+        List<String> commands = new ArrayList<>();
+
+        commands.add("-classpath");
+        commands.add("a#b");
+        commands.add("Hello");
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(commands);
+
+        try {
+            OutputAnalyzer outputAnalyzer = ProcessTools.executeProcess(pb);
+            outputAnalyzer.shouldHaveExitValue(0);
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
     }
 }

From 16061874ffdd1b018fe1cad7e6d8ba8bdbdbbee1 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 11 Apr 2024 14:15:34 +0000
Subject: [PATCH 009/486] 8326947: Minimize MakeBase.gmk

Reviewed-by: erikj
---
 make/Bundles.gmk                              |   5 +-
 make/CompileDemos.gmk                         |   2 +
 make/CompileInterimLangtools.gmk              |   2 +
 make/CompileToolsJdk.gmk                      |   2 +
 make/CopyImportModules.gmk                    |   2 +
 make/CopyInterimTZDB.gmk                      |   2 +
 make/CreateJmods.gmk                          |   2 +
 make/Docs.gmk                                 |   2 +
 make/GenerateLinkOptData.gmk                  |   2 +
 make/GraalBuilderImage.gmk                    |   2 +
 make/Images.gmk                               |   2 +
 make/InitSupport.gmk                          |  25 ++
 make/JrtfsJar.gmk                             |   2 +
 make/MacBundles.gmk                           |   2 +
 make/ModuleWrapper.gmk                        |   2 +
 make/SourceRevision.gmk                       |  12 +-
 make/StaticLibsImage.gmk                      |   2 +
 make/autoconf/spec.gmk.template               |   4 +
 make/common/FileUtils.gmk                     | 303 +++++++++++++++++
 make/common/JarArchive.gmk                    |   4 +-
 make/common/JavaCompilation.gmk               |   4 +-
 make/common/MakeBase.gmk                      | 289 +---------------
 make/common/MakeIO.gmk                        |  29 --
 make/common/NativeCompilation.gmk             |   1 +
 make/common/Utils.gmk                         | 321 +++++++++---------
 make/common/modules/CopyCommon.gmk            |   2 +
 make/common/modules/LauncherCommon.gmk        |   1 +
 make/hotspot/CopyToExplodedJdk.gmk            |   2 +
 make/hotspot/gensrc/GensrcJvmti.gmk           |   2 +
 make/hotspot/lib/CompileJvm.gmk               |   2 +
 make/hotspot/test/GtestImage.gmk              |   2 +
 make/modules/java.base/Lib.gmk                |   1 +
 .../java.desktop/lib/Awt2dLibraries.gmk       |   2 +
 make/modules/jdk.compiler/Gendata.gmk         |   1 +
 make/test/BuildFailureHandler.gmk             |   2 +
 make/test/BuildJtregTestThreadFactory.gmk     |   2 +
 make/test/BuildMicrobenchmark.gmk             |   2 +
 make/test/BuildTestLib.gmk                    |   2 +
 make/test/BuildTestLibNative.gmk              |   2 +
 make/test/JtregNativeHotspot.gmk              |   2 +
 make/test/JtregNativeJdk.gmk                  |   2 +
 make/test/JtregNativeLibTest.gmk              |   2 +
 test/make/TestCopyFiles.gmk                   |   3 +-
 43 files changed, 577 insertions(+), 482 deletions(-)
 create mode 100644 make/common/FileUtils.gmk

diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index 33d51d3f613..0901e415a8a 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+include CopyFiles.gmk
+include MakeIO.gmk
+
 PRODUCT_TARGETS :=
 LEGACY_TARGETS :=
 TEST_TARGETS :=
diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
index 3aee428602d..9339250c4fb 100644
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -31,6 +31,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include JavaCompilation.gmk
 include TextFileProcessing.gmk
 include ZipArchive.gmk
diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk
index 990ec06aca2..1a8b6382f81 100644
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@@ -28,6 +28,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include JavaCompilation.gmk
 include Modules.gmk
 
diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
index 13101c7cccf..50ffe73a096 100644
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -27,6 +27,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include JavaCompilation.gmk
 include TextFileProcessing.gmk
 
diff --git a/make/CopyImportModules.gmk b/make/CopyImportModules.gmk
index 34baaf9d37b..52515ebd314 100644
--- a/make/CopyImportModules.gmk
+++ b/make/CopyImportModules.gmk
@@ -31,6 +31,8 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+include CopyFiles.gmk
+
 LIBS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_LIBS)))
 CMDS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CMDS)))
 CONF_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CONF)))
diff --git a/make/CopyInterimTZDB.gmk b/make/CopyInterimTZDB.gmk
index 6ce41865e2c..ac390580aa9 100644
--- a/make/CopyInterimTZDB.gmk
+++ b/make/CopyInterimTZDB.gmk
@@ -28,6 +28,8 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+include CopyFiles.gmk
+
 ##########################################################################################
 
 ### TZDB tool needs files from java.time.zone package
diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index d1e83c8c8e0..fd36554358b 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -27,6 +27,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include Execute.gmk
 include Modules.gmk
 
diff --git a/make/Docs.gmk b/make/Docs.gmk
index d0c01f0283d..2977f6f66f9 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -26,6 +26,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include Execute.gmk
 include Modules.gmk
 include ModuleTools.gmk
diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index 5dd766c8c07..e7d6962fb79 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -31,6 +31,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include JavaCompilation.gmk
 
 ################################################################################
diff --git a/make/GraalBuilderImage.gmk b/make/GraalBuilderImage.gmk
index 8c4d66aa9d5..7fa90c66019 100644
--- a/make/GraalBuilderImage.gmk
+++ b/make/GraalBuilderImage.gmk
@@ -31,6 +31,8 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+include CopyFiles.gmk
+
 ################################################################################
 
 TARGETS :=
diff --git a/make/Images.gmk b/make/Images.gmk
index 3048eb3eda9..bfad1ad563c 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -27,6 +27,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include Execute.gmk
 include Modules.gmk
 include Utils.gmk
diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk
index 2bdab7f907d..c59e685bf4f 100644
--- a/make/InitSupport.gmk
+++ b/make/InitSupport.gmk
@@ -536,6 +536,31 @@ else # $(HAS_SPEC)=true
     endef
   endif
 
+  ##############################################################################
+  # Functions for timers
+  ##############################################################################
+
+  # Store the build times in this directory.
+  BUILDTIMESDIR=$(OUTPUTDIR)/make-support/build-times
+
+  # Record starting time for build of a sub repository.
+  define RecordStartTime
+	$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$(strip $1) && \
+	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$(strip $1)_human_readable
+  endef
+
+  # Record ending time and calculate the difference and store it in a
+  # easy to read format. Handles builds that cross midnight. Expects
+  # that a build will never take 24 hours or more.
+  define RecordEndTime
+	$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)
+	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)_human_readable
+	$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$(strip $1)` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$(strip $1)` $1 | \
+	    $(AWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
+	    M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
+	    > $(BUILDTIMESDIR)/build_time_diff_$(strip $1)
+  endef
+
   define StartGlobalTimer
 	$(RM) -r $(BUILDTIMESDIR) 2> /dev/null && \
 	$(MKDIR) -p $(BUILDTIMESDIR) && \
diff --git a/make/JrtfsJar.gmk b/make/JrtfsJar.gmk
index b0b7ed6ce08..990c8a7e1ed 100644
--- a/make/JrtfsJar.gmk
+++ b/make/JrtfsJar.gmk
@@ -27,6 +27,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include JavaCompilation.gmk
 include JarArchive.gmk
 include TextFileProcessing.gmk
diff --git a/make/MacBundles.gmk b/make/MacBundles.gmk
index 39da6c9cdb3..8ed6476c506 100644
--- a/make/MacBundles.gmk
+++ b/make/MacBundles.gmk
@@ -25,6 +25,8 @@
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include TextFileProcessing.gmk
 
 default: bundles
diff --git a/make/ModuleWrapper.gmk b/make/ModuleWrapper.gmk
index d83af819a9b..14298d25a53 100644
--- a/make/ModuleWrapper.gmk
+++ b/make/ModuleWrapper.gmk
@@ -35,6 +35,8 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+include CopyFiles.gmk
+
 MODULE_SRC := $(TOPDIR)/src/$(MODULE)
 
 # All makefiles should add the targets to be built to this variable.
diff --git a/make/SourceRevision.gmk b/make/SourceRevision.gmk
index 9a47ae456e2..63bbe5b62fb 100644
--- a/make/SourceRevision.gmk
+++ b/make/SourceRevision.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, 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
@@ -41,6 +41,16 @@ $(eval $(call IncludeCustomExtension, SourceRevision-pre.gmk))
 
 STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev
 
+# Locate all sourcecode repositories included in the forest, as absolute paths
+FindAllReposAbs = \
+    $(strip $(sort $(dir $(filter-out $(TOPDIR)/build/%, $(wildcard \
+        $(addprefix $(TOPDIR)/, .git */.git */*/.git */*/*/.git */*/*/*/.git) \
+    )))))
+
+# Locate all sourcecode repositories included in the forest, as relative paths
+FindAllReposRel = \
+    $(strip $(subst $(TOPDIR)/,.,$(patsubst $(TOPDIR)/%/, %, $(FindAllReposAbs))))
+
 USE_SCM := false
 ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
   USE_SCM := true
diff --git a/make/StaticLibsImage.gmk b/make/StaticLibsImage.gmk
index 44a4ba56782..84e97b13b29 100644
--- a/make/StaticLibsImage.gmk
+++ b/make/StaticLibsImage.gmk
@@ -30,6 +30,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include Modules.gmk
 
 ALL_MODULES = $(call FindAllModules)
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index e90d9aabf04..2f2525a662a 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -677,6 +677,10 @@ BUILD_JAR = @FIXPATH@ $(BUILD_JDK)/bin/jar
 
 DOCS_REFERENCE_JAVADOC := @DOCS_REFERENCE_JAVADOC@
 
+# A file containing a way to uniquely identify the source code revision that
+# the build was created from
+SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
+
 # Interim langtools modules and arguments
 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
diff --git a/make/common/FileUtils.gmk b/make/common/FileUtils.gmk
new file mode 100644
index 00000000000..114f3adefbe
--- /dev/null
+++ b/make/common/FileUtils.gmk
@@ -0,0 +1,303 @@
+#
+# Copyright (c) 2011, 2024, 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.
+#
+
+ifeq (,$(_MAKEBASE_GMK))
+  $(error You must include MakeBase.gmk prior to including FileUtils.gmk)
+endif
+
+################################################################################
+#
+# Common file utility functions
+#
+################################################################################
+
+################################################################################
+# Replace question marks with space in string. This macro needs to be called on
+# files from FindFiles in case any of them contains space in their file name,
+# since FindFiles replaces space with ?.
+# Param 1 - String to replace in
+DecodeSpace = \
+    $(subst ?,$(SPACE),$(strip $1))
+
+EncodeSpace = \
+    $(subst $(SPACE),?,$(strip $1))
+
+################################################################################
+# Take two paths and return the path of the last common directory.
+# Ex: /foo/bar/baz, /foo/bar/banan -> /foo/bar
+#     foo/bar/baz, /foo/bar -> <empty>
+#
+# The x prefix is used to preserve the presence of the initial slash
+# On Windows paths are treated as case-insensitive
+#
+# $1 - Path to compare
+# $2 - Other path to compare
+FindCommonPathPrefix = \
+    $(call DecodeSpace,$(patsubst x%,%,$(subst $(SPACE),/,$(strip \
+        $(call FindCommonPathPrefixHelper1, \
+            $(subst /,$(SPACE),x$(call EncodeSpace,$(strip $1))), \
+            $(subst /,$(SPACE),x$(call EncodeSpace,$(strip $2)))) \
+    ))))
+
+FindCommonPathPrefixHelper1 = \
+    $(if $(filter $(OPENJDK_TARGET_OS), windows), \
+        $(call FindCommonPathPrefixHelper2,$(call uppercase,$1),$(call uppercase,$2),$1), \
+        $(call FindCommonPathPrefixHelper2,$1,$2,$1))
+
+FindCommonPathPrefixHelper2 = \
+    $(if $(call equals, $(firstword $1), $(firstword $2)), \
+      $(if $(call equals, $(firstword $1),),, \
+        $(firstword $3) \
+        $(call FindCommonPathPrefixHelper2, \
+            $(wordlist 2, $(words $1), $1), \
+            $(wordlist 2, $(words $2), $2), \
+            $(wordlist 2, $(words $3), $3) \
+        ) \
+      ) \
+    )
+
+# Computes the relative path from a directory to a file
+# $1 - File to compute the relative path to
+# $2 - Directory to compute the relative path from
+RelativePath = \
+    $(call DecodeSpace,$(strip $(call RelativePathHelper,$(call EncodeSpace \
+        ,$(strip $1)),$(call EncodeSpace \
+        ,$(strip $2)),$(call EncodeSpace \
+        ,$(call FindCommonPathPrefix,$1,$2)))))
+
+RelativePathHelper = \
+    $(eval $3_prefix_length := $(words $(subst /,$(SPACE),$3))) \
+    $(eval $1_words := $(subst /,$(SPACE),$1)) \
+    $(eval $2_words := $(subst /,$(SPACE),$2)) \
+    $(if $(call equals,$($3_prefix_length),0),, \
+        $(eval $1_words := $(wordlist 2,$(words $($1_words)),$(wordlist \
+            $($3_prefix_length),$(words $($1_words)),$($1_words)))) \
+        $(eval $2_words := $(wordlist 2,$(words $($2_words)),$(wordlist \
+            $($3_prefix_length),$(words $($2_words)),$($2_words)))) \
+    ) \
+    $(eval $1_suffix := $(subst $(SPACE),/,$($1_words))) \
+    $(eval $2_dotdots := $(subst $(SPACE),/,$(foreach d,$($2_words),..))) \
+    $(if $($1_suffix), \
+        $(if $($2_dotdots), $($2_dotdots)/$($1_suffix), $($1_suffix)), \
+        $(if $($2_dotdots), $($2_dotdots), .))
+
+# Make directory for target file. Should handle spaces in filenames. Just
+# calling $(call MakeDir $(@D)) will not work if the directory contains a space
+# and the target file already exists. In that case, the target file will have
+# its wildcard ? resolved and the $(@D) will evaluate each space separated dir
+# part on its own.
+MakeTargetDir = \
+    $(call MakeDir, $(dir $(call EncodeSpace, $@)))
+
+################################################################################
+# All install-file and related macros automatically call DecodeSpace when needed.
+
+ifeq ($(call isTargetOs, macosx), true)
+  # On mac, extended attributes sometimes creep into the source files, which may later
+  # cause the creation of ._* files which confuses testing. Clear these with xattr if
+  # set. Some files get their write permissions removed after being copied to the
+  # output dir. When these are copied again to images, xattr would fail. By only clearing
+  # attributes when they are present, failing on this is avoided.
+  #
+  # If copying a soft link to a directory, need to delete the target first to avoid
+  # weird errors.
+  define install-file
+	$(call MakeTargetDir)
+	$(RM) '$(call DecodeSpace, $@)'
+        # Work around a weirdness with cp on Macosx. When copying a symlink, if
+        # the target of the link is write protected (e.g. 444), cp will add
+        # write permission for the user on the target file (644). Avoid this by
+        # using ln to create a new link instead.
+	if [ -h '$(call DecodeSpace, $<)' ]; then \
+	  $(LN) -s "`$(READLINK) '$(call DecodeSpace, $<)'`" '$(call DecodeSpace, $@)'; \
+	else \
+	  $(CP) -fRP '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'; \
+	fi
+	if [ -n "`$(XATTR) -ls '$(call DecodeSpace, $@)'`" ]; then \
+	  $(XATTR) -cs '$(call DecodeSpace, $@)'; \
+	fi
+  endef
+else
+  define install-file
+	$(call MakeTargetDir)
+	$(CP) -fP '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'
+  endef
+endif
+
+# Variant of install file that does not preserve symlinks
+define install-file-nolink
+	$(call MakeTargetDir)
+	$(CP) -f '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'
+endef
+
+################################################################################
+# link-file-* works similarly to install-file but creates a symlink instead.
+# There are two versions, either creating a relative or an absolute link. Be
+# careful when using this on Windows since the symlink created is only valid in
+# the unix emulation environment.
+# In msys2 we use mklink /J because its ln would perform a deep copy of the target.
+# This inhibits performance and can lead to issues with long paths. With mklink /J
+# relative linking does not work, so we handle the link as absolute path.
+ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys2)
+  define link-file-relative
+	$(call MakeTargetDir)
+	$(RM) '$(call DecodeSpace, $@)'
+	cmd //c "mklink /J $(call FixPath, $(call DecodeSpace, $@)) $(call FixPath, $(call DecodeSpace, $<))"
+  endef
+else
+  define link-file-relative
+	$(call MakeTargetDir)
+	$(RM) '$(call DecodeSpace, $@)'
+	$(LN) -s '$(call DecodeSpace, $(call RelativePath, $<, $(@D)))' '$(call DecodeSpace, $@)'
+  endef
+endif
+
+ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys2)
+  define link-file-absolute
+	$(call MakeTargetDir)
+	$(RM) '$(call DecodeSpace, $@)'
+	cmd //c "mklink /J $(call FixPath, $(call DecodeSpace, $@)) $(call FixPath, $(call DecodeSpace, $<))"
+  endef
+else
+  define link-file-absolute
+	$(call MakeTargetDir)
+	$(RM) '$(call DecodeSpace, $@)'
+	$(LN) -s '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'
+  endef
+endif
+
+################################################################################
+
+# Recursive wildcard function. Walks down directories recursively and matches
+# files with the search patterns. Patterns use standard file wildcards (* and
+# ?).
+#
+# $1 - Directories to start search in
+# $2 - Search patterns
+rwildcard = \
+    $(strip \
+        $(foreach d, \
+          $(patsubst %/,%,$(sort $(dir $(wildcard $(addsuffix /*/*, $(strip $1)))))), \
+          $(call rwildcard,$d,$2) \
+        ) \
+        $(call DoubleDollar, $(wildcard $(foreach p, $2, $(addsuffix /$(strip $p), $(strip $1))))) \
+    )
+
+# Find non directories using recursive wildcard function. This function may
+# be used directly when a small amount of directories is expected to be
+# searched and caching is not expected to be of use.
+#
+# $1 - Directory to start search in
+# $2 - Optional search patterns, defaults to '*'.
+WildcardFindFiles = \
+    $(sort $(strip \
+        $(eval WildcardFindFiles_result := $(call rwildcard,$(patsubst %/,%,$1),$(if $(strip $2),$2,*))) \
+        $(filter-out $(patsubst %/,%,$(sort $(dir $(WildcardFindFiles_result)))), \
+            $(WildcardFindFiles_result) \
+        ) \
+    ))
+
+# Find non directories using the find utility in the shell. Safe to call for
+# non existing directories, or directories containing wildcards.
+#
+# Files containing space will get spaces replaced with ? because GNU Make
+# cannot handle lists of files with space in them. By using ?, make will match
+# the wildcard to space in many situations so we don't need to replace back
+# to space on every use. While not a complete solution it does allow some uses
+# of FindFiles to function with spaces in file names, including for
+# SetupCopyFiles. Unfortunately this does not work for WildcardFindFiles so
+# if files with spaces are anticipated, use ShellFindFiles directly.
+#
+# $1 - Directories to start search in.
+# $2 - Optional search patterns, empty means find everything. Patterns use
+#      standard file wildcards (* and ?) and should not be quoted.
+# $3 - Optional options to find.
+ShellFindFiles = \
+    $(if $(wildcard $1), \
+      $(sort \
+          $(shell $(FIND) $3 $(patsubst %/,%,$(wildcard $1)) \( -type f -o -type l \) \
+              $(if $(strip $2), -a \( -name "$(firstword $2)" \
+              $(foreach p, $(filter-out $(firstword $2), $2), -o -name "$(p)") \)) \
+              | $(TR) ' ' '?' \
+          ) \
+      ) \
+    )
+
+# Find non directories using the method most likely to work best for the
+# current build host
+#
+# $1 - Directory to start search in
+# $2 - Optional search patterns, defaults to '*'.
+ifeq ($(OPENJDK_BUILD_OS)-$(RWILDCARD_WORKS), windows-true)
+  DirectFindFiles = $(WildcardFindFiles)
+else
+  DirectFindFiles = $(ShellFindFiles)
+endif
+
+# Finds files using a cache that is populated by FillFindCache below. If any of
+# the directories given have not been cached, DirectFindFiles is used for
+# everything. Caching is especially useful in Cygwin, where file finds are very
+# costly.
+#
+# $1 - Directories to start search in.
+# $2 - Optional search patterns. If used, no caching is done.
+CacheFindFiles_CACHED_DIRS :=
+CacheFindFiles_CACHED_FILES :=
+CacheFindFiles = \
+    $(if $2, \
+      $(call DirectFindFiles, $1, $2) \
+    , \
+      $(if $(filter-out $(addsuffix /%, $(CacheFindFiles_CACHED_DIRS)) \
+          $(CacheFindFiles_CACHED_DIRS), $1), \
+        $(call DirectFindFiles, $1) \
+      , \
+        $(filter $(addsuffix /%,$(patsubst %/,%,$1)) $1,$(CacheFindFiles_CACHED_FILES)) \
+      ) \
+    )
+
+# Explicitly adds files to the find cache used by CacheFindFiles.
+#
+# $1 - Directories to start search in
+FillFindCache = \
+    $(eval CacheFindFiles_NEW_DIRS := $$(filter-out $$(addsuffix /%,\
+        $$(CacheFindFiles_CACHED_DIRS)) $$(CacheFindFiles_CACHED_DIRS), $1)) \
+    $(if $(CacheFindFiles_NEW_DIRS), \
+      $(eval CacheFindFiles_CACHED_DIRS += $$(patsubst %/,%,$$(CacheFindFiles_NEW_DIRS))) \
+      $(eval CacheFindFiles_CACHED_FILES := $$(sort $$(CacheFindFiles_CACHED_FILES) \
+          $$(call DirectFindFiles, $$(CacheFindFiles_NEW_DIRS)))) \
+    )
+
+# Findfiles is the default macro that should be used to find files in the file
+# system. This function does not always support files with spaces in the names.
+# If files with spaces are anticipated, use ShellFindFiles directly.
+#
+# $1 - Directories to start search in.
+# $2 - Optional search patterns, empty means find everything. Patterns use
+#      standard file wildcards (* and ?) and should not be quoted.
+ifeq ($(DISABLE_CACHE_FIND), true)
+  FindFiles = $(DirectFindFiles)
+else
+  FindFiles = $(CacheFindFiles)
+endif
diff --git a/make/common/JarArchive.gmk b/make/common/JarArchive.gmk
index 684736cb289..25b42186666 100644
--- a/make/common/JarArchive.gmk
+++ b/make/common/JarArchive.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@ ifeq (,$(_MAKEBASE_GMK))
   $(error You must include MakeBase.gmk prior to including JarArchive.gmk)
 endif
 
+include MakeIO.gmk
+
 FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
 
 # Setup make rules for creating a jar archive.
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
index ff7c90e5785..259c1834da3 100644
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@ ifeq (,$(_MAKEBASE_GMK))
   $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
 endif
 
+include MakeIO.gmk
+
 # Java compilation needs SetupJarArchive and/or SetupZipArchive, if we're
 # generating a jar file or a source zip.
 include JarArchive.gmk
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 3858b652ee6..5af1967e54b 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -24,9 +24,10 @@
 #
 
 ################################################################
-#
-# Setup common utility functions.
-#
+# MakeBase provides the core functionality needed and used by all makefiles. It
+# should be included by all makefiles. MakeBase provides essential
+# functionality for named parameter functions, variable dependency, tool
+# execution, logging and fixpath functionality.
 ################################################################
 
 ifndef _MAKEBASE_GMK
@@ -64,9 +65,6 @@ define NEWLINE
 
 endef
 
-# Make sure we have a value (could be overridden on command line by caller)
-CREATING_BUILDJDK ?= false
-
 # Certain features only work in newer version of GNU Make. The build will still
 # function in 3.81, but will be less performant.
 ifeq (4.0, $(firstword $(sort 4.0 $(MAKE_VERSION))))
@@ -75,67 +73,16 @@ ifeq (4.0, $(firstword $(sort 4.0 $(MAKE_VERSION))))
   RWILDCARD_WORKS := true
 endif
 
-
 # For convenience, MakeBase.gmk continues to include these separate files, at
 # least for now.
-
+# Utils.gmk must be included before FileUtils.gmk, since it uses some of the
+# basic utility functions there.
 include $(TOPDIR)/make/common/Utils.gmk
-include $(TOPDIR)/make/common/MakeIO.gmk
-include $(TOPDIR)/make/common/CopyFiles.gmk
+include $(TOPDIR)/make/common/FileUtils.gmk
 
 ################################################################################
-# Functions for timers
-################################################################################
-
-# Store the build times in this directory.
-BUILDTIMESDIR=$(OUTPUTDIR)/make-support/build-times
-
-# Record starting time for build of a sub repository.
-define RecordStartTime
-	$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$(strip $1) && \
-	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$(strip $1)_human_readable
-endef
-
-# Record ending time and calculate the difference and store it in a
-# easy to read format. Handles builds that cross midnight. Expects
-# that a build will never take 24 hours or more.
-define RecordEndTime
-	$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)
-	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)_human_readable
-	$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$(strip $1)` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$(strip $1)` $1 | \
-	    $(AWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
-	    M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
-	    > $(BUILDTIMESDIR)/build_time_diff_$(strip $1)
-endef
-
-# Hook to be called when starting to execute a top-level target
-define TargetEnter
-	$(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
-	$(call RecordStartTime,$(patsubst %-only,%,$@))
-endef
-
-# Hook to be called when finish executing a top-level target
-define TargetExit
-	$(call RecordEndTime,$(patsubst %-only,%,$@))
-	$(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
-endef
-
-################################################################################
-
-# A file containing a way to uniquely identify the source code revision that
-# the build was created from
-SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
-
-# Locate all sourcecode repositories included in the forest, as absolute paths
-FindAllReposAbs = \
-    $(strip $(sort $(dir $(filter-out $(TOPDIR)/build/%, $(wildcard \
-        $(addprefix $(TOPDIR)/, .git */.git */*/.git */*/*/.git */*/*/*/.git) \
-    )))))
-
-# Locate all sourcecode repositories included in the forest, as relative paths
-FindAllReposRel = \
-    $(strip $(subst $(TOPDIR)/,.,$(patsubst $(TOPDIR)/%/, %, $(FindAllReposAbs))))
+# Make sure we have a value (could be overridden on command line by caller)
+CREATING_BUILDJDK ?= false
 
 ################################################################################
 
@@ -237,224 +184,6 @@ define NamedParamsMacroTemplate
   $(call $(0)Body,$(strip $1))
 endef
 
-################################################################################
-# Make directory without forking mkdir if not needed.
-#
-# If a directory with an encoded space is provided, the wildcard function
-# sometimes returns false answers (typically if the dir existed when the
-# makefile was parsed, but was deleted by a previous rule). In that case, always
-# call mkdir regardless of what wildcard says.
-#
-# 1: List of directories to create
-MakeDir = \
-    $(strip \
-        $(eval MakeDir_dirs_to_make := $(strip $(foreach d, $1, \
-          $(if $(findstring ?, $d), '$(call DecodeSpace, $d)', \
-            $(if $(wildcard $d), , $d) \
-          ) \
-        ))) \
-        $(if $(MakeDir_dirs_to_make), $(shell $(MKDIR) -p $(MakeDir_dirs_to_make))) \
-    )
-
-# Make directory for target file. Should handle spaces in filenames. Just
-# calling $(call MakeDir $(@D)) will not work if the directory contains a space
-# and the target file already exists. In that case, the target file will have
-# its wildcard ? resolved and the $(@D) will evaluate each space separated dir
-# part on its own.
-MakeTargetDir = \
-    $(call MakeDir, $(dir $(call EncodeSpace, $@)))
-
-################################################################################
-# All install-file and related macros automatically call DecodeSpace when needed.
-
-ifeq ($(call isTargetOs, macosx), true)
-  # On mac, extended attributes sometimes creep into the source files, which may later
-  # cause the creation of ._* files which confuses testing. Clear these with xattr if
-  # set. Some files get their write permissions removed after being copied to the
-  # output dir. When these are copied again to images, xattr would fail. By only clearing
-  # attributes when they are present, failing on this is avoided.
-  #
-  # If copying a soft link to a directory, need to delete the target first to avoid
-  # weird errors.
-  define install-file
-	$(call MakeTargetDir)
-	$(RM) '$(call DecodeSpace, $@)'
-        # Work around a weirdness with cp on Macosx. When copying a symlink, if
-        # the target of the link is write protected (e.g. 444), cp will add
-        # write permission for the user on the target file (644). Avoid this by
-        # using ln to create a new link instead.
-	if [ -h '$(call DecodeSpace, $<)' ]; then \
-	  $(LN) -s "`$(READLINK) '$(call DecodeSpace, $<)'`" '$(call DecodeSpace, $@)'; \
-	else \
-	  $(CP) -fRP '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'; \
-	fi
-	if [ -n "`$(XATTR) -ls '$(call DecodeSpace, $@)'`" ]; then \
-	  $(XATTR) -cs '$(call DecodeSpace, $@)'; \
-	fi
-  endef
-else
-  define install-file
-	$(call MakeTargetDir)
-	$(CP) -fP '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'
-  endef
-endif
-
-# Variant of install file that does not preserve symlinks
-define install-file-nolink
-	$(call MakeTargetDir)
-	$(CP) -f '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'
-endef
-
-################################################################################
-# link-file-* works similarly to install-file but creates a symlink instead.
-# There are two versions, either creating a relative or an absolute link. Be
-# careful when using this on Windows since the symlink created is only valid in
-# the unix emulation environment.
-# In msys2 we use mklink /J because its ln would perform a deep copy of the target.
-# This inhibits performance and can lead to issues with long paths. With mklink /J
-# relative linking does not work, so we handle the link as absolute path.
-ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys2)
-  define link-file-relative
-	$(call MakeTargetDir)
-	$(RM) '$(call DecodeSpace, $@)'
-	cmd //c "mklink /J $(call FixPath, $(call DecodeSpace, $@)) $(call FixPath, $(call DecodeSpace, $<))"
-  endef
-else
-  define link-file-relative
-	$(call MakeTargetDir)
-	$(RM) '$(call DecodeSpace, $@)'
-	$(LN) -s '$(call DecodeSpace, $(call RelativePath, $<, $(@D)))' '$(call DecodeSpace, $@)'
-  endef
-endif
-
-ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys2)
-  define link-file-absolute
-	$(call MakeTargetDir)
-	$(RM) '$(call DecodeSpace, $@)'
-	cmd //c "mklink /J $(call FixPath, $(call DecodeSpace, $@)) $(call FixPath, $(call DecodeSpace, $<))"
-  endef
-else
-  define link-file-absolute
-	$(call MakeTargetDir)
-	$(RM) '$(call DecodeSpace, $@)'
-	$(LN) -s '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'
-  endef
-endif
-
-################################################################################
-
-# Recursive wildcard function. Walks down directories recursively and matches
-# files with the search patterns. Patterns use standard file wildcards (* and
-# ?).
-#
-# $1 - Directories to start search in
-# $2 - Search patterns
-rwildcard = \
-    $(strip \
-        $(foreach d, \
-          $(patsubst %/,%,$(sort $(dir $(wildcard $(addsuffix /*/*, $(strip $1)))))), \
-          $(call rwildcard,$d,$2) \
-        ) \
-        $(call DoubleDollar, $(wildcard $(foreach p, $2, $(addsuffix /$(strip $p), $(strip $1))))) \
-    )
-
-# Find non directories using recursive wildcard function. This function may
-# be used directly when a small amount of directories is expected to be
-# searched and caching is not expected to be of use.
-#
-# $1 - Directory to start search in
-# $2 - Optional search patterns, defaults to '*'.
-WildcardFindFiles = \
-    $(sort $(strip \
-        $(eval WildcardFindFiles_result := $(call rwildcard,$(patsubst %/,%,$1),$(if $(strip $2),$2,*))) \
-        $(filter-out $(patsubst %/,%,$(sort $(dir $(WildcardFindFiles_result)))), \
-            $(WildcardFindFiles_result) \
-        ) \
-    ))
-
-# Find non directories using the find utility in the shell. Safe to call for
-# non existing directories, or directories containing wildcards.
-#
-# Files containing space will get spaces replaced with ? because GNU Make
-# cannot handle lists of files with space in them. By using ?, make will match
-# the wildcard to space in many situations so we don't need to replace back
-# to space on every use. While not a complete solution it does allow some uses
-# of FindFiles to function with spaces in file names, including for
-# SetupCopyFiles. Unfortunately this does not work for WildcardFindFiles so
-# if files with spaces are anticipated, use ShellFindFiles directly.
-#
-# $1 - Directories to start search in.
-# $2 - Optional search patterns, empty means find everything. Patterns use
-#      standard file wildcards (* and ?) and should not be quoted.
-# $3 - Optional options to find.
-ShellFindFiles = \
-    $(if $(wildcard $1), \
-      $(sort \
-          $(shell $(FIND) $3 $(patsubst %/,%,$(wildcard $1)) \( -type f -o -type l \) \
-              $(if $(strip $2), -a \( -name "$(firstword $2)" \
-              $(foreach p, $(filter-out $(firstword $2), $2), -o -name "$(p)") \)) \
-              | $(TR) ' ' '?' \
-          ) \
-      ) \
-    )
-
-# Find non directories using the method most likely to work best for the
-# current build host
-#
-# $1 - Directory to start search in
-# $2 - Optional search patterns, defaults to '*'.
-ifeq ($(OPENJDK_BUILD_OS)-$(RWILDCARD_WORKS), windows-true)
-  DirectFindFiles = $(WildcardFindFiles)
-else
-  DirectFindFiles = $(ShellFindFiles)
-endif
-
-# Finds files using a cache that is populated by FillFindCache below. If any of
-# the directories given have not been cached, DirectFindFiles is used for
-# everything. Caching is especially useful in Cygwin, where file finds are very
-# costly.
-#
-# $1 - Directories to start search in.
-# $2 - Optional search patterns. If used, no caching is done.
-CacheFindFiles_CACHED_DIRS :=
-CacheFindFiles_CACHED_FILES :=
-CacheFindFiles = \
-    $(if $2, \
-      $(call DirectFindFiles, $1, $2) \
-    , \
-      $(if $(filter-out $(addsuffix /%, $(CacheFindFiles_CACHED_DIRS)) \
-          $(CacheFindFiles_CACHED_DIRS), $1), \
-        $(call DirectFindFiles, $1) \
-      , \
-        $(filter $(addsuffix /%,$(patsubst %/,%,$1)) $1,$(CacheFindFiles_CACHED_FILES)) \
-      ) \
-    )
-
-# Explicitly adds files to the find cache used by CacheFindFiles.
-#
-# $1 - Directories to start search in
-FillFindCache = \
-    $(eval CacheFindFiles_NEW_DIRS := $$(filter-out $$(addsuffix /%,\
-        $$(CacheFindFiles_CACHED_DIRS)) $$(CacheFindFiles_CACHED_DIRS), $1)) \
-    $(if $(CacheFindFiles_NEW_DIRS), \
-      $(eval CacheFindFiles_CACHED_DIRS += $$(patsubst %/,%,$$(CacheFindFiles_NEW_DIRS))) \
-      $(eval CacheFindFiles_CACHED_FILES := $$(sort $$(CacheFindFiles_CACHED_FILES) \
-          $$(call DirectFindFiles, $$(CacheFindFiles_NEW_DIRS)))) \
-    )
-
-# Findfiles is the default macro that should be used to find files in the file
-# system. This function does not always support files with spaces in the names.
-# If files with spaces are anticipated, use ShellFindFiles directly.
-#
-# $1 - Directories to start search in.
-# $2 - Optional search patterns, empty means find everything. Patterns use
-#      standard file wildcards (* and ?) and should not be quoted.
-ifeq ($(DISABLE_CACHE_FIND), true)
-  FindFiles = $(DirectFindFiles)
-else
-  FindFiles = $(CacheFindFiles)
-endif
-
 ################################################################################
 # FixPath
 #
diff --git a/make/common/MakeIO.gmk b/make/common/MakeIO.gmk
index 75a387c34d9..865c5cae2e5 100644
--- a/make/common/MakeIO.gmk
+++ b/make/common/MakeIO.gmk
@@ -241,32 +241,3 @@ else # HAS_FILE_FUNCTION = false
     $$(call ListPathsSafely_IfPrintf,$1,$2,29751,30000)
   endef
 endif # HAS_FILE_FUNCTION
-
-################################################################################
-# Write to and read from file
-
-# Param 1 - File to read
-ReadFile = \
-    $(shell $(CAT) $1)
-
-# Param 1 - Text to write
-# Param 2 - File to write to
-ifeq ($(HAS_FILE_FUNCTION), true)
-  WriteFile = \
-      $(file >$2,$(strip $1))
-else
-  # Use printf to get consistent behavior on all platforms.
-  WriteFile = \
-      $(shell $(PRINTF) "%s\n" $(strip $(call ShellQuote, $1)) > $2)
-endif
-
-# Param 1 - Text to write
-# Param 2 - File to write to
-ifeq ($(HAS_FILE_FUNCTION), true)
-  AppendFile = \
-      $(file >>$2,$(strip $1))
-else
-  # Use printf to get consistent behavior on all platforms.
-  AppendFile = \
-      $(shell $(PRINTF) "%s\n" $(strip $(call ShellQuote, $1)) >> $2)
-endif
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index afae920f755..3f31865c247 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -36,6 +36,7 @@ ifeq ($(_MAKEBASE_GMK), )
   $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
 endif
 
+include MakeIO.gmk
 include native/CompileFile.gmk
 include native/DebugSymbols.gmk
 include native/Flags.gmk
diff --git a/make/common/Utils.gmk b/make/common/Utils.gmk
index 00e73f7dd6c..7f1cbd61f38 100644
--- a/make/common/Utils.gmk
+++ b/make/common/Utils.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,29 +29,34 @@ endif
 
 ################################################################################
 #
-# Common utility functions
+# Basic utility functions available to MakeBase.gmk itself
 #
 ################################################################################
 
-### Debug functions
+# String equals
+equals = \
+    $(if $(strip $1)$(strip $2),$(strip \
+      $(and $(findstring $(strip $1),$(strip $2)),\
+        $(findstring $(strip $2),$(strip $1)))), \
+      true \
+    )
 
-# Prints the name and value of a variable
-PrintVar = \
-    $(info $(strip $1) >$($(strip $1))<)
+# Convert the string given to upper case, without any $(shell)
+# Inspired by http://lists.gnu.org/archive/html/help-make/2013-09/msg00009.html
+uppercase_table := a,A b,B c,C d,D e,E f,F g,G h,H i,I j,J k,K l,L m,M n,N o,O \
+    p,P q,Q r,R s,S t,T u,U v,V w,W x,X y,Y z,Z
 
-################################################################################
-# This macro translates $ into \$ to protect the $ from expansion in the shell.
-# To make this macro resilient against already escaped strings, first remove
-# any present escapes before escaping so that no double escapes are added.
-EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1)))
+uppercase_internal = \
+  $(if $(strip $1), $$(subst $(firstword $1), $(call uppercase_internal, \
+      $(wordlist 2, $(words $1), $1), $2)), $2)
 
-################################################################################
-# This macro works just like EscapeDollar above, but for #.
-EscapeHash = $(subst \#,\\\#,$(subst \\\#,\#,$(strip $1)))
-
-################################################################################
-# This macro translates $ into $$ to protect the string from make itself.
-DoubleDollar = $(subst $$,$$$$,$(strip $1))
+# Convert a string to upper case. Works only on a-z.
+# $1 - The string to convert
+uppercase = \
+  $(strip \
+    $(eval uppercase_result := $(call uppercase_internal, $(uppercase_table), $1)) \
+    $(uppercase_result) \
+  )
 
 ################################################################################
 # Creates a sequence of increasing numbers (inclusive).
@@ -68,23 +73,142 @@ _sequence-do = \
       $(words $(SEQUENCE_COUNT)) \
       $(call _sequence-do,$1))
 
+################################################################################
+# This macro translates $ into \$ to protect the $ from expansion in the shell.
+# To make this macro resilient against already escaped strings, first remove
+# any present escapes before escaping so that no double escapes are added.
+EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1)))
+
+################################################################################
+# This macro works just like EscapeDollar above, but for #.
+EscapeHash = $(subst \#,\\\#,$(subst \\\#,\#,$(strip $1)))
+
+################################################################################
+# This macro translates $ into $$ to protect the string from make itself.
+DoubleDollar = $(subst $$,$$$$,$(strip $1))
+
+################################################################################
+# ShellQuote
+#
+# Quotes a string with single quotes and replaces single quotes with '\'' so
+# that the contents survives being given to the shell.
+ShellQuote = \
+    $(SQUOTE)$(subst $(SQUOTE),$(SQUOTE)\$(SQUOTE)$(SQUOTE),$(strip $1))$(SQUOTE)
+
+################################################################################
+# Write to and read from file
+
+# Param 1 - File to read
+ReadFile = \
+    $(shell $(CAT) $1)
+
+# Param 1 - Text to write
+# Param 2 - File to write to
+ifeq ($(HAS_FILE_FUNCTION), true)
+  WriteFile = \
+      $(file >$2,$(strip $1))
+else
+  # Use printf to get consistent behavior on all platforms.
+  WriteFile = \
+      $(shell $(PRINTF) "%s\n" $(strip $(call ShellQuote, $1)) > $2)
+endif
+
+# Param 1 - Text to write
+# Param 2 - File to write to
+ifeq ($(HAS_FILE_FUNCTION), true)
+  AppendFile = \
+      $(file >>$2,$(strip $1))
+else
+  # Use printf to get consistent behavior on all platforms.
+  AppendFile = \
+      $(shell $(PRINTF) "%s\n" $(strip $(call ShellQuote, $1)) >> $2)
+endif
+
+################################################################################
+# Make directory without forking mkdir if not needed.
+#
+# If a directory with an encoded space is provided, the wildcard function
+# sometimes returns false answers (typically if the dir existed when the
+# makefile was parsed, but was deleted by a previous rule). In that case, always
+# call mkdir regardless of what wildcard says.
+#
+# 1: List of directories to create
+MakeDir = \
+    $(strip \
+        $(eval MakeDir_dirs_to_make := $(strip $(foreach d, $1, \
+          $(if $(findstring ?, $d), '$(call DecodeSpace, $d)', \
+            $(if $(wildcard $d), , $d) \
+          ) \
+        ))) \
+        $(if $(MakeDir_dirs_to_make), $(shell $(MKDIR) -p $(MakeDir_dirs_to_make))) \
+    )
+
+################################################################################
+# Check if our build or target conforms to certain restrictions. This set of
+# functions all work in similar ways, testing the property that the name
+# implies, so e.g. isTargetCpu test the CPU of the target system.
+#
+# $1 - A property, or a space separated list of properties to test for.
+#
+# Returns true if the actual property matches one of the properties in the list,
+# and false otherwise.
+#
+# Examples: $(call isTargetOs, linux windows) will return true when executed
+# on either linux or windows, and false otherwise.
+# $(call isBuildCpuArch, x86) will return true iff the build CPU Arch is x86.
+
+isTargetOs = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_OS), $1), true, false))
+
+isTargetOsType = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_OS_TYPE), $1), true, false))
+
+isTargetCpu = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_CPU), $1), true, false))
+
+isTargetCpuArch = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_CPU_ARCH), $1), true, false))
+
+isTargetCpuBits = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_CPU_BITS), $1), true, false))
+
+isBuildOs = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_OS), $1), true, false))
+
+isBuildOsType = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_OS_TYPE), $1), true, false))
+
+isBuildOsEnv = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_OS_ENV), $1), true, false))
+
+isBuildCpu = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_CPU), $1), true, false))
+
+isBuildCpuArch = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_CPU_ARCH), $1), true, false))
+
+isCompiler = \
+  $(strip $(if $(filter $(TOOLCHAIN_TYPE), $1), true, false))
+
+################################################################################
+#
+# Common utility functions
+#
+################################################################################
+
+### Debug functions
+
+# Prints the name and value of a variable
+PrintVar = \
+    $(info $(strip $1) >$($(strip $1))<)
+
+
 ################################################################################
 # Strip both arguments. Append the first argument to the second argument. If the
 # first argument is empty, return the empty string.
 IfAppend = \
     $(if $(strip $1),$(strip $1)$(strip $2),)
 
-################################################################################
-# Replace question marks with space in string. This macro needs to be called on
-# files from FindFiles in case any of them contains space in their file name,
-# since FindFiles replaces space with ?.
-# Param 1 - String to replace in
-DecodeSpace = \
-    $(subst ?,$(SPACE),$(strip $1))
-
-EncodeSpace = \
-    $(subst $(SPACE),?,$(strip $1))
-
 ################################################################################
 # Assign a variable only if it is empty
 # Param 1 - Variable to assign
@@ -92,65 +216,6 @@ EncodeSpace = \
 SetIfEmpty = \
     $(if $($(strip $1)),,$(eval $(strip $1) := $2))
 
-################################################################################
-# Take two paths and return the path of the last common directory.
-# Ex: /foo/bar/baz, /foo/bar/banan -> /foo/bar
-#     foo/bar/baz, /foo/bar -> <empty>
-#
-# The x prefix is used to preserve the presence of the initial slash
-# On Windows paths are treated as case-insensitive
-#
-# $1 - Path to compare
-# $2 - Other path to compare
-FindCommonPathPrefix = \
-    $(call DecodeSpace,$(patsubst x%,%,$(subst $(SPACE),/,$(strip \
-        $(call FindCommonPathPrefixHelper1, \
-            $(subst /,$(SPACE),x$(call EncodeSpace,$(strip $1))), \
-            $(subst /,$(SPACE),x$(call EncodeSpace,$(strip $2)))) \
-    ))))
-
-FindCommonPathPrefixHelper1 = \
-    $(if $(filter $(OPENJDK_TARGET_OS), windows), \
-        $(call FindCommonPathPrefixHelper2,$(call uppercase,$1),$(call uppercase,$2),$1), \
-        $(call FindCommonPathPrefixHelper2,$1,$2,$1))
-
-FindCommonPathPrefixHelper2 = \
-    $(if $(call equals, $(firstword $1), $(firstword $2)), \
-      $(if $(call equals, $(firstword $1),),, \
-        $(firstword $3) \
-        $(call FindCommonPathPrefixHelper2, \
-            $(wordlist 2, $(words $1), $1), \
-            $(wordlist 2, $(words $2), $2), \
-            $(wordlist 2, $(words $3), $3) \
-        ) \
-      ) \
-    )
-
-# Computes the relative path from a directory to a file
-# $1 - File to compute the relative path to
-# $2 - Directory to compute the relative path from
-RelativePath = \
-    $(call DecodeSpace,$(strip $(call RelativePathHelper,$(call EncodeSpace \
-        ,$(strip $1)),$(call EncodeSpace \
-        ,$(strip $2)),$(call EncodeSpace \
-        ,$(call FindCommonPathPrefix,$1,$2)))))
-
-RelativePathHelper = \
-    $(eval $3_prefix_length := $(words $(subst /,$(SPACE),$3))) \
-    $(eval $1_words := $(subst /,$(SPACE),$1)) \
-    $(eval $2_words := $(subst /,$(SPACE),$2)) \
-    $(if $(call equals,$($3_prefix_length),0),, \
-        $(eval $1_words := $(wordlist 2,$(words $($1_words)),$(wordlist \
-            $($3_prefix_length),$(words $($1_words)),$($1_words)))) \
-        $(eval $2_words := $(wordlist 2,$(words $($2_words)),$(wordlist \
-            $($3_prefix_length),$(words $($2_words)),$($2_words)))) \
-    ) \
-    $(eval $1_suffix := $(subst $(SPACE),/,$($1_words))) \
-    $(eval $2_dotdots := $(subst $(SPACE),/,$(foreach d,$($2_words),..))) \
-    $(if $($1_suffix), \
-        $(if $($2_dotdots), $($2_dotdots)/$($1_suffix), $($1_suffix)), \
-        $(if $($2_dotdots), $($2_dotdots), .))
-
 ################################################################################
 # Filter out duplicate sub strings while preserving order. Keeps the first occurrence.
 uniq = \
@@ -173,14 +238,6 @@ dups = \
     $(strip $(foreach v, $(sort $1), $(if $(filter-out 1, \
         $(words $(filter $v, $1))), $v)))
 
-# String equals
-equals = \
-    $(if $(strip $1)$(strip $2),$(strip \
-      $(and $(findstring $(strip $1),$(strip $2)),\
-        $(findstring $(strip $2),$(strip $1)))), \
-      true \
-    )
-
 # Remove a whole list of prefixes
 # $1 - List of prefixes
 # $2 - List of elements to process
@@ -188,23 +245,6 @@ remove-prefixes = \
     $(strip $(if $1,$(patsubst $(firstword $1)%,%,\
       $(call remove-prefixes,$(filter-out $(firstword $1),$1),$2)),$2))
 
-# Convert the string given to upper case, without any $(shell)
-# Inspired by http://lists.gnu.org/archive/html/help-make/2013-09/msg00009.html
-uppercase_table := a,A b,B c,C d,D e,E f,F g,G h,H i,I j,J k,K l,L m,M n,N o,O \
-    p,P q,Q r,R s,S t,T u,U v,V w,W x,X y,Y z,Z
-
-uppercase_internal = \
-  $(if $(strip $1), $$(subst $(firstword $1), $(call uppercase_internal, \
-      $(wordlist 2, $(words $1), $1), $2)), $2)
-
-# Convert a string to upper case. Works only on a-z.
-# $1 - The string to convert
-uppercase = \
-  $(strip \
-    $(eval uppercase_result := $(call uppercase_internal, $(uppercase_table), $1)) \
-    $(uppercase_result) \
-  )
-
 ################################################################################
 # Boolean operators.
 
@@ -290,14 +330,6 @@ define ParseKeywordVariableBody
   endif
 endef
 
-################################################################################
-# ShellQuote
-#
-# Quotes a string with single quotes and replaces single quotes with '\'' so
-# that the contents survives being given to the shell.
-ShellQuote = \
-    $(SQUOTE)$(subst $(SQUOTE),$(SQUOTE)\$(SQUOTE)$(SQUOTE),$(strip $1))$(SQUOTE)
-
 ################################################################################
 # Find lib dir for module
 # Param 1 - module name
@@ -329,53 +361,6 @@ check-jvm-variant = \
       $(error Internal error: Invalid variant tested: $1)) \
     $(if $(filter $1, $(JVM_VARIANTS)), true, false))
 
-################################################################################
-# Check if our build or target conforms to certain restrictions. This set of
-# functions all work in similar ways, testing the property that the name
-# implies, so e.g. isTargetCpu test the CPU of the target system.
-#
-# $1 - A property, or a space separated list of properties to test for.
-#
-# Returns true if the actual property matches one of the properties in the list,
-# and false otherwise.
-#
-# Examples: $(call isTargetOs, linux windows) will return true when executed
-# on either linux or windows, and false otherwise.
-# $(call isBuildCpuArch, x86) will return true iff the build CPU Arch is x86.
-
-isTargetOs = \
-  $(strip $(if $(filter $(OPENJDK_TARGET_OS), $1), true, false))
-
-isTargetOsType = \
-  $(strip $(if $(filter $(OPENJDK_TARGET_OS_TYPE), $1), true, false))
-
-isTargetCpu = \
-  $(strip $(if $(filter $(OPENJDK_TARGET_CPU), $1), true, false))
-
-isTargetCpuArch = \
-  $(strip $(if $(filter $(OPENJDK_TARGET_CPU_ARCH), $1), true, false))
-
-isTargetCpuBits = \
-  $(strip $(if $(filter $(OPENJDK_TARGET_CPU_BITS), $1), true, false))
-
-isBuildOs = \
-  $(strip $(if $(filter $(OPENJDK_BUILD_OS), $1), true, false))
-
-isBuildOsType = \
-  $(strip $(if $(filter $(OPENJDK_BUILD_OS_TYPE), $1), true, false))
-
-isBuildOsEnv = \
-  $(strip $(if $(filter $(OPENJDK_BUILD_OS_ENV), $1), true, false))
-
-isBuildCpu = \
-  $(strip $(if $(filter $(OPENJDK_BUILD_CPU), $1), true, false))
-
-isBuildCpuArch = \
-  $(strip $(if $(filter $(OPENJDK_BUILD_CPU_ARCH), $1), true, false))
-
-isCompiler = \
-  $(strip $(if $(filter $(TOOLCHAIN_TYPE), $1), true, false))
-
 ################################################################################
 # Converts a space separated list to a comma separated list.
 #
diff --git a/make/common/modules/CopyCommon.gmk b/make/common/modules/CopyCommon.gmk
index b8cf880d673..75bfb0d62b1 100644
--- a/make/common/modules/CopyCommon.gmk
+++ b/make/common/modules/CopyCommon.gmk
@@ -23,6 +23,8 @@
 # questions.
 #
 
+include CopyFiles.gmk
+
 LIB_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
 CONF_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE)
 LEGAL_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)
diff --git a/make/common/modules/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk
index f072cbfb9bf..a801631a9c9 100644
--- a/make/common/modules/LauncherCommon.gmk
+++ b/make/common/modules/LauncherCommon.gmk
@@ -23,6 +23,7 @@
 # questions.
 #
 
+include CopyFiles.gmk
 include JdkNativeCompilation.gmk
 include Modules.gmk
 include ProcessMarkdown.gmk
diff --git a/make/hotspot/CopyToExplodedJdk.gmk b/make/hotspot/CopyToExplodedJdk.gmk
index d8012f6878f..4462af0dc3b 100644
--- a/make/hotspot/CopyToExplodedJdk.gmk
+++ b/make/hotspot/CopyToExplodedJdk.gmk
@@ -23,6 +23,8 @@
 # questions.
 #
 
+include CopyFiles.gmk
+
 # Copy all built libraries into exploded jdk
 LIB_TARGETS := $(filter $(LIB_OUTPUTDIR)/%, $(TARGETS))
 ifeq ($(call isTargetOs, windows), true)
diff --git a/make/hotspot/gensrc/GensrcJvmti.gmk b/make/hotspot/gensrc/GensrcJvmti.gmk
index b31a6f52292..718766cacae 100644
--- a/make/hotspot/gensrc/GensrcJvmti.gmk
+++ b/make/hotspot/gensrc/GensrcJvmti.gmk
@@ -23,6 +23,8 @@
 # questions.
 #
 
+include CopyFiles.gmk
+
 $(eval $(call IncludeCustomExtension, hotspot/gensrc/GensrcJvmti.gmk))
 
 ################################################################################
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index e887885db2c..47f987092f9 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -23,6 +23,8 @@
 # questions.
 #
 
+include CopyFiles.gmk
+
 # Include support files that will setup compiler flags due to the selected
 # jvm feature set, specific file overrides, and general flags.
 include lib/JvmFeatures.gmk
diff --git a/make/hotspot/test/GtestImage.gmk b/make/hotspot/test/GtestImage.gmk
index 9b2a37962cd..b6256cd575b 100644
--- a/make/hotspot/test/GtestImage.gmk
+++ b/make/hotspot/test/GtestImage.gmk
@@ -28,6 +28,8 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+include CopyFiles.gmk
+
 $(foreach v, $(JVM_VARIANTS), \
   $(eval $(call SetupCopyFiles, COPY_GTEST_$v, \
       SRC := $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/gtest, \
diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
index d09e33d489f..3a24c5e4550 100644
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -23,6 +23,7 @@
 # questions.
 #
 
+include CopyFiles.gmk
 include LibCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
index c30901e1543..868e6fb7a7c 100644
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -23,6 +23,8 @@
 # questions.
 #
 
+include CopyFiles.gmk
+
 LIBAWT_DEFAULT_HEADER_DIRS := \
     common/awt/utility \
     libawt/awt/image \
diff --git a/make/modules/jdk.compiler/Gendata.gmk b/make/modules/jdk.compiler/Gendata.gmk
index e9ff3c439be..32fa70462b2 100644
--- a/make/modules/jdk.compiler/Gendata.gmk
+++ b/make/modules/jdk.compiler/Gendata.gmk
@@ -23,6 +23,7 @@
 # questions.
 #
 
+include CopyFiles.gmk
 include JarArchive.gmk
 include JavaCompilation.gmk
 include Modules.gmk
diff --git a/make/test/BuildFailureHandler.gmk b/make/test/BuildFailureHandler.gmk
index 6c9876f80c7..005cbb330f6 100644
--- a/make/test/BuildFailureHandler.gmk
+++ b/make/test/BuildFailureHandler.gmk
@@ -27,6 +27,8 @@ default: build
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include JavaCompilation.gmk
 
 TARGETS :=
diff --git a/make/test/BuildJtregTestThreadFactory.gmk b/make/test/BuildJtregTestThreadFactory.gmk
index b096ae303ea..aa9808dd584 100644
--- a/make/test/BuildJtregTestThreadFactory.gmk
+++ b/make/test/BuildJtregTestThreadFactory.gmk
@@ -27,6 +27,8 @@ default: build
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include JavaCompilation.gmk
 
 TARGETS :=
diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index ba502a56128..bb1e6111baa 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -28,6 +28,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include JavaCompilation.gmk
 include TestFilesCompilation.gmk
 
diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
index 54c4c61642c..00642a1e7cf 100644
--- a/make/test/BuildTestLib.gmk
+++ b/make/test/BuildTestLib.gmk
@@ -33,6 +33,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include JavaCompilation.gmk
 
 ################################################################################
diff --git a/make/test/BuildTestLibNative.gmk b/make/test/BuildTestLibNative.gmk
index 455936d163f..63dcbbf008b 100644
--- a/make/test/BuildTestLibNative.gmk
+++ b/make/test/BuildTestLibNative.gmk
@@ -33,6 +33,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include TestFilesCompilation.gmk
 
 ################################################################################
diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index 33532f77974..887b530bfca 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -33,6 +33,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include TestFilesCompilation.gmk
 
 $(eval $(call IncludeCustomExtension, test/JtregNativeHotspot.gmk))
diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
index ae830501635..46eeb7684b6 100644
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -33,6 +33,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include TestFilesCompilation.gmk
 
 $(eval $(call IncludeCustomExtension, test/JtregNativeJdk.gmk))
diff --git a/make/test/JtregNativeLibTest.gmk b/make/test/JtregNativeLibTest.gmk
index 7ab45cce878..838d37f8145 100644
--- a/make/test/JtregNativeLibTest.gmk
+++ b/make/test/JtregNativeLibTest.gmk
@@ -33,6 +33,8 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+
+include CopyFiles.gmk
 include TestFilesCompilation.gmk
 
 $(eval $(call IncludeCustomExtension, test/JtregNativeLibTest.gmk))
diff --git a/test/make/TestCopyFiles.gmk b/test/make/TestCopyFiles.gmk
index cbfa1cc003c..cc05f89db23 100644
--- a/test/make/TestCopyFiles.gmk
+++ b/test/make/TestCopyFiles.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+include CopyFiles.gmk
 include UtilsForTests.gmk
 
 THIS_FILE := $(TOPDIR)/test/make/TestCopyFiles.gmk

From 0656f0809208160f83a7dd1ae91d9f09b582ce35 Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Thu, 11 Apr 2024 15:01:41 +0000
Subject: [PATCH 010/486] 8329469: Generational ZGC: Move the methods
 forwarding_[index|find|insert] from zRelocate.cpp to ZForwarding

Reviewed-by: stefank, eosterlund
---
 src/hotspot/share/gc/z/zForwarding.hpp        | 17 ++++++--
 src/hotspot/share/gc/z/zForwarding.inline.hpp | 39 ++++++++++++++---
 src/hotspot/share/gc/z/zRelocate.cpp          | 42 +++----------------
 3 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/src/hotspot/share/gc/z/zForwarding.hpp b/src/hotspot/share/gc/z/zForwarding.hpp
index a99473322d4..ee37508903f 100644
--- a/src/hotspot/share/gc/z/zForwarding.hpp
+++ b/src/hotspot/share/gc/z/zForwarding.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -83,6 +83,14 @@ private:
   ZForwardingEntry first(uintptr_t from_index, ZForwardingCursor* cursor) const;
   ZForwardingEntry next(ZForwardingCursor* cursor) const;
 
+  uintptr_t index(zoffset from_offset);
+
+  ZForwardingEntry find(uintptr_t from_index, ZForwardingCursor* cursor) const;
+  zaddress find(zoffset from_offset, ZForwardingCursor* cursor);
+
+  zoffset insert(uintptr_t from_index, zoffset to_offset, ZForwardingCursor* cursor);
+  zaddress insert(zoffset from_offset, zaddress to_addr, ZForwardingCursor* cursor);
+
   template <typename Function>
   void object_iterate_forwarded_via_livemap(Function function);
 
@@ -140,10 +148,11 @@ public:
   void mark_done();
   bool is_done() const;
 
-  zaddress find(zaddress_unsafe addr);
+  zaddress find(zaddress from_addr, ZForwardingCursor* cursor);
+  zaddress find(zaddress_unsafe from_addr, ZForwardingCursor* cursor);
+  zaddress find(zaddress_unsafe from_addr);
 
-  ZForwardingEntry find(uintptr_t from_index, ZForwardingCursor* cursor) const;
-  zoffset insert(uintptr_t from_index, zoffset to_offset, ZForwardingCursor* cursor);
+  zaddress insert(zaddress from_addr, zaddress to_addr, ZForwardingCursor* cursor);
 
   // Relocated remembered set fields support
   void relocated_remembered_fields_register(volatile zpointer* p);
diff --git a/src/hotspot/share/gc/z/zForwarding.inline.hpp b/src/hotspot/share/gc/z/zForwarding.inline.hpp
index b0cb67a70cd..eb5f4a36161 100644
--- a/src/hotspot/share/gc/z/zForwarding.inline.hpp
+++ b/src/hotspot/share/gc/z/zForwarding.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -218,11 +218,8 @@ inline ZForwardingEntry ZForwarding::next(ZForwardingCursor* cursor) const {
   return at(cursor);
 }
 
-inline zaddress ZForwarding::find(zaddress_unsafe addr) {
-  const uintptr_t from_index = (ZAddress::offset(addr) - start()) >> object_alignment_shift();
-  ZForwardingCursor cursor;
-  const ZForwardingEntry entry = find(from_index, &cursor);
-  return entry.populated() ? ZOffset::address(to_zoffset(entry.to_offset())) : zaddress::null;
+inline uintptr_t ZForwarding::index(zoffset from_offset) {
+  return (from_offset - start()) >> object_alignment_shift();
 }
 
 inline ZForwardingEntry ZForwarding::find(uintptr_t from_index, ZForwardingCursor* cursor) const {
@@ -243,6 +240,25 @@ inline ZForwardingEntry ZForwarding::find(uintptr_t from_index, ZForwardingCurso
   return entry;
 }
 
+inline zaddress ZForwarding::find(zoffset from_offset, ZForwardingCursor* cursor) {
+  const uintptr_t from_index = index(from_offset);
+  const ZForwardingEntry entry = find(from_index, cursor);
+  return entry.populated() ? ZOffset::address(to_zoffset(entry.to_offset())) : zaddress::null;
+}
+
+inline zaddress ZForwarding::find(zaddress from_addr, ZForwardingCursor* cursor) {
+  return find(ZAddress::offset(from_addr), cursor);
+}
+
+inline zaddress ZForwarding::find(zaddress_unsafe from_addr, ZForwardingCursor* cursor) {
+  return find(ZAddress::offset(from_addr), cursor);
+}
+
+inline zaddress ZForwarding::find(zaddress_unsafe from_addr) {
+  ZForwardingCursor cursor;
+  return find(from_addr, &cursor);
+}
+
 inline zoffset ZForwarding::insert(uintptr_t from_index, zoffset to_offset, ZForwardingCursor* cursor) {
   const ZForwardingEntry new_entry(from_index, untype(to_offset));
   const ZForwardingEntry old_entry; // Empty
@@ -271,6 +287,17 @@ inline zoffset ZForwarding::insert(uintptr_t from_index, zoffset to_offset, ZFor
   }
 }
 
+inline zaddress ZForwarding::insert(zoffset from_offset, zaddress to_addr, ZForwardingCursor* cursor) {
+  const uintptr_t from_index = index(from_offset);
+  const zoffset to_offset = ZAddress::offset(to_addr);
+  const zoffset to_offset_final = insert(from_index, to_offset, cursor);
+  return ZOffset::address(to_offset_final);
+}
+
+inline zaddress ZForwarding::insert(zaddress from_addr, zaddress to_addr, ZForwardingCursor* cursor) {
+  return insert(ZAddress::offset(from_addr), to_addr, cursor);
+}
+
 inline void ZForwarding::relocated_remembered_fields_register(volatile zpointer* p) {
   // Invariant: Page is being retained
   assert(ZGeneration::young()->is_phase_mark(), "Only called when");
diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
index 78efa7cdb12..b55a1863bde 100644
--- a/src/hotspot/share/gc/z/zRelocate.cpp
+++ b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -52,35 +52,6 @@
 static const ZStatCriticalPhase ZCriticalPhaseRelocationStall("Relocation Stall");
 static const ZStatSubPhase ZSubPhaseConcurrentRelocateRememberedSetFlipPromotedYoung("Concurrent Relocate Remset FP", ZGenerationId::young);
 
-static uintptr_t forwarding_index(ZForwarding* forwarding, zoffset from_offset) {
-  return (from_offset - forwarding->start()) >> forwarding->object_alignment_shift();
-}
-
-static zaddress forwarding_find(ZForwarding* forwarding, zoffset from_offset, ZForwardingCursor* cursor) {
-  const uintptr_t from_index = forwarding_index(forwarding, from_offset);
-  const ZForwardingEntry entry = forwarding->find(from_index, cursor);
-  return entry.populated() ? ZOffset::address(to_zoffset(entry.to_offset())) : zaddress::null;
-}
-
-static zaddress forwarding_find(ZForwarding* forwarding, zaddress_unsafe from_addr, ZForwardingCursor* cursor) {
-  return forwarding_find(forwarding, ZAddress::offset(from_addr), cursor);
-}
-
-static zaddress forwarding_find(ZForwarding* forwarding, zaddress from_addr, ZForwardingCursor* cursor) {
-  return forwarding_find(forwarding, ZAddress::offset(from_addr), cursor);
-}
-
-static zaddress forwarding_insert(ZForwarding* forwarding, zoffset from_offset, zaddress to_addr, ZForwardingCursor* cursor) {
-  const uintptr_t from_index = forwarding_index(forwarding, from_offset);
-  const zoffset to_offset = ZAddress::offset(to_addr);
-  const zoffset to_offset_final = forwarding->insert(from_index, to_offset, cursor);
-  return ZOffset::address(to_offset_final);
-}
-
-static zaddress forwarding_insert(ZForwarding* forwarding, zaddress from_addr, zaddress to_addr, ZForwardingCursor* cursor) {
-  return forwarding_insert(forwarding, ZAddress::offset(from_addr), to_addr, cursor);
-}
-
 ZRelocateQueue::ZRelocateQueue()
   : _lock(),
     _queue(),
@@ -368,7 +339,7 @@ static zaddress relocate_object_inner(ZForwarding* forwarding, zaddress from_add
   ZUtils::object_copy_disjoint(from_addr, to_addr, size);
 
   // Insert forwarding
-  const zaddress to_addr_final = forwarding_insert(forwarding, from_addr, to_addr, cursor);
+  const zaddress to_addr_final = forwarding->insert(from_addr, to_addr, cursor);
 
   if (to_addr_final != to_addr) {
     // Already relocated, try undo allocation
@@ -382,7 +353,7 @@ zaddress ZRelocate::relocate_object(ZForwarding* forwarding, zaddress_unsafe fro
   ZForwardingCursor cursor;
 
   // Lookup forwarding
-  zaddress to_addr = forwarding_find(forwarding, from_addr, &cursor);
+  zaddress to_addr = forwarding->find(from_addr, &cursor);
   if (!is_null(to_addr)) {
     // Already relocated
     return to_addr;
@@ -409,8 +380,7 @@ zaddress ZRelocate::relocate_object(ZForwarding* forwarding, zaddress_unsafe fro
 }
 
 zaddress ZRelocate::forward_object(ZForwarding* forwarding, zaddress_unsafe from_addr) {
-  ZForwardingCursor cursor;
-  const zaddress to_addr = forwarding_find(forwarding, from_addr, &cursor);
+  const zaddress to_addr = forwarding->find(from_addr);
   assert(!is_null(to_addr), "Should be forwarded: " PTR_FORMAT, untype(from_addr));
   return to_addr;
 }
@@ -626,7 +596,7 @@ private:
 
     // Lookup forwarding
     {
-      const zaddress to_addr = forwarding_find(_forwarding, from_addr, &cursor);
+      const zaddress to_addr = _forwarding->find(from_addr, &cursor);
       if (!is_null(to_addr)) {
         // Already relocated
         increase_other_forwarded(size);
@@ -650,7 +620,7 @@ private:
     }
 
     // Insert forwarding
-    const zaddress to_addr = forwarding_insert(_forwarding, from_addr, allocated_addr, &cursor);
+    const zaddress to_addr = _forwarding->insert(from_addr, allocated_addr, &cursor);
     if (to_addr != allocated_addr) {
       // Already relocated, undo allocation
       _allocator->undo_alloc_object(to_page, to_addr, size);

From 31ee5108e059afae0a3809947adb7b91e19baec6 Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Thu, 11 Apr 2024 15:44:49 +0000
Subject: [PATCH 011/486] 8241503: C2: Share MacroAssembler between mach nodes
 during code emission

Reviewed-by: kvn, mdoerr, amitkumar, lucy
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  232 +--
 src/hotspot/cpu/aarch64/aarch64_vector.ad     |   28 +-
 src/hotspot/cpu/aarch64/aarch64_vector_ad.m4  |   28 +-
 src/hotspot/cpu/aarch64/ad_encode.m4          |    9 +-
 .../cpu/aarch64/compiledIC_aarch64.cpp        |   14 +-
 .../gc/shenandoah/shenandoah_aarch64.ad       |   26 +-
 src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad     |   22 +-
 src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad     |   62 +-
 .../cpu/aarch64/sharedRuntime_aarch64.cpp     |    6 +-
 src/hotspot/cpu/arm/arm.ad                    |  188 +-
 src/hotspot/cpu/arm/compiledIC_arm.cpp        |    8 +-
 src/hotspot/cpu/ppc/compiledIC_ppc.cpp        |   10 +-
 .../cpu/ppc/gc/shenandoah/shenandoah_ppc.ad   |   16 +-
 src/hotspot/cpu/ppc/gc/x/x_ppc.ad             |   32 +-
 src/hotspot/cpu/ppc/gc/z/z_ppc.ad             |   58 +-
 src/hotspot/cpu/ppc/ppc.ad                    |  198 +-
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |    6 +-
 src/hotspot/cpu/riscv/compiledIC_riscv.cpp    |   14 +-
 .../riscv/gc/shenandoah/shenandoah_riscv.ad   |   24 +-
 src/hotspot/cpu/riscv/gc/x/x_riscv.ad         |   20 +-
 src/hotspot/cpu/riscv/gc/z/z_riscv.ad         |   52 +-
 src/hotspot/cpu/riscv/riscv.ad                |  105 +-
 src/hotspot/cpu/riscv/riscv_v.ad              |   18 +-
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp |    6 +-
 src/hotspot/cpu/s390/compiledIC_s390.cpp      |   10 +-
 src/hotspot/cpu/s390/s390.ad                  |  208 +-
 src/hotspot/cpu/x86/assembler_x86.cpp         |   13 +
 .../cpu/x86/c2_intelJccErratum_x86.cpp        |    4 +-
 .../cpu/x86/c2_intelJccErratum_x86.hpp        |    6 +-
 src/hotspot/cpu/x86/compiledIC_x86.cpp        |   10 +-
 .../x86/gc/shenandoah/shenandoah_x86_32.ad    |    4 +-
 .../x86/gc/shenandoah/shenandoah_x86_64.ad    |    8 +-
 .../cpu/x86/gc/x/xBarrierSetAssembler_x86.cpp |    8 +-
 src/hotspot/cpu/x86/gc/x/x_x86_64.ad          |   24 +-
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp |   10 +-
 src/hotspot/cpu/x86/gc/z/z_x86_64.ad          |   46 +-
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp  |    6 +-
 src/hotspot/cpu/x86/x86.ad                    |   27 +-
 src/hotspot/cpu/x86/x86_32.ad                 | 1717 ++++++++---------
 src/hotspot/cpu/x86/x86_64.ad                 |  168 +-
 .../cpu/zero/c2_MacroAssembler_zero.hpp       |   31 +
 src/hotspot/cpu/zero/compiledIC_zero.cpp      |    2 +-
 src/hotspot/share/adlc/adlparse.cpp           |    8 -
 src/hotspot/share/adlc/output_c.cpp           |   19 +-
 src/hotspot/share/adlc/output_h.cpp           |    2 +-
 src/hotspot/share/asm/assembler.hpp           |   19 +-
 src/hotspot/share/code/compiledIC.hpp         |    3 +-
 .../share/jvmci/jvmciCodeInstaller.cpp        |    3 +-
 src/hotspot/share/opto/c2_CodeStubs.cpp       |    9 +-
 src/hotspot/share/opto/c2_CodeStubs.hpp       |    2 +-
 src/hotspot/share/opto/cfgnode.hpp            |    2 +-
 src/hotspot/share/opto/constantTable.cpp      |   46 +-
 src/hotspot/share/opto/constantTable.hpp      |    8 +-
 src/hotspot/share/opto/locknode.hpp           |    2 +-
 src/hotspot/share/opto/machnode.cpp           |    4 +-
 src/hotspot/share/opto/machnode.hpp           |   32 +-
 src/hotspot/share/opto/node.cpp               |    4 +-
 src/hotspot/share/opto/node.hpp               |    6 +-
 src/hotspot/share/opto/output.cpp             |   84 +-
 src/hotspot/share/opto/output.hpp             |    2 +-
 60 files changed, 1713 insertions(+), 2026 deletions(-)
 create mode 100644 src/hotspot/cpu/zero/c2_MacroAssembler_zero.hpp

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 171ce00ae56..2d134475739 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1148,8 +1148,8 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(CodeBuffer &cbuf);
-  static int emit_deopt_handler(CodeBuffer& cbuf);
+  static int emit_exception_handler(C2_MacroAssembler *masm);
+  static int emit_deopt_handler(C2_MacroAssembler* masm);
 
   static uint size_exception_handler() {
     return MacroAssembler::far_codestub_branch_size();
@@ -1602,7 +1602,7 @@ bool needs_acquiring_load_exclusive(const Node *n)
   return true;
 }
 
-#define __ _masm.
+#define __ masm->
 
 // advance declarations for helper functions to convert register
 // indices to register objects
@@ -1657,8 +1657,7 @@ void MachBreakpointNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
+void MachBreakpointNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   __ brk(0);
 }
 
@@ -1674,8 +1673,7 @@ uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
   }
 #endif
 
-  void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc*) const {
-    C2_MacroAssembler _masm(&cbuf);
+  void MachNopNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc*) const {
     for (int i = 0; i < _count; i++) {
       __ nop();
     }
@@ -1697,7 +1695,7 @@ void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, Phase
   ShouldNotReachHere();
 }
 
-void MachConstantBaseNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
+void MachConstantBaseNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const {
   // Empty encoding
 }
 
@@ -1751,9 +1749,8 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
 
   // n.b. frame size includes space for return pc and rfp
   const int framesize = C->output()->frame_size_in_bytes();
@@ -1802,7 +1799,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
         guard = &stub->guard();
       }
       // In the C2 code, we move the non-hot part of nmethod entry barriers out-of-line to a stub.
-      bs->nmethod_entry_barrier(&_masm, slow_path, continuation, guard);
+      bs->nmethod_entry_barrier(masm, slow_path, continuation, guard);
     }
   }
 
@@ -1810,7 +1807,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
     Unimplemented();
   }
 
-  C->output()->set_frame_complete(cbuf.insts_size());
+  C->output()->set_frame_complete(__ offset());
 
   if (C->has_mach_constant_base_node()) {
     // NOTE: We set the table base offset here because users might be
@@ -1864,9 +1861,8 @@ void MachEpilogNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachEpilogNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
   int framesize = C->output()->frame_slots() << LogBytesPerInt;
 
   __ remove_frame(framesize);
@@ -1938,7 +1934,7 @@ static enum RC rc_class(OptoReg::Name reg) {
   return rc_stack;
 }
 
-uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, bool do_size, outputStream *st) const {
+uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *ra_, bool do_size, outputStream *st) const {
   Compile* C = ra_->C;
 
   // Get registers to move.
@@ -1971,8 +1967,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
 
   if (bottom_type()->isa_vect() && !bottom_type()->isa_vectmask()) {
     uint ireg = ideal_reg();
-    if (ireg == Op_VecA && cbuf) {
-      C2_MacroAssembler _masm(cbuf);
+    if (ireg == Op_VecA && masm) {
       int sve_vector_reg_size_in_bytes = Matcher::scalable_vector_reg_size(T_BYTE);
       if (src_lo_rc == rc_stack && dst_lo_rc == rc_stack) {
         // stack->stack
@@ -1991,9 +1986,8 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
       } else {
         ShouldNotReachHere();
       }
-    } else if (cbuf) {
+    } else if (masm) {
       assert(ireg == Op_VecD || ireg == Op_VecX, "must be 64 bit or 128 bit vector");
-      C2_MacroAssembler _masm(cbuf);
       assert((src_lo_rc != rc_int && dst_lo_rc != rc_int), "sanity");
       if (src_lo_rc == rc_stack && dst_lo_rc == rc_stack) {
         // stack->stack
@@ -2020,8 +2014,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
         ShouldNotReachHere();
       }
     }
-  } else if (cbuf) {
-    C2_MacroAssembler _masm(cbuf);
+  } else if (masm) {
     switch (src_lo_rc) {
     case rc_int:
       if (dst_lo_rc == rc_int) {  // gpr --> gpr copy
@@ -2029,7 +2022,6 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
             __ mov(as_Register(Matcher::_regEncode[dst_lo]),
                    as_Register(Matcher::_regEncode[src_lo]));
         } else {
-            C2_MacroAssembler _masm(cbuf);
             __ movw(as_Register(Matcher::_regEncode[dst_lo]),
                     as_Register(Matcher::_regEncode[src_lo]));
         }
@@ -2157,8 +2149,8 @@ void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  implementation(&cbuf, ra_, false, nullptr);
+void MachSpillCopyNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  implementation(masm, ra_, false, nullptr);
 }
 
 uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
@@ -2176,9 +2168,7 @@ void BoxLockNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void BoxLockNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
-
+void BoxLockNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
   int reg    = ra_->get_encode(this);
 
@@ -2217,10 +2207,8 @@ void MachUEPNode::format(PhaseRegAlloc* ra_, outputStream* st) const
 }
 #endif
 
-void MachUEPNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
+void MachUEPNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const
 {
-  // This is the unverified entry point.
-  C2_MacroAssembler _masm(&cbuf);
   __ ic_check(InteriorEntryAlignment);
 }
 
@@ -2234,13 +2222,12 @@ uint MachUEPNode::size(PhaseRegAlloc* ra_) const
 //=============================================================================
 
 // Emit exception handler code.
-int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf)
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm)
 {
   // mov rscratch1 #exception_blob_entry_point
   // br rscratch1
   // Note that the code buffer's insts_mark is always relative to insts.
   // That's why we must use the macroassembler to generate a handler.
-  C2_MacroAssembler _masm(&cbuf);
   address base = __ start_a_stub(size_exception_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -2254,11 +2241,10 @@ int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf)
 }
 
 // Emit deopt handler code.
-int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf)
+int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
 {
   // Note that the code buffer's insts_mark is always relative to insts.
   // That's why we must use the macroassembler to generate a handler.
-  C2_MacroAssembler _masm(&cbuf);
   address base = __ start_a_stub(size_deopt_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -2677,7 +2663,6 @@ bool Matcher::pd_clone_address_expressions(AddPNode* m, Matcher::MStack& mstack,
 }
 
 #define MOV_VOLATILE(REG, BASE, INDEX, SCALE, DISP, SCRATCH, INSN)      \
-  C2_MacroAssembler _masm(&cbuf);                                       \
   {                                                                     \
     guarantee(INDEX == -1, "mode not permitted for volatile");          \
     guarantee(DISP == 0, "mode not permitted for volatile");            \
@@ -2722,7 +2707,7 @@ typedef void (MacroAssembler::* mem_vector_insn)(FloatRegister Rt,
   // Used for all non-volatile memory accesses.  The use of
   // $mem->opcode() to discover whether this pattern uses sign-extended
   // offsets is something of a kludge.
-  static void loadStore(C2_MacroAssembler masm, mem_insn insn,
+  static void loadStore(C2_MacroAssembler* masm, mem_insn insn,
                         Register reg, int opcode,
                         Register base, int index, int scale, int disp,
                         int size_in_memory)
@@ -2732,12 +2717,12 @@ typedef void (MacroAssembler::* mem_vector_insn)(FloatRegister Rt,
       /* Fix up any out-of-range offsets. */
       assert_different_registers(rscratch1, base);
       assert_different_registers(rscratch1, reg);
-      addr = masm.legitimize_address(addr, size_in_memory, rscratch1);
+      addr = __ legitimize_address(addr, size_in_memory, rscratch1);
     }
-    (masm.*insn)(reg, addr);
+    (masm->*insn)(reg, addr);
   }
 
-  static void loadStore(C2_MacroAssembler masm, mem_float_insn insn,
+  static void loadStore(C2_MacroAssembler* masm, mem_float_insn insn,
                         FloatRegister reg, int opcode,
                         Register base, int index, int size, int disp,
                         int size_in_memory)
@@ -2760,23 +2745,23 @@ typedef void (MacroAssembler::* mem_vector_insn)(FloatRegister Rt,
       /* Fix up any out-of-range offsets. */
       assert_different_registers(rscratch1, base);
       Address addr = Address(base, disp);
-      addr = masm.legitimize_address(addr, size_in_memory, rscratch1);
-      (masm.*insn)(reg, addr);
+      addr = __ legitimize_address(addr, size_in_memory, rscratch1);
+      (masm->*insn)(reg, addr);
     } else {
       assert(disp == 0, "unsupported address mode: disp = %d", disp);
-      (masm.*insn)(reg, Address(base, as_Register(index), scale));
+      (masm->*insn)(reg, Address(base, as_Register(index), scale));
     }
   }
 
-  static void loadStore(C2_MacroAssembler masm, mem_vector_insn insn,
+  static void loadStore(C2_MacroAssembler* masm, mem_vector_insn insn,
                         FloatRegister reg, MacroAssembler::SIMD_RegVariant T,
                         int opcode, Register base, int index, int size, int disp)
   {
     if (index == -1) {
-      (masm.*insn)(reg, T, Address(base, disp));
+      (masm->*insn)(reg, T, Address(base, disp));
     } else {
       assert(disp == 0, "unsupported address mode");
-      (masm.*insn)(reg, T, Address(base, as_Register(index), Address::lsl(size)));
+      (masm->*insn)(reg, T, Address(base, as_Register(index), Address::lsl(size)));
     }
   }
 
@@ -2821,7 +2806,6 @@ encode %{
 
   // catch all for unimplemented encodings
   enc_class enc_unimplemented %{
-    C2_MacroAssembler _masm(&cbuf);
     __ unimplemented("C2 catch all");
   %}
 
@@ -2831,7 +2815,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrsbw(iRegI dst, memory1 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrsbw, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrsbw, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 1);
   %}
 
@@ -2839,7 +2823,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrsb(iRegI dst, memory1 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrsb, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrsb, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 1);
   %}
 
@@ -2847,7 +2831,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrb(iRegI dst, memory1 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrb, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrb, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 1);
   %}
 
@@ -2855,7 +2839,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrb(iRegL dst, memory1 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrb, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrb, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 1);
   %}
 
@@ -2863,7 +2847,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrshw(iRegI dst, memory2 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrshw, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrshw, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 2);
   %}
 
@@ -2871,7 +2855,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrsh(iRegI dst, memory2 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrsh, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrsh, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 2);
   %}
 
@@ -2879,7 +2863,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrh(iRegI dst, memory2 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrh, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrh, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 2);
   %}
 
@@ -2887,7 +2871,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrh(iRegL dst, memory2 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrh, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrh, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 2);
   %}
 
@@ -2895,7 +2879,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrw(iRegI dst, memory4 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrw, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrw, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
   %}
 
@@ -2903,7 +2887,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrw(iRegL dst, memory4 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrw, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrw, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
   %}
 
@@ -2911,7 +2895,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrsw(iRegL dst, memory4 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrsw, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrsw, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
   %}
 
@@ -2919,7 +2903,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldr(iRegL dst, memory8 mem) %{
     Register dst_reg = as_Register($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldr, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldr, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 8);
   %}
 
@@ -2927,7 +2911,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrs(vRegF dst, memory4 mem) %{
     FloatRegister dst_reg = as_FloatRegister($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrs, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrs, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
   %}
 
@@ -2935,7 +2919,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_ldrd(vRegD dst, memory8 mem) %{
     FloatRegister dst_reg = as_FloatRegister($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrd, dst_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrd, dst_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 8);
   %}
 
@@ -2943,15 +2927,14 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strb(iRegI src, memory1 mem) %{
     Register src_reg = as_Register($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::strb, src_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::strb, src_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 1);
   %}
 
   // This encoding class is generated automatically from ad_encode.m4.
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strb0(memory1 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
-    loadStore(_masm, &MacroAssembler::strb, zr, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::strb, zr, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 1);
   %}
 
@@ -2959,15 +2942,14 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strh(iRegI src, memory2 mem) %{
     Register src_reg = as_Register($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::strh, src_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::strh, src_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 2);
   %}
 
   // This encoding class is generated automatically from ad_encode.m4.
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strh0(memory2 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
-    loadStore(_masm, &MacroAssembler::strh, zr, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::strh, zr, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 2);
   %}
 
@@ -2975,15 +2957,14 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strw(iRegI src, memory4 mem) %{
     Register src_reg = as_Register($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::strw, src_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::strw, src_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
   %}
 
   // This encoding class is generated automatically from ad_encode.m4.
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strw0(memory4 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
-    loadStore(_masm, &MacroAssembler::strw, zr, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::strw, zr, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
   %}
 
@@ -2994,20 +2975,18 @@ encode %{
     // we sometimes get asked to store the stack pointer into the
     // current thread -- we cannot do that directly on AArch64
     if (src_reg == r31_sp) {
-      C2_MacroAssembler _masm(&cbuf);
       assert(as_Register($mem$$base) == rthread, "unexpected store for sp");
       __ mov(rscratch2, sp);
       src_reg = rscratch2;
     }
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::str, src_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::str, src_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 8);
   %}
 
   // This encoding class is generated automatically from ad_encode.m4.
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_str0(memory8 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
-    loadStore(_masm, &MacroAssembler::str, zr, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::str, zr, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 8);
   %}
 
@@ -3015,7 +2994,7 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strs(vRegF src, memory4 mem) %{
     FloatRegister src_reg = as_FloatRegister($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::strs, src_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::strs, src_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
   %}
 
@@ -3023,16 +3002,15 @@ encode %{
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strd(vRegD src, memory8 mem) %{
     FloatRegister src_reg = as_FloatRegister($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::strd, src_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::strd, src_reg, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 8);
   %}
 
   // This encoding class is generated automatically from ad_encode.m4.
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strb0_ordered(memory4 mem) %{
-      C2_MacroAssembler _masm(&cbuf);
       __ membar(Assembler::StoreStore);
-      loadStore(_masm, &MacroAssembler::strb, zr, $mem->opcode(),
+      loadStore(masm, &MacroAssembler::strb, zr, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 1);
   %}
 
@@ -3041,49 +3019,49 @@ encode %{
   // Vector loads and stores
   enc_class aarch64_enc_ldrvH(vReg dst, memory mem) %{
     FloatRegister dst_reg = as_FloatRegister($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldr, dst_reg, MacroAssembler::H,
+    loadStore(masm, &MacroAssembler::ldr, dst_reg, MacroAssembler::H,
        $mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
 
   enc_class aarch64_enc_ldrvS(vReg dst, memory mem) %{
     FloatRegister dst_reg = as_FloatRegister($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldr, dst_reg, MacroAssembler::S,
+    loadStore(masm, &MacroAssembler::ldr, dst_reg, MacroAssembler::S,
        $mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
 
   enc_class aarch64_enc_ldrvD(vReg dst, memory mem) %{
     FloatRegister dst_reg = as_FloatRegister($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldr, dst_reg, MacroAssembler::D,
+    loadStore(masm, &MacroAssembler::ldr, dst_reg, MacroAssembler::D,
        $mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
 
   enc_class aarch64_enc_ldrvQ(vReg dst, memory mem) %{
     FloatRegister dst_reg = as_FloatRegister($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldr, dst_reg, MacroAssembler::Q,
+    loadStore(masm, &MacroAssembler::ldr, dst_reg, MacroAssembler::Q,
        $mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
 
   enc_class aarch64_enc_strvH(vReg src, memory mem) %{
     FloatRegister src_reg = as_FloatRegister($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::str, src_reg, MacroAssembler::H,
+    loadStore(masm, &MacroAssembler::str, src_reg, MacroAssembler::H,
        $mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
 
   enc_class aarch64_enc_strvS(vReg src, memory mem) %{
     FloatRegister src_reg = as_FloatRegister($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::str, src_reg, MacroAssembler::S,
+    loadStore(masm, &MacroAssembler::str, src_reg, MacroAssembler::S,
        $mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
 
   enc_class aarch64_enc_strvD(vReg src, memory mem) %{
     FloatRegister src_reg = as_FloatRegister($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::str, src_reg, MacroAssembler::D,
+    loadStore(masm, &MacroAssembler::str, src_reg, MacroAssembler::D,
        $mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
 
   enc_class aarch64_enc_strvQ(vReg src, memory mem) %{
     FloatRegister src_reg = as_FloatRegister($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::str, src_reg, MacroAssembler::Q,
+    loadStore(masm, &MacroAssembler::str, src_reg, MacroAssembler::Q,
        $mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
 
@@ -3199,7 +3177,6 @@ encode %{
     // we sometimes get asked to store the stack pointer into the
     // current thread -- we cannot do that directly on AArch64
     if (src_reg == r31_sp) {
-      C2_MacroAssembler _masm(&cbuf);
       assert(as_Register($mem$$base) == rthread, "unexpected store for sp");
       __ mov(rscratch2, sp);
       src_reg = rscratch2;
@@ -3215,7 +3192,6 @@ encode %{
 
   enc_class aarch64_enc_fstlrs(vRegF src, memory mem) %{
     {
-      C2_MacroAssembler _masm(&cbuf);
       FloatRegister src_reg = as_FloatRegister($src$$reg);
       __ fmovs(rscratch2, src_reg);
     }
@@ -3225,7 +3201,6 @@ encode %{
 
   enc_class aarch64_enc_fstlrd(vRegD src, memory mem) %{
     {
-      C2_MacroAssembler _masm(&cbuf);
       FloatRegister src_reg = as_FloatRegister($src$$reg);
       __ fmovd(rscratch2, src_reg);
     }
@@ -3236,7 +3211,6 @@ encode %{
   // synchronized read/update encodings
 
   enc_class aarch64_enc_ldaxr(iRegL dst, memory8 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register base = as_Register($mem$$base);
     int index = $mem$$index;
@@ -3265,7 +3239,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_stlxr(iRegLNoSp src, memory8 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register src_reg = as_Register($src$$reg);
     Register base = as_Register($mem$$base);
     int index = $mem$$index;
@@ -3295,7 +3268,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmpxchg(memory mem, iRegLNoSp oldval, iRegLNoSp newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::xword, /*acquire*/ false, /*release*/ true,
@@ -3303,7 +3275,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmpxchgw(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::word, /*acquire*/ false, /*release*/ true,
@@ -3311,7 +3282,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmpxchgs(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::halfword, /*acquire*/ false, /*release*/ true,
@@ -3319,7 +3289,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmpxchgb(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::byte, /*acquire*/ false, /*release*/ true,
@@ -3332,7 +3301,6 @@ encode %{
   // CompareAndSwap sequence to serve as a barrier on acquiring a
   // lock.
   enc_class aarch64_enc_cmpxchg_acq(memory mem, iRegLNoSp oldval, iRegLNoSp newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::xword, /*acquire*/ true, /*release*/ true,
@@ -3340,7 +3308,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmpxchgw_acq(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::word, /*acquire*/ true, /*release*/ true,
@@ -3348,7 +3315,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmpxchgs_acq(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::halfword, /*acquire*/ true, /*release*/ true,
@@ -3356,7 +3322,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmpxchgb_acq(memory mem, iRegINoSp oldval, iRegINoSp newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     __ cmpxchg($mem$$base$$Register, $oldval$$Register, $newval$$Register,
                Assembler::byte, /*acquire*/ true, /*release*/ true,
@@ -3365,7 +3330,6 @@ encode %{
 
   // auxiliary used for CompareAndSwapX to set result register
   enc_class aarch64_enc_cset_eq(iRegINoSp res) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register res_reg = as_Register($res$$reg);
     __ cset(res_reg, Assembler::EQ);
   %}
@@ -3373,7 +3337,6 @@ encode %{
   // prefetch encodings
 
   enc_class aarch64_enc_prefetchw(memory mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register base = as_Register($mem$$base);
     int index = $mem$$index;
     int scale = $mem$$scale;
@@ -3394,7 +3357,6 @@ encode %{
   /// mov envcodings
 
   enc_class aarch64_enc_movw_imm(iRegI dst, immI src) %{
-    C2_MacroAssembler _masm(&cbuf);
     uint32_t con = (uint32_t)$src$$constant;
     Register dst_reg = as_Register($dst$$reg);
     if (con == 0) {
@@ -3405,7 +3367,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_mov_imm(iRegL dst, immL src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     uint64_t con = (uint64_t)$src$$constant;
     if (con == 0) {
@@ -3416,7 +3377,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_mov_p(iRegP dst, immP src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     address con = (address)$src$$constant;
     if (con == nullptr || con == (address)1) {
@@ -3442,24 +3402,20 @@ encode %{
   %}
 
   enc_class aarch64_enc_mov_p0(iRegP dst, immP0 src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     __ mov(dst_reg, zr);
   %}
 
   enc_class aarch64_enc_mov_p1(iRegP dst, immP_1 src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     __ mov(dst_reg, (uint64_t)1);
   %}
 
   enc_class aarch64_enc_mov_byte_map_base(iRegP dst, immByteMapBase src) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ load_byte_map_base($dst$$Register);
   %}
 
   enc_class aarch64_enc_mov_n(iRegN dst, immN src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     address con = (address)$src$$constant;
     if (con == nullptr) {
@@ -3472,13 +3428,11 @@ encode %{
   %}
 
   enc_class aarch64_enc_mov_n0(iRegN dst, immN0 src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     __ mov(dst_reg, zr);
   %}
 
   enc_class aarch64_enc_mov_nk(iRegN dst, immNKlass src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     address con = (address)$src$$constant;
     if (con == nullptr) {
@@ -3493,7 +3447,6 @@ encode %{
   // arithmetic encodings
 
   enc_class aarch64_enc_addsubw_imm(iRegI dst, iRegI src1, immIAddSub src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src_reg = as_Register($src1$$reg);
     int32_t con = (int32_t)$src2$$constant;
@@ -3507,7 +3460,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_addsub_imm(iRegL dst, iRegL src1, immLAddSub src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src_reg = as_Register($src1$$reg);
     int32_t con = (int32_t)$src2$$constant;
@@ -3521,7 +3473,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_divw(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
    Register dst_reg = as_Register($dst$$reg);
    Register src1_reg = as_Register($src1$$reg);
    Register src2_reg = as_Register($src2$$reg);
@@ -3529,7 +3480,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_div(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
    Register dst_reg = as_Register($dst$$reg);
    Register src1_reg = as_Register($src1$$reg);
    Register src2_reg = as_Register($src2$$reg);
@@ -3537,7 +3487,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_modw(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
    Register dst_reg = as_Register($dst$$reg);
    Register src1_reg = as_Register($src1$$reg);
    Register src2_reg = as_Register($src2$$reg);
@@ -3545,7 +3494,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_mod(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
    Register dst_reg = as_Register($dst$$reg);
    Register src1_reg = as_Register($src1$$reg);
    Register src2_reg = as_Register($src2$$reg);
@@ -3555,14 +3503,12 @@ encode %{
   // compare instruction encodings
 
   enc_class aarch64_enc_cmpw(iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg1 = as_Register($src1$$reg);
     Register reg2 = as_Register($src2$$reg);
     __ cmpw(reg1, reg2);
   %}
 
   enc_class aarch64_enc_cmpw_imm_addsub(iRegI src1, immIAddSub src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg = as_Register($src1$$reg);
     int32_t val = $src2$$constant;
     if (val >= 0) {
@@ -3573,7 +3519,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmpw_imm(iRegI src1, immI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg1 = as_Register($src1$$reg);
     uint32_t val = (uint32_t)$src2$$constant;
     __ movw(rscratch1, val);
@@ -3581,14 +3526,12 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmp(iRegL src1, iRegL src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg1 = as_Register($src1$$reg);
     Register reg2 = as_Register($src2$$reg);
     __ cmp(reg1, reg2);
   %}
 
   enc_class aarch64_enc_cmp_imm_addsub(iRegL src1, immL12 src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg = as_Register($src1$$reg);
     int64_t val = $src2$$constant;
     if (val >= 0) {
@@ -3603,7 +3546,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmp_imm(iRegL src1, immL src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg1 = as_Register($src1$$reg);
     uint64_t val = (uint64_t)$src2$$constant;
     __ mov(rscratch1, val);
@@ -3611,45 +3553,38 @@ encode %{
   %}
 
   enc_class aarch64_enc_cmpp(iRegP src1, iRegP src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg1 = as_Register($src1$$reg);
     Register reg2 = as_Register($src2$$reg);
     __ cmp(reg1, reg2);
   %}
 
   enc_class aarch64_enc_cmpn(iRegN src1, iRegN src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg1 = as_Register($src1$$reg);
     Register reg2 = as_Register($src2$$reg);
     __ cmpw(reg1, reg2);
   %}
 
   enc_class aarch64_enc_testp(iRegP src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg = as_Register($src$$reg);
     __ cmp(reg, zr);
   %}
 
   enc_class aarch64_enc_testn(iRegN src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register reg = as_Register($src$$reg);
     __ cmpw(reg, zr);
   %}
 
   enc_class aarch64_enc_b(label lbl) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label *L = $lbl$$label;
     __ b(*L);
   %}
 
   enc_class aarch64_enc_br_con(cmpOp cmp, label lbl) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label *L = $lbl$$label;
     __ br ((Assembler::Condition)$cmp$$cmpcode, *L);
   %}
 
   enc_class aarch64_enc_br_conU(cmpOpU cmp, label lbl) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label *L = $lbl$$label;
     __ br ((Assembler::Condition)$cmp$$cmpcode, *L);
   %}
@@ -3662,7 +3597,6 @@ encode %{
      Register result_reg = as_Register($result$$reg);
 
      Label miss;
-     C2_MacroAssembler _masm(&cbuf);
      __ check_klass_subtype_slow_path(sub_reg, super_reg, temp_reg, result_reg,
                                      nullptr, &miss,
                                      /*set_cond_codes:*/ true);
@@ -3673,8 +3607,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_java_static_call(method meth) %{
-    C2_MacroAssembler _masm(&cbuf);
-
     address addr = (address)$meth$$method;
     address call;
     if (!_method) {
@@ -3690,7 +3622,7 @@ encode %{
       __ nop();
       __ block_comment("call JVM_EnsureMaterializedForStackWalk (elided)");
     } else {
-      int method_index = resolved_method_index(cbuf);
+      int method_index = resolved_method_index(masm);
       RelocationHolder rspec = _optimized_virtual ? opt_virtual_call_Relocation::spec(method_index)
                                                   : static_call_Relocation::spec(method_index);
       call = __ trampoline_call(Address(addr, rspec));
@@ -3701,10 +3633,10 @@ encode %{
       if (CodeBuffer::supports_shared_stubs() && _method->can_be_statically_bound()) {
         // Calls of the same statically bound method can share
         // a stub to the interpreter.
-        cbuf.shared_stub_to_interp_for(_method, call - cbuf.insts_begin());
+        __ code()->shared_stub_to_interp_for(_method, call - __ begin());
       } else {
         // Emit stub for static call
-        address stub = CompiledDirectCall::emit_to_interp_stub(cbuf, call);
+        address stub = CompiledDirectCall::emit_to_interp_stub(masm, call);
         if (stub == nullptr) {
           ciEnv::current()->record_failure("CodeCache is full");
           return;
@@ -3721,8 +3653,7 @@ encode %{
   %}
 
   enc_class aarch64_enc_java_dynamic_call(method meth) %{
-    C2_MacroAssembler _masm(&cbuf);
-    int method_index = resolved_method_index(cbuf);
+    int method_index = resolved_method_index(masm);
     address call = __ ic_call((address)$meth$$method, method_index);
     if (call == nullptr) {
       ciEnv::current()->record_failure("CodeCache is full");
@@ -3735,7 +3666,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_call_epilog() %{
-    C2_MacroAssembler _masm(&cbuf);
     if (VerifyStackAtCalls) {
       // Check that stack depth is unchanged: find majik cookie on stack
       __ call_Unimplemented();
@@ -3743,8 +3673,6 @@ encode %{
   %}
 
   enc_class aarch64_enc_java_to_runtime(method meth) %{
-    C2_MacroAssembler _masm(&cbuf);
-
     // some calls to generated routines (arraycopy code) are scheduled
     // by C2 as runtime calls. if so we can call them using a br (they
     // will be in a reachable segment) otherwise we have to use a blr
@@ -3775,12 +3703,10 @@ encode %{
   %}
 
   enc_class aarch64_enc_rethrow() %{
-    C2_MacroAssembler _masm(&cbuf);
     __ far_jump(RuntimeAddress(OptoRuntime::rethrow_stub()));
   %}
 
   enc_class aarch64_enc_ret() %{
-    C2_MacroAssembler _masm(&cbuf);
 #ifdef ASSERT
     if (Compile::current()->max_vector_size() > 0) {
       __ verify_ptrue();
@@ -3790,13 +3716,11 @@ encode %{
   %}
 
   enc_class aarch64_enc_tail_call(iRegP jump_target) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register target_reg = as_Register($jump_target$$reg);
     __ br(target_reg);
   %}
 
   enc_class aarch64_enc_tail_jmp(iRegP jump_target) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register target_reg = as_Register($jump_target$$reg);
     // exception oop should be in r0
     // ret addr has been popped into lr
@@ -4565,7 +4489,7 @@ operand immP()
   interface(CONST_INTER);
 %}
 
-// Null Pointer Immediate
+// nullptr Pointer Immediate
 operand immP0()
 %{
   predicate(n->get_ptr() == 0);
@@ -4673,7 +4597,7 @@ operand immN()
   interface(CONST_INTER);
 %}
 
-// Narrow Null Pointer Immediate
+// Narrow nullptr Pointer Immediate
 operand immN0()
 %{
   predicate(n->get_narrowcon() == 0);
@@ -6768,7 +6692,7 @@ instruct loadConP0(iRegPNoSp dst, immP0 con)
   match(Set dst con);
 
   ins_cost(INSN_COST);
-  format %{ "mov  $dst, $con\t# null pointer" %}
+  format %{ "mov  $dst, $con\t# nullptr ptr" %}
 
   ins_encode(aarch64_enc_mov_p0(dst, con));
 
@@ -6782,7 +6706,7 @@ instruct loadConP1(iRegPNoSp dst, immP_1 con)
   match(Set dst con);
 
   ins_cost(INSN_COST);
-  format %{ "mov  $dst, $con\t# null pointer" %}
+  format %{ "mov  $dst, $con\t# nullptr ptr" %}
 
   ins_encode(aarch64_enc_mov_p1(dst, con));
 
@@ -6824,7 +6748,7 @@ instruct loadConN0(iRegNNoSp dst, immN0 con)
   match(Set dst con);
 
   ins_cost(INSN_COST);
-  format %{ "mov  $dst, $con\t# compressed null pointer" %}
+  format %{ "mov  $dst, $con\t# compressed nullptr ptr" %}
 
   ins_encode(aarch64_enc_mov_n0(dst, con));
 
@@ -7735,7 +7659,7 @@ instruct popCountI_mem(iRegINoSp dst, memory4 mem, vRegF tmp) %{
             "mov    $dst, $tmp\t# vector (1D)" %}
   ins_encode %{
     FloatRegister tmp_reg = as_FloatRegister($tmp$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrs, tmp_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrs, tmp_reg, $mem->opcode(),
               as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
     __ cnt($tmp$$FloatRegister, __ T8B, $tmp$$FloatRegister);
     __ addv($tmp$$FloatRegister, __ T8B, $tmp$$FloatRegister);
@@ -7776,7 +7700,7 @@ instruct popCountL_mem(iRegINoSp dst, memory8 mem, vRegD tmp) %{
             "mov    $dst, $tmp\t# vector (1D)" %}
   ins_encode %{
     FloatRegister tmp_reg = as_FloatRegister($tmp$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrd, tmp_reg, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrd, tmp_reg, $mem->opcode(),
               as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 8);
     __ cnt($tmp$$FloatRegister, __ T8B, $tmp$$FloatRegister);
     __ addv($tmp$$FloatRegister, __ T8B, $tmp$$FloatRegister);
@@ -16870,7 +16794,7 @@ instruct compressBitsI_memcon(iRegINoSp dst, memory4 mem, immI mask,
             "mov    $dst, $tdst"
           %}
   ins_encode %{
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrs, $tsrc$$FloatRegister, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrs, $tsrc$$FloatRegister, $mem->opcode(),
               as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
     __ ldrs($tmask$$FloatRegister, $constantaddress($mask));
     __ sve_bext($tdst$$FloatRegister, __ S, $tsrc$$FloatRegister, $tmask$$FloatRegister);
@@ -16907,7 +16831,7 @@ instruct compressBitsL_memcon(iRegLNoSp dst, memory8 mem, immL mask,
             "mov    $dst, $tdst"
           %}
   ins_encode %{
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrd, $tsrc$$FloatRegister, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrd, $tsrc$$FloatRegister, $mem->opcode(),
               as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 8);
     __ ldrd($tmask$$FloatRegister, $constantaddress($mask));
     __ sve_bext($tdst$$FloatRegister, __ D, $tsrc$$FloatRegister, $tmask$$FloatRegister);
@@ -16944,7 +16868,7 @@ instruct expandBitsI_memcon(iRegINoSp dst, memory4 mem, immI mask,
             "mov    $dst, $tdst"
           %}
   ins_encode %{
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrs, $tsrc$$FloatRegister, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrs, $tsrc$$FloatRegister, $mem->opcode(),
               as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 4);
     __ ldrs($tmask$$FloatRegister, $constantaddress($mask));
     __ sve_bdep($tdst$$FloatRegister, __ S, $tsrc$$FloatRegister, $tmask$$FloatRegister);
@@ -16982,7 +16906,7 @@ instruct expandBitsL_memcon(iRegINoSp dst, memory8 mem, immL mask,
             "mov    $dst, $tdst"
           %}
   ins_encode %{
-    loadStore(C2_MacroAssembler(&cbuf), &MacroAssembler::ldrd, $tsrc$$FloatRegister, $mem->opcode(),
+    loadStore(masm, &MacroAssembler::ldrd, $tsrc$$FloatRegister, $mem->opcode(),
               as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 8);
     __ ldrd($tmask$$FloatRegister, $constantaddress($mask));
     __ sve_bdep($tdst$$FloatRegister, __ D, $tsrc$$FloatRegister, $tmask$$FloatRegister);
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index d611c14f403..467d6ec2250 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -94,7 +94,7 @@ source %{
                                                              PRegister Pg, const Address &adr);
 
   // Predicated load/store, with optional ptrue to all elements of given predicate register.
-  static void loadStoreA_predicated(C2_MacroAssembler masm, bool is_store, FloatRegister reg,
+  static void loadStoreA_predicated(C2_MacroAssembler* masm, bool is_store, FloatRegister reg,
                                     PRegister pg, BasicType mem_elem_bt, BasicType vector_elem_bt,
                                     int opcode, Register base, int index, int size, int disp) {
     sve_mem_insn_predicate insn;
@@ -119,7 +119,7 @@ source %{
         ShouldNotReachHere();
       }
       int imm4 = disp / mesize / Matcher::scalable_vector_reg_size(vector_elem_bt);
-      (masm.*insn)(reg, Assembler::elemType_to_regVariant(vector_elem_bt), pg, Address(base, imm4));
+      (masm->*insn)(reg, Assembler::elemType_to_regVariant(vector_elem_bt), pg, Address(base, imm4));
     } else {
       assert(false, "unimplemented");
       ShouldNotReachHere();
@@ -422,7 +422,7 @@ instruct loadV(vReg dst, vmemA mem) %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), /* is_store */ false,
+    loadStoreA_predicated(masm, /* is_store */ false,
                           $dst$$FloatRegister, ptrue, bt, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -439,7 +439,7 @@ instruct storeV(vReg src, vmemA mem) %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this, $src);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), /* is_store */ true,
+    loadStoreA_predicated(masm, /* is_store */ true,
                           $src$$FloatRegister, ptrue, bt, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -454,7 +454,7 @@ instruct loadV_masked(vReg dst, vmemA mem, pRegGov pg) %{
   format %{ "loadV_masked $dst, $pg, $mem" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), /* is_store */ false, $dst$$FloatRegister,
+    loadStoreA_predicated(masm, /* is_store */ false, $dst$$FloatRegister,
                           $pg$$PRegister, bt, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -467,7 +467,7 @@ instruct storeV_masked(vReg src, vmemA mem, pRegGov pg) %{
   format %{ "storeV_masked $mem, $pg, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), /* is_store */ true, $src$$FloatRegister,
+    loadStoreA_predicated(masm, /* is_store */ true, $src$$FloatRegister,
                           $pg$$PRegister, bt, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -4929,7 +4929,7 @@ instruct vloadmask_loadV(pReg dst, indirect mem, vReg tmp, rFlagsReg cr) %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, false, $tmp$$FloatRegister,
                           ptrue, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ sve_cmp(Assembler::NE, $dst$$PRegister, __ elemType_to_regVariant(bt),
@@ -4950,7 +4950,7 @@ instruct vloadmask_loadV_masked(pReg dst, indirect mem, pRegGov pg,
     // Load valid mask values which are boolean type, and extend them to the
     // defined vector element type. Convert the vector to predicate.
     BasicType bt = Matcher::vector_element_basic_type(this);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, false, $tmp$$FloatRegister,
                           $pg$$PRegister, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ sve_cmp(Assembler::NE, $dst$$PRegister, __ elemType_to_regVariant(bt),
@@ -4977,7 +4977,7 @@ instruct vloadmask_loadVMasked(pReg dst, vmemA mem, pRegGov pg, vReg tmp, rFlags
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, false, $tmp$$FloatRegister,
                           ptrue, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ sve_cmp(Assembler::NE, $dst$$PRegister, __ elemType_to_regVariant(bt),
@@ -5005,7 +5005,7 @@ instruct vloadmask_loadVMasked_masked(pReg dst, vmemA mem, pRegGov pg1, pRegGov
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, false, $tmp$$FloatRegister,
                           $pg2$$PRegister, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ sve_cmp(Assembler::NE, $dst$$PRegister, __ elemType_to_regVariant(bt),
@@ -5030,7 +5030,7 @@ instruct storeV_vstoremask(indirect mem, pReg src, immI_gt_1 esize, vReg tmp) %{
     assert(type2aelembytes(bt) == (int)$esize$$constant, "unsupported type");
     Assembler::SIMD_RegVariant size = __ elemBytes_to_regVariant($esize$$constant);
     __ sve_cpy($tmp$$FloatRegister, size, $src$$PRegister, 1, false);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, true, $tmp$$FloatRegister,
                           ptrue, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -5052,7 +5052,7 @@ instruct storeV_vstoremask_masked(indirect mem, pReg src, immI_gt_1 esize,
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
     __ sve_cpy($tmp$$FloatRegister, size, $src$$PRegister, 1, false);
     __ sve_gen_mask_imm($pgtmp$$PRegister, bt, Matcher::vector_length(this, $src));
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, true, $tmp$$FloatRegister,
                           $pgtmp$$PRegister, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -5078,7 +5078,7 @@ instruct storeVMasked_vstoremask(vmemA mem, pReg src, pRegGov pg, immI_gt_1 esiz
     assert(type2aelembytes(bt) == (int)$esize$$constant, "unsupported type.");
     Assembler::SIMD_RegVariant size = __ elemBytes_to_regVariant($esize$$constant);
     __ sve_cpy($tmp$$FloatRegister, size, $src$$PRegister, 1, false);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, true, $tmp$$FloatRegister,
                           ptrue, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -5105,7 +5105,7 @@ instruct storeVMasked_vstoremask_masked(vmemA mem, pReg src, pRegGov pg, immI_gt
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
     __ sve_cpy($tmp$$FloatRegister, size, $src$$PRegister, 1, false);
     __ sve_gen_mask_imm($pgtmp$$PRegister, bt, Matcher::vector_length(this, $src));
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, true, $tmp$$FloatRegister,
                           $pgtmp$$PRegister, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index 5c4e13d432f..d31a4e05799 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -84,7 +84,7 @@ source %{
                                                              PRegister Pg, const Address &adr);
 
   // Predicated load/store, with optional ptrue to all elements of given predicate register.
-  static void loadStoreA_predicated(C2_MacroAssembler masm, bool is_store, FloatRegister reg,
+  static void loadStoreA_predicated(C2_MacroAssembler* masm, bool is_store, FloatRegister reg,
                                     PRegister pg, BasicType mem_elem_bt, BasicType vector_elem_bt,
                                     int opcode, Register base, int index, int size, int disp) {
     sve_mem_insn_predicate insn;
@@ -109,7 +109,7 @@ source %{
         ShouldNotReachHere();
       }
       int imm4 = disp / mesize / Matcher::scalable_vector_reg_size(vector_elem_bt);
-      (masm.*insn)(reg, Assembler::elemType_to_regVariant(vector_elem_bt), pg, Address(base, imm4));
+      (masm->*insn)(reg, Assembler::elemType_to_regVariant(vector_elem_bt), pg, Address(base, imm4));
     } else {
       assert(false, "unimplemented");
       ShouldNotReachHere();
@@ -361,7 +361,7 @@ instruct loadV(vReg dst, vmemA mem) %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), /* is_store */ false,
+    loadStoreA_predicated(masm, /* is_store */ false,
                           $dst$$FloatRegister, ptrue, bt, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -378,7 +378,7 @@ instruct storeV(vReg src, vmemA mem) %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this, $src);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), /* is_store */ true,
+    loadStoreA_predicated(masm, /* is_store */ true,
                           $src$$FloatRegister, ptrue, bt, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -393,7 +393,7 @@ instruct loadV_masked(vReg dst, vmemA mem, pRegGov pg) %{
   format %{ "loadV_masked $dst, $pg, $mem" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), /* is_store */ false, $dst$$FloatRegister,
+    loadStoreA_predicated(masm, /* is_store */ false, $dst$$FloatRegister,
                           $pg$$PRegister, bt, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -406,7 +406,7 @@ instruct storeV_masked(vReg src, vmemA mem, pRegGov pg) %{
   format %{ "storeV_masked $mem, $pg, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), /* is_store */ true, $src$$FloatRegister,
+    loadStoreA_predicated(masm, /* is_store */ true, $src$$FloatRegister,
                           $pg$$PRegister, bt, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -3321,7 +3321,7 @@ instruct vloadmask_loadV(pReg dst, indirect mem, vReg tmp, rFlagsReg cr) %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, false, $tmp$$FloatRegister,
                           ptrue, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ sve_cmp(Assembler::NE, $dst$$PRegister, __ elemType_to_regVariant(bt),
@@ -3342,7 +3342,7 @@ instruct vloadmask_loadV_masked(pReg dst, indirect mem, pRegGov pg,
     // Load valid mask values which are boolean type, and extend them to the
     // defined vector element type. Convert the vector to predicate.
     BasicType bt = Matcher::vector_element_basic_type(this);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, false, $tmp$$FloatRegister,
                           $pg$$PRegister, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ sve_cmp(Assembler::NE, $dst$$PRegister, __ elemType_to_regVariant(bt),
@@ -3369,7 +3369,7 @@ instruct vloadmask_loadVMasked(pReg dst, vmemA mem, pRegGov pg, vReg tmp, rFlags
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, false, $tmp$$FloatRegister,
                           ptrue, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ sve_cmp(Assembler::NE, $dst$$PRegister, __ elemType_to_regVariant(bt),
@@ -3397,7 +3397,7 @@ instruct vloadmask_loadVMasked_masked(pReg dst, vmemA mem, pRegGov pg1, pRegGov
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint length_in_bytes = Matcher::vector_length_in_bytes(this);
     assert(length_in_bytes == MaxVectorSize, "invalid vector length");
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, false, $tmp$$FloatRegister,
                           $pg2$$PRegister, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ sve_cmp(Assembler::NE, $dst$$PRegister, __ elemType_to_regVariant(bt),
@@ -3422,7 +3422,7 @@ instruct storeV_vstoremask(indirect mem, pReg src, immI_gt_1 esize, vReg tmp) %{
     assert(type2aelembytes(bt) == (int)$esize$$constant, "unsupported type");
     Assembler::SIMD_RegVariant size = __ elemBytes_to_regVariant($esize$$constant);
     __ sve_cpy($tmp$$FloatRegister, size, $src$$PRegister, 1, false);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, true, $tmp$$FloatRegister,
                           ptrue, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -3444,7 +3444,7 @@ instruct storeV_vstoremask_masked(indirect mem, pReg src, immI_gt_1 esize,
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
     __ sve_cpy($tmp$$FloatRegister, size, $src$$PRegister, 1, false);
     __ sve_gen_mask_imm($pgtmp$$PRegister, bt, Matcher::vector_length(this, $src));
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, true, $tmp$$FloatRegister,
                           $pgtmp$$PRegister, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -3470,7 +3470,7 @@ instruct storeVMasked_vstoremask(vmemA mem, pReg src, pRegGov pg, immI_gt_1 esiz
     assert(type2aelembytes(bt) == (int)$esize$$constant, "unsupported type.");
     Assembler::SIMD_RegVariant size = __ elemBytes_to_regVariant($esize$$constant);
     __ sve_cpy($tmp$$FloatRegister, size, $src$$PRegister, 1, false);
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, true, $tmp$$FloatRegister,
                           ptrue, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
@@ -3497,7 +3497,7 @@ instruct storeVMasked_vstoremask_masked(vmemA mem, pReg src, pRegGov pg, immI_gt
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
     __ sve_cpy($tmp$$FloatRegister, size, $src$$PRegister, 1, false);
     __ sve_gen_mask_imm($pgtmp$$PRegister, bt, Matcher::vector_length(this, $src));
-    loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, $tmp$$FloatRegister,
+    loadStoreA_predicated(masm, true, $tmp$$FloatRegister,
                           $pgtmp$$PRegister, T_BOOLEAN, bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
   %}
diff --git a/src/hotspot/cpu/aarch64/ad_encode.m4 b/src/hotspot/cpu/aarch64/ad_encode.m4
index 4897998d870..008dbd2c936 100644
--- a/src/hotspot/cpu/aarch64/ad_encode.m4
+++ b/src/hotspot/cpu/aarch64/ad_encode.m4
@@ -29,7 +29,7 @@ define(choose, `loadStore($1, &MacroAssembler::$3, $2, $4,
   %}')dnl
 define(access, `
     $3Register $1_reg = as_$3Register($$1$$reg);
-    $4choose(C2_MacroAssembler(&cbuf), $1_reg,$2,$mem->opcode(),
+    $4choose(masm, $1_reg,$2,$mem->opcode(),
         as_Register($mem$$base),$mem$$index,$mem$$scale,$mem$$disp,$5)')dnl
 define(load,`
   // This encoding class is generated automatically from ad_encode.m4.
@@ -59,8 +59,7 @@ define(STORE0,`
   // This encoding class is generated automatically from ad_encode.m4.
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_$2`'0(memory$4 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
-    choose(_masm,zr,$2,$mem->opcode(),
+    choose(masm,zr,$2,$mem->opcode(),
         as_$3Register($mem$$base),$mem$$index,$mem$$scale,$mem$$disp,$4)')dnl
 STORE(iRegI,strb,,,1)
 STORE0(iRegI,strb,,1)
@@ -72,7 +71,6 @@ STORE(iRegL,str,,
 `// we sometimes get asked to store the stack pointer into the
     // current thread -- we cannot do that directly on AArch64
     if (src_reg == r31_sp) {
-      C2_MacroAssembler _masm(&cbuf);
       assert(as_Register($mem$$base) == rthread, "unexpected store for sp");
       __ mov(rscratch2, sp);
       src_reg = rscratch2;
@@ -85,8 +83,7 @@ STORE(vRegD,strd,Float,,8)
   // This encoding class is generated automatically from ad_encode.m4.
   // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
   enc_class aarch64_enc_strb0_ordered(memory4 mem) %{
-      C2_MacroAssembler _masm(&cbuf);
       __ membar(Assembler::StoreStore);
-      loadStore(_masm, &MacroAssembler::strb, zr, $mem->opcode(),
+      loadStore(masm, &MacroAssembler::strb, zr, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 1);
   %}
diff --git a/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp b/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp
index 23c08f11d1a..03ee729b767 100644
--- a/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp
@@ -34,10 +34,10 @@
 
 // ----------------------------------------------------------------------------
 
-#define __ _masm.
-address CompiledDirectCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) {
-  precond(cbuf.stubs()->start() != badAddress);
-  precond(cbuf.stubs()->end() != badAddress);
+#define __ masm->
+address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark) {
+  precond(__ code()->stubs()->start() != badAddress);
+  precond(__ code()->stubs()->end() != badAddress);
 
   // Stub is fixed up when the corresponding call is converted from
   // calling compiled code to calling interpreted code.
@@ -45,13 +45,9 @@ address CompiledDirectCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark)
   // jmp -4 # to self
 
   if (mark == nullptr) {
-    mark = cbuf.insts_mark();  // Get mark within main instrs section.
+    mark = __ inst_mark();  // Get mark within main instrs section.
   }
 
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a stub.
-  MacroAssembler _masm(&cbuf);
-
   address base = __ start_a_stub(to_interp_stub_size());
   int offset = __ offset();
   if (base == nullptr) {
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad
index 0572e7d8d11..d5dcf7f9534 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad
@@ -29,20 +29,18 @@ source_hpp %{
 
 encode %{
   enc_class aarch64_enc_cmpxchg_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, iRegINoSp res) %{
-    MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ false, $res$$Register);
   %}
 
   enc_class aarch64_enc_cmpxchg_acq_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, iRegINoSp res) %{
-    MacroAssembler _masm(&cbuf);
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ false, $res$$Register);
   %}
 %}
@@ -77,7 +75,7 @@ instruct compareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, i
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ false, /*release*/ true, /*is_cae*/ false, $res$$Register);
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ false, /*release*/ true, /*is_cae*/ false, $res$$Register);
   %}
 
   ins_pipe(pipe_slow);
@@ -115,7 +113,7 @@ instruct compareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ true, /*release*/ true, /*is_cae*/ false, $res$$Register);
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ true, /*release*/ true, /*is_cae*/ false, $res$$Register);
   %}
 
   ins_pipe(pipe_slow);
@@ -131,7 +129,7 @@ instruct compareAndExchangeN_shenandoah(iRegNNoSp res, indirect mem, iRegN oldva
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ true, $res$$Register);
   %}
   ins_pipe(pipe_slow);
@@ -147,7 +145,7 @@ instruct compareAndExchangeP_shenandoah(iRegPNoSp res, indirect mem, iRegP oldva
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ true, $res$$Register);
   %}
   ins_pipe(pipe_slow);
@@ -164,7 +162,7 @@ instruct compareAndExchangeNAcq_shenandoah(iRegNNoSp res, indirect mem, iRegN ol
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ true, $res$$Register);
   %}
   ins_pipe(pipe_slow);
@@ -181,7 +179,7 @@ instruct compareAndExchangePAcq_shenandoah(iRegPNoSp res, indirect mem, iRegP ol
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ true, $res$$Register);
   %}
   ins_pipe(pipe_slow);
@@ -199,7 +197,7 @@ instruct weakCompareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldva
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
     // Weak is not currently supported by ShenandoahBarrierSet::cmpxchg_oop
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ false, $res$$Register);
   %}
   ins_pipe(pipe_slow);
@@ -216,7 +214,7 @@ instruct weakCompareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldva
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
     // Weak is not currently supported by ShenandoahBarrierSet::cmpxchg_oop
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ false, $res$$Register);
   %}
   ins_pipe(pipe_slow);
@@ -235,7 +233,7 @@ instruct weakCompareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN ol
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
     // Weak is not currently supported by ShenandoahBarrierSet::cmpxchg_oop
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ false, $res$$Register);
   %}
   ins_pipe(pipe_slow);
@@ -254,7 +252,7 @@ instruct weakCompareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP ol
     Register tmp = $tmp$$Register;
     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
     // Weak is not currently supported by ShenandoahBarrierSet::cmpxchg_oop
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ false, $res$$Register);
   %}
   ins_pipe(pipe_slow);
diff --git a/src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad b/src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad
index a8ef3ce9f13..c7c7165affb 100644
--- a/src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad
+++ b/src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ source_hpp %{
 
 source %{
 
-static void x_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data) {
+static void x_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data) {
   if (barrier_data == XLoadBarrierElided) {
     return;
   }
@@ -42,7 +42,7 @@ static void x_load_barrier(MacroAssembler& _masm, const MachNode* node, Address
   __ bind(*stub->continuation());
 }
 
-static void x_load_barrier_slow_path(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
+static void x_load_barrier_slow_path(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
   XLoadBarrierStubC2* const stub = XLoadBarrierStubC2::create(node, ref_addr, ref, tmp, XLoadBarrierStrong);
   __ b(*stub->entry());
   __ bind(*stub->continuation());
@@ -64,7 +64,7 @@ instruct xLoadP(iRegPNoSp dst, memory8 mem, rFlagsReg cr)
   ins_encode %{
     const Address ref_addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ ldr($dst$$Register, ref_addr);
-    x_load_barrier(_masm, this, ref_addr, $dst$$Register, rscratch2 /* tmp */, barrier_data());
+    x_load_barrier(masm, this, ref_addr, $dst$$Register, rscratch2 /* tmp */, barrier_data());
   %}
 
   ins_pipe(iload_reg_mem);
@@ -83,7 +83,7 @@ instruct xLoadPVolatile(iRegPNoSp dst, indirect mem /* sync_memory */, rFlagsReg
 
   ins_encode %{
     __ ldar($dst$$Register, $mem$$Register);
-    x_load_barrier(_masm, this, Address($mem$$Register), $dst$$Register, rscratch2 /* tmp */, barrier_data());
+    x_load_barrier(masm, this, Address($mem$$Register), $dst$$Register, rscratch2 /* tmp */, barrier_data());
   %}
 
   ins_pipe(pipe_serial);
@@ -110,7 +110,7 @@ instruct xCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newva
       __ ldr(rscratch1, Address(rthread, XThreadLocalData::address_bad_mask_offset()));
       __ andr(rscratch1, rscratch1, rscratch2);
       __ cbz(rscratch1, good);
-      x_load_barrier_slow_path(_masm, this, Address($mem$$Register), rscratch2 /* ref */, rscratch1 /* tmp */);
+      x_load_barrier_slow_path(masm, this, Address($mem$$Register), rscratch2 /* ref */, rscratch1 /* tmp */);
       __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::xword,
                  false /* acquire */, true /* release */, false /* weak */, rscratch2);
       __ cset($res$$Register, Assembler::EQ);
@@ -142,7 +142,7 @@ instruct xCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP ne
       __ ldr(rscratch1, Address(rthread, XThreadLocalData::address_bad_mask_offset()));
       __ andr(rscratch1, rscratch1, rscratch2);
       __ cbz(rscratch1, good);
-      x_load_barrier_slow_path(_masm, this, Address($mem$$Register), rscratch2 /* ref */, rscratch1 /* tmp */ );
+      x_load_barrier_slow_path(masm, this, Address($mem$$Register), rscratch2 /* ref */, rscratch1 /* tmp */ );
       __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::xword,
                  true /* acquire */, true /* release */, false /* weak */, rscratch2);
       __ cset($res$$Register, Assembler::EQ);
@@ -171,7 +171,7 @@ instruct xCompareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP n
       __ ldr(rscratch1, Address(rthread, XThreadLocalData::address_bad_mask_offset()));
       __ andr(rscratch1, rscratch1, $res$$Register);
       __ cbz(rscratch1, good);
-      x_load_barrier_slow_path(_masm, this, Address($mem$$Register), $res$$Register /* ref */, rscratch1 /* tmp */);
+      x_load_barrier_slow_path(masm, this, Address($mem$$Register), $res$$Register /* ref */, rscratch1 /* tmp */);
       __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::xword,
                  false /* acquire */, true /* release */, false /* weak */, $res$$Register);
       __ bind(good);
@@ -199,7 +199,7 @@ instruct xCompareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iReg
       __ ldr(rscratch1, Address(rthread, XThreadLocalData::address_bad_mask_offset()));
       __ andr(rscratch1, rscratch1, $res$$Register);
       __ cbz(rscratch1, good);
-      x_load_barrier_slow_path(_masm, this, Address($mem$$Register), $res$$Register /* ref */, rscratch1 /* tmp */);
+      x_load_barrier_slow_path(masm, this, Address($mem$$Register), $res$$Register /* ref */, rscratch1 /* tmp */);
       __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::xword,
                  true /* acquire */, true /* release */, false /* weak */, $res$$Register);
       __ bind(good);
@@ -220,7 +220,7 @@ instruct xGetAndSetP(indirect mem, iRegP newv, iRegPNoSp prev, rFlagsReg cr) %{
 
   ins_encode %{
     __ atomic_xchg($prev$$Register, $newv$$Register, $mem$$Register);
-    x_load_barrier(_masm, this, Address(noreg, 0), $prev$$Register, rscratch2 /* tmp */, barrier_data());
+    x_load_barrier(masm, this, Address(noreg, 0), $prev$$Register, rscratch2 /* tmp */, barrier_data());
   %}
 
   ins_pipe(pipe_serial);
@@ -237,7 +237,7 @@ instruct xGetAndSetPAcq(indirect mem, iRegP newv, iRegPNoSp prev, rFlagsReg cr)
 
   ins_encode %{
     __ atomic_xchgal($prev$$Register, $newv$$Register, $mem$$Register);
-    x_load_barrier(_masm, this, Address(noreg, 0), $prev$$Register, rscratch2 /* tmp */, barrier_data());
+    x_load_barrier(masm, this, Address(noreg, 0), $prev$$Register, rscratch2 /* tmp */, barrier_data());
   %}
   ins_pipe(pipe_serial);
 %}
diff --git a/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad b/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
index 23564a3f23c..92181e2b6b9 100644
--- a/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
+++ b/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
@@ -33,40 +33,40 @@ source %{
 
 #include "gc/z/zBarrierSetAssembler.hpp"
 
-static void z_color(MacroAssembler& _masm, const MachNode* node, Register dst, Register src) {
+static void z_color(MacroAssembler* masm, const MachNode* node, Register dst, Register src) {
   assert_different_registers(src, dst);
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodBeforeMov);
   __ movzw(dst, barrier_Relocation::unpatched);
   __ orr(dst, dst, src, Assembler::LSL, ZPointerLoadShift);
 }
 
-static void z_uncolor(MacroAssembler& _masm, const MachNode* node, Register ref) {
+static void z_uncolor(MacroAssembler* masm, const MachNode* node, Register ref) {
   __ lsr(ref, ref, ZPointerLoadShift);
 }
 
-static void z_keep_alive_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
+static void z_keep_alive_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatMarkBadBeforeMov);
   __ movzw(tmp, barrier_Relocation::unpatched);
   __ tst(ref, tmp);
   ZLoadBarrierStubC2Aarch64* const stub = ZLoadBarrierStubC2Aarch64::create(node, ref_addr, ref);
   __ br(Assembler::NE, *stub->entry());
-  z_uncolor(_masm, node, ref);
+  z_uncolor(masm, node, ref);
   __ bind(*stub->continuation());
 }
 
-static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(&_masm);
+static void z_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
+  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   const bool on_non_strong =
       ((node->barrier_data() & ZBarrierWeak) != 0) ||
       ((node->barrier_data() & ZBarrierPhantom) != 0);
 
   if (on_non_strong) {
-    z_keep_alive_load_barrier(_masm, node, ref_addr, ref, tmp);
+    z_keep_alive_load_barrier(masm, node, ref_addr, ref, tmp);
     return;
   }
 
   if (node->barrier_data() == ZBarrierElided) {
-    z_uncolor(_masm, node, ref);
+    z_uncolor(masm, node, ref);
     return;
   }
 
@@ -81,19 +81,19 @@ static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address
     __ b(*stub->entry());
     __ bind(good);
   }
-  z_uncolor(_masm, node, ref);
+  z_uncolor(masm, node, ref);
   __ bind(*stub->continuation());
 }
 
-static void z_store_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register rnew_zaddress, Register rnew_zpointer, Register tmp, bool is_atomic) {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(&_masm);
+static void z_store_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register rnew_zaddress, Register rnew_zpointer, Register tmp, bool is_atomic) {
+  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   if (node->barrier_data() == ZBarrierElided) {
-    z_color(_masm, node, rnew_zpointer, rnew_zaddress);
+    z_color(masm, node, rnew_zpointer, rnew_zaddress);
   } else {
     bool is_native = (node->barrier_data() & ZBarrierNative) != 0;
     ZStoreBarrierStubC2Aarch64* const stub = ZStoreBarrierStubC2Aarch64::create(node, ref_addr, rnew_zaddress, rnew_zpointer, is_native, is_atomic);
     ZBarrierSetAssembler* bs_asm = ZBarrierSet::assembler();
-    bs_asm->store_barrier_fast(&_masm, ref_addr, rnew_zaddress, rnew_zpointer, tmp, true /* in_nmethod */, is_atomic, *stub->entry(), *stub->continuation());
+    bs_asm->store_barrier_fast(masm, ref_addr, rnew_zaddress, rnew_zpointer, tmp, true /* in_nmethod */, is_atomic, *stub->entry(), *stub->continuation());
   }
 }
 
@@ -113,7 +113,7 @@ instruct zLoadP(iRegPNoSp dst, memory8 mem, rFlagsReg cr)
   ins_encode %{
     const Address ref_addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
     __ ldr($dst$$Register, ref_addr);
-    z_load_barrier(_masm, this, ref_addr, $dst$$Register, rscratch1);
+    z_load_barrier(masm, this, ref_addr, $dst$$Register, rscratch1);
   %}
 
   ins_pipe(iload_reg_mem);
@@ -133,7 +133,7 @@ instruct zLoadPVolatile(iRegPNoSp dst, indirect mem /* sync_memory */, rFlagsReg
   ins_encode %{
     const Address ref_addr = Address($mem$$Register);
     __ ldar($dst$$Register, $mem$$Register);
-    z_load_barrier(_masm, this, ref_addr, $dst$$Register, rscratch1);
+    z_load_barrier(masm, this, ref_addr, $dst$$Register, rscratch1);
   %}
 
   ins_pipe(pipe_serial);
@@ -150,7 +150,7 @@ instruct zStoreP(memory mem, iRegP src, iRegPNoSp tmp, rFlagsReg cr)
   format %{ "movq    $mem, $src\t# ptr" %}
   ins_encode %{
     const Address ref_addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
-    z_store_barrier(_masm, this, ref_addr, $src$$Register, $tmp$$Register, rscratch2, false /* is_atomic */);
+    z_store_barrier(masm, this, ref_addr, $src$$Register, $tmp$$Register, rscratch2, false /* is_atomic */);
     __ str($tmp$$Register, ref_addr);
   %}
   ins_pipe(pipe_serial);
@@ -167,7 +167,7 @@ instruct zStorePVolatile(indirect mem, iRegP src, iRegPNoSp tmp, rFlagsReg cr)
   format %{ "movq    $mem, $src\t# ptr" %}
   ins_encode %{
     const Address ref_addr = Address($mem$$Register);
-    z_store_barrier(_masm, this, ref_addr, $src$$Register, $tmp$$Register, rscratch2, false /* is_atomic */);
+    z_store_barrier(masm, this, ref_addr, $src$$Register, $tmp$$Register, rscratch2, false /* is_atomic */);
     __ stlr($tmp$$Register, $mem$$Register);
   %}
   ins_pipe(pipe_serial);
@@ -187,8 +187,8 @@ instruct zCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newva
   ins_encode %{
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     Address ref_addr($mem$$Register);
-    z_store_barrier(_masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, rscratch2, true /* is_atomic */);
-    z_color(_masm, this, $oldval_tmp$$Register, $oldval$$Register);
+    z_store_barrier(masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, rscratch2, true /* is_atomic */);
+    z_color(masm, this, $oldval_tmp$$Register, $oldval$$Register);
     __ cmpxchg($mem$$Register, $oldval_tmp$$Register, $newval_tmp$$Register, Assembler::xword,
                false /* acquire */, true /* release */, false /* weak */, noreg);
     __ cset($res$$Register, Assembler::EQ);
@@ -211,8 +211,8 @@ instruct zCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP ne
   ins_encode %{
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     Address ref_addr($mem$$Register);
-    z_store_barrier(_masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, rscratch2, true /* is_atomic */);
-    z_color(_masm, this, $oldval_tmp$$Register, $oldval$$Register);
+    z_store_barrier(masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, rscratch2, true /* is_atomic */);
+    z_color(masm, this, $oldval_tmp$$Register, $oldval$$Register);
     __ cmpxchg($mem$$Register, $oldval_tmp$$Register, $newval_tmp$$Register, Assembler::xword,
                true /* acquire */, true /* release */, false /* weak */, noreg);
     __ cset($res$$Register, Assembler::EQ);
@@ -235,11 +235,11 @@ instruct zCompareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP n
   ins_encode %{
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     Address ref_addr($mem$$Register);
-    z_store_barrier(_masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, rscratch2, true /* is_atomic */);
-    z_color(_masm, this, $oldval_tmp$$Register, $oldval$$Register);
+    z_store_barrier(masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, rscratch2, true /* is_atomic */);
+    z_color(masm, this, $oldval_tmp$$Register, $oldval$$Register);
     __ cmpxchg($mem$$Register, $oldval_tmp$$Register, $newval_tmp$$Register, Assembler::xword,
                false /* acquire */, true /* release */, false /* weak */, $res$$Register);
-    z_uncolor(_masm, this, $res$$Register);
+    z_uncolor(masm, this, $res$$Register);
   %}
 
   ins_pipe(pipe_slow);
@@ -258,11 +258,11 @@ instruct zCompareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iReg
   ins_encode %{
     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
     Address ref_addr($mem$$Register);
-    z_store_barrier(_masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, rscratch2, true /* is_atomic */);
-    z_color(_masm, this, $oldval_tmp$$Register, $oldval$$Register);
+    z_store_barrier(masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, rscratch2, true /* is_atomic */);
+    z_color(masm, this, $oldval_tmp$$Register, $oldval$$Register);
     __ cmpxchg($mem$$Register, $oldval_tmp$$Register, $newval_tmp$$Register, Assembler::xword,
                true /* acquire */, true /* release */, false /* weak */, $res$$Register);
-    z_uncolor(_masm, this, $res$$Register);
+    z_uncolor(masm, this, $res$$Register);
   %}
 
   ins_pipe(pipe_slow);
@@ -278,9 +278,9 @@ instruct zGetAndSetP(indirect mem, iRegP newv, iRegPNoSp prev, rFlagsReg cr) %{
   format %{ "atomic_xchg  $prev, $newv, [$mem]" %}
 
   ins_encode %{
-    z_store_barrier(_masm, this, Address($mem$$Register), $newv$$Register, $prev$$Register, rscratch2, true /* is_atomic */);
+    z_store_barrier(masm, this, Address($mem$$Register), $newv$$Register, $prev$$Register, rscratch2, true /* is_atomic */);
     __ atomic_xchg($prev$$Register, $prev$$Register, $mem$$Register);
-    z_uncolor(_masm, this, $prev$$Register);
+    z_uncolor(masm, this, $prev$$Register);
   %}
 
   ins_pipe(pipe_serial);
@@ -296,9 +296,9 @@ instruct zGetAndSetPAcq(indirect mem, iRegP newv, iRegPNoSp prev, rFlagsReg cr)
   format %{ "atomic_xchg  $prev, $newv, [$mem]" %}
 
   ins_encode %{
-    z_store_barrier(_masm, this, Address($mem$$Register), $newv$$Register, $prev$$Register, rscratch2, true /* is_atomic */);
+    z_store_barrier(masm, this, Address($mem$$Register), $newv$$Register, $prev$$Register, rscratch2, true /* is_atomic */);
     __ atomic_xchgal($prev$$Register, $prev$$Register, $mem$$Register);
-    z_uncolor(_masm, this, $prev$$Register);
+    z_uncolor(masm, this, $prev$$Register);
   %}
 
   ins_pipe(pipe_serial);
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 97a10afde7a..b200fb4c4b0 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1108,8 +1108,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
 
     __ b(exit);
 
-    CodeBuffer* cbuf = masm->code_section()->outer();
-    address stub = CompiledDirectCall::emit_to_interp_stub(*cbuf, tr_call);
+    address stub = CompiledDirectCall::emit_to_interp_stub(masm, tr_call);
     if (stub == nullptr) {
       fatal("CodeCache is full at gen_continuation_enter");
     }
@@ -1173,8 +1172,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
       __ br(r1); // the exception handler
   }
 
-  CodeBuffer* cbuf = masm->code_section()->outer();
-  address stub = CompiledDirectCall::emit_to_interp_stub(*cbuf, tr_call);
+  address stub = CompiledDirectCall::emit_to_interp_stub(masm, tr_call);
   if (stub == nullptr) {
     fatal("CodeCache is full at gen_continuation_enter");
   }
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index 07c5b953254..638c48ad5aa 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -105,8 +105,8 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(CodeBuffer &cbuf);
-  static int emit_deopt_handler(CodeBuffer& cbuf);
+  static int emit_exception_handler(C2_MacroAssembler *masm);
+  static int emit_deopt_handler(C2_MacroAssembler* masm);
 
   static uint size_exception_handler() {
     return ( 3 * 4 );
@@ -138,7 +138,7 @@ bool assert_not_var_shift(const Node *n) {
   return true;
 }
 
-#define __ _masm.
+#define __ masm->
 
 static FloatRegister reg_to_FloatRegister_object(int register_encoding);
 static Register reg_to_register_object(int register_encoding);
@@ -159,8 +159,7 @@ int MachNode::compute_padding(int current_offset) const {
 // REQUIRED FUNCTIONALITY
 
 // emit an interrupt that is caught by the debugger (for debugging compiler)
-void emit_break(CodeBuffer &cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
+void emit_break(C2_MacroAssembler *masm) {
   __ breakpoint();
 }
 
@@ -170,8 +169,8 @@ void MachBreakpointNode::format( PhaseRegAlloc *, outputStream *st ) const {
 }
 #endif
 
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  emit_break(cbuf);
+void MachBreakpointNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  emit_break(masm);
 }
 
 uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
@@ -179,16 +178,14 @@ uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
 }
 
 
-void emit_nop(CodeBuffer &cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
+void emit_nop(C2_MacroAssembler *masm) {
   __ nop();
 }
 
 
-void emit_call_reloc(CodeBuffer &cbuf, const MachCallNode *n, MachOper *m, RelocationHolder const& rspec) {
+void emit_call_reloc(C2_MacroAssembler *masm, const MachCallNode *n, MachOper *m, RelocationHolder const& rspec) {
   int ret_addr_offset0 = n->as_MachCall()->ret_addr_offset();
-  int call_site_offset = cbuf.insts()->mark_off();
-  C2_MacroAssembler _masm(&cbuf);
+  int call_site_offset = __ code()->insts()->mark_off();
   __ set_inst_mark(); // needed in emit_to_interp_stub() to locate the call
   address target = (address)m->method();
   assert(n->as_MachCall()->entry_point() == target, "sanity");
@@ -210,8 +207,8 @@ void emit_call_reloc(CodeBuffer &cbuf, const MachCallNode *n, MachOper *m, Reloc
 
 //=============================================================================
 // REQUIRED FUNCTIONALITY for encoding
-void emit_lo(CodeBuffer &cbuf, int val) {  }
-void emit_hi(CodeBuffer &cbuf, int val) {  }
+void emit_lo(C2_MacroAssembler *masm, int val) {  }
+void emit_hi(C2_MacroAssembler *masm, int val) {  }
 
 
 //=============================================================================
@@ -232,10 +229,9 @@ void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, Phase
   ShouldNotReachHere();
 }
 
-void MachConstantBaseNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
+void MachConstantBaseNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const {
   Compile* C = ra_->C;
   ConstantTable& constant_table = C->output()->constant_table();
-  C2_MacroAssembler _masm(&cbuf);
 
   Register r = as_Register(ra_->get_encode(this));
   CodeSection* consts_section = __ code()->consts();
@@ -303,9 +299,8 @@ void MachPrologNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
 }
 #endif
 
-void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
 
   for (int i = 0; i < OptoPrologueNops; i++) {
     __ nop();
@@ -334,11 +329,11 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
 
   if (C->stub_function() == nullptr) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    bs->nmethod_entry_barrier(&_masm);
+    bs->nmethod_entry_barrier(masm);
   }
 
   // offset from scratch buffer is not valid
-  if (strcmp(cbuf.name(), "Compile::Fill_buffer") == 0) {
+  if (strcmp(__ code()->name(), "Compile::Fill_buffer") == 0) {
     C->output()->set_frame_complete( __ offset() );
   }
 
@@ -379,8 +374,7 @@ void MachEpilogNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
 }
 #endif
 
-void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
+void MachEpilogNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
 
   size_t framesize = C->output()->frame_size_in_bytes();
@@ -430,7 +424,7 @@ static inline bool is_iRegLd_memhd(OptoReg::Name src_first, OptoReg::Name src_se
   return (rlo&1)==0 && (rlo+1 == rhi) && is_memoryHD(offset);
 }
 
-uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
+uint MachSpillCopyNode::implementation( C2_MacroAssembler *masm,
                                         PhaseRegAlloc *ra_,
                                         bool do_size,
                                         outputStream* st ) const {
@@ -463,14 +457,12 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   // Bailout only for real instruction emit.
   // This requires a single comment change in shared code. ( see output.cpp "Normal" instruction case )
 
-  C2_MacroAssembler _masm(cbuf);
-
   // --------------------------------------
   // Check for mem-mem move.  Load into unused float registers and fall into
   // the float-store case.
   if (src_first_rc == rc_stack && dst_first_rc == rc_stack) {
     int offset = ra_->reg2offset(src_first);
-    if (cbuf && !is_memoryfp(offset)) {
+    if (masm && !is_memoryfp(offset)) {
       ra_->C->record_method_not_compilable("unable to handle large constant offsets");
       return 0;
     } else {
@@ -480,7 +472,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
         src_second    = OptoReg::Name(R_mem_copy_hi_num);
         src_first_rc  = rc_float;
         src_second_rc = rc_float;
-        if (cbuf) {
+        if (masm) {
           __ ldr_double(Rmemcopy, Address(SP, offset));
         } else if (!do_size) {
           st->print(LDR_DOUBLE "   R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(src_first),offset);
@@ -488,7 +480,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
       } else {
         src_first     = OptoReg::Name(R_mem_copy_lo_num);
         src_first_rc  = rc_float;
-        if (cbuf) {
+        if (masm) {
           __ ldr_float(Rmemcopy, Address(SP, offset));
         } else if (!do_size) {
           st->print(LDR_FLOAT "   R_%s,[R_SP + #%d]\t! spill",OptoReg::regname(src_first),offset);
@@ -507,7 +499,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   if (src_first_rc == rc_int && dst_first_rc == rc_int) {
     // Else normal reg-reg copy
     assert( src_second != dst_first, "smashed second before evacuating it" );
-    if (cbuf) {
+    if (masm) {
       __ mov(reg_to_register_object(Matcher::_regEncode[dst_first]), reg_to_register_object(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
     } else if (!do_size) {
@@ -522,13 +514,13 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   // Check for integer store
   if (src_first_rc == rc_int && dst_first_rc == rc_stack) {
     int offset = ra_->reg2offset(dst_first);
-    if (cbuf && !is_memoryI(offset)) {
+    if (masm && !is_memoryI(offset)) {
       ra_->C->record_method_not_compilable("unable to handle large constant offsets");
       return 0;
     } else {
       if (src_second_rc != rc_bad && is_iRegLd_memhd(src_first, src_second, offset)) {
         assert((src_first&1)==0 && src_first+1 == src_second, "pair of registers must be aligned/contiguous");
-        if (cbuf) {
+        if (masm) {
           __ str_64(reg_to_register_object(Matcher::_regEncode[src_first]), Address(SP, offset));
 #ifndef PRODUCT
         } else if (!do_size) {
@@ -538,7 +530,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
         }
         return size + 4;
       } else {
-        if (cbuf) {
+        if (masm) {
           __ str_32(reg_to_register_object(Matcher::_regEncode[src_first]), Address(SP, offset));
 #ifndef PRODUCT
         } else if (!do_size) {
@@ -554,13 +546,13 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   // Check for integer load
   if (dst_first_rc == rc_int && src_first_rc == rc_stack) {
     int offset = ra_->reg2offset(src_first);
-    if (cbuf && !is_memoryI(offset)) {
+    if (masm && !is_memoryI(offset)) {
       ra_->C->record_method_not_compilable("unable to handle large constant offsets");
       return 0;
     } else {
       if (src_second_rc != rc_bad && is_iRegLd_memhd(dst_first, dst_second, offset)) {
         assert((src_first&1)==0 && src_first+1 == src_second, "pair of registers must be aligned/contiguous");
-        if (cbuf) {
+        if (masm) {
           __ ldr_64(reg_to_register_object(Matcher::_regEncode[dst_first]), Address(SP, offset));
 #ifndef PRODUCT
         } else if (!do_size) {
@@ -570,7 +562,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
         }
         return size + 4;
       } else {
-        if (cbuf) {
+        if (masm) {
           __ ldr_32(reg_to_register_object(Matcher::_regEncode[dst_first]), Address(SP, offset));
 #ifndef PRODUCT
         } else if (!do_size) {
@@ -587,7 +579,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   if (src_first_rc == rc_float && dst_first_rc == rc_float) {
     if (src_second_rc != rc_bad) {
       assert((src_first&1)==0 && src_first+1 == src_second && (dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers must be aligned/contiguous");
-      if (cbuf) {
+      if (masm) {
       __ mov_double(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), reg_to_FloatRegister_object(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
       } else if (!do_size) {
@@ -598,7 +590,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
       }
       return 4;
     }
-    if (cbuf) {
+    if (masm) {
       __ mov_float(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), reg_to_FloatRegister_object(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
     } else if (!do_size) {
@@ -613,14 +605,14 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   // Check for float store
   if (src_first_rc == rc_float && dst_first_rc == rc_stack) {
     int offset = ra_->reg2offset(dst_first);
-    if (cbuf && !is_memoryfp(offset)) {
+    if (masm && !is_memoryfp(offset)) {
       ra_->C->record_method_not_compilable("unable to handle large constant offsets");
       return 0;
     } else {
       // Further check for aligned-adjacent pair, so we can use a double store
       if (src_second_rc != rc_bad) {
         assert((src_first&1)==0 && src_first+1 == src_second && (dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers and stack slots must be aligned/contiguous");
-        if (cbuf) {
+        if (masm) {
           __ str_double(reg_to_FloatRegister_object(Matcher::_regEncode[src_first]), Address(SP, offset));
 #ifndef PRODUCT
         } else if (!do_size) {
@@ -630,7 +622,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
         }
         return size + 4;
       } else {
-        if (cbuf) {
+        if (masm) {
           __ str_float(reg_to_FloatRegister_object(Matcher::_regEncode[src_first]), Address(SP, offset));
 #ifndef PRODUCT
         } else if (!do_size) {
@@ -646,14 +638,14 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   // Check for float load
   if (dst_first_rc == rc_float && src_first_rc == rc_stack) {
     int offset = ra_->reg2offset(src_first);
-    if (cbuf && !is_memoryfp(offset)) {
+    if (masm && !is_memoryfp(offset)) {
       ra_->C->record_method_not_compilable("unable to handle large constant offsets");
       return 0;
     } else {
       // Further check for aligned-adjacent pair, so we can use a double store
       if (src_second_rc != rc_bad) {
         assert((src_first&1)==0 && src_first+1 == src_second && (dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers and stack slots must be aligned/contiguous");
-        if (cbuf) {
+        if (masm) {
           __ ldr_double(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), Address(SP, offset));
 #ifndef PRODUCT
         } else if (!do_size) {
@@ -663,7 +655,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
         }
         return size + 4;
       } else {
-        if (cbuf) {
+        if (masm) {
           __ ldr_float(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), Address(SP, offset));
 #ifndef PRODUCT
         } else if (!do_size) {
@@ -683,7 +675,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
       assert((dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers must be aligned/contiguous");
       assert((src_first&1)==0 && src_first+1 == src_second, "pairs of registers must be aligned/contiguous");
       assert(src_second_rc == rc_int && dst_second_rc == rc_float, "unsupported");
-      if (cbuf) {
+      if (masm) {
         __ fmdrr(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), reg_to_register_object(Matcher::_regEncode[src_first]), reg_to_register_object(Matcher::_regEncode[src_second]));
 #ifndef PRODUCT
       } else if (!do_size) {
@@ -693,7 +685,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
       }
       return size + 4;
     } else {
-      if (cbuf) {
+      if (masm) {
         __ fmsr(reg_to_FloatRegister_object(Matcher::_regEncode[dst_first]), reg_to_register_object(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
       } else if (!do_size) {
@@ -712,7 +704,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
       assert((src_first&1)==0 && src_first+1 == src_second, "pairs of registers must be aligned/contiguous");
       assert((dst_first&1)==0 && dst_first+1 == dst_second, "pairs of registers must be aligned/contiguous");
       assert(src_second_rc == rc_float && dst_second_rc == rc_int, "unsupported");
-      if (cbuf) {
+      if (masm) {
         __ fmrrd(reg_to_register_object(Matcher::_regEncode[dst_first]), reg_to_register_object(Matcher::_regEncode[dst_second]), reg_to_FloatRegister_object(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
       } else if (!do_size) {
@@ -722,7 +714,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
       }
       return size + 4;
     } else {
-      if (cbuf) {
+      if (masm) {
         __ fmrs(reg_to_register_object(Matcher::_regEncode[dst_first]), reg_to_FloatRegister_object(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
       } else if (!do_size) {
@@ -746,7 +738,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   // register (else it's a hi-bits-to-hi-bits copy which should have
   // happened already as part of a 64-bit move)
   if (src_second_rc == rc_int && dst_second_rc == rc_int) {
-    if (cbuf) {
+    if (masm) {
       __ mov(reg_to_register_object(Matcher::_regEncode[dst_second]), reg_to_register_object(Matcher::_regEncode[src_second]));
 #ifndef PRODUCT
     } else if (!do_size) {
@@ -763,11 +755,11 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   if (src_second_rc == rc_int && dst_second_rc == rc_stack) {
     int offset = ra_->reg2offset(dst_second);
 
-    if (cbuf && !is_memoryP(offset)) {
+    if (masm && !is_memoryP(offset)) {
       ra_->C->record_method_not_compilable("unable to handle large constant offsets");
       return 0;
     } else {
-      if (cbuf) {
+      if (masm) {
         __ str(reg_to_register_object(Matcher::_regEncode[src_second]), Address(SP, offset));
 #ifndef PRODUCT
       } else if (!do_size) {
@@ -782,11 +774,11 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
   // Check for high word integer load
   if (dst_second_rc == rc_int && src_second_rc == rc_stack) {
     int offset = ra_->reg2offset(src_second);
-    if (cbuf && !is_memoryP(offset)) {
+    if (masm && !is_memoryP(offset)) {
       ra_->C->record_method_not_compilable("unable to handle large constant offsets");
       return 0;
     } else {
-      if (cbuf) {
+      if (masm) {
         __ ldr(reg_to_register_object(Matcher::_regEncode[dst_second]), Address(SP, offset));
 #ifndef PRODUCT
       } else if (!do_size) {
@@ -804,12 +796,12 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf,
 
 #ifndef PRODUCT
 void MachSpillCopyNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
-  implementation(nullptr, ra_, false, st );
+  implementation( nullptr, ra_, false, st );
 }
 #endif
 
-void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  implementation( &cbuf, ra_, false, nullptr );
+void MachSpillCopyNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  implementation( masm, ra_, false, nullptr );
 }
 
 uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
@@ -823,8 +815,7 @@ void MachNopNode::format( PhaseRegAlloc *, outputStream *st ) const {
 }
 #endif
 
-void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc * ) const {
-  C2_MacroAssembler _masm(&cbuf);
+void MachNopNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc * ) const {
   for(int i = 0; i < _count; i += 1) {
     __ nop();
   }
@@ -844,8 +835,7 @@ void BoxLockNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
 }
 #endif
 
-void BoxLockNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
+void BoxLockNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
   int reg = ra_->get_encode(this);
   Register dst = reg_to_register_object(reg);
@@ -875,8 +865,7 @@ void MachUEPNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
 }
 #endif
 
-void MachUEPNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
+void MachUEPNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   __ ic_check(InteriorEntryAlignment);
 }
 
@@ -888,9 +877,7 @@ uint MachUEPNode::size(PhaseRegAlloc *ra_) const {
 //=============================================================================
 
 // Emit exception handler code.
-int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
-
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm) {
   address base = __ start_a_stub(size_exception_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -909,11 +896,9 @@ int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf) {
   return offset;
 }
 
-int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf) {
+int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   // Can't use any of the current frame's registers as we may have deopted
   // at a poll and everything can be live.
-  C2_MacroAssembler _masm(&cbuf);
-
   address base = __ start_a_stub(size_deopt_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -1208,13 +1193,25 @@ bool maybe_far_call(const MachCallNode *n) {
 // tertiary opcode.  Only the opcode sections which a particular instruction
 // needs for encoding need to be specified.
 encode %{
+  // Set instruction mark in MacroAssembler. This is used only in
+  // instructions that emit bytes directly to the CodeBuffer wraped
+  // in the MacroAssembler. Should go away once all "instruct" are
+  // patched to emit bytes only using methods in MacroAssembler.
+  enc_class SetInstMark %{
+    __ set_inst_mark();
+  %}
+
+  enc_class ClearInstMark %{
+    __ clear_inst_mark();
+  %}
+
   enc_class call_epilog %{
     // nothing
   %}
 
   enc_class Java_To_Runtime (method meth) %{
     // CALL directly to the runtime
-    emit_call_reloc(cbuf, as_MachCall(), $meth, runtime_call_Relocation::spec());
+    emit_call_reloc(masm, as_MachCall(), $meth, runtime_call_Relocation::spec());
   %}
 
   enc_class Java_Static_Call (method meth) %{
@@ -1222,15 +1219,15 @@ encode %{
     // who we intended to call.
 
     if ( !_method) {
-      emit_call_reloc(cbuf, as_MachCall(), $meth, runtime_call_Relocation::spec());
+      emit_call_reloc(masm, as_MachCall(), $meth, runtime_call_Relocation::spec());
     } else {
-      int method_index = resolved_method_index(cbuf);
+      int method_index = resolved_method_index(masm);
       RelocationHolder rspec = _optimized_virtual ? opt_virtual_call_Relocation::spec(method_index)
                                                   : static_call_Relocation::spec(method_index);
-      emit_call_reloc(cbuf, as_MachCall(), $meth, rspec);
+      emit_call_reloc(masm, as_MachCall(), $meth, rspec);
 
       // Emit stubs for static call.
-      address stub = CompiledDirectCall::emit_to_interp_stub(cbuf);
+      address stub = CompiledDirectCall::emit_to_interp_stub(masm);
       if (stub == nullptr) {
         ciEnv::current()->record_failure("CodeCache is full");
         return;
@@ -1240,39 +1237,35 @@ encode %{
 
   enc_class save_last_PC %{
     // preserve mark
-    address mark = cbuf.insts()->mark();
-    debug_only(int off0 = cbuf.insts_size());
-    C2_MacroAssembler _masm(&cbuf);
+    address mark = __ inst_mark();
+    debug_only(int off0 = __ offset());
     int ret_addr_offset = as_MachCall()->ret_addr_offset();
     __ adr(LR, mark + ret_addr_offset);
     __ str(LR, Address(Rthread, JavaThread::last_Java_pc_offset()));
-    debug_only(int off1 = cbuf.insts_size());
+    debug_only(int off1 = __ offset());
     assert(off1 - off0 == 2 * Assembler::InstructionSize, "correct size prediction");
     // restore mark
-    cbuf.insts()->set_mark(mark);
+    __ set_inst_mark(mark);
   %}
 
   enc_class preserve_SP %{
     // preserve mark
-    address mark = cbuf.insts()->mark();
-    debug_only(int off0 = cbuf.insts_size());
-    C2_MacroAssembler _masm(&cbuf);
+    address mark = __ inst_mark();
+    debug_only(int off0 = __ offset());
     // FP is preserved across all calls, even compiled calls.
     // Use it to preserve SP in places where the callee might change the SP.
     __ mov(Rmh_SP_save, SP);
-    debug_only(int off1 = cbuf.insts_size());
+    debug_only(int off1 = __ offset());
     assert(off1 - off0 == 4, "correct size prediction");
     // restore mark
-    cbuf.insts()->set_mark(mark);
+    __ set_inst_mark(mark);
   %}
 
   enc_class restore_SP %{
-    C2_MacroAssembler _masm(&cbuf);
     __ mov(SP, Rmh_SP_save);
   %}
 
   enc_class Java_Dynamic_Call (method meth) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register R8_ic_reg = reg_to_register_object(Matcher::inline_cache_reg_encode());
     assert(R8_ic_reg == Ricklass, "should be");
     __ set_inst_mark();
@@ -1281,9 +1274,9 @@ encode %{
     address  virtual_call_oop_addr = __ inst_mark();
     // CALL to fixup routine.  Fixup routine uses ScopeDesc info to determine
     // who we intended to call.
-    int method_index = resolved_method_index(cbuf);
+    int method_index = resolved_method_index(masm);
     __ relocate(virtual_call_Relocation::spec(virtual_call_oop_addr, method_index));
-    emit_call_reloc(cbuf, as_MachCall(), $meth, RelocationHolder::none);
+    emit_call_reloc(masm, as_MachCall(), $meth, RelocationHolder::none);
   %}
 
   enc_class LdReplImmI(immI src, regD dst, iRegI tmp, int cnt, int wth) %{
@@ -1300,7 +1293,6 @@ encode %{
         val |= (val << bit_width);
       }
     }
-    C2_MacroAssembler _masm(&cbuf);
 
     if (val == -1) {
       __ mvn($tmp$$Register, 0);
@@ -1317,7 +1309,6 @@ encode %{
     // Replicate float con 2 times and pack into vector (8 bytes) in regD.
     float fval = $src$$constant;
     int val = *((int*)&fval);
-    C2_MacroAssembler _masm(&cbuf);
 
     if (val == -1) {
       __ mvn($tmp$$Register, 0);
@@ -1332,7 +1323,6 @@ encode %{
 
   enc_class enc_String_Compare(R0RegP str1, R1RegP str2, R2RegI cnt1, R3RegI cnt2, iRegI result, iRegI tmp1, iRegI tmp2) %{
     Label Ldone, Lloop;
-    C2_MacroAssembler _masm(&cbuf);
 
     Register   str1_reg = $str1$$Register;
     Register   str2_reg = $str2$$Register;
@@ -1424,7 +1414,6 @@ encode %{
 
   enc_class enc_String_Equals(R0RegP str1, R1RegP str2, R2RegI cnt, iRegI result, iRegI tmp1, iRegI tmp2) %{
     Label Lchar, Lchar_loop, Ldone, Lequal;
-    C2_MacroAssembler _masm(&cbuf);
 
     Register   str1_reg = $str1$$Register;
     Register   str2_reg = $str2$$Register;
@@ -1486,7 +1475,6 @@ encode %{
 
   enc_class enc_Array_Equals(R0RegP ary1, R1RegP ary2, iRegI tmp1, iRegI tmp2, iRegI tmp3, iRegI result) %{
     Label Ldone, Lloop, Lequal;
-    C2_MacroAssembler _masm(&cbuf);
 
     Register   ary1_reg = $ary1$$Register;
     Register   ary2_reg = $ary2$$Register;
@@ -8847,7 +8835,7 @@ instruct CallStaticJavaDirect( method meth ) %{
 
   ins_cost(CALL_COST);
   format %{ "CALL,static ==> " %}
-  ins_encode( Java_Static_Call( meth ), call_epilog );
+  ins_encode( SetInstMark, Java_Static_Call( meth ), call_epilog, ClearInstMark );
   ins_pipe(simple_call);
 %}
 
@@ -8861,7 +8849,7 @@ instruct CallStaticJavaHandle( method meth ) %{
 
   ins_cost(CALL_COST);
   format %{ "CALL,static/MethodHandle ==> " %}
-  ins_encode( preserve_SP, Java_Static_Call( meth ), restore_SP, call_epilog );
+  ins_encode( SetInstMark, preserve_SP, Java_Static_Call( meth ), restore_SP, call_epilog, ClearInstMark );
   ins_pipe(simple_call);
 %}
 
@@ -8873,7 +8861,7 @@ instruct CallDynamicJavaDirect( method meth ) %{
   ins_cost(CALL_COST);
   format %{ "MOV_OOP    (empty),R_R8\n\t"
             "CALL,dynamic  ; NOP ==> " %}
-  ins_encode( Java_Dynamic_Call( meth ), call_epilog );
+  ins_encode( SetInstMark, Java_Dynamic_Call( meth ), call_epilog, ClearInstMark );
   ins_pipe(call);
 %}
 
@@ -8883,8 +8871,8 @@ instruct CallRuntimeDirect(method meth) %{
   effect(USE meth);
   ins_cost(CALL_COST);
   format %{ "CALL,runtime" %}
-  ins_encode( Java_To_Runtime( meth ),
-              call_epilog );
+  ins_encode( SetInstMark, Java_To_Runtime( meth ),
+              call_epilog, ClearInstMark );
   ins_pipe(simple_call);
 %}
 
@@ -8895,8 +8883,8 @@ instruct CallLeafDirect(method meth) %{
   ins_cost(CALL_COST);
   format %{ "CALL,runtime leaf" %}
   // TODO: need save_last_PC here?
-  ins_encode( Java_To_Runtime( meth ),
-              call_epilog );
+  ins_encode( SetInstMark, Java_To_Runtime( meth ),
+              call_epilog, ClearInstMark );
   ins_pipe(simple_call);
 %}
 
@@ -8907,8 +8895,8 @@ instruct CallLeafNoFPDirect(method meth) %{
   ins_cost(CALL_COST);
   format %{ "CALL,runtime leaf nofp" %}
   // TODO: need save_last_PC here?
-  ins_encode( Java_To_Runtime( meth ),
-              call_epilog );
+  ins_encode( SetInstMark, Java_To_Runtime( meth ),
+              call_epilog, ClearInstMark );
   ins_pipe(simple_call);
 %}
 
diff --git a/src/hotspot/cpu/arm/compiledIC_arm.cpp b/src/hotspot/cpu/arm/compiledIC_arm.cpp
index 71389d2353d..a2c37e2907c 100644
--- a/src/hotspot/cpu/arm/compiledIC_arm.cpp
+++ b/src/hotspot/cpu/arm/compiledIC_arm.cpp
@@ -34,20 +34,18 @@
 
 // ----------------------------------------------------------------------------
 #if COMPILER2_OR_JVMCI
-#define __ _masm.
+#define __ masm->
 // emit call stub, compiled java to interpreter
-address CompiledDirectCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) {
+address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark) {
   // Stub is fixed up when the corresponding call is converted from calling
   // compiled code to calling interpreted code.
   // set (empty), R9
   // b -1
 
   if (mark == nullptr) {
-    mark = cbuf.insts_mark();  // get mark within main instrs section
+    mark = __ inst_mark();  // get mark within main instrs section
   }
 
-  MacroAssembler _masm(&cbuf);
-
   address base = __ start_a_stub(to_interp_stub_size());
   if (base == nullptr) {
     return nullptr;  // CodeBuffer::expand failed
diff --git a/src/hotspot/cpu/ppc/compiledIC_ppc.cpp b/src/hotspot/cpu/ppc/compiledIC_ppc.cpp
index 355ac4815d5..0780837e8e5 100644
--- a/src/hotspot/cpu/ppc/compiledIC_ppc.cpp
+++ b/src/hotspot/cpu/ppc/compiledIC_ppc.cpp
@@ -77,18 +77,14 @@
 // Usage of r1 and r2 in the stubs allows to distinguish them.
 
 const int IC_pos_in_java_to_interp_stub = 8;
-#define __ _masm.
-address CompiledDirectCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark/* = nullptr*/) {
+#define __ masm->
+address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark/* = nullptr*/) {
 #ifdef COMPILER2
   if (mark == nullptr) {
     // Get the mark within main instrs section which is set to the address of the call.
-    mark = cbuf.insts_mark();
+    mark = __ inst_mark();
   }
 
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a stub.
-  MacroAssembler _masm(&cbuf);
-
   // Start the stub.
   address stub = __ start_a_stub(CompiledDirectCall::to_interp_stub_size());
   if (stub == nullptr) {
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoah_ppc.ad b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoah_ppc.ad
index 4825ca9cf81..eb4894656e2 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoah_ppc.ad
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoah_ppc.ad
@@ -44,7 +44,7 @@ instruct compareAndSwapP_shenandoah(iRegIdst res, indirect mem, iRegPsrc oldval,
   format %{ "CMPXCHG $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
     ShenandoahBarrierSet::assembler()->cmpxchg_oop(
-        &_masm,
+        masm,
         $mem$$Register, $oldval$$Register, $newval$$Register,
         $tmp1$$Register, $tmp2$$Register,
         false, $res$$Register
@@ -65,7 +65,7 @@ instruct compareAndSwapN_shenandoah(iRegIdst res, indirect mem, iRegNsrc oldval,
   format %{ "CMPXCHG $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
     ShenandoahBarrierSet::assembler()->cmpxchg_oop(
-        &_masm,
+        masm,
         $mem$$Register, $oldval$$Register, $newval$$Register,
         $tmp1$$Register, $tmp2$$Register,
         false, $res$$Register
@@ -86,7 +86,7 @@ instruct compareAndSwapP_acq_shenandoah(iRegIdst res, indirect mem, iRegPsrc old
   format %{ "CMPXCHGD acq $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
     ShenandoahBarrierSet::assembler()->cmpxchg_oop(
-        &_masm,
+        masm,
         $mem$$Register, $oldval$$Register, $newval$$Register,
         $tmp1$$Register, $tmp2$$Register,
         false, $res$$Register
@@ -112,7 +112,7 @@ instruct compareAndSwapN_acq_shenandoah(iRegIdst res, indirect mem, iRegNsrc old
   format %{ "CMPXCHGD acq $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
     ShenandoahBarrierSet::assembler()->cmpxchg_oop(
-        &_masm,
+        masm,
         $mem$$Register, $oldval$$Register, $newval$$Register,
         $tmp1$$Register, $tmp2$$Register,
         false, $res$$Register
@@ -137,7 +137,7 @@ instruct compareAndExchangeP_shenandoah(iRegPdst res, indirect mem, iRegPsrc old
   format %{ "CMPXCHGD $res, $mem, $oldval, $newval; as ptr; ptr" %}
   ins_encode %{
     ShenandoahBarrierSet::assembler()->cmpxchg_oop(
-        &_masm,
+        masm,
         $mem$$Register, $oldval$$Register, $newval$$Register,
         $tmp1$$Register, $tmp2$$Register,
         true, $res$$Register
@@ -157,7 +157,7 @@ instruct compareAndExchangeN_shenandoah(iRegNdst res, indirect mem, iRegNsrc old
   format %{ "CMPXCHGD $res, $mem, $oldval, $newval; as ptr; ptr" %}
   ins_encode %{
     ShenandoahBarrierSet::assembler()->cmpxchg_oop(
-        &_masm,
+        masm,
         $mem$$Register, $oldval$$Register, $newval$$Register,
         $tmp1$$Register, $tmp2$$Register,
         true, $res$$Register
@@ -177,7 +177,7 @@ instruct compareAndExchangePAcq_shenandoah(iRegPdst res, indirect mem, iRegPsrc
   format %{ "CMPXCHGD acq $res, $mem, $oldval, $newval; as ptr; ptr" %}
   ins_encode %{
     ShenandoahBarrierSet::assembler()->cmpxchg_oop(
-        &_masm,
+        masm,
         $mem$$Register, $oldval$$Register, $newval$$Register,
         $tmp1$$Register, $tmp2$$Register,
         true, $res$$Register
@@ -202,7 +202,7 @@ instruct compareAndExchangeNAcq_shenandoah(iRegNdst res, indirect mem, iRegNsrc
   format %{ "CMPXCHGD acq $res, $mem, $oldval, $newval; as ptr; ptr" %}
   ins_encode %{
     ShenandoahBarrierSet::assembler()->cmpxchg_oop(
-        &_masm,
+        masm,
         $mem$$Register, $oldval$$Register, $newval$$Register,
         $tmp1$$Register, $tmp2$$Register,
         true, $res$$Register
diff --git a/src/hotspot/cpu/ppc/gc/x/x_ppc.ad b/src/hotspot/cpu/ppc/gc/x/x_ppc.ad
index 644fb3def38..b206b6593fb 100644
--- a/src/hotspot/cpu/ppc/gc/x/x_ppc.ad
+++ b/src/hotspot/cpu/ppc/gc/x/x_ppc.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2021 SAP SE. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -32,7 +32,7 @@ source_hpp %{
 
 source %{
 
-static void x_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref,
+static void x_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref,
                            Register tmp, uint8_t barrier_data) {
   if (barrier_data == XLoadBarrierElided) {
     return;
@@ -45,14 +45,14 @@ static void x_load_barrier(MacroAssembler& _masm, const MachNode* node, Address
   __ bind(*stub->continuation());
 }
 
-static void x_load_barrier_slow_path(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref,
+static void x_load_barrier_slow_path(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref,
                                      Register tmp) {
   XLoadBarrierStubC2* const stub = XLoadBarrierStubC2::create(node, ref_addr, ref, tmp, XLoadBarrierStrong);
   __ b(*stub->entry());
   __ bind(*stub->continuation());
 }
 
-static void x_compare_and_swap(MacroAssembler& _masm, const MachNode* node,
+static void x_compare_and_swap(MacroAssembler* masm, const MachNode* node,
                               Register res, Register mem, Register oldval, Register newval,
                               Register tmp_xchg, Register tmp_mask,
                               bool weak, bool acquire) {
@@ -70,7 +70,7 @@ static void x_compare_and_swap(MacroAssembler& _masm, const MachNode* node,
     __ beq(CCR0, skip_barrier);
 
     // CAS must have failed because pointer in memory is bad.
-    x_load_barrier_slow_path(_masm, node, Address(mem), tmp_xchg, res /* used as tmp */);
+    x_load_barrier_slow_path(masm, node, Address(mem), tmp_xchg, res /* used as tmp */);
 
     __ cmpxchgd(CCR0, tmp_xchg, oldval, newval, mem,
                 MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(), res, nullptr, true, weak);
@@ -89,7 +89,7 @@ static void x_compare_and_swap(MacroAssembler& _masm, const MachNode* node,
   }
 }
 
-static void x_compare_and_exchange(MacroAssembler& _masm, const MachNode* node,
+static void x_compare_and_exchange(MacroAssembler* masm, const MachNode* node,
                                    Register res, Register mem, Register oldval, Register newval, Register tmp,
                                    bool weak, bool acquire) {
   // z-specific load barrier requires strong CAS operations.
@@ -104,7 +104,7 @@ static void x_compare_and_exchange(MacroAssembler& _masm, const MachNode* node,
     __ and_(tmp, tmp, res);
     __ beq(CCR0, skip_barrier);
 
-    x_load_barrier_slow_path(_masm, node, Address(mem), res, tmp);
+    x_load_barrier_slow_path(masm, node, Address(mem), res, tmp);
 
     __ cmpxchgd(CCR0, res, oldval, newval, mem,
                 MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(), noreg, nullptr, true, weak);
@@ -138,7 +138,7 @@ instruct xLoadP(iRegPdst dst, memoryAlg4 mem, iRegPdst tmp, flagsRegCR0 cr0)
   ins_encode %{
     assert($mem$$index == 0, "sanity");
     __ ld($dst$$Register, $mem$$disp, $mem$$base$$Register);
-    x_load_barrier(_masm, this, Address($mem$$base$$Register, $mem$$disp), $dst$$Register, $tmp$$Register, barrier_data());
+    x_load_barrier(masm, this, Address($mem$$base$$Register, $mem$$disp), $dst$$Register, $tmp$$Register, barrier_data());
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -156,7 +156,7 @@ instruct xLoadP_acq(iRegPdst dst, memoryAlg4 mem, iRegPdst tmp, flagsRegCR0 cr0)
   format %{ "LD acq $dst, $mem" %}
   ins_encode %{
     __ ld($dst$$Register, $mem$$disp, $mem$$base$$Register);
-    x_load_barrier(_masm, this, Address($mem$$base$$Register, $mem$$disp), $dst$$Register, $tmp$$Register, barrier_data());
+    x_load_barrier(masm, this, Address($mem$$base$$Register, $mem$$disp), $dst$$Register, $tmp$$Register, barrier_data());
 
     // Uses the isync instruction as an acquire barrier.
     // This exploits the compare and the branch in the z load barrier (load, compare and branch, isync).
@@ -175,7 +175,7 @@ instruct xCompareAndSwapP(iRegIdst res, iRegPdst mem, iRegPsrc oldval, iRegPsrc
 
   format %{ "CMPXCHG $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
-    x_compare_and_swap(_masm, this,
+    x_compare_and_swap(masm, this,
                                 $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register,
                                 $tmp_xchg$$Register, $tmp_mask$$Register,
                                 false /* weak */, false /* acquire */);
@@ -193,7 +193,7 @@ instruct xCompareAndSwapP_acq(iRegIdst res, iRegPdst mem, iRegPsrc oldval, iRegP
 
   format %{ "CMPXCHG acq $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
-    x_compare_and_swap(_masm, this,
+    x_compare_and_swap(masm, this,
                                 $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register,
                                 $tmp_xchg$$Register, $tmp_mask$$Register,
                                 false /* weak */, true /* acquire */);
@@ -211,7 +211,7 @@ instruct xCompareAndSwapPWeak(iRegIdst res, iRegPdst mem, iRegPsrc oldval, iRegP
 
   format %{ "weak CMPXCHG $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
-    x_compare_and_swap(_masm, this,
+    x_compare_and_swap(masm, this,
                                 $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register,
                                 $tmp_xchg$$Register, $tmp_mask$$Register,
                                 true /* weak */, false /* acquire */);
@@ -229,7 +229,7 @@ instruct xCompareAndSwapPWeak_acq(iRegIdst res, iRegPdst mem, iRegPsrc oldval, i
 
   format %{ "weak CMPXCHG acq $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
-    x_compare_and_swap(_masm, this,
+    x_compare_and_swap(masm, this,
                                 $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register,
                                 $tmp_xchg$$Register, $tmp_mask$$Register,
                                 true /* weak */, true /* acquire */);
@@ -250,7 +250,7 @@ instruct xCompareAndExchangeP(iRegPdst res, iRegPdst mem, iRegPsrc oldval, iRegP
 
   format %{ "CMPXCHG $res, $mem, $oldval, $newval; as ptr; ptr" %}
   ins_encode %{
-    x_compare_and_exchange(_masm, this,
+    x_compare_and_exchange(masm, this,
                                     $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register, $tmp$$Register,
                                     false /* weak */, false /* acquire */);
   %}
@@ -270,7 +270,7 @@ instruct xCompareAndExchangeP_acq(iRegPdst res, iRegPdst mem, iRegPsrc oldval, i
 
   format %{ "CMPXCHG acq $res, $mem, $oldval, $newval; as ptr; ptr" %}
   ins_encode %{
-    x_compare_and_exchange(_masm, this,
+    x_compare_and_exchange(masm, this,
                                     $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register, $tmp$$Register,
                                     false /* weak */, true /* acquire */);
   %}
@@ -286,7 +286,7 @@ instruct xGetAndSetP(iRegPdst res, iRegPdst mem, iRegPsrc newval, iRegPdst tmp,
   format %{ "GetAndSetP $res, $mem, $newval" %}
   ins_encode %{
     __ getandsetd($res$$Register, $newval$$Register, $mem$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
-    x_load_barrier(_masm, this, Address(noreg, (intptr_t) 0), $res$$Register, $tmp$$Register, barrier_data());
+    x_load_barrier(masm, this, Address(noreg, (intptr_t) 0), $res$$Register, $tmp$$Register, barrier_data());
 
     if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
       __ isync();
diff --git a/src/hotspot/cpu/ppc/gc/z/z_ppc.ad b/src/hotspot/cpu/ppc/gc/z/z_ppc.ad
index 777e5a785a7..017574d40ff 100644
--- a/src/hotspot/cpu/ppc/gc/z/z_ppc.ad
+++ b/src/hotspot/cpu/ppc/gc/z/z_ppc.ad
@@ -34,7 +34,7 @@ source %{
 
 #include "gc/z/zBarrierSetAssembler.hpp"
 
-static void z_color(MacroAssembler& _masm, Register dst, Register src) {
+static void z_color(MacroAssembler* masm, Register dst, Register src) {
   assert_different_registers(dst, src);
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodBits);
   __ li(dst, barrier_Relocation::unpatched); // Load color bits.
@@ -47,55 +47,55 @@ static void z_color(MacroAssembler& _masm, Register dst, Register src) {
   }
 }
 
-static void z_uncolor(MacroAssembler& _masm, Register ref) {
+static void z_uncolor(MacroAssembler* masm, Register ref) {
   __ srdi(ref, ref, ZPointerLoadShift);
 }
 
-static void check_color(MacroAssembler& _masm, Register ref, bool on_non_strong) {
+static void check_color(MacroAssembler* masm, Register ref, bool on_non_strong) {
   int relocFormat = on_non_strong ? ZBarrierRelocationFormatMarkBadMask
                                   : ZBarrierRelocationFormatLoadBadMask;
   __ relocate(barrier_Relocation::spec(), relocFormat);
   __ andi_(R0, ref, barrier_Relocation::unpatched);
 }
 
-static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref) {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(&_masm);
+static void z_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref) {
+  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   if (node->barrier_data() == ZBarrierElided) {
-    z_uncolor(_masm, ref);
+    z_uncolor(masm, ref);
   } else {
     const bool on_non_strong =
       ((node->barrier_data() & ZBarrierWeak) != 0) ||
       ((node->barrier_data() & ZBarrierPhantom) != 0);
 
-    check_color(_masm, ref, on_non_strong);
+    check_color(masm, ref, on_non_strong);
 
     ZLoadBarrierStubC2* const stub = ZLoadBarrierStubC2::create(node, ref_addr, ref);
     __ bne_far(CCR0, *stub->entry(), MacroAssembler::bc_far_optimize_on_relocate);
 
-    z_uncolor(_masm, ref);
+    z_uncolor(masm, ref);
     __ bind(*stub->continuation());
   }
 }
 
-static void z_store_barrier(MacroAssembler& _masm, const MachNode* node, Register ref_base, intptr_t disp, Register rnew_zaddress, Register rnew_zpointer, bool is_atomic) {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(&_masm);
+static void z_store_barrier(MacroAssembler* masm, const MachNode* node, Register ref_base, intptr_t disp, Register rnew_zaddress, Register rnew_zpointer, bool is_atomic) {
+  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   if (node->barrier_data() == ZBarrierElided) {
-    z_color(_masm, rnew_zpointer, rnew_zaddress);
+    z_color(masm, rnew_zpointer, rnew_zaddress);
   } else {
     bool is_native = (node->barrier_data() & ZBarrierNative) != 0;
     ZStoreBarrierStubC2* const stub = ZStoreBarrierStubC2::create(node, Address(ref_base, disp), rnew_zaddress, rnew_zpointer, is_native, is_atomic);
     ZBarrierSetAssembler* bs_asm = ZBarrierSet::assembler();
-    bs_asm->store_barrier_fast(&_masm, ref_base, disp, rnew_zaddress, rnew_zpointer, true /* in_nmethod */, is_atomic, *stub->entry(), *stub->continuation());
+    bs_asm->store_barrier_fast(masm, ref_base, disp, rnew_zaddress, rnew_zpointer, true /* in_nmethod */, is_atomic, *stub->entry(), *stub->continuation());
   }
 }
 
-static void z_compare_and_swap(MacroAssembler& _masm, const MachNode* node,
+static void z_compare_and_swap(MacroAssembler* masm, const MachNode* node,
                               Register res, Register mem, Register oldval, Register newval,
                               Register tmp1, Register tmp2, bool acquire) {
 
   Register rold_zpointer = tmp1, rnew_zpointer = tmp2;
-  z_store_barrier(_masm, node, mem, 0, newval, rnew_zpointer, true /* is_atomic */);
-  z_color(_masm, rold_zpointer, oldval);
+  z_store_barrier(masm, node, mem, 0, newval, rnew_zpointer, true /* is_atomic */);
+  z_color(masm, rold_zpointer, oldval);
   __ cmpxchgd(CCR0, R0, rold_zpointer, rnew_zpointer, mem,
               MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(), res, nullptr, true,
               false /* we could support weak, but benefit is questionable */);
@@ -111,17 +111,17 @@ static void z_compare_and_swap(MacroAssembler& _masm, const MachNode* node,
   }
 }
 
-static void z_compare_and_exchange(MacroAssembler& _masm, const MachNode* node,
+static void z_compare_and_exchange(MacroAssembler* masm, const MachNode* node,
                                    Register res, Register mem, Register oldval, Register newval,
                                    Register tmp, bool acquire) {
 
   Register rold_zpointer = R0, rnew_zpointer = tmp;
-  z_store_barrier(_masm, node, mem, 0, newval, rnew_zpointer, true /* is_atomic */);
-  z_color(_masm, rold_zpointer, oldval);
+  z_store_barrier(masm, node, mem, 0, newval, rnew_zpointer, true /* is_atomic */);
+  z_color(masm, rold_zpointer, oldval);
   __ cmpxchgd(CCR0, res, rold_zpointer, rnew_zpointer, mem,
               MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(), noreg, nullptr, true,
               false /* we could support weak, but benefit is questionable */);
-  z_uncolor(_masm, res);
+  z_uncolor(masm, res);
 
   if (acquire) {
     if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
@@ -149,7 +149,7 @@ instruct zLoadP(iRegPdst dst, memoryAlg4 mem, flagsRegCR0 cr0)
   ins_encode %{
     assert($mem$$index == 0, "sanity");
     __ ld($dst$$Register, $mem$$disp, $mem$$base$$Register);
-    z_load_barrier(_masm, this, Address($mem$$base$$Register, $mem$$disp), $dst$$Register);
+    z_load_barrier(masm, this, Address($mem$$base$$Register, $mem$$disp), $dst$$Register);
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -167,7 +167,7 @@ instruct zLoadP_acq(iRegPdst dst, memoryAlg4 mem, flagsRegCR0 cr0)
   format %{ "LD acq $dst, $mem" %}
   ins_encode %{
     __ ld($dst$$Register, $mem$$disp, $mem$$base$$Register);
-    z_load_barrier(_masm, this, Address($mem$$base$$Register, $mem$$disp), $dst$$Register);
+    z_load_barrier(masm, this, Address($mem$$base$$Register, $mem$$disp), $dst$$Register);
 
     // Uses the isync instruction as an acquire barrier.
     // This exploits the compare and the branch in the z load barrier (load, compare and branch, isync).
@@ -186,7 +186,7 @@ instruct zStoreP(memoryAlg4 mem, iRegPsrc src, iRegPdst tmp, flagsRegCR0 cr0)
   ins_cost(2 * MEMORY_REF_COST);
   format %{ "std    $mem, $src\t# ptr" %}
   ins_encode %{
-    z_store_barrier(_masm, this, $mem$$base$$Register, $mem$$disp, $src$$Register, $tmp$$Register, false /* is_atomic */);
+    z_store_barrier(masm, this, $mem$$base$$Register, $mem$$disp, $src$$Register, $tmp$$Register, false /* is_atomic */);
     __ std($tmp$$Register, $mem$$disp, $mem$$base$$Register);
   %}
   ins_pipe(pipe_class_default);
@@ -200,7 +200,7 @@ instruct zStorePNull(memoryAlg4 mem, immP_0 zero, iRegPdst tmp, flagsRegCR0 cr0)
   ins_cost(MEMORY_REF_COST);
   format %{ "std    $mem, null\t# ptr" %}
   ins_encode %{
-    z_store_barrier(_masm, this, $mem$$base$$Register, $mem$$disp, noreg, $tmp$$Register, false /* is_atomic */);
+    z_store_barrier(masm, this, $mem$$base$$Register, $mem$$disp, noreg, $tmp$$Register, false /* is_atomic */);
     __ std($tmp$$Register, $mem$$disp, $mem$$base$$Register);
   %}
   ins_pipe(pipe_class_default);
@@ -217,7 +217,7 @@ instruct zCompareAndSwapP(iRegIdst res, iRegPdst mem, iRegPsrc oldval, iRegPsrc
 
   format %{ "CMPXCHG $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
-    z_compare_and_swap(_masm, this,
+    z_compare_and_swap(masm, this,
                        $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register,
                        $tmp1$$Register, $tmp2$$Register,
                        false /* acquire */);
@@ -236,7 +236,7 @@ instruct zCompareAndSwapP_acq(iRegIdst res, iRegPdst mem, iRegPsrc oldval, iRegP
 
   format %{ "CMPXCHG acq $res, $mem, $oldval, $newval; as bool; ptr" %}
   ins_encode %{
-    z_compare_and_swap(_masm, this,
+    z_compare_and_swap(masm, this,
                        $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register,
                        $tmp1$$Register, $tmp2$$Register,
                        true /* acquire */);
@@ -257,7 +257,7 @@ instruct zCompareAndExchangeP(iRegPdst res, iRegPdst mem, iRegPsrc oldval, iRegP
 
   format %{ "CMPXCHG $res, $mem, $oldval, $newval; as ptr; ptr" %}
   ins_encode %{
-    z_compare_and_exchange(_masm, this,
+    z_compare_and_exchange(masm, this,
                            $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register, $tmp$$Register,
                            false /* acquire */);
   %}
@@ -277,7 +277,7 @@ instruct zCompareAndExchangeP_acq(iRegPdst res, iRegPdst mem, iRegPsrc oldval, i
 
   format %{ "CMPXCHG acq $res, $mem, $oldval, $newval; as ptr; ptr" %}
   ins_encode %{
-    z_compare_and_exchange(_masm, this,
+    z_compare_and_exchange(masm, this,
                            $res$$Register, $mem$$Register, $oldval$$Register, $newval$$Register, $tmp$$Register,
                            true /* acquire */);
   %}
@@ -293,9 +293,9 @@ instruct zGetAndSetP(iRegPdst res, iRegPdst mem, iRegPsrc newval, iRegPdst tmp,
   format %{ "GetAndSetP $res, $mem, $newval" %}
   ins_encode %{
     Register rnew_zpointer = $tmp$$Register, result = $res$$Register;
-    z_store_barrier(_masm, this, $mem$$Register, 0, $newval$$Register, rnew_zpointer, true /* is_atomic */);
+    z_store_barrier(masm, this, $mem$$Register, 0, $newval$$Register, rnew_zpointer, true /* is_atomic */);
     __ getandsetd(result, rnew_zpointer, $mem$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
-    z_uncolor(_masm, result);
+    z_uncolor(masm, result);
 
     if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
       __ isync();
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 773e60e3f4f..cbe28deb516 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -1079,7 +1079,7 @@ bool followed_by_acquire(const Node *load) {
   return false;
 }
 
-#define __ _masm.
+#define __ masm->
 
 // Tertiary op of a LoadP or StoreP encoding.
 #define REGP_OP true
@@ -1189,8 +1189,7 @@ int cmprb_Whitespace_reg_reg_prefixedNode::compute_padding(int current_offset) c
 //=============================================================================
 
 // Emit an interrupt that is caught by the debugger (for debugging compiler).
-void emit_break(CodeBuffer &cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
+void emit_break(C2_MacroAssembler *masm) {
   __ illtrap();
 }
 
@@ -1200,8 +1199,8 @@ void MachBreakpointNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  emit_break(cbuf);
+void MachBreakpointNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  emit_break(masm);
 }
 
 uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
@@ -1210,14 +1209,13 @@ uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
 
 //=============================================================================
 
-void emit_nop(CodeBuffer &cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
+void emit_nop(C2_MacroAssembler *masm) {
   __ nop();
 }
 
-static inline void emit_long(CodeBuffer &cbuf, int value) {
-  *((int*)(cbuf.insts_end())) = value;
-  cbuf.set_insts_end(cbuf.insts_end() + BytesPerInstWord);
+static inline void emit_long(C2_MacroAssembler *masm, int value) {
+  *((int*)(__ pc())) = value;
+  __ set_inst_end(__ pc() + BytesPerInstWord);
 }
 
 //=============================================================================
@@ -1237,7 +1235,7 @@ class CallStubImpl {
  public:
 
   // Emit call stub, compiled java to interpreter.
-  static void emit_trampoline_stub(C2_MacroAssembler &_masm, int destination_toc_offset, int insts_call_instruction_offset);
+  static void emit_trampoline_stub(C2_MacroAssembler *masm, int destination_toc_offset, int insts_call_instruction_offset);
 
   // Size of call trampoline stub.
   // This doesn't need to be accurate to the byte, but it
@@ -1268,7 +1266,7 @@ source %{
 //   load the call target from the constant pool
 //   branch via CTR (LR/link still points to the call-site above)
 
-void CallStubImpl::emit_trampoline_stub(C2_MacroAssembler &_masm, int destination_toc_offset, int insts_call_instruction_offset) {
+void CallStubImpl::emit_trampoline_stub(C2_MacroAssembler *masm, int destination_toc_offset, int insts_call_instruction_offset) {
   address stub = __ emit_trampoline_stub(destination_toc_offset, insts_call_instruction_offset);
   if (stub == nullptr) {
     ciEnv::current()->record_out_of_memory_failure();
@@ -1299,7 +1297,7 @@ typedef struct {
 // - Add a relocation at the branch-and-link instruction.
 // - Emit a branch-and-link.
 // - Remember the return pc offset.
-EmitCallOffsets emit_call_with_trampoline_stub(C2_MacroAssembler &_masm, address entry_point, relocInfo::relocType rtype) {
+EmitCallOffsets emit_call_with_trampoline_stub(C2_MacroAssembler *masm, address entry_point, relocInfo::relocType rtype) {
   EmitCallOffsets offsets = { -1, -1 };
   const int start_offset = __ offset();
   offsets.insts_call_instruction_offset = __ offset();
@@ -1316,7 +1314,7 @@ EmitCallOffsets emit_call_with_trampoline_stub(C2_MacroAssembler &_masm, address
   const int     entry_point_toc_offset = __ offset_to_method_toc(entry_point_toc_addr);
 
   // Emit the trampoline stub which will be related to the branch-and-link below.
-  CallStubImpl::emit_trampoline_stub(_masm, entry_point_toc_offset, offsets.insts_call_instruction_offset);
+  CallStubImpl::emit_trampoline_stub(masm, entry_point_toc_offset, offsets.insts_call_instruction_offset);
   if (ciEnv::current()->failing()) { return offsets; } // Code cache may be full.
   __ relocate(rtype);
 
@@ -1366,7 +1364,7 @@ void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, Phase
   nodes->push(m2);
 }
 
-void MachConstantBaseNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
+void MachConstantBaseNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const {
   // Is postalloc expanded.
   ShouldNotReachHere();
 }
@@ -1404,9 +1402,8 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
 
   const long framesize = C->output()->frame_size_in_bytes();
   assert(framesize % (2 * wordSize) == 0, "must preserve 2*wordSize alignment");
@@ -1556,10 +1553,10 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
 
   if (C->stub_function() == nullptr) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    bs->nmethod_entry_barrier(&_masm, push_frame_temp);
+    bs->nmethod_entry_barrier(masm, push_frame_temp);
   }
 
-  C->output()->set_frame_complete(cbuf.insts_size());
+  C->output()->set_frame_complete(__ offset());
 }
 
 uint MachPrologNode::size(PhaseRegAlloc *ra_) const {
@@ -1588,9 +1585,8 @@ void MachEpilogNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachEpilogNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
 
   const long framesize = ((long)C->output()->frame_slots()) << LogBytesPerInt;
   assert(framesize >= 0, "negative frame-size?");
@@ -1668,7 +1664,7 @@ static enum RC rc_class(OptoReg::Name reg) {
   return rc_stack;
 }
 
-static int ld_st_helper(CodeBuffer *cbuf, const char *op_str, uint opcode, int reg, int offset,
+static int ld_st_helper(C2_MacroAssembler *masm, const char *op_str, uint opcode, int reg, int offset,
                         bool do_print, Compile* C, outputStream *st) {
 
   assert(opcode == Assembler::LD_OPCODE   ||
@@ -1681,12 +1677,12 @@ static int ld_st_helper(CodeBuffer *cbuf, const char *op_str, uint opcode, int r
          opcode == Assembler::STFS_OPCODE,
          "opcode not supported");
 
-  if (cbuf) {
+  if (masm) {
     int d =
       (Assembler::LD_OPCODE == opcode || Assembler::STD_OPCODE == opcode) ?
         Assembler::ds(offset+0 /* TODO: PPC port C->frame_slots_sp_bias_in_bytes()*/)
       : Assembler::d1(offset+0 /* TODO: PPC port C->frame_slots_sp_bias_in_bytes()*/); // Makes no difference in opt build.
-    emit_long(*cbuf, opcode | Assembler::rt(Matcher::_regEncode[reg]) | d | Assembler::ra(R1_SP));
+    emit_long(masm, opcode | Assembler::rt(Matcher::_regEncode[reg]) | d | Assembler::ra(R1_SP));
   }
 #ifndef PRODUCT
   else if (do_print) {
@@ -1699,7 +1695,7 @@ static int ld_st_helper(CodeBuffer *cbuf, const char *op_str, uint opcode, int r
   return 4; // size
 }
 
-uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, bool do_size, outputStream *st) const {
+uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *ra_, bool do_size, outputStream *st) const {
   Compile* C = ra_->C;
 
   // Get registers to move.
@@ -1729,8 +1725,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     if (src_lo_rc == rc_stack && dst_lo_rc == rc_stack) {
       int src_offset = ra_->reg2offset(src_lo);
       int dst_offset = ra_->reg2offset(dst_lo);
-      if (cbuf) {
-        C2_MacroAssembler _masm(cbuf);
+      if (masm) {
         __ ld(R0, src_offset, R1_SP);
         __ std(R0, dst_offset, R1_SP);
         __ ld(R0, src_offset+8, R1_SP);
@@ -1742,8 +1737,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     else if (src_lo_rc == rc_vs && dst_lo_rc == rc_stack) {
       VectorSRegister Rsrc = as_VectorSRegister(Matcher::_regEncode[src_lo]);
       int dst_offset = ra_->reg2offset(dst_lo);
-      if (cbuf) {
-        C2_MacroAssembler _masm(cbuf);
+      if (masm) {
         __ addi(R0, R1_SP, dst_offset);
         __ stxvd2x(Rsrc, R0);
       }
@@ -1753,8 +1747,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     else if (src_lo_rc == rc_stack && dst_lo_rc == rc_vs) {
       VectorSRegister Rdst = as_VectorSRegister(Matcher::_regEncode[dst_lo]);
       int src_offset = ra_->reg2offset(src_lo);
-      if (cbuf) {
-        C2_MacroAssembler _masm(cbuf);
+      if (masm) {
         __ addi(R0, R1_SP, src_offset);
         __ lxvd2x(Rdst, R0);
       }
@@ -1764,8 +1757,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     else if (src_lo_rc == rc_vs && dst_lo_rc == rc_vs) {
       VectorSRegister Rsrc = as_VectorSRegister(Matcher::_regEncode[src_lo]);
       VectorSRegister Rdst = as_VectorSRegister(Matcher::_regEncode[dst_lo]);
-      if (cbuf) {
-        C2_MacroAssembler _masm(cbuf);
+      if (masm) {
         __ xxlor(Rdst, Rsrc, Rsrc);
       }
       size += 4;
@@ -1784,13 +1776,13 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     if (src_hi != OptoReg::Bad) {
       assert(src_hi_rc==rc_stack && dst_hi_rc==rc_stack,
              "expected same type of move for high parts");
-      size += ld_st_helper(cbuf, "LD  ", Assembler::LD_OPCODE,  R0_num, src_offset, !do_size, C, st);
-      if (!cbuf && !do_size) st->print("\n\t");
-      size += ld_st_helper(cbuf, "STD ", Assembler::STD_OPCODE, R0_num, dst_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "LD  ", Assembler::LD_OPCODE,  R0_num, src_offset, !do_size, C, st);
+      if (!masm && !do_size) st->print("\n\t");
+      size += ld_st_helper(masm, "STD ", Assembler::STD_OPCODE, R0_num, dst_offset, !do_size, C, st);
     } else {
-      size += ld_st_helper(cbuf, "LWZ ", Assembler::LWZ_OPCODE, R0_num, src_offset, !do_size, C, st);
-      if (!cbuf && !do_size) st->print("\n\t");
-      size += ld_st_helper(cbuf, "STW ", Assembler::STW_OPCODE, R0_num, dst_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "LWZ ", Assembler::LWZ_OPCODE, R0_num, src_offset, !do_size, C, st);
+      if (!masm && !do_size) st->print("\n\t");
+      size += ld_st_helper(masm, "STW ", Assembler::STW_OPCODE, R0_num, dst_offset, !do_size, C, st);
     }
     return size;
   }
@@ -1808,8 +1800,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
       Register Rdst = as_Register(Matcher::_regEncode[dst_lo]);
       size = (Rsrc != Rdst) ? 4 : 0;
 
-      if (cbuf) {
-        C2_MacroAssembler _masm(cbuf);
+      if (masm) {
         if (size) {
           __ mr(Rdst, Rsrc);
         }
@@ -1832,9 +1823,9 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     if (src_hi != OptoReg::Bad) {
       assert(src_hi_rc==rc_int && dst_hi_rc==rc_stack,
              "expected same type of move for high parts");
-      size += ld_st_helper(cbuf, "STD ", Assembler::STD_OPCODE, src_lo, dst_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "STD ", Assembler::STD_OPCODE, src_lo, dst_offset, !do_size, C, st);
     } else {
-      size += ld_st_helper(cbuf, "STW ", Assembler::STW_OPCODE, src_lo, dst_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "STW ", Assembler::STW_OPCODE, src_lo, dst_offset, !do_size, C, st);
     }
     return size;
   }
@@ -1845,17 +1836,16 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     if (src_hi != OptoReg::Bad) {
       assert(dst_hi_rc==rc_int && src_hi_rc==rc_stack,
              "expected same type of move for high parts");
-      size += ld_st_helper(cbuf, "LD  ", Assembler::LD_OPCODE, dst_lo, src_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "LD  ", Assembler::LD_OPCODE, dst_lo, src_offset, !do_size, C, st);
     } else {
-      size += ld_st_helper(cbuf, "LWZ ", Assembler::LWZ_OPCODE, dst_lo, src_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "LWZ ", Assembler::LWZ_OPCODE, dst_lo, src_offset, !do_size, C, st);
     }
     return size;
   }
 
   // Check for float reg-reg copy.
   if (src_lo_rc == rc_float && dst_lo_rc == rc_float) {
-    if (cbuf) {
-      C2_MacroAssembler _masm(cbuf);
+    if (masm) {
       FloatRegister Rsrc = as_FloatRegister(Matcher::_regEncode[src_lo]);
       FloatRegister Rdst = as_FloatRegister(Matcher::_regEncode[dst_lo]);
       __ fmr(Rdst, Rsrc);
@@ -1874,9 +1864,9 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     if (src_hi != OptoReg::Bad) {
       assert(src_hi_rc==rc_float && dst_hi_rc==rc_stack,
              "expected same type of move for high parts");
-      size += ld_st_helper(cbuf, "STFD", Assembler::STFD_OPCODE, src_lo, dst_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "STFD", Assembler::STFD_OPCODE, src_lo, dst_offset, !do_size, C, st);
     } else {
-      size += ld_st_helper(cbuf, "STFS", Assembler::STFS_OPCODE, src_lo, dst_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "STFS", Assembler::STFS_OPCODE, src_lo, dst_offset, !do_size, C, st);
     }
     return size;
   }
@@ -1887,9 +1877,9 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     if (src_hi != OptoReg::Bad) {
       assert(dst_hi_rc==rc_float && src_hi_rc==rc_stack,
              "expected same type of move for high parts");
-      size += ld_st_helper(cbuf, "LFD ", Assembler::LFD_OPCODE, dst_lo, src_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "LFD ", Assembler::LFD_OPCODE, dst_lo, src_offset, !do_size, C, st);
     } else {
-      size += ld_st_helper(cbuf, "LFS ", Assembler::LFS_OPCODE, dst_lo, src_offset, !do_size, C, st);
+      size += ld_st_helper(masm, "LFS ", Assembler::LFS_OPCODE, dst_lo, src_offset, !do_size, C, st);
     }
     return size;
   }
@@ -1914,8 +1904,8 @@ void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  implementation(&cbuf, ra_, false, nullptr);
+void MachSpillCopyNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  implementation(masm, ra_, false, nullptr);
 }
 
 uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
@@ -1928,8 +1918,7 @@ void MachNopNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *) const {
-  C2_MacroAssembler _masm(&cbuf);
+void MachNopNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *) const {
   // _count contains the number of nops needed for padding.
   for (int i = 0; i < _count; i++) {
     __ nop();
@@ -1949,9 +1938,7 @@ void BoxLockNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void BoxLockNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
-
+void BoxLockNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
   int reg    = ra_->get_encode(this);
 
@@ -1974,10 +1961,8 @@ void MachUEPNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachUEPNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachUEPNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   // This is the unverified entry point.
-  C2_MacroAssembler _masm(&cbuf);
-
   __ ic_check(CodeEntryAlignment);
   // Argument is valid and klass is as expected, continue.
 }
@@ -1997,8 +1982,8 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(CodeBuffer &cbuf);
-  static int emit_deopt_handler(CodeBuffer& cbuf);
+  static int emit_exception_handler(C2_MacroAssembler *masm);
+  static int emit_deopt_handler(C2_MacroAssembler* masm);
 
   static uint size_exception_handler() {
     // The exception_handler is a b64_patchable.
@@ -2023,9 +2008,7 @@ public:
 
 source %{
 
-int HandlerImpl::emit_exception_handler(CodeBuffer &cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
-
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler *masm) {
   address base = __ start_a_stub(size_exception_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -2043,9 +2026,7 @@ int HandlerImpl::emit_exception_handler(CodeBuffer &cbuf) {
 
 // The deopt_handler is like the exception handler, but it calls to
 // the deoptimization blob instead of jumping to the exception blob.
-int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
-
+int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   address base = __ start_a_stub(size_deopt_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -2421,27 +2402,23 @@ const RegMask Matcher::method_handle_invoke_SP_save_mask() {
 // needs for encoding need to be specified.
 encode %{
   enc_class enc_unimplemented %{
-    C2_MacroAssembler _masm(&cbuf);
     __ unimplemented("Unimplemented mach node encoding in AD file.", 13);
   %}
 
   enc_class enc_untested %{
 #ifdef ASSERT
-    C2_MacroAssembler _masm(&cbuf);
     __ untested("Untested mach node encoding in AD file.");
 #else
 #endif
   %}
 
   enc_class enc_lbz(iRegIdst dst, memory mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ lbz($dst$$Register, Idisp, $mem$$base$$Register);
   %}
 
   // Load acquire.
   enc_class enc_lbz_ac(iRegIdst dst, memory mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ lbz($dst$$Register, Idisp, $mem$$base$$Register);
     __ twi_0($dst$$Register);
@@ -2449,16 +2426,12 @@ encode %{
   %}
 
   enc_class enc_lhz(iRegIdst dst, memory mem) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ lhz($dst$$Register, Idisp, $mem$$base$$Register);
   %}
 
   // Load acquire.
   enc_class enc_lhz_ac(iRegIdst dst, memory mem) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ lhz($dst$$Register, Idisp, $mem$$base$$Register);
     __ twi_0($dst$$Register);
@@ -2466,16 +2439,12 @@ encode %{
   %}
 
   enc_class enc_lwz(iRegIdst dst, memory mem) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ lwz($dst$$Register, Idisp, $mem$$base$$Register);
   %}
 
   // Load acquire.
   enc_class enc_lwz_ac(iRegIdst dst, memory mem) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ lwz($dst$$Register, Idisp, $mem$$base$$Register);
     __ twi_0($dst$$Register);
@@ -2483,7 +2452,6 @@ encode %{
   %}
 
   enc_class enc_ld(iRegLdst dst, memoryAlg4 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     // Operand 'ds' requires 4-alignment.
     assert((Idisp & 0x3) == 0, "unaligned offset");
@@ -2492,7 +2460,6 @@ encode %{
 
   // Load acquire.
   enc_class enc_ld_ac(iRegLdst dst, memoryAlg4 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     // Operand 'ds' requires 4-alignment.
     assert((Idisp & 0x3) == 0, "unaligned offset");
@@ -2502,14 +2469,11 @@ encode %{
   %}
 
   enc_class enc_lfd(RegF dst, memory mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ lfd($dst$$FloatRegister, Idisp, $mem$$base$$Register);
   %}
 
   enc_class enc_load_long_constL(iRegLdst dst, immL src, iRegLdst toc) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     int toc_offset = 0;
 
     address const_toc_addr;
@@ -2531,9 +2495,6 @@ encode %{
   %}
 
   enc_class enc_load_long_constL_hi(iRegLdst dst, iRegLdst toc, immL src) %{
-
-    C2_MacroAssembler _masm(&cbuf);
-
     if (!ra_->C->output()->in_scratch_emit_size()) {
       address const_toc_addr;
       // Create a non-oop constant, no relocation needed.
@@ -2765,8 +2726,6 @@ encode %{
   %}
 
   enc_class enc_load_long_constP(iRegLdst dst, immP src, iRegLdst toc) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     int toc_offset = 0;
 
     intptr_t val = $src$$constant;
@@ -2799,8 +2758,6 @@ encode %{
   %}
 
   enc_class enc_load_long_constP_hi(iRegLdst dst, immP src, iRegLdst toc) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     if (!ra_->C->output()->in_scratch_emit_size()) {
       intptr_t val = $src$$constant;
       relocInfo::relocType constant_reloc = $src->constant_reloc();  // src
@@ -2935,13 +2892,11 @@ encode %{
   %}
 
   enc_class enc_stw(iRegIsrc src, memory mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ stw($src$$Register, Idisp, $mem$$base$$Register);
   %}
 
   enc_class enc_std(iRegIsrc src, memoryAlg4 mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     // Operand 'ds' requires 4-alignment.
     assert((Idisp & 0x3) == 0, "unaligned offset");
@@ -2949,13 +2904,11 @@ encode %{
   %}
 
   enc_class enc_stfs(RegF src, memory mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ stfs($src$$FloatRegister, Idisp, $mem$$base$$Register);
   %}
 
   enc_class enc_stfd(RegF src, memory mem) %{
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     __ stfd($src$$FloatRegister, Idisp, $mem$$base$$Register);
   %}
@@ -3154,8 +3107,6 @@ encode %{
   %}
 
   enc_class enc_cmove_reg(iRegIdst dst, flagsRegSrc crx, iRegIsrc src, cmpOp cmp) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     int cc        = $cmp$$cmpcode;
     int flags_reg = $crx$$reg;
     Label done;
@@ -3167,8 +3118,6 @@ encode %{
   %}
 
   enc_class enc_cmove_imm(iRegIdst dst, flagsRegSrc crx, immI16 src, cmpOp cmp) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     Label done;
     assert((Assembler::bcondCRbiIs1 & ~Assembler::bcondCRbiIs0) == 8, "check encoding");
     // Branch if not (cmp crx).
@@ -3180,14 +3129,10 @@ encode %{
   // This enc_class is needed so that scheduler gets proper
   // input mapping for latency computation.
   enc_class enc_andc(iRegIdst dst, iRegIsrc src1, iRegIsrc src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ andc($dst$$Register, $src1$$Register, $src2$$Register);
   %}
 
   enc_class enc_convI2B_regI__cmove(iRegIdst dst, iRegIsrc src, flagsReg crx, immI16 zero, immI16 notzero) %{
-
-    C2_MacroAssembler _masm(&cbuf);
-
     Label done;
     __ cmpwi($crx$$CondRegister, $src$$Register, 0);
     __ li($dst$$Register, $zero$$constant);
@@ -3197,9 +3142,6 @@ encode %{
   %}
 
   enc_class enc_convP2B_regP__cmove(iRegIdst dst, iRegPsrc src, flagsReg crx, immI16 zero, immI16 notzero) %{
-
-    C2_MacroAssembler _masm(&cbuf);
-
     Label done;
     __ cmpdi($crx$$CondRegister, $src$$Register, 0);
     __ li($dst$$Register, $zero$$constant);
@@ -3209,8 +3151,6 @@ encode %{
   %}
 
   enc_class enc_cmove_bso_stackSlotL(iRegLdst dst, flagsRegSrc crx, stackSlotL mem ) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     int Idisp = $mem$$disp + frame_slots_bias($mem$$base, ra_);
     Label done;
     __ bso($crx$$CondRegister, done);
@@ -3219,8 +3159,6 @@ encode %{
   %}
 
   enc_class enc_cmove_bso_reg(iRegLdst dst, flagsRegSrc crx, regD src) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     Label done;
     __ bso($crx$$CondRegister, done);
     __ mffprd($dst$$Register, $src$$FloatRegister);
@@ -3228,8 +3166,6 @@ encode %{
   %}
 
   enc_class enc_bc(flagsRegSrc crx, cmpOp cmp, Label lbl) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     Label d;   // dummy
     __ bind(d);
     Label* p = ($lbl$$label);
@@ -3257,8 +3193,6 @@ encode %{
   enc_class enc_bc_far(flagsRegSrc crx, cmpOp cmp, Label lbl) %{
     // The scheduler doesn't know about branch shortening, so we set the opcode
     // to ppc64Opcode_bc in order to hide this detail from the scheduler.
-
-    C2_MacroAssembler _masm(&cbuf);
     Label d;    // dummy
     __ bind(d);
     Label* p = ($lbl$$label);
@@ -3333,7 +3267,6 @@ encode %{
     // Fake operand dst needed for PPC scheduler.
     assert($dst$$constant == 0x0, "dst must be 0x0");
 
-    C2_MacroAssembler _masm(&cbuf);
     // Mark the code position where the load from the safepoint
     // polling page was emitted as relocInfo::poll_type.
     __ relocate(relocInfo::poll_type);
@@ -3387,13 +3320,11 @@ encode %{
   //
   // Usage of r1 and r2 in the stubs allows to distinguish them.
   enc_class enc_java_static_call(method meth) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     address entry_point = (address)$meth$$method;
 
     if (!_method) {
       // A call to a runtime wrapper, e.g. new, new_typeArray_Java, uncommon_trap.
-      emit_call_with_trampoline_stub(_masm, entry_point, relocInfo::runtime_call_type);
+      emit_call_with_trampoline_stub(masm, entry_point, relocInfo::runtime_call_type);
       if (ciEnv::current()->failing()) { return; } // Code cache may be full.
     } else {
       // Remember the offset not the address.
@@ -3413,9 +3344,9 @@ encode %{
       const int entry_point_toc_offset = __ offset_to_method_toc(entry_point_toc_addr);
 
       // Emit the trampoline stub which will be related to the branch-and-link below.
-      CallStubImpl::emit_trampoline_stub(_masm, entry_point_toc_offset, start_offset);
+      CallStubImpl::emit_trampoline_stub(masm, entry_point_toc_offset, start_offset);
       if (ciEnv::current()->failing()) { return; } // Code cache may be full.
-      int method_index = resolved_method_index(cbuf);
+      int method_index = resolved_method_index(masm);
       __ relocate(_optimized_virtual ? opt_virtual_call_Relocation::spec(method_index)
                   : static_call_Relocation::spec(method_index));
 
@@ -3423,11 +3354,12 @@ encode %{
       // Note: At this point we do not have the address of the trampoline
       // stub, and the entry point might be too far away for bl, so __ pc()
       // serves as dummy and the bl will be patched later.
-      cbuf.set_insts_mark();
+      __ set_inst_mark();
       __ bl(__ pc());  // Emits a relocation.
 
       // The stub for call to interpreter.
-      address stub = CompiledDirectCall::emit_to_interp_stub(cbuf);
+      address stub = CompiledDirectCall::emit_to_interp_stub(masm);
+      __ clear_inst_mark();
       if (stub == nullptr) {
         ciEnv::current()->record_failure("CodeCache is full");
         return;
@@ -3438,9 +3370,6 @@ encode %{
 
   // Second node of expanded dynamic call - the call.
   enc_class enc_java_dynamic_call_sched(method meth) %{
-
-    C2_MacroAssembler _masm(&cbuf);
-
     if (!ra_->C->output()->in_scratch_emit_size()) {
       // Create a call trampoline stub for the given method.
       const address entry_point = !($meth$$method) ? 0 : (address)$meth$$method;
@@ -3450,7 +3379,7 @@ encode %{
         return;
       }
       const int entry_point_const_toc_offset = __ offset_to_method_toc(entry_point_const);
-      CallStubImpl::emit_trampoline_stub(_masm, entry_point_const_toc_offset, __ offset());
+      CallStubImpl::emit_trampoline_stub(masm, entry_point_const_toc_offset, __ offset());
       if (ra_->C->env()->failing()) { return; } // Code cache may be full.
 
       // Build relocation at call site with ic position as data.
@@ -3466,7 +3395,7 @@ encode %{
       const address virtual_call_oop_addr = __ addr_at(virtual_call_oop_addr_offset);
       assert(MacroAssembler::is_load_const_from_method_toc_at(virtual_call_oop_addr),
              "should be load from TOC");
-      int method_index = resolved_method_index(cbuf);
+      int method_index = resolved_method_index(masm);
       __ relocate(virtual_call_Relocation::spec(virtual_call_oop_addr, method_index));
     }
 
@@ -3541,7 +3470,6 @@ encode %{
   // Toc is only passed so that it can be used in ins_encode statement.
   // In the code we have to use $constanttablebase.
   enc_class enc_java_dynamic_call(method meth, iRegLdst toc) %{
-    C2_MacroAssembler _masm(&cbuf);
     int start_offset = __ offset();
 
     Register Rtoc = (ra_) ? $constanttablebase : R2_TOC;
@@ -3564,7 +3492,7 @@ encode %{
       // CALL to fixup routine.  Fixup routine uses ScopeDesc info
       // to determine who we intended to call.
       __ relocate(virtual_call_Relocation::spec(virtual_call_meta_addr));
-      emit_call_with_trampoline_stub(_masm, (address)$meth$$method, relocInfo::none);
+      emit_call_with_trampoline_stub(masm, (address)$meth$$method, relocInfo::none);
       if (ciEnv::current()->failing()) { return; } // Code cache may be full.
       assert(((MachCallDynamicJavaNode*)this)->ret_addr_offset() == __ offset() - start_offset,
              "Fix constant in ret_addr_offset(), expected %d", __ offset() - start_offset);
@@ -3595,8 +3523,6 @@ encode %{
 
   // a runtime call
   enc_class enc_java_to_runtime_call (method meth) %{
-
-    C2_MacroAssembler _masm(&cbuf);
     const address start_pc = __ pc();
 
 #if defined(ABI_ELFv2)
@@ -3630,7 +3556,6 @@ encode %{
   // This enc_class is needed so that scheduler gets proper
   // input mapping for latency computation.
   enc_class enc_leaf_call_mtctr(iRegLsrc src) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ mtctr($src$$Register);
   %}
 
@@ -4085,7 +4010,7 @@ operand immN() %{
   interface(CONST_INTER);
 %}
 
-// Null Pointer Immediate
+// nullptr Pointer Immediate
 operand immN_0() %{
   predicate(n->get_narrowcon() == 0);
   match(ConN);
@@ -14581,8 +14506,9 @@ instruct RethrowException() %{
 
   format %{ "Jmp     rethrow_stub" %}
   ins_encode %{
-    cbuf.set_insts_mark();
+    __ set_inst_mark();
     __ b64_patchable((address)OptoRuntime::rethrow_stub(), relocInfo::runtime_call_type);
+    __ clear_inst_mark();
   %}
   ins_pipe(pipe_class_call);
 %}
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 66b19794b05..666b46817f9 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -1760,8 +1760,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
     __ b(L_exit);
 
     // static stub for the call above
-    CodeBuffer* cbuf = masm->code_section()->outer();
-    stub = CompiledDirectCall::emit_to_interp_stub(*cbuf, c2i_call_pc);
+    stub = CompiledDirectCall::emit_to_interp_stub(masm, c2i_call_pc);
     guarantee(stub != nullptr, "no space for static stub");
   }
 
@@ -1853,8 +1852,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
   __ blr();
 
   // static stub for the call above
-  CodeBuffer* cbuf = masm->code_section()->outer();
-  stub = CompiledDirectCall::emit_to_interp_stub(*cbuf, call_pc);
+  stub = CompiledDirectCall::emit_to_interp_stub(masm, call_pc);
   guarantee(stub != nullptr, "no space for static stub");
 }
 
diff --git a/src/hotspot/cpu/riscv/compiledIC_riscv.cpp b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
index fdb2bcb06ff..60dceb3ada7 100644
--- a/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
+++ b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
@@ -35,23 +35,19 @@
 
 // ----------------------------------------------------------------------------
 
-#define __ _masm.
-address CompiledDirectCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) {
-  precond(cbuf.stubs()->start() != badAddress);
-  precond(cbuf.stubs()->end() != badAddress);
+#define __ masm->
+address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark) {
+  precond(__ code()->stubs()->start() != badAddress);
+  precond(__ code()->stubs()->end() != badAddress);
   // Stub is fixed up when the corresponding call is converted from
   // calling compiled code to calling interpreted code.
   // mv xmethod, 0
   // jalr -4 # to self
 
   if (mark == nullptr) {
-    mark = cbuf.insts_mark();  // Get mark within main instrs section.
+    mark = __ inst_mark();  // Get mark within main instrs section.
   }
 
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a stub.
-  MacroAssembler _masm(&cbuf);
-
   address base = __ start_a_stub(to_interp_stub_size());
   int offset = __ offset();
   if (base == nullptr) {
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv.ad b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv.ad
index 6c855f23c2a..81bcd3c1362 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv.ad
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv.ad
@@ -41,7 +41,7 @@ instruct compareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, i
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::relaxed /* acquire */, Assembler::rl /* release */,
                                                    false /* is_cae */, $res$$Register);
   %}
@@ -62,7 +62,7 @@ instruct compareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, i
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::relaxed /* acquire */, Assembler::rl /* release */,
                                                    false /* is_cae */, $res$$Register);
   %}
@@ -84,7 +84,7 @@ instruct compareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP oldval
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::aq /* acquire */, Assembler::rl /* release */,
                                                    false /* is_cae */, $res$$Register);
   %}
@@ -106,7 +106,7 @@ instruct compareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::aq /* acquire */, Assembler::rl /* release */,
                                                    false /* is_cae */, $res$$Register);
   %}
@@ -126,7 +126,7 @@ instruct compareAndExchangeN_shenandoah(iRegNNoSp res, indirect mem, iRegN oldva
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::relaxed /* acquire */, Assembler::rl /* release */,
                                                    true /* is_cae */, $res$$Register);
   %}
@@ -146,7 +146,7 @@ instruct compareAndExchangeP_shenandoah(iRegPNoSp res, indirect mem, iRegP oldva
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::relaxed /* acquire */, Assembler::rl /* release */,
                                                    true /* is_cae */, $res$$Register);
   %}
@@ -168,7 +168,7 @@ instruct weakCompareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldva
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
     // Weak is not current supported by ShenandoahBarrierSet::cmpxchg_oop
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::relaxed /* acquire */, Assembler::rl /* release */,
                                                    false /* is_cae */, $res$$Register);
   %}
@@ -189,7 +189,7 @@ instruct compareAndExchangeNAcq_shenandoah(iRegNNoSp res, indirect mem, iRegN ol
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register);
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::aq /* acquire */, Assembler::rl /* release */,
                                                    true /* is_cae */, $res$$Register);
   %}
@@ -210,7 +210,7 @@ instruct compareAndExchangePAcq_shenandoah(iRegPNoSp res, indirect mem, iRegP ol
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register);
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::aq /* acquire */, Assembler::rl /* release */,
                                                    true /* is_cae */, $res$$Register);
   %}
@@ -230,7 +230,7 @@ instruct weakCompareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldva
   ins_encode %{
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::relaxed /* acquire */, Assembler::rl /* release */,
                                                    false /* is_cae */, $res$$Register);
   %}
@@ -253,7 +253,7 @@ instruct weakCompareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN ol
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
     // Weak is not current supported by ShenandoahBarrierSet::cmpxchg_oop
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::aq /* acquire */, Assembler::rl /* release */,
                                                    false /* is_cae */, $res$$Register);
   %}
@@ -276,7 +276,7 @@ instruct weakCompareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP ol
     Register tmp = $tmp$$Register;
     __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
     // Weak is not current supported by ShenandoahBarrierSet::cmpxchg_oop
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
                                                    Assembler::aq /* acquire */, Assembler::rl /* release */,
                                                    false /* is_cae */, $res$$Register);
   %}
diff --git a/src/hotspot/cpu/riscv/gc/x/x_riscv.ad b/src/hotspot/cpu/riscv/gc/x/x_riscv.ad
index 3d0273109ac..ef02f301c6a 100644
--- a/src/hotspot/cpu/riscv/gc/x/x_riscv.ad
+++ b/src/hotspot/cpu/riscv/gc/x/x_riscv.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -32,7 +32,7 @@ source_hpp %{
 
 source %{
 
-static void x_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, int barrier_data) {
+static void x_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, int barrier_data) {
   if (barrier_data == XLoadBarrierElided) {
     return;
   }
@@ -43,7 +43,7 @@ static void x_load_barrier(MacroAssembler& _masm, const MachNode* node, Address
   __ bind(*stub->continuation());
 }
 
-static void x_load_barrier_slow_path(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
+static void x_load_barrier_slow_path(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
   XLoadBarrierStubC2* const stub = XLoadBarrierStubC2::create(node, ref_addr, ref, tmp, XLoadBarrierStrong);
   __ j(*stub->entry());
   __ bind(*stub->continuation());
@@ -65,7 +65,7 @@ instruct xLoadP(iRegPNoSp dst, memory mem, iRegPNoSp tmp)
   ins_encode %{
     const Address ref_addr (as_Register($mem$$base), $mem$$disp);
     __ ld($dst$$Register, ref_addr);
-    x_load_barrier(_masm, this, ref_addr, $dst$$Register, $tmp$$Register /* tmp */, barrier_data());
+    x_load_barrier(masm, this, ref_addr, $dst$$Register, $tmp$$Register /* tmp */, barrier_data());
   %}
 
   ins_pipe(iload_reg_mem);
@@ -94,7 +94,7 @@ instruct xCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newva
       __ ld(t0, Address(xthread, XThreadLocalData::address_bad_mask_offset()));
       __ andr(t0, t0, $tmp$$Register);
       __ beqz(t0, good);
-      x_load_barrier_slow_path(_masm, this, Address($mem$$Register), $tmp$$Register /* ref */, $res$$Register /* tmp */);
+      x_load_barrier_slow_path(masm, this, Address($mem$$Register), $tmp$$Register /* ref */, $res$$Register /* tmp */);
       __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
                  Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register,
                  true /* result_as_bool */);
@@ -128,7 +128,7 @@ instruct xCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP ne
       __ ld(t0, Address(xthread, XThreadLocalData::address_bad_mask_offset()));
       __ andr(t0, t0, $tmp$$Register);
       __ beqz(t0, good);
-      x_load_barrier_slow_path(_masm, this, Address($mem$$Register), $tmp$$Register /* ref */, $res$$Register /* tmp */);
+      x_load_barrier_slow_path(masm, this, Address($mem$$Register), $tmp$$Register /* ref */, $res$$Register /* tmp */);
       __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
                  Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register,
                  true /* result_as_bool */);
@@ -157,7 +157,7 @@ instruct xCompareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP n
       __ ld(t0, Address(xthread, XThreadLocalData::address_bad_mask_offset()));
       __ andr(t0, t0, $res$$Register);
       __ beqz(t0, good);
-      x_load_barrier_slow_path(_masm, this, Address($mem$$Register), $res$$Register /* ref */, $tmp$$Register /* tmp */);
+      x_load_barrier_slow_path(masm, this, Address($mem$$Register), $res$$Register /* ref */, $tmp$$Register /* tmp */);
       __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
                  Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register);
       __ bind(good);
@@ -185,7 +185,7 @@ instruct xCompareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iReg
       __ ld(t0, Address(xthread, XThreadLocalData::address_bad_mask_offset()));
       __ andr(t0, t0, $res$$Register);
       __ beqz(t0, good);
-      x_load_barrier_slow_path(_masm, this, Address($mem$$Register), $res$$Register /* ref */, $tmp$$Register /* tmp */);
+      x_load_barrier_slow_path(masm, this, Address($mem$$Register), $res$$Register /* ref */, $tmp$$Register /* tmp */);
       __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
                  Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register);
       __ bind(good);
@@ -206,7 +206,7 @@ instruct xGetAndSetP(indirect mem, iRegP newv, iRegPNoSp prev, iRegPNoSp tmp) %{
 
   ins_encode %{
     __ atomic_xchg($prev$$Register, $newv$$Register, as_Register($mem$$base));
-    x_load_barrier(_masm, this, Address(noreg, 0), $prev$$Register, $tmp$$Register /* tmp */, barrier_data());
+    x_load_barrier(masm, this, Address(noreg, 0), $prev$$Register, $tmp$$Register /* tmp */, barrier_data());
   %}
 
   ins_pipe(pipe_serial);
@@ -223,7 +223,7 @@ instruct xGetAndSetPAcq(indirect mem, iRegP newv, iRegPNoSp prev, iRegPNoSp tmp)
 
   ins_encode %{
     __ atomic_xchgal($prev$$Register, $newv$$Register, as_Register($mem$$base));
-    x_load_barrier(_masm, this, Address(noreg, 0), $prev$$Register, $tmp$$Register /* tmp */, barrier_data());
+    x_load_barrier(masm, this, Address(noreg, 0), $prev$$Register, $tmp$$Register /* tmp */, barrier_data());
   %}
   ins_pipe(pipe_serial);
 %}
diff --git a/src/hotspot/cpu/riscv/gc/z/z_riscv.ad b/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
index 29de8234029..4c94e504475 100644
--- a/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
+++ b/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
@@ -33,7 +33,7 @@ source_hpp %{
 source %{
 #include "gc/z/zBarrierSetAssembler.hpp"
 
-static void z_color(MacroAssembler& _masm, const MachNode* node, Register dst, Register src, Register tmp) {
+static void z_color(MacroAssembler* masm, const MachNode* node, Register dst, Register src, Register tmp) {
   assert_different_registers(dst, tmp);
 
   __ relocate(barrier_Relocation::spec(), [&] {
@@ -43,11 +43,11 @@ static void z_color(MacroAssembler& _masm, const MachNode* node, Register dst, R
   __ orr(dst, dst, tmp);
 }
 
-static void z_uncolor(MacroAssembler& _masm, const MachNode* node, Register ref) {
+static void z_uncolor(MacroAssembler* masm, const MachNode* node, Register ref) {
   __ srli(ref, ref, ZPointerLoadShift);
 }
 
-static void check_color(MacroAssembler& _masm, Register ref, bool on_non_strong, Register result) {
+static void check_color(MacroAssembler* masm, Register ref, bool on_non_strong, Register result) {
   int format = on_non_strong ? ZBarrierRelocationFormatMarkBadMask
                              : ZBarrierRelocationFormatLoadBadMask;
   __ relocate(barrier_Relocation::spec(), [&] {
@@ -56,35 +56,35 @@ static void check_color(MacroAssembler& _masm, Register ref, bool on_non_strong,
   __ andr(result, ref, result);
 }
 
-static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
+static void z_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
   const bool on_non_strong =
       ((node->barrier_data() & ZBarrierWeak) != 0) ||
       ((node->barrier_data() & ZBarrierPhantom) != 0);
 
   if (node->barrier_data() == ZBarrierElided) {
-    z_uncolor(_masm, node, ref);
+    z_uncolor(masm, node, ref);
     return;
   }
 
   ZLoadBarrierStubC2* const stub = ZLoadBarrierStubC2::create(node, ref_addr, ref);
   Label good;
-  check_color(_masm, ref, on_non_strong, tmp);
+  check_color(masm, ref, on_non_strong, tmp);
   __ beqz(tmp, good);
   __ j(*stub->entry());
 
   __ bind(good);
-  z_uncolor(_masm, node, ref);
+  z_uncolor(masm, node, ref);
   __ bind(*stub->continuation());
 }
 
-static void z_store_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register rnew_zaddress, Register rnew_zpointer, Register tmp, bool is_atomic) {
+static void z_store_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register rnew_zaddress, Register rnew_zpointer, Register tmp, bool is_atomic) {
   if (node->barrier_data() == ZBarrierElided) {
-    z_color(_masm, node, rnew_zpointer, rnew_zaddress, tmp);
+    z_color(masm, node, rnew_zpointer, rnew_zaddress, tmp);
   } else {
     bool is_native = (node->barrier_data() & ZBarrierNative) != 0;
     ZStoreBarrierStubC2* const stub = ZStoreBarrierStubC2::create(node, ref_addr, rnew_zaddress, rnew_zpointer, is_native, is_atomic);
     ZBarrierSetAssembler* bs_asm = ZBarrierSet::assembler();
-    bs_asm->store_barrier_fast(&_masm, ref_addr, rnew_zaddress, rnew_zpointer, tmp, true /* in_nmethod */, is_atomic, *stub->entry(), *stub->continuation());
+    bs_asm->store_barrier_fast(masm, ref_addr, rnew_zaddress, rnew_zpointer, tmp, true /* in_nmethod */, is_atomic, *stub->entry(), *stub->continuation());
   }
 }
 %}
@@ -103,7 +103,7 @@ instruct zLoadP(iRegPNoSp dst, memory mem, iRegPNoSp tmp)
   ins_encode %{
     const Address ref_addr(as_Register($mem$$base), $mem$$disp);
     __ ld($dst$$Register, ref_addr);
-    z_load_barrier(_masm, this, ref_addr, $dst$$Register, $tmp$$Register);
+    z_load_barrier(masm, this, ref_addr, $dst$$Register, $tmp$$Register);
   %}
 
   ins_pipe(iload_reg_mem);
@@ -120,7 +120,7 @@ instruct zStoreP(memory mem, iRegP src, iRegPNoSp tmp1, iRegPNoSp tmp2)
   format %{ "sd    $mem, $src\t# ptr" %}
   ins_encode %{
     const Address ref_addr(as_Register($mem$$base), $mem$$disp);
-    z_store_barrier(_masm, this, ref_addr, $src$$Register, $tmp1$$Register, $tmp2$$Register, false /* is_atomic */);
+    z_store_barrier(masm, this, ref_addr, $src$$Register, $tmp1$$Register, $tmp2$$Register, false /* is_atomic */);
     __ sd($tmp1$$Register, ref_addr);
   %}
   ins_pipe(pipe_serial);
@@ -141,8 +141,8 @@ instruct zCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newva
   ins_encode %{
     guarantee($mem$$disp == 0, "impossible encoding");
     Address ref_addr($mem$$Register);
-    z_color(_masm, this, $oldval_tmp$$Register, $oldval$$Register, $tmp1$$Register);
-    z_store_barrier(_masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, $tmp1$$Register, true /* is_atomic */);
+    z_color(masm, this, $oldval_tmp$$Register, $oldval$$Register, $tmp1$$Register);
+    z_store_barrier(masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, $tmp1$$Register, true /* is_atomic */);
     __ cmpxchg($mem$$Register, $oldval_tmp$$Register, $newval_tmp$$Register, Assembler::int64, Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register, true /* result_as_bool */);
   %}
 
@@ -164,8 +164,8 @@ instruct zCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP ne
   ins_encode %{
     guarantee($mem$$disp == 0, "impossible encoding");
     Address ref_addr($mem$$Register);
-    z_color(_masm, this, $oldval_tmp$$Register, $oldval$$Register, $tmp1$$Register);
-    z_store_barrier(_masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, $tmp1$$Register, true /* is_atomic */);
+    z_color(masm, this, $oldval_tmp$$Register, $oldval$$Register, $tmp1$$Register);
+    z_store_barrier(masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, $tmp1$$Register, true /* is_atomic */);
     __ cmpxchg($mem$$Register, $oldval_tmp$$Register, $newval_tmp$$Register, Assembler::int64, Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register, true /* result_as_bool */);
   %}
 
@@ -185,10 +185,10 @@ instruct zCompareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP n
   ins_encode %{
     guarantee($mem$$disp == 0, "impossible encoding");
     Address ref_addr($mem$$Register);
-    z_color(_masm, this, $oldval_tmp$$Register, $oldval$$Register, $tmp1$$Register);
-    z_store_barrier(_masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, $tmp1$$Register, true /* is_atomic */);
+    z_color(masm, this, $oldval_tmp$$Register, $oldval$$Register, $tmp1$$Register);
+    z_store_barrier(masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, $tmp1$$Register, true /* is_atomic */);
     __ cmpxchg($mem$$Register, $oldval_tmp$$Register, $newval_tmp$$Register, Assembler::int64, Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register);
-    z_uncolor(_masm, this, $res$$Register);
+    z_uncolor(masm, this, $res$$Register);
   %}
 
   ins_pipe(pipe_slow);
@@ -207,10 +207,10 @@ instruct zCompareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iReg
   ins_encode %{
     guarantee($mem$$disp == 0, "impossible encoding");
     Address ref_addr($mem$$Register);
-    z_color(_masm, this, $oldval_tmp$$Register, $oldval$$Register, $tmp1$$Register);
-    z_store_barrier(_masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, $tmp1$$Register, true /* is_atomic */);
+    z_color(masm, this, $oldval_tmp$$Register, $oldval$$Register, $tmp1$$Register);
+    z_store_barrier(masm, this, ref_addr, $newval$$Register, $newval_tmp$$Register, $tmp1$$Register, true /* is_atomic */);
     __ cmpxchg($mem$$Register, $oldval_tmp$$Register, $newval_tmp$$Register, Assembler::int64, Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register);
-    z_uncolor(_masm, this, $res$$Register);
+    z_uncolor(masm, this, $res$$Register);
   %}
 
   ins_pipe(pipe_slow);
@@ -226,9 +226,9 @@ instruct zGetAndSetP(indirect mem, iRegP newv, iRegPNoSp prev, iRegPNoSp tmp) %{
   format %{ "atomic_xchg  $prev, $newv, [$mem], #@zGetAndSetP" %}
 
   ins_encode %{
-    z_store_barrier(_masm, this, Address($mem$$Register), $newv$$Register, $prev$$Register, $tmp$$Register, true /* is_atomic */);
+    z_store_barrier(masm, this, Address($mem$$Register), $newv$$Register, $prev$$Register, $tmp$$Register, true /* is_atomic */);
     __ atomic_xchg($prev$$Register, $prev$$Register, $mem$$Register);
-    z_uncolor(_masm, this, $prev$$Register);
+    z_uncolor(masm, this, $prev$$Register);
   %}
 
   ins_pipe(pipe_serial);
@@ -244,9 +244,9 @@ instruct zGetAndSetPAcq(indirect mem, iRegP newv, iRegPNoSp prev, iRegPNoSp tmp)
   format %{ "atomic_xchg_acq  $prev, $newv, [$mem], #@zGetAndSetPAcq" %}
 
   ins_encode %{
-    z_store_barrier(_masm, this, Address($mem$$Register), $newv$$Register, $prev$$Register, $tmp$$Register, true /* is_atomic */);
+    z_store_barrier(masm, this, Address($mem$$Register), $newv$$Register, $prev$$Register, $tmp$$Register, true /* is_atomic */);
     __ atomic_xchgal($prev$$Register, $prev$$Register, $mem$$Register);
-    z_uncolor(_masm, this, $prev$$Register);
+    z_uncolor(masm, this, $prev$$Register);
   %}
   ins_pipe(pipe_serial);
 %}
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 56a2d71bb5f..2c69486a0e5 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1060,8 +1060,8 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(CodeBuffer &cbuf);
-  static int emit_deopt_handler(CodeBuffer& cbuf);
+  static int emit_exception_handler(C2_MacroAssembler *masm);
+  static int emit_deopt_handler(C2_MacroAssembler* masm);
 
   static uint size_exception_handler() {
     return MacroAssembler::far_branch_size();
@@ -1207,7 +1207,7 @@ bool needs_acquiring_load_reserved(const Node *n)
   // so we can just return true here
   return true;
 }
-#define __ _masm.
+#define __ masm->
 
 // advance declarations for helper functions to convert register
 // indices to register objects
@@ -1291,8 +1291,7 @@ void MachBreakpointNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
+void MachBreakpointNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   __ ebreak();
 }
 
@@ -1308,9 +1307,8 @@ uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
   }
 #endif
 
-  void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc*) const {
-    C2_MacroAssembler _masm(&cbuf);
-    Assembler::CompressibleRegion cr(&_masm); // nops shall be 2-byte under RVC for alignment purposes.
+  void MachNopNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc*) const {
+    Assembler::CompressibleRegion cr(masm); // nops shall be 2-byte under RVC for alignment purposes.
     for (int i = 0; i < _count; i++) {
       __ nop();
     }
@@ -1332,7 +1330,7 @@ void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, Phase
   ShouldNotReachHere();
 }
 
-void MachConstantBaseNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
+void MachConstantBaseNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const {
   // Empty encoding
 }
 
@@ -1376,10 +1374,9 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   assert_cond(ra_ != nullptr);
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
 
   // n.b. frame size includes space for return pc and fp
   const int framesize = C->output()->frame_size_in_bytes();
@@ -1387,7 +1384,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
   // insert a nop at the start of the prolog so we can patch in a
   // branch if we need to invalidate the method later
   {
-    Assembler::IncompressibleRegion ir(&_masm);  // keep the nop as 4 bytes for patching.
+    Assembler::IncompressibleRegion ir(masm);  // keep the nop as 4 bytes for patching.
     MacroAssembler::assert_alignment(__ pc());
     __ nop();  // 4 bytes
   }
@@ -1431,7 +1428,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
         guard = &stub->guard();
       }
       // In the C2 code, we move the non-hot part of nmethod entry barriers out-of-line to a stub.
-      bs->nmethod_entry_barrier(&_masm, slow_path, continuation, guard);
+      bs->nmethod_entry_barrier(masm, slow_path, continuation, guard);
     }
   }
 
@@ -1439,7 +1436,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
     Unimplemented();
   }
 
-  C->output()->set_frame_complete(cbuf.insts_size());
+  C->output()->set_frame_complete(__ offset());
 
   if (C->has_mach_constant_base_node()) {
     // NOTE: We set the table base offset here because users might be
@@ -1490,10 +1487,9 @@ void MachEpilogNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachEpilogNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   assert_cond(ra_ != nullptr);
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
   assert_cond(C != nullptr);
   int framesize = C->output()->frame_size_in_bytes();
 
@@ -1567,7 +1563,7 @@ static enum RC rc_class(OptoReg::Name reg) {
   return rc_stack;
 }
 
-uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, bool do_size, outputStream *st) const {
+uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *ra_, bool do_size, outputStream *st) const {
   assert_cond(ra_ != nullptr);
   Compile* C = ra_->C;
 
@@ -1601,8 +1597,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
 
   if (bottom_type()->isa_vect() != nullptr) {
     uint ireg = ideal_reg();
-    if (ireg == Op_VecA && cbuf) {
-      C2_MacroAssembler _masm(cbuf);
+    if (ireg == Op_VecA && masm) {
       int vector_reg_size_in_bytes = Matcher::scalable_vector_reg_size(T_BYTE);
       if (src_lo_rc == rc_stack && dst_lo_rc == rc_stack) {
         // stack to stack
@@ -1620,8 +1615,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
       } else {
         ShouldNotReachHere();
       }
-    } else if (bottom_type()->isa_vectmask() && cbuf) {
-      C2_MacroAssembler _masm(cbuf);
+    } else if (bottom_type()->isa_vectmask() && masm) {
       int vmask_size_in_bytes = Matcher::scalable_predicate_reg_slots() * 32 / 8;
       if (src_lo_rc == rc_stack && dst_lo_rc == rc_stack) {
         // stack to stack
@@ -1640,8 +1634,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
         ShouldNotReachHere();
       }
     }
-  } else if (cbuf != nullptr) {
-    C2_MacroAssembler _masm(cbuf);
+  } else if (masm != nullptr) {
     switch (src_lo_rc) {
       case rc_int:
         if (dst_lo_rc == rc_int) {  // gpr --> gpr copy
@@ -1753,8 +1746,8 @@ void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  implementation(&cbuf, ra_, false, nullptr);
+void MachSpillCopyNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  implementation(masm, ra_, false, nullptr);
 }
 
 uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
@@ -1773,9 +1766,8 @@ void BoxLockNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void BoxLockNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
-  Assembler::IncompressibleRegion ir(&_masm);  // Fixed length: see BoxLockNode::size()
+void BoxLockNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  Assembler::IncompressibleRegion ir(masm);  // Fixed length: see BoxLockNode::size()
 
   assert_cond(ra_ != nullptr);
   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
@@ -1820,10 +1812,9 @@ void MachUEPNode::format(PhaseRegAlloc* ra_, outputStream* st) const
 }
 #endif
 
-void MachUEPNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
+void MachUEPNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const
 {
   // This is the unverified entry point.
-  C2_MacroAssembler _masm(&cbuf);
   __ ic_check(CodeEntryAlignment);
 
   // Verified entry point must be properly 4 bytes aligned for patching by NativeJump::patch_verified_entry().
@@ -1842,13 +1833,12 @@ uint MachUEPNode::size(PhaseRegAlloc* ra_) const
 //=============================================================================
 
 // Emit exception handler code.
-int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf)
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm)
 {
   // auipc t0, #exception_blob_entry_point
   // jr (offset)t0
   // Note that the code buffer's insts_mark is always relative to insts.
   // That's why we must use the macroassembler to generate a handler.
-  C2_MacroAssembler _masm(&cbuf);
   address base = __ start_a_stub(size_exception_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -1862,11 +1852,8 @@ int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf)
 }
 
 // Emit deopt handler code.
-int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf)
+int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm)
 {
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a handler.
-  C2_MacroAssembler _masm(&cbuf);
   address base = __ start_a_stub(size_deopt_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -2201,14 +2188,12 @@ encode %{
   // BEGIN Non-volatile memory access
 
   enc_class riscv_enc_mov_imm(iRegIorL dst, immIorL src) %{
-    C2_MacroAssembler _masm(&cbuf);
     int64_t con = (int64_t)$src$$constant;
     Register dst_reg = as_Register($dst$$reg);
     __ mv(dst_reg, con);
   %}
 
   enc_class riscv_enc_mov_p(iRegP dst, immP src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     address con = (address)$src$$constant;
     if (con == nullptr || con == (address)1) {
@@ -2227,18 +2212,15 @@ encode %{
   %}
 
   enc_class riscv_enc_mov_p1(iRegP dst) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     __ mv(dst_reg, 1);
   %}
 
   enc_class riscv_enc_mov_byte_map_base(iRegP dst) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ load_byte_map_base($dst$$Register);
   %}
 
   enc_class riscv_enc_mov_n(iRegN dst, immN src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     address con = (address)$src$$constant;
     if (con == nullptr) {
@@ -2251,13 +2233,11 @@ encode %{
   %}
 
   enc_class riscv_enc_mov_zero(iRegNorP dst) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     __ mv(dst_reg, zr);
   %}
 
   enc_class riscv_enc_mov_nk(iRegN dst, immNKlass src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     address con = (address)$src$$constant;
     if (con == nullptr) {
@@ -2270,42 +2250,36 @@ encode %{
   %}
 
   enc_class riscv_enc_cmpxchgw(iRegINoSp res, memory mem, iRegI oldval, iRegI newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
                /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
                /*result as bool*/ true);
   %}
 
   enc_class riscv_enc_cmpxchgn(iRegINoSp res, memory mem, iRegI oldval, iRegI newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
                /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
                /*result as bool*/ true);
   %}
 
   enc_class riscv_enc_cmpxchg(iRegINoSp res, memory mem, iRegL oldval, iRegL newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
                /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
                /*result as bool*/ true);
   %}
 
   enc_class riscv_enc_cmpxchgw_acq(iRegINoSp res, memory mem, iRegI oldval, iRegI newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
                /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
                /*result as bool*/ true);
   %}
 
   enc_class riscv_enc_cmpxchgn_acq(iRegINoSp res, memory mem, iRegI oldval, iRegI newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
                /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
                /*result as bool*/ true);
   %}
 
   enc_class riscv_enc_cmpxchg_acq(iRegINoSp res, memory mem, iRegL oldval, iRegL newval) %{
-    C2_MacroAssembler _masm(&cbuf);
     __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
                /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
                /*result as bool*/ true);
@@ -2314,13 +2288,11 @@ encode %{
   // compare and branch instruction encodings
 
   enc_class riscv_enc_j(label lbl) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* L = $lbl$$label;
     __ j(*L);
   %}
 
   enc_class riscv_enc_far_cmpULtGe_imm0_branch(cmpOpULtGe cmp, iRegIorL op1, label lbl) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* L = $lbl$$label;
     switch ($cmp$$cmpcode) {
       case(BoolTest::ge):
@@ -2344,7 +2316,6 @@ encode %{
 
     Label miss;
     Label done;
-    C2_MacroAssembler _masm(&cbuf);
     __ check_klass_subtype_slow_path(sub_reg, super_reg, temp_reg, result_reg,
                                      nullptr, &miss);
     if ($primary) {
@@ -2363,8 +2334,7 @@ encode %{
   %}
 
   enc_class riscv_enc_java_static_call(method meth) %{
-    C2_MacroAssembler _masm(&cbuf);
-    Assembler::IncompressibleRegion ir(&_masm);  // Fixed length: see ret_addr_offset
+    Assembler::IncompressibleRegion ir(masm);  // Fixed length: see ret_addr_offset
 
     address addr = (address)$meth$$method;
     address call = nullptr;
@@ -2382,7 +2352,7 @@ encode %{
       __ nop();
       __ block_comment("call JVM_EnsureMaterializedForStackWalk (elided)");
     } else {
-      int method_index = resolved_method_index(cbuf);
+      int method_index = resolved_method_index(masm);
       RelocationHolder rspec = _optimized_virtual ? opt_virtual_call_Relocation::spec(method_index)
                                                   : static_call_Relocation::spec(method_index);
       call = __ trampoline_call(Address(addr, rspec));
@@ -2394,10 +2364,10 @@ encode %{
       if (CodeBuffer::supports_shared_stubs() && _method->can_be_statically_bound()) {
         // Calls of the same statically bound method can share
         // a stub to the interpreter.
-        cbuf.shared_stub_to_interp_for(_method, call - cbuf.insts_begin());
+        __ code()->shared_stub_to_interp_for(_method, call - (__ begin()));
       } else {
         // Emit stub for static call
-        address stub = CompiledDirectCall::emit_to_interp_stub(cbuf, call);
+        address stub = CompiledDirectCall::emit_to_interp_stub(masm, call);
         if (stub == nullptr) {
           ciEnv::current()->record_failure("CodeCache is full");
           return;
@@ -2409,9 +2379,8 @@ encode %{
   %}
 
   enc_class riscv_enc_java_dynamic_call(method meth) %{
-    C2_MacroAssembler _masm(&cbuf);
-    Assembler::IncompressibleRegion ir(&_masm);  // Fixed length: see ret_addr_offset
-    int method_index = resolved_method_index(cbuf);
+    Assembler::IncompressibleRegion ir(masm);  // Fixed length: see ret_addr_offset
+    int method_index = resolved_method_index(masm);
     address call = __ ic_call((address)$meth$$method, method_index);
     if (call == nullptr) {
       ciEnv::current()->record_failure("CodeCache is full");
@@ -2422,7 +2391,6 @@ encode %{
   %}
 
   enc_class riscv_enc_call_epilog() %{
-    C2_MacroAssembler _masm(&cbuf);
     if (VerifyStackAtCalls) {
       // Check that stack depth is unchanged: find majik cookie on stack
       __ call_Unimplemented();
@@ -2430,8 +2398,7 @@ encode %{
   %}
 
   enc_class riscv_enc_java_to_runtime(method meth) %{
-    C2_MacroAssembler _masm(&cbuf);
-    Assembler::IncompressibleRegion ir(&_masm);  // Fixed length: see ret_addr_offset
+    Assembler::IncompressibleRegion ir(masm);  // Fixed length: see ret_addr_offset
 
     // some calls to generated routines (arraycopy code) are scheduled
     // by C2 as runtime calls. if so we can call them using a jr (they
@@ -2463,7 +2430,6 @@ encode %{
   // arithmetic encodings
 
   enc_class riscv_enc_divw(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src1_reg = as_Register($src1$$reg);
     Register src2_reg = as_Register($src2$$reg);
@@ -2471,7 +2437,6 @@ encode %{
   %}
 
   enc_class riscv_enc_divuw(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src1_reg = as_Register($src1$$reg);
     Register src2_reg = as_Register($src2$$reg);
@@ -2479,7 +2444,6 @@ encode %{
   %}
 
   enc_class riscv_enc_div(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src1_reg = as_Register($src1$$reg);
     Register src2_reg = as_Register($src2$$reg);
@@ -2487,7 +2451,6 @@ encode %{
   %}
 
   enc_class riscv_enc_divu(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src1_reg = as_Register($src1$$reg);
     Register src2_reg = as_Register($src2$$reg);
@@ -2495,7 +2458,6 @@ encode %{
   %}
 
   enc_class riscv_enc_modw(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src1_reg = as_Register($src1$$reg);
     Register src2_reg = as_Register($src2$$reg);
@@ -2503,7 +2465,6 @@ encode %{
   %}
 
   enc_class riscv_enc_moduw(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src1_reg = as_Register($src1$$reg);
     Register src2_reg = as_Register($src2$$reg);
@@ -2511,7 +2472,6 @@ encode %{
   %}
 
   enc_class riscv_enc_mod(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src1_reg = as_Register($src1$$reg);
     Register src2_reg = as_Register($src2$$reg);
@@ -2519,7 +2479,6 @@ encode %{
   %}
 
   enc_class riscv_enc_modu(iRegI dst, iRegI src1, iRegI src2) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register dst_reg = as_Register($dst$$reg);
     Register src1_reg = as_Register($src1$$reg);
     Register src2_reg = as_Register($src2$$reg);
@@ -2527,13 +2486,11 @@ encode %{
   %}
 
   enc_class riscv_enc_tail_call(iRegP jump_target) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register target_reg = as_Register($jump_target$$reg);
     __ jr(target_reg);
   %}
 
   enc_class riscv_enc_tail_jmp(iRegP jump_target) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register target_reg = as_Register($jump_target$$reg);
     // exception oop should be in x10
     // ret addr has been popped into ra
@@ -2543,12 +2500,10 @@ encode %{
   %}
 
   enc_class riscv_enc_rethrow() %{
-    C2_MacroAssembler _masm(&cbuf);
     __ far_jump(RuntimeAddress(OptoRuntime::rethrow_stub()));
   %}
 
   enc_class riscv_enc_ret() %{
-    C2_MacroAssembler _masm(&cbuf);
     __ ret();
   %}
 
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 25ad0ba39ea..36f4d499c38 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -30,19 +30,19 @@ opclass vmemA(indirect);
 
 source %{
 
-  static void loadStore(C2_MacroAssembler masm, bool is_store,
+  static void loadStore(C2_MacroAssembler* masm, bool is_store,
                         VectorRegister reg, BasicType bt, Register base,
                         uint vector_length, Assembler::VectorMask vm = Assembler::unmasked) {
     Assembler::SEW sew = Assembler::elemtype_to_sew(bt);
-    masm.vsetvli_helper(bt, vector_length);
+    __ vsetvli_helper(bt, vector_length);
 
     if (is_store) {
-      masm.vsex_v(reg, base, sew, vm);
+      __ vsex_v(reg, base, sew, vm);
     } else {
       if (vm == Assembler::v0_t) {
-        masm.vxor_vv(reg, reg, reg);
+        __ vxor_vv(reg, reg, reg);
       }
-      masm.vlex_v(reg, base, sew, vm);
+      __ vlex_v(reg, base, sew, vm);
     }
   }
 
@@ -108,7 +108,7 @@ instruct loadV(vReg dst, vmemA mem) %{
   format %{ "loadV $dst, $mem\t# vector (rvv)" %}
   ins_encode %{
     VectorRegister dst_reg = as_VectorRegister($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), false, dst_reg,
+    loadStore(masm, false, dst_reg,
               Matcher::vector_element_basic_type(this), as_Register($mem$$base), Matcher::vector_length(this));
   %}
   ins_pipe(pipe_slow);
@@ -120,7 +120,7 @@ instruct storeV(vReg src, vmemA mem) %{
   format %{ "storeV $mem, $src\t# vector (rvv)" %}
   ins_encode %{
     VectorRegister src_reg = as_VectorRegister($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), true, src_reg,
+    loadStore(masm, true, src_reg,
               Matcher::vector_element_basic_type(this, $src), as_Register($mem$$base), Matcher::vector_length(this, $src));
   %}
   ins_pipe(pipe_slow);
@@ -3154,7 +3154,7 @@ instruct loadV_masked(vReg dst, vmemA mem, vRegMask_V0 v0) %{
   format %{ "loadV_masked $dst, $mem, $v0" %}
   ins_encode %{
     VectorRegister dst_reg = as_VectorRegister($dst$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), false, dst_reg,
+    loadStore(masm, false, dst_reg,
               Matcher::vector_element_basic_type(this), as_Register($mem$$base),
               Matcher::vector_length(this), Assembler::v0_t);
   %}
@@ -3166,7 +3166,7 @@ instruct storeV_masked(vReg src, vmemA mem, vRegMask_V0 v0) %{
   format %{ "storeV_masked $mem, $src, $v0" %}
   ins_encode %{
     VectorRegister src_reg = as_VectorRegister($src$$reg);
-    loadStore(C2_MacroAssembler(&cbuf), true, src_reg,
+    loadStore(masm, true, src_reg,
               Matcher::vector_element_basic_type(this, $src), as_Register($mem$$base),
               Matcher::vector_length(this, $src), Assembler::v0_t);
   %}
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 5945f9d5fe2..b84e31b40a7 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -974,8 +974,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
 
     __ j(exit);
 
-    CodeBuffer* cbuf = masm->code_section()->outer();
-    address stub = CompiledDirectCall::emit_to_interp_stub(*cbuf, tr_call);
+    address stub = CompiledDirectCall::emit_to_interp_stub(masm, tr_call);
     if (stub == nullptr) {
       fatal("CodeCache is full at gen_continuation_enter");
     }
@@ -1040,8 +1039,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
     __ jr(x11); // the exception handler
   }
 
-  CodeBuffer* cbuf = masm->code_section()->outer();
-  address stub = CompiledDirectCall::emit_to_interp_stub(*cbuf, tr_call);
+  address stub = CompiledDirectCall::emit_to_interp_stub(masm, tr_call);
   if (stub == nullptr) {
     fatal("CodeCache is full at gen_continuation_enter");
   }
diff --git a/src/hotspot/cpu/s390/compiledIC_s390.cpp b/src/hotspot/cpu/s390/compiledIC_s390.cpp
index 3adcfbc85f1..9c9073cb93d 100644
--- a/src/hotspot/cpu/s390/compiledIC_s390.cpp
+++ b/src/hotspot/cpu/s390/compiledIC_s390.cpp
@@ -37,22 +37,18 @@
 // ----------------------------------------------------------------------------
 
 #undef  __
-#define __ _masm.
+#define __ masm->
 
-address CompiledDirectCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark/* = nullptr*/) {
+address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark/* = nullptr*/) {
 #ifdef COMPILER2
   // Stub is fixed up when the corresponding call is converted from calling
   // compiled code to calling interpreted code.
   if (mark == nullptr) {
     // Get the mark within main instrs section which is set to the address of the call.
-    mark = cbuf.insts_mark();
+    mark = __ inst_mark();
   }
   assert(mark != nullptr, "mark must not be null");
 
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a stub.
-  MacroAssembler _masm(&cbuf);
-
   address stub = __ start_a_stub(CompiledDirectCall::to_interp_stub_size());
   if (stub == nullptr) {
     return nullptr;  // CodeBuffer::expand failed.
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index e2a11733cd6..28cac16864d 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -584,7 +584,7 @@ source %{
 #define BIND(label)        __ bind(label); BLOCK_COMMENT(#label ":")
 #endif
 
-#define __ _masm.
+#define __ masm->
 
 #define Z_DISP_SIZE Immediate::is_uimm12((long)opnd_array(1)->disp(ra_,this,2)) ?  4 : 6
 #define Z_DISP3_SIZE 6
@@ -666,14 +666,12 @@ int CallLeafNoFPDirectNode::compute_padding(int current_offset) const {
   return (12 - current_offset) & 2;
 }
 
-void emit_nop(CodeBuffer &cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
+void emit_nop(C2_MacroAssembler *masm) {
   __ z_nop();
 }
 
 // Emit an interrupt that is caught by the debugger (for debugging compiler).
-void emit_break(CodeBuffer &cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
+void emit_break(C2_MacroAssembler *masm) {
   __ z_illtrap();
 }
 
@@ -683,51 +681,45 @@ void MachBreakpointNode::format(PhaseRegAlloc *, outputStream *os) const {
 }
 #endif
 
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  emit_break(cbuf);
+void MachBreakpointNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  emit_break(masm);
 }
 
 uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
   return MachNode::size(ra_);
 }
 
-static inline void z_emit16(CodeBuffer &cbuf, long value) {
-  C2_MacroAssembler _masm(&cbuf);
+static inline void z_emit16(C2_MacroAssembler *masm, long value) {
   __ emit_instruction((unsigned long)value, 2);
 }
 
-static inline void z_emit32(CodeBuffer &cbuf, long value) {
-  C2_MacroAssembler _masm(&cbuf);
+static inline void z_emit32(C2_MacroAssembler *masm, long value) {
   __ emit_instruction((unsigned long)value, 4);
 }
 
-static inline void z_emit48(CodeBuffer &cbuf, long value) {
-  C2_MacroAssembler _masm(&cbuf);
+static inline void z_emit48(C2_MacroAssembler *masm, long value) {
   __ emit_instruction((unsigned long)value, 6);
 }
 
-static inline unsigned int z_emit_inst(CodeBuffer &cbuf, long value) {
+static inline unsigned int z_emit_inst(C2_MacroAssembler *masm, long value) {
   if (value < 0) {
     // There obviously has been an unintended sign extension (int->long). Revert it.
     value = (long)((unsigned long)((unsigned int)value));
   }
 
-  C2_MacroAssembler _masm(&cbuf);
   int len = __ emit_instruction((unsigned long)value, 0);
   return len;
 }
 
 // Check effective address (at runtime) for required alignment.
-static inline void z_assert_aligned(CodeBuffer &cbuf, int disp, Register index, Register base, int alignment) {
-  C2_MacroAssembler _masm(&cbuf);
-
+static inline void z_assert_aligned(C2_MacroAssembler *masm, int disp, Register index, Register base, int alignment) {
   __ z_lay(Z_R0, disp, index, base);
   __ z_nill(Z_R0, alignment-1);
   __ z_brc(Assembler::bcondEqual, +3);
   __ z_illtrap();
 }
 
-int emit_call_reloc(C2_MacroAssembler &_masm, intptr_t entry_point, relocInfo::relocType rtype,
+int emit_call_reloc(C2_MacroAssembler *masm, intptr_t entry_point, relocInfo::relocType rtype,
                     PhaseRegAlloc* ra_, bool is_native_call = false) {
   __ set_inst_mark(); // Used in z_enc_java_static_call() and emit_java_to_interp().
   address old_mark = __ inst_mark();
@@ -758,7 +750,7 @@ int emit_call_reloc(C2_MacroAssembler &_masm, intptr_t entry_point, relocInfo::r
   return (ret_off - start_off);
 }
 
-static int emit_call_reloc(C2_MacroAssembler &_masm, intptr_t entry_point, RelocationHolder const& rspec) {
+static int emit_call_reloc(C2_MacroAssembler *masm, intptr_t entry_point, RelocationHolder const& rspec) {
   __ set_inst_mark(); // Used in z_enc_java_static_call() and emit_java_to_interp().
   address old_mark = __ inst_mark();
   unsigned int start_off = __ offset();
@@ -790,8 +782,7 @@ void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, Phase
 
 // Even with PC-relative TOC addressing, we still need this node.
 // Float loads/stores do not support PC-relative addresses.
-void MachConstantBaseNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
+void MachConstantBaseNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const {
   Register Rtoc = as_Register(ra_->get_encode(this));
   __ load_toc(Rtoc);
 }
@@ -841,9 +832,8 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 }
 #endif
 
-void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
 
   size_t framesize = C->output()->frame_size_in_bytes();
   size_t bangsize  = C->output()->bang_size_in_bytes();
@@ -892,10 +882,10 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
 
   if (C->stub_function() == nullptr) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    bs->nmethod_entry_barrier(&_masm);
+    bs->nmethod_entry_barrier(masm);
   }
 
-  C->output()->set_frame_complete(cbuf.insts_size());
+  C->output()->set_frame_complete(__ offset());
 }
 
 uint MachPrologNode::size(PhaseRegAlloc *ra_) const {
@@ -921,8 +911,7 @@ void MachEpilogNode::format(PhaseRegAlloc *ra_, outputStream *os) const {
 }
 #endif
 
-void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
+void MachEpilogNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
 
   // If this does safepoint polling, then do it here.
@@ -990,15 +979,15 @@ static enum RC rc_class(OptoReg::Name reg) {
 }
 
 // Returns size as obtained from z_emit_instr.
-static unsigned int z_ld_st_helper(CodeBuffer *cbuf, const char *op_str, unsigned long opcode,
+static unsigned int z_ld_st_helper(C2_MacroAssembler *masm, const char *op_str, unsigned long opcode,
                                    int reg, int offset, bool do_print, outputStream *os) {
 
-  if (cbuf) {
+  if (masm) {
     if (opcode > (1L<<32)) {
-      return z_emit_inst(*cbuf, opcode | Assembler::reg(Matcher::_regEncode[reg], 8, 48) |
+      return z_emit_inst(masm, opcode | Assembler::reg(Matcher::_regEncode[reg], 8, 48) |
                          Assembler::simm20(offset) | Assembler::reg(Z_R0, 12, 48) | Assembler::regz(Z_SP, 16, 48));
     } else {
-      return z_emit_inst(*cbuf, opcode | Assembler::reg(Matcher::_regEncode[reg], 8, 32) |
+      return z_emit_inst(masm, opcode | Assembler::reg(Matcher::_regEncode[reg], 8, 32) |
                          Assembler::uimm12(offset, 20, 32) | Assembler::reg(Z_R0, 12, 32) | Assembler::regz(Z_SP, 16, 32));
     }
   }
@@ -1011,9 +1000,8 @@ static unsigned int z_ld_st_helper(CodeBuffer *cbuf, const char *op_str, unsigne
   return (opcode > (1L << 32)) ? 6 : 4;
 }
 
-static unsigned int z_mvc_helper(CodeBuffer *cbuf, int len, int dst_off, int src_off, bool do_print, outputStream *os) {
-  if (cbuf) {
-    C2_MacroAssembler _masm(cbuf);
+static unsigned int z_mvc_helper(C2_MacroAssembler *masm, int len, int dst_off, int src_off, bool do_print, outputStream *os) {
+  if (masm) {
     __ z_mvc(dst_off, len-1, Z_SP, src_off, Z_SP);
   }
 
@@ -1026,7 +1014,7 @@ static unsigned int z_mvc_helper(CodeBuffer *cbuf, int len, int dst_off, int src
   return 6;
 }
 
-uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, bool do_size, outputStream *os) const {
+uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *ra_, bool do_size, outputStream *os) const {
   // Get registers to move.
   OptoReg::Name src_hi = ra_->get_reg_second(in(1));
   OptoReg::Name src_lo = ra_->get_reg_first(in(1));
@@ -1066,17 +1054,17 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
            "expected same type of move for high parts");
 
     if (src12 && dst12) {
-      return z_mvc_helper(cbuf, is64 ? 8 : 4, dst_offset, src_offset, print, os);
+      return z_mvc_helper(masm, is64 ? 8 : 4, dst_offset, src_offset, print, os);
     }
 
     int r0 = Z_R0_num;
     if (is64) {
-      return z_ld_st_helper(cbuf, "LG  ", LG_ZOPC, r0, src_offset, print, os) +
-             z_ld_st_helper(cbuf, "STG ", STG_ZOPC, r0, dst_offset, print, os);
+      return z_ld_st_helper(masm, "LG  ", LG_ZOPC, r0, src_offset, print, os) +
+             z_ld_st_helper(masm, "STG ", STG_ZOPC, r0, dst_offset, print, os);
     }
 
-    return z_ld_st_helper(cbuf, "LY   ", LY_ZOPC, r0, src_offset, print, os) +
-           z_ld_st_helper(cbuf, "STY  ", STY_ZOPC, r0, dst_offset, print, os);
+    return z_ld_st_helper(masm, "LY   ", LY_ZOPC, r0, src_offset, print, os) +
+           z_ld_st_helper(masm, "STY  ", STY_ZOPC, r0, dst_offset, print, os);
   }
 
   // Check for float->int copy. Requires a trip through memory.
@@ -1086,8 +1074,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
 
   // Check for integer reg-reg copy.
   if (src_lo_rc == rc_int && dst_lo_rc == rc_int) {
-    if (cbuf) {
-      C2_MacroAssembler _masm(cbuf);
+    if (masm) {
       Register Rsrc = as_Register(Matcher::_regEncode[src_lo]);
       Register Rdst = as_Register(Matcher::_regEncode[dst_lo]);
       __ z_lgr(Rdst, Rsrc);
@@ -1108,14 +1095,14 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
            "expected same type of move for high parts");
 
     if (is64) {
-      return z_ld_st_helper(cbuf, "STG ", STG_ZOPC, src_lo, dst_offset, print, os);
+      return z_ld_st_helper(masm, "STG ", STG_ZOPC, src_lo, dst_offset, print, os);
     }
 
     // else
     mnemo = dst12 ? "ST  " : "STY ";
     opc = dst12 ? ST_ZOPC : STY_ZOPC;
 
-    return z_ld_st_helper(cbuf, mnemo, opc, src_lo, dst_offset, print, os);
+    return z_ld_st_helper(masm, mnemo, opc, src_lo, dst_offset, print, os);
   }
 
   // Check for integer load
@@ -1128,13 +1115,12 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     mnemo = is64 ? "LG  " : "LLGF";
     opc = is64 ? LG_ZOPC : LLGF_ZOPC;
 
-    return z_ld_st_helper(cbuf, mnemo, opc, dst_lo, src_offset, print, os);
+    return z_ld_st_helper(masm, mnemo, opc, dst_lo, src_offset, print, os);
   }
 
   // Check for float reg-reg copy.
   if (src_lo_rc == rc_float && dst_lo_rc == rc_float) {
-    if (cbuf) {
-      C2_MacroAssembler _masm(cbuf);
+    if (masm) {
       FloatRegister Rsrc = as_FloatRegister(Matcher::_regEncode[src_lo]);
       FloatRegister Rdst = as_FloatRegister(Matcher::_regEncode[dst_lo]);
       __ z_ldr(Rdst, Rsrc);
@@ -1157,13 +1143,13 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     if (is64) {
       mnemo = dst12 ? "STD  " : "STDY ";
       opc = dst12 ? STD_ZOPC : STDY_ZOPC;
-      return z_ld_st_helper(cbuf, mnemo, opc, src_lo, dst_offset, print, os);
+      return z_ld_st_helper(masm, mnemo, opc, src_lo, dst_offset, print, os);
     }
     // else
 
     mnemo = dst12 ? "STE  " : "STEY ";
     opc = dst12 ? STE_ZOPC : STEY_ZOPC;
-    return z_ld_st_helper(cbuf, mnemo, opc, src_lo, dst_offset, print, os);
+    return z_ld_st_helper(masm, mnemo, opc, src_lo, dst_offset, print, os);
   }
 
   // Check for float load.
@@ -1174,13 +1160,13 @@ uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, boo
     if (is64) {
       mnemo = src12 ? "LD   " : "LDY  ";
       opc = src12 ? LD_ZOPC : LDY_ZOPC;
-      return z_ld_st_helper(cbuf, mnemo, opc, dst_lo, src_offset, print, os);
+      return z_ld_st_helper(masm, mnemo, opc, dst_lo, src_offset, print, os);
     }
     // else
 
     mnemo = src12 ? "LE   " : "LEY  ";
     opc = src12 ? LE_ZOPC : LEY_ZOPC;
-    return z_ld_st_helper(cbuf, mnemo, opc, dst_lo, src_offset, print, os);
+    return z_ld_st_helper(masm, mnemo, opc, dst_lo, src_offset, print, os);
   }
 
   // --------------------------------------------------------------------
@@ -1216,8 +1202,8 @@ void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream *os) const {
 }
 #endif
 
-void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  implementation(&cbuf, ra_, false, nullptr);
+void MachSpillCopyNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  implementation(masm, ra_, false, nullptr);
 }
 
 uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
@@ -1232,12 +1218,10 @@ void MachNopNode::format(PhaseRegAlloc *, outputStream *os) const {
 }
 #endif
 
-void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc * ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
-
+void MachNopNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc * ra_) const {
   int rem_space = 0;
   if (!(ra_->C->output()->in_scratch_emit_size())) {
-    rem_space = cbuf.insts()->remaining();
+    rem_space = __ code()->insts()->remaining();
     if (rem_space <= _count*2 + 8) {
       tty->print("NopNode: _count = %3.3d, remaining space before = %d", _count, rem_space);
     }
@@ -1249,7 +1233,7 @@ void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc * ra_) const {
 
   if (!(ra_->C->output()->in_scratch_emit_size())) {
     if (rem_space <= _count*2 + 8) {
-      int rem_space2 = cbuf.insts()->remaining();
+      int rem_space2 = __ code()->insts()->remaining();
       tty->print_cr(", after = %d", rem_space2);
     }
   }
@@ -1272,9 +1256,7 @@ void BoxLockNode::format(PhaseRegAlloc *ra_, outputStream *os) const {
 #endif
 
 // Take care of the size function, if you make changes here!
-void BoxLockNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  C2_MacroAssembler _masm(&cbuf);
-
+void BoxLockNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
   int reg = ra_->get_encode(this);
   __ z_lay(as_Register(reg), offset, Z_SP);
@@ -1340,9 +1322,8 @@ void MachUEPNode::format(PhaseRegAlloc *ra_, outputStream *os) const {
 }
 #endif
 
-void MachUEPNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachUEPNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   // This is Unverified Entry Point
-  C2_MacroAssembler _masm(&cbuf);
   __ ic_check(CodeEntryAlignment);
 }
 
@@ -1360,8 +1341,8 @@ source_hpp %{ // Header information of the source block.
 class HandlerImpl {
  public:
 
-  static int emit_exception_handler(CodeBuffer &cbuf);
-  static int emit_deopt_handler(CodeBuffer& cbuf);
+  static int emit_exception_handler(C2_MacroAssembler *masm);
+  static int emit_deopt_handler(C2_MacroAssembler* masm);
 
   static uint size_exception_handler() {
     return NativeJump::max_instruction_size();
@@ -1399,9 +1380,8 @@ source %{
 // 3) The handler will get patched such that it does not jump to the
 //   exception blob, but to an entry in the deoptimization blob being
 //   aware of the exception.
-int HandlerImpl::emit_exception_handler(CodeBuffer &cbuf) {
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler *masm) {
   Register temp_reg = Z_R1;
-  C2_MacroAssembler _masm(&cbuf);
 
   address base = __ start_a_stub(size_exception_handler());
   if (base == nullptr) {
@@ -1422,8 +1402,7 @@ int HandlerImpl::emit_exception_handler(CodeBuffer &cbuf) {
 }
 
 // Emit deopt handler code.
-int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf) {
-  C2_MacroAssembler _masm(&cbuf);
+int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
   address        base = __ start_a_stub(size_deopt_handler());
 
   if (base == nullptr) {
@@ -1701,13 +1680,11 @@ bool Matcher::pd_clone_address_expressions(AddPNode* m, Matcher::MStack& mstack,
 // needs for encoding need to be specified.
 encode %{
   enc_class enc_unimplemented %{
-    C2_MacroAssembler _masm(&cbuf);
     __ unimplemented("Unimplemented mach node encoding in AD file.", 13);
   %}
 
   enc_class enc_untested %{
 #ifdef ASSERT
-    C2_MacroAssembler _masm(&cbuf);
     __ untested("Untested mach node encoding in AD file.");
 #endif
   %}
@@ -1715,21 +1692,21 @@ encode %{
   enc_class z_rrform(iRegI dst, iRegI src) %{
     assert((($primary >> 14) & 0x03) == 0, "Instruction format error");
     assert( ($primary >> 16)         == 0, "Instruction format error");
-    z_emit16(cbuf, $primary |
+    z_emit16(masm, $primary |
              Assembler::reg($dst$$reg,8,16) |
              Assembler::reg($src$$reg,12,16));
   %}
 
   enc_class z_rreform(iRegI dst1, iRegI src2) %{
     assert((($primary >> 30) & 0x03) == 2, "Instruction format error");
-    z_emit32(cbuf, $primary |
+    z_emit32(masm, $primary |
              Assembler::reg($dst1$$reg,24,32) |
              Assembler::reg($src2$$reg,28,32));
   %}
 
   enc_class z_rrfform(iRegI dst1, iRegI src2, iRegI src3) %{
     assert((($primary >> 30) & 0x03) == 2, "Instruction format error");
-    z_emit32(cbuf, $primary |
+    z_emit32(masm, $primary |
              Assembler::reg($dst1$$reg,24,32) |
              Assembler::reg($src2$$reg,28,32) |
              Assembler::reg($src3$$reg,16,32));
@@ -1737,21 +1714,21 @@ encode %{
 
   enc_class z_riform_signed(iRegI dst, immI16 src) %{
     assert((($primary>>30) & 0x03) == 2, "Instruction format error");
-    z_emit32(cbuf, $primary |
+    z_emit32(masm, $primary |
              Assembler::reg($dst$$reg,8,32) |
              Assembler::simm16($src$$constant,16,32));
   %}
 
   enc_class z_riform_unsigned(iRegI dst, uimmI16 src) %{
     assert((($primary>>30) & 0x03) == 2, "Instruction format error");
-    z_emit32(cbuf, $primary |
+    z_emit32(masm, $primary |
              Assembler::reg($dst$$reg,8,32) |
              Assembler::uimm16($src$$constant,16,32));
   %}
 
   enc_class z_rieform_d(iRegI dst1, iRegI src3, immI src2) %{
     assert((($primary>>46) & 0x03) == 3, "Instruction format error");
-    z_emit48(cbuf, $primary |
+    z_emit48(masm, $primary |
              Assembler::reg($dst1$$reg,8,48) |
              Assembler::reg($src3$$reg,12,48) |
              Assembler::simm16($src2$$constant,16,48));
@@ -1759,27 +1736,27 @@ encode %{
 
   enc_class z_rilform_signed(iRegI dst, immL32 src) %{
     assert((($primary>>46) & 0x03) == 3, "Instruction format error");
-    z_emit48(cbuf, $primary |
+    z_emit48(masm, $primary |
              Assembler::reg($dst$$reg,8,48) |
              Assembler::simm32($src$$constant,16,48));
   %}
 
   enc_class z_rilform_unsigned(iRegI dst, uimmL32 src) %{
     assert((($primary>>46) & 0x03) == 3, "Instruction format error");
-    z_emit48(cbuf, $primary |
+    z_emit48(masm, $primary |
              Assembler::reg($dst$$reg,8,48) |
              Assembler::uimm32($src$$constant,16,48));
   %}
 
   enc_class z_rsyform_const(iRegI dst, iRegI src1, immI src2) %{
-    z_emit48(cbuf, $primary |
+    z_emit48(masm, $primary |
              Assembler::reg($dst$$reg,8,48) |
              Assembler::reg($src1$$reg,12,48) |
              Assembler::simm20($src2$$constant));
   %}
 
   enc_class z_rsyform_reg_reg(iRegI dst, iRegI src, iRegI shft) %{
-    z_emit48(cbuf, $primary |
+    z_emit48(masm, $primary |
              Assembler::reg($dst$$reg,8,48) |
              Assembler::reg($src$$reg,12,48) |
              Assembler::reg($shft$$reg,16,48) |
@@ -1788,7 +1765,7 @@ encode %{
 
   enc_class z_rxform_imm_reg_reg(iRegL dst, immL con, iRegL src1, iRegL src2) %{
     assert((($primary>>30) & 0x03) == 1, "Instruction format error");
-    z_emit32(cbuf, $primary |
+    z_emit32(masm, $primary |
              Assembler::reg($dst$$reg,8,32) |
              Assembler::reg($src1$$reg,12,32) |
              Assembler::reg($src2$$reg,16,32) |
@@ -1797,14 +1774,14 @@ encode %{
 
   enc_class z_rxform_imm_reg(iRegL dst, immL con, iRegL src) %{
     assert((($primary>>30) & 0x03) == 1, "Instruction format error");
-    z_emit32(cbuf, $primary |
+    z_emit32(masm, $primary |
              Assembler::reg($dst$$reg,8,32) |
              Assembler::reg($src$$reg,16,32) |
              Assembler::uimm12($con$$constant,20,32));
   %}
 
   enc_class z_rxyform_imm_reg_reg(iRegL dst, immL con, iRegL src1, iRegL src2) %{
-    z_emit48(cbuf, $primary |
+    z_emit48(masm, $primary |
              Assembler::reg($dst$$reg,8,48) |
              Assembler::reg($src1$$reg,12,48) |
              Assembler::reg($src2$$reg,16,48) |
@@ -1812,7 +1789,7 @@ encode %{
   %}
 
   enc_class z_rxyform_imm_reg(iRegL dst, immL con, iRegL src) %{
-    z_emit48(cbuf, $primary |
+    z_emit48(masm, $primary |
              Assembler::reg($dst$$reg,8,48) |
              Assembler::reg($src$$reg,16,48) |
              Assembler::simm20($con$$constant));
@@ -1825,14 +1802,14 @@ encode %{
     int      con  = $src$$constant;
 
     assert(VM_Version::has_MemWithImmALUOps(), "unsupported CPU");
-    z_emit_inst(cbuf, $primary |
+    z_emit_inst(masm, $primary |
                 Assembler::regz(base,16,48) |
                 Assembler::simm20(disp) |
                 Assembler::simm8(con,8,48));
   %}
 
   enc_class z_silform(memoryRS mem, immI16 src) %{
-    z_emit_inst(cbuf, $primary |
+    z_emit_inst(masm, $primary |
                 Assembler::regz(reg_to_register_object($mem$$base),16,48) |
                 Assembler::uimm12($mem$$disp,20,48) |
                 Assembler::simm16($src$$constant,32,48));
@@ -1843,13 +1820,13 @@ encode %{
     Register Ridx = $mem$$index$$Register;
     if (Ridx == noreg) { Ridx = Z_R0; } // Index is 0.
     if ($primary > (1L << 32)) {
-      z_emit_inst(cbuf, $primary |
+      z_emit_inst(masm, $primary |
                   Assembler::reg($dst$$reg, 8, 48) |
                   Assembler::uimm12($mem$$disp, 20, 48) |
                   Assembler::reg(Ridx, 12, 48) |
                   Assembler::regz(reg_to_register_object($mem$$base), 16, 48));
     } else {
-      z_emit_inst(cbuf, $primary |
+      z_emit_inst(masm, $primary |
                   Assembler::reg($dst$$reg, 8, 32) |
                   Assembler::uimm12($mem$$disp, 20, 32) |
                   Assembler::reg(Ridx, 12, 32) |
@@ -1861,13 +1838,13 @@ encode %{
     Register Ridx = $mem$$index$$Register;
     if (Ridx == noreg) { Ridx = Z_R0; } // Index is 0.
     if ($primary > (1L<<32)) {
-      z_emit_inst(cbuf, $primary |
+      z_emit_inst(masm, $primary |
                   Assembler::reg($dst$$reg, 8, 48) |
                   Assembler::simm20($mem$$disp) |
                   Assembler::reg(Ridx, 12, 48) |
                   Assembler::regz(reg_to_register_object($mem$$base), 16, 48));
     } else {
-      z_emit_inst(cbuf, $primary |
+      z_emit_inst(masm, $primary |
                   Assembler::reg($dst$$reg, 8, 32) |
                   Assembler::uimm12($mem$$disp, 20, 32) |
                   Assembler::reg(Ridx, 12, 32) |
@@ -1881,22 +1858,21 @@ encode %{
     if (Ridx == noreg) { Ridx = Z_R0; } // Index is 0.
 
     if (Displacement::is_shortDisp((long)$mem$$disp)) {
-      z_emit_inst(cbuf, $secondary |
+      z_emit_inst(masm, $secondary |
                   Assembler::reg($dst$$reg, 8, isize) |
                   Assembler::uimm12($mem$$disp, 20, isize) |
                   Assembler::reg(Ridx, 12, isize) |
                   Assembler::regz(reg_to_register_object($mem$$base), 16, isize));
     } else if (Displacement::is_validDisp((long)$mem$$disp)) {
-      z_emit_inst(cbuf, $primary |
+      z_emit_inst(masm, $primary |
                   Assembler::reg($dst$$reg, 8, 48) |
                   Assembler::simm20($mem$$disp) |
                   Assembler::reg(Ridx, 12, 48) |
                   Assembler::regz(reg_to_register_object($mem$$base), 16, 48));
     } else {
-        C2_MacroAssembler _masm(&cbuf);
         __ load_const_optimized(Z_R1_scratch, $mem$$disp);
         if (Ridx != Z_R0) { __ z_agr(Z_R1_scratch, Ridx); }
-        z_emit_inst(cbuf, $secondary |
+        z_emit_inst(masm, $secondary |
                     Assembler::reg($dst$$reg, 8, isize) |
                     Assembler::uimm12(0, 20, isize) |
                     Assembler::reg(Z_R1_scratch, 12, isize) |
@@ -1905,7 +1881,6 @@ encode %{
   %}
 
   enc_class z_enc_brul(Label lbl) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* p = $lbl$$label;
 
     // 'p' is `nullptr' when this encoding class is used only to
@@ -1918,7 +1893,6 @@ encode %{
   %}
 
   enc_class z_enc_bru(Label lbl) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* p = $lbl$$label;
 
     // 'p' is `nullptr' when this encoding class is used only to
@@ -1931,7 +1905,6 @@ encode %{
   %}
 
   enc_class z_enc_branch_con_far(cmpOp cmp, Label lbl) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* p = $lbl$$label;
 
     // 'p' is `nullptr' when this encoding class is used only to
@@ -1944,7 +1917,6 @@ encode %{
   %}
 
   enc_class z_enc_branch_con_short(cmpOp cmp, Label lbl) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* p = $lbl$$label;
 
     // 'p' is `nullptr' when this encoding class is used only to
@@ -1957,7 +1929,6 @@ encode %{
   %}
 
   enc_class z_enc_cmpb_regreg(iRegI src1, iRegI src2, Label lbl, cmpOpT cmp) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* p = $lbl$$label;
 
     // 'p' is `nullptr' when this encoding class is used only to
@@ -1981,7 +1952,6 @@ encode %{
   %}
 
   enc_class z_enc_cmpb_regregFar(iRegI src1, iRegI src2, Label lbl, cmpOpT cmp) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* p = $lbl$$label;
 
     // 'p' is `nullptr' when this encoding class is used only to
@@ -2007,7 +1977,6 @@ encode %{
   %}
 
   enc_class z_enc_cmpb_regimm(iRegI src1, immI8 src2, Label lbl, cmpOpT cmp) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* p = $lbl$$label;
 
     // 'p' is `nullptr' when this encoding class is used only to
@@ -2032,7 +2001,6 @@ encode %{
   %}
 
   enc_class z_enc_cmpb_regimmFar(iRegI src1, immI8 src2, Label lbl, cmpOpT cmp) %{
-    C2_MacroAssembler _masm(&cbuf);
     Label* p = $lbl$$label;
 
     // 'p' is `nullptr' when this encoding class is used only to
@@ -2059,8 +2027,6 @@ encode %{
 
   // Call from Java to runtime.
   enc_class z_enc_java_to_runtime_call(method meth) %{
-    C2_MacroAssembler _masm(&cbuf);
-
     // Save return pc before call to the place where we need it, since
     // callee doesn't.
     unsigned int start_off = __ offset();
@@ -2087,36 +2053,37 @@ encode %{
   enc_class z_enc_java_static_call(method meth) %{
     // Call to fixup routine. Fixup routine uses ScopeDesc info to determine
     // whom we intended to call.
-    C2_MacroAssembler _masm(&cbuf);
     int ret_offset = 0;
 
     if (!_method) {
-      ret_offset = emit_call_reloc(_masm, $meth$$method,
+      ret_offset = emit_call_reloc(masm, $meth$$method,
                                    relocInfo::runtime_call_w_cp_type, ra_);
     } else {
-      int method_index = resolved_method_index(cbuf);
+      int method_index = resolved_method_index(masm);
       if (_optimized_virtual) {
-        ret_offset = emit_call_reloc(_masm, $meth$$method,
+        ret_offset = emit_call_reloc(masm, $meth$$method,
                                      opt_virtual_call_Relocation::spec(method_index));
       } else {
-        ret_offset = emit_call_reloc(_masm, $meth$$method,
+        ret_offset = emit_call_reloc(masm, $meth$$method,
                                      static_call_Relocation::spec(method_index));
       }
     }
     assert(__ inst_mark() != nullptr, "emit_call_reloc must set_inst_mark()");
 
     if (_method) { // Emit stub for static call.
-      address stub = CompiledDirectCall::emit_to_interp_stub(cbuf);
+      address stub = CompiledDirectCall::emit_to_interp_stub(masm);
       if (stub == nullptr) {
+        __ clear_inst_mark();
         ciEnv::current()->record_failure("CodeCache is full");
         return;
       }
     }
+
+    __ clear_inst_mark();
   %}
 
   // Java dynamic call
   enc_class z_enc_java_dynamic_call(method meth) %{
-    C2_MacroAssembler _masm(&cbuf);
     unsigned int start_off = __ offset();
 
     int vtable_index = this->_vtable_index;
@@ -2134,11 +2101,12 @@ encode %{
 
       // Call to fixup routine. Fixup routine uses ScopeDesc info
       // to determine who we intended to call.
-      int method_index = resolved_method_index(cbuf);
+      int method_index = resolved_method_index(masm);
       __ relocate(virtual_call_Relocation::spec(virtual_call_oop_addr, method_index));
       unsigned int ret_off = __ offset();
       assert(__ offset() - start_off == 6, "bad prelude len: %d", __ offset() - start_off);
-      ret_off += emit_call_reloc(_masm, $meth$$method, relocInfo::none, ra_);
+      ret_off += emit_call_reloc(masm, $meth$$method, relocInfo::none, ra_);
+      __ clear_inst_mark();
       assert(_method, "lazy_constant may be wrong when _method==null");
     } else {
       assert(!UseInlineCaches, "expect vtable calls only if not using ICs");
@@ -2171,7 +2139,6 @@ encode %{
   %}
 
   enc_class z_enc_cmov_reg(cmpOp cmp, iRegI dst, iRegI src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register Rdst = reg_to_register_object($dst$$reg);
     Register Rsrc = reg_to_register_object($src$$reg);
 
@@ -2192,7 +2159,6 @@ encode %{
   %}
 
   enc_class z_enc_cmov_imm(cmpOp cmp, iRegI dst, immI16 src) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register Rdst = reg_to_register_object($dst$$reg);
     int      Csrc = $src$$constant;
     Assembler::branch_condition cc = (Assembler::branch_condition)$cmp$$cmpcode;
@@ -2209,7 +2175,6 @@ encode %{
   %}
 
   enc_class z_enc_cctobool(iRegI res) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register Rres = reg_to_register_object($res$$reg);
 
     if (VM_Version::has_LoadStoreConditional()) {
@@ -2226,7 +2191,6 @@ encode %{
   %}
 
   enc_class z_enc_casI(iRegI compare_value, iRegI exchange_value, iRegP addr_ptr) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register Rcomp = reg_to_register_object($compare_value$$reg);
     Register Rnew  = reg_to_register_object($exchange_value$$reg);
     Register Raddr = reg_to_register_object($addr_ptr$$reg);
@@ -2235,7 +2199,6 @@ encode %{
   %}
 
   enc_class z_enc_casL(iRegL compare_value, iRegL exchange_value, iRegP addr_ptr) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register Rcomp = reg_to_register_object($compare_value$$reg);
     Register Rnew  = reg_to_register_object($exchange_value$$reg);
     Register Raddr = reg_to_register_object($addr_ptr$$reg);
@@ -2244,7 +2207,6 @@ encode %{
   %}
 
   enc_class z_enc_SwapI(memoryRSY mem, iRegI dst, iRegI tmp) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register Rdst = reg_to_register_object($dst$$reg);
     Register Rtmp = reg_to_register_object($tmp$$reg);
     guarantee(Rdst != Rtmp, "Fix match rule to use TEMP_DEF");
@@ -2260,7 +2222,6 @@ encode %{
   %}
 
   enc_class z_enc_SwapL(memoryRSY mem, iRegL dst, iRegL tmp) %{
-    C2_MacroAssembler _masm(&cbuf);
     Register Rdst = reg_to_register_object($dst$$reg);
     Register Rtmp = reg_to_register_object($tmp$$reg);
     guarantee(Rdst != Rtmp, "Fix match rule to use TEMP_DEF");
@@ -9558,9 +9519,10 @@ instruct RethrowException() %{
   // TODO: s390 port size(VARIABLE_SIZE);
   format %{ "Jmp    rethrow_stub" %}
   ins_encode %{
-    cbuf.set_insts_mark();
+    __ set_inst_mark();
     __ load_const_optimized(Z_R1_scratch, (address)OptoRuntime::rethrow_stub());
     __ z_br(Z_R1_scratch);
+    __ clear_inst_mark();
   %}
   ins_pipe(pipe_class_dummy);
 %}
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index bb04ae12fa8..0896fbd8bf5 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -4260,6 +4260,7 @@ void Assembler::vpermb(XMMRegister dst, XMMRegister nds, XMMRegister src, int ve
 
 void Assembler::vpermb(XMMRegister dst, XMMRegister nds, Address src, int vector_len) {
   assert(VM_Version::supports_avx512_vbmi(), "");
+  InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes);
@@ -4695,6 +4696,7 @@ void Assembler::pextrd(Register dst, XMMRegister src, int imm8) {
 
 void Assembler::pextrd(Address dst, XMMRegister src, int imm8) {
   assert(VM_Version::supports_sse4_1(), "");
+  InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ _legacy_mode_dq, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_32bit);
   simd_prefix(src, xnoreg, dst, VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes);
@@ -4712,6 +4714,7 @@ void Assembler::pextrq(Register dst, XMMRegister src, int imm8) {
 
 void Assembler::pextrq(Address dst, XMMRegister src, int imm8) {
   assert(VM_Version::supports_sse4_1(), "");
+  InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ _legacy_mode_dq, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_64bit);
   simd_prefix(src, xnoreg, dst, VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes);
@@ -4729,6 +4732,7 @@ void Assembler::pextrw(Register dst, XMMRegister src, int imm8) {
 
 void Assembler::pextrw(Address dst, XMMRegister src, int imm8) {
   assert(VM_Version::supports_sse4_1(), "");
+  InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_16bit);
   simd_prefix(src, xnoreg, dst, VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes);
@@ -4746,6 +4750,7 @@ void Assembler::pextrb(Register dst, XMMRegister src, int imm8) {
 
 void Assembler::pextrb(Address dst, XMMRegister src, int imm8) {
   assert(VM_Version::supports_sse4_1(), "");
+  InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_8bit);
   simd_prefix(src, xnoreg, dst, VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes);
@@ -4763,6 +4768,7 @@ void Assembler::pinsrd(XMMRegister dst, Register src, int imm8) {
 
 void Assembler::pinsrd(XMMRegister dst, Address src, int imm8) {
   assert(VM_Version::supports_sse4_1(), "");
+  InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ _legacy_mode_dq, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_32bit);
   simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes);
@@ -4787,6 +4793,7 @@ void Assembler::pinsrq(XMMRegister dst, Register src, int imm8) {
 
 void Assembler::pinsrq(XMMRegister dst, Address src, int imm8) {
   assert(VM_Version::supports_sse4_1(), "");
+  InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ _legacy_mode_dq, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_64bit);
   simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes);
@@ -4811,6 +4818,7 @@ void Assembler::pinsrw(XMMRegister dst, Register src, int imm8) {
 
 void Assembler::pinsrw(XMMRegister dst, Address src, int imm8) {
   assert(VM_Version::supports_sse2(), "");
+  InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_16bit);
   simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
@@ -4828,6 +4836,7 @@ void Assembler::vpinsrw(XMMRegister dst, XMMRegister nds, Register src, int imm8
 
 void Assembler::pinsrb(XMMRegister dst, Address src, int imm8) {
   assert(VM_Version::supports_sse4_1(), "");
+  InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_8bit);
   simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes);
@@ -13318,21 +13327,25 @@ void Assembler::decq(Address dst) {
 }
 
 void Assembler::fxrstor(Address src) {
+  InstructionMark im(this);
   emit_int24(get_prefixq(src), 0x0F, (unsigned char)0xAE);
   emit_operand(as_Register(1), src, 0);
 }
 
 void Assembler::xrstor(Address src) {
+  InstructionMark im(this);
   emit_int24(get_prefixq(src), 0x0F, (unsigned char)0xAE);
   emit_operand(as_Register(5), src, 0);
 }
 
 void Assembler::fxsave(Address dst) {
+  InstructionMark im(this);
   emit_int24(get_prefixq(dst), 0x0F, (unsigned char)0xAE);
   emit_operand(as_Register(0), dst, 0);
 }
 
 void Assembler::xsave(Address dst) {
+  InstructionMark im(this);
   emit_int24(get_prefixq(dst), 0x0F, (unsigned char)0xAE);
   emit_operand(as_Register(4), dst, 0);
 }
diff --git a/src/hotspot/cpu/x86/c2_intelJccErratum_x86.cpp b/src/hotspot/cpu/x86/c2_intelJccErratum_x86.cpp
index fce09c31b9c..7b71a6bdbfc 100644
--- a/src/hotspot/cpu/x86/c2_intelJccErratum_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_intelJccErratum_x86.cpp
@@ -114,13 +114,13 @@ int IntelJccErratum::compute_padding(uintptr_t current_offset, const MachNode* m
   }
 }
 
-#define __ _masm.
+#define __ _masm->
 
 uintptr_t IntelJccErratumAlignment::pc() {
   return (uintptr_t)__ pc();
 }
 
-IntelJccErratumAlignment::IntelJccErratumAlignment(MacroAssembler& masm, int jcc_size) :
+IntelJccErratumAlignment::IntelJccErratumAlignment(MacroAssembler* masm, int jcc_size) :
     _masm(masm),
     _start_pc(pc()) {
   if (!VM_Version::has_intel_jcc_erratum()) {
diff --git a/src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp b/src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp
index 415d8a99933..485a2d17c16 100644
--- a/src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, 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
@@ -54,13 +54,13 @@ public:
 
 class IntelJccErratumAlignment {
 private:
-  MacroAssembler& _masm;
+  MacroAssembler* _masm;
   uintptr_t       _start_pc;
 
   uintptr_t pc();
 
 public:
-  IntelJccErratumAlignment(MacroAssembler& masm, int jcc_size);
+  IntelJccErratumAlignment(MacroAssembler* masm, int jcc_size);
   ~IntelJccErratumAlignment();
 };
 
diff --git a/src/hotspot/cpu/x86/compiledIC_x86.cpp b/src/hotspot/cpu/x86/compiledIC_x86.cpp
index 95b41f62b6a..e46f892b388 100644
--- a/src/hotspot/cpu/x86/compiledIC_x86.cpp
+++ b/src/hotspot/cpu/x86/compiledIC_x86.cpp
@@ -34,21 +34,17 @@
 
 // ----------------------------------------------------------------------------
 
-#define __ _masm.
-address CompiledDirectCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) {
+#define __ masm->
+address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark) {
   // Stub is fixed up when the corresponding call is converted from
   // calling compiled code to calling interpreted code.
   // movq rbx, 0
   // jmp -5 # to self
 
   if (mark == nullptr) {
-    mark = cbuf.insts_mark();  // Get mark within main instrs section.
+    mark = __ inst_mark();  // Get mark within main instrs section.
   }
 
-  // Note that the code buffer's insts_mark is always relative to insts.
-  // That's why we must use the macroassembler to generate a stub.
-  MacroAssembler _masm(&cbuf);
-
   address base = __ start_a_stub(to_interp_stub_size());
   if (base == nullptr) {
     return nullptr;  // CodeBuffer::expand failed.
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_32.ad b/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_32.ad
index 8675a34324f..3cf82bf9fb1 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_32.ad
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_32.ad
@@ -40,7 +40,7 @@ instruct compareAndSwapP_shenandoah(rRegI res,
   format %{ "shenandoah_cas_oop $mem_ptr,$newval" %}
 
   ins_encode %{
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm,
                                                    $res$$Register, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
                                                    false, // swap
                                                    $tmp1$$Register, $tmp2$$Register
@@ -61,7 +61,7 @@ instruct compareAndExchangeP_shenandoah(memory mem_ptr,
   format %{ "shenandoah_cas_oop $mem_ptr,$newval" %}
 
   ins_encode %{
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm,
                                                    noreg, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
                                                    true,  // exchange
                                                    $tmp1$$Register, $tmp2$$Register
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_64.ad b/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_64.ad
index cb595f16168..c580d21c9b8 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_64.ad
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_64.ad
@@ -40,7 +40,7 @@ instruct compareAndSwapP_shenandoah(rRegI res,
   format %{ "shenandoah_cas_oop $mem_ptr,$newval" %}
 
   ins_encode %{
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm,
                                                    $res$$Register, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
                                                    false, // swap
                                                    $tmp1$$Register, $tmp2$$Register
@@ -61,7 +61,7 @@ instruct compareAndSwapN_shenandoah(rRegI res,
   format %{ "shenandoah_cas_oop $mem_ptr,$newval" %}
 
   ins_encode %{
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm,
                                                    $res$$Register, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
                                                    false, // swap
                                                    $tmp1$$Register, $tmp2$$Register
@@ -80,7 +80,7 @@ instruct compareAndExchangeN_shenandoah(memory mem_ptr,
   format %{ "shenandoah_cas_oop $mem_ptr,$newval" %}
 
   ins_encode %{
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm,
                                                    noreg, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
                                                    true, // exchange
                                                    $tmp1$$Register, $tmp2$$Register
@@ -101,7 +101,7 @@ instruct compareAndExchangeP_shenandoah(memory mem_ptr,
   format %{ "shenandoah_cas_oop $mem_ptr,$newval" %}
 
   ins_encode %{
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm,
                                                    noreg, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
                                                    true,  // exchange
                                                    $tmp1$$Register, $tmp2$$Register
diff --git a/src/hotspot/cpu/x86/gc/x/xBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/x/xBarrierSetAssembler_x86.cpp
index 38129a9fc81..4805b213084 100644
--- a/src/hotspot/cpu/x86/gc/x/xBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/x/xBarrierSetAssembler_x86.cpp
@@ -375,7 +375,7 @@ OptoReg::Name XBarrierSetAssembler::refine_register(const Node* node, OptoReg::N
 }
 
 // We use the vec_spill_helper from the x86.ad file to avoid reinventing this wheel
-extern void vec_spill_helper(CodeBuffer *cbuf, bool is_load,
+extern void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
                             int stack_offset, int reg, uint ireg, outputStream* st);
 
 #undef __
@@ -437,13 +437,15 @@ private:
     const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
     const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
     _spill_offset -= reg_data._size;
-    vec_spill_helper(__ code(), false /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
+    C2_MacroAssembler c2_masm(__ code());
+    vec_spill_helper(&c2_masm, false /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
   }
 
   void xmm_register_restore(const XMMRegisterData& reg_data) {
     const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
     const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
-    vec_spill_helper(__ code(), true /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
+    C2_MacroAssembler c2_masm(__ code());
+    vec_spill_helper(&c2_masm, true /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
     _spill_offset += reg_data._size;
   }
 
diff --git a/src/hotspot/cpu/x86/gc/x/x_x86_64.ad b/src/hotspot/cpu/x86/gc/x/x_x86_64.ad
index c33a994a4b8..116fb3cbc6d 100644
--- a/src/hotspot/cpu/x86/gc/x/x_x86_64.ad
+++ b/src/hotspot/cpu/x86/gc/x/x_x86_64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2015, 2023, 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
@@ -33,34 +33,34 @@ source %{
 
 #include "c2_intelJccErratum_x86.hpp"
 
-static void x_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data) {
+static void x_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, uint8_t barrier_data) {
   if (barrier_data == XLoadBarrierElided) {
     return;
   }
   XLoadBarrierStubC2* const stub = XLoadBarrierStubC2::create(node, ref_addr, ref, tmp, barrier_data);
   {
-    IntelJccErratumAlignment intel_alignment(_masm, 10 /* jcc_size */);
+    IntelJccErratumAlignment intel_alignment(masm, 10 /* jcc_size */);
     __ testptr(ref, Address(r15_thread, XThreadLocalData::address_bad_mask_offset()));
     __ jcc(Assembler::notZero, *stub->entry());
   }
   __ bind(*stub->continuation());
 }
 
-static void x_load_barrier_cmpxchg(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, Label& good) {
+static void x_load_barrier_cmpxchg(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, Label& good) {
   XLoadBarrierStubC2* const stub = XLoadBarrierStubC2::create(node, ref_addr, ref, tmp, XLoadBarrierStrong);
   {
-    IntelJccErratumAlignment intel_alignment(_masm, 10 /* jcc_size */);
+    IntelJccErratumAlignment intel_alignment(masm, 10 /* jcc_size */);
     __ testptr(ref, Address(r15_thread, XThreadLocalData::address_bad_mask_offset()));
     __ jcc(Assembler::zero, good);
   }
   {
-    IntelJccErratumAlignment intel_alignment(_masm, 5 /* jcc_size */);
+    IntelJccErratumAlignment intel_alignment(masm, 5 /* jcc_size */);
     __ jmp(*stub->entry());
   }
   __ bind(*stub->continuation());
 }
 
-static void x_cmpxchg_common(MacroAssembler& _masm, const MachNode* node, Register mem_reg, Register newval, Register tmp) {
+static void x_cmpxchg_common(MacroAssembler* masm, const MachNode* node, Register mem_reg, Register newval, Register tmp) {
   // Compare value (oldval) is in rax
    const Address mem = Address(mem_reg, 0);
 
@@ -73,7 +73,7 @@ static void x_cmpxchg_common(MacroAssembler& _masm, const MachNode* node, Regist
 
   if (node->barrier_data() != XLoadBarrierElided) {
     Label good;
-    x_load_barrier_cmpxchg(_masm, node, mem, rax, tmp, good);
+    x_load_barrier_cmpxchg(masm, node, mem, rax, tmp, good);
     __ movptr(rax, tmp);
     __ lock();
     __ cmpxchgptr(newval, mem);
@@ -96,7 +96,7 @@ instruct xLoadP(rRegP dst, memory mem, rFlagsReg cr)
 
   ins_encode %{
     __ movptr($dst$$Register, $mem$$Address);
-    x_load_barrier(_masm, this, $mem$$Address, $dst$$Register, noreg /* tmp */, barrier_data());
+    x_load_barrier(masm, this, $mem$$Address, $dst$$Register, noreg /* tmp */, barrier_data());
   %}
 
   ins_pipe(ialu_reg_mem);
@@ -112,7 +112,7 @@ instruct xCompareAndExchangeP(indirect mem, rax_RegP oldval, rRegP newval, rRegP
 
   ins_encode %{
     precond($oldval$$Register == rax);
-    x_cmpxchg_common(_masm, this, $mem$$Register, $newval$$Register, $tmp$$Register);
+    x_cmpxchg_common(masm, this, $mem$$Register, $newval$$Register, $tmp$$Register);
   %}
 
   ins_pipe(pipe_cmpxchg);
@@ -131,7 +131,7 @@ instruct xCompareAndSwapP(rRegI res, indirect mem, rRegP newval, rRegP tmp, rFla
 
   ins_encode %{
     precond($oldval$$Register == rax);
-    x_cmpxchg_common(_masm, this, $mem$$Register, $newval$$Register, $tmp$$Register);
+    x_cmpxchg_common(masm, this, $mem$$Register, $newval$$Register, $tmp$$Register);
     if (barrier_data() != XLoadBarrierElided) {
       __ cmpptr($tmp$$Register, rax);
     }
@@ -151,7 +151,7 @@ instruct xXChgP(indirect mem, rRegP newval, rFlagsReg cr) %{
 
   ins_encode %{
     __ xchgptr($newval$$Register, Address($mem$$Register, 0));
-    x_load_barrier(_masm, this, Address(noreg, 0), $newval$$Register, noreg /* tmp */, barrier_data());
+    x_load_barrier(masm, this, Address(noreg, 0), $newval$$Register, noreg /* tmp */, barrier_data());
   %}
 
   ins_pipe(pipe_cmpxchg);
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index 6cb16a09d55..5f0b73bf23f 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -356,7 +356,7 @@ static void emit_store_fast_path_check_c2(MacroAssembler* masm, Address ref_addr
   // This is a JCC erratum mitigation wrapper for calling the inner check
   int size = store_fast_path_check_size(masm, ref_addr, is_atomic, medium_path);
   // Emit JCC erratum mitigation nops with the right size
-  IntelJccErratumAlignment intel_alignment(*masm, size);
+  IntelJccErratumAlignment intel_alignment(masm, size);
   // Emit the JCC erratum mitigation guarded code
   emit_store_fast_path_check(masm, ref_addr, is_atomic, medium_path);
 #endif
@@ -1184,7 +1184,7 @@ OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::N
 }
 
 // We use the vec_spill_helper from the x86.ad file to avoid reinventing this wheel
-extern void vec_spill_helper(CodeBuffer *cbuf, bool is_load,
+extern void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
                             int stack_offset, int reg, uint ireg, outputStream* st);
 
 #undef __
@@ -1246,13 +1246,15 @@ private:
     const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
     const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
     _spill_offset -= reg_data._size;
-    vec_spill_helper(__ code(), false /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
+    C2_MacroAssembler c2_masm(__ code());
+    vec_spill_helper(&c2_masm, false /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
   }
 
   void xmm_register_restore(const XMMRegisterData& reg_data) {
     const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
     const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
-    vec_spill_helper(__ code(), true /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
+    C2_MacroAssembler c2_masm(__ code());
+    vec_spill_helper(&c2_masm, true /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
     _spill_offset += reg_data._size;
   }
 
diff --git a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
index 0cc2ea03b35..1a4499c3d44 100644
--- a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
+++ b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
@@ -34,66 +34,66 @@ source %{
 #include "c2_intelJccErratum_x86.hpp"
 #include "gc/z/zBarrierSetAssembler.hpp"
 
-static void z_color(MacroAssembler& _masm, const MachNode* node, Register ref) {
+static void z_color(MacroAssembler* masm, const MachNode* node, Register ref) {
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shlq(ref, barrier_Relocation::unpatched);
   __ orq_imm32(ref, barrier_Relocation::unpatched);
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodAfterOr);
 }
 
-static void z_uncolor(MacroAssembler& _masm, const MachNode* node, Register ref) {
+static void z_uncolor(MacroAssembler* masm, const MachNode* node, Register ref) {
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shrq(ref, barrier_Relocation::unpatched);
 }
 
-static void z_keep_alive_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref) {
+static void z_keep_alive_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref) {
   __ Assembler::testl(ref, barrier_Relocation::unpatched);
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatMarkBadAfterTest);
 
   ZLoadBarrierStubC2* const stub = ZLoadBarrierStubC2::create(node, ref_addr, ref);
   __ jcc(Assembler::notEqual, *stub->entry());
 
-  z_uncolor(_masm, node, ref);
+  z_uncolor(masm, node, ref);
 
   __ bind(*stub->continuation());
 }
 
-static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref) {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(&_masm);
+static void z_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref) {
+  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   const bool on_non_strong =
       ((node->barrier_data() & ZBarrierWeak) != 0) ||
       ((node->barrier_data() & ZBarrierPhantom) != 0);
 
   if (on_non_strong) {
-    z_keep_alive_load_barrier(_masm, node, ref_addr, ref);
+    z_keep_alive_load_barrier(masm, node, ref_addr, ref);
     return;
   }
 
-  z_uncolor(_masm, node, ref);
+  z_uncolor(masm, node, ref);
   if (node->barrier_data() == ZBarrierElided) {
     return;
   }
   ZLoadBarrierStubC2* const stub = ZLoadBarrierStubC2::create(node, ref_addr, ref);
   {
-    IntelJccErratumAlignment intel_alignment(_masm, 6);
+    IntelJccErratumAlignment intel_alignment(masm, 6);
     __ jcc(Assembler::above, *stub->entry());
   }
   __ bind(*stub->continuation());
 }
 
-static void z_store_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register rnew_zaddress, Register rnew_zpointer, bool is_atomic) {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(&_masm);
+static void z_store_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register rnew_zaddress, Register rnew_zpointer, bool is_atomic) {
+  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   if (node->barrier_data() == ZBarrierElided) {
     if (rnew_zaddress != noreg) {
       // noreg means null; no need to color
       __ movptr(rnew_zpointer, rnew_zaddress);
-      z_color(_masm, node, rnew_zpointer);
+      z_color(masm, node, rnew_zpointer);
     }
   } else {
     bool is_native = (node->barrier_data() & ZBarrierNative) != 0;
     ZStoreBarrierStubC2* const stub = ZStoreBarrierStubC2::create(node, ref_addr, rnew_zaddress, rnew_zpointer, is_native, is_atomic);
     ZBarrierSetAssembler* bs_asm = ZBarrierSet::assembler();
-    bs_asm->store_barrier_fast(&_masm, ref_addr, rnew_zaddress, rnew_zpointer, true /* in_nmethod */, is_atomic, *stub->entry(), *stub->continuation());
+    bs_asm->store_barrier_fast(masm, ref_addr, rnew_zaddress, rnew_zpointer, true /* in_nmethod */, is_atomic, *stub->entry(), *stub->continuation());
   }
 }
 
@@ -124,7 +124,7 @@ instruct zLoadP(rRegP dst, memory mem, rFlagsReg cr)
 
   ins_encode %{
     __ movptr($dst$$Register, $mem$$Address);
-    z_load_barrier(_masm, this, $mem$$Address, $dst$$Register);
+    z_load_barrier(masm, this, $mem$$Address, $dst$$Register);
   %}
 
   ins_pipe(ialu_reg_mem);
@@ -156,7 +156,7 @@ instruct zStoreP(memory mem, any_RegP src, rRegP tmp, rFlagsReg cr)
   ins_cost(125); // XXX
   format %{ "movq    $mem, $src\t# ptr" %}
   ins_encode %{
-    z_store_barrier(_masm, this, $mem$$Address, $src$$Register, $tmp$$Register, false /* is_atomic */);
+    z_store_barrier(masm, this, $mem$$Address, $src$$Register, $tmp$$Register, false /* is_atomic */);
     __ movq($mem$$Address, $tmp$$Register);
   %}
   ins_pipe(ialu_mem_reg);
@@ -172,7 +172,7 @@ instruct zStorePNull(memory mem, immP0 zero, rRegP tmp, rFlagsReg cr)
   ins_cost(125); // XXX
   format %{ "movq    $mem, 0\t# ptr" %}
   ins_encode %{
-    z_store_barrier(_masm, this, $mem$$Address, noreg, $tmp$$Register, false /* is_atomic */);
+    z_store_barrier(masm, this, $mem$$Address, noreg, $tmp$$Register, false /* is_atomic */);
     // Store a colored null - barrier code above does not need to color
     __ movq($mem$$Address, barrier_Relocation::unpatched);
     // The relocation cant be fully after the mov, as that is the beginning of a random subsequent
@@ -194,11 +194,11 @@ instruct zCompareAndExchangeP(indirect mem, no_rax_RegP newval, rRegP tmp, rax_R
     assert_different_registers($oldval$$Register, $mem$$Register);
     assert_different_registers($oldval$$Register, $newval$$Register);
     const Address mem_addr = Address($mem$$Register, 0);
-    z_store_barrier(_masm, this, mem_addr, $newval$$Register, $tmp$$Register, true /* is_atomic */);
-    z_color(_masm, this, $oldval$$Register);
+    z_store_barrier(masm, this, mem_addr, $newval$$Register, $tmp$$Register, true /* is_atomic */);
+    z_color(masm, this, $oldval$$Register);
     __ lock();
     __ cmpxchgptr($tmp$$Register, mem_addr);
-    z_uncolor(_masm, this, $oldval$$Register);
+    z_uncolor(masm, this, $oldval$$Register);
   %}
 
   ins_pipe(pipe_cmpxchg);
@@ -218,8 +218,8 @@ instruct zCompareAndSwapP(rRegI res, indirect mem, rRegP newval, rRegP tmp, rax_
   ins_encode %{
     assert_different_registers($oldval$$Register, $mem$$Register);
     const Address mem_addr = Address($mem$$Register, 0);
-    z_store_barrier(_masm, this, mem_addr, $newval$$Register, $tmp$$Register, true /* is_atomic */);
-    z_color(_masm, this, $oldval$$Register);
+    z_store_barrier(masm, this, mem_addr, $newval$$Register, $tmp$$Register, true /* is_atomic */);
+    z_color(masm, this, $oldval$$Register);
     __ lock();
     __ cmpxchgptr($tmp$$Register, mem_addr);
     __ setb(Assembler::equal, $res$$Register);
@@ -239,10 +239,10 @@ instruct zXChgP(indirect mem, rRegP newval, rRegP tmp, rFlagsReg cr) %{
   ins_encode %{
     assert_different_registers($mem$$Register, $newval$$Register);
     const Address mem_addr = Address($mem$$Register, 0);
-    z_store_barrier(_masm, this, mem_addr, $newval$$Register, $tmp$$Register, true /* is_atomic */);
+    z_store_barrier(masm, this, mem_addr, $newval$$Register, $tmp$$Register, true /* is_atomic */);
     __ movptr($newval$$Register, $tmp$$Register);
     __ xchgptr($newval$$Register, mem_addr);
-    z_uncolor(_masm, this, $newval$$Register);
+    z_uncolor(masm, this, $newval$$Register);
   %}
 
   ins_pipe(pipe_cmpxchg);
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index c666f982d0f..0c1dc865c78 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -1441,8 +1441,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
     // Make sure the call is patchable
     __ align(BytesPerWord, __ offset() + NativeCall::displacement_offset);
     // Emit stub for static call
-    CodeBuffer* cbuf = masm->code_section()->outer();
-    address stub = CompiledDirectCall::emit_to_interp_stub(*cbuf, __ pc());
+    address stub = CompiledDirectCall::emit_to_interp_stub(masm, __ pc());
     if (stub == nullptr) {
       fatal("CodeCache is full at gen_continuation_enter");
     }
@@ -1478,8 +1477,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
   __ align(BytesPerWord, __ offset() + NativeCall::displacement_offset);
 
   // Emit stub for static call
-  CodeBuffer* cbuf = masm->code_section()->outer();
-  address stub = CompiledDirectCall::emit_to_interp_stub(*cbuf, __ pc());
+  address stub = CompiledDirectCall::emit_to_interp_stub(masm, __ pc());
   if (stub == nullptr) {
     fatal("CodeCache is full at gen_continuation_enter");
   }
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 54306d02ea0..0b262bb9c37 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -1187,8 +1187,8 @@ class HandlerImpl {
 
  public:
 
-  static int emit_exception_handler(CodeBuffer &cbuf);
-  static int emit_deopt_handler(CodeBuffer& cbuf);
+  static int emit_exception_handler(C2_MacroAssembler *masm);
+  static int emit_deopt_handler(C2_MacroAssembler* masm);
 
   static uint size_exception_handler() {
     // NativeCall instruction size is the same as NativeJump.
@@ -1306,11 +1306,10 @@ int MachNode::compute_padding(int current_offset) const {
 
 // Emit exception handler code.
 // Stuff framesize into a register and call a VM stub routine.
-int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf) {
+int HandlerImpl::emit_exception_handler(C2_MacroAssembler* masm) {
 
   // Note that the code buffer's insts_mark is always relative to insts.
   // That's why we must use the macroassembler to generate a handler.
-  C2_MacroAssembler _masm(&cbuf);
   address base = __ start_a_stub(size_exception_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -1324,11 +1323,10 @@ int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf) {
 }
 
 // Emit deopt handler code.
-int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf) {
+int HandlerImpl::emit_deopt_handler(C2_MacroAssembler* masm) {
 
   // Note that the code buffer's insts_mark is always relative to insts.
   // That's why we must use the macroassembler to generate a handler.
-  C2_MacroAssembler _masm(&cbuf);
   address base = __ start_a_stub(size_deopt_handler());
   if (base == nullptr) {
     ciEnv::current()->record_failure("CodeCache is full");
@@ -2523,14 +2521,13 @@ static inline Assembler::ComparisonPredicateFP booltest_pred_to_comparison_pred_
 }
 
 // Helper methods for MachSpillCopyNode::implementation().
-static void vec_mov_helper(CodeBuffer *cbuf, int src_lo, int dst_lo,
+static void vec_mov_helper(C2_MacroAssembler *masm, int src_lo, int dst_lo,
                           int src_hi, int dst_hi, uint ireg, outputStream* st) {
   assert(ireg == Op_VecS || // 32bit vector
          ((src_lo & 1) == 0 && (src_lo + 1) == src_hi &&
           (dst_lo & 1) == 0 && (dst_lo + 1) == dst_hi),
          "no non-adjacent vector moves" );
-  if (cbuf) {
-    C2_MacroAssembler _masm(cbuf);
+  if (masm) {
     switch (ireg) {
     case Op_VecS: // copy whole register
     case Op_VecD:
@@ -2581,10 +2578,9 @@ static void vec_mov_helper(CodeBuffer *cbuf, int src_lo, int dst_lo,
   }
 }
 
-void vec_spill_helper(CodeBuffer *cbuf, bool is_load,
+void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
                      int stack_offset, int reg, uint ireg, outputStream* st) {
-  if (cbuf) {
-    C2_MacroAssembler _masm(cbuf);
+  if (masm) {
     if (is_load) {
       switch (ireg) {
       case Op_VecS:
@@ -2742,8 +2738,7 @@ static inline jlong high_bit_set(BasicType bt) {
   }
 #endif
 
-  void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc*) const {
-    C2_MacroAssembler _masm(&cbuf);
+  void MachNopNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc*) const {
     __ nop(_count);
   }
 
@@ -2757,8 +2752,7 @@ static inline jlong high_bit_set(BasicType bt) {
   }
 #endif
 
-  void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc* ra_) const {
-    C2_MacroAssembler _masm(&cbuf);
+  void MachBreakpointNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc* ra_) const {
     __ int3();
   }
 
@@ -2771,7 +2765,6 @@ static inline jlong high_bit_set(BasicType bt) {
 encode %{
 
   enc_class call_epilog %{
-    C2_MacroAssembler _masm(&cbuf);
     if (VerifyStackAtCalls) {
       // Check that stack depth is unchanged: find majik cookie on stack
       int framesize = ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP, -3*VMRegImpl::slots_per_word));
diff --git a/src/hotspot/cpu/x86/x86_32.ad b/src/hotspot/cpu/x86/x86_32.ad
index 36ec4d283ed..39c09efc49c 100644
--- a/src/hotspot/cpu/x86/x86_32.ad
+++ b/src/hotspot/cpu/x86/x86_32.ad
@@ -252,7 +252,7 @@ source %{
 #define   RELOC_IMM32    Assembler::imm_operand
 #define   RELOC_DISP32   Assembler::disp32_operand
 
-#define __ _masm.
+#define __ masm->
 
 // How to find the high register of a Long pair, given the low register
 #define   HIGH_FROM_LOW(x) (as_Register((x)->encoding()+2))
@@ -337,107 +337,107 @@ int CallDynamicJavaDirectNode::compute_padding(int current_offset) const {
 }
 
 // EMIT_RM()
-void emit_rm(CodeBuffer &cbuf, int f1, int f2, int f3) {
+void emit_rm(C2_MacroAssembler *masm, int f1, int f2, int f3) {
   unsigned char c = (unsigned char)((f1 << 6) | (f2 << 3) | f3);
-  cbuf.insts()->emit_int8(c);
+  __ emit_int8(c);
 }
 
 // EMIT_CC()
-void emit_cc(CodeBuffer &cbuf, int f1, int f2) {
+void emit_cc(C2_MacroAssembler *masm, int f1, int f2) {
   unsigned char c = (unsigned char)( f1 | f2 );
-  cbuf.insts()->emit_int8(c);
+  __ emit_int8(c);
 }
 
 // EMIT_OPCODE()
-void emit_opcode(CodeBuffer &cbuf, int code) {
-  cbuf.insts()->emit_int8((unsigned char) code);
+void emit_opcode(C2_MacroAssembler *masm, int code) {
+  __ emit_int8((unsigned char) code);
 }
 
 // EMIT_OPCODE() w/ relocation information
-void emit_opcode(CodeBuffer &cbuf, int code, relocInfo::relocType reloc, int offset = 0) {
-  cbuf.relocate(cbuf.insts_mark() + offset, reloc);
-  emit_opcode(cbuf, code);
+void emit_opcode(C2_MacroAssembler *masm, int code, relocInfo::relocType reloc, int offset = 0) {
+  __ relocate(__ inst_mark() + offset, reloc);
+  emit_opcode(masm, code);
 }
 
 // EMIT_D8()
-void emit_d8(CodeBuffer &cbuf, int d8) {
-  cbuf.insts()->emit_int8((unsigned char) d8);
+void emit_d8(C2_MacroAssembler *masm, int d8) {
+  __ emit_int8((unsigned char) d8);
 }
 
 // EMIT_D16()
-void emit_d16(CodeBuffer &cbuf, int d16) {
-  cbuf.insts()->emit_int16(d16);
+void emit_d16(C2_MacroAssembler *masm, int d16) {
+  __ emit_int16(d16);
 }
 
 // EMIT_D32()
-void emit_d32(CodeBuffer &cbuf, int d32) {
-  cbuf.insts()->emit_int32(d32);
+void emit_d32(C2_MacroAssembler *masm, int d32) {
+  __ emit_int32(d32);
 }
 
 // emit 32 bit value and construct relocation entry from relocInfo::relocType
-void emit_d32_reloc(CodeBuffer &cbuf, int d32, relocInfo::relocType reloc,
+void emit_d32_reloc(C2_MacroAssembler *masm, int d32, relocInfo::relocType reloc,
         int format) {
-  cbuf.relocate(cbuf.insts_mark(), reloc, format);
-  cbuf.insts()->emit_int32(d32);
+  __ relocate(__ inst_mark(), reloc, format);
+  __ emit_int32(d32);
 }
 
 // emit 32 bit value and construct relocation entry from RelocationHolder
-void emit_d32_reloc(CodeBuffer &cbuf, int d32, RelocationHolder const& rspec,
+void emit_d32_reloc(C2_MacroAssembler *masm, int d32, RelocationHolder const& rspec,
         int format) {
 #ifdef ASSERT
   if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
     assert(oopDesc::is_oop(cast_to_oop(d32)), "cannot embed broken oops in code");
   }
 #endif
-  cbuf.relocate(cbuf.insts_mark(), rspec, format);
-  cbuf.insts()->emit_int32(d32);
+  __ relocate(__ inst_mark(), rspec, format);
+  __ emit_int32(d32);
 }
 
 // Access stack slot for load or store
-void store_to_stackslot(CodeBuffer &cbuf, int opcode, int rm_field, int disp) {
-  emit_opcode( cbuf, opcode );               // (e.g., FILD   [ESP+src])
+void store_to_stackslot(C2_MacroAssembler *masm, int opcode, int rm_field, int disp) {
+  emit_opcode( masm, opcode );               // (e.g., FILD   [ESP+src])
   if( -128 <= disp && disp <= 127 ) {
-    emit_rm( cbuf, 0x01, rm_field, ESP_enc );  // R/M byte
-    emit_rm( cbuf, 0x00, ESP_enc, ESP_enc);    // SIB byte
-    emit_d8 (cbuf, disp);     // Displacement  // R/M byte
+    emit_rm( masm, 0x01, rm_field, ESP_enc );  // R/M byte
+    emit_rm( masm, 0x00, ESP_enc, ESP_enc);    // SIB byte
+    emit_d8 (masm, disp);     // Displacement  // R/M byte
   } else {
-    emit_rm( cbuf, 0x02, rm_field, ESP_enc );  // R/M byte
-    emit_rm( cbuf, 0x00, ESP_enc, ESP_enc);    // SIB byte
-    emit_d32(cbuf, disp);     // Displacement  // R/M byte
+    emit_rm( masm, 0x02, rm_field, ESP_enc );  // R/M byte
+    emit_rm( masm, 0x00, ESP_enc, ESP_enc);    // SIB byte
+    emit_d32(masm, disp);     // Displacement  // R/M byte
   }
 }
 
    // rRegI ereg, memory mem) %{    // emit_reg_mem
-void encode_RegMem( CodeBuffer &cbuf, int reg_encoding, int base, int index, int scale, int displace, relocInfo::relocType disp_reloc ) {
+void encode_RegMem( C2_MacroAssembler *masm, int reg_encoding, int base, int index, int scale, int displace, relocInfo::relocType disp_reloc ) {
   // There is no index & no scale, use form without SIB byte
   if ((index == 0x4) &&
       (scale == 0) && (base != ESP_enc)) {
     // If no displacement, mode is 0x0; unless base is [EBP]
     if ( (displace == 0) && (base != EBP_enc) ) {
-      emit_rm(cbuf, 0x0, reg_encoding, base);
+      emit_rm(masm, 0x0, reg_encoding, base);
     }
     else {                    // If 8-bit displacement, mode 0x1
       if ((displace >= -128) && (displace <= 127)
           && (disp_reloc == relocInfo::none) ) {
-        emit_rm(cbuf, 0x1, reg_encoding, base);
-        emit_d8(cbuf, displace);
+        emit_rm(masm, 0x1, reg_encoding, base);
+        emit_d8(masm, displace);
       }
       else {                  // If 32-bit displacement
         if (base == -1) { // Special flag for absolute address
-          emit_rm(cbuf, 0x0, reg_encoding, 0x5);
+          emit_rm(masm, 0x0, reg_encoding, 0x5);
           // (manual lies; no SIB needed here)
           if ( disp_reloc != relocInfo::none ) {
-            emit_d32_reloc(cbuf, displace, disp_reloc, 1);
+            emit_d32_reloc(masm, displace, disp_reloc, 1);
           } else {
-            emit_d32      (cbuf, displace);
+            emit_d32      (masm, displace);
           }
         }
         else {                // Normal base + offset
-          emit_rm(cbuf, 0x2, reg_encoding, base);
+          emit_rm(masm, 0x2, reg_encoding, base);
           if ( disp_reloc != relocInfo::none ) {
-            emit_d32_reloc(cbuf, displace, disp_reloc, 1);
+            emit_d32_reloc(masm, displace, disp_reloc, 1);
           } else {
-            emit_d32      (cbuf, displace);
+            emit_d32      (masm, displace);
           }
         }
       }
@@ -446,28 +446,28 @@ void encode_RegMem( CodeBuffer &cbuf, int reg_encoding, int base, int index, int
   else {                      // Else, encode with the SIB byte
     // If no displacement, mode is 0x0; unless base is [EBP]
     if (displace == 0 && (base != EBP_enc)) {  // If no displacement
-      emit_rm(cbuf, 0x0, reg_encoding, 0x4);
-      emit_rm(cbuf, scale, index, base);
+      emit_rm(masm, 0x0, reg_encoding, 0x4);
+      emit_rm(masm, scale, index, base);
     }
     else {                    // If 8-bit displacement, mode 0x1
       if ((displace >= -128) && (displace <= 127)
           && (disp_reloc == relocInfo::none) ) {
-        emit_rm(cbuf, 0x1, reg_encoding, 0x4);
-        emit_rm(cbuf, scale, index, base);
-        emit_d8(cbuf, displace);
+        emit_rm(masm, 0x1, reg_encoding, 0x4);
+        emit_rm(masm, scale, index, base);
+        emit_d8(masm, displace);
       }
       else {                  // If 32-bit displacement
         if (base == 0x04 ) {
-          emit_rm(cbuf, 0x2, reg_encoding, 0x4);
-          emit_rm(cbuf, scale, index, 0x04);
+          emit_rm(masm, 0x2, reg_encoding, 0x4);
+          emit_rm(masm, scale, index, 0x04);
         } else {
-          emit_rm(cbuf, 0x2, reg_encoding, 0x4);
-          emit_rm(cbuf, scale, index, base);
+          emit_rm(masm, 0x2, reg_encoding, 0x4);
+          emit_rm(masm, scale, index, base);
         }
         if ( disp_reloc != relocInfo::none ) {
-          emit_d32_reloc(cbuf, displace, disp_reloc, 1);
+          emit_d32_reloc(masm, displace, disp_reloc, 1);
         } else {
-          emit_d32      (cbuf, displace);
+          emit_d32      (masm, displace);
         }
       }
     }
@@ -475,16 +475,16 @@ void encode_RegMem( CodeBuffer &cbuf, int reg_encoding, int base, int index, int
 }
 
 
-void encode_Copy( CodeBuffer &cbuf, int dst_encoding, int src_encoding ) {
+void encode_Copy( C2_MacroAssembler *masm, int dst_encoding, int src_encoding ) {
   if( dst_encoding == src_encoding ) {
     // reg-reg copy, use an empty encoding
   } else {
-    emit_opcode( cbuf, 0x8B );
-    emit_rm(cbuf, 0x3, dst_encoding, src_encoding );
+    emit_opcode( masm, 0x8B );
+    emit_rm(masm, 0x3, dst_encoding, src_encoding );
   }
 }
 
-void emit_cmpfp_fixup(MacroAssembler& _masm) {
+void emit_cmpfp_fixup(MacroAssembler* masm) {
   Label exit;
   __ jccb(Assembler::noParity, exit);
   __ pushf();
@@ -504,7 +504,7 @@ void emit_cmpfp_fixup(MacroAssembler& _masm) {
   __ bind(exit);
 }
 
-static void emit_cmpfp3(MacroAssembler& _masm, Register dst) {
+static void emit_cmpfp3(MacroAssembler* masm, Register dst) {
   Label done;
   __ movl(dst, -1);
   __ jcc(Assembler::parity, done);
@@ -527,7 +527,7 @@ void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, Phase
   ShouldNotReachHere();
 }
 
-void MachConstantBaseNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
+void MachConstantBaseNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const {
   // Empty encoding
 }
 
@@ -607,16 +607,15 @@ void MachPrologNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
 #endif
 
 
-void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
 
   int framesize = C->output()->frame_size_in_bytes();
   int bangsize = C->output()->bang_size_in_bytes();
 
   __ verified_entry(framesize, C->output()->need_stack_bang(bangsize)?bangsize:0, C->in_24_bit_fp_mode(), C->stub_function() != nullptr);
 
-  C->output()->set_frame_complete(cbuf.insts_size());
+  C->output()->set_frame_complete(__ offset());
 
   if (C->has_mach_constant_base_node()) {
     // NOTE: We set the table base offset here because users might be
@@ -664,18 +663,17 @@ void MachEpilogNode::format( PhaseRegAlloc *ra_, outputStream* st ) const {
 }
 #endif
 
-void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachEpilogNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile *C = ra_->C;
-  MacroAssembler _masm(&cbuf);
 
   if (C->max_vector_size() > 16) {
     // Clear upper bits of YMM registers when current compiled code uses
     // wide vectors to avoid AVX <-> SSE transition penalty during call.
-    _masm.vzeroupper();
+    __ vzeroupper();
   }
   // If method set FPU control word, restore to standard control word
   if (C->in_24_bit_fp_mode()) {
-    _masm.fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
+    __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
   }
 
   int framesize = C->output()->frame_size_in_bytes();
@@ -686,16 +684,16 @@ void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
   // Note that VerifyStackAtCalls' Majik cookie does not change the frame size popped here
 
   if (framesize >= 128) {
-    emit_opcode(cbuf, 0x81); // add  SP, #framesize
-    emit_rm(cbuf, 0x3, 0x00, ESP_enc);
-    emit_d32(cbuf, framesize);
+    emit_opcode(masm, 0x81); // add  SP, #framesize
+    emit_rm(masm, 0x3, 0x00, ESP_enc);
+    emit_d32(masm, framesize);
   } else if (framesize) {
-    emit_opcode(cbuf, 0x83); // add  SP, #framesize
-    emit_rm(cbuf, 0x3, 0x00, ESP_enc);
-    emit_d8(cbuf, framesize);
+    emit_opcode(masm, 0x83); // add  SP, #framesize
+    emit_rm(masm, 0x3, 0x00, ESP_enc);
+    emit_d8(masm, framesize);
   }
 
-  emit_opcode(cbuf, 0x58 | EBP_enc);
+  emit_opcode(masm, 0x58 | EBP_enc);
 
   if (StackReservedPages > 0 && C->has_reserved_stack_access()) {
     __ reserved_stack_check();
@@ -703,7 +701,6 @@ void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
 
   if (do_polling() && C->is_method_compilation()) {
     Register thread = as_Register(EBX_enc);
-    MacroAssembler masm(&cbuf);
     __ get_thread(thread);
     Label dummy_label;
     Label* code_stub = &dummy_label;
@@ -712,7 +709,9 @@ void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
       C->output()->add_stub(stub);
       code_stub = &stub->entry();
     }
+    __ set_inst_mark();
     __ relocate(relocInfo::poll_return_type);
+    __ clear_inst_mark();
     __ safepoint_poll(*code_stub, thread, true /* at_return */, true /* in_nmethod */);
   }
 }
@@ -749,11 +748,13 @@ static enum RC rc_class( OptoReg::Name reg ) {
   return rc_xmm;
 }
 
-static int impl_helper( CodeBuffer *cbuf, bool do_size, bool is_load, int offset, int reg,
+static int impl_helper( C2_MacroAssembler *masm, bool do_size, bool is_load, int offset, int reg,
                         int opcode, const char *op_str, int size, outputStream* st ) {
-  if( cbuf ) {
-    emit_opcode  (*cbuf, opcode );
-    encode_RegMem(*cbuf, Matcher::_regEncode[reg], ESP_enc, 0x4, 0, offset, relocInfo::none);
+  if( masm ) {
+    masm->set_inst_mark();
+    emit_opcode  (masm, opcode );
+    encode_RegMem(masm, Matcher::_regEncode[reg], ESP_enc, 0x4, 0, offset, relocInfo::none);
+    masm->clear_inst_mark();
 #ifndef PRODUCT
   } else if( !do_size ) {
     if( size != 0 ) st->print("\n\t");
@@ -770,7 +771,7 @@ static int impl_helper( CodeBuffer *cbuf, bool do_size, bool is_load, int offset
 }
 
 // Helper for XMM registers.  Extra opcode bits, limited syntax.
-static int impl_x_helper( CodeBuffer *cbuf, bool do_size, bool is_load,
+static int impl_x_helper( C2_MacroAssembler *masm, bool do_size, bool is_load,
                          int offset, int reg_lo, int reg_hi, int size, outputStream* st ) {
   int in_size_in_bits = Assembler::EVEX_32bit;
   int evex_encoding = 0;
@@ -778,11 +779,10 @@ static int impl_x_helper( CodeBuffer *cbuf, bool do_size, bool is_load,
     in_size_in_bits = Assembler::EVEX_64bit;
     evex_encoding = Assembler::VEX_W;
   }
-  if (cbuf) {
-    MacroAssembler _masm(cbuf);
+  if (masm) {
     // EVEX spills remain EVEX: Compressed displacemement is better than AVX on spill mem operations,
     //                          it maps more cases to single byte displacement
-    _masm.set_managed();
+    __ set_managed();
     if (reg_lo+1 == reg_hi) { // double move?
       if (is_load) {
         __ movdbl(as_XMMRegister(Matcher::_regEncode[reg_lo]), Address(rsp, offset));
@@ -829,12 +829,11 @@ static int impl_x_helper( CodeBuffer *cbuf, bool do_size, bool is_load,
 }
 
 
-static int impl_movx_helper( CodeBuffer *cbuf, bool do_size, int src_lo, int dst_lo,
+static int impl_movx_helper( C2_MacroAssembler *masm, bool do_size, int src_lo, int dst_lo,
                             int src_hi, int dst_hi, int size, outputStream* st ) {
-  if (cbuf) {
-    MacroAssembler _masm(cbuf);
+  if (masm) {
     // EVEX spills remain EVEX: logic complex between full EVEX, partial and AVX, manage EVEX spill code one way.
-    _masm.set_managed();
+    __ set_managed();
     if (src_lo+1 == src_hi && dst_lo+1 == dst_hi) { // double move?
       __ movdbl(as_XMMRegister(Matcher::_regEncode[dst_lo]),
                 as_XMMRegister(Matcher::_regEncode[src_lo]));
@@ -868,13 +867,12 @@ static int impl_movx_helper( CodeBuffer *cbuf, bool do_size, int src_lo, int dst
   return size + sz;
 }
 
-static int impl_movgpr2x_helper( CodeBuffer *cbuf, bool do_size, int src_lo, int dst_lo,
+static int impl_movgpr2x_helper( C2_MacroAssembler *masm, bool do_size, int src_lo, int dst_lo,
                             int src_hi, int dst_hi, int size, outputStream* st ) {
   // 32-bit
-  if (cbuf) {
-    MacroAssembler _masm(cbuf);
+  if (masm) {
     // EVEX spills remain EVEX: logic complex between full EVEX, partial and AVX, manage EVEX spill code one way.
-    _masm.set_managed();
+    __ set_managed();
     __ movdl(as_XMMRegister(Matcher::_regEncode[dst_lo]),
              as_Register(Matcher::_regEncode[src_lo]));
 #ifndef PRODUCT
@@ -886,13 +884,12 @@ static int impl_movgpr2x_helper( CodeBuffer *cbuf, bool do_size, int src_lo, int
 }
 
 
-static int impl_movx2gpr_helper( CodeBuffer *cbuf, bool do_size, int src_lo, int dst_lo,
+static int impl_movx2gpr_helper( C2_MacroAssembler *masm, bool do_size, int src_lo, int dst_lo,
                                  int src_hi, int dst_hi, int size, outputStream* st ) {
   // 32-bit
-  if (cbuf) {
-    MacroAssembler _masm(cbuf);
+  if (masm) {
     // EVEX spills remain EVEX: logic complex between full EVEX, partial and AVX, manage EVEX spill code one way.
-    _masm.set_managed();
+    __ set_managed();
     __ movdl(as_Register(Matcher::_regEncode[dst_lo]),
              as_XMMRegister(Matcher::_regEncode[src_lo]));
 #ifndef PRODUCT
@@ -903,10 +900,10 @@ static int impl_movx2gpr_helper( CodeBuffer *cbuf, bool do_size, int src_lo, int
   return (UseAVX> 2) ? 6 : 4;
 }
 
-static int impl_mov_helper( CodeBuffer *cbuf, bool do_size, int src, int dst, int size, outputStream* st ) {
-  if( cbuf ) {
-    emit_opcode(*cbuf, 0x8B );
-    emit_rm    (*cbuf, 0x3, Matcher::_regEncode[dst], Matcher::_regEncode[src] );
+static int impl_mov_helper( C2_MacroAssembler *masm, bool do_size, int src, int dst, int size, outputStream* st ) {
+  if( masm ) {
+    emit_opcode(masm, 0x8B );
+    emit_rm    (masm, 0x3, Matcher::_regEncode[dst], Matcher::_regEncode[src] );
 #ifndef PRODUCT
   } else if( !do_size ) {
     if( size != 0 ) st->print("\n\t");
@@ -916,12 +913,12 @@ static int impl_mov_helper( CodeBuffer *cbuf, bool do_size, int src, int dst, in
   return size+2;
 }
 
-static int impl_fp_store_helper( CodeBuffer *cbuf, bool do_size, int src_lo, int src_hi, int dst_lo, int dst_hi,
+static int impl_fp_store_helper( C2_MacroAssembler *masm, bool do_size, int src_lo, int src_hi, int dst_lo, int dst_hi,
                                  int offset, int size, outputStream* st ) {
   if( src_lo != FPR1L_num ) {      // Move value to top of FP stack, if not already there
-    if( cbuf ) {
-      emit_opcode( *cbuf, 0xD9 );  // FLD (i.e., push it)
-      emit_d8( *cbuf, 0xC0-1+Matcher::_regEncode[src_lo] );
+    if( masm ) {
+      emit_opcode( masm, 0xD9 );  // FLD (i.e., push it)
+      emit_d8( masm, 0xC0-1+Matcher::_regEncode[src_lo] );
 #ifndef PRODUCT
     } else if( !do_size ) {
       if( size != 0 ) st->print("\n\t");
@@ -943,20 +940,19 @@ static int impl_fp_store_helper( CodeBuffer *cbuf, bool do_size, int src_lo, int
     assert( !OptoReg::is_valid(src_hi) && !OptoReg::is_valid(dst_hi), "no non-adjacent float-stores" );
   }
 
-  return impl_helper(cbuf,do_size,false,offset,st_op,op,op_str,size, st);
+  return impl_helper(masm,do_size,false,offset,st_op,op,op_str,size, st);
 }
 
 // Next two methods are shared by 32- and 64-bit VM. They are defined in x86.ad.
-static void vec_mov_helper(CodeBuffer *cbuf, int src_lo, int dst_lo,
+static void vec_mov_helper(C2_MacroAssembler *masm, int src_lo, int dst_lo,
                           int src_hi, int dst_hi, uint ireg, outputStream* st);
 
-void vec_spill_helper(CodeBuffer *cbuf, bool is_load,
+void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
                             int stack_offset, int reg, uint ireg, outputStream* st);
 
-static void vec_stack_to_stack_helper(CodeBuffer *cbuf, int src_offset,
+static void vec_stack_to_stack_helper(C2_MacroAssembler *masm, int src_offset,
                                      int dst_offset, uint ireg, outputStream* st) {
-  if (cbuf) {
-    MacroAssembler _masm(cbuf);
+  if (masm) {
     switch (ireg) {
     case Op_VecS:
       __ pushl(Address(rsp, src_offset));
@@ -1032,7 +1028,7 @@ static void vec_stack_to_stack_helper(CodeBuffer *cbuf, int src_offset,
   }
 }
 
-uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bool do_size, outputStream* st ) const {
+uint MachSpillCopyNode::implementation( C2_MacroAssembler *masm, PhaseRegAlloc *ra_, bool do_size, outputStream* st ) const {
   // Get registers to move
   OptoReg::Name src_second = ra_->get_reg_second(in(1));
   OptoReg::Name src_first = ra_->get_reg_first(in(1));
@@ -1061,15 +1057,15 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
       // mem -> mem
       int src_offset = ra_->reg2offset(src_first);
       int dst_offset = ra_->reg2offset(dst_first);
-      vec_stack_to_stack_helper(cbuf, src_offset, dst_offset, ireg, st);
+      vec_stack_to_stack_helper(masm, src_offset, dst_offset, ireg, st);
     } else if (src_first_rc == rc_xmm && dst_first_rc == rc_xmm ) {
-      vec_mov_helper(cbuf, src_first, dst_first, src_second, dst_second, ireg, st);
+      vec_mov_helper(masm, src_first, dst_first, src_second, dst_second, ireg, st);
     } else if (src_first_rc == rc_xmm && dst_first_rc == rc_stack ) {
       int stack_offset = ra_->reg2offset(dst_first);
-      vec_spill_helper(cbuf, false, stack_offset, src_first, ireg, st);
+      vec_spill_helper(masm, false, stack_offset, src_first, ireg, st);
     } else if (src_first_rc == rc_stack && dst_first_rc == rc_xmm ) {
       int stack_offset = ra_->reg2offset(src_first);
-      vec_spill_helper(cbuf, true,  stack_offset, dst_first, ireg, st);
+      vec_spill_helper(masm, true,  stack_offset, dst_first, ireg, st);
     } else {
       ShouldNotReachHere();
     }
@@ -1081,16 +1077,16 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
   if( src_first_rc == rc_stack && dst_first_rc == rc_stack ) {
     if( src_second == dst_first ) { // overlapping stack copy ranges
       assert( src_second_rc == rc_stack && dst_second_rc == rc_stack, "we only expect a stk-stk copy here" );
-      size = impl_helper(cbuf,do_size,true ,ra_->reg2offset(src_second),ESI_num,0xFF,"PUSH  ",size, st);
-      size = impl_helper(cbuf,do_size,false,ra_->reg2offset(dst_second),EAX_num,0x8F,"POP   ",size, st);
+      size = impl_helper(masm,do_size,true ,ra_->reg2offset(src_second),ESI_num,0xFF,"PUSH  ",size, st);
+      size = impl_helper(masm,do_size,false,ra_->reg2offset(dst_second),EAX_num,0x8F,"POP   ",size, st);
       src_second_rc = dst_second_rc = rc_bad;  // flag as already moved the second bits
     }
     // move low bits
-    size = impl_helper(cbuf,do_size,true ,ra_->reg2offset(src_first),ESI_num,0xFF,"PUSH  ",size, st);
-    size = impl_helper(cbuf,do_size,false,ra_->reg2offset(dst_first),EAX_num,0x8F,"POP   ",size, st);
+    size = impl_helper(masm,do_size,true ,ra_->reg2offset(src_first),ESI_num,0xFF,"PUSH  ",size, st);
+    size = impl_helper(masm,do_size,false,ra_->reg2offset(dst_first),EAX_num,0x8F,"POP   ",size, st);
     if( src_second_rc == rc_stack && dst_second_rc == rc_stack ) { // mov second bits
-      size = impl_helper(cbuf,do_size,true ,ra_->reg2offset(src_second),ESI_num,0xFF,"PUSH  ",size, st);
-      size = impl_helper(cbuf,do_size,false,ra_->reg2offset(dst_second),EAX_num,0x8F,"POP   ",size, st);
+      size = impl_helper(masm,do_size,true ,ra_->reg2offset(src_second),ESI_num,0xFF,"PUSH  ",size, st);
+      size = impl_helper(masm,do_size,false,ra_->reg2offset(dst_second),EAX_num,0x8F,"POP   ",size, st);
     }
     return size;
   }
@@ -1098,41 +1094,41 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
   // --------------------------------------
   // Check for integer reg-reg copy
   if( src_first_rc == rc_int && dst_first_rc == rc_int )
-    size = impl_mov_helper(cbuf,do_size,src_first,dst_first,size, st);
+    size = impl_mov_helper(masm,do_size,src_first,dst_first,size, st);
 
   // Check for integer store
   if( src_first_rc == rc_int && dst_first_rc == rc_stack )
-    size = impl_helper(cbuf,do_size,false,ra_->reg2offset(dst_first),src_first,0x89,"MOV ",size, st);
+    size = impl_helper(masm,do_size,false,ra_->reg2offset(dst_first),src_first,0x89,"MOV ",size, st);
 
   // Check for integer load
   if( src_first_rc == rc_stack && dst_first_rc == rc_int )
-    size = impl_helper(cbuf,do_size,true ,ra_->reg2offset(src_first),dst_first,0x8B,"MOV ",size, st);
+    size = impl_helper(masm,do_size,true ,ra_->reg2offset(src_first),dst_first,0x8B,"MOV ",size, st);
 
   // Check for integer reg-xmm reg copy
   if( src_first_rc == rc_int && dst_first_rc == rc_xmm ) {
     assert( (src_second_rc == rc_bad && dst_second_rc == rc_bad),
             "no 64 bit integer-float reg moves" );
-    return impl_movgpr2x_helper(cbuf,do_size,src_first,dst_first,src_second, dst_second, size, st);
+    return impl_movgpr2x_helper(masm,do_size,src_first,dst_first,src_second, dst_second, size, st);
   }
   // --------------------------------------
   // Check for float reg-reg copy
   if( src_first_rc == rc_float && dst_first_rc == rc_float ) {
     assert( (src_second_rc == rc_bad && dst_second_rc == rc_bad) ||
             (src_first+1 == src_second && dst_first+1 == dst_second), "no non-adjacent float-moves" );
-    if( cbuf ) {
+    if( masm ) {
 
       // Note the mucking with the register encode to compensate for the 0/1
       // indexing issue mentioned in a comment in the reg_def sections
       // for FPR registers many lines above here.
 
       if( src_first != FPR1L_num ) {
-        emit_opcode  (*cbuf, 0xD9 );           // FLD    ST(i)
-        emit_d8      (*cbuf, 0xC0+Matcher::_regEncode[src_first]-1 );
-        emit_opcode  (*cbuf, 0xDD );           // FSTP   ST(i)
-        emit_d8      (*cbuf, 0xD8+Matcher::_regEncode[dst_first] );
+        emit_opcode  (masm, 0xD9 );           // FLD    ST(i)
+        emit_d8      (masm, 0xC0+Matcher::_regEncode[src_first]-1 );
+        emit_opcode  (masm, 0xDD );           // FSTP   ST(i)
+        emit_d8      (masm, 0xD8+Matcher::_regEncode[dst_first] );
      } else {
-        emit_opcode  (*cbuf, 0xDD );           // FST    ST(i)
-        emit_d8      (*cbuf, 0xD0+Matcher::_regEncode[dst_first]-1 );
+        emit_opcode  (masm, 0xDD );           // FST    ST(i)
+        emit_d8      (masm, 0xD0+Matcher::_regEncode[dst_first]-1 );
      }
 #ifndef PRODUCT
     } else if( !do_size ) {
@@ -1146,7 +1142,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
 
   // Check for float store
   if( src_first_rc == rc_float && dst_first_rc == rc_stack ) {
-    return impl_fp_store_helper(cbuf,do_size,src_first,src_second,dst_first,dst_second,ra_->reg2offset(dst_first),size, st);
+    return impl_fp_store_helper(masm,do_size,src_first,src_second,dst_first,dst_second,ra_->reg2offset(dst_first),size, st);
   }
 
   // Check for float load
@@ -1162,11 +1158,13 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
       op = 0xD9;
       assert( src_second_rc == rc_bad && dst_second_rc == rc_bad, "no non-adjacent float-loads" );
     }
-    if( cbuf ) {
-      emit_opcode  (*cbuf, op );
-      encode_RegMem(*cbuf, 0x0, ESP_enc, 0x4, 0, offset, relocInfo::none);
-      emit_opcode  (*cbuf, 0xDD );           // FSTP   ST(i)
-      emit_d8      (*cbuf, 0xD8+Matcher::_regEncode[dst_first] );
+    if( masm ) {
+      masm->set_inst_mark();
+      emit_opcode  (masm, op );
+      encode_RegMem(masm, 0x0, ESP_enc, 0x4, 0, offset, relocInfo::none);
+      emit_opcode  (masm, 0xDD );           // FSTP   ST(i)
+      emit_d8      (masm, 0xD8+Matcher::_regEncode[dst_first] );
+      masm->clear_inst_mark();
 #ifndef PRODUCT
     } else if( !do_size ) {
       if( size != 0 ) st->print("\n\t");
@@ -1182,35 +1180,35 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
     assert( (src_second_rc == rc_bad && dst_second_rc == rc_bad) ||
             (src_first+1 == src_second && dst_first+1 == dst_second),
             "no non-adjacent float-moves" );
-    return impl_movx_helper(cbuf,do_size,src_first,dst_first,src_second, dst_second, size, st);
+    return impl_movx_helper(masm,do_size,src_first,dst_first,src_second, dst_second, size, st);
   }
 
   // Check for xmm reg-integer reg copy
   if( src_first_rc == rc_xmm && dst_first_rc == rc_int ) {
     assert( (src_second_rc == rc_bad && dst_second_rc == rc_bad),
             "no 64 bit float-integer reg moves" );
-    return impl_movx2gpr_helper(cbuf,do_size,src_first,dst_first,src_second, dst_second, size, st);
+    return impl_movx2gpr_helper(masm,do_size,src_first,dst_first,src_second, dst_second, size, st);
   }
 
   // Check for xmm store
   if( src_first_rc == rc_xmm && dst_first_rc == rc_stack ) {
-    return impl_x_helper(cbuf,do_size,false,ra_->reg2offset(dst_first), src_first, src_second, size, st);
+    return impl_x_helper(masm,do_size,false,ra_->reg2offset(dst_first), src_first, src_second, size, st);
   }
 
   // Check for float xmm load
   if( src_first_rc == rc_stack && dst_first_rc == rc_xmm ) {
-    return impl_x_helper(cbuf,do_size,true ,ra_->reg2offset(src_first),dst_first, dst_second, size, st);
+    return impl_x_helper(masm,do_size,true ,ra_->reg2offset(src_first),dst_first, dst_second, size, st);
   }
 
   // Copy from float reg to xmm reg
   if( src_first_rc == rc_float && dst_first_rc == rc_xmm ) {
     // copy to the top of stack from floating point reg
     // and use LEA to preserve flags
-    if( cbuf ) {
-      emit_opcode(*cbuf,0x8D);  // LEA  ESP,[ESP-8]
-      emit_rm(*cbuf, 0x1, ESP_enc, 0x04);
-      emit_rm(*cbuf, 0x0, 0x04, ESP_enc);
-      emit_d8(*cbuf,0xF8);
+    if( masm ) {
+      emit_opcode(masm,0x8D);  // LEA  ESP,[ESP-8]
+      emit_rm(masm, 0x1, ESP_enc, 0x04);
+      emit_rm(masm, 0x0, 0x04, ESP_enc);
+      emit_d8(masm,0xF8);
 #ifndef PRODUCT
     } else if( !do_size ) {
       if( size != 0 ) st->print("\n\t");
@@ -1219,16 +1217,16 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
     }
     size += 4;
 
-    size = impl_fp_store_helper(cbuf,do_size,src_first,src_second,dst_first,dst_second,0,size, st);
+    size = impl_fp_store_helper(masm,do_size,src_first,src_second,dst_first,dst_second,0,size, st);
 
     // Copy from the temp memory to the xmm reg.
-    size = impl_x_helper(cbuf,do_size,true ,0,dst_first, dst_second, size, st);
+    size = impl_x_helper(masm,do_size,true ,0,dst_first, dst_second, size, st);
 
-    if( cbuf ) {
-      emit_opcode(*cbuf,0x8D);  // LEA  ESP,[ESP+8]
-      emit_rm(*cbuf, 0x1, ESP_enc, 0x04);
-      emit_rm(*cbuf, 0x0, 0x04, ESP_enc);
-      emit_d8(*cbuf,0x08);
+    if( masm ) {
+      emit_opcode(masm,0x8D);  // LEA  ESP,[ESP+8]
+      emit_rm(masm, 0x1, ESP_enc, 0x04);
+      emit_rm(masm, 0x0, 0x04, ESP_enc);
+      emit_d8(masm,0x08);
 #ifndef PRODUCT
     } else if( !do_size ) {
       if( size != 0 ) st->print("\n\t");
@@ -1244,8 +1242,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
     assert((src_first & 1) == 0 && src_first + 1 == src_second, "invalid register pair");
     assert((dst_first & 1) == 0 && dst_first + 1 == dst_second, "invalid register pair");
     int offset = ra_->reg2offset(src_first);
-    if (cbuf != nullptr) {
-      MacroAssembler _masm(cbuf);
+    if (masm != nullptr) {
       __ kmov(as_KRegister(Matcher::_regEncode[dst_first]), Address(rsp, offset));
 #ifndef PRODUCT
     } else {
@@ -1259,8 +1256,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
     assert((src_first & 1) == 0 && src_first + 1 == src_second, "invalid register pair");
     assert((dst_first & 1) == 0 && dst_first + 1 == dst_second, "invalid register pair");
     int offset = ra_->reg2offset(dst_first);
-    if (cbuf != nullptr) {
-      MacroAssembler _masm(cbuf);
+    if (masm != nullptr) {
       __ kmov(Address(rsp, offset), as_KRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
     } else {
@@ -1283,8 +1279,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
   if (src_first_rc == rc_kreg && dst_first_rc == rc_kreg) {
     assert((src_first & 1) == 0 && src_first + 1 == src_second, "invalid register pair");
     assert((dst_first & 1) == 0 && dst_first + 1 == dst_second, "invalid register pair");
-    if (cbuf != nullptr) {
-      MacroAssembler _masm(cbuf);
+    if (masm != nullptr) {
       __ kmov(as_KRegister(Matcher::_regEncode[dst_first]), as_KRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
     } else {
@@ -1304,15 +1299,15 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
 
   // Check for second word int-int move
   if( src_second_rc == rc_int && dst_second_rc == rc_int )
-    return impl_mov_helper(cbuf,do_size,src_second,dst_second,size, st);
+    return impl_mov_helper(masm,do_size,src_second,dst_second,size, st);
 
   // Check for second word integer store
   if( src_second_rc == rc_int && dst_second_rc == rc_stack )
-    return impl_helper(cbuf,do_size,false,ra_->reg2offset(dst_second),src_second,0x89,"MOV ",size, st);
+    return impl_helper(masm,do_size,false,ra_->reg2offset(dst_second),src_second,0x89,"MOV ",size, st);
 
   // Check for second word integer load
   if( dst_second_rc == rc_int && src_second_rc == rc_stack )
-    return impl_helper(cbuf,do_size,true ,ra_->reg2offset(src_second),dst_second,0x8B,"MOV ",size, st);
+    return impl_helper(masm,do_size,true ,ra_->reg2offset(src_second),dst_second,0x8B,"MOV ",size, st);
 
   Unimplemented();
   return 0; // Mute compiler
@@ -1324,8 +1319,8 @@ void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream* st) const {
 }
 #endif
 
-void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  implementation( &cbuf, ra_, false, nullptr );
+void MachSpillCopyNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  implementation( masm, ra_, false, nullptr );
 }
 
 uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
@@ -1342,20 +1337,20 @@ void BoxLockNode::format( PhaseRegAlloc *ra_, outputStream* st ) const {
 }
 #endif
 
-void BoxLockNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void BoxLockNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
   int reg = ra_->get_encode(this);
   if( offset >= 128 ) {
-    emit_opcode(cbuf, 0x8D);      // LEA  reg,[SP+offset]
-    emit_rm(cbuf, 0x2, reg, 0x04);
-    emit_rm(cbuf, 0x0, 0x04, ESP_enc);
-    emit_d32(cbuf, offset);
+    emit_opcode(masm, 0x8D);      // LEA  reg,[SP+offset]
+    emit_rm(masm, 0x2, reg, 0x04);
+    emit_rm(masm, 0x0, 0x04, ESP_enc);
+    emit_d32(masm, offset);
   }
   else {
-    emit_opcode(cbuf, 0x8D);      // LEA  reg,[SP+offset]
-    emit_rm(cbuf, 0x1, reg, 0x04);
-    emit_rm(cbuf, 0x0, 0x04, ESP_enc);
-    emit_d8(cbuf, offset);
+    emit_opcode(masm, 0x8D);      // LEA  reg,[SP+offset]
+    emit_rm(masm, 0x1, reg, 0x04);
+    emit_rm(masm, 0x0, 0x04, ESP_enc);
+    emit_d8(masm, offset);
   }
 }
 
@@ -1381,9 +1376,8 @@ void MachUEPNode::format( PhaseRegAlloc *ra_, outputStream* st ) const {
 }
 #endif
 
-void MachUEPNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  MacroAssembler masm(&cbuf);
-  masm.ic_check(CodeEntryAlignment);
+void MachUEPNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  __ ic_check(CodeEntryAlignment);
 }
 
 uint MachUEPNode::size(PhaseRegAlloc *ra_) const {
@@ -1528,37 +1522,49 @@ encode %{
   // adding a syntax that specifies the sizes of fields in an order,
   // so that the adlc can build the emit functions automagically
 
+  // Set instruction mark in MacroAssembler. This is used only in
+  // instructions that emit bytes directly to the CodeBuffer wraped
+  // in the MacroAssembler. Should go away once all "instruct" are
+  // patched to emit bytes only using methods in MacroAssembler.
+  enc_class SetInstMark %{
+    __ set_inst_mark();
+  %}
+
+  enc_class ClearInstMark %{
+    __ clear_inst_mark();
+  %}
+
   // Emit primary opcode
   enc_class OpcP %{
-    emit_opcode(cbuf, $primary);
+    emit_opcode(masm, $primary);
   %}
 
   // Emit secondary opcode
   enc_class OpcS %{
-    emit_opcode(cbuf, $secondary);
+    emit_opcode(masm, $secondary);
   %}
 
   // Emit opcode directly
   enc_class Opcode(immI d8) %{
-    emit_opcode(cbuf, $d8$$constant);
+    emit_opcode(masm, $d8$$constant);
   %}
 
   enc_class SizePrefix %{
-    emit_opcode(cbuf,0x66);
+    emit_opcode(masm,0x66);
   %}
 
   enc_class RegReg (rRegI dst, rRegI src) %{    // RegReg(Many)
-    emit_rm(cbuf, 0x3, $dst$$reg, $src$$reg);
+    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
   %}
 
   enc_class OpcRegReg (immI opcode, rRegI dst, rRegI src) %{    // OpcRegReg(Many)
-    emit_opcode(cbuf,$opcode$$constant);
-    emit_rm(cbuf, 0x3, $dst$$reg, $src$$reg);
+    emit_opcode(masm,$opcode$$constant);
+    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
   %}
 
   enc_class mov_r32_imm0( rRegI dst ) %{
-    emit_opcode( cbuf, 0xB8 + $dst$$reg ); // 0xB8+ rd   -- MOV r32  ,imm32
-    emit_d32   ( cbuf, 0x0  );             //                         imm32==0x0
+    emit_opcode( masm, 0xB8 + $dst$$reg ); // 0xB8+ rd   -- MOV r32  ,imm32
+    emit_d32   ( masm, 0x0  );             //                         imm32==0x0
   %}
 
   enc_class cdq_enc %{
@@ -1585,26 +1591,26 @@ encode %{
     //  F7 F9                idiv        rax,ecx
     //                  done:
     //
-    emit_opcode(cbuf,0x81); emit_d8(cbuf,0xF8);
-    emit_opcode(cbuf,0x00); emit_d8(cbuf,0x00);
-    emit_opcode(cbuf,0x00); emit_d8(cbuf,0x80);                     // cmp rax,80000000h
-    emit_opcode(cbuf,0x0F); emit_d8(cbuf,0x85);
-    emit_opcode(cbuf,0x0B); emit_d8(cbuf,0x00);
-    emit_opcode(cbuf,0x00); emit_d8(cbuf,0x00);                     // jne normal_case
-    emit_opcode(cbuf,0x33); emit_d8(cbuf,0xD2);                     // xor rdx,edx
-    emit_opcode(cbuf,0x83); emit_d8(cbuf,0xF9); emit_d8(cbuf,0xFF); // cmp rcx,0FFh
-    emit_opcode(cbuf,0x0F); emit_d8(cbuf,0x84);
-    emit_opcode(cbuf,0x03); emit_d8(cbuf,0x00);
-    emit_opcode(cbuf,0x00); emit_d8(cbuf,0x00);                     // je done
+    emit_opcode(masm,0x81); emit_d8(masm,0xF8);
+    emit_opcode(masm,0x00); emit_d8(masm,0x00);
+    emit_opcode(masm,0x00); emit_d8(masm,0x80);                     // cmp rax,80000000h
+    emit_opcode(masm,0x0F); emit_d8(masm,0x85);
+    emit_opcode(masm,0x0B); emit_d8(masm,0x00);
+    emit_opcode(masm,0x00); emit_d8(masm,0x00);                     // jne normal_case
+    emit_opcode(masm,0x33); emit_d8(masm,0xD2);                     // xor rdx,edx
+    emit_opcode(masm,0x83); emit_d8(masm,0xF9); emit_d8(masm,0xFF); // cmp rcx,0FFh
+    emit_opcode(masm,0x0F); emit_d8(masm,0x84);
+    emit_opcode(masm,0x03); emit_d8(masm,0x00);
+    emit_opcode(masm,0x00); emit_d8(masm,0x00);                     // je done
     // normal_case:
-    emit_opcode(cbuf,0x99);                                         // cdq
+    emit_opcode(masm,0x99);                                         // cdq
     // idiv (note: must be emitted by the user of this rule)
     // normal:
   %}
 
   // Dense encoding for older common ops
   enc_class Opc_plus(immI opcode, rRegI reg) %{
-    emit_opcode(cbuf, $opcode$$constant + $reg$$reg);
+    emit_opcode(masm, $opcode$$constant + $reg$$reg);
   %}
 
 
@@ -1612,10 +1618,10 @@ encode %{
   enc_class OpcSE (immI imm) %{ // Emit primary opcode and set sign-extend bit
     // Check for 8-bit immediate, and set sign extend bit in opcode
     if (($imm$$constant >= -128) && ($imm$$constant <= 127)) {
-      emit_opcode(cbuf, $primary | 0x02);
+      emit_opcode(masm, $primary | 0x02);
     }
     else {                          // If 32-bit immediate
-      emit_opcode(cbuf, $primary);
+      emit_opcode(masm, $primary);
     }
   %}
 
@@ -1623,12 +1629,12 @@ encode %{
     // Emit primary opcode and set sign-extend bit
     // Check for 8-bit immediate, and set sign extend bit in opcode
     if (($imm$$constant >= -128) && ($imm$$constant <= 127)) {
-      emit_opcode(cbuf, $primary | 0x02);    }
+      emit_opcode(masm, $primary | 0x02);    }
     else {                          // If 32-bit immediate
-      emit_opcode(cbuf, $primary);
+      emit_opcode(masm, $primary);
     }
     // Emit r/m byte with secondary opcode, after primary opcode.
-    emit_rm(cbuf, 0x3, $secondary, $dst$$reg);
+    emit_rm(masm, 0x3, $secondary, $dst$$reg);
   %}
 
   enc_class Con8or32 (immI imm) %{    // Con8or32(storeImmI), 8 or 32 bits
@@ -1646,62 +1652,62 @@ encode %{
     // Emit primary opcode and set sign-extend bit
     // Check for 8-bit immediate, and set sign extend bit in opcode
     int con = (int)$imm$$constant; // Throw away top bits
-    emit_opcode(cbuf, ((con >= -128) && (con <= 127)) ? ($primary | 0x02) : $primary);
+    emit_opcode(masm, ((con >= -128) && (con <= 127)) ? ($primary | 0x02) : $primary);
     // Emit r/m byte with secondary opcode, after primary opcode.
-    emit_rm(cbuf, 0x3, $secondary, $dst$$reg);
-    if ((con >= -128) && (con <= 127)) emit_d8 (cbuf,con);
-    else                               emit_d32(cbuf,con);
+    emit_rm(masm, 0x3, $secondary, $dst$$reg);
+    if ((con >= -128) && (con <= 127)) emit_d8 (masm,con);
+    else                               emit_d32(masm,con);
   %}
 
   enc_class Long_OpcSErm_Hi(eRegL dst, immL imm) %{
     // Emit primary opcode and set sign-extend bit
     // Check for 8-bit immediate, and set sign extend bit in opcode
     int con = (int)($imm$$constant >> 32); // Throw away bottom bits
-    emit_opcode(cbuf, ((con >= -128) && (con <= 127)) ? ($primary | 0x02) : $primary);
+    emit_opcode(masm, ((con >= -128) && (con <= 127)) ? ($primary | 0x02) : $primary);
     // Emit r/m byte with tertiary opcode, after primary opcode.
-    emit_rm(cbuf, 0x3, $tertiary, HIGH_FROM_LOW_ENC($dst$$reg));
-    if ((con >= -128) && (con <= 127)) emit_d8 (cbuf,con);
-    else                               emit_d32(cbuf,con);
+    emit_rm(masm, 0x3, $tertiary, HIGH_FROM_LOW_ENC($dst$$reg));
+    if ((con >= -128) && (con <= 127)) emit_d8 (masm,con);
+    else                               emit_d32(masm,con);
   %}
 
   enc_class OpcSReg (rRegI dst) %{    // BSWAP
-    emit_cc(cbuf, $secondary, $dst$$reg );
+    emit_cc(masm, $secondary, $dst$$reg );
   %}
 
   enc_class bswap_long_bytes(eRegL dst) %{ // BSWAP
     int destlo = $dst$$reg;
     int desthi = HIGH_FROM_LOW_ENC(destlo);
     // bswap lo
-    emit_opcode(cbuf, 0x0F);
-    emit_cc(cbuf, 0xC8, destlo);
+    emit_opcode(masm, 0x0F);
+    emit_cc(masm, 0xC8, destlo);
     // bswap hi
-    emit_opcode(cbuf, 0x0F);
-    emit_cc(cbuf, 0xC8, desthi);
+    emit_opcode(masm, 0x0F);
+    emit_cc(masm, 0xC8, desthi);
     // xchg lo and hi
-    emit_opcode(cbuf, 0x87);
-    emit_rm(cbuf, 0x3, destlo, desthi);
+    emit_opcode(masm, 0x87);
+    emit_rm(masm, 0x3, destlo, desthi);
   %}
 
   enc_class RegOpc (rRegI div) %{    // IDIV, IMOD, JMP indirect, ...
-    emit_rm(cbuf, 0x3, $secondary, $div$$reg );
+    emit_rm(masm, 0x3, $secondary, $div$$reg );
   %}
 
   enc_class enc_cmov(cmpOp cop ) %{ // CMOV
     $$$emit8$primary;
-    emit_cc(cbuf, $secondary, $cop$$cmpcode);
+    emit_cc(masm, $secondary, $cop$$cmpcode);
   %}
 
   enc_class enc_cmov_dpr(cmpOp cop, regDPR src ) %{ // CMOV
     int op = 0xDA00 + $cop$$cmpcode + ($src$$reg-1);
-    emit_d8(cbuf, op >> 8 );
-    emit_d8(cbuf, op & 255);
+    emit_d8(masm, op >> 8 );
+    emit_d8(masm, op & 255);
   %}
 
   // emulate a CMOV with a conditional branch around a MOV
   enc_class enc_cmov_branch( cmpOp cop, immI brOffs ) %{ // CMOV
     // Invert sense of branch from sense of CMOV
-    emit_cc( cbuf, 0x70, ($cop$$cmpcode^1) );
-    emit_d8( cbuf, $brOffs$$constant );
+    emit_cc( masm, 0x70, ($cop$$cmpcode^1) );
+    emit_d8( masm, $brOffs$$constant );
   %}
 
   enc_class enc_PartialSubtypeCheck( ) %{
@@ -1711,7 +1717,6 @@ encode %{
     Register Resi = as_Register(ESI_enc); // sub class
     Label miss;
 
-    MacroAssembler _masm(&cbuf);
     __ check_klass_subtype_slow_path(Resi, Reax, Recx, Redi,
                                      nullptr, &miss,
                                      /*set_cond_codes:*/ true);
@@ -1722,43 +1727,40 @@ encode %{
   %}
 
   enc_class FFree_Float_Stack_All %{    // Free_Float_Stack_All
-    MacroAssembler masm(&cbuf);
-    int start = masm.offset();
+    int start = __ offset();
     if (UseSSE >= 2) {
       if (VerifyFPU) {
-        masm.verify_FPU(0, "must be empty in SSE2+ mode");
+        __ verify_FPU(0, "must be empty in SSE2+ mode");
       }
     } else {
       // External c_calling_convention expects the FPU stack to be 'clean'.
       // Compiled code leaves it dirty.  Do cleanup now.
-      masm.empty_FPU_stack();
+      __ empty_FPU_stack();
     }
     if (sizeof_FFree_Float_Stack_All == -1) {
-      sizeof_FFree_Float_Stack_All = masm.offset() - start;
+      sizeof_FFree_Float_Stack_All = __ offset() - start;
     } else {
-      assert(masm.offset() - start == sizeof_FFree_Float_Stack_All, "wrong size");
+      assert(__ offset() - start == sizeof_FFree_Float_Stack_All, "wrong size");
     }
   %}
 
   enc_class Verify_FPU_For_Leaf %{
     if( VerifyFPU ) {
-      MacroAssembler masm(&cbuf);
-      masm.verify_FPU( -3, "Returning from Runtime Leaf call");
+      __ verify_FPU( -3, "Returning from Runtime Leaf call");
     }
   %}
 
   enc_class Java_To_Runtime (method meth) %{    // CALL Java_To_Runtime, Java_To_Runtime_Leaf
     // This is the instruction starting address for relocation info.
-    MacroAssembler _masm(&cbuf);
-    cbuf.set_insts_mark();
+    __ set_inst_mark();
     $$$emit8$primary;
     // CALL directly to the runtime
-    emit_d32_reloc(cbuf, ($meth$$method - (int)(cbuf.insts_end()) - 4),
+    emit_d32_reloc(masm, ($meth$$method - (int)(__ pc()) - 4),
                 runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ clear_inst_mark();
     __ post_call_nop();
 
     if (UseSSE >= 2) {
-      MacroAssembler _masm(&cbuf);
       BasicType rt = tf()->return_type();
 
       if ((rt == T_FLOAT || rt == T_DOUBLE) && !return_value_is_used()) {
@@ -1783,54 +1785,53 @@ encode %{
 
   enc_class pre_call_resets %{
     // If method sets FPU control word restore it here
-    debug_only(int off0 = cbuf.insts_size());
+    debug_only(int off0 = __ offset());
     if (ra_->C->in_24_bit_fp_mode()) {
-      MacroAssembler _masm(&cbuf);
       __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
     }
     // Clear upper bits of YMM registers when current compiled code uses
     // wide vectors to avoid AVX <-> SSE transition penalty during call.
-    MacroAssembler _masm(&cbuf);
     __ vzeroupper();
-    debug_only(int off1 = cbuf.insts_size());
+    debug_only(int off1 = __ offset());
     assert(off1 - off0 == pre_call_resets_size(), "correct size prediction");
   %}
 
   enc_class post_call_FPU %{
     // If method sets FPU control word do it here also
     if (Compile::current()->in_24_bit_fp_mode()) {
-      MacroAssembler masm(&cbuf);
-      masm.fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_24()));
+      __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_24()));
     }
   %}
 
   enc_class Java_Static_Call (method meth) %{    // JAVA STATIC CALL
     // CALL to fixup routine.  Fixup routine uses ScopeDesc info to determine
     // who we intended to call.
-    MacroAssembler _masm(&cbuf);
-    cbuf.set_insts_mark();
+    __ set_inst_mark();
     $$$emit8$primary;
 
     if (!_method) {
-      emit_d32_reloc(cbuf, ($meth$$method - (int)(cbuf.insts_end()) - 4),
+      emit_d32_reloc(masm, ($meth$$method - (int)(__ pc()) - 4),
                      runtime_call_Relocation::spec(),
                      RELOC_IMM32);
+      __ clear_inst_mark();
       __ post_call_nop();
     } else {
-      int method_index = resolved_method_index(cbuf);
+      int method_index = resolved_method_index(masm);
       RelocationHolder rspec = _optimized_virtual ? opt_virtual_call_Relocation::spec(method_index)
                                                   : static_call_Relocation::spec(method_index);
-      emit_d32_reloc(cbuf, ($meth$$method - (int)(cbuf.insts_end()) - 4),
+      emit_d32_reloc(masm, ($meth$$method - (int)(__ pc()) - 4),
                      rspec, RELOC_DISP32);
       __ post_call_nop();
-      address mark = cbuf.insts_mark();
+      address mark = __ inst_mark();
       if (CodeBuffer::supports_shared_stubs() && _method->can_be_statically_bound()) {
         // Calls of the same statically bound method can share
         // a stub to the interpreter.
-        cbuf.shared_stub_to_interp_for(_method, cbuf.insts()->mark_off());
+        __ code()->shared_stub_to_interp_for(_method, __ code()->insts()->mark_off());
+        __ clear_inst_mark();
       } else {
         // Emit stubs for static call.
-        address stub = CompiledDirectCall::emit_to_interp_stub(cbuf, mark);
+        address stub = CompiledDirectCall::emit_to_interp_stub(masm, mark);
+        __ clear_inst_mark();
         if (stub == nullptr) {
           ciEnv::current()->record_failure("CodeCache is full");
           return;
@@ -1840,8 +1841,7 @@ encode %{
   %}
 
   enc_class Java_Dynamic_Call (method meth) %{    // JAVA DYNAMIC CALL
-    MacroAssembler _masm(&cbuf);
-    __ ic_call((address)$meth$$method, resolved_method_index(cbuf));
+    __ ic_call((address)$meth$$method, resolved_method_index(masm));
     __ post_call_nop();
   %}
 
@@ -1850,57 +1850,31 @@ encode %{
     assert( -128 <= disp && disp <= 127, "compiled_code_offset isn't small");
 
     // CALL *[EAX+in_bytes(Method::from_compiled_code_entry_point_offset())]
-    MacroAssembler _masm(&cbuf);
-    cbuf.set_insts_mark();
+    __ set_inst_mark();
     $$$emit8$primary;
-    emit_rm(cbuf, 0x01, $secondary, EAX_enc );  // R/M byte
-    emit_d8(cbuf, disp);             // Displacement
+    emit_rm(masm, 0x01, $secondary, EAX_enc );  // R/M byte
+    emit_d8(masm, disp);             // Displacement
+    __ clear_inst_mark();
     __ post_call_nop();
   %}
 
-//   Following encoding is no longer used, but may be restored if calling
-//   convention changes significantly.
-//   Became: Xor_Reg(EBP), Java_To_Runtime( labl )
-//
-//   enc_class Java_Interpreter_Call (label labl) %{    // JAVA INTERPRETER CALL
-//     // int ic_reg     = Matcher::inline_cache_reg();
-//     // int ic_encode  = Matcher::_regEncode[ic_reg];
-//     // int imo_reg    = Matcher::interpreter_method_reg();
-//     // int imo_encode = Matcher::_regEncode[imo_reg];
-//
-//     // // Interpreter expects method_ptr in EBX, currently a callee-saved register,
-//     // // so we load it immediately before the call
-//     // emit_opcode(cbuf, 0x8B);                     // MOV    imo_reg,ic_reg  # method_ptr
-//     // emit_rm(cbuf, 0x03, imo_encode, ic_encode ); // R/M byte
-//
-//     // xor rbp,ebp
-//     emit_opcode(cbuf, 0x33);
-//     emit_rm(cbuf, 0x3, EBP_enc, EBP_enc);
-//
-//     // CALL to interpreter.
-//     cbuf.set_insts_mark();
-//     $$$emit8$primary;
-//     emit_d32_reloc(cbuf, ($labl$$label - (int)(cbuf.insts_end()) - 4),
-//                 runtime_call_Relocation::spec(), RELOC_IMM32 );
-//   %}
-
   enc_class RegOpcImm (rRegI dst, immI8 shift) %{    // SHL, SAR, SHR
     $$$emit8$primary;
-    emit_rm(cbuf, 0x3, $secondary, $dst$$reg);
+    emit_rm(masm, 0x3, $secondary, $dst$$reg);
     $$$emit8$shift$$constant;
   %}
 
   enc_class LdImmI (rRegI dst, immI src) %{    // Load Immediate
     // Load immediate does not have a zero or sign extended version
     // for 8-bit immediates
-    emit_opcode(cbuf, 0xB8 + $dst$$reg);
+    emit_opcode(masm, 0xB8 + $dst$$reg);
     $$$emit32$src$$constant;
   %}
 
   enc_class LdImmP (rRegI dst, immI src) %{    // Load Immediate
     // Load immediate does not have a zero or sign extended version
     // for 8-bit immediates
-    emit_opcode(cbuf, $primary + $dst$$reg);
+    emit_opcode(masm, $primary + $dst$$reg);
     $$$emit32$src$$constant;
   %}
 
@@ -1911,11 +1885,11 @@ encode %{
     int src_con = $src$$constant & 0x0FFFFFFFFL;
     if (src_con == 0) {
       // xor dst, dst
-      emit_opcode(cbuf, 0x33);
-      emit_rm(cbuf, 0x3, dst_enc, dst_enc);
+      emit_opcode(masm, 0x33);
+      emit_rm(masm, 0x3, dst_enc, dst_enc);
     } else {
-      emit_opcode(cbuf, $primary + dst_enc);
-      emit_d32(cbuf, src_con);
+      emit_opcode(masm, $primary + dst_enc);
+      emit_d32(masm, src_con);
     }
   %}
 
@@ -1926,48 +1900,48 @@ encode %{
     int src_con = ((julong)($src$$constant)) >> 32;
     if (src_con == 0) {
       // xor dst, dst
-      emit_opcode(cbuf, 0x33);
-      emit_rm(cbuf, 0x3, dst_enc, dst_enc);
+      emit_opcode(masm, 0x33);
+      emit_rm(masm, 0x3, dst_enc, dst_enc);
     } else {
-      emit_opcode(cbuf, $primary + dst_enc);
-      emit_d32(cbuf, src_con);
+      emit_opcode(masm, $primary + dst_enc);
+      emit_d32(masm, src_con);
     }
   %}
 
 
   // Encode a reg-reg copy.  If it is useless, then empty encoding.
   enc_class enc_Copy( rRegI dst, rRegI src ) %{
-    encode_Copy( cbuf, $dst$$reg, $src$$reg );
+    encode_Copy( masm, $dst$$reg, $src$$reg );
   %}
 
   enc_class enc_CopyL_Lo( rRegI dst, eRegL src ) %{
-    encode_Copy( cbuf, $dst$$reg, $src$$reg );
+    encode_Copy( masm, $dst$$reg, $src$$reg );
   %}
 
   enc_class RegReg (rRegI dst, rRegI src) %{    // RegReg(Many)
-    emit_rm(cbuf, 0x3, $dst$$reg, $src$$reg);
+    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
   %}
 
   enc_class RegReg_Lo(eRegL dst, eRegL src) %{    // RegReg(Many)
     $$$emit8$primary;
-    emit_rm(cbuf, 0x3, $dst$$reg, $src$$reg);
+    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
   %}
 
   enc_class RegReg_Hi(eRegL dst, eRegL src) %{    // RegReg(Many)
     $$$emit8$secondary;
-    emit_rm(cbuf, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($src$$reg));
+    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($src$$reg));
   %}
 
   enc_class RegReg_Lo2(eRegL dst, eRegL src) %{    // RegReg(Many)
-    emit_rm(cbuf, 0x3, $dst$$reg, $src$$reg);
+    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
   %}
 
   enc_class RegReg_Hi2(eRegL dst, eRegL src) %{    // RegReg(Many)
-    emit_rm(cbuf, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($src$$reg));
+    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($src$$reg));
   %}
 
   enc_class RegReg_HiLo( eRegL src, rRegI dst ) %{
-    emit_rm(cbuf, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($src$$reg));
+    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($src$$reg));
   %}
 
   enc_class Con32 (immI src) %{    // Con32(storeImmI)
@@ -1979,14 +1953,14 @@ encode %{
     // Output Float immediate bits
     jfloat jf = $src$$constant;
     int    jf_as_bits = jint_cast( jf );
-    emit_d32(cbuf, jf_as_bits);
+    emit_d32(masm, jf_as_bits);
   %}
 
   enc_class Con32F_as_bits(immF src) %{      // storeX_imm
     // Output Float immediate bits
     jfloat jf = $src$$constant;
     int    jf_as_bits = jint_cast( jf );
-    emit_d32(cbuf, jf_as_bits);
+    emit_d32(masm, jf_as_bits);
   %}
 
   enc_class Con16 (immI src) %{    // Con16(storeImmI)
@@ -1995,17 +1969,17 @@ encode %{
   %}
 
   enc_class Con_d32(immI src) %{
-    emit_d32(cbuf,$src$$constant);
+    emit_d32(masm,$src$$constant);
   %}
 
   enc_class conmemref (eRegP t1) %{    // Con32(storeImmI)
     // Output immediate memory reference
-    emit_rm(cbuf, 0x00, $t1$$reg, 0x05 );
-    emit_d32(cbuf, 0x00);
+    emit_rm(masm, 0x00, $t1$$reg, 0x05 );
+    emit_d32(masm, 0x00);
   %}
 
   enc_class lock_prefix( ) %{
-    emit_opcode(cbuf,0xF0);         // [Lock]
+    emit_opcode(masm,0xF0);         // [Lock]
   %}
 
   // Cmp-xchg long value.
@@ -2016,71 +1990,67 @@ encode %{
   enc_class enc_cmpxchg8(eSIRegP mem_ptr) %{
 
     // XCHG  rbx,ecx
-    emit_opcode(cbuf,0x87);
-    emit_opcode(cbuf,0xD9);
+    emit_opcode(masm,0x87);
+    emit_opcode(masm,0xD9);
     // [Lock]
-    emit_opcode(cbuf,0xF0);
+    emit_opcode(masm,0xF0);
     // CMPXCHG8 [Eptr]
-    emit_opcode(cbuf,0x0F);
-    emit_opcode(cbuf,0xC7);
-    emit_rm( cbuf, 0x0, 1, $mem_ptr$$reg );
+    emit_opcode(masm,0x0F);
+    emit_opcode(masm,0xC7);
+    emit_rm( masm, 0x0, 1, $mem_ptr$$reg );
     // XCHG  rbx,ecx
-    emit_opcode(cbuf,0x87);
-    emit_opcode(cbuf,0xD9);
+    emit_opcode(masm,0x87);
+    emit_opcode(masm,0xD9);
   %}
 
   enc_class enc_cmpxchg(eSIRegP mem_ptr) %{
     // [Lock]
-    emit_opcode(cbuf,0xF0);
+    emit_opcode(masm,0xF0);
 
     // CMPXCHG [Eptr]
-    emit_opcode(cbuf,0x0F);
-    emit_opcode(cbuf,0xB1);
-    emit_rm( cbuf, 0x0, 1, $mem_ptr$$reg );
+    emit_opcode(masm,0x0F);
+    emit_opcode(masm,0xB1);
+    emit_rm( masm, 0x0, 1, $mem_ptr$$reg );
   %}
 
   enc_class enc_cmpxchgb(eSIRegP mem_ptr) %{
     // [Lock]
-    emit_opcode(cbuf,0xF0);
+    emit_opcode(masm,0xF0);
 
     // CMPXCHGB [Eptr]
-    emit_opcode(cbuf,0x0F);
-    emit_opcode(cbuf,0xB0);
-    emit_rm( cbuf, 0x0, 1, $mem_ptr$$reg );
+    emit_opcode(masm,0x0F);
+    emit_opcode(masm,0xB0);
+    emit_rm( masm, 0x0, 1, $mem_ptr$$reg );
   %}
 
   enc_class enc_cmpxchgw(eSIRegP mem_ptr) %{
     // [Lock]
-    emit_opcode(cbuf,0xF0);
+    emit_opcode(masm,0xF0);
 
     // 16-bit mode
-    emit_opcode(cbuf, 0x66);
+    emit_opcode(masm, 0x66);
 
     // CMPXCHGW [Eptr]
-    emit_opcode(cbuf,0x0F);
-    emit_opcode(cbuf,0xB1);
-    emit_rm( cbuf, 0x0, 1, $mem_ptr$$reg );
+    emit_opcode(masm,0x0F);
+    emit_opcode(masm,0xB1);
+    emit_rm( masm, 0x0, 1, $mem_ptr$$reg );
   %}
 
   enc_class enc_flags_ne_to_boolean( iRegI res ) %{
     int res_encoding = $res$$reg;
 
     // MOV  res,0
-    emit_opcode( cbuf, 0xB8 + res_encoding);
-    emit_d32( cbuf, 0 );
+    emit_opcode( masm, 0xB8 + res_encoding);
+    emit_d32( masm, 0 );
     // JNE,s  fail
-    emit_opcode(cbuf,0x75);
-    emit_d8(cbuf, 5 );
+    emit_opcode(masm,0x75);
+    emit_d8(masm, 5 );
     // MOV  res,1
-    emit_opcode( cbuf, 0xB8 + res_encoding);
-    emit_d32( cbuf, 1 );
+    emit_opcode( masm, 0xB8 + res_encoding);
+    emit_d32( masm, 1 );
     // fail:
   %}
 
-  enc_class set_instruction_start( ) %{
-    cbuf.set_insts_mark();            // Mark start of opcode for reloc info in mem operand
-  %}
-
   enc_class RegMem (rRegI ereg, memory mem) %{    // emit_reg_mem
     int reg_encoding = $ereg$$reg;
     int base  = $mem$$base;
@@ -2088,7 +2058,7 @@ encode %{
     int scale = $mem$$scale;
     int displace = $mem$$disp;
     relocInfo::relocType disp_reloc = $mem->disp_reloc();
-    encode_RegMem(cbuf, reg_encoding, base, index, scale, displace, disp_reloc);
+    encode_RegMem(masm, reg_encoding, base, index, scale, displace, disp_reloc);
   %}
 
   enc_class RegMem_Hi(eRegL ereg, memory mem) %{    // emit_reg_mem
@@ -2098,33 +2068,33 @@ encode %{
     int scale = $mem$$scale;
     int displace = $mem$$disp + 4;      // Offset is 4 further in memory
     assert( $mem->disp_reloc() == relocInfo::none, "Cannot add 4 to oop" );
-    encode_RegMem(cbuf, reg_encoding, base, index, scale, displace, relocInfo::none);
+    encode_RegMem(masm, reg_encoding, base, index, scale, displace, relocInfo::none);
   %}
 
   enc_class move_long_small_shift( eRegL dst, immI_1_31 cnt ) %{
     int r1, r2;
     if( $tertiary == 0xA4 ) { r1 = $dst$$reg;  r2 = HIGH_FROM_LOW_ENC($dst$$reg); }
     else                    { r2 = $dst$$reg;  r1 = HIGH_FROM_LOW_ENC($dst$$reg); }
-    emit_opcode(cbuf,0x0F);
-    emit_opcode(cbuf,$tertiary);
-    emit_rm(cbuf, 0x3, r1, r2);
-    emit_d8(cbuf,$cnt$$constant);
-    emit_d8(cbuf,$primary);
-    emit_rm(cbuf, 0x3, $secondary, r1);
-    emit_d8(cbuf,$cnt$$constant);
+    emit_opcode(masm,0x0F);
+    emit_opcode(masm,$tertiary);
+    emit_rm(masm, 0x3, r1, r2);
+    emit_d8(masm,$cnt$$constant);
+    emit_d8(masm,$primary);
+    emit_rm(masm, 0x3, $secondary, r1);
+    emit_d8(masm,$cnt$$constant);
   %}
 
   enc_class move_long_big_shift_sign( eRegL dst, immI_32_63 cnt ) %{
-    emit_opcode( cbuf, 0x8B ); // Move
-    emit_rm(cbuf, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg));
+    emit_opcode( masm, 0x8B ); // Move
+    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg));
     if( $cnt$$constant > 32 ) { // Shift, if not by zero
-      emit_d8(cbuf,$primary);
-      emit_rm(cbuf, 0x3, $secondary, $dst$$reg);
-      emit_d8(cbuf,$cnt$$constant-32);
+      emit_d8(masm,$primary);
+      emit_rm(masm, 0x3, $secondary, $dst$$reg);
+      emit_d8(masm,$cnt$$constant-32);
     }
-    emit_d8(cbuf,$primary);
-    emit_rm(cbuf, 0x3, $secondary, HIGH_FROM_LOW_ENC($dst$$reg));
-    emit_d8(cbuf,31);
+    emit_d8(masm,$primary);
+    emit_rm(masm, 0x3, $secondary, HIGH_FROM_LOW_ENC($dst$$reg));
+    emit_d8(masm,31);
   %}
 
   enc_class move_long_big_shift_clr( eRegL dst, immI_32_63 cnt ) %{
@@ -2132,28 +2102,28 @@ encode %{
     if( $secondary == 0x5 ) { r1 = $dst$$reg;  r2 = HIGH_FROM_LOW_ENC($dst$$reg); }
     else                    { r2 = $dst$$reg;  r1 = HIGH_FROM_LOW_ENC($dst$$reg); }
 
-    emit_opcode( cbuf, 0x8B ); // Move r1,r2
-    emit_rm(cbuf, 0x3, r1, r2);
+    emit_opcode( masm, 0x8B ); // Move r1,r2
+    emit_rm(masm, 0x3, r1, r2);
     if( $cnt$$constant > 32 ) { // Shift, if not by zero
-      emit_opcode(cbuf,$primary);
-      emit_rm(cbuf, 0x3, $secondary, r1);
-      emit_d8(cbuf,$cnt$$constant-32);
+      emit_opcode(masm,$primary);
+      emit_rm(masm, 0x3, $secondary, r1);
+      emit_d8(masm,$cnt$$constant-32);
     }
-    emit_opcode(cbuf,0x33);  // XOR r2,r2
-    emit_rm(cbuf, 0x3, r2, r2);
+    emit_opcode(masm,0x33);  // XOR r2,r2
+    emit_rm(masm, 0x3, r2, r2);
   %}
 
   // Clone of RegMem but accepts an extra parameter to access each
   // half of a double in memory; it never needs relocation info.
   enc_class Mov_MemD_half_to_Reg (immI opcode, memory mem, immI disp_for_half, rRegI rm_reg) %{
-    emit_opcode(cbuf,$opcode$$constant);
+    emit_opcode(masm,$opcode$$constant);
     int reg_encoding = $rm_reg$$reg;
     int base     = $mem$$base;
     int index    = $mem$$index;
     int scale    = $mem$$scale;
     int displace = $mem$$disp + $disp_for_half$$constant;
     relocInfo::relocType disp_reloc = relocInfo::none;
-    encode_RegMem(cbuf, reg_encoding, base, index, scale, displace, disp_reloc);
+    encode_RegMem(masm, reg_encoding, base, index, scale, displace, disp_reloc);
   %}
 
   // !!!!! Special Custom Code used by MemMove, and stack access instructions !!!!!
@@ -2168,7 +2138,7 @@ encode %{
     int scale    = $mem$$scale;
     int displace = $mem$$disp;
     assert( $mem->disp_reloc() == relocInfo::none, "No oops here because no reloc info allowed" );
-    encode_RegMem(cbuf, rm_byte_opcode, base, index, scale, displace, relocInfo::none);
+    encode_RegMem(masm, rm_byte_opcode, base, index, scale, displace, relocInfo::none);
   %}
 
   enc_class RMopc_Mem (immI rm_opcode, memory mem) %{
@@ -2178,7 +2148,7 @@ encode %{
     int scale    = $mem$$scale;
     int displace = $mem$$disp;
     relocInfo::relocType disp_reloc = $mem->disp_reloc(); // disp-as-oop when working with static globals
-    encode_RegMem(cbuf, rm_byte_opcode, base, index, scale, displace, disp_reloc);
+    encode_RegMem(masm, rm_byte_opcode, base, index, scale, displace, disp_reloc);
   %}
 
   enc_class RegLea (rRegI dst, rRegI src0, immI src1 ) %{    // emit_reg_lea
@@ -2188,31 +2158,31 @@ encode %{
     int scale        = 0x00;            // 0x00 indicates no scale
     int displace     = $src1$$constant; // 0x00 indicates no displacement
     relocInfo::relocType disp_reloc = relocInfo::none;
-    encode_RegMem(cbuf, reg_encoding, base, index, scale, displace, disp_reloc);
+    encode_RegMem(masm, reg_encoding, base, index, scale, displace, disp_reloc);
   %}
 
   enc_class min_enc (rRegI dst, rRegI src) %{    // MIN
     // Compare dst,src
-    emit_opcode(cbuf,0x3B);
-    emit_rm(cbuf, 0x3, $dst$$reg, $src$$reg);
+    emit_opcode(masm,0x3B);
+    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
     // jmp dst < src around move
-    emit_opcode(cbuf,0x7C);
-    emit_d8(cbuf,2);
+    emit_opcode(masm,0x7C);
+    emit_d8(masm,2);
     // move dst,src
-    emit_opcode(cbuf,0x8B);
-    emit_rm(cbuf, 0x3, $dst$$reg, $src$$reg);
+    emit_opcode(masm,0x8B);
+    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
   %}
 
   enc_class max_enc (rRegI dst, rRegI src) %{    // MAX
     // Compare dst,src
-    emit_opcode(cbuf,0x3B);
-    emit_rm(cbuf, 0x3, $dst$$reg, $src$$reg);
+    emit_opcode(masm,0x3B);
+    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
     // jmp dst > src around move
-    emit_opcode(cbuf,0x7F);
-    emit_d8(cbuf,2);
+    emit_opcode(masm,0x7F);
+    emit_d8(masm,2);
     // move dst,src
-    emit_opcode(cbuf,0x8B);
-    emit_rm(cbuf, 0x3, $dst$$reg, $src$$reg);
+    emit_opcode(masm,0x8B);
+    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
   %}
 
   enc_class enc_FPR_store(memory mem, regDPR src) %{
@@ -2226,115 +2196,116 @@ encode %{
     relocInfo::relocType disp_reloc = $mem->disp_reloc(); // disp-as-oop when working with static globals
     if( $src$$reg != FPR1L_enc ) {
       reg_encoding = 0x3;  // Store & pop
-      emit_opcode( cbuf, 0xD9 ); // FLD (i.e., push it)
-      emit_d8( cbuf, 0xC0-1+$src$$reg );
+      emit_opcode( masm, 0xD9 ); // FLD (i.e., push it)
+      emit_d8( masm, 0xC0-1+$src$$reg );
     }
-    cbuf.set_insts_mark();       // Mark start of opcode for reloc info in mem operand
-    emit_opcode(cbuf,$primary);
-    encode_RegMem(cbuf, reg_encoding, base, index, scale, displace, disp_reloc);
+    __ set_inst_mark();       // Mark start of opcode for reloc info in mem operand
+    emit_opcode(masm,$primary);
+    encode_RegMem(masm, reg_encoding, base, index, scale, displace, disp_reloc);
+    __ clear_inst_mark();
   %}
 
   enc_class neg_reg(rRegI dst) %{
     // NEG $dst
-    emit_opcode(cbuf,0xF7);
-    emit_rm(cbuf, 0x3, 0x03, $dst$$reg );
+    emit_opcode(masm,0xF7);
+    emit_rm(masm, 0x3, 0x03, $dst$$reg );
   %}
 
   enc_class setLT_reg(eCXRegI dst) %{
     // SETLT $dst
-    emit_opcode(cbuf,0x0F);
-    emit_opcode(cbuf,0x9C);
-    emit_rm( cbuf, 0x3, 0x4, $dst$$reg );
+    emit_opcode(masm,0x0F);
+    emit_opcode(masm,0x9C);
+    emit_rm( masm, 0x3, 0x4, $dst$$reg );
   %}
 
   enc_class enc_cmpLTP(ncxRegI p, ncxRegI q, ncxRegI y, eCXRegI tmp) %{    // cadd_cmpLT
     int tmpReg = $tmp$$reg;
 
     // SUB $p,$q
-    emit_opcode(cbuf,0x2B);
-    emit_rm(cbuf, 0x3, $p$$reg, $q$$reg);
+    emit_opcode(masm,0x2B);
+    emit_rm(masm, 0x3, $p$$reg, $q$$reg);
     // SBB $tmp,$tmp
-    emit_opcode(cbuf,0x1B);
-    emit_rm(cbuf, 0x3, tmpReg, tmpReg);
+    emit_opcode(masm,0x1B);
+    emit_rm(masm, 0x3, tmpReg, tmpReg);
     // AND $tmp,$y
-    emit_opcode(cbuf,0x23);
-    emit_rm(cbuf, 0x3, tmpReg, $y$$reg);
+    emit_opcode(masm,0x23);
+    emit_rm(masm, 0x3, tmpReg, $y$$reg);
     // ADD $p,$tmp
-    emit_opcode(cbuf,0x03);
-    emit_rm(cbuf, 0x3, $p$$reg, tmpReg);
+    emit_opcode(masm,0x03);
+    emit_rm(masm, 0x3, $p$$reg, tmpReg);
   %}
 
   enc_class shift_left_long( eRegL dst, eCXRegI shift ) %{
     // TEST shift,32
-    emit_opcode(cbuf,0xF7);
-    emit_rm(cbuf, 0x3, 0, ECX_enc);
-    emit_d32(cbuf,0x20);
+    emit_opcode(masm,0xF7);
+    emit_rm(masm, 0x3, 0, ECX_enc);
+    emit_d32(masm,0x20);
     // JEQ,s small
-    emit_opcode(cbuf, 0x74);
-    emit_d8(cbuf, 0x04);
+    emit_opcode(masm, 0x74);
+    emit_d8(masm, 0x04);
     // MOV    $dst.hi,$dst.lo
-    emit_opcode( cbuf, 0x8B );
-    emit_rm(cbuf, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg );
+    emit_opcode( masm, 0x8B );
+    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg );
     // CLR    $dst.lo
-    emit_opcode(cbuf, 0x33);
-    emit_rm(cbuf, 0x3, $dst$$reg, $dst$$reg);
+    emit_opcode(masm, 0x33);
+    emit_rm(masm, 0x3, $dst$$reg, $dst$$reg);
 // small:
     // SHLD   $dst.hi,$dst.lo,$shift
-    emit_opcode(cbuf,0x0F);
-    emit_opcode(cbuf,0xA5);
-    emit_rm(cbuf, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg));
+    emit_opcode(masm,0x0F);
+    emit_opcode(masm,0xA5);
+    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg));
     // SHL    $dst.lo,$shift"
-    emit_opcode(cbuf,0xD3);
-    emit_rm(cbuf, 0x3, 0x4, $dst$$reg );
+    emit_opcode(masm,0xD3);
+    emit_rm(masm, 0x3, 0x4, $dst$$reg );
   %}
 
   enc_class shift_right_long( eRegL dst, eCXRegI shift ) %{
     // TEST shift,32
-    emit_opcode(cbuf,0xF7);
-    emit_rm(cbuf, 0x3, 0, ECX_enc);
-    emit_d32(cbuf,0x20);
+    emit_opcode(masm,0xF7);
+    emit_rm(masm, 0x3, 0, ECX_enc);
+    emit_d32(masm,0x20);
     // JEQ,s small
-    emit_opcode(cbuf, 0x74);
-    emit_d8(cbuf, 0x04);
+    emit_opcode(masm, 0x74);
+    emit_d8(masm, 0x04);
     // MOV    $dst.lo,$dst.hi
-    emit_opcode( cbuf, 0x8B );
-    emit_rm(cbuf, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
+    emit_opcode( masm, 0x8B );
+    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
     // CLR    $dst.hi
-    emit_opcode(cbuf, 0x33);
-    emit_rm(cbuf, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($dst$$reg));
+    emit_opcode(masm, 0x33);
+    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($dst$$reg));
 // small:
     // SHRD   $dst.lo,$dst.hi,$shift
-    emit_opcode(cbuf,0x0F);
-    emit_opcode(cbuf,0xAD);
-    emit_rm(cbuf, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg);
+    emit_opcode(masm,0x0F);
+    emit_opcode(masm,0xAD);
+    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg);
     // SHR    $dst.hi,$shift"
-    emit_opcode(cbuf,0xD3);
-    emit_rm(cbuf, 0x3, 0x5, HIGH_FROM_LOW_ENC($dst$$reg) );
+    emit_opcode(masm,0xD3);
+    emit_rm(masm, 0x3, 0x5, HIGH_FROM_LOW_ENC($dst$$reg) );
   %}
 
   enc_class shift_right_arith_long( eRegL dst, eCXRegI shift ) %{
     // TEST shift,32
-    emit_opcode(cbuf,0xF7);
-    emit_rm(cbuf, 0x3, 0, ECX_enc);
-    emit_d32(cbuf,0x20);
+    emit_opcode(masm,0xF7);
+    emit_rm(masm, 0x3, 0, ECX_enc);
+    emit_d32(masm,0x20);
     // JEQ,s small
-    emit_opcode(cbuf, 0x74);
-    emit_d8(cbuf, 0x05);
+    emit_opcode(masm, 0x74);
+    emit_d8(masm, 0x05);
     // MOV    $dst.lo,$dst.hi
-    emit_opcode( cbuf, 0x8B );
-    emit_rm(cbuf, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
+    emit_opcode( masm, 0x8B );
+    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
     // SAR    $dst.hi,31
-    emit_opcode(cbuf, 0xC1);
-    emit_rm(cbuf, 0x3, 7, HIGH_FROM_LOW_ENC($dst$$reg) );
-    emit_d8(cbuf, 0x1F );
+    emit_opcode(masm, 0xC1);
+    emit_rm(masm, 0x3, 7, HIGH_FROM_LOW_ENC($dst$$reg) );
+    emit_d8(masm, 0x1F );
 // small:
     // SHRD   $dst.lo,$dst.hi,$shift
-    emit_opcode(cbuf,0x0F);
-    emit_opcode(cbuf,0xAD);
-    emit_rm(cbuf, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg);
+    emit_opcode(masm,0x0F);
+    emit_opcode(masm,0xAD);
+    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg);
     // SAR    $dst.hi,$shift"
-    emit_opcode(cbuf,0xD3);
-    emit_rm(cbuf, 0x3, 0x7, HIGH_FROM_LOW_ENC($dst$$reg) );
+    emit_opcode(masm,0xD3);
+    emit_rm(masm, 0x3, 0x7, HIGH_FROM_LOW_ENC($dst$$reg) );
   %}
 
 
@@ -2342,136 +2313,135 @@ encode %{
   // May leave result in FPU-TOS or FPU reg depending on opcodes
   enc_class OpcReg_FPR(regFPR src) %{    // FMUL, FDIV
     $$$emit8$primary;
-    emit_rm(cbuf, 0x3, $secondary, $src$$reg );
+    emit_rm(masm, 0x3, $secondary, $src$$reg );
   %}
 
   // Pop argument in FPR0 with FSTP ST(0)
   enc_class PopFPU() %{
-    emit_opcode( cbuf, 0xDD );
-    emit_d8( cbuf, 0xD8 );
+    emit_opcode( masm, 0xDD );
+    emit_d8( masm, 0xD8 );
   %}
 
   // !!!!! equivalent to Pop_Reg_F
   enc_class Pop_Reg_DPR( regDPR dst ) %{
-    emit_opcode( cbuf, 0xDD );           // FSTP   ST(i)
-    emit_d8( cbuf, 0xD8+$dst$$reg );
+    emit_opcode( masm, 0xDD );           // FSTP   ST(i)
+    emit_d8( masm, 0xD8+$dst$$reg );
   %}
 
   enc_class Push_Reg_DPR( regDPR dst ) %{
-    emit_opcode( cbuf, 0xD9 );
-    emit_d8( cbuf, 0xC0-1+$dst$$reg );   // FLD ST(i-1)
+    emit_opcode( masm, 0xD9 );
+    emit_d8( masm, 0xC0-1+$dst$$reg );   // FLD ST(i-1)
   %}
 
   enc_class strictfp_bias1( regDPR dst ) %{
-    emit_opcode( cbuf, 0xDB );           // FLD m80real
-    emit_opcode( cbuf, 0x2D );
-    emit_d32( cbuf, (int)StubRoutines::x86::addr_fpu_subnormal_bias1() );
-    emit_opcode( cbuf, 0xDE );           // FMULP ST(dst), ST0
-    emit_opcode( cbuf, 0xC8+$dst$$reg );
+    emit_opcode( masm, 0xDB );           // FLD m80real
+    emit_opcode( masm, 0x2D );
+    emit_d32( masm, (int)StubRoutines::x86::addr_fpu_subnormal_bias1() );
+    emit_opcode( masm, 0xDE );           // FMULP ST(dst), ST0
+    emit_opcode( masm, 0xC8+$dst$$reg );
   %}
 
   enc_class strictfp_bias2( regDPR dst ) %{
-    emit_opcode( cbuf, 0xDB );           // FLD m80real
-    emit_opcode( cbuf, 0x2D );
-    emit_d32( cbuf, (int)StubRoutines::x86::addr_fpu_subnormal_bias2() );
-    emit_opcode( cbuf, 0xDE );           // FMULP ST(dst), ST0
-    emit_opcode( cbuf, 0xC8+$dst$$reg );
+    emit_opcode( masm, 0xDB );           // FLD m80real
+    emit_opcode( masm, 0x2D );
+    emit_d32( masm, (int)StubRoutines::x86::addr_fpu_subnormal_bias2() );
+    emit_opcode( masm, 0xDE );           // FMULP ST(dst), ST0
+    emit_opcode( masm, 0xC8+$dst$$reg );
   %}
 
   // Special case for moving an integer register to a stack slot.
   enc_class OpcPRegSS( stackSlotI dst, rRegI src ) %{ // RegSS
-    store_to_stackslot( cbuf, $primary, $src$$reg, $dst$$disp );
+    store_to_stackslot( masm, $primary, $src$$reg, $dst$$disp );
   %}
 
   // Special case for moving a register to a stack slot.
   enc_class RegSS( stackSlotI dst, rRegI src ) %{ // RegSS
     // Opcode already emitted
-    emit_rm( cbuf, 0x02, $src$$reg, ESP_enc );   // R/M byte
-    emit_rm( cbuf, 0x00, ESP_enc, ESP_enc);          // SIB byte
-    emit_d32(cbuf, $dst$$disp);   // Displacement
+    emit_rm( masm, 0x02, $src$$reg, ESP_enc );   // R/M byte
+    emit_rm( masm, 0x00, ESP_enc, ESP_enc);          // SIB byte
+    emit_d32(masm, $dst$$disp);   // Displacement
   %}
 
   // Push the integer in stackSlot 'src' onto FP-stack
   enc_class Push_Mem_I( memory src ) %{    // FILD   [ESP+src]
-    store_to_stackslot( cbuf, $primary, $secondary, $src$$disp );
+    store_to_stackslot( masm, $primary, $secondary, $src$$disp );
   %}
 
   // Push FPU's TOS float to a stack-slot, and pop FPU-stack
   enc_class Pop_Mem_FPR( stackSlotF dst ) %{ // FSTP_S [ESP+dst]
-    store_to_stackslot( cbuf, 0xD9, 0x03, $dst$$disp );
+    store_to_stackslot( masm, 0xD9, 0x03, $dst$$disp );
   %}
 
   // Same as Pop_Mem_F except for opcode
   // Push FPU's TOS double to a stack-slot, and pop FPU-stack
   enc_class Pop_Mem_DPR( stackSlotD dst ) %{ // FSTP_D [ESP+dst]
-    store_to_stackslot( cbuf, 0xDD, 0x03, $dst$$disp );
+    store_to_stackslot( masm, 0xDD, 0x03, $dst$$disp );
   %}
 
   enc_class Pop_Reg_FPR( regFPR dst ) %{
-    emit_opcode( cbuf, 0xDD );           // FSTP   ST(i)
-    emit_d8( cbuf, 0xD8+$dst$$reg );
+    emit_opcode( masm, 0xDD );           // FSTP   ST(i)
+    emit_d8( masm, 0xD8+$dst$$reg );
   %}
 
   enc_class Push_Reg_FPR( regFPR dst ) %{
-    emit_opcode( cbuf, 0xD9 );           // FLD    ST(i-1)
-    emit_d8( cbuf, 0xC0-1+$dst$$reg );
+    emit_opcode( masm, 0xD9 );           // FLD    ST(i-1)
+    emit_d8( masm, 0xC0-1+$dst$$reg );
   %}
 
   // Push FPU's float to a stack-slot, and pop FPU-stack
   enc_class Pop_Mem_Reg_FPR( stackSlotF dst, regFPR src ) %{
     int pop = 0x02;
     if ($src$$reg != FPR1L_enc) {
-      emit_opcode( cbuf, 0xD9 );         // FLD    ST(i-1)
-      emit_d8( cbuf, 0xC0-1+$src$$reg );
+      emit_opcode( masm, 0xD9 );         // FLD    ST(i-1)
+      emit_d8( masm, 0xC0-1+$src$$reg );
       pop = 0x03;
     }
-    store_to_stackslot( cbuf, 0xD9, pop, $dst$$disp ); // FST<P>_S  [ESP+dst]
+    store_to_stackslot( masm, 0xD9, pop, $dst$$disp ); // FST<P>_S  [ESP+dst]
   %}
 
   // Push FPU's double to a stack-slot, and pop FPU-stack
   enc_class Pop_Mem_Reg_DPR( stackSlotD dst, regDPR src ) %{
     int pop = 0x02;
     if ($src$$reg != FPR1L_enc) {
-      emit_opcode( cbuf, 0xD9 );         // FLD    ST(i-1)
-      emit_d8( cbuf, 0xC0-1+$src$$reg );
+      emit_opcode( masm, 0xD9 );         // FLD    ST(i-1)
+      emit_d8( masm, 0xC0-1+$src$$reg );
       pop = 0x03;
     }
-    store_to_stackslot( cbuf, 0xDD, pop, $dst$$disp ); // FST<P>_D  [ESP+dst]
+    store_to_stackslot( masm, 0xDD, pop, $dst$$disp ); // FST<P>_D  [ESP+dst]
   %}
 
   // Push FPU's double to a FPU-stack-slot, and pop FPU-stack
   enc_class Pop_Reg_Reg_DPR( regDPR dst, regFPR src ) %{
     int pop = 0xD0 - 1; // -1 since we skip FLD
     if ($src$$reg != FPR1L_enc) {
-      emit_opcode( cbuf, 0xD9 );         // FLD    ST(src-1)
-      emit_d8( cbuf, 0xC0-1+$src$$reg );
+      emit_opcode( masm, 0xD9 );         // FLD    ST(src-1)
+      emit_d8( masm, 0xC0-1+$src$$reg );
       pop = 0xD8;
     }
-    emit_opcode( cbuf, 0xDD );
-    emit_d8( cbuf, pop+$dst$$reg );      // FST<P> ST(i)
+    emit_opcode( masm, 0xDD );
+    emit_d8( masm, pop+$dst$$reg );      // FST<P> ST(i)
   %}
 
 
   enc_class Push_Reg_Mod_DPR( regDPR dst, regDPR src) %{
     // load dst in FPR0
-    emit_opcode( cbuf, 0xD9 );
-    emit_d8( cbuf, 0xC0-1+$dst$$reg );
+    emit_opcode( masm, 0xD9 );
+    emit_d8( masm, 0xC0-1+$dst$$reg );
     if ($src$$reg != FPR1L_enc) {
       // fincstp
-      emit_opcode (cbuf, 0xD9);
-      emit_opcode (cbuf, 0xF7);
+      emit_opcode (masm, 0xD9);
+      emit_opcode (masm, 0xF7);
       // swap src with FPR1:
       // FXCH FPR1 with src
-      emit_opcode(cbuf, 0xD9);
-      emit_d8(cbuf, 0xC8-1+$src$$reg );
+      emit_opcode(masm, 0xD9);
+      emit_d8(masm, 0xC8-1+$src$$reg );
       // fdecstp
-      emit_opcode (cbuf, 0xD9);
-      emit_opcode (cbuf, 0xF6);
+      emit_opcode (masm, 0xD9);
+      emit_opcode (masm, 0xF6);
     }
   %}
 
   enc_class Push_ModD_encoding(regD src0, regD src1) %{
-    MacroAssembler _masm(&cbuf);
     __ subptr(rsp, 8);
     __ movdbl(Address(rsp, 0), $src1$$XMMRegister);
     __ fld_d(Address(rsp, 0));
@@ -2480,7 +2450,6 @@ encode %{
   %}
 
   enc_class Push_ModF_encoding(regF src0, regF src1) %{
-    MacroAssembler _masm(&cbuf);
     __ subptr(rsp, 4);
     __ movflt(Address(rsp, 0), $src1$$XMMRegister);
     __ fld_s(Address(rsp, 0));
@@ -2489,38 +2458,32 @@ encode %{
   %}
 
   enc_class Push_ResultD(regD dst) %{
-    MacroAssembler _masm(&cbuf);
     __ fstp_d(Address(rsp, 0));
     __ movdbl($dst$$XMMRegister, Address(rsp, 0));
     __ addptr(rsp, 8);
   %}
 
   enc_class Push_ResultF(regF dst, immI d8) %{
-    MacroAssembler _masm(&cbuf);
     __ fstp_s(Address(rsp, 0));
     __ movflt($dst$$XMMRegister, Address(rsp, 0));
     __ addptr(rsp, $d8$$constant);
   %}
 
   enc_class Push_SrcD(regD src) %{
-    MacroAssembler _masm(&cbuf);
     __ subptr(rsp, 8);
     __ movdbl(Address(rsp, 0), $src$$XMMRegister);
     __ fld_d(Address(rsp, 0));
   %}
 
   enc_class push_stack_temp_qword() %{
-    MacroAssembler _masm(&cbuf);
     __ subptr(rsp, 8);
   %}
 
   enc_class pop_stack_temp_qword() %{
-    MacroAssembler _masm(&cbuf);
     __ addptr(rsp, 8);
   %}
 
   enc_class push_xmm_to_fpr1(regD src) %{
-    MacroAssembler _masm(&cbuf);
     __ movdbl(Address(rsp, 0), $src$$XMMRegister);
     __ fld_d(Address(rsp, 0));
   %}
@@ -2528,90 +2491,86 @@ encode %{
   enc_class Push_Result_Mod_DPR( regDPR src) %{
     if ($src$$reg != FPR1L_enc) {
       // fincstp
-      emit_opcode (cbuf, 0xD9);
-      emit_opcode (cbuf, 0xF7);
+      emit_opcode (masm, 0xD9);
+      emit_opcode (masm, 0xF7);
       // FXCH FPR1 with src
-      emit_opcode(cbuf, 0xD9);
-      emit_d8(cbuf, 0xC8-1+$src$$reg );
+      emit_opcode(masm, 0xD9);
+      emit_d8(masm, 0xC8-1+$src$$reg );
       // fdecstp
-      emit_opcode (cbuf, 0xD9);
-      emit_opcode (cbuf, 0xF6);
+      emit_opcode (masm, 0xD9);
+      emit_opcode (masm, 0xF6);
     }
-    // // following asm replaced with Pop_Reg_F or Pop_Mem_F
-    // // FSTP   FPR$dst$$reg
-    // emit_opcode( cbuf, 0xDD );
-    // emit_d8( cbuf, 0xD8+$dst$$reg );
   %}
 
   enc_class fnstsw_sahf_skip_parity() %{
     // fnstsw ax
-    emit_opcode( cbuf, 0xDF );
-    emit_opcode( cbuf, 0xE0 );
+    emit_opcode( masm, 0xDF );
+    emit_opcode( masm, 0xE0 );
     // sahf
-    emit_opcode( cbuf, 0x9E );
+    emit_opcode( masm, 0x9E );
     // jnp  ::skip
-    emit_opcode( cbuf, 0x7B );
-    emit_opcode( cbuf, 0x05 );
+    emit_opcode( masm, 0x7B );
+    emit_opcode( masm, 0x05 );
   %}
 
   enc_class emitModDPR() %{
     // fprem must be iterative
     // :: loop
     // fprem
-    emit_opcode( cbuf, 0xD9 );
-    emit_opcode( cbuf, 0xF8 );
+    emit_opcode( masm, 0xD9 );
+    emit_opcode( masm, 0xF8 );
     // wait
-    emit_opcode( cbuf, 0x9b );
+    emit_opcode( masm, 0x9b );
     // fnstsw ax
-    emit_opcode( cbuf, 0xDF );
-    emit_opcode( cbuf, 0xE0 );
+    emit_opcode( masm, 0xDF );
+    emit_opcode( masm, 0xE0 );
     // sahf
-    emit_opcode( cbuf, 0x9E );
+    emit_opcode( masm, 0x9E );
     // jp  ::loop
-    emit_opcode( cbuf, 0x0F );
-    emit_opcode( cbuf, 0x8A );
-    emit_opcode( cbuf, 0xF4 );
-    emit_opcode( cbuf, 0xFF );
-    emit_opcode( cbuf, 0xFF );
-    emit_opcode( cbuf, 0xFF );
+    emit_opcode( masm, 0x0F );
+    emit_opcode( masm, 0x8A );
+    emit_opcode( masm, 0xF4 );
+    emit_opcode( masm, 0xFF );
+    emit_opcode( masm, 0xFF );
+    emit_opcode( masm, 0xFF );
   %}
 
   enc_class fpu_flags() %{
     // fnstsw_ax
-    emit_opcode( cbuf, 0xDF);
-    emit_opcode( cbuf, 0xE0);
+    emit_opcode( masm, 0xDF);
+    emit_opcode( masm, 0xE0);
     // test ax,0x0400
-    emit_opcode( cbuf, 0x66 );   // operand-size prefix for 16-bit immediate
-    emit_opcode( cbuf, 0xA9 );
-    emit_d16   ( cbuf, 0x0400 );
+    emit_opcode( masm, 0x66 );   // operand-size prefix for 16-bit immediate
+    emit_opcode( masm, 0xA9 );
+    emit_d16   ( masm, 0x0400 );
     // // // This sequence works, but stalls for 12-16 cycles on PPro
     // // test rax,0x0400
-    // emit_opcode( cbuf, 0xA9 );
-    // emit_d32   ( cbuf, 0x00000400 );
+    // emit_opcode( masm, 0xA9 );
+    // emit_d32   ( masm, 0x00000400 );
     //
     // jz exit (no unordered comparison)
-    emit_opcode( cbuf, 0x74 );
-    emit_d8    ( cbuf, 0x02 );
+    emit_opcode( masm, 0x74 );
+    emit_d8    ( masm, 0x02 );
     // mov ah,1 - treat as LT case (set carry flag)
-    emit_opcode( cbuf, 0xB4 );
-    emit_d8    ( cbuf, 0x01 );
+    emit_opcode( masm, 0xB4 );
+    emit_d8    ( masm, 0x01 );
     // sahf
-    emit_opcode( cbuf, 0x9E);
+    emit_opcode( masm, 0x9E);
   %}
 
   enc_class cmpF_P6_fixup() %{
     // Fixup the integer flags in case comparison involved a NaN
     //
     // JNP exit (no unordered comparison, P-flag is set by NaN)
-    emit_opcode( cbuf, 0x7B );
-    emit_d8    ( cbuf, 0x03 );
+    emit_opcode( masm, 0x7B );
+    emit_d8    ( masm, 0x03 );
     // MOV AH,1 - treat as LT case (set carry flag)
-    emit_opcode( cbuf, 0xB4 );
-    emit_d8    ( cbuf, 0x01 );
+    emit_opcode( masm, 0xB4 );
+    emit_d8    ( masm, 0x01 );
     // SAHF
-    emit_opcode( cbuf, 0x9E);
+    emit_opcode( masm, 0x9E);
     // NOP     // target for branch to avoid branch to branch
-    emit_opcode( cbuf, 0x90);
+    emit_opcode( masm, 0x90);
   %}
 
 //     fnstsw_ax();
@@ -2631,31 +2590,31 @@ encode %{
 
   enc_class CmpF_Result(rRegI dst) %{
     // fnstsw_ax();
-    emit_opcode( cbuf, 0xDF);
-    emit_opcode( cbuf, 0xE0);
+    emit_opcode( masm, 0xDF);
+    emit_opcode( masm, 0xE0);
     // sahf
-    emit_opcode( cbuf, 0x9E);
+    emit_opcode( masm, 0x9E);
     // movl(dst, nan_result);
-    emit_opcode( cbuf, 0xB8 + $dst$$reg);
-    emit_d32( cbuf, -1 );
+    emit_opcode( masm, 0xB8 + $dst$$reg);
+    emit_d32( masm, -1 );
     // jcc(Assembler::parity, exit);
-    emit_opcode( cbuf, 0x7A );
-    emit_d8    ( cbuf, 0x13 );
+    emit_opcode( masm, 0x7A );
+    emit_d8    ( masm, 0x13 );
     // movl(dst, less_result);
-    emit_opcode( cbuf, 0xB8 + $dst$$reg);
-    emit_d32( cbuf, -1 );
+    emit_opcode( masm, 0xB8 + $dst$$reg);
+    emit_d32( masm, -1 );
     // jcc(Assembler::below, exit);
-    emit_opcode( cbuf, 0x72 );
-    emit_d8    ( cbuf, 0x0C );
+    emit_opcode( masm, 0x72 );
+    emit_d8    ( masm, 0x0C );
     // movl(dst, equal_result);
-    emit_opcode( cbuf, 0xB8 + $dst$$reg);
-    emit_d32( cbuf, 0 );
+    emit_opcode( masm, 0xB8 + $dst$$reg);
+    emit_d32( masm, 0 );
     // jcc(Assembler::equal, exit);
-    emit_opcode( cbuf, 0x74 );
-    emit_d8    ( cbuf, 0x05 );
+    emit_opcode( masm, 0x74 );
+    emit_d8    ( masm, 0x05 );
     // movl(dst, greater_result);
-    emit_opcode( cbuf, 0xB8 + $dst$$reg);
-    emit_d32( cbuf, 1 );
+    emit_opcode( masm, 0xB8 + $dst$$reg);
+    emit_d32( masm, 1 );
   %}
 
 
@@ -2663,14 +2622,14 @@ encode %{
   // BROKEN!  Do Not use as-is
   enc_class cmpl_test( eRegL src1, eRegL src2 ) %{
     // CMP    $src1.hi,$src2.hi
-    emit_opcode( cbuf, 0x3B );
-    emit_rm(cbuf, 0x3, HIGH_FROM_LOW_ENC($src1$$reg), HIGH_FROM_LOW_ENC($src2$$reg) );
+    emit_opcode( masm, 0x3B );
+    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($src1$$reg), HIGH_FROM_LOW_ENC($src2$$reg) );
     // JNE,s  done
-    emit_opcode(cbuf,0x75);
-    emit_d8(cbuf, 2 );
+    emit_opcode(masm,0x75);
+    emit_d8(masm, 2 );
     // CMP    $src1.lo,$src2.lo
-    emit_opcode( cbuf, 0x3B );
-    emit_rm(cbuf, 0x3, $src1$$reg, $src2$$reg );
+    emit_opcode( masm, 0x3B );
+    emit_rm(masm, 0x3, $src1$$reg, $src2$$reg );
 // done:
   %}
 
@@ -2678,223 +2637,223 @@ encode %{
     // mov $dst.lo,$src
     int dst_encoding = $dst$$reg;
     int src_encoding = $src$$reg;
-    encode_Copy( cbuf, dst_encoding  , src_encoding );
+    encode_Copy( masm, dst_encoding  , src_encoding );
     // mov $dst.hi,$src
-    encode_Copy( cbuf, HIGH_FROM_LOW_ENC(dst_encoding), src_encoding );
+    encode_Copy( masm, HIGH_FROM_LOW_ENC(dst_encoding), src_encoding );
     // sar $dst.hi,31
-    emit_opcode( cbuf, 0xC1 );
-    emit_rm(cbuf, 0x3, 7, HIGH_FROM_LOW_ENC(dst_encoding) );
-    emit_d8(cbuf, 0x1F );
+    emit_opcode( masm, 0xC1 );
+    emit_rm(masm, 0x3, 7, HIGH_FROM_LOW_ENC(dst_encoding) );
+    emit_d8(masm, 0x1F );
   %}
 
   enc_class convert_long_double( eRegL src ) %{
     // push $src.hi
-    emit_opcode(cbuf, 0x50+HIGH_FROM_LOW_ENC($src$$reg));
+    emit_opcode(masm, 0x50+HIGH_FROM_LOW_ENC($src$$reg));
     // push $src.lo
-    emit_opcode(cbuf, 0x50+$src$$reg  );
+    emit_opcode(masm, 0x50+$src$$reg  );
     // fild 64-bits at [SP]
-    emit_opcode(cbuf,0xdf);
-    emit_d8(cbuf, 0x6C);
-    emit_d8(cbuf, 0x24);
-    emit_d8(cbuf, 0x00);
+    emit_opcode(masm,0xdf);
+    emit_d8(masm, 0x6C);
+    emit_d8(masm, 0x24);
+    emit_d8(masm, 0x00);
     // pop stack
-    emit_opcode(cbuf, 0x83); // add  SP, #8
-    emit_rm(cbuf, 0x3, 0x00, ESP_enc);
-    emit_d8(cbuf, 0x8);
+    emit_opcode(masm, 0x83); // add  SP, #8
+    emit_rm(masm, 0x3, 0x00, ESP_enc);
+    emit_d8(masm, 0x8);
   %}
 
   enc_class multiply_con_and_shift_high( eDXRegI dst, nadxRegI src1, eADXRegL_low_only src2, immI_32_63 cnt, eFlagsReg cr ) %{
     // IMUL   EDX:EAX,$src1
-    emit_opcode( cbuf, 0xF7 );
-    emit_rm( cbuf, 0x3, 0x5, $src1$$reg );
+    emit_opcode( masm, 0xF7 );
+    emit_rm( masm, 0x3, 0x5, $src1$$reg );
     // SAR    EDX,$cnt-32
     int shift_count = ((int)$cnt$$constant) - 32;
     if (shift_count > 0) {
-      emit_opcode(cbuf, 0xC1);
-      emit_rm(cbuf, 0x3, 7, $dst$$reg );
-      emit_d8(cbuf, shift_count);
+      emit_opcode(masm, 0xC1);
+      emit_rm(masm, 0x3, 7, $dst$$reg );
+      emit_d8(masm, shift_count);
     }
   %}
 
   // this version doesn't have add sp, 8
   enc_class convert_long_double2( eRegL src ) %{
     // push $src.hi
-    emit_opcode(cbuf, 0x50+HIGH_FROM_LOW_ENC($src$$reg));
+    emit_opcode(masm, 0x50+HIGH_FROM_LOW_ENC($src$$reg));
     // push $src.lo
-    emit_opcode(cbuf, 0x50+$src$$reg  );
+    emit_opcode(masm, 0x50+$src$$reg  );
     // fild 64-bits at [SP]
-    emit_opcode(cbuf,0xdf);
-    emit_d8(cbuf, 0x6C);
-    emit_d8(cbuf, 0x24);
-    emit_d8(cbuf, 0x00);
+    emit_opcode(masm,0xdf);
+    emit_d8(masm, 0x6C);
+    emit_d8(masm, 0x24);
+    emit_d8(masm, 0x00);
   %}
 
   enc_class long_int_multiply( eADXRegL dst, nadxRegI src) %{
     // Basic idea: long = (long)int * (long)int
     // IMUL EDX:EAX, src
-    emit_opcode( cbuf, 0xF7 );
-    emit_rm( cbuf, 0x3, 0x5, $src$$reg);
+    emit_opcode( masm, 0xF7 );
+    emit_rm( masm, 0x3, 0x5, $src$$reg);
   %}
 
   enc_class long_uint_multiply( eADXRegL dst, nadxRegI src) %{
     // Basic Idea:  long = (int & 0xffffffffL) * (int & 0xffffffffL)
     // MUL EDX:EAX, src
-    emit_opcode( cbuf, 0xF7 );
-    emit_rm( cbuf, 0x3, 0x4, $src$$reg);
+    emit_opcode( masm, 0xF7 );
+    emit_rm( masm, 0x3, 0x4, $src$$reg);
   %}
 
   enc_class long_multiply( eADXRegL dst, eRegL src, rRegI tmp ) %{
     // Basic idea: lo(result) = lo(x_lo * y_lo)
     //             hi(result) = hi(x_lo * y_lo) + lo(x_hi * y_lo) + lo(x_lo * y_hi)
     // MOV    $tmp,$src.lo
-    encode_Copy( cbuf, $tmp$$reg, $src$$reg );
+    encode_Copy( masm, $tmp$$reg, $src$$reg );
     // IMUL   $tmp,EDX
-    emit_opcode( cbuf, 0x0F );
-    emit_opcode( cbuf, 0xAF );
-    emit_rm( cbuf, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
+    emit_opcode( masm, 0x0F );
+    emit_opcode( masm, 0xAF );
+    emit_rm( masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
     // MOV    EDX,$src.hi
-    encode_Copy( cbuf, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($src$$reg) );
+    encode_Copy( masm, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($src$$reg) );
     // IMUL   EDX,EAX
-    emit_opcode( cbuf, 0x0F );
-    emit_opcode( cbuf, 0xAF );
-    emit_rm( cbuf, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg );
+    emit_opcode( masm, 0x0F );
+    emit_opcode( masm, 0xAF );
+    emit_rm( masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg );
     // ADD    $tmp,EDX
-    emit_opcode( cbuf, 0x03 );
-    emit_rm( cbuf, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
+    emit_opcode( masm, 0x03 );
+    emit_rm( masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
     // MUL   EDX:EAX,$src.lo
-    emit_opcode( cbuf, 0xF7 );
-    emit_rm( cbuf, 0x3, 0x4, $src$$reg );
+    emit_opcode( masm, 0xF7 );
+    emit_rm( masm, 0x3, 0x4, $src$$reg );
     // ADD    EDX,ESI
-    emit_opcode( cbuf, 0x03 );
-    emit_rm( cbuf, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $tmp$$reg );
+    emit_opcode( masm, 0x03 );
+    emit_rm( masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $tmp$$reg );
   %}
 
   enc_class long_multiply_con( eADXRegL dst, immL_127 src, rRegI tmp ) %{
     // Basic idea: lo(result) = lo(src * y_lo)
     //             hi(result) = hi(src * y_lo) + lo(src * y_hi)
     // IMUL   $tmp,EDX,$src
-    emit_opcode( cbuf, 0x6B );
-    emit_rm( cbuf, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
-    emit_d8( cbuf, (int)$src$$constant );
+    emit_opcode( masm, 0x6B );
+    emit_rm( masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
+    emit_d8( masm, (int)$src$$constant );
     // MOV    EDX,$src
-    emit_opcode(cbuf, 0xB8 + EDX_enc);
-    emit_d32( cbuf, (int)$src$$constant );
+    emit_opcode(masm, 0xB8 + EDX_enc);
+    emit_d32( masm, (int)$src$$constant );
     // MUL   EDX:EAX,EDX
-    emit_opcode( cbuf, 0xF7 );
-    emit_rm( cbuf, 0x3, 0x4, EDX_enc );
+    emit_opcode( masm, 0xF7 );
+    emit_rm( masm, 0x3, 0x4, EDX_enc );
     // ADD    EDX,ESI
-    emit_opcode( cbuf, 0x03 );
-    emit_rm( cbuf, 0x3, EDX_enc, $tmp$$reg );
+    emit_opcode( masm, 0x03 );
+    emit_rm( masm, 0x3, EDX_enc, $tmp$$reg );
   %}
 
   enc_class long_div( eRegL src1, eRegL src2 ) %{
     // PUSH src1.hi
-    emit_opcode(cbuf, HIGH_FROM_LOW_ENC(0x50+$src1$$reg) );
+    emit_opcode(masm, HIGH_FROM_LOW_ENC(0x50+$src1$$reg) );
     // PUSH src1.lo
-    emit_opcode(cbuf,               0x50+$src1$$reg  );
+    emit_opcode(masm,               0x50+$src1$$reg  );
     // PUSH src2.hi
-    emit_opcode(cbuf, HIGH_FROM_LOW_ENC(0x50+$src2$$reg) );
+    emit_opcode(masm, HIGH_FROM_LOW_ENC(0x50+$src2$$reg) );
     // PUSH src2.lo
-    emit_opcode(cbuf,               0x50+$src2$$reg  );
+    emit_opcode(masm,               0x50+$src2$$reg  );
     // CALL directly to the runtime
-    MacroAssembler _masm(&cbuf);
-    cbuf.set_insts_mark();
-    emit_opcode(cbuf,0xE8);       // Call into runtime
-    emit_d32_reloc(cbuf, (CAST_FROM_FN_PTR(address, SharedRuntime::ldiv) - cbuf.insts_end()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ set_inst_mark();
+    emit_opcode(masm,0xE8);       // Call into runtime
+    emit_d32_reloc(masm, (CAST_FROM_FN_PTR(address, SharedRuntime::ldiv) - __ pc()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ clear_inst_mark();
     __ post_call_nop();
     // Restore stack
-    emit_opcode(cbuf, 0x83); // add  SP, #framesize
-    emit_rm(cbuf, 0x3, 0x00, ESP_enc);
-    emit_d8(cbuf, 4*4);
+    emit_opcode(masm, 0x83); // add  SP, #framesize
+    emit_rm(masm, 0x3, 0x00, ESP_enc);
+    emit_d8(masm, 4*4);
   %}
 
   enc_class long_mod( eRegL src1, eRegL src2 ) %{
     // PUSH src1.hi
-    emit_opcode(cbuf, HIGH_FROM_LOW_ENC(0x50+$src1$$reg) );
+    emit_opcode(masm, HIGH_FROM_LOW_ENC(0x50+$src1$$reg) );
     // PUSH src1.lo
-    emit_opcode(cbuf,               0x50+$src1$$reg  );
+    emit_opcode(masm,               0x50+$src1$$reg  );
     // PUSH src2.hi
-    emit_opcode(cbuf, HIGH_FROM_LOW_ENC(0x50+$src2$$reg) );
+    emit_opcode(masm, HIGH_FROM_LOW_ENC(0x50+$src2$$reg) );
     // PUSH src2.lo
-    emit_opcode(cbuf,               0x50+$src2$$reg  );
+    emit_opcode(masm,               0x50+$src2$$reg  );
     // CALL directly to the runtime
-    MacroAssembler _masm(&cbuf);
-    cbuf.set_insts_mark();
-    emit_opcode(cbuf,0xE8);       // Call into runtime
-    emit_d32_reloc(cbuf, (CAST_FROM_FN_PTR(address, SharedRuntime::lrem ) - cbuf.insts_end()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ set_inst_mark();
+    emit_opcode(masm,0xE8);       // Call into runtime
+    emit_d32_reloc(masm, (CAST_FROM_FN_PTR(address, SharedRuntime::lrem ) - __ pc()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ clear_inst_mark();
     __ post_call_nop();
     // Restore stack
-    emit_opcode(cbuf, 0x83); // add  SP, #framesize
-    emit_rm(cbuf, 0x3, 0x00, ESP_enc);
-    emit_d8(cbuf, 4*4);
+    emit_opcode(masm, 0x83); // add  SP, #framesize
+    emit_rm(masm, 0x3, 0x00, ESP_enc);
+    emit_d8(masm, 4*4);
   %}
 
   enc_class long_cmp_flags0( eRegL src, rRegI tmp ) %{
     // MOV   $tmp,$src.lo
-    emit_opcode(cbuf, 0x8B);
-    emit_rm(cbuf, 0x3, $tmp$$reg, $src$$reg);
+    emit_opcode(masm, 0x8B);
+    emit_rm(masm, 0x3, $tmp$$reg, $src$$reg);
     // OR    $tmp,$src.hi
-    emit_opcode(cbuf, 0x0B);
-    emit_rm(cbuf, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src$$reg));
+    emit_opcode(masm, 0x0B);
+    emit_rm(masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src$$reg));
   %}
 
   enc_class long_cmp_flags1( eRegL src1, eRegL src2 ) %{
     // CMP    $src1.lo,$src2.lo
-    emit_opcode( cbuf, 0x3B );
-    emit_rm(cbuf, 0x3, $src1$$reg, $src2$$reg );
+    emit_opcode( masm, 0x3B );
+    emit_rm(masm, 0x3, $src1$$reg, $src2$$reg );
     // JNE,s  skip
-    emit_cc(cbuf, 0x70, 0x5);
-    emit_d8(cbuf,2);
+    emit_cc(masm, 0x70, 0x5);
+    emit_d8(masm,2);
     // CMP    $src1.hi,$src2.hi
-    emit_opcode( cbuf, 0x3B );
-    emit_rm(cbuf, 0x3, HIGH_FROM_LOW_ENC($src1$$reg), HIGH_FROM_LOW_ENC($src2$$reg) );
+    emit_opcode( masm, 0x3B );
+    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($src1$$reg), HIGH_FROM_LOW_ENC($src2$$reg) );
   %}
 
   enc_class long_cmp_flags2( eRegL src1, eRegL src2, rRegI tmp ) %{
     // CMP    $src1.lo,$src2.lo\t! Long compare; set flags for low bits
-    emit_opcode( cbuf, 0x3B );
-    emit_rm(cbuf, 0x3, $src1$$reg, $src2$$reg );
+    emit_opcode( masm, 0x3B );
+    emit_rm(masm, 0x3, $src1$$reg, $src2$$reg );
     // MOV    $tmp,$src1.hi
-    emit_opcode( cbuf, 0x8B );
-    emit_rm(cbuf, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src1$$reg) );
+    emit_opcode( masm, 0x8B );
+    emit_rm(masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src1$$reg) );
     // SBB   $tmp,$src2.hi\t! Compute flags for long compare
-    emit_opcode( cbuf, 0x1B );
-    emit_rm(cbuf, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src2$$reg) );
+    emit_opcode( masm, 0x1B );
+    emit_rm(masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src2$$reg) );
   %}
 
   enc_class long_cmp_flags3( eRegL src, rRegI tmp ) %{
     // XOR    $tmp,$tmp
-    emit_opcode(cbuf,0x33);  // XOR
-    emit_rm(cbuf,0x3, $tmp$$reg, $tmp$$reg);
+    emit_opcode(masm,0x33);  // XOR
+    emit_rm(masm,0x3, $tmp$$reg, $tmp$$reg);
     // CMP    $tmp,$src.lo
-    emit_opcode( cbuf, 0x3B );
-    emit_rm(cbuf, 0x3, $tmp$$reg, $src$$reg );
+    emit_opcode( masm, 0x3B );
+    emit_rm(masm, 0x3, $tmp$$reg, $src$$reg );
     // SBB    $tmp,$src.hi
-    emit_opcode( cbuf, 0x1B );
-    emit_rm(cbuf, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src$$reg) );
+    emit_opcode( masm, 0x1B );
+    emit_rm(masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src$$reg) );
   %}
 
  // Sniff, sniff... smells like Gnu Superoptimizer
   enc_class neg_long( eRegL dst ) %{
-    emit_opcode(cbuf,0xF7);    // NEG hi
-    emit_rm    (cbuf,0x3, 0x3, HIGH_FROM_LOW_ENC($dst$$reg));
-    emit_opcode(cbuf,0xF7);    // NEG lo
-    emit_rm    (cbuf,0x3, 0x3,               $dst$$reg );
-    emit_opcode(cbuf,0x83);    // SBB hi,0
-    emit_rm    (cbuf,0x3, 0x3, HIGH_FROM_LOW_ENC($dst$$reg));
-    emit_d8    (cbuf,0 );
+    emit_opcode(masm,0xF7);    // NEG hi
+    emit_rm    (masm,0x3, 0x3, HIGH_FROM_LOW_ENC($dst$$reg));
+    emit_opcode(masm,0xF7);    // NEG lo
+    emit_rm    (masm,0x3, 0x3,               $dst$$reg );
+    emit_opcode(masm,0x83);    // SBB hi,0
+    emit_rm    (masm,0x3, 0x3, HIGH_FROM_LOW_ENC($dst$$reg));
+    emit_d8    (masm,0 );
   %}
 
   enc_class enc_pop_rdx() %{
-    emit_opcode(cbuf,0x5A);
+    emit_opcode(masm,0x5A);
   %}
 
   enc_class enc_rethrow() %{
-    MacroAssembler _masm(&cbuf);
-    cbuf.set_insts_mark();
-    emit_opcode(cbuf, 0xE9);        // jmp    entry
-    emit_d32_reloc(cbuf, (int)OptoRuntime::rethrow_stub() - ((int)cbuf.insts_end())-4,
+    __ set_inst_mark();
+    emit_opcode(masm, 0xE9);        // jmp    entry
+    emit_d32_reloc(masm, (int)OptoRuntime::rethrow_stub() - ((int)__ pc())-4,
                    runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ clear_inst_mark();
     __ post_call_nop();
   %}
 
@@ -2912,83 +2871,83 @@ encode %{
     // invalid-op exceptions hanging.  We would have to clear them before
     // enabling them and that is more expensive than just testing for the
     // invalid value Intel stores down in the corner cases.
-    emit_opcode(cbuf,0xD9);            // FLDCW  trunc
-    emit_opcode(cbuf,0x2D);
-    emit_d32(cbuf,(int)StubRoutines::x86::addr_fpu_cntrl_wrd_trunc());
+    emit_opcode(masm,0xD9);            // FLDCW  trunc
+    emit_opcode(masm,0x2D);
+    emit_d32(masm,(int)StubRoutines::x86::addr_fpu_cntrl_wrd_trunc());
     // Allocate a word
-    emit_opcode(cbuf,0x83);            // SUB ESP,4
-    emit_opcode(cbuf,0xEC);
-    emit_d8(cbuf,0x04);
+    emit_opcode(masm,0x83);            // SUB ESP,4
+    emit_opcode(masm,0xEC);
+    emit_d8(masm,0x04);
     // Encoding assumes a double has been pushed into FPR0.
     // Store down the double as an int, popping the FPU stack
-    emit_opcode(cbuf,0xDB);            // FISTP [ESP]
-    emit_opcode(cbuf,0x1C);
-    emit_d8(cbuf,0x24);
+    emit_opcode(masm,0xDB);            // FISTP [ESP]
+    emit_opcode(masm,0x1C);
+    emit_d8(masm,0x24);
     // Restore the rounding mode; mask the exception
-    emit_opcode(cbuf,0xD9);            // FLDCW   std/24-bit mode
-    emit_opcode(cbuf,0x2D);
-    emit_d32( cbuf, Compile::current()->in_24_bit_fp_mode()
+    emit_opcode(masm,0xD9);            // FLDCW   std/24-bit mode
+    emit_opcode(masm,0x2D);
+    emit_d32( masm, Compile::current()->in_24_bit_fp_mode()
         ? (int)StubRoutines::x86::addr_fpu_cntrl_wrd_24()
         : (int)StubRoutines::x86::addr_fpu_cntrl_wrd_std());
 
     // Load the converted int; adjust CPU stack
-    emit_opcode(cbuf,0x58);       // POP EAX
-    emit_opcode(cbuf,0x3D);       // CMP EAX,imm
-    emit_d32   (cbuf,0x80000000); //         0x80000000
-    emit_opcode(cbuf,0x75);       // JNE around_slow_call
-    emit_d8    (cbuf,0x07);       // Size of slow_call
+    emit_opcode(masm,0x58);       // POP EAX
+    emit_opcode(masm,0x3D);       // CMP EAX,imm
+    emit_d32   (masm,0x80000000); //         0x80000000
+    emit_opcode(masm,0x75);       // JNE around_slow_call
+    emit_d8    (masm,0x07);       // Size of slow_call
     // Push src onto stack slow-path
-    emit_opcode(cbuf,0xD9 );      // FLD     ST(i)
-    emit_d8    (cbuf,0xC0-1+$src$$reg );
+    emit_opcode(masm,0xD9 );      // FLD     ST(i)
+    emit_d8    (masm,0xC0-1+$src$$reg );
     // CALL directly to the runtime
-    MacroAssembler _masm(&cbuf);
-    cbuf.set_insts_mark();
-    emit_opcode(cbuf,0xE8);       // Call into runtime
-    emit_d32_reloc(cbuf, (StubRoutines::x86::d2i_wrapper() - cbuf.insts_end()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ set_inst_mark();
+    emit_opcode(masm,0xE8);       // Call into runtime
+    emit_d32_reloc(masm, (StubRoutines::x86::d2i_wrapper() - __ pc()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ clear_inst_mark();
     __ post_call_nop();
     // Carry on here...
   %}
 
   enc_class DPR2L_encoding( regDPR src ) %{
-    emit_opcode(cbuf,0xD9);            // FLDCW  trunc
-    emit_opcode(cbuf,0x2D);
-    emit_d32(cbuf,(int)StubRoutines::x86::addr_fpu_cntrl_wrd_trunc());
+    emit_opcode(masm,0xD9);            // FLDCW  trunc
+    emit_opcode(masm,0x2D);
+    emit_d32(masm,(int)StubRoutines::x86::addr_fpu_cntrl_wrd_trunc());
     // Allocate a word
-    emit_opcode(cbuf,0x83);            // SUB ESP,8
-    emit_opcode(cbuf,0xEC);
-    emit_d8(cbuf,0x08);
+    emit_opcode(masm,0x83);            // SUB ESP,8
+    emit_opcode(masm,0xEC);
+    emit_d8(masm,0x08);
     // Encoding assumes a double has been pushed into FPR0.
     // Store down the double as a long, popping the FPU stack
-    emit_opcode(cbuf,0xDF);            // FISTP [ESP]
-    emit_opcode(cbuf,0x3C);
-    emit_d8(cbuf,0x24);
+    emit_opcode(masm,0xDF);            // FISTP [ESP]
+    emit_opcode(masm,0x3C);
+    emit_d8(masm,0x24);
     // Restore the rounding mode; mask the exception
-    emit_opcode(cbuf,0xD9);            // FLDCW   std/24-bit mode
-    emit_opcode(cbuf,0x2D);
-    emit_d32( cbuf, Compile::current()->in_24_bit_fp_mode()
+    emit_opcode(masm,0xD9);            // FLDCW   std/24-bit mode
+    emit_opcode(masm,0x2D);
+    emit_d32( masm, Compile::current()->in_24_bit_fp_mode()
         ? (int)StubRoutines::x86::addr_fpu_cntrl_wrd_24()
         : (int)StubRoutines::x86::addr_fpu_cntrl_wrd_std());
 
     // Load the converted int; adjust CPU stack
-    emit_opcode(cbuf,0x58);       // POP EAX
-    emit_opcode(cbuf,0x5A);       // POP EDX
-    emit_opcode(cbuf,0x81);       // CMP EDX,imm
-    emit_d8    (cbuf,0xFA);       // rdx
-    emit_d32   (cbuf,0x80000000); //         0x80000000
-    emit_opcode(cbuf,0x75);       // JNE around_slow_call
-    emit_d8    (cbuf,0x07+4);     // Size of slow_call
-    emit_opcode(cbuf,0x85);       // TEST EAX,EAX
-    emit_opcode(cbuf,0xC0);       // 2/rax,/rax,
-    emit_opcode(cbuf,0x75);       // JNE around_slow_call
-    emit_d8    (cbuf,0x07);       // Size of slow_call
+    emit_opcode(masm,0x58);       // POP EAX
+    emit_opcode(masm,0x5A);       // POP EDX
+    emit_opcode(masm,0x81);       // CMP EDX,imm
+    emit_d8    (masm,0xFA);       // rdx
+    emit_d32   (masm,0x80000000); //         0x80000000
+    emit_opcode(masm,0x75);       // JNE around_slow_call
+    emit_d8    (masm,0x07+4);     // Size of slow_call
+    emit_opcode(masm,0x85);       // TEST EAX,EAX
+    emit_opcode(masm,0xC0);       // 2/rax,/rax,
+    emit_opcode(masm,0x75);       // JNE around_slow_call
+    emit_d8    (masm,0x07);       // Size of slow_call
     // Push src onto stack slow-path
-    emit_opcode(cbuf,0xD9 );      // FLD     ST(i)
-    emit_d8    (cbuf,0xC0-1+$src$$reg );
+    emit_opcode(masm,0xD9 );      // FLD     ST(i)
+    emit_d8    (masm,0xC0-1+$src$$reg );
     // CALL directly to the runtime
-    MacroAssembler _masm(&cbuf);
-    cbuf.set_insts_mark();
-    emit_opcode(cbuf,0xE8);       // Call into runtime
-    emit_d32_reloc(cbuf, (StubRoutines::x86::d2l_wrapper() - cbuf.insts_end()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ set_inst_mark();
+    emit_opcode(masm,0xE8);       // Call into runtime
+    emit_d32_reloc(masm, (StubRoutines::x86::d2l_wrapper() - __ pc()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
+    __ clear_inst_mark();
     __ post_call_nop();
     // Carry on here...
   %}
@@ -2996,68 +2955,68 @@ encode %{
   enc_class FMul_ST_reg( eRegFPR src1 ) %{
     // Operand was loaded from memory into fp ST (stack top)
     // FMUL   ST,$src  /* D8 C8+i */
-    emit_opcode(cbuf, 0xD8);
-    emit_opcode(cbuf, 0xC8 + $src1$$reg);
+    emit_opcode(masm, 0xD8);
+    emit_opcode(masm, 0xC8 + $src1$$reg);
   %}
 
   enc_class FAdd_ST_reg( eRegFPR src2 ) %{
     // FADDP  ST,src2  /* D8 C0+i */
-    emit_opcode(cbuf, 0xD8);
-    emit_opcode(cbuf, 0xC0 + $src2$$reg);
+    emit_opcode(masm, 0xD8);
+    emit_opcode(masm, 0xC0 + $src2$$reg);
     //could use FADDP  src2,fpST  /* DE C0+i */
   %}
 
   enc_class FAddP_reg_ST( eRegFPR src2 ) %{
     // FADDP  src2,ST  /* DE C0+i */
-    emit_opcode(cbuf, 0xDE);
-    emit_opcode(cbuf, 0xC0 + $src2$$reg);
+    emit_opcode(masm, 0xDE);
+    emit_opcode(masm, 0xC0 + $src2$$reg);
   %}
 
   enc_class subFPR_divFPR_encode( eRegFPR src1, eRegFPR src2) %{
     // Operand has been loaded into fp ST (stack top)
       // FSUB   ST,$src1
-      emit_opcode(cbuf, 0xD8);
-      emit_opcode(cbuf, 0xE0 + $src1$$reg);
+      emit_opcode(masm, 0xD8);
+      emit_opcode(masm, 0xE0 + $src1$$reg);
 
       // FDIV
-      emit_opcode(cbuf, 0xD8);
-      emit_opcode(cbuf, 0xF0 + $src2$$reg);
+      emit_opcode(masm, 0xD8);
+      emit_opcode(masm, 0xF0 + $src2$$reg);
   %}
 
   enc_class MulFAddF (eRegFPR src1, eRegFPR src2) %{
     // Operand was loaded from memory into fp ST (stack top)
     // FADD   ST,$src  /* D8 C0+i */
-    emit_opcode(cbuf, 0xD8);
-    emit_opcode(cbuf, 0xC0 + $src1$$reg);
+    emit_opcode(masm, 0xD8);
+    emit_opcode(masm, 0xC0 + $src1$$reg);
 
     // FMUL  ST,src2  /* D8 C*+i */
-    emit_opcode(cbuf, 0xD8);
-    emit_opcode(cbuf, 0xC8 + $src2$$reg);
+    emit_opcode(masm, 0xD8);
+    emit_opcode(masm, 0xC8 + $src2$$reg);
   %}
 
 
   enc_class MulFAddFreverse (eRegFPR src1, eRegFPR src2) %{
     // Operand was loaded from memory into fp ST (stack top)
     // FADD   ST,$src  /* D8 C0+i */
-    emit_opcode(cbuf, 0xD8);
-    emit_opcode(cbuf, 0xC0 + $src1$$reg);
+    emit_opcode(masm, 0xD8);
+    emit_opcode(masm, 0xC0 + $src1$$reg);
 
     // FMULP  src2,ST  /* DE C8+i */
-    emit_opcode(cbuf, 0xDE);
-    emit_opcode(cbuf, 0xC8 + $src2$$reg);
+    emit_opcode(masm, 0xDE);
+    emit_opcode(masm, 0xC8 + $src2$$reg);
   %}
 
   // Atomically load the volatile long
   enc_class enc_loadL_volatile( memory mem, stackSlotL dst ) %{
-    emit_opcode(cbuf,0xDF);
+    emit_opcode(masm,0xDF);
     int rm_byte_opcode = 0x05;
     int base     = $mem$$base;
     int index    = $mem$$index;
     int scale    = $mem$$scale;
     int displace = $mem$$disp;
     relocInfo::relocType disp_reloc = $mem->disp_reloc(); // disp-as-oop when working with static globals
-    encode_RegMem(cbuf, rm_byte_opcode, base, index, scale, displace, disp_reloc);
-    store_to_stackslot( cbuf, 0x0DF, 0x07, $dst$$disp );
+    encode_RegMem(masm, rm_byte_opcode, base, index, scale, displace, disp_reloc);
+    store_to_stackslot( masm, 0x0DF, 0x07, $dst$$disp );
   %}
 
   // Volatile Store Long.  Must be atomic, so move it into
@@ -3065,16 +3024,17 @@ encode %{
   // target address before the store (for null-ptr checks)
   // so the memory operand is used twice in the encoding.
   enc_class enc_storeL_volatile( memory mem, stackSlotL src ) %{
-    store_to_stackslot( cbuf, 0x0DF, 0x05, $src$$disp );
-    cbuf.set_insts_mark();            // Mark start of FIST in case $mem has an oop
-    emit_opcode(cbuf,0xDF);
+    store_to_stackslot( masm, 0x0DF, 0x05, $src$$disp );
+    __ set_inst_mark();            // Mark start of FIST in case $mem has an oop
+    emit_opcode(masm,0xDF);
     int rm_byte_opcode = 0x07;
     int base     = $mem$$base;
     int index    = $mem$$index;
     int scale    = $mem$$scale;
     int displace = $mem$$disp;
     relocInfo::relocType disp_reloc = $mem->disp_reloc(); // disp-as-oop when working with static globals
-    encode_RegMem(cbuf, rm_byte_opcode, base, index, scale, displace, disp_reloc);
+    encode_RegMem(masm, rm_byte_opcode, base, index, scale, displace, disp_reloc);
+    __ clear_inst_mark();
   %}
 
 %}
@@ -5754,7 +5714,7 @@ instruct loadRange(rRegI dst, memory mem) %{
   ins_cost(125);
   format %{ "MOV    $dst,$mem" %}
   opcode(0x8B);
-  ins_encode( OpcP, RegMem(dst,mem));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -5766,7 +5726,7 @@ instruct loadP(eRegP dst, memory mem) %{
   ins_cost(125);
   format %{ "MOV    $dst,$mem" %}
   opcode(0x8B);
-  ins_encode( OpcP, RegMem(dst,mem));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -5777,7 +5737,7 @@ instruct loadKlass(eRegP dst, memory mem) %{
   ins_cost(125);
   format %{ "MOV    $dst,$mem" %}
   opcode(0x8B);
-  ins_encode( OpcP, RegMem(dst,mem));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -5790,8 +5750,8 @@ instruct loadDPR(regDPR dst, memory mem) %{
   format %{ "FLD_D  ST,$mem\n\t"
             "FSTP   $dst" %}
   opcode(0xDD);               /* DD /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),
-              Pop_Reg_DPR(dst) );
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
+              Pop_Reg_DPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -5840,8 +5800,8 @@ instruct loadFPR(regFPR dst, memory mem) %{
   format %{ "FLD_S  ST,$mem\n\t"
             "FSTP   $dst" %}
   opcode(0xD9);               /* D9 /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),
-              Pop_Reg_FPR(dst) );
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
+              Pop_Reg_FPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -5852,7 +5812,7 @@ instruct leaP8(eRegP dst, indOffset8 mem) %{
   ins_cost(110);
   format %{ "LEA    $dst,$mem" %}
   opcode(0x8D);
-  ins_encode( OpcP, RegMem(dst,mem));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
   ins_pipe( ialu_reg_reg_fat );
 %}
 
@@ -5862,7 +5822,7 @@ instruct leaP32(eRegP dst, indOffset32 mem) %{
   ins_cost(110);
   format %{ "LEA    $dst,$mem" %}
   opcode(0x8D);
-  ins_encode( OpcP, RegMem(dst,mem));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
   ins_pipe( ialu_reg_reg_fat );
 %}
 
@@ -5872,7 +5832,7 @@ instruct leaPIdxOff(eRegP dst, indIndexOffset mem) %{
   ins_cost(110);
   format %{ "LEA    $dst,$mem" %}
   opcode(0x8D);
-  ins_encode( OpcP, RegMem(dst,mem));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
   ins_pipe( ialu_reg_reg_fat );
 %}
 
@@ -5882,7 +5842,7 @@ instruct leaPIdxScale(eRegP dst, indIndexScale mem) %{
   ins_cost(110);
   format %{ "LEA    $dst,$mem" %}
   opcode(0x8D);
-  ins_encode( OpcP, RegMem(dst,mem));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
   ins_pipe( ialu_reg_reg_fat );
 %}
 
@@ -5892,7 +5852,7 @@ instruct leaPIdxScaleOff(eRegP dst, indIndexScaleOffset mem) %{
   ins_cost(110);
   format %{ "LEA    $dst,$mem" %}
   opcode(0x8D);
-  ins_encode( OpcP, RegMem(dst,mem));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
   ins_pipe( ialu_reg_reg_fat );
 %}
 
@@ -5901,7 +5861,7 @@ instruct loadConI(rRegI dst, immI src) %{
   match(Set dst src);
 
   format %{ "MOV    $dst,$src" %}
-  ins_encode( LdImmI(dst, src) );
+  ins_encode( SetInstMark, LdImmI(dst, src), ClearInstMark );
   ins_pipe( ialu_reg_fat );
 %}
 
@@ -5922,7 +5882,7 @@ instruct loadConP(eRegP dst, immP src) %{
 
   format %{ "MOV    $dst,$src" %}
   opcode(0xB8);  /* + rd */
-  ins_encode( LdImmP(dst, src) );
+  ins_encode( SetInstMark, LdImmP(dst, src), ClearInstMark );
   ins_pipe( ialu_reg_fat );
 %}
 
@@ -6080,7 +6040,7 @@ instruct loadSSI(rRegI dst, stackSlotI src) %{
 
   format %{ "MOV    $dst,$src" %}
   opcode(0x8B);
-  ins_encode( OpcP, RegMem(dst,src));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,src), ClearInstMark);
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -6091,7 +6051,7 @@ instruct loadSSL(eRegL dst, stackSlotL src) %{
   format %{ "MOV    $dst,$src.lo\n\t"
             "MOV    $dst+4,$src.hi" %}
   opcode(0x8B, 0x8B);
-  ins_encode( OpcP, RegMem( dst, src ), OpcS, RegMem_Hi( dst, src ) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, src ), OpcS, RegMem_Hi( dst, src ), ClearInstMark );
   ins_pipe( ialu_mem_long_reg );
 %}
 
@@ -6102,7 +6062,7 @@ instruct loadSSP(eRegP dst, stackSlotP src) %{
 
   format %{ "MOV    $dst,$src" %}
   opcode(0x8B);
-  ins_encode( OpcP, RegMem(dst,src));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,src), ClearInstMark);
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -6114,8 +6074,8 @@ instruct loadSSF(regFPR dst, stackSlotF src) %{
   format %{ "FLD_S  $src\n\t"
             "FSTP   $dst" %}
   opcode(0xD9);               /* D9 /0, FLD m32real */
-  ins_encode( OpcP, RMopc_Mem_no_oop(0x00,src),
-              Pop_Reg_FPR(dst) );
+  ins_encode( SetInstMark, OpcP, RMopc_Mem_no_oop(0x00,src),
+              Pop_Reg_FPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -6127,8 +6087,8 @@ instruct loadSSD(regDPR dst, stackSlotD src) %{
   format %{ "FLD_D  $src\n\t"
             "FSTP   $dst" %}
   opcode(0xDD);               /* DD /0, FLD m64real */
-  ins_encode( OpcP, RMopc_Mem_no_oop(0x00,src),
-              Pop_Reg_DPR(dst) );
+  ins_encode( SetInstMark, OpcP, RMopc_Mem_no_oop(0x00,src),
+              Pop_Reg_DPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -6202,7 +6162,7 @@ instruct storeB(memory mem, xRegI src) %{
   ins_cost(125);
   format %{ "MOV8   $mem,$src" %}
   opcode(0x88);
-  ins_encode( OpcP, RegMem( src, mem ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), ClearInstMark );
   ins_pipe( ialu_mem_reg );
 %}
 
@@ -6213,7 +6173,7 @@ instruct storeC(memory mem, rRegI src) %{
   ins_cost(125);
   format %{ "MOV16  $mem,$src" %}
   opcode(0x89, 0x66);
-  ins_encode( OpcS, OpcP, RegMem( src, mem ) );
+  ins_encode( SetInstMark, OpcS, OpcP, RegMem( src, mem ), ClearInstMark );
   ins_pipe( ialu_mem_reg );
 %}
 
@@ -6224,7 +6184,7 @@ instruct storeI(memory mem, rRegI src) %{
   ins_cost(125);
   format %{ "MOV    $mem,$src" %}
   opcode(0x89);
-  ins_encode( OpcP, RegMem( src, mem ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), ClearInstMark );
   ins_pipe( ialu_mem_reg );
 %}
 
@@ -6237,7 +6197,7 @@ instruct storeL(long_memory mem, eRegL src) %{
   format %{ "MOV    $mem,$src.lo\n\t"
             "MOV    $mem+4,$src.hi" %}
   opcode(0x89, 0x89);
-  ins_encode( OpcP, RegMem( src, mem ), OpcS, RegMem_Hi( src, mem ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), OpcS, RegMem_Hi( src, mem ), ClearInstMark );
   ins_pipe( ialu_mem_long_reg );
 %}
 
@@ -6265,7 +6225,7 @@ instruct storeL_volatile(memory mem, stackSlotL src, eFlagsReg cr ) %{
             "FILD   $src\n\t"
             "FISTp  $mem\t # 64-bit atomic volatile long store" %}
   opcode(0x3B);
-  ins_encode( OpcP, RegMem( EAX, mem ), enc_storeL_volatile(mem,src));
+  ins_encode( SetInstMark, OpcP, RegMem( EAX, mem ), enc_storeL_volatile(mem,src), ClearInstMark);
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -6312,7 +6272,7 @@ instruct storeP(memory mem, anyRegP src) %{
   ins_cost(125);
   format %{ "MOV    $mem,$src" %}
   opcode(0x89);
-  ins_encode( OpcP, RegMem( src, mem ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), ClearInstMark );
   ins_pipe( ialu_mem_reg );
 %}
 
@@ -6323,7 +6283,7 @@ instruct storeImmI(memory mem, immI src) %{
   ins_cost(150);
   format %{ "MOV    $mem,$src" %}
   opcode(0xC7);               /* C7 /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),  Con32( src ));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem), Con32(src), ClearInstMark);
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -6335,7 +6295,7 @@ instruct storeImmI16(memory mem, immI16 src) %{
   ins_cost(150);
   format %{ "MOV16  $mem,$src" %}
   opcode(0xC7);     /* C7 /0 Same as 32 store immediate with prefix */
-  ins_encode( SizePrefix, OpcP, RMopc_Mem(0x00,mem),  Con16( src ));
+  ins_encode( SetInstMark, SizePrefix, OpcP, RMopc_Mem(0x00,mem), Con16(src), ClearInstMark);
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -6347,7 +6307,7 @@ instruct storeImmP(memory mem, immP src) %{
   ins_cost(150);
   format %{ "MOV    $mem,$src" %}
   opcode(0xC7);               /* C7 /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),  Con32( src ));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem), Con32( src ), ClearInstMark);
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -6358,7 +6318,7 @@ instruct storeImmB(memory mem, immI8 src) %{
   ins_cost(150);
   format %{ "MOV8   $mem,$src" %}
   opcode(0xC6);               /* C6 /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),  Con8or32( src ));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem), Con8or32(src), ClearInstMark);
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -6369,7 +6329,7 @@ instruct storeImmCM(memory mem, immI8 src) %{
   ins_cost(150);
   format %{ "MOV8   $mem,$src\t! CMS card-mark imm0" %}
   opcode(0xC6);               /* C6 /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),  Con8or32( src ));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem), Con8or32(src), ClearInstMark);
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -6468,7 +6428,7 @@ instruct storeFPR_imm( memory mem, immFPR src) %{
   ins_cost(50);
   format %{ "MOV    $mem,$src\t# store float" %}
   opcode(0xC7);               /* C7 /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),  Con32FPR_as_bits( src ));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),  Con32FPR_as_bits(src), ClearInstMark);
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -6480,7 +6440,7 @@ instruct storeF_imm( memory mem, immF src) %{
   ins_cost(50);
   format %{ "MOV    $mem,$src\t# store float" %}
   opcode(0xC7);               /* C7 /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),  Con32F_as_bits( src ));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),  Con32F_as_bits(src), ClearInstMark);
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -6514,7 +6474,7 @@ instruct storeSSL(stackSlotL dst, eRegL src) %{
   format %{ "MOV    $dst,$src.lo\n\t"
             "MOV    $dst+4,$src.hi" %}
   opcode(0x89, 0x89);
-  ins_encode( OpcP, RegMem( src, dst ), OpcS, RegMem_Hi( src, dst ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), OpcS, RegMem_Hi( src, dst ), ClearInstMark );
   ins_pipe( ialu_mem_long_reg );
 %}
 
@@ -6689,7 +6649,7 @@ instruct cmovI_mem(cmpOp cop, eFlagsReg cr, rRegI dst, memory src) %{
   ins_cost(250);
   format %{ "CMOV$cop $dst,$src" %}
   opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cop), RegMem( dst, src ) );
+  ins_encode( SetInstMark, enc_cmov(cop), RegMem( dst, src ), ClearInstMark );
   ins_pipe( pipe_cmov_mem );
 %}
 
@@ -6700,7 +6660,7 @@ instruct cmovI_memU(cmpOpU cop, eFlagsRegU cr, rRegI dst, memory src) %{
   ins_cost(250);
   format %{ "CMOV$cop $dst,$src" %}
   opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cop), RegMem( dst, src ) );
+  ins_encode( SetInstMark, enc_cmov(cop), RegMem( dst, src ), ClearInstMark );
   ins_pipe( pipe_cmov_mem );
 %}
 
@@ -6998,7 +6958,7 @@ instruct leaI_eReg_immI(rRegI dst, rRegI src0, immI src1) %{
 
   format %{ "LEA    $dst,[$src0 + $src1]" %}
   opcode(0x8D); /* 0x8D /r */
-  ins_encode( OpcP, RegLea( dst, src0, src1 ) );
+  ins_encode( SetInstMark, OpcP, RegLea( dst, src0, src1 ), ClearInstMark );
   ins_pipe( ialu_reg_reg );
 %}
 
@@ -7008,7 +6968,7 @@ instruct leaP_eReg_immI(eRegP dst, eRegP src0, immI src1) %{
 
   format %{ "LEA    $dst,[$src0 + $src1]\t# ptr" %}
   opcode(0x8D); /* 0x8D /r */
-  ins_encode( OpcP, RegLea( dst, src0, src1 ) );
+  ins_encode( SetInstMark, OpcP, RegLea( dst, src0, src1 ), ClearInstMark );
   ins_pipe( ialu_reg_reg );
 %}
 
@@ -7053,7 +7013,7 @@ instruct addI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "ADD    $dst,$src" %}
   opcode(0x03);
-  ins_encode( OpcP, RegMem( dst, src) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, src), ClearInstMark );
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -7064,7 +7024,7 @@ instruct addI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "ADD    $dst,$src" %}
   opcode(0x01);  /* Opcode 01 /r */
-  ins_encode( OpcP, RegMem( src, dst ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
   ins_pipe( ialu_mem_reg );
 %}
 
@@ -7076,7 +7036,7 @@ instruct addI_mem_imm(memory dst, immI src, eFlagsReg cr) %{
   ins_cost(125);
   format %{ "ADD    $dst,$src" %}
   opcode(0x81);               /* Opcode 81 /0 id */
-  ins_encode( OpcSE( src ), RMopc_Mem(0x00,dst), Con8or32( src ) );
+  ins_encode( SetInstMark, OpcSE( src ), RMopc_Mem(0x00,dst), Con8or32(src), ClearInstMark );
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -7087,7 +7047,7 @@ instruct incI_mem(memory dst, immI_1 src, eFlagsReg cr) %{
   ins_cost(125);
   format %{ "INC    $dst" %}
   opcode(0xFF);               /* Opcode FF /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,dst));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,dst), ClearInstMark);
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -7098,7 +7058,7 @@ instruct decI_mem(memory dst, immI_M1 src, eFlagsReg cr) %{
   ins_cost(125);
   format %{ "DEC    $dst" %}
   opcode(0xFF);               /* Opcode FF /1 */
-  ins_encode( OpcP, RMopc_Mem(0x01,dst));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x01,dst), ClearInstMark);
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -7420,7 +7380,7 @@ instruct subI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "SUB    $dst,$src" %}
   opcode(0x2B);
-  ins_encode( OpcP, RegMem( dst, src) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, src), ClearInstMark );
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -7431,7 +7391,7 @@ instruct subI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "SUB    $dst,$src" %}
   opcode(0x29);  /* Opcode 29 /r */
-  ins_encode( OpcP, RegMem( src, dst ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
   ins_pipe( ialu_mem_reg );
 %}
 
@@ -7537,7 +7497,7 @@ instruct mulI_mem_imm(rRegI dst, memory src, immI imm, eFlagsReg cr) %{
   ins_cost(300);
   format %{ "IMUL   $dst,$src,$imm" %}
   opcode(0x69);  /* 69 /r id */
-  ins_encode( OpcSE(imm), RegMem( dst, src ), Con8or32( imm ) );
+  ins_encode( SetInstMark, OpcSE(imm), RegMem( dst, src ), Con8or32( imm ), ClearInstMark );
   ins_pipe( ialu_reg_mem_alu0 );
 %}
 
@@ -7549,7 +7509,7 @@ instruct mulI(rRegI dst, memory src, eFlagsReg cr) %{
   ins_cost(350);
   format %{ "IMUL   $dst,$src" %}
   opcode(0xAF, 0x0F);
-  ins_encode( OpcS, OpcP, RegMem( dst, src) );
+  ins_encode( SetInstMark, OpcS, OpcP, RegMem( dst, src), ClearInstMark );
   ins_pipe( ialu_reg_mem_alu0 );
 %}
 
@@ -7954,7 +7914,7 @@ instruct sarI_mem_1(memory dst, immI_1 shift, eFlagsReg cr) %{
   effect(KILL cr);
   format %{ "SAR    $dst,$shift" %}
   opcode(0xD1, 0x7);  /* D1 /7 */
-  ins_encode( OpcP, RMopc_Mem(secondary,dst) );
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(secondary,dst), ClearInstMark );
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -7977,7 +7937,7 @@ instruct sarI_mem_imm(memory dst, immI8 shift, eFlagsReg cr) %{
 
   format %{ "SAR    $dst,$shift" %}
   opcode(0xC1, 0x7);  /* C1 /7 ib */
-  ins_encode( OpcP, RMopc_Mem(secondary, dst ), Con8or32( shift ) );
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(secondary, dst ), Con8or32(shift), ClearInstMark );
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -8093,7 +8053,7 @@ instruct andI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "AND    $dst,$src" %}
   opcode(0x23);
-  ins_encode( OpcP, RegMem( dst, src) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, src), ClearInstMark );
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -8105,7 +8065,7 @@ instruct andI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "AND    $dst,$src" %}
   opcode(0x21);  /* Opcode 21 /r */
-  ins_encode( OpcP, RegMem( src, dst ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
   ins_pipe( ialu_mem_reg );
 %}
 
@@ -8118,7 +8078,7 @@ instruct andI_mem_imm(memory dst, immI src, eFlagsReg cr) %{
   format %{ "AND    $dst,$src" %}
   opcode(0x81, 0x4);  /* Opcode 81 /4 id */
   // ins_encode( MemImm( dst, src) );
-  ins_encode( OpcSE( src ), RMopc_Mem(secondary, dst ), Con8or32( src ) );
+  ins_encode( SetInstMark, OpcSE( src ), RMopc_Mem(secondary, dst ), Con8or32(src), ClearInstMark );
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -8284,7 +8244,7 @@ instruct orI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "OR     $dst,$src" %}
   opcode(0x0B);
-  ins_encode( OpcP, RegMem( dst, src) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, src), ClearInstMark );
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -8296,7 +8256,7 @@ instruct orI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "OR     $dst,$src" %}
   opcode(0x09);  /* Opcode 09 /r */
-  ins_encode( OpcP, RegMem( src, dst ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
   ins_pipe( ialu_mem_reg );
 %}
 
@@ -8309,7 +8269,7 @@ instruct orI_mem_imm(memory dst, immI src, eFlagsReg cr) %{
   format %{ "OR     $dst,$src" %}
   opcode(0x81,0x1);  /* Opcode 81 /1 id */
   // ins_encode( MemImm( dst, src) );
-  ins_encode( OpcSE( src ), RMopc_Mem(secondary, dst ), Con8or32( src ) );
+  ins_encode( SetInstMark, OpcSE( src ), RMopc_Mem(secondary, dst ), Con8or32(src), ClearInstMark );
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -8491,7 +8451,7 @@ instruct xorI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "XOR    $dst,$src" %}
   opcode(0x33);
-  ins_encode( OpcP, RegMem(dst, src) );
+  ins_encode( SetInstMark, OpcP, RegMem(dst, src), ClearInstMark );
   ins_pipe( ialu_reg_mem );
 %}
 
@@ -8503,7 +8463,7 @@ instruct xorI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
   ins_cost(150);
   format %{ "XOR    $dst,$src" %}
   opcode(0x31);  /* Opcode 31 /r */
-  ins_encode( OpcP, RegMem( src, dst ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
   ins_pipe( ialu_mem_reg );
 %}
 
@@ -8515,7 +8475,7 @@ instruct xorI_mem_imm(memory dst, immI src, eFlagsReg cr) %{
   ins_cost(125);
   format %{ "XOR    $dst,$src" %}
   opcode(0x81,0x6);  /* Opcode 81 /6 id */
-  ins_encode( OpcSE( src ), RMopc_Mem(secondary, dst ), Con8or32( src ) );
+  ins_encode( SetInstMark, OpcSE( src ), RMopc_Mem(secondary, dst ), Con8or32(src), ClearInstMark );
   ins_pipe( ialu_mem_imm );
 %}
 
@@ -8801,7 +8761,7 @@ instruct addL_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
   format %{ "ADD    $dst.lo,$mem\n\t"
             "ADC    $dst.hi,$mem+4" %}
   opcode(0x03, 0x13);
-  ins_encode( OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
   ins_pipe( ialu_reg_long_mem );
 %}
 
@@ -8836,7 +8796,7 @@ instruct subL_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
   format %{ "SUB    $dst.lo,$mem\n\t"
             "SBB    $dst.hi,$mem+4" %}
   opcode(0x2B, 0x1B);
-  ins_encode( OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
   ins_pipe( ialu_reg_long_mem );
 %}
 
@@ -8879,7 +8839,7 @@ instruct andL_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
   format %{ "AND    $dst.lo,$mem\n\t"
             "AND    $dst.hi,$mem+4" %}
   opcode(0x23, 0x23);
-  ins_encode( OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
   ins_pipe( ialu_reg_long_mem );
 %}
 
@@ -9117,7 +9077,7 @@ instruct orl_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
   format %{ "OR     $dst.lo,$mem\n\t"
             "OR     $dst.hi,$mem+4" %}
   opcode(0x0B,0x0B);
-  ins_encode( OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
   ins_pipe( ialu_reg_long_mem );
 %}
 
@@ -9163,7 +9123,7 @@ instruct xorl_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
   format %{ "XOR    $dst.lo,$mem\n\t"
             "XOR    $dst.hi,$mem+4" %}
   opcode(0x33,0x33);
-  ins_encode( OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem) );
+  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
   ins_pipe( ialu_reg_long_mem );
 %}
 
@@ -9445,7 +9405,7 @@ instruct cmpD_cc(eFlagsRegU cr, regD src1, regD src2) %{
     "exit:" %}
   ins_encode %{
     __ ucomisd($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp_fixup(_masm);
+    emit_cmpfp_fixup(masm);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -9474,7 +9434,7 @@ instruct cmpD_ccmem(eFlagsRegU cr, regD src1, memory src2) %{
     "exit:" %}
   ins_encode %{
     __ ucomisd($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp_fixup(_masm);
+    emit_cmpfp_fixup(masm);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -9505,7 +9465,7 @@ instruct cmpD_reg(xRegI dst, regD src1, regD src2, eFlagsReg cr) %{
     "done:" %}
   ins_encode %{
     __ ucomisd($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -9525,7 +9485,7 @@ instruct cmpD_regmem(xRegI dst, regD src1, memory src2, eFlagsReg cr) %{
     "done:" %}
   ins_encode %{
     __ ucomisd($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -9567,8 +9527,8 @@ instruct subDPR_reg_mem(regDPR dst, memory src) %{
   format %{ "FLD    $src\n\t"
             "DSUBp  $dst,ST" %}
   opcode(0xDE, 0x5, 0xDD); /* DE C0+i */  /* LoadD  DD /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src),
-              OpcP, RegOpc(dst) );
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src),
+              OpcP, RegOpc(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -9629,8 +9589,8 @@ instruct addDPR_reg_mem(regDPR dst, memory src) %{
   format %{ "FLD    $src\n\t"
             "DADDp  $dst,ST" %}
   opcode(0xDE, 0x0, 0xDD); /* DE C0+i */  /* LoadD  DD /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src),
-              OpcP, RegOpc(dst) );
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src),
+              OpcP, RegOpc(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -9644,10 +9604,11 @@ instruct addDPR_mem_reg(memory dst, regDPR src) %{
             "DADD   ST,$src\n\t"
             "FST_D  $dst" %}
   opcode(0xDD, 0x0);
-  ins_encode( Opcode(0xDD), RMopc_Mem(0x00,dst),
-              Opcode(0xD8), RegOpc(src),
-              set_instruction_start,
-              Opcode(0xDD), RMopc_Mem(0x03,dst) );
+  ins_encode( SetInstMark, Opcode(0xDD), RMopc_Mem(0x00,dst),
+              Opcode(0xD8), RegOpc(src), ClearInstMark,
+              SetInstMark,
+              Opcode(0xDD), RMopc_Mem(0x03,dst),
+              ClearInstMark);
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -9752,8 +9713,8 @@ instruct mulDPR_reg_mem(regDPR dst, memory src) %{
   format %{ "FLD_D  $src\n\t"
             "DMULp  $dst,ST" %}
   opcode(0xDE, 0x1, 0xDD); /* DE C8+i or DE /1*/  /* LoadD  DD /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src),
-              OpcP, RegOpc(dst) );
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src),
+              OpcP, RegOpc(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -9767,9 +9728,9 @@ instruct mulDPR_reg_mem_cisc(regDPR dst, regDPR src, memory mem) %{
             "DMUL   ST,$src\n\t"
             "FSTP_D $dst" %}
   opcode(0xD8, 0x1, 0xD9); /* D8 C8+i */  /* LoadD D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,mem),
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,mem),
               OpcReg_FPR(src),
-              Pop_Reg_DPR(dst) );
+              Pop_Reg_DPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_reg_mem );
 %}
 
@@ -10028,7 +9989,7 @@ instruct cmpF_cc(eFlagsRegU cr, regF src1, regF src2) %{
     "exit:" %}
   ins_encode %{
     __ ucomiss($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp_fixup(_masm);
+    emit_cmpfp_fixup(masm);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -10057,7 +10018,7 @@ instruct cmpF_ccmem(eFlagsRegU cr, regF src1, memory src2) %{
     "exit:" %}
   ins_encode %{
     __ ucomiss($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp_fixup(_masm);
+    emit_cmpfp_fixup(masm);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -10088,7 +10049,7 @@ instruct cmpF_reg(xRegI dst, regF src1, regF src2, eFlagsReg cr) %{
     "done:" %}
   ins_encode %{
     __ ucomiss($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -10108,7 +10069,7 @@ instruct cmpF_regmem(xRegI dst, regF src1, memory src2, eFlagsReg cr) %{
     "done:" %}
   ins_encode %{
     __ ucomiss($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -10194,9 +10155,9 @@ instruct addFPR24_reg_mem(stackSlotF dst, regFPR src1, memory src2) %{
             "FADD   ST,$src1\n\t"
             "FSTP_S $dst" %}
   opcode(0xD8, 0x0, 0xD9); /* D8 C0+i */  /* LoadF  D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src2),
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
               OpcReg_FPR(src1),
-              Pop_Mem_FPR(dst) );
+              Pop_Mem_FPR(dst), ClearInstMark );
   ins_pipe( fpu_mem_reg_mem );
 %}
 //
@@ -10208,8 +10169,8 @@ instruct addFPR_reg_mem(regFPR dst, memory src) %{
 
   format %{ "FADD   $dst,$src" %}
   opcode(0xDE, 0x0, 0xD9); /* DE C0+i or DE /0*/  /* LoadF  D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src),
-              OpcP, RegOpc(dst) );
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src),
+              OpcP, RegOpc(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -10221,9 +10182,9 @@ instruct addFPR24_mem_reg(stackSlotF dst, regFPR src2, memory src1 ) %{
 
   format %{ "FADD   $dst,$src1,$src2" %}
   opcode(0xD8, 0x0, 0xD9); /* D8 C0+i */  /* LoadF  D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src1),
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src1),
               OpcReg_FPR(src2),
-              Pop_Mem_FPR(dst) );
+              Pop_Mem_FPR(dst), ClearInstMark );
   ins_pipe( fpu_mem_reg_mem );
 %}
 
@@ -10235,10 +10196,10 @@ instruct addFPR24_mem_cisc(stackSlotF dst, memory src1, memory src2) %{
 
   format %{ "FADD   $dst,$src1,$src2 cisc" %}
   opcode(0xD8, 0x0, 0xD9); /* D8 C0+i */  /* LoadF  D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src2),
-              set_instruction_start,
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
               OpcP, RMopc_Mem(secondary,src1),
-              Pop_Mem_FPR(dst) );
+              Pop_Mem_FPR(dst),
+              ClearInstMark);
   ins_pipe( fpu_mem_mem_mem );
 %}
 
@@ -10249,10 +10210,10 @@ instruct addFPR24_mem_mem(stackSlotF dst, memory src1, memory src2) %{
 
   format %{ "FADD   $dst,$src1,$src2" %}
   opcode(0xD8, 0x0, 0xD9); /* D8 /0 */  /* LoadF  D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src2),
-              set_instruction_start,
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
               OpcP, RMopc_Mem(secondary,src1),
-              Pop_Mem_FPR(dst) );
+              Pop_Mem_FPR(dst),
+              ClearInstMark);
   ins_pipe( fpu_mem_mem_mem );
 %}
 
@@ -10328,9 +10289,9 @@ instruct mulFPR24_reg_mem(stackSlotF dst, regFPR src1, memory src2) %{
             "FMUL   $src1\n\t"
             "FSTP_S $dst"  %}
   opcode(0xD8, 0x1, 0xD9); /* D8 C8+i or DE /1*/  /* LoadF D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src2),
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
               OpcReg_FPR(src1),
-              Pop_Mem_FPR(dst) );
+              Pop_Mem_FPR(dst), ClearInstMark );
   ins_pipe( fpu_mem_reg_mem );
 %}
 //
@@ -10342,9 +10303,9 @@ instruct mulFPR_reg_mem(regFPR dst, regFPR src1, memory src2) %{
 
   format %{ "FMUL   $dst,$src1,$src2" %}
   opcode(0xD8, 0x1, 0xD9); /* D8 C8+i */  /* LoadF D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src2),
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
               OpcReg_FPR(src1),
-              Pop_Reg_FPR(dst) );
+              Pop_Reg_FPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_reg_mem );
 %}
 
@@ -10355,10 +10316,10 @@ instruct mulFPR24_mem_mem(stackSlotF dst, memory src1, memory src2) %{
 
   format %{ "FMUL   $dst,$src1,$src2" %}
   opcode(0xD8, 0x1, 0xD9); /* D8 /1 */  /* LoadF D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,src2),
-              set_instruction_start,
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
               OpcP, RMopc_Mem(secondary,src1),
-              Pop_Mem_FPR(dst) );
+              Pop_Mem_FPR(dst),
+              ClearInstMark );
   ins_pipe( fpu_mem_mem_mem );
 %}
 
@@ -10406,9 +10367,9 @@ instruct mulFPR_reg_load1(regFPR dst, regFPR src, memory mem1 ) %{
             "FMUL   ST,$src\n\t"
             "FSTP   $dst" %}
   opcode(0xD8, 0x1, 0xD9); /* D8 C8+i or D8 /1 */  /* LoadF D9 /0 */
-  ins_encode( Opcode(tertiary), RMopc_Mem(0x00,mem1),
+  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,mem1),
               OpcReg_FPR(src),
-              Pop_Reg_FPR(dst) );
+              Pop_Reg_FPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_reg_mem );
 %}
 //
@@ -10424,10 +10385,10 @@ instruct addFPR_mulFPR_reg_load1(regFPR dst, memory mem1, regFPR src1, regFPR sr
             "FADD   ST,$src2\n\t"
             "FSTP   $dst" %}
   opcode(0xD9); /* LoadF D9 /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem1),
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem1),
               FMul_ST_reg(src1),
               FAdd_ST_reg(src2),
-              Pop_Reg_FPR(dst) );
+              Pop_Reg_FPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem_reg_reg );
 %}
 
@@ -10966,8 +10927,8 @@ instruct convI2DPR_mem(regDPR dst, memory mem) %{
   format %{ "FILD   $mem\n\t"
             "FSTP   $dst" %}
   opcode(0xDB);      /* DB /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),
-              Pop_Reg_DPR(dst));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
+              Pop_Reg_DPR(dst), ClearInstMark);
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -11004,8 +10965,8 @@ instruct convI2FPR_SSF_mem(stackSlotF dst, memory mem) %{
   format %{ "FILD   $mem\n\t"
             "FSTP_S $dst" %}
   opcode(0xDB);  /* DB /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),
-              Pop_Mem_FPR(dst));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
+              Pop_Mem_FPR(dst), ClearInstMark);
   ins_pipe( fpu_mem_mem );
 %}
 
@@ -11028,8 +10989,8 @@ instruct convI2FPR_mem(regFPR dst, memory mem) %{
   format %{ "FILD   $mem\n\t"
             "FSTP   $dst" %}
   opcode(0xDB);      /* DB /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,mem),
-              Pop_Reg_FPR(dst));
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
+              Pop_Reg_FPR(dst), ClearInstMark);
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -11227,8 +11188,8 @@ instruct MoveI2FPR_stack_reg(regFPR dst, stackSlotI src) %{
   format %{ "FLD_S  $src\n\t"
             "FSTP   $dst\t# MoveI2F_stack_reg" %}
   opcode(0xD9);               /* D9 /0, FLD m32real */
-  ins_encode( OpcP, RMopc_Mem_no_oop(0x00,src),
-              Pop_Reg_FPR(dst) );
+  ins_encode( SetInstMark, OpcP, RMopc_Mem_no_oop(0x00,src),
+              Pop_Reg_FPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -11266,7 +11227,7 @@ instruct MoveD2L_stack_reg(eRegL dst, stackSlotD src) %{
   format %{ "MOV    $dst.lo,$src\n\t"
             "MOV    $dst.hi,$src+4\t# MoveD2L_stack_reg" %}
   opcode(0x8B, 0x8B);
-  ins_encode( OpcP, RegMem(dst,src), OpcS, RegMem_Hi(dst,src));
+  ins_encode( SetInstMark, OpcP, RegMem(dst,src), OpcS, RegMem_Hi(dst,src), ClearInstMark);
   ins_pipe( ialu_mem_long_reg );
 %}
 
@@ -11317,7 +11278,7 @@ instruct MoveL2D_reg_stack(stackSlotD dst, eRegL src) %{
   format %{ "MOV    $dst,$src.lo\n\t"
             "MOV    $dst+4,$src.hi\t# MoveL2D_reg_stack" %}
   opcode(0x89, 0x89);
-  ins_encode( OpcP, RegMem( src, dst ), OpcS, RegMem_Hi( src, dst ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), OpcS, RegMem_Hi( src, dst ), ClearInstMark );
   ins_pipe( ialu_mem_long_reg );
 %}
 
@@ -11331,8 +11292,8 @@ instruct MoveL2DPR_stack_reg(regDPR dst, stackSlotL src) %{
   format %{ "FLD_D  $src\n\t"
             "FSTP   $dst\t# MoveL2D_stack_reg" %}
   opcode(0xDD);               /* DD /0, FLD m64real */
-  ins_encode( OpcP, RMopc_Mem_no_oop(0x00,src),
-              Pop_Reg_DPR(dst) );
+  ins_encode( SetInstMark, OpcP, RMopc_Mem_no_oop(0x00,src),
+              Pop_Reg_DPR(dst), ClearInstMark );
   ins_pipe( fpu_reg_mem );
 %}
 
@@ -12245,7 +12206,7 @@ instruct compI_eReg_mem(eFlagsReg cr, rRegI op1, memory op2) %{
   format %{ "CMP    $op1,$op2" %}
   ins_cost(500);
   opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( OpcP, RegMem( op1, op2) );
+  ins_encode( SetInstMark, OpcP, RegMem( op1, op2), ClearInstMark );
   ins_pipe( ialu_cr_reg_mem );
 %}
 
@@ -12273,7 +12234,7 @@ instruct testI_reg_mem( eFlagsReg cr, rRegI src, memory mem, immI_0 zero ) %{
 
   format %{ "TEST   $src,$mem" %}
   opcode(0x85);
-  ins_encode( OpcP, RegMem( src, mem ) );
+  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), ClearInstMark );
   ins_pipe( ialu_cr_reg_mem );
 %}
 
@@ -12304,7 +12265,7 @@ instruct compU_eReg_mem(eFlagsRegU cr, rRegI op1, memory op2) %{
   format %{ "CMPu   $op1,$op2" %}
   ins_cost(500);
   opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( OpcP, RegMem( op1, op2) );
+  ins_encode( SetInstMark, OpcP, RegMem( op1, op2), ClearInstMark );
   ins_pipe( ialu_cr_reg_mem );
 %}
 
@@ -12342,7 +12303,7 @@ instruct compP_eReg_imm(eFlagsRegU cr, eRegP op1, immP op2) %{
 
   format %{ "CMPu   $op1,$op2" %}
   opcode(0x81,0x07);  /* Opcode 81 /7 */
-  ins_encode( OpcSErm( op1, op2 ), Con8or32( op2 ) );
+  ins_encode( SetInstMark, OpcSErm( op1, op2 ), Con8or32( op2 ), ClearInstMark );
   ins_pipe( ialu_cr_reg_imm );
 %}
 
@@ -12353,7 +12314,7 @@ instruct compP_eReg_mem(eFlagsRegU cr, eRegP op1, memory op2) %{
   format %{ "CMPu   $op1,$op2" %}
   ins_cost(500);
   opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( OpcP, RegMem( op1, op2) );
+  ins_encode( SetInstMark, OpcP, RegMem( op1, op2), ClearInstMark );
   ins_pipe( ialu_cr_reg_mem );
 %}
 
@@ -12376,7 +12337,7 @@ instruct compP_mem_eReg( eFlagsRegU cr, eRegP op1, memory op2 ) %{
 
   format %{ "CMPu   $op1,$op2" %}
   opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( OpcP, RegMem( op1, op2) );
+  ins_encode( SetInstMark, OpcP, RegMem( op1, op2), ClearInstMark );
   ins_pipe( ialu_cr_reg_mem );
 %}
 
@@ -12401,7 +12362,7 @@ instruct testP_Reg_mem( eFlagsReg cr, memory op, immI_0 zero ) %{
   format %{ "TEST   $op,0xFFFFFFFF" %}
   ins_cost(500);
   opcode(0xF7);               /* Opcode F7 /0 */
-  ins_encode( OpcP, RMopc_Mem(0x00,op), Con_d32(0xFFFFFFFF) );
+  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,op), Con_d32(0xFFFFFFFF), ClearInstMark );
   ins_pipe( ialu_cr_reg_imm );
 %}
 
@@ -12969,7 +12930,7 @@ instruct cmovLL_mem_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, eRegL dst, load_lo
   format %{ "CMOV$cmp $dst.lo,$src.lo\n\t"
             "CMOV$cmp $dst.hi,$src.hi" %}
   opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegMem(dst, src), enc_cmov(cmp), RegMem_Hi(dst, src) );
+  ins_encode( SetInstMark, enc_cmov(cmp), RegMem(dst, src), enc_cmov(cmp), RegMem_Hi(dst, src), ClearInstMark );
   ins_pipe( pipe_cmov_reg_long );
 %}
 
@@ -13008,7 +12969,7 @@ instruct cmovII_mem_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, rRegI dst, memory
   ins_cost(250);
   format %{ "CMOV$cmp $dst,$src" %}
   opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegMem( dst, src ) );
+  ins_encode( SetInstMark, enc_cmov(cmp), RegMem( dst, src ), ClearInstMark );
   ins_pipe( pipe_cmov_mem );
 %}
 
@@ -13178,7 +13139,7 @@ instruct cmovLL_mem_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, eRegL dst, load_lo
   format %{ "CMOV$cmp $dst.lo,$src.lo\n\t"
             "CMOV$cmp $dst.hi,$src.hi" %}
   opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegMem(dst, src), enc_cmov(cmp), RegMem_Hi(dst, src) );
+  ins_encode( SetInstMark, enc_cmov(cmp), RegMem(dst, src), enc_cmov(cmp), RegMem_Hi(dst, src), ClearInstMark );
   ins_pipe( pipe_cmov_reg_long );
 %}
 
@@ -13199,7 +13160,7 @@ instruct cmovII_mem_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, rRegI dst, memory
   ins_cost(250);
   format %{ "CMOV$cmp $dst,$src" %}
   opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegMem( dst, src ) );
+  ins_encode( SetInstMark, enc_cmov(cmp), RegMem( dst, src ), ClearInstMark );
   ins_pipe( pipe_cmov_mem );
 %}
 
@@ -13379,7 +13340,7 @@ instruct cmovLL_mem_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, eRegL dst,
   format %{ "CMOV$cmp $dst.lo,$src.lo\n\t"
             "CMOV$cmp $dst.hi,$src.hi+4" %}
   opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegMem(dst, src), enc_cmov(cmp), RegMem_Hi(dst, src) );
+  ins_encode( SetInstMark, enc_cmov(cmp), RegMem(dst, src), enc_cmov(cmp), RegMem_Hi(dst, src), ClearInstMark );
   ins_pipe( pipe_cmov_reg_long );
 %}
 
@@ -13418,7 +13379,7 @@ instruct cmovII_mem_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, rRegI dst,
   ins_cost(250);
   format %{ "CMOV$cmp $dst,$src" %}
   opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegMem( dst, src ) );
+  ins_encode( SetInstMark, enc_cmov(cmp), RegMem( dst, src ), ClearInstMark );
   ins_pipe( pipe_cmov_mem );
 %}
 
@@ -13765,7 +13726,9 @@ instruct safePoint_poll_tls(eFlagsReg cr, eRegP_no_EBP poll) %{
   // EBP would need size(3)
   size(2); /* setting an explicit size will cause debug builds to assert if size is incorrect */
   ins_encode %{
+    __ set_inst_mark();
     __ relocate(relocInfo::poll_type);
+    __ clear_inst_mark();
     address pre_pc = __ pc();
     __ testl(rax, Address($poll$$Register, 0));
     address post_pc = __ pc();
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 4e57f3e1bbe..2e0cf770c22 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -358,7 +358,7 @@ source %{
 #define   RELOC_IMM64    Assembler::imm_operand
 #define   RELOC_DISP32   Assembler::disp32_operand
 
-#define __ _masm.
+#define __ masm->
 
 RegMask _ANY_REG_mask;
 RegMask _PTR_REG_mask;
@@ -519,7 +519,7 @@ int CallDynamicJavaDirectNode::compute_padding(int current_offset) const
 }
 
 // This could be in MacroAssembler but it's fairly C2 specific
-static void emit_cmpfp_fixup(MacroAssembler& _masm) {
+static void emit_cmpfp_fixup(MacroAssembler* masm) {
   Label exit;
   __ jccb(Assembler::noParity, exit);
   __ pushf();
@@ -539,7 +539,7 @@ static void emit_cmpfp_fixup(MacroAssembler& _masm) {
   __ bind(exit);
 }
 
-static void emit_cmpfp3(MacroAssembler& _masm, Register dst) {
+static void emit_cmpfp3(MacroAssembler* masm, Register dst) {
   Label done;
   __ movl(dst, -1);
   __ jcc(Assembler::parity, done);
@@ -558,7 +558,7 @@ static void emit_cmpfp3(MacroAssembler& _masm, Register dst) {
 // je            #
 // |-jz -> a | b # a & b
 // |    -> a     #
-static void emit_fp_min_max(MacroAssembler& _masm, XMMRegister dst,
+static void emit_fp_min_max(MacroAssembler* masm, XMMRegister dst,
                             XMMRegister a, XMMRegister b,
                             XMMRegister xmmt, Register rt,
                             bool min, bool single) {
@@ -643,7 +643,7 @@ void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, Phase
   ShouldNotReachHere();
 }
 
-void MachConstantBaseNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
+void MachConstantBaseNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const {
   // Empty encoding
 }
 
@@ -719,9 +719,8 @@ void MachPrologNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
 }
 #endif
 
-void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   Compile* C = ra_->C;
-  C2_MacroAssembler _masm(&cbuf);
 
   int framesize = C->output()->frame_size_in_bytes();
   int bangsize = C->output()->bang_size_in_bytes();
@@ -743,7 +742,7 @@ void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
 
   __ verified_entry(framesize, C->output()->need_stack_bang(bangsize)?bangsize:0, false, C->stub_function() != nullptr);
 
-  C->output()->set_frame_complete(cbuf.insts_size());
+  C->output()->set_frame_complete(__ offset());
 
   if (C->has_mach_constant_base_node()) {
     // NOTE: We set the table base offset here because users might be
@@ -795,10 +794,9 @@ void MachEpilogNode::format(PhaseRegAlloc* ra_, outputStream* st) const
 }
 #endif
 
-void MachEpilogNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
+void MachEpilogNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const
 {
   Compile* C = ra_->C;
-  MacroAssembler _masm(&cbuf);
 
   if (generate_vzeroupper(C)) {
     // Clear upper bits of YMM registers when current compiled code uses
@@ -825,7 +823,6 @@ void MachEpilogNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
   }
 
   if (do_polling() && C->is_method_compilation()) {
-    MacroAssembler _masm(&cbuf);
     Label dummy_label;
     Label* code_stub = &dummy_label;
     if (!C->output()->in_scratch_emit_size()) {
@@ -881,16 +878,15 @@ static enum RC rc_class(OptoReg::Name reg)
 }
 
 // Next two methods are shared by 32- and 64-bit VM. They are defined in x86.ad.
-static void vec_mov_helper(CodeBuffer *cbuf, int src_lo, int dst_lo,
+static void vec_mov_helper(C2_MacroAssembler *masm, int src_lo, int dst_lo,
                           int src_hi, int dst_hi, uint ireg, outputStream* st);
 
-void vec_spill_helper(CodeBuffer *cbuf, bool is_load,
+void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
                      int stack_offset, int reg, uint ireg, outputStream* st);
 
-static void vec_stack_to_stack_helper(CodeBuffer *cbuf, int src_offset,
+static void vec_stack_to_stack_helper(C2_MacroAssembler *masm, int src_offset,
                                       int dst_offset, uint ireg, outputStream* st) {
-  if (cbuf) {
-    MacroAssembler _masm(cbuf);
+  if (masm) {
     switch (ireg) {
     case Op_VecS:
       __ movq(Address(rsp, -8), rax);
@@ -966,11 +962,11 @@ static void vec_stack_to_stack_helper(CodeBuffer *cbuf, int src_offset,
   }
 }
 
-uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
+uint MachSpillCopyNode::implementation(C2_MacroAssembler* masm,
                                        PhaseRegAlloc* ra_,
                                        bool do_size,
                                        outputStream* st) const {
-  assert(cbuf != nullptr || st  != nullptr, "sanity");
+  assert(masm != nullptr || st  != nullptr, "sanity");
   // Get registers to move
   OptoReg::Name src_second = ra_->get_reg_second(in(1));
   OptoReg::Name src_first = ra_->get_reg_first(in(1));
@@ -997,15 +993,15 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
       // mem -> mem
       int src_offset = ra_->reg2offset(src_first);
       int dst_offset = ra_->reg2offset(dst_first);
-      vec_stack_to_stack_helper(cbuf, src_offset, dst_offset, ireg, st);
+      vec_stack_to_stack_helper(masm, src_offset, dst_offset, ireg, st);
     } else if (src_first_rc == rc_float && dst_first_rc == rc_float ) {
-      vec_mov_helper(cbuf, src_first, dst_first, src_second, dst_second, ireg, st);
+      vec_mov_helper(masm, src_first, dst_first, src_second, dst_second, ireg, st);
     } else if (src_first_rc == rc_float && dst_first_rc == rc_stack ) {
       int stack_offset = ra_->reg2offset(dst_first);
-      vec_spill_helper(cbuf, false, stack_offset, src_first, ireg, st);
+      vec_spill_helper(masm, false, stack_offset, src_first, ireg, st);
     } else if (src_first_rc == rc_stack && dst_first_rc == rc_float ) {
       int stack_offset = ra_->reg2offset(src_first);
-      vec_spill_helper(cbuf, true,  stack_offset, dst_first, ireg, st);
+      vec_spill_helper(masm, true,  stack_offset, dst_first, ireg, st);
     } else {
       ShouldNotReachHere();
     }
@@ -1021,8 +1017,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         // 64-bit
         int src_offset = ra_->reg2offset(src_first);
         int dst_offset = ra_->reg2offset(dst_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ pushq(Address(rsp, src_offset));
           __ popq (Address(rsp, dst_offset));
 #ifndef PRODUCT
@@ -1039,8 +1034,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         // No pushl/popl, so:
         int src_offset = ra_->reg2offset(src_first);
         int dst_offset = ra_->reg2offset(dst_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movq(Address(rsp, -8), rax);
           __ movl(rax, Address(rsp, src_offset));
           __ movl(Address(rsp, dst_offset), rax);
@@ -1062,8 +1056,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
         int offset = ra_->reg2offset(src_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movq(as_Register(Matcher::_regEncode[dst_first]), Address(rsp, offset));
 #ifndef PRODUCT
         } else {
@@ -1077,8 +1070,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         assert(!((src_first & 1) == 0 && src_first + 1 == src_second), "no transform");
         assert(!((dst_first & 1) == 0 && dst_first + 1 == dst_second), "no transform");
         int offset = ra_->reg2offset(src_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movl(as_Register(Matcher::_regEncode[dst_first]), Address(rsp, offset));
 #ifndef PRODUCT
         } else {
@@ -1095,8 +1087,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
         int offset = ra_->reg2offset(src_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movdbl( as_XMMRegister(Matcher::_regEncode[dst_first]), Address(rsp, offset));
 #ifndef PRODUCT
         } else {
@@ -1111,8 +1102,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         assert(!((src_first & 1) == 0 && src_first + 1 == src_second), "no transform");
         assert(!((dst_first & 1) == 0 && dst_first + 1 == dst_second), "no transform");
         int offset = ra_->reg2offset(src_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movflt( as_XMMRegister(Matcher::_regEncode[dst_first]), Address(rsp, offset));
 #ifndef PRODUCT
         } else {
@@ -1129,8 +1119,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
         int offset = ra_->reg2offset(src_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ kmov(as_KRegister(Matcher::_regEncode[dst_first]), Address(rsp, offset));
 #ifndef PRODUCT
         } else {
@@ -1150,8 +1139,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
         int offset = ra_->reg2offset(dst_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movq(Address(rsp, offset), as_Register(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1165,8 +1153,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         assert(!((src_first & 1) == 0 && src_first + 1 == src_second), "no transform");
         assert(!((dst_first & 1) == 0 && dst_first + 1 == dst_second), "no transform");
         int offset = ra_->reg2offset(dst_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movl(Address(rsp, offset), as_Register(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1182,8 +1169,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
       if ((src_first & 1) == 0 && src_first + 1 == src_second &&
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movq(as_Register(Matcher::_regEncode[dst_first]),
                   as_Register(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
@@ -1198,8 +1184,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         // 32-bit
         assert(!((src_first & 1) == 0 && src_first + 1 == src_second), "no transform");
         assert(!((dst_first & 1) == 0 && dst_first + 1 == dst_second), "no transform");
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movl(as_Register(Matcher::_regEncode[dst_first]),
                   as_Register(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
@@ -1216,8 +1201,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
       if ((src_first & 1) == 0 && src_first + 1 == src_second &&
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movdq( as_XMMRegister(Matcher::_regEncode[dst_first]), as_Register(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1230,8 +1214,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         // 32-bit
         assert(!((src_first & 1) == 0 && src_first + 1 == src_second), "no transform");
         assert(!((dst_first & 1) == 0 && dst_first + 1 == dst_second), "no transform");
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movdl( as_XMMRegister(Matcher::_regEncode[dst_first]), as_Register(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1246,8 +1229,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
       if ((src_first & 1) == 0 && src_first + 1 == src_second &&
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ kmov(as_KRegister(Matcher::_regEncode[dst_first]), as_Register(Matcher::_regEncode[src_first]));
   #ifndef PRODUCT
         } else {
@@ -1268,8 +1250,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
         int offset = ra_->reg2offset(dst_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movdbl( Address(rsp, offset), as_XMMRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1283,8 +1264,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         assert(!((src_first & 1) == 0 && src_first + 1 == src_second), "no transform");
         assert(!((dst_first & 1) == 0 && dst_first + 1 == dst_second), "no transform");
         int offset = ra_->reg2offset(dst_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movflt(Address(rsp, offset), as_XMMRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1300,8 +1280,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
       if ((src_first & 1) == 0 && src_first + 1 == src_second &&
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movdq( as_Register(Matcher::_regEncode[dst_first]), as_XMMRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1314,8 +1293,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         // 32-bit
         assert(!((src_first & 1) == 0 && src_first + 1 == src_second), "no transform");
         assert(!((dst_first & 1) == 0 && dst_first + 1 == dst_second), "no transform");
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movdl( as_Register(Matcher::_regEncode[dst_first]), as_XMMRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1331,8 +1309,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
       if ((src_first & 1) == 0 && src_first + 1 == src_second &&
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movdbl( as_XMMRegister(Matcher::_regEncode[dst_first]), as_XMMRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1346,8 +1323,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
         // 32-bit
         assert(!((src_first & 1) == 0 && src_first + 1 == src_second), "no transform");
         assert(!((dst_first & 1) == 0 && dst_first + 1 == dst_second), "no transform");
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ movflt( as_XMMRegister(Matcher::_regEncode[dst_first]), as_XMMRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1370,8 +1346,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
         int offset = ra_->reg2offset(dst_first);
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ kmov(Address(rsp, offset), as_KRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1386,8 +1361,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
       if ((src_first & 1) == 0 && src_first + 1 == src_second &&
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ kmov(as_Register(Matcher::_regEncode[dst_first]), as_KRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1403,8 +1377,7 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
       if ((src_first & 1) == 0 && src_first + 1 == src_second &&
           (dst_first & 1) == 0 && dst_first + 1 == dst_second) {
         // 64-bit
-        if (cbuf) {
-          MacroAssembler _masm(cbuf);
+        if (masm) {
           __ kmov(as_KRegister(Matcher::_regEncode[dst_first]), as_KRegister(Matcher::_regEncode[src_first]));
 #ifndef PRODUCT
         } else {
@@ -1432,8 +1405,8 @@ void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream* st) const {
 }
 #endif
 
-void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-  implementation(&cbuf, ra_, false, nullptr);
+void MachSpillCopyNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
+  implementation(masm, ra_, false, nullptr);
 }
 
 uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
@@ -1451,13 +1424,12 @@ void BoxLockNode::format(PhaseRegAlloc* ra_, outputStream* st) const
 }
 #endif
 
-void BoxLockNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
+void BoxLockNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const
 {
   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
   int reg = ra_->get_encode(this);
 
-  MacroAssembler masm(&cbuf);
-  masm.lea(as_Register(reg), Address(rsp, offset));
+  __ lea(as_Register(reg), Address(rsp, offset));
 }
 
 uint BoxLockNode::size(PhaseRegAlloc *ra_) const
@@ -1481,10 +1453,9 @@ void MachUEPNode::format(PhaseRegAlloc* ra_, outputStream* st) const
 }
 #endif
 
-void MachUEPNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
+void MachUEPNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const
 {
-  MacroAssembler masm(&cbuf);
-  masm.ic_check(InteriorEntryAlignment);
+  __ ic_check(InteriorEntryAlignment);
 }
 
 uint MachUEPNode::size(PhaseRegAlloc* ra_) const
@@ -1663,7 +1634,6 @@ encode %{
     //  [REX_B]
     //    f:   f7 f9                   idiv   $div
     // 0000000000000011 <done>:
-    MacroAssembler _masm(&cbuf);
     Label normal;
     Label done;
 
@@ -1719,7 +1689,6 @@ encode %{
     //   17:   48 99                   cqto
     //   19:   48 f7 f9                idiv   $div
     // 000000000000001c <done>:
-    MacroAssembler _masm(&cbuf);
     Label normal;
     Label done;
 
@@ -1761,7 +1730,6 @@ encode %{
     Label miss;
     const bool set_cond_codes = true;
 
-    MacroAssembler _masm(&cbuf);
     __ check_klass_subtype_slow_path(Rrsi, Rrax, Rrcx, Rrdi,
                                      nullptr, &miss,
                                      /*set_cond_codes:*/ true);
@@ -1772,21 +1740,19 @@ encode %{
   %}
 
   enc_class clear_avx %{
-    debug_only(int off0 = cbuf.insts_size());
+    debug_only(int off0 = __ offset());
     if (generate_vzeroupper(Compile::current())) {
       // Clear upper bits of YMM registers to avoid AVX <-> SSE transition penalty
       // Clear upper bits of YMM registers when current compiled code uses
       // wide vectors to avoid AVX <-> SSE transition penalty during call.
-      MacroAssembler _masm(&cbuf);
       __ vzeroupper();
     }
-    debug_only(int off1 = cbuf.insts_size());
+    debug_only(int off1 = __ offset());
     assert(off1 - off0 == clear_avx_size(), "correct size prediction");
   %}
 
   enc_class Java_To_Runtime(method meth) %{
     // No relocation needed
-    MacroAssembler _masm(&cbuf);
     __ mov64(r10, (int64_t) $meth$$method);
     __ call(r10);
     __ post_call_nop();
@@ -1797,8 +1763,6 @@ encode %{
     // JAVA STATIC CALL
     // CALL to fixup routine.  Fixup routine uses ScopeDesc info to
     // determine who we intended to call.
-    MacroAssembler _masm(&cbuf);
-
     if (!_method) {
       __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, $meth$$method)));
     } else if (_method->intrinsic_id() == vmIntrinsicID::_ensureMaterializedForStackWalk) {
@@ -1807,7 +1771,7 @@ encode %{
       __ addr_nop_5();
       __ block_comment("call JVM_EnsureMaterializedForStackWalk (elided)");
     } else {
-      int method_index = resolved_method_index(cbuf);
+      int method_index = resolved_method_index(masm);
       RelocationHolder rspec = _optimized_virtual ? opt_virtual_call_Relocation::spec(method_index)
                                                   : static_call_Relocation::spec(method_index);
       address mark = __ pc();
@@ -1816,10 +1780,11 @@ encode %{
       if (CodeBuffer::supports_shared_stubs() && _method->can_be_statically_bound()) {
         // Calls of the same statically bound method can share
         // a stub to the interpreter.
-        cbuf.shared_stub_to_interp_for(_method, call_offset);
+        __ code()->shared_stub_to_interp_for(_method, call_offset);
       } else {
         // Emit stubs for static call.
-        address stub = CompiledDirectCall::emit_to_interp_stub(cbuf, mark);
+        address stub = CompiledDirectCall::emit_to_interp_stub(masm, mark);
+        __ clear_inst_mark();
         if (stub == nullptr) {
           ciEnv::current()->record_failure("CodeCache is full");
           return;
@@ -1830,8 +1795,7 @@ encode %{
   %}
 
   enc_class Java_Dynamic_Call(method meth) %{
-    MacroAssembler _masm(&cbuf);
-    __ ic_call((address)$meth$$method, resolved_method_index(cbuf));
+    __ ic_call((address)$meth$$method, resolved_method_index(masm));
     __ post_call_nop();
   %}
 
@@ -4351,7 +4315,7 @@ instruct maxF_reduction_reg(legRegF dst, legRegF a, legRegF b, legRegF xmmt, rRe
 
   format %{ "$dst = max($a, $b)\t# intrinsic (float)" %}
   ins_encode %{
-    emit_fp_min_max(_masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
+    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
                     false /*min*/, true /*single*/);
   %}
   ins_pipe( pipe_slow );
@@ -4376,7 +4340,7 @@ instruct maxD_reduction_reg(legRegD dst, legRegD a, legRegD b, legRegD xmmt, rRe
 
   format %{ "$dst = max($a, $b)\t# intrinsic (double)" %}
   ins_encode %{
-    emit_fp_min_max(_masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
+    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
                     false /*min*/, false /*single*/);
   %}
   ins_pipe( pipe_slow );
@@ -4401,7 +4365,7 @@ instruct minF_reduction_reg(legRegF dst, legRegF a, legRegF b, legRegF xmmt, rRe
 
   format %{ "$dst = min($a, $b)\t# intrinsic (float)" %}
   ins_encode %{
-    emit_fp_min_max(_masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
+    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
                     true /*min*/, true /*single*/);
   %}
   ins_pipe( pipe_slow );
@@ -4426,7 +4390,7 @@ instruct minD_reduction_reg(legRegD dst, legRegD a, legRegD b, legRegD xmmt, rRe
 
   format %{ "$dst = min($a, $b)\t# intrinsic (double)" %}
   ins_encode %{
-    emit_fp_min_max(_masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
+    emit_fp_min_max(masm, $dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, $xmmt$$XMMRegister, $tmp$$Register,
                     true /*min*/, false /*single*/);
   %}
   ins_pipe( pipe_slow );
@@ -9732,7 +9696,7 @@ instruct cmpF_cc_reg(rFlagsRegU cr, regF src1, regF src2)
     "exit:" %}
   ins_encode %{
     __ ucomiss($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp_fixup(_masm);
+    emit_cmpfp_fixup(masm);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -9783,7 +9747,7 @@ instruct cmpD_cc_reg(rFlagsRegU cr, regD src1, regD src2)
     "exit:" %}
   ins_encode %{
     __ ucomisd($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp_fixup(_masm);
+    emit_cmpfp_fixup(masm);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -9836,7 +9800,7 @@ instruct cmpF_reg(rRegI dst, regF src1, regF src2, rFlagsReg cr)
     "done:" %}
   ins_encode %{
     __ ucomiss($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -9857,7 +9821,7 @@ instruct cmpF_mem(rRegI dst, regF src1, memory src2, rFlagsReg cr)
     "done:" %}
   ins_encode %{
     __ ucomiss($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -9877,7 +9841,7 @@ instruct cmpF_imm(rRegI dst, regF src, immF con, rFlagsReg cr) %{
     "done:" %}
   ins_encode %{
     __ ucomiss($src$$XMMRegister, $constantaddress($con));
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -9898,7 +9862,7 @@ instruct cmpD_reg(rRegI dst, regD src1, regD src2, rFlagsReg cr)
     "done:" %}
   ins_encode %{
     __ ucomisd($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -9919,7 +9883,7 @@ instruct cmpD_mem(rRegI dst, regD src1, memory src2, rFlagsReg cr)
     "done:" %}
   ins_encode %{
     __ ucomisd($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -9939,7 +9903,7 @@ instruct cmpD_imm(rRegI dst, regD src, immD con, rFlagsReg cr) %{
     "done:" %}
   ins_encode %{
     __ ucomisd($src$$XMMRegister, $constantaddress($con));
-    emit_cmpfp3(_masm, $dst$$Register);
+    emit_cmpfp3(masm, $dst$$Register);
   %}
   ins_pipe(pipe_slow);
 %}
diff --git a/src/hotspot/cpu/zero/c2_MacroAssembler_zero.hpp b/src/hotspot/cpu/zero/c2_MacroAssembler_zero.hpp
new file mode 100644
index 00000000000..3efa561c8e6
--- /dev/null
+++ b/src/hotspot/cpu/zero/c2_MacroAssembler_zero.hpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_ZERO_C2_MACROASSEMBLER_ZERO_HPP
+#define CPU_ZERO_C2_MACROASSEMBLER_ZERO_HPP
+
+// C2_MacroAssembler contains high-level macros for C2
+
+#endif // CPU_ZERO_C2_MACROASSEMBLER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/compiledIC_zero.cpp b/src/hotspot/cpu/zero/compiledIC_zero.cpp
index 24153aeacc5..7db93a5f3cf 100644
--- a/src/hotspot/cpu/zero/compiledIC_zero.cpp
+++ b/src/hotspot/cpu/zero/compiledIC_zero.cpp
@@ -42,7 +42,7 @@
 
 // ----------------------------------------------------------------------------
 
-address CompiledDirectCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) {
+address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark) {
   ShouldNotReachHere(); // Only needed for COMPILER2.
   return nullptr;
 }
diff --git a/src/hotspot/share/adlc/adlparse.cpp b/src/hotspot/share/adlc/adlparse.cpp
index 57c6b0c5a99..48dea8804f3 100644
--- a/src/hotspot/share/adlc/adlparse.cpp
+++ b/src/hotspot/share/adlc/adlparse.cpp
@@ -2896,14 +2896,6 @@ void ADLParser::ins_encode_parse_block(InstructForm& inst) {
     encoding->add_parameter(opForm->_ident, param);
   }
 
-  if (!inst._is_postalloc_expand) {
-    // Define a MacroAssembler instance for use by the encoding.  The
-    // name is chosen to match the __ idiom used for assembly in other
-    // parts of hotspot and assumes the existence of the standard
-    // #define __ _masm.
-    encoding->add_code("    C2_MacroAssembler _masm(&cbuf);\n");
-  }
-
   // Parse the following %{ }% block
   ins_encode_parse_block_impl(inst, encoding, ec_name);
 
diff --git a/src/hotspot/share/adlc/output_c.cpp b/src/hotspot/share/adlc/output_c.cpp
index b54e62663e7..77332b21c01 100644
--- a/src/hotspot/share/adlc/output_c.cpp
+++ b/src/hotspot/share/adlc/output_c.cpp
@@ -1902,7 +1902,7 @@ void ArchDesc::defineExpand(FILE *fp, InstructForm *node) {
 // target specific instruction object encodings.
 // Define the ___Node::emit() routine
 //
-// (1) void  ___Node::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+// (1) void  ___Node::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
 // (2)   // ...  encoding defined by user
 // (3)
 // (4) }
@@ -2301,7 +2301,7 @@ public:
       // Check results of prior scan
       if ( ! _may_reloc ) {
         // Definitely don't need relocation information
-        fprintf( _fp, "emit_%s(cbuf, ", d32_hi_lo );
+        fprintf( _fp, "emit_%s(masm, ", d32_hi_lo );
         emit_replacement(); fprintf(_fp, ")");
       }
       else {
@@ -2315,26 +2315,26 @@ public:
         fprintf(_fp,"if ( opnd_array(%d)->%s_reloc() != relocInfo::none ) {\n",
                 _operand_idx, disp_constant);
         fprintf(_fp,"  ");
-        fprintf(_fp,"emit_%s_reloc(cbuf, ", d32_hi_lo );
+        fprintf(_fp,"emit_%s_reloc(masm, ", d32_hi_lo );
         emit_replacement();             fprintf(_fp,", ");
         fprintf(_fp,"opnd_array(%d)->%s_reloc(), ",
                 _operand_idx, disp_constant);
         fprintf(_fp, "%d", _reloc_form);fprintf(_fp, ");");
         fprintf(_fp,"\n");
         fprintf(_fp,"} else {\n");
-        fprintf(_fp,"  emit_%s(cbuf, ", d32_hi_lo);
+        fprintf(_fp,"  emit_%s(masm, ", d32_hi_lo);
         emit_replacement(); fprintf(_fp, ");\n"); fprintf(_fp,"}");
       }
     }
     else if ( _doing_emit_d16 ) {
       // Relocation of 16-bit values is not supported
-      fprintf(_fp,"emit_d16(cbuf, ");
+      fprintf(_fp,"emit_d16(masm, ");
       emit_replacement(); fprintf(_fp, ")");
       // No relocation done for 16-bit values
     }
     else if ( _doing_emit8 ) {
       // Relocation of 8-bit values is not supported
-      fprintf(_fp,"emit_d8(cbuf, ");
+      fprintf(_fp,"emit_d8(masm, ");
       emit_replacement(); fprintf(_fp, ")");
       // No relocation done for 8-bit values
     }
@@ -2675,7 +2675,7 @@ void ArchDesc::defineEmit(FILE* fp, InstructForm& inst) {
 
   // (1)
   // Output instruction's emit prototype
-  fprintf(fp, "void %sNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {\n", inst._ident);
+  fprintf(fp, "void %sNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const {\n", inst._ident);
 
   // If user did not define an encode section,
   // provide stub that does not generate any machine code.
@@ -2685,12 +2685,9 @@ void ArchDesc::defineEmit(FILE* fp, InstructForm& inst) {
     return;
   }
 
-  // Save current instruction's starting address (helps with relocation).
-  fprintf(fp, "  cbuf.set_insts_mark();\n");
-
   // For MachConstantNodes which are ideal jump nodes, fill the jump table.
   if (inst.is_mach_constant() && inst.is_ideal_jump()) {
-    fprintf(fp, "  ra_->C->output()->constant_table().fill_jump_table(cbuf, (MachConstantNode*) this, _index2label);\n");
+    fprintf(fp, "  ra_->C->output()->constant_table().fill_jump_table(masm, (MachConstantNode*) this, _index2label);\n");
   }
 
   // Output each operand's offset into the array of registers.
diff --git a/src/hotspot/share/adlc/output_h.cpp b/src/hotspot/share/adlc/output_h.cpp
index 17a0fd0e01e..9d54d840688 100644
--- a/src/hotspot/share/adlc/output_h.cpp
+++ b/src/hotspot/share/adlc/output_h.cpp
@@ -1629,7 +1629,7 @@ void ArchDesc::declareClasses(FILE *fp) {
         fprintf(fp,"  virtual bool           requires_postalloc_expand() const { return true; }\n");
         fprintf(fp,"  virtual void           postalloc_expand(GrowableArray <Node *> *nodes, PhaseRegAlloc *ra_);\n");
       } else {
-        fprintf(fp,"  virtual void           emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;\n");
+        fprintf(fp,"  virtual void           emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;\n");
       }
     }
 
diff --git a/src/hotspot/share/asm/assembler.hpp b/src/hotspot/share/asm/assembler.hpp
index a533b963844..d05278f7fe1 100644
--- a/src/hotspot/share/asm/assembler.hpp
+++ b/src/hotspot/share/asm/assembler.hpp
@@ -227,7 +227,8 @@ class AbstractAssembler : public ResourceObj  {
   bool isByte(int x) const             { return 0 <= x && x < 0x100; }
   bool isShiftCount(int x) const       { return 0 <= x && x < 32; }
 
-  // Instruction boundaries (required when emitting relocatable values).
+  // Mark instruction boundaries, this is required when emitting relocatable values.
+  // Basically, all instructions that directly or indirectly use Assembler::emit_data* methods.
   class InstructionMark: public StackObj {
    private:
     AbstractAssembler* _assm;
@@ -366,6 +367,7 @@ class AbstractAssembler : public ResourceObj  {
   CodeBuffer*   code()         const   { return code_section()->outer(); }
   int           sect()         const   { return code_section()->index(); }
   address       pc()           const   { return code_section()->end();   }
+  address       begin()        const   { return code_section()->start(); }
   int           offset()       const   { return code_section()->size();  }
   int           locator()      const   { return CodeBuffer::locator(offset(), sect()); }
 
@@ -374,10 +376,11 @@ class AbstractAssembler : public ResourceObj  {
 
   void   register_skipped(int size) { code_section()->register_skipped(size); }
 
-  address       inst_mark() const { return code_section()->mark();       }
-  void      set_inst_mark()       {        code_section()->set_mark();   }
-  void    clear_inst_mark()       {        code_section()->clear_mark(); }
-
+  address       inst_mark() const         { return code_section()->mark();          }
+  void      set_inst_mark()               {        code_section()->set_mark();      }
+  void      set_inst_mark(address addr)   {        code_section()->set_mark(addr);  }
+  void    clear_inst_mark()               {        code_section()->clear_mark();    }
+  void set_inst_end(address addr)         {        code_section()->set_end(addr);   }
 
   // Constants in code
   void relocate(RelocationHolder const& rspec, int format = 0) {
@@ -389,6 +392,12 @@ class AbstractAssembler : public ResourceObj  {
   void relocate(   relocInfo::relocType rtype, int format = 0) {
     code_section()->relocate(code_section()->end(), rtype, format);
   }
+  void relocate(address addr, relocInfo::relocType rtype, int format = 0) {
+    code_section()->relocate(addr, rtype, format);
+  }
+  void relocate(address addr, RelocationHolder const& rspec, int format = 0) {
+    code_section()->relocate(addr, rspec, format);
+  }
 
   static int code_fill_byte();         // used to pad out odd-sized code buffers
 
diff --git a/src/hotspot/share/code/compiledIC.hpp b/src/hotspot/share/code/compiledIC.hpp
index 4439ff958f7..22b93c1760a 100644
--- a/src/hotspot/share/code/compiledIC.hpp
+++ b/src/hotspot/share/code/compiledIC.hpp
@@ -28,6 +28,7 @@
 #include "code/nativeInst.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "runtime/safepointVerifiers.hpp"
+#include "opto/c2_MacroAssembler.hpp"
 
 //-----------------------------------------------------------------------------
 // The CompiledIC represents a compiled inline cache.
@@ -185,7 +186,7 @@ private:
 
  public:
   // Returns null if CodeBuffer::expand fails
-  static address emit_to_interp_stub(CodeBuffer &cbuf, address mark = nullptr);
+  static address emit_to_interp_stub(MacroAssembler *masm, address mark = nullptr);
   static int to_interp_stub_size();
   static int to_trampoline_stub_size();
   static int reloc_to_interp_stub();
diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
index 9b1cb351a68..f59d049462b 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
@@ -1243,7 +1243,8 @@ void CodeInstaller::site_Call(CodeBuffer& buffer, u1 tag, jint pc_offset, HotSpo
     CodeInstaller::pd_relocate_JavaMethod(buffer, method, pc_offset, JVMCI_CHECK);
     if (_next_call_type == INVOKESTATIC || _next_call_type == INVOKESPECIAL) {
       // Need a static call stub for transitions from compiled to interpreted.
-      if (CompiledDirectCall::emit_to_interp_stub(buffer, _instructions->start() + pc_offset) == nullptr) {
+      MacroAssembler masm(&buffer);
+      if (CompiledDirectCall::emit_to_interp_stub(&masm, _instructions->start() + pc_offset) == nullptr) {
         JVMCI_ERROR("could not emit to_interp stub - code cache is full");
       }
     }
diff --git a/src/hotspot/share/opto/c2_CodeStubs.cpp b/src/hotspot/share/opto/c2_CodeStubs.cpp
index f96f086d7a1..793e915da7d 100644
--- a/src/hotspot/share/opto/c2_CodeStubs.cpp
+++ b/src/hotspot/share/opto/c2_CodeStubs.cpp
@@ -33,22 +33,21 @@
 C2CodeStubList::C2CodeStubList() :
   _stubs(Compile::current()->comp_arena(), 2, 0, nullptr) {}
 
-void C2CodeStubList::emit(CodeBuffer& cb) {
-  C2_MacroAssembler masm(&cb);
+void C2CodeStubList::emit(C2_MacroAssembler& masm) {
   for (int i = _stubs.length() - 1; i >= 0; i--) {
     C2CodeStub* stub = _stubs.at(i);
     int max_size = stub->max_size();
     // Make sure there is enough space in the code buffer
-    if (cb.insts()->maybe_expand_to_ensure_remaining(max_size) && cb.blob() == nullptr) {
+    if (masm.code()->insts()->maybe_expand_to_ensure_remaining(max_size) && masm.code()->blob() == nullptr) {
       ciEnv::current()->record_failure("CodeCache is full");
       return;
     }
 
-    DEBUG_ONLY(int size_before = cb.insts_size();)
+    DEBUG_ONLY(int size_before = masm.offset();)
 
     stub->emit(masm);
 
-    DEBUG_ONLY(int actual_size = cb.insts_size() - size_before;)
+    DEBUG_ONLY(int actual_size = masm.offset() - size_before;)
     assert(max_size >= actual_size, "Expected stub size (%d) must be larger than or equal to actual stub size (%d)", max_size, actual_size);
   }
 }
diff --git a/src/hotspot/share/opto/c2_CodeStubs.hpp b/src/hotspot/share/opto/c2_CodeStubs.hpp
index 83d17081070..1316fa68ed4 100644
--- a/src/hotspot/share/opto/c2_CodeStubs.hpp
+++ b/src/hotspot/share/opto/c2_CodeStubs.hpp
@@ -68,7 +68,7 @@ public:
   C2CodeStubList();
 
   void add_stub(C2CodeStub* stub) { _stubs.append(stub); }
-  void emit(CodeBuffer& cb);
+  void emit(C2_MacroAssembler& masm);
 };
 
 class C2SafepointPollStub : public C2CodeStub {
diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index 4bc4962ccf0..869ac68bd9e 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -687,7 +687,7 @@ public:
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual int required_outcnt() const { return 2; }
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const { }
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const { }
   virtual uint size(PhaseRegAlloc *ra_) const { return 0; }
 #ifndef PRODUCT
   virtual void format( PhaseRegAlloc *, outputStream *st ) const;
diff --git a/src/hotspot/share/opto/constantTable.cpp b/src/hotspot/share/opto/constantTable.cpp
index 354fe27d30b..66cf8105476 100644
--- a/src/hotspot/share/opto/constantTable.cpp
+++ b/src/hotspot/share/opto/constantTable.cpp
@@ -144,28 +144,27 @@ void ConstantTable::calculate_offsets_and_size() {
   _size = align_up(offset, (int)CodeEntryAlignment);
 }
 
-bool ConstantTable::emit(CodeBuffer& cb) const {
-  MacroAssembler _masm(&cb);
+bool ConstantTable::emit(C2_MacroAssembler* masm) const {
   for (int i = 0; i < _constants.length(); i++) {
     Constant con = _constants.at(i);
     address constant_addr = nullptr;
     if (con.is_array()) {
-      constant_addr = _masm.array_constant(con.type(), con.get_array(), con.alignment());
+      constant_addr = masm->array_constant(con.type(), con.get_array(), con.alignment());
     } else {
       switch (con.type()) {
-      case T_INT:    constant_addr = _masm.int_constant(   con.get_jint()   ); break;
-      case T_LONG:   constant_addr = _masm.long_constant(  con.get_jlong()  ); break;
-      case T_FLOAT:  constant_addr = _masm.float_constant( con.get_jfloat() ); break;
-      case T_DOUBLE: constant_addr = _masm.double_constant(con.get_jdouble()); break;
+      case T_INT:    constant_addr = masm->int_constant(   con.get_jint()   ); break;
+      case T_LONG:   constant_addr = masm->long_constant(  con.get_jlong()  ); break;
+      case T_FLOAT:  constant_addr = masm->float_constant( con.get_jfloat() ); break;
+      case T_DOUBLE: constant_addr = masm->double_constant(con.get_jdouble()); break;
       case T_OBJECT: {
         jobject obj = con.get_jobject();
-        int oop_index = _masm.oop_recorder()->find_index(obj);
-        constant_addr = _masm.address_constant((address) obj, oop_Relocation::spec(oop_index));
+        int oop_index = masm->oop_recorder()->find_index(obj);
+        constant_addr = masm->address_constant((address) obj, oop_Relocation::spec(oop_index));
         break;
       }
       case T_ADDRESS: {
         address addr = (address) con.get_jobject();
-        constant_addr = _masm.address_constant(addr);
+        constant_addr = masm->address_constant(addr);
         break;
       }
       // We use T_VOID as marker for jump-table entries (labels) which
@@ -175,23 +174,23 @@ bool ConstantTable::emit(CodeBuffer& cb) const {
         // Fill the jump-table with a dummy word.  The real value is
         // filled in later in fill_jump_table.
         address dummy = (address) n;
-        constant_addr = _masm.address_constant(dummy);
+        constant_addr = masm->address_constant(dummy);
         if (constant_addr == nullptr) {
           return false;
         }
-        assert((constant_addr - _masm.code()->consts()->start()) == con.offset(),
-              "must be: %d == %d", (int)(constant_addr - _masm.code()->consts()->start()), (int)(con.offset()));
+        assert((constant_addr - masm->code()->consts()->start()) == con.offset(),
+              "must be: %d == %d", (int)(constant_addr - masm->code()->consts()->start()), (int)(con.offset()));
 
         // Expand jump-table
         address last_addr = nullptr;
         for (uint j = 1; j < n->outcnt(); j++) {
-          last_addr = _masm.address_constant(dummy + j);
+          last_addr = masm->address_constant(dummy + j);
           if (last_addr == nullptr) {
             return false;
           }
         }
 #ifdef ASSERT
-        address start = _masm.code()->consts()->start();
+        address start = masm->code()->consts()->start();
         address new_constant_addr = last_addr - ((n->outcnt() - 1) * sizeof(address));
         // Expanding the jump-table could result in an expansion of the const code section.
         // In that case, we need to check if the new constant address matches the offset.
@@ -203,8 +202,8 @@ bool ConstantTable::emit(CodeBuffer& cb) const {
       }
       case T_METADATA: {
         Metadata* obj = con.get_metadata();
-        int metadata_index = _masm.oop_recorder()->find_index(obj);
-        constant_addr = _masm.address_constant((address) obj, metadata_Relocation::spec(metadata_index));
+        int metadata_index = masm->oop_recorder()->find_index(obj);
+        constant_addr = masm->address_constant((address) obj, metadata_Relocation::spec(metadata_index));
         break;
       }
       default: ShouldNotReachHere();
@@ -214,8 +213,8 @@ bool ConstantTable::emit(CodeBuffer& cb) const {
     if (constant_addr == nullptr) {
       return false;
     }
-    assert((constant_addr - _masm.code()->consts()->start()) == con.offset(),
-            "must be: %d == %d", (int)(constant_addr - _masm.code()->consts()->start()), (int)(con.offset()));
+    assert((constant_addr - masm->code()->consts()->start()) == con.offset(),
+            "must be: %d == %d", (int)(constant_addr - masm->code()->consts()->start()), (int)(con.offset()));
   }
   return true;
 }
@@ -292,7 +291,7 @@ ConstantTable::Constant ConstantTable::add_jump_table(MachConstantNode* n) {
   return con;
 }
 
-void ConstantTable::fill_jump_table(CodeBuffer& cb, MachConstantNode* n, GrowableArray<Label*> labels) const {
+void ConstantTable::fill_jump_table(C2_MacroAssembler* masm, MachConstantNode* n, GrowableArray<Label*> labels) const {
   // If called from Compile::scratch_emit_size do nothing.
   if (Compile::current()->output()->in_scratch_emit_size())  return;
 
@@ -304,13 +303,12 @@ void ConstantTable::fill_jump_table(CodeBuffer& cb, MachConstantNode* n, Growabl
   // to get the plain offset into the constant table.
   int offset = n->constant_offset() - table_base_offset();
 
-  MacroAssembler _masm(&cb);
-  address* jump_table_base = (address*) (_masm.code()->consts()->start() + offset);
+  address* jump_table_base = (address*) (masm->code()->consts()->start() + offset);
 
   for (uint i = 0; i < n->outcnt(); i++) {
     address* constant_addr = &jump_table_base[i];
     assert(*constant_addr == (((address) n) + i), "all jump-table entries must contain adjusted node pointer: " INTPTR_FORMAT " == " INTPTR_FORMAT, p2i(*constant_addr), p2i(((address) n) + i));
-    *constant_addr = cb.consts()->target(*labels.at(i), (address) constant_addr);
-    cb.consts()->relocate((address) constant_addr, relocInfo::internal_word_type);
+    *constant_addr = masm->code()->consts()->target(*labels.at(i), (address) constant_addr);
+    masm->code()->consts()->relocate((address) constant_addr, relocInfo::internal_word_type);
   }
 }
diff --git a/src/hotspot/share/opto/constantTable.hpp b/src/hotspot/share/opto/constantTable.hpp
index 001193f6d0d..f7197783773 100644
--- a/src/hotspot/share/opto/constantTable.hpp
+++ b/src/hotspot/share/opto/constantTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
 
 #include "utilities/globalDefinitions.hpp"
 
-class CodeBuffer;
 class Metadata;
 class MachConstantNode;
 class MachOper;
+class C2_MacroAssembler;
 
 class ConstantTable {
 public:
@@ -139,7 +139,7 @@ public:
   void set_table_base_offset(int x)  { assert(_table_base_offset == -1 || x == _table_base_offset, "can't change"); _table_base_offset = x; }
   int      table_base_offset() const { assert(_table_base_offset != -1, "not set yet");                      return _table_base_offset; }
 
-  bool emit(CodeBuffer& cb) const;
+  bool emit(C2_MacroAssembler* masm) const;
 
   // Returns the offset of the last entry (the top) of the constant table.
   int  top_offset() const { assert(_constants.top().offset() != -1, "not bound yet"); return _constants.top().offset(); }
@@ -172,7 +172,7 @@ public:
 
   // Jump-table
   Constant  add_jump_table(MachConstantNode* n);
-  void     fill_jump_table(CodeBuffer& cb, MachConstantNode* n, GrowableArray<Label*> labels) const;
+  void     fill_jump_table(C2_MacroAssembler* masm, MachConstantNode* n, GrowableArray<Label*> labels) const;
 };
 
 
diff --git a/src/hotspot/share/opto/locknode.hpp b/src/hotspot/share/opto/locknode.hpp
index 3bc684c40a9..fcc8da0eb34 100644
--- a/src/hotspot/share/opto/locknode.hpp
+++ b/src/hotspot/share/opto/locknode.hpp
@@ -68,7 +68,7 @@ private:
 public:
   BoxLockNode( int lock );
   virtual int Opcode() const;
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   virtual uint size(PhaseRegAlloc *ra_) const;
   virtual const RegMask &in_RegMask(uint) const;
   virtual const RegMask &out_RegMask() const;
diff --git a/src/hotspot/share/opto/machnode.cpp b/src/hotspot/share/opto/machnode.cpp
index 173a38fa9d8..b2c0028b1a3 100644
--- a/src/hotspot/share/opto/machnode.cpp
+++ b/src/hotspot/share/opto/machnode.cpp
@@ -132,7 +132,7 @@ bool methodOper::cmp( const MachOper &oper ) const {
 //------------------------------MachNode---------------------------------------
 
 //------------------------------emit-------------------------------------------
-void MachNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   #ifdef ASSERT
   tty->print("missing MachNode emit function: ");
   dump();
@@ -604,7 +604,7 @@ void MachNullCheckNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
 }
 #endif
 
-void MachNullCheckNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+void MachNullCheckNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   // only emits entries in the null-pointer exception handler table
 }
 void MachNullCheckNode::label_set(Label* label, uint block_num) {
diff --git a/src/hotspot/share/opto/machnode.hpp b/src/hotspot/share/opto/machnode.hpp
index b834f994df4..677e1bcd1d1 100644
--- a/src/hotspot/share/opto/machnode.hpp
+++ b/src/hotspot/share/opto/machnode.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_OPTO_MACHNODE_HPP
 #define SHARE_OPTO_MACHNODE_HPP
 
+#include "opto/c2_MacroAssembler.hpp"
 #include "opto/callnode.hpp"
 #include "opto/constantTable.hpp"
 #include "opto/matcher.hpp"
@@ -34,7 +35,6 @@
 #include "utilities/growableArray.hpp"
 
 class BufferBlob;
-class CodeBuffer;
 class JVMState;
 class MachCallDynamicJavaNode;
 class MachCallJavaNode;
@@ -284,8 +284,8 @@ public:
   MachOper **_opnds;
   uint16_t num_opnds() const { return _num_opnds; }
 
-  // Emit bytes into cbuf
-  virtual void  emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  // Emit bytes using C2_MacroAssembler
+  virtual void  emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   // Expand node after register allocation.
   // Node is replaced by several nodes in the postalloc expand phase.
   // Corresponding methods are generated for nodes if they specify
@@ -421,7 +421,7 @@ public:
 class MachBreakpointNode : public MachIdealNode {
 public:
   MachBreakpointNode( ) {}
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   virtual uint size(PhaseRegAlloc *ra_) const;
 
 #ifndef PRODUCT
@@ -447,7 +447,7 @@ public:
   virtual bool requires_postalloc_expand() const;
   virtual void postalloc_expand(GrowableArray <Node *> *nodes, PhaseRegAlloc *ra_);
 
-  virtual void emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const;
+  virtual void emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const;
   virtual uint size(PhaseRegAlloc* ra_) const;
 
   static const RegMask& static_out_RegMask() { return _out_RegMask; }
@@ -498,7 +498,7 @@ public:
 class MachUEPNode : public MachIdealNode {
 public:
   MachUEPNode( ) {}
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   virtual uint size(PhaseRegAlloc *ra_) const;
 
 #ifndef PRODUCT
@@ -512,7 +512,7 @@ public:
 class MachPrologNode : public MachIdealNode {
 public:
   MachPrologNode( ) {}
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   virtual uint size(PhaseRegAlloc *ra_) const;
   virtual int reloc() const;
 
@@ -527,7 +527,7 @@ public:
 class MachEpilogNode : public MachIdealNode {
 public:
   MachEpilogNode(bool do_poll = false) : _do_polling(do_poll) {}
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   virtual uint size(PhaseRegAlloc *ra_) const;
   virtual int reloc() const;
   virtual const Pipeline *pipeline() const;
@@ -552,7 +552,7 @@ private:
 public:
   MachNopNode( ) : _count(1) {}
   MachNopNode( int count ) : _count(count) {}
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   virtual uint size(PhaseRegAlloc *ra_) const;
 
   virtual const class Type *bottom_type() const { return Type::CONTROL; }
@@ -610,9 +610,9 @@ public:
   virtual const class Type *bottom_type() const { return _type; }
   virtual uint ideal_reg() const { return _type->ideal_reg(); }
   virtual uint oper_input_base() const { return 1; }
-  uint implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bool do_size, outputStream* st ) const;
+  uint implementation( C2_MacroAssembler *masm, PhaseRegAlloc *ra_, bool do_size, outputStream* st ) const;
 
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   virtual uint size(PhaseRegAlloc *ra_) const;
 
 
@@ -675,7 +675,7 @@ public:
   virtual const class Type *bottom_type() const { return in(1)->bottom_type(); }
   virtual uint ideal_reg() const { return bottom_type()->ideal_reg(); }
   virtual uint oper_input_base() const { return 1; }
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const { }
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const { }
   virtual uint size(PhaseRegAlloc *ra_) const { return 0; }
 #ifndef PRODUCT
   virtual const char *Name() const { return "MachMerge"; }
@@ -715,7 +715,7 @@ public:
   virtual int Opcode() const;
   virtual uint size_of() const { return sizeof(*this); }
 
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   virtual void label_set(Label* label, uint block_num);
   virtual void save_label(Label** label, uint* block_num);
   virtual void negate() { }
@@ -946,13 +946,13 @@ public:
 
   virtual const RegMask &in_RegMask(uint) const;
 
-  int resolved_method_index(CodeBuffer &cbuf) const {
+  int resolved_method_index(C2_MacroAssembler *masm) const {
     if (_override_symbolic_info) {
       // Attach corresponding Method* to the call site, so VM can use it during resolution
       // instead of querying symbolic info from bytecode.
       assert(_method != nullptr, "method should be set");
       assert(_method->constant_encoding()->is_method(), "should point to a Method");
-      return cbuf.oop_recorder()->find_index(_method->constant_encoding());
+      return masm->code()->oop_recorder()->find_index(_method->constant_encoding());
     }
     return 0; // Use symbolic info from bytecode (resolved_method is null).
   }
@@ -1057,7 +1057,7 @@ private:
 public:
   virtual const RegMask &out_RegMask() const { return *_opnds[0]->in_RegMask(0); }
   virtual uint rule() const { return 9999999; }
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {}
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {}
 
   MachTempNode(MachOper* oper) {
     init_class_id(Class_MachTemp);
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index dee4ce80d35..cb3b519ba5d 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -1092,8 +1092,8 @@ juint Node::max_flags() {
 // Print as assembly
 void Node::format( PhaseRegAlloc *, outputStream *st ) const {}
 //------------------------------emit-------------------------------------------
-// Emit bytes starting at parameter 'ptr'.
-void Node::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {}
+// Emit bytes using C2_MacroAssembler
+void Node::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {}
 //------------------------------size-------------------------------------------
 // Size of instruction in bytes
 uint Node::size(PhaseRegAlloc *ra_) const { return 0; }
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 14cf1436671..19b9a11d9ce 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -191,6 +191,7 @@ class ShiftVNode;
 class ExpandVNode;
 class CompressVNode;
 class CompressMNode;
+class C2_MacroAssembler;
 
 
 #ifndef OPTO_DU_ITERATOR_ASSERT
@@ -1181,9 +1182,8 @@ public:
 
   // Print as assembly
   virtual void format( PhaseRegAlloc *, outputStream* st = tty ) const;
-  // Emit bytes starting at parameter 'ptr'
-  // Bump 'ptr' by the number of output bytes
-  virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
+  // Emit bytes using C2_MacroAssembler
+  virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   // Size of instruction in bytes
   virtual uint size(PhaseRegAlloc *ra_) const;
 
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 640a24693de..a3b99263469 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -363,7 +363,8 @@ void PhaseOutput::Output() {
     return;
   }
 
-  fill_buffer(cb, blk_starts);
+  C2_MacroAssembler masm(cb);
+  fill_buffer(&masm, blk_starts);
 }
 
 bool PhaseOutput::need_stack_bang(int frame_size_in_bytes) const {
@@ -1368,7 +1369,7 @@ CodeBuffer* PhaseOutput::init_buffer() {
 }
 
 //------------------------------fill_buffer------------------------------------
-void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
+void PhaseOutput::fill_buffer(C2_MacroAssembler* masm, uint* blk_starts) {
   // blk_starts[] contains offsets calculated during short branches processing,
   // offsets should not be increased during following steps.
 
@@ -1424,7 +1425,7 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
 
   // Emit the constant table.
   if (C->has_mach_constant_base_node()) {
-    if (!constant_table().emit(*cb)) {
+    if (!constant_table().emit(masm)) {
       C->record_failure("consts section overflow");
       return;
     }
@@ -1447,14 +1448,14 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
     // than by falling-thru from the previous block), then force the
     // start of a new bundle.
     if (Pipeline::requires_bundling() && starts_bundle(head)) {
-      cb->flush_bundle(true);
+      masm->code()->flush_bundle(true);
     }
 
 #ifdef ASSERT
     if (!block->is_connector()) {
       stringStream st;
       block->dump_head(C->cfg(), &st);
-      MacroAssembler(cb).block_comment(st.freeze());
+      masm->block_comment(st.freeze());
     }
     jmp_target[i] = 0;
     jmp_offset[i] = 0;
@@ -1464,7 +1465,7 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
     int blk_offset = current_offset;
 
     // Define the label at the beginning of the basic block
-    MacroAssembler(cb).bind(blk_labels[block->_pre_order]);
+    masm->bind(blk_labels[block->_pre_order]);
 
     uint last_inst = block->number_of_nodes();
 
@@ -1488,7 +1489,7 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
       // If this starts a new instruction group, then flush the current one
       // (but allow split bundles)
       if (Pipeline::requires_bundling() && starts_bundle(n))
-        cb->flush_bundle(false);
+        masm->code()->flush_bundle(false);
 
       // Special handling for SafePoint/Call Nodes
       bool is_mcall = false;
@@ -1499,8 +1500,8 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
 
         // If this requires all previous instructions be flushed, then do so
         if (is_sfn || is_mcall || mach->alignment_required() != 1) {
-          cb->flush_bundle(true);
-          current_offset = cb->insts_size();
+          masm->code()->flush_bundle(true);
+          current_offset = masm->offset();
         }
 
         // A padding may be needed again since a previous instruction
@@ -1527,14 +1528,14 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
           last_inst++;
           C->cfg()->map_node_to_block(nop, block);
           // Ensure enough space.
-          cb->insts()->maybe_expand_to_ensure_remaining(MAX_inst_size);
-          if ((cb->blob() == nullptr) || (!CompileBroker::should_compile_new_jobs())) {
+          masm->code()->insts()->maybe_expand_to_ensure_remaining(MAX_inst_size);
+          if ((masm->code()->blob() == nullptr) || (!CompileBroker::should_compile_new_jobs())) {
             C->record_failure("CodeCache is full");
             return;
           }
-          nop->emit(*cb, C->regalloc());
-          cb->flush_bundle(true);
-          current_offset = cb->insts_size();
+          nop->emit(masm, C->regalloc());
+          masm->code()->flush_bundle(true);
+          current_offset = masm->offset();
         }
 
         bool observe_safepoint = is_sfn;
@@ -1612,9 +1613,9 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
                 block->insert_node(nop, j++);
                 C->cfg()->map_node_to_block(nop, block);
                 last_inst++;
-                nop->emit(*cb, C->regalloc());
-                cb->flush_bundle(true);
-                current_offset = cb->insts_size();
+                nop->emit(masm, C->regalloc());
+                masm->code()->flush_bundle(true);
+                current_offset = masm->offset();
               }
 #ifdef ASSERT
               jmp_target[i] = block_num;
@@ -1679,8 +1680,8 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
       }
 
       // Verify that there is sufficient space remaining
-      cb->insts()->maybe_expand_to_ensure_remaining(MAX_inst_size);
-      if ((cb->blob() == nullptr) || (!CompileBroker::should_compile_new_jobs())) {
+      masm->code()->insts()->maybe_expand_to_ensure_remaining(MAX_inst_size);
+      if ((masm->code()->blob() == nullptr) || (!CompileBroker::should_compile_new_jobs())) {
         C->record_failure("CodeCache is full");
         return;
       }
@@ -1688,15 +1689,15 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
       // Save the offset for the listing
 #if defined(SUPPORT_OPTO_ASSEMBLY)
       if ((node_offsets != nullptr) && (n->_idx < node_offset_limit)) {
-        node_offsets[n->_idx] = cb->insts_size();
+        node_offsets[n->_idx] = masm->offset();
       }
 #endif
       assert(!C->failing(), "Should not reach here if failing.");
 
       // "Normal" instruction case
-      DEBUG_ONLY(uint instr_offset = cb->insts_size());
-      n->emit(*cb, C->regalloc());
-      current_offset = cb->insts_size();
+      DEBUG_ONLY(uint instr_offset = masm->offset());
+      n->emit(masm, C->regalloc());
+      current_offset = masm->offset();
 
       // Above we only verified that there is enough space in the instruction section.
       // However, the instruction may emit stubs that cause code buffer expansion.
@@ -1715,7 +1716,7 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
         n->dump();
         mach->dump_format(C->regalloc(), tty);
         tty->print_cr(" n_size (%d), current_offset (%d), instr_offset (%d)", n_size, current_offset, instr_offset);
-        Disassembler::decode(cb->insts_begin() + instr_offset, cb->insts_begin() + current_offset + 1, tty);
+        Disassembler::decode(masm->code()->insts_begin() + instr_offset, masm->code()->insts_begin() + current_offset + 1, tty);
         tty->print_cr(" ------------------- ");
         BufferBlob* blob = this->scratch_buffer_blob();
         address blob_begin = blob->content_begin();
@@ -1746,12 +1747,12 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
         guarantee(delay_slot != nullptr, "expecting delay slot node");
 
         // Back up 1 instruction
-        cb->set_insts_end(cb->insts_end() - Pipeline::instr_unit_size());
+        masm->code()->set_insts_end(masm->code()->insts_end() - Pipeline::instr_unit_size());
 
         // Save the offset for the listing
 #if defined(SUPPORT_OPTO_ASSEMBLY)
         if ((node_offsets != nullptr) && (delay_slot->_idx < node_offset_limit)) {
-          node_offsets[delay_slot->_idx] = cb->insts_size();
+          node_offsets[delay_slot->_idx] = masm->offset();
         }
 #endif
 
@@ -1773,7 +1774,7 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
         }
 
         // Insert the delay slot instruction
-        delay_slot->emit(*cb, C->regalloc());
+        delay_slot->emit(masm, C->regalloc());
 
         // Don't reuse it
         delay_slot = nullptr;
@@ -1790,8 +1791,8 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
         MachNode *nop = new MachNopNode(padding / nop_size);
         block->insert_node(nop, block->number_of_nodes());
         C->cfg()->map_node_to_block(nop, block);
-        nop->emit(*cb, C->regalloc());
-        current_offset = cb->insts_size();
+        nop->emit(masm, C->regalloc());
+        current_offset = masm->offset();
       }
     }
     // Verify that the distance for generated before forward
@@ -1809,7 +1810,7 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
   if (C->failing())  return;
 
   // Define a pseudo-label at the end of the code
-  MacroAssembler(cb).bind( blk_labels[nblocks] );
+  masm->bind( blk_labels[nblocks] );
 
   // Compute the size of the first block
   _first_block_size = blk_labels[1].loc_pos() - blk_labels[0].loc_pos();
@@ -1827,22 +1828,23 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
   }
 #endif
 
-  if (!cb->finalize_stubs()) {
+  if (!masm->code()->finalize_stubs()) {
     C->record_failure("CodeCache is full");
     return;
   }
 
   BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
-  bs->emit_stubs(*cb);
+  bs->emit_stubs(*masm->code());
   if (C->failing())  return;
 
   // Fill in stubs.
-  _stub_list.emit(*cb);
+  assert(masm->inst_mark() == nullptr, "should be.");
+  _stub_list.emit(*masm);
   if (C->failing())  return;
 
 #ifndef PRODUCT
   // Information on the size of the method, without the extraneous code
-  Scheduling::increment_method_size(cb->insts_size());
+  Scheduling::increment_method_size(masm->offset());
 #endif
 
   // ------------------
@@ -1853,23 +1855,23 @@ void PhaseOutput::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
   // class HandlerImpl is platform-specific and defined in the *.ad files.
   if (C->method()) {
     // Emit the exception handler code.
-    _code_offsets.set_value(CodeOffsets::Exceptions, HandlerImpl::emit_exception_handler(*cb));
+    _code_offsets.set_value(CodeOffsets::Exceptions, HandlerImpl::emit_exception_handler(masm));
     if (C->failing()) {
       return; // CodeBuffer::expand failed
     }
     // Emit the deopt handler code.
-    _code_offsets.set_value(CodeOffsets::Deopt, HandlerImpl::emit_deopt_handler(*cb));
+    _code_offsets.set_value(CodeOffsets::Deopt, HandlerImpl::emit_deopt_handler(masm));
 
     // Emit the MethodHandle deopt handler code (if required).
     if (C->has_method_handle_invokes() && !C->failing()) {
       // We can use the same code as for the normal deopt handler, we
       // just need a different entry point address.
-      _code_offsets.set_value(CodeOffsets::DeoptMH, HandlerImpl::emit_deopt_handler(*cb));
+      _code_offsets.set_value(CodeOffsets::DeoptMH, HandlerImpl::emit_deopt_handler(masm));
     }
   }
 
   // One last check for failed CodeBuffer::expand:
-  if ((cb->blob() == nullptr) || (!CompileBroker::should_compile_new_jobs())) {
+  if ((masm->code()->blob() == nullptr) || (!CompileBroker::should_compile_new_jobs())) {
     C->record_failure("CodeCache is full");
     return;
   }
@@ -3357,13 +3359,13 @@ uint PhaseOutput::scratch_emit_size(const Node* n) {
   Label*   saveL = nullptr;
   uint save_bnum = 0;
   bool is_branch = n->is_MachBranch();
+  C2_MacroAssembler masm(&buf);
+  masm.bind(fakeL);
   if (is_branch) {
-    MacroAssembler masm(&buf);
-    masm.bind(fakeL);
     n->as_MachBranch()->save_label(&saveL, &save_bnum);
     n->as_MachBranch()->label_set(&fakeL, 0);
   }
-  n->emit(buf, C->regalloc());
+  n->emit(&masm, C->regalloc());
 
   // Emitting into the scratch buffer should not fail
   assert (!C->failing(), "Must not have pending failure. Reason is: %s", C->failure_reason());
diff --git a/src/hotspot/share/opto/output.hpp b/src/hotspot/share/opto/output.hpp
index 36352083419..b58b97e7745 100644
--- a/src/hotspot/share/opto/output.hpp
+++ b/src/hotspot/share/opto/output.hpp
@@ -154,7 +154,7 @@ public:
   CodeBuffer* init_buffer();
 
   // Write out basic block data to code buffer
-  void fill_buffer(CodeBuffer* cb, uint* blk_starts);
+  void fill_buffer(C2_MacroAssembler* masm, uint* blk_starts);
 
   // Compute the information for the exception tables
   void FillExceptionTables(uint cnt, uint *call_returns, uint *inct_starts, Label *blk_labels);

From 5808f30b89382af22027c43ebf14e36b0c16f041 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 11 Apr 2024 19:22:11 +0000
Subject: [PATCH 012/486] 8330026: Serial: Move some includes to
 vmStructs_serial.hpp

Reviewed-by: kbarrett
---
 src/hotspot/share/gc/serial/vmStructs_serial.hpp | 2 ++
 src/hotspot/share/gc/shared/vmStructs_gc.hpp     | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/serial/vmStructs_serial.hpp b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
index f7bb570b601..d1e29a42632 100644
--- a/src/hotspot/share/gc/serial/vmStructs_serial.hpp
+++ b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
@@ -26,6 +26,8 @@
 #define SHARE_GC_SERIAL_VMSTRUCTS_SERIAL_HPP
 
 #include "gc/serial/cardTableRS.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/serial/generation.hpp"
 #include "gc/serial/serialHeap.hpp"
 #include "gc/serial/tenuredGeneration.hpp"
 
diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
index 4c1d7b6b2aa..786f7b635e7 100644
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
@@ -40,8 +40,6 @@
 #include "gc/parallel/vmStructs_parallelgc.hpp"
 #endif
 #if INCLUDE_SERIALGC
-#include "gc/serial/defNewGeneration.hpp"
-#include "gc/serial/generation.hpp"
 #include "gc/serial/vmStructs_serial.hpp"
 #endif
 #if INCLUDE_SHENANDOAHGC

From 0db42906e390a98b3a6be078f1b8c3f2a03a838f Mon Sep 17 00:00:00 2001
From: Jorn Vernee <jvernee@openjdk.org>
Date: Thu, 11 Apr 2024 20:54:09 +0000
Subject: [PATCH 013/486] 8330049: Remove unused
 AbstractLinker::linkerByteOrder

Reviewed-by: mcimadamore
---
 .../classes/jdk/internal/foreign/abi/AbstractLinker.java | 3 ---
 .../foreign/abi/aarch64/linux/LinuxAArch64Linker.java    | 7 +------
 .../foreign/abi/aarch64/macos/MacOsAArch64Linker.java    | 7 +------
 .../abi/aarch64/windows/WindowsAArch64Linker.java        | 7 +------
 .../internal/foreign/abi/fallback/FallbackLinker.java    | 5 -----
 .../internal/foreign/abi/ppc64/aix/AixPPC64Linker.java   | 9 ++-------
 .../foreign/abi/ppc64/linux/LinuxPPC64Linker.java        | 7 +------
 .../foreign/abi/ppc64/linux/LinuxPPC64leLinker.java      | 7 +------
 .../foreign/abi/riscv64/linux/LinuxRISCV64Linker.java    | 7 +------
 .../internal/foreign/abi/s390/linux/LinuxS390Linker.java | 7 +------
 .../jdk/internal/foreign/abi/x64/sysv/SysVx64Linker.java | 7 +------
 .../foreign/abi/x64/windows/Windowsx64Linker.java        | 7 +------
 12 files changed, 11 insertions(+), 69 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
index 12c9a2dfaa2..4f3baaa0e71 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
@@ -141,9 +141,6 @@ public abstract sealed class AbstractLinker implements Linker permits LinuxAArch
         return SystemLookup.getInstance();
     }
 
-    /** {@return byte order used by this linker} */
-    protected abstract ByteOrder linkerByteOrder();
-
     // C spec mandates that variadic arguments smaller than int are promoted to int,
     // and float is promoted to double
     // See: https://en.cppreference.com/w/c/language/conversion#Default_argument_promotions
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/linux/LinuxAArch64Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/linux/LinuxAArch64Linker.java
index 54307e1ec21..4ffd15aefa0 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/linux/LinuxAArch64Linker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/linux/LinuxAArch64Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, 2021, Arm Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -69,11 +69,6 @@ public final class LinuxAArch64Linker extends AbstractLinker {
         return CallArranger.LINUX.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.LITTLE_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/macos/MacOsAArch64Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/macos/MacOsAArch64Linker.java
index 0772c09fdb5..c60f01524df 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/macos/MacOsAArch64Linker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/macos/MacOsAArch64Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Arm Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -69,11 +69,6 @@ public final class MacOsAArch64Linker extends AbstractLinker {
         return CallArranger.MACOS.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.LITTLE_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/windows/WindowsAArch64Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/windows/WindowsAArch64Linker.java
index eac1d49c1dd..23fb046aeb1 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/windows/WindowsAArch64Linker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/windows/WindowsAArch64Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Arm Limited. All rights reserved.
  * Copyright (c) 2021, 2022, Microsoft. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,11 +65,6 @@ public final class WindowsAArch64Linker extends AbstractLinker {
         return CallArranger.WINDOWS.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.LITTLE_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java
index d617e535dd6..59d3810ecc0 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java
@@ -123,11 +123,6 @@ public final class FallbackLinker extends AbstractLinker {
         };
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.nativeOrder();
-    }
-
     private static MemorySegment makeCif(MethodType methodType, FunctionDescriptor function, LinkerOptions options, Arena scope) {
         FFIABI abi = FFIABI.DEFAULT;
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/AixPPC64Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/AixPPC64Linker.java
index 2ec8d31f3f2..503dac3e4fb 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/AixPPC64Linker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/AixPPC64Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -65,7 +65,7 @@ public final class AixPPC64Linker extends AbstractLinker {
             if (vl.byteAlignment() != 4) {
                 throw new IllegalArgumentException("double struct member " + vl + " at offset " + offset + " should be 4-byte aligned");
             }
-            if (vl.order() != linkerByteOrder()) {
+            if (vl.order() != ByteOrder.BIG_ENDIAN) {
                 throw new IllegalArgumentException("double struct member " + vl + " at offset " + offset + " has an unexpected byte order");
             }
         } else {
@@ -83,11 +83,6 @@ public final class AixPPC64Linker extends AbstractLinker {
         return CallArranger.AIX.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.BIG_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/linux/LinuxPPC64Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/linux/LinuxPPC64Linker.java
index 7cf2d524bff..a9f5bb4d600 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/linux/LinuxPPC64Linker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/linux/LinuxPPC64Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -65,11 +65,6 @@ public final class LinuxPPC64Linker extends AbstractLinker {
         return CallArranger.ABIv1.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.BIG_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/linux/LinuxPPC64leLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/linux/LinuxPPC64leLinker.java
index be4d217d547..e8305669ba0 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/linux/LinuxPPC64leLinker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/linux/LinuxPPC64leLinker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -65,11 +65,6 @@ public final class LinuxPPC64leLinker extends AbstractLinker {
         return CallArranger.ABIv2.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.LITTLE_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/riscv64/linux/LinuxRISCV64Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/riscv64/linux/LinuxRISCV64Linker.java
index 1c3558b4742..706fdacf608 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/riscv64/linux/LinuxRISCV64Linker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/riscv64/linux/LinuxRISCV64Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, Institute of Software, Chinese Academy of Sciences.
  * All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,11 +67,6 @@ public final class LinuxRISCV64Linker extends AbstractLinker {
         return LinuxRISCV64CallArranger.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.LITTLE_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java
index 80aa950026e..9810fbf1695 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023 IBM Corp. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -64,11 +64,6 @@ public final class LinuxS390Linker extends AbstractLinker {
         return LinuxS390CallArranger.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.BIG_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVx64Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVx64Linker.java
index 91a0dc76831..b1fce35af83 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVx64Linker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVx64Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -67,11 +67,6 @@ public final class SysVx64Linker extends AbstractLinker {
         return CallArranger.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.LITTLE_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/Windowsx64Linker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/Windowsx64Linker.java
index f262bd6872b..30e4a5bdaf4 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/Windowsx64Linker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/Windowsx64Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -66,11 +66,6 @@ public final class Windowsx64Linker extends AbstractLinker {
         return CallArranger.arrangeUpcall(targetType, function, options);
     }
 
-    @Override
-    protected ByteOrder linkerByteOrder() {
-        return ByteOrder.LITTLE_ENDIAN;
-    }
-
     @Override
     public Map<String, MemoryLayout> canonicalLayouts() {
         return CANONICAL_LAYOUTS;

From ece7d4349a13f75c654e2ca0f4d1b66d3af5cf10 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Thu, 11 Apr 2024 22:05:55 +0000
Subject: [PATCH 014/486] 8329416: Split relocation pointer map into read-write
 and read-only maps

Reviewed-by: iklam, ccheung
---
 src/hotspot/share/cds/archiveBuilder.cpp    |  7 +-
 src/hotspot/share/cds/archiveBuilder.hpp    | 11 ++-
 src/hotspot/share/cds/archiveHeapLoader.cpp |  2 +-
 src/hotspot/share/cds/archiveUtils.cpp      | 37 +++++++++-
 src/hotspot/share/cds/archiveUtils.hpp      | 15 +++-
 src/hotspot/share/cds/filemap.cpp           | 82 +++++++++++++--------
 src/hotspot/share/cds/filemap.hpp           | 14 ++--
 7 files changed, 123 insertions(+), 45 deletions(-)

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 841b68a9fb2..0fc8c29a5b7 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -158,6 +158,8 @@ ArchiveBuilder::ArchiveBuilder() :
   _rw_region("rw", MAX_SHARED_DELTA),
   _ro_region("ro", MAX_SHARED_DELTA),
   _ptrmap(mtClassShared),
+  _rw_ptrmap(mtClassShared),
+  _ro_ptrmap(mtClassShared),
   _rw_src_objs(),
   _ro_src_objs(),
   _src_obj_table(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE),
@@ -1275,8 +1277,11 @@ void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_i
   write_region(mapinfo, MetaspaceShared::rw, &_rw_region, /*read_only=*/false,/*allow_exec=*/false);
   write_region(mapinfo, MetaspaceShared::ro, &_ro_region, /*read_only=*/true, /*allow_exec=*/false);
 
+  // Split pointer map into read-write and read-only bitmaps
+  ArchivePtrMarker::initialize_rw_ro_maps(&_rw_ptrmap, &_ro_ptrmap);
+
   size_t bitmap_size_in_bytes;
-  char* bitmap = mapinfo->write_bitmap_region(ArchivePtrMarker::ptrmap(), heap_info,
+  char* bitmap = mapinfo->write_bitmap_region(ArchivePtrMarker::rw_ptrmap(), ArchivePtrMarker::ro_ptrmap(), heap_info,
                                               bitmap_size_in_bytes);
 
   if (heap_info->is_used()) {
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index 4f811a0c512..a80370d3976 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -204,7 +204,14 @@ private:
 
   DumpRegion _rw_region;
   DumpRegion _ro_region;
-  CHeapBitMap _ptrmap;    // bitmap used by ArchivePtrMarker
+
+  // Combined bitmap to track pointers in both RW and RO regions. This is updated
+  // as objects are copied into RW and RO.
+  CHeapBitMap _ptrmap;
+
+  // _ptrmap is split into these two bitmaps which are written into the archive.
+  CHeapBitMap _rw_ptrmap;   // marks pointers in the RW region
+  CHeapBitMap _ro_ptrmap;   // marks pointers in the RO region
 
   SourceObjList _rw_src_objs;                 // objs to put in rw region
   SourceObjList _ro_src_objs;                 // objs to put in ro region
diff --git a/src/hotspot/share/cds/archiveHeapLoader.cpp b/src/hotspot/share/cds/archiveHeapLoader.cpp
index fe30be16427..2ef502a3643 100644
--- a/src/hotspot/share/cds/archiveHeapLoader.cpp
+++ b/src/hotspot/share/cds/archiveHeapLoader.cpp
@@ -442,7 +442,7 @@ void ArchiveHeapLoader::patch_native_pointers() {
   FileMapRegion* r = FileMapInfo::current_info()->region_at(MetaspaceShared::hp);
   if (r->mapped_base() != nullptr && r->has_ptrmap()) {
     log_info(cds, heap)("Patching native pointers in heap region");
-    BitMapView bm = r->ptrmap_view();
+    BitMapView bm = FileMapInfo::current_info()->ptrmap_view(MetaspaceShared::hp);
     PatchNativePointers patcher((Metadata**)r->mapped_base() + FileMapInfo::current_info()->heap_ptrmap_start_pos());
     bm.iterate(&patcher);
   }
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index b14dfc8c33e..5ba36960c55 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -46,12 +46,16 @@
 #include "utilities/globalDefinitions.hpp"
 
 CHeapBitMap* ArchivePtrMarker::_ptrmap = nullptr;
+CHeapBitMap* ArchivePtrMarker::_rw_ptrmap = nullptr;
+CHeapBitMap* ArchivePtrMarker::_ro_ptrmap = nullptr;
 VirtualSpace* ArchivePtrMarker::_vs;
 
 bool ArchivePtrMarker::_compacted;
 
 void ArchivePtrMarker::initialize(CHeapBitMap* ptrmap, VirtualSpace* vs) {
   assert(_ptrmap == nullptr, "initialize only once");
+  assert(_rw_ptrmap == nullptr, "initialize only once");
+  assert(_ro_ptrmap == nullptr, "initialize only once");
   _vs = vs;
   _compacted = false;
   _ptrmap = ptrmap;
@@ -67,6 +71,37 @@ void ArchivePtrMarker::initialize(CHeapBitMap* ptrmap, VirtualSpace* vs) {
   _ptrmap->initialize(estimated_archive_size / sizeof(intptr_t));
 }
 
+void ArchivePtrMarker::initialize_rw_ro_maps(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap) {
+  address* rw_bottom = (address*)ArchiveBuilder::current()->rw_region()->base();
+  address* ro_bottom = (address*)ArchiveBuilder::current()->ro_region()->base();
+
+  _rw_ptrmap = rw_ptrmap;
+  _ro_ptrmap = ro_ptrmap;
+
+  size_t rw_size = ArchiveBuilder::current()->rw_region()->used() / sizeof(address);
+  size_t ro_size = ArchiveBuilder::current()->ro_region()->used() / sizeof(address);
+  // ro_start is the first bit in _ptrmap that covers the pointer that would sit at ro_bottom.
+  // E.g., if rw_bottom = (address*)100
+  //          ro_bottom = (address*)116
+  //       then for 64-bit platform:
+  //          ro_start = ro_bottom - rw_bottom = (116 - 100) / sizeof(address) = 2;
+  size_t ro_start = ro_bottom - rw_bottom;
+
+  // Note: ptrmap is big enough only to cover the last pointer in ro_region.
+  // See ArchivePtrMarker::compact()
+  _rw_ptrmap->initialize(rw_size);
+  _ro_ptrmap->initialize(_ptrmap->size() - ro_start);
+
+  for (size_t rw_bit = 0; rw_bit < _rw_ptrmap->size(); rw_bit++) {
+    _rw_ptrmap->at_put(rw_bit, _ptrmap->at(rw_bit));
+  }
+
+  for(size_t ro_bit = ro_start; ro_bit < _ptrmap->size(); ro_bit++) {
+    _ro_ptrmap->at_put(ro_bit-ro_start, _ptrmap->at(ro_bit));
+  }
+  assert(_ptrmap->size() - ro_start == _ro_ptrmap->size(), "must be");
+}
+
 void ArchivePtrMarker::mark_pointer(address* ptr_loc) {
   assert(_ptrmap != nullptr, "not initialized");
   assert(!_compacted, "cannot mark anymore");
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index 2c965f8fe9c..efe5a468b93 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,8 @@ class VirtualSpace;
 // fixed, but _ptr_end can be expanded as more objects are dumped.
 class ArchivePtrMarker : AllStatic {
   static CHeapBitMap*  _ptrmap;
+  static CHeapBitMap*  _rw_ptrmap;
+  static CHeapBitMap*  _ro_ptrmap;
   static VirtualSpace* _vs;
 
   // Once _ptrmap is compacted, we don't allow bit marking anymore. This is to
@@ -53,6 +55,7 @@ class ArchivePtrMarker : AllStatic {
 
 public:
   static void initialize(CHeapBitMap* ptrmap, VirtualSpace* vs);
+  static void initialize_rw_ro_maps(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap);
   static void mark_pointer(address* ptr_loc);
   static void clear_pointer(address* ptr_loc);
   static void compact(address relocatable_base, address relocatable_end);
@@ -73,8 +76,18 @@ public:
     return _ptrmap;
   }
 
+  static CHeapBitMap* rw_ptrmap() {
+    return _rw_ptrmap;
+  }
+
+  static CHeapBitMap* ro_ptrmap() {
+    return _ro_ptrmap;
+  }
+
   static void reset_map_and_vs() {
     _ptrmap = nullptr;
+    _rw_ptrmap = nullptr;
+    _ro_ptrmap = nullptr;
     _vs = nullptr;
   }
 };
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 2b35e64c264..c81838ed2ef 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -294,7 +294,6 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- allow_archiving_with_java_agent:%d", _allow_archiving_with_java_agent);
   st->print_cr("- use_optimized_module_handling:  %d", _use_optimized_module_handling);
   st->print_cr("- has_full_module_graph           %d", _has_full_module_graph);
-  st->print_cr("- ptrmap_size_in_bits:            " SIZE_FORMAT, _ptrmap_size_in_bits);
 }
 
 void SharedClassPathEntry::init_as_non_existent(const char* path, TRAPS) {
@@ -1453,22 +1452,6 @@ void FileMapRegion::init_ptrmap(size_t offset, size_t size_in_bits) {
   _ptrmap_size_in_bits = size_in_bits;
 }
 
-BitMapView FileMapRegion::bitmap_view(bool is_oopmap) {
-  char* bitmap_base = FileMapInfo::current_info()->map_bitmap_region();
-  bitmap_base += is_oopmap ? _oopmap_offset : _ptrmap_offset;
-  size_t size_in_bits = is_oopmap ? _oopmap_size_in_bits : _ptrmap_size_in_bits;
-  return BitMapView((BitMap::bm_word_t*)(bitmap_base), size_in_bits);
-}
-
-BitMapView FileMapRegion::oopmap_view() {
-  return bitmap_view(true);
-}
-
-BitMapView FileMapRegion::ptrmap_view() {
-  assert(has_ptrmap(), "must be");
-  return bitmap_view(false);
-}
-
 bool FileMapRegion::check_region_crc(char* base) const {
   // This function should be called after the region has been properly
   // loaded into memory via FileMapInfo::map_region() or FileMapInfo::read_region().
@@ -1497,6 +1480,27 @@ static const char* region_name(int region_index) {
   return names[region_index];
 }
 
+BitMapView FileMapInfo::bitmap_view(int region_index, bool is_oopmap) {
+  FileMapRegion* r = region_at(region_index);
+  char* bitmap_base = is_static() ? FileMapInfo::current_info()->map_bitmap_region() : FileMapInfo::dynamic_info()->map_bitmap_region();
+  bitmap_base += is_oopmap ? r->oopmap_offset() : r->ptrmap_offset();
+  size_t size_in_bits = is_oopmap ? r->oopmap_size_in_bits() : r->ptrmap_size_in_bits();
+
+  log_debug(cds, reloc)("mapped %s relocation %smap @ " INTPTR_FORMAT " (" SIZE_FORMAT " bits)",
+                        region_name(region_index), is_oopmap ? "oop" : "ptr",
+                        p2i(bitmap_base), size_in_bits);
+
+  return BitMapView((BitMap::bm_word_t*)(bitmap_base), size_in_bits);
+}
+
+BitMapView FileMapInfo::oopmap_view(int region_index) {
+    return bitmap_view(region_index, /*is_oopmap*/true);
+  }
+
+BitMapView FileMapInfo::ptrmap_view(int region_index) {
+  return bitmap_view(region_index, /*is_oopmap*/false);
+}
+
 void FileMapRegion::print(outputStream* st, int region_index) {
   st->print_cr("============ region ============= %d \"%s\"", region_index, region_name(region_index));
   st->print_cr("- crc:                            0x%08x", _crc);
@@ -1510,6 +1514,8 @@ void FileMapRegion::print(outputStream* st, int region_index) {
   st->print_cr("- used:                           " SIZE_FORMAT, _used);
   st->print_cr("- oopmap_offset:                  " SIZE_FORMAT_X, _oopmap_offset);
   st->print_cr("- oopmap_size_in_bits:            " SIZE_FORMAT, _oopmap_size_in_bits);
+  st->print_cr("- ptrmap_offset:                  " SIZE_FORMAT_X, _ptrmap_offset);
+  st->print_cr("- ptrmap_size_in_bits:            " SIZE_FORMAT, _ptrmap_size_in_bits);
   st->print_cr("- mapped_base:                    " INTPTR_FORMAT, p2i(_mapped_base));
 }
 
@@ -1586,9 +1592,9 @@ size_t FileMapInfo::remove_bitmap_leading_zeros(CHeapBitMap* map) {
   return old_zeros;
 }
 
-char* FileMapInfo::write_bitmap_region(const CHeapBitMap* ptrmap, ArchiveHeapInfo* heap_info,
+char* FileMapInfo::write_bitmap_region(const CHeapBitMap* rw_ptrmap, const CHeapBitMap* ro_ptrmap, ArchiveHeapInfo* heap_info,
                                        size_t &size_in_bytes) {
-  size_in_bytes = ptrmap->size_in_bytes();
+  size_in_bytes = rw_ptrmap->size_in_bytes() + ro_ptrmap->size_in_bytes();
 
   if (heap_info->is_used()) {
     // Remove leading zeros
@@ -1602,14 +1608,19 @@ char* FileMapInfo::write_bitmap_region(const CHeapBitMap* ptrmap, ArchiveHeapInf
     size_in_bytes += heap_info->ptrmap()->size_in_bytes();
   }
 
-  // The bitmap region contains up to 3 parts:
-  // ptrmap:              metaspace pointers inside the ro/rw regions
+  // The bitmap region contains up to 4 parts:
+  // rw_ptrmap:           metaspace pointers inside the read-write region
+  // ro_ptrmap:           metaspace pointers inside the read-only region
   // heap_info->oopmap(): Java oop pointers in the heap region
   // heap_info->ptrmap(): metaspace pointers in the heap region
   char* buffer = NEW_C_HEAP_ARRAY(char, size_in_bytes, mtClassShared);
   size_t written = 0;
-  written = write_bitmap(ptrmap, buffer, written);
-  header()->set_ptrmap_size_in_bits(ptrmap->size());
+
+  region_at(MetaspaceShared::rw)->init_ptrmap(0, rw_ptrmap->size());
+  written = write_bitmap(rw_ptrmap, buffer, written);
+
+  region_at(MetaspaceShared::ro)->init_ptrmap(written, ro_ptrmap->size());
+  written = write_bitmap(ro_ptrmap, buffer, written);
 
   if (heap_info->is_used()) {
     FileMapRegion* r = region_at(MetaspaceShared::hp);
@@ -1904,15 +1915,19 @@ bool FileMapInfo::relocate_pointers_in_core_regions(intx addr_delta) {
   if (bitmap_base == nullptr) {
     return false; // OOM, or CRC check failure
   } else {
-    size_t ptrmap_size_in_bits = header()->ptrmap_size_in_bits();
-    log_debug(cds, reloc)("mapped relocation bitmap @ " INTPTR_FORMAT " (" SIZE_FORMAT " bits)",
-                          p2i(bitmap_base), ptrmap_size_in_bits);
+    BitMapView rw_ptrmap = ptrmap_view(MetaspaceShared::rw);
+    BitMapView ro_ptrmap = ptrmap_view(MetaspaceShared::ro);
 
-    BitMapView ptrmap((BitMap::bm_word_t*)bitmap_base, ptrmap_size_in_bits);
+    FileMapRegion* rw_region = first_core_region();
+    FileMapRegion* ro_region = last_core_region();
 
-    // Patch all pointers in the mapped region that are marked by ptrmap.
-    address patch_base = (address)mapped_base();
-    address patch_end  = (address)mapped_end();
+    // Patch all pointers inside the RW region
+    address rw_patch_base = (address)rw_region->mapped_base();
+    address rw_patch_end  = (address)rw_region->mapped_end();
+
+    // Patch all pointers inside the RO region
+    address ro_patch_base = (address)ro_region->mapped_base();
+    address ro_patch_end  = (address)ro_region->mapped_end();
 
     // the current value of the pointers to be patched must be within this
     // range (i.e., must be between the requested base address and the address of the current archive).
@@ -1925,9 +1940,12 @@ bool FileMapInfo::relocate_pointers_in_core_regions(intx addr_delta) {
     address valid_new_base = (address)header()->mapped_base_address();
     address valid_new_end  = (address)mapped_end();
 
-    SharedDataRelocator patcher((address*)patch_base, (address*)patch_end, valid_old_base, valid_old_end,
+    SharedDataRelocator rw_patcher((address*)rw_patch_base, (address*)rw_patch_end, valid_old_base, valid_old_end,
                                 valid_new_base, valid_new_end, addr_delta);
-    ptrmap.iterate(&patcher);
+    SharedDataRelocator ro_patcher((address*)ro_patch_base, (address*)ro_patch_end, valid_old_base, valid_old_end,
+                                valid_new_base, valid_new_end, addr_delta);
+    rw_ptrmap.iterate(&rw_patcher);
+    ro_ptrmap.iterate(&ro_patcher);
 
     // The MetaspaceShared::bm region will be unmapped in MetaspaceShared::initialize_shared_spaces().
 
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index e7c131ee5bb..6d106ef099d 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -131,7 +131,6 @@ public:
 
 
 class FileMapRegion: private CDSFileMapRegion {
-  BitMapView bitmap_view(bool is_oopmap);
 public:
   void assert_is_heap_region() const {
     assert(_is_heap_region, "must be heap region");
@@ -158,6 +157,8 @@ public:
   bool   mapped_from_file()         const { return _mapped_from_file != 0; }
   size_t oopmap_offset()            const { assert_is_heap_region();     return _oopmap_offset; }
   size_t oopmap_size_in_bits()      const { assert_is_heap_region();     return _oopmap_size_in_bits; }
+  size_t ptrmap_offset()            const { return _ptrmap_offset; }
+  size_t ptrmap_size_in_bits()      const { return _ptrmap_size_in_bits; }
 
   void set_file_offset(size_t s)     { _file_offset = s; }
   void set_read_only(bool v)         { _read_only = v; }
@@ -167,8 +168,6 @@ public:
             bool allow_exec, int crc);
   void init_oopmap(size_t offset, size_t size_in_bits);
   void init_ptrmap(size_t offset, size_t size_in_bits);
-  BitMapView oopmap_view();
-  BitMapView ptrmap_view();
   bool has_ptrmap()                  { return _ptrmap_size_in_bits != 0; }
 
   bool check_region_crc(char* base) const;
@@ -225,7 +224,6 @@ private:
   bool   _use_optimized_module_handling;// No module-relation VM options were specified, so we can skip
                                         // some expensive operations.
   bool   _has_full_module_graph;        // Does this CDS archive contain the full archived module graph?
-  size_t _ptrmap_size_in_bits;          // Size of pointer relocation bitmap
   size_t _heap_roots_offset;            // Offset of the HeapShared::roots() object, from the bottom
                                         // of the archived heap objects, in bytes.
   size_t _heap_oopmap_start_pos;        // The first bit in the oopmap corresponds to this position in the heap.
@@ -267,7 +265,6 @@ public:
   char* mapped_base_address()              const { return _mapped_base_address; }
   bool has_platform_or_app_classes()       const { return _has_platform_or_app_classes; }
   bool has_non_jar_in_classpath()          const { return _has_non_jar_in_classpath; }
-  size_t ptrmap_size_in_bits()             const { return _ptrmap_size_in_bits; }
   bool compressed_oops()                   const { return _compressed_oops; }
   bool compressed_class_pointers()         const { return _compressed_class_ptrs; }
   size_t heap_roots_offset()               const { return _heap_roots_offset; }
@@ -282,7 +279,6 @@ public:
   void set_has_platform_or_app_classes(bool v)   { _has_platform_or_app_classes = v; }
   void set_cloned_vtables(char* p)               { set_as_offset(p, &_cloned_vtables_offset); }
   void set_serialized_data(char* p)              { set_as_offset(p, &_serialized_data_offset); }
-  void set_ptrmap_size_in_bits(size_t s)         { _ptrmap_size_in_bits = s; }
   void set_mapped_base_address(char* p)          { _mapped_base_address = p; }
   void set_heap_roots_offset(size_t n)           { _heap_roots_offset = n; }
   void set_heap_oopmap_start_pos(size_t n)       { _heap_oopmap_start_pos = n; }
@@ -443,7 +439,7 @@ public:
   void  write_region(int region, char* base, size_t size,
                      bool read_only, bool allow_exec);
   size_t remove_bitmap_leading_zeros(CHeapBitMap* map);
-  char* write_bitmap_region(const CHeapBitMap* ptrmap, ArchiveHeapInfo* heap_info,
+  char* write_bitmap_region(const CHeapBitMap* rw_ptrmap, const CHeapBitMap* ro_ptrmap, ArchiveHeapInfo* heap_info,
                             size_t &size_in_bytes);
   size_t write_heap_region(ArchiveHeapInfo* heap_info);
   void  write_bytes(const void* buffer, size_t count);
@@ -526,6 +522,10 @@ public:
     return header()->region_at(i);
   }
 
+  BitMapView bitmap_view(int region_index, bool is_oopmap);
+  BitMapView oopmap_view(int region_index);
+  BitMapView ptrmap_view(int region_index);
+
   void print(outputStream* st) const;
 
   const char* vm_version() {

From e45fea5a801ac09c3d572ac07d6179e80c422942 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Fri, 12 Apr 2024 06:04:20 +0000
Subject: [PATCH 015/486] 8329757: Crash with fatal error: DEBUG MESSAGE: Fast
 Unlock lock on stack

Reviewed-by: pchilanomate, kvn
---
 src/hotspot/share/runtime/deoptimization.cpp  | 15 +++-
 src/hotspot/share/runtime/lockStack.cpp       | 58 +++++++++++++++
 src/hotspot/share/runtime/lockStack.hpp       |  5 ++
 .../compiler/escapeAnalysis/Test8329757.java  | 72 +++++++++++++++++++
 4 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/escapeAnalysis/Test8329757.java

diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 1bdc597e4ce..cf2f7e9c216 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -391,6 +391,7 @@ static void restore_eliminated_locks(JavaThread* thread, GrowableArray<compiledV
 #ifndef PRODUCT
   bool first = true;
 #endif // !PRODUCT
+  DEBUG_ONLY(GrowableArray<oop> lock_order{0};)
   // Start locking from outermost/oldest frame
   for (int i = (chunk->length() - 1); i >= 0; i--) {
     compiledVFrame* cvf = chunk->at(i);
@@ -400,6 +401,13 @@ static void restore_eliminated_locks(JavaThread* thread, GrowableArray<compiledV
       bool relocked = Deoptimization::relock_objects(thread, monitors, deoptee_thread, deoptee,
                                                      exec_mode, realloc_failures);
       deoptimized_objects = deoptimized_objects || relocked;
+#ifdef ASSERT
+      if (LockingMode == LM_LIGHTWEIGHT && !realloc_failures) {
+        for (MonitorInfo* mi : *monitors) {
+          lock_order.push(mi->owner());
+        }
+      }
+#endif // ASSERT
 #ifndef PRODUCT
       if (PrintDeoptimizationDetails) {
         ResourceMark rm;
@@ -431,6 +439,11 @@ static void restore_eliminated_locks(JavaThread* thread, GrowableArray<compiledV
 #endif // !PRODUCT
     }
   }
+#ifdef ASSERT
+  if (LockingMode == LM_LIGHTWEIGHT && !realloc_failures) {
+    deoptee_thread->lock_stack().verify_consistent_lock_order(lock_order, exec_mode != Deoptimization::Unpack_none);
+  }
+#endif // ASSERT
 }
 
 // Deoptimize objects, that is reallocate and relock them, just before they escape through JVMTI.
@@ -1642,7 +1655,7 @@ bool Deoptimization::relock_objects(JavaThread* thread, GrowableArray<MonitorInf
             }
           }
         }
-        if (LockingMode == LM_LIGHTWEIGHT && exec_mode == Unpack_none) {
+        if (LockingMode == LM_LIGHTWEIGHT) {
           // We have lost information about the correct state of the lock stack.
           // Inflate the locks instead. Enter then inflate to avoid races with
           // deflation.
diff --git a/src/hotspot/share/runtime/lockStack.cpp b/src/hotspot/share/runtime/lockStack.cpp
index d7dcbdda7e9..c7889da1a76 100644
--- a/src/hotspot/share/runtime/lockStack.cpp
+++ b/src/hotspot/share/runtime/lockStack.cpp
@@ -26,8 +26,11 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
+#include "oops/markWord.hpp"
+#include "oops/oop.inline.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/lockStack.inline.hpp"
+#include "runtime/objectMonitor.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/stackWatermark.hpp"
 #include "runtime/stackWatermarkSet.inline.hpp"
@@ -35,6 +38,7 @@
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/growableArray.hpp"
 #include "utilities/ostream.hpp"
 
 #include <type_traits>
@@ -99,6 +103,60 @@ void LockStack::verify(const char* msg) const {
 }
 #endif
 
+#ifdef ASSERT
+void LockStack::verify_consistent_lock_order(GrowableArray<oop>& lock_order, bool leaf_frame) const {
+  int top_index = to_index(_top);
+  int lock_index = lock_order.length();
+
+  if (!leaf_frame) {
+    // If the lock_order is not from the leaf frame we must search
+    // for the top_index which fits with the most recent fast_locked
+    // objects in the lock stack.
+    while (lock_index-- > 0) {
+      const oop obj = lock_order.at(lock_index);
+      if (contains(obj)) {
+        for (int index = 0; index < top_index; index++) {
+          if (_base[index] == obj) {
+            // Found top index
+            top_index = index + 1;
+            break;
+          }
+        }
+
+        if (VM_Version::supports_recursive_lightweight_locking()) {
+          // With recursive looks there may be more of the same object
+          while (lock_index-- > 0 && lock_order.at(lock_index) == obj) {
+            top_index++;
+          }
+          assert(top_index <= to_index(_top), "too many obj in lock_order");
+        }
+
+        break;
+      }
+    }
+
+    lock_index = lock_order.length();
+  }
+
+  while (lock_index-- > 0) {
+    const oop obj = lock_order.at(lock_index);
+    const markWord mark = obj->mark_acquire();
+    assert(obj->is_locked(), "must be locked");
+    if (top_index > 0 && obj == _base[top_index - 1]) {
+      assert(mark.is_fast_locked() || mark.monitor()->is_owner_anonymous(),
+             "must be fast_locked or inflated by other thread");
+      top_index--;
+    } else {
+      assert(!mark.is_fast_locked(), "must be inflated");
+      assert(mark.monitor()->owner_raw() == get_thread() ||
+             (!leaf_frame && get_thread()->current_waiting_monitor() == mark.monitor()),
+             "must be owned by (or waited on by) thread");
+      assert(!contains(obj), "must not be on lock_stack");
+    }
+  }
+}
+#endif
+
 void LockStack::print_on(outputStream* st) {
   for (int i = to_index(_top); (--i) >= 0;) {
     st->print("LockStack[%d]: ", i);
diff --git a/src/hotspot/share/runtime/lockStack.hpp b/src/hotspot/share/runtime/lockStack.hpp
index 17b0a1ca836..2cf02f00a8d 100644
--- a/src/hotspot/share/runtime/lockStack.hpp
+++ b/src/hotspot/share/runtime/lockStack.hpp
@@ -34,6 +34,8 @@
 class JavaThread;
 class OopClosure;
 class outputStream;
+template<typename>
+class GrowableArray;
 
 class LockStack {
   friend class LockStackTest;
@@ -119,6 +121,9 @@ public:
 
   // Printing
   void print_on(outputStream* st);
+
+  // Verify Lock Stack consistent with lock order
+  void verify_consistent_lock_order(GrowableArray<oop>& lock_order, bool leaf_frame) const NOT_DEBUG_RETURN;
 };
 
 #endif // SHARE_RUNTIME_LOCKSTACK_HPP
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/Test8329757.java b/test/hotspot/jtreg/compiler/escapeAnalysis/Test8329757.java
new file mode 100644
index 00000000000..483c2c49962
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/Test8329757.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2024, 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 8329757
+ * @summary Deoptimization with nested eliminated and not eliminated locks
+ *          caused reordered lock stacks. This can be handled by the interpreter
+ *          but when a frame is migrated back to compiled code via OSR the C2
+ *          assumption about balanced monitorenter-monitorexit is broken.
+ *
+ * @requires vm.compMode != "Xint"
+ *
+ * @run main/othervm compiler.escapeAnalysis.Test8329757
+ */
+
+package compiler.escapeAnalysis;
+
+public class Test8329757 {
+
+    int a = 400;
+    Double ddd;
+
+    void q() {
+        int e;
+        synchronized (new Double(1.1f)) {
+        int[] f = new int[a];
+        synchronized (Test8329757.class) {
+            for (int d = 4; d < 127; d++) {
+            e = 13;
+            do switch (d * 5) {
+                case 0:
+                case 42:
+                case 29:
+                e = d;
+                default:
+                f[1] = e;
+            } while (--e > 0);
+            }
+        }
+        }
+    }
+
+    void n() {
+        for (int j = 6; j < 274; ++j) q();
+    }
+
+    public static void main(String[] args) {
+        Test8329757 r = new Test8329757();
+        for (int i = 0; i < 1000; i++) r.n();
+    }
+}

From bde3fc0c03c87d1f2605ae6bb84c33fadb7aa865 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Fri, 12 Apr 2024 07:17:27 +0000
Subject: [PATCH 016/486] 8330106: C2: VectorInsertNode::make() shouldn't call
 ConINode::make() directly

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/vectorIntrinsics.cpp | 2 +-
 src/hotspot/share/opto/vectornode.cpp       | 4 ++--
 src/hotspot/share/opto/vectornode.hpp       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 41d8fd713e0..5249d8d67af 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -2696,7 +2696,7 @@ bool LibraryCallKit::inline_vector_insert() {
     default: fatal("%s", type2name(elem_bt)); break;
   }
 
-  Node* operation = gvn().transform(VectorInsertNode::make(opd, insert_val, idx->get_con()));
+  Node* operation = gvn().transform(VectorInsertNode::make(opd, insert_val, idx->get_con(), gvn()));
 
   Node* vbox = box_vector(operation, vbox_type, elem_bt, num_elem);
   set_result(vbox);
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index f81c29649bb..bef4a2a1095 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1676,9 +1676,9 @@ Node* VectorReinterpretNode::Identity(PhaseGVN *phase) {
   return this;
 }
 
-Node* VectorInsertNode::make(Node* vec, Node* new_val, int position) {
+Node* VectorInsertNode::make(Node* vec, Node* new_val, int position, PhaseGVN& gvn) {
   assert(position < (int)vec->bottom_type()->is_vect()->length(), "pos in range");
-  ConINode* pos = ConINode::make(position);
+  ConINode* pos = gvn.intcon(position);
   return new VectorInsertNode(vec, new_val, pos, vec->bottom_type()->is_vect());
 }
 
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index 740c07d64ff..ae37202cd25 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -1688,7 +1688,7 @@ class VectorInsertNode : public VectorNode {
   virtual int Opcode() const;
   uint pos() const { return in(3)->get_int(); }
 
-  static Node* make(Node* vec, Node* new_val, int position);
+  static Node* make(Node* vec, Node* new_val, int position, PhaseGVN& gvn);
 };
 
 class VectorBoxNode : public Node {

From 2c45eca15943826cb6bfbdf6e6fd88abc196e8f7 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 12 Apr 2024 07:22:06 +0000
Subject: [PATCH 017/486] 8328879: G1: Some gtests modify global state crashing
 the JVM during GC after JDK-8289822

Reviewed-by: iwalulya, kbarrett
---
 test/hotspot/gtest/gc/g1/test_freeRegionList.cpp | 2 +-
 test/hotspot/gtest/gc/g1/test_heapRegion.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp b/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp
index 91540f7b78d..4639f1c9694 100644
--- a/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp
+++ b/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp
@@ -34,7 +34,7 @@
 #include "unittest.hpp"
 
 // @requires UseG1GC
-TEST_VM(FreeRegionList, length) {
+TEST_OTHER_VM(FreeRegionList, length) {
   if (!UseG1GC) {
     return;
   }
diff --git a/test/hotspot/gtest/gc/g1/test_heapRegion.cpp b/test/hotspot/gtest/gc/g1/test_heapRegion.cpp
index e329a2b80ae..c274e1c8494 100644
--- a/test/hotspot/gtest/gc/g1/test_heapRegion.cpp
+++ b/test/hotspot/gtest/gc/g1/test_heapRegion.cpp
@@ -122,7 +122,7 @@ void VM_HeapRegionApplyToMarkedObjectsTest::doit() {
   region->set_top(old_top);
 }
 
-TEST_VM(HeapRegion, apply_to_marked_object) {
+TEST_OTHER_VM(HeapRegion, apply_to_marked_object) {
   if (!UseG1GC) {
     return;
   }

From 2c8b432b8911bc1a52b02def89e4820c76ea67ba Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Fri, 12 Apr 2024 07:26:01 +0000
Subject: [PATCH 018/486] 8330003: Serial: Move the logic of
 FastEvacuateFollowersClosure to SerialHeap

Reviewed-by: ayang, tschatzl
---
 .../share/gc/serial/defNewGeneration.cpp      | 19 +----------------
 src/hotspot/share/gc/serial/serialHeap.cpp    | 11 +++++++++-
 src/hotspot/share/gc/serial/serialHeap.hpp    |  9 ++------
 .../share/gc/serial/serialHeap.inline.hpp     | 21 ++++++++++++-------
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index ee7ef765fa3..7ac0d9b554a 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -76,20 +76,6 @@ public:
   void do_oop(narrowOop* p) { do_oop_work(p); }
 };
 
-class YoungGenScanClosure : public InHeapScanClosure {
-  template <typename T>
-  void do_oop_work(T* p) {
-    assert(SerialHeap::heap()->young_gen()->to()->is_in_reserved(p), "precondition");
-
-    try_scavenge(p, [] (auto) {});
-  }
-public:
-  YoungGenScanClosure(DefNewGeneration* g) : InHeapScanClosure(g) {}
-
-  void do_oop(oop* p)       { do_oop_work(p); }
-  void do_oop(narrowOop* p) { do_oop_work(p); }
-};
-
 class RootScanClosure : public OffHeapScanClosure {
   template <typename T>
   void do_oop_work(T* p) {
@@ -231,10 +217,7 @@ public:
   {}
 
   void do_void() {
-    do {
-      _heap->oop_since_save_marks_iterate(_young_cl, _old_cl);
-    } while (!_heap->no_allocs_since_save_marks());
-    guarantee(_heap->young_gen()->promo_failure_scan_is_complete(), "Failed to finish scan");
+    _heap->scan_evacuated_objs(_young_cl, _old_cl);
   }
 };
 
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 8c43239b201..84d941fbdb7 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -32,7 +32,7 @@
 #include "gc/serial/cardTableRS.hpp"
 #include "gc/serial/defNewGeneration.inline.hpp"
 #include "gc/serial/serialFullGC.hpp"
-#include "gc/serial/serialHeap.hpp"
+#include "gc/serial/serialHeap.inline.hpp"
 #include "gc/serial/serialMemoryPools.hpp"
 #include "gc/serial/serialVMOperations.hpp"
 #include "gc/serial/tenuredGeneration.inline.hpp"
@@ -762,6 +762,15 @@ bool SerialHeap::no_allocs_since_save_marks() {
          _old_gen->no_allocs_since_save_marks();
 }
 
+void SerialHeap::scan_evacuated_objs(YoungGenScanClosure* young_cl,
+                                     OldGenScanClosure* old_cl) {
+  do {
+    young_gen()->oop_since_save_marks_iterate(young_cl);
+    old_gen()->oop_since_save_marks_iterate(old_cl);
+  } while (!no_allocs_since_save_marks());
+  guarantee(young_gen()->promo_failure_scan_is_complete(), "Failed to finish scan");
+}
+
 // public collection interfaces
 void SerialHeap::collect(GCCause::Cause cause) {
   // The caller doesn't have the Heap_lock
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index 54a776406fa..d13b8706c22 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -355,13 +355,8 @@ public:
     return _old_gen;
   }
 
-  // Apply "cur->do_oop" or "older->do_oop" to all the oops in objects
-  // allocated since the last call to save_marks in the young generation.
-  // The "cur" closure is applied to references in the younger generation
-  // at "level", and the "older" closure to older generations.
-  template <typename OopClosureType1, typename OopClosureType2>
-  void oop_since_save_marks_iterate(OopClosureType1* cur,
-                                    OopClosureType2* older);
+  void scan_evacuated_objs(YoungGenScanClosure* young_cl,
+                           OldGenScanClosure* old_cl);
 
   void safepoint_synchronize_begin() override;
   void safepoint_synchronize_end() override;
diff --git a/src/hotspot/share/gc/serial/serialHeap.inline.hpp b/src/hotspot/share/gc/serial/serialHeap.inline.hpp
index 27819f0d1c9..750c0e9c311 100644
--- a/src/hotspot/share/gc/serial/serialHeap.inline.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.inline.hpp
@@ -30,13 +30,6 @@
 #include "gc/serial/defNewGeneration.inline.hpp"
 #include "gc/serial/tenuredGeneration.inline.hpp"
 
-template <typename OopClosureType1, typename OopClosureType2>
-void SerialHeap::oop_since_save_marks_iterate(OopClosureType1* cur,
-                                              OopClosureType2* older) {
-  young_gen()->oop_since_save_marks_iterate(cur);
-  old_gen()->oop_since_save_marks_iterate(older);
-}
-
 class ScavengeHelper {
   DefNewGeneration* _young_gen;
   HeapWord*         _young_gen_end;
@@ -100,6 +93,20 @@ protected:
   OffHeapScanClosure(DefNewGeneration* young_gen) :  _helper(young_gen) {}
 };
 
+class YoungGenScanClosure : public InHeapScanClosure {
+  template <typename T>
+  void do_oop_work(T* p) {
+    assert(SerialHeap::heap()->young_gen()->to()->is_in_reserved(p), "precondition");
+
+    try_scavenge(p, [] (auto) {});
+  }
+public:
+  YoungGenScanClosure(DefNewGeneration* g) : InHeapScanClosure(g) {}
+
+  void do_oop(oop* p)       { do_oop_work(p); }
+  void do_oop(narrowOop* p) { do_oop_work(p); }
+};
+
 class OldGenScanClosure : public InHeapScanClosure {
   CardTableRS* _rs;
 

From c7fcd62302a4b70214e4aea7052e661a2aa9b03b Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Fri, 12 Apr 2024 07:29:41 +0000
Subject: [PATCH 019/486] 8330006: Serial: Extract out
 ContiguousSpace::block_start_const

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/serial/cardTableRS.cpp   | 12 +++----
 src/hotspot/share/gc/serial/cardTableRS.hpp   |  4 +--
 .../share/gc/serial/defNewGeneration.cpp      | 29 +++++++++++++--
 .../share/gc/serial/tenuredGeneration.cpp     | 18 ++++++++--
 .../share/gc/serial/tenuredGeneration.hpp     |  2 +-
 src/hotspot/share/gc/shared/space.cpp         | 35 -------------------
 src/hotspot/share/gc/shared/space.hpp         |  8 -----
 7 files changed, 50 insertions(+), 58 deletions(-)

diff --git a/src/hotspot/share/gc/serial/cardTableRS.cpp b/src/hotspot/share/gc/serial/cardTableRS.cpp
index 789b5f21cff..71492a8468d 100644
--- a/src/hotspot/share/gc/serial/cardTableRS.cpp
+++ b/src/hotspot/share/gc/serial/cardTableRS.cpp
@@ -31,9 +31,9 @@
 #include "memory/iterator.inline.hpp"
 #include "utilities/align.hpp"
 
-void CardTableRS::scan_old_to_young_refs(TenuredSpace* sp, HeapWord* saved_mark_word) {
-  const MemRegion ur    = sp->used_region();
-  const MemRegion urasm = MemRegion(sp->bottom(), saved_mark_word);
+void CardTableRS::scan_old_to_young_refs(TenuredGeneration* tg, HeapWord* saved_mark_word) {
+  const MemRegion ur    = tg->used_region();
+  const MemRegion urasm = MemRegion(tg->space()->bottom(), saved_mark_word);
 
   assert(ur.contains(urasm),
          "Did you forget to call save_marks()? "
@@ -43,7 +43,7 @@ void CardTableRS::scan_old_to_young_refs(TenuredSpace* sp, HeapWord* saved_mark_
 
   if (!urasm.is_empty()) {
     OldGenScanClosure cl(SerialHeap::heap()->young_gen());
-    non_clean_card_iterate(sp, urasm, &cl);
+    non_clean_card_iterate(tg, urasm, &cl);
   }
 }
 
@@ -225,7 +225,7 @@ static void scan_obj_with_limit(oop obj,
   }
 }
 
-void CardTableRS::non_clean_card_iterate(TenuredSpace* sp,
+void CardTableRS::non_clean_card_iterate(TenuredGeneration* tg,
                                          MemRegion mr,
                                          OldGenScanClosure* cl) {
   struct {
@@ -238,7 +238,7 @@ void CardTableRS::non_clean_card_iterate(TenuredSpace* sp,
       assert(cached_obj.start_addr != nullptr, "inv");
       return cached_obj.start_addr;
     }
-    HeapWord* result = sp->block_start_const(addr);
+    HeapWord* result = tg->block_start(addr);
 
     cached_obj.start_addr = result;
     cached_obj.end_addr = result + cast_to_oop(result)->size();
diff --git a/src/hotspot/share/gc/serial/cardTableRS.hpp b/src/hotspot/share/gc/serial/cardTableRS.hpp
index 9be2c720dcb..c12cd906482 100644
--- a/src/hotspot/share/gc/serial/cardTableRS.hpp
+++ b/src/hotspot/share/gc/serial/cardTableRS.hpp
@@ -60,7 +60,7 @@ class CardTableRS : public CardTable {
 public:
   CardTableRS(MemRegion whole_heap);
 
-  void scan_old_to_young_refs(TenuredSpace* sp, HeapWord* saved_mark_word);
+  void scan_old_to_young_refs(TenuredGeneration* tg, HeapWord* saved_mark_word);
 
   void inline_write_ref_field_gc(void* field) {
     CardValue* byte = byte_for(field);
@@ -83,7 +83,7 @@ public:
   // Iterate over the portion of the card-table which covers the given
   // region mr in the given space and apply cl to any dirty sub-regions
   // of mr. Clears the dirty cards as they are processed.
-  void non_clean_card_iterate(TenuredSpace* sp,
+  void non_clean_card_iterate(TenuredGeneration* tg,
                               MemRegion mr,
                               OldGenScanClosure* cl);
 
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 7ac0d9b554a..9817bb7620c 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -571,15 +571,38 @@ void DefNewGeneration::object_iterate(ObjectClosure* blk) {
   from()->object_iterate(blk);
 }
 
+// If "p" is in the space, returns the address of the start of the
+// "block" that contains "p".  We say "block" instead of "object" since
+// some heaps may not pack objects densely; a chunk may either be an
+// object or a non-object.  If "p" is not in the space, return null.
+// Very general, slow implementation.
+static HeapWord* block_start_const(const ContiguousSpace* cs, const void* p) {
+  assert(MemRegion(cs->bottom(), cs->end()).contains(p),
+         "p (" PTR_FORMAT ") not in space [" PTR_FORMAT ", " PTR_FORMAT ")",
+         p2i(p), p2i(cs->bottom()), p2i(cs->end()));
+  if (p >= cs->top()) {
+    return cs->top();
+  } else {
+    HeapWord* last = cs->bottom();
+    HeapWord* cur = last;
+    while (cur <= p) {
+      last = cur;
+      cur += cast_to_oop(cur)->size();
+    }
+    assert(oopDesc::is_oop(cast_to_oop(last)), PTR_FORMAT " should be an object start", p2i(last));
+    return last;
+  }
+}
+
 HeapWord* DefNewGeneration::block_start(const void* p) const {
   if (eden()->is_in_reserved(p)) {
-    return eden()->block_start_const(p);
+    return block_start_const(eden(), p);
   }
   if (from()->is_in_reserved(p)) {
-    return from()->block_start_const(p);
+    return block_start_const(from(), p);
   }
   assert(to()->is_in_reserved(p), "inv");
-  return to()->block_start_const(p);
+  return block_start_const(to(), p);
 }
 
 // The last collection bailed out, we are running out of heap space,
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index d6a1a4a6910..ddbb7b8403b 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -264,12 +264,24 @@ void TenuredGeneration::compute_new_size_inner() {
   }
 }
 
-HeapWord* TenuredGeneration::block_start(const void* p) const {
-  return space()->block_start_const(p);
+HeapWord* TenuredGeneration::block_start(const void* addr) const {
+  HeapWord* cur_block = _bts->block_start_reaching_into_card(addr);
+
+  while (true) {
+    HeapWord* next_block = cur_block + cast_to_oop(cur_block)->size();
+    if (next_block > addr) {
+      assert(cur_block <= addr, "postcondition");
+      return cur_block;
+    }
+    cur_block = next_block;
+    // Because the BOT is precise, we should never step into the next card
+    // (i.e. crossing the card boundary).
+    assert(!SerialBlockOffsetTable::is_crossing_card_boundary(cur_block, (HeapWord*)addr), "must be");
+  }
 }
 
 void TenuredGeneration::scan_old_to_young_refs() {
-  _rs->scan_old_to_young_refs(space(), saved_mark_word());
+  _rs->scan_old_to_young_refs(this, saved_mark_word());
 }
 
 TenuredGeneration::TenuredGeneration(ReservedSpace rs,
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 9983790b82e..04d5d612074 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -112,7 +112,7 @@ public:
     return _virtual_space.uncommitted_size() == 0;
   }
 
-  HeapWord* block_start(const void* p) const;
+  HeapWord* block_start(const void* addr) const;
 
   void scan_old_to_young_refs();
 
diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
index f5622cd64de..a7e22856a56 100644
--- a/src/hotspot/share/gc/shared/space.cpp
+++ b/src/hotspot/share/gc/shared/space.cpp
@@ -125,25 +125,6 @@ void ContiguousSpace::object_iterate(ObjectClosure* blk) {
   }
 }
 
-// Very general, slow implementation.
-HeapWord* ContiguousSpace::block_start_const(const void* p) const {
-  assert(MemRegion(bottom(), end()).contains(p),
-         "p (" PTR_FORMAT ") not in space [" PTR_FORMAT ", " PTR_FORMAT ")",
-         p2i(p), p2i(bottom()), p2i(end()));
-  if (p >= top()) {
-    return top();
-  } else {
-    HeapWord* last = bottom();
-    HeapWord* cur = last;
-    while (cur <= p) {
-      last = cur;
-      cur += cast_to_oop(cur)->size();
-    }
-    assert(oopDesc::is_oop(cast_to_oop(last)), PTR_FORMAT " should be an object start", p2i(last));
-    return last;
-  }
-}
-
 // This version requires locking.
 inline HeapWord* ContiguousSpace::allocate_impl(size_t size) {
   assert(Heap_lock->owned_by_self() ||
@@ -191,22 +172,6 @@ HeapWord* ContiguousSpace::par_allocate(size_t size) {
 }
 
 #if INCLUDE_SERIALGC
-HeapWord* TenuredSpace::block_start_const(const void* addr) const {
-  HeapWord* cur_block = _offsets->block_start_reaching_into_card(addr);
-
-  while (true) {
-    HeapWord* next_block = cur_block + cast_to_oop(cur_block)->size();
-    if (next_block > addr) {
-      assert(cur_block <= addr, "postcondition");
-      return cur_block;
-    }
-    cur_block = next_block;
-    // Because the BOT is precise, we should never step into the next card
-    // (i.e. crossing the card boundary).
-    assert(!SerialBlockOffsetTable::is_crossing_card_boundary(cur_block, (HeapWord*)addr), "must be");
-  }
-}
-
 TenuredSpace::TenuredSpace(SerialBlockOffsetTable* offsets,
                            MemRegion mr) :
   _offsets(offsets)
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index a4679b3adad..44f10cbd1ce 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -169,12 +169,6 @@ public:
   // Iteration
   void object_iterate(ObjectClosure* blk);
 
-  // If "p" is in the space, returns the address of the start of the
-  // "block" that contains "p".  We say "block" instead of "object" since
-  // some heaps may not pack objects densely; a chunk may either be an
-  // object or a non-object.  If "p" is not in the space, return null.
-  virtual HeapWord* block_start_const(const void* p) const;
-
   // Addresses for inlined allocation
   HeapWord** top_addr() { return &_top; }
 
@@ -197,8 +191,6 @@ class TenuredSpace: public ContiguousSpace {
   TenuredSpace(SerialBlockOffsetTable* offsets,
                MemRegion mr);
 
-  HeapWord* block_start_const(const void* addr) const override;
-
   // Add offset table update.
   inline HeapWord* allocate(size_t word_size) override;
   inline HeapWord* par_allocate(size_t word_size) override;

From 006a516aa0e10d74ffafca2e2da2ae89faf47457 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 12 Apr 2024 07:37:48 +0000
Subject: [PATCH 020/486] 8329962: Remove CardTable::invalidate

Reviewed-by: tschatzl, gli
---
 src/hotspot/share/gc/shared/cardTable.cpp           | 10 +---------
 src/hotspot/share/gc/shared/cardTable.hpp           |  2 --
 src/hotspot/share/gc/shared/cardTableBarrierSet.cpp |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp
index 16edfada77d..1095defaf9f 100644
--- a/src/hotspot/share/gc/shared/cardTable.cpp
+++ b/src/hotspot/share/gc/shared/cardTable.cpp
@@ -202,6 +202,7 @@ void CardTable::resize_covered_region(MemRegion new_region) {
 void CardTable::dirty_MemRegion(MemRegion mr) {
   assert(align_down(mr.start(), HeapWordSize) == mr.start(), "Unaligned start");
   assert(align_up  (mr.end(),   HeapWordSize) == mr.end(),   "Unaligned end"  );
+  assert(_covered[0].contains(mr) || _covered[1].contains(mr), "precondition");
   CardValue* cur  = byte_for(mr.start());
   CardValue* last = byte_after(mr.last());
   memset(cur, dirty_card, pointer_delta(last, cur, sizeof(CardValue)));
@@ -226,15 +227,6 @@ uintx CardTable::ct_max_alignment_constraint() {
   return GCCardSizeInBytes * os::vm_page_size();
 }
 
-void CardTable::invalidate(MemRegion mr) {
-  assert(align_down(mr.start(), HeapWordSize) == mr.start(), "Unaligned start");
-  assert(align_up  (mr.end(),   HeapWordSize) == mr.end(),   "Unaligned end"  );
-  for (int i = 0; i < max_covered_regions; i++) {
-    MemRegion mri = mr.intersection(_covered[i]);
-    if (!mri.is_empty()) dirty_MemRegion(mri);
-  }
-}
-
 #ifndef PRODUCT
 void CardTable::verify_region(MemRegion mr, CardValue val, bool val_equals) {
   CardValue* start    = byte_for(mr.start());
diff --git a/src/hotspot/share/gc/shared/cardTable.hpp b/src/hotspot/share/gc/shared/cardTable.hpp
index 13285be4fc5..ee41be06be0 100644
--- a/src/hotspot/share/gc/shared/cardTable.hpp
+++ b/src/hotspot/share/gc/shared/cardTable.hpp
@@ -131,8 +131,6 @@ public:
     return byte_for(p) + 1;
   }
 
-  void invalidate(MemRegion mr);
-
   // Provide read-only access to the card table array.
   const CardValue* byte_for_const(const void* p) const {
     return byte_for(p);
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
index c4f318561d6..1aab76d5ab5 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
@@ -85,7 +85,7 @@ void CardTableBarrierSet::write_ref_array_work(MemRegion mr) {
 }
 
 void CardTableBarrierSet::invalidate(MemRegion mr) {
-  _card_table->invalidate(mr);
+  _card_table->dirty_MemRegion(mr);
 }
 
 void CardTableBarrierSet::print_on(outputStream* st) const {

From aebfd53e9d19f5939c81fa1a2fc75716c3355900 Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Fri, 12 Apr 2024 07:46:43 +0000
Subject: [PATCH 021/486] 8329660: G1: Improve TestGCLogMessages to be more
 precise

Reviewed-by: tschatzl, ayang
---
 src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp    |   2 +-
 .../jtreg/gc/g1/TestGCLogMessages.java        | 142 +++++++++---------
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
index 29b7c414777..32a56d71205 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
@@ -534,7 +534,7 @@ double G1GCPhaseTimes::print_post_evacuate_collection_set(bool evacuation_failed
   trace_time("Serial Free Collection Set", _recorded_serial_free_cset_time_ms);
 
   debug_time("Rebuild Free List", _recorded_total_rebuild_freelist_time_ms);
-  trace_time("Serial Rebuild Free List ", _recorded_serial_rebuild_freelist_time_ms);
+  trace_time("Serial Rebuild Free List", _recorded_serial_rebuild_freelist_time_ms);
   trace_phase(_gc_par_phases[RebuildFreeList]);
 
   debug_time("Prepare For Mutator", _recorded_prepare_for_mutator_time_ms);
diff --git a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
index e5db6cb0dae..d37bf567381 100644
--- a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
+++ b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
@@ -102,64 +102,64 @@ public class TestGCLogMessages {
     }
 
     private LogMessageWithLevel allLogMessages[] = new LogMessageWithLevel[] {
-        new LogMessageWithLevel("Pre Evacuate Collection Set", Level.INFO),
-        new LogMessageWithLevel("Evacuate Collection Set", Level.INFO),
-        new LogMessageWithLevel("Post Evacuate Collection Set", Level.INFO),
-        new LogMessageWithLevel("Other", Level.INFO),
+        new LogMessageWithLevel("Pre Evacuate Collection Set:", Level.INFO),
+        new LogMessageWithLevel("Evacuate Collection Set:", Level.INFO),
+        new LogMessageWithLevel("Post Evacuate Collection Set:", Level.INFO),
+        new LogMessageWithLevel("Other:", Level.INFO),
 
         // Pre Evacuate Collection Set
-        new LogMessageWithLevel("JT Retire TLABs And Flush Logs", Level.DEBUG),
-        new LogMessageWithLevel("Non-JT Flush Logs", Level.DEBUG),
-        new LogMessageWithLevel("Choose Collection Set", Level.DEBUG),
-        new LogMessageWithLevel("Region Register", Level.DEBUG),
-        new LogMessageWithLevel("Prepare Heap Roots", Level.DEBUG),
+        new LogMessageWithLevel("JT Retire TLABs And Flush Logs \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Non-JT Flush Logs \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Choose Collection Set:", Level.DEBUG),
+        new LogMessageWithLevel("Region Register:", Level.DEBUG),
+        new LogMessageWithLevel("Prepare Heap Roots:", Level.DEBUG),
         // Merge Heap Roots
-        new LogMessageWithLevel("Merge Heap Roots", Level.INFO),
-        new LogMessageWithLevel("Prepare Merge Heap Roots", Level.DEBUG),
-        new LogMessageWithLevel("Eager Reclaim", Level.DEBUG),
-        new LogMessageWithLevel("Remembered Sets", Level.DEBUG),
-        new LogMessageWithLevel("Merged Inline", Level.DEBUG),
-        new LogMessageWithLevel("Merged ArrayOfCards", Level.DEBUG),
-        new LogMessageWithLevel("Merged Howl", Level.DEBUG),
-        new LogMessageWithLevel("Merged Full", Level.DEBUG),
-        new LogMessageWithLevel("Merged Howl Inline", Level.DEBUG),
-        new LogMessageWithLevel("Merged Howl ArrayOfCards", Level.DEBUG),
-        new LogMessageWithLevel("Merged Howl BitMap", Level.DEBUG),
-        new LogMessageWithLevel("Merged Howl Full", Level.DEBUG),
-        new LogMessageWithLevel("Log Buffers", Level.DEBUG),
-        new LogMessageWithLevel("Dirty Cards", Level.DEBUG),
-        new LogMessageWithLevel("Merged Cards", Level.DEBUG),
-        new LogMessageWithLevel("Skipped Cards", Level.DEBUG),
+        new LogMessageWithLevel("Merge Heap Roots:", Level.INFO),
+        new LogMessageWithLevel("Prepare Merge Heap Roots:", Level.DEBUG),
+        new LogMessageWithLevel("Eager Reclaim \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Remembered Sets \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Merged Inline:", Level.DEBUG),
+        new LogMessageWithLevel("Merged ArrayOfCards:", Level.DEBUG),
+        new LogMessageWithLevel("Merged Howl:", Level.DEBUG),
+        new LogMessageWithLevel("Merged Full:", Level.DEBUG),
+        new LogMessageWithLevel("Merged Howl Inline:", Level.DEBUG),
+        new LogMessageWithLevel("Merged Howl ArrayOfCards:", Level.DEBUG),
+        new LogMessageWithLevel("Merged Howl BitMap:", Level.DEBUG),
+        new LogMessageWithLevel("Merged Howl Full:", Level.DEBUG),
+        new LogMessageWithLevel("Log Buffers \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Dirty Cards:", Level.DEBUG),
+        new LogMessageWithLevel("Merged Cards:", Level.DEBUG),
+        new LogMessageWithLevel("Skipped Cards:", Level.DEBUG),
         // Evacuate Collection Set
-        new LogMessageWithLevel("Ext Root Scanning", Level.DEBUG),
-        new LogMessageWithLevel("Thread Roots", Level.TRACE),
-        new LogMessageWithLevel("CLDG Roots", Level.TRACE),
-        new LogMessageWithLevel("CM RefProcessor Roots", Level.TRACE),
+        new LogMessageWithLevel("Ext Root Scanning \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Thread Roots \\(ms\\):", Level.TRACE),
+        new LogMessageWithLevel("CLDG Roots \\(ms\\):", Level.TRACE),
+        new LogMessageWithLevel("CM RefProcessor Roots \\(ms\\):", Level.TRACE),
         new LogMessageWithLevel("JNI Global Roots", Level.TRACE),
         new LogMessageWithLevel("VM Global Roots", Level.TRACE),
         // Scan Heap Roots
-        new LogMessageWithLevel("Scan Heap Roots", Level.DEBUG),
-        new LogMessageWithLevel("Scanned Cards", Level.DEBUG),
-        new LogMessageWithLevel("Scanned Blocks", Level.DEBUG),
-        new LogMessageWithLevel("Claimed Chunks", Level.DEBUG),
-        new LogMessageWithLevel("Found Roots", Level.DEBUG),
+        new LogMessageWithLevel("Scan Heap Roots \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Scanned Cards:", Level.DEBUG),
+        new LogMessageWithLevel("Scanned Blocks:", Level.DEBUG),
+        new LogMessageWithLevel("Claimed Chunks:", Level.DEBUG),
+        new LogMessageWithLevel("Found Roots:", Level.DEBUG),
         // Code Roots Scan
-        new LogMessageWithLevel("Code Root Scan", Level.DEBUG),
+        new LogMessageWithLevel("Code Root Scan \\(ms\\):", Level.DEBUG),
         // Object Copy
-        new LogMessageWithLevel("Object Copy", Level.DEBUG),
-        new LogMessageWithLevel("Copied Bytes", Level.DEBUG),
-        new LogMessageWithLevel("LAB Waste", Level.DEBUG),
-        new LogMessageWithLevel("LAB Undo Waste", Level.DEBUG),
+        new LogMessageWithLevel("Object Copy \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Copied Bytes:", Level.DEBUG),
+        new LogMessageWithLevel("LAB Waste:", Level.DEBUG),
+        new LogMessageWithLevel("LAB Undo Waste:", Level.DEBUG),
         // Termination
-        new LogMessageWithLevel("Termination", Level.DEBUG),
-        new LogMessageWithLevel("Termination Attempts", Level.DEBUG),
+        new LogMessageWithLevel("Termination \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Termination Attempts:", Level.DEBUG),
         // Post Evacuate Collection Set
         // NMethod List Cleanup
-        new LogMessageWithLevel("NMethod List Cleanup", Level.DEBUG),
+        new LogMessageWithLevel("NMethod List Cleanup:", Level.DEBUG),
         // Reference Processing
-        new LogMessageWithLevel("Reference Processing", Level.DEBUG),
+        new LogMessageWithLevel("Reference Processing:", Level.DEBUG),
         // VM internal reference processing
-        new LogMessageWithLevel("Weak Processing", Level.DEBUG),
+        new LogMessageWithLevel("Weak Processing:", Level.DEBUG),
         new LogMessageWithLevel("VM Weak", Level.DEBUG),
         new LogMessageWithLevel("ObjectSynchronizer Weak", Level.DEBUG),
         new LogMessageWithLevel("JVMTI Tag Weak OopStorage", Level.DEBUG),
@@ -169,31 +169,31 @@ public class TestGCLogMessages {
         new LogMessageWithLevel("JNI Weak", Level.DEBUG),
 
         // Post Evacuate Cleanup 1
-        new LogMessageWithLevel("Post Evacuate Cleanup 1", Level.DEBUG),
-        new LogMessageWithLevel("Merge Per-Thread State", Level.DEBUG),
-        new LogMessageWithLevel("LAB Waste", Level.DEBUG),
-        new LogMessageWithLevel("LAB Undo Waste", Level.DEBUG),
-        new LogMessageWithLevel("Evac Fail Extra Cards", Level.DEBUG),
-        new LogMessageWithLevel("Clear Logged Cards", Level.DEBUG),
-        new LogMessageWithLevel("Recalculate Used Memory", Level.DEBUG),
+        new LogMessageWithLevel("Post Evacuate Cleanup 1:", Level.DEBUG),
+        new LogMessageWithLevel("Merge Per-Thread State \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("LAB Waste:", Level.DEBUG),
+        new LogMessageWithLevel("LAB Undo Waste:", Level.DEBUG),
+        new LogMessageWithLevel("Evac Fail Extra Cards:", Level.DEBUG),
+        new LogMessageWithLevel("Clear Logged Cards \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Recalculate Used Memory \\(ms\\):", Level.DEBUG),
 
         // Post Evacuate Cleanup 2
-        new LogMessageWithLevel("Post Evacuate Cleanup 2", Level.DEBUG),
+        new LogMessageWithLevel("Post Evacuate Cleanup 2:", Level.DEBUG),
         new LogMessageWithLevelC2OrJVMCIOnly("Update Derived Pointers", Level.DEBUG),
-        new LogMessageWithLevel("Redirty Logged Cards", Level.DEBUG),
-        new LogMessageWithLevel("Redirtied Cards", Level.DEBUG),
-        new LogMessageWithLevel("Resize TLABs", Level.DEBUG),
-        new LogMessageWithLevel("Free Collection Set", Level.DEBUG),
-        new LogMessageWithLevel("Serial Free Collection Set", Level.TRACE),
-        new LogMessageWithLevel("Young Free Collection Set", Level.TRACE),
-        new LogMessageWithLevel("Non-Young Free Collection Set", Level.TRACE),
+        new LogMessageWithLevel("Redirty Logged Cards \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Redirtied Cards:", Level.DEBUG),
+        new LogMessageWithLevel("Resize TLABs \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Free Collection Set \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Serial Free Collection Set:", Level.TRACE),
+        new LogMessageWithLevel("Young Free Collection Set \\(ms\\):", Level.TRACE),
+        new LogMessageWithLevel("Non-Young Free Collection Set \\(ms\\):", Level.TRACE),
 
         // Misc Top-level
-        new LogMessageWithLevel("Rebuild Free List", Level.DEBUG),
-        new LogMessageWithLevel("Serial Rebuild Free List", Level.TRACE),
-        new LogMessageWithLevel("Parallel Rebuild Free List", Level.TRACE),
-        new LogMessageWithLevel("Prepare For Mutator", Level.DEBUG),
-        new LogMessageWithLevel("Expand Heap After Collection", Level.DEBUG),
+        new LogMessageWithLevel("Rebuild Free List:", Level.DEBUG),
+        new LogMessageWithLevel("Serial Rebuild Free List:", Level.TRACE),
+        new LogMessageWithLevel("Parallel Rebuild Free List \\(ms\\):", Level.TRACE),
+        new LogMessageWithLevel("Prepare For Mutator:", Level.DEBUG),
+        new LogMessageWithLevel("Expand Heap After Collection:", Level.DEBUG),
     };
 
     void checkMessagesAtLevel(OutputAnalyzer output, LogMessageWithLevel messages[], Level level) throws Exception {
@@ -258,13 +258,13 @@ public class TestGCLogMessages {
     }
 
     LogMessageWithLevel exhFailureMessages[] = new LogMessageWithLevel[] {
-        new LogMessageWithLevel("Recalculate Used Memory", Level.DEBUG),
-        new LogMessageWithLevel("Restore Preserved Marks", Level.DEBUG),
-        new LogMessageWithLevel("Restore Evacuation Failed Regions", Level.DEBUG),
-        new LogMessageWithLevel("Process Evacuation Failed Regions", Level.DEBUG),
-        new LogMessageWithLevel("Evacuation Failed Regions", Level.DEBUG),
-        new LogMessageWithLevel("Pinned Regions", Level.DEBUG),
-        new LogMessageWithLevel("Allocation Failed Regions", Level.DEBUG),
+        new LogMessageWithLevel("Recalculate Used Memory \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Restore Preserved Marks \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Restore Evacuation Failed Regions \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Process Evacuation Failed Regions \\(ms\\):", Level.DEBUG),
+        new LogMessageWithLevel("Evacuation Failed Regions:", Level.DEBUG),
+        new LogMessageWithLevel("Pinned Regions:", Level.DEBUG),
+        new LogMessageWithLevel("Allocation Failed Regions:", Level.DEBUG),
     };
 
     private void testWithEvacuationFailureLogs() throws Exception {

From 717a07b932e3dcabbad130d299b15cb963d50a67 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Fri, 12 Apr 2024 10:21:31 +0000
Subject: [PATCH 022/486] 8322140:
 javax/swing/JTable/JTableScrollPrintTest.java does not print the rows and
 columns of the table in Nimbus and Aqua LookAndFeel

Reviewed-by: psadhukhan, abhiscxk
---
 .../share/classes/javax/swing/JViewport.java  | 16 +++-----
 .../share/classes/sun/print/PathGraphics.java | 18 +++++++-
 .../classes/sun/swing/SwingUtilities2.java    |  4 +-
 .../swing/JTable/JTableScrollPrintTest.java   | 41 ++++++++-----------
 4 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/JViewport.java b/src/java.desktop/share/classes/javax/swing/JViewport.java
index 7ceab7f83dd..f7c27314750 100644
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -603,15 +603,11 @@ public class JViewport extends JComponent implements Accessible
 
 
     private Graphics getBackingStoreGraphics(Graphics g) {
-        if (!SwingUtilities2.isPrinting(g)) {
-            Graphics bsg = backingStoreImage.getGraphics();
-            bsg.setColor(g.getColor());
-            bsg.setFont(g.getFont());
-            bsg.setClip(g.getClipBounds());
-            return bsg;
-        } else {
-            return g;
-        }
+        Graphics bsg = backingStoreImage.getGraphics();
+        bsg.setColor(g.getColor());
+        bsg.setFont(g.getFont());
+        bsg.setClip(g.getClipBounds());
+        return bsg;
     }
 
 
diff --git a/src/java.desktop/share/classes/sun/print/PathGraphics.java b/src/java.desktop/share/classes/sun/print/PathGraphics.java
index e7fc04a97c4..7a82ffb4a48 100644
--- a/src/java.desktop/share/classes/sun/print/PathGraphics.java
+++ b/src/java.desktop/share/classes/sun/print/PathGraphics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ import java.awt.image.DataBuffer;
 import java.awt.image.DataBufferInt;
 import java.awt.image.ImageObserver;
 import java.awt.image.IndexColorModel;
+import java.awt.image.MultiResolutionImage;
 import java.awt.image.Raster;
 import java.awt.image.RenderedImage;
 import java.awt.image.SampleModel;
@@ -1132,6 +1133,9 @@ public abstract class PathGraphics extends ProxyGraphics2D {
             // VI needs to make a new BI: this is unavoidable but
             // I don't expect VI's to be "huge" in any case.
             return ((VolatileImage)img).getSnapshot();
+        } else if (img instanceof MultiResolutionImage) {
+            return convertToBufferedImage((MultiResolutionImage) img,
+                                           img.getWidth(null), img.getHeight(null));
         } else {
             // may be null or may be some non-standard Image which
             // shouldn't happen as Image is implemented by the platform
@@ -1142,6 +1146,18 @@ public abstract class PathGraphics extends ProxyGraphics2D {
         }
     }
 
+    protected BufferedImage convertToBufferedImage(MultiResolutionImage multiResolutionImage,
+                                                       double width, double height ) {
+        Image resolutionImage = multiResolutionImage.getResolutionVariant(width, height);
+        BufferedImage bufferedImage = new BufferedImage(resolutionImage.getWidth(null),
+                                                        resolutionImage.getHeight(null),
+                                                        BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g2d = bufferedImage.createGraphics();
+        g2d.drawImage(resolutionImage, 0, 0, (int) width, (int) height, null);
+        g2d.dispose();
+        return bufferedImage;
+    }
+
     /**
      * Return true if the BufferedImage argument has non-opaque
      * bits in it and therefore can not be directly rendered by
diff --git a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
index d85d10963ed..d763a72d528 100644
--- a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
+++ b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -1317,7 +1317,7 @@ public class SwingUtilities2 {
      * returns true if the Graphics is print Graphics
      * false otherwise
      */
-    public static boolean isPrinting(Graphics g) {
+    static boolean isPrinting(Graphics g) {
         return (g instanceof PrinterGraphics || g instanceof PrintGraphics);
     }
 
diff --git a/test/jdk/javax/swing/JTable/JTableScrollPrintTest.java b/test/jdk/javax/swing/JTable/JTableScrollPrintTest.java
index 6a12a361345..5621b359346 100644
--- a/test/jdk/javax/swing/JTable/JTableScrollPrintTest.java
+++ b/test/jdk/javax/swing/JTable/JTableScrollPrintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,13 +36,12 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.JViewport;
-import javax.swing.SwingUtilities;
 import javax.swing.table.DefaultTableModel;
 
 /*
  * @test
  * @key headful
- * @bug 8210807
+ * @bug 8210807 8322140
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame
  * @summary Test to check if JTable can be printed when JScrollPane added to it.
@@ -50,32 +49,27 @@ import javax.swing.table.DefaultTableModel;
  */
 
 public class JTableScrollPrintTest {
-    public static JFrame frame;
-    public static PassFailJFrame passFailJFrame;
-
     public static void main(String[] args) throws Exception {
-        SwingUtilities.invokeAndWait(() -> {
-            try {
-                initialize();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-        passFailJFrame.awaitAndCheck();
-    }
-
-    public static void initialize() throws Exception {
-        final String INSTRUCTIONS = """
+        String INSTRUCTIONS = """
                 Instructions to Test:
                 1. Print table onto Paper/PDF, using the Print Dialog.
                 2. If entire table is printed, then the Test is PASS.
                 3. If table is partially printed without table cells,
                 then the Test is FAIL.
                 """;
-        TestTable testTable = new TestTable(true);
-        frame = new JFrame("JTable Print Test");
-        passFailJFrame = new PassFailJFrame("Test Instructions", INSTRUCTIONS, 5L, 6, 35);
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .rows(6)
+                .columns(35)
+                .testUI(JTableScrollPrintTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
 
+    public static JFrame initialize() {
+        TestTable testTable = new TestTable(true);
+        JFrame frame = new JFrame("JTable Print Test");
         PassFailJFrame.addTestWindow(frame);
         PassFailJFrame.positionTestWindow(frame, PassFailJFrame.Position.VERTICAL);
         frame.add(testTable);
@@ -83,6 +77,7 @@ public class JTableScrollPrintTest {
         frame.setVisible(true);
         PrintUtilities printerJob = new PrintUtilities(testTable);
         printerJob.print("Test BackingStore Image Print");
+        return frame;
     }
 
     public static class TestTable extends JPanel {
@@ -103,7 +98,7 @@ public class JTableScrollPrintTest {
 
             JTable table = new JTable(model);
 
-            if (useScrollPane == true) {
+            if (useScrollPane) {
                 JScrollPane sp = new JScrollPane(table,
                         JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
                         JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
@@ -117,7 +112,7 @@ public class JTableScrollPrintTest {
     }
 
     static class PrintUtilities implements Printable {
-        private Component componentToBePrinted;
+        private final Component componentToBePrinted;
 
         public void printComponent(Component c, String jobname) {
             new PrintUtilities(c).print(jobname);

From 77a217df6000190cf73a1ca42a42cbcec42fb60f Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Fri, 12 Apr 2024 11:42:05 +0000
Subject: [PATCH 023/486] 8330095: RISC-V: Remove obsolete vandn_vi instruction

Reviewed-by: fyang, luhenry
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index bc8c9f1cd7f..388e7f9eb94 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1870,7 +1870,6 @@ enum Nf {
   // Vector Bit-manipulation used in Cryptography (Zvkb) Extension
   INSN(vandn_vv,   0b1010111, 0b000, 0b000001);
   INSN(vandn_vx,   0b1010111, 0b100, 0b000001);
-  INSN(vandn_vi,   0b1010111, 0b011, 0b000001);
   INSN(vclmul_vv,  0b1010111, 0b010, 0b001100);
   INSN(vclmul_vx,  0b1010111, 0b110, 0b001100);
   INSN(vclmulh_vv, 0b1010111, 0b010, 0b001101);

From 3e9c3811669196945d7227affc28728670a256c5 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Fri, 12 Apr 2024 12:16:49 +0000
Subject: [PATCH 024/486] 8329488: Move OopStorage code from safepoint cleanup
 and remove safepoint cleanup code

Reviewed-by: kbarrett, eosterlund
---
 src/hotspot/share/gc/shared/oopStorage.cpp    |  82 +++++--------
 src/hotspot/share/jfr/metadata/metadata.xml   |  13 +--
 src/hotspot/share/runtime/globals.hpp         |   5 +
 src/hotspot/share/runtime/safepoint.cpp       | 109 +-----------------
 src/hotspot/share/runtime/safepoint.hpp       |  12 --
 src/hotspot/share/runtime/serviceThread.cpp   |   7 +-
 .../classes/jdk/jfr/internal/query/view.ini   |   8 +-
 src/jdk.jfr/share/conf/jfr/default.jfc        |  10 --
 src/jdk.jfr/share/conf/jfr/profile.jfc        |  10 --
 .../stress/TestReclaimStringsLeaksMemory.java |   4 +-
 .../runtime/logging/SafepointCleanupTest.java |  67 -----------
 .../metadata/TestLookForUntestedEvents.java   |   3 +-
 .../event/runtime/TestSafepointEvents.java    |   1 -
 test/lib/jdk/test/lib/jfr/EventNames.java     |   4 +-
 14 files changed, 54 insertions(+), 281 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/logging/SafepointCleanupTest.java

diff --git a/src/hotspot/share/gc/shared/oopStorage.cpp b/src/hotspot/share/gc/shared/oopStorage.cpp
index 4d1a720bb34..7117b86b264 100644
--- a/src/hotspot/share/gc/shared/oopStorage.cpp
+++ b/src/hotspot/share/gc/shared/oopStorage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -410,7 +410,7 @@ OopStorage::Block::block_for_ptr(const OopStorage* owner, const oop* ptr) {
 // allocations until some entries in it are released.
 //
 // release() is performed lock-free. (Note: This means it can't notify the
-// service thread of pending cleanup work.  It must be lock-free because
+// ServiceThread of pending cleanup work.  It must be lock-free because
 // it is called in all kinds of contexts where even quite low ranked locks
 // may be held.)  release() first looks up the block for
 // the entry, using address alignment to find the enclosing block (thereby
@@ -705,7 +705,7 @@ void OopStorage::Block::release_entries(uintx releasing, OopStorage* owner) {
       // Only request cleanup for to-empty transitions, not for from-full.
       // There isn't any rush to process from-full transitions.  Allocation
       // will reduce deferrals before allocating new blocks, so may process
-      // some.  And the service thread will drain the entire deferred list
+      // some.  And the ServiceThread will drain the entire deferred list
       // if there are any pending to-empty transitions.
       if (releasing == old_allocated) {
         owner->record_needs_cleanup();
@@ -880,67 +880,51 @@ bool OopStorage::should_report_num_dead() const {
 }
 
 // Managing service thread notifications.
-//
-// We don't want cleanup work to linger indefinitely, but we also don't want
-// to run the service thread too often.  We're also very limited in what we
-// can do in a release operation, where cleanup work is created.
-//
+
 // When a release operation changes a block's state to empty, it records the
 // need for cleanup in both the associated storage object and in the global
-// request state.  A safepoint cleanup task notifies the service thread when
+// request state. The ServiceThread checks at timed intervals if
 // there may be cleanup work for any storage object, based on the global
-// request state.  But that notification is deferred if the service thread
-// has run recently, and we also avoid duplicate notifications.  The service
-// thread updates the timestamp and resets the state flags on every iteration.
+// request state.  We don't want to run empty block cleanup too often in the
+// face of frequent explicit ServiceThread wakeups, hence the defer period.
 
 // Global cleanup request state.
 static volatile bool needs_cleanup_requested = false;
 
-// Flag for avoiding duplicate notifications.
-static bool needs_cleanup_triggered = false;
+// Time after which a cleanup is permitted.
+static jlong cleanup_permit_time = 0;
 
-// Time after which a notification can be made.
-static jlong cleanup_trigger_permit_time = 0;
-
-// Minimum time since last service thread check before notification is
-// permitted.  The value of 500ms was an arbitrary choice; frequent, but not
-// too frequent.
-const jlong cleanup_trigger_defer_period = 500 * NANOSECS_PER_MILLISEC;
-
-void OopStorage::trigger_cleanup_if_needed() {
-  MonitorLocker ml(Service_lock, Monitor::_no_safepoint_check_flag);
-  if (Atomic::load(&needs_cleanup_requested) &&
-      !needs_cleanup_triggered &&
-      (os::javaTimeNanos() > cleanup_trigger_permit_time)) {
-    needs_cleanup_triggered = true;
-    ml.notify_all();
-  }
-}
+// Minimum time between ServiceThread cleanups.
+// The value of 500ms was an arbitrary choice; frequent, but not too frequent.
+const jlong cleanup_defer_period = 500 * NANOSECS_PER_MILLISEC;
 
 bool OopStorage::has_cleanup_work_and_reset() {
   assert_lock_strong(Service_lock);
-  cleanup_trigger_permit_time =
-    os::javaTimeNanos() + cleanup_trigger_defer_period;
-  needs_cleanup_triggered = false;
-  // Set the request flag false and return its old value.
-  // Needs to be atomic to avoid dropping a concurrent request.
-  // Can't use Atomic::xchg, which may not support bool.
-  return Atomic::cmpxchg(&needs_cleanup_requested, true, false);
+
+  if (Atomic::load_acquire(&needs_cleanup_requested) &&
+      os::javaTimeNanos() > cleanup_permit_time) {
+    cleanup_permit_time =
+      os::javaTimeNanos() + cleanup_defer_period;
+    // Set the request flag false and return its old value.
+    Atomic::release_store(&needs_cleanup_requested, false);
+    return true;
+  } else {
+    return false;
+  }
 }
 
-// Record that cleanup is needed, without notifying the Service thread.
-// Used by release(), where we can't lock even Service_lock.
+// Record that cleanup is needed, without notifying the Service thread, because
+// we can't lock the Service_lock.  Used by release().
 void OopStorage::record_needs_cleanup() {
-  // Set local flag first, else service thread could wake up and miss
-  // the request.  This order may instead (rarely) unnecessarily notify.
+  // Set local flag first, else ServiceThread could wake up and miss
+  // the request.
   Atomic::release_store(&_needs_cleanup, true);
   Atomic::release_store_fence(&needs_cleanup_requested, true);
 }
 
 bool OopStorage::delete_empty_blocks() {
-  // Service thread might have oopstorage work, but not for this object.
-  // Check for deferred updates even though that's not a service thread
-  // trigger; since we're here, we might as well process them.
+  // ServiceThread might have oopstorage work, but not for this object.
+  // But check for deferred updates, which might provide cleanup work.
   if (!Atomic::load_acquire(&_needs_cleanup) &&
       (Atomic::load_acquire(&_deferred_updates) == nullptr)) {
     return false;
@@ -986,7 +970,7 @@ bool OopStorage::delete_empty_blocks() {
         // Don't interfere with an active concurrent iteration.
         // Instead, give up immediately.  There is more work to do,
         // but don't re-notify, to avoid useless spinning of the
-        // service thread.  Instead, iteration completion notifies.
+        // ServiceThread.  Instead, iteration completion notifies.
         if (_concurrent_iteration_count > 0) return true;
         _active_array->remove(block);
       }
@@ -998,10 +982,8 @@ bool OopStorage::delete_empty_blocks() {
       ThreadBlockInVM tbiv(JavaThread::current());
     }
   }
-  // Exceeded work limit or can't delete last block.  This will
-  // cause the service thread to loop, giving other subtasks an
-  // opportunity to run too.  There's no need for a notification,
-  // because we are part of the service thread (unless gtesting).
+  // Exceeded work limit or can't delete last block so still needs cleanup
+  // for the next time.
   record_needs_cleanup();
   return true;
 }
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 78cd95840b2..42facf56217 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2024, 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
@@ -684,17 +684,6 @@
     <Field type="int" name="iterations" label="Iterations" description="Number of state check iterations" />
   </Event>
 
-  <Event name="SafepointCleanup" category="Java Virtual Machine, Runtime, Safepoint" label="Safepoint Cleanup" description="Safepointing begin running cleanup tasks"
-    thread="true">
-    <Field type="ulong" name="safepointId" label="Safepoint Identifier" relation="SafepointId" />
-  </Event>
-
-  <Event name="SafepointCleanupTask" category="Java Virtual Machine, Runtime, Safepoint" label="Safepoint Cleanup Task" description="Safepointing begin running cleanup tasks"
-    thread="true">
-    <Field type="ulong" name="safepointId" label="Safepoint Identifier" relation="SafepointId" />
-    <Field type="string" name="name" label="Task Name" description="The task name" />
-  </Event>
-
   <Event name="SafepointEnd" category="Java Virtual Machine, Runtime, Safepoint" label="Safepoint End" description="Safepointing end" thread="true">
     <Field type="ulong" name="safepointId" label="Safepoint Identifier" relation="SafepointId" />
   </Event>
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 575d9a3de36..f74930b62e1 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1282,6 +1282,11 @@ const int ObjectAlignmentInBytes = 8;
           "(0 means none)")                                                 \
           range(0, max_jint)                                                \
                                                                             \
+  product(intx, ServiceThreadCleanupInterval, 1000, DIAGNOSTIC,             \
+          "Wake the ServiceThread to do periodic cleanup checks every so "  \
+          "many milliseconds (0 means none)")                               \
+          range(0, max_jint)                                                \
+                                                                            \
   product(double, SafepointTimeoutDelay, 10000,                             \
           "Delay in milliseconds for option SafepointTimeout; "             \
           "supports sub-millisecond resolution with fractional values.")    \
diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp
index 935c1beee40..05f59de4a17 100644
--- a/src/hotspot/share/runtime/safepoint.cpp
+++ b/src/hotspot/share/runtime/safepoint.cpp
@@ -80,12 +80,6 @@ static void post_safepoint_begin_event(EventSafepointBegin& event,
   }
 }
 
-static void post_safepoint_cleanup_event(EventSafepointCleanup& event, uint64_t safepoint_id) {
-  if (event.should_commit()) {
-    event.set_safepointId(safepoint_id);
-    event.commit();
-  }
-}
 
 static void post_safepoint_synchronize_event(EventSafepointStateSynchronization& event,
                                              uint64_t safepoint_id,
@@ -101,16 +95,6 @@ static void post_safepoint_synchronize_event(EventSafepointStateSynchronization&
   }
 }
 
-static void post_safepoint_cleanup_task_event(EventSafepointCleanupTask& event,
-                                              uint64_t safepoint_id,
-                                              const char* name) {
-  if (event.should_commit()) {
-    event.set_safepointId(safepoint_id);
-    event.set_name(name);
-    event.commit();
-  }
-}
-
 static void post_safepoint_end_event(EventSafepointEnd& event, uint64_t safepoint_id) {
   if (event.should_commit()) {
     event.set_safepointId(safepoint_id);
@@ -435,14 +419,7 @@ void SafepointSynchronize::begin() {
 
   SafepointTracing::synchronized(nof_threads, initial_running, _nof_threads_hit_polling_page);
 
-  // We do the safepoint cleanup first since a GC related safepoint
-  // needs cleanup to be completed before running the GC op.
-  EventSafepointCleanup cleanup_event;
-  do_cleanup_tasks();
-  post_safepoint_cleanup_event(cleanup_event, _safepoint_id);
-
   post_safepoint_begin_event(begin_event, _safepoint_id, nof_threads, _current_jni_active_count);
-  SafepointTracing::cleanup();
 }
 
 void SafepointSynchronize::disarm_safepoint() {
@@ -507,68 +484,6 @@ void SafepointSynchronize::end() {
   post_safepoint_end_event(event, safepoint_id());
 }
 
-class ParallelCleanupTask : public WorkerTask {
-private:
-  SubTasksDone _subtasks;
-
-  class Tracer {
-  private:
-    const char*               _name;
-    EventSafepointCleanupTask _event;
-    TraceTime                 _timer;
-
-  public:
-    Tracer(const char* name) :
-        _name(name),
-        _event(),
-        _timer(name, TRACETIME_LOG(Info, safepoint, cleanup)) {}
-    ~Tracer() {
-      post_safepoint_cleanup_task_event(_event, SafepointSynchronize::safepoint_id(), _name);
-    }
-  };
-
-public:
-  ParallelCleanupTask() :
-    WorkerTask("Parallel Safepoint Cleanup"),
-    _subtasks(SafepointSynchronize::SAFEPOINT_CLEANUP_NUM_TASKS) {}
-
-  uint expected_num_workers() const {
-    uint workers = 0;
-
-    return MAX2<uint>(1, workers);
-  }
-
-  void work(uint worker_id) {
-    if (_subtasks.try_claim_task(SafepointSynchronize::SAFEPOINT_CLEANUP_REQUEST_OOPSTORAGE_CLEANUP)) {
-      // Don't bother reporting event or time for this very short operation.
-      // To have any utility we'd also want to report whether needed.
-      OopStorage::trigger_cleanup_if_needed();
-    }
-
-    _subtasks.all_tasks_claimed();
-  }
-};
-
-// Various cleaning tasks that should be done periodically at safepoints.
-void SafepointSynchronize::do_cleanup_tasks() {
-
-  TraceTime timer("safepoint cleanup tasks", TRACETIME_LOG(Info, safepoint, cleanup));
-
-  CollectedHeap* heap = Universe::heap();
-  assert(heap != nullptr, "heap not initialized yet?");
-  ParallelCleanupTask cleanup;
-  WorkerThreads* cleanup_workers = heap->safepoint_workers();
-  const uint expected_num_workers = cleanup.expected_num_workers();
-  if (cleanup_workers != nullptr && expected_num_workers > 1) {
-    // Parallel cleanup using GC provided thread pool.
-    const uint num_workers = MIN2(expected_num_workers, cleanup_workers->active_workers());
-    cleanup_workers->run_task(&cleanup, num_workers);
-  } else {
-    // Serial cleanup using VMThread.
-    cleanup.work(0);
-  }
-}
-
 // Methods for determining if a JavaThread is safepoint safe.
 
 // False means unsafe with undetermined state.
@@ -946,7 +861,6 @@ void ThreadSafepointState::handle_polling_page_exception() {
 
 jlong SafepointTracing::_last_safepoint_begin_time_ns = 0;
 jlong SafepointTracing::_last_safepoint_sync_time_ns = 0;
-jlong SafepointTracing::_last_safepoint_cleanup_time_ns = 0;
 jlong SafepointTracing::_last_safepoint_end_time_ns = 0;
 jlong SafepointTracing::_last_app_time_ns = 0;
 int SafepointTracing::_nof_threads = 0;
@@ -954,7 +868,6 @@ int SafepointTracing::_nof_running = 0;
 int SafepointTracing::_page_trap = 0;
 VM_Operation::VMOp_Type SafepointTracing::_current_type;
 jlong     SafepointTracing::_max_sync_time = 0;
-jlong     SafepointTracing::_max_cleanup_time = 0;
 jlong     SafepointTracing::_max_vmop_time = 0;
 uint64_t  SafepointTracing::_op_count[VM_Operation::VMOp_Terminating] = {0};
 
@@ -970,7 +883,7 @@ static void print_header(outputStream* st) {
 
   st->print("VM Operation                 "
             "[ threads: total initial_running ]"
-            "[ time:       sync    cleanup       vmop      total ]");
+            "[ time:       sync    vmop      total ]");
 
   st->print_cr(" page_trap_count");
 }
@@ -999,11 +912,9 @@ void SafepointTracing::statistics_log() {
            _nof_threads,
            _nof_running);
   ls.print("[       "
-           INT64_FORMAT_W(10) " " INT64_FORMAT_W(10) " "
-           INT64_FORMAT_W(10) " " INT64_FORMAT_W(10) " ]",
+           INT64_FORMAT_W(10) " " INT64_FORMAT_W(10) " " INT64_FORMAT_W(10) " ]",
            (int64_t)(_last_safepoint_sync_time_ns - _last_safepoint_begin_time_ns),
-           (int64_t)(_last_safepoint_cleanup_time_ns - _last_safepoint_sync_time_ns),
-           (int64_t)(_last_safepoint_end_time_ns - _last_safepoint_cleanup_time_ns),
+           (int64_t)(_last_safepoint_end_time_ns - _last_safepoint_sync_time_ns),
            (int64_t)(_last_safepoint_end_time_ns - _last_safepoint_begin_time_ns));
 
   ls.print_cr(INT32_FORMAT_W(16), _page_trap);
@@ -1024,8 +935,6 @@ void SafepointTracing::statistics_exit_log() {
 
   log_info(safepoint, stats)("Maximum sync time  " INT64_FORMAT" ns",
                               (int64_t)(_max_sync_time));
-  log_info(safepoint, stats)("Maximum cleanup time  " INT64_FORMAT" ns",
-                              (int64_t)(_max_cleanup_time));
   log_info(safepoint, stats)("Maximum vm operation time (except for Exit VM operation)  "
                               INT64_FORMAT " ns",
                               (int64_t)(_max_vmop_time));
@@ -1038,7 +947,6 @@ void SafepointTracing::begin(VM_Operation::VMOp_Type type) {
   // update the time stamp to begin recording safepoint time
   _last_safepoint_begin_time_ns = os::javaTimeNanos();
   _last_safepoint_sync_time_ns = 0;
-  _last_safepoint_cleanup_time_ns = 0;
 
   _last_app_time_ns = _last_safepoint_begin_time_ns - _last_safepoint_end_time_ns;
   _last_safepoint_end_time_ns = 0;
@@ -1054,19 +962,12 @@ void SafepointTracing::synchronized(int nof_threads, int nof_running, int traps)
   RuntimeService::record_safepoint_synchronized(_last_safepoint_sync_time_ns - _last_safepoint_begin_time_ns);
 }
 
-void SafepointTracing::cleanup() {
-  _last_safepoint_cleanup_time_ns = os::javaTimeNanos();
-}
-
 void SafepointTracing::end() {
   _last_safepoint_end_time_ns = os::javaTimeNanos();
 
   if (_max_sync_time < (_last_safepoint_sync_time_ns - _last_safepoint_begin_time_ns)) {
     _max_sync_time = _last_safepoint_sync_time_ns - _last_safepoint_begin_time_ns;
   }
-  if (_max_cleanup_time < (_last_safepoint_cleanup_time_ns - _last_safepoint_sync_time_ns)) {
-    _max_cleanup_time = _last_safepoint_cleanup_time_ns - _last_safepoint_sync_time_ns;
-  }
   if (_max_vmop_time < (_last_safepoint_end_time_ns - _last_safepoint_sync_time_ns)) {
     _max_vmop_time = _last_safepoint_end_time_ns - _last_safepoint_sync_time_ns;
   }
@@ -1078,14 +979,12 @@ void SafepointTracing::end() {
      "Safepoint \"%s\", "
      "Time since last: " JLONG_FORMAT " ns, "
      "Reaching safepoint: " JLONG_FORMAT " ns, "
-     "Cleanup: " JLONG_FORMAT " ns, "
      "At safepoint: " JLONG_FORMAT " ns, "
      "Total: " JLONG_FORMAT " ns",
       VM_Operation::name(_current_type),
       _last_app_time_ns,
       _last_safepoint_sync_time_ns    - _last_safepoint_begin_time_ns,
-      _last_safepoint_cleanup_time_ns - _last_safepoint_sync_time_ns,
-      _last_safepoint_end_time_ns     - _last_safepoint_cleanup_time_ns,
+      _last_safepoint_end_time_ns     - _last_safepoint_sync_time_ns,
       _last_safepoint_end_time_ns     - _last_safepoint_begin_time_ns
      );
 
diff --git a/src/hotspot/share/runtime/safepoint.hpp b/src/hotspot/share/runtime/safepoint.hpp
index c8b80b34217..93ede70c6ac 100644
--- a/src/hotspot/share/runtime/safepoint.hpp
+++ b/src/hotspot/share/runtime/safepoint.hpp
@@ -68,13 +68,6 @@ class SafepointSynchronize : AllStatic {
                                                // VM thread and any NonJavaThread may be running.
   };
 
-  // The enums are listed in the order of the tasks when done serially.
-  enum SafepointCleanupTasks {
-    SAFEPOINT_CLEANUP_REQUEST_OOPSTORAGE_CLEANUP,
-    // Leave this one last.
-    SAFEPOINT_CLEANUP_NUM_TASKS
-  };
-
  private:
   friend class SafepointMechanism;
   friend class ThreadSafepointState;
@@ -155,8 +148,6 @@ public:
   // Exception handling for page polling
   static void handle_polling_page_exception(JavaThread *thread);
 
-  static void do_cleanup_tasks();
-
   static void set_is_at_safepoint()             { _state = _synchronized; }
   static void set_is_not_at_safepoint()         { _state = _not_synchronized; }
 
@@ -239,7 +230,6 @@ private:
   // Absolute
   static jlong _last_safepoint_begin_time_ns;
   static jlong _last_safepoint_sync_time_ns;
-  static jlong _last_safepoint_cleanup_time_ns;
   static jlong _last_safepoint_end_time_ns;
 
   // Relative
@@ -251,7 +241,6 @@ private:
 
   static VM_Operation::VMOp_Type _current_type;
   static jlong     _max_sync_time;
-  static jlong     _max_cleanup_time;
   static jlong     _max_vmop_time;
   static uint64_t  _op_count[VM_Operation::VMOp_Terminating];
 
@@ -262,7 +251,6 @@ public:
 
   static void begin(VM_Operation::VMOp_Type type);
   static void synchronized(int nof_threads, int nof_running, int traps);
-  static void cleanup();
   static void end();
 
   static void statistics_exit_log();
diff --git a/src/hotspot/share/runtime/serviceThread.cpp b/src/hotspot/share/runtime/serviceThread.cpp
index 0118c5005ab..a5082fad479 100644
--- a/src/hotspot/share/runtime/serviceThread.cpp
+++ b/src/hotspot/share/runtime/serviceThread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -126,8 +126,9 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
               (cldg_cleanup_work = ClassLoaderDataGraph::should_clean_metaspaces_and_reset()) |
               (jvmti_tagmap_work = JvmtiTagMap::has_object_free_events_and_reset())
              ) == 0) {
-        // Wait until notified that there is some work to do.
-        ml.wait();
+        // Wait until notified that there is some work to do or timer expires.
+        // Some cleanup requests don't notify the ServiceThread so work needs to be done at periodic intervals.
+        ml.wait(ServiceThreadCleanupInterval);
       }
 
       if (has_jvmti_events) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index c28d13c0e91..8db19fdc239 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2023, 2024, 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
@@ -525,13 +525,13 @@ form = "COLUMN 'Event Count', 'First Recorded Event', 'Last Recorded Event',
 [jvm.safepoints]
 label = "Safepoints"
 table = "COLUMN  'Start Time', 'Duration',
-                   'State Syncronization', 'Cleanup',
+                   'State Syncronization',
                    'JNI Critical Threads', 'Total Threads'
          SELECT    B.startTime,  DIFF([B|E].startTime),
-                   S.duration, C.duration,
+                   S.duration,
                    jniCriticalThreadCount, totalThreadCount
          FROM SafepointBegin AS B, SafepointEnd AS E,
-              SafepointCleanup AS C, SafepointStateSynchronization AS S
+              SafepointStateSynchronization AS S
          GROUP BY safepointId ORDER BY B.startTime"
 
 [jvm.longest-compilations]
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 1ea936ae20d..79aee3f3349 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -200,16 +200,6 @@
       <setting name="threshold">10 ms</setting>
     </event>
 
-    <event name="jdk.SafepointCleanup">
-      <setting name="enabled">false</setting>
-      <setting name="threshold">10 ms</setting>
-    </event>
-
-    <event name="jdk.SafepointCleanupTask">
-      <setting name="enabled">false</setting>
-      <setting name="threshold">10 ms</setting>
-    </event>
-
     <event name="jdk.SafepointEnd">
       <setting name="enabled">false</setting>
       <setting name="threshold">10 ms</setting>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 0b018d33058..6691638e5d4 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -200,16 +200,6 @@
       <setting name="threshold">0 ms</setting>
     </event>
 
-    <event name="jdk.SafepointCleanup">
-      <setting name="enabled">false</setting>
-      <setting name="threshold">0 ms</setting>
-    </event>
-
-    <event name="jdk.SafepointCleanupTask">
-      <setting name="enabled">false</setting>
-      <setting name="threshold">0 ms</setting>
-    </event>
-
     <event name="jdk.SafepointEnd">
       <setting name="enabled">false</setting>
       <setting name="threshold">0 ms</setting>
diff --git a/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java b/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java
index bfe19e2c9c5..645583ec450 100644
--- a/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java
+++ b/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -55,7 +55,7 @@ public class TestReclaimStringsLeaksMemory {
     public static void main(String[] args) throws Exception {
         ArrayList<String> baseargs = new ArrayList<>(Arrays.asList("-Xms256M",
                                                                    "-Xmx256M",
-                                                                   "-Xlog:gc*,stringtable*=debug:gc.log",
+                                                                   "-Xlog:gc*,stringtable*=debug,oopstorage+blocks=debug:gc.log",
                                                                    "-XX:NativeMemoryTracking=summary",
                                                                    "-XX:+UnlockDiagnosticVMOptions",
                                                                    "-XX:+PrintNMTStatistics" ));
diff --git a/test/hotspot/jtreg/runtime/logging/SafepointCleanupTest.java b/test/hotspot/jtreg/runtime/logging/SafepointCleanupTest.java
deleted file mode 100644
index 0586bf29989..00000000000
--- a/test/hotspot/jtreg/runtime/logging/SafepointCleanupTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2016, 2023, 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 8149991
- * @summary safepoint+cleanup=info should have output from the code
- * @requires vm.flagless
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- * @run driver SafepointCleanupTest
- */
-
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-
-public class SafepointCleanupTest {
-    static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
-        OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        output.shouldContain("[safepoint,cleanup]");
-        output.shouldContain("safepoint cleanup tasks");
-        output.shouldHaveExitValue(0);
-    }
-
-    static void analyzeOutputOff(ProcessBuilder pb) throws Exception {
-        OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        output.shouldNotContain("[safepoint,cleanup]");
-        output.shouldHaveExitValue(0);
-    }
-
-    public static void main(String[] args) throws Exception {
-        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Xlog:safepoint+cleanup=info",
-                                                                             InnerClass.class.getName());
-        analyzeOutputOn(pb);
-
-        pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Xlog:safepoint+cleanup=off",
-                                                              InnerClass.class.getName());
-        analyzeOutputOff(pb);
-    }
-
-    public static class InnerClass {
-        public static void main(String[] args) throws Exception {
-            System.out.println("Safepoint Cleanup test");
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
index c701a846780..981579ba341 100644
--- a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
+++ b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
@@ -56,8 +56,7 @@ public class TestLookForUntestedEvents {
         Arrays.asList(
             "DataLoss", "IntFlag", "ReservedStackActivation", "NativeLibraryUnload",
             "DoubleFlag", "UnsignedLongFlagChanged", "IntFlagChanged",
-            "UnsignedIntFlag", "UnsignedIntFlagChanged", "DoubleFlagChanged",
-            "SafepointCleanupTask")
+            "UnsignedIntFlag", "UnsignedIntFlagChanged", "DoubleFlagChanged")
     );
 
     // GC uses specific framework to test the events, instead of using event names literally.
diff --git a/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java b/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java
index 31ac3718592..8ea0181b0dd 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java
@@ -52,7 +52,6 @@ public class TestSafepointEvents {
     static final String[] EVENT_NAMES = new String[] {
         EventNames.SafepointBegin,
         EventNames.SafepointStateSynchronization,
-        EventNames.SafepointCleanup,
         EventNames.SafepointEnd
     };
 
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index 3799af54804..5ea58ab8464 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -65,8 +65,6 @@ public class EventNames {
     public static final String ClassUnload = PREFIX + "ClassUnload";
     public static final String SafepointBegin = PREFIX + "SafepointBegin";
     public static final String SafepointStateSynchronization = PREFIX + "SafepointStateSynchronization";
-    public static final String SafepointCleanup = PREFIX + "SafepointCleanup";
-    public static final String SafepointCleanupTask = PREFIX + "SafepointCleanupTask";
     public static final String SafepointEnd = PREFIX + "SafepointEnd";
     public static final String ExecuteVMOperation = PREFIX + "ExecuteVMOperation";
     public static final String Shutdown = PREFIX + "Shutdown";

From b8f675f45b890a9e969c250d9bf3117e6d61c2ff Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Fri, 12 Apr 2024 12:54:36 +0000
Subject: [PATCH 025/486] 8329771: G1: Refactor G1BlockOffsetTable::verify

Reviewed-by: ayang, tschatzl
---
 .../share/gc/g1/g1BlockOffsetTable.cpp        | 73 ++++++++-----------
 .../share/gc/g1/g1BlockOffsetTable.hpp        |  3 +-
 src/hotspot/share/gc/g1/g1HeapRegion.cpp      |  5 --
 3 files changed, 31 insertions(+), 50 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
index 18ab40174d6..ac546faafd9 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
@@ -211,55 +211,40 @@ void G1BlockOffsetTable::update_for_block_work(HeapWord* blk_start, HeapWord* bl
          "boundary: " PTR_FORMAT,
          (uint)offset_array(offset_card),
          p2i(blk_start), p2i(boundary));
-  for (uint8_t* j = offset_card + 1; j <= end_card; j++) {
-    assert(offset_array(j) > 0 &&
-           offset_array(j) <= (uint8_t) (CardTable::card_size_in_words() + BOTConstants::N_powers - 1),
-           "offset array should have been set - "
-           "%u not > 0 OR %u not <= %u",
-           (uint) offset_array(j),
-           (uint) offset_array(j),
-           (uint) (CardTable::card_size_in_words() + BOTConstants::N_powers - 1));
-  }
-#endif
+
+  G1BlockOffsetTable::verify_for_block(blk_start, blk_end);
+#endif // ASSERT
 }
 
-void G1BlockOffsetTable::verify(const HeapRegion* hr) const {
-  assert(hr->bottom() < hr->top(), "Only non-empty regions should be verified.");
-  uint8_t* start_card = entry_for_addr(hr->bottom());
-  uint8_t* end_card = entry_for_addr(hr->top() - 1);
+#ifdef ASSERT
+void G1BlockOffsetTable::verify_offset(uint8_t* card_index, uint8_t upper_boundary) const {
+  assert(offset_array(card_index) <= upper_boundary,
+         "Offset %u should not be larger than upper boundary %u.",
+         (uint) offset_array(card_index),
+         (uint) upper_boundary);
+}
 
-  for (uint8_t* current_card = start_card; current_card < end_card; current_card++) {
-    uint8_t entry = offset_array(current_card);
-    if (entry < CardTable::card_size_in_words()) {
-      // The entry should point to an object before the current card. Verify that
-      // it is possible to walk from that object in to the current card by just
-      // iterating over the objects following it.
-      HeapWord* card_address = addr_for_entry(current_card);
-      HeapWord* obj_end = card_address - entry;
-      while (obj_end < card_address) {
-        HeapWord* obj = obj_end;
-        size_t obj_size = hr->block_size(obj);
-        obj_end = obj + obj_size;
-        guarantee(obj_end > obj && obj_end <= hr->top(),
-                  "Invalid object end. obj: " PTR_FORMAT " obj_size: " SIZE_FORMAT " obj_end: " PTR_FORMAT " top: " PTR_FORMAT,
-                  p2i(obj), obj_size, p2i(obj_end), p2i(hr->top()));
-      }
-    } else {
-      // Because we refine the BOT based on which cards are dirty there is not much we can verify here.
-      // We need to make sure that we are going backwards and that we don't pass the start of the
-      // corresponding heap region. But that is about all we can verify.
-      size_t backskip = BOTConstants::entry_to_cards_back(entry);
-      guarantee(backskip >= 1, "Must be going back at least one card.");
+void G1BlockOffsetTable::verify_for_block(HeapWord* blk_start, HeapWord* blk_end) const {
+  assert(is_crossing_card_boundary(blk_start, blk_end), "precondition");
 
-      size_t max_backskip = current_card - start_card;
-      guarantee(backskip <= max_backskip,
-                "Going backwards beyond the start_card. start_card: " SIZE_FORMAT " current_card: " SIZE_FORMAT " backskip: " SIZE_FORMAT,
-                p2i(start_card), p2i(current_card), backskip);
+  uint8_t* start_card = entry_for_addr(align_up_by_card_size(blk_start));
+  uint8_t* end_card = entry_for_addr(blk_end - 1);
+  // Check cards in [start_card, end_card]
+  verify_offset(start_card, CardTable::card_size_in_words());
 
-      HeapWord* backskip_address = addr_for_entry(current_card - backskip);
-      guarantee(backskip_address >= hr->bottom(),
-                "Going backwards beyond bottom of the region: bottom: " PTR_FORMAT ", backskip_address: " PTR_FORMAT,
-                p2i(hr->bottom()), p2i(backskip_address));
+  for (uint8_t* current_card = start_card + 1; current_card <= end_card; ++current_card) {
+    assert(offset_array(current_card) > 0,
+           "Offset %u is not larger than 0.",
+           (uint) offset_array(current_card));
+    verify_offset(current_card, (uint8_t) (CardTable::card_size_in_words() + BOTConstants::N_powers - 1));
+
+    uint8_t* prev  = current_card - 1;
+    uint8_t* value = current_card;
+    if (offset_array(prev) != offset_array(value)) {
+      assert(offset_array(value) >= offset_array(prev), "monotonic");
+      size_t n_cards_back = BOTConstants::entry_to_cards_back(offset_array(value));
+      assert(start_card == (current_card - n_cards_back), "inv");
     }
   }
 }
+#endif // ASSERT
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
index 4eff09f243e..518c595b225 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
@@ -112,7 +112,8 @@ public:
     return obj_end > cur_card_boundary;
   }
 
-  void verify(const HeapRegion* hr) const;
+  void verify_offset(uint8_t* card_index, uint8_t upper) const NOT_DEBUG_RETURN;
+  void verify_for_block(HeapWord* blk_start, HeapWord* blk_end) const NOT_DEBUG_RETURN;
 
   // Returns the address of the start of the block reaching into the card containing
   // "addr".
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
index 4583cae2046..698a4e0e39f 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -695,11 +695,6 @@ bool HeapRegion::verify(VerifyOption vo) const {
     return true;
   }
 
-  // Only regions in old generation contain valid BOT.
-  if (!is_empty() && !is_young()) {
-    _bot->verify(this);
-  }
-
   if (is_humongous()) {
     oop obj = cast_to_oop(this->humongous_start_region()->bottom());
     if (cast_from_oop<HeapWord*>(obj) > bottom() || cast_from_oop<HeapWord*>(obj) + obj->size() < bottom()) {

From 0f78d017afb786345fca635862a4a70f43fff251 Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Fri, 12 Apr 2024 12:59:49 +0000
Subject: [PATCH 026/486] 8329658: Serial: Refactor
 ContiguousSpace::_next_compaction_space

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/serial/defNewGeneration.cpp | 14 --------------
 src/hotspot/share/gc/serial/serialFullGC.cpp     |  2 +-
 src/hotspot/share/gc/shared/space.cpp            |  2 --
 src/hotspot/share/gc/shared/space.hpp            | 15 ---------------
 4 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 9817bb7620c..008ea957b9e 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -359,24 +359,12 @@ void DefNewGeneration::compute_space_boundaries(uintx minimum_eden_size,
   }
   from()->initialize(fromMR, clear_space, mangle_space);
   to()->initialize(toMR, clear_space, mangle_space);
-
-  // Set next compaction spaces.
-  eden()->set_next_compaction_space(from());
-  // The to-space is normally empty before a compaction so need
-  // not be considered.  The exception is during promotion
-  // failure handling when to-space can contain live objects.
-  from()->set_next_compaction_space(nullptr);
 }
 
 void DefNewGeneration::swap_spaces() {
   ContiguousSpace* s = from();
   _from_space        = to();
   _to_space          = s;
-  eden()->set_next_compaction_space(from());
-  // The to-space is normally empty before a compaction so need
-  // not be considered.  The exception is during promotion
-  // failure handling when to-space can contain live objects.
-  from()->set_next_compaction_space(nullptr);
 
   if (UsePerfData) {
     CSpaceCounters* c = _from_counters;
@@ -780,7 +768,6 @@ void DefNewGeneration::collect(bool   full,
     // as a result of a partial evacuation of eden
     // and from-space.
     swap_spaces();   // For uniformity wrt ParNewGeneration.
-    from()->set_next_compaction_space(to());
     heap->set_incremental_collection_failed();
 
     _gc_tracer->report_promotion_failed(_promotion_failed_info);
@@ -801,7 +788,6 @@ void DefNewGeneration::collect(bool   full,
 void DefNewGeneration::init_assuming_no_promotion_failure() {
   _promotion_failed = false;
   _promotion_failed_info.reset();
-  from()->set_next_compaction_space(nullptr);
 }
 
 void DefNewGeneration::remove_forwarding_pointers() {
diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index 4bcdf702fe2..df5e43b3e57 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -267,7 +267,7 @@ public:
     _spaces[1].init(heap->young_gen()->eden());
     _spaces[2].init(heap->young_gen()->from());
 
-    bool is_promotion_failed = (heap->young_gen()->from()->next_compaction_space() != nullptr);
+    bool is_promotion_failed = !heap->young_gen()->to()->is_empty();
     if (is_promotion_failed) {
       _spaces[3].init(heap->young_gen()->to());
       _num_spaces = 4;
diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
index a7e22856a56..e1ef2e984e2 100644
--- a/src/hotspot/share/gc/shared/space.cpp
+++ b/src/hotspot/share/gc/shared/space.cpp
@@ -43,7 +43,6 @@
 ContiguousSpace::ContiguousSpace():
   _bottom(nullptr),
   _end(nullptr),
-  _next_compaction_space(nullptr),
   _top(nullptr) {
   _mangler = new GenSpaceMangler(this);
 }
@@ -64,7 +63,6 @@ void ContiguousSpace::initialize(MemRegion mr,
   if (clear_space) {
     clear(mangle_space);
   }
-  _next_compaction_space = nullptr;
 }
 
 void ContiguousSpace::clear(bool mangle_space) {
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 44f10cbd1ce..36b96a96325 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -64,9 +64,6 @@ class ContiguousSpace: public CHeapObj<mtGC> {
 private:
   HeapWord* _bottom;
   HeapWord* _end;
-
-  ContiguousSpace* _next_compaction_space;
-
   HeapWord* _top;
   // A helper for mangling the unused area of the space in debug builds.
   GenSpaceMangler* _mangler;
@@ -123,18 +120,6 @@ public:
   // had allocation performed in it, but is now to be considered empty.
   void clear(bool mangle_space);
 
-  // Returns the next space (in the current generation) to be compacted in
-  // the global compaction order.  Also is used to select the next
-  // space into which to compact.
-
-  ContiguousSpace* next_compaction_space() const {
-    return _next_compaction_space;
-  }
-
-  void set_next_compaction_space(ContiguousSpace* csp) {
-    _next_compaction_space = csp;
-  }
-
   // Accessors
   HeapWord* top() const            { return _top;    }
   void set_top(HeapWord* value)    { _top = value; }

From f7069494f4d292060834d0b7b7e92e5516a3001d Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Fri, 12 Apr 2024 14:06:07 +0000
Subject: [PATCH 027/486] 8329781: Serial: Remove serialFullGC.inline.hpp

Reviewed-by: ayang, stefank, tschatzl
---
 src/hotspot/share/gc/serial/serialFullGC.cpp  | 30 ++++++++-
 src/hotspot/share/gc/serial/serialFullGC.hpp  |  4 +-
 .../share/gc/serial/serialFullGC.inline.hpp   | 65 -------------------
 3 files changed, 28 insertions(+), 71 deletions(-)
 delete mode 100644 src/hotspot/share/gc/serial/serialFullGC.inline.hpp

diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index df5e43b3e57..e9e4ad4046f 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -24,7 +24,8 @@
 
 #include "precompiled.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
-#include "classfile/javaClasses.hpp"
+#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/javaClasses.inline.hpp"
 #include "classfile/stringTable.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
@@ -34,11 +35,13 @@
 #include "compiler/oopMap.hpp"
 #include "gc/serial/cardTableRS.hpp"
 #include "gc/serial/defNewGeneration.hpp"
-#include "gc/serial/serialFullGC.inline.hpp"
+#include "gc/serial/serialFullGC.hpp"
 #include "gc/serial/serialGcRefProcProxyTask.hpp"
 #include "gc/serial/serialHeap.hpp"
+#include "gc/serial/serialStringDedup.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/continuationGCSupport.inline.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
@@ -56,11 +59,13 @@
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/instanceRefKlass.hpp"
+#include "oops/markWord.hpp"
 #include "oops/methodData.hpp"
 #include "oops/objArrayKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
+#include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/events.hpp"
 #include "utilities/stack.inline.hpp"
@@ -327,7 +332,7 @@ public:
       while (cur_addr < top) {
         prefetch_write_scan(cur_addr);
         if (cur_addr < first_dead || cast_to_oop(cur_addr)->is_gc_marked()) {
-          size_t size = SerialFullGC::adjust_pointers(cast_to_oop(cur_addr));
+          size_t size = cast_to_oop(cur_addr)->oop_iterate_size(&SerialFullGC::adjust_pointer_closure);
           cur_addr += size;
         } else {
           assert(*(HeapWord**)cur_addr > cur_addr, "forward progress");
@@ -609,6 +614,25 @@ void MarkAndPushClosure::do_oop_work(T* p)            { SerialFullGC::mark_and_p
 void MarkAndPushClosure::do_oop(      oop* p)         { do_oop_work(p); }
 void MarkAndPushClosure::do_oop(narrowOop* p)         { do_oop_work(p); }
 
+template <class T> void SerialFullGC::adjust_pointer(T* p) {
+  T heap_oop = RawAccess<>::oop_load(p);
+  if (!CompressedOops::is_null(heap_oop)) {
+    oop obj = CompressedOops::decode_not_null(heap_oop);
+    assert(Universe::heap()->is_in(obj), "should be in heap");
+
+    if (obj->is_forwarded()) {
+      oop new_obj = obj->forwardee();
+      assert(is_object_aligned(new_obj), "oop must be aligned");
+      RawAccess<IS_NOT_NULL>::oop_store(p, new_obj);
+    }
+  }
+}
+
+template <typename T>
+void AdjustPointerClosure::do_oop_work(T* p)           { SerialFullGC::adjust_pointer(p); }
+inline void AdjustPointerClosure::do_oop(oop* p)       { do_oop_work(p); }
+inline void AdjustPointerClosure::do_oop(narrowOop* p) { do_oop_work(p); }
+
 AdjustPointerClosure SerialFullGC::adjust_pointer_closure;
 
 void SerialFullGC::adjust_marks() {
diff --git a/src/hotspot/share/gc/serial/serialFullGC.hpp b/src/hotspot/share/gc/serial/serialFullGC.hpp
index fba41560e67..fff287b1f50 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.hpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.hpp
@@ -133,11 +133,9 @@ class SerialFullGC : AllStatic {
   static void adjust_marks();   // Adjust the pointers in the preserved marks table
   static void restore_marks();  // Restore the marks that we saved in preserve_mark
 
-  static size_t adjust_pointers(oop obj);
-
   static void follow_stack();   // Empty marking stack.
 
-  template <class T> static inline void adjust_pointer(T* p);
+  template <class T> static void adjust_pointer(T* p);
 
   // Check mark and maybe push on marking stack
   template <class T> static void mark_and_push(T* p);
diff --git a/src/hotspot/share/gc/serial/serialFullGC.inline.hpp b/src/hotspot/share/gc/serial/serialFullGC.inline.hpp
deleted file mode 100644
index 2984c49b3d5..00000000000
--- a/src/hotspot/share/gc/serial/serialFullGC.inline.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2000, 2024, 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.
- *
- */
-
-#ifndef SHARE_GC_SERIAL_SERIALFULLGC_INLINE_HPP
-#define SHARE_GC_SERIAL_SERIALFULLGC_INLINE_HPP
-
-#include "gc/serial/serialFullGC.hpp"
-
-#include "classfile/classLoaderData.inline.hpp"
-#include "classfile/javaClasses.inline.hpp"
-#include "gc/shared/continuationGCSupport.inline.hpp"
-#include "gc/serial/serialStringDedup.hpp"
-#include "memory/universe.hpp"
-#include "oops/markWord.hpp"
-#include "oops/access.inline.hpp"
-#include "oops/compressedOops.inline.hpp"
-#include "oops/oop.inline.hpp"
-#include "utilities/align.hpp"
-#include "utilities/stack.inline.hpp"
-
-template <class T> inline void SerialFullGC::adjust_pointer(T* p) {
-  T heap_oop = RawAccess<>::oop_load(p);
-  if (!CompressedOops::is_null(heap_oop)) {
-    oop obj = CompressedOops::decode_not_null(heap_oop);
-    assert(Universe::heap()->is_in(obj), "should be in heap");
-
-    if (obj->is_forwarded()) {
-      oop new_obj = obj->forwardee();
-      assert(is_object_aligned(new_obj), "oop must be aligned");
-      RawAccess<IS_NOT_NULL>::oop_store(p, new_obj);
-    }
-  }
-}
-
-template <typename T>
-void AdjustPointerClosure::do_oop_work(T* p)           { SerialFullGC::adjust_pointer(p); }
-inline void AdjustPointerClosure::do_oop(oop* p)       { do_oop_work(p); }
-inline void AdjustPointerClosure::do_oop(narrowOop* p) { do_oop_work(p); }
-
-inline size_t SerialFullGC::adjust_pointers(oop obj) {
-  return obj->oop_iterate_size(&SerialFullGC::adjust_pointer_closure);
-}
-
-#endif // SHARE_GC_SERIAL_SERIALFULLGC_INLINE_HPP

From 397d94831033e91c7a849774bf4e80d8f1c8ec66 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 12 Apr 2024 14:09:23 +0000
Subject: [PATCH 028/486] 8329605: hs errfile generic events - move memory
 protections and nmethod flushes to separate sections

Reviewed-by: lucy, stefank, stuefe
---
 src/hotspot/os/aix/os_aix.cpp          |  2 +-
 src/hotspot/os/bsd/os_bsd.cpp          |  6 +++---
 src/hotspot/os/linux/os_linux.cpp      |  2 +-
 src/hotspot/share/code/nmethod.cpp     |  2 +-
 src/hotspot/share/utilities/events.cpp |  6 +++++-
 src/hotspot/share/utilities/events.hpp | 30 +++++++++++++++++++++++++-
 6 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 9e9e2575b0f..39400db75e1 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -1934,7 +1934,7 @@ static bool checked_mprotect(char* addr, size_t size, int prot) {
   //
   // See http://publib.boulder.ibm.com/infocenter/pseries/v5r3/index.jsp?topic=/com.ibm.aix.basetechref/doc/basetrf1/mprotect.htm
 
-  Events::log(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(addr), p2i(addr+size), prot);
+  Events::log_memprotect(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(addr), p2i(addr+size), prot);
   bool rc = ::mprotect(addr, size, prot) == 0 ? true : false;
 
   if (!rc) {
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index bf615d1b37a..4b849c5bad4 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1590,7 +1590,7 @@ bool os::pd_commit_memory(char* addr, size_t size, bool exec) {
   int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
 #if defined(__OpenBSD__)
   // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
-  Events::log(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(addr), p2i(addr+size), prot);
+  Events::log_memprotect(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(addr), p2i(addr+size), prot);
   if (::mprotect(addr, size, prot) == 0) {
     return true;
   } else {
@@ -1711,7 +1711,7 @@ bool os::numa_get_group_ids_for_range(const void** addresses, int* lgrp_ids, siz
 bool os::pd_uncommit_memory(char* addr, size_t size, bool exec) {
 #if defined(__OpenBSD__)
   // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
-  Events::log(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with PROT_NONE", p2i(addr), p2i(addr+size));
+  Events::log_memprotect(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with PROT_NONE", p2i(addr), p2i(addr+size));
   if (::mprotect(addr, size, PROT_NONE) == 0) {
     return true;
   } else {
@@ -1829,7 +1829,7 @@ static bool bsd_mprotect(char* addr, size_t size, int prot) {
   assert(addr == bottom, "sanity check");
 
   size = align_up(pointer_delta(addr, bottom, 1) + size, os::vm_page_size());
-  Events::log(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(bottom), p2i(bottom+size), prot);
+  Events::log_memprotect(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(bottom), p2i(bottom+size), prot);
   return ::mprotect(bottom, size, prot) == 0;
 }
 
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 18a9a38db7f..974ca7c8553 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -3786,7 +3786,7 @@ static bool linux_mprotect(char* addr, size_t size, int prot) {
 #ifdef CAN_SHOW_REGISTERS_ON_ASSERT
   if (addr != g_assert_poison)
 #endif
-  Events::log(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(bottom), p2i(bottom+size), prot);
+  Events::log_memprotect(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(bottom), p2i(bottom+size), prot);
   return ::mprotect(bottom, size, prot) == 0;
 }
 
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 51ba872b3ac..4f0f6c15af1 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -2037,7 +2037,7 @@ void nmethod::purge(bool free_code_cache_data, bool unregister_nmethod) {
   MutexLocker ml(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 
   // completely deallocate this method
-  Events::log(Thread::current(), "flushing nmethod " INTPTR_FORMAT, p2i(this));
+  Events::log_nmethod_flush(Thread::current(), "flushing %s nmethod " INTPTR_FORMAT, is_osr_method() ? "osr" : "", p2i(this));
   log_debug(codecache)("*flushing %s nmethod %3d/" INTPTR_FORMAT ". Live blobs:" UINT32_FORMAT
                        "/Free CodeCache:" SIZE_FORMAT "Kb",
                        is_osr_method() ? "osr" : "",_compile_id, p2i(this), CodeCache::blob_count(),
diff --git a/src/hotspot/share/utilities/events.cpp b/src/hotspot/share/utilities/events.cpp
index f89821800d1..b4d46d79ffa 100644
--- a/src/hotspot/share/utilities/events.cpp
+++ b/src/hotspot/share/utilities/events.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -37,6 +37,8 @@
 
 EventLog* Events::_logs = nullptr;
 StringEventLog* Events::_messages = nullptr;
+StringEventLog* Events::_memprotect_messages = nullptr;
+StringEventLog* Events::_nmethod_flush_messages = nullptr;
 StringEventLog* Events::_vm_operations = nullptr;
 StringEventLog* Events::_zgc_phase_switch = nullptr;
 ExceptionsEventLog* Events::_exceptions = nullptr;
@@ -97,6 +99,8 @@ void Events::print() {
 void Events::init() {
   if (LogEvents) {
     _messages = new StringEventLog("Events", "events");
+    _nmethod_flush_messages = new StringEventLog("Nmethod flushes", "nmethodflushes");
+    _memprotect_messages = new StringEventLog("Memory protections", "memprotects");
     _vm_operations = new StringEventLog("VM Operations", "vmops");
     if (UseZGC) {
       _zgc_phase_switch = new StringEventLog("ZGC Phase Switch", "zgcps");
diff --git a/src/hotspot/share/utilities/events.hpp b/src/hotspot/share/utilities/events.hpp
index b400fd707fa..0aefbbefd2b 100644
--- a/src/hotspot/share/utilities/events.hpp
+++ b/src/hotspot/share/utilities/events.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -220,6 +220,12 @@ class Events : AllStatic {
   // A log for generic messages that aren't well categorized.
   static StringEventLog* _messages;
 
+  // A log for memory protection related messages
+  static StringEventLog* _memprotect_messages;
+
+  // A log for nmethod flush operations
+  static StringEventLog* _nmethod_flush_messages;
+
   // A log for VM Operations
   static StringEventLog* _vm_operations;
 
@@ -259,6 +265,10 @@ class Events : AllStatic {
   // Logs a generic message with timestamp and format as printf.
   static void log(Thread* thread, const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
 
+  static void log_memprotect(Thread* thread, const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
+
+  static void log_nmethod_flush(Thread* thread, const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
+
   static void log_vm_operation(Thread* thread, const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
 
   static void log_zgc_phase_switch(const char* format, ...) ATTRIBUTE_PRINTF(1, 2);
@@ -290,6 +300,24 @@ inline void Events::log(Thread* thread, const char* format, ...) {
   }
 }
 
+inline void Events::log_memprotect(Thread* thread, const char* format, ...) {
+  if (LogEvents && _memprotect_messages != nullptr) {
+    va_list ap;
+    va_start(ap, format);
+    _memprotect_messages->logv(thread, format, ap);
+    va_end(ap);
+  }
+}
+
+inline void Events::log_nmethod_flush(Thread* thread, const char* format, ...) {
+  if (LogEvents && _nmethod_flush_messages != nullptr) {
+    va_list ap;
+    va_start(ap, format);
+    _nmethod_flush_messages->logv(thread, format, ap);
+    va_end(ap);
+  }
+}
+
 inline void Events::log_vm_operation(Thread* thread, const char* format, ...) {
   if (LogEvents && _vm_operations != nullptr) {
     va_list ap;

From 68f86dccce601ec10111dc3e535d28ce9fc80928 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Fri, 12 Apr 2024 20:57:56 +0000
Subject: [PATCH 029/486] 8330110: AIX build fails after JDK-8329704 - issue
 with libjli.a

Reviewed-by: mbaesken, mdoerr
---
 make/common/JdkNativeCompilation.gmk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/make/common/JdkNativeCompilation.gmk b/make/common/JdkNativeCompilation.gmk
index b425bdbae2b..4385fb95988 100644
--- a/make/common/JdkNativeCompilation.gmk
+++ b/make/common/JdkNativeCompilation.gmk
@@ -118,6 +118,8 @@ define ResolveLibPath
       else
         ifeq ($(STATIC_LIBS), true)
           $1_$2_LIBPATH := $$(SUPPORT_OUTPUTDIR)/native/$$($1_$2_MODULE)/lib$$($1_$2_NAME)/static
+        else ifeq ($$($1_$2_STATIC_LIBRARY), true)
+          $1_$2_LIBPATH := $$(SUPPORT_OUTPUTDIR)/native/$$($1_$2_MODULE)
         else
           $1_$2_LIBPATH := $$(SUPPORT_OUTPUTDIR)/modules_libs/$$($1_$2_MODULE)
         endif

From 28b201955907e145f208d756b607ab545a83b2d3 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Fri, 12 Apr 2024 22:29:34 +0000
Subject: [PATCH 030/486] 8240343: JDI stopListening/stoplis001 "FAILED:
 listening is successfully stopped without starting listening"

Reviewed-by: cjplummer, sspitsyn
---
 .../stopListening/stoplis001.java             |  7 +++++-
 .../stopListening/stoplis001/TEST.properties  | 24 -------------------
 .../stoplis001/TestDescription.java           |  3 ---
 3 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TEST.properties

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java
index 9fa40e17d5a..1fd2d0f8a0a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java
@@ -86,7 +86,6 @@ public class stoplis001 {
         this.out = out;
         log = new Log(out, argHandler);
 
-        Map<String,? extends com.sun.jdi.connect.Connector.Argument> cArgs1 = initConnector(argHandler.getTransportPort());
         Map<String,? extends com.sun.jdi.connect.Connector.Argument> cArgs2 = initConnector(null);
         if ((addr = startListen(cArgs2)) == null) {
             log.complain("FAILURE: unable to start listening the address " +
@@ -96,6 +95,12 @@ public class stoplis001 {
         else
             log.display("TEST: start listening the address " + addr);
 
+        // argHandler.getTransportPort() returns a free port (different from the port allocated by startListen(cArgs2))
+        Map<String,? extends com.sun.jdi.connect.Connector.Argument> cArgs1 = initConnector(argHandler.getTransportPort());
+
+        log.display("cArgs1: " + cArgs1);
+        log.display("cArgs2: " + cArgs2);
+
 /* Check that an Exception is thrown if ListeningConnector.stopListening
  has been invoked with argument map different from the one given for
  a previous ListeningConnector.startListening() invocation */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TEST.properties
deleted file mode 100644
index 8b51b2a9115..00000000000
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TEST.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java
index c3298a3111f..121f67d498c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java
@@ -40,9 +40,6 @@
  *       argument map is the same with the one given for the previous
  *       ListeningConnector.startListening() invocation.
  *
- *     NOTE: this test is tagged "nonconcurrent" because it uses the default
- *     "javadebug" shmem file, as do some other tests.
- *
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdi.ListeningConnector.stopListening.stoplis001

From b9ef9f667ef9d4052c9d6dfec763b94d331dc04d Mon Sep 17 00:00:00 2001
From: Scott Gibbons <sgibbons@openjdk.org>
Date: Sat, 13 Apr 2024 00:48:52 +0000
Subject: [PATCH 031/486] 8330185: Potential uncaught unsafe memory copy
 exception

Reviewed-by: kvn, sviswanathan
---
 src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
index c802f953c90..8e77b9cc6c7 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
@@ -728,7 +728,8 @@ address StubGenerator::generate_disjoint_copy_avx3_masked(address* entry, const
 
   if (MaxVectorSize == 64) {
     __ BIND(L_copy_large);
-    arraycopy_avx3_large(to, from, temp1, temp2, temp3, temp4, count, xmm1, xmm2, xmm3, xmm4, shift);
+      UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, false, ucme_exit_pc);
+      arraycopy_avx3_large(to, from, temp1, temp2, temp3, temp4, count, xmm1, xmm2, xmm3, xmm4, shift);
     __ jmp(L_finish);
   }
   return start;

From c1c99a669bb7f9928086db6a4ecfc90c410ffbb0 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Sat, 13 Apr 2024 09:22:00 +0000
Subject: [PATCH 032/486] 8329674: JvmtiEnvThreadState::reset_current_location
 function should use JvmtiHandshake

Reviewed-by: lmesnik, pchilanomate
---
 src/hotspot/share/prims/jvmtiEnvBase.cpp      |   5 +-
 .../share/prims/jvmtiEnvThreadState.cpp       | 101 ++++++------------
 src/hotspot/share/runtime/vmOperation.hpp     |   1 -
 3 files changed, 34 insertions(+), 73 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index 9b9197aa888..778cc17ffe0 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -1997,8 +1997,11 @@ JvmtiHandshake::execute(JvmtiUnitedHandshakeClosure* hs_cl, jthread target) {
 void
 JvmtiHandshake::execute(JvmtiUnitedHandshakeClosure* hs_cl, ThreadsListHandle* tlh,
                         JavaThread* target_jt, Handle target_h) {
+  JavaThread* current = JavaThread::current();
   bool is_virtual = java_lang_VirtualThread::is_instance(target_h());
-  bool self = target_jt == JavaThread::current();
+  bool self = target_jt == current;
+
+  assert(!Continuations::enabled() || self || !is_virtual || current->is_VTMS_transition_disabler(), "sanity check");
 
   hs_cl->set_target_jt(target_jt);   // can be needed in the virtual thread case
   hs_cl->set_is_virtual(is_virtual); // can be needed in the virtual thread case
diff --git a/src/hotspot/share/prims/jvmtiEnvThreadState.cpp b/src/hotspot/share/prims/jvmtiEnvThreadState.cpp
index 6f2891fdc18..f61f9415bbc 100644
--- a/src/hotspot/share/prims/jvmtiEnvThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvThreadState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -264,57 +264,18 @@ bool JvmtiEnvThreadState::is_frame_pop(int cur_frame_number) {
   return get_frame_pops()->contains(fp);
 }
 
-class VM_VirtualThreadGetCurrentLocation : public VM_Operation {
- private:
-   Handle _vthread_h;
-   jmethodID _method_id;
-   int _bci;
-   bool _completed;
-
- public:
-  VM_VirtualThreadGetCurrentLocation(Handle vthread_h)
-    : _vthread_h(vthread_h),
-      _method_id(nullptr),
-      _bci(0),
-      _completed(false)
-  {}
-
-  VMOp_Type type() const { return VMOp_VirtualThreadGetCurrentLocation; }
-  void doit() {
-    if (!JvmtiEnvBase::is_vthread_alive(_vthread_h())) {
-      return; // _completed remains false.
-    }
-    ResourceMark rm;
-    javaVFrame* jvf = JvmtiEnvBase::get_vthread_jvf(_vthread_h());
-
-    if (jvf != nullptr) {
-      // jvf can be null, when the native enterSpecial frame is on the top.
-      Method* method = jvf->method();
-      _method_id = method->jmethod_id();
-      _bci = jvf->bci();
-    }
-    _completed = true;
-  }
-  void get_current_location(jmethodID *method_id, int *bci) {
-    *method_id = _method_id;
-    *bci = _bci;
-  }
-  bool completed() {
-    return _completed;
-  }
-};
-
-class GetCurrentLocationClosure : public HandshakeClosure {
+class GetCurrentLocationClosure : public JvmtiUnitedHandshakeClosure {
  private:
    jmethodID _method_id;
    int _bci;
    bool _completed;
  public:
   GetCurrentLocationClosure()
-    : HandshakeClosure("GetCurrentLocation"),
+    : JvmtiUnitedHandshakeClosure("GetCurrentLocation"),
       _method_id(nullptr),
       _bci(0),
       _completed(false) {}
+
   void do_thread(Thread *target) {
     JavaThread *jt = JavaThread::cast(target);
     ResourceMark rmark; // jt != Thread::current()
@@ -335,6 +296,20 @@ class GetCurrentLocationClosure : public HandshakeClosure {
     }
     _completed = true;
   }
+  void do_vthread(Handle target_h) {
+    assert(_target_jt == nullptr || !_target_jt->is_exiting(), "sanity check");
+    // use jvmti_vthread() as vthread() can be outdated
+    assert(_target_jt == nullptr || _target_jt->jvmti_vthread() == target_h(), "sanity check");
+    ResourceMark rm;
+    javaVFrame *jvf = JvmtiEnvBase::get_vthread_jvf(target_h());
+
+    if (jvf != nullptr) {
+      Method* method = jvf->method();
+      _method_id = method->jmethod_id();
+      _bci = jvf->bci();
+    }
+    _completed = true;
+  }
   void get_current_location(jmethodID *method_id, int *bci) {
     *method_id = _method_id;
     *bci = _bci;
@@ -372,41 +347,25 @@ void JvmtiEnvThreadState::reset_current_location(jvmtiEvent event_type, bool ena
   if (enabled) {
     // If enabling breakpoint, no need to reset.
     // Can't do anything if empty stack.
-
     JavaThread* thread = get_thread_or_saved();
 
-    oop thread_oop = jvmti_thread_state()->get_thread_oop();
+    if (event_type == JVMTI_EVENT_SINGLE_STEP &&
+        ((thread == nullptr && is_virtual()) || thread->has_last_Java_frame())) {
+      JavaThread* current = JavaThread::current();
+      HandleMark hm(current);
+      oop thread_oop = jvmti_thread_state()->get_thread_oop();
+      Handle thread_h(current, thread_oop);
+      ThreadsListHandle tlh(current);
+
+      GetCurrentLocationClosure op;
+      JvmtiHandshake::execute(&op, &tlh, thread, thread_h);
 
-    if (thread == nullptr && event_type == JVMTI_EVENT_SINGLE_STEP && is_virtual()) {
-      // Handle the unmounted virtual thread case.
-      jmethodID method_id;
-      int bci;
-      JavaThread* cur_thread = JavaThread::current();
-      HandleMark hm(cur_thread);
-      VM_VirtualThreadGetCurrentLocation op(Handle(cur_thread, thread_oop));
-      VMThread::execute(&op);
       if (op.completed()) {
-        // Do nothing if virtual thread has been already terminated.
+        jmethodID method_id;
+        int bci;
         op.get_current_location(&method_id, &bci);
         set_current_location(method_id, bci);
       }
-      return;
-    }
-    if (event_type == JVMTI_EVENT_SINGLE_STEP && thread->has_last_Java_frame()) {
-      jmethodID method_id;
-      int bci;
-      // The java thread stack may not be walkable for a running thread
-      // so get current location with direct handshake.
-      GetCurrentLocationClosure op;
-      Thread *current = Thread::current();
-      if (thread->is_handshake_safe_for(current)) {
-        op.do_thread(thread);
-      } else {
-        Handshake::execute(&op, thread);
-        guarantee(op.completed(), "Handshake failed. Target thread is not alive?");
-      }
-      op.get_current_location(&method_id, &bci);
-      set_current_location(method_id, bci);
     }
   } else if (event_type == JVMTI_EVENT_SINGLE_STEP || !is_enabled(JVMTI_EVENT_SINGLE_STEP)) {
     // If this is to disable breakpoint, also check if single-step is not enabled
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index ed136e90206..f6991d78f8e 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -82,7 +82,6 @@
   template(ChangeBreakpoints)                     \
   template(GetOrSetLocal)                         \
   template(VirtualThreadGetOrSetLocal)            \
-  template(VirtualThreadGetCurrentLocation)       \
   template(ChangeSingleStep)                      \
   template(SetNotifyJvmtiEventsMode)              \
   template(HeapWalkOperation)                     \

From 1abb826210eda76a3dc8cf1c10e6df6f2413a87a Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Sun, 14 Apr 2024 16:02:07 +0000
Subject: [PATCH 033/486] 8330131: Problemlist
 serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java

Reviewed-by: dcubed
---
 test/hotspot/jtreg/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 6221bd4bb2f..8e144b692f2 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -133,6 +133,7 @@ serviceability/sa/sadebugd/DebugdConnectTest.java 8239062,8270326 macosx-x64,mac
 serviceability/sa/TestRevPtrsForInvokeDynamic.java 8241235 generic-all
 
 serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java 8225354 windows-all
+serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java 8318090,8318729 generic-all
 serviceability/jvmti/vthread/GetSetLocalTest/GetSetLocalTest.java 8286836 generic-all
 serviceability/dcmd/gc/RunFinalizationTest.java 8227120 linux-all,windows-x64,aix-ppc64
 

From b486709b0627cfb4cf428a6508ef7c5b14e6da57 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 15 Apr 2024 06:25:24 +0000
Subject: [PATCH 034/486] 8328480: C2: SubTypeCheckNode in checkcast should use
 the klass constant of a unique concrete sub class

Reviewed-by: roland, kvn
---
 src/hotspot/share/opto/graphKit.cpp           | 19 +++--
 .../types/TestSubTypeCheckUniqueSubclass.java | 73 +++++++++++++++++++
 2 files changed, 85 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/types/TestSubTypeCheckUniqueSubclass.java

diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 1ba6896170e..6bfdae1cf5c 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -3268,8 +3268,9 @@ Node* GraphKit::gen_instanceof(Node* obj, Node* superklass, bool safe_for_replac
 Node* GraphKit::gen_checkcast(Node *obj, Node* superklass,
                               Node* *failure_control) {
   kill_dead_locals();           // Benefit all the uncommon traps
-  const TypeKlassPtr *tk = _gvn.type(superklass)->is_klassptr()->try_improve();
-  const TypeOopPtr *toop = tk->cast_to_exactness(false)->as_instance_type();
+  const TypeKlassPtr* klass_ptr_type = _gvn.type(superklass)->is_klassptr();
+  const TypeKlassPtr* improved_klass_ptr_type = klass_ptr_type->try_improve();
+  const TypeOopPtr* toop = improved_klass_ptr_type->cast_to_exactness(false)->as_instance_type();
 
   // Fast cutout:  Check the case that the cast is vacuously true.
   // This detects the common cases where the test will short-circuit
@@ -3277,10 +3278,10 @@ Node* GraphKit::gen_checkcast(Node *obj, Node* superklass,
   // because if the test is going to turn into zero code, we don't
   // want a residual null check left around.  (Causes a slowdown,
   // for example, in some objArray manipulations, such as a[i]=a[j].)
-  if (tk->singleton()) {
+  if (improved_klass_ptr_type->singleton()) {
     const TypeOopPtr* objtp = _gvn.type(obj)->isa_oopptr();
     if (objtp != nullptr) {
-      switch (C->static_subtype_check(tk, objtp->as_klass_type())) {
+      switch (C->static_subtype_check(improved_klass_ptr_type, objtp->as_klass_type())) {
       case Compile::SSC_always_true:
         // If we know the type check always succeed then we don't use
         // the profiling data at this bytecode. Don't lose it, feed it
@@ -3346,7 +3347,7 @@ Node* GraphKit::gen_checkcast(Node *obj, Node* superklass,
   }
 
   Node* cast_obj = nullptr;
-  if (tk->klass_is_exact()) {
+  if (improved_klass_ptr_type->klass_is_exact()) {
     // The following optimization tries to statically cast the speculative type of the object
     // (for example obtained during profiling) to the type of the superklass and then do a
     // dynamic check that the type of the object is what we expect. To work correctly
@@ -3356,7 +3357,7 @@ Node* GraphKit::gen_checkcast(Node *obj, Node* superklass,
     // a speculative type use it to perform an exact cast.
     ciKlass* spec_obj_type = obj_type->speculative_type();
     if (spec_obj_type != nullptr || data != nullptr) {
-      cast_obj = maybe_cast_profiled_receiver(not_null_obj, tk, spec_obj_type, safe_for_replace);
+      cast_obj = maybe_cast_profiled_receiver(not_null_obj, improved_klass_ptr_type, spec_obj_type, safe_for_replace);
       if (cast_obj != nullptr) {
         if (failure_control != nullptr) // failure is now impossible
           (*failure_control) = top();
@@ -3368,7 +3369,11 @@ Node* GraphKit::gen_checkcast(Node *obj, Node* superklass,
 
   if (cast_obj == nullptr) {
     // Generate the subtype check
-    Node* not_subtype_ctrl = gen_subtype_check(not_null_obj, superklass );
+    Node* improved_superklass = superklass;
+    if (improved_klass_ptr_type != klass_ptr_type && improved_klass_ptr_type->singleton()) {
+      improved_superklass = makecon(improved_klass_ptr_type);
+    }
+    Node* not_subtype_ctrl = gen_subtype_check(not_null_obj, improved_superklass);
 
     // Plug in success path into the merge
     cast_obj = _gvn.transform(new CheckCastPPNode(control(), not_null_obj, toop));
diff --git a/test/hotspot/jtreg/compiler/types/TestSubTypeCheckUniqueSubclass.java b/test/hotspot/jtreg/compiler/types/TestSubTypeCheckUniqueSubclass.java
new file mode 100644
index 00000000000..ceee83f3d6a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/types/TestSubTypeCheckUniqueSubclass.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2024, 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 8328480
+ * @summary Test that SubTypeCheckNode takes improved unique concrete klass constant in order to fold consecutive sub
+ *          type checks.
+ * @library /test/lib /
+ * @run driver compiler.types.TestSubTypeCheckUniqueSubclass
+ */
+
+package compiler.types;
+
+import compiler.lib.ir_framework.*;
+
+public class TestSubTypeCheckUniqueSubclass {
+    static Object o = new C(); // Make sure C is loaded.
+    static Object o2 = new C2(); // Make sure C2 is loaded while NeverLoaded is not.
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @Warmup(0)
+    @IR(counts = {IRNode.SUBTYPE_CHECK, "1"},
+        phase = CompilePhase.ITER_GVN1)
+    static void testAbstractAbstract() {
+         A a = (A)o;
+         A a2 = (B)o;
+    }
+
+    @Test
+    @Warmup(0)
+    @IR(counts = {IRNode.SUBTYPE_CHECK, "1"},
+            phase = CompilePhase.ITER_GVN1)
+    static void testAbstractAbstractWithUnloaded() {
+        A2 a = (A2)o2;
+        A2 a2 = (B2)o2;
+    }
+}
+
+abstract class A {}
+abstract class B extends A {}
+class C extends B {}
+
+abstract class A2 {}
+abstract class B2 extends A2 {}
+class C2 extends B2 {}
+
+// Class never loaded -> C2 looks like unique sub class.
+class NeverLoaded extends B2 {}

From bc1a1a5861741ce5002e28eed2ea84ddafd68c70 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Mon, 15 Apr 2024 07:31:58 +0000
Subject: [PATCH 035/486] 8330064: JFR: Incorrect function declarations for
 register/unregister_stack_filter

Reviewed-by: mgronlun, dcubed, egahlin, jwaters
---
 src/hotspot/share/jfr/jni/jfrJniMethod.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
index 72351d3e1c1..6a2d622d7e9 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
@@ -161,9 +161,9 @@ jlong JNICALL jfr_host_total_swap_memory(JNIEnv* env, jclass jvm);
 
 void JNICALL jfr_emit_data_loss(JNIEnv* env, jclass jvm, jlong bytes);
 
-jlong JNICALL jfr_register_stack_filter(JNIEnv* env, jobject classes, jobject methods);
+jlong JNICALL jfr_register_stack_filter(JNIEnv* env, jclass jvm, jobjectArray classes, jobjectArray methods);
 
-jlong JNICALL jfr_unregister_stack_filter(JNIEnv* env, jlong start_filter_id);
+jlong JNICALL jfr_unregister_stack_filter(JNIEnv* env, jclass jvm, jlong id);
 
 #ifdef __cplusplus
 }

From d22d56087142d2fdf8ffc5fcde83dd08f07f6933 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Mon, 15 Apr 2024 07:33:10 +0000
Subject: [PATCH 036/486] 8329864: TestLibGraal.java still crashes with
 assert(_stack_base != nullptr)

Reviewed-by: dnsimon, jsjolen, dcubed
---
 src/hotspot/share/runtime/javaThread.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 8fe8e368f09..f6d514055b9 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -1580,9 +1580,11 @@ void JavaThread::print_on_error(outputStream* st, char *buf, int buflen) const {
   if (osthread()) {
     st->print(", id=%d", osthread()->thread_id());
   }
+  // Use raw field members for stack base/size as this could be
+  // called before a thread has run enough to initialize them.
   st->print(", stack(" PTR_FORMAT "," PTR_FORMAT ") (" PROPERFMT ")",
-            p2i(stack_end()), p2i(stack_base()),
-            PROPERFMTARGS(stack_size()));
+            p2i(_stack_base - _stack_size), p2i(_stack_base),
+            PROPERFMTARGS(_stack_size));
   st->print("]");
 
   ThreadsSMRSupport::print_info_on(this, st);

From 5404b4eafc2eb3291cecf99f98728946388f5d16 Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yzheng@openjdk.org>
Date: Mon, 15 Apr 2024 08:07:49 +0000
Subject: [PATCH 037/486] 8330105: SharedRuntime::resolve* should respect
 interpreter-only mode

Reviewed-by: never, dlong, dnsimon
---
 src/hotspot/share/runtime/sharedRuntime.cpp | 51 +++++++--------------
 src/hotspot/share/runtime/sharedRuntime.hpp |  1 +
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index a4ee1a31734..2b06859c96d 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -1396,8 +1396,7 @@ JRT_BLOCK_ENTRY(address, SharedRuntime::handle_wrong_method_ic_miss(JavaThread*
     current->set_vm_result_2(callee_method());
   JRT_BLOCK_END
   // return compiled code entry point after potential safepoints
-  assert(callee_method->verified_code_entry() != nullptr, " Jump to zero!");
-  return callee_method->verified_code_entry();
+  return get_resolved_entry(current, callee_method);
 JRT_END
 
 
@@ -1450,8 +1449,7 @@ JRT_BLOCK_ENTRY(address, SharedRuntime::handle_wrong_method(JavaThread* current)
     current->set_vm_result_2(callee_method());
   JRT_BLOCK_END
   // return compiled code entry point after potential safepoints
-  assert(callee_method->verified_code_entry() != nullptr, " Jump to zero!");
-  return callee_method->verified_code_entry();
+  return get_resolved_entry(current, callee_method);
 JRT_END
 
 // Handle abstract method call
@@ -1488,6 +1486,17 @@ JRT_BLOCK_ENTRY(address, SharedRuntime::handle_wrong_method_abstract(JavaThread*
   return res;
 JRT_END
 
+// return verified_code_entry if interp_only_mode is not set for the current thread;
+// otherwise return c2i entry.
+address SharedRuntime::get_resolved_entry(JavaThread* current, methodHandle callee_method) {
+  if (current->is_interp_only_mode()) {
+    // In interp_only_mode we need to go to the interpreted entry
+    // The c2i won't patch in this mode -- see fixup_callers_callsite
+    return callee_method->get_c2i_entry();
+  }
+  assert(callee_method->verified_code_entry() != nullptr, " Jump to zero!");
+  return callee_method->verified_code_entry();
+}
 
 // resolve a static call and patch code
 JRT_BLOCK_ENTRY(address, SharedRuntime::resolve_static_call_C(JavaThread* current ))
@@ -1496,37 +1505,11 @@ JRT_BLOCK_ENTRY(address, SharedRuntime::resolve_static_call_C(JavaThread* curren
   JRT_BLOCK
     callee_method = SharedRuntime::resolve_helper(false, false, CHECK_NULL);
     current->set_vm_result_2(callee_method());
-
-    if (current->is_interp_only_mode()) {
-      RegisterMap reg_map(current,
-                          RegisterMap::UpdateMap::skip,
-                          RegisterMap::ProcessFrames::include,
-                          RegisterMap::WalkContinuation::skip);
-      frame stub_frame = current->last_frame();
-      assert(stub_frame.is_runtime_frame(), "must be a runtimeStub");
-      frame caller = stub_frame.sender(&reg_map);
-      enter_special = caller.cb() != nullptr && caller.cb()->is_nmethod()
-        && caller.cb()->as_nmethod()->method()->is_continuation_enter_intrinsic();
-    }
   JRT_BLOCK_END
-
-  if (current->is_interp_only_mode() && enter_special) {
-    // enterSpecial is compiled and calls this method to resolve the call to Continuation::enter
-    // but in interp_only_mode we need to go to the interpreted entry
-    // The c2i won't patch in this mode -- see fixup_callers_callsite
-    //
-    // This should probably be done in all cases, not just enterSpecial (see JDK-8218403),
-    // but that's part of a larger fix, and the situation is worse for enterSpecial, as it has no
-    // interpreted version.
-    return callee_method->get_c2i_entry();
-  }
-
   // return compiled code entry point after potential safepoints
-  assert(callee_method->verified_code_entry() != nullptr, " Jump to zero!");
-  return callee_method->verified_code_entry();
+  return get_resolved_entry(current, callee_method);
 JRT_END
 
-
 // resolve virtual call and update inline cache to monomorphic
 JRT_BLOCK_ENTRY(address, SharedRuntime::resolve_virtual_call_C(JavaThread* current))
   methodHandle callee_method;
@@ -1535,8 +1518,7 @@ JRT_BLOCK_ENTRY(address, SharedRuntime::resolve_virtual_call_C(JavaThread* curre
     current->set_vm_result_2(callee_method());
   JRT_BLOCK_END
   // return compiled code entry point after potential safepoints
-  assert(callee_method->verified_code_entry() != nullptr, " Jump to zero!");
-  return callee_method->verified_code_entry();
+  return get_resolved_entry(current, callee_method);
 JRT_END
 
 
@@ -1549,8 +1531,7 @@ JRT_BLOCK_ENTRY(address, SharedRuntime::resolve_opt_virtual_call_C(JavaThread* c
     current->set_vm_result_2(callee_method());
   JRT_BLOCK_END
   // return compiled code entry point after potential safepoints
-  assert(callee_method->verified_code_entry() != nullptr, " Jump to zero!");
-  return callee_method->verified_code_entry();
+  return get_resolved_entry(current, callee_method);
 JRT_END
 
 methodHandle SharedRuntime::handle_ic_miss_helper(TRAPS) {
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index c8a10006764..d477929768f 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -496,6 +496,7 @@ class SharedRuntime: AllStatic {
   static void complete_monitor_unlocking_C(oopDesc* obj, BasicLock* lock, JavaThread* current);
 
   // Resolving of calls
+  static address get_resolved_entry        (JavaThread* current, methodHandle callee_method);
   static address resolve_static_call_C     (JavaThread* current);
   static address resolve_virtual_call_C    (JavaThread* current);
   static address resolve_opt_virtual_call_C(JavaThread* current);

From 3f1d9c441ea98910d9483e133bccfac784db393d Mon Sep 17 00:00:00 2001
From: Joachim Kern <jkern@openjdk.org>
Date: Mon, 15 Apr 2024 08:46:36 +0000
Subject: [PATCH 038/486] 8329257: AIX: Switch HOTSPOT_TOOLCHAIN_TYPE from xlc
 to gcc

Reviewed-by: jwaters, stuefe, kbarrett, mdoerr
---
 make/autoconf/flags-cflags.m4                 |   2 +-
 make/autoconf/toolchain.m4                    |   6 +-
 src/hotspot/os/aix/loadlib_aix.cpp            |   4 +-
 src/hotspot/os/aix/os_aix.cpp                 |  16 +--
 src/hotspot/os/aix/os_aix.hpp                 |  10 +-
 src/hotspot/os/aix/porting_aix.cpp            |   6 +-
 src/hotspot/os/posix/os_posix.cpp             |   2 +-
 src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp     |  20 +--
 src/hotspot/share/utilities/byteswap.hpp      |   4 +-
 .../share/utilities/compilerWarnings_xlc.hpp  |  30 ----
 .../share/utilities/count_leading_zeros.hpp   |  33 +----
 .../share/utilities/count_trailing_zeros.hpp  |  17 +--
 src/hotspot/share/utilities/debug.hpp         |   2 +-
 .../share/utilities/globalDefinitions_gcc.hpp |  12 +-
 .../share/utilities/globalDefinitions_xlc.hpp | 128 ------------------
 15 files changed, 44 insertions(+), 248 deletions(-)
 delete mode 100644 src/hotspot/share/utilities/compilerWarnings_xlc.hpp
 delete mode 100644 src/hotspot/share/utilities/globalDefinitions_xlc.hpp

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 97a3ec14ecd..c96b289084c 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -459,7 +459,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     CFLAGS_OS_DEF_JVM="-D_ALLBSD_SOURCE -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
   elif test "x$OPENJDK_TARGET_OS" = xaix; then
-    CFLAGS_OS_DEF_JVM="-DAIX -D_LARGE_FILES"
+    CFLAGS_OS_DEF_JVM="-DAIX -Dalloca'(size)'=__builtin_alloca'(size)' -D_LARGE_FILES"
     CFLAGS_OS_DEF_JDK="-D_LARGE_FILES"
   elif test "x$OPENJDK_TARGET_OS" = xbsd; then
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE"
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index acccac3e320..aceb6edb79d 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -953,11 +953,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
   # Setup hotspot lecagy names for toolchains
   HOTSPOT_TOOLCHAIN_TYPE=$TOOLCHAIN_TYPE
   if test "x$TOOLCHAIN_TYPE" = xclang; then
-    if test "x$OPENJDK_TARGET_OS" = xaix; then
-      HOTSPOT_TOOLCHAIN_TYPE=xlc
-    else
-      HOTSPOT_TOOLCHAIN_TYPE=gcc
-    fi
+    HOTSPOT_TOOLCHAIN_TYPE=gcc
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     HOTSPOT_TOOLCHAIN_TYPE=visCPP
   fi
diff --git a/src/hotspot/os/aix/loadlib_aix.cpp b/src/hotspot/os/aix/loadlib_aix.cpp
index 107f2783ff5..bc21aef3836 100644
--- a/src/hotspot/os/aix/loadlib_aix.cpp
+++ b/src/hotspot/os/aix/loadlib_aix.cpp
@@ -117,8 +117,8 @@ static void print_entry(const loaded_module_t* lm, outputStream* os) {
             ", data: " INTPTR_FORMAT " - " INTPTR_FORMAT " "
             "%s",
       (lm->is_in_vm ? '*' : ' '),
-      lm->text, (uintptr_t)lm->text + lm->text_len,
-      lm->data, (uintptr_t)lm->data + lm->data_len,
+      p2i(lm->text), (uintptr_t)lm->text + lm->text_len,
+      p2i(lm->data), (uintptr_t)lm->data + lm->data_len,
       lm->path);
   if (lm->member) {
     os->print("(%s)", lm->member);
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 39400db75e1..71a9aa576ea 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -23,10 +23,6 @@
  *
  */
 
-// According to the AIX OS doc #pragma alloca must be used
-// with C++ compiler before referencing the function alloca()
-#pragma alloca
-
 // no precompiled headers
 #include "classfile/vmSymbols.hpp"
 #include "code/vtableStubs.hpp"
@@ -606,8 +602,8 @@ static void *thread_native_entry(Thread *thread) {
     address low_address = thread->stack_end();
     address high_address = thread->stack_base();
     lt.print("Thread is alive (tid: " UINTX_FORMAT ", kernel thread id: " UINTX_FORMAT
-             ", stack [" PTR_FORMAT " - " PTR_FORMAT " (" SIZE_FORMAT "k using %uk pages)).",
-             os::current_thread_id(), (uintx) kernel_thread_id, low_address, high_address,
+             ", stack [" PTR_FORMAT " - " PTR_FORMAT " (" SIZE_FORMAT "k using %luk pages)).",
+             os::current_thread_id(), (uintx) kernel_thread_id, p2i(low_address), p2i(high_address),
              (high_address - low_address) / K, os::Aix::query_pagesize(low_address) / K);
   }
 
@@ -1354,8 +1350,8 @@ struct vmembk_t {
 
   void print_on(outputStream* os) const {
     os->print("[" PTR_FORMAT " - " PTR_FORMAT "] (" UINTX_FORMAT
-      " bytes, %d %s pages), %s",
-      addr, addr + size - 1, size, size / pagesize, describe_pagesize(pagesize),
+      " bytes, %ld %s pages), %s",
+      p2i(addr), p2i(addr) + size - 1, size, size / pagesize, describe_pagesize(pagesize),
       (type == VMEM_SHMATED ? "shmat" : "mmap")
     );
   }
@@ -1939,7 +1935,7 @@ static bool checked_mprotect(char* addr, size_t size, int prot) {
 
   if (!rc) {
     const char* const s_errno = os::errno_name(errno);
-    warning("mprotect(" PTR_FORMAT "-" PTR_FORMAT ", 0x%X) failed (%s).", addr, addr + size, prot, s_errno);
+    warning("mprotect(" PTR_FORMAT "-" PTR_FORMAT ", 0x%X) failed (%s).", p2i(addr), p2i(addr) + size, prot, s_errno);
     return false;
   }
 
@@ -2356,7 +2352,7 @@ void os::set_native_thread_name(const char *name) {
 
 bool os::find(address addr, outputStream* st) {
 
-  st->print(PTR_FORMAT ": ", addr);
+  st->print(PTR_FORMAT ": ", p2i(addr));
 
   loaded_module_t lm;
   if (LoadedLibraries::find_for_text_address(addr, &lm) ||
diff --git a/src/hotspot/os/aix/os_aix.hpp b/src/hotspot/os/aix/os_aix.hpp
index 7f4f3c7e8cc..759bc552bb7 100644
--- a/src/hotspot/os/aix/os_aix.hpp
+++ b/src/hotspot/os/aix/os_aix.hpp
@@ -120,19 +120,19 @@ class os::Aix {
   struct meminfo_t {
 
     // Amount of virtual memory (in units of 4 KB pages)
-    unsigned long long virt_total;
+    size_t virt_total;
 
     // Amount of real memory, in bytes
-    unsigned long long real_total;
+    size_t real_total;
 
     // Amount of free real memory, in bytes
-    unsigned long long real_free;
+    size_t real_free;
 
     // Total amount of paging space, in bytes
-    unsigned long long pgsp_total;
+    size_t pgsp_total;
 
     // Amount of free paging space, in bytes
-    unsigned long long pgsp_free;
+    size_t pgsp_free;
 
   };
 
diff --git a/src/hotspot/os/aix/porting_aix.cpp b/src/hotspot/os/aix/porting_aix.cpp
index 68233097b49..c06d4ad9a7f 100644
--- a/src/hotspot/os/aix/porting_aix.cpp
+++ b/src/hotspot/os/aix/porting_aix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -741,7 +741,7 @@ void AixNativeCallstack::print_callstack_for_context(outputStream* st, const uco
     st->print("(invalid) ");
     goto cleanup;
   } else {
-    st->print("(base - 0x%X) ", PTRDIFF_BYTES(stack_base, cur_sp));
+    st->print("(base - 0x%lX) ", PTRDIFF_BYTES(stack_base, cur_sp));
   }
   st->cr();
 
@@ -797,7 +797,7 @@ void AixNativeCallstack::print_callstack_for_context(outputStream* st, const uco
       st->print_cr("trying to recover and find backchain...");
       sp = try_find_backchain(sp_last, stack_base, stack_size);
       if (sp) {
-        st->print_cr("found something which looks like a backchain at " PTR_FORMAT ", after 0x%x bytes... ",
+        st->print_cr("found something which looks like a backchain at " PTR_FORMAT ", after 0x%lx bytes... ",
             p2i(sp), PTRDIFF_BYTES(sp, sp_last));
       } else {
         st->print_cr("did not find a backchain, giving up.");
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index d2de5b30484..76a6080305b 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -508,7 +508,7 @@ void os::Posix::print_rlimit_info(outputStream* st) {
 
 #if defined(AIX)
   st->print(", NPROC ");
-  st->print("%d", sysconf(_SC_CHILD_MAX));
+  st->print("%ld", sysconf(_SC_CHILD_MAX));
 
   print_rlimit(st, ", THREADS", RLIMIT_THREADS);
 #else
diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
index e1e81d673a7..8711c9a89b3 100644
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -261,7 +261,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
       else if (sig == SIGTRAP && TrapBasedICMissChecks &&
                nativeInstruction_at(pc)->is_sigtrap_ic_miss_check()) {
         if (TraceTraps) {
-          tty->print_cr("trap: ic_miss_check at " INTPTR_FORMAT " (SIGTRAP)", pc);
+          tty->print_cr("trap: ic_miss_check at " INTPTR_FORMAT " (SIGTRAP)", p2i(pc));
         }
         stub = SharedRuntime::get_ic_miss_stub();
         goto run_stub;
@@ -271,7 +271,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
       else if (sig == SIGTRAP && TrapBasedNullChecks &&
                nativeInstruction_at(pc)->is_sigtrap_null_check()) {
         if (TraceTraps) {
-          tty->print_cr("trap: null_check at " INTPTR_FORMAT " (SIGTRAP)", pc);
+          tty->print_cr("trap: null_check at " INTPTR_FORMAT " (SIGTRAP)", p2i(pc));
         }
         stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
         goto run_stub;
@@ -282,7 +282,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                CodeCache::contains((void*) pc) &&
                MacroAssembler::uses_implicit_null_check(info->si_addr)) {
         if (TraceTraps) {
-          tty->print_cr("trap: null_check at " INTPTR_FORMAT " (SIGSEGV)", pc);
+          tty->print_cr("trap: null_check at " INTPTR_FORMAT " (SIGSEGV)", p2i(pc));
         }
         stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
       }
@@ -292,7 +292,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
       else if (sig == SIGTRAP && TrapBasedRangeChecks &&
                nativeInstruction_at(pc)->is_sigtrap_range_check()) {
         if (TraceTraps) {
-          tty->print_cr("trap: range_check at " INTPTR_FORMAT " (SIGTRAP)", pc);
+          tty->print_cr("trap: range_check at " INTPTR_FORMAT " (SIGTRAP)", p2i(pc));
         }
         stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
         goto run_stub;
@@ -435,12 +435,12 @@ void os::print_context(outputStream *st, const void *context) {
   const ucontext_t* uc = (const ucontext_t*)context;
 
   st->print_cr("Registers:");
-  st->print("pc =" INTPTR_FORMAT "  ", uc->uc_mcontext.jmp_context.iar);
-  st->print("lr =" INTPTR_FORMAT "  ", uc->uc_mcontext.jmp_context.lr);
-  st->print("ctr=" INTPTR_FORMAT "  ", uc->uc_mcontext.jmp_context.ctr);
+  st->print("pc =" INTPTR_FORMAT "  ", (unsigned long)uc->uc_mcontext.jmp_context.iar);
+  st->print("lr =" INTPTR_FORMAT "  ", (unsigned long)uc->uc_mcontext.jmp_context.lr);
+  st->print("ctr=" INTPTR_FORMAT "  ", (unsigned long)uc->uc_mcontext.jmp_context.ctr);
   st->cr();
   for (int i = 0; i < 32; i++) {
-    st->print("r%-2d=" INTPTR_FORMAT "  ", i, uc->uc_mcontext.jmp_context.gpr[i]);
+    st->print("r%-2d=" INTPTR_FORMAT "  ", i, (unsigned long)uc->uc_mcontext.jmp_context.gpr[i]);
     if (i % 3 == 2) st->cr();
   }
   st->cr();
@@ -464,7 +464,7 @@ void os::print_tos_pc(outputStream *st, const void *context) {
   st->cr();
 
   // Try to decode the instructions.
-  st->print_cr("Decoded instructions: (pc=" PTR_FORMAT ")", pc);
+  st->print_cr("Decoded instructions: (pc=" PTR_FORMAT ")", p2i(pc));
   st->print("<TODO: PPC port - print_context>");
   // TODO: PPC port Disassembler::decode(pc, 16, 16, st);
   st->cr();
diff --git a/src/hotspot/share/utilities/byteswap.hpp b/src/hotspot/share/utilities/byteswap.hpp
index d5ece7e00cd..fba0775cf49 100644
--- a/src/hotspot/share/utilities/byteswap.hpp
+++ b/src/hotspot/share/utilities/byteswap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Google and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Google 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
@@ -88,7 +88,7 @@ struct ByteswapFallbackImpl<T, 8> {
 /*****************************************************************************
  * GCC and compatible (including Clang)
  *****************************************************************************/
-#if defined(TARGET_COMPILER_gcc) || defined(TARGET_COMPILER_xlc)
+#if defined(TARGET_COMPILER_gcc)
 
 #if defined(__clang__) || defined(ASSERT)
 
diff --git a/src/hotspot/share/utilities/compilerWarnings_xlc.hpp b/src/hotspot/share/utilities/compilerWarnings_xlc.hpp
deleted file mode 100644
index 76782c105af..00000000000
--- a/src/hotspot/share/utilities/compilerWarnings_xlc.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_UTILITIES_COMPILERWARNINGS_XLC_HPP
-#define SHARE_UTILITIES_COMPILERWARNINGS_XLC_HPP
-
-// Nothing here yet.
-
-#endif // SHARE_UTILITIES_COMPILERWARNINGS_XLC_HPP
diff --git a/src/hotspot/share/utilities/count_leading_zeros.hpp b/src/hotspot/share/utilities/count_leading_zeros.hpp
index 612a6efbc3a..d6cbed9a355 100644
--- a/src/hotspot/share/utilities/count_leading_zeros.hpp
+++ b/src/hotspot/share/utilities/count_leading_zeros.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -123,37 +123,6 @@ template <typename T> struct CountLeadingZerosImpl<T, 8> {
   }
 };
 
-/*****************************************************************************
- * IBM XL C/C++
- *****************************************************************************/
-#elif defined(TARGET_COMPILER_xlc)
-
-#include <builtins.h>
-
-template <typename T> struct CountLeadingZerosImpl<T, 1> {
-  static unsigned doit(T v) {
-    return __cntlz4((uint32_t)v & 0xFF) - 24u;
-  }
-};
-
-template <typename T> struct CountLeadingZerosImpl<T, 2> {
-  static unsigned doit(T v) {
-    return __cntlz4((uint32_t)v & 0xFFFF) - 16u;
-  }
-};
-
-template <typename T> struct CountLeadingZerosImpl<T, 4> {
-  static unsigned doit(T v) {
-    return __cntlz4(v);
-  }
-};
-
-template <typename T> struct CountLeadingZerosImpl<T, 8> {
-  static unsigned doit(T v) {
-    return __cntlz8(v);
-  }
-};
-
 /*****************************************************************************
  * Fallback
  *****************************************************************************/
diff --git a/src/hotspot/share/utilities/count_trailing_zeros.hpp b/src/hotspot/share/utilities/count_trailing_zeros.hpp
index b9e55d0fa24..59cda41daff 100644
--- a/src/hotspot/share/utilities/count_trailing_zeros.hpp
+++ b/src/hotspot/share/utilities/count_trailing_zeros.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, 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
@@ -84,21 +84,6 @@ inline unsigned count_trailing_zeros_64(uint64_t x) {
   return index;
 }
 
-/*****************************************************************************
- * IBM XL C/C++
- *****************************************************************************/
-#elif defined(TARGET_COMPILER_xlc)
-
-#include <builtins.h>
-
-inline unsigned count_trailing_zeros_32(uint32_t x) {
-  return __cnttz4(x);
-}
-
-inline unsigned count_trailing_zeros_64(uint64_t x) {
-  return __cnttz8(x);
-}
-
 /*****************************************************************************
  * Unknown toolchain
  *****************************************************************************/
diff --git a/src/hotspot/share/utilities/debug.hpp b/src/hotspot/share/utilities/debug.hpp
index 3a9adda9054..d21439c35ca 100644
--- a/src/hotspot/share/utilities/debug.hpp
+++ b/src/hotspot/share/utilities/debug.hpp
@@ -106,7 +106,7 @@ public:
 // constant evaluation in the compiler. We don't do something like that now,
 // because we need a fallback when we don't have any mechanism for detecting
 // constant evaluation.
-#if defined(TARGET_COMPILER_gcc) || defined(TARGET_COMPILER_xlc)
+#if defined(TARGET_COMPILER_gcc)
 
 // Both __has_builtin and __builtin_is_constant_evaluated are available in our
 // minimum required versions of gcc and clang.
diff --git a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
index 06bb22687d8..4267cdb2746 100644
--- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
@@ -39,6 +39,14 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+// In stdlib.h on AIX malloc is defined as a macro causing
+// compiler errors when resolving them in different depths as it
+// happens in the log tags. This avoids the macro.
+#if (defined(__VEC__) || defined(__AIXVEC)) && defined(AIX) \
+    && defined(__open_xl_version__) && __open_xl_version__ >= 17
+  #undef malloc
+  extern void *malloc(size_t) asm("vec_malloc");
+#endif
 #include <wchar.h>
 
 #include <math.h>
@@ -50,7 +58,7 @@
 #include <limits.h>
 #include <errno.h>
 
-#if defined(LINUX) || defined(_ALLBSD_SOURCE)
+#if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(_AIX)
 #include <signal.h>
 #ifndef __OpenBSD__
 #include <ucontext.h>
@@ -83,7 +91,7 @@
 // checking for nanness
 #if defined(__APPLE__)
 inline int g_isnan(double f) { return isnan(f); }
-#elif defined(LINUX) || defined(_ALLBSD_SOURCE)
+#elif defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(_AIX)
 inline int g_isnan(float  f) { return isnan(f); }
 inline int g_isnan(double f) { return isnan(f); }
 #else
diff --git a/src/hotspot/share/utilities/globalDefinitions_xlc.hpp b/src/hotspot/share/utilities/globalDefinitions_xlc.hpp
deleted file mode 100644
index 9595452d399..00000000000
--- a/src/hotspot/share/utilities/globalDefinitions_xlc.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2023 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_UTILITIES_GLOBALDEFINITIONS_XLC_HPP
-#define SHARE_UTILITIES_GLOBALDEFINITIONS_XLC_HPP
-
-#include "jni.h"
-
-// This file holds compiler-dependent includes,
-// globally used constants & types, class (forward)
-// declarations and a few frequently used utility functions.
-
-#include <alloca.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-// In stdlib.h on AIX malloc is defined as a macro causing
-// compiler errors when resolving them in different depths as it
-// happens in the log tags. This avoids the macro.
-#if (defined(__VEC__) || defined(__AIXVEC)) && defined(AIX) \
-    && defined(__open_xl_version__) && __open_xl_version__ >= 17
-  #undef malloc
-  extern void *malloc(size_t) asm("vec_malloc");
-#endif
-
-#include <wchar.h>
-
-#include <math.h>
-#include <time.h>
-#include <fcntl.h>
-#include <dlfcn.h>
-#include <pthread.h>
-
-#include <limits.h>
-#include <errno.h>
-
-#include <stdint.h>
-
-#if defined(__open_xl_version__)
-  #if __open_xl_version__ < 17
-  #error "open xlc < 17 not supported"
-  #endif
-#else
-  #error "xlc version not supported, macro __open_xl_version__ not found"
-#endif
-
-#ifndef _AIX
-#error "missing AIX-specific definition _AIX"
-#endif
-
-// Use XLC compiler builtins instead of inline assembler
-#define USE_XLC_BUILTINS
-
-#ifdef USE_XLC_BUILTINS
-#include <builtins.h>
-// XLC V10 and higher provide the prototype for __dcbtst (void *);
-#endif // USE_XLC_BUILTINS
-
-// NULL vs NULL_WORD:
-// Some platform/tool-chain combinations can't assign NULL to an integer
-// type so we define NULL_WORD to use in those contexts.
-#define NULL_WORD  0L
-
-// checking for nanness
-inline int g_isnan(float  f) { return isnan(f); }
-inline int g_isnan(double f) { return isnan(f); }
-
-// Checking for finiteness
-inline int g_isfinite(jfloat  f)                 { return finite(f); }
-inline int g_isfinite(jdouble f)                 { return finite(f); }
-
-// Formatting.
-#ifdef _LP64
-#define FORMAT64_MODIFIER "l"
-#else // !_LP64
-#define FORMAT64_MODIFIER "ll"
-#endif // _LP64
-
-// Cannot use xlc's offsetof as implementation of hotspot's
-// offset_of(), because xlc warns about applying offsetof() to non-POD
-// object and xlc cannot compile the expression offsetof(DataLayout,
-// _cells[index]) in DataLayout::cell_offset() .  Therefore we define
-// offset_of as it is defined for gcc.
-#define offset_of(klass,field) (size_t)((intx)&(((klass*)16)->field) - 16)
-
-#define THREAD_LOCAL __thread
-
-// Inlining support
-//
-// Be aware that for function/method declarations, xlC only supports the following
-// syntax (i.e. the attribute must be placed AFTER the function/method declarator):
-//
-//   void* operator new(size_t size) throw() NOINLINE;
-//
-// For function/method definitions, the more common placement BEFORE the
-// function/method declarator seems to be supported as well:
-//
-//   NOINLINE void* CHeapObj<F>::operator new(size_t size) throw() {...}
-
-#define NOINLINE     __attribute__((__noinline__))
-#define ALWAYSINLINE inline __attribute__((__always_inline__))
-
-#endif // SHARE_UTILITIES_GLOBALDEFINITIONS_XLC_HPP

From 60d88b7ae2945724ab4db44207e3390bcff172c0 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Mon, 15 Apr 2024 12:42:31 +0000
Subject: [PATCH 039/486] 8330176: Typo in Linker javadoc

Reviewed-by: mcimadamore
---
 src/java.base/share/classes/java/lang/foreign/Linker.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/Linker.java b/src/java.base/share/classes/java/lang/foreign/Linker.java
index ea407c296f7..fb325ef1d44 100644
--- a/src/java.base/share/classes/java/lang/foreign/Linker.java
+++ b/src/java.base/share/classes/java/lang/foreign/Linker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -598,7 +598,7 @@ public sealed interface Linker permits AbstractLinker {
      * <p>
      * Calling this method is equivalent to the following code:
      * {@snippet lang=java :
-     * linker.downcallHandle(function).bindTo(symbol);
+     * linker.downcallHandle(function, options).bindTo(address);
      * }
      *
      * @param address  the native memory segment whose

From a3fecdb2f417bd32e528f907bc293cc494746955 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 15 Apr 2024 13:21:18 +0000
Subject: [PATCH 040/486] 8329764: G1: Handle null references during
 verification first

Reviewed-by: stefank, iwalulya
---
 src/hotspot/share/gc/g1/g1HeapRegion.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
index 698a4e0e39f..ff5ac4ab3a1 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -621,14 +621,18 @@ class G1VerifyLiveAndRemSetClosure : public BasicOopIterateClosure {
 
   template <class T>
   void do_oop_work(T* p) {
-    if (_failures->count() >= G1MaxVerifyFailures) {
-      return;
-    }
-
+    // Check for null references first - they are fairly common and since there is
+    // nothing to do for them anyway (they can't fail verification), it makes sense
+    // to handle them first.
     T heap_oop = RawAccess<>::oop_load(p);
     if (CompressedOops::is_null(heap_oop)) {
       return;
     }
+
+    if (_failures->count() >= G1MaxVerifyFailures) {
+      return;
+    }
+
     oop obj = CompressedOops::decode_raw_not_null(heap_oop);
 
     LiveChecker<T> live_check(_failures, _containing_obj, p, obj, _vo);

From 273df6286a9cc4dcef4cd339234206b2ad922386 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 15 Apr 2024 13:32:26 +0000
Subject: [PATCH 041/486] 8328792: Parallel: Refactor
 PSParallelCompact::summary_phase

Reviewed-by: iwalulya, tschatzl
---
 .../share/gc/parallel/psParallelCompact.cpp   | 273 +++++++-----------
 .../share/gc/parallel/psParallelCompact.hpp   |  24 +-
 2 files changed, 120 insertions(+), 177 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 8480e8520c4..30b73ad3e56 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -642,6 +642,38 @@ ParallelCompactData::summarize_split_space(size_t src_region,
   return source_next;
 }
 
+size_t ParallelCompactData::live_words_in_space(const MutableSpace* space,
+                                                HeapWord** full_region_prefix_end) {
+  size_t cur_region = addr_to_region_idx(space->bottom());
+  const size_t end_region = addr_to_region_idx(region_align_up(space->top()));
+  size_t live_words = 0;
+  if (full_region_prefix_end == nullptr) {
+    for (/* empty */; cur_region < end_region; ++cur_region) {
+      live_words += _region_data[cur_region].data_size();
+    }
+  } else {
+    bool first_set = false;
+    for (/* empty */; cur_region < end_region; ++cur_region) {
+      size_t live_words_in_region = _region_data[cur_region].data_size();
+      if (!first_set && live_words_in_region < RegionSize) {
+        *full_region_prefix_end = region_to_addr(cur_region);
+        first_set = true;
+      }
+      live_words += live_words_in_region;
+    }
+    if (!first_set) {
+      // All regions are full of live objs.
+      assert(is_region_aligned(space->top()), "inv");
+      *full_region_prefix_end = space->top();
+    }
+    assert(*full_region_prefix_end != nullptr, "postcondition");
+    assert(is_region_aligned(*full_region_prefix_end), "inv");
+    assert(*full_region_prefix_end >= space->bottom(), "in-range");
+    assert(*full_region_prefix_end <= space->top(), "in-range");
+  }
+  return live_words;
+}
+
 bool ParallelCompactData::summarize(SplitInfo& split_info,
                                     HeapWord* source_beg, HeapWord* source_end,
                                     HeapWord** source_next,
@@ -982,93 +1014,19 @@ void PSParallelCompact::post_compact()
   Universe::heap()->record_whole_heap_examined_timestamp();
 }
 
-ParallelCompactData::RegionData*
-PSParallelCompact::first_dead_space_region(const RegionData* beg,
-                                           const RegionData* end)
-{
-  const size_t region_size = ParallelCompactData::RegionSize;
-  ParallelCompactData& sd = summary_data();
-  size_t left = sd.region(beg);
-  size_t right = end > beg ? sd.region(end) - 1 : left;
-
-  // Binary search.
-  while (left < right) {
-    // Equivalent to (left + right) / 2, but does not overflow.
-    const size_t middle = left + (right - left) / 2;
-    RegionData* const middle_ptr = sd.region(middle);
-    HeapWord* const dest = middle_ptr->destination();
-    HeapWord* const addr = sd.region_to_addr(middle);
-    assert(dest != nullptr, "sanity");
-    assert(dest <= addr, "must move left");
-
-    if (middle > left && dest < addr) {
-      right = middle - 1;
-    } else if (middle < right && middle_ptr->data_size() == region_size) {
-      left = middle + 1;
-    } else {
-      return middle_ptr;
-    }
-  }
-  return sd.region(left);
-}
-
-// Return the address of the end of the dense prefix, a.k.a. the start of the
-// compacted region.  The address is always on a region boundary.
-//
-// Completely full regions at the left are skipped, since no compaction can
-// occur in those regions.  Then the maximum amount of dead wood to allow is
-// computed, based on the density (amount live / capacity) of the generation;
-// the region with approximately that amount of dead space to the left is
-// identified as the limit region.  Regions between the last completely full
-// region and the limit region are scanned and the one that has the best
-// (maximum) reclaimed_ratio() is selected.
-HeapWord*
-PSParallelCompact::compute_dense_prefix(const SpaceId id,
-                                        bool maximum_compaction)
-{
+HeapWord* PSParallelCompact::compute_dense_prefix_for_old_space(MutableSpace* old_space,
+                                                                HeapWord* full_region_prefix_end) {
   const size_t region_size = ParallelCompactData::RegionSize;
   const ParallelCompactData& sd = summary_data();
 
-  const MutableSpace* const space = _space_info[id].space();
-  HeapWord* const top = space->top();
-  HeapWord* const top_aligned_up = sd.region_align_up(top);
-  HeapWord* const new_top = _space_info[id].new_top();
-  HeapWord* const new_top_aligned_up = sd.region_align_up(new_top);
-  HeapWord* const bottom = space->bottom();
-  const RegionData* const beg_cp = sd.addr_to_region_ptr(bottom);
-  const RegionData* const top_cp = sd.addr_to_region_ptr(top_aligned_up);
-  const RegionData* const new_top_cp =
-    sd.addr_to_region_ptr(new_top_aligned_up);
-
-  // Skip full regions at the beginning of the space--they are necessarily part
-  // of the dense prefix.
-  const RegionData* const full_cp = first_dead_space_region(beg_cp, new_top_cp);
-  assert(full_cp->destination() == sd.region_to_addr(full_cp) ||
-         space->is_empty(), "no dead space allowed to the left");
-  assert(full_cp->data_size() < region_size || full_cp == new_top_cp - 1,
-         "region must have dead space");
-
-  // The gc number is saved whenever a maximum compaction is done, and used to
-  // determine when the maximum compaction interval has expired.  This avoids
-  // successive max compactions for different reasons.
-  const uint total_invocations = ParallelScavengeHeap::heap()->total_full_collections();
-  assert(total_invocations >= _maximum_compaction_gc_num, "sanity");
-  const size_t gcs_since_max = total_invocations - _maximum_compaction_gc_num;
-  const bool interval_ended = gcs_since_max > HeapMaximumCompactionInterval ||
-    total_invocations == HeapFirstMaximumCompactionCount;
-  if (maximum_compaction || full_cp == top_cp || interval_ended) {
-    _maximum_compaction_gc_num = total_invocations;
-    return sd.region_to_addr(full_cp);
-  }
-
   // Iteration starts with the region *after* the full-region-prefix-end.
-  const RegionData* const start_region = full_cp;
+  const RegionData* const start_region = sd.addr_to_region_ptr(full_region_prefix_end);
   // If final region is not full, iteration stops before that region,
   // because fill_dense_prefix_end assumes that prefix_end <= top.
-  const RegionData* const end_region = sd.addr_to_region_ptr(space->top());
+  const RegionData* const end_region = sd.addr_to_region_ptr(old_space->top());
   assert(start_region <= end_region, "inv");
 
-  size_t max_waste = space->capacity_in_words() * (MarkSweepDeadRatio / 100.0);
+  size_t max_waste = old_space->capacity_in_words() * (MarkSweepDeadRatio / 100.0);
   const RegionData* cur_region = start_region;
   for (/* empty */; cur_region < end_region; ++cur_region) {
     assert(region_size >= cur_region->data_size(), "inv");
@@ -1081,24 +1039,11 @@ PSParallelCompact::compute_dense_prefix(const SpaceId id,
 
   HeapWord* const prefix_end = sd.region_to_addr(cur_region);
   assert(sd.is_region_aligned(prefix_end), "postcondition");
-  assert(prefix_end >= sd.region_to_addr(full_cp), "in-range");
-  assert(prefix_end <= space->top(), "in-range");
+  assert(prefix_end >= full_region_prefix_end, "in-range");
+  assert(prefix_end <= old_space->top(), "in-range");
   return prefix_end;
 }
 
-void PSParallelCompact::summarize_spaces_quick()
-{
-  for (unsigned int i = 0; i < last_space_id; ++i) {
-    const MutableSpace* space = _space_info[i].space();
-    HeapWord** nta = _space_info[i].new_top_addr();
-    bool result = _summary_data.summarize(_space_info[i].split_info(),
-                                          space->bottom(), space->top(), nullptr,
-                                          space->bottom(), space->end(), nta);
-    assert(result, "space must fit into itself");
-    _space_info[i].set_dense_prefix(space->bottom());
-  }
-}
-
 void PSParallelCompact::fill_dense_prefix_end(SpaceId id) {
   // Comparing two sizes to decide if filling is required:
   //
@@ -1123,6 +1068,12 @@ void PSParallelCompact::fill_dense_prefix_end(SpaceId id) {
   }
   assert(CollectedHeap::min_fill_size() == 2, "inv");
   HeapWord* const dense_prefix_end = dense_prefix(id);
+  assert(_summary_data.is_region_aligned(dense_prefix_end), "precondition");
+  assert(dense_prefix_end <= space(id)->top(), "precondition");
+  if (dense_prefix_end == space(id)->top()) {
+    // Must not have single-word gap right before prefix-end/top.
+    return;
+  }
   RegionData* const region_after_dense_prefix = _summary_data.addr_to_region_ptr(dense_prefix_end);
   idx_t const dense_prefix_bit = _mark_bitmap.addr_to_bit(dense_prefix_end);
 
@@ -1147,56 +1098,6 @@ void PSParallelCompact::fill_dense_prefix_end(SpaceId id) {
   }
 }
 
-void
-PSParallelCompact::summarize_space(SpaceId id, bool maximum_compaction)
-{
-  assert(id < last_space_id, "id out of range");
-  assert(_space_info[id].dense_prefix() == _space_info[id].space()->bottom(),
-         "should have been reset in summarize_spaces_quick()");
-
-  const MutableSpace* space = _space_info[id].space();
-  if (_space_info[id].new_top() != space->bottom()) {
-    HeapWord* dense_prefix_end = compute_dense_prefix(id, maximum_compaction);
-    _space_info[id].set_dense_prefix(dense_prefix_end);
-
-    // Recompute the summary data, taking into account the dense prefix.  If
-    // every last byte will be reclaimed, then the existing summary data which
-    // compacts everything can be left in place.
-    if (!maximum_compaction && dense_prefix_end != space->bottom()) {
-      // If dead space crosses the dense prefix boundary, it is (at least
-      // partially) filled with a dummy object, marked live and added to the
-      // summary data.  This simplifies the copy/update phase and must be done
-      // before the final locations of objects are determined, to prevent
-      // leaving a fragment of dead space that is too small to fill.
-      fill_dense_prefix_end(id);
-
-      // Compute the destination of each Region, and thus each object.
-      _summary_data.summarize_dense_prefix(space->bottom(), dense_prefix_end);
-      _summary_data.summarize(_space_info[id].split_info(),
-                              dense_prefix_end, space->top(), nullptr,
-                              dense_prefix_end, space->end(),
-                              _space_info[id].new_top_addr());
-    }
-  }
-
-  if (log_develop_is_enabled(Trace, gc, compaction)) {
-    const size_t region_size = ParallelCompactData::RegionSize;
-    HeapWord* const dense_prefix_end = _space_info[id].dense_prefix();
-    const size_t dp_region = _summary_data.addr_to_region_idx(dense_prefix_end);
-    const size_t dp_words = pointer_delta(dense_prefix_end, space->bottom());
-    HeapWord* const new_top = _space_info[id].new_top();
-    const HeapWord* nt_aligned_up = _summary_data.region_align_up(new_top);
-    const size_t cr_words = pointer_delta(nt_aligned_up, dense_prefix_end);
-    log_develop_trace(gc, compaction)(
-        "id=%d cap=" SIZE_FORMAT " dp=" PTR_FORMAT " "
-        "dp_region=" SIZE_FORMAT " " "dp_count=" SIZE_FORMAT " "
-        "cr_count=" SIZE_FORMAT " " "nt=" PTR_FORMAT,
-        id, space->capacity_in_words(), p2i(dense_prefix_end),
-        dp_region, dp_words / region_size,
-        cr_words / region_size, p2i(new_top));
-  }
-}
-
 #ifndef PRODUCT
 void PSParallelCompact::summary_phase_msg(SpaceId dst_space_id,
                                           HeapWord* dst_beg, HeapWord* dst_end,
@@ -1220,33 +1121,75 @@ void PSParallelCompact::summary_phase_msg(SpaceId dst_space_id,
 }
 #endif  // #ifndef PRODUCT
 
+bool PSParallelCompact::reassess_maximum_compaction(bool maximum_compaction,
+                                                    size_t total_live_words,
+                                                    MutableSpace* const old_space,
+                                                    HeapWord* full_region_prefix_end) {
+  // Check if all live objs are larger than old-gen.
+  const bool is_old_gen_overflowing = (total_live_words > old_space->capacity_in_words());
+
+  // JVM flags
+  const uint total_invocations = ParallelScavengeHeap::heap()->total_full_collections();
+  assert(total_invocations >= _maximum_compaction_gc_num, "sanity");
+  const size_t gcs_since_max = total_invocations - _maximum_compaction_gc_num;
+  const bool is_interval_ended = gcs_since_max > HeapMaximumCompactionInterval
+                              || total_invocations == HeapFirstMaximumCompactionCount;
+
+  // If all regions in old-gen are full
+  const bool is_region_full =
+    full_region_prefix_end >= _summary_data.region_align_down(old_space->top());
+
+  if (maximum_compaction || is_old_gen_overflowing || is_interval_ended || is_region_full) {
+    _maximum_compaction_gc_num = total_invocations;
+    return true;
+  }
+
+  return false;
+}
+
 void PSParallelCompact::summary_phase(bool maximum_compaction)
 {
   GCTraceTime(Info, gc, phases) tm("Summary Phase", &_gc_timer);
 
-  // Quick summarization of each space into itself, to see how much is live.
-  summarize_spaces_quick();
-
-  log_develop_trace(gc, compaction)("summary phase:  after summarizing each space to self");
-  NOT_PRODUCT(print_region_ranges());
-  NOT_PRODUCT(print_initial_summary_data(_summary_data, _space_info));
-
-  // The amount of live data that will end up in old space (assuming it fits).
-  size_t old_space_total_live = 0;
-  for (unsigned int id = old_space_id; id < last_space_id; ++id) {
-    old_space_total_live += pointer_delta(_space_info[id].new_top(),
-                                          _space_info[id].space()->bottom());
-  }
-
   MutableSpace* const old_space = _space_info[old_space_id].space();
-  const size_t old_capacity = old_space->capacity_in_words();
-  if (old_space_total_live > old_capacity) {
-    // XXX - should also try to expand
-    maximum_compaction = true;
-  }
+  {
+    size_t total_live_words = 0;
+    HeapWord* full_region_prefix_end = nullptr;
+    {
+      // old-gen
+      size_t live_words = _summary_data.live_words_in_space(old_space,
+                                                            &full_region_prefix_end);
+      total_live_words += live_words;
+    }
+    // young-gen
+    for (uint i = eden_space_id; i < last_space_id; ++i) {
+      const MutableSpace* space = _space_info[i].space();
+      size_t live_words = _summary_data.live_words_in_space(space);
+      total_live_words += live_words;
+      _space_info[i].set_new_top(space->bottom() + live_words);
+      _space_info[i].set_dense_prefix(space->bottom());
+    }
 
-  // Old generations.
-  summarize_space(old_space_id, maximum_compaction);
+    maximum_compaction = reassess_maximum_compaction(maximum_compaction,
+                                                     total_live_words,
+                                                     old_space,
+                                                     full_region_prefix_end);
+    HeapWord* dense_prefix_end =
+      maximum_compaction ? full_region_prefix_end
+                         : compute_dense_prefix_for_old_space(old_space,
+                                                              full_region_prefix_end);
+    SpaceId id = old_space_id;
+    _space_info[id].set_dense_prefix(dense_prefix_end);
+
+    if (dense_prefix_end != old_space->bottom()) {
+      fill_dense_prefix_end(id);
+      _summary_data.summarize_dense_prefix(old_space->bottom(), dense_prefix_end);
+    }
+    _summary_data.summarize(_space_info[id].split_info(),
+                            dense_prefix_end, old_space->top(), nullptr,
+                            dense_prefix_end, old_space->end(),
+                            _space_info[id].new_top_addr());
+  }
 
   // Summarize the remaining spaces in the young gen.  The initial target space
   // is the old gen.  If a space does not fit entirely into the target, then the
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index cd4965bbb45..6ca23947ca4 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
@@ -406,6 +406,10 @@ public:
   HeapWord* summarize_split_space(size_t src_region, SplitInfo& split_info,
                                   HeapWord* destination, HeapWord* target_end,
                                   HeapWord** target_next);
+
+  size_t live_words_in_space(const MutableSpace* space,
+                             HeapWord** full_region_prefix_end = nullptr);
+
   bool summarize(SplitInfo& split_info,
                  HeapWord* source_beg, HeapWord* source_end,
                  HeapWord** source_next,
@@ -935,26 +939,22 @@ class PSParallelCompact : AllStatic {
   static void pre_compact();
   static void post_compact();
 
+  static bool reassess_maximum_compaction(bool maximum_compaction,
+                                          size_t total_live_words,
+                                          MutableSpace* const old_space,
+                                          HeapWord* full_region_prefix_end);
+
   // Mark live objects
   static void marking_phase(ParallelOldTracer *gc_tracer);
 
-  // Methods used to compute the dense prefix.
-
-  // Return a pointer to the first region in the range [beg, end) that is not
-  // completely full.
-  static RegionData* first_dead_space_region(const RegionData* beg,
-                                             const RegionData* end);
-
-  // Compute the dense prefix for the designated space.
-  static HeapWord* compute_dense_prefix(const SpaceId id,
-                                        bool maximum_compaction);
+  // Identify the dense-fix in the old-space to avoid moving much memory with little reclaimed.
+  static HeapWord* compute_dense_prefix_for_old_space(MutableSpace* old_space,
+                                                      HeapWord* full_region_prefix_end);
 
   // Create a filler obj (if needed) right before the dense-prefix-boundary to
   // make the heap parsable.
   static void fill_dense_prefix_end(SpaceId id);
 
-  static void summarize_spaces_quick();
-  static void summarize_space(SpaceId id, bool maximum_compaction);
   static void summary_phase(bool maximum_compaction);
 
   // Adjust addresses in roots.  Does not adjust addresses in heap.

From ddc3921cf98b9470f597ae9bb6a4f5a043e1544f Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Mon, 15 Apr 2024 15:01:05 +0000
Subject: [PATCH 042/486] 8330103: Compiler memory statistics should keep
 separate records for C1 and C2

Reviewed-by: kvn, redestad
---
 .../compiler/compilationMemoryStatistic.cpp   | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 7c39024a82a..6bc3f39b939 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -167,12 +167,9 @@ public:
     ss.put(')');
     return buf;
   }
-
-  bool equals(const FullMethodName& b) const {
+  bool operator== (const FullMethodName& b) const {
     return _k == b._k && _m == b._m && _s == b._s;
   }
-
-  bool operator== (const FullMethodName& other) const { return equals(other); }
 };
 
 // Note: not mtCompiler since we don't want to change what we measure
@@ -292,15 +289,34 @@ public:
     const size_t x2 = _total;
     return x1 < x2 ? -1 : x1 == x2 ? 0 : 1;
   }
+};
 
-  bool equals(const FullMethodName& b) const {
-    return _method.equals(b);
+// The MemStatTable contains records of memory usage of all compilations. It is printed,
+// as memory summary, either with jcmd Compiler.memory, or - if the "print" suboption has
+// been given with the MemStat compile command - as summary printout at VM exit.
+// For any given compiled method, we only keep the memory statistics of the most recent
+// compilation, but on a per-compiler basis. If one needs statistics of prior compilations,
+// one needs to look into the log produced by the "print" suboption.
+
+class MemStatTableKey {
+  const FullMethodName _fmn;
+  const CompilerType _comptype;
+public:
+  MemStatTableKey(FullMethodName fmn, CompilerType comptype) :
+    _fmn(fmn), _comptype(comptype) {}
+  MemStatTableKey(const MemStatTableKey& o) :
+    _fmn(o._fmn), _comptype(o._comptype) {}
+  bool operator== (const MemStatTableKey& other) const {
+    return _fmn == other._fmn && _comptype == other._comptype;
+  }
+  static unsigned compute_hash(const MemStatTableKey& n) {
+    return FullMethodName::compute_hash(n._fmn) + (unsigned)n._comptype;
   }
 };
 
 class MemStatTable :
-    public ResourceHashtable<FullMethodName, MemStatEntry*, 7919, AnyObj::C_HEAP,
-                             mtInternal, FullMethodName::compute_hash>
+    public ResourceHashtable<MemStatTableKey, MemStatEntry*, 7919, AnyObj::C_HEAP,
+                             mtInternal, MemStatTableKey::compute_hash>
 {
 public:
 
@@ -308,12 +324,12 @@ public:
            size_t total, size_t na_at_peak, size_t ra_at_peak,
            unsigned live_nodes_at_peak, const char* result) {
     assert_lock_strong(NMTCompilationCostHistory_lock);
-
-    MemStatEntry** pe = get(fmn);
+    MemStatTableKey key(fmn, comptype);
+    MemStatEntry** pe = get(key);
     MemStatEntry* e = nullptr;
     if (pe == nullptr) {
       e = new MemStatEntry(fmn);
-      put(fmn, e);
+      put(key, e);
     } else {
       // Update existing entry
       e = *pe;
@@ -338,7 +354,7 @@ public:
     const int num_all = number_of_entries();
     MemStatEntry** flat = NEW_C_HEAP_ARRAY(MemStatEntry*, num_all, mtInternal);
     int i = 0;
-    auto do_f = [&] (const FullMethodName& ignored, MemStatEntry* e) {
+    auto do_f = [&] (const MemStatTableKey& ignored, MemStatEntry* e) {
       if (e->total() >= min_size) {
         flat[i] = e;
         assert(i < num_all, "Sanity");

From da75e015b54f4ff011837995cacf80850411bb74 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 15 Apr 2024 15:11:40 +0000
Subject: [PATCH 043/486] 8330196: Make
 java/lang/invoke/defineHiddenClass/BasicTest release agnostic

Reviewed-by: liach, mchung, jkuhn
---
 test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
index ce4f4f75906..2ca27be4248 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -78,7 +78,8 @@ public class BasicTest {
 
     @BeforeTest
     static void setup() throws IOException {
-        compileSources(SRC_DIR, CLASSES_DIR, "--enable-preview", "--release", "23");
+        compileSources(SRC_DIR, CLASSES_DIR, "--enable-preview",
+                       "--release", Integer.toString(Runtime.version().feature()));
         hiddenClassBytes = Files.readAllBytes(CLASSES_DIR.resolve("HiddenClass.class"));
 
         // compile with --release 10 with no NestHost and NestMembers attribute

From a293bdff91f7bcc0deece6bed3151a40fad42a64 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 15 Apr 2024 15:11:53 +0000
Subject: [PATCH 044/486] 8330197: Make javac/diags/example release agnostic

Reviewed-by: jlahoda
---
 .../tools/javac/diags/examples/DefaultAndBothBoolean.java       | 2 +-
 .../diags/examples/UnconditionalPatternAndBothBoolean.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/langtools/tools/javac/diags/examples/DefaultAndBothBoolean.java b/test/langtools/tools/javac/diags/examples/DefaultAndBothBoolean.java
index dac10c13954..a3f602630a1 100644
--- a/test/langtools/tools/javac/diags/examples/DefaultAndBothBoolean.java
+++ b/test/langtools/tools/javac/diags/examples/DefaultAndBothBoolean.java
@@ -24,7 +24,7 @@
 // key: compiler.err.default.and.both.boolean.values
 // key: compiler.note.preview.filename
 // key: compiler.note.preview.recompile
-// options: --enable-preview --source 23
+// options: --enable-preview --source ${jdk.version}
 public class DefaultAndBothBoolean {
     private int test(boolean sel) {
         return switch (sel) {
diff --git a/test/langtools/tools/javac/diags/examples/UnconditionalPatternAndBothBoolean.java b/test/langtools/tools/javac/diags/examples/UnconditionalPatternAndBothBoolean.java
index 69d60d10f59..23b1bb82654 100644
--- a/test/langtools/tools/javac/diags/examples/UnconditionalPatternAndBothBoolean.java
+++ b/test/langtools/tools/javac/diags/examples/UnconditionalPatternAndBothBoolean.java
@@ -24,7 +24,7 @@
 // key: compiler.err.unconditional.pattern.and.both.boolean.values
 // key: compiler.note.preview.filename
 // key: compiler.note.preview.recompile
-// options: --enable-preview --source 23
+// options: --enable-preview --source ${jdk.version}
 public class UnconditionalPatternAndBothBoolean {
     private int test(boolean sel) {
         return switch (sel) {

From 140f56718bbbfc31bb0c39255c68568fad285a1f Mon Sep 17 00:00:00 2001
From: Joshua Cao <cao.joshua@yahoo.com>
Date: Mon, 15 Apr 2024 15:54:34 +0000
Subject: [PATCH 045/486] 8323220: Reassociate loop invariants involved in Cmps
 and Add/Subs

Reviewed-by: epeter, xliu, chagedorn
---
 src/hotspot/share/opto/loopTransform.cpp      |  72 ++-
 src/hotspot/share/opto/loopnode.hpp           |   6 +-
 .../InvariantCodeMotionReassociateAddSub.java | 525 ++++++++++++++++++
 .../InvariantCodeMotionReassociateCmp.java    | 412 ++++++++++++++
 4 files changed, 994 insertions(+), 21 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateAddSub.java
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateCmp.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 5fd98251af5..21e8807d15d 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -254,11 +254,10 @@ void IdealLoopTree::compute_profile_trip_cnt(PhaseIdealLoop *phase) {
   head->set_profile_trip_cnt(trip_cnt);
 }
 
-//---------------------find_invariant-----------------------------
 // Return nonzero index of invariant operand for an associative
 // binary operation of (nonconstant) invariant and variant values.
 // Helper for reassociate_invariants.
-int IdealLoopTree::find_invariant(Node* n, PhaseIdealLoop *phase) {
+int IdealLoopTree::find_invariant(Node* n, PhaseIdealLoop* phase) {
   bool in1_invar = this->is_invariant(n->in(1));
   bool in2_invar = this->is_invariant(n->in(2));
   if (in1_invar && !in2_invar) return 1;
@@ -266,7 +265,24 @@ int IdealLoopTree::find_invariant(Node* n, PhaseIdealLoop *phase) {
   return 0;
 }
 
-//---------------------is_associative-----------------------------
+// Return TRUE if "n" is an associative cmp node. A cmp node is
+// associative if it is only used for equals or not-equals
+// comparisons of integers or longs. We cannot reassociate
+// non-equality comparisons due to possibility of overflow.
+bool IdealLoopTree::is_associative_cmp(Node* n) {
+  if (n->Opcode() != Op_CmpI && n->Opcode() != Op_CmpL) {
+    return false;
+  }
+  for (DUIterator i = n->outs(); n->has_out(i); i++) {
+    BoolNode* bool_out = n->out(i)->isa_Bool();
+    if (bool_out == nullptr || !(bool_out->_test._test == BoolTest::eq ||
+                                 bool_out->_test._test == BoolTest::ne)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 // Return TRUE if "n" is an associative binary node. If "base" is
 // not null, "n" must be re-associative with it.
 bool IdealLoopTree::is_associative(Node* n, Node* base) {
@@ -274,25 +290,26 @@ bool IdealLoopTree::is_associative(Node* n, Node* base) {
   if (base != nullptr) {
     assert(is_associative(base), "Base node should be associative");
     int base_op = base->Opcode();
-    if (base_op == Op_AddI || base_op == Op_SubI) {
+    if (base_op == Op_AddI || base_op == Op_SubI || base_op == Op_CmpI) {
       return op == Op_AddI || op == Op_SubI;
     }
-    if (base_op == Op_AddL || base_op == Op_SubL) {
+    if (base_op == Op_AddL || base_op == Op_SubL || base_op == Op_CmpL) {
       return op == Op_AddL || op == Op_SubL;
     }
     return op == base_op;
   } else {
-    // Integer "add/sub/mul/and/or/xor" operations are associative.
+    // Integer "add/sub/mul/and/or/xor" operations are associative. Integer
+    // "cmp" operations are associative if it is an equality comparison.
     return op == Op_AddI || op == Op_AddL
         || op == Op_SubI || op == Op_SubL
         || op == Op_MulI || op == Op_MulL
         || op == Op_AndI || op == Op_AndL
         || op == Op_OrI  || op == Op_OrL
-        || op == Op_XorI || op == Op_XorL;
+        || op == Op_XorI || op == Op_XorL
+        || is_associative_cmp(n);
   }
 }
 
-//---------------------reassociate_add_sub------------------------
 // Reassociate invariant add and subtract expressions:
 //
 // inv1 + (x + inv2)  =>  ( inv1 + inv2) + x
@@ -308,22 +325,32 @@ bool IdealLoopTree::is_associative(Node* n, Node* base) {
 // (inv2 - x) - inv1  =>  (-inv1 + inv2) - x
 // inv1 - (x + inv2)  =>  ( inv1 - inv2) - x
 //
-Node* IdealLoopTree::reassociate_add_sub(Node* n1, int inv1_idx, int inv2_idx, PhaseIdealLoop *phase) {
-  assert(n1->is_Add() || n1->is_Sub(), "Target node should be add or subtract");
+// Apply the same transformations to == and !=
+// inv1 == (x + inv2) => ( inv1 - inv2 ) == x
+// inv1 == (x - inv2) => ( inv1 + inv2 ) == x
+// inv1 == (inv2 - x) => (-inv1 + inv2 ) == x
+Node* IdealLoopTree::reassociate_add_sub_cmp(Node* n1, int inv1_idx, int inv2_idx, PhaseIdealLoop* phase) {
   Node* n2   = n1->in(3 - inv1_idx);
+  bool n1_is_sub = n1->is_Sub() && !n1->is_Cmp();
+  bool n1_is_cmp = n1->is_Cmp();
+  bool n2_is_sub = n2->is_Sub();
+  assert(n1->is_Add() || n1_is_sub || n1_is_cmp, "Target node should be add, subtract, or compare");
+  assert(n2->is_Add() || (n2_is_sub && !n2->is_Cmp()), "Child node should be add or subtract");
   Node* inv1 = n1->in(inv1_idx);
   Node* inv2 = n2->in(inv2_idx);
   Node* x    = n2->in(3 - inv2_idx);
 
-  bool neg_x    = n2->is_Sub() && inv2_idx == 1;
-  bool neg_inv2 = n2->is_Sub() && inv2_idx == 2;
-  bool neg_inv1 = n1->is_Sub() && inv1_idx == 2;
-  if (n1->is_Sub() && inv1_idx == 1) {
+  // Determine whether x, inv1, or inv2 should be negative in the transformed
+  // expression
+  bool neg_x = n2_is_sub && inv2_idx == 1;
+  bool neg_inv2 = (n2_is_sub && !n1_is_cmp && inv2_idx == 2) || (n1_is_cmp && !n2_is_sub);
+  bool neg_inv1 = (n1_is_sub && inv1_idx == 2) || (n1_is_cmp && inv2_idx == 1 && n2_is_sub);
+  if (n1_is_sub && inv1_idx == 1) {
     neg_x    = !neg_x;
     neg_inv2 = !neg_inv2;
   }
 
-  bool is_int = n1->bottom_type()->isa_int() != nullptr;
+  bool is_int = n2->bottom_type()->isa_int() != nullptr;
   Node* inv1_c = phase->get_ctrl(inv1);
   Node* n_inv1;
   if (neg_inv1) {
@@ -349,6 +376,9 @@ Node* IdealLoopTree::reassociate_add_sub(Node* n1, int inv1_idx, int inv2_idx, P
       inv = new AddINode(n_inv1, inv2);
     }
     phase->register_new_node(inv, phase->get_early_ctrl(inv));
+    if (n1_is_cmp) {
+      return new CmpINode(x, inv);
+    }
     if (neg_x) {
       return new SubINode(inv, x);
     } else {
@@ -361,6 +391,9 @@ Node* IdealLoopTree::reassociate_add_sub(Node* n1, int inv1_idx, int inv2_idx, P
       inv = new AddLNode(n_inv1, inv2);
     }
     phase->register_new_node(inv, phase->get_early_ctrl(inv));
+    if (n1_is_cmp) {
+      return new CmpLNode(x, inv);
+    }
     if (neg_x) {
       return new SubLNode(inv, x);
     } else {
@@ -369,10 +402,9 @@ Node* IdealLoopTree::reassociate_add_sub(Node* n1, int inv1_idx, int inv2_idx, P
   }
 }
 
-//---------------------reassociate-----------------------------
 // Reassociate invariant binary expressions with add/sub/mul/
-// and/or/xor operators.
-// For add/sub expressions: see "reassociate_add_sub"
+// and/or/xor/cmp operators.
+// For add/sub/cmp expressions: see "reassociate_add_sub_cmp"
 //
 // For mul/and/or/xor expressions:
 //
@@ -399,7 +431,9 @@ Node* IdealLoopTree::reassociate(Node* n1, PhaseIdealLoop *phase) {
     case Op_AddL:
     case Op_SubI:
     case Op_SubL:
-      result = reassociate_add_sub(n1, inv1_idx, inv2_idx, phase);
+    case Op_CmpI:
+    case Op_CmpL:
+      result = reassociate_add_sub_cmp(n1, inv1_idx, inv2_idx, phase);
       break;
     case Op_MulI:
     case Op_MulL:
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index e4654f6538c..389e381e542 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -739,13 +739,15 @@ public:
   void reassociate_invariants(PhaseIdealLoop *phase);
   // Reassociate invariant binary expressions.
   Node* reassociate(Node* n1, PhaseIdealLoop *phase);
-  // Reassociate invariant add and subtract expressions.
-  Node* reassociate_add_sub(Node* n1, int inv1_idx, int inv2_idx, PhaseIdealLoop *phase);
+  // Reassociate invariant add, subtract, and compare expressions.
+  Node* reassociate_add_sub_cmp(Node* n1, int inv1_idx, int inv2_idx, PhaseIdealLoop* phase);
   // Return nonzero index of invariant operand if invariant and variant
   // are combined with an associative binary. Helper for reassociate_invariants.
   int find_invariant(Node* n, PhaseIdealLoop *phase);
   // Return TRUE if "n" is associative.
   bool is_associative(Node* n, Node* base=nullptr);
+  // Return TRUE if "n" is an associative cmp node.
+  bool is_associative_cmp(Node* n);
 
   // Return true if n is invariant
   bool is_invariant(Node* n) const;
diff --git a/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateAddSub.java b/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateAddSub.java
new file mode 100644
index 00000000000..4e8daf3d163
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateAddSub.java
@@ -0,0 +1,525 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.c2.loopopts;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+import java.util.Random;
+
+/*
+ * @test
+ * @bug 8323220
+ * @summary Test loop invariant code motion of add/sub through reassociation
+ * @library /test/lib /
+ * @run driver compiler.c2.loopopts.InvariantCodeMotionReassociateAddSub
+ */
+public class InvariantCodeMotionReassociateAddSub {
+    private static final Random RANDOM = Utils.getRandomInstance();
+    private int size;
+    private int inv1;
+    private int inv2;
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @DontInline
+    private int blackhole(int i) { return i; }
+    @DontInline
+    private int blackhole(long i) { return (int)i; }
+
+    @Setup
+    public Object[] setup(SetupInfo info) {
+        int count = info.invocationCounter();
+        size = count + 500;
+        inv1 = count;
+        if (RANDOM.nextInt() % 7 == 0) {
+            // Setup inputs to be equals sometimes to avoid uncommon traps
+            inv2 = inv1;
+        } else {
+            inv2 = count * 2;
+        }
+        return new Object[] { inv1, inv2, size };
+    }
+
+    public void fail(int returnValue) {
+        throw new RuntimeException("Illegal reassociation: returnValue=" + returnValue + ", inv1=" + inv1
+                + ", inv2=" + inv2 + ", size=" + size);
+    }
+
+    public void check(int returnValue, int expected) {
+        if (returnValue != expected) {
+            fail(returnValue);
+        }
+    }
+
+    public void checkAdd(int returnValue) {
+        check(returnValue, inv1 + inv2 + size - 1);
+    }
+
+    public void checkSubAdd(int returnValue) {
+        check(returnValue, inv1 - inv2 + size - 1);
+    }
+
+    public void checkNegSubAdd(int returnValue) {
+        check(returnValue, -inv1 - inv2 + size - 1);
+    }
+
+    public void checkAddSub(int returnValue) {
+        check(returnValue, inv1 + inv2 - (size - 1));
+    }
+
+    public void checkSubSub(int returnValue) {
+        check(returnValue, inv1 - inv2 - (size - 1));
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "3"})
+    public int addInt(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 + i`
+            result = blackhole(inv1 + i + inv2);
+        }
+        return result;
+    }
+
+    @Check(test = "addInt")
+    public void checkAddInt(int returnValue) {
+        checkAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "2"})
+    public int addLong(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 + i`
+            result = blackhole(inv1 + i + inv2);
+        }
+        return result;
+    }
+
+    @Check(test = "addLong")
+    public void checkAddLong(int returnValue) {
+        checkAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "3"})
+    public int addInt2(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 + i`
+            result = blackhole(inv1 + (i + inv2));
+        }
+        return result;
+    }
+
+    @Check(test = "addInt2")
+    public void checkAddInt2(int returnValue) {
+        checkAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "2"})
+    public int addLong2(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 + i`
+            result = blackhole(inv1 + (i + inv2));
+        }
+        return result;
+    }
+
+    @Check(test = "addLong2")
+    public void checkAddLong2(int returnValue) {
+        checkAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "2"})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int minusAddInt(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 + i`
+            result = blackhole(inv1 + (i - inv2));
+        }
+        return result;
+    }
+
+    @Check(test = "minusAddInt")
+    public void checkSubAddInt(int returnValue) {
+        checkSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "1"})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int minusAddLong(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 + i`
+            result = blackhole(inv1 + (i - inv2));
+        }
+        return result;
+    }
+
+    @Check(test = "minusAddLong")
+    public void checkSubAddLong(int returnValue) {
+        checkSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "2"})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int minusAddInt2(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 + i`
+            result = blackhole(inv1 - (inv2 - i));
+        }
+        return result;
+    }
+
+    @Check(test = "minusAddInt2")
+    public void checkSubAddInt2(int returnValue) {
+        checkSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "1"})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int minusAddLong2(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 + i`
+            result = blackhole(inv1 - (inv2 - i));
+        }
+        return result;
+    }
+
+    @Check(test = "minusAddLong2")
+    public void checkSubAddLong2(int returnValue) {
+        checkSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "2"})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int minusAddInt3(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 + i`
+            result = blackhole(i - inv2 + inv1);
+        }
+        return result;
+    }
+
+    @Check(test = "minusAddInt3")
+    public void checkSubAddInt3(int returnValue) {
+        checkSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "1"})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int minusAddLong3(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 + i`
+            result = blackhole(i - inv2 + inv1);
+        }
+        return result;
+    }
+
+    @Check(test = "minusAddLong3")
+    public void checkSubAddLong3(int returnValue) {
+        checkSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "2"})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int negAddInt(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `-inv2 + inv1 + i`
+            result = blackhole(i + inv1 - inv2);
+        }
+        return result;
+    }
+
+    @Check(test = "negAddInt")
+    public void checkNegAddInt(int returnValue) {
+        checkSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "1"})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int negAddLong(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `-inv2 + inv1 + i`
+            result = blackhole(i + inv1 - inv2);
+        }
+        return result;
+    }
+
+    @Check(test = "negAddLong")
+    public void checkNegAddLong(int returnValue) {
+        checkSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "2"})
+    @IR(counts = {IRNode.SUB_I, "2"})
+    public int negSubAddInt(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `-inv1 - inv2 + i`
+            result = blackhole(i - inv1 - inv2);
+        }
+        return result;
+    }
+
+    @Check(test = "negSubAddInt")
+    public void checkNegSubAddInt(int returnValue) {
+        checkNegSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "1"})
+    @IR(counts = {IRNode.SUB_L, "2"})
+    public int negSubAddLong(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `-inv1 - inv2 + i`
+            result = blackhole(i - inv1 - inv2);
+        }
+        return result;
+    }
+
+    @Check(test = "negSubAddLong")
+    public void checkNegSubAddLong(int returnValue) {
+        checkNegSubAdd(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "3"})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int addSubInt(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 - i`
+            result = blackhole(inv1 + (inv2 - i));
+        }
+        return result;
+    }
+
+    @Check(test = "addSubInt")
+    public void checkAddSubInt(int returnValue) {
+        checkAddSub(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "1"})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int addSubLong(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 - i`
+            result = blackhole(inv1 + (inv2 - i));
+        }
+        return result;
+    }
+
+    @Check(test = "addSubLong")
+    public void checkAddSubLong(int returnValue) {
+        checkAddSub(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "3"})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int addSubInt2(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 - i`
+            result = blackhole(inv1 - (i - inv2));
+        }
+        return result;
+    }
+
+    @Check(test = "addSubInt2")
+    public void checkAddSubInt2(int returnValue) {
+        checkAddSub(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "1"})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int addSubLong2(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 - i`
+            result = blackhole(inv1 - (i - inv2));
+        }
+        return result;
+    }
+
+    @Check(test = "addSubLong2")
+    public void checkAddSubLong2(int returnValue) {
+        checkAddSub(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "3"})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int addSubInt3(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 - i`
+            result = blackhole(inv2 - i + inv1);
+        }
+        return result;
+    }
+
+    @Check(test = "addSubInt3")
+    public void checkAddSubInt3(int returnValue) {
+        checkAddSub(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_L, "1"})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int addSubLong3(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 + inv2 - i`
+            result = blackhole(inv2 - i + inv1);
+        }
+        return result;
+    }
+
+    @Check(test = "addSubLong3")
+    public void checkAddSubLong3(int returnValue) {
+        checkAddSub(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "2"})
+    @IR(counts = {IRNode.SUB_I, "2"})
+    public int subSubInt(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 - i`
+            result = blackhole(inv1 - (i + inv2));
+        }
+        return result;
+    }
+
+    @Check(test = "subSubInt")
+    public void checkSubSubInt(int returnValue) {
+        checkSubSub(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(failOn = {IRNode.ADD_L})
+    @IR(counts = {IRNode.SUB_L, "2"})
+    public int subSubLong(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 - i`
+            result = blackhole(inv1 - (i + inv2));
+        }
+        return result;
+    }
+
+    @Check(test = "subSubLong")
+    public void checkSubSubLong(int returnValue) {
+        checkSubSub(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.ADD_I, "2"})
+    @IR(counts = {IRNode.SUB_I, "2"})
+    public int subSubInt2(int inv1, int inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 - i`
+            result = blackhole(inv1 - i - inv2);
+        }
+        return result;
+    }
+
+    @Check(test = "subSubInt2")
+    public void checkSubSubInt2(int returnValue) {
+        checkSubSub(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(failOn = {IRNode.ADD_L})
+    @IR(counts = {IRNode.SUB_L, "2"})
+    public int subSubLong2(long inv1, long inv2, int size) {
+        int result = -1;
+        for (int i = 0; i < size; ++i) {
+            // Reassociate to `inv1 - inv2 - i`
+            result = blackhole(inv1 - i - inv2);
+        }
+        return result;
+    }
+
+    @Check(test = "subSubLong2")
+    public void checkSubSubLong2(int returnValue) {
+        checkSubSub(returnValue);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateCmp.java b/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateCmp.java
new file mode 100644
index 00000000000..566e294b4bf
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateCmp.java
@@ -0,0 +1,412 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.c2.loopopts;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+import java.util.Random;
+
+/*
+ * @test
+ * @bug 8323220
+ * @summary Test loop invariant code motion for cmp nodes through reassociation
+ * @library /test/lib /
+ * @run driver compiler.c2.loopopts.InvariantCodeMotionReassociateCmp
+ */
+public class InvariantCodeMotionReassociateCmp {
+    private static final Random RANDOM = Utils.getRandomInstance();
+    private int size;
+    private int inv1;
+    private int inv2;
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @DontInline
+    private void blackhole() {}
+
+    @Setup
+    public Object[] setup(SetupInfo info) {
+        int count = info.invocationCounter();
+        size = count + 500;
+        inv1 = count;
+        if (RANDOM.nextInt() % 7 == 0) {
+            // Setup inputs to be equals sometimes to avoid uncommon traps
+            inv2 = inv1;
+        } else {
+            inv2 = count * 2;
+        }
+        return new Object[] { inv1, inv2, size };
+    }
+
+    public void fail(int returnValue) {
+        throw new RuntimeException("Illegal reassociation: returnValue=" + returnValue + ", inv1=" + inv1
+                + ", inv2=" + inv2 + ", size=" + size);
+    }
+
+    public void checkEq(int returnValue) {
+        int invDiff = inv2 - inv1;
+        if ((invDiff < size && returnValue != invDiff) || (invDiff >= size && returnValue != size)) {
+            fail(returnValue);
+        }
+    }
+
+    public void checkNe(int returnValue) {
+        int invDiff = inv2 - inv1;
+        if ((invDiff != 0 && returnValue != 0) || (invDiff == 0 && returnValue != 1)) {
+            fail(returnValue);
+        }
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int equalsAddInt(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv2 - inv1 == i`
+            if (inv1 + i == inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "equalsAddInt")
+    public void checkEqualsAddInt(int returnValue) {
+        checkEq(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int equalsAddLong(long inv1, long inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv2 - inv1 == i`
+            if (inv1 + i == inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "equalsAddLong")
+    public void checkEqualsAddLong(int returnValue) {
+        checkEq(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int equalsInvariantSubVariantInt(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv1 - inv2 == i`
+            if (inv2 - i == inv1) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "equalsInvariantSubVariantInt")
+    public void checkEqualsInvariantSubVariantInt(int returnValue) {
+        checkEq(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int equalsInvariantSubVariantLong(long inv1, long inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv2 - inv1 == i`
+            if (inv2 - i == inv1) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "equalsInvariantSubVariantLong")
+    public void checkEqualsInvariantSubVariantLong(int returnValue) {
+        checkEq(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int equalsVariantSubInvariantInt(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv2 - inv1 == i`
+            if (i - inv2 == -inv1) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "equalsVariantSubInvariantInt")
+    public void checkEqualsVariantSubInvariantInt(int returnValue) {
+        checkEq(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int equalsVariantSubInvariantLong(long inv1, long inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv2 - inv1 == i`
+            if (i - inv2 == -inv1) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "equalsVariantSubInvariantLong")
+    public void checkEqualsVariantSubInvariantLong(int returnValue) {
+        checkEq(returnValue);
+    }
+
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int notEqualsAddInt(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < 500; ++i) {
+            blackhole();
+            // Reassociate to `inv1 - inv2 != i`
+            if (inv1 + i != inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "notEqualsAddInt")
+    public void checkNotEqualsAddInt(int returnValue) {
+        checkNe(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int notEqualsAddLong(long inv1, long inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv1 - inv2 != i`
+            if (inv1 + i != inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "notEqualsAddLong")
+    public void checkNotEqualsAddLong(int returnValue) {
+        checkNe(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int notEqualsInvariantSubVariantInt(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv1 - inv2 != i`
+            if (inv1 - i != inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "notEqualsInvariantSubVariantInt")
+    public void checkNotEqualsInvariantSubVariantInt(int returnValue) {
+        checkNe(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int notEqualsInvariantSubVariantLong(long inv1, long inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv1 - inv2 != i`
+            if (inv1 - i != inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "notEqualsInvariantSubVariantLong")
+    public void checkNotEqualsInvariantSubVariantLong(int returnValue) {
+        checkNe(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int notEqualsVariantSubInvariantInt(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < 500; ++i) {
+            blackhole();
+            // Reassociate to `inv2 - inv1 != i`
+            if (i - inv2 != -inv1) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "notEqualsVariantSubInvariantInt")
+    public void checkNotEqualsVariantSubInvariantInt(int returnValue) {
+        checkNe(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public int notEqualsVariantSubInvariantLong(long inv1, long inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            // Reassociate to `inv1 - inv1 != i`
+            if (i - inv2 != -inv1) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "notEqualsVariantSubInvariantLong")
+    public void checkNotEqualsVariantSubInvariantLong(int returnValue) {
+        checkNe(returnValue);
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(failOn = {IRNode.SUB_I})
+    public int ltDontReassociate(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            if (inv1 + i < inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "ltDontReassociate")
+    public void checkLtDontReassociate(int returnValue) {
+        int sum = inv1 + returnValue;
+        if ((returnValue < size && sum >= inv2) || (returnValue > size && sum < inv2)) {
+            fail(returnValue);
+        }
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(failOn = {IRNode.SUB_I})
+    public int leDontReassociate(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            if (inv1 + i <= inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "leDontReassociate")
+    public void checkLeDontReassociate(int returnValue) {
+        int sum = inv1 + returnValue;
+        if ((returnValue < size && sum > inv2) || (returnValue > size && sum <= inv2)) {
+            fail(returnValue);
+        }
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(failOn = {IRNode.SUB_I})
+    public int gtDontReassociate(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            if (inv1 + i > inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "gtDontReassociate")
+    public void checkGtDontReassociate(int returnValue) {
+        int sum = inv1 + returnValue;
+        if ((returnValue < size && sum <= inv2) || (returnValue > size && sum > inv2)) {
+            fail(returnValue);
+        }
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(failOn = {IRNode.SUB_I})
+    public int geDontReassociate(int inv1, int inv2, int size) {
+        int i = 0;
+        for (; i < size; ++i) {
+            blackhole();
+            if (inv1 + i >= inv2) {
+                break;
+            }
+        }
+        return i;
+    }
+
+    @Check(test = "geDontReassociate")
+    public void checkGeDontReassociate(int returnValue) {
+        int sum = inv1 + returnValue;
+        if ((returnValue < size && sum < inv2) || (returnValue > size && sum >= inv2)) {
+            fail(returnValue);
+        }
+    }
+}

From 274c805c5137d9080a7670d864ecca8a0befc3f6 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 16 Apr 2024 00:48:15 +0000
Subject: [PATCH 046/486] 8327743: JVM crash in
 hotspot/share/runtime/javaThread.cpp - failed: held monitor count should be
 equal to jni: 0 != 1

Co-authored-by: Fredrik Bredberg <fbredberg@openjdk.org>
Reviewed-by: rehn, fbredberg, pchilanomate, rrich
---
 .../cpu/aarch64/sharedRuntime_aarch64.cpp     |  42 ++-
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |  55 +++-
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp |  43 ++-
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp  |  42 ++-
 src/hotspot/share/runtime/javaThread.cpp      |  47 ++-
 src/hotspot/share/runtime/javaThread.hpp      |   1 +
 src/hotspot/share/runtime/sharedRuntime.cpp   |  14 +
 src/hotspot/share/runtime/sharedRuntime.hpp   |   3 +
 .../vthread/JNIMonitor/JNIMonitor.java        | 277 ++++++++++++++++--
 .../GetOwnedMonitorInfoTest.java              |  11 +-
 10 files changed, 491 insertions(+), 44 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index b200fb4c4b0..a2600825622 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1038,9 +1038,49 @@ static void continuation_enter_cleanup(MacroAssembler* masm) {
   __ stop("incorrect sp1");
   __ bind(OK);
 #endif
-
   __ ldr(rscratch1, Address(sp, ContinuationEntry::parent_cont_fastpath_offset()));
   __ str(rscratch1, Address(rthread, JavaThread::cont_fastpath_offset()));
+
+  if (CheckJNICalls) {
+    // Check if this is a virtual thread continuation
+    Label L_skip_vthread_code;
+    __ ldrw(rscratch1, Address(sp, ContinuationEntry::flags_offset()));
+    __ cbzw(rscratch1, L_skip_vthread_code);
+
+    // If the held monitor count is > 0 and this vthread is terminating then
+    // it failed to release a JNI monitor. So we issue the same log message
+    // that JavaThread::exit does.
+    __ ldr(rscratch1, Address(rthread, JavaThread::jni_monitor_count_offset()));
+    __ cbz(rscratch1, L_skip_vthread_code);
+
+    // Save return value potentially containing the exception oop in callee-saved R19.
+    __ mov(r19, r0);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::log_jni_monitor_still_held));
+    // Restore potential return value.
+    __ mov(r0, r19);
+
+    // For vthreads we have to explicitly zero the JNI monitor count of the carrier
+    // on termination. The held count is implicitly zeroed below when we restore from
+    // the parent held count (which has to be zero).
+    __ str(zr, Address(rthread, JavaThread::jni_monitor_count_offset()));
+
+    __ bind(L_skip_vthread_code);
+  }
+#ifdef ASSERT
+  else {
+    // Check if this is a virtual thread continuation
+    Label L_skip_vthread_code;
+    __ ldrw(rscratch1, Address(sp, ContinuationEntry::flags_offset()));
+    __ cbzw(rscratch1, L_skip_vthread_code);
+
+    // See comment just above. If not checking JNI calls the JNI count is only
+    // needed for assertion checking.
+    __ str(zr, Address(rthread, JavaThread::jni_monitor_count_offset()));
+
+    __ bind(L_skip_vthread_code);
+  }
+#endif
+
   __ ldr(rscratch1, Address(sp, ContinuationEntry::parent_held_monitor_count_offset()));
   __ str(rscratch1, Address(rthread, JavaThread::held_monitor_count_offset()));
 
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 666b46817f9..12afe49537d 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1637,7 +1637,7 @@ static void fill_continuation_entry(MacroAssembler* masm, Register reg_cont_obj,
 //   None.
 //
 // Kills:
-//   R8_ARG6, R9_ARG7, R10_ARG8
+//   R8_ARG6, R9_ARG7, R10_ARG8, R15_esp
 //
 static void continuation_enter_cleanup(MacroAssembler* masm) {
   Register tmp1 = R8_ARG6;
@@ -1652,9 +1652,56 @@ static void continuation_enter_cleanup(MacroAssembler* masm) {
 #endif
 
   __ ld_ptr(tmp1, ContinuationEntry::parent_cont_fastpath_offset(), R1_SP);
+  __ st_ptr(tmp1, JavaThread::cont_fastpath_offset(), R16_thread);
+
+  if (CheckJNICalls) {
+    // Check if this is a virtual thread continuation
+    Label L_skip_vthread_code;
+    __ lwz(R0, in_bytes(ContinuationEntry::flags_offset()), R1_SP);
+    __ cmpwi(CCR0, R0, 0);
+    __ beq(CCR0, L_skip_vthread_code);
+
+    // If the held monitor count is > 0 and this vthread is terminating then
+    // it failed to release a JNI monitor. So we issue the same log message
+    // that JavaThread::exit does.
+    __ ld(R0, in_bytes(JavaThread::jni_monitor_count_offset()), R16_thread);
+    __ cmpdi(CCR0, R0, 0);
+    __ beq(CCR0, L_skip_vthread_code);
+
+    // Save return value potentially containing the exception oop
+    Register ex_oop = R15_esp;   // nonvolatile register
+    __ mr(ex_oop, R3_RET);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::log_jni_monitor_still_held));
+    // Restore potental return value
+    __ mr(R3_RET, ex_oop);
+
+    // For vthreads we have to explicitly zero the JNI monitor count of the carrier
+    // on termination. The held count is implicitly zeroed below when we restore from
+    // the parent held count (which has to be zero).
+    __ li(tmp1, 0);
+    __ std(tmp1, in_bytes(JavaThread::jni_monitor_count_offset()), R16_thread);
+
+    __ bind(L_skip_vthread_code);
+  }
+#ifdef ASSERT
+  else {
+    // Check if this is a virtual thread continuation
+    Label L_skip_vthread_code;
+    __ lwz(R0, in_bytes(ContinuationEntry::flags_offset()), R1_SP);
+    __ cmpwi(CCR0, R0, 0);
+    __ beq(CCR0, L_skip_vthread_code);
+
+    // See comment just above. If not checking JNI calls the JNI count is only
+    // needed for assertion checking.
+    __ li(tmp1, 0);
+    __ std(tmp1, in_bytes(JavaThread::jni_monitor_count_offset()), R16_thread);
+
+    __ bind(L_skip_vthread_code);
+  }
+#endif
+
   __ ld(tmp2, in_bytes(ContinuationEntry::parent_held_monitor_count_offset()), R1_SP);
   __ ld_ptr(tmp3, ContinuationEntry::parent_offset(), R1_SP);
-  __ st_ptr(tmp1, JavaThread::cont_fastpath_offset(), R16_thread);
   __ std(tmp2, in_bytes(JavaThread::held_monitor_count_offset()), R16_thread);
   __ st_ptr(tmp3, JavaThread::cont_entry_offset(), R16_thread);
   DEBUG_ONLY(__ block_comment("} clean"));
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index b84e31b40a7..4f84ae256de 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -905,6 +905,47 @@ static void continuation_enter_cleanup(MacroAssembler* masm) {
 
   __ ld(t0, Address(sp, ContinuationEntry::parent_cont_fastpath_offset()));
   __ sd(t0, Address(xthread, JavaThread::cont_fastpath_offset()));
+
+  if (CheckJNICalls) {
+    // Check if this is a virtual thread continuation
+    Label L_skip_vthread_code;
+    __ lwu(t0, Address(sp, ContinuationEntry::flags_offset()));
+    __ beqz(t0, L_skip_vthread_code);
+
+    // If the held monitor count is > 0 and this vthread is terminating then
+    // it failed to release a JNI monitor. So we issue the same log message
+    // that JavaThread::exit does.
+    __ ld(t0, Address(xthread, JavaThread::jni_monitor_count_offset()));
+    __ beqz(t0, L_skip_vthread_code);
+
+    // Save return value potentially containing the exception oop in callee-saved x9
+    __ mv(x9, x10);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::log_jni_monitor_still_held));
+    // Restore potential return value
+    __ mv(x10, x9);
+
+    // For vthreads we have to explicitly zero the JNI monitor count of the carrier
+    // on termination. The held count is implicitly zeroed below when we restore from
+    // the parent held count (which has to be zero).
+    __ sd(zr, Address(xthread, JavaThread::jni_monitor_count_offset()));
+
+    __ bind(L_skip_vthread_code);
+  }
+#ifdef ASSERT
+  else {
+    // Check if this is a virtual thread continuation
+    Label L_skip_vthread_code;
+    __ lwu(t0, Address(sp, ContinuationEntry::flags_offset()));
+    __ beqz(t0, L_skip_vthread_code);
+
+    // See comment just above. If not checking JNI calls the JNI count is only
+    // needed for assertion checking.
+    __ sd(zr, Address(xthread, JavaThread::jni_monitor_count_offset()));
+
+    __ bind(L_skip_vthread_code);
+  }
+#endif
+
   __ ld(t0, Address(sp, ContinuationEntry::parent_held_monitor_count_offset()));
   __ sd(t0, Address(xthread, JavaThread::held_monitor_count_offset()));
 
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 0c1dc865c78..31bbfb747f8 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -1354,9 +1354,48 @@ void static continuation_enter_cleanup(MacroAssembler* masm) {
   __ stop("Incorrect rsp at continuation_enter_cleanup");
   __ bind(L_good_sp);
 #endif
-
   __ movptr(rbx, Address(rsp, ContinuationEntry::parent_cont_fastpath_offset()));
   __ movptr(Address(r15_thread, JavaThread::cont_fastpath_offset()), rbx);
+
+  if (CheckJNICalls) {
+    // Check if this is a virtual thread continuation
+    Label L_skip_vthread_code;
+    __ cmpl(Address(rsp, ContinuationEntry::flags_offset()), 0);
+    __ jcc(Assembler::equal, L_skip_vthread_code);
+
+    // If the held monitor count is > 0 and this vthread is terminating then
+    // it failed to release a JNI monitor. So we issue the same log message
+    // that JavaThread::exit does.
+    __ cmpptr(Address(r15_thread, JavaThread::jni_monitor_count_offset()), 0);
+    __ jcc(Assembler::equal, L_skip_vthread_code);
+
+    // rax may hold an exception oop, save it before the call
+    __ push(rax);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::log_jni_monitor_still_held));
+    __ pop(rax);
+
+    // For vthreads we have to explicitly zero the JNI monitor count of the carrier
+    // on termination. The held count is implicitly zeroed below when we restore from
+    // the parent held count (which has to be zero).
+    __ movq(Address(r15_thread, JavaThread::jni_monitor_count_offset()), 0);
+
+    __ bind(L_skip_vthread_code);
+  }
+#ifdef ASSERT
+  else {
+    // Check if this is a virtual thread continuation
+    Label L_skip_vthread_code;
+    __ cmpl(Address(rsp, ContinuationEntry::flags_offset()), 0);
+    __ jcc(Assembler::equal, L_skip_vthread_code);
+
+    // See comment just above. If not checking JNI calls the JNI count is only
+    // needed for assertion checking.
+    __ movq(Address(r15_thread, JavaThread::jni_monitor_count_offset()), 0);
+
+    __ bind(L_skip_vthread_code);
+  }
+#endif
+
   __ movq(rbx, Address(rsp, ContinuationEntry::parent_held_monitor_count_offset()));
   __ movq(Address(r15_thread, JavaThread::held_monitor_count_offset()), rbx);
 
@@ -3696,4 +3735,3 @@ void OptoRuntime::generate_exception_blob() {
   _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
 }
 #endif // COMPILER2
-
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index f6d514055b9..6687d85bcbd 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -910,19 +910,27 @@ void JavaThread::exit(bool destroy_vm, ExitType exit_type) {
            "should not have a Java frame when detaching or exiting");
     ObjectSynchronizer::release_monitors_owned_by_thread(this);
     assert(!this->has_pending_exception(), "release_monitors should have cleared");
+    // Check for monitor counts being out of sync.
+    assert(held_monitor_count() == jni_monitor_count(),
+           "held monitor count should be equal to jni: " INTX_FORMAT " != " INTX_FORMAT,
+           held_monitor_count(), jni_monitor_count());
+    // All in-use monitors, including JNI-locked ones, should have been released above.
+    assert(held_monitor_count() == 0, "Failed to unlock " INTX_FORMAT " object monitors",
+           held_monitor_count());
+  } else {
+    // Check for monitor counts being out of sync.
+    assert(held_monitor_count() == jni_monitor_count(),
+           "held monitor count should be equal to jni: " INTX_FORMAT " != " INTX_FORMAT,
+           held_monitor_count(), jni_monitor_count());
+    // It is possible that a terminating thread failed to unlock monitors it locked
+    // via JNI so we don't assert the count is zero.
   }
 
-  // Since above code may not release JNI monitors and if someone forgot to do an
-  // JNI monitorexit, held count should be equal jni count.
-  // Consider scan all object monitor for this owner if JNI count > 0 (at least on detach).
-  assert(held_monitor_count() == jni_monitor_count(),
-         "held monitor count should be equal to jni: " INTX_FORMAT " != " INTX_FORMAT,
-         held_monitor_count(), jni_monitor_count());
   if (CheckJNICalls && jni_monitor_count() > 0) {
     // We would like a fatal here, but due to we never checked this before there
     // is a lot of tests which breaks, even with an error log.
     log_debug(jni)("JavaThread %s (tid: " UINTX_FORMAT ") with Objects still locked by JNI MonitorEnter.",
-      exit_type == JavaThread::normal_exit ? "exiting" : "detaching", os::current_thread_id());
+                   exit_type == JavaThread::normal_exit ? "exiting" : "detaching", os::current_thread_id());
   }
 
   // These things needs to be done while we are still a Java Thread. Make sure that thread
@@ -960,9 +968,12 @@ void JavaThread::exit(bool destroy_vm, ExitType exit_type) {
     thread_name = os::strdup(name());
   }
 
-  log_info(os, thread)("JavaThread %s (tid: " UINTX_FORMAT ").",
-    exit_type == JavaThread::normal_exit ? "exiting" : "detaching",
-    os::current_thread_id());
+  if (log_is_enabled(Info, os, thread)) {
+    ResourceMark rm(this);
+    log_info(os, thread)("JavaThread %s (name: \"%s\", tid: " UINTX_FORMAT ").",
+                         exit_type == JavaThread::normal_exit ? "exiting" : "detaching",
+                         name(), os::current_thread_id());
+  }
 
   if (log_is_enabled(Debug, os, thread, timer)) {
     _timer_exit_phase3.stop();
@@ -1990,17 +2001,23 @@ void JavaThread::trace_stack() {
 
 #endif // PRODUCT
 
+// Slow-path increment of the held monitor counts. JNI locking is always
+// this slow-path.
 void JavaThread::inc_held_monitor_count(intx i, bool jni) {
 #ifdef SUPPORT_MONITOR_COUNT
-  assert(_held_monitor_count >= 0, "Must always be greater than 0: " INTX_FORMAT, _held_monitor_count);
+  assert(_held_monitor_count >= 0, "Must always be non-negative: " INTX_FORMAT, _held_monitor_count);
   _held_monitor_count += i;
   if (jni) {
-    assert(_jni_monitor_count >= 0, "Must always be greater than 0: " INTX_FORMAT, _jni_monitor_count);
+    assert(_jni_monitor_count >= 0, "Must always be non-negative: " INTX_FORMAT, _jni_monitor_count);
     _jni_monitor_count += i;
   }
+  assert(_held_monitor_count >= _jni_monitor_count, "Monitor count discrepancy detected - held count "
+         INTX_FORMAT " is less than JNI count " INTX_FORMAT, _held_monitor_count, _jni_monitor_count);
 #endif
 }
 
+// Slow-path decrement of the held monitor counts. JNI unlocking is always
+// this slow-path.
 void JavaThread::dec_held_monitor_count(intx i, bool jni) {
 #ifdef SUPPORT_MONITOR_COUNT
   _held_monitor_count -= i;
@@ -2009,6 +2026,12 @@ void JavaThread::dec_held_monitor_count(intx i, bool jni) {
     _jni_monitor_count -= i;
     assert(_jni_monitor_count >= 0, "Must always be greater than 0: " INTX_FORMAT, _jni_monitor_count);
   }
+  // When a thread is detaching with still owned JNI monitors, the logic that releases
+  // the monitors doesn't know to set the "jni" flag and so the counts can get out of sync.
+  // So we skip this assert if the thread is exiting. Once all monitors are unlocked the
+  // JNI count is directly set to zero.
+  assert(_held_monitor_count >= _jni_monitor_count || is_exiting(), "Monitor count discrepancy detected - held count "
+         INTX_FORMAT " is less than JNI count " INTX_FORMAT, _held_monitor_count, _jni_monitor_count);
 #endif
 }
 
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index 80d52eda390..52eae8eb067 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -811,6 +811,7 @@ private:
   static ByteSize cont_entry_offset()         { return byte_offset_of(JavaThread, _cont_entry); }
   static ByteSize cont_fastpath_offset()      { return byte_offset_of(JavaThread, _cont_fastpath); }
   static ByteSize held_monitor_count_offset() { return byte_offset_of(JavaThread, _held_monitor_count); }
+  static ByteSize jni_monitor_count_offset()  { return byte_offset_of(JavaThread, _jni_monitor_count); }
 
 #if INCLUDE_JVMTI
   static ByteSize is_in_VTMS_transition_offset()     { return byte_offset_of(JavaThread, _is_in_VTMS_transition); }
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 2b06859c96d..3eb4c45ed1b 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -1931,6 +1931,20 @@ JRT_LEAF(void, SharedRuntime::complete_monitor_unlocking_C(oopDesc* obj, BasicLo
   SharedRuntime::monitor_exit_helper(obj, lock, current);
 JRT_END
 
+// This is only called when CheckJNICalls is true, and only
+// for virtual thread termination.
+JRT_LEAF(void,  SharedRuntime::log_jni_monitor_still_held())
+  assert(CheckJNICalls, "Only call this when checking JNI usage");
+  if (log_is_enabled(Debug, jni)) {
+    JavaThread* current = JavaThread::current();
+    int64_t vthread_id = java_lang_Thread::thread_id(current->vthread());
+    int64_t carrier_id = java_lang_Thread::thread_id(current->threadObj());
+    log_debug(jni)("VirtualThread (tid: " INT64_FORMAT ", carrier id: " INT64_FORMAT
+                   ") exiting with Objects still locked by JNI MonitorEnter.",
+                   vthread_id, carrier_id);
+  }
+JRT_END
+
 #ifndef PRODUCT
 
 void SharedRuntime::print_statistics() {
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index d477929768f..93182a10126 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -349,6 +349,9 @@ class SharedRuntime: AllStatic {
 
   static void monitor_exit_helper(oopDesc* obj, BasicLock* lock, JavaThread* current);
 
+  // Issue UL warning for unlocked JNI monitor on virtual thread termination
+  static void log_jni_monitor_still_held();
+
  private:
   static Handle find_callee_info(Bytecodes::Code& bc, CallInfo& callinfo, TRAPS);
   static Handle find_callee_info_helper(vframeStream& vfst, Bytecodes::Code& bc, CallInfo& callinfo, TRAPS);
diff --git a/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java b/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
index fc0fff0042d..5fe5aaf286f 100644
--- a/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
+++ b/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,42 +21,275 @@
  * questions.
  */
 import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/*
+ * Tests that JNI monitors work correctly with virtual threads,
+ * There are multiple test scenarios that we check using unified logging output
+ * (both positive and negative tests). Each test case is handled by its own @-test
+ * definition so that we can run each sub-test independently.
+ *
+ * The original bug was only discovered because the ForkJoinPool worker thread terminated
+ * and trigerred an assertion failure. So we use a custom scheduler to give us control.
+ */
 
 /**
- * @test JNIMonitor
- * @summary Tests that JNI monitors work correctly with virtual threads
+ * @test id=normal
+ * @bug 8327743
+ * @summary Normal lock then unlock
  * @library /test/lib
- * @compile JNIMonitor.java
- * @run main/native/othervm JNIMonitor
+ * @modules java.base/java.lang:+open
+ * @requires vm.continuations
+ * @run driver JNIMonitor Normal
+ */
+
+/**
+ * @test id=multiNormal
+ * @bug 8327743
+ * @summary Normal lock then unlock by multiple threads
+ * @library /test/lib
+ * @modules java.base/java.lang:+open
+ * @requires vm.continuations
+ * @run driver JNIMonitor MultiNormal
+ */
+
+/**
+ * @test id=missingUnlock
+ * @bug 8327743
+ * @summary Don't do the unlock and exit normally
+ * @library /test/lib
+ * @modules java.base/java.lang:+open
+ * @requires vm.continuations
+ * @run driver JNIMonitor MissingUnlock
+ */
+
+/**
+ * @test id=multiMissingUnlock
+ * @bug 8327743
+ * @summary Don't do the unlock and exit normally, by multiple threads
+ * @library /test/lib
+ * @modules java.base/java.lang:+open
+ * @requires vm.continuations
+ * @run driver JNIMonitor MultiMissingUnlock
+ */
+
+/**
+ * @test id=missingUnlockWithThrow
+ * @bug 8327743
+ * @summary Don't do the unlock and exit by throwing
+ * @library /test/lib
+ * @modules java.base/java.lang:+open
+ * @requires vm.continuations
+ * @run driver JNIMonitor MissingUnlockWithThrow
+ */
+
+/**
+ * @test id=multiMissingUnlockWithThrow
+ * @bug 8327743
+ * @summary Don't do the unlock and exit by throwing, by multiple threads
+ * @library /test/lib
+ * @modules java.base/java.lang:+open
+ * @requires vm.continuations
+ * @run driver JNIMonitor MultiMissingUnlockWithThrow
  */
 
 public class JNIMonitor {
 
+    public static void main(String[] args) throws Exception {
+        String test = args[0];
+        String[] cmdArgs = new String[] {
+            "-Djava.library.path=" + Utils.TEST_NATIVE_PATH,
+            // Grant access to ThreadBuilders$VirtualThreadBuilder
+            "--add-opens=java.base/java.lang=ALL-UNNAMED",
+            // Enable the JNI warning
+            "-Xcheck:jni",
+            "-Xlog:jni=debug",
+            // Enable thread termination logging as a visual cross-check
+            "-Xlog:thread+os=info",
+            "JNIMonitor$" + test,
+        };
+        OutputAnalyzer oa = ProcessTools.executeTestJava(cmdArgs);
+        oa.shouldHaveExitValue(0);
+        oa.stdoutShouldMatch(terminated);
+
+        switch(test) {
+            case "Normal":
+            case "MultiNormal":
+                oa.stdoutShouldNotMatch(stillLocked);
+                break;
+            case "MissingUnlock":
+                oa.stdoutShouldMatch(stillLocked);
+                break;
+            case "MultiMissingUnlock":
+                parseOutputForPattern(oa.stdoutAsLines(), stillLocked, MULTI_THREAD_COUNT);
+                break;
+            case "MissingUnlockWithThrow":
+                oa.stdoutShouldMatch(stillLocked);
+                oa.stderrShouldContain(throwMsg);
+                break;
+            case "MultiMissingUnlockWithThrow":
+                parseOutputForPattern(oa.stdoutAsLines(), stillLocked, MULTI_THREAD_COUNT);
+                parseOutputForPattern(oa.stderrAsLines(), throwMsg, MULTI_THREAD_COUNT);
+                break;
+
+            default: throw new Error("Unknown arg: " + args[0]);
+        }
+        oa.reportDiagnosticSummary();
+    }
+
+    // The number of threads for a multi tests. Arbitrarily chosen to be > 1 but small
+    // enough to not waste too much time.
+    static final int MULTI_THREAD_COUNT = 5;
+
+    // The logging message for leaving a monitor JNI locked has the form
+    //   [0.187s][debug][jni] VirtualThread (tid: 28, carrier id: 29) exiting with Objects still locked by JNI MonitorEnter.
+    // but if the test is run with other logging options then whitespace may get introduced in the
+    // log decorator sections, so ignore those.
+    static final String stillLocked = "VirtualThread \\(tid:.*exiting with Objects still locked by JNI MonitorEnter";
+    // The carrier thread termination logging has the form:
+    // [1.394s][info][os,thread] JavaThread exiting (name: "pool-1-thread-1", tid: 3090592).
+    static final String terminated = "JavaThread exiting \\(name: \"pool-1-thread-1\"";
+
+    static final String throwMsg = "Terminating via exception as requested";
+
+    // Check the process logging output for the given pattern to see if the expected number of
+    // lines are found.
+    private static void parseOutputForPattern(List<String> lines, String pattern, int expected) {
+        Pattern p = Pattern.compile(pattern);
+        int found = 0;
+        for (String line : lines) {
+            Matcher m = p.matcher(line);
+            if (m.find()) {
+                found++;
+            }
+        }
+        if (found != expected) {
+            throw new RuntimeException("Checking for pattern \"" + pattern + "\": expected "
+                                       + expected + " but found " + found);
+        }
+    }
+
+
     // straight-forward interface to JNI monitor functions
     static native int monitorEnter(Object o);
     static native int monitorExit(Object o);
-    static {
-        System.loadLibrary("JNIMonitor");
-    }
 
-    public static void main(String[] args) throws Throwable {
-        final Object monitor = new Object();
-        final AtomicReference<Throwable> exception = new AtomicReference();
-        Thread.ofVirtual().start(() -> {
+    // Isolate the native library loading to the actual test cases, not the class that
+    // jtreg Driver will load and execute.
+    static class TestBase {
+
+        static {
+            System.loadLibrary("JNIMonitor");
+        }
+
+        // This gives us a way to control the scheduler used for our virtual threads. The test
+        // only works as intended when the virtual threads run on the same carrier thread (as
+        // that carrier maintains ownership of the monitor if the virtual thread fails to unlock it).
+        // The original issue was also only discovered due to the carrier thread terminating
+        // unexpectedly, so we can force that condition too by shutting down our custom scheduler.
+        private static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler) {
+            Thread.Builder.OfVirtual builder = Thread.ofVirtual();
             try {
-                int res = monitorEnter(monitor);
-                Asserts.assertTrue(res == 0, "monitorEnter should return 0.");
-                Thread.yield();
-                res = monitorExit(monitor);
-                Asserts.assertTrue(res == 0, "monitorExit should return 0.");
-            } catch (Throwable t) {
-                exception.set(t);
+                Class<?> clazz = Class.forName("java.lang.ThreadBuilders$VirtualThreadBuilder");
+                Constructor<?> ctor = clazz.getDeclaredConstructor(Executor.class);
+                ctor.setAccessible(true);
+                return (Thread.Builder.OfVirtual) ctor.newInstance(scheduler);
+            } catch (InvocationTargetException e) {
+                Throwable cause = e.getCause();
+                if (cause instanceof RuntimeException re) {
+                    throw re;
+                }
+                throw new RuntimeException(e);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
-        }).join();
-        if (exception.get() != null) {
-            throw exception.get();
+        }
+
+        static void runTest(int nThreads, boolean skipUnlock, boolean throwOnExit) throws Throwable {
+            final Object monitor = new Object();
+            final AtomicReference<Throwable> exception = new AtomicReference();
+            // Ensure all our VT's operate of the same carrier, sequentially.
+            ExecutorService scheduler = Executors.newSingleThreadExecutor();
+            ThreadFactory factory = virtualThreadBuilder(scheduler).factory();
+            for (int i = 0 ; i < nThreads; i++) {
+                Thread th = factory.newThread(() -> {
+                        try {
+                            int res = monitorEnter(monitor);
+                            Asserts.assertTrue(res == 0, "monitorEnter should return 0.");
+                            Asserts.assertTrue(Thread.holdsLock(monitor), "monitor should be owned");
+                            Thread.yield();
+                            if (!skipUnlock) {
+                                res = monitorExit(monitor);
+                                Asserts.assertTrue(res == 0, "monitorExit should return 0.");
+                                Asserts.assertFalse(Thread.holdsLock(monitor), "monitor should be unowned");
+                            }
+                        } catch (Throwable t) {
+                            exception.set(t);
+                        }
+                        if (throwOnExit) {
+                            throw new RuntimeException(throwMsg);
+                        }
+                    });
+                th.start();
+                th.join();
+                if (exception.get() != null) {
+                    throw exception.get();
+                }
+            }
+            // Now force carrier thread to shutdown.
+            scheduler.shutdown();
         }
     }
+
+    // These are the actual test case classes that get exec'd.
+
+    static class Normal extends TestBase {
+        public static void main(String[] args) throws Throwable {
+            runTest(1, false, false);
+        }
+    }
+
+    static class MultiNormal extends TestBase {
+        public static void main(String[] args) throws Throwable {
+            runTest(MULTI_THREAD_COUNT, false, false);
+        }
+    }
+
+    static class MissingUnlock extends TestBase  {
+        public static void main(String[] args) throws Throwable {
+            runTest(1, true, false);
+        }
+    }
+
+    static class MultiMissingUnlock extends TestBase {
+        public static void main(String[] args) throws Throwable {
+            runTest(MULTI_THREAD_COUNT, true, false);
+        }
+    }
+
+    static class MissingUnlockWithThrow extends TestBase {
+        public static void main(String[] args) throws Throwable {
+            runTest(1, true, true);
+        }
+    }
+
+    static class MultiMissingUnlockWithThrow extends TestBase {
+        public static void main(String[] args) throws Throwable {
+            runTest(MULTI_THREAD_COUNT, true, true);
+        }
+    }
+
 }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java
index 7b99104670f..80ca790a11d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java
@@ -73,14 +73,19 @@ public class GetOwnedMonitorInfoTest {
         runTest(false, false);
     }
 
+    static int t_num = 0;
     public static void runTest(boolean isVirtual, boolean jni) throws Exception {
         var threadFactory = isVirtual ? Thread.ofVirtual().factory() : Thread.ofPlatform().factory();
         final GetOwnedMonitorInfoTest lock = new GetOwnedMonitorInfoTest();
 
         Thread t1 = threadFactory.newThread(() -> {
-            Thread.currentThread().setName("Worker-Thread");
+            Thread.currentThread().setName((isVirtual ? "Virtual-" : "") + "Worker-Thread-" + t_num);
+            t_num++;
 
             if (jni) {
+                System.out.println("Thread doing JNI call: "
+                                   + Thread.currentThread().getName());
+
                 jniMonitorEnterAndLetObjectDie();
             }
 
@@ -92,7 +97,9 @@ public class GetOwnedMonitorInfoTest {
 
         // Make sure t1 contends on the monitor.
         synchronized (lock) {
-            System.out.println("Main starting worker thread.");
+            System.out.print("Main starting worker thread for ");
+            System.out.print(isVirtual ? "virtual " : "non-virtual ");
+            System.out.println(jni ? "JNI" : "non-JNI");
             t1.start();
 
             // Wait for the MonitorContendedEnter event

From 31a1f9c493764615acfba7392d8e3578b793abab Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Tue, 16 Apr 2024 01:03:14 +0000
Subject: [PATCH 047/486] 8307143: CredentialsCache.cacheName should not be
 static

Reviewed-by: valeriep
---
 .../internal/ccache/CredentialsCache.java     |  8 +-
 .../internal/ccache/FileCredentialsCache.java | 69 +++++++++---------
 .../ccache/MemoryCredentialsCache.java        | 73 -------------------
 .../security/krb5/internal/tools/Klist.java   | 14 ++--
 .../sun/security/krb5/ccache/TwoFiles.java    | 46 ++++++++++++
 5 files changed, 92 insertions(+), 118 deletions(-)
 delete mode 100644 src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java
 create mode 100644 test/jdk/sun/security/krb5/ccache/TwoFiles.java

diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
index 95c1ccf4b67..250ba0f2043 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -44,8 +44,6 @@ import java.io.IOException;
  * @author Yanni Zhang
  */
 public abstract class CredentialsCache {
-    static String cacheName;
-
     public static CredentialsCache getInstance(PrincipalName principal) {
         return FileCredentialsCache.acquireInstance(principal, null);
     }
@@ -105,9 +103,7 @@ public abstract class CredentialsCache {
         return (FileCredentialsCache.New(principal));
     }
 
-    public static String cacheName() {
-        return cacheName;
-    }
+    public abstract String cacheName();
 
     public abstract PrincipalName getPrimaryPrincipal();
     public abstract void update(Credentials c);
diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
index 6cefb646297..594d282424d 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
@@ -66,16 +66,18 @@ import static sun.security.krb5.internal.Krb5.DEBUG;
  */
 
 public class FileCredentialsCache extends CredentialsCache
-    implements FileCCacheConstants {
+        implements FileCCacheConstants {
     public int version;
     public Tag tag; // optional
     public PrincipalName primaryPrincipal;
     private Vector<Credentials> credentialsList;
 
+    private final String localCacheName;
+
     public static synchronized FileCredentialsCache acquireInstance(
                 PrincipalName principal, String cache) {
         try {
-            FileCredentialsCache fcc = new FileCredentialsCache();
+            String cacheName;
             if (cache == null) {
                 cacheName = FileCredentialsCache.getDefaultCacheName();
             } else {
@@ -85,10 +87,11 @@ public class FileCredentialsCache extends CredentialsCache
                 // invalid cache name or the file doesn't exist
                 return null;
             }
+            FileCredentialsCache fcc = new FileCredentialsCache(cacheName);
             if (principal != null) {
                 fcc.primaryPrincipal = principal;
             }
-            fcc.load(cacheName);
+            fcc.load();
             return fcc;
         } catch (IOException | KrbException e) {
             // we don't handle it now, instead we return a null at the end.
@@ -106,13 +109,13 @@ public class FileCredentialsCache extends CredentialsCache
     static synchronized FileCredentialsCache New(PrincipalName principal,
                                                 String name) {
         try {
-            FileCredentialsCache fcc = new FileCredentialsCache();
-            cacheName = FileCredentialsCache.checkValidation(name);
+            String cacheName = FileCredentialsCache.checkValidation(name);
             if (cacheName == null) {
-                // invalid cache name or the file doesn't exist
+                // invalid cache name
                 return null;
             }
-            fcc.init(principal, cacheName);
+            FileCredentialsCache fcc = new FileCredentialsCache(cacheName);
+            fcc.init(principal);
             return fcc;
         }
         catch (IOException | KrbException e) {
@@ -122,9 +125,9 @@ public class FileCredentialsCache extends CredentialsCache
 
     static synchronized FileCredentialsCache New(PrincipalName principal) {
         try {
-            FileCredentialsCache fcc = new FileCredentialsCache();
-            cacheName = FileCredentialsCache.getDefaultCacheName();
-            fcc.init(principal, cacheName);
+            String cacheName = FileCredentialsCache.getDefaultCacheName();
+            FileCredentialsCache fcc = new FileCredentialsCache(cacheName);
+            fcc.init(principal);
             return fcc;
         }
         catch (IOException | KrbException e) {
@@ -135,29 +138,29 @@ public class FileCredentialsCache extends CredentialsCache
         return null;
     }
 
-    private FileCredentialsCache() {
+    private FileCredentialsCache(String cacheName) {
+        localCacheName = cacheName;
     }
 
-    boolean exists(String cache) {
-        File file = new File(cache);
-        return file.exists();
+    @Override
+    public String cacheName() {
+        return localCacheName;
     }
 
-    synchronized void init(PrincipalName principal, String name)
-        throws IOException, KrbException {
+    synchronized void init(PrincipalName principal)
+            throws IOException, KrbException {
         primaryPrincipal = principal;
-        try (FileOutputStream fos = new FileOutputStream(name);
+        try (FileOutputStream fos = new FileOutputStream(localCacheName);
              CCacheOutputStream cos = new CCacheOutputStream(fos)) {
             version = KRB5_FCC_FVNO_3;
             cos.writeHeader(primaryPrincipal, version);
         }
-        load(name);
+        load();
     }
 
-    synchronized void load(String name) throws IOException, KrbException {
-        PrincipalName p;
-        try (FileInputStream fis = new FileInputStream(name);
-             CCacheInputStream cis = new CCacheInputStream(fis)) {
+    synchronized void load() throws IOException, KrbException {
+        try (FileInputStream fis = new FileInputStream(localCacheName);
+                CCacheInputStream cis = new CCacheInputStream(fis)) {
             version = cis.readVersion();
             if (version == KRB5_FCC_FVNO_4) {
                 tag = cis.readTag();
@@ -167,14 +170,15 @@ public class FileCredentialsCache extends CredentialsCache
                     cis.setNativeByteOrder();
                 }
             }
-            p = cis.readPrincipal(version);
+            PrincipalName p = cis.readPrincipal(version);
 
             if (primaryPrincipal != null) {
                 if (!(primaryPrincipal.match(p))) {
                     throw new IOException("Primary principals don't match.");
                 }
-            } else
+            } else {
                 primaryPrincipal = p;
+            }
             credentialsList = new Vector<>();
             while (cis.available() > 0) {
                 Object cred = cis.readCred(version);
@@ -245,8 +249,8 @@ public class FileCredentialsCache extends CredentialsCache
      * Saves the credentials cache file to the disk.
      */
     public synchronized void save() throws IOException, Asn1Exception {
-        try (FileOutputStream fos = new FileOutputStream(cacheName);
-             CCacheOutputStream cos = new CCacheOutputStream(fos)) {
+        try (FileOutputStream fos = new FileOutputStream(localCacheName);
+                CCacheOutputStream cos = new CCacheOutputStream(fos)) {
             cos.writeHeader(primaryPrincipal, version);
             Credentials[] tmp;
             if ((tmp = getCredsList()) != null) {
@@ -533,12 +537,10 @@ public class FileCredentialsCache extends CredentialsCache
                 // get absolute directory
                 File temp = new File(fCheck.getParent());
                 // test if the directory exists
-                if (!(temp.isDirectory()))
+                if (!(temp.isDirectory())) {
                     fullname = null;
-                temp = null;
+                }
             }
-            fCheck = null;
-
         } catch (IOException e) {
             fullname = null; // invalid name
         }
@@ -554,7 +556,6 @@ public class FileCredentialsCache extends CredentialsCache
         }
         final String[] command = v.toArray(new String[0]);
         try {
-
             @SuppressWarnings("removal")
             Process p =
                 java.security.AccessController.doPrivileged
@@ -582,13 +583,15 @@ public class FileCredentialsCache extends CredentialsCache
                 while ((s1 = commandResult.readLine()) != null) {
                     if (s1.length() >= 11) {
                         if ((s1.substring(0, 11)).equalsIgnoreCase
-                            ("KRB5CCNAME=")) {
+                                ("KRB5CCNAME=")) {
                             s1 = s1.substring(11);
                             break;
                         }
                     }
                 }
-            } else     s1 = commandResult.readLine();
+            } else {
+                s1 = commandResult.readLine();
+            }
             commandResult.close();
             return s1;
         } catch (Exception e) {
diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java
deleted file mode 100644
index 57cbc239759..00000000000
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2022, 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.
- */
-
-/*
- *
- *  (C) Copyright IBM Corp. 1999 All Rights Reserved.
- *  Copyright 1997 The Open Group Research Institute.  All rights reserved.
- */
-
-package sun.security.krb5.internal.ccache;
-
-import sun.security.krb5.KrbException;
-import sun.security.krb5.PrincipalName;
-
-import java.io.File;
-import java.io.IOException;
-
-//Windows supports the "API: cache" type, which is a shared memory cache.  This is
-//implemented by krbcc32.dll as part of the MIT Kerberos for Win32 distribution.
-//MemoryCredentialsCache will provide future functions to access shared memory cache on
-//Windows platform. Native code implementation may be necessary.
-/**
- * This class extends CredentialsCache. It is used for accessing data in shared memory
- * cache on Windows platforms.
- *
- * @author Yanni Zhang
- */
-public abstract class MemoryCredentialsCache extends CredentialsCache {
-
-    private static CredentialsCache getCCacheInstance(PrincipalName p) {
-        return null;
-    }
-
-    private static CredentialsCache getCCacheInstance(PrincipalName p, File cacheFile) {
-        return null;
-    }
-
-
-    public abstract boolean exists(String cache);
-
-    public abstract void update(Credentials c);
-
-    public abstract void save() throws IOException, KrbException;
-
-    public abstract Credentials[] getCredsList();
-
-    public abstract Credentials getCreds(PrincipalName sname) ;
-
-    public abstract PrincipalName getPrimaryPrincipal();
-
-}
diff --git a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java
index 375a8b52c39..f338fe5d3d2 100644
--- a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java
+++ b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java
@@ -144,11 +144,12 @@ public class Klist {
         switch (action) {
         case 'c':
             if (name == null) {
-                target = CredentialsCache.getInstance();
-                name = CredentialsCache.cacheName();
-            } else
+                CredentialsCache cc = CredentialsCache.getInstance();
+                target = cc;
+                name = cc.cacheName();
+            } else {
                 target = CredentialsCache.getInstance(name);
-
+            }
             if (target != null) {
                 return displayCache();
             } else {
@@ -172,8 +173,9 @@ public class Klist {
                 printHelp();
                 return -1;
             } else {
-                target = CredentialsCache.getInstance();
-                name = CredentialsCache.cacheName();
+                CredentialsCache cc = CredentialsCache.getInstance();
+                target = cc;
+                name = cc.cacheName();
                 if (target != null) {
                     return displayCache();
                 } else {
diff --git a/test/jdk/sun/security/krb5/ccache/TwoFiles.java b/test/jdk/sun/security/krb5/ccache/TwoFiles.java
new file mode 100644
index 00000000000..388d3eda3ca
--- /dev/null
+++ b/test/jdk/sun/security/krb5/ccache/TwoFiles.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2024, 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 8307143
+ * @summary CredentialsCache.cacheName should not be static
+ * @modules java.security.jgss/sun.security.krb5
+ *          java.security.jgss/sun.security.krb5.internal.ccache
+ * @library /test/lib
+ */
+
+import jdk.test.lib.Asserts;
+import sun.security.krb5.PrincipalName;
+import sun.security.krb5.internal.ccache.CredentialsCache;
+
+public class TwoFiles {
+    public static void main(String[] args) throws Exception {
+        PrincipalName pn = new PrincipalName("me@HERE");
+        CredentialsCache cc1 = CredentialsCache.create(pn, "cc1");
+        CredentialsCache cc2 = CredentialsCache.create(pn, "cc2");
+        // name is canonicalized
+        Asserts.assertTrue(cc1.cacheName().endsWith("cc1"), cc1.cacheName());
+        Asserts.assertTrue(cc2.cacheName().endsWith("cc2"), cc2.cacheName());
+    }
+}

From 2885469c4b9259d9218c845c9bebfdbfe27be784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Mon, 23 Oct 2023 06:48:34 +0000
Subject: [PATCH 048/486] 8315708: Enhance HTTP/2 client usage

Reviewed-by: rhalade, michaelm, dfuchs
---
 .../jdk/internal/net/http/ConnectionPool.java        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java b/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
index 0288eb84099..0ad7b9d5992 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
@@ -108,14 +108,10 @@ final class ConnectionPool {
                 return false;
             }
             if (secure && destination != null) {
-                if (destination.getHostName() != null) {
-                    if (!destination.getHostName().equalsIgnoreCase(
-                            other.destination.getHostName())) {
-                        return false;
-                    }
-                } else {
-                    if (other.destination.getHostName() != null)
-                        return false;
+                String hostString = destination.getHostString();
+                if (hostString == null || !hostString.equalsIgnoreCase(
+                        other.destination.getHostString())) {
+                    return false;
                 }
             }
             return true;

From 0203c7e612126d85c7cd7a3bd55d948e130283a1 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Fri, 27 Oct 2023 00:29:20 +0000
Subject: [PATCH 049/486] 8318340: Improve RSA key implementations

Reviewed-by: rhalade, mschoene, valeriep, mullan
---
 .../security/rsa/RSAPrivateCrtKeyImpl.java    |  8 --------
 .../sun/security/rsa/RSAPrivateKeyImpl.java   |  8 --------
 .../classes/sun/security/mscapi/CKey.java     | 18 +++++++++++++++++-
 .../sun/security/mscapi/CPrivateKey.java      | 12 +-----------
 .../sun/security/mscapi/CPublicKey.java       | 19 +++++--------------
 test/jdk/sun/security/pkcs11/PKCS11Test.java  | 12 +++++++++++-
 6 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
index 99365640ec7..218b1f6f4ba 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
@@ -301,14 +301,6 @@ public final class RSAPrivateCrtKeyImpl
         return keyParams;
     }
 
-    // return a string representation of this key for debugging
-    @Override
-    public String toString() {
-        return "SunRsaSign " + type.keyAlgo + " private CRT key, "
-               + n.bitLength() + " bits" + "\n  params: " + keyParams
-               + "\n  modulus: " + n + "\n  private exponent: " + d;
-    }
-
     // utility method for parsing DER encoding of RSA private keys in PKCS#1
     // format as defined in RFC 8017 Appendix A.1.2, i.e. SEQ of version, n,
     // e, d, p, q, pe, qe, and coeff, and return the parsed components.
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
index da5474cb26a..aa5297b0040 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
@@ -138,14 +138,6 @@ public final class RSAPrivateKeyImpl extends PKCS8Key implements RSAPrivateKey {
         return keyParams;
     }
 
-    // return a string representation of this key for debugging
-    @Override
-    public String toString() {
-        return "Sun " + type.keyAlgo + " private key, " + n.bitLength()
-               + " bits" + "\n  params: " + keyParams + "\n  modulus: " + n
-               + "\n  private exponent: " + d;
-    }
-
     /**
      * Restores the state of this object from the stream.
      * <p>
diff --git a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKey.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKey.java
index e010e971787..9c985f0e483 100644
--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKey.java
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKey.java
@@ -76,10 +76,14 @@ abstract class CKey implements Key, Length {
 
     protected final String algorithm;
 
-    protected CKey(String algorithm, NativeHandles handles, int keyLength) {
+    private final boolean isPublic;
+
+    protected CKey(String algorithm, NativeHandles handles, int keyLength,
+            boolean isPublic) {
         this.algorithm = algorithm;
         this.handles = handles;
         this.keyLength = keyLength;
+        this.isPublic = isPublic;
     }
 
     // Native method to cleanup the key handle.
@@ -102,6 +106,18 @@ abstract class CKey implements Key, Length {
         return algorithm;
     }
 
+    public String toString() {
+        String typeStr;
+        if (handles.hCryptKey != 0) {
+            typeStr = getKeyType(handles.hCryptKey) + ", container=" +
+                    getContainerName(handles.hCryptProv);
+        } else {
+            typeStr = "CNG";
+        }
+        return algorithm + " " + (isPublic ? "PublicKey" : "PrivateKey") +
+                " [size=" + keyLength + " bits, type=" + typeStr + "]";
+    }
+
     protected static native String getContainerName(long hCryptProv);
 
     protected static native String getKeyType(long hCryptKey);
diff --git a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPrivateKey.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPrivateKey.java
index 91a7775b8bd..c3882616615 100644
--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPrivateKey.java
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPrivateKey.java
@@ -42,7 +42,7 @@ class CPrivateKey extends CKey implements PrivateKey {
     private static final long serialVersionUID = 8113152807912338063L;
 
     private CPrivateKey(String alg, NativeHandles handles, int keyLength) {
-        super(alg, handles, keyLength);
+        super(alg, handles, keyLength, false);
     }
 
     // Called by native code inside security.cpp
@@ -65,16 +65,6 @@ class CPrivateKey extends CKey implements PrivateKey {
         return null;
     }
 
-    public String toString() {
-        if (handles.hCryptKey != 0) {
-            return algorithm + "PrivateKey [size=" + keyLength + " bits, type=" +
-                    getKeyType(handles.hCryptKey) + ", container=" +
-                    getContainerName(handles.hCryptProv) + "]";
-        } else {
-            return algorithm + "PrivateKey [size=" + keyLength + " bits, type=CNG]";
-        }
-    }
-
     // This class is not serializable
     @java.io.Serial
     private void writeObject(java.io.ObjectOutputStream out)
diff --git a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java
index 6c3079c3a72..056e85cd036 100644
--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java
@@ -114,9 +114,8 @@ public abstract class CPublicKey extends CKey implements PublicKey {
         }
 
         public String toString() {
-            StringBuffer sb = new StringBuffer();
-            sb.append(algorithm).append("PublicKey [size=").append(keyLength)
-                    .append("]\n  ECPoint: ").append(getW())
+            StringBuffer sb = new StringBuffer(super.toString());
+            sb.append("\n ECPoint: ").append(getW())
                     .append("\n  params: ").append(getParams());
             return sb.toString();
         }
@@ -135,16 +134,8 @@ public abstract class CPublicKey extends CKey implements PublicKey {
         }
 
         public String toString() {
-            StringBuffer sb = new StringBuffer();
-            sb.append(algorithm).append("PublicKey [size=").append(keyLength)
-                    .append(" bits, type=");
-            if (handles.hCryptKey != 0) {
-                sb.append(getKeyType(handles.hCryptKey))
-                        .append(", container=").append(getContainerName(handles.hCryptProv));
-            } else {
-                sb.append("CNG");
-            }
-            sb.append("]\n  modulus: ").append(getModulus())
+            StringBuffer sb = new StringBuffer(super.toString());
+            sb.append("\n  modulus: ").append(getModulus())
                     .append("\n  public exponent: ").append(getPublicExponent());
             return sb.toString();
         }
@@ -215,7 +206,7 @@ public abstract class CPublicKey extends CKey implements PublicKey {
 
     protected CPublicKey(
             String alg, NativeHandles handles, int keyLength) {
-        super(alg, handles, keyLength);
+        super(alg, handles, keyLength, true);
     }
 
     @Override
diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
index b2609e61988..2ae1730f6e9 100644
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -233,7 +233,17 @@ public abstract class PKCS11Test {
                 throw new RuntimeException("Test root directory not found");
             }
         }
-        PKCS11_BASE = new File(cwd, PKCS11_REL_PATH.replace('/', SEP)).getAbsolutePath();
+        File pkcs11 = new File(cwd, PKCS11_REL_PATH.replace('/', SEP));
+        if (!new File(pkcs11, "nss/p11-nss.txt").exists()) {
+            // this test might be in the closed
+            pkcs11 = new File(new File(cwd, "../../../open/test/jdk"),
+                    PKCS11_REL_PATH.replace('/', SEP));
+            if (!new File(pkcs11, "nss/p11-nss.txt").exists()) {
+                throw new RuntimeException("Not a PKCS11 directory"
+                        + pkcs11.getAbsolutePath());
+            }
+        }
+        PKCS11_BASE = pkcs11.getAbsolutePath();
         return PKCS11_BASE;
     }
 

From 8de2f6f883b319370f5959036ff7b1b6195e310d Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Mon, 4 Dec 2023 00:59:34 +0000
Subject: [PATCH 050/486] 8319851: Improve exception logging

Reviewed-by: rhalade, matsaave, coleenp
---
 src/hotspot/share/classfile/javaClasses.cpp   | 19 +++++-----
 src/hotspot/share/classfile/javaClasses.hpp   |  8 ++--
 .../share/classfile/resolutionErrors.cpp      | 24 +++++++-----
 .../share/classfile/resolutionErrors.hpp      | 31 ++++++++-------
 .../share/classfile/systemDictionary.cpp      |  7 ++--
 .../share/classfile/systemDictionary.hpp      |  9 +++--
 src/hotspot/share/oops/constantPool.cpp       | 38 ++++++++++---------
 src/hotspot/share/oops/cpCache.cpp            |  4 +-
 src/hotspot/share/utilities/exceptions.cpp    |  4 +-
 9 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index b942c155d1a..077b05f936e 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -2081,18 +2081,17 @@ oop java_lang_Throwable::message(oop throwable) {
   return throwable->obj_field(_detailMessage_offset);
 }
 
-oop java_lang_Throwable::cause(oop throwable) {
-  return throwable->obj_field(_cause_offset);
+const char* java_lang_Throwable::message_as_utf8(oop throwable) {
+  oop msg = java_lang_Throwable::message(throwable);
+  const char* msg_utf8 = nullptr;
+  if (msg != nullptr) {
+    msg_utf8 = java_lang_String::as_utf8_string(msg);
+  }
+  return msg_utf8;
 }
 
-// Return Symbol for detailed_message or null
-Symbol* java_lang_Throwable::detail_message(oop throwable) {
-  PreserveExceptionMark pm(Thread::current());
-  oop detailed_message = java_lang_Throwable::message(throwable);
-  if (detailed_message != nullptr) {
-    return java_lang_String::as_symbol(detailed_message);
-  }
-  return nullptr;
+oop java_lang_Throwable::cause(oop throwable) {
+  return throwable->obj_field(_cause_offset);
 }
 
 void java_lang_Throwable::set_message(oop throwable, oop value) {
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index b7660c1cdd3..e3bb453ae0a 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -598,12 +598,14 @@ class java_lang_Throwable: AllStatic {
   static void set_backtrace(oop throwable, oop value);
   static int depth(oop throwable);
   static void set_depth(oop throwable, int value);
-  static int get_detailMessage_offset() { CHECK_INIT(_detailMessage_offset); }
   // Message
+  static int get_detailMessage_offset() { CHECK_INIT(_detailMessage_offset); }
   static oop message(oop throwable);
-  static oop cause(oop throwable);
+  static const char* message_as_utf8(oop throwable);
   static void set_message(oop throwable, oop value);
-  static Symbol* detail_message(oop throwable);
+
+  static oop cause(oop throwable);
+
   static void print_stack_element(outputStream *st, Method* method, int bci);
 
   static void compute_offsets();
diff --git a/src/hotspot/share/classfile/resolutionErrors.cpp b/src/hotspot/share/classfile/resolutionErrors.cpp
index dc916eefaf2..cf598df59d7 100644
--- a/src/hotspot/share/classfile/resolutionErrors.cpp
+++ b/src/hotspot/share/classfile/resolutionErrors.cpp
@@ -66,8 +66,8 @@ void ResolutionErrorTable::initialize() {
 
 // create new error entry
 void ResolutionErrorTable::add_entry(const constantPoolHandle& pool, int cp_index,
-                                     Symbol* error, Symbol* message,
-                                     Symbol* cause, Symbol* cause_msg)
+                                     Symbol* error, const char* message,
+                                     Symbol* cause, const char* cause_msg)
 {
   assert_locked_or_safepoint(SystemDictionary_lock);
   assert(!pool.is_null() && error != nullptr, "adding null obj");
@@ -97,26 +97,30 @@ ResolutionErrorEntry* ResolutionErrorTable::find_entry(const constantPoolHandle&
   return entry == nullptr ? nullptr : *entry;
 }
 
-ResolutionErrorEntry::ResolutionErrorEntry(Symbol* error, Symbol* message,
-      Symbol* cause, Symbol* cause_msg):
+ResolutionErrorEntry::ResolutionErrorEntry(Symbol* error, const char* message,
+                                           Symbol* cause, const char* cause_msg):
         _error(error),
-        _message(message),
+        _message(message != nullptr ? os::strdup(message) : nullptr),
         _cause(cause),
-        _cause_msg(cause_msg),
+        _cause_msg(cause_msg != nullptr ? os::strdup(cause_msg) : nullptr),
         _nest_host_error(nullptr) {
 
   Symbol::maybe_increment_refcount(_error);
-  Symbol::maybe_increment_refcount(_message);
   Symbol::maybe_increment_refcount(_cause);
-  Symbol::maybe_increment_refcount(_cause_msg);
 }
 
 ResolutionErrorEntry::~ResolutionErrorEntry() {
   // decrement error refcount
   Symbol::maybe_decrement_refcount(_error);
-  Symbol::maybe_decrement_refcount(_message);
   Symbol::maybe_decrement_refcount(_cause);
-  Symbol::maybe_decrement_refcount(_cause_msg);
+
+  if (_message != nullptr) {
+    FREE_C_HEAP_ARRAY(char, _message);
+  }
+
+  if (_cause_msg != nullptr) {
+    FREE_C_HEAP_ARRAY(char, _cause_msg);
+  }
 
   if (nest_host_error() != nullptr) {
     FREE_C_HEAP_ARRAY(char, nest_host_error());
diff --git a/src/hotspot/share/classfile/resolutionErrors.hpp b/src/hotspot/share/classfile/resolutionErrors.hpp
index 388ab6c4ec6..ad6d793c6c0 100644
--- a/src/hotspot/share/classfile/resolutionErrors.hpp
+++ b/src/hotspot/share/classfile/resolutionErrors.hpp
@@ -36,10 +36,11 @@ class ResolutionErrorTable : AllStatic {
 
 public:
   static void initialize();
-  static void add_entry(const constantPoolHandle& pool, int which, Symbol* error, Symbol* message,
-                        Symbol* cause, Symbol* cause_msg);
+  static void add_entry(const constantPoolHandle& pool, int cp_index,
+                        Symbol* error, const char* error_msg,
+                        Symbol* cause, const char* cause_msg);
 
-  static void add_entry(const constantPoolHandle& pool, int which, const char* message);
+  static void add_entry(const constantPoolHandle& pool, int cp_index, const char* message);
 
   // find error given the constant pool and constant pool index
   static ResolutionErrorEntry* find_entry(const constantPoolHandle& pool, int cp_index);
@@ -68,34 +69,38 @@ public:
 class ResolutionErrorEntry : public CHeapObj<mtClass> {
  private:
   Symbol*           _error;
-  Symbol*           _message;
+  const char*       _message;
   Symbol*           _cause;
-  Symbol*           _cause_msg;
+  const char*       _cause_msg;
   const char*       _nest_host_error;
 
   NONCOPYABLE(ResolutionErrorEntry);
 
  public:
-    ResolutionErrorEntry(Symbol* error, Symbol* message, Symbol* cause, Symbol* cause_msg);
+  // The incoming message and cause_msg are copied to the C-Heap.
+  ResolutionErrorEntry(Symbol* error, const char* message,
+                       Symbol* cause, const char* cause_msg);
 
-    ResolutionErrorEntry(const char* message):
+  // The incoming nest host error message is already in the C-Heap.
+  ResolutionErrorEntry(const char* message):
         _error(nullptr),
         _message(nullptr),
         _cause(nullptr),
         _cause_msg(nullptr),
         _nest_host_error(message) {}
 
-    ~ResolutionErrorEntry();
+  ~ResolutionErrorEntry();
 
-    void set_nest_host_error(const char* message) {
-      _nest_host_error = message;
-    }
+  // The incoming nest host error message is already in the C-Heap.
+  void set_nest_host_error(const char* message) {
+    _nest_host_error = message;
+  }
 
 
   Symbol*            error() const              { return _error; }
-  Symbol*            message() const            { return _message; }
+  const char*        message() const            { return _message; }
   Symbol*            cause() const              { return _cause; }
-  Symbol*            cause_msg() const          { return _cause_msg; }
+  const char*        cause_msg() const          { return _cause_msg; }
   const char*        nest_host_error() const    { return _nest_host_error; }
 };
 
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 6a8d2975059..71ede3d9e00 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -1799,8 +1799,8 @@ bool SystemDictionary::add_loader_constraint(Symbol* class_name,
 // Add entry to resolution error table to record the error when the first
 // attempt to resolve a reference to a class has failed.
 void SystemDictionary::add_resolution_error(const constantPoolHandle& pool, int which,
-                                            Symbol* error, Symbol* message,
-                                            Symbol* cause, Symbol* cause_msg) {
+                                            Symbol* error, const char* message,
+                                            Symbol* cause, const char* cause_msg) {
   {
     MutexLocker ml(Thread::current(), SystemDictionary_lock);
     ResolutionErrorEntry* entry = ResolutionErrorTable::find_entry(pool, which);
@@ -1817,7 +1817,8 @@ void SystemDictionary::delete_resolution_error(ConstantPool* pool) {
 
 // Lookup resolution error table. Returns error if found, otherwise null.
 Symbol* SystemDictionary::find_resolution_error(const constantPoolHandle& pool, int which,
-                                                Symbol** message, Symbol** cause, Symbol** cause_msg) {
+                                                const char** message,
+                                                Symbol** cause, const char** cause_msg) {
 
   {
     MutexLocker ml(Thread::current(), SystemDictionary_lock);
diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
index a65606e8cf6..9f65cb593d3 100644
--- a/src/hotspot/share/classfile/systemDictionary.hpp
+++ b/src/hotspot/share/classfile/systemDictionary.hpp
@@ -272,12 +272,13 @@ public:
 
   // Record the error when the first attempt to resolve a reference from a constant
   // pool entry to a class fails.
-  static void add_resolution_error(const constantPoolHandle& pool, int which, Symbol* error,
-                                   Symbol* message, Symbol* cause = nullptr, Symbol* cause_msg = nullptr);
+  static void add_resolution_error(const constantPoolHandle& pool, int which,
+                                   Symbol* error, const char* message,
+                                   Symbol* cause = nullptr, const char* cause_msg = nullptr);
   static void delete_resolution_error(ConstantPool* pool);
   static Symbol* find_resolution_error(const constantPoolHandle& pool, int which,
-                                       Symbol** message, Symbol** cause, Symbol** cause_msg);
-
+                                       const char** message,
+                                       Symbol** cause, const char** cause_msg);
 
   // Record a nest host resolution/validation error
   static void add_nest_host_error(const constantPoolHandle& pool, int which,
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 1649b843cc8..9d521e032ff 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -802,13 +802,16 @@ void ConstantPool::resolve_string_constants_impl(const constantPoolHandle& this_
   }
 }
 
-static Symbol* exception_message(const constantPoolHandle& this_cp, int which, constantTag tag, oop pending_exception) {
+static const char* exception_message(const constantPoolHandle& this_cp, int which, constantTag tag, oop pending_exception) {
+  // Note: caller needs ResourceMark
+
   // Dig out the detailed message to reuse if possible
-  Symbol* message = java_lang_Throwable::detail_message(pending_exception);
-  if (message != nullptr) {
-    return message;
+  const char* msg = java_lang_Throwable::message_as_utf8(pending_exception);
+  if (msg != nullptr) {
+    return msg;
   }
 
+  Symbol* message = nullptr;
   // Return specific message for the tag
   switch (tag.value()) {
   case JVM_CONSTANT_UnresolvedClass:
@@ -831,49 +834,48 @@ static Symbol* exception_message(const constantPoolHandle& this_cp, int which, c
     ShouldNotReachHere();
   }
 
-  return message;
+  return message != nullptr ? message->as_C_string() : nullptr;
 }
 
-static void add_resolution_error(const constantPoolHandle& this_cp, int which,
+static void add_resolution_error(JavaThread* current, const constantPoolHandle& this_cp, int which,
                                  constantTag tag, oop pending_exception) {
 
+  ResourceMark rm(current);
   Symbol* error = pending_exception->klass()->name();
   oop cause = java_lang_Throwable::cause(pending_exception);
 
   // Also dig out the exception cause, if present.
   Symbol* cause_sym = nullptr;
-  Symbol* cause_msg = nullptr;
+  const char* cause_msg = nullptr;
   if (cause != nullptr && cause != pending_exception) {
     cause_sym = cause->klass()->name();
-    cause_msg = java_lang_Throwable::detail_message(cause);
+    cause_msg = java_lang_Throwable::message_as_utf8(cause);
   }
 
-  Symbol* message = exception_message(this_cp, which, tag, pending_exception);
+  const char* message = exception_message(this_cp, which, tag, pending_exception);
   SystemDictionary::add_resolution_error(this_cp, which, error, message, cause_sym, cause_msg);
 }
 
 
 void ConstantPool::throw_resolution_error(const constantPoolHandle& this_cp, int which, TRAPS) {
   ResourceMark rm(THREAD);
-  Symbol* message = nullptr;
+  const char* message = nullptr;
   Symbol* cause = nullptr;
-  Symbol* cause_msg = nullptr;
+  const char* cause_msg = nullptr;
   Symbol* error = SystemDictionary::find_resolution_error(this_cp, which, &message, &cause, &cause_msg);
   assert(error != nullptr, "checking");
-  const char* cause_str = cause_msg != nullptr ? cause_msg->as_C_string() : nullptr;
 
   CLEAR_PENDING_EXCEPTION;
   if (message != nullptr) {
-    char* msg = message->as_C_string();
     if (cause != nullptr) {
-      Handle h_cause = Exceptions::new_exception(THREAD, cause, cause_str);
-      THROW_MSG_CAUSE(error, msg, h_cause);
+      Handle h_cause = Exceptions::new_exception(THREAD, cause, cause_msg);
+      THROW_MSG_CAUSE(error, message, h_cause);
     } else {
-      THROW_MSG(error, msg);
+      THROW_MSG(error, message);
     }
   } else {
     if (cause != nullptr) {
-      Handle h_cause = Exceptions::new_exception(THREAD, cause, cause_str);
+      Handle h_cause = Exceptions::new_exception(THREAD, cause, cause_msg);
       THROW_CAUSE(error, h_cause);
     } else {
       THROW(error);
@@ -895,7 +897,7 @@ void ConstantPool::save_and_throw_exception(const constantPoolHandle& this_cp, i
     // and OutOfMemoryError, etc, or if the thread was hit by stop()
     // Needs clarification to section 5.4.3 of the VM spec (see 6308271)
   } else if (this_cp->tag_at(cp_index).value() != error_tag) {
-    add_resolution_error(this_cp, cp_index, tag, PENDING_EXCEPTION);
+    add_resolution_error(THREAD, this_cp, cp_index, tag, PENDING_EXCEPTION);
     // CAS in the tag.  If a thread beat us to registering this error that's fine.
     // If another thread resolved the reference, this is a race condition. This
     // thread may have had a security manager or something temporary.
diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
index 43e30a9ca3c..ccab0a04a0b 100644
--- a/src/hotspot/share/oops/cpCache.cpp
+++ b/src/hotspot/share/oops/cpCache.cpp
@@ -566,9 +566,9 @@ bool ConstantPoolCache::save_and_throw_indy_exc(
     CLEAR_PENDING_EXCEPTION;
     return false;
   }
-
+  ResourceMark rm(THREAD);
   Symbol* error = PENDING_EXCEPTION->klass()->name();
-  Symbol* message = java_lang_Throwable::detail_message(PENDING_EXCEPTION);
+  const char* message = java_lang_Throwable::message_as_utf8(PENDING_EXCEPTION);
 
   int encoded_index = ResolutionErrorTable::encode_indy_index(
                           ConstantPool::encode_invokedynamic_index(index));
diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index 3e0683999e1..a99c36e7eb6 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -566,11 +566,11 @@ void Exceptions::debug_check_abort_helper(Handle exception, const char* message)
 // for logging exceptions
 void Exceptions::log_exception(Handle exception, const char* message) {
   ResourceMark rm;
-  Symbol* detail_message = java_lang_Throwable::detail_message(exception());
+  const char* detail_message = java_lang_Throwable::message_as_utf8(exception());
   if (detail_message != nullptr) {
     log_info(exceptions)("Exception <%s: %s>\n thrown in %s",
                          exception->print_value_string(),
-                         detail_message->as_C_string(),
+                         detail_message,
                          message);
   } else {
     log_info(exceptions)("Exception <%s>\n thrown in %s",

From 33d7127555a6782d718184dc2a00de2a7c4dcd20 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Fri, 9 Feb 2024 12:38:12 +0000
Subject: [PATCH 051/486] 8322122: Enhance generation of addresses

Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Co-authored-by: hedongbo <hedongbo@huawei.com>
Reviewed-by: rhalade, mschoene, dlong, thartmann
---
 src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp | 6 ++++--
 src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp         | 8 +++++---
 src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp       | 8 +++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
index fd31d2dde5b..568be65e144 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
@@ -168,8 +168,10 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
   if (index->is_register()) {
     // apply the shift and accumulate the displacement
     if (shift > 0) {
-      LIR_Opr tmp = new_pointer_register();
-      __ shift_left(index, shift, tmp);
+      // Use long register to avoid overflow when shifting large index values left.
+      LIR_Opr tmp = new_register(T_LONG);
+      __ convert(Bytecodes::_i2l, index, tmp);
+      __ shift_left(tmp, shift, tmp);
       index = tmp;
     }
     if (large_disp != 0) {
diff --git a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
index 32aab91c7d3..b58defc1847 100644
--- a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -165,8 +165,10 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
   if (index->is_register()) {
     // Apply the shift and accumulate the displacement.
     if (shift > 0) {
-      LIR_Opr tmp = new_pointer_register();
-      __ shift_left(index, shift, tmp);
+      // Use long register to avoid overflow when shifting large index values left.
+      LIR_Opr tmp = new_register(T_LONG);
+      __ convert(Bytecodes::_i2l, index, tmp);
+      __ shift_left(tmp, shift, tmp);
       index = tmp;
     }
     if (large_disp != 0) {
diff --git a/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp b/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
index c216897d68f..8df13597425 100644
--- a/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRGenerator_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -157,8 +157,10 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
     return new LIR_Address(base, index, type);
   } else {
     if (shift > 0) {
-      LIR_Opr tmp = new_pointer_register();
-      __ shift_left(index, shift, tmp);
+      // Use long register to avoid overflow when shifting large index values left.
+      LIR_Opr tmp = new_register(T_LONG);
+      __ convert(Bytecodes::_i2l, index, tmp);
+      __ shift_left(tmp, shift, tmp);
       index = tmp;
     }
     return new LIR_Address(base, index, disp, type);

From 2f11afdae93d47da2bc9036ea109f34f09d28c7e Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Tue, 16 Apr 2024 06:19:32 +0000
Subject: [PATCH 052/486] 8330172: G1: Consolidate update_bot_for_block and
 update_bot_for_obj in HeapRegion

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/g1/g1HeapRegion.cpp         |  6 +-----
 src/hotspot/share/gc/g1/g1HeapRegion.hpp         |  5 +----
 src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp  | 14 +++++---------
 src/hotspot/share/gc/g1/g1ParScanThreadState.cpp |  4 ++--
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
index ff5ac4ab3a1..291648393a9 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -724,10 +724,6 @@ void HeapRegion::mangle_unused_area() {
 }
 #endif
 
-void HeapRegion::update_bot_for_block(HeapWord* start, HeapWord* end) {
-  _bot->update_for_block(start, end);
-}
-
 void HeapRegion::object_iterate(ObjectClosure* blk) {
   HeapWord* p = bottom();
   while (p < top()) {
@@ -741,7 +737,7 @@ void HeapRegion::object_iterate(ObjectClosure* blk) {
 void HeapRegion::fill_with_dummy_object(HeapWord* address, size_t word_size, bool zap) {
   // Keep the BOT in sync for old generation regions.
   if (is_old()) {
-    update_bot_for_obj(address, word_size);
+    update_bot_for_block(address, address + word_size);
   }
   // Fill in the object.
   CollectedHeap::fill_with_object(address, word_size, zap);
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
index dc5cd97a82d..d6be0837069 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
@@ -167,12 +167,9 @@ public:
   inline HeapWord* allocate(size_t word_size);
   inline HeapWord* allocate(size_t min_word_size, size_t desired_word_size, size_t* actual_size);
 
-  // Update BOT if this obj is the first entering a new card (i.e. crossing the card boundary).
-  inline void update_bot_for_obj(HeapWord* obj_start, size_t obj_size);
-
   // Full GC support methods.
 
-  void update_bot_for_block(HeapWord* start, HeapWord* end);
+  inline void update_bot_for_block(HeapWord* start, HeapWord* end);
 
   void prepare_for_full_gc();
   // Update heap region that has been compacted to be consistent after Full GC.
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp
index 183579b64d4..401540804ba 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp
@@ -253,17 +253,13 @@ inline void HeapRegion::update_bot() {
   assert(next_addr == top(), "Should stop the scan at the limit.");
 }
 
-inline void HeapRegion::update_bot_for_obj(HeapWord* obj_start, size_t obj_size) {
-  assert(is_old(), "should only do BOT updates for old regions");
-
-  HeapWord* obj_end = obj_start + obj_size;
-
-  assert(is_in(obj_start), "obj_start must be in this region: " HR_FORMAT
-         " obj_start " PTR_FORMAT " obj_end " PTR_FORMAT,
+inline void HeapRegion::update_bot_for_block(HeapWord* start, HeapWord* end) {
+  assert(is_in(start), "The start address must be in this region: " HR_FORMAT
+         " start " PTR_FORMAT " end " PTR_FORMAT,
          HR_FORMAT_PARAMS(this),
-         p2i(obj_start), p2i(obj_end));
+         p2i(start), p2i(end));
 
-  _bot->update_for_block(obj_start, obj_end);
+  _bot->update_for_block(start, end);
 }
 
 inline HeapWord* HeapRegion::parsable_bottom() const {
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index 3480e0ae994..81169f89a07 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -444,7 +444,7 @@ void G1ParScanThreadState::undo_allocation(G1HeapRegionAttr dest_attr,
 void G1ParScanThreadState::update_bot_after_copying(oop obj, size_t word_sz) {
   HeapWord* obj_start = cast_from_oop<HeapWord*>(obj);
   HeapRegion* region = _g1h->heap_region_containing(obj_start);
-  region->update_bot_for_obj(obj_start, word_sz);
+  region->update_bot_for_block(obj_start, obj_start + word_sz);
 }
 
 // Private inline function, for direct internal use and providing the

From def257727dd19b2bf11e8afa18d741d3502331ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Tue, 16 Apr 2024 06:51:37 +0000
Subject: [PATCH 053/486] 8330215: Trim working set for OldObjectSamples

Reviewed-by: jbachorik, egahlin
---
 .../checkpoint/objectSampleCheckpoint.cpp     | 42 ++++++++++++-------
 .../leakprofiler/sampling/objectSampler.cpp   | 24 +++++++++++
 .../leakprofiler/sampling/objectSampler.hpp   |  1 +
 src/hotspot/share/jfr/utilities/jfrSignal.hpp | 14 ++++++-
 4 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
index d13b31e89a0..2412454f6aa 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
@@ -264,12 +264,12 @@ void StackTraceBlobInstaller::install(ObjectSample* sample) {
 static void install_stack_traces(const ObjectSampler* sampler) {
   assert(sampler != nullptr, "invariant");
   const ObjectSample* const last = sampler->last();
-  if (last != sampler->last_resolved()) {
-    ResourceMark rm;
-    JfrKlassUnloading::sort();
-    StackTraceBlobInstaller installer;
-    iterate_samples(installer);
-  }
+  assert(last != nullptr, "invariant");
+  assert(last != sampler->last_resolved(), "invariant");
+  ResourceMark rm;
+  JfrKlassUnloading::sort();
+  StackTraceBlobInstaller installer;
+  iterate_samples(installer);
 }
 
 void ObjectSampleCheckpoint::on_rotation(const ObjectSampler* sampler) {
@@ -277,6 +277,9 @@ void ObjectSampleCheckpoint::on_rotation(const ObjectSampler* sampler) {
   assert(LeakProfiler::is_running(), "invariant");
   JavaThread* const thread = JavaThread::current();
   DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(thread);)
+  if (!ObjectSampler::has_unresolved_entry()) {
+    return;
+  }
   {
     // can safepoint here
     ThreadInVMfromNative transition(thread);
@@ -422,8 +425,10 @@ class BlobInstaller {
 };
 
 static void install_type_set_blobs() {
-  BlobInstaller installer;
-  iterate_samples(installer);
+  if (saved_type_set_blobs.valid()) {
+    BlobInstaller installer;
+    iterate_samples(installer);
+  }
 }
 
 static void save_type_set_blob(JfrCheckpointWriter& writer) {
@@ -436,20 +441,29 @@ static void save_type_set_blob(JfrCheckpointWriter& writer) {
   }
 }
 
+// This routine has exclusive access to the sampler instance on entry.
 void ObjectSampleCheckpoint::on_type_set(JfrCheckpointWriter& writer) {
   assert(LeakProfiler::is_running(), "invariant");
   DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(JavaThread::current());)
-  const ObjectSample* last = ObjectSampler::sampler()->last();
-  if (writer.has_data() && last != nullptr) {
-    save_type_set_blob(writer);
-    install_type_set_blobs();
-    ObjectSampler::sampler()->set_last_resolved(last);
+  assert(ClassLoaderDataGraph_lock->owned_by_self(), "invariant");
+  if (!ObjectSampler::has_unresolved_entry()) {
+    return;
   }
+  const ObjectSample* const last = ObjectSampler::sampler()->last();
+  assert(last != nullptr, "invariant");
+  assert(last != ObjectSampler::sampler()->last_resolved(), "invariant");
+  if (writer.has_data()) {
+    save_type_set_blob(writer);
+  }
+  install_type_set_blobs();
+  ObjectSampler::sampler()->set_last_resolved(last);
 }
 
+// This routine does NOT have exclusive access to the sampler instance on entry.
 void ObjectSampleCheckpoint::on_type_set_unload(JfrCheckpointWriter& writer) {
   assert(LeakProfiler::is_running(), "invariant");
-  if (writer.has_data() && ObjectSampler::sampler()->last() != nullptr) {
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  if (writer.has_data() && ObjectSampler::has_unresolved_entry()) {
     save_type_set_blob(writer);
   }
 }
diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp
index 8ecca9ec8c0..c80d93619a5 100644
--- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp
@@ -35,6 +35,7 @@
 #include "jfr/recorder/jfrEventSetting.inline.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
 #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp"
+#include "jfr/utilities/jfrSignal.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
 #include "jfr/utilities/jfrTime.hpp"
 #include "jfr/utilities/jfrTryLock.hpp"
@@ -59,6 +60,25 @@ static bool volatile _dead_samples = false;
 // that persist independent of the state of the ObjectSampler.
 static OopStorage* _oop_storage = nullptr;
 
+// A notification mechanism to let class unloading determine if to save unloaded typesets.
+static JfrSignal _unresolved_entry;
+
+static inline void signal_unresolved_entry() {
+  _unresolved_entry.signal_if_not_set();
+}
+
+static inline void clear_unresolved_entry() {
+  _unresolved_entry.reset();
+}
+
+static inline void signal_resolved() {
+  clear_unresolved_entry();
+}
+
+bool ObjectSampler::has_unresolved_entry() {
+  return _unresolved_entry.is_signaled();
+}
+
 OopStorage* ObjectSampler::oop_storage() { return _oop_storage; }
 
 // Callback invoked by the GC after an iteration over the oop storage
@@ -108,6 +128,8 @@ ObjectSampler::~ObjectSampler() {
 bool ObjectSampler::create(size_t size) {
   assert(SafepointSynchronize::is_at_safepoint(), "invariant");
   assert(_oop_storage != nullptr, "should be already created");
+  clear_unresolved_entry();
+  assert(!has_unresolved_entry(), "invariant");
   ObjectSampleCheckpoint::clear();
   assert(_instance == nullptr, "invariant");
   _instance = new ObjectSampler(size);
@@ -242,6 +264,7 @@ void ObjectSampler::add(HeapWord* obj, size_t allocated, traceid thread_id, bool
   }
 
   assert(sample != nullptr, "invariant");
+  signal_unresolved_entry();
   sample->set_thread_id(thread_id);
   if (virtual_thread) {
     sample->set_thread_is_virtual();
@@ -304,6 +327,7 @@ const ObjectSample* ObjectSampler::last_resolved() const {
 
 void ObjectSampler::set_last_resolved(const ObjectSample* sample) {
   _list->set_last_resolved(sample);
+  signal_resolved();
 }
 
 int ObjectSampler::item_count() const {
diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
index 3789227b600..e6bb16506c9 100644
--- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
@@ -85,6 +85,7 @@ class ObjectSampler : public CHeapObj<mtTracing> {
   ObjectSample* last() const;
   const ObjectSample* last_resolved() const;
   void set_last_resolved(const ObjectSample* sample);
+  static bool has_unresolved_entry();
 };
 
 #endif // SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrSignal.hpp b/src/hotspot/share/jfr/utilities/jfrSignal.hpp
index 74d1b9e21ca..acfc26c5abe 100644
--- a/src/hotspot/share/jfr/utilities/jfrSignal.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrSignal.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -37,13 +37,23 @@ class JfrSignal {
     Atomic::release_store(&_signaled, true);
   }
 
+  void reset() const {
+    Atomic::release_store(&_signaled, false);
+  }
+
   bool is_signaled() const {
     return Atomic::load_acquire(&_signaled);
   }
 
+  void signal_if_not_set() const {
+    if (!is_signaled()) {
+      signal();
+    }
+  }
+
   bool is_signaled_with_reset() const {
     if (is_signaled()) {
-      Atomic::release_store(&_signaled, false);
+      reset();
       return true;
     }
     return false;

From 97c180892b62ccba0041fb4480ecd2191aea0032 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Tue, 16 Apr 2024 08:23:31 +0000
Subject: [PATCH 054/486] 8329099: Undocumented exception thrown by Instruction
 factory methods accepting Opcode

Reviewed-by: briangoetz
---
 .../lang/classfile/instruction/ArrayLoadInstruction.java    | 2 ++
 .../lang/classfile/instruction/ArrayStoreInstruction.java   | 2 ++
 .../java/lang/classfile/instruction/BranchInstruction.java  | 2 ++
 .../lang/classfile/instruction/ConstantInstruction.java     | 6 ++++++
 .../java/lang/classfile/instruction/ConvertInstruction.java | 2 ++
 .../lang/classfile/instruction/DiscontinuedInstruction.java | 4 ++++
 .../java/lang/classfile/instruction/FieldInstruction.java   | 2 ++
 .../java/lang/classfile/instruction/InvokeInstruction.java  | 2 ++
 .../java/lang/classfile/instruction/LoadInstruction.java    | 2 ++
 .../java/lang/classfile/instruction/MonitorInstruction.java | 2 ++
 .../classfile/instruction/NewPrimitiveArrayInstruction.java | 6 ++++++
 .../lang/classfile/instruction/OperatorInstruction.java     | 2 ++
 .../java/lang/classfile/instruction/ReturnInstruction.java  | 2 ++
 .../java/lang/classfile/instruction/StackInstruction.java   | 2 ++
 .../java/lang/classfile/instruction/StoreInstruction.java   | 2 ++
 .../lang/classfile/instruction/TypeCheckInstruction.java    | 2 ++
 .../share/classes/java/lang/classfile/package-info.java     | 6 ++++++
 17 files changed, 48 insertions(+)

diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ArrayLoadInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ArrayLoadInstruction.java
index 876cc403727..3502e87edda 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ArrayLoadInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ArrayLoadInstruction.java
@@ -54,6 +54,8 @@ public sealed interface ArrayLoadInstruction extends Instruction
      *
      * @param op the opcode for the specific type of array load instruction,
      *           which must be of kind {@link Opcode.Kind#ARRAY_LOAD}
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#ARRAY_LOAD}.
      */
     static ArrayLoadInstruction of(Opcode op) {
         Util.checkKind(op, Opcode.Kind.ARRAY_LOAD);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ArrayStoreInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ArrayStoreInstruction.java
index 10430f8ec3a..a85b994181a 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ArrayStoreInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ArrayStoreInstruction.java
@@ -54,6 +54,8 @@ public sealed interface ArrayStoreInstruction extends Instruction
      *
      * @param op the opcode for the specific type of array store instruction,
      *           which must be of kind {@link Opcode.Kind#ARRAY_STORE}
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#ARRAY_STORE}.
      */
     static ArrayStoreInstruction of(Opcode op) {
         Util.checkKind(op, Opcode.Kind.ARRAY_STORE);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/BranchInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/BranchInstruction.java
index e391b24cefb..6ee47b7fbc2 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/BranchInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/BranchInstruction.java
@@ -56,6 +56,8 @@ public sealed interface BranchInstruction extends Instruction
      * @param op the opcode for the specific type of branch instruction,
      *           which must be of kind {@link Opcode.Kind#BRANCH}
      * @param target the target of the branch
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#BRANCH}.
      */
     static BranchInstruction of(Opcode op, Label target) {
         Util.checkKind(op, Opcode.Kind.BRANCH);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ConstantInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ConstantInstruction.java
index 6052946a752..a7ba9e2a6a1 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ConstantInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ConstantInstruction.java
@@ -131,6 +131,8 @@ public sealed interface ConstantInstruction extends Instruction {
      *
      * @param op the opcode for the specific type of intrinsic constant instruction,
      *           which must be of kind {@link Opcode.Kind#CONSTANT}
+     * @throws IllegalArgumentException if the opcode does not represent a constant
+     *                                  with implicit value
      */
     static IntrinsicConstantInstruction ofIntrinsic(Opcode op) {
         Util.checkKind(op, Opcode.Kind.CONSTANT);
@@ -145,6 +147,8 @@ public sealed interface ConstantInstruction extends Instruction {
      * @param op the opcode for the specific type of intrinsic constant instruction,
      *           which must be of kind {@link Opcode.Kind#CONSTANT}
      * @param value the constant value
+     * @throws IllegalArgumentException if the opcode is not {@link Opcode#BIPUSH}
+     *                                  or {@link Opcode#SIPUSH}
      */
     static ArgumentConstantInstruction ofArgument(Opcode op, int value) {
         Util.checkKind(op, Opcode.Kind.CONSTANT);
@@ -159,6 +163,8 @@ public sealed interface ConstantInstruction extends Instruction {
      * @param op the opcode for the specific type of load constant instruction,
      *           which must be of kind {@link Opcode.Kind#CONSTANT}
      * @param constant the constant value
+     * @throws IllegalArgumentException if the opcode is not {@link Opcode#LDC},
+     *                                  {@link Opcode#LDC_W}, or {@link Opcode#LDC2_W}
      */
     static LoadConstantInstruction ofLoad(Opcode op, LoadableConstantEntry constant) {
         Util.checkKind(op, Opcode.Kind.CONSTANT);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ConvertInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ConvertInstruction.java
index 5a21b91ea8c..daa7e602484 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ConvertInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ConvertInstruction.java
@@ -70,6 +70,8 @@ public sealed interface ConvertInstruction extends Instruction
      *
      * @param op the opcode for the specific type of conversion instruction,
      *           which must be of kind {@link Opcode.Kind#CONVERT}
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#CONVERT}.
      */
     static ConvertInstruction of(Opcode op) {
         Util.checkKind(op, Opcode.Kind.CONVERT);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java
index d6f2c50a8fa..61ea14c4598 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java
@@ -68,6 +68,8 @@ public sealed interface DiscontinuedInstruction extends Instruction {
          * @param op the opcode for the specific type of JSR instruction,
          *           which must be of kind {@link Opcode.Kind#DISCONTINUED_JSR}
          * @param target target label of the subroutine
+         * @throws IllegalArgumentException if the opcode kind is not
+         *         {@link Opcode.Kind#DISCONTINUED_JSR}.
          */
         static JsrInstruction of(Opcode op, Label target) {
             Util.checkKind(op, Opcode.Kind.DISCONTINUED_JSR);
@@ -109,6 +111,8 @@ public sealed interface DiscontinuedInstruction extends Instruction {
          * @param op the opcode for the specific type of RET instruction,
          *           which must be of kind {@link Opcode.Kind#DISCONTINUED_RET}
          * @param slot the local variable slot to load return address from
+         * @throws IllegalArgumentException if the opcode kind is not
+         *         {@link Opcode.Kind#DISCONTINUED_RET}.
          */
         static RetInstruction of(Opcode op, int slot) {
             Util.checkKind(op, Opcode.Kind.DISCONTINUED_RET);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/FieldInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/FieldInstruction.java
index 3d40866e194..43dbcccf75e 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/FieldInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/FieldInstruction.java
@@ -89,6 +89,8 @@ public sealed interface FieldInstruction extends Instruction
      * @param op the opcode for the specific type of field access instruction,
      *           which must be of kind {@link Opcode.Kind#FIELD_ACCESS}
      * @param field a constant pool entry describing the field
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#FIELD_ACCESS}.
      */
     static FieldInstruction of(Opcode op, FieldRefEntry field) {
         Util.checkKind(op, Opcode.Kind.FIELD_ACCESS);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/InvokeInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/InvokeInstruction.java
index a1cd11d55e8..79a2142eb65 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/InvokeInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/InvokeInstruction.java
@@ -104,6 +104,8 @@ public sealed interface InvokeInstruction extends Instruction
      * @param op the opcode for the specific type of invocation instruction,
      *           which must be of kind {@link Opcode.Kind#INVOKE}
      * @param method a constant pool entry describing the method
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#INVOKE}.
      */
     static InvokeInstruction of(Opcode op, MemberRefEntry method) {
         Util.checkKind(op, Opcode.Kind.INVOKE);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/LoadInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/LoadInstruction.java
index 2a8605e72b1..f4cc8bab794 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/LoadInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/LoadInstruction.java
@@ -73,6 +73,8 @@ public sealed interface LoadInstruction extends Instruction
      * @param op the opcode for the specific type of load instruction,
      *           which must be of kind {@link Opcode.Kind#LOAD}
      * @param slot the local variable slot to load from
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#LOAD}.
      */
     static LoadInstruction of(Opcode op, int slot) {
         Util.checkKind(op, Opcode.Kind.LOAD);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/MonitorInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/MonitorInstruction.java
index 72c9aa8c438..d0148b34aee 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/MonitorInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/MonitorInstruction.java
@@ -48,6 +48,8 @@ public sealed interface MonitorInstruction extends Instruction
      *
      * @param op the opcode for the specific type of monitor instruction,
      *           which must be of kind {@link Opcode.Kind#MONITOR}
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#MONITOR}.
      */
     static MonitorInstruction of(Opcode op) {
         Util.checkKind(op, Opcode.Kind.MONITOR);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
index 4ef7049edc8..a67a0f21c08 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
@@ -51,8 +51,14 @@ public sealed interface NewPrimitiveArrayInstruction extends Instruction
      * {@return a new primitive array instruction}
      *
      * @param typeKind the component type of the array
+     * @throws IllegalArgumentException when the {@code typeKind} is not a legal
+     *                                  primitive array component type
      */
     static NewPrimitiveArrayInstruction of(TypeKind typeKind) {
+        // Implicit null-check:
+        if (typeKind.newarraycode() < 0) {
+            throw new IllegalArgumentException("Illegal component type: " + typeKind.typeName());
+        }
         return new AbstractInstruction.UnboundNewPrimitiveArrayInstruction(typeKind);
     }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/OperatorInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/OperatorInstruction.java
index ce34e61a695..aeaa4109d7b 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/OperatorInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/OperatorInstruction.java
@@ -54,6 +54,8 @@ public sealed interface OperatorInstruction extends Instruction
      *
      * @param op the opcode for the specific type of array load instruction,
      *           which must be of kind {@link Opcode.Kind#OPERATOR}
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#OPERATOR}.
      */
     static OperatorInstruction of(Opcode op) {
         Util.checkKind(op, Opcode.Kind.OPERATOR);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/ReturnInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/ReturnInstruction.java
index 9dd7ddf6b42..fbfd22210d3 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/ReturnInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/ReturnInstruction.java
@@ -65,6 +65,8 @@ public sealed interface ReturnInstruction extends Instruction
      *
      * @param op the opcode for the specific type of return instruction,
      *           which must be of kind {@link Opcode.Kind#RETURN}
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#RETURN}.
      */
     static ReturnInstruction of(Opcode op) {
         Util.checkKind(op, Opcode.Kind.RETURN);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/StackInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/StackInstruction.java
index e66f9c5a3db..9b2e0b69043 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/StackInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/StackInstruction.java
@@ -49,6 +49,8 @@ public sealed interface StackInstruction extends Instruction
      *
      * @param op the opcode for the specific type of stack instruction,
      *           which must be of kind {@link Opcode.Kind#STACK}
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#STACK}.
      */
     static StackInstruction of(Opcode op) {
         Util.checkKind(op, Opcode.Kind.STACK);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/StoreInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/StoreInstruction.java
index 9eb45c0b5d4..278bf8c0ec3 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/StoreInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/StoreInstruction.java
@@ -72,6 +72,8 @@ public sealed interface StoreInstruction extends Instruction
      * @param op the opcode for the specific type of store instruction,
      *           which must be of kind {@link Opcode.Kind#STORE}
      * @param slot the local variable slot to store to
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#STORE}.
      */
     static StoreInstruction of(Opcode op, int slot) {
         Util.checkKind(op, Opcode.Kind.STORE);
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/TypeCheckInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/TypeCheckInstruction.java
index b4107a528d0..d93f5244ca9 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/TypeCheckInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/TypeCheckInstruction.java
@@ -59,6 +59,8 @@ public sealed interface TypeCheckInstruction extends Instruction
      * @param op the opcode for the specific type of type check instruction,
      *           which must be of kind {@link Opcode.Kind#TYPE_CHECK}
      * @param type the type against which to check or cast
+     * @throws IllegalArgumentException if the opcode kind is not
+     *         {@link Opcode.Kind#TYPE_CHECK}.
      */
     static TypeCheckInstruction of(Opcode op, ClassEntry type) {
         Util.checkKind(op, Opcode.Kind.TYPE_CHECK);
diff --git a/src/java.base/share/classes/java/lang/classfile/package-info.java b/src/java.base/share/classes/java/lang/classfile/package-info.java
index de94c09d9b4..edeafc439d3 100644
--- a/src/java.base/share/classes/java/lang/classfile/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/package-info.java
@@ -238,6 +238,12 @@
  * the convenience method {@code CodeBuilder.invokeInstruction}, which in turn behaves
  * as if it calls method {@code CodeBuilder.with}. This composing of method calls on the
  * builder enables the composing of transforms (as described later).
+ * <p>
+ * Unless otherwise noted, passing a {@code null} argument to a constructor
+ * or method of any Class-File API class or interface will cause a {@link
+ * java.lang.NullPointerException NullPointerException} to be thrown. Additionally,
+ * invoking a method with an array or collection containing a {@code null} element
+ * will cause a {@code NullPointerException}, unless otherwise specified. </p>
  *
  * <h3>Symbolic information</h3>
  * To describe symbolic information for classes and types, the API uses the

From 58911ccc2c48b4b5dd2ebc9d2a44dcf3737eca50 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Tue, 16 Apr 2024 10:20:50 +0000
Subject: [PATCH 055/486] 8188784:
 javax/management/notification/BroadcasterSupportDeadlockTest.java - TEST
 FAILED: deadlock

Reviewed-by: cjplummer, lmesnik
---
 .../BroadcasterSupportDeadlockTest.java       | 54 ++++++++-----------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/test/jdk/javax/management/notification/BroadcasterSupportDeadlockTest.java b/test/jdk/javax/management/notification/BroadcasterSupportDeadlockTest.java
index be3f0d8caa8..9485126a9d3 100644
--- a/test/jdk/javax/management/notification/BroadcasterSupportDeadlockTest.java
+++ b/test/jdk/javax/management/notification/BroadcasterSupportDeadlockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, 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
@@ -38,13 +38,8 @@ import java.util.concurrent.*;
 import javax.management.*;
 
 public class BroadcasterSupportDeadlockTest {
+
     public static void main(String[] args) throws Exception {
-        try {
-            Class.forName(ManagementFactory.class.getName());
-        } catch (Throwable t) {
-            System.out.println("TEST CANNOT RUN: needs JDK 5 at least");
-            return;
-        }
 
         final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         final BroadcasterMBean mbean = new Broadcaster();
@@ -66,8 +61,7 @@ public class BroadcasterSupportDeadlockTest {
                 } catch (Exception e) {
                     e.printStackTrace(System.out);
                 } finally {
-                    System.out.println("TEST INCORRECT: block returned");
-                    System.exit(1);
+                    throw new RuntimeException("TEST INCORRECT: block returned");
                 }
             }
         };
@@ -85,8 +79,9 @@ public class BroadcasterSupportDeadlockTest {
            interested in.  */
         semaphore.acquire();
         Thread.sleep(100);
-        while (t1.getState() != Thread.State.WAITING)
-            Thread.sleep(1);
+        while (t1.getState() != Thread.State.WAITING) {
+            Thread.sleep(100);
+        }
 
         // Thread 2 - try to add a listener
         final NotificationListener listener = new NotificationListener() {
@@ -105,32 +100,26 @@ public class BroadcasterSupportDeadlockTest {
         t2.setDaemon(true);
         t2.start();
 
-        /* Wait for Thread 2 to be blocked on the monitor or to
-           succeed.  */
+        /* Wait for Thread 2 to be blocked on the monitor or to succeed. */
         Thread.sleep(100);
 
-        for (int i = 0; i < 1000/*ms*/; i++) {
-            t2.join(1/*ms*/);
-            switch (t2.getState()) {
-            case TERMINATED:
+        for (int i = 0; i < 1000; i++) {
+            t2.join(100 /*ms*/);
+            if (t2.getState() == Thread.State.TERMINATED) {
                 System.out.println("TEST PASSED");
                 return;
-            case BLOCKED:
-                java.util.Map<Thread,StackTraceElement[]> traces =
-                    Thread.getAllStackTraces();
-                showStackTrace("Thread 1", traces.get(t1));
-                showStackTrace("Thread 2", traces.get(t2));
-                System.out.println("TEST FAILED: deadlock");
-                System.exit(1);
-                break;
-            default:
-                break;
             }
         }
 
-        System.out.println("TEST FAILED BUT DID NOT NOTICE DEADLOCK");
-        Thread.sleep(10000);
-        System.exit(1);
+        if (t2.getState() == Thread.State.BLOCKED) {
+            System.out.println("TEST FAILED: deadlock");
+        } else {
+            System.out.println("TEST FAILED BUT DID NOT NOTICE DEADLOCK (state = " + t2.getState() + ")");
+        }
+        java.util.Map<Thread,StackTraceElement[]> traces = Thread.getAllStackTraces();
+        showStackTrace("Thread 1", traces.get(t1));
+        showStackTrace("Thread 2", traces.get(t2));
+        throw new RuntimeException("TEST FAILED");
     }
 
     private static void showStackTrace(String title,
@@ -152,6 +141,7 @@ public class BroadcasterSupportDeadlockTest {
     public static class Broadcaster
             extends NotificationBroadcasterSupport
             implements BroadcasterMBean {
+
         public synchronized void block(Semaphore semaphore) {
             Object lock = new Object();
             synchronized (lock) {
@@ -161,9 +151,7 @@ public class BroadcasterSupportDeadlockTest {
                     semaphore.release();
                     lock.wait(); // block forever
                 } catch (InterruptedException e) {
-                    System.out.println("TEST INCORRECT: lock interrupted:");
-                    e.printStackTrace(System.out);
-                    System.exit(1);
+                    throw new RuntimeException("TEST INCORRECT: lock interrupted");
                 }
             }
         }

From 8a5b86c52954f6917acfda11df183691beb07f56 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Tue, 16 Apr 2024 11:09:59 +0000
Subject: [PATCH 056/486] 8196106: Support nested infinite or recursive flat
 mapped streams

Reviewed-by: psandoz
---
 .../java/util/stream/AbstractPipeline.java    |  16 +-
 .../java/util/stream/DoublePipeline.java      |  58 +++--
 .../classes/java/util/stream/GathererOp.java  |   8 -
 .../classes/java/util/stream/IntPipeline.java |  57 +++--
 .../java/util/stream/LongPipeline.java        |  58 +++--
 .../java/util/stream/ReferencePipeline.java   | 207 ++++++++-------
 .../tests/java/util/stream/FlatMapOpTest.java |  31 ++-
 .../util/stream/ops/DoubleAccumulator.java    |  45 ++++
 .../java/util/stream/ops/ref/FlatMap.java     | 239 ++++++++++++++++++
 9 files changed, 536 insertions(+), 183 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/util/stream/ops/DoubleAccumulator.java
 create mode 100644 test/micro/org/openjdk/bench/java/util/stream/ops/ref/FlatMap.java

diff --git a/src/java.base/share/classes/java/util/stream/AbstractPipeline.java b/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
index db75384e4d3..8afe5083cc7 100644
--- a/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -433,6 +433,20 @@ abstract class AbstractPipeline<E_IN, E_OUT, S extends BaseStream<E_OUT, S>>
          return result;
      }
 
+    /**
+     * Returns whether any of the stages in the (entire) pipeline is short-circuiting
+     * or not.
+     * @return {@code true} if any stage in this pipeline is short-circuiting,
+     *         {@code false} if not.
+     */
+    protected final boolean isShortCircuitingPipeline() {
+        for (var u = sourceStage.nextStage; u != null; u = u.nextStage) {
+            if (StreamOpFlag.SHORT_CIRCUIT.isKnown(u.combinedFlags))
+                return true;
+        }
+        return false;
+    }
+
     /**
      * Get the source spliterator for this pipeline stage.  For a sequential or
      * stateless parallel pipeline, this is the source spliterator.  For a
diff --git a/src/java.base/share/classes/java/util/stream/DoublePipeline.java b/src/java.base/share/classes/java/util/stream/DoublePipeline.java
index 47d9e017bb7..22b3bf67ef4 100644
--- a/src/java.base/share/classes/java/util/stream/DoublePipeline.java
+++ b/src/java.base/share/classes/java/util/stream/DoublePipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ import java.util.function.DoublePredicate;
 import java.util.function.DoubleToIntFunction;
 import java.util.function.DoubleToLongFunction;
 import java.util.function.DoubleUnaryOperator;
+import java.util.function.IntConsumer;
 import java.util.function.IntFunction;
 import java.util.function.ObjDoubleConsumer;
 import java.util.function.Supplier;
@@ -263,43 +264,46 @@ abstract class DoublePipeline<E_IN>
                 StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
             @Override
             Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
-                return new Sink.ChainedDouble<>(sink) {
-                    // true if cancellationRequested() has been called
-                    boolean cancellationRequestedCalled;
+                final DoubleConsumer fastPath =
+                        isShortCircuitingPipeline()
+                                ? null
+                                : (sink instanceof DoubleConsumer dc)
+                                ? dc
+                                : sink::accept;
+                final class FlatMap implements Sink.OfDouble, DoublePredicate {
+                    boolean cancel;
 
-                    // cache the consumer to avoid creation on every accepted element
-                    DoubleConsumer downstreamAsDouble = downstream::accept;
+                    @Override public void begin(long size) { sink.begin(-1); }
+                    @Override public void end() { sink.end(); }
 
                     @Override
-                    public void begin(long size) {
-                        downstream.begin(-1);
-                    }
-
-                    @Override
-                    public void accept(double t) {
-                        try (DoubleStream result = mapper.apply(t)) {
+                    public void accept(double e) {
+                        try (DoubleStream result = mapper.apply(e)) {
                             if (result != null) {
-                                if (!cancellationRequestedCalled) {
-                                    result.sequential().forEach(downstreamAsDouble);
-                                } else {
-                                    var s = result.sequential().spliterator();
-                                    do {
-                                    } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsDouble));
-                                }
+                                if (fastPath == null)
+                                    result.sequential().allMatch(this);
+                                else
+                                    result.sequential().forEach(fastPath);
                             }
                         }
                     }
 
                     @Override
                     public boolean cancellationRequested() {
-                        // If this method is called then an operation within the stream
-                        // pipeline is short-circuiting (see AbstractPipeline.copyInto).
-                        // Note that we cannot differentiate between an upstream or
-                        // downstream operation
-                        cancellationRequestedCalled = true;
-                        return downstream.cancellationRequested();
+                        return cancel || (cancel |= sink.cancellationRequested());
                     }
-                };
+
+                    @Override
+                    public boolean test(double output) {
+                        if (!cancel) {
+                            sink.accept(output);
+                            return !(cancel |= sink.cancellationRequested());
+                        } else {
+                            return false;
+                        }
+                    }
+                }
+                return new FlatMap();
             }
         };
     }
diff --git a/src/java.base/share/classes/java/util/stream/GathererOp.java b/src/java.base/share/classes/java/util/stream/GathererOp.java
index 096ac4ea3a5..8a7073f63ef 100644
--- a/src/java.base/share/classes/java/util/stream/GathererOp.java
+++ b/src/java.base/share/classes/java/util/stream/GathererOp.java
@@ -28,23 +28,15 @@ import jdk.internal.vm.annotation.ForceInline;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Optional;
 import java.util.Spliterator;
 import java.util.concurrent.CountedCompleter;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.IntFunction;
-import java.util.function.Predicate;
 import java.util.function.Supplier;
-import java.util.function.ToDoubleFunction;
-import java.util.function.ToIntFunction;
-import java.util.function.ToLongFunction;
 import java.util.stream.Gatherer.Integrator;
 
 /**
diff --git a/src/java.base/share/classes/java/util/stream/IntPipeline.java b/src/java.base/share/classes/java/util/stream/IntPipeline.java
index 83a978d6f68..e78bc9fecc9 100644
--- a/src/java.base/share/classes/java/util/stream/IntPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/IntPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -297,43 +297,46 @@ abstract class IntPipeline<E_IN>
                 StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
             @Override
             Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
-                return new Sink.ChainedInt<>(sink) {
-                    // true if cancellationRequested() has been called
-                    boolean cancellationRequestedCalled;
+                final IntConsumer fastPath =
+                        isShortCircuitingPipeline()
+                                ? null
+                                : (sink instanceof IntConsumer ic)
+                                ? ic
+                                : sink::accept;
+                final class FlatMap implements Sink.OfInt, IntPredicate {
+                    boolean cancel;
 
-                    // cache the consumer to avoid creation on every accepted element
-                    IntConsumer downstreamAsInt = downstream::accept;
+                    @Override public void begin(long size) { sink.begin(-1); }
+                    @Override public void end() { sink.end(); }
 
                     @Override
-                    public void begin(long size) {
-                        downstream.begin(-1);
-                    }
-
-                    @Override
-                    public void accept(int t) {
-                        try (IntStream result = mapper.apply(t)) {
+                    public void accept(int e) {
+                        try (IntStream result = mapper.apply(e)) {
                             if (result != null) {
-                                if (!cancellationRequestedCalled) {
-                                    result.sequential().forEach(downstreamAsInt);
-                                } else {
-                                    var s = result.sequential().spliterator();
-                                    do {
-                                    } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsInt));
-                                }
+                                if (fastPath == null)
+                                    result.sequential().allMatch(this);
+                                else
+                                    result.sequential().forEach(fastPath);
                             }
                         }
                     }
 
                     @Override
                     public boolean cancellationRequested() {
-                        // If this method is called then an operation within the stream
-                        // pipeline is short-circuiting (see AbstractPipeline.copyInto).
-                        // Note that we cannot differentiate between an upstream or
-                        // downstream operation
-                        cancellationRequestedCalled = true;
-                        return downstream.cancellationRequested();
+                        return cancel || (cancel |= sink.cancellationRequested());
                     }
-                };
+
+                    @Override
+                    public boolean test(int output) {
+                        if (!cancel) {
+                            sink.accept(output);
+                            return !(cancel |= sink.cancellationRequested());
+                        } else {
+                            return false;
+                        }
+                    }
+                }
+                return new FlatMap();
             }
         };
     }
diff --git a/src/java.base/share/classes/java/util/stream/LongPipeline.java b/src/java.base/share/classes/java/util/stream/LongPipeline.java
index b5d43c2ef13..c8c296824ed 100644
--- a/src/java.base/share/classes/java/util/stream/LongPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/LongPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, 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
@@ -33,6 +33,7 @@ import java.util.Spliterator;
 import java.util.Spliterators;
 import java.util.function.BiConsumer;
 import java.util.function.BinaryOperator;
+import java.util.function.IntConsumer;
 import java.util.function.IntFunction;
 import java.util.function.LongBinaryOperator;
 import java.util.function.LongConsumer;
@@ -279,43 +280,46 @@ abstract class LongPipeline<E_IN>
                 StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
             @Override
             Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
-                return new Sink.ChainedLong<>(sink) {
-                    // true if cancellationRequested() has been called
-                    boolean cancellationRequestedCalled;
+                final LongConsumer fastPath =
+                        isShortCircuitingPipeline()
+                                ? null
+                                : (sink instanceof LongConsumer lc)
+                                ? lc
+                                : sink::accept;
+                final class FlatMap implements Sink.OfLong, LongPredicate {
+                    boolean cancel;
 
-                    // cache the consumer to avoid creation on every accepted element
-                    LongConsumer downstreamAsLong = downstream::accept;
+                    @Override public void begin(long size) { sink.begin(-1); }
+                    @Override public void end() { sink.end(); }
 
                     @Override
-                    public void begin(long size) {
-                        downstream.begin(-1);
-                    }
-
-                    @Override
-                    public void accept(long t) {
-                        try (LongStream result = mapper.apply(t)) {
+                    public void accept(long e) {
+                        try (LongStream result = mapper.apply(e)) {
                             if (result != null) {
-                                if (!cancellationRequestedCalled) {
-                                    result.sequential().forEach(downstreamAsLong);
-                                } else {
-                                    var s = result.sequential().spliterator();
-                                    do {
-                                    } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsLong));
-                                }
+                                if (fastPath == null)
+                                    result.sequential().allMatch(this);
+                                else
+                                    result.sequential().forEach(fastPath);
                             }
                         }
                     }
 
                     @Override
                     public boolean cancellationRequested() {
-                        // If this method is called then an operation within the stream
-                        // pipeline is short-circuiting (see AbstractPipeline.copyInto).
-                        // Note that we cannot differentiate between an upstream or
-                        // downstream operation
-                        cancellationRequestedCalled = true;
-                        return downstream.cancellationRequested();
+                        return cancel || (cancel |= sink.cancellationRequested());
                     }
-                };
+
+                    @Override
+                    public boolean test(long output) {
+                        if (!cancel) {
+                            sink.accept(output);
+                            return !(cancel |= sink.cancellationRequested());
+                        } else {
+                            return false;
+                        }
+                    }
+                }
+                return new FlatMap();
             }
         };
     }
diff --git a/src/java.base/share/classes/java/util/stream/ReferencePipeline.java b/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
index 5058440335f..3133b20b03d 100644
--- a/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
+++ b/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,13 @@ import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
 import java.util.function.DoubleConsumer;
+import java.util.function.DoublePredicate;
 import java.util.function.Function;
 import java.util.function.IntConsumer;
 import java.util.function.IntFunction;
+import java.util.function.IntPredicate;
 import java.util.function.LongConsumer;
+import java.util.function.LongPredicate;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.function.ToDoubleFunction;
@@ -274,40 +277,41 @@ abstract class ReferencePipeline<P_IN, P_OUT>
                 StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
             @Override
             Sink<P_OUT> opWrapSink(int flags, Sink<R> sink) {
-                return new Sink.ChainedReference<>(sink) {
-                    // true if cancellationRequested() has been called
-                    boolean cancellationRequestedCalled;
+                boolean shorts = isShortCircuitingPipeline();
+                final class FlatMap implements Sink<P_OUT>, Predicate<R> {
+                    boolean cancel;
+
+                    @Override public void begin(long size) { sink.begin(-1); }
+                    @Override public void end() { sink.end(); }
 
                     @Override
-                    public void begin(long size) {
-                        downstream.begin(-1);
-                    }
-
-                    @Override
-                    public void accept(P_OUT u) {
-                        try (Stream<? extends R> result = mapper.apply(u)) {
+                    public void accept(P_OUT e) {
+                        try (Stream<? extends R> result = mapper.apply(e)) {
                             if (result != null) {
-                                if (!cancellationRequestedCalled) {
-                                    result.sequential().forEach(downstream);
-                                } else {
-                                    var s = result.sequential().spliterator();
-                                    do {
-                                    } while (!downstream.cancellationRequested() && s.tryAdvance(downstream));
-                                }
+                                if (shorts)
+                                    result.sequential().allMatch(this);
+                                else
+                                    result.sequential().forEach(sink);
                             }
                         }
                     }
 
                     @Override
                     public boolean cancellationRequested() {
-                        // If this method is called then an operation within the stream
-                        // pipeline is short-circuiting (see AbstractPipeline.copyInto).
-                        // Note that we cannot differentiate between an upstream or
-                        // downstream operation
-                        cancellationRequestedCalled = true;
-                        return downstream.cancellationRequested();
+                        return cancel || (cancel |= sink.cancellationRequested());
                     }
-                };
+
+                    @Override
+                    public boolean test(R output) {
+                        if (!cancel) {
+                            sink.accept(output);
+                            return !(cancel |= sink.cancellationRequested());
+                        } else {
+                            return false;
+                        }
+                    }
+                }
+                return new FlatMap();
             }
         };
     }
@@ -319,39 +323,46 @@ abstract class ReferencePipeline<P_IN, P_OUT>
                 StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
             @Override
             Sink<P_OUT> opWrapSink(int flags, Sink<Integer> sink) {
-                return new Sink.ChainedReference<>(sink) {
-                    // true if cancellationRequested() has been called
-                    boolean cancellationRequestedCalled;
+                IntConsumer fastPath =
+                    isShortCircuitingPipeline()
+                        ? null
+                        : (sink instanceof IntConsumer ic)
+                            ? ic
+                            : sink::accept;
+                final class FlatMap implements Sink<P_OUT>, IntPredicate {
+                    boolean cancel;
 
-                    // cache the consumer to avoid creation on every accepted element
-                    IntConsumer downstreamAsInt = downstream::accept;
+                    @Override public void begin(long size) { sink.begin(-1); }
+                    @Override public void end() { sink.end(); }
 
                     @Override
-                    public void begin(long size) {
-                        downstream.begin(-1);
-                    }
-
-                    @Override
-                    public void accept(P_OUT u) {
-                        try (IntStream result = mapper.apply(u)) {
+                    public void accept(P_OUT e) {
+                        try (IntStream result = mapper.apply(e)) {
                             if (result != null) {
-                                if (!cancellationRequestedCalled) {
-                                    result.sequential().forEach(downstreamAsInt);
-                                } else {
-                                    var s = result.sequential().spliterator();
-                                    do {
-                                    } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsInt));
-                                }
+                                if (fastPath == null)
+                                    result.sequential().allMatch(this);
+                                else
+                                    result.sequential().forEach(fastPath);
                             }
                         }
                     }
 
                     @Override
                     public boolean cancellationRequested() {
-                        cancellationRequestedCalled = true;
-                        return downstream.cancellationRequested();
+                        return cancel || (cancel |= sink.cancellationRequested());
                     }
-                };
+
+                    @Override
+                    public boolean test(int output) {
+                        if (!cancel) {
+                            sink.accept(output);
+                            return !(cancel |= sink.cancellationRequested());
+                        } else {
+                            return false;
+                        }
+                    }
+                }
+                return new FlatMap();
             }
         };
     }
@@ -363,39 +374,46 @@ abstract class ReferencePipeline<P_IN, P_OUT>
                 StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
             @Override
             Sink<P_OUT> opWrapSink(int flags, Sink<Double> sink) {
-                return new Sink.ChainedReference<>(sink) {
-                    // true if cancellationRequested() has been called
-                    boolean cancellationRequestedCalled;
+                DoubleConsumer fastPath =
+                    isShortCircuitingPipeline()
+                        ? null
+                        : (sink instanceof DoubleConsumer dc)
+                            ? dc
+                            : sink::accept;
+                final class FlatMap implements Sink<P_OUT>, DoublePredicate {
+                    boolean cancel;
 
-                    // cache the consumer to avoid creation on every accepted element
-                    DoubleConsumer downstreamAsDouble = downstream::accept;
+                    @Override public void begin(long size) { sink.begin(-1); }
+                    @Override public void end() { sink.end(); }
 
                     @Override
-                    public void begin(long size) {
-                        downstream.begin(-1);
-                    }
-
-                    @Override
-                    public void accept(P_OUT u) {
-                        try (DoubleStream result = mapper.apply(u)) {
+                    public void accept(P_OUT e) {
+                        try (DoubleStream result = mapper.apply(e)) {
                             if (result != null) {
-                                if (!cancellationRequestedCalled) {
-                                    result.sequential().forEach(downstreamAsDouble);
-                                } else {
-                                    var s = result.sequential().spliterator();
-                                    do {
-                                    } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsDouble));
-                                }
+                                if (fastPath == null)
+                                    result.sequential().allMatch(this);
+                                else
+                                    result.sequential().forEach(fastPath);
                             }
                         }
                     }
 
                     @Override
                     public boolean cancellationRequested() {
-                        cancellationRequestedCalled = true;
-                        return downstream.cancellationRequested();
+                        return cancel || (cancel |= sink.cancellationRequested());
                     }
-                };
+
+                    @Override
+                    public boolean test(double output) {
+                        if (!cancel) {
+                            sink.accept(output);
+                            return !(cancel |= sink.cancellationRequested());
+                        } else {
+                            return false;
+                        }
+                    }
+                }
+                return new FlatMap();
             }
         };
     }
@@ -408,39 +426,46 @@ abstract class ReferencePipeline<P_IN, P_OUT>
                 StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
             @Override
             Sink<P_OUT> opWrapSink(int flags, Sink<Long> sink) {
-                return new Sink.ChainedReference<>(sink) {
-                    // true if cancellationRequested() has been called
-                    boolean cancellationRequestedCalled;
+                LongConsumer fastPath =
+                    isShortCircuitingPipeline()
+                        ? null
+                        : (sink instanceof LongConsumer lc)
+                            ? lc
+                            : sink::accept;
+                final class FlatMap implements Sink<P_OUT>, LongPredicate {
+                    boolean cancel;
 
-                    // cache the consumer to avoid creation on every accepted element
-                    LongConsumer downstreamAsLong = downstream::accept;
+                    @Override public void begin(long size) { sink.begin(-1); }
+                    @Override public void end() { sink.end(); }
 
                     @Override
-                    public void begin(long size) {
-                        downstream.begin(-1);
-                    }
-
-                    @Override
-                    public void accept(P_OUT u) {
-                        try (LongStream result = mapper.apply(u)) {
+                    public void accept(P_OUT e) {
+                        try (LongStream result = mapper.apply(e)) {
                             if (result != null) {
-                                if (!cancellationRequestedCalled) {
-                                    result.sequential().forEach(downstreamAsLong);
-                                } else {
-                                    var s = result.sequential().spliterator();
-                                    do {
-                                    } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsLong));
-                                }
+                                if (fastPath == null)
+                                    result.sequential().allMatch(this);
+                                else
+                                    result.sequential().forEach(fastPath);
                             }
                         }
                     }
 
                     @Override
                     public boolean cancellationRequested() {
-                        cancellationRequestedCalled = true;
-                        return downstream.cancellationRequested();
+                        return cancel || (cancel |= sink.cancellationRequested());
                     }
-                };
+
+                    @Override
+                    public boolean test(long output) {
+                        if (!cancel) {
+                            sink.accept(output);
+                            return !(cancel |= sink.cancellationRequested());
+                        } else {
+                            return false;
+                        }
+                    }
+                }
+                return new FlatMap();
             }
         };
     }
diff --git a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java
index ab8daa732cd..36227de9c3a 100644
--- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java
+++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary flat-map operations
- * @bug 8044047 8076458 8075939
+ * @bug 8044047 8076458 8075939 8196106
  */
 
 package org.openjdk.tests.java.util.stream;
@@ -273,4 +273,31 @@ public class FlatMapOpTest extends OpTestCase {
                 limit(10).toArray();
         assertEquals(count.get(), 10);
     }
+
+    @Test
+    public void testTerminationOfNestedInfiniteStreams() {
+        var refExpected = Stream.generate(() -> "").limit(5).toList();
+        var refResult = Stream.generate(() -> "")
+              .flatMap(c -> Stream.generate(() -> c).flatMap(x -> Stream.generate(() -> x)))
+              .limit(5).toList();
+        assertEquals(refResult, refExpected);
+
+        var intExpected = IntStream.generate(() -> 1).limit(5).sum();
+        var intResult = IntStream.generate(() -> 1)
+                .flatMap(c -> IntStream.generate(() -> c).flatMap(x -> IntStream.generate(() -> x)))
+                .limit(5).sum();
+        assertEquals(intResult, intExpected);
+
+        var longExpected = LongStream.generate(() -> 1L).limit(5).sum();
+        var longResult = LongStream.generate(() -> 1L)
+                .flatMap(c -> LongStream.generate(() -> c).flatMap(x -> LongStream.generate(() -> x)))
+                .limit(5).sum();
+        assertEquals(longResult, longExpected);
+
+        var doubleExpected = DoubleStream.generate(() -> 0d).limit(5).sum();
+        var doubleResult = DoubleStream.generate(() -> 0d)
+                .flatMap(c -> DoubleStream.generate(() -> c).flatMap(x -> DoubleStream.generate(() -> x)))
+                .limit(5).sum();
+        assertEquals(doubleResult, doubleExpected);
+    }
 }
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/DoubleAccumulator.java b/test/micro/org/openjdk/bench/java/util/stream/ops/DoubleAccumulator.java
new file mode 100644
index 00000000000..0a828834633
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/DoubleAccumulator.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+package org.openjdk.bench.java.util.stream.ops;
+
+public class DoubleAccumulator {
+
+    double acc;
+
+    public DoubleAccumulator() {
+        acc = 0;
+    }
+
+    public void add(double v) {
+        acc += v;
+    }
+
+    public void merge(DoubleAccumulator other) {
+        acc += other.acc;
+    }
+
+    public double get() {
+        return acc;
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/FlatMap.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/FlatMap.java
new file mode 100644
index 00000000000..ddd70ec18d8
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/FlatMap.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+package org.openjdk.bench.java.util.stream.ops.ref;
+
+import org.openjdk.bench.java.util.stream.ops.DoubleAccumulator;
+import org.openjdk.bench.java.util.stream.ops.LongAccumulator;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+import java.util.function.LongFunction;
+import java.util.function.DoubleFunction;
+import java.util.stream.Stream;
+import java.util.stream.DoubleStream;
+import java.util.stream.LongStream;
+import java.util.stream.IntStream;
+import java.util.Arrays;
+
+/**
+ * Benchmark for flatMap() operation.
+ */
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 3)
+@OutputTimeUnit(TimeUnit.SECONDS)
+@State(Scope.Thread)
+public class FlatMap {
+
+    /**
+     * Implementation notes:
+     *   - parallel version requires thread-safe sink, we use the same for sequential version for better comparison
+     *   - operations are explicit inner classes to untangle unwanted lambda effects
+     *   - the result of applying consecutive operations is the same, in order to have the same number of elements in sink
+     */
+
+    @Param({"10", "100", "1000"})
+    private int size;
+
+    private Function<Long, Stream<Long>> funArrayStream;
+    private Function<Long, Stream<Long>> funIterateStream;
+    private LongFunction<LongStream> funLongStream;
+    private LongFunction<LongStream> funIterateLongStream;
+    private IntFunction<IntStream> funIntStream;
+    private IntFunction<IntStream> funIterateIntStream;
+    private DoubleFunction<DoubleStream> funDoubleStream;
+    private DoubleFunction<DoubleStream> funIterateDoubleStream;
+
+    private Long[] cachedRefArray;
+    private int[] cachedIntArray;
+    private long[] cachedLongArray;
+    private double[] cachedDoubleArray;
+
+    @Setup
+    public void setup() {
+        final int cachedSize = size;
+        cachedRefArray = new Long[cachedSize];
+        cachedIntArray = new int[cachedSize];
+        cachedLongArray = new long[cachedSize];
+        cachedDoubleArray = new double[cachedSize];
+        for(int i = 0;i < cachedRefArray.length;++i) {
+            cachedRefArray[i]    = Long.valueOf(i);
+            cachedIntArray[i]    = i;
+            cachedLongArray[i]   = i;
+            cachedDoubleArray[i] = i;
+        }
+
+        funArrayStream = new Function<Long, Stream<Long>>() { @Override public Stream<Long> apply(Long l) {
+            return Arrays.stream(cachedRefArray);
+        } };
+        funIterateStream = new Function<Long, Stream<Long>>() { @Override public Stream<Long> apply(Long l) {
+            return Stream.iterate(0L, i -> i + 1).limit(cachedSize); } };
+        funLongStream = new LongFunction<LongStream>() { @Override public LongStream apply(long l) {
+            return Arrays.stream(cachedLongArray); } };
+        funIterateLongStream = new LongFunction<LongStream>() { @Override public LongStream apply(long l) {
+            return LongStream.iterate(0L, i -> i + 1).limit(cachedSize); } };
+        funIntStream = new IntFunction<IntStream>() { @Override public IntStream apply(int i) {
+            return Arrays.stream(cachedIntArray); } };
+        funIterateIntStream = new IntFunction<IntStream>() { @Override public IntStream apply(int i) {
+            return IntStream.iterate(0, ii -> ii + 1).limit(cachedSize); } };
+        funDoubleStream = new DoubleFunction<DoubleStream>() { @Override public DoubleStream apply(double d) {
+            return Arrays.stream(cachedDoubleArray); } };
+        funIterateDoubleStream = new DoubleFunction<DoubleStream>() { @Override public DoubleStream apply(double d) {
+            return DoubleStream.iterate(0d, i -> i + 1d).limit(cachedSize); } };
+    }
+
+    @Benchmark
+    public long seq_array_ref() {
+        return funArrayStream.apply(0L)
+                .flatMap(funArrayStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long par_array_ref() {
+        return funArrayStream.apply(0L)
+                .parallel()
+                .flatMap(funArrayStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long seq_array_long() {
+        return funLongStream.apply(0L)
+                .flatMap(funLongStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long par_array_long() {
+        return funLongStream.apply(0L)
+                .parallel()
+                .flatMap(funLongStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long seq_array_int() {
+        return funIntStream.apply(0)
+                .flatMap(funIntStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long par_array_int() {
+        return funIntStream.apply(0)
+                .parallel()
+                .flatMap(funIntStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public double seq_array_double() {
+        return funDoubleStream.apply(0d)
+                .flatMap(funDoubleStream)
+                .collect(DoubleAccumulator::new, DoubleAccumulator::add, DoubleAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public double par_array_double() {
+        return funDoubleStream.apply(0d)
+                .parallel()
+                .flatMap(funDoubleStream)
+                .collect(DoubleAccumulator::new, DoubleAccumulator::add, DoubleAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long seq_iterate_ref() {
+        return funIterateStream.apply(0L)
+                .flatMap(funIterateStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long par_iterate_ref() {
+        return funIterateStream.apply(0L)
+                .parallel()
+                .flatMap(funIterateStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+
+    @Benchmark
+    public long seq_iterate_long() {
+        return funIterateLongStream.apply(0L)
+                .flatMap(funIterateLongStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long par_iterate_long() {
+        return funIterateLongStream.apply(0L)
+                .parallel()
+                .flatMap(funIterateLongStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long seq_iterate_int() {
+        return funIterateIntStream.apply(0)
+                .flatMap(funIterateIntStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public long par_iterate_int() {
+        return funIterateIntStream.apply(0)
+                .parallel()
+                .flatMap(funIterateIntStream)
+                .collect(LongAccumulator::new, LongAccumulator::add, LongAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public double seq_iterate_double() {
+        return funIterateDoubleStream.apply(0d)
+                .flatMap(funIterateDoubleStream)
+                .collect(DoubleAccumulator::new, DoubleAccumulator::add, DoubleAccumulator::merge).get();
+    }
+
+    @Benchmark
+    public double par_iterate_double() {
+        return funIterateDoubleStream.apply(0d)
+                .parallel()
+                .flatMap(funIterateDoubleStream)
+                .collect(DoubleAccumulator::new, DoubleAccumulator::add, DoubleAccumulator::merge).get();
+    }
+
+}

From 56ff87a09648ed6bb1176a28f70982d9241627a2 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 16 Apr 2024 13:51:04 +0000
Subject: [PATCH 057/486] 8330359: G1: Remove unused forward declaration in
 g1BlockOffsetTable.hpp

Reviewed-by: iwalulya, gli
---
 src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
index 518c595b225..6a359a2cc9e 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
@@ -32,9 +32,6 @@
 #include "memory/virtualspace.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-// Forward declarations
-class HeapRegion;
-
 // This implementation of "G1BlockOffsetTable" divides the covered region
 // into "N"-word subregions (where "N" = 2^"LogN".  An array with an entry
 // for each such subregion indicates how far back one must go to find the

From 61fa4d45b68ffbfb751471730518651b78b195aa Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 16 Apr 2024 13:51:14 +0000
Subject: [PATCH 058/486] 8330351: Remove the SHARED_LIBRARY and STATIC_LIBRARY
 macros

Reviewed-by: erikj
---
 make/RunTestsPrebuiltSpec.gmk    |  6 +-----
 make/autoconf/spec.gmk.template  |  7 -------
 make/autoconf/toolchain.m4       | 12 ++----------
 make/hotspot/test/GtestImage.gmk |  4 ++--
 make/modules/java.base/Lib.gmk   |  7 ++++---
 5 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/make/RunTestsPrebuiltSpec.gmk b/make/RunTestsPrebuiltSpec.gmk
index 16a14fbd2a0..170a2c25553 100644
--- a/make/RunTestsPrebuiltSpec.gmk
+++ b/make/RunTestsPrebuiltSpec.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2024, 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
@@ -176,7 +176,3 @@ ULIMIT := ulimit
 ifeq ($(OPENJDK_BUILD_OS), windows)
   PATHTOOL := cygpath
 endif
-
-################################################################################
-# Simple macros from spec.gmk.in
-SHARED_LIBRARY=$(LIBRARY_PREFIX)$1$(SHARED_LIBRARY_SUFFIX)
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 2f2525a662a..616999f2736 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -625,13 +625,6 @@ SHARED_LIBRARY_FLAGS := @SHARED_LIBRARY_FLAGS@
 SET_SHARED_LIBRARY_ORIGIN = @SET_SHARED_LIBRARY_ORIGIN@
 SET_EXECUTABLE_ORIGIN = @SET_EXECUTABLE_ORIGIN@
 
-# Different OS:es have different ways of naming shared libraries.
-# The SHARED_LIBRARY and STATIC_LIBRARY macros takes "verify" as and argument and returns:
-#    "libverify.so" or "libverify.dylib" or "verify.dll" depending on platform.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SHARED_LIBRARY = @SHARED_LIBRARY@
-STATIC_LIBRARY = @STATIC_LIBRARY@
-
 LIBRARY_PREFIX := @LIBRARY_PREFIX@
 SHARED_LIBRARY_SUFFIX := @SHARED_LIBRARY_SUFFIX@
 STATIC_LIBRARY_SUFFIX := @STATIC_LIBRARY_SUFFIX@
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index aceb6edb79d..15f4247b274 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -174,30 +174,24 @@ AC_DEFUN([TOOLCHAIN_SETUP_FILENAME_PATTERNS],
     LIBRARY_PREFIX=
     SHARED_LIBRARY_SUFFIX='.dll'
     STATIC_LIBRARY_SUFFIX='.lib'
-    SHARED_LIBRARY='[$]1.dll'
-    STATIC_LIBRARY='[$]1.lib'
     OBJ_SUFFIX='.obj'
     EXECUTABLE_SUFFIX='.exe'
   else
     LIBRARY_PREFIX=lib
     SHARED_LIBRARY_SUFFIX='.so'
     STATIC_LIBRARY_SUFFIX='.a'
-    SHARED_LIBRARY='lib[$]1.so'
-    STATIC_LIBRARY='lib[$]1.a'
     OBJ_SUFFIX='.o'
     EXECUTABLE_SUFFIX=''
     if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      # For full static builds, we're overloading the SHARED_LIBRARY
-      # variables in order to limit the amount of changes required.
+      # For full static builds, we're overloading the shared library suffix
+      # in order to limit the amount of changes required.
       # It would be better to remove SHARED and just use LIBRARY and
       # LIBRARY_SUFFIX for libraries that can be built either
       # shared or static and use STATIC_* for libraries that are
       # always built statically.
       if test "x$STATIC_BUILD" = xtrue; then
-        SHARED_LIBRARY='lib[$]1.a'
         SHARED_LIBRARY_SUFFIX='.a'
       else
-        SHARED_LIBRARY='lib[$]1.dylib'
         SHARED_LIBRARY_SUFFIX='.dylib'
       fi
     fi
@@ -206,8 +200,6 @@ AC_DEFUN([TOOLCHAIN_SETUP_FILENAME_PATTERNS],
   AC_SUBST(LIBRARY_PREFIX)
   AC_SUBST(SHARED_LIBRARY_SUFFIX)
   AC_SUBST(STATIC_LIBRARY_SUFFIX)
-  AC_SUBST(SHARED_LIBRARY)
-  AC_SUBST(STATIC_LIBRARY)
   AC_SUBST(OBJ_SUFFIX)
   AC_SUBST(EXECUTABLE_SUFFIX)
 ])
diff --git a/make/hotspot/test/GtestImage.gmk b/make/hotspot/test/GtestImage.gmk
index b6256cd575b..3d6290837ee 100644
--- a/make/hotspot/test/GtestImage.gmk
+++ b/make/hotspot/test/GtestImage.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ $(foreach v, $(JVM_VARIANTS), \
   $(eval $(call SetupCopyFiles, COPY_GTEST_$v, \
       SRC := $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/gtest, \
       DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
-      FILES := $(call SHARED_LIBRARY,jvm) gtestLauncher$(EXECUTABLE_SUFFIX), \
+      FILES := $(LIBRARY_PREFIX)jvm$(SHARED_LIBRARY_SUFFIX) gtestLauncher$(EXECUTABLE_SUFFIX), \
   )) \
   $(eval TARGETS += $$(COPY_GTEST_$v)) \
 )
diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
index 3a24c5e4550..cb7c2ed84ae 100644
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -126,17 +126,18 @@ ifeq ($(call isTargetOsType, unix)+$(STATIC_BUILD), true+false)
   # Create symlinks to libjsig in each JVM variant sub dir
   ifneq ($(STATIC_LIBS), true)
     LIB_OUTPUTDIR := $(call FindLibDirForModule, java.base)
+    LIBJSIG_NAME := $(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
 
     # $1 variant subdir
     define CreateSymlinks
       # Always symlink from libdir/variant/libjsig.so -> ../libjsig.so.
-      $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig): \
-          $(LIB_OUTPUTDIR)/$(call SHARED_LIBRARY,jsig)
+      $(LIB_OUTPUTDIR)/$1/$(LIBJSIG_NAME): \
+          $(LIB_OUTPUTDIR)/$(LIBJSIG_NAME)
 		$$(call MakeDir, $$(@D))
 		$(RM) $$@
 		$(LN) -s ../$$(@F) $$@
 
-      TARGETS += $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig)
+      TARGETS += $(LIB_OUTPUTDIR)/$1/$(LIBJSIG_NAME)
     endef
 
     # The subdir is the same as the variant

From 6e77d918e62a2eb77c3c1cc32b8ddad909036517 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 16 Apr 2024 13:52:16 +0000
Subject: [PATCH 059/486] 8330261: Clean up linking steps

Reviewed-by: erikj
---
 make/autoconf/jdk-options.m4         |  9 ++-
 make/common/NativeCompilation.gmk    |  3 +
 make/common/native/DebugSymbols.gmk  | 56 +++++++------------
 make/common/native/Link.gmk          | 82 ++++++++++++++++++----------
 make/common/native/LinkMicrosoft.gmk |  4 +-
 5 files changed, 82 insertions(+), 72 deletions(-)

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index f56081223a6..1e9a5637ae5 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, 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
@@ -849,7 +849,7 @@ AC_DEFUN([JDKOPT_CHECK_CODESIGN_DEBUG],
 
 AC_DEFUN([JDKOPT_SETUP_MACOSX_SIGNING],
 [
-  ENABLE_CODESIGN=false
+  MACOSX_CODESIGN_MODE=disabled
   if test "x$OPENJDK_TARGET_OS" = "xmacosx" && test "x$CODESIGN" != "x"; then
 
     UTIL_ARG_WITH(NAME: macosx-codesign, TYPE: literal, OPTIONAL: true,
@@ -859,7 +859,6 @@ AC_DEFUN([JDKOPT_SETUP_MACOSX_SIGNING],
         DESC: [set the macosx code signing mode (hardened, debug, auto)]
     )
 
-    MACOSX_CODESIGN_MODE=disabled
     if test "x$MACOSX_CODESIGN_ENABLED" = "xtrue"; then
 
       # Check for user provided code signing identity.
@@ -902,9 +901,9 @@ AC_DEFUN([JDKOPT_SETUP_MACOSX_SIGNING],
         AC_MSG_ERROR([unknown value for --with-macosx-codesign: $MACOSX_CODESIGN])
       fi
     fi
-    AC_SUBST(MACOSX_CODESIGN_IDENTITY)
-    AC_SUBST(MACOSX_CODESIGN_MODE)
   fi
+  AC_SUBST(MACOSX_CODESIGN_IDENTITY)
+  AC_SUBST(MACOSX_CODESIGN_MODE)
 ])
 
 ################################################################################
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 3f31865c247..8db00247f9a 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -229,6 +229,9 @@ endef
 ################################################################################
 # Verify that user passed arguments are valid
 define VerifyArguments
+  ifeq ($$($1_NAME), )
+    $$(error NAME must not be empty in $1)
+  endif
   ifneq ($$($1_NAME), $(basename $$($1_NAME)))
     $$(error NAME must not contain any directory path in $1)
   endif
diff --git a/make/common/native/DebugSymbols.gmk b/make/common/native/DebugSymbols.gmk
index 9f49f5e1d52..7e014f416d6 100644
--- a/make/common/native/DebugSymbols.gmk
+++ b/make/common/native/DebugSymbols.gmk
@@ -36,47 +36,35 @@ define CreateDebugSymbols
     $1_ZIP_EXTERNAL_DEBUG_SYMBOLS := $(ZIP_EXTERNAL_DEBUG_SYMBOLS)
   endif
 
+  $1_CREATE_DEBUGINFO := false
   ifeq ($$($1_COPY_DEBUG_SYMBOLS), true)
     ifneq ($$($1_DEBUG_SYMBOLS), false)
       $$(call SetIfEmpty, $1_SYMBOLS_DIR, $$($1_OUTPUT_DIR))
       # Only copy debug symbols for dynamic libraries and programs.
       ifneq ($$($1_TYPE), STATIC_LIBRARY)
-        # Generate debuginfo files.
+        $1_CREATE_DEBUGINFO := true
+
+        # Setup where the platform specific debuginfo files end up
+        ifeq ($(call isTargetOs, windows), true)
+          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_BASENAME).pdb \
+              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).map
+          $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_BASENAME).diz
+        else ifeq ($(call isTargetOs, macosx), true)
+          $1_DEBUGINFO_FILES := \
+              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \
+              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME)
+          $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).diz
+        else ifeq ($(call isTargetOsType, unix), true)
+          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).debuginfo
+          $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).diz
+        endif
+
         ifeq ($(call isTargetOs, windows), true)
           $1_EXTRA_LDFLAGS += -debug "-pdb:$$($1_SYMBOLS_DIR)/$$($1_BASENAME).pdb" \
               "-map:$$($1_SYMBOLS_DIR)/$$($1_BASENAME).map"
           ifeq ($(SHIP_DEBUG_SYMBOLS), public)
             $1_EXTRA_LDFLAGS += "-pdbstripped:$$($1_SYMBOLS_DIR)/$$($1_BASENAME).stripped.pdb"
           endif
-          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_BASENAME).pdb \
-              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).map
-
-        else ifeq ($(call isTargetOs, linux), true)
-          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).debuginfo
-          # Setup the command line creating debuginfo files, to be run after linking.
-          # It cannot be run separately since it updates the original target file
-          # Creating the debuglink is done in another command rather than all at once
-          # so we can run it after strip is called, since strip can sometimes mangle the
-          # embedded debuglink, which we want to avoid.
-          $1_CREATE_DEBUGINFO_CMDS := \
-              $$($1_OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) && \
-              $$(CHMOD) -x $$($1_DEBUGINFO_FILES)
-          $1_CREATE_DEBUGLINK_CMDS := $(CD) $$($1_SYMBOLS_DIR) && \
-              $$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET)
-
-        else ifeq ($(call isTargetOs, aix), true)
-          # AIX does not provide the equivalent of OBJCOPY to extract debug symbols,
-          # so we copy the compiled object with symbols to the .debuginfo file, which
-          # happens prior to the STRIP_CMD on the original target object file.
-          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).debuginfo
-          $1_CREATE_DEBUGINFO_CMDS := $(CP) $$($1_TARGET) $$($1_DEBUGINFO_FILES)
-
-        else ifeq ($(call isTargetOs, macosx), true)
-          $1_DEBUGINFO_FILES := \
-              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \
-              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME)
-          $1_CREATE_DEBUGINFO_CMDS := \
-              $(DSYMUTIL) --out $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM $$($1_TARGET)
         endif
 
         # Since the link rule creates more than one file that we want to track,
@@ -98,19 +86,13 @@ define CreateDebugSymbols
         $1 += $$($1_DEBUGINFO_FILES)
 
         ifeq ($$($1_ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
-          ifeq ($(call isTargetOs, windows), true)
-            $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_BASENAME).diz
-          else
-            $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).diz
-          endif
-          $1 += $$($1_DEBUGINFO_ZIP)
-
           # The dependency on TARGET is needed for debuginfo files
           # to be rebuilt properly.
           $$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET)
 		$(CD) $$($1_SYMBOLS_DIR) && \
 		    $(ZIPEXE) -q -r $$@ $$(subst $$($1_SYMBOLS_DIR)/,, $$($1_DEBUGINFO_FILES))
 
+          $1 += $$($1_DEBUGINFO_ZIP)
         endif
        endif # !STATIC_LIBRARY
     endif # $1_DEBUG_SYMBOLS != false
diff --git a/make/common/native/Link.gmk b/make/common/native/Link.gmk
index d9c566011a9..1ebc4b14c34 100644
--- a/make/common/native/Link.gmk
+++ b/make/common/native/Link.gmk
@@ -52,12 +52,9 @@ define SetupLinking
   # being copied.
   $$(call SetIfEmpty, $1_STRIP_SYMBOLS, $$($1_COPY_DEBUG_SYMBOLS))
 
-  ifneq ($$($1_STRIP_SYMBOLS), false)
-    # Default to using the global STRIPFLAGS. Allow for overriding with an
-    # empty value
-    $1_STRIPFLAGS ?= $(STRIPFLAGS)
-    $1_STRIP_CMD := $$($1_STRIP) $$($1_STRIPFLAGS) $$($1_TARGET)
-  endif
+  # Default to using the global STRIPFLAGS. Allow for overriding with an
+  # empty value
+  $1_STRIPFLAGS ?= $(STRIPFLAGS)
 endef
 
 ################################################################################
@@ -109,13 +106,12 @@ define CreateStaticLibrary
         # Do partial linking.
         ifeq ($$($1_ENABLE_PARTIAL_LINKING), true)
 	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_partial_link, \
-	    $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
+	      $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
 	      $$($1_LD) $(LDFLAGS_CXX_PARTIAL_LINKING) $$($1_SYSROOT_LDFLAGS) \
-	        -o $$($1_TARGET_RELOCATABLE) \
-	        $$($1_LD_OBJ_ARG))
+	          -o $$($1_TARGET_RELOCATABLE) $$($1_LD_OBJ_ARG))
         endif
-	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
-	  $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
+	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_run_ar, \
+	    $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
 	    $$($1_AR) $$(ARFLAGS) -r -cs $$($1_TARGET) \
 	        $$($1_AR_OBJ_ARG) $$($1_RES))
         ifeq ($(STATIC_BUILD), true)
@@ -135,9 +131,16 @@ define CreateDynamicLibraryOrExecutable
     $1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
   endif
 
+  ifeq ($(MACOSX_CODESIGN_MODE), hardened)
+    $1_CODESIGN_OPTS := "$(MACOSX_CODESIGN_IDENTITY)" --timestamp \
+        --options runtime
+  else ifeq ($(MACOSX_CODESIGN_MODE), debug)
+    $1_CODESIGN_OPTS := -
+  endif
+
   $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) \
       $$($1_EXTRA_LDFLAGS) $$($1_LIBS) $$($1_EXTRA_LIBS) \
-      $$($1_CREATE_DEBUGINFO_CMDS) $$($1_STRIP_CMD) $$($1_CREATE_DEBUGLINK_CMDS)
+      $$($1_DEBUGINFO_FILES) $$($1_STRIPFLAGS)
   $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
       $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
 
@@ -153,25 +156,48 @@ define CreateDynamicLibraryOrExecutable
         endif
 	$$(call LogInfo, Linking $$($1_BASENAME))
 	$$(call MakeDir, $$($1_OUTPUT_DIR) $$($1_SYMBOLS_DIR))
-	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
+	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_run_ld, \
 	    $$(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
 	    $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
 	        $$($1_SYSROOT_LDFLAGS) -o $$($1_TARGET) $$($1_LD_OBJ_ARG) \
 	        $$($1_LIBS) $$($1_EXTRA_LIBS))
-	$$($1_CREATE_DEBUGINFO_CMDS)
-	$$($1_STRIP_CMD)
-	$$($1_CREATE_DEBUGLINK_CMDS)
-        # On macosx, optionally run codesign on every binary.
-        # Remove signature explicitly first to avoid warnings if the linker
-        # added a default adhoc signature.
-        ifeq ($(MACOSX_CODESIGN_MODE), hardened)
-	  $(CODESIGN) --remove-signature $$@
-	  $(CODESIGN) -f -s "$(MACOSX_CODESIGN_IDENTITY)" --timestamp \
-	      --options runtime --entitlements \
-	      $$(call GetEntitlementsFile, $$@) $$@
-        else ifeq ($(MACOSX_CODESIGN_MODE), debug)
-	  $(CODESIGN) --remove-signature $$@
-	  $(CODESIGN) -f -s - --entitlements \
-	      $$(call GetEntitlementsFile, $$@) $$@
+        ifeq ($$($1_CREATE_DEBUGINFO), true)
+          ifeq ($(call isTargetOs, linux), true)
+            # This cannot be run separately since it updates the original target
+            # file.
+	    $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_create_debuginfo, \
+	        $$($1_OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES))
+	    $$(CHMOD) -x $$($1_DEBUGINFO_FILES)
+          else ifeq ($(call isTargetOs, aix), true)
+            # AIX does not provide the equivalent of objcopy to extract debug
+            # symbols, so we copy unstripped library instead.
+	    $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_create_debuginfo, \
+	        $(CP) $$($1_TARGET) $$($1_DEBUGINFO_FILES))
+          else ifeq ($(call isTargetOs, macosx), true)
+	    $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_create_debuginfo, \
+	        $(DSYMUTIL) --out $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM $$($1_TARGET))
+          endif
+        endif
+        ifneq ($$($1_STRIP_SYMBOLS), false)
+	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_strip, \
+	      $$($1_STRIP) $$($1_STRIPFLAGS) $$($1_TARGET))
+        endif
+        ifeq ($$($1_CREATE_DEBUGINFO), true)
+          ifeq ($(call isTargetOs, linux), true)
+            # Run this after strip is called, since strip can sometimes mangle
+            # the embedded debuglink, which we want to avoid.
+	    $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_add_debuginfo_link, \
+	        $(CD) $$($1_SYMBOLS_DIR) && \
+	            $$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET))
+          endif
+        endif
+        ifneq ($(MACOSX_CODESIGN_MODE), disabled)
+          # Remove signature explicitly first to avoid warnings if the linker
+          # added a default adhoc signature.
+	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_codesign_clear, \
+	      $(CODESIGN) --remove-signature $$@)
+	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_codesign_add, \
+	      $(CODESIGN) -f -s $$($1_CODESIGN_OPTS) --entitlements \
+	          $$(call GetEntitlementsFile, $$@) $$@)
         endif
 endef
diff --git a/make/common/native/LinkMicrosoft.gmk b/make/common/native/LinkMicrosoft.gmk
index a85ee1379df..cb457034a7e 100644
--- a/make/common/native/LinkMicrosoft.gmk
+++ b/make/common/native/LinkMicrosoft.gmk
@@ -52,7 +52,7 @@ define CreateStaticLibraryMicrosoft
         endif
 	$$(call LogInfo, Building static library $$($1_BASENAME))
 	$$(call MakeDir, $$($1_OUTPUT_DIR) $$($1_SYMBOLS_DIR))
-	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
+	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_run_lib, \
 	    $$($1_LIB) -nologo $$(LIBFLAGS) -out:$$($1_TARGET) \
 	        $$($1_LD_OBJ_ARG) $$($1_RES))
 endef
@@ -98,7 +98,7 @@ define CreateDynamicLibraryOrExecutableMicrosoft
         endif
 	$$(call LogInfo, Linking $$($1_BASENAME))
 	$$(call MakeDir, $$($1_OUTPUT_DIR) $$($1_SYMBOLS_DIR))
-	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
+	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_run_ld, \
 	    $$($1_LD) -nologo $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
 	        $$($1_SYSROOT_LDFLAGS) -out:$$($1_TARGET) $$($1_LD_OBJ_ARG) \
 	        $$($1_RES) $$($1_LIBS) $$($1_EXTRA_LIBS)) \

From e073d5b37422c2adad18db520c5f4fcf120c147b Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Tue, 16 Apr 2024 14:09:44 +0000
Subject: [PATCH 060/486] 8329665: fatal error: memory leak: allocating without
 ResourceMark

Reviewed-by: dholmes, shade, coleenp
---
 src/hotspot/share/interpreter/oopMapCache.cpp | 12 ------------
 src/hotspot/share/interpreter/oopMapCache.hpp |  1 -
 src/hotspot/share/runtime/frame.cpp           |  1 +
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/hotspot/share/interpreter/oopMapCache.cpp b/src/hotspot/share/interpreter/oopMapCache.cpp
index f376bfc4e58..3c2f1dd3e35 100644
--- a/src/hotspot/share/interpreter/oopMapCache.cpp
+++ b/src/hotspot/share/interpreter/oopMapCache.cpp
@@ -181,18 +181,6 @@ InterpreterOopMap::InterpreterOopMap() {
 #endif
 }
 
-InterpreterOopMap::~InterpreterOopMap() {
-  // The expectation is that the bit mask was allocated
-  // last in this resource area.  That would make the free of the
-  // bit_mask effective (see how FREE_RESOURCE_ARRAY does a free).
-  // If it was not allocated last, there is not a correctness problem
-  // but the space for the bit_mask is not freed.
-  assert(_resource_allocate_bit_mask, "Trying to free C heap space");
-  if (mask_size() > small_mask_limit) {
-    FREE_RESOURCE_ARRAY(uintptr_t, _bit_mask[0], mask_word_size());
-  }
-}
-
 bool InterpreterOopMap::is_empty() const {
   bool result = _method == nullptr;
   assert(_method != nullptr || (_bci == 0 &&
diff --git a/src/hotspot/share/interpreter/oopMapCache.hpp b/src/hotspot/share/interpreter/oopMapCache.hpp
index 0c2e45036eb..7378a987cc6 100644
--- a/src/hotspot/share/interpreter/oopMapCache.hpp
+++ b/src/hotspot/share/interpreter/oopMapCache.hpp
@@ -128,7 +128,6 @@ class InterpreterOopMap: ResourceObj {
 
  public:
   InterpreterOopMap();
-  ~InterpreterOopMap();
 
   // Copy the OopMapCacheEntry in parameter "from" into this
   // InterpreterOopMap.  If the _bit_mask[0] in "from" points to
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index b45c996e1f3..3a8eb2ebaaa 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -947,6 +947,7 @@ void frame::oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool quer
   InterpreterFrameClosure blk(this, max_locals, m->max_stack(), f);
 
   // process locals & expression stack
+  ResourceMark rm(thread);
   InterpreterOopMap mask;
   if (query_oop_map_cache) {
     m->mask_for(bci, &mask);

From bfff02eef68c80f623419a3f6ceb9fe3121b88f4 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Tue, 16 Apr 2024 14:11:05 +0000
Subject: [PATCH 061/486] 8330165: C2: make superword consistently use
 PhaseIdealLoop::register_new_node()

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/loopTransform.cpp |  4 +-
 src/hotspot/share/opto/loopnode.hpp      |  3 ++
 src/hotspot/share/opto/loopopts.cpp      | 10 ++--
 src/hotspot/share/opto/split_if.cpp      |  2 +-
 src/hotspot/share/opto/superword.cpp     | 62 +++++++++---------------
 5 files changed, 34 insertions(+), 47 deletions(-)

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 21e8807d15d..e7b92fbc2ac 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -456,7 +456,7 @@ Node* IdealLoopTree::reassociate(Node* n1, PhaseIdealLoop *phase) {
   }
 
   assert(result != nullptr, "");
-  phase->register_new_node(result, phase->get_ctrl(n1));
+  phase->register_new_node_with_ctrl_of(result, n1);
   phase->_igvn.replace_node(n1, result);
   assert(phase->get_loop(phase->get_ctrl(n1)) == this, "");
   _body.yank(n1);
@@ -2215,7 +2215,7 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
       // Limit is not constant. Int subtraction could lead to underflow.
       // (1) Convert to long.
       Node* limit_l = new ConvI2LNode(limit);
-      register_new_node(limit_l, get_ctrl(limit));
+      register_new_node_with_ctrl_of(limit_l, limit);
       Node* stride_l = _igvn.longcon(stride_con);
       set_ctrl(stride_l, C->root());
 
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 389e381e542..658da04f209 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1673,6 +1673,9 @@ public:
   void set_created_loop_node() { _created_loop_node = true; }
   bool created_loop_node()     { return _created_loop_node; }
   void register_new_node(Node* n, Node* blk);
+  void register_new_node_with_ctrl_of(Node* new_node, Node* ctrl_of) {
+    register_new_node(new_node, get_ctrl(ctrl_of));
+  }
 
   Node* clone_and_register(Node* n, Node* ctrl) {
     n = n->clone();
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 884f3f65cbd..e7cd56d57ea 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -467,7 +467,7 @@ Node* PhaseIdealLoop::remix_address_expressions_add_left_shift(Node* n, IdealLoo
       Node* zero = _igvn.integercon(0, bt);
       set_ctrl(zero, C->root());
       Node* neg = SubNode::make(zero, add->in(2), bt);
-      register_new_node(neg, get_ctrl(add->in(2)));
+      register_new_node_with_ctrl_of(neg, add->in(2));
       add = AddNode::make(add->in(1), neg, bt);
       register_new_node(add, add_ctrl);
     }
@@ -654,13 +654,13 @@ Node *PhaseIdealLoop::convert_add_to_muladd(Node* n) {
             if ((adr1->in(AddPNode::Base) == adr3->in(AddPNode::Base)) &&
                 (adr2->in(AddPNode::Base) == adr4->in(AddPNode::Base))) {
               nn = new MulAddS2INode(mul_in1, mul_in2, mul_in3, mul_in4);
-              register_new_node(nn, get_ctrl(n));
+              register_new_node_with_ctrl_of(nn, n);
               _igvn.replace_node(n, nn);
               return nn;
             } else if ((adr1->in(AddPNode::Base) == adr4->in(AddPNode::Base)) &&
                        (adr2->in(AddPNode::Base) == adr3->in(AddPNode::Base))) {
               nn = new MulAddS2INode(mul_in1, mul_in2, mul_in4, mul_in3);
-              register_new_node(nn, get_ctrl(n));
+              register_new_node_with_ctrl_of(nn, n);
               _igvn.replace_node(n, nn);
               return nn;
             }
@@ -2268,7 +2268,7 @@ void PhaseIdealLoop::clone_loop_handle_data_uses(Node* old, Node_List &old_new,
           // that access. If that condition is replaced by an identical dominating one, then an unpinned load would risk
           // floating above its range check.
           pinned_clone->set_req(0, phi);
-          register_new_node(pinned_clone, get_ctrl(use));
+          register_new_node_with_ctrl_of(pinned_clone, use);
           _igvn.replace_node(use, pinned_clone);
           continue;
         }
@@ -3914,7 +3914,7 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
         // floating above its range check.
         Node* pinned_clone = n_clone->pin_array_access_node();
         if (pinned_clone != nullptr) {
-          register_new_node(pinned_clone, get_ctrl(n_clone));
+          register_new_node_with_ctrl_of(pinned_clone, n_clone);
           old_new.map(n->_idx, pinned_clone);
           _igvn.replace_node(n_clone, pinned_clone);
           n_clone = pinned_clone;
diff --git a/src/hotspot/share/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp
index 7f8b8261584..0b7faffda00 100644
--- a/src/hotspot/share/opto/split_if.cpp
+++ b/src/hotspot/share/opto/split_if.cpp
@@ -756,7 +756,7 @@ void PhaseIdealLoop::pin_array_access_nodes_dependent_on(Node* ctrl) {
     }
     Node* pinned_clone = use->pin_array_access_node();
     if (pinned_clone != nullptr) {
-      register_new_node(pinned_clone, get_ctrl(use));
+      register_new_node_with_ctrl_of(pinned_clone, use);
       _igvn.replace_node(use, pinned_clone);
       --i;
     }
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 4c4cdd074a1..cd9b76eb44d 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -33,6 +33,7 @@
 #include "opto/memnode.hpp"
 #include "opto/opcodes.hpp"
 #include "opto/opaquenode.hpp"
+#include "opto/rootnode.hpp"
 #include "opto/superword.hpp"
 #include "opto/vectornode.hpp"
 #include "opto/movenode.hpp"
@@ -2553,8 +2554,7 @@ bool SuperWord::output() {
         BasicType bt = velt_basic_type(cmp);
         const TypeVect* vt = TypeVect::make(bt, vlen);
         VectorNode* mask = new VectorMaskCmpNode(bol_test, cmp_in1, cmp_in2, bol_test_node, vt);
-        igvn().register_new_node_with_optimizer(mask);
-        phase()->set_ctrl(mask, phase()->get_ctrl(p->at(0)));
+        phase()->register_new_node_with_ctrl_of(mask, p->at(0));
         igvn()._worklist.push(mask);
 
         // VectorBlend
@@ -2628,8 +2628,7 @@ bool SuperWord::output() {
         assert(n->req() == 2, "only one input expected");
         Node* in = vector_opd(p, 1);
         Node* longval = VectorNode::make(opc, in, nullptr, vlen, T_LONG);
-        igvn().register_new_node_with_optimizer(longval);
-        phase()->set_ctrl(longval, phase()->get_ctrl(first));
+        phase()->register_new_node_with_ctrl_of(longval, first);
         vn = VectorCastNode::make(Op_VectorCastL2X, longval, T_INT, vlen);
         vlen_in_bytes = vn->as_Vector()->length_in_bytes();
       } else if (VectorNode::is_convert_opcode(opc)) {
@@ -2669,8 +2668,7 @@ bool SuperWord::output() {
       }
 #endif
 
-      igvn().register_new_node_with_optimizer(vn);
-      phase()->set_ctrl(vn, phase()->get_ctrl(first));
+      phase()->register_new_node_with_ctrl_of(vn, first);
       for (uint j = 0; j < p->size(); j++) {
         Node* pm = p->at(j);
         igvn().replace_node(pm, vn);
@@ -2739,8 +2737,7 @@ Node* SuperWord::vector_opd(Node_List* p, int opd_idx) {
     const TypeVect* vt = TypeVect::make(iv_bt, vlen);
     Node* vn = new PopulateIndexNode(iv(), igvn().intcon(1), vt);
     VectorNode::trace_new_vector(vn, "SuperWord");
-    igvn().register_new_node_with_optimizer(vn);
-    phase()->set_ctrl(vn, phase()->get_ctrl(opd));
+    phase()->register_new_node_with_ctrl_of(vn, opd);
     return vn;
   }
 
@@ -2760,16 +2757,14 @@ Node* SuperWord::vector_opd(Node_List* p, int opd_idx) {
       if (t != nullptr && t->is_con()) {
         juint shift = t->get_con();
         if (shift > mask) { // Unsigned cmp
-          cnt = ConNode::make(TypeInt::make(shift & mask));
-          igvn().register_new_node_with_optimizer(cnt);
+          cnt = igvn().intcon(shift & mask);
+          phase()->set_ctrl(cnt, phase()->C->root());
         }
       } else {
         if (t == nullptr || t->_lo < 0 || t->_hi > (int)mask) {
-          cnt = ConNode::make(TypeInt::make(mask));
-          igvn().register_new_node_with_optimizer(cnt);
+          cnt = igvn().intcon(mask);
           cnt = new AndINode(opd, cnt);
-          igvn().register_new_node_with_optimizer(cnt);
-          phase()->set_ctrl(cnt, phase()->get_ctrl(opd));
+          phase()->register_new_node_with_ctrl_of(cnt, opd);
         }
         if (!opd->bottom_type()->isa_int()) {
           assert(false, "int type only");
@@ -2778,8 +2773,7 @@ Node* SuperWord::vector_opd(Node_List* p, int opd_idx) {
       }
       // Move shift count into vector register.
       cnt = VectorNode::shift_count(p0->Opcode(), cnt, vlen, velt_basic_type(p0));
-      igvn().register_new_node_with_optimizer(cnt);
-      phase()->set_ctrl(cnt, phase()->get_ctrl(opd));
+      phase()->register_new_node_with_ctrl_of(cnt, opd);
       return cnt;
     }
     if (opd->is_StoreVector()) {
@@ -2797,8 +2791,7 @@ Node* SuperWord::vector_opd(Node_List* p, int opd_idx) {
        if (p0->bottom_type()->isa_long()) {
          p0_t = TypeLong::LONG;
          conv = new ConvI2LNode(opd);
-         igvn().register_new_node_with_optimizer(conv);
-         phase()->set_ctrl(conv, phase()->get_ctrl(opd));
+         phase()->register_new_node_with_ctrl_of(conv, opd);
        }
        vn = VectorNode::scalar2vector(conv, vlen, p0_t);
     } else {
@@ -2806,8 +2799,7 @@ Node* SuperWord::vector_opd(Node_List* p, int opd_idx) {
        vn = VectorNode::scalar2vector(opd, vlen, p0_t);
     }
 
-    igvn().register_new_node_with_optimizer(vn);
-    phase()->set_ctrl(vn, phase()->get_ctrl(opd));
+    phase()->register_new_node_with_ctrl_of(vn, opd);
     VectorNode::trace_new_vector(vn, "SuperWord");
     return vn;
   }
@@ -2836,8 +2828,7 @@ Node* SuperWord::vector_opd(Node_List* p, int opd_idx) {
       pk->add_opd(in2);
     }
   }
-  igvn().register_new_node_with_optimizer(pk);
-  phase()->set_ctrl(pk, phase()->get_ctrl(opd));
+  phase()->register_new_node_with_ctrl_of(pk, opd);
   VectorNode::trace_new_vector(pk, "SuperWord");
   return pk;
 }
@@ -3640,7 +3631,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
       // safe to simply convert invar to an int and loose the upper 32
       // bit half.
       invar = new ConvL2INode(invar);
-      igvn().register_new_node_with_optimizer(invar);
+      phase()->register_new_node(invar, pre_ctrl);
       TRACE_ALIGN_VECTOR_NODE(invar);
    }
     if (is_sub) {
@@ -3648,8 +3639,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
     } else {
       xboi = new AddINode(xboi, invar);
     }
-    igvn().register_new_node_with_optimizer(xboi);
-    phase()->set_ctrl(xboi, pre_ctrl);
+    phase()->register_new_node(xboi, pre_ctrl);
     TRACE_ALIGN_VECTOR_NODE(xboi);
   }
 
@@ -3659,11 +3649,11 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
     // When the base() is top, we have no alignment guarantee at all.
     // Hence, we must now take the base into account for the calculation.
     Node* xbase = new CastP2XNode(nullptr, base);
-    igvn().register_new_node_with_optimizer(xbase);
+    phase()->register_new_node(xbase, pre_ctrl);
     TRACE_ALIGN_VECTOR_NODE(xbase);
 #ifdef _LP64
     xbase  = new ConvL2INode(xbase);
-    igvn().register_new_node_with_optimizer(xbase);
+    phase()->register_new_node(xbase, pre_ctrl);
     TRACE_ALIGN_VECTOR_NODE(xbase);
 #endif
     if (is_sub) {
@@ -3671,8 +3661,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
     } else {
       xboi = new AddINode(xboi, xbase);
     }
-    igvn().register_new_node_with_optimizer(xboi);
-    phase()->set_ctrl(xboi, pre_ctrl);
+    phase()->register_new_node(xboi, pre_ctrl);
     TRACE_ALIGN_VECTOR_NODE(xboi);
   }
 
@@ -3681,8 +3670,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   //    The division is executed as shift
   Node* log2_abs_scale = igvn().intcon(exact_log2(abs(scale)));
   Node* XBOI = new URShiftINode(xboi, log2_abs_scale);
-  igvn().register_new_node_with_optimizer(XBOI);
-  phase()->set_ctrl(XBOI, pre_ctrl);
+  phase()->register_new_node(XBOI, pre_ctrl);
   TRACE_ALIGN_VECTOR_NODE(log2_abs_scale);
   TRACE_ALIGN_VECTOR_NODE(XBOI);
 
@@ -3696,8 +3684,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   } else {
     XBOI_OP_old_limit = new AddINode(XBOI, old_limit);
   }
-  igvn().register_new_node_with_optimizer(XBOI_OP_old_limit);
-  phase()->set_ctrl(XBOI_OP_old_limit, pre_ctrl);
+  phase()->register_new_node(XBOI_OP_old_limit, pre_ctrl);
   TRACE_ALIGN_VECTOR_NODE(XBOI_OP_old_limit);
 
   // 3.2: Compute:
@@ -3708,8 +3695,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   //    a bitmask operation.
   Node* mask_AW = igvn().intcon(AW-1);
   Node* adjust_pre_iter = new AndINode(XBOI_OP_old_limit, mask_AW);
-  igvn().register_new_node_with_optimizer(adjust_pre_iter);
-  phase()->set_ctrl(adjust_pre_iter, pre_ctrl);
+  phase()->register_new_node(adjust_pre_iter, pre_ctrl);
   TRACE_ALIGN_VECTOR_NODE(mask_AW);
   TRACE_ALIGN_VECTOR_NODE(adjust_pre_iter);
 
@@ -3722,8 +3708,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   } else {
     new_limit = new AddINode(old_limit, adjust_pre_iter);
   }
-  igvn().register_new_node_with_optimizer(new_limit);
-  phase()->set_ctrl(new_limit, pre_ctrl);
+  phase()->register_new_node(new_limit, pre_ctrl);
   TRACE_ALIGN_VECTOR_NODE(new_limit);
 
   // 5: Compute (15a, b):
@@ -3731,8 +3716,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   Node* constrained_limit =
     (stride > 0) ? (Node*) new MinINode(new_limit, orig_limit)
                  : (Node*) new MaxINode(new_limit, orig_limit);
-  igvn().register_new_node_with_optimizer(constrained_limit);
-  phase()->set_ctrl(constrained_limit, pre_ctrl);
+  phase()->register_new_node(constrained_limit, pre_ctrl);
   TRACE_ALIGN_VECTOR_NODE(constrained_limit);
 
   // 6: Hack the pre-loop limit

From f11a496de61d800a680517457eb43b078a633953 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@openjdk.org>
Date: Tue, 16 Apr 2024 14:21:48 +0000
Subject: [PATCH 062/486] 8180450: secondary_super_cache does not scale well

Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org>
Reviewed-by: kvn, vlivanov, dlong
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  35 +-
 src/hotspot/cpu/aarch64/assembler_aarch64.hpp |   3 +-
 .../cpu/aarch64/macroAssembler_aarch64.cpp    | 240 +++++++++++-
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |  28 +-
 .../cpu/aarch64/stubGenerator_aarch64.cpp     |  58 ++-
 .../cpu/aarch64/vm_version_aarch64.hpp        |   2 +
 src/hotspot/cpu/x86/assembler_x86.cpp         |   9 +
 src/hotspot/cpu/x86/assembler_x86.hpp         |   1 +
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    | 334 ++++++++++++++++
 src/hotspot/cpu/x86/macroAssembler_x86.hpp    |  42 +-
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |  57 +++
 src/hotspot/cpu/x86/stubGenerator_x86_64.hpp  |   6 +
 src/hotspot/cpu/x86/vm_version_x86.hpp        |   5 +
 src/hotspot/cpu/x86/x86_64.ad                 |  38 ++
 src/hotspot/share/cds/filemap.cpp             |   7 +
 src/hotspot/share/cds/filemap.hpp             |   1 +
 src/hotspot/share/classfile/classLoader.cpp   |   2 +
 src/hotspot/share/classfile/classLoader.hpp   |   6 +
 src/hotspot/share/memory/universe.cpp         |   8 +
 src/hotspot/share/memory/universe.hpp         |   8 +-
 src/hotspot/share/oops/arrayKlass.cpp         |   3 +-
 src/hotspot/share/oops/instanceKlass.cpp      |  60 ++-
 src/hotspot/share/oops/klass.cpp              | 360 ++++++++++++++++--
 src/hotspot/share/oops/klass.hpp              |  35 +-
 src/hotspot/share/oops/objArrayKlass.cpp      |   3 +-
 src/hotspot/share/opto/c2_globals.hpp         |   3 +
 src/hotspot/share/opto/matcher.cpp            |   8 +
 src/hotspot/share/opto/memnode.cpp            |   6 +
 .../share/runtime/abstract_vm_version.hpp     |   3 +
 src/hotspot/share/runtime/arguments.cpp       |  11 +
 src/hotspot/share/runtime/globals.hpp         |  12 +
 src/hotspot/share/runtime/stubRoutines.cpp    |   7 +-
 src/hotspot/share/runtime/stubRoutines.hpp    |  14 +
 .../share/utilities/globalDefinitions.hpp     |   5 +
 src/hotspot/share/utilities/rotate_bits.hpp   |  57 +++
 .../vm/compiler/SecondarySuperCacheHits.java  | 108 ++++++
 .../SecondarySuperCacheInterContention.java   |  81 ++++
 .../SecondarySuperCacheIntraContention.java   |  72 ++++
 .../bench/vm/lang/SecondarySupersLookup.java  | 310 +++++++++++++++
 .../openjdk/bench/vm/lang/TypePollution.java  | 209 ++++++++++
 40 files changed, 2209 insertions(+), 48 deletions(-)
 create mode 100644 src/hotspot/share/utilities/rotate_bits.hpp
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheHits.java
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheInterContention.java
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheIntraContention.java
 create mode 100644 test/micro/org/openjdk/bench/vm/lang/SecondarySupersLookup.java
 create mode 100644 test/micro/org/openjdk/bench/vm/lang/TypePollution.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 2d134475739..a310eae5eb9 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2014, 2021, Red Hat, Inc. All rights reserved.
+// Copyright (c) 2014, 2024, 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
@@ -16201,6 +16201,39 @@ instruct partialSubtypeCheck(iRegP_R4 sub, iRegP_R0 super, iRegP_R2 temp, iRegP_
   ins_pipe(pipe_class_memory);
 %}
 
+instruct partialSubtypeCheckConstSuper(iRegP_R4 sub, iRegP_R0 super_reg, immP super_con, vRegD_V0 vtemp, iRegP_R5 result,
+                                       iRegP_R1 tempR1, iRegP_R2 tempR2, iRegP_R3 tempR3,
+                                       rFlagsReg cr)
+%{
+  match(Set result (PartialSubtypeCheck sub (Binary super_reg super_con)));
+  predicate(UseSecondarySupersTable);
+  effect(KILL cr, TEMP tempR1, TEMP tempR2, TEMP tempR3, TEMP vtemp);
+
+  ins_cost(700);  // smaller than the next version
+  format %{ "partialSubtypeCheck $result, $sub, super" %}
+
+  ins_encode %{
+    bool success = false;
+    u1 super_klass_slot = ((Klass*)$super_con$$constant)->hash_slot();
+    if (InlineSecondarySupersTest) {
+      success = __ lookup_secondary_supers_table($sub$$Register, $super_reg$$Register,
+                                                 $tempR1$$Register, $tempR2$$Register, $tempR3$$Register,
+                                                 $vtemp$$FloatRegister,
+                                                 $result$$Register,
+                                                 super_klass_slot);
+    } else {
+      address call = __ trampoline_call(RuntimeAddress(StubRoutines::lookup_secondary_supers_table_stub(super_klass_slot)));
+      success = (call != nullptr);
+    }
+    if (!success) {
+      ciEnv::current()->record_failure("CodeCache is full");
+      return;
+    }
+  %}
+
+  ins_pipe(pipe_class_memory);
+%}
+
 instruct partialSubtypeCheckVsZero(iRegP_R4 sub, iRegP_R0 super, iRegP_R2 temp, iRegP_R5 result, immP0 zero, rFlagsReg cr)
 %{
   match(Set cr (CmpP (PartialSubtypeCheck sub super) zero));
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index 9c05c36706d..28a0cc2c7d9 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -2595,6 +2595,7 @@ template<typename R, typename... Rx>
 
 #undef INSN
 
+  // Advanced SIMD across lanes
 #define INSN(NAME, opc, opc2, accepted) \
   void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {                   \
     guarantee(T != T1Q && T != T1D, "incorrect arrangement");                           \
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 0e807e8d83a..fd6db98c7b7 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -1514,6 +1514,9 @@ void MacroAssembler::check_klass_subtype_slow_path(Register sub_klass,
                                                    Label* L_success,
                                                    Label* L_failure,
                                                    bool set_cond_codes) {
+  // NB! Callers may assume that, when temp2_reg is a valid register,
+  // this code sets it to a nonzero value.
+
   assert_different_registers(sub_klass, super_klass, temp_reg);
   if (temp2_reg != noreg)
     assert_different_registers(sub_klass, super_klass, temp_reg, temp2_reg, rscratch1);
@@ -1593,6 +1596,241 @@ void MacroAssembler::check_klass_subtype_slow_path(Register sub_klass,
   bind(L_fallthrough);
 }
 
+// Ensure that the inline code and the stub are using the same registers.
+#define LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS                    \
+do {                                                               \
+  assert(r_super_klass  == r0                                   && \
+         r_array_base   == r1                                   && \
+         r_array_length == r2                                   && \
+         (r_array_index == r3        || r_array_index == noreg) && \
+         (r_sub_klass   == r4        || r_sub_klass   == noreg) && \
+         (r_bitmap      == rscratch2 || r_bitmap      == noreg) && \
+         (result        == r5        || result        == noreg), "registers must match aarch64.ad"); \
+} while(0)
+
+// Return true: we succeeded in generating this code
+bool MacroAssembler::lookup_secondary_supers_table(Register r_sub_klass,
+                                                   Register r_super_klass,
+                                                   Register temp1,
+                                                   Register temp2,
+                                                   Register temp3,
+                                                   FloatRegister vtemp,
+                                                   Register result,
+                                                   u1 super_klass_slot,
+                                                   bool stub_is_near) {
+  assert_different_registers(r_sub_klass, temp1, temp2, temp3, result, rscratch1, rscratch2);
+
+  Label L_fallthrough;
+
+  BLOCK_COMMENT("lookup_secondary_supers_table {");
+
+  const Register
+    r_array_base   = temp1, // r1
+    r_array_length = temp2, // r2
+    r_array_index  = temp3, // r3
+    r_bitmap       = rscratch2;
+
+  LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS;
+
+  u1 bit = super_klass_slot;
+
+  // Make sure that result is nonzero if the TBZ below misses.
+  mov(result, 1);
+
+  // We're going to need the bitmap in a vector reg and in a core reg,
+  // so load both now.
+  ldr(r_bitmap, Address(r_sub_klass, Klass::bitmap_offset()));
+  if (bit != 0) {
+    ldrd(vtemp, Address(r_sub_klass, Klass::bitmap_offset()));
+  }
+  // First check the bitmap to see if super_klass might be present. If
+  // the bit is zero, we are certain that super_klass is not one of
+  // the secondary supers.
+  tbz(r_bitmap, bit, L_fallthrough);
+
+  // Get the first array index that can contain super_klass into r_array_index.
+  if (bit != 0) {
+    shld(vtemp, vtemp, Klass::SECONDARY_SUPERS_TABLE_MASK - bit);
+    cnt(vtemp, T8B, vtemp);
+    addv(vtemp, T8B, vtemp);
+    fmovd(r_array_index, vtemp);
+  } else {
+    mov(r_array_index, (u1)1);
+  }
+  // NB! r_array_index is off by 1. It is compensated by keeping r_array_base off by 1 word.
+
+  // We will consult the secondary-super array.
+  ldr(r_array_base, Address(r_sub_klass, in_bytes(Klass::secondary_supers_offset())));
+
+  // The value i in r_array_index is >= 1, so even though r_array_base
+  // points to the length, we don't need to adjust it to point to the
+  // data.
+  assert(Array<Klass*>::base_offset_in_bytes() == wordSize, "Adjust this code");
+  assert(Array<Klass*>::length_offset_in_bytes() == 0, "Adjust this code");
+
+  ldr(result, Address(r_array_base, r_array_index, Address::lsl(LogBytesPerWord)));
+  eor(result, result, r_super_klass);
+  cbz(result, L_fallthrough); // Found a match
+
+  // Is there another entry to check? Consult the bitmap.
+  tbz(r_bitmap, (bit + 1) & Klass::SECONDARY_SUPERS_TABLE_MASK, L_fallthrough);
+
+  // Linear probe.
+  if (bit != 0) {
+    ror(r_bitmap, r_bitmap, bit);
+  }
+
+  // The slot we just inspected is at secondary_supers[r_array_index - 1].
+  // The next slot to be inspected, by the stub we're about to call,
+  // is secondary_supers[r_array_index]. Bits 0 and 1 in the bitmap
+  // have been checked.
+  Address stub = RuntimeAddress(StubRoutines::lookup_secondary_supers_table_slow_path_stub());
+  if (stub_is_near) {
+    bl(stub);
+  } else {
+    address call = trampoline_call(stub);
+    if (call == nullptr) {
+      return false; // trampoline allocation failed
+    }
+  }
+
+  BLOCK_COMMENT("} lookup_secondary_supers_table");
+
+  bind(L_fallthrough);
+
+  if (VerifySecondarySupers) {
+    verify_secondary_supers_table(r_sub_klass, r_super_klass, // r4, r0
+                                  temp1, temp2, result);      // r1, r2, r5
+  }
+  return true;
+}
+
+// Called by code generated by check_klass_subtype_slow_path
+// above. This is called when there is a collision in the hashed
+// lookup in the secondary supers array.
+void MacroAssembler::lookup_secondary_supers_table_slow_path(Register r_super_klass,
+                                                             Register r_array_base,
+                                                             Register r_array_index,
+                                                             Register r_bitmap,
+                                                             Register temp1,
+                                                             Register result) {
+  assert_different_registers(r_super_klass, r_array_base, r_array_index, r_bitmap, temp1, result, rscratch1);
+
+  const Register
+    r_array_length = temp1,
+    r_sub_klass    = noreg; // unused
+
+  LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS;
+
+  Label L_fallthrough, L_huge;
+
+  // Load the array length.
+  ldrw(r_array_length, Address(r_array_base, Array<Klass*>::length_offset_in_bytes()));
+  // And adjust the array base to point to the data.
+  // NB! Effectively increments current slot index by 1.
+  assert(Array<Klass*>::base_offset_in_bytes() == wordSize, "");
+  add(r_array_base, r_array_base, Array<Klass*>::base_offset_in_bytes());
+
+  // The bitmap is full to bursting.
+  // Implicit invariant: BITMAP_FULL implies (length > 0)
+  assert(Klass::SECONDARY_SUPERS_BITMAP_FULL == ~uintx(0), "");
+  cmn(r_bitmap, (u1)1);
+  br(EQ, L_huge);
+
+  // NB! Our caller has checked bits 0 and 1 in the bitmap. The
+  // current slot (at secondary_supers[r_array_index]) has not yet
+  // been inspected, and r_array_index may be out of bounds if we
+  // wrapped around the end of the array.
+
+  { // This is conventional linear probing, but instead of terminating
+    // when a null entry is found in the table, we maintain a bitmap
+    // in which a 0 indicates missing entries.
+    // The check above guarantees there are 0s in the bitmap, so the loop
+    // eventually terminates.
+    Label L_loop;
+    bind(L_loop);
+
+    // Check for wraparound.
+    cmp(r_array_index, r_array_length);
+    csel(r_array_index, zr, r_array_index, GE);
+
+    ldr(rscratch1, Address(r_array_base, r_array_index, Address::lsl(LogBytesPerWord)));
+    eor(result, rscratch1, r_super_klass);
+    cbz(result, L_fallthrough);
+
+    tbz(r_bitmap, 2, L_fallthrough); // look-ahead check (Bit 2); result is non-zero
+
+    ror(r_bitmap, r_bitmap, 1);
+    add(r_array_index, r_array_index, 1);
+    b(L_loop);
+  }
+
+  { // Degenerate case: more than 64 secondary supers.
+    // FIXME: We could do something smarter here, maybe a vectorized
+    // comparison or a binary search, but is that worth any added
+    // complexity?
+    bind(L_huge);
+    cmp(sp, zr); // Clear Z flag; SP is never zero
+    repne_scan(r_array_base, r_super_klass, r_array_length, rscratch1);
+    cset(result, NE); // result == 0 iff we got a match.
+  }
+
+  bind(L_fallthrough);
+}
+
+// Make sure that the hashed lookup and a linear scan agree.
+void MacroAssembler::verify_secondary_supers_table(Register r_sub_klass,
+                                                   Register r_super_klass,
+                                                   Register temp1,
+                                                   Register temp2,
+                                                   Register result) {
+  assert_different_registers(r_sub_klass, r_super_klass, temp1, temp2, result, rscratch1);
+
+  const Register
+    r_array_base   = temp1,
+    r_array_length = temp2,
+    r_array_index  = noreg, // unused
+    r_bitmap       = noreg; // unused
+
+  LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS;
+
+  BLOCK_COMMENT("verify_secondary_supers_table {");
+
+  // We will consult the secondary-super array.
+  ldr(r_array_base, Address(r_sub_klass, in_bytes(Klass::secondary_supers_offset())));
+
+  // Load the array length.
+  ldrw(r_array_length, Address(r_array_base, Array<Klass*>::length_offset_in_bytes()));
+  // And adjust the array base to point to the data.
+  add(r_array_base, r_array_base, Array<Klass*>::base_offset_in_bytes());
+
+  cmp(sp, zr); // Clear Z flag; SP is never zero
+  // Scan R2 words at [R5] for an occurrence of R0.
+  // Set NZ/Z based on last compare.
+  repne_scan(/*addr*/r_array_base, /*value*/r_super_klass, /*count*/r_array_length, rscratch2);
+  // rscratch1 == 0 iff we got a match.
+  cset(rscratch1, NE);
+
+  Label passed;
+  cmp(result, zr);
+  cset(result, NE); // normalize result to 0/1 for comparison
+
+  cmp(rscratch1, result);
+  br(EQ, passed);
+  {
+    mov(r0, r_super_klass);         // r0 <- r0
+    mov(r1, r_sub_klass);           // r1 <- r4
+    mov(r2, /*expected*/rscratch1); // r2 <- r8
+    mov(r3, result);                // r3 <- r5
+    mov(r4, (address)("mismatch")); // r4 <- const
+    rt_call(CAST_FROM_FN_PTR(address, Klass::on_secondary_supers_verification_failure), rscratch2);
+    should_not_reach_here();
+  }
+  bind(passed);
+
+  BLOCK_COMMENT("} verify_secondary_supers_table");
+}
+
 void MacroAssembler::clinit_barrier(Register klass, Register scratch, Label* L_fast_path, Label* L_slow_path) {
   assert(L_fast_path != nullptr || L_slow_path != nullptr, "at least one is required");
   assert_different_registers(klass, rthread, scratch);
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index dad7ec4d497..c8f1ff81af0 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -999,6 +999,31 @@ public:
                                      Label* L_failure,
                                      bool set_cond_codes = false);
 
+  // As above, but with a constant super_klass.
+  // The result is in Register result, not the condition codes.
+  bool lookup_secondary_supers_table(Register r_sub_klass,
+                                     Register r_super_klass,
+                                     Register temp1,
+                                     Register temp2,
+                                     Register temp3,
+                                     FloatRegister vtemp,
+                                     Register result,
+                                     u1 super_klass_slot,
+                                     bool stub_is_near = false);
+
+  void verify_secondary_supers_table(Register r_sub_klass,
+                                     Register r_super_klass,
+                                     Register temp1,
+                                     Register temp2,
+                                     Register result);
+
+  void lookup_secondary_supers_table_slow_path(Register r_super_klass,
+                                               Register r_array_base,
+                                               Register r_array_index,
+                                               Register r_bitmap,
+                                               Register temp1,
+                                               Register result);
+
   // Simplified, combined version, good for typical uses.
   // Falls through on failure.
   void check_klass_subtype(Register sub_klass,
@@ -1213,6 +1238,7 @@ public:
   // - relocInfo::virtual_call_type
   //
   // Return: the call PC or null if CodeCache is full.
+  // Clobbers: rscratch1
   address trampoline_call(Address entry);
 
   static bool far_branches() {
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 46a7d796267..ece7f8a347a 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2022, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -6772,6 +6772,52 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  address generate_lookup_secondary_supers_table_stub(u1 super_klass_index) {
+    StubCodeMark mark(this, "StubRoutines", "lookup_secondary_supers_table");
+
+    address start = __ pc();
+    const Register
+      r_super_klass  = r0,
+      r_array_base   = r1,
+      r_array_length = r2,
+      r_array_index  = r3,
+      r_sub_klass    = r4,
+      r_bitmap       = rscratch2,
+      result         = r5;
+    const FloatRegister
+      vtemp          = v0;
+
+    Label L_success;
+    __ enter();
+    __ lookup_secondary_supers_table(r_sub_klass, r_super_klass,
+                                     r_array_base, r_array_length, r_array_index,
+                                     vtemp, result, super_klass_index,
+                                     /*stub_is_near*/true);
+    __ leave();
+    __ ret(lr);
+
+    return start;
+  }
+
+  // Slow path implementation for UseSecondarySupersTable.
+  address generate_lookup_secondary_supers_table_slow_path_stub() {
+    StubCodeMark mark(this, "StubRoutines", "lookup_secondary_supers_table_slow_path");
+
+    address start = __ pc();
+    const Register
+      r_super_klass  = r0,        // argument
+      r_array_base   = r1,        // argument
+      temp1          = r2,        // temp
+      r_array_index  = r3,        // argument
+      r_bitmap       = rscratch2, // argument
+      result         = r5;        // argument
+
+    __ lookup_secondary_supers_table_slow_path(r_super_klass, r_array_base, r_array_index, r_bitmap, temp1, result);
+    __ ret(lr);
+
+    return start;
+  }
+
 #if defined (LINUX) && !defined (__ARM_FEATURE_ATOMICS)
 
   // ARMv8.1 LSE versions of the atomic stubs used by Atomic::PlatformXX.
@@ -8422,6 +8468,16 @@ class StubGenerator: public StubCodeGenerator {
 
 #endif // LINUX
 
+    if (UseSecondarySupersTable) {
+      StubRoutines::_lookup_secondary_supers_table_slow_path_stub = generate_lookup_secondary_supers_table_slow_path_stub();
+      if (! InlineSecondarySupersTest) {
+        for (int slot = 0; slot < Klass::SECONDARY_SUPERS_TABLE_SIZE; slot++) {
+          StubRoutines::_lookup_secondary_supers_table_stubs[slot]
+            = generate_lookup_secondary_supers_table_stub(slot);
+        }
+      }
+    }
+
     StubRoutines::_upcall_stub_exception_handler = generate_upcall_stub_exception_handler();
 
     StubRoutines::aarch64::set_completed(); // Inidicate that arraycopy and zero_blocks stubs are generated
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
index 6883dc0d93e..f6cac72804f 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
@@ -171,6 +171,8 @@ enum Ampere_CPU_Model {
   constexpr static bool supports_stack_watermark_barrier() { return true; }
   constexpr static bool supports_recursive_lightweight_locking() { return true; }
 
+  constexpr static bool supports_secondary_supers_table() { return true; }
+
   static void get_compatible_board(char *buf, int buflen);
 
   static const SpinWait& spin_wait_desc() { return _spin_wait; }
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 0896fbd8bf5..dd3f9c64e20 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -13652,6 +13652,15 @@ void Assembler::notq(Register dst) {
   emit_int16((unsigned char)0xF7, (0xD0 | encode));
 }
 
+void Assembler::btq(Register src, int imm8) {
+  assert(isByte(imm8), "not a byte");
+  InstructionMark im(this);
+  int encode = prefixq_and_encode(src->encoding());
+  emit_int16(0x0f, 0xba);
+  emit_int8(0xe0|encode);
+  emit_int8(imm8);
+}
+
 void Assembler::btsq(Address dst, int imm8) {
   assert(isByte(imm8), "not a byte");
   InstructionMark im(this);
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 7c565b4f8e0..656b2a97c70 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1734,6 +1734,7 @@ private:
 
   void btsq(Address dst, int imm8);
   void btrq(Address dst, int imm8);
+  void btq(Register src, int imm8);
 #endif
 
   void orw(Register dst, Register src);
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index eb70c807e52..3d427fd0cde 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -4726,6 +4726,340 @@ void MacroAssembler::check_klass_subtype_slow_path(Register sub_klass,
   bind(L_fallthrough);
 }
 
+#ifdef _LP64
+
+// population_count variant for running without the POPCNT
+// instruction, which was introduced with SSE4.2 in 2008.
+void MacroAssembler::population_count(Register dst, Register src,
+                                      Register scratch1, Register scratch2) {
+  assert_different_registers(src, scratch1, scratch2);
+  if (UsePopCountInstruction) {
+    Assembler::popcntq(dst, src);
+  } else {
+    assert_different_registers(src, scratch1, scratch2);
+    assert_different_registers(dst, scratch1, scratch2);
+    Label loop, done;
+
+    mov(scratch1, src);
+    // dst = 0;
+    // while(scratch1 != 0) {
+    //   dst++;
+    //   scratch1 &= (scratch1 - 1);
+    // }
+    xorl(dst, dst);
+    testq(scratch1, scratch1);
+    jccb(Assembler::equal, done);
+    {
+      bind(loop);
+      incq(dst);
+      movq(scratch2, scratch1);
+      decq(scratch2);
+      andq(scratch1, scratch2);
+      jccb(Assembler::notEqual, loop);
+    }
+    bind(done);
+  }
+}
+
+// Ensure that the inline code and the stub are using the same registers.
+#define LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS                      \
+do {                                                                 \
+  assert(r_super_klass  == rax, "mismatch");                         \
+  assert(r_array_base   == rbx, "mismatch");                         \
+  assert(r_array_length == rcx, "mismatch");                         \
+  assert(r_array_index  == rdx, "mismatch");                         \
+  assert(r_sub_klass    == rsi || r_sub_klass == noreg, "mismatch"); \
+  assert(r_bitmap       == r11 || r_bitmap    == noreg, "mismatch"); \
+  assert(result         == rdi || result      == noreg, "mismatch"); \
+} while(0)
+
+void MacroAssembler::lookup_secondary_supers_table(Register r_sub_klass,
+                                                   Register r_super_klass,
+                                                   Register temp1,
+                                                   Register temp2,
+                                                   Register temp3,
+                                                   Register temp4,
+                                                   Register result,
+                                                   u1 super_klass_slot) {
+  assert_different_registers(r_sub_klass, r_super_klass, temp1, temp2, temp3, temp4, result);
+
+  Label L_fallthrough, L_success, L_failure;
+
+  BLOCK_COMMENT("lookup_secondary_supers_table {");
+
+  const Register
+    r_array_index  = temp1,
+    r_array_length = temp2,
+    r_array_base   = temp3,
+    r_bitmap       = temp4;
+
+  LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS;
+
+  xorq(result, result); // = 0
+
+  movq(r_bitmap, Address(r_sub_klass, Klass::bitmap_offset()));
+  movq(r_array_index, r_bitmap);
+
+  // First check the bitmap to see if super_klass might be present. If
+  // the bit is zero, we are certain that super_klass is not one of
+  // the secondary supers.
+  u1 bit = super_klass_slot;
+  {
+    // NB: If the count in a x86 shift instruction is 0, the flags are
+    // not affected, so we do a testq instead.
+    int shift_count = Klass::SECONDARY_SUPERS_TABLE_MASK - bit;
+    if (shift_count != 0) {
+      salq(r_array_index, shift_count);
+    } else {
+      testq(r_array_index, r_array_index);
+    }
+  }
+  // We test the MSB of r_array_index, i.e. its sign bit
+  jcc(Assembler::positive, L_failure);
+
+  // Get the first array index that can contain super_klass into r_array_index.
+  if (bit != 0) {
+    population_count(r_array_index, r_array_index, temp2, temp3);
+  } else {
+    movl(r_array_index, 1);
+  }
+  // NB! r_array_index is off by 1. It is compensated by keeping r_array_base off by 1 word.
+
+  // We will consult the secondary-super array.
+  movptr(r_array_base, Address(r_sub_klass, in_bytes(Klass::secondary_supers_offset())));
+
+  // We're asserting that the first word in an Array<Klass*> is the
+  // length, and the second word is the first word of the data. If
+  // that ever changes, r_array_base will have to be adjusted here.
+  assert(Array<Klass*>::base_offset_in_bytes() == wordSize, "Adjust this code");
+  assert(Array<Klass*>::length_offset_in_bytes() == 0, "Adjust this code");
+
+  cmpq(r_super_klass, Address(r_array_base, r_array_index, Address::times_8));
+  jccb(Assembler::equal, L_success);
+
+  // Is there another entry to check? Consult the bitmap.
+  btq(r_bitmap, (bit + 1) & Klass::SECONDARY_SUPERS_TABLE_MASK);
+  jccb(Assembler::carryClear, L_failure);
+
+  // Linear probe. Rotate the bitmap so that the next bit to test is
+  // in Bit 1.
+  if (bit != 0) {
+    rorq(r_bitmap, bit);
+  }
+
+  // Calls into the stub generated by lookup_secondary_supers_table_slow_path.
+  // Arguments: r_super_klass, r_array_base, r_array_index, r_bitmap.
+  // Kills: r_array_length.
+  // Returns: result.
+  call(RuntimeAddress(StubRoutines::lookup_secondary_supers_table_slow_path_stub()));
+  // Result (0/1) is in rdi
+  jmpb(L_fallthrough);
+
+  bind(L_failure);
+  incq(result); // 0 => 1
+
+  bind(L_success);
+  // result = 0;
+
+  bind(L_fallthrough);
+  BLOCK_COMMENT("} lookup_secondary_supers_table");
+
+  if (VerifySecondarySupers) {
+    verify_secondary_supers_table(r_sub_klass, r_super_klass, result,
+                                  temp1, temp2, temp3);
+  }
+}
+
+void MacroAssembler::repne_scanq(Register addr, Register value, Register count, Register limit,
+                                 Label* L_success, Label* L_failure) {
+  Label L_loop, L_fallthrough;
+  {
+    int label_nulls = 0;
+    if (L_success == nullptr) { L_success = &L_fallthrough; label_nulls++; }
+    if (L_failure == nullptr) { L_failure = &L_fallthrough; label_nulls++; }
+    assert(label_nulls <= 1, "at most one null in the batch");
+  }
+  bind(L_loop);
+  cmpq(value, Address(addr, count, Address::times_8));
+  jcc(Assembler::equal, *L_success);
+  addl(count, 1);
+  cmpl(count, limit);
+  jcc(Assembler::less, L_loop);
+
+  if (&L_fallthrough != L_failure) {
+    jmp(*L_failure);
+  }
+  bind(L_fallthrough);
+}
+
+// Called by code generated by check_klass_subtype_slow_path
+// above. This is called when there is a collision in the hashed
+// lookup in the secondary supers array.
+void MacroAssembler::lookup_secondary_supers_table_slow_path(Register r_super_klass,
+                                                             Register r_array_base,
+                                                             Register r_array_index,
+                                                             Register r_bitmap,
+                                                             Register temp1,
+                                                             Register temp2,
+                                                             Label* L_success,
+                                                             Label* L_failure) {
+  assert_different_registers(r_super_klass, r_array_base, r_array_index, r_bitmap, temp1, temp2);
+
+  const Register
+    r_array_length = temp1,
+    r_sub_klass    = noreg,
+    result         = noreg;
+
+  LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS;
+
+  Label L_fallthrough;
+  int label_nulls = 0;
+  if (L_success == nullptr)   { L_success   = &L_fallthrough; label_nulls++; }
+  if (L_failure == nullptr)   { L_failure   = &L_fallthrough; label_nulls++; }
+  assert(label_nulls <= 1, "at most one null in the batch");
+
+  // Load the array length.
+  movl(r_array_length, Address(r_array_base, Array<Klass*>::length_offset_in_bytes()));
+  // And adjust the array base to point to the data.
+  // NB! Effectively increments current slot index by 1.
+  assert(Array<Klass*>::base_offset_in_bytes() == wordSize, "");
+  addptr(r_array_base, Array<Klass*>::base_offset_in_bytes());
+
+  // Linear probe
+  Label L_huge;
+
+  // The bitmap is full to bursting.
+  // Implicit invariant: BITMAP_FULL implies (length > 0)
+  assert(Klass::SECONDARY_SUPERS_BITMAP_FULL == ~uintx(0), "");
+  cmpq(r_bitmap, (int32_t)-1); // sign-extends immediate to 64-bit value
+  jcc(Assembler::equal, L_huge);
+
+  // NB! Our caller has checked bits 0 and 1 in the bitmap. The
+  // current slot (at secondary_supers[r_array_index]) has not yet
+  // been inspected, and r_array_index may be out of bounds if we
+  // wrapped around the end of the array.
+
+  { // This is conventional linear probing, but instead of terminating
+    // when a null entry is found in the table, we maintain a bitmap
+    // in which a 0 indicates missing entries.
+    // The check above guarantees there are 0s in the bitmap, so the loop
+    // eventually terminates.
+
+    xorl(temp2, temp2); // = 0;
+
+    Label L_again;
+    bind(L_again);
+
+    // Check for array wraparound.
+    cmpl(r_array_index, r_array_length);
+    cmovl(Assembler::greaterEqual, r_array_index, temp2);
+
+    cmpq(r_super_klass, Address(r_array_base, r_array_index, Address::times_8));
+    jcc(Assembler::equal, *L_success);
+
+    // If the next bit in bitmap is zero, we're done.
+    btq(r_bitmap, 2); // look-ahead check (Bit 2); Bits 0 and 1 are tested by now
+    jcc(Assembler::carryClear, *L_failure);
+
+    rorq(r_bitmap, 1); // Bits 1/2 => 0/1
+    addl(r_array_index, 1);
+
+    jmp(L_again);
+  }
+
+  { // Degenerate case: more than 64 secondary supers.
+    // FIXME: We could do something smarter here, maybe a vectorized
+    // comparison or a binary search, but is that worth any added
+    // complexity?
+    bind(L_huge);
+    xorl(r_array_index, r_array_index); // = 0
+    repne_scanq(r_array_base, r_super_klass, r_array_index, r_array_length,
+                L_success,
+                (&L_fallthrough != L_failure ? L_failure : nullptr));
+
+    bind(L_fallthrough);
+  }
+}
+
+struct VerifyHelperArguments {
+  Klass* _super;
+  Klass* _sub;
+  intptr_t _linear_result;
+  intptr_t _table_result;
+};
+
+static void verify_secondary_supers_table_helper(const char* msg, VerifyHelperArguments* args) {
+  Klass::on_secondary_supers_verification_failure(args->_super,
+                                                  args->_sub,
+                                                  args->_linear_result,
+                                                  args->_table_result,
+                                                  msg);
+}
+
+// Make sure that the hashed lookup and a linear scan agree.
+void MacroAssembler::verify_secondary_supers_table(Register r_sub_klass,
+                                                   Register r_super_klass,
+                                                   Register result,
+                                                   Register temp1,
+                                                   Register temp2,
+                                                   Register temp3) {
+  const Register
+      r_array_index  = temp1,
+      r_array_length = temp2,
+      r_array_base   = temp3,
+      r_bitmap       = noreg;
+
+  LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS;
+
+  BLOCK_COMMENT("verify_secondary_supers_table {");
+
+  Label L_success, L_failure, L_check, L_done;
+
+  movptr(r_array_base, Address(r_sub_klass, in_bytes(Klass::secondary_supers_offset())));
+  movl(r_array_length, Address(r_array_base, Array<Klass*>::length_offset_in_bytes()));
+  // And adjust the array base to point to the data.
+  addptr(r_array_base, Array<Klass*>::base_offset_in_bytes());
+
+  testl(r_array_length, r_array_length); // array_length == 0?
+  jcc(Assembler::zero, L_failure);
+
+  movl(r_array_index, 0);
+  repne_scanq(r_array_base, r_super_klass, r_array_index, r_array_length, &L_success);
+  // fall through to L_failure
+
+  const Register linear_result = r_array_index; // reuse temp1
+
+  bind(L_failure); // not present
+  movl(linear_result, 1);
+  jmp(L_check);
+
+  bind(L_success); // present
+  movl(linear_result, 0);
+
+  bind(L_check);
+  cmpl(linear_result, result);
+  jcc(Assembler::equal, L_done);
+
+  { // To avoid calling convention issues, build a record on the stack
+    // and pass the pointer to that instead.
+    push(result);
+    push(linear_result);
+    push(r_sub_klass);
+    push(r_super_klass);
+    movptr(c_rarg1, rsp);
+    movptr(c_rarg0, (uintptr_t) "mismatch");
+    call(RuntimeAddress(CAST_FROM_FN_PTR(address, verify_secondary_supers_table_helper)));
+    should_not_reach_here();
+  }
+  bind(L_done);
+
+  BLOCK_COMMENT("} verify_secondary_supers_table");
+}
+
+#undef LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS
+
+#endif // LP64
+
 void MacroAssembler::clinit_barrier(Register klass, Register thread, Label* L_fast_path, Label* L_slow_path) {
   assert(L_fast_path != nullptr || L_slow_path != nullptr, "at least one is required");
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index bafa3b92dea..738ce8a55c3 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -595,6 +595,8 @@ public:
   );
   void zero_memory(Register address, Register length_in_bytes, int offset_in_bytes, Register temp);
 
+  void population_count(Register dst, Register src, Register scratch1, Register scratch2);
+
   // interface method calling
   void lookup_interface_method(Register recv_klass,
                                Register intf_klass,
@@ -645,8 +647,46 @@ public:
                                      Label* L_success,
                                      Label* L_failure,
                                      bool set_cond_codes = false);
+  void hashed_check_klass_subtype_slow_path(Register sub_klass,
+                                     Register super_klass,
+                                     Register temp_reg,
+                                     Register temp2_reg,
+                                     Label* L_success,
+                                     Label* L_failure,
+                                     bool set_cond_codes = false);
 
-  // Simplified, combined version, good for typical uses.
+  // As above, but with a constant super_klass.
+  // The result is in Register result, not the condition codes.
+  void lookup_secondary_supers_table(Register sub_klass,
+                                     Register super_klass,
+                                     Register temp1,
+                                     Register temp2,
+                                     Register temp3,
+                                     Register temp4,
+                                     Register result,
+                                     u1 super_klass_slot);
+
+  void lookup_secondary_supers_table_slow_path(Register r_super_klass,
+                                               Register r_array_base,
+                                               Register r_array_index,
+                                               Register r_bitmap,
+                                               Register temp1,
+                                               Register temp2,
+                                               Label* L_success,
+                                               Label* L_failure = nullptr);
+
+  void verify_secondary_supers_table(Register r_sub_klass,
+                                     Register r_super_klass,
+                                     Register expected,
+                                     Register temp1,
+                                     Register temp2,
+                                     Register temp3);
+
+  void repne_scanq(Register addr, Register value, Register count, Register limit,
+                   Label* L_success,
+                   Label* L_failure = nullptr);
+
+    // Simplified, combined version, good for typical uses.
   // Falls through on failure.
   void check_klass_subtype(Register sub_klass,
                            Register super_klass,
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 71aafdc1cd3..fecefcea0ee 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -3994,6 +3994,54 @@ address StubGenerator::generate_upcall_stub_exception_handler() {
   return start;
 }
 
+address StubGenerator::generate_lookup_secondary_supers_table_stub(u1 super_klass_index) {
+  StubCodeMark mark(this, "StubRoutines", "lookup_secondary_supers_table");
+
+  address start = __ pc();
+
+  const Register
+      r_super_klass = rax,
+      r_sub_klass   = rsi,
+      result        = rdi;
+
+  __ lookup_secondary_supers_table(r_sub_klass, r_super_klass,
+                                   rdx, rcx, rbx, r11, // temps
+                                   result,
+                                   super_klass_index);
+  __ ret(0);
+
+  return start;
+}
+
+// Slow path implementation for UseSecondarySupersTable.
+address StubGenerator::generate_lookup_secondary_supers_table_slow_path_stub() {
+  StubCodeMark mark(this, "StubRoutines", "lookup_secondary_supers_table");
+
+  address start = __ pc();
+
+  const Register
+      r_super_klass  = rax,
+      r_array_base   = rbx,
+      r_array_index  = rdx,
+      r_sub_klass    = rsi,
+      r_bitmap       = r11,
+      result         = rdi;
+
+  Label L_success;
+  __ lookup_secondary_supers_table_slow_path(r_super_klass, r_array_base, r_array_index, r_bitmap,
+                                             rcx, rdi, // temps
+                                             &L_success);
+  // bind(L_failure);
+  __ movl(result, 1);
+  __ ret(0);
+
+  __ bind(L_success);
+  __ movl(result, 0);
+  __ ret(0);
+
+  return start;
+}
+
 void StubGenerator::create_control_words() {
   // Round to nearest, 64-bit mode, exceptions masked, flags specialized
   StubRoutines::x86::_mxcsr_std = EnableX86ECoreOpts ? 0x1FBF : 0x1F80;
@@ -4279,6 +4327,14 @@ void StubGenerator::generate_compiler_stubs() {
     StubRoutines::_bigIntegerRightShiftWorker = generate_bigIntegerRightShift();
     StubRoutines::_bigIntegerLeftShiftWorker = generate_bigIntegerLeftShift();
   }
+  if (UseSecondarySupersTable) {
+    StubRoutines::_lookup_secondary_supers_table_slow_path_stub = generate_lookup_secondary_supers_table_slow_path_stub();
+    if (! InlineSecondarySupersTest) {
+      for (int slot = 0; slot < Klass::SECONDARY_SUPERS_TABLE_SIZE; slot++) {
+        StubRoutines::_lookup_secondary_supers_table_stubs[slot] = generate_lookup_secondary_supers_table_stub(slot);
+      }
+    }
+  }
   if (UseMontgomeryMultiplyIntrinsic) {
     StubRoutines::_montgomeryMultiply
       = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_multiply);
@@ -4372,6 +4428,7 @@ void StubGenerator::generate_compiler_stubs() {
       StubRoutines::_vector_d_math[VectorSupport::VEC_SIZE_256][op] = (address)os::dll_lookup(libjsvml, ebuf);
     }
   }
+
 #endif // COMPILER2
 #endif // COMPILER2_OR_JVMCI
 }
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
index 42ae25e410f..e573ea98c14 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
@@ -605,6 +605,12 @@ class StubGenerator: public StubCodeGenerator {
   // shared exception handler for FFM upcall stubs
   address generate_upcall_stub_exception_handler();
 
+  // Specialized stub implementations for UseSecondarySupersTable.
+  address generate_lookup_secondary_supers_table_stub(u1 super_klass_index);
+
+  // Slow path implementation for UseSecondarySupersTable.
+  address generate_lookup_secondary_supers_table_slow_path_stub();
+
   void create_control_words();
 
   // Initialization
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index 845b8a7e24d..18b272ab58b 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -788,6 +788,11 @@ public:
     return LP64_ONLY(true) NOT_LP64(false); // not implemented on x86_32
   }
 
+  // x86_64 supports secondary supers table
+  constexpr static bool supports_secondary_supers_table() {
+    return LP64_ONLY(true) NOT_LP64(false); // not implemented on x86_32
+  }
+
   constexpr static bool supports_stack_watermark_barrier() {
     return true;
   }
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 2e0cf770c22..288212d6d13 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -296,6 +296,9 @@ reg_class long_rcx_reg(RCX, RCX_H);
 // Singleton class for RDX long register
 reg_class long_rdx_reg(RDX, RDX_H);
 
+// Singleton class for R11 long register
+reg_class long_r11_reg(R11, R11_H);
+
 // Singleton class for RAX int register
 reg_class int_rax_reg(RAX);
 
@@ -2667,6 +2670,16 @@ operand rdx_RegL()
   interface(REG_INTER);
 %}
 
+operand r11_RegL()
+%{
+  constraint(ALLOC_IN_RC(long_r11_reg));
+  match(RegL);
+  match(rRegL);
+
+  format %{ %}
+  interface(REG_INTER);
+%}
+
 operand no_rbp_r13_RegL()
 %{
   constraint(ALLOC_IN_RC(long_no_rbp_r13_reg));
@@ -12072,6 +12085,31 @@ instruct partialSubtypeCheck(rdi_RegP result,
   ins_pipe(pipe_slow);
 %}
 
+instruct partialSubtypeCheckConstSuper(rsi_RegP sub, rax_RegP super_reg, immP super_con, rdi_RegP result,
+                                       rdx_RegL temp1, rcx_RegL temp2, rbx_RegP temp3, r11_RegL temp4,
+                                       rFlagsReg cr)
+%{
+  match(Set result (PartialSubtypeCheck sub (Binary super_reg super_con)));
+  predicate(UseSecondarySupersTable);
+  effect(KILL cr, TEMP temp1, TEMP temp2, TEMP temp3, TEMP temp4);
+
+  ins_cost(700);  // smaller than the next version
+  format %{ "partialSubtypeCheck $result, $sub, super" %}
+
+  ins_encode %{
+    u1 super_klass_slot = ((Klass*)$super_con$$constant)->hash_slot();
+    if (InlineSecondarySupersTest) {
+      __ lookup_secondary_supers_table($sub$$Register, $super_reg$$Register, $temp1$$Register, $temp2$$Register,
+                                       $temp3$$Register, $temp4$$Register, $result$$Register,
+                                       super_klass_slot);
+    } else {
+      __ call(RuntimeAddress(StubRoutines::lookup_secondary_supers_table_stub(super_klass_slot)));
+    }
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
 instruct partialSubtypeCheck_vs_Zero(rFlagsReg cr,
                                      rsi_RegP sub, rax_RegP super, rcx_RegI rcx,
                                      immP0 zero,
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index c81838ed2ef..707a1de6fd1 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -211,6 +211,7 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
   }
   _compressed_oops = UseCompressedOops;
   _compressed_class_ptrs = UseCompressedClassPointers;
+  _use_secondary_supers_table = UseSecondarySupersTable;
   _max_heap_size = MaxHeapSize;
   _use_optimized_module_handling = CDSConfig::is_using_optimized_module_handling();
   _has_full_module_graph = CDSConfig::is_dumping_full_module_graph();
@@ -274,6 +275,7 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- narrow_oop_mode:                %d", _narrow_oop_mode);
   st->print_cr("- compressed_oops:                %d", _compressed_oops);
   st->print_cr("- compressed_class_ptrs:          %d", _compressed_class_ptrs);
+  st->print_cr("- use_secondary_supers_table:     %d", _use_secondary_supers_table);
   st->print_cr("- cloned_vtables_offset:          " SIZE_FORMAT_X, _cloned_vtables_offset);
   st->print_cr("- serialized_data_offset:         " SIZE_FORMAT_X, _serialized_data_offset);
   st->print_cr("- jvm_ident:                      %s", _jvm_ident);
@@ -2438,6 +2440,11 @@ bool FileMapHeader::validate() {
     return false;
   }
 
+  if (! _use_secondary_supers_table && UseSecondarySupersTable) {
+    log_warning(cds)("The shared archive was created without UseSecondarySupersTable.");
+    return false;
+  }
+
   if (!_use_optimized_module_handling) {
     CDSConfig::stop_using_optimized_module_handling();
     log_info(cds)("optimized module handling: disabled because archive was created without optimized module handling");
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index 6d106ef099d..a7f1c23d00a 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -191,6 +191,7 @@ private:
   CompressedOops::Mode _narrow_oop_mode;          // compressed oop encoding mode
   bool    _compressed_oops;                       // save the flag UseCompressedOops
   bool    _compressed_class_ptrs;                 // save the flag UseCompressedClassPointers
+  bool    _use_secondary_supers_table;            // save the flag UseSecondarySupersTable
   size_t  _cloned_vtables_offset;                 // The address of the first cloned vtable
   size_t  _serialized_data_offset;                // Data accessed using {ReadClosure,WriteClosure}::serialize()
   bool _has_non_jar_in_classpath;                 // non-jar file entry exists in classpath
diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index 3fc9b5f7976..76084ff1685 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -119,6 +119,7 @@ PerfCounter*    ClassLoader::_perf_define_appclass_selftime = nullptr;
 PerfCounter*    ClassLoader::_perf_app_classfile_bytes_read = nullptr;
 PerfCounter*    ClassLoader::_perf_sys_classfile_bytes_read = nullptr;
 PerfCounter*    ClassLoader::_unsafe_defineClassCallCounter = nullptr;
+PerfCounter*    ClassLoader::_perf_secondary_hash_time = nullptr;
 
 GrowableArray<ModuleClassPathList*>* ClassLoader::_patch_mod_entries = nullptr;
 GrowableArray<ModuleClassPathList*>* ClassLoader::_exploded_entries = nullptr;
@@ -1337,6 +1338,7 @@ void ClassLoader::initialize(TRAPS) {
     NEWPERFBYTECOUNTER(_perf_sys_classfile_bytes_read, SUN_CLS, "sysClassBytes");
 
     NEWPERFEVENTCOUNTER(_unsafe_defineClassCallCounter, SUN_CLS, "unsafeDefineClassCalls");
+    NEWPERFTICKCOUNTER(_perf_secondary_hash_time, SUN_CLS, "secondarySuperHashTime");
   }
 
   // lookup java library entry points
diff --git a/src/hotspot/share/classfile/classLoader.hpp b/src/hotspot/share/classfile/classLoader.hpp
index c8ea47435dd..d3ca476ac95 100644
--- a/src/hotspot/share/classfile/classLoader.hpp
+++ b/src/hotspot/share/classfile/classLoader.hpp
@@ -169,6 +169,9 @@ class ClassLoader: AllStatic {
 
   static PerfCounter* _unsafe_defineClassCallCounter;
 
+  // Count the time taken to hash the scondary superclass arrays.
+  static PerfCounter* _perf_secondary_hash_time;
+
   // The boot class path consists of 3 ordered pieces:
   //  1. the module/path pairs specified to --patch-module
   //    --patch-module=<module>=<file>(<pathsep><file>)*
@@ -269,6 +272,9 @@ class ClassLoader: AllStatic {
   static PerfCounter* perf_class_link_time()          { return _perf_class_link_time; }
   static PerfCounter* perf_class_link_selftime()      { return _perf_class_link_selftime; }
   static PerfCounter* perf_shared_classload_time()    { return _perf_shared_classload_time; }
+  static PerfCounter* perf_secondary_hash_time() {
+    return _perf_secondary_hash_time;
+  }
   static PerfCounter* perf_sys_classload_time()       { return _perf_sys_classload_time; }
   static PerfCounter* perf_app_classload_time()       { return _perf_app_classload_time; }
   static PerfCounter* perf_app_classload_selftime()   { return _perf_app_classload_selftime; }
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 3769285d08c..237eac5017c 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -161,6 +161,9 @@ Array<Klass*>* Universe::_the_empty_klass_array     = nullptr;
 Array<InstanceKlass*>* Universe::_the_empty_instance_klass_array  = nullptr;
 Array<Method*>* Universe::_the_empty_method_array   = nullptr;
 
+uintx Universe::_the_array_interfaces_bitmap = 0;
+uintx Universe::_the_empty_klass_bitmap      = 0;
+
 // These variables are guarded by FullGCALot_lock.
 debug_only(OopHandle Universe::_fullgc_alot_dummy_array;)
 debug_only(int Universe::_fullgc_alot_dummy_next = 0;)
@@ -437,6 +440,11 @@ void Universe::genesis(TRAPS) {
       _the_array_interfaces_array->at_put(1, vmClasses::Serializable_klass());
     }
 
+    if (UseSecondarySupersTable) {
+      Universe::_the_array_interfaces_bitmap = Klass::compute_secondary_supers_bitmap(_the_array_interfaces_array);
+      Universe::_the_empty_klass_bitmap      = Klass::compute_secondary_supers_bitmap(_the_empty_klass_array);
+    }
+
     initialize_basic_type_klass(_fillerArrayKlass, CHECK);
 
     initialize_basic_type_klass(boolArrayKlass(), CHECK);
diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
index c5e366f507f..09e00bb24a0 100644
--- a/src/hotspot/share/memory/universe.hpp
+++ b/src/hotspot/share/memory/universe.hpp
@@ -96,6 +96,9 @@ class Universe: AllStatic {
 
   static Array<Klass*>*  _the_array_interfaces_array;
 
+  static uintx _the_array_interfaces_bitmap;
+  static uintx _the_empty_klass_bitmap;
+
   // array of preallocated error objects with backtrace
   static OopHandle     _preallocated_out_of_memory_error_array;
 
@@ -229,7 +232,8 @@ class Universe: AllStatic {
   static oop          virtual_machine_error_instance();
   static oop          vm_exception()                  { return virtual_machine_error_instance(); }
 
-  static Array<Klass*>* the_array_interfaces_array()  { return _the_array_interfaces_array;   }
+  static Array<Klass*>* the_array_interfaces_array()  { return _the_array_interfaces_array; }
+  static uintx        the_array_interfaces_bitmap()   { return _the_array_interfaces_bitmap; }
 
   static Method*      finalizer_register_method();
   static Method*      loader_addClass_method();
@@ -262,6 +266,8 @@ class Universe: AllStatic {
   static Array<Klass*>*          the_empty_klass_array()  { return _the_empty_klass_array; }
   static Array<InstanceKlass*>*  the_empty_instance_klass_array() { return _the_empty_instance_klass_array; }
 
+  static uintx                   the_empty_klass_bitmap() { return _the_empty_klass_bitmap; }
+
   // OutOfMemoryError support. Returns an error with the required message. The returned error
   // may or may not have a backtrace. If error has a backtrace then the stack trace is already
   // filled in.
diff --git a/src/hotspot/share/oops/arrayKlass.cpp b/src/hotspot/share/oops/arrayKlass.cpp
index 3b97b25da6c..5685bbb6bb5 100644
--- a/src/hotspot/share/oops/arrayKlass.cpp
+++ b/src/hotspot/share/oops/arrayKlass.cpp
@@ -179,7 +179,8 @@ GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots,
   assert(num_extra_slots == 0, "sanity of primitive array type");
   assert(transitive_interfaces == nullptr, "sanity");
   // Must share this for correct bootstrapping!
-  set_secondary_supers(Universe::the_array_interfaces_array());
+  set_secondary_supers(Universe::the_array_interfaces_array(),
+                       Universe::the_array_interfaces_bitmap());
   return nullptr;
 }
 
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index ec92a9e8227..43bec86d8e5 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -1427,29 +1427,37 @@ bool InstanceKlass::can_be_primary_super_slow() const {
 GrowableArray<Klass*>* InstanceKlass::compute_secondary_supers(int num_extra_slots,
                                                                Array<InstanceKlass*>* transitive_interfaces) {
   // The secondaries are the implemented interfaces.
-  Array<InstanceKlass*>* interfaces = transitive_interfaces;
+  // We need the cast because Array<Klass*> is NOT a supertype of Array<InstanceKlass*>,
+  // (but it's safe to do here because we won't write into _secondary_supers from this point on).
+  Array<Klass*>* interfaces = (Array<Klass*>*)(address)transitive_interfaces;
   int num_secondaries = num_extra_slots + interfaces->length();
   if (num_secondaries == 0) {
     // Must share this for correct bootstrapping!
-    set_secondary_supers(Universe::the_empty_klass_array());
+    set_secondary_supers(Universe::the_empty_klass_array(), Universe::the_empty_klass_bitmap());
     return nullptr;
   } else if (num_extra_slots == 0) {
     // The secondary super list is exactly the same as the transitive interfaces, so
     // let's use it instead of making a copy.
     // Redefine classes has to be careful not to delete this!
-    // We need the cast because Array<Klass*> is NOT a supertype of Array<InstanceKlass*>,
-    // (but it's safe to do here because we won't write into _secondary_supers from this point on).
-    set_secondary_supers((Array<Klass*>*)(address)interfaces);
-    return nullptr;
-  } else {
-    // Copy transitive interfaces to a temporary growable array to be constructed
-    // into the secondary super list with extra slots.
-    GrowableArray<Klass*>* secondaries = new GrowableArray<Klass*>(interfaces->length());
-    for (int i = 0; i < interfaces->length(); i++) {
-      secondaries->push(interfaces->at(i));
+    if (!UseSecondarySupersTable) {
+      set_secondary_supers(interfaces);
+      return nullptr;
+    } else if (num_extra_slots == 0 && interfaces->length() <= 1) {
+      // We will reuse the transitive interfaces list if we're certain
+      // it's in hash order.
+      uintx bitmap = compute_secondary_supers_bitmap(interfaces);
+      set_secondary_supers(interfaces, bitmap);
+      return nullptr;
     }
-    return secondaries;
+    // ... fall through if that didn't work.
   }
+  // Copy transitive interfaces to a temporary growable array to be constructed
+  // into the secondary super list with extra slots.
+  GrowableArray<Klass*>* secondaries = new GrowableArray<Klass*>(interfaces->length());
+  for (int i = 0; i < interfaces->length(); i++) {
+    secondaries->push(interfaces->at(i));
+  }
+  return secondaries;
 }
 
 bool InstanceKlass::implements_interface(Klass* k) const {
@@ -3537,7 +3545,7 @@ void InstanceKlass::print_on(outputStream* st) const {
   }
 
   st->print(BULLET"arrays:            "); Metadata::print_value_on_maybe_null(st, array_klasses()); st->cr();
-  st->print(BULLET"methods:           "); methods()->print_value_on(st);                  st->cr();
+  st->print(BULLET"methods:           "); methods()->print_value_on(st);               st->cr();
   if (Verbose || WizardMode) {
     Array<Method*>* method_array = methods();
     for (int i = 0; i < method_array->length(); i++) {
@@ -3557,6 +3565,29 @@ void InstanceKlass::print_on(outputStream* st) const {
   }
   st->print(BULLET"local interfaces:  "); local_interfaces()->print_value_on(st);      st->cr();
   st->print(BULLET"trans. interfaces: "); transitive_interfaces()->print_value_on(st); st->cr();
+
+  st->print(BULLET"secondary supers: "); secondary_supers()->print_value_on(st); st->cr();
+  if (UseSecondarySupersTable) {
+    st->print(BULLET"hash_slot:         %d", hash_slot()); st->cr();
+    st->print(BULLET"bitmap:            " UINTX_FORMAT_X_0, _bitmap); st->cr();
+  }
+  if (secondary_supers() != nullptr) {
+    if (Verbose) {
+      bool is_hashed = UseSecondarySupersTable && (_bitmap != SECONDARY_SUPERS_BITMAP_FULL);
+      st->print_cr(BULLET"---- secondary supers (%d words):", _secondary_supers->length());
+      for (int i = 0; i < _secondary_supers->length(); i++) {
+        ResourceMark rm; // for external_name()
+        Klass* secondary_super = _secondary_supers->at(i);
+        st->print(BULLET"%2d:", i);
+        if (is_hashed) {
+          int home_slot = compute_home_slot(secondary_super, _bitmap);
+          int distance = (i - home_slot) & SECONDARY_SUPERS_TABLE_MASK;
+          st->print(" dist:%02d:", distance);
+        }
+        st->print_cr(" %p %s", secondary_super, secondary_super->external_name());
+      }
+    }
+  }
   st->print(BULLET"constants:         "); constants()->print_value_on(st);         st->cr();
   if (class_loader_data() != nullptr) {
     st->print(BULLET"class loader data:  ");
@@ -3614,6 +3645,7 @@ void InstanceKlass::print_on(outputStream* st) const {
   st->print(BULLET"itable length      %d (start addr: " PTR_FORMAT ")", itable_length(), p2i(start_of_itable())); st->cr();
   if (itable_length() > 0 && (Verbose || WizardMode))  print_vtable(start_of_itable(), itable_length(), st);
   st->print_cr(BULLET"---- static fields (%d words):", static_field_size());
+
   FieldPrinter print_static_field(st);
   ((InstanceKlass*)this)->do_local_static_fields(&print_static_field);
   st->print_cr(BULLET"---- non-static fields (%d words):", nonstatic_field_size());
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 8eb54696f6b..5b1919a5c4c 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/heapShared.hpp"
+#include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataGraph.inline.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -51,8 +52,10 @@
 #include "prims/jvmtiExport.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/perfData.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/powerOfTwo.hpp"
+#include "utilities/rotate_bits.hpp"
 #include "utilities/stack.inline.hpp"
 
 void Klass::set_java_mirror(Handle m) {
@@ -77,9 +80,66 @@ void Klass::set_is_cloneable() {
   }
 }
 
+uint8_t Klass::compute_hash_slot(Symbol* n) {
+  uint hash_code;
+  // Special cases for the two superclasses of all Array instances.
+  // Code elsewhere assumes, for all instances of ArrayKlass, that
+  // these two interfaces will be in this order.
+
+  // We ensure there are some empty slots in the hash table between
+  // these two very common interfaces because if they were adjacent
+  // (e.g. Slots 0 and 1), then any other class which hashed to 0 or 1
+  // would result in a probe length of 3.
+  if (n == vmSymbols::java_lang_Cloneable()) {
+    hash_code = 0;
+  } else if (n == vmSymbols::java_io_Serializable()) {
+    hash_code = SECONDARY_SUPERS_TABLE_SIZE / 2;
+  } else {
+    auto s = (const jbyte*) n->bytes();
+    hash_code = java_lang_String::hash_code(s, n->utf8_length());
+    // We use String::hash_code here (rather than e.g.
+    // Symbol::identity_hash()) in order to have a hash code that
+    // does not change from run to run. We want that because the
+    // hash value for a secondary superclass appears in generated
+    // code as a constant.
+
+    // This constant is magic: see Knuth, "Fibonacci Hashing".
+    constexpr uint multiplier
+      = 2654435769; // (uint)(((u8)1 << 32) / ((1 + sqrt(5)) / 2 ))
+    constexpr uint hash_shift = sizeof(hash_code) * 8 - 6;
+    // The leading bits of the least significant half of the product.
+    hash_code = (hash_code * multiplier) >> hash_shift;
+
+    if (StressSecondarySupers) {
+      // Generate many hash collisions in order to stress-test the
+      // linear search fallback.
+      hash_code = hash_code % 3;
+      hash_code = hash_code * (SECONDARY_SUPERS_TABLE_SIZE / 3);
+    }
+  }
+
+  return (hash_code & SECONDARY_SUPERS_TABLE_MASK);
+}
+
 void Klass::set_name(Symbol* n) {
   _name = n;
-  if (_name != nullptr) _name->increment_refcount();
+
+  if (_name != nullptr) {
+    _name->increment_refcount();
+  }
+
+  if (UseSecondarySupersTable) {
+    elapsedTimer selftime;
+    selftime.start();
+
+    _hash_slot = compute_hash_slot(n);
+    assert(_hash_slot < SECONDARY_SUPERS_TABLE_SIZE, "required");
+
+    selftime.stop();
+    if (UsePerfData) {
+      ClassLoader::perf_secondary_hash_time()->inc(selftime.ticks());
+    }
+  }
 
   if (CDSConfig::is_dumping_archive() && is_instance_klass()) {
     SystemDictionaryShared::init_dumptime_info(InstanceKlass::cast(this));
@@ -236,6 +296,175 @@ bool Klass::can_be_primary_super_slow() const {
     return true;
 }
 
+void Klass::set_secondary_supers(Array<Klass*>* secondaries) {
+  assert(!UseSecondarySupersTable || secondaries == nullptr, "");
+  set_secondary_supers(secondaries, SECONDARY_SUPERS_BITMAP_EMPTY);
+}
+
+void Klass::set_secondary_supers(Array<Klass*>* secondaries, uintx bitmap) {
+#ifdef ASSERT
+  if (UseSecondarySupersTable && secondaries != nullptr) {
+    uintx real_bitmap = compute_secondary_supers_bitmap(secondaries);
+    assert(bitmap == real_bitmap, "must be");
+  }
+#endif
+  _bitmap = bitmap;
+  _secondary_supers = secondaries;
+
+  if (secondaries != nullptr) {
+    LogMessage(class, load) msg;
+    NonInterleavingLogStream log {LogLevel::Debug, msg};
+    if (log.is_enabled()) {
+      ResourceMark rm;
+      log.print_cr("set_secondary_supers: hash_slot: %d; klass: %s", hash_slot(), external_name());
+      print_secondary_supers_on(&log);
+    }
+  }
+}
+
+// Hashed secondary superclasses
+//
+// We use a compressed 64-entry hash table with linear probing. We
+// start by creating a hash table in the usual way, followed by a pass
+// that removes all the null entries. To indicate which entries would
+// have been null we use a bitmap that contains a 1 in each position
+// where an entry is present, 0 otherwise. This bitmap also serves as
+// a kind of Bloom filter, which in many cases allows us quickly to
+// eliminate the possibility that something is a member of a set of
+// secondaries.
+uintx Klass::hash_secondary_supers(Array<Klass*>* secondaries, bool rewrite) {
+  const int length = secondaries->length();
+
+  if (length == 0) {
+    return SECONDARY_SUPERS_BITMAP_EMPTY;
+  }
+
+  if (length == 1) {
+    int hash_slot = secondaries->at(0)->hash_slot();
+    return uintx(1) << hash_slot;
+  }
+
+  // For performance reasons we don't use a hashed table unless there
+  // are at least two empty slots in it. If there were only one empty
+  // slot it'd take a long time to create the table and the resulting
+  // search would be no faster than linear probing.
+  if (length > SECONDARY_SUPERS_TABLE_SIZE - 2) {
+    return SECONDARY_SUPERS_BITMAP_FULL;
+  }
+
+  {
+    PerfTraceTime ptt(ClassLoader::perf_secondary_hash_time());
+
+    ResourceMark rm;
+    uintx bitmap = SECONDARY_SUPERS_BITMAP_EMPTY;
+    auto hashed_secondaries = new GrowableArray<Klass*>(SECONDARY_SUPERS_TABLE_SIZE,
+                                                        SECONDARY_SUPERS_TABLE_SIZE, nullptr);
+
+    for (int j = 0; j < length; j++) {
+      Klass* k = secondaries->at(j);
+      hash_insert(k, hashed_secondaries, bitmap);
+    }
+
+    // Pack the hashed secondaries array by copying it into the
+    // secondaries array, sans nulls, if modification is allowed.
+    // Otherwise, validate the order.
+    int i = 0;
+    for (int slot = 0; slot < SECONDARY_SUPERS_TABLE_SIZE; slot++) {
+      bool has_element = ((bitmap >> slot) & 1) != 0;
+      assert(has_element == (hashed_secondaries->at(slot) != nullptr), "");
+      if (has_element) {
+        Klass* k = hashed_secondaries->at(slot);
+        if (rewrite) {
+          secondaries->at_put(i, k);
+        } else if (secondaries->at(i) != k) {
+          assert(false, "broken secondary supers hash table");
+          return SECONDARY_SUPERS_BITMAP_FULL;
+        }
+        i++;
+      }
+    }
+    assert(i == secondaries->length(), "mismatch");
+
+    return bitmap;
+  }
+}
+
+void Klass::hash_insert(Klass* klass, GrowableArray<Klass*>* secondaries, uintx& bitmap) {
+  assert(bitmap != SECONDARY_SUPERS_BITMAP_FULL, "");
+
+  int dist = 0;
+  for (int slot = klass->hash_slot(); true; slot = (slot + 1) & SECONDARY_SUPERS_TABLE_MASK) {
+    Klass* existing = secondaries->at(slot);
+    assert(((bitmap >> slot) & 1) == (existing != nullptr), "mismatch");
+    if (existing == nullptr) { // no conflict
+      secondaries->at_put(slot, klass);
+      bitmap |= uintx(1) << slot;
+      assert(bitmap != SECONDARY_SUPERS_BITMAP_FULL, "");
+      return;
+    } else {
+      // Use Robin Hood hashing to minimize the worst case search.
+      // Also, every permutation of the insertion sequence produces
+      // the same final Robin Hood hash table, provided that a
+      // consistent tie breaker is used.
+      int existing_dist = (slot - existing->hash_slot()) & SECONDARY_SUPERS_TABLE_MASK;
+      if (existing_dist < dist
+          // This tie breaker ensures that the hash order is maintained.
+          || ((existing_dist == dist)
+              && (uintptr_t(existing) < uintptr_t(klass)))) {
+        Klass* tmp = secondaries->at(slot);
+        secondaries->at_put(slot, klass);
+        klass = tmp;
+        dist = existing_dist;
+      }
+      ++dist;
+    }
+  }
+}
+
+Array<Klass*>* Klass::pack_secondary_supers(ClassLoaderData* loader_data,
+                                            GrowableArray<Klass*>* primaries,
+                                            GrowableArray<Klass*>* secondaries,
+                                            uintx& bitmap, TRAPS) {
+  int new_length = primaries->length() + secondaries->length();
+  Array<Klass*>* secondary_supers = MetadataFactory::new_array<Klass*>(loader_data, new_length, CHECK_NULL);
+
+  // Combine the two arrays into a metadata object to pack the array.
+  // The primaries are added in the reverse order, then the secondaries.
+  int fill_p = primaries->length();
+  for (int j = 0; j < fill_p; j++) {
+    secondary_supers->at_put(j, primaries->pop());  // add primaries in reverse order.
+  }
+  for( int j = 0; j < secondaries->length(); j++ ) {
+    secondary_supers->at_put(j+fill_p, secondaries->at(j));  // add secondaries on the end.
+  }
+#ifdef ASSERT
+  // We must not copy any null placeholders left over from bootstrap.
+  for (int j = 0; j < secondary_supers->length(); j++) {
+    assert(secondary_supers->at(j) != nullptr, "correct bootstrapping order");
+  }
+#endif
+
+  if (UseSecondarySupersTable) {
+    bitmap = hash_secondary_supers(secondary_supers, /*rewrite=*/true); // rewrites freshly allocated array
+  } else {
+    bitmap = SECONDARY_SUPERS_BITMAP_EMPTY;
+  }
+  return secondary_supers;
+}
+
+uintx Klass::compute_secondary_supers_bitmap(Array<Klass*>* secondary_supers) {
+  return hash_secondary_supers(secondary_supers, /*rewrite=*/false); // no rewrites allowed
+}
+
+uint8_t Klass::compute_home_slot(Klass* k, uintx bitmap) {
+  uint8_t hash = k->hash_slot();
+  if (hash > 0) {
+    return population_count(bitmap << (SECONDARY_SUPERS_TABLE_SIZE - hash));
+  }
+  return 0;
+}
+
+
 void Klass::initialize_supers(Klass* k, Array<InstanceKlass*>* transitive_interfaces, TRAPS) {
   if (k == nullptr) {
     set_super(nullptr);
@@ -326,26 +555,9 @@ void Klass::initialize_supers(Klass* k, Array<InstanceKlass*>* transitive_interf
       primaries->push(p);
     }
     // Combine the two arrays into a metadata object to pack the array.
-    // The primaries are added in the reverse order, then the secondaries.
-    int new_length = primaries->length() + secondaries->length();
-    Array<Klass*>* s2 = MetadataFactory::new_array<Klass*>(
-                                       class_loader_data(), new_length, CHECK);
-    int fill_p = primaries->length();
-    for (int j = 0; j < fill_p; j++) {
-      s2->at_put(j, primaries->pop());  // add primaries in reverse order.
-    }
-    for( int j = 0; j < secondaries->length(); j++ ) {
-      s2->at_put(j+fill_p, secondaries->at(j));  // add secondaries on the end.
-    }
-
-  #ifdef ASSERT
-      // We must not copy any null placeholders left over from bootstrap.
-    for (int j = 0; j < s2->length(); j++) {
-      assert(s2->at(j) != nullptr, "correct bootstrapping order");
-    }
-  #endif
-
-    set_secondary_supers(s2);
+    uintx bitmap = 0;
+    Array<Klass*>* s2 = pack_secondary_supers(class_loader_data(), primaries, secondaries, bitmap, CHECK);
+    set_secondary_supers(s2, bitmap);
   }
 }
 
@@ -353,7 +565,7 @@ GrowableArray<Klass*>* Klass::compute_secondary_supers(int num_extra_slots,
                                                        Array<InstanceKlass*>* transitive_interfaces) {
   assert(num_extra_slots == 0, "override for complex klasses");
   assert(transitive_interfaces == nullptr, "sanity");
-  set_secondary_supers(Universe::the_empty_klass_array());
+  set_secondary_supers(Universe::the_empty_klass_array(), Universe::the_empty_klass_bitmap());
   return nullptr;
 }
 
@@ -552,6 +764,11 @@ void Klass::remove_unshareable_info() {
   // Null out class_loader_data because we don't share that yet.
   set_class_loader_data(nullptr);
   set_is_shared();
+
+  // FIXME: validation in Klass::hash_secondary_supers() may fail for shared klasses.
+  // Even though the bitmaps always match, the canonical order of elements in the table
+  // is not guaranteed to stay the same (see tie breaker during Robin Hood hashing in Klass::hash_insert).
+  //assert(compute_secondary_supers_bitmap(secondary_supers()) == _bitmap, "broken table");
 }
 
 void Klass::remove_java_mirror() {
@@ -957,3 +1174,100 @@ const char* Klass::class_in_module_of_loader(bool use_are, bool include_parent_l
 
   return class_description;
 }
+
+class LookupStats : StackObj {
+ private:
+  uint _no_of_samples;
+  uint _worst;
+  uint _worst_count;
+  uint _average;
+  uint _best;
+  uint _best_count;
+ public:
+  LookupStats() : _no_of_samples(0), _worst(0), _worst_count(0), _average(0), _best(INT_MAX), _best_count(0) {}
+
+  ~LookupStats() {
+    assert(_best <= _worst || _no_of_samples == 0, "sanity");
+  }
+
+  void sample(uint value) {
+    ++_no_of_samples;
+    _average += value;
+
+    if (_worst < value) {
+      _worst = value;
+      _worst_count = 1;
+    } else if (_worst == value) {
+      ++_worst_count;
+    }
+
+    if (_best > value) {
+      _best = value;
+      _best_count = 1;
+    } else if (_best == value) {
+      ++_best_count;
+    }
+  }
+
+  void print_on(outputStream* st) const {
+    st->print("best: %2d (%4.1f%%)", _best, (100.0 * _best_count) / _no_of_samples);
+    if (_best_count < _no_of_samples) {
+      st->print("; average: %4.1f; worst: %2d (%4.1f%%)",
+                (1.0 * _average) / _no_of_samples,
+                _worst, (100.0 * _worst_count) / _no_of_samples);
+    }
+  }
+};
+
+static void print_positive_lookup_stats(Array<Klass*>* secondary_supers, uintx bitmap, outputStream* st) {
+  int num_of_supers = secondary_supers->length();
+
+  LookupStats s;
+  for (int i = 0; i < num_of_supers; i++) {
+    Klass* secondary_super = secondary_supers->at(i);
+    int home_slot = Klass::compute_home_slot(secondary_super, bitmap);
+    uint score = 1 + ((i - home_slot) & Klass::SECONDARY_SUPERS_TABLE_MASK);
+    s.sample(score);
+  }
+  st->print("positive_lookup: "); s.print_on(st);
+}
+
+static uint compute_distance_to_nearest_zero(int slot, uintx bitmap) {
+  assert(~bitmap != 0, "no zeroes");
+  uintx start = rotate_right(bitmap, slot);
+  return count_trailing_zeros(~start);
+}
+
+static void print_negative_lookup_stats(uintx bitmap, outputStream* st) {
+  LookupStats s;
+  for (int slot = 0; slot < Klass::SECONDARY_SUPERS_TABLE_SIZE; slot++) {
+    uint score = compute_distance_to_nearest_zero(slot, bitmap);
+    s.sample(score);
+  }
+  st->print("negative_lookup: "); s.print_on(st);
+}
+
+void Klass::print_secondary_supers_on(outputStream* st) const {
+  if (secondary_supers() != nullptr) {
+    if (UseSecondarySupersTable) {
+      st->print("  - "); st->print("%d elements;", _secondary_supers->length());
+      st->print_cr(" bitmap: " UINTX_FORMAT_X_0 ";", _bitmap);
+      if (_bitmap != SECONDARY_SUPERS_BITMAP_EMPTY &&
+          _bitmap != SECONDARY_SUPERS_BITMAP_FULL) {
+        st->print("  - "); print_positive_lookup_stats(secondary_supers(), _bitmap, st); st->cr();
+        st->print("  - "); print_negative_lookup_stats(_bitmap, st); st->cr();
+      }
+    }
+  } else {
+    st->print("null");
+  }
+}
+
+void Klass::on_secondary_supers_verification_failure(Klass* super, Klass* sub, bool linear_result, bool table_result, const char* msg) {
+  ResourceMark rm;
+  super->print();
+  sub->print();
+  fatal("%s: %s implements %s: is_subtype_of: %d; linear_search: %d; table_lookup: %d",
+        msg, sub->external_name(), super->external_name(),
+        sub->is_subtype_of(super), linear_result, table_result);
+}
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index 0c9c05bed32..2923235e2f3 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -159,6 +159,12 @@ class Klass : public Metadata {
   // Provide access the corresponding instance java.lang.ClassLoader.
   ClassLoaderData* _class_loader_data;
 
+  // Bitmap and hash code used by hashed secondary supers.
+  uintx    _bitmap;
+  uint8_t  _hash_slot;
+
+  static uint8_t compute_hash_slot(Symbol* s);
+
   int _vtable_len;              // vtable length. This field may be read very often when we
                                 // have lots of itable dispatches (e.g., lambdas and streams).
                                 // Keep it away from the beginning of a Klass to avoid cacheline
@@ -231,7 +237,10 @@ protected:
   void set_secondary_super_cache(Klass* k) { _secondary_super_cache = k; }
 
   Array<Klass*>* secondary_supers() const { return _secondary_supers; }
-  void set_secondary_supers(Array<Klass*>* k) { _secondary_supers = k; }
+  void set_secondary_supers(Array<Klass*>* k);
+  void set_secondary_supers(Array<Klass*>* k, uintx bitmap);
+
+  uint8_t hash_slot() const { return _hash_slot; }
 
   // Return the element of the _super chain of the given depth.
   // If there is no such element, return either null or this.
@@ -382,7 +391,26 @@ protected:
   void     set_subklass(Klass* s);
   void     set_next_sibling(Klass* s);
 
+ private:
+  static void  hash_insert(Klass* klass, GrowableArray<Klass*>* secondaries, uintx& bitmap);
+  static uintx hash_secondary_supers(Array<Klass*>* secondaries, bool rewrite);
+
  public:
+  // Secondary supers table support
+  static Array<Klass*>* pack_secondary_supers(ClassLoaderData* loader_data,
+                                              GrowableArray<Klass*>* primaries,
+                                              GrowableArray<Klass*>* secondaries,
+                                              uintx& bitmap,
+                                              TRAPS);
+
+  static uintx   compute_secondary_supers_bitmap(Array<Klass*>* secondary_supers);
+  static uint8_t compute_home_slot(Klass* k, uintx bitmap);
+
+  static constexpr int SECONDARY_SUPERS_TABLE_SIZE = sizeof(_bitmap) * 8;
+  static constexpr int SECONDARY_SUPERS_TABLE_MASK = SECONDARY_SUPERS_TABLE_SIZE - 1;
+
+  static constexpr uintx SECONDARY_SUPERS_BITMAP_EMPTY    = 0;
+  static constexpr uintx SECONDARY_SUPERS_BITMAP_FULL     = ~(uintx)0;
 
   // Compiler support
   static ByteSize super_offset()                 { return byte_offset_of(Klass, _super); }
@@ -399,6 +427,7 @@ protected:
   static ByteSize subklass_offset()              { return byte_offset_of(Klass, _subklass); }
   static ByteSize next_sibling_offset()          { return byte_offset_of(Klass, _next_sibling); }
 #endif
+  static ByteSize bitmap_offset()                { return byte_offset_of(Klass, _bitmap); }
 
   // Unpacking layout_helper:
   static const int _lh_neutral_value           = 0;  // neutral non-array non-instance value
@@ -711,6 +740,8 @@ protected:
   virtual void oop_print_value_on(oop obj, outputStream* st);
   virtual void oop_print_on      (oop obj, outputStream* st);
 
+  void print_secondary_supers_on(outputStream* st) const;
+
   virtual const char* internal_name() const = 0;
 
   // Verification
@@ -725,6 +756,8 @@ protected:
 
   // for error reporting
   static bool is_valid(Klass* k);
+
+  static void on_secondary_supers_verification_failure(Klass* super, Klass* sub, bool linear_result, bool table_result, const char* msg);
 };
 
 #endif // SHARE_OOPS_KLASS_HPP
diff --git a/src/hotspot/share/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp
index b477948917e..94d3c6b6b35 100644
--- a/src/hotspot/share/oops/objArrayKlass.cpp
+++ b/src/hotspot/share/oops/objArrayKlass.cpp
@@ -308,7 +308,8 @@ GrowableArray<Klass*>* ObjArrayKlass::compute_secondary_supers(int num_extra_slo
   int num_secondaries = num_extra_slots + 2 + num_elem_supers;
   if (num_secondaries == 2) {
     // Must share this for correct bootstrapping!
-    set_secondary_supers(Universe::the_array_interfaces_array());
+    set_secondary_supers(Universe::the_array_interfaces_array(),
+                         Universe::the_array_interfaces_bitmap());
     return nullptr;
   } else {
     GrowableArray<Klass*>* secondaries = new GrowableArray<Klass*>(num_elem_supers+2);
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index bfb8146a650..62489f426c6 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -788,6 +788,9 @@
                                                                             \
   develop(bool, StressPrunedExceptionHandlers, false,                       \
           "Always prune exception handlers")                                \
+                                                                            \
+  product(bool, InlineSecondarySupersTest, true, DIAGNOSTIC,                \
+          "Inline the secondary supers hash lookup.")                       \
 
 // end of C2_FLAGS
 
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 692521dc246..386d3224889 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -2500,6 +2500,14 @@ void Matcher::find_shared_post_visit(Node* n, uint opcode) {
       n->del_req(3);
       break;
     }
+    case Op_PartialSubtypeCheck: {
+      if (UseSecondarySupersTable && n->in(2)->is_Con()) {
+        // PartialSubtypeCheck uses both constant and register operands for superclass input.
+        n->set_req(2, new BinaryNode(n->in(2), n->in(2)));
+        break;
+      }
+      break;
+    }
     default:
       break;
   }
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index fa57801d327..f7fdc167cb8 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -2454,6 +2454,12 @@ const Type* LoadNode::klass_value_common(PhaseGVN* phase) const {
     }
   }
 
+  if (tkls != nullptr && !UseSecondarySupersCache
+      && tkls->offset() == in_bytes(Klass::secondary_super_cache_offset()))  {
+    // Treat Klass::_secondary_super_cache as a constant when the cache is disabled.
+    return TypePtr::NULL_PTR;
+  }
+
   // Bailout case
   return LoadNode::Value(phase);
 }
diff --git a/src/hotspot/share/runtime/abstract_vm_version.hpp b/src/hotspot/share/runtime/abstract_vm_version.hpp
index 6fca13ece85..491d8a49dae 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.hpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.hpp
@@ -190,6 +190,9 @@ class Abstract_VM_Version: AllStatic {
   // Is recursive lightweight locking implemented for this platform?
   constexpr static bool supports_recursive_lightweight_locking() { return false; }
 
+  // Does platform support secondary supers table lookup?
+  constexpr static bool supports_secondary_supers_table() { return false; }
+
   // Does platform support float16 instructions?
   static bool supports_float16() { return false; }
 
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 8ccd466d109..3b0916f46fc 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -3685,6 +3685,17 @@ jint Arguments::apply_ergo() {
     return code;
   }
 
+  if (FLAG_IS_DEFAULT(UseSecondarySupersTable)) {
+    FLAG_SET_DEFAULT(UseSecondarySupersTable, VM_Version::supports_secondary_supers_table());
+  } else if (UseSecondarySupersTable && !VM_Version::supports_secondary_supers_table()) {
+    warning("UseSecondarySupersTable is not supported");
+    FLAG_SET_DEFAULT(UseSecondarySupersTable, false);
+  }
+  if (!UseSecondarySupersTable) {
+    FLAG_SET_DEFAULT(StressSecondarySupers, false);
+    FLAG_SET_DEFAULT(VerifySecondarySupers, false);
+  }
+
 #ifdef ZERO
   // Clear flags not supported on zero.
   FLAG_SET_DEFAULT(ProfileInterpreter, false);
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index f74930b62e1..5da2c0b80c5 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1998,6 +1998,18 @@ const int ObjectAlignmentInBytes = 8;
                 "Unconditionally record nmethod dependencies on class "     \
                 "rewriting/transformation independently of the JVMTI "      \
                 "can_{retransform/redefine}_classes capabilities.")         \
+                                                                            \
+  product(bool, UseSecondarySupersCache, true, DIAGNOSTIC,                  \
+                "Use secondary supers cache during subtype checks.")        \
+                                                                            \
+  product(bool, UseSecondarySupersTable, false, DIAGNOSTIC,                 \
+                "Use hash table to lookup secondary supers.")               \
+                                                                            \
+  product(bool, VerifySecondarySupers, false, DIAGNOSTIC,                   \
+          "Check that linear and hashed secondary lookups return the same result.") \
+                                                                            \
+  product(bool, StressSecondarySupers, false, DIAGNOSTIC,                   \
+          "Use a terrible hash function in order to generate many collisions.") \
 
 // end of RUNTIME_FLAGS
 
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index ff32240905d..4e5cd7f0389 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #include "asm/macroAssembler.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
+#include "oops/klass.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/vectorSupport.hpp"
 #include "runtime/continuation.hpp"
@@ -191,6 +192,10 @@ JFR_ONLY(address StubRoutines::_jfr_return_lease = nullptr;)
 
 address StubRoutines::_upcall_stub_exception_handler = nullptr;
 
+address StubRoutines::_lookup_secondary_supers_table_slow_path_stub = nullptr;
+address StubRoutines::_lookup_secondary_supers_table_stubs[Klass::SECONDARY_SUPERS_TABLE_SIZE] = { nullptr };
+
+
 // Initialization
 //
 // Note: to break cycle with universe initialization, stubs are generated in two phases.
diff --git a/src/hotspot/share/runtime/stubRoutines.hpp b/src/hotspot/share/runtime/stubRoutines.hpp
index 03756f92d1c..d7adf320131 100644
--- a/src/hotspot/share/runtime/stubRoutines.hpp
+++ b/src/hotspot/share/runtime/stubRoutines.hpp
@@ -274,6 +274,9 @@ class StubRoutines: AllStatic {
 
   static address _upcall_stub_exception_handler;
 
+  static address _lookup_secondary_supers_table_stubs[];
+  static address _lookup_secondary_supers_table_slow_path_stub;
+
  public:
   // Initialization/Testing
   static void    initialize_initial_stubs();               // must happen before universe::genesis
@@ -479,6 +482,17 @@ class StubRoutines: AllStatic {
     return _upcall_stub_exception_handler;
   }
 
+  static address lookup_secondary_supers_table_stub(u1 slot) {
+    assert(slot < Klass::SECONDARY_SUPERS_TABLE_SIZE, "out of bounds");
+    assert(_lookup_secondary_supers_table_stubs[slot] != nullptr, "not implemented");
+    return _lookup_secondary_supers_table_stubs[slot];
+  }
+
+  static address lookup_secondary_supers_table_slow_path_stub() {
+    assert(_lookup_secondary_supers_table_slow_path_stub != nullptr, "not implemented");
+    return _lookup_secondary_supers_table_slow_path_stub;
+  }
+
   static address select_fill_function(BasicType t, bool aligned, const char* &name);
 
   //
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index ec47f3c62fb..87af33d97e7 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -150,6 +150,11 @@ class oopDesc;
 #define INTX_FORMAT_W(width)     "%"   #width PRIdPTR
 #define UINTX_FORMAT             "%"          PRIuPTR
 #define UINTX_FORMAT_X           "0x%"        PRIxPTR
+#ifdef _LP64
+#define UINTX_FORMAT_X_0         "0x%016"     PRIxPTR
+#else
+#define UINTX_FORMAT_X_0         "0x%08"      PRIxPTR
+#endif
 #define UINTX_FORMAT_W(width)    "%"   #width PRIuPTR
 
 // Format jlong, if necessary
diff --git a/src/hotspot/share/utilities/rotate_bits.hpp b/src/hotspot/share/utilities/rotate_bits.hpp
new file mode 100644
index 00000000000..7228cca108c
--- /dev/null
+++ b/src/hotspot/share/utilities/rotate_bits.hpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2024, 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.
+ *
+ */
+
+#ifndef SHARE_UTILITIES_ROTATE_BITS_HPP
+#define SHARE_UTILITIES_ROTATE_BITS_HPP
+
+#include "utilities/globalDefinitions.hpp"
+
+inline uint32_t rotate_right_32(uint32_t x, int distance) {
+  distance = distance & 0x1F;
+  if (distance > 0) {
+    return (x >> distance) | (x << (32 - distance));
+  } else {
+    return x;
+  }
+}
+
+inline uint64_t rotate_right_64(uint64_t x, int distance) {
+  distance = distance & 0x3F;
+  if (distance > 0) {
+    return (x >> distance) | (x << (64 - distance));
+  } else {
+    return x;
+  }
+}
+
+template<typename T,
+    ENABLE_IF(std::is_integral<T>::value),
+ENABLE_IF(sizeof(T) <= sizeof(uint64_t))>
+inline T rotate_right(T x, int dist) {
+  return (sizeof(x) <= sizeof(uint32_t)) ?
+         rotate_right_32(static_cast<uint32_t>(x), dist) :
+         rotate_right_64(static_cast<uint64_t>(x), dist);
+}
+
+#endif // SHARE_UTILITIES_ROTATE_BITS_HPP
diff --git a/test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheHits.java b/test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheHits.java
new file mode 100644
index 00000000000..aaaf0edb258
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheHits.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+
+@Warmup(iterations = 5, time = 300, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 300, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(value = 3, jvmArgsAppend = {"-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1"})
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Threads(1)
+@State(Scope.Benchmark)
+public class SecondarySuperCacheHits {
+
+    // This test targets C1 specifically, to enter the interesting code path
+    // without heavily optimizing compiler like C2 optimizing based on profiles,
+    // or folding the instanceof checks.
+
+    // The test verifies what happens on a happy path, when we can actually cache
+    // the last super and use it effectively.
+
+    interface I01 {}
+    interface I02 {}
+    interface I03 {}
+    interface I04 {}
+    interface I05 {}
+    interface I06 {}
+    interface I07 {}
+    interface I08 {}
+    interface I09 {}
+    interface I10 {}
+    interface I11 {}
+    interface I12 {}
+    interface I13 {}
+    interface I14 {}
+    interface I15 {}
+    interface I16 {}
+    interface I17 {}
+    interface I18 {}
+    interface I19 {}
+    interface I20 {}
+
+    class B {}
+    class C1 extends B implements I01, I02, I03, I04, I05, I06, I07, I08, I09, I10, I11, I12, I13, I14, I15, I16, I17, I18, I19, I20 {}
+
+    volatile B o;
+
+    @Setup
+    public void setup() {
+        o = new C1();
+    }
+
+    static final int ITERS = 10000;
+
+    @Benchmark
+    @OperationsPerInvocation(20*ITERS)
+    public void test(Blackhole bh) {
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I01);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I02);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I03);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I04);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I05);
+
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I06);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I07);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I08);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I09);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I10);
+
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I11);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I12);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I13);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I14);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I15);
+
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I16);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I17);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I18);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I19);
+        for (int c = 0; c < ITERS; c++) bh.consume(o instanceof I20);
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheInterContention.java b/test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheInterContention.java
new file mode 100644
index 00000000000..3cafa582c09
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheInterContention.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+
+@Warmup(iterations = 5, time = 300, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 300, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(value = 3, jvmArgsAppend = {"-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1"})
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Threads(Threads.MAX)
+@State(Scope.Benchmark)
+public class SecondarySuperCacheInterContention {
+
+    // This test targets C1 specifically, to enter the interesting code path
+    // without heavily optimizing compiler like C2 optimizing based on profiles,
+    // or folding the instanceof checks.
+
+    // The test verifies what happens on unhappy path, when we contend a lot over
+    // the secondary super cache, where different threads want to update the cache
+    // with different value. In tihs test, every thread comes with its own stable
+    // cached value. Meaning, this tests the INTER-thread contention.
+
+    interface IA {}
+    interface IB {}
+    class B {}
+    class C1 extends B implements IA, IB {}
+    class C2 extends B implements IA, IB {}
+
+    volatile B o1, o2;
+
+    @Setup
+    public void setup() {
+        o1 = new C1();
+        o2 = new C2();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(2)
+    @Group("test")
+    @GroupThreads(1)
+    public void t1(Blackhole bh) {
+        bh.consume(o1 instanceof IA);
+        bh.consume(o2 instanceof IA);
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(2)
+    @Group("test")
+    @GroupThreads(1)
+    public void t2(Blackhole bh) {
+        bh.consume(o1 instanceof IB);
+        bh.consume(o2 instanceof IB);
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheIntraContention.java b/test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheIntraContention.java
new file mode 100644
index 00000000000..b97d49e2e60
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/SecondarySuperCacheIntraContention.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+
+@Warmup(iterations = 5, time = 300, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 300, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(value = 3, jvmArgsAppend = {"-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1"})
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Threads(Threads.MAX)
+@State(Scope.Benchmark)
+public class SecondarySuperCacheIntraContention {
+
+    // This test targets C1 specifically, to enter the interesting code path
+    // without heavily optimizing compiler like C2 optimizing based on profiles,
+    // or folding the instanceof checks.
+
+    // The test verifies what happens on unhappy path, when we contend a lot over
+    // the secondary super cache, where different threads want to update the cache
+    // with different value. In this test, every thread comes with its own contending
+    // value. Meaning, this tests the INTRA-thread contention.
+
+    interface IA {}
+    interface IB {}
+    class B {}
+    class C1 extends B implements IA, IB {}
+    class C2 extends B implements IA, IB {}
+
+    volatile B o1, o2;
+
+    @Setup
+    public void setup() {
+        o1 = new C1();
+        o2 = new C2();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(4)
+    public void test(Blackhole bh) {
+        bh.consume(o1 instanceof IA);
+        bh.consume(o2 instanceof IA);
+        bh.consume(o1 instanceof IB);
+        bh.consume(o2 instanceof IB);
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/vm/lang/SecondarySupersLookup.java b/test/micro/org/openjdk/bench/vm/lang/SecondarySupersLookup.java
new file mode 100644
index 00000000000..54e5b081672
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/lang/SecondarySupersLookup.java
@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+package org.openjdk.bench.vm.lang;
+
+import org.openjdk.jmh.annotations.*;
+import java.util.concurrent.TimeUnit;
+import java.util.Random;
+
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 1, time = 1)
+@Measurement(iterations = 3, time = 1)
+@Fork(value = 5)
+public class SecondarySupersLookup {
+    interface J  {}
+    interface I01 {}
+    interface I02 extends I01 {}
+    interface I03 extends I02 {}
+    interface I04 extends I03 {}
+    interface I05 extends I04 {}
+    interface I06 extends I05 {}
+    interface I07 extends I06 {}
+    interface I08 extends I07 {}
+    interface I09 extends I08 {}
+    interface I10 extends I09 {}
+    interface I11 extends I10 {}
+    interface I12 extends I11 {}
+    interface I13 extends I12 {}
+    interface I14 extends I13 {}
+    interface I15 extends I14 {}
+    interface I16 extends I15 {}
+    interface I17 extends I16 {}
+    interface I18 extends I17 {}
+    interface I19 extends I18 {}
+    interface I20 extends I19 {}
+    interface I21 extends I20 {}
+    interface I22 extends I21 {}
+    interface I23 extends I22 {}
+    interface I24 extends I23 {}
+    interface I25 extends I24 {}
+    interface I26 extends I25 {}
+    interface I27 extends I26 {}
+    interface I28 extends I27 {}
+    interface I29 extends I28 {}
+    interface I30 extends I29 {}
+    interface I31 extends I30 {}
+    interface I32 extends I31 {}
+    interface I33 extends I32 {}
+    interface I34 extends I33 {}
+    interface I35 extends I34 {}
+    interface I36 extends I35 {}
+    interface I37 extends I36 {}
+    interface I38 extends I37 {}
+    interface I39 extends I38 {}
+    interface I40 extends I39 {}
+    interface I41 extends I40 {}
+    interface I42 extends I41 {}
+    interface I43 extends I42 {}
+    interface I44 extends I43 {}
+    interface I45 extends I44 {}
+    interface I46 extends I45 {}
+    interface I47 extends I46 {}
+    interface I48 extends I47 {}
+    interface I49 extends I48 {}
+    interface I50 extends I49 {}
+    interface I51 extends I50 {}
+    interface I52 extends I51 {}
+    interface I53 extends I52 {}
+    interface I54 extends I53 {}
+    interface I55 extends I54 {}
+    interface I56 extends I55 {}
+    interface I57 extends I56 {}
+    interface I58 extends I57 {}
+    interface I59 extends I58 {}
+    interface I60 extends I59 {}
+    interface I61 extends I60 {}
+    interface I62 extends I61 {}
+    interface I63 extends I62 {}
+    interface I64 extends I63 {}
+
+    final Object obj00 = new Object();
+    final Object obj01 = new I01() {};
+    final Object obj02 = new I02() {};
+    final Object obj03 = new I03() {};
+    final Object obj04 = new I04() {};
+    final Object obj05 = new I05() {};
+    final Object obj06 = new I06() {};
+    final Object obj07 = new I07() {};
+    final Object obj08 = new I08() {};
+    final Object obj09 = new I09() {};
+    final Object obj10 = new I10() {};
+    final Object obj16 = new I16() {};
+    final Object obj20 = new I20() {};
+    final Object obj30 = new I30() {};
+    final Object obj32 = new I32() {};
+    final Object obj40 = new I40() {};
+    final Object obj50 = new I50() {};
+    final Object obj55 = new I55() {};
+    final Object obj56 = new I56() {};
+    final Object obj57 = new I57() {};
+    final Object obj58 = new I58() {};
+    final Object obj59 = new I59() {};
+    final Object obj60 = new I60() {};
+    final Object obj61 = new I61() {};
+    final Object obj62 = new I62() {};
+    final Object obj63 = new I63() {};
+    final Object obj64 = new I64() {};
+
+    static Class<?> getSuper(int idx) {
+        int i = Math.abs(idx) % 10;
+        switch (i) {
+            case 0: return I01.class;
+            case 1: return I02.class;
+            case 2: return I03.class;
+            case 3: return I04.class;
+            case 4: return I05.class;
+            case 5: return I06.class;
+            case 6: return I07.class;
+            case 7: return I08.class;
+            case 8: return I09.class;
+            case 9: return I10.class;
+        }
+        throw new InternalError("" + i);
+    }
+
+    @Setup
+    public void warmup() {
+        for (int i = 0; i < 20_000; i++) {
+            Class<?> s = getSuper(i);
+            test(obj01, s, s.isInstance(obj01));
+            test(obj02, s, s.isInstance(obj02));
+            test(obj03, s, s.isInstance(obj03));
+            test(obj04, s, s.isInstance(obj04));
+            test(obj05, s, s.isInstance(obj05));
+            test(obj06, s, s.isInstance(obj06));
+            test(obj07, s, s.isInstance(obj07));
+            test(obj08, s, s.isInstance(obj08));
+            test(obj09, s, s.isInstance(obj09));
+        }
+    }
+
+    private static void test(Object obj, Class<?> cls, boolean expected) {
+        if (cls.isInstance(obj) != expected) {
+            throw new InternalError(obj.getClass() + " " + cls + " " + expected);
+        }
+    }
+    @Benchmark
+    public void testPositive01() {
+        test(obj01, I01.class, true);
+    }
+    @Benchmark public void testPositive02() {
+        test(obj02, I02.class, true);
+    }
+    @Benchmark public void testPositive03() {
+        test(obj03, I03.class, true);
+    }
+    @Benchmark public void testPositive04() {
+        test(obj04, I04.class, true);
+    }
+    @Benchmark public void testPositive05() {
+        test(obj05, I05.class, true);
+    }
+    @Benchmark public void testPositive06() {
+        test(obj06, I06.class, true);
+    }
+    @Benchmark public void testPositive07() {
+        test(obj07, I07.class, true);
+    }
+    @Benchmark public void testPositive08() {
+        test(obj08, I08.class, true);
+    }
+    @Benchmark public void testPositive09() {
+        test(obj09, I09.class, true);
+    }
+    @Benchmark public void testPositive10() {
+        test(obj10, I10.class, true);
+    }
+    @Benchmark public void testPositive16() {
+        test(obj16, I16.class, true);
+    }
+    @Benchmark public void testPositive20() {
+        test(obj20, I20.class, true);
+    }
+    @Benchmark public void testPositive30() {
+        test(obj30, I30.class, true);
+    }
+    @Benchmark public void testPositive32() {
+        test(obj32, I32.class, true);
+    }
+    @Benchmark public void testPositive40() {
+        test(obj40, I40.class, true);
+    }
+    @Benchmark public void testPositive50() {
+        test(obj50, I50.class, true);
+    }
+    @Benchmark public void testPositive60() {
+        test(obj60, I60.class, true);
+    }
+    @Benchmark public void testPositive63() {
+        test(obj63, I63.class, true);
+    }
+    @Benchmark public void testPositive64() {
+        test(obj64, I64.class, true);
+    }
+
+    @Benchmark public void testNegative00() {
+        test(obj00, J.class, false);
+    }
+    @Benchmark public void testNegative01() {
+        test(obj01, J.class, false);
+    }
+    @Benchmark public void testNegative02() {
+        test(obj02, J.class, false);
+    }
+    @Benchmark public void testNegative03() {
+        test(obj03, J.class, false);
+    }
+    @Benchmark public void testNegative04() {
+        test(obj04, J.class, false);
+    }
+    @Benchmark public void testNegative05() {
+        test(obj05, J.class, false);
+    }
+    @Benchmark public void testNegative06() {
+        test(obj06, J.class, false);
+    }
+    @Benchmark public void testNegative07() {
+        test(obj07, J.class, false);
+    }
+    @Benchmark public void testNegative08() {
+        test(obj08, J.class, false);
+    }
+    @Benchmark public void testNegative09() {
+        test(obj09, J.class, false);
+    }
+    @Benchmark public void testNegative10() {
+        test(obj10, J.class, false);
+    }
+    @Benchmark public void testNegative16() {
+        test(obj16, J.class, false);
+    }
+    @Benchmark public void testNegative20() {
+        test(obj20, J.class, false);
+    }
+    @Benchmark public void testNegative30() {
+        test(obj30, J.class, false);
+    }
+    @Benchmark public void testNegative32() {
+        test(obj32, J.class, false);
+    }
+    @Benchmark public void testNegative40() {
+        test(obj40, J.class, false);
+    }
+    @Benchmark public void testNegative50() {
+        test(obj50, J.class, false);
+    }
+    @Benchmark public void testNegative55() {
+        test(obj55, J.class, false);
+    }
+    @Benchmark public void testNegative56() {
+        test(obj56, J.class, false);
+    }
+    @Benchmark public void testNegative57() {
+        test(obj57, J.class, false);
+    }
+    @Benchmark public void testNegative58() {
+        test(obj58, J.class, false);
+    }
+    @Benchmark public void testNegative59() {
+        test(obj59, J.class, false);
+    }
+    @Benchmark public void testNegative60() {
+        test(obj60, J.class, false);
+    }
+    @Benchmark public void testNegative61() {
+        test(obj61, J.class, false);
+    }
+    @Benchmark public void testNegative62() {
+        test(obj62, J.class, false);
+    }
+    @Benchmark public void testNegative63() {
+        test(obj63, J.class, false);
+    }
+
+    @Benchmark public void testNegative64() {
+        test(obj64, J.class, false);
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/lang/TypePollution.java b/test/micro/org/openjdk/bench/vm/lang/TypePollution.java
new file mode 100644
index 00000000000..8109e205d15
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/lang/TypePollution.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+package org.openjdk.bench.vm.lang;
+
+import org.openjdk.jmh.annotations.*;
+
+import java.io.Serializable;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
+import java.util.function.*;
+
+/*
+ * A test to demonstrate type pollution.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 4, time = 2)
+@Measurement(iterations = 4, time = 2)
+@Fork(value = 3)
+public class TypePollution {
+
+    static class DynamicInvocationHandler implements InvocationHandler {
+
+        @Override
+            public Object invoke(Object proxy, Method method, Object[] args) {
+            return null;
+        }
+    }
+
+    interface I01 {}
+    interface I02 {}
+    interface I03 {}
+    interface I04 {}
+    interface I05 {}
+    interface I06 {}
+    interface I07 {}
+    interface I08 {}
+    interface I09 {}
+    interface I10 {}
+    interface I11 {}
+    interface I12 {}
+    interface I13 {}
+    interface I14 {}
+    interface I15 {}
+    interface I16 {}
+    interface I17 {}
+    interface I18 {}
+    interface I19 {}
+    interface I20 {}
+
+    static Class<?>[] classes;
+
+    static {
+        classes = new Class<?>[] { I01.class, I02.class, I03.class, I04.class, I05.class,
+                                   I06.class, I07.class, I08.class, I09.class, I10.class,
+                                   I11.class, I12.class, I13.class, I14.class, I15.class,
+                                   I16.class, I17.class, I18.class, I19.class, I20.class };
+    }
+
+    private static final int NOOFOBJECTS = 100;
+
+    public Object[] objectArray;
+
+    public Random rand = new Random(0);
+
+    @Setup(Level.Trial)
+    public void setup() {
+        objectArray = new Object[1000];
+        var loader = getClass().getClassLoader();
+        Class<?>[] someInterfaces = new Class<?>[0];
+        for (int i = 0; i < objectArray.length; i++) {
+            Set<Class<?>> aSet = new HashSet<Class<?>>();
+            for (int j = 0; j < 6; j++) {
+                aSet.add(classes[rand.nextInt(classes.length)]);
+            }
+            Class<?>[] interfaceArray = new Class[aSet.size()];
+            interfaceArray = aSet.toArray(interfaceArray);
+            objectArray[i] = Proxy.newProxyInstance(loader, interfaceArray, new DynamicInvocationHandler());
+        }
+    }
+
+    int probe = 99;
+
+    @Benchmark
+    @Fork(jvmArgsAppend={"-XX:+UnlockDiagnosticVMOptions", "-XX:-UseSecondarySupersTable", "-XX:-UseSecondarySuperCache"})
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public long parallelInstanceOfInterfaceSwitchLinearNoSCC() {
+        return parallelInstanceOfInterfaceSwitch();
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend={"-XX:+UnlockDiagnosticVMOptions", "-XX:-UseSecondarySupersTable", "-XX:+UseSecondarySuperCache"})
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public long parallelInstanceOfInterfaceSwitchLinearSCC() {
+        return parallelInstanceOfInterfaceSwitch();
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend={"-XX:+UnlockDiagnosticVMOptions", "-XX:+UseSecondarySupersTable", "-XX:-UseSecondarySuperCache"})
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public long parallelInstanceOfInterfaceSwitchTableNoSCC() {
+        return parallelInstanceOfInterfaceSwitch();
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend={"-XX:+UnlockDiagnosticVMOptions", "-XX:+UseSecondarySupersTable", "-XX:+UseSecondarySuperCache"})
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public long parallelInstanceOfInterfaceSwitchTableSCC() {
+        return parallelInstanceOfInterfaceSwitch();
+    }
+
+    long parallelInstanceOfInterfaceSwitch() {
+        Supplier<Long> s = () -> {
+            long sum = 0;
+            for (int i = 0; i < 10000; i++) {
+                sum += instanceOfInterfaceSwitch();
+            }
+            return sum;
+        };
+        try {
+            CompletableFuture<Long> future = CompletableFuture.supplyAsync(s);
+            return s.get() + future.get();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend={"-XX:+UnlockDiagnosticVMOptions", "-XX:-UseSecondarySupersTable", "-XX:-UseSecondarySuperCache"})
+    public int instanceOfInterfaceSwitchLinearNoSCC() {
+        return instanceOfInterfaceSwitch();
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend={"-XX:+UnlockDiagnosticVMOptions", "-XX:-UseSecondarySupersTable", "-XX:+UseSecondarySuperCache"})
+    public int instanceOfInterfaceSwitchLinearSCC() {
+        return instanceOfInterfaceSwitch();
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend={"-XX:+UnlockDiagnosticVMOptions", "-XX:+UseSecondarySupersTable", "-XX:-UseSecondarySuperCache"})
+    public int instanceOfInterfaceSwitchTableNoSCC() {
+        return instanceOfInterfaceSwitch();
+    }
+
+    @Benchmark
+    @Fork(jvmArgsAppend={"-XX:+UnlockDiagnosticVMOptions", "-XX:+UseSecondarySupersTable", "-XX:+UseSecondarySuperCache"})
+    public int instanceOfInterfaceSwitchTableSCC() {
+        return instanceOfInterfaceSwitch();
+    }
+
+    int instanceOfInterfaceSwitch() {
+        int dummy = 0;
+        for (int i = 0; i < 100; i++) {
+            probe ^= probe << 13;   // xorshift
+            probe ^= probe >>> 17;
+            probe ^= probe << 5;
+            dummy += switch(objectArray[Math.abs(probe) % objectArray.length]) {
+            case I01 inst -> 1;
+            case I02 inst -> 2;
+            case I03 inst -> 3;
+            case I04 inst -> 4;
+            case I05 inst -> 5;
+            case I06 inst -> 6;
+            case I07 inst -> 7;
+            case I08 inst -> 8;
+            default -> 10;
+            };
+            probe ^= probe << 13;   // xorshift
+            probe ^= probe >>> 17;
+            probe ^= probe << 5;
+            dummy += switch(objectArray[Math.abs(probe) % objectArray.length]) {
+            case I18 inst -> 8;
+            case I17 inst -> 7;
+            case I16 inst -> 6;
+            case I15 inst -> 5;
+            case I14 inst -> 4;
+            case I13 inst -> 3;
+            case I12 inst -> 2;
+            case I11 inst -> 1;
+            default -> 0;
+            };
+        }
+        return dummy;
+    }
+}

From 90df3b7fbb87f816f0bb688aa122cb3480399aee Mon Sep 17 00:00:00 2001
From: Mark Sheppard <msheppar@openjdk.org>
Date: Tue, 16 Apr 2024 15:44:15 +0000
Subject: [PATCH 063/486] 8329190: (ch) DatagramChannel.receive should throw
 ClosedChannelException when called on closed channel

Co-authored-by: Alan Bateman <alanb@openjdk.org>
Reviewed-by: jpai, michaelm
---
 .../sun/nio/ch/DatagramChannelImpl.java       |   8 +-
 .../sun/nio/ch/ServerSocketChannelImpl.java   |   3 +-
 .../classes/sun/nio/ch/SocketChannelImpl.java |   4 +-
 .../classes/sun/nio/ch/SinkChannelImpl.java   |   2 +
 .../classes/sun/nio/ch/SourceChannelImpl.java |   2 +
 .../Channels/ClosedNetworkChannels.java       | 210 ++++++++++++++++++
 6 files changed, 226 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/java/nio/channels/Channels/ClosedNetworkChannels.java

diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
index af8f0b987e9..4790ee75dd9 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -573,6 +573,7 @@ class DatagramChannelImpl
             throw new IllegalArgumentException("Read-only buffer");
         readLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             SocketAddress sender = null;
             try {
@@ -851,6 +852,7 @@ class DatagramChannelImpl
 
         writeLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             int n;
             boolean completed = false;
@@ -1039,6 +1041,7 @@ class DatagramChannelImpl
 
         readLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             int n = 0;
             try {
@@ -1069,6 +1072,7 @@ class DatagramChannelImpl
 
         readLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             long n = 0;
             try {
@@ -1152,6 +1156,7 @@ class DatagramChannelImpl
 
         writeLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             int n = 0;
             try {
@@ -1182,6 +1187,7 @@ class DatagramChannelImpl
 
         writeLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             long n = 0;
             try {
diff --git a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
index 1841eebc93c..c6ddad2a05c 100644
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -392,6 +392,7 @@ class ServerSocketChannelImpl
 
         acceptLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             try {
                 begin(blocking);
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
index 6c65a964a65..f23a0aa0152 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -955,6 +955,7 @@ class SocketChannelImpl
             try {
                 writeLock.lock();
                 try {
+                    ensureOpen();
                     boolean blocking = isBlocking();
                     boolean connected = false;
                     try {
@@ -1053,6 +1054,7 @@ class SocketChannelImpl
                     if (isConnected())
                         return true;
 
+                    ensureOpen();
                     boolean blocking = isBlocking();
                     boolean connected = false;
                     try {
diff --git a/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
index d72a4892ef0..491e0104765 100644
--- a/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
@@ -306,6 +306,7 @@ class SinkChannelImpl
 
         writeLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             int n = 0;
             try {
@@ -334,6 +335,7 @@ class SinkChannelImpl
 
         writeLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             long n = 0;
             try {
diff --git a/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
index 7be17040b4c..102041dd294 100644
--- a/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
@@ -306,6 +306,7 @@ class SourceChannelImpl
 
         readLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             int n = 0;
             try {
@@ -334,6 +335,7 @@ class SourceChannelImpl
 
         readLock.lock();
         try {
+            ensureOpen();
             boolean blocking = isBlocking();
             long n = 0;
             try {
diff --git a/test/jdk/java/nio/channels/Channels/ClosedNetworkChannels.java b/test/jdk/java/nio/channels/Channels/ClosedNetworkChannels.java
new file mode 100644
index 00000000000..208f73bf62b
--- /dev/null
+++ b/test/jdk/java/nio/channels/Channels/ClosedNetworkChannels.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2024, 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 8329190
+ * @summary Test that I/O operations on a closed network channel throw ClosedChannelException
+ *    and not AsynchronousCloseException
+ * @run junit ClosedNetworkChannels
+ */
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousCloseException;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.DatagramChannel;
+import java.nio.channels.NotYetConnectedException;
+import java.nio.channels.Pipe;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ClosedNetworkChannels {
+
+    /**
+     * An operation that does not return a result but may throw an exception.
+     */
+    @FunctionalInterface
+    interface ThrowingRunnable {
+        void run() throws Exception;
+    }
+
+    /**
+     * Assert that the given operation throws ClosedChannelException.
+     */
+    private void assertThrowsCCE(ThrowingRunnable op) throws Exception {
+        try {
+            op.run();
+            fail();
+        } catch (AsynchronousCloseException e) {
+            fail(e + " thrown");
+        } catch (ClosedChannelException e) {
+            // expected
+        }
+    }
+
+    /**
+     * Closes the given SocketChannel and checks that I/O ops throw ClosedChannelException.
+     */
+    private void testSocketChannel(SocketChannel sc) throws Exception {
+        sc.close();
+
+        InetAddress lb = InetAddress.getLoopbackAddress();
+        SocketAddress target = new InetSocketAddress(lb, 7777);  // any port will do
+
+        ByteBuffer bb = ByteBuffer.allocate(100);
+        ByteBuffer[] bufs = new ByteBuffer[] { bb };
+
+        assertThrowsCCE(() -> sc.connect(target));
+        assertThrowsCCE(() -> sc.finishConnect());
+        assertThrowsCCE(() -> sc.read(bb));
+        assertThrowsCCE(() -> sc.read(bufs));
+        assertThrowsCCE(() -> sc.read(bufs, 0, 1));
+        assertThrowsCCE(() -> sc.write(bb));
+        assertThrowsCCE(() -> sc.write(bufs));
+        assertThrowsCCE(() -> sc.write(bufs, 0, 1));
+    }
+
+    /**
+     * Test that I/O operations on a closed (but previously unconnected) SocketChannel
+     * throw ClosedChannelException.
+     */
+    @Test
+    void testUnconnectedSocketChannel() throws Exception {
+        SocketChannel sc = SocketChannel.open();
+        testSocketChannel(sc);
+    }
+
+    /**
+     * Test that I/O operations on a closed (but previously connected) SocketChannel
+     * throw ClosedChannelException.
+     */
+    @Test
+    void testConnectedSocketChannel() throws Exception {
+        try (ServerSocketChannel ssc = ServerSocketChannel.open()) {
+            ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+            try (SocketChannel sc = SocketChannel.open(ssc.getLocalAddress());
+                 SocketChannel peer = ssc.accept()) {
+                testSocketChannel(sc);
+            }
+        }
+    }
+
+    /**
+     * Test that the accept operation on a closed (but previously unbound) ServerSocketChannel
+     * throws ClosedChannelException.
+     */
+    @Test
+    void testUnboundServerSocketChannel() throws Exception {
+        ServerSocketChannel ssc = ServerSocketChannel.open();
+        ssc.close();
+        assertThrowsCCE(() -> ssc.accept());
+    }
+
+    /**
+     * Test that the accept operation on a closed (but previously bound) ServerSocketChannel
+     * throws ClosedChannelException.
+     */
+    @Test
+    void testBoundServerSocketChannel() throws Exception {
+        try (ServerSocketChannel ssc = ServerSocketChannel.open()) {
+            ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+            ssc.close();
+            assertThrowsCCE(() -> ssc.accept());
+        }
+    }
+
+    /**
+     * Test that I/O operations on a closed Pipe.SourceChannel and Pipe.SinkChannel
+     * throw ClosedChannelException.
+     */
+    @Test
+    void testSourceAndSinkChannels() throws Exception {
+        Pipe p = Pipe.open();
+        try (Pipe.SourceChannel source = p.source();
+             Pipe.SinkChannel sink = p.sink()) {
+            source.close();
+            sink.close();
+
+            ByteBuffer bb = ByteBuffer.allocate(100);
+            ByteBuffer[] bufs = new ByteBuffer[]{bb};
+
+            assertThrowsCCE(() -> source.read(bb));
+            assertThrowsCCE(() -> source.read(bufs));
+            assertThrowsCCE(() -> source.read(bufs, 0, 1));
+            assertThrowsCCE(() -> sink.write(bb));
+            assertThrowsCCE(() -> sink.write(bufs));
+            assertThrowsCCE(() -> sink.write(bufs, 0, 1));
+        }
+    }
+
+    /**
+     * Closes the given DatagramChannel and checks that I/O ops throw ClosedChannelException.
+     */
+    private void testDatagramChannel(DatagramChannel dc) throws Exception {
+        dc.close();
+
+        InetAddress lb = InetAddress.getLoopbackAddress();
+        SocketAddress target = new InetSocketAddress(lb, 7777);  // any port will do
+
+        ByteBuffer bb = ByteBuffer.allocate(100);
+        ByteBuffer[] bufs = new ByteBuffer[] { bb };
+
+        assertThrowsCCE(() -> dc.send(bb, target));
+        assertThrowsCCE(() -> dc.receive(bb));
+        assertThrowsCCE(() -> dc.read(bb));
+        assertThrowsCCE(() -> dc.read(bufs));
+        assertThrowsCCE(() -> dc.read(bufs, 0, 1));
+        assertThrowsCCE(() -> dc.write(bb));
+        assertThrowsCCE(() -> dc.write(bufs));
+        assertThrowsCCE(() -> dc.write(bufs, 0, 1));
+    }
+
+    /**
+     * Test that I/O operations on a closed (but previously unconnected) DatagramChannel
+     * throw ClosedChannelException.
+     */
+    @Test
+    void testUnconnectedDatagramChannel() throws Exception {
+        DatagramChannel dc = DatagramChannel.open();
+        testDatagramChannel(dc);
+    }
+
+    /**
+     * Test that I/O operations on a closed (but previously connected) DatagramChannel
+     * throw ClosedChannelException.
+     */
+    @Test
+    void testConnectedDatagramChannel() throws Exception {
+        try (DatagramChannel dc = DatagramChannel.open()) {
+            InetAddress lb = InetAddress.getLoopbackAddress();
+            dc.bind(new InetSocketAddress(lb, 0));
+            dc.connect(new InetSocketAddress(lb, 7777));  // any port will do
+            testDatagramChannel(dc);
+        }
+    }
+}

From 2ede14335a2c9133bf4f356189cfbd5839361d17 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 16 Apr 2024 16:04:43 +0000
Subject: [PATCH 064/486] 8330279: Typo in `java.text.Bidi` class description

Reviewed-by: iris, joehw
---
 src/java.base/share/classes/java/text/Bidi.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/text/Bidi.java b/src/java.base/share/classes/java/text/Bidi.java
index 2ec7bea6988..c500493da05 100644
--- a/src/java.base/share/classes/java/text/Bidi.java
+++ b/src/java.base/share/classes/java/text/Bidi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, 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
@@ -105,7 +105,7 @@ public final class Bidi {
      * <p>
      * The RUN_DIRECTION attribute in the text, if present, determines the base
      * direction (left-to-right or right-to-left).  If not present, the base
-     * direction is computes using the Unicode Bidirectional Algorithm, defaulting to left-to-right
+     * direction is computed using the Unicode Bidirectional Algorithm, defaulting to left-to-right
      * if there are no strong directional characters in the text.  This attribute, if
      * present, must be applied to all the text in the paragraph.
      * <p>

From 941bee197ff679e9b8755cad117f5172e3508ef2 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Tue, 16 Apr 2024 16:18:09 +0000
Subject: [PATCH 065/486] 8327640: Allow NumberFormat strict parsing

Reviewed-by: naoto
---
 .../share/classes/java/text/ChoiceFormat.java |  12 +
 .../java/text/CompactNumberFormat.java        | 131 ++++-
 .../classes/java/text/DecimalFormat.java      | 174 +++++-
 .../share/classes/java/text/Format.java       |  28 +-
 .../share/classes/java/text/NumberFormat.java | 131 +++--
 .../CompactNumberFormat/TestEquality.java     |  16 +-
 .../serialization/TestSerialization.java      |   5 +-
 .../Format/DecimalFormat/EqualityTest.java    |  53 ++
 .../DecimalFormat/SerializationTest.java      |  86 +++
 .../Format/NumberFormat/LenientParseTest.java | 417 ++++++++++++++
 .../NumberFormat/StrictMethodsTest.java       |  94 ++++
 .../Format/NumberFormat/StrictParseTest.java  | 525 ++++++++++++++++++
 12 files changed, 1569 insertions(+), 103 deletions(-)
 create mode 100644 test/jdk/java/text/Format/DecimalFormat/EqualityTest.java
 create mode 100644 test/jdk/java/text/Format/DecimalFormat/SerializationTest.java
 create mode 100644 test/jdk/java/text/Format/NumberFormat/LenientParseTest.java
 create mode 100644 test/jdk/java/text/Format/NumberFormat/StrictMethodsTest.java
 create mode 100644 test/jdk/java/text/Format/NumberFormat/StrictParseTest.java

diff --git a/src/java.base/share/classes/java/text/ChoiceFormat.java b/src/java.base/share/classes/java/text/ChoiceFormat.java
index 02c3d6b1d5c..5d71d9d7262 100644
--- a/src/java.base/share/classes/java/text/ChoiceFormat.java
+++ b/src/java.base/share/classes/java/text/ChoiceFormat.java
@@ -586,6 +586,18 @@ public class ChoiceFormat extends NumberFormat {
         return Double.valueOf(bestNumber);
     }
 
+    @Override
+    public boolean isStrict() {
+        throw new UnsupportedOperationException(
+                "ChoiceFormat does not utilize leniency when parsing");
+    }
+
+    @Override
+    public void setStrict(boolean strict) {
+        throw new UnsupportedOperationException(
+                "ChoiceFormat does not utilize leniency when parsing");
+    }
+
     /**
      * Finds the least double greater than {@code d}.
      * If {@code NaN}, returns same value.
diff --git a/src/java.base/share/classes/java/text/CompactNumberFormat.java b/src/java.base/share/classes/java/text/CompactNumberFormat.java
index 1bda7855fba..a477d9c2fd8 100644
--- a/src/java.base/share/classes/java/text/CompactNumberFormat.java
+++ b/src/java.base/share/classes/java/text/CompactNumberFormat.java
@@ -348,6 +348,15 @@ public final class CompactNumberFormat extends NumberFormat {
      */
     private String pluralRules = "";
 
+    /**
+     * True if this {@code CompactNumberFormat} will parse numbers with strict
+     * leniency.
+     *
+     * @serial
+     * @since 23
+     */
+    private boolean parseStrict = false;
+
     /**
      * The map for plural rules that maps LDML defined tags (e.g. "one") to
      * its rule.
@@ -1498,22 +1507,40 @@ public final class CompactNumberFormat extends NumberFormat {
     }
 
     /**
-     * Parses a compact number from a string to produce a {@code Number}.
+     * {@inheritDoc NumberFormat}
      * <p>
-     * The method attempts to parse text starting at the index given by
-     * {@code pos}.
-     * If parsing succeeds, then the index of {@code pos} is updated
-     * to the index after the last character used (parsing does not necessarily
-     * use all characters up to the end of the string), and the parsed
-     * number is returned. The updated {@code pos} can be used to
-     * indicate the starting point for the next call to this method.
-     * If an error occurs, then the index of {@code pos} is not
-     * changed, the error index of {@code pos} is set to the index of
-     * the character where the error occurred, and {@code null} is returned.
-     * <p>
-     * The value is the numeric part in the given text multiplied
+     * The returned value is the numeric part in the given text multiplied
      * by the numeric equivalent of the affix attached
      * (For example, "K" = 1000 in {@link java.util.Locale#US US locale}).
+     * <p>
+     * A {@code CompactNumberFormat} can match
+     * the default prefix/suffix to a compact prefix/suffix interchangeably.
+     * <p>
+     * Parsing can be done in either a strict or lenient manner, by default it is lenient.
+     * <p>
+     * Parsing fails when <b>lenient</b>, if the prefix and/or suffix are non-empty
+     * and cannot be found due to parsing ending early, or the first character
+     * after the prefix cannot be parsed.
+     * <p>
+     * Parsing fails when <b>strict</b>, if in {@code text},
+     * <ul>
+     *   <li> The default or a compact prefix is not found. For example, the {@code
+     *   Locale.US} currency format prefix: "{@code $}"
+     *   <li> The default or a compact suffix is not found. For example, a {@code Locale.US}
+     *   {@link NumberFormat.Style#SHORT} compact suffix: "{@code K}"
+     *   <li> {@link #isGroupingUsed()} returns {@code false}, and the grouping
+     *   symbol is found
+     *   <li> {@link #isGroupingUsed()} returns {@code true}, and {@link
+     *   #getGroupingSize()} is not adhered to
+     *   <li> {@link #isParseIntegerOnly()} returns {@code true}, and the decimal
+     *   separator is found
+     *   <li> {@link #isGroupingUsed()} returns {@code true} and {@link
+     *   #isParseIntegerOnly()} returns {@code false}, and the grouping
+     *   symbol occurs after the decimal separator
+     *   <li> Any other characters are found, that are not the expected symbols,
+     *   and are not digits that occur within the numerical portion
+     * </ul>
+     * <p>
      * The subclass returned depends on the value of
      * {@link #isParseBigDecimal}.
      * <ul>
@@ -1553,7 +1580,6 @@ public final class CompactNumberFormat extends NumberFormat {
      * @return the parsed value, or {@code null} if the parse fails
      * @throws     NullPointerException if {@code text} or
      *             {@code pos} is null
-     *
      */
     @Override
     public Number parse(String text, ParsePosition pos) {
@@ -1661,6 +1687,13 @@ public final class CompactNumberFormat extends NumberFormat {
                     return cnfMultiplier;
                 }
             }
+        } else {
+            // Neither prefix match, should fail now (strict or lenient), before
+            // position is incremented by subparseNumber(). Otherwise, an empty
+            // prefix could pass through here, position gets incremented by the
+            // numerical portion, and return a faulty errorIndex and index later.
+            pos.errorIndex = position;
+            return null;
         }
 
         digitList.setRoundingMode(getRoundingMode());
@@ -1705,6 +1738,11 @@ public final class CompactNumberFormat extends NumberFormat {
                 status, gotPositive, gotNegative, num);
 
         if (multiplier.longValue() == -1L) {
+            if (parseStrict) {
+                // When strict, if -1L was returned, index should be
+                // reset to the original index to ensure failure
+                pos.index = oldStart;
+            }
             return null;
         } else if (multiplier.longValue() != 1L) {
             cnfMultiplier = multiplier;
@@ -1886,7 +1924,10 @@ public final class CompactNumberFormat extends NumberFormat {
 
         if (prefix.equals(matchedPrefix)
                 || matchedPrefix.equals(defaultPrefix)) {
-            return matchAffix(text, position, suffix, defaultSuffix, matchedSuffix);
+            // Suffix must match exactly when strict
+            return parseStrict ? matchAffix(text, position, suffix, defaultSuffix, matchedSuffix)
+                    && text.length() == position + suffix.length()
+                    : matchAffix(text, position, suffix, defaultSuffix, matchedSuffix);
         }
         return false;
     }
@@ -1924,10 +1965,11 @@ public final class CompactNumberFormat extends NumberFormat {
             String positiveSuffix = getAffix(true, false, false, compactIndex, num);
             String negativeSuffix = getAffix(true, false, true, compactIndex, num);
 
-            // Do not break if a match occur; there is a possibility that the
+            // When lenient, do not break if a match occurs; there is a possibility that the
             // subsequent affixes may match the longer subsequence in the given
-            // string.
-            // For example, matching "3Mdx" with "M", "Md" should match with "Md"
+            // string. For example, matching "3Mdx" with "M", "Md" should match
+            // with "Md". However, when strict, break as the match should be exact,
+            // and thus no need to check for a longer suffix.
             boolean match = matchPrefixAndSuffix(text, position, positivePrefix, matchedPrefix,
                     defaultDecimalFormat.getPositivePrefix(), positiveSuffix,
                     matchedPosSuffix, defaultDecimalFormat.getPositiveSuffix());
@@ -1935,6 +1977,10 @@ public final class CompactNumberFormat extends NumberFormat {
                 matchedPosIndex = compactIndex;
                 matchedPosSuffix = positiveSuffix;
                 gotPos = true;
+                if (parseStrict) {
+                    // when strict, exit early with exact match, same for negative
+                    break;
+                }
             }
 
             match = matchPrefixAndSuffix(text, position, negativePrefix, matchedPrefix,
@@ -1944,29 +1990,39 @@ public final class CompactNumberFormat extends NumberFormat {
                 matchedNegIndex = compactIndex;
                 matchedNegSuffix = negativeSuffix;
                 gotNeg = true;
+                if (parseStrict) {
+                    break;
+                }
             }
         }
 
         // Suffix in the given text does not match with the compact
         // patterns suffixes; match with the default suffix
+        // When strict, text must end with the default suffix
         if (!gotPos && !gotNeg) {
             String positiveSuffix = defaultDecimalFormat.getPositiveSuffix();
             String negativeSuffix = defaultDecimalFormat.getNegativeSuffix();
-            if (text.regionMatches(position, positiveSuffix, 0,
-                    positiveSuffix.length())) {
+            boolean containsPosSuffix = text.regionMatches(position,
+                    positiveSuffix, 0, positiveSuffix.length());
+            boolean endsWithPosSuffix = containsPosSuffix && text.length() ==
+                    position + positiveSuffix.length();
+            if (parseStrict ? endsWithPosSuffix : containsPosSuffix) {
                 // Matches the default positive prefix
                 matchedPosSuffix = positiveSuffix;
                 gotPos = true;
             }
-            if (text.regionMatches(position, negativeSuffix, 0,
-                    negativeSuffix.length())) {
+            boolean containsNegSuffix = text.regionMatches(position,
+                    negativeSuffix, 0, negativeSuffix.length());
+            boolean endsWithNegSuffix = containsNegSuffix && text.length() ==
+                    position + negativeSuffix.length();
+            if (parseStrict ? endsWithNegSuffix : containsNegSuffix) {
                 // Matches the default negative suffix
                 matchedNegSuffix = negativeSuffix;
                 gotNeg = true;
             }
         }
 
-        // If both matches, take the longest one
+        // If both match, take the longest one
         if (gotPos && gotNeg) {
             if (matchedPosSuffix.length() > matchedNegSuffix.length()) {
                 gotNeg = false;
@@ -2077,6 +2133,7 @@ public final class CompactNumberFormat extends NumberFormat {
         decimalFormat.setGroupingSize(getGroupingSize());
         decimalFormat.setGroupingUsed(isGroupingUsed());
         decimalFormat.setParseIntegerOnly(isParseIntegerOnly());
+        decimalFormat.setStrict(parseStrict);
 
         try {
             defaultDecimalFormat = new DecimalFormat(decimalPattern, symbols);
@@ -2316,6 +2373,31 @@ public final class CompactNumberFormat extends NumberFormat {
         super.setParseIntegerOnly(value);
     }
 
+    /**
+     * {@inheritDoc NumberFormat}
+     *
+     * @see #setStrict(boolean)
+     * @see #parse(String, ParsePosition)
+     * @since 23
+     */
+    @Override
+    public boolean isStrict() {
+        return parseStrict;
+    }
+
+    /**
+     * {@inheritDoc NumberFormat}
+     *
+     * @see #isStrict()
+     * @see #parse(String, ParsePosition)
+     * @since 23
+     */
+    @Override
+    public void setStrict(boolean strict) {
+        decimalFormat.setStrict(strict);
+        parseStrict = strict; // don't call super, default is UOE
+    }
+
     /**
      * Returns whether the {@link #parse(String, ParsePosition)}
      * method returns {@code BigDecimal}. The default value is false.
@@ -2373,7 +2455,8 @@ public final class CompactNumberFormat extends NumberFormat {
                 && roundingMode.equals(other.roundingMode)
                 && pluralRules.equals(other.pluralRules)
                 && groupingSize == other.groupingSize
-                && parseBigDecimal == other.parseBigDecimal;
+                && parseBigDecimal == other.parseBigDecimal
+                && parseStrict == other.parseStrict;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index c235cf5b790..752c3924855 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -50,6 +50,7 @@ import java.util.Currency;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+
 import sun.util.locale.provider.LocaleProviderAdapter;
 import sun.util.locale.provider.ResourceBundleBasedAdapter;
 
@@ -2140,18 +2141,32 @@ public class DecimalFormat extends NumberFormat {
     }
 
     /**
-     * Parses text from a string to produce a {@code Number}.
+     * {@inheritDoc NumberFormat}
      * <p>
-     * The method attempts to parse text starting at the index given by
-     * {@code pos}.
-     * If parsing succeeds, then the index of {@code pos} is updated
-     * to the index after the last character used (parsing does not necessarily
-     * use all characters up to the end of the string), and the parsed
-     * number is returned. The updated {@code pos} can be used to
-     * indicate the starting point for the next call to this method.
-     * If an error occurs, then the index of {@code pos} is not
-     * changed, the error index of {@code pos} is set to the index of
-     * the character where the error occurred, and null is returned.
+     * Parsing can be done in either a strict or lenient manner, by default it is lenient.
+     * <p>
+     * Parsing fails when <b>lenient</b>, if the prefix and/or suffix are non-empty
+     * and cannot be found due to parsing ending early, or the first character
+     * after the prefix cannot be parsed.
+     * <p>
+     * Parsing fails when <b>strict</b>, if in {@code text},
+     * <ul>
+     *   <li> The prefix is not found. For example, a {@code Locale.US} currency
+     *   format prefix: "{@code $}"
+     *   <li> The suffix is not found. For example, a {@code Locale.US} percent
+     *   format suffix: "{@code %}"
+     *   <li> {@link #isGroupingUsed()} returns {@code true}, and {@link
+     *   #getGroupingSize()} is not adhered to
+     *   <li> {@link #isGroupingUsed()} returns {@code false}, and the grouping
+     *   symbol is found
+     *   <li> {@link #isParseIntegerOnly()} returns {@code true}, and the decimal
+     *   separator is found
+     *   <li> {@link #isGroupingUsed()} returns {@code true} and {@link
+     *   #isParseIntegerOnly()} returns {@code false}, and the grouping
+     *   symbol occurs after the decimal separator
+     *   <li> Any other characters are found, that are not the expected symbols,
+     *   and are not digits that occur within the numerical portion
+     * </ul>
      * <p>
      * The subclass returned depends on the value of {@link #isParseBigDecimal}
      * as well as on the string being parsed.
@@ -2371,22 +2386,34 @@ public class DecimalFormat extends NumberFormat {
             return false;
         }
 
+        // position will serve as new index when success, otherwise it will
+        // serve as errorIndex when failure
         position = subparseNumber(text, position, digits, true, isExponent, status);
+
+        // First character after the prefix was un-parseable, should
+        // fail regardless if lenient or strict.
         if (position == -1) {
             parsePosition.index = oldStart;
             parsePosition.errorIndex = oldStart;
             return false;
         }
 
-        // Check for suffix
+        // When strict, text should end with the suffix.
+        // When lenient, text only needs to contain the suffix.
         if (!isExponent) {
             if (gotPositive) {
-                gotPositive = text.regionMatches(position,positiveSuffix,0,
-                        positiveSuffix.length());
+                boolean containsPosSuffix =
+                        text.regionMatches(position, positiveSuffix, 0, positiveSuffix.length());
+                boolean endsWithPosSuffix =
+                        containsPosSuffix && text.length() == position + positiveSuffix.length();
+                gotPositive = parseStrict ? endsWithPosSuffix : containsPosSuffix;
             }
             if (gotNegative) {
-                gotNegative = text.regionMatches(position,negativeSuffix,0,
-                        negativeSuffix.length());
+                boolean containsNegSuffix =
+                        text.regionMatches(position, negativeSuffix, 0, negativeSuffix.length());
+                boolean endsWithNegSuffix =
+                        containsNegSuffix && text.length() == position + negativeSuffix.length();
+                gotNegative = parseStrict ? endsWithNegSuffix : containsNegSuffix;
             }
 
             // If both match, take longest
@@ -2404,8 +2431,9 @@ public class DecimalFormat extends NumberFormat {
                 return false;
             }
 
+            // No failures, thus increment the index by the suffix
             parsePosition.index = position +
-                    (gotPositive ? positiveSuffix.length() : negativeSuffix.length()); // mark success!
+                    (gotPositive ? positiveSuffix.length() : negativeSuffix.length());
         } else {
             parsePosition.index = position;
         }
@@ -2420,7 +2448,7 @@ public class DecimalFormat extends NumberFormat {
 
     /**
      * Parses a number from the given {@code text}. The text is parsed
-     * beginning at position, until an unparseable character is seen.
+     * beginning at {@code position}, until an unparseable character is seen.
      *
      * @param text the string to parse
      * @param position the position at which parsing begins
@@ -2438,7 +2466,7 @@ public class DecimalFormat extends NumberFormat {
                        boolean isExponent, boolean[] status) {
         // process digits or Inf, find decimal position
         status[STATUS_INFINITE] = false;
-        if (!isExponent && text.regionMatches(position,symbols.getInfinity(),0,
+        if (!isExponent && text.regionMatches(position, symbols.getInfinity(), 0,
                 symbols.getInfinity().length())) {
             position += symbols.getInfinity().length();
             status[STATUS_INFINITE] = true;
@@ -2467,6 +2495,8 @@ public class DecimalFormat extends NumberFormat {
             // We have to track digitCount ourselves, because digits.count will
             // pin when the maximum allowable digits is reached.
             int digitCount = 0;
+            int prevSeparatorIndex = -groupingSize;
+            int startPos = position; // Rely on startPos as index after prefix
 
             int backup = -1;
             for (; position < text.length(); ++position) {
@@ -2488,6 +2518,13 @@ public class DecimalFormat extends NumberFormat {
                     digit = Character.digit(ch, 10);
                 }
 
+                // Enforce the grouping size on the first group
+                if (parseStrict && isGroupingUsed() && position == startPos + groupingSize
+                        && prevSeparatorIndex == -groupingSize && !sawDecimal
+                        && digit >= 0 && digit <= 9) {
+                    return position;
+                }
+
                 if (digit == 0) {
                     // Cancel out backup setting (see grouping handler below)
                     backup = -1; // Do this BEFORE continue statement below!!!
@@ -2517,6 +2554,10 @@ public class DecimalFormat extends NumberFormat {
                     // Cancel out backup setting (see grouping handler below)
                     backup = -1;
                 } else if (!isExponent && ch == decimal) {
+                    // Check grouping size on decimal separator
+                    if (parseStrict && isGroupingViolation(position, prevSeparatorIndex)) {
+                        return groupingViolationIndex(position, prevSeparatorIndex);
+                    }
                     // If we're only parsing integers, or if we ALREADY saw the
                     // decimal, then don't parse this one.
                     if (isParseIntegerOnly() || sawDecimal) {
@@ -2525,8 +2566,23 @@ public class DecimalFormat extends NumberFormat {
                     digits.decimalAt = digitCount; // Not digits.count!
                     sawDecimal = true;
                 } else if (!isExponent && ch == grouping && isGroupingUsed()) {
-                    if (sawDecimal) {
-                        break;
+                    if (parseStrict) {
+                        // text should not start with grouping when strict
+                        if (position == startPos) {
+                            return startPos;
+                        }
+                        // when strict, fail if grouping occurs after decimal OR
+                        // current group violates grouping size
+                        if (sawDecimal || (isGroupingViolation(position, prevSeparatorIndex))) {
+                            return groupingViolationIndex(position, prevSeparatorIndex);
+                        }
+                        prevSeparatorIndex = position; // track previous
+                    } else {
+                        // when lenient, only exit if grouping occurs after decimal
+                        // subsequent grouping symbols are allowed when lenient
+                        if (sawDecimal) {
+                            break;
+                        }
                     }
                     // Ignore grouping characters, if we are using them, but
                     // require that they be followed by a digit.  Otherwise
@@ -2554,6 +2610,23 @@ public class DecimalFormat extends NumberFormat {
                 }
             }
 
+            // (When strict), within the loop we enforce grouping when encountering
+            // decimal/grouping symbols. Once outside loop, we need to check
+            // the final grouping, ex: "1,234". Only check the final grouping
+            // if we have not seen a decimal separator, to prevent a non needed check,
+            // for ex: "1,234.", "1,234.12"
+            if (parseStrict) {
+                if (!sawDecimal && isGroupingViolation(position, prevSeparatorIndex)) {
+                    // -1, since position is incremented by one too many when loop is finished
+                    // "1,234%" and "1,234" both end with pos = 5, since '%' breaks
+                    // the loop before incrementing position. In both cases, check
+                    // should be done at pos = 4
+                    return groupingViolationIndex(position - 1, prevSeparatorIndex);
+                }
+            }
+
+            // If a grouping symbol is not followed by a digit, it must be
+            // backed up to either exit early or fail depending on leniency
             if (backup != -1) {
                 position = backup;
             }
@@ -2575,7 +2648,30 @@ public class DecimalFormat extends NumberFormat {
             }
         }
         return position;
+    }
 
+    // Checks to make sure grouping size is not violated. Used when strict.
+    private boolean isGroupingViolation(int pos, int prevGroupingPos) {
+        assert parseStrict : "Grouping violations should only occur when strict";
+        return isGroupingUsed() && // Only violates if using grouping
+                // Checks if a previous grouping symbol was seen.
+                prevGroupingPos != -groupingSize &&
+                // The check itself, - 1 to account for grouping/decimal symbol
+                pos - 1 != prevGroupingPos + groupingSize;
+    }
+
+    // Calculates the index that violated the grouping size
+    // Violation can be over or under the grouping size
+    // under - Current group has a grouping size of less than the expected
+    // over - Current group has a grouping size of more than the expected
+    private int groupingViolationIndex(int pos, int prevGroupingPos) {
+        // Both examples assume grouping size of 3 and 0 indexed
+        // under ex: "1,23,4". (4) OR "1,,2". (2) When under, violating char is grouping symbol
+        // over ex: "1,2345,6. (5) When over, violating char is the excess digit
+        // This method is only evaluated when a grouping symbol is found, thus
+        // we can take the minimum of either the current pos, or where we expect
+        // the current group to have ended
+        return Math.min(pos, prevGroupingPos + groupingSize + 1);
     }
 
     /**
@@ -2888,6 +2984,30 @@ public class DecimalFormat extends NumberFormat {
         fastPathCheckNeeded = true;
     }
 
+    /**
+     * {@inheritDoc NumberFormat}
+     *
+     * @see #setStrict(boolean)
+     * @see #parse(String, ParsePosition)
+     * @since 23
+     */
+    @Override
+    public boolean isStrict() {
+        return parseStrict;
+    }
+
+    /**
+     * {@inheritDoc NumberFormat}
+     *
+     * @see #isStrict()
+     * @see #parse(String, ParsePosition)
+     * @since 23
+     */
+    @Override
+    public void setStrict(boolean strict) {
+        parseStrict = strict;
+    }
+
     /**
      * Returns whether the {@link #parse(java.lang.String, java.text.ParsePosition)}
      * method returns {@code BigDecimal}. The default value is false.
@@ -2991,7 +3111,8 @@ public class DecimalFormat extends NumberFormat {
             && maximumFractionDigits == other.maximumFractionDigits
             && minimumFractionDigits == other.minimumFractionDigits
             && roundingMode == other.roundingMode
-            && symbols.equals(other.symbols);
+            && symbols.equals(other.symbols)
+            && parseStrict == other.parseStrict;
     }
 
     /**
@@ -4176,6 +4297,15 @@ public class DecimalFormat extends NumberFormat {
      */
     private boolean useExponentialNotation;  // Newly persistent in the Java 2 platform v.1.2
 
+    /**
+     * True if this {@code DecimalFormat} will parse numbers with strict
+     * leniency.
+     *
+     * @serial
+     * @since 23
+     */
+    private boolean parseStrict = false;
+
     /**
      * FieldPositions describing the positive prefix String. This is
      * lazily created. Use {@code getPositivePrefixFieldPositions}
diff --git a/src/java.base/share/classes/java/text/Format.java b/src/java.base/share/classes/java/text/Format.java
index 18b656c2c84..81efc27acf4 100644
--- a/src/java.base/share/classes/java/text/Format.java
+++ b/src/java.base/share/classes/java/text/Format.java
@@ -106,6 +106,9 @@ import java.io.Serializable;
  * </pre>
  * </blockquote>
  *
+ * <p> Subclasses may also consider implementing leniency when parsing.
+ * The definition of leniency should be delegated to the subclass.
+ *
  * <p>
  * And finally subclasses may define a set of constants to identify the various
  * fields in the formatted output. These constants are used to create a FieldPosition
@@ -210,37 +213,36 @@ public abstract class Format implements Serializable, Cloneable {
     }
 
     /**
-     * Parses text from a string to produce an object.
+     * Parses text from the given string to produce an object.
      * <p>
-     * The method attempts to parse text starting at the index given by
-     * {@code pos}.
-     * If parsing succeeds, then the index of {@code pos} is updated
+     * This method attempts to parse text starting at the index given by
+     * {@code pos}. If parsing succeeds, then the index of {@code pos} is updated
      * to the index after the last character used (parsing does not necessarily
      * use all characters up to the end of the string), and the parsed
      * object is returned. The updated {@code pos} can be used to
      * indicate the starting point for the next call to this method.
      * If an error occurs, then the index of {@code pos} is not
      * changed, the error index of {@code pos} is set to the index of
-     * the character where the error occurred, and null is returned.
+     * the character where the error occurred, and {@code null} is returned.
      *
-     * @param source A {@code String}, part of which should be parsed.
+     * @param source the {@code String} to parse
      * @param pos A {@code ParsePosition} object with index and error
      *            index information as described above.
      * @return An {@code Object} parsed from the string. In case of
-     *         error, returns null.
-     * @throws NullPointerException if {@code source} or {@code pos} is null.
+     *         error, returns {@code null}.
+     * @throws NullPointerException if {@code source} or {@code pos} is
+     *         {@code null}.
      */
     public abstract Object parseObject (String source, ParsePosition pos);
 
     /**
      * Parses text from the beginning of the given string to produce an object.
-     * The method may not use the entire text of the given string.
+     * This method may not use the entire text of the given string.
      *
-     * @param source A {@code String} whose beginning should be parsed.
+     * @param source A {@code String}, to be parsed from the beginning.
      * @return An {@code Object} parsed from the string.
-     * @throws    ParseException if the beginning of the specified string
-     *            cannot be parsed.
-     * @throws NullPointerException if {@code source} is null.
+     * @throws ParseException if parsing fails
+     * @throws NullPointerException if {@code source} is {@code null}.
      */
     public Object parseObject(String source) throws ParseException {
         ParsePosition pos = new ParsePosition(0);
diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java
index 716cfb710c4..bd36ad6dc25 100644
--- a/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/src/java.base/share/classes/java/text/NumberFormat.java
@@ -38,8 +38,8 @@
 
 package java.text;
 
-import java.io.InvalidObjectException;
 import java.io.IOException;
+import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.math.BigInteger;
@@ -52,6 +52,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+
 import sun.util.locale.provider.LocaleProviderAdapter;
 import sun.util.locale.provider.LocaleServiceProviderPool;
 
@@ -147,7 +148,6 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
  * if false, 3456.00 &rarr; "3456"
  * This is independent of parsing.  If you want parsing to stop at the decimal
  * point, use setParseIntegerOnly.
- *
  * <p>
  * You can also use forms of the {@code parse} and {@code format}
  * methods with {@code ParsePosition} and {@code FieldPosition} to
@@ -175,9 +175,23 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
  *      numbers: "(12)" for -12.
  * </ol>
  *
- * <h2><a id="synchronization">Synchronization</a></h2>
- *
+ * <h2><a id="leniency">Leniency</a></h2>
+ * {@code NumberFormat} by default, parses leniently. Subclasses may consider
+ * implementing strict parsing and as such, overriding and providing
+ * implementations for the optional {@link #isStrict()} and {@link
+ * #setStrict(boolean)} methods.
  * <p>
+ * Lenient parsing should be used when attempting to parse a number
+ * out of a String that contains non-numerical or non-format related values.
+ * For example, using a {@link Locale#US} currency format to parse the number
+ * {@code 1000} out of the String "$1,000.00 was paid".
+ * <p>
+ * Strict parsing should be used when attempting to ensure a String adheres exactly
+ * to a locale's conventions, and can thus serve to validate input. For example, successfully
+ * parsing the number {@code 1000.55} out of the String "1.000,55" confirms the String
+ * exactly adhered to the {@link Locale#GERMANY} numerical conventions.
+ *
+ * <h2><a id="synchronization">Synchronization</a></h2>
  * Number formats are generally not synchronized.
  * It is recommended to create separate format instances for each thread.
  * If multiple threads access a format concurrently, it must be synchronized
@@ -285,23 +299,11 @@ public abstract class NumberFormat extends Format  {
     }
 
     /**
-     * Parses text from a string to produce a {@code Number}.
-     * <p>
-     * The method attempts to parse text starting at the index given by
-     * {@code pos}.
-     * If parsing succeeds, then the index of {@code pos} is updated
-     * to the index after the last character used (parsing does not necessarily
-     * use all characters up to the end of the string), and the parsed
-     * number is returned. The updated {@code pos} can be used to
-     * indicate the starting point for the next call to this method.
-     * If an error occurs, then the index of {@code pos} is not
-     * changed, the error index of {@code pos} is set to the index of
-     * the character where the error occurred, and null is returned.
-     * <p>
-     * See the {@link #parse(String, ParsePosition)} method for more information
-     * on number parsing.
+     * {@inheritDoc Format}
      *
-     * @param source A {@code String}, part of which should be parsed.
+     * @implSpec This implementation is equivalent to calling {@code parse(source,
+     *           pos)}.
+     * @param source the {@code String} to parse
      * @param pos A {@code ParsePosition} object with index and error
      *            index information as described above.
      * @return A {@code Number} parsed from the string. In case of
@@ -399,33 +401,44 @@ public abstract class NumberFormat extends Format  {
                                         FieldPosition pos);
 
     /**
-     * Returns a Long if possible (e.g., within the range [Long.MIN_VALUE,
+     * Parses text from the beginning of the given string to produce a {@code Number}.
+     * <p>
+     * This method attempts to parse text starting at the index given by the
+     * {@code ParsePosition}. If parsing succeeds, then the index of the {@code
+     * ParsePosition} is updated to the index after the last character used
+     * (parsing does not necessarily use all characters up to the end of the
+     * string), and the parsed number is returned. The updated {@code
+     * ParsePosition} can be used to indicate the starting
+     * point for the next call to this method. If an error occurs, then the
+     * index of the {@code ParsePosition} is not changed, the error index of the
+     * {@code ParsePosition} is set to the index of the character where the error
+     * occurred, and {@code null} is returned.
+     * <p>
+     * This method will return a Long if possible (e.g., within the range [Long.MIN_VALUE,
      * Long.MAX_VALUE] and with no decimals), otherwise a Double.
-     * If IntegerOnly is set, will stop at a decimal
-     * point (or equivalent; e.g., for rational numbers "1 2/3", will stop
-     * after the 1).
-     * Does not throw an exception; if no object can be parsed, index is
-     * unchanged!
      *
-     * @param source the String to parse
-     * @param parsePosition the parse position
-     * @return the parsed value
-     * @see java.text.NumberFormat#isParseIntegerOnly
-     * @see java.text.Format#parseObject
+     * @param source the {@code String} to parse
+     * @param parsePosition A {@code ParsePosition} object with index and error
+     *            index information as described above.
+     * @return A {@code Number} parsed from the string. In case of
+     *         failure, returns {@code null}.
+     * @throws NullPointerException if {@code source} or {@code ParsePosition}
+     *         is {@code null}.
+     * @see #isStrict()
      */
     public abstract Number parse(String source, ParsePosition parsePosition);
 
     /**
-     * Parses text from the beginning of the given string to produce a number.
-     * The method may not use the entire text of the given string.
+     * Parses text from the beginning of the given string to produce a {@code Number}.
      * <p>
-     * See the {@link #parse(String, ParsePosition)} method for more information
-     * on number parsing.
+     * This method will return a Long if possible (e.g., within the range [Long.MIN_VALUE,
+     * Long.MAX_VALUE] and with no decimals), otherwise a Double.
      *
-     * @param source A {@code String} whose beginning should be parsed.
+     * @param source A {@code String}, to be parsed from the beginning.
      * @return A {@code Number} parsed from the string.
-     * @throws    ParseException if the beginning of the specified string
-     *            cannot be parsed.
+     * @throws ParseException if parsing fails
+     * @throws NullPointerException if {@code source} is {@code null}.
+     * @see #isStrict()
      */
     public Number parse(String source) throws ParseException {
         ParsePosition parsePosition = new ParsePosition(0);
@@ -463,6 +476,44 @@ public abstract class NumberFormat extends Format  {
         parseIntegerOnly = value;
     }
 
+    /**
+     * {@return {@code true} if this format will parse numbers strictly;
+     * {@code false} otherwise}
+     *
+     * @implSpec The default implementation always throws {@code
+     * UnsupportedOperationException}. Subclasses should override this method
+     * when implementing strict parsing.
+     * @throws    UnsupportedOperationException if the implementation of this
+     *            method does not support this operation
+     * @see ##leniency Leniency Section
+     * @see #setStrict(boolean)
+     * @since 23
+     */
+    public boolean isStrict() {
+        throw new UnsupportedOperationException("Subclasses should override this " +
+                "method when implementing strict parsing");
+    }
+
+    /**
+     * Change the leniency value for parsing. Parsing can either be strict or lenient,
+     * by default it is lenient.
+     *
+     * @implSpec The default implementation always throws {@code
+     * UnsupportedOperationException}. Subclasses should override this method
+     * when implementing strict parsing.
+     * @param strict {@code true} if parsing should be done strictly;
+     *               {@code false} otherwise
+     * @throws    UnsupportedOperationException if the implementation of this
+     *            method does not support this operation
+     * @see ##leniency Leniency Section
+     * @see #isStrict()
+     * @since 23
+     */
+    public void setStrict(boolean strict) {
+        throw new UnsupportedOperationException("Subclasses should override this " +
+                "method when implementing strict parsing");
+    }
+
     //============== Locale Stuff =====================
 
     /**
@@ -759,12 +810,12 @@ public abstract class NumberFormat extends Format  {
             return false;
         }
         NumberFormat other = (NumberFormat) obj;
-        return (maximumIntegerDigits == other.maximumIntegerDigits
+        return maximumIntegerDigits == other.maximumIntegerDigits
             && minimumIntegerDigits == other.minimumIntegerDigits
             && maximumFractionDigits == other.maximumFractionDigits
             && minimumFractionDigits == other.minimumFractionDigits
             && groupingUsed == other.groupingUsed
-            && parseIntegerOnly == other.parseIntegerOnly);
+            && parseIntegerOnly == other.parseIntegerOnly;
     }
 
     /**
diff --git a/test/jdk/java/text/Format/CompactNumberFormat/TestEquality.java b/test/jdk/java/text/Format/CompactNumberFormat/TestEquality.java
index b5d0ae860ed..584f8c2c9bd 100644
--- a/test/jdk/java/text/Format/CompactNumberFormat/TestEquality.java
+++ b/test/jdk/java/text/Format/CompactNumberFormat/TestEquality.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 8177552 8222756
+ * @bug 8177552 8222756 8327640
  * @summary Checks the equals and hashCode method of CompactNumberFormat
  * @modules jdk.localedata
  * @run testng/othervm TestEquality
@@ -131,6 +131,18 @@ public class TestEquality {
         cnf1.setParseBigDecimal(true);
         checkEquals(cnf1, cnf2, false, "8th", "different parse big decimal");
 
+        // Changing the parseBigDecimal of second object; objects must be equal
+        cnf2.setParseBigDecimal(true);
+        checkEquals(cnf1, cnf2, true, "9th", "");
+
+        // Changing the strict parsing value of first object; objects must not be equal
+        cnf1.setStrict(true);
+        checkEquals(cnf1, cnf2, false, "10th", "different strict parsing");
+
+        // Changing the strict parsing value of second object; objects must be equal
+        cnf2.setStrict(true);
+        checkEquals(cnf1, cnf2, true, "11th", "");
+
     }
 
     private void checkEquals(CompactNumberFormat cnf1, CompactNumberFormat cnf2,
diff --git a/test/jdk/java/text/Format/CompactNumberFormat/serialization/TestSerialization.java b/test/jdk/java/text/Format/CompactNumberFormat/serialization/TestSerialization.java
index 55f950bd674..574e6dc7905 100644
--- a/test/jdk/java/text/Format/CompactNumberFormat/serialization/TestSerialization.java
+++ b/test/jdk/java/text/Format/CompactNumberFormat/serialization/TestSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 8177552
+ * @bug 8177552 8327640
  * @modules jdk.localedata
  * @summary Checks the serialization feature of CompactNumberFormat
  * @run testng/othervm TestSerialization
@@ -71,6 +71,7 @@ public class TestSerialization {
 
         FORMAT_FR_FR.setParseIntegerOnly(true);
         FORMAT_FR_FR.setGroupingUsed(true);
+        FORMAT_FR_FR.setStrict(true);
 
         // Setting minimum integer digits beyond the allowed range
         FORMAT_DE_DE.setMinimumIntegerDigits(320);
diff --git a/test/jdk/java/text/Format/DecimalFormat/EqualityTest.java b/test/jdk/java/text/Format/DecimalFormat/EqualityTest.java
new file mode 100644
index 00000000000..42d66170e5b
--- /dev/null
+++ b/test/jdk/java/text/Format/DecimalFormat/EqualityTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2024, 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 8327640
+ * @summary Check parseStrict correctness for DecimalFormat.equals()
+ * @run junit EqualityTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.text.DecimalFormat;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class EqualityTest {
+
+    private static final DecimalFormat fmt1 = new DecimalFormat();
+    private static final DecimalFormat fmt2 = new DecimalFormat();
+
+    // Ensure that parseStrict is reflected correctly for DecimalFormat.equals()
+    @Test
+    public void checkStrictTest() {
+        // parseStrict is false by default
+        assertEquals(fmt1, fmt2);
+        fmt1.setStrict(true);
+        assertNotEquals(fmt1, fmt2);
+        fmt2.setStrict(true);
+        assertEquals(fmt1, fmt2);
+    }
+}
diff --git a/test/jdk/java/text/Format/DecimalFormat/SerializationTest.java b/test/jdk/java/text/Format/DecimalFormat/SerializationTest.java
new file mode 100644
index 00000000000..09e3f6cf809
--- /dev/null
+++ b/test/jdk/java/text/Format/DecimalFormat/SerializationTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2024, 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 8327640
+ * @summary Check parseStrict correctness for DecimalFormat serialization
+ * @run junit/othervm SerializationTest
+ */
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.text.NumberFormat;
+import java.text.ParseException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class SerializationTest {
+
+    private static final NumberFormat FORMAT = NumberFormat.getInstance();
+
+    @BeforeAll
+    public static void mutateFormat() {
+        FORMAT.setStrict(true);
+    }
+
+    @Test
+    public void testSerialization() throws IOException, ClassNotFoundException {
+        // Serialize
+        serialize("fmt.ser", FORMAT);
+        // Deserialize
+        deserialize("fmt.ser", FORMAT);
+    }
+
+    private void serialize(String fileName, NumberFormat... formats)
+            throws IOException {
+        try (ObjectOutputStream os = new ObjectOutputStream(
+                new FileOutputStream(fileName))) {
+            for (NumberFormat fmt : formats) {
+                os.writeObject(fmt);
+            }
+        }
+    }
+
+    private static void deserialize(String fileName, NumberFormat... formats)
+            throws IOException, ClassNotFoundException {
+        try (ObjectInputStream os = new ObjectInputStream(
+                new FileInputStream(fileName))) {
+            for (NumberFormat fmt : formats) {
+                NumberFormat obj = (NumberFormat) os.readObject();
+                assertEquals(fmt, obj, "Serialized and deserialized"
+                        + " objects do not match");
+
+                String badNumber = "fooofooo23foo";
+                assertThrows(ParseException.class, () -> fmt.parse(badNumber));
+                assertThrows(ParseException.class, () -> obj.parse(badNumber));
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/text/Format/NumberFormat/LenientParseTest.java b/test/jdk/java/text/Format/NumberFormat/LenientParseTest.java
new file mode 100644
index 00000000000..948ccb247e8
--- /dev/null
+++ b/test/jdk/java/text/Format/NumberFormat/LenientParseTest.java
@@ -0,0 +1,417 @@
+/*
+ * Copyright (c) 2024, 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 8327640
+ * @summary Test suite for NumberFormat parsing when lenient.
+ * @run junit/othervm -Duser.language=en -Duser.country=US LenientParseTest
+ * @run junit/othervm -Duser.language=ja -Duser.country=JP LenientParseTest
+ * @run junit/othervm -Duser.language=zh -Duser.country=CN LenientParseTest
+ * @run junit/othervm -Duser.language=tr -Duser.country=TR LenientParseTest
+ * @run junit/othervm -Duser.language=de -Duser.country=DE LenientParseTest
+ * @run junit/othervm -Duser.language=fr -Duser.country=FR LenientParseTest
+ * @run junit/othervm -Duser.language=ar -Duser.country=AR LenientParseTest
+ */
+
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.text.CompactNumberFormat;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+// Tests lenient parsing, this is done by testing the NumberFormat factory instances
+// against a number of locales with different formatting conventions. The locales
+// used all use a grouping size of 3. When lenient, parsing only fails
+// if the prefix and/or suffix are not found, or the first character after the
+// prefix is un-parseable. The tested locales all use groupingSize of 3.
+public class LenientParseTest {
+
+    // Used to retrieve the locale's expected symbols
+    private static final DecimalFormatSymbols dfs =
+            new DecimalFormatSymbols(Locale.getDefault());
+    private static final DecimalFormat dFmt = (DecimalFormat)
+            NumberFormat.getNumberInstance(Locale.getDefault());
+    private static final DecimalFormat cFmt =
+            (DecimalFormat) NumberFormat.getCurrencyInstance(Locale.getDefault());
+    private static final DecimalFormat pFmt =
+            (DecimalFormat) NumberFormat.getPercentInstance(Locale.getDefault());
+    private static final CompactNumberFormat cmpctFmt =
+            (CompactNumberFormat) NumberFormat.getCompactNumberInstance(Locale.getDefault(),
+                    NumberFormat.Style.SHORT);
+
+    // All NumberFormats should parse leniently (which is the default)
+    static {
+        // To effectively test compactNumberFormat, these should be set accordingly
+        cmpctFmt.setParseIntegerOnly(false);
+        cmpctFmt.setGroupingUsed(true);
+    }
+
+    // ---- NumberFormat tests ----
+    // Test prefix/suffix behavior with a predefined DecimalFormat
+    // Non-localized, only run once
+    @ParameterizedTest
+    @MethodSource("badParseStrings")
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void numFmtFailParseTest(String toParse, int expectedErrorIndex) {
+        // Format with grouping size = 3, prefix = a, suffix = b
+        DecimalFormat nonLocalizedDFmt = new DecimalFormat("a#,#00.00b");
+        failParse(nonLocalizedDFmt, toParse, expectedErrorIndex);
+    }
+
+    // All input Strings should parse fully and return the expected value.
+    // Expected index should be the length of the parse string, since it parses fully
+    @ParameterizedTest
+    @MethodSource("validFullParseStrings")
+    public void numFmtSuccessFullParseTest(String toParse, double expectedValue) {
+        assertEquals(expectedValue, successParse(dFmt, toParse, toParse.length()));
+    }
+
+    // All input Strings should parse partially and return expected value
+    // with the expected final index
+    @ParameterizedTest
+    @MethodSource("validPartialParseStrings")
+    public void numFmtSuccessPartialParseTest(String toParse, double expectedValue,
+                                              int expectedIndex) {
+        assertEquals(expectedValue, successParse(dFmt, toParse, expectedIndex));
+    }
+
+    // Parse partially due to no grouping
+    @ParameterizedTest
+    @MethodSource("noGroupingParseStrings")
+    public void numFmtStrictGroupingNotUsed(String toParse, double expectedValue, int expectedIndex) {
+        dFmt.setGroupingUsed(false);
+        assertEquals(expectedValue, successParse(dFmt, toParse, expectedIndex));
+        dFmt.setGroupingUsed(true);
+    }
+
+    // Parse partially due to integer only
+    @ParameterizedTest
+    @MethodSource("integerOnlyParseStrings")
+    public void numFmtStrictIntegerOnlyUsed(String toParse, int expectedValue, int expectedIndex) {
+        dFmt.setParseIntegerOnly(true);
+        assertEquals(expectedValue, successParse(dFmt, toParse, expectedIndex));
+        dFmt.setParseIntegerOnly(false);
+    }
+
+    // ---- CurrencyFormat tests ----
+    // All input Strings should pass and return expected value.
+    @ParameterizedTest
+    @MethodSource("currencyValidFullParseStrings")
+    public void currFmtSuccessParseTest(String toParse, double expectedValue) {
+        assertEquals(expectedValue, successParse(cFmt, toParse, toParse.length()));
+    }
+
+    // Strings may parse partially or fail. This is because the mapped
+    // data may cause the error to occur before the suffix can be found, (if the locale
+    // uses a suffix).
+    @ParameterizedTest
+    @MethodSource("currencyValidPartialParseStrings")
+    public void currFmtParseTest(String toParse, double expectedValue,
+                                 int expectedIndex) {
+        if (cFmt.getPositiveSuffix().length() > 0) {
+            // Since the error will occur before suffix is found, exception is thrown.
+            failParse(cFmt, toParse, expectedIndex);
+        } else {
+            // Empty suffix, thus even if the error occurs, we have already found the
+            // prefix, and simply parse partially
+            assertEquals(expectedValue, successParse(cFmt, toParse, expectedIndex));
+        }
+    }
+
+    // ---- PercentFormat tests ----
+    // All input Strings should pass and return expected value.
+    @ParameterizedTest
+    @MethodSource("percentValidFullParseStrings")
+    public void percentFmtSuccessParseTest(String toParse, double expectedValue) {
+        assertEquals(expectedValue, successParse(pFmt, toParse, toParse.length()));
+    }
+
+    // Strings may parse partially or fail. This is because the mapped
+    // data may cause the error to occur before the suffix can be found, (if the locale
+    // uses a suffix).
+    @ParameterizedTest
+    @MethodSource("percentValidPartialParseStrings")
+    public void percentFmtParseTest(String toParse, double expectedValue,
+                                 int expectedIndex) {
+        if (pFmt.getPositiveSuffix().length() > 0) {
+            // Since the error will occur before suffix is found, exception is thrown.
+            failParse(pFmt, toParse, expectedIndex);
+        } else {
+            // Empty suffix, thus even if the error occurs, we have already found the
+            // prefix, and simply parse partially
+            assertEquals(expectedValue, successParse(pFmt, toParse, expectedIndex));
+        }
+    }
+
+    // ---- CompactNumberFormat tests ----
+    // Can match to both the decimalFormat patterns and the compact patterns
+    // Unlike the other tests, this test is only ran against the US Locale and
+    // tests against data built with the thousands format (K).
+    @ParameterizedTest
+    @MethodSource("compactValidPartialParseStrings")
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void compactFmtFailParseTest(String toParse, double expectedValue, int expectedErrorIndex) {
+        assertEquals(expectedValue, successParse(cmpctFmt, toParse, expectedErrorIndex));
+    }
+
+
+    @ParameterizedTest
+    @MethodSource("compactValidFullParseStrings")
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void compactFmtSuccessParseTest(String toParse, double expectedValue) {
+        assertEquals(expectedValue, successParse(cmpctFmt, toParse, toParse.length()));
+    }
+
+    // ---- Helper test methods ----
+
+    // Method is used when a String should parse successfully. This does not indicate
+    // that the entire String was used, however. The index and errorIndex values
+    // should be as expected.
+    private double successParse(NumberFormat fmt, String toParse, int expectedIndex) {
+        Number parsedValue = assertDoesNotThrow(() -> fmt.parse(toParse));
+        ParsePosition pp = new ParsePosition(0);
+        assertDoesNotThrow(() -> fmt.parse(toParse, pp));
+        assertEquals(-1, pp.getErrorIndex(),
+                "ParsePosition ErrorIndex is not in correct location");
+        assertEquals(expectedIndex, pp.getIndex(),
+                "ParsePosition Index is not in correct location");
+        return parsedValue.doubleValue();
+    }
+
+    // Method is used when a String should fail parsing. Indicated by either a thrown
+    // ParseException, or null is returned depending on which parse method is invoked.
+    // errorIndex should be as expected.
+    private void failParse(NumberFormat fmt, String toParse, int expectedErrorIndex) {
+        ParsePosition pp = new ParsePosition(0);
+        assertThrows(ParseException.class, () -> fmt.parse(toParse));
+        assertNull(fmt.parse(toParse, pp));
+        assertEquals(expectedErrorIndex, pp.getErrorIndex());
+    }
+
+    // ---- Data Providers ----
+
+    // Strings that should fail when parsed leniently.
+    // Given as Arguments<String, expectedErrorIndex>
+    // Non-localized data. For reference, the pattern of nonLocalizedDFmt is
+    // "a#,#00.00b"
+    private static Stream<Arguments> badParseStrings() {
+        return Stream.of(
+                // No prefix
+                Arguments.of("1,1b", 0),
+                // No suffix
+                Arguments.of("a1,11", 5),
+                // Digit does not follow the last grouping separator
+                // Current behavior fails on the grouping separator
+                Arguments.of("a1,11,z", 5),
+                // No suffix after grouping
+                Arguments.of("a1,11,", 5),
+                // No prefix and suffix
+                Arguments.of("1,11", 0),
+                // First character after prefix is un-parseable
+                // Behavior is to expect error index at 0, not 1
+                Arguments.of("ac1,11", 0));
+    }
+
+    // These data providers use US locale grouping and decimal separators
+    // for readability, however, the data is tested against multiple locales
+    // and is converted appropriately at runtime.
+
+    // Strings that should parse successfully, and consume the entire String
+    // Form of Arguments(parseString, expectedParsedNumber)
+    private static Stream<Arguments> validFullParseStrings() {
+        return Stream.of(
+                // Many subsequent grouping symbols
+                Arguments.of("1,,,1", 11d),
+                Arguments.of("11,,,11,,,11", 111111d),
+                // Bad grouping size (with decimal)
+                Arguments.of("1,1.", 11d),
+                Arguments.of("11,111,11.", 1111111d),
+                // Improper grouping size (with decimal and digits after)
+                Arguments.of("1,1.1", 11.1d),
+                Arguments.of("1,11.1", 111.1d),
+                Arguments.of("1,1111.1", 11111.1d),
+                Arguments.of("11,111,11.1", 1111111.1d),
+                // Starts with grouping symbol
+                Arguments.of(",111,,1,1", 11111d),
+                Arguments.of(",1", 1d),
+                Arguments.of(",,1", 1d),
+                // Leading Zeros (not digits)
+                Arguments.of("000,1,1", 11d),
+                Arguments.of("000,111,11,,1", 111111d),
+                Arguments.of("0,000,1,,1,1", 111d),
+                Arguments.of("1,234.00", 1234d),
+                Arguments.of("1,234.0", 1234d),
+                Arguments.of("1,234.", 1234d),
+                Arguments.of("1,234.00123", 1234.00123d),
+                Arguments.of("1,234.012", 1234.012d),
+                Arguments.of("1,234.224", 1234.224d),
+                Arguments.of("1", 1d),
+                Arguments.of("10", 10d),
+                Arguments.of("100", 100d),
+                Arguments.of("1000", 1000d),
+                Arguments.of("1,000", 1000d),
+                Arguments.of("10,000", 10000d),
+                Arguments.of("10000", 10000d),
+                Arguments.of("100,000", 100000d),
+                Arguments.of("1,000,000", 1000000d),
+                Arguments.of("10,000,000", 10000000d))
+                .map(args -> Arguments.of(
+                        localizeText(String.valueOf(args.get()[0])), args.get()[1]));
+    }
+
+    // Strings that should parse successfully, but do not use the entire String
+    // Form of Arguments(parseString, expectedParsedNumber, expectedIndex)
+    private static Stream<Arguments> validPartialParseStrings() {
+        return Stream.of(
+                // End with grouping symbol
+                Arguments.of("11,", 11d, 2),
+                Arguments.of("11,,", 11d, 3),
+                Arguments.of("11,,,", 11d, 4),
+                // Random chars that aren't the expected symbols
+                Arguments.of("1,1P111", 11d, 3),
+                Arguments.of("1.1P111", 1.1d, 3),
+                Arguments.of("1P,1111", 1d, 1),
+                Arguments.of("1P.1111", 1d, 1),
+                Arguments.of("1,1111P", 11111d, 6),
+                // Grouping occurs after decimal separator)
+                Arguments.of("1.11,11", 1.11d, 4),
+                Arguments.of("1.,11,11", 1d, 2))
+                .map(args -> Arguments.of(
+                        localizeText(String.valueOf(args.get()[0])), args.get()[1], args.get()[2]));
+    }
+
+    // Test data input for when parse integer only is true
+    // Form of Arguments(parseString, expectedParsedNumber, expectedIndex)
+    private static Stream<Arguments> integerOnlyParseStrings() {
+        return Stream.of(
+                Arguments.of("1234.1234", 1234, 4),
+                Arguments.of("1234.12", 1234, 4),
+                Arguments.of("1234.1a", 1234, 4),
+                Arguments.of("1234.", 1234, 4))
+                .map(args -> Arguments.of(
+                        localizeText(String.valueOf(args.get()[0])), args.get()[1], args.get()[2]));
+    }
+
+    // Test data input for when no grouping is true
+    // Form of Arguments(parseString, expectedParsedNumber, expectedIndex)
+    private static Stream<Arguments> noGroupingParseStrings() {
+        return Stream.of(
+                Arguments.of("12,34", 12d, 2),
+                Arguments.of("1234,", 1234d, 4),
+                Arguments.of("123,456.789", 123d, 3))
+                .map(args -> Arguments.of(
+                        localizeText(String.valueOf(args.get()[0])), args.get()[1], args.get()[2]));
+    }
+
+    // Mappers for respective data providers to adjust values accordingly
+    // Localized percent prefix/suffix is added, with appropriate expected values
+    // adjusted. Expected parsed number should be divided by 100.
+    private static Stream<Arguments> percentValidPartialParseStrings() {
+        return validPartialParseStrings().map(args ->
+                Arguments.of(pFmt.getPositivePrefix() + args.get()[0] + pFmt.getPositiveSuffix(),
+                        (double) args.get()[1] / 100, (int) args.get()[2] + pFmt.getPositivePrefix().length())
+        );
+    }
+
+    private static Stream<Arguments> percentValidFullParseStrings() {
+        return validFullParseStrings().map(args -> Arguments.of(
+                pFmt.getPositivePrefix() + args.get()[0] + pFmt.getPositiveSuffix(),
+                (double) args.get()[1] / 100)
+        );
+    }
+
+    // Mappers for respective data providers to adjust values accordingly
+    // Localized percent prefix/suffix is added, with appropriate expected values
+    // adjusted. Separators replaced for monetary versions.
+    private static Stream<Arguments> currencyValidPartialParseStrings() {
+        return validPartialParseStrings().map(args -> Arguments.of(
+                cFmt.getPositivePrefix() + String.valueOf(args.get()[0])
+                        .replace(dfs.getGroupingSeparator(), dfs.getMonetaryGroupingSeparator())
+                        .replace(dfs.getDecimalSeparator(), dfs.getMonetaryDecimalSeparator())
+                        + cFmt.getPositiveSuffix(),
+                args.get()[1], (int) args.get()[2] + cFmt.getPositivePrefix().length())
+        );
+    }
+
+    private static Stream<Arguments> currencyValidFullParseStrings() {
+        return validFullParseStrings().map(args -> Arguments.of(
+                cFmt.getPositivePrefix() + String.valueOf(args.get()[0])
+                        .replace(dfs.getGroupingSeparator(), dfs.getMonetaryGroupingSeparator())
+                        .replace(dfs.getDecimalSeparator(), dfs.getMonetaryDecimalSeparator())
+                        + cFmt.getPositiveSuffix(),
+                args.get()[1])
+        );
+    }
+
+    // Compact Pattern Data Provider provides test input for both DecimalFormat patterns
+    // and the compact patterns. As there is no method to retrieve compact patterns,
+    // thus test only against US English locale, and use a hard coded K - 1000
+    private static Stream<Arguments> compactValidPartialParseStrings() {
+        return Stream.concat(validPartialParseStrings().map(args -> Arguments.of(args.get()[0],
+                args.get()[1], args.get()[2])), validPartialParseStrings().map(args -> Arguments.of(args.get()[0] + "K",
+                args.get()[1], args.get()[2]))
+        );
+    }
+
+    private static Stream<Arguments> compactValidFullParseStrings() {
+        return Stream.concat(validFullParseStrings().map(args -> Arguments.of(args.get()[0],
+                args.get()[1])), validFullParseStrings().map(args -> Arguments.of(args.get()[0] + "K",
+                (double)args.get()[1] * 1000.0))
+        );
+    }
+
+    // Replace the grouping and decimal separators with localized variants
+    // Used during localization of data
+    private static String localizeText(String text) {
+        // As this is a single pass conversion, this is safe for multiple replacement,
+        // even if a ',' could be a decimal separator for a locale.
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < text.length(); i++) {
+            char c = text.charAt(i);
+            if (c == ',') {
+                sb.append(dfs.getGroupingSeparator());
+            } else if (c == '.') {
+                sb.append(dfs.getDecimalSeparator());
+            } else if (c == '0') {
+                sb.append(dfs.getZeroDigit());
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/test/jdk/java/text/Format/NumberFormat/StrictMethodsTest.java b/test/jdk/java/text/Format/NumberFormat/StrictMethodsTest.java
new file mode 100644
index 00000000000..cab027ce2e2
--- /dev/null
+++ b/test/jdk/java/text/Format/NumberFormat/StrictMethodsTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2024, 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 8327640
+ * @summary Unit test for the isStrict() and setStrict() parsing related methods
+ * @run junit StrictMethodsTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.text.CompactNumberFormat;
+import java.text.DecimalFormat;
+import java.text.FieldPosition;
+import java.text.NumberFormat;
+import java.text.ParsePosition;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class StrictMethodsTest {
+
+    // Check that DecimalFormat implements isStrict()/setStrict()
+    // Ensure that the default value is false, and can be set to true via API
+    @Test
+    public void decimalFormatTest() {
+        DecimalFormat dFmt = (DecimalFormat) NumberFormat.getInstance();
+        assertFalse(dFmt.isStrict());
+        dFmt.setStrict(true);
+        assertTrue(dFmt.isStrict());
+    }
+
+    // Check that CompactNumberFormat implements isStrict()/setStrict()
+    // Ensure that the default value is false, and can be set to true via API
+    @Test
+    public void compactFormatTest() {
+        CompactNumberFormat cFmt = (CompactNumberFormat) NumberFormat.getCompactNumberInstance();
+        assertFalse(cFmt.isStrict());
+        cFmt.setStrict(true);
+        assertTrue(cFmt.isStrict());
+    }
+
+    // Check that NumberFormat throws exception for isStrict()/setStrict()
+    // when subclass does not implement said methods
+    @Test
+    public void numberFormatTest() {
+        FooFormat fmt = new FooFormat();
+        assertThrows(UnsupportedOperationException.class, fmt::isStrict);
+        assertThrows(UnsupportedOperationException.class, () -> fmt.setStrict(false));
+    }
+
+    // Dummy NumberFormat class to check that isStrict() and setStrict()
+    // are not implemented by default
+    private static class FooFormat extends NumberFormat {
+
+        // Provide overrides for abstract methods
+        @Override
+        public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) {
+            return null;
+        }
+
+        @Override
+        public StringBuffer format(long number, StringBuffer toAppendTo, FieldPosition pos) {
+            return null;
+        }
+
+        @Override
+        public Number parse(String source, ParsePosition parsePosition) {
+            return null;
+        }
+    }
+}
diff --git a/test/jdk/java/text/Format/NumberFormat/StrictParseTest.java b/test/jdk/java/text/Format/NumberFormat/StrictParseTest.java
new file mode 100644
index 00000000000..3fa1fc70faf
--- /dev/null
+++ b/test/jdk/java/text/Format/NumberFormat/StrictParseTest.java
@@ -0,0 +1,525 @@
+/*
+ * Copyright (c) 2024, 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 8327640
+ * @summary Test suite for NumberFormat parsing with strict leniency
+ * @run junit/othervm -Duser.language=en -Duser.country=US StrictParseTest
+ * @run junit/othervm -Duser.language=ja -Duser.country=JP StrictParseTest
+ * @run junit/othervm -Duser.language=zh -Duser.country=CN StrictParseTest
+ * @run junit/othervm -Duser.language=tr -Duser.country=TR StrictParseTest
+ * @run junit/othervm -Duser.language=de -Duser.country=DE StrictParseTest
+ * @run junit/othervm -Duser.language=fr -Duser.country=FR StrictParseTest
+ * @run junit/othervm -Duser.language=ar -Duser.country=AR StrictParseTest
+ */
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.text.CompactNumberFormat;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+// Tests strict parsing, this is done by testing the NumberFormat factory instances
+// against a number of locales with different formatting conventions. The locales
+// used all use a grouping size of 3.
+public class StrictParseTest {
+
+    // Used to retrieve the locale's expected symbols
+    private static final DecimalFormatSymbols dfs =
+            new DecimalFormatSymbols(Locale.getDefault());
+    // We re-use these formats for the respective factory tests
+    private static final DecimalFormat dFmt =
+            (DecimalFormat) NumberFormat.getNumberInstance(Locale.getDefault());
+    private static final DecimalFormat cFmt =
+            (DecimalFormat) NumberFormat.getCurrencyInstance(Locale.getDefault());
+    private static final DecimalFormat pFmt =
+            (DecimalFormat) NumberFormat.getPercentInstance(Locale.getDefault());
+    private static final CompactNumberFormat cmpctFmt =
+            (CompactNumberFormat) NumberFormat.getCompactNumberInstance(Locale.getDefault(),
+                    NumberFormat.Style.SHORT);
+
+
+    // All NumberFormats should parse strictly
+    static {
+        dFmt.setStrict(true);
+        pFmt.setStrict(true);
+        cFmt.setStrict(true);
+        cmpctFmt.setStrict(true);
+        // To effectively test strict compactNumberFormat parsing
+        cmpctFmt.setParseIntegerOnly(false);
+        cmpctFmt.setGroupingUsed(true);
+        cmpctFmt.setGroupingSize(3);
+    }
+
+    // ---- NumberFormat tests ----
+
+    // Guarantee some edge case test input
+    @Test // Non-localized, run once
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void uniqueCaseNumberFormatTest() {
+        // Format with grouping size = 3, prefix = a, suffix = b
+        DecimalFormat nonLocalizedDFmt = new DecimalFormat("a#,#00.00b");
+        nonLocalizedDFmt.setStrict(true);
+        // Text after suffix
+        failParse(nonLocalizedDFmt, "a12bfoo", 3);
+        failParse(nonLocalizedDFmt, "a123,456.00bc", 11);
+        // Text after prefix
+        failParse(nonLocalizedDFmt, "ac123", 0);
+        // Missing suffix
+        failParse(nonLocalizedDFmt, "a123", 4);
+        // Prefix contains a decimal separator
+        failParse(nonLocalizedDFmt, ".a123", 0);
+        // Test non grouping size of 3
+        nonLocalizedDFmt.setGroupingSize(1);
+        successParse(nonLocalizedDFmt, "a1,2,3,4b");
+        failParse(nonLocalizedDFmt, "a1,2,3,45,6b", 8);
+        nonLocalizedDFmt.setGroupingSize(5);
+        successParse(nonLocalizedDFmt, "a12345,67890b");
+        successParse(nonLocalizedDFmt, "a1234,67890b");
+        failParse(nonLocalizedDFmt, "a123456,7890b", 6);
+
+    }
+
+    // All input Strings should fail
+    @ParameterizedTest
+    @MethodSource("badParseStrings")
+    public void numFmtFailParseTest(String toParse, int expectedErrorIndex) {
+        failParse(dFmt, toParse, expectedErrorIndex);
+    }
+
+    // All input Strings should pass and return expected value.
+    @ParameterizedTest
+    @MethodSource("validParseStrings")
+    public void numFmtSuccessParseTest(String toParse, double expectedValue) {
+        assertEquals(expectedValue, successParse(dFmt, toParse));
+    }
+
+    // All input Strings should fail
+    @ParameterizedTest
+    @MethodSource("negativeBadParseStrings")
+    public void negNumFmtFailParseTest(String toParse, int expectedErrorIndex) {
+        failParse(dFmt, toParse, expectedErrorIndex);
+    }
+
+    // All input Strings should pass and return expected value.
+    @ParameterizedTest
+    @MethodSource("negativeValidParseStrings")
+    public void negNumFmtSuccessParseTest(String toParse, double expectedValue) {
+        assertEquals(expectedValue, successParse(dFmt, toParse));
+    }
+
+    // Exception should be thrown if grouping separator occurs anywhere
+    // Don't pass badParseStrings as a data source, since they may fail for other reasons
+    @ParameterizedTest
+    @MethodSource({"validParseStrings", "noGroupingParseStrings"})
+    public void numFmtStrictGroupingNotUsed(String toParse) {
+        // When grouping is not used, if a grouping separator is found,
+        // a failure should occur
+        dFmt.setGroupingUsed(false);
+        int failIndex = toParse.indexOf(
+                dFmt.getDecimalFormatSymbols().getGroupingSeparator());
+        if (failIndex > -1) {
+            failParse(dFmt, toParse, failIndex);
+        } else {
+            successParse(dFmt, toParse);
+        }
+        dFmt.setGroupingUsed(true);
+    }
+
+    // Exception should be thrown if decimal separator occurs anywhere
+    // Don't pass badParseStrings for same reason as previous method.
+    @ParameterizedTest
+    @MethodSource({"validParseStrings", "integerOnlyParseStrings"})
+    public void numFmtStrictIntegerOnlyUsed(String toParse) {
+        // When integer only is true, if a decimal separator is found,
+        // a failure should occur
+        dFmt.setParseIntegerOnly(true);
+        int failIndex = toParse.indexOf(dfs.getDecimalSeparator());
+        if (failIndex > -1) {
+            failParse(dFmt, toParse, failIndex);
+        } else {
+            successParse(dFmt, toParse);
+        }
+        dFmt.setParseIntegerOnly(false);
+    }
+
+    // ---- CurrencyFormat tests ----
+    @ParameterizedTest
+    @MethodSource("currencyBadParseStrings")
+    public void currFmtFailParseTest(String toParse, int expectedErrorIndex) {
+        failParse(cFmt, toParse, expectedErrorIndex);
+    }
+
+    @ParameterizedTest
+    @MethodSource("currencyValidParseStrings")
+    public void currFmtSuccessParseTest(String toParse, double expectedValue) {
+        assertEquals(expectedValue, successParse(cFmt, toParse));
+    }
+
+    // ---- PercentFormat tests ----
+    @ParameterizedTest
+    @MethodSource("percentBadParseStrings")
+    public void percentFmtFailParseTest(String toParse, int expectedErrorIndex) {
+        failParse(pFmt, toParse, expectedErrorIndex);
+    }
+
+    @ParameterizedTest
+    @MethodSource("percentValidParseStrings")
+    public void percentFmtSuccessParseTest(String toParse, double expectedValue) {
+        assertEquals(expectedValue, successParse(pFmt, toParse));
+    }
+
+    // ---- CompactNumberFormat tests ----
+    // Can match to both the decimalFormat patterns and the compact patterns
+    // Thus we test leniency for both. Unlike the other tests, this test
+    // is only ran against the US Locale and tests against data built with the
+    // thousands format (K).
+    @ParameterizedTest
+    @MethodSource("compactBadParseStrings")
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void compactFmtFailParseTest(String toParse, int expectedErrorIndex) {
+        failParse(cmpctFmt, toParse, expectedErrorIndex);
+    }
+
+    @ParameterizedTest
+    @MethodSource("compactValidParseStrings")
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void compactFmtSuccessParseTest(String toParse, double expectedValue) {
+        assertEquals(expectedValue, successParse(cmpctFmt, toParse));
+    }
+
+    // Checks some odd leniency edge cases between matching of default pattern
+    // and compact pattern.
+    @Test // Non-localized, run once
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void compactFmtEdgeParseTest() {
+        // Uses a compact format with unique and non-empty prefix/suffix for both
+        // default and compact patterns
+        CompactNumberFormat cnf = new CompactNumberFormat("a##0.0#b", DecimalFormatSymbols
+                .getInstance(Locale.US), new String[]{"", "c0d"});
+        cnf.setStrict(true);
+
+        // Existing behavior of failed prefix parsing has errorIndex return
+        // the beginning of prefix, even if the error occurred later in the prefix.
+        // Prefix empty
+        failParse(cnf, "12345d", 0);
+        failParse(cnf, "1b", 0);
+        // Prefix bad
+        failParse(cnf, "aa1d", 0);
+        failParse(cnf, "cc1d", 0);
+        failParse(cnf, "aa1b", 0);
+        failParse(cnf, "cc1b", 0);
+
+        // Suffix error index is always the start of the failed suffix
+        // not necessarily where the error occurred in the suffix. This is
+        // consistent with the prefix error index behavior.
+        // Suffix empty
+        failParse(cnf, "a1", 2);
+        failParse(cnf, "c1", 2);
+        // Suffix bad
+        failParse(cnf, "a1dd", 2);
+        failParse(cnf, "c1dd", 2);
+        failParse(cnf, "a1bb", 2);
+        failParse(cnf, "c1bb", 2);
+    }
+
+    // Ensure that on failure, the original index of the PP remains the same
+    @Test
+    public void parsePositionIndexTest() {
+        failParse(dFmt, localizeText("123,456,,789.00"), 8, 4);
+    }
+
+    // ---- Helper test methods ----
+
+    // Should parse entire String successfully, and return correctly parsed value.
+    private double successParse(NumberFormat fmt, String toParse) {
+        // For Strings that don't have grouping separators, we test them with
+        // grouping off so that they do not fail under the expectation that
+        // grouping symbols should occur
+        if (!toParse.contains(String.valueOf(dfs.getGroupingSeparator())) &&
+                !toParse.contains(String.valueOf(dfs.getMonetaryGroupingSeparator()))) {
+            fmt.setGroupingUsed(false);
+        }
+        Number parsedValue = assertDoesNotThrow(() -> fmt.parse(toParse));
+        ParsePosition pp = new ParsePosition(0);
+        assertDoesNotThrow(() -> fmt.parse(toParse, pp));
+        assertEquals(-1, pp.getErrorIndex(),
+                "ParsePosition ErrorIndex is not in correct location");
+        assertEquals(toParse.length(), pp.getIndex(),
+                "ParsePosition Index is not in correct location");
+        fmt.setGroupingUsed(true);
+        return parsedValue.doubleValue();
+    }
+
+    // Method which tests a parsing failure. Either a ParseException is thrown,
+    // or null is returned depending on which parse method is invoked. When failing,
+    // index should remain the initial index set to the ParsePosition while
+    // errorIndex is the index of failure.
+    private void failParse(NumberFormat fmt, String toParse, int expectedErrorIndex) {
+        failParse(fmt, toParse, expectedErrorIndex, 0);
+    }
+
+    // Variant to check non 0 initial parse index
+    private void failParse(NumberFormat fmt, String toParse,
+                           int expectedErrorIndex, int initialParseIndex) {
+        ParsePosition pp = new ParsePosition(initialParseIndex);
+        assertThrows(ParseException.class, () -> fmt.parse(toParse));
+        assertNull(fmt.parse(toParse, pp));
+        assertEquals(expectedErrorIndex, pp.getErrorIndex());
+        assertEquals(initialParseIndex, pp.getIndex());
+    }
+
+    // ---- Data Providers ----
+    // These data providers use US locale grouping and decimal separators
+    // for readability, however, the data is tested against multiple locales
+    // and is converted appropriately at runtime.
+
+    // Strings that should fail when parsed with strict leniency.
+    // Given as Arguments<String, expectedErrorIndex>
+    private static Stream<Arguments> badParseStrings() {
+        return Stream.of(
+                // Grouping symbol focus
+                // Grouping symbol right before decimal
+                Arguments.of("1,.", 2),
+                Arguments.of("1,.1", 2),
+                // Does not end with proper grouping size
+                Arguments.of("1,1", 2),
+                Arguments.of("1,11", 3),
+                Arguments.of("1,1111", 5),
+                Arguments.of("11,111,11", 8),
+                // Does not end with proper grouping size (with decimal)
+                Arguments.of("1,1.", 3),
+                Arguments.of("1,11.", 4),
+                Arguments.of("1,1111.", 5),
+                Arguments.of("11,111,11.", 9),
+                // Ends on a grouping symbol
+                // Suffix matches correctly, so failure is on the ","
+                Arguments.of("11,111,", 6),
+                Arguments.of("11,", 2),
+                Arguments.of("11,,", 3),
+                // Ends with grouping symbol. Failure should occur on grouping,
+                // even if non recognized char after
+                Arguments.of("11,a", 2),
+                // Improper grouping size (with decimal and digits after)
+                Arguments.of("1,1.1", 3),
+                Arguments.of("1,11.1", 4),
+                Arguments.of("1,1111.1", 5),
+                Arguments.of("11,111,11.1", 9),
+                // Subsequent grouping symbols
+                Arguments.of("1,,1", 2),
+                Arguments.of("1,1,,1", 3),
+                Arguments.of("1,,1,1", 2),
+                // Invalid grouping sizes
+                Arguments.of("1,11,111", 4),
+                Arguments.of("11,11,111", 5),
+                Arguments.of("111,11,11", 6),
+                // First group is too large
+                Arguments.of("1111,11,111", 3),
+                Arguments.of("00000,11,111", 3),
+                Arguments.of("111,1111111111", 7),
+                Arguments.of("111,11", 5),
+                Arguments.of("111,1111111111.", 7),
+                Arguments.of("111,11.", 6),
+                Arguments.of("111,1111111111.", 7),
+                // Starts with grouping symbol
+                Arguments.of(",111,,1,1", 0),
+                Arguments.of(",1", 0),
+                Arguments.of(",,1", 0),
+                // Leading Zeros (not digits)
+                Arguments.of("000,1,1", 5),
+                Arguments.of("000,111,11,,1", 10),
+                Arguments.of("0,000,1,,1,1", 7),
+                // Bad suffix
+                Arguments.of("1a", 1),
+                // Bad chars in numerical portion
+                Arguments.of("123a4", 3),
+                Arguments.of("123.4a5", 5),
+                // Variety of edge cases
+                Arguments.of("123,456.77a", 10),
+                Arguments.of("1,234a", 5),
+                Arguments.of("1,.a", 2),
+                Arguments.of("1.a", 2),
+                Arguments.of(".22a", 3),
+                Arguments.of(".1a1", 2),
+                Arguments.of("1,234,a", 5))
+                .map(args -> Arguments.of(
+                        localizeText(String.valueOf(args.get()[0])), args.get()[1]));
+    }
+
+    // Strings that should parse fully. (Both in lenient and strict)
+    // Given as Arguments<String, expectedParsedNumber>
+    private static Stream<Arguments> validParseStrings() {
+        return Stream.of(
+                Arguments.of("1,234.00", 1234d),
+                Arguments.of("1,234.0", 1234d),
+                Arguments.of("1,234.", 1234d),
+                Arguments.of("1", 1d),
+                Arguments.of("10", 10d),
+                Arguments.of("100", 100d),
+                Arguments.of("1000", 1000d),
+                Arguments.of("1,000", 1000d),
+                Arguments.of("10,000", 10000d),
+                Arguments.of("10000", 10000d),
+                Arguments.of("100,000", 100000d),
+                Arguments.of("1,000,000", 1000000d),
+                Arguments.of("10,000,000", 10000000d))
+                .map(args -> Arguments.of(
+                        localizeText(String.valueOf(args.get()[0])), args.get()[1]));
+    }
+
+    // Separate test data set for integer only. Can not use "badParseStrings", as
+    // there is test data where the failure may occur from some other issue,
+    // not related to grouping
+    private static Stream<Arguments> integerOnlyParseStrings() {
+        return Stream.of(
+                Arguments.of("234.a"),
+                Arguments.of("234.a1"),
+                Arguments.of("234.1"),
+                Arguments.of("234.1a"),
+                Arguments.of("234."))
+                .map(args -> Arguments.of(localizeText(String.valueOf(args.get()[0]))));
+    }
+
+    // Separate test data set for no grouping. Can not use "badParseStrings", as
+    // there is test data where the failure may occur from some other issue,
+    // not related to grouping
+    private static Stream<Arguments> noGroupingParseStrings() {
+        return Stream.of(
+                Arguments.of("12,34.a"),
+                Arguments.of("123,.a1"),
+                Arguments.of(",1234"),
+                Arguments.of("123,"))
+                .map(args -> Arguments.of(localizeText(String.valueOf(args.get()[0]))));
+    }
+
+    // Negative variant of a numerical format
+    private static Stream<Arguments> negativeBadParseStrings() {
+        return badParseStrings().map(args -> Arguments.of(
+                dFmt.getNegativePrefix() + args.get()[0] + dFmt.getNegativeSuffix(),
+                (int)args.get()[1] + dFmt.getNegativePrefix().length())
+        );
+    }
+
+    // Negative variant of a numerical format
+    private static Stream<Arguments> negativeValidParseStrings() {
+        return validParseStrings().map(args -> Arguments.of(
+                dFmt.getNegativePrefix() + args.get()[0] + dFmt.getNegativeSuffix(),
+                (double) args.get()[1] * -1)
+        );
+    }
+
+    // Same as original with a percent prefix/suffix.
+    // Additionally, increment expected error index if a prefix is added
+    private static Stream<Arguments> percentBadParseStrings() {
+        return badParseStrings().map(args -> Arguments.of(
+                pFmt.getPositivePrefix() + args.get()[0] + pFmt.getPositiveSuffix(),
+                        (int)args.get()[1] + pFmt.getPositivePrefix().length())
+        );
+    }
+
+    // Expected parsed value should be / 100 as it is a percent format.
+    private static Stream<Arguments> percentValidParseStrings() {
+        return validParseStrings().map(args -> Arguments.of(
+                pFmt.getPositivePrefix() + args.get()[0] + pFmt.getPositiveSuffix(),
+                (double)args.get()[1] / 100.0)
+        );
+    }
+
+    // Same as original with a currency prefix/suffix, but replace separators
+    // with monetary variants. Additionally, increment expected error index
+    // if a prefix is added
+    private static Stream<Arguments> currencyBadParseStrings() {
+        return badParseStrings().map(args -> Arguments.of(
+                cFmt.getPositivePrefix() + String.valueOf(args.get()[0])
+                        .replace(dfs.getGroupingSeparator(), dfs.getMonetaryGroupingSeparator())
+                        .replace(dfs.getDecimalSeparator(), dfs.getMonetaryDecimalSeparator())
+                        + cFmt.getPositiveSuffix(),
+                (int)args.get()[1] + cFmt.getPositivePrefix().length())
+        );
+    }
+
+    private static Stream<Arguments> currencyValidParseStrings() {
+        return validParseStrings().map(args -> Arguments.of(
+                cFmt.getPositivePrefix() + String.valueOf(args.get()[0])
+                        .replace(dfs.getGroupingSeparator(), dfs.getMonetaryGroupingSeparator())
+                        .replace(dfs.getDecimalSeparator(), dfs.getMonetaryDecimalSeparator())
+                        + cFmt.getPositiveSuffix(),
+                args.get()[1])
+        );
+    }
+
+    // Compact Pattern Data Provider provides test input for both DecimalFormat patterns
+    // and the compact patterns. As there is no method to retrieve compact patterns,
+    // thus test only against US English locale, and use a hard coded K - 1000
+    private static Stream<Arguments> compactBadParseStrings() {
+        return Stream.concat(
+                badParseStrings().map(args -> Arguments.of(args.get()[0], args.get()[1])),
+                badParseStrings().map(args -> Arguments.of(args.get()[0] + "K", args.get()[1]))
+        );
+    }
+
+    private static Stream<Arguments> compactValidParseStrings() {
+        return Stream.concat(
+                validParseStrings().map(args -> Arguments.of(
+                        args.get()[0], args.get()[1])),
+                validParseStrings().map(args -> Arguments.of(
+                        args.get()[0] + "K", (double) args.get()[1] * 1000))
+        );
+    }
+
+    // Replace the grouping and decimal separators with localized variants
+    // Used during localization of data
+    private static String localizeText(String text) {
+        // As this is a single pass conversion, this is safe for multiple replacement,
+        // even if a ',' could be a decimal separator for a locale.
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < text.length(); i++) {
+            char c = text.charAt(i);
+            if (c == ',') {
+                sb.append(dfs.getGroupingSeparator());
+            } else if (c == '.') {
+                sb.append(dfs.getDecimalSeparator());
+            } else if (c == '0') {
+                sb.append(dfs.getZeroDigit());
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+}

From f7c84137b5a1c9ce9878ff37a1f006a84b883b5e Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 16 Apr 2024 17:21:47 +0000
Subject: [PATCH 066/486] 8326116: JFR: Add help option to
 -XX:StartFlightRecording

Reviewed-by: mgronlun
---
 src/hotspot/share/jfr/dcmd/jfrDcmds.cpp       | 13 +++-
 src/hotspot/share/jfr/dcmd/jfrDcmds.hpp       |  1 +
 .../jdk/jfr/internal/dcmd/DCmdStart.java      | 64 +++++++++++++------
 .../classes/jdk/jfr/internal/util/Utils.java  | 23 +++++++
 .../jdk/jfr/startupargs/TestStartHelp.java    | 47 ++++++++++++++
 5 files changed, 127 insertions(+), 21 deletions(-)
 create mode 100644 test/jdk/jdk/jfr/startupargs/TestStartHelp.java

diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
index d52bc9e2e5b..34ccef434d0 100644
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
@@ -220,6 +220,11 @@ void JfrDCmd::execute(DCmdSource source, TRAPS) {
   if (invalid_state(output(), THREAD)) {
     return;
   }
+  if (source == DCmd_Source_Internal && _args != nullptr && strcmp(_args, "help") == 0) {
+     print_java_help("printStartupHelp");
+     vm_exit(0);
+  }
+
   static const char signature[] = "(Ljava/lang/String;Ljava/lang/String;C)[Ljava/lang/String;";
   JavaValue result(T_OBJECT);
   JfrJavaArguments execute(&result, javaClass(), "execute", signature, CHECK);
@@ -241,15 +246,19 @@ void JfrDCmd::execute(DCmdSource source, TRAPS) {
   handle_dcmd_result(output(), result.get_oop(), source, THREAD);
 }
 
-void JfrDCmd::print_help(const char* name) const {
+void JfrDCmd::print_java_help(const char* help_method) const {
   static const char signature[] = "()[Ljava/lang/String;";
   JavaThread* thread = JavaThread::current();
   JavaValue result(T_OBJECT);
-  JfrJavaArguments printHelp(&result, javaClass(), "printHelp", signature, thread);
+  JfrJavaArguments printHelp(&result, javaClass(), help_method, signature, thread);
   invoke(printHelp, thread);
   handle_dcmd_result(output(), result.get_oop(), DCmd_Source_MBean, thread);
 }
 
+void JfrDCmd::print_help(const char* name) const {
+  print_java_help("printHelp");
+}
+
 static void initialize_dummy_descriptors(GrowableArray<DCmdArgumentInfo*>* array) {
   assert(array != nullptr, "invariant");
   DCmdArgumentInfo * const dummy = new DCmdArgumentInfo(nullptr,
diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
index ad58c1c16c3..45e1addeb87 100644
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
@@ -37,6 +37,7 @@ class JfrDCmd : public DCmd {
   JfrDCmd(outputStream* output, bool heap, int num_arguments);
   virtual const char* javaClass() const = 0;
   void invoke(JfrJavaArguments& method, TRAPS) const;
+  void print_java_help(const char* help_method) const;
  public:
   virtual void execute(DCmdSource source, TRAPS);
   virtual void print_help(const char* name) const;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
index 5f83dee1182..692ab578478 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
@@ -55,6 +55,7 @@ import jdk.jfr.internal.jfc.JFC;
 import jdk.jfr.internal.jfc.model.JFCModel;
 import jdk.jfr.internal.jfc.model.JFCModelException;
 import jdk.jfr.internal.jfc.model.XmlInput;
+import jdk.jfr.internal.util.Utils;
 
 /**
  * JFR.start
@@ -317,11 +318,35 @@ final class DCmdStart extends AbstractDCmd {
         return false;
     }
 
+    public String[] printStartupHelp() {
+        Map<String, String> parameters = Map.of(
+            "$SYNTAX", "-XX:StartFlightRecording:[options]",
+            "$SOURCE", "-XX:StartFlightRecording:",
+            "$DELIMITER", ",",
+            "$DELIMITER_NAME", "comma",
+            "$DIRECTORY", exampleDirectory(),
+            "$JFC_OPTIONS", jfcOptions()
+        );
+        return Utils.format(helpTemplate(), parameters).lines().toArray(String[]::new);
+    }
+
     @Override
     public String[] printHelp() {
+        Map<String, String> parameters = Map.of(
+           "$SYNTAX", "JFR.start [options]",
+           "$SOURCE", "$ jcmd <pid> JFR.start ",
+           "$DELIMITER", " ",
+           "$DELIMITER_NAME", "whitespace",
+           "$DIRECTORY", exampleDirectory(),
+           "$JFC_OPTIONS", jfcOptions()
+        );
+        return Utils.format(helpTemplate(), parameters).lines().toArray(String[]::new);
+    }
+
+    private static String helpTemplate() {
             // 0123456789001234567890012345678900123456789001234567890012345678900123456789001234567890
         return """
-               Syntax : JFR.start [options]
+               Syntax : $SYNTAX
 
                Options:
 
@@ -352,8 +377,8 @@ final class DCmdStart extends AbstractDCmd {
                                   generated from the PID and the current date in the specified
                                   directory. (STRING, no default value)
 
-                                  Note: If a filename is given, '%%p' in the filename will be
-                                  replaced by the PID, and '%%t' will be replaced by the time in
+                                  Note: If a filename is given, '%p' in the filename will be
+                                  replaced by the PID, and '%t' will be replaced by the time in
                                   'yyyy_MM_dd_HH_mm_ss' format.
 
                  maxage           (Optional) Maximum time to keep the recorded data on disk. This
@@ -409,27 +434,28 @@ final class DCmdStart extends AbstractDCmd {
                take  precedence. The whitespace character can be omitted for timespan values,
                i.e. 20s. For more information about the settings syntax, see Javadoc of the
                jdk.jfr package.
-               %s
-               Options must be specified using the <key> or <key>=<value> syntax.
+               $JFC_OPTIONS
+               Options must be specified using the <key> or <key>=<value> syntax. Multiple
+               options are separated with a $DELIMITER_NAME.
 
                Example usage:
 
-                $ jcmd <pid> JFR.start
-                $ jcmd <pid> JFR.start filename=dump.jfr
-                $ jcmd <pid> JFR.start filename=%s
-                $ jcmd <pid> JFR.start dumponexit=true
-                $ jcmd <pid> JFR.start maxage=1h maxsize=1000M
-                $ jcmd <pid> JFR.start settings=profile
-                $ jcmd <pid> JFR.start delay=5m settings=my.jfc
-                $ jcmd <pid> JFR.start gc=high method-profiling=high
-                $ jcmd <pid> JFR.start jdk.JavaMonitorEnter#threshold=1ms
-                $ jcmd <pid> JFR.start +HelloWorld#enabled=true +HelloWorld#stackTrace=true
-                $ jcmd <pid> JFR.start settings=user.jfc com.example.UserDefined#enabled=true
-                $ jcmd <pid> JFR.start settings=none +Hello#enabled=true
+                $SOURCE
+                $SOURCEfilename=dump.jfr
+                $SOURCEfilename=$DIRECTORY
+                $SOURCEdumponexit=true
+                $SOURCEmaxage=1h$DELIMITERmaxsize=1000M
+                $SOURCEsettings=profile
+                $SOURCEdelay=5m$DELIMITERsettings=my.jfc
+                $SOURCEgc=high$DELIMITERmethod-profiling=high
+                $SOURCEjdk.JavaMonitorEnter#threshold=1ms
+                $SOURCE+HelloWorld#enabled=true$DELIMITER+HelloWorld#stackTrace=true
+                $SOURCEsettings=user.jfc$DELIMITERcom.example.UserDefined#enabled=true
+                $SOURCEsettings=none$DELIMITER+Hello#enabled=true
 
-               Note, if the default event settings are modified, overhead may exceed 1%%.
+               Note, if the default event settings are modified, overhead may exceed 1%.
 
-               """.formatted(jfcOptions(), exampleDirectory()).lines().toArray(String[]::new);
+               """;
     }
 
     private static String jfcOptions() {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
index 96a2de5b7b9..4ed36989277 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
@@ -37,6 +37,7 @@ import java.nio.file.Path;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -445,4 +446,26 @@ public final class Utils {
     public static String makeSimpleName(String qualified) {
         return qualified.substring(qualified.lastIndexOf(".") + 1);
     }
+
+    public static String format(String template, Map<String, String> parameters) {
+        StringBuilder sb = new StringBuilder(3 * template.length() / 2);
+        List<String> keys = new ArrayList<>(parameters.keySet());
+        // Sort so longest keys are checked first in case keys overlap.
+        keys.sort((a, b) -> b.length() - a.length());
+        for (int i = 0; i < template.length(); i++) {
+            int index = i;
+            for (int j = 0; j < keys.size(); j++) {
+                String key = keys.get(j);
+                if (template.startsWith(key, i)) {
+                    sb.append(parameters.get(key));
+                    i += key.length() - 1;
+                    break;
+                }
+            }
+            if (i == index) {
+                sb.append(template.charAt(i));
+            }
+        }
+        return sb.toString();
+    }
 }
diff --git a/test/jdk/jdk/jfr/startupargs/TestStartHelp.java b/test/jdk/jdk/jfr/startupargs/TestStartHelp.java
new file mode 100644
index 00000000000..4d4edbf68dc
--- /dev/null
+++ b/test/jdk/jdk/jfr/startupargs/TestStartHelp.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package jdk.jfr.startupargs;
+
+import jdk.jfr.Recording;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+/**
+ * @test
+ * @key jfr
+ * @requires vm.hasJFR
+ * @library /test/lib /test/jdk
+ * @run main jdk.jfr.startupargs.TestStartHelp
+ */
+public class TestStartHelp {
+
+    public static void main(String[] args) throws Exception {
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("-XX:StartFlightRecording:help");
+        OutputAnalyzer out = ProcessTools.executeProcess(pb);
+        out.shouldContain("Syntax : -XX:StartFlightRecording:[options]");
+        out.shouldContain("options are separated with a comma.");
+        out.shouldHaveExitValue(0);
+    }
+}

From 76cbe4883b5f53843e5140eee2145011fec67e4c Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Tue, 16 Apr 2024 17:47:06 +0000
Subject: [PATCH 067/486] 8329430: MetaspaceShared::preload_and_dump should
 clear pending exception

Reviewed-by: iklam, stuefe
---
 src/hotspot/share/cds/metaspaceShared.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 95cf4dfa791..231f69e3ab1 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -665,10 +665,12 @@ void MetaspaceShared::preload_and_dump() {
     if (PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())) {
       log_error(cds)("Out of memory. Please run with a larger Java heap, current MaxHeapSize = "
                      SIZE_FORMAT "M", MaxHeapSize/M);
+      CLEAR_PENDING_EXCEPTION;
       MetaspaceShared::unrecoverable_writing_error();
     } else {
       log_error(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
                      java_lang_String::as_utf8_string(java_lang_Throwable::message(PENDING_EXCEPTION)));
+      CLEAR_PENDING_EXCEPTION;
       MetaspaceShared::unrecoverable_writing_error("VM exits due to exception, use -Xlog:cds,exceptions=trace for detail");
     }
   }

From d1c6cd104ec117b88c45aafcb342164be4483f94 Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Tue, 16 Apr 2024 22:47:02 +0000
Subject: [PATCH 068/486] 8330133: libj2pkcs11.so crashes on some pkcs#11 v3.0
 libraries

Reviewed-by: djelinski, weijun
---
 src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c  | 8 +++-----
 .../windows/native/libj2pkcs11/p11_md.c                   | 7 ++++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c b/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c
index 099ef00c6d9..62895895123 100644
--- a/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c
+++ b/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c
@@ -162,7 +162,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
             rv = (C_GetInterface)(NULL, NULL, &interface, 0L);
             // don't use ckAssertReturnValueOK as we want to continue trying
             // C_GetFunctionList() or method named by "getFunctionListStr"
-            if (rv == CKR_OK) {
+            if (rv == CKR_OK && interface != NULL) {
                 goto setModuleData;
             }
         }
@@ -210,15 +210,13 @@ setModuleData:
         }
     } else if (interface != NULL) {
         moduleData->ckFunctionListPtr = interface->pFunctionList;
-        if (((CK_VERSION *)moduleData->ckFunctionListPtr)->major == 3) {
-            moduleData->ckFunctionList30Ptr = interface->pFunctionList;
-        }
     } else {
         // should never happen
         p11ThrowIOException(env, "ERROR: No function list ptr found");
         goto cleanup;
     }
-    if (((CK_VERSION *)moduleData->ckFunctionListPtr)->major == 3) {
+    if (((CK_VERSION *)moduleData->ckFunctionListPtr)->major == 3 &&
+            interface != NULL) {
         moduleData->ckFunctionList30Ptr = interface->pFunctionList;
     } else {
         moduleData->ckFunctionList30Ptr = NULL;
diff --git a/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c b/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c
index d05a341377f..ca0fd317230 100644
--- a/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c
+++ b/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -186,7 +186,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
         if (C_GetInterface != NULL) {
             TRACE0("Connect: Found C_GetInterface func\n");
             rv = (C_GetInterface)(NULL, NULL, &interface, 0);
-            if (ckAssertReturnValueOK(env, rv) == CK_ASSERT_OK) {
+            if (rv == CKR_OK && interface != NULL) {
                 goto setModuleData;
             }
         }
@@ -234,7 +234,8 @@ setModuleData:
         p11ThrowIOException(env, "ERROR: No function list ptr found");
         goto cleanup;
     }
-    if (((CK_VERSION *)moduleData->ckFunctionListPtr)->major == 3) {
+    if (((CK_VERSION *)moduleData->ckFunctionListPtr)->major == 3 &&
+            interface != NULL) {
         moduleData->ckFunctionList30Ptr = interface->pFunctionList;
     } else {
         moduleData->ckFunctionList30Ptr = NULL;

From fb4cf1cc3ce5957378516f4f6090d4c5d0f53e61 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 16 Apr 2024 22:53:54 +0000
Subject: [PATCH 069/486] 8329636: Deprecate -XX:+PreserveAllAnnotations

Reviewed-by: coleenp, dholmes
---
 src/hotspot/share/runtime/arguments.cpp                         | 1 +
 src/hotspot/share/runtime/globals.hpp                           | 2 +-
 test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 3b0916f46fc..f8e9629d94a 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -501,6 +501,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "RequireSharedSpaces",          JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "UseSharedSpaces",              JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "RegisterFinalizersAtInit",     JDK_Version::jdk(22), JDK_Version::jdk(23), JDK_Version::jdk(24) },
+  { "PreserveAllAnnotations",       JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
 #if defined(X86)
   { "UseRTMLocking",                JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseRTMDeopt",                  JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 5da2c0b80c5..ef6c0dcd9f6 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -799,7 +799,7 @@ const int ObjectAlignmentInBytes = 8;
           "at this time")                                                   \
                                                                             \
   product(bool, PreserveAllAnnotations, false,                              \
-          "Preserve RuntimeInvisibleAnnotations as well "                   \
+          "(Deprecated) Preserve RuntimeInvisibleAnnotations as well "      \
           "as RuntimeVisibleAnnotations")                                   \
                                                                             \
   develop(uintx, PreallocatedOutOfMemoryErrorCount, 4,                      \
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
index 62c5ef411da..0f93ee0f43a 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
@@ -56,6 +56,7 @@ public class VMDeprecatedOptions {
         ArrayList<String[]> deprecated = new ArrayList(
           Arrays.asList(new String[][] {
             // deprecated non-alias flags:
+            {"PreserveAllAnnotations", "true"},
             {"AllowRedefinitionToAddDeleteMethods", "true"},
 
             // deprecated alias flags (see also aliased_jvm_flags):

From f6f038a678c450e1157247344fb0984c7bcaa11d Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <never@openjdk.org>
Date: Wed, 17 Apr 2024 00:18:15 +0000
Subject: [PATCH 070/486] 8317368: [JVMCI] SIGSEGV in
 JVMCIEnv::initialize_installed_code on libgraal

Reviewed-by: dnsimon, kvn, eosterlund
---
 .../share/jvmci/jvmciCodeInstaller.cpp        | 16 ++++++----
 .../share/jvmci/jvmciCodeInstaller.hpp        |  1 +
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp | 16 +++++++---
 src/hotspot/share/jvmci/jvmciEnv.cpp          | 32 ++++++++++++++-----
 src/hotspot/share/jvmci/jvmciEnv.hpp          | 21 ++++++++++--
 src/hotspot/share/runtime/javaThread.cpp      | 11 +++++++
 src/hotspot/share/runtime/javaThread.hpp      | 13 ++++++++
 7 files changed, 88 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
index f59d049462b..7dd2840656d 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
@@ -704,6 +704,7 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
     JVMCIObject compiled_code,
     objArrayHandle object_pool,
     CodeBlob*& cb,
+    JVMCINMethodHandle& nmethod_handle,
     JVMCIObject installed_code,
     FailedSpeculation** failed_speculations,
     char* speculations,
@@ -805,6 +806,8 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
                                         speculations_len,
                                         _nmethod_entry_patch_offset);
     if (result == JVMCI::ok) {
+      guarantee(nm != nullptr, "successful compile must produce an nmethod");
+      nmethod_handle.set_nmethod(nm);
       cb = nm;
       if (compile_state == nullptr) {
         // This compile didn't come through the CompileBroker so perform the printing here
@@ -813,14 +816,13 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
         DirectivesStack::release(directive);
       }
 
-      if (nm != nullptr) {
-        if (_nmethod_entry_patch_offset != -1) {
-          err_msg msg("");
-          BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+      if (_nmethod_entry_patch_offset != -1) {
+        BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
 
-          if (!bs_nm->verify_barrier(nm, msg)) {
-            JVMCI_THROW_MSG_(IllegalArgumentException, err_msg("nmethod entry barrier is malformed: %s", msg.buffer()), JVMCI::ok);
-          }
+        // an empty error buffer for use by the verify_barrier code
+        err_msg msg("");
+        if (!bs_nm->verify_barrier(nm, msg)) {
+          JVMCI_THROW_MSG_(IllegalArgumentException, err_msg("nmethod entry barrier is malformed: %s", msg.buffer()), JVMCI::ok);
         }
       }
     }
diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
index ef1868028f5..98fed480bf1 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
@@ -332,6 +332,7 @@ public:
                                    JVMCIObject compiled_code,
                                    objArrayHandle object_pool,
                                    CodeBlob*& cb,
+                                   JVMCINMethodHandle& nmethod_handle,
                                    JVMCIObject installed_code,
                                    FailedSpeculation** failed_speculations,
                                    char* speculations,
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 8a033492bbb..99d5f9ae588 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -61,6 +61,7 @@
 #include "runtime/globals_extension.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "runtime/keepStackGCProcessed.hpp"
 #include "runtime/reflection.hpp"
 #include "runtime/stackFrameStream.inline.hpp"
 #include "runtime/timerTrace.hpp"
@@ -1106,6 +1107,7 @@ C2V_VMENTRY_0(jint, installCode0, (JNIEnv *env, jobject,
   TraceTime install_time("installCode", timer);
 
   CodeInstaller installer(JVMCIENV);
+  JVMCINMethodHandle nmethod_handle(THREAD);
 
   JVMCI::CodeInstallResult result = installer.install(compiler,
       compiled_code_buffer,
@@ -1113,6 +1115,7 @@ C2V_VMENTRY_0(jint, installCode0, (JNIEnv *env, jobject,
       compiled_code_handle,
       object_pool_handle,
       cb,
+      nmethod_handle,
       installed_code_handle,
       (FailedSpeculation**)(address) failed_speculations_address,
       speculations,
@@ -1204,7 +1207,8 @@ C2V_VMENTRY_NULL(jobject, executeHotSpotNmethod, (JNIEnv* env, jobject, jobject
   HandleMark hm(THREAD);
 
   JVMCIObject nmethod_mirror = JVMCIENV->wrap(hs_nmethod);
-  nmethod* nm = JVMCIENV->get_nmethod(nmethod_mirror);
+  JVMCINMethodHandle nmethod_handle(THREAD);
+  nmethod* nm = JVMCIENV->get_nmethod(nmethod_mirror, nmethod_handle);
   if (nm == nullptr || !nm->is_in_use()) {
     JVMCI_THROW_NULL(InvalidInstalledCodeException);
   }
@@ -1478,6 +1482,7 @@ C2V_VMENTRY_NULL(jobject, iterateFrames, (JNIEnv* env, jobject compilerToVM, job
     return nullptr;
   }
   Handle visitor(THREAD, JNIHandles::resolve_non_null(visitor_handle));
+  KeepStackGCProcessedMark keep_stack(THREAD);
 
   requireInHotSpot("iterateFrames", JVMCI_CHECK_NULL);
 
@@ -2762,7 +2767,8 @@ C2V_VMENTRY_0(jlong, translate, (JNIEnv* env, jobject, jobject obj_handle, jbool
     result = PEER_JVMCIENV->get_object_constant(constant());
   } else if (thisEnv->isa_HotSpotNmethod(obj)) {
     if (PEER_JVMCIENV->is_hotspot()) {
-      nmethod* nm = JVMCIENV->get_nmethod(obj);
+      JVMCINMethodHandle nmethod_handle(THREAD);
+      nmethod* nm = JVMCIENV->get_nmethod(obj, nmethod_handle);
       if (nm != nullptr) {
         JVMCINMethodData* data = nm->jvmci_nmethod_data();
         if (data != nullptr) {
@@ -2785,7 +2791,8 @@ C2V_VMENTRY_0(jlong, translate, (JNIEnv* env, jobject, jobject obj_handle, jbool
       const char* cstring = name_string.is_null() ? nullptr : thisEnv->as_utf8_string(name_string);
       // Create a new HotSpotNmethod instance in the peer runtime
       result = PEER_JVMCIENV->new_HotSpotNmethod(mh, cstring, isDefault, compileIdSnapshot, JVMCI_CHECK_0);
-      nmethod* nm = JVMCIENV->get_nmethod(obj);
+      JVMCINMethodHandle nmethod_handle(THREAD);
+      nmethod* nm = JVMCIENV->get_nmethod(obj, nmethod_handle);
       if (result.is_null()) {
         // exception occurred (e.g. OOME) creating a new HotSpotNmethod
       } else if (nm == nullptr) {
@@ -2837,7 +2844,8 @@ C2V_END
 C2V_VMENTRY(void, updateHotSpotNmethod, (JNIEnv* env, jobject, jobject code_handle))
   JVMCIObject code = JVMCIENV->wrap(code_handle);
   // Execute this operation for the side effect of updating the InstalledCode state
-  JVMCIENV->get_nmethod(code);
+  JVMCINMethodHandle nmethod_handle(THREAD);
+  JVMCIENV->get_nmethod(code, nmethod_handle);
 C2V_END
 
 C2V_VMENTRY_NULL(jbyteArray, getCode, (JNIEnv* env, jobject, jobject code_handle))
diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index 4260094c849..3d942d83225 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -29,6 +29,8 @@
 #include "code/codeCache.hpp"
 #include "compiler/compilerOracle.hpp"
 #include "compiler/compileTask.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetNMethod.hpp"
 #include "jvm_io.h"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
@@ -1722,12 +1724,6 @@ void JVMCIEnv::invalidate_nmethod_mirror(JVMCIObject mirror, bool deoptimize, JV
     JVMCI_THROW(NullPointerException);
   }
 
-  nmethod* nm = JVMCIENV->get_nmethod(mirror);
-  if (nm == nullptr) {
-    // Nothing to do
-    return;
-  }
-
   Thread* current = Thread::current();
   if (!mirror.is_hotspot() && !current->is_Java_thread()) {
     // Calling back into native might cause the execution to block, so only allow this when calling
@@ -1736,6 +1732,14 @@ void JVMCIEnv::invalidate_nmethod_mirror(JVMCIObject mirror, bool deoptimize, JV
                     "Cannot invalidate HotSpotNmethod object in shared library VM heap from non-JavaThread");
   }
 
+  JavaThread* thread = JavaThread::cast(current);
+  JVMCINMethodHandle nmethod_handle(thread);
+  nmethod* nm = JVMCIENV->get_nmethod(mirror, nmethod_handle);
+  if (nm == nullptr) {
+    // Nothing to do
+    return;
+  }
+
   if (!deoptimize) {
     // Prevent future executions of the nmethod but let current executions complete.
     nm->make_not_entrant();
@@ -1825,10 +1829,22 @@ CodeBlob* JVMCIEnv::get_code_blob(JVMCIObject obj) {
   return cb;
 }
 
-nmethod* JVMCIEnv::get_nmethod(JVMCIObject obj) {
+void JVMCINMethodHandle::set_nmethod(nmethod* nm) {
+  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs_nm != nullptr) {
+    bs_nm->nmethod_entry_barrier(nm);
+  }
+  _thread->set_live_nmethod(nm);
+}
+
+nmethod* JVMCIEnv::get_nmethod(JVMCIObject obj, JVMCINMethodHandle& nmethod_handle) {
   CodeBlob* cb = get_code_blob(obj);
   if (cb != nullptr) {
-    return cb->as_nmethod_or_null();
+    nmethod* nm = cb->as_nmethod_or_null();
+    if (nm != nullptr) {
+      nmethod_handle.set_nmethod(nm);
+      return nm;
+    }
   }
   return nullptr;
 }
diff --git a/src/hotspot/share/jvmci/jvmciEnv.hpp b/src/hotspot/share/jvmci/jvmciEnv.hpp
index ace0cc53352..b3aa487f34c 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.hpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.hpp
@@ -88,6 +88,21 @@ class JVMCIKlassHandle : public StackObj {
   bool    not_null() const                     { return _klass != nullptr; }
 };
 
+// A helper class to main a strong link to an nmethod that might not otherwise be referenced.  Only
+// one nmethod can be kept alive in this manner.
+class JVMCINMethodHandle : public StackObj {
+  JavaThread* _thread;
+
+ public:
+  JVMCINMethodHandle(JavaThread* thread): _thread(thread) {}
+
+  void set_nmethod(nmethod* nm);
+
+  ~JVMCINMethodHandle() {
+    _thread->clear_live_nmethod();
+  }
+};
+
 // A class that maintains the state needed for compilations requested
 // by the CompileBroker.  It is created in the broker and passed through
 // into the code installation step.
@@ -370,11 +385,11 @@ public:
 
   void fthrow_error(const char* file, int line, const char* format, ...) ATTRIBUTE_PRINTF(4, 5);
 
-  // Given an instance of HotSpotInstalledCode return the corresponding CodeBlob*.
+  // Given an instance of HotSpotInstalledCode, return the corresponding CodeBlob*.
   CodeBlob* get_code_blob(JVMCIObject code);
 
-  // Given an instance of HotSpotInstalledCode return the corresponding nmethod.
-  nmethod* get_nmethod(JVMCIObject code);
+  // Given an instance of HotSpotInstalledCode, return the corresponding nmethod.
+  nmethod* get_nmethod(JVMCIObject code, JVMCINMethodHandle& nmethod_handle);
 
   const char* klass_name(JVMCIObject object);
 
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 6687d85bcbd..cbb63fd60df 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -467,6 +467,7 @@ JavaThread::JavaThread() :
   _jvmci_reserved0(0),
   _jvmci_reserved1(0),
   _jvmci_reserved_oop0(nullptr),
+  _live_nmethod(nullptr),
 #endif // INCLUDE_JVMCI
 
   _exception_oop(oop()),
@@ -1429,6 +1430,10 @@ void JavaThread::oops_do_no_frames(OopClosure* f, NMethodClosure* cf) {
   f->do_oop((oop*) &_exception_oop);
 #if INCLUDE_JVMCI
   f->do_oop((oop*) &_jvmci_reserved_oop0);
+
+  if (_live_nmethod != nullptr && cf != nullptr) {
+    cf->do_nmethod(_live_nmethod);
+  }
 #endif
 
   if (jvmti_thread_state() != nullptr) {
@@ -1484,6 +1489,12 @@ void JavaThread::nmethods_do(NMethodClosure* cf) {
   if (jvmti_thread_state() != nullptr) {
     jvmti_thread_state()->nmethods_do(cf);
   }
+
+#if INCLUDE_JVMCI
+  if (_live_nmethod != nullptr) {
+    cf->do_nmethod(_live_nmethod);
+  }
+#endif
 }
 
 void JavaThread::metadata_do(MetadataClosure* f) {
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index 52eae8eb067..abba4c75de8 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -379,6 +379,10 @@ class JavaThread: public Thread {
   jlong      _jvmci_reserved1;
   oop        _jvmci_reserved_oop0;
 
+  // This field is used to keep an nmethod visible to the GC so that it and its contained oops can
+  // be kept alive
+  nmethod*  _live_nmethod;
+
  public:
   static jlong* _jvmci_old_thread_counters;
   static void collect_counters(jlong* array, int length);
@@ -411,6 +415,15 @@ class JavaThread: public Thread {
     return _jvmci_reserved1;
   }
 
+  void set_live_nmethod(nmethod* nm) {
+    assert(_live_nmethod == nullptr, "only one");
+    _live_nmethod = nm;
+  }
+
+  void clear_live_nmethod() {
+    _live_nmethod = nullptr;
+  }
+
  private:
 #endif // INCLUDE_JVMCI
 

From c8702ede97437e0197340a559987ca321f67c15b Mon Sep 17 00:00:00 2001
From: Feilong Jiang <fjiang@openjdk.org>
Date: Wed, 17 Apr 2024 00:50:59 +0000
Subject: [PATCH 071/486] 8330213: RISC-V: C2: assert(false) failed: bad AD
 file after JDK-8316991

Reviewed-by: fyang, rehn
---
 src/hotspot/cpu/riscv/riscv.ad | 68 ++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 2c69486a0e5..f9d66f158fb 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -9786,6 +9786,40 @@ instruct cmovI_cmpUL(iRegINoSp dst, iRegI src, iRegL op1, iRegL op2, cmpOpU cop)
   ins_pipe(pipe_class_compare);
 %}
 
+instruct cmovI_cmpN(iRegINoSp dst, iRegI src, iRegN op1, iRegN op2, cmpOpU cop) %{
+  match(Set dst (CMoveI (Binary cop (CmpN op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpN\n\t"
+  %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode | C2_MacroAssembler::unsigned_branch_mask,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
+instruct cmovI_cmpP(iRegINoSp dst, iRegI src, iRegP op1, iRegP op2, cmpOpU cop) %{
+  match(Set dst (CMoveI (Binary cop (CmpP op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpP\n\t"
+  %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode | C2_MacroAssembler::unsigned_branch_mask,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
 instruct cmovL_cmpL(iRegLNoSp dst, iRegL src, iRegL op1, iRegL op2, cmpOp cop) %{
   match(Set dst (CMoveL (Binary cop (CmpL op1 op2)) (Binary dst src)));
   ins_cost(ALU_COST + BRANCH_COST);
@@ -9854,6 +9888,40 @@ instruct cmovL_cmpU(iRegLNoSp dst, iRegL src, iRegI op1, iRegI op2, cmpOpU cop)
   ins_pipe(pipe_class_compare);
 %}
 
+instruct cmovL_cmpN(iRegLNoSp dst, iRegL src, iRegN op1, iRegN op2, cmpOpU cop) %{
+  match(Set dst (CMoveL (Binary cop (CmpN op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpN\n\t"
+  %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode | C2_MacroAssembler::unsigned_branch_mask,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
+instruct cmovL_cmpP(iRegLNoSp dst, iRegL src, iRegP op1, iRegP op2, cmpOpU cop) %{
+  match(Set dst (CMoveL (Binary cop (CmpP op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpP\n\t"
+  %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode | C2_MacroAssembler::unsigned_branch_mask,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
 // ============================================================================
 // Procedure Call/Return Instructions
 

From e57a322d7076474806458cc4b796bdb874e8e92e Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 17 Apr 2024 00:51:11 +0000
Subject: [PATCH 072/486] 8329970: Update autoconf build-aux files with latest
 from 2024-01-01

Reviewed-by: ihse, clanger
---
 make/autoconf/build-aux/autoconf-config.guess |  64 ++++-
 make/autoconf/build-aux/autoconf-config.sub   | 234 +++++++++++-------
 2 files changed, 200 insertions(+), 98 deletions(-)

diff --git a/make/autoconf/build-aux/autoconf-config.guess b/make/autoconf/build-aux/autoconf-config.guess
index 523a71774c9..086cb65cede 100644
--- a/make/autoconf/build-aux/autoconf-config.guess
+++ b/make/autoconf/build-aux/autoconf-config.guess
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
 #
 
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-09-17'
+timestamp='2024-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
 Usage: $0 [OPTION]
 
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system '$me' is run on.
 
 Options:
   -h, --help         print this help, then exit
@@ -85,13 +85,13 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -127,8 +127,8 @@ GUESS=
 # temporary files to be created and, as you can see below, it is a
 # headache to deal with in a portable fashion.
 
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
+# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
+# use 'HOST_CC' if defined, but it is deprecated.
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
@@ -180,6 +180,9 @@ Linux|GNU|GNU/*)
 
 	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
+	#if defined(__ANDROID__)
+	LIBC=android
+	#else
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
@@ -187,6 +190,8 @@ Linux|GNU|GNU/*)
 	LIBC=dietlibc
 	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#elif defined(__LLVM_LIBC__)
+	LIBC=llvm
 	#else
 	#include <stdarg.h>
 	/* First heuristic to detect musl libc.  */
@@ -194,6 +199,7 @@ Linux|GNU|GNU/*)
 	LIBC=musl
 	#endif
 	#endif
+	#endif
 	EOF
 	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	eval "$cc_set_libc"
@@ -484,7 +490,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
+	# Japanese Language versions have a version number like '4.1.3-JL'.
 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
 	GUESS=sparc-sun-sunos$SUN_REL
 	;;
@@ -929,7 +935,7 @@ EOF
 	fi
 	;;
     *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	UNAME_PROCESSOR=`uname -p`
 	case $UNAME_PROCESSOR in
 	    amd64)
 		UNAME_PROCESSOR=x86_64 ;;
@@ -1001,7 +1007,27 @@ EOF
 	GUESS=$UNAME_MACHINE-unknown-minix
 	;;
     aarch64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	set_cc_for_build
+	CPU=$UNAME_MACHINE
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    ABI=64
+	    sed 's/^	    //' << EOF > "$dummy.c"
+	    #ifdef __ARM_EABI__
+	    #ifdef __ARM_PCS_VFP
+	    ABI=eabihf
+	    #else
+	    ABI=eabi
+	    #endif
+	    #endif
+EOF
+	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+	    eval "$cc_set_abi"
+	    case $ABI in
+		eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
+	    esac
+	fi
+	GUESS=$CPU-unknown-linux-$LIBCABI
 	;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
@@ -1067,6 +1093,15 @@ EOF
     k1om:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
+    kvx:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    kvx:cos:*:*)
+	GUESS=$UNAME_MACHINE-unknown-cos
+	;;
+    kvx:mbr:*:*)
+	GUESS=$UNAME_MACHINE-unknown-mbr
+	;;
     loongarch32:Linux:*:* | loongarch64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
@@ -1222,7 +1257,7 @@ EOF
 	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
 	;;
     i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
+	# If we were able to find 'uname', then EMX Unix compatibility
 	# is probably installed.
 	GUESS=$UNAME_MACHINE-pc-os2-emx
 	;;
@@ -1363,7 +1398,7 @@ EOF
 		GUESS=ns32k-sni-sysv
 	fi
 	;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*)	# Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
 	GUESS=i586-unisys-sysv4
 	;;
@@ -1585,6 +1620,9 @@ EOF
     *:Unleashed:*:*)
 	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
 	;;
+    *:Ironclad:*:*)
+	GUESS=$UNAME_MACHINE-unknown-ironclad
+	;;
 esac
 
 # Do we have a guess based on uname results?
diff --git a/make/autoconf/build-aux/autoconf-config.sub b/make/autoconf/build-aux/autoconf-config.sub
index f0dda6a43ba..4f2843dd176 100644
--- a/make/autoconf/build-aux/autoconf-config.sub
+++ b/make/autoconf/build-aux/autoconf-config.sub
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 #
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,11 @@
 #
 
 # Configuration validation subroutine script.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-09-17'
+timestamp='2024-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -102,13 +102,13 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -156,7 +156,7 @@ IFS=$saved_IFS
 # Separate into logical components for further validation
 case $1 in
 	*-*-*-*-*)
-		echo Invalid configuration \`"$1"\': more than four components >&2
+		echo "Invalid configuration '$1': more than four components" >&2
 		exit 1
 		;;
 	*-*-*-*)
@@ -171,7 +171,8 @@ case $1 in
 			nto-qnx* | linux-* | uclinux-uclibc* \
 			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
 			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-*)
+			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
+			| windows-* )
 				basic_machine=$field1
 				basic_os=$maybe_os
 				;;
@@ -969,7 +970,7 @@ $basic_machine
 EOF
 		IFS=$saved_IFS
 		;;
-	# We use `pc' rather than `unknown'
+	# We use 'pc' rather than 'unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
@@ -1101,7 +1102,7 @@ case $cpu-$vendor in
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		cpu=i586
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
 		cpu=i686
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1206,7 +1207,7 @@ case $cpu-$vendor in
 		case $cpu in
 			1750a | 580 \
 			| a29k \
-			| aarch64 | aarch64_be \
+			| aarch64 | aarch64_be | aarch64c | arm64ec \
 			| abacus \
 			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
 			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
@@ -1225,12 +1226,14 @@ case $cpu-$vendor in
 			| d10v | d30v | dlx | dsp16xx \
 			| e2k | elxsi | epiphany \
 			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| javascript \
 			| h8300 | h8500 \
 			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 			| hexagon \
 			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
 			| ip2k | iq2000 \
 			| k1om \
+			| kvx \
 			| le32 | le64 \
 			| lm32 \
 			| loongarch32 | loongarch64 \
@@ -1239,36 +1242,13 @@ case $cpu-$vendor in
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
 			| m88110 | m88k | maxq | mb | mcore | mep | metag \
 			| microblaze | microblazeel \
-			| mips | mipsbe | mipseb | mipsel | mipsle \
-			| mips16 \
-			| mips64 | mips64eb | mips64el \
-			| mips64octeon | mips64octeonel \
-			| mips64orion | mips64orionel \
-			| mips64r5900 | mips64r5900el \
-			| mips64vr | mips64vrel \
-			| mips64vr4100 | mips64vr4100el \
-			| mips64vr4300 | mips64vr4300el \
-			| mips64vr5000 | mips64vr5000el \
-			| mips64vr5900 | mips64vr5900el \
-			| mipsisa32 | mipsisa32el \
-			| mipsisa32r2 | mipsisa32r2el \
-			| mipsisa32r3 | mipsisa32r3el \
-			| mipsisa32r5 | mipsisa32r5el \
-			| mipsisa32r6 | mipsisa32r6el \
-			| mipsisa64 | mipsisa64el \
-			| mipsisa64r2 | mipsisa64r2el \
-			| mipsisa64r3 | mipsisa64r3el \
-			| mipsisa64r5 | mipsisa64r5el \
-			| mipsisa64r6 | mipsisa64r6el \
-			| mipsisa64sb1 | mipsisa64sb1el \
-			| mipsisa64sr71k | mipsisa64sr71kel \
-			| mipsr5900 | mipsr5900el \
-			| mipstx39 | mipstx39el \
+			| mips* \
 			| mmix \
 			| mn10200 | mn10300 \
 			| moxie \
 			| mt \
 			| msp430 \
+			| nanomips* \
 			| nds32 | nds32le | nds32be \
 			| nfp \
 			| nios | nios2 | nios2eb | nios2el \
@@ -1300,6 +1280,7 @@ case $cpu-$vendor in
 			| ubicom32 \
 			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
 			| vax \
+			| vc4 \
 			| visium \
 			| w65 \
 			| wasm32 | wasm64 \
@@ -1311,7 +1292,7 @@ case $cpu-$vendor in
 				;;
 
 			*)
-				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
 				exit 1
 				;;
 		esac
@@ -1332,11 +1313,12 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if test x$basic_os != x
+if test x"$basic_os" != x
 then
 
 # First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
 # set os.
+obj=
 case $basic_os in
 	gnu/linux*)
 		kernel=linux
@@ -1536,10 +1518,16 @@ case $os in
 			os=eabi
 			;;
 		    *)
-			os=elf
+			os=
+			obj=elf
 			;;
 		esac
 		;;
+	aout* | coff* | elf* | pe*)
+		# These are machine code file formats, not OSes
+		obj=$os
+		os=
+		;;
 	*)
 		# No normalization, but not necessarily accepted, that comes below.
 		;;
@@ -1558,12 +1546,15 @@ else
 # system, and we'll never get to this point.
 
 kernel=
+obj=
 case $cpu-$vendor in
 	score-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	spu-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	*-acorn)
 		os=riscix1.2
@@ -1573,28 +1564,35 @@ case $cpu-$vendor in
 		os=gnu
 		;;
 	arm*-semi)
-		os=aout
+		os=
+		obj=aout
 		;;
 	c4x-* | tic4x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	c8051-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	clipper-intergraph)
 		os=clix
 		;;
 	hexagon-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	tic54x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	tic55x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	tic6x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1616,19 +1614,24 @@ case $cpu-$vendor in
 		os=sunos3
 		;;
 	m68*-cisco)
-		os=aout
+		os=
+		obj=aout
 		;;
 	mep-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	mips*-cisco)
-		os=elf
+		os=
+		obj=elf
 		;;
-	mips*-*)
-		os=elf
+	mips*-*|nanomips*-*)
+		os=
+		obj=elf
 		;;
 	or32-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=sysv3
@@ -1637,7 +1640,8 @@ case $cpu-$vendor in
 		os=sunos4.1.1
 		;;
 	pru-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	*-be)
 		os=beos
@@ -1718,10 +1722,12 @@ case $cpu-$vendor in
 		os=uxpv
 		;;
 	*-rom68k)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-*bug)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-apple)
 		os=macos
@@ -1739,10 +1745,11 @@ esac
 
 fi
 
-# Now, validate our (potentially fixed-up) OS.
+# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
+
 case $os in
 	# Sometimes we do "kernel-libc", so those need to count as OSes.
-	musl* | newlib* | relibc* | uclibc*)
+	llvm* | musl* | newlib* | relibc* | uclibc*)
 		;;
 	# Likewise for "kernel-abi"
 	eabi* | gnueabi*)
@@ -1750,6 +1757,9 @@ case $os in
 	# VxWorks passes extra cpu info in the 4th filed.
 	simlinux | simwindows | spe)
 		;;
+	# See `case $cpu-$os` validation below
+	ghcjs)
+		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
@@ -1758,7 +1768,7 @@ case $os in
 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
 	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* \
+	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
@@ -1767,11 +1777,11 @@ case $os in
 	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
 	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
 	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
-	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | bosx* | nextstep* | cxux* | oabi* \
+	     | ptx* | ecoff* | winnt* | domain* | vsta* \
 	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
 	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | cygwin* | msys* | moss* | proelf* | rtems* \
 	     | midipix* | mingw32* | mingw64* | mint* \
 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
 	     | interix* | uwin* | mks* | rhapsody* | darwin* \
@@ -1784,62 +1794,116 @@ case $os in
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* | mlibc* )
+	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
 		;;
+	# This refers to builds using the UEFI calling convention
+	# (which depends on the architecture) and PE file format.
+	# Note that this is both a different calling convention and
+	# different file format than that of GNU-EFI
+	# (x86_64-w64-mingw32).
+	uefi)
+		;;
 	none)
 		;;
-	kernel* )
+	kernel* | msvc* )
 		# Restricted further below
 		;;
+	'')
+		if test x"$obj" = x
+		then
+			echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
+		fi
+		;;
 	*)
-		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
+		exit 1
+		;;
+esac
+
+case $obj in
+	aout* | coff* | elf* | pe*)
+		;;
+	'')
+		# empty is fine
+		;;
+	*)
+		echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
+		exit 1
+		;;
+esac
+
+# Here we handle the constraint that a (synthetic) cpu and os are
+# valid only in combination with each other and nowhere else.
+case $cpu-$os in
+	# The "javascript-unknown-ghcjs" triple is used by GHC; we
+	# accept it here in order to tolerate that, but reject any
+	# variations.
+	javascript-ghcjs)
+		;;
+	javascript-* | *-ghcjs)
+		echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
 		exit 1
 		;;
 esac
 
 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
-case $kernel-$os in
-	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
-		   | linux-musl* | linux-relibc* | linux-uclibc* )
+case $kernel-$os-$obj in
+	linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
+		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
+		    | linux-relibc*- | linux-uclibc*- )
 		;;
-	uclinux-uclibc* )
+	uclinux-uclibc*- )
 		;;
-	managarm-mlibc* | managarm-kernel* )
+	managarm-mlibc*- | managarm-kernel*- )
 		;;
-	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
+	windows*-msvc*-)
+		;;
+	-dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
+		    | -uclibc*- )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
-		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	-kernel* )
-		echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2
+	-kernel*- )
+		echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	*-kernel* )
-		echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2
+	*-kernel*- )
+		echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
 		exit 1
 		;;
-	kfreebsd*-gnu* | kopensolaris*-gnu*)
+	*-msvc*- )
+		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
+		exit 1
 		;;
-	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
 		;;
-	nto-qnx*)
+	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
 		;;
-	os2-emx)
+	nto-qnx*-)
 		;;
-	*-eabi* | *-gnueabi*)
+	os2-emx-)
 		;;
-	-*)
+	*-eabi*- | *-gnueabi*-)
+		;;
+	none--*)
+		# None (no kernel, i.e. freestanding / bare metal),
+		# can be paired with an machine code file format
+		;;
+	-*-)
 		# Blank kernel with real OS is always fine.
 		;;
-	*-*)
-		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+	--*)
+		# Blank kernel and OS with real machine code file format is always fine.
+		;;
+	*-*-*)
+		echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
 		exit 1
 		;;
 esac
@@ -1922,7 +1986,7 @@ case $vendor in
 		;;
 esac
 
-echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
 exit
 
 # Local variables:

From cd4c3aac63ddab3d3618df09787d6e9311454ff8 Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Wed, 17 Apr 2024 01:34:39 +0000
Subject: [PATCH 073/486] 8330242: RISC-V: Simplify and remove
 CORRECT_COMPILER_ATOMIC_SUPPORT in atomic_linux_riscv.hpp

Reviewed-by: fyang, rehn
---
 .../os_cpu/linux_riscv/atomic_linux_riscv.hpp | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
index 6546adb6ff3..b3e35d6cc10 100644
--- a/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
+++ b/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
@@ -35,16 +35,10 @@
 
 #if defined(__clang_major__)
 #define FULL_COMPILER_ATOMIC_SUPPORT
-#elif (__GNUC__ > 13) || ((__GNUC__ == 13) && (__GNUC_MINOR__ >= 2))
+#elif (__GNUC__ > 13) || ((__GNUC__ == 13) && (__GNUC_MINOR__ > 2))
 #define FULL_COMPILER_ATOMIC_SUPPORT
 #endif
 
-#if defined(__clang_major__)
-#define CORRECT_COMPILER_ATOMIC_SUPPORT
-#elif defined(__GNUC__) && (__riscv_xlen <= 32 || __GNUC__ > 13)
-#define CORRECT_COMPILER_ATOMIC_SUPPORT
-#endif
-
 template<size_t byte_size>
 struct Atomic::PlatformAdd {
   template<typename D, typename I>
@@ -120,9 +114,9 @@ inline T Atomic::PlatformCmpxchg<1>::operator()(T volatile* dest __attribute__((
 }
 #endif
 
-#ifndef CORRECT_COMPILER_ATOMIC_SUPPORT
+#ifndef FULL_COMPILER_ATOMIC_SUPPORT
 // The implementation of `__atomic_compare_exchange` lacks sign extensions
-// in GCC 13 and lower when using with 32-bit unsigned integers on RV64,
+// in GCC 13.2 and lower when using with 32-bit unsigned integers on RV64,
 // so we should implement it manually.
 // GCC bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114130.
 // See also JDK-8326936.
@@ -192,11 +186,7 @@ inline T Atomic::PlatformCmpxchg<byte_size>::operator()(T volatile* dest __attri
                                                         atomic_memory_order order) const {
 
 #ifndef FULL_COMPILER_ATOMIC_SUPPORT
-  STATIC_ASSERT(byte_size >= 4);
-#endif
-
-#ifndef CORRECT_COMPILER_ATOMIC_SUPPORT
-  STATIC_ASSERT(byte_size != 4);
+  STATIC_ASSERT(byte_size > 4);
 #endif
 
   STATIC_ASSERT(byte_size == sizeof(T));
@@ -235,6 +225,5 @@ struct Atomic::PlatformOrderedStore<byte_size, RELEASE_X_FENCE>
 };
 
 #undef FULL_COMPILER_ATOMIC_SUPPORT
-#undef CORRECT_COMPILER_ATOMIC_SUPPORT
 
 #endif // OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_HPP

From 2fe2f3aff82f41a3b7942861e29ccbd3bcc68661 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 17 Apr 2024 05:31:39 +0000
Subject: [PATCH 074/486] 8323900: Avoid calling os::init_random() in CDS
 static dump

Reviewed-by: stuefe, ccheung
---
 src/hotspot/share/cds/archiveBuilder.cpp  | 13 ++++++++++++-
 src/hotspot/share/cds/archiveBuilder.hpp  |  2 ++
 src/hotspot/share/cds/metaspaceShared.cpp |  3 ---
 src/hotspot/share/oops/symbol.cpp         |  8 +++-----
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 0fc8c29a5b7..0eee36eec21 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -39,6 +39,7 @@
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
 #include "interpreter/abstractInterpreter.hpp"
+#include "jvm.h"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allStatic.hpp"
@@ -170,7 +171,7 @@ ArchiveBuilder::ArchiveBuilder() :
 {
   _klasses = new (mtClassShared) GrowableArray<Klass*>(4 * K, mtClassShared);
   _symbols = new (mtClassShared) GrowableArray<Symbol*>(256 * K, mtClassShared);
-
+  _entropy_seed = 0x12345678;
   assert(_current == nullptr, "must be");
   _current = this;
 }
@@ -190,6 +191,16 @@ ArchiveBuilder::~ArchiveBuilder() {
   }
 }
 
+// Returns a deterministic sequence of pseudo random numbers. The main purpose is NOT
+// for randomness but to get good entropy for the identity_hash() of archived Symbols,
+// while keeping the contents of static CDS archives deterministic to ensure
+// reproducibility of JDK builds.
+int ArchiveBuilder::entropy() {
+  assert(SafepointSynchronize::is_at_safepoint(), "needed to ensure deterministic sequence");
+  _entropy_seed = os::next_random(_entropy_seed);
+  return static_cast<int>(_entropy_seed);
+}
+
 class GatherKlassesAndSymbols : public UniqueMetaspaceClosure {
   ArchiveBuilder* _builder;
 
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index a80370d3976..e6ac2e7ac4e 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -219,6 +219,7 @@ private:
   ResizeableResourceHashtable<address, address, AnyObj::C_HEAP, mtClassShared> _buffered_to_src_table;
   GrowableArray<Klass*>* _klasses;
   GrowableArray<Symbol*>* _symbols;
+  unsigned int _entropy_seed;
 
   // statistics
   DumpAllocStats _alloc_stats;
@@ -341,6 +342,7 @@ public:
   ArchiveBuilder();
   ~ArchiveBuilder();
 
+  int entropy();
   void gather_klasses_and_symbols();
   void gather_source_objs();
   bool gather_klass_and_symbol(MetaspaceClosure::Ref* ref, bool read_only);
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 231f69e3ab1..b13ef2101a9 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -513,9 +513,6 @@ void VM_PopulateDumpSharedSpace::doit() {
 
   char* cloned_vtables = CppVtables::dumptime_init(&builder);
 
-  // Initialize random for updating the hash of symbols
-  os::init_random(0x12345678);
-
   builder.dump_rw_metadata();
   builder.dump_ro_metadata();
   builder.relocate_metaspaceobj_embedded_pointers();
diff --git a/src/hotspot/share/oops/symbol.cpp b/src/hotspot/share/oops/symbol.cpp
index cbb51e1bb90..4deae372061 100644
--- a/src/hotspot/share/oops/symbol.cpp
+++ b/src/hotspot/share/oops/symbol.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/archiveBuilder.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/classLoaderData.hpp"
@@ -73,11 +74,8 @@ Symbol::Symbol(const Symbol& s1) {
 
 #if INCLUDE_CDS
 void Symbol::update_identity_hash() {
-  // This is called at a safepoint during dumping of a static CDS archive. The caller should have
-  // called os::init_random() with a deterministic seed and then iterate all archived Symbols in
-  // a deterministic order.
   assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
-  _hash_and_refcount =  pack_hash_and_refcount((short)os::random(), PERM_REFCOUNT);
+  _hash_and_refcount =  pack_hash_and_refcount((short)ArchiveBuilder::current()->entropy(), PERM_REFCOUNT);
 }
 
 void Symbol::set_permanent() {

From 01bda278d6a498ca89c0bc5218680cd51a04e9d3 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Wed, 17 Apr 2024 06:34:31 +0000
Subject: [PATCH 075/486] 8330011: [s390x] update block-comments to make code
 consistent

Reviewed-by: lucy
---
 src/hotspot/cpu/s390/downcallLinker_s390.cpp | 32 +++++++++++---------
 src/hotspot/cpu/s390/upcallLinker_s390.cpp   | 20 ++++++------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/hotspot/cpu/s390/downcallLinker_s390.cpp b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
index 22bd644e2b8..383a3244874 100644
--- a/src/hotspot/cpu/s390/downcallLinker_s390.cpp
+++ b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -138,10 +138,10 @@ void DowncallLinker::StubGenerator::generate() {
   locs.set(StubLocations::TARGET_ADDRESS, _abi._scratch2);
 
   if (_captured_state_mask != 0) {
-    __ block_comment("{ _captured_state_mask is set");
+    __ block_comment("_captured_state_mask_is_set {");
     locs.set_frame_data(StubLocations::CAPTURED_STATE_BUFFER, allocated_frame_size);
     allocated_frame_size += BytesPerWord;
-    __ block_comment("} _captured_state_mask is set");
+    __ block_comment("} _captured_state_mask_is_set");
   }
 
   VMStorage shuffle_reg = _abi._scratch1;
@@ -176,7 +176,7 @@ void DowncallLinker::StubGenerator::generate() {
   _frame_complete = __ pc() - start;  // frame build complete.
 
   if (_needs_transition) {
-    __ block_comment("{ thread java2native");
+    __ block_comment("thread_java2native {");
     __ get_PC(Z_R1_scratch);
     address the_pc = __ pc();
     __ set_last_Java_frame(Z_SP, Z_R1_scratch);
@@ -186,21 +186,21 @@ void DowncallLinker::StubGenerator::generate() {
 
     // State transition
     __ set_thread_state(_thread_in_native);
-    __ block_comment("} thread java2native");
+    __ block_comment("} thread_java2native");
   }
   if (has_objects) {
     add_offsets_to_oops(java_regs, _abi._scratch1, _abi._scratch2);
   }
-  __ block_comment("{ argument shuffle");
+  __ block_comment("argument shuffle {");
   arg_shuffle.generate(_masm, shuffle_reg, frame::z_jit_out_preserve_size, _abi._shadow_space_bytes);
-  __ block_comment("} argument shuffle");
+  __ block_comment("} argument_shuffle");
 
   __ call(as_Register(locs.get(StubLocations::TARGET_ADDRESS)));
 
   //////////////////////////////////////////////////////////////////////////////
 
   if (_captured_state_mask != 0) {
-    __ block_comment("{ save thread local");
+    __ block_comment("save_thread_local {");
 
       out_reg_spiller.generate_spill(_masm, spill_offset);
 
@@ -211,7 +211,7 @@ void DowncallLinker::StubGenerator::generate() {
 
       out_reg_spiller.generate_fill(_masm, spill_offset);
 
-    __ block_comment("} save thread local");
+    __ block_comment("} save_thread_local");
   }
 
   //////////////////////////////////////////////////////////////////////////////
@@ -222,7 +222,7 @@ void DowncallLinker::StubGenerator::generate() {
   Label L_after_reguard;
 
   if (_needs_transition) {
-    __ block_comment("{ thread native2java");
+    __ block_comment("thread_native2java {");
     __ set_thread_state(_thread_in_native_trans);
 
     if (!UseSystemMemoryBarrier) {
@@ -239,10 +239,12 @@ void DowncallLinker::StubGenerator::generate() {
     // change thread state
     __ set_thread_state(_thread_in_Java);
 
-    __ block_comment("reguard stack check");
-    __ z_cli(Address(Z_thread, JavaThread::stack_guard_state_offset() + in_ByteSize(sizeof(StackOverflow::StackGuardState) - 1)),
-        StackOverflow::stack_guard_yellow_reserved_disabled);
+    __ block_comment("reguard_stack_check {");
+    __ z_cli(Address(Z_thread,
+                     JavaThread::stack_guard_state_offset() + in_ByteSize(sizeof(StackOverflow::StackGuardState) - 1)),
+                     StackOverflow::stack_guard_yellow_reserved_disabled);
     __ z_bre(L_reguard);
+    __ block_comment("} reguard_stack_check");
     __ bind(L_after_reguard);
 
     __ reset_last_Java_frame();
@@ -256,7 +258,7 @@ void DowncallLinker::StubGenerator::generate() {
   //////////////////////////////////////////////////////////////////////////////
 
   if (_needs_transition) {
-    __ block_comment("{ L_safepoint_poll_slow_path");
+    __ block_comment("L_safepoint_poll_slow_path {");
     __ bind(L_safepoint_poll_slow_path);
 
       // Need to save the native result registers around any runtime calls.
@@ -272,7 +274,7 @@ void DowncallLinker::StubGenerator::generate() {
     __ block_comment("} L_safepoint_poll_slow_path");
 
     //////////////////////////////////////////////////////////////////////////////
-    __ block_comment("{ L_reguard");
+    __ block_comment("L_reguard {");
     __ bind(L_reguard);
 
       // Need to save the native result registers around any runtime calls.
diff --git a/src/hotspot/cpu/s390/upcallLinker_s390.cpp b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
index 20c9b35db62..734b4e89c7c 100644
--- a/src/hotspot/cpu/s390/upcallLinker_s390.cpp
+++ b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
@@ -63,7 +63,7 @@ static void preserve_callee_saved_registers(MacroAssembler* _masm, const ABIDesc
 
   int offset = reg_save_area_offset;
 
-  __ block_comment("{ preserve_callee_saved_regs ");
+  __ block_comment("preserve_callee_saved_regs {");
   for (int i = 0; i < Register::number_of_registers; i++) {
     Register reg = as_Register(i);
     // Z_SP saved/restored by prologue/epilogue
@@ -82,7 +82,7 @@ static void preserve_callee_saved_registers(MacroAssembler* _masm, const ABIDesc
     }
   }
 
-  __ block_comment("} preserve_callee_saved_regs ");
+  __ block_comment("} preserve_callee_saved_regs");
 }
 
 static void restore_callee_saved_registers(MacroAssembler* _masm, const ABIDescriptor& abi, int reg_save_area_offset) {
@@ -92,7 +92,7 @@ static void restore_callee_saved_registers(MacroAssembler* _masm, const ABIDescr
 
   int offset = reg_save_area_offset;
 
-  __ block_comment("{ restore_callee_saved_regs ");
+  __ block_comment("restore_callee_saved_regs {");
   for (int i = 0; i < Register::number_of_registers; i++) {
     Register reg = as_Register(i);
     // Z_SP saved/restored by prologue/epilogue
@@ -111,7 +111,7 @@ static void restore_callee_saved_registers(MacroAssembler* _masm, const ABIDescr
     }
   }
 
-  __ block_comment("} restore_callee_saved_regs ");
+  __ block_comment("} restore_callee_saved_regs");
 }
 
 static const int upcall_stub_code_base_size = 1024;
@@ -203,7 +203,7 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
   // Java methods won't preserve them, so save them here:
   preserve_callee_saved_registers(_masm, abi, reg_save_area_offset);
 
-  __ block_comment("{ on_entry");
+  __ block_comment("on_entry {");
   __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_entry));
   __ z_aghik(Z_ARG1, Z_SP, frame_data_offset);
   __ load_const_optimized(Z_ARG2, (intptr_t)receiver);
@@ -212,13 +212,13 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
   __ block_comment("} on_entry");
 
   arg_spiller.generate_fill(_masm, arg_save_area_offset);
-  __ block_comment("{ argument shuffle");
+  __ block_comment("argument_shuffle {");
   arg_shuffle.generate(_masm, shuffle_reg, abi._shadow_space_bytes, frame::z_jit_out_preserve_size);
-  __ block_comment("} argument shuffle");
+  __ block_comment("} argument_shuffle");
 
-  __ block_comment("{ receiver ");
+  __ block_comment("receiver {");
   __ get_vm_result(Z_ARG1);
-  __ block_comment("} receiver ");
+  __ block_comment("} receiver");
 
   __ load_const_optimized(Z_method, (intptr_t)entry);
   __ z_stg(Z_method, Address(Z_thread, in_bytes(JavaThread::callee_target_offset())));
@@ -254,7 +254,7 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
 
   result_spiller.generate_spill(_masm, res_save_area_offset);
 
-  __ block_comment("{ on_exit");
+  __ block_comment("on_exit {");
   __ load_const_optimized(call_target_address, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_exit));
   __ z_aghik(Z_ARG1, Z_SP, frame_data_offset);
   __ call(call_target_address);

From 9d63fee49c3b365e19cf492412a6b6d8c9633964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Wed, 17 Apr 2024 06:38:23 +0000
Subject: [PATCH 076/486] 8330262: C2: simplify transfer of GC barrier data
 from Ideal to Mach nodes

Reviewed-by: eosterlund, kvn
---
 src/hotspot/share/opto/matcher.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 386d3224889..d14dce77208 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -1890,11 +1890,7 @@ MachNode *Matcher::ReduceInst( State *s, int rule, Node *&mem ) {
   }
 
   // Have mach nodes inherit GC barrier data
-  if (leaf->is_LoadStore()) {
-    mach->set_barrier_data(leaf->as_LoadStore()->barrier_data());
-  } else if (leaf->is_Mem()) {
-    mach->set_barrier_data(leaf->as_Mem()->barrier_data());
-  }
+  mach->set_barrier_data(MemNode::barrier_data(leaf));
 
   return ex;
 }

From 7744b0046af4dbacb7068ae819d8a973cfbf8e40 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Wed, 17 Apr 2024 08:39:12 +0000
Subject: [PATCH 077/486] 8327946: containers/docker/TestJFREvents.java fails
 when host kernel config vm.swappiness=0 after JDK-8325139

Reviewed-by: sgehwolf
---
 .../containers/docker/TestJFREvents.java      | 63 ++++++++++++-------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/test/hotspot/jtreg/containers/docker/TestJFREvents.java b/test/hotspot/jtreg/containers/docker/TestJFREvents.java
index 19bbce1c547..abc9de45db8 100644
--- a/test/hotspot/jtreg/containers/docker/TestJFREvents.java
+++ b/test/hotspot/jtreg/containers/docker/TestJFREvents.java
@@ -30,6 +30,7 @@
  *          Also make sure that PIDs are based on value provided by container,
  *          not by the host system.
  * @requires (docker.support & os.maxMemory >= 2g)
+ * @modules java.base/jdk.internal.platform
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -44,6 +45,7 @@ import jdk.test.lib.containers.docker.DockerTestUtils;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.Utils;
+import jdk.internal.platform.Metrics;
 
 
 public class TestJFREvents {
@@ -52,6 +54,7 @@ public class TestJFREvents {
     private static final String TEST_ENV_VALUE = "unique_value_abc592903xyz";
     private static final int availableCPUs = Runtime.getRuntime().availableProcessors();
     private static final int UNKNOWN = -100;
+    private static boolean isCgroupV1 = false;
 
     public static void main(String[] args) throws Exception {
         System.out.println("Test Environment: detected availableCPUs = " + availableCPUs);
@@ -59,6 +62,14 @@ public class TestJFREvents {
             return;
         }
 
+        // If cgroups is not configured, report success.
+        Metrics metrics = Metrics.systemMetrics();
+        if (metrics == null) {
+            System.out.println("TEST PASSED!!!");
+            return;
+        }
+        isCgroupV1 = "cgroupv1".equals(metrics.getProvider());
+
         DockerTestUtils.buildJdkContainerImage(imageName);
 
         try {
@@ -217,32 +228,36 @@ public class TestJFREvents {
 
     private static void testSwapMemory(String memValueToSet, String swapValueToSet, String expectedTotalValue, String expectedFreeValue) throws Exception {
         Common.logNewTestCase("Memory: --memory = " + memValueToSet + " --memory-swap = " + swapValueToSet);
-         OutputAnalyzer out = DockerTestUtils.dockerRunJava(
-                                      commonDockerOpts()
-                                      .addDockerOpts("--memory=" + memValueToSet)
-                                      .addDockerOpts("--memory-swap=" + swapValueToSet)
-                                      .addClassOptions("jdk.SwapSpace"));
-         out.shouldHaveExitValue(0)
+        DockerRunOptions opts = commonDockerOpts();
+        opts.addDockerOpts("--memory=" + memValueToSet)
+            .addDockerOpts("--memory-swap=" + swapValueToSet)
+            .addClassOptions("jdk.SwapSpace");
+        if (isCgroupV1) {
+            // With Cgroupv1, The default memory-swappiness vaule is inherited from the host machine, which maybe 0
+            opts.addDockerOpts("--memory-swappiness=60");
+        }
+        OutputAnalyzer out = DockerTestUtils.dockerRunJava(opts);
+        out.shouldHaveExitValue(0)
             .shouldContain("totalSize = " + expectedTotalValue)
             .shouldContain("freeSize = ");
-         List<String> ls = out.asLinesWithoutVMWarnings();
-         for (String cur : ls) {
-             int idx = cur.indexOf("freeSize = ");
-             if (idx != -1) {
-                 int startNbr = idx+11;
-                 int endNbr = cur.indexOf(' ', startNbr);
-                 if (endNbr == -1) endNbr = cur.length();
-                 String freeSizeStr = cur.substring(startNbr, endNbr);
-                 long freeval = Long.parseLong(freeSizeStr);
-                 long totalval = Long.parseLong(expectedTotalValue);
-                 if (0 <= freeval && freeval <= totalval) {
-                     System.out.println("Found freeSize value " + freeval + " is fine");
-                 } else {
-                     System.out.println("Found freeSize value " + freeval + " is bad");
-                     throw new Exception("Found free size value is bad");
-                 }
-             }
-         }
+        List<String> ls = out.asLinesWithoutVMWarnings();
+        for (String cur : ls) {
+            int idx = cur.indexOf("freeSize = ");
+            if (idx != -1) {
+                int startNbr = idx+11;
+                int endNbr = cur.indexOf(' ', startNbr);
+                if (endNbr == -1) endNbr = cur.length();
+                String freeSizeStr = cur.substring(startNbr, endNbr);
+                long freeval = Long.parseLong(freeSizeStr);
+                long totalval = Long.parseLong(expectedTotalValue);
+                if (0 <= freeval && freeval <= totalval) {
+                    System.out.println("Found freeSize value " + freeval + " is fine");
+                } else {
+                    System.out.println("Found freeSize value " + freeval + " is bad");
+                    throw new Exception("Found free size value is bad");
+                }
+            }
+        }
     }
 
 

From 3ccbc6d4d014fb1ea92c47d270efd5f7ec05b0c3 Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yzheng@openjdk.org>
Date: Wed, 17 Apr 2024 09:08:50 +0000
Subject: [PATCH 078/486] 8330280: SharedRuntime::get_resolved_entry should not
 return c2i entry if the callee is special native intrinsic

Reviewed-by: pchilanomate, dlong
---
 src/hotspot/share/runtime/sharedRuntime.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 3eb4c45ed1b..299f1900906 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -1489,7 +1489,7 @@ JRT_END
 // return verified_code_entry if interp_only_mode is not set for the current thread;
 // otherwise return c2i entry.
 address SharedRuntime::get_resolved_entry(JavaThread* current, methodHandle callee_method) {
-  if (current->is_interp_only_mode()) {
+  if (current->is_interp_only_mode() && !callee_method->is_special_native_intrinsic()) {
     // In interp_only_mode we need to go to the interpreted entry
     // The c2i won't patch in this mode -- see fixup_callers_callsite
     return callee_method->get_c2i_entry();

From e4021adb287381a6c7775234b401429380075e0f Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Wed, 17 Apr 2024 09:26:26 +0000
Subject: [PATCH 079/486] 8330272: Wrong javadoc for
 ValueLayout.JAVA_LONG/JAVA_DOUBLE on x86 32bit

Reviewed-by: mcimadamore, jvernee
---
 .../share/classes/java/lang/foreign/ValueLayout.java      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/ValueLayout.java b/src/java.base/share/classes/java/lang/foreign/ValueLayout.java
index 77bfe0e0209..d4e39653491 100644
--- a/src/java.base/share/classes/java/lang/foreign/ValueLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/ValueLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -446,8 +446,7 @@ public sealed interface ValueLayout extends MemoryLayout
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code long},
-     * (platform-dependent) byte alignment set to {@code ADDRESS.byteSize()},
-     * and byte order set to {@link ByteOrder#nativeOrder()}.
+     * byte alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      */
     OfLong JAVA_LONG = ValueLayouts.OfLongImpl.of(ByteOrder.nativeOrder());
 
@@ -459,8 +458,7 @@ public sealed interface ValueLayout extends MemoryLayout
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code double},
-     * (platform-dependent) byte alignment set to {@code ADDRESS.byteSize()},
-     * and byte order set to {@link ByteOrder#nativeOrder()}.
+     * byte alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      */
     OfDouble JAVA_DOUBLE = ValueLayouts.OfDoubleImpl.of(ByteOrder.nativeOrder());
 

From 9445047d059a87d49ed0923b438d2ec49340d78e Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Wed, 17 Apr 2024 10:48:35 +0000
Subject: [PATCH 080/486] 8330163: C2: improve CMoveNode::Value() when
 condition is always true or false

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/movenode.cpp           |  7 ++
 .../compiler/c2/irTests/TestCMoveCCP.java     | 71 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/c2/irTests/TestCMoveCCP.java

diff --git a/src/hotspot/share/opto/movenode.cpp b/src/hotspot/share/opto/movenode.cpp
index 8d9cc80e69e..58feb3ec9ce 100644
--- a/src/hotspot/share/opto/movenode.cpp
+++ b/src/hotspot/share/opto/movenode.cpp
@@ -169,6 +169,13 @@ const Type* CMoveNode::Value(PhaseGVN* phase) const {
   if (phase->type(in(IfTrue)) == Type::TOP || phase->type(in(IfFalse)) == Type::TOP) {
     return Type::TOP;
   }
+  if (phase->type(in(Condition)) == TypeInt::ZERO) {
+    return phase->type(in(IfFalse))->filter(_type); // Always pick left (false) input
+  }
+  if (phase->type(in(Condition)) == TypeInt::ONE) {
+    return phase->type(in(IfTrue))->filter(_type);  // Always pick right (true) input
+  }
+
   const Type* t = phase->type(in(IfFalse))->meet_speculative(phase->type(in(IfTrue)));
   return t->filter(_type);
 }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestCMoveCCP.java b/test/hotspot/jtreg/compiler/c2/irTests/TestCMoveCCP.java
new file mode 100644
index 00000000000..475e8565b28
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestCMoveCCP.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2024, Red Hat 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.
+ */
+
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8330163
+ * @summary C2: improve CMoveNode::Value() when condition is always true or false
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestCMoveCCP
+ */
+
+
+public class TestCMoveCCP {
+    private static volatile int volatileField;
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @IR(failOn = { IRNode.COUNTED_LOOP, IRNode.LOOP })
+    private static void test1() {
+        int i = -1;
+        testHelper1(i);
+    }
+
+    @ForceInline
+    private static void testHelper1(int i) {
+        do {
+            if (i != 1) {
+                if (i < 0) { // Converted to CMoveI
+                    i = 50;
+                }
+                volatileField = 42;
+            }
+            i *= 2;
+            // i = 100 on first iteration when called from test1
+        } while (i != 100);
+    }
+
+    @Run(test = "test1")
+    @Warmup(10000)
+    private static void testRunner1() {
+        test1();
+        testHelper1(1);
+    }
+}

From 89129e3f672d8af9613ad2a72e64322661836c96 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 17 Apr 2024 10:59:12 +0000
Subject: [PATCH 081/486] 8212895: ChronoField.INSTANT_SECONDS's range doesn't
 match the range of Instant

Reviewed-by: rriggs, naoto
---
 .../classes/java/time/temporal/ChronoField.java     |  7 +++++--
 .../time/tck/java/time/temporal/TCKChronoField.java | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/time/temporal/ChronoField.java b/src/java.base/share/classes/java/time/temporal/ChronoField.java
index 3728f9e6d91..9e5de367b0e 100644
--- a/src/java.base/share/classes/java/time/temporal/ChronoField.java
+++ b/src/java.base/share/classes/java/time/temporal/ChronoField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -586,8 +586,11 @@ public enum ChronoField implements TemporalField {
      * <p>
      * This field is strictly defined to have the same meaning in all calendar systems.
      * This is necessary to ensure interoperation between calendars.
+     * <p>
+     * Range of InstantSeconds is between {@link Instant#MIN} and {@link Instant#MAX}
+     * {@linkplain Instant#getEpochSecond() epoch second}, both inclusive.
      */
-    INSTANT_SECONDS("InstantSeconds", SECONDS, FOREVER, ValueRange.of(Long.MIN_VALUE, Long.MAX_VALUE)),
+    INSTANT_SECONDS("InstantSeconds", SECONDS, FOREVER, ValueRange.of(Instant.MIN.getEpochSecond(), Instant.MAX.getEpochSecond())),
     /**
      * The offset from UTC/Greenwich.
      * <p>
diff --git a/test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java b/test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java
index 97329b47f74..efc63b192b6 100644
--- a/test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java
+++ b/test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -97,6 +97,7 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -263,4 +264,14 @@ public class TCKChronoField {
             assertEquals(ChronoField.valueOf(field.name()), field);
         }
     }
+
+    // verify the minimum and maximum values of ChronoField.INSTANT_SECONDS
+    // matches the minimum and maximum supported epoch second by Instant.
+    @Test
+    public void testMinMaxInstantSeconds() {
+        assertEquals(ChronoField.INSTANT_SECONDS.range().getMinimum(),
+                Instant.MIN.getLong(ChronoField.INSTANT_SECONDS));
+        assertEquals(ChronoField.INSTANT_SECONDS.range().getMaximum(),
+                Instant.MAX.getLong(ChronoField.INSTANT_SECONDS));
+    }
 }

From 5841cb3b51e45e7c3aaa086e179815fa8184f22d Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 17 Apr 2024 12:39:36 +0000
Subject: [PATCH 082/486] 8330107: Separate out "awt" libraries from
 Awt2dLibraries.gmk

Reviewed-by: erikj
---
 make/modules/java.desktop/Lib.gmk             |   3 +-
 .../modules/java.desktop/lib/AwtLibraries.gmk | 426 ++++++++++++
 ...Awt2dLibraries.gmk => ClientLibraries.gmk} | 632 ++++--------------
 3 files changed, 549 insertions(+), 512 deletions(-)
 create mode 100644 make/modules/java.desktop/lib/AwtLibraries.gmk
 rename make/modules/java.desktop/lib/{Awt2dLibraries.gmk => ClientLibraries.gmk} (54%)

diff --git a/make/modules/java.desktop/Lib.gmk b/make/modules/java.desktop/Lib.gmk
index 011e8375105..01b51fd4788 100644
--- a/make/modules/java.desktop/Lib.gmk
+++ b/make/modules/java.desktop/Lib.gmk
@@ -35,7 +35,8 @@ $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.desktop/*/native))
 ################################################################################
 # Create the AWT/2D libraries
 
-include lib/Awt2dLibraries.gmk
+include lib/AwtLibraries.gmk
+include lib/ClientLibraries.gmk
 
 ifeq ($(call isTargetOs, aix), false)
   ##############################################################################
diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
new file mode 100644
index 00000000000..11f92585bd9
--- /dev/null
+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -0,0 +1,426 @@
+#
+# Copyright (c) 2011, 2024, 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.
+#
+
+include CopyFiles.gmk
+
+################################################################################
+# This file will build all AWT/2D native libraries with "awt" in the name.
+# Note that this does not imply that the code they bring in belong to AWT.
+# This split is purely made to keep the size of the Makefiles reasonable.
+
+LIBAWT_DEFAULT_HEADER_DIRS := \
+    common/awt/utility \
+    libawt/awt/image \
+    libawt/awt/image/cvutils \
+    libawt/java2d \
+    libawt/java2d/loops \
+    libawt/java2d/pipe \
+    #
+
+################################################################################
+## Build libawt
+################################################################################
+
+LIBAWT_EXTRA_SRC := \
+    common/awt/debug \
+    $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+    #
+
+ifeq ($(call isTargetOs, windows), true)
+  LIBAWT_EXTRA_SRC += \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/awt/utility \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/font \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/opengl \
+      $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
+      #
+endif
+
+ifeq ($(call isTargetOs, linux macosx aix), true)
+  LIBAWT_EXCLUDE_FILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
+endif
+
+ifeq ($(call isTargetOs, macosx), true)
+  LIBAWT_EXCLUDE_FILES += initIDs.c img_colors.c
+endif
+
+ifeq ($(call isTargetOs, windows), true)
+  LIBAWT_EXCLUDE_FILES += D3DShaderGen.c img_colors.c
+endif
+
+LIBAWT_EXTRA_HEADER_DIRS := \
+    $(LIBAWT_DEFAULT_HEADER_DIRS) \
+    $(call GetJavaHeaderDir, java.base) \
+    libawt/awt/medialib \
+    libawt/java2d/d3d \
+    libawt/java2d/opengl \
+    libawt/java2d/windows \
+    libawt/windows \
+    common/awt/medialib \
+    libmlib_image \
+    include \
+    #
+
+LIBAWT_CFLAGS := -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES -DMLIB_NO_LIBSUNMATH
+
+ifeq ($(call isTargetOs, windows), true)
+  LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
+  ifeq ($(call isTargetCpuBits, 64), true)
+    LIBAWT_CFLAGS += -DMLIB_OS64BIT
+  endif
+
+  LIBAWT_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
+  LIBAWT_VERSIONINFO_RESOURCE := \
+      $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
+endif
+
+# -fgcse-after-reload improves performance of MaskFill in Java2D by 20% for
+# some gcc
+$(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
+    NAME := awt, \
+    EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \
+    EXCLUDE_FILES := $(LIBAWT_EXCLUDE_FILES), \
+    OPTIMIZATION := HIGHEST, \
+    CFLAGS := $(LIBAWT_CFLAGS) $(X_CFLAGS), \
+    CXXFLAGS := $(LIBAWT_CFLAGS) $(X_CFLAGS), \
+    CFLAGS_gcc := -fgcse-after-reload, \
+    EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
+    DISABLED_WARNINGS_gcc_awt_LoadLibrary.c := unused-result, \
+    DISABLED_WARNINGS_gcc_debug_mem.c := format-nonliteral, \
+    DISABLED_WARNINGS_gcc_ProcessPath.c := maybe-uninitialized, \
+    DISABLED_WARNINGS_gcc_Region.c := maybe-uninitialized, \
+    DISABLED_WARNINGS_gcc_SurfaceData.c := unused-value, \
+    DISABLED_WARNINGS_gcc_TransformHelper.c := sign-compare, \
+    DISABLED_WARNINGS_clang_awt_ImagingLib.c := deprecated-non-prototype, \
+    DISABLED_WARNINGS_clang_debug_trace.c := format-nonliteral, \
+    DISABLED_WARNINGS_clang_Trace.c := format-nonliteral, \
+    DISABLED_WARNINGS_clang_TransformHelper.c := sign-compare, \
+    DISABLED_WARNINGS_microsoft := 4244 4996, \
+    DISABLED_WARNINGS_microsoft_awt_Toolkit.cpp := 4267, \
+    LDFLAGS_windows := -delayload:comctl32.dll -delayload:comdlg32.dll \
+        -delayload:gdi32.dll -delayload:imm32.dll -delayload:ole32.dll \
+        -delayload:shell32.dll -delayload:shlwapi.dll -delayload:user32.dll \
+        -delayload:winmm.dll -delayload:winspool.drv, \
+    JDK_LIBS := java.base:libjava java.base:libjvm, \
+    LIBS_unix := $(LIBM), \
+    LIBS_linux := $(LIBDL), \
+    LIBS_aix := $(LIBDL),\
+    LIBS_macosx := \
+        -framework ApplicationServices \
+        -framework AudioToolbox \
+        -framework Cocoa \
+        -framework JavaRuntimeSupport \
+        -framework Metal \
+        -framework OpenGL, \
+    LIBS_windows := advapi32.lib comctl32.lib comdlg32.lib delayimp.lib \
+        gdi32.lib imm32.lib kernel32.lib ole32.lib shell32.lib shlwapi.lib \
+        user32.lib uuid.lib winmm.lib winspool.lib, \
+    VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
+    EXTRA_RCFLAGS := $(LIBAWT_RCFLAGS), \
+))
+
+TARGETS += $(BUILD_LIBAWT)
+
+# Mac and Windows only use the native AWT lib, do not build libawt_headless
+ifeq ($(call isTargetOs, windows macosx), false)
+  ##############################################################################
+  ## Build libawt_headless
+  ##############################################################################
+
+  LIBAWT_HEADLESS_EXTRA_SRC := \
+      common/font \
+      common/java2d \
+      $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+      #
+
+  LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \
+      $(LIBAWT_DEFAULT_HEADER_DIRS) \
+      common/awt/debug \
+      common/font \
+      common/java2d/opengl \
+      java.base:libjvm \
+      #
+
+  # These are the object files provided by the awt native
+  # library. Do not include these external (non-awt_headless library)
+  # objects in the static library. When statically linking the java
+  # launcher with all JDK and VM static libraries, we use the
+  # --whole-archive linker option. The duplicate objects in different
+  # static libraries cause linking errors due to duplicate symbols.
+  LIBAWT_HEADLESS_STATIC_EXCLUDE_OBJS := systemScale.o
+
+  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
+      NAME := awt_headless, \
+      EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
+      EXCLUDES := medialib, \
+      OPTIMIZATION := LOW, \
+      CFLAGS := -DHEADLESS=true $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) \
+          $(X_CFLAGS), \
+      EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
+      DISABLED_WARNINGS_gcc_X11Renderer.c := unused-function, \
+      DISABLED_WARNINGS_gcc_X11SurfaceData.c := unused-function, \
+      JDK_LIBS := libawt java.base:libjava, \
+      LIBS_linux := $(LIBDL) $(LIBM), \
+      STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_HEADLESS_STATIC_EXCLUDE_OBJS), \
+  ))
+
+  TARGETS += $(BUILD_LIBAWT_HEADLESS)
+endif
+
+ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
+  ##############################################################################
+  ## Build libawt_xawt
+  ##############################################################################
+
+  LIBAWT_XAWT_EXTRA_SRC := \
+      common/awt \
+      common/java2d \
+      common/font \
+      #
+
+  LIBAWT_XAWT_EXTRA_HEADER_DIRS := \
+      $(LIBAWT_DEFAULT_HEADER_DIRS) \
+      libawt_xawt/awt \
+      include \
+      common/awt/debug \
+      common/awt/systemscale \
+      common/font \
+      common/java2d/opengl \
+      common/java2d/x11 \
+      libpipewire/include \
+      java.base:libjvm \
+      #
+
+  ifeq ($(call isTargetOs, linux), true)
+    ifeq ($(DISABLE_XRENDER), true)
+      LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
+    endif
+  endif
+
+  # These are the object files provided by the awt native
+  # library. Do not include these external (non-awt_xawt library)
+  # objects in the static library. When statically linking the java
+  # launcher with all JDK and VM static libraries, we use the
+  # --whole-archive linker option. The duplicate objects in different
+  # static libraries cause linking errors due to duplicate symbols.
+  LIBAWT_XAWT_STATIC_EXCLUDE_OBJS := systemScale.o
+
+  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
+      NAME := awt_xawt, \
+      EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
+      EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
+      EXCLUDES := medialib debug, \
+      OPTIMIZATION := LOW, \
+      CFLAGS := -DXAWT -DXAWT_HACK $(LIBAWT_XAWT_CFLAGS) \
+          $(FONTCONFIG_CFLAGS) $(CUPS_CFLAGS) $(X_CFLAGS), \
+      DISABLED_WARNINGS_gcc := int-to-pointer-cast, \
+      DISABLED_WARNINGS_gcc_awt_Taskbar.c := parentheses, \
+      DISABLED_WARNINGS_gcc_GLXSurfaceData.c := unused-function, \
+      DISABLED_WARNINGS_gcc_gtk2_interface.c := parentheses type-limits, \
+      DISABLED_WARNINGS_gcc_gtk3_interface.c := parentheses type-limits \
+          unused-function, \
+      DISABLED_WARNINGS_gcc_OGLBufImgOps.c := format-nonliteral, \
+      DISABLED_WARNINGS_gcc_OGLPaints.c := format-nonliteral, \
+      DISABLED_WARNINGS_gcc_screencast_pipewire.c := undef, \
+      DISABLED_WARNINGS_gcc_screencast_portal.c := undef, \
+      DISABLED_WARNINGS_gcc_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
+      DISABLED_WARNINGS_gcc_X11SurfaceData.c := implicit-fallthrough \
+          pointer-to-int-cast, \
+      DISABLED_WARNINGS_gcc_XlibWrapper.c := type-limits pointer-to-int-cast, \
+      DISABLED_WARNINGS_gcc_XRBackendNative.c := maybe-uninitialized, \
+      DISABLED_WARNINGS_gcc_XToolkit.c := unused-result, \
+      DISABLED_WARNINGS_gcc_XWindow.c := unused-function, \
+      DISABLED_WARNINGS_clang_awt_Taskbar.c := parentheses, \
+      DISABLED_WARNINGS_clang_gtk2_interface.c := parentheses, \
+      DISABLED_WARNINGS_clang_gtk3_interface.c := parentheses, \
+      DISABLED_WARNINGS_clang_OGLBufImgOps.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_screencast_pipewire.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
+      DISABLED_WARNINGS_clang_aix := deprecated-non-prototype, \
+      DISABLED_WARNINGS_clang_aix_awt_Taskbar.c := parentheses, \
+      DISABLED_WARNINGS_clang_aix_OGLPaints.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_aix_OGLBufImgOps.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_aix_gtk2_interface.c := parentheses \
+          logical-op-parentheses, \
+      DISABLED_WARNINGS_clang_aix_gtk3_interface.c := parentheses \
+          logical-op-parentheses, \
+      DISABLED_WARNINGS_clang_aix_sun_awt_X11_GtkFileDialogPeer.c := \
+          parentheses, \
+      DISABLED_WARNINGS_clang_aix_awt_InputMethod.c := sign-compare, \
+      JDK_LIBS := libawt java.base:libjava, \
+      LIBS_unix := $(LIBDL) $(LIBM) $(X_LIBS) -lX11 -lXext -lXi -lXrender \
+          -lXtst, \
+      LIBS_linux := -lpthread, \
+      STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_XAWT_STATIC_EXCLUDE_OBJS), \
+  ))
+
+  TARGETS += $(BUILD_LIBAWT_XAWT)
+endif
+
+ifeq ($(call isTargetOs, macosx), true)
+  ##############################################################################
+  ## Build libawt_lwawt
+  ##############################################################################
+
+  LIBAWT_LWAWT_EXTRA_SRC := \
+      $(TOPDIR)/src/$(MODULE)/unix/native/common/awt \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/font \
+      $(TOPDIR)/src/$(MODULE)/share/native/common/java2d \
+      #
+
+  LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \
+      $(LIBAWT_DEFAULT_HEADER_DIRS) \
+      libawt_lwawt/awt \
+      libawt_lwawt/font \
+      libawt_lwawt/java2d/opengl \
+      libawt_lwawt/java2d/metal \
+      include \
+      common/awt/debug \
+      common/java2d/opengl \
+      java.base:libjvm \
+      #
+
+  LIBAWT_LWAWT_EXCLUDE_FILES := fontpath.c awt_Font.c X11Color.c
+  LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib
+
+  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \
+      NAME := awt_lwawt, \
+      EXTRA_SRC := $(LIBAWT_LWAWT_EXTRA_SRC), \
+      EXCLUDE_FILES := $(LIBAWT_LWAWT_EXCLUDE_FILES), \
+      EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
+      OPTIMIZATION := LOW, \
+      EXTRA_HEADER_DIRS := $(LIBAWT_LWAWT_EXTRA_HEADER_DIRS), \
+      DISABLED_WARNINGS_clang := incomplete-implementation \
+          deprecated-declarations objc-method-access \
+          incompatible-pointer-types extra-tokens sign-compare undef, \
+      DISABLED_WARNINGS_clang_AWTWindow.m := bitwise-op-parentheses, \
+      DISABLED_WARNINGS_clang_CFileDialog.m := semicolon-before-method-body, \
+      DISABLED_WARNINGS_clang_CGGlyphImages.m := pointer-arith, \
+      DISABLED_WARNINGS_clang_CGLLayer.m := semicolon-before-method-body, \
+      DISABLED_WARNINGS_clang_ImageSurfaceData.m := enum-conversion \
+          parentheses-equality, \
+      DISABLED_WARNINGS_clang_MTLBlitLoops.m := pointer-arith, \
+      DISABLED_WARNINGS_clang_MTLPipelineStatesStorage.m := \
+          semicolon-before-method-body, \
+      DISABLED_WARNINGS_clang_MTLRenderer.m := gnu-folding-constant, \
+      DISABLED_WARNINGS_clang_MTLVertexCache.m := pointer-arith, \
+      DISABLED_WARNINGS_clang_OGLBufImgOps.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_PrinterView.m := enum-conversion, \
+      JDK_LIBS := libawt java.base:libjava libosxapp, \
+      LIBS_macosx := $(LIBM) \
+          -framework Accelerate \
+          -framework ApplicationServices \
+          -framework AudioToolbox \
+          -framework Carbon \
+          -framework Cocoa \
+          -framework ExceptionHandling \
+          -framework JavaRuntimeSupport \
+          -framework Metal \
+          -framework OpenGL \
+          -framework QuartzCore \
+          -framework Security, \
+  ))
+
+  TARGETS += $(BUILD_LIBAWT_LWAWT)
+endif
+
+################################################################################
+## Build libjawt
+################################################################################
+
+LIBJAWT_EXTRA_HEADER_DIRS := \
+    include \
+    java.base:libjava \
+    #
+
+ifeq ($(call isTargetOs, windows), true)
+  LIBJAWT_EXTRA_HEADER_DIRS += \
+      common/awt/debug \
+      common/awt/utility \
+      libawt/awt/image/cvutils \
+      libawt/java2d \
+      libawt/java2d/windows \
+      libawt/windows \
+      java.base:libjvm \
+      #
+else
+  LIBJAWT_EXTRA_HEADER_DIRS += \
+      common/awt \
+      #
+endif
+
+ifeq ($(call isTargetOs, macosx), true)
+  # libjawt on macosx does not use the unix code
+  LIBJAWT_EXCLUDE_SRC_PATTERNS := /unix/
+endif
+
+ifeq ($(call isTargetOs, linux)+$(ENABLE_HEADLESS_ONLY), true+true)
+  LIBJAWT_CFLAGS += -DHEADLESS
+endif
+
+ifeq ($(call isTargetOs, windows)+$(call isTargetCpu, x86), true+true)
+  LIBJAWT_LIBS_windows := kernel32.lib
+endif
+
+ifeq ($(call isTargetOsType, unix)+$(call isTargetOs, macosx), true+false)
+  LIBJAWT_JDK_LIBS_unix := libawt
+  ifeq ($(ENABLE_HEADLESS_ONLY), false)
+    LIBJAWT_JDK_LIBS_unix += libawt_xawt
+  else
+    LIBJAWT_JDK_LIBS_unix += libawt_headless
+  endif
+endif
+
+$(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
+    NAME := jawt, \
+    EXCLUDE_SRC_PATTERNS := $(LIBJAWT_EXCLUDE_SRC_PATTERNS), \
+    OPTIMIZATION := LOW, \
+    CFLAGS := $(LIBJAWT_CFLAGS), \
+    CFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
+    CXXFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
+    DISABLED_WARNINGS_clang_jawt.m := sign-compare, \
+    EXTRA_HEADER_DIRS := $(LIBJAWT_EXTRA_HEADER_DIRS), \
+    LDFLAGS_windows := $(LDFLAGS_CXX_JDK), \
+    LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
+    JDK_LIBS_unix := $(LIBJAWT_JDK_LIBS_unix), \
+    JDK_LIBS_windows := libawt, \
+    JDK_LIBS_macosx := libawt_lwawt, \
+    LIBS_macosx := -framework Cocoa, \
+    LIBS_windows := advapi32.lib $(LIBJAWT_LIBS_windows), \
+))
+
+TARGETS += $(BUILD_LIBJAWT)
+
+ifeq ($(call isTargetOs, windows), true)
+  $(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
+      FILES := $(BUILD_LIBJAWT_IMPORT_LIBRARY), \
+      DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
+  ))
+
+  $(COPY_JAWT_LIB): $(BUILD_LIBJAWT)
+
+  TARGETS += $(COPY_JAWT_LIB)
+endif
diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
similarity index 54%
rename from make/modules/java.desktop/lib/Awt2dLibraries.gmk
rename to make/modules/java.desktop/lib/ClientLibraries.gmk
index 868e6fb7a7c..6f3616608cc 100644
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -23,16 +23,11 @@
 # questions.
 #
 
-include CopyFiles.gmk
-
-LIBAWT_DEFAULT_HEADER_DIRS := \
-    common/awt/utility \
-    libawt/awt/image \
-    libawt/awt/image/cvutils \
-    libawt/java2d \
-    libawt/java2d/loops \
-    libawt/java2d/pipe \
-    #
+################################################################################
+# This file will build all AWT/2D native libraries that does not have "awt" in
+# the name. Note that this does not imply anything about the logical ownership
+# of the code they compile.
+# This split is purely made to keep the size of the Makefiles reasonable.
 
 ################################################################################
 ## Build libmlib_image
@@ -56,200 +51,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
 
 TARGETS += $(BUILD_LIBMLIB_IMAGE)
 
-################################################################################
-## Build libawt
-################################################################################
-
-LIBAWT_EXTRA_SRC := \
-    common/awt/debug \
-    $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-    #
-
-ifeq ($(call isTargetOs, windows), true)
-  LIBAWT_EXTRA_SRC += \
-      $(TOPDIR)/src/$(MODULE)/share/native/common/awt/utility \
-      $(TOPDIR)/src/$(MODULE)/share/native/common/font \
-      $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/opengl \
-      $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
-      #
-endif
-
-ifeq ($(call isTargetOs, linux macosx aix), true)
-  LIBAWT_EXCLUDE_FILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
-endif
-
-ifeq ($(call isTargetOs, macosx), true)
-  LIBAWT_EXCLUDE_FILES += initIDs.c img_colors.c
-endif
-
-ifeq ($(call isTargetOs, windows), true)
-  LIBAWT_EXCLUDE_FILES += D3DShaderGen.c img_colors.c
-endif
-
-LIBAWT_EXTRA_HEADER_DIRS := \
-    $(LIBAWT_DEFAULT_HEADER_DIRS) \
-    $(call GetJavaHeaderDir, java.base) \
-    libawt/awt/medialib \
-    libawt/java2d/d3d \
-    libawt/java2d/opengl \
-    libawt/java2d/windows \
-    libawt/windows \
-    common/awt/medialib \
-    libmlib_image \
-    include \
-    #
-
-LIBAWT_CFLAGS := -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES -DMLIB_NO_LIBSUNMATH
-
-ifeq ($(call isTargetOs, windows), true)
-  LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
-  ifeq ($(call isTargetCpuBits, 64), true)
-    LIBAWT_CFLAGS += -DMLIB_OS64BIT
-  endif
-
-  LIBAWT_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
-  LIBAWT_VERSIONINFO_RESOURCE := \
-      $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
-endif
-
-# -fgcse-after-reload improves performance of MaskFill in Java2D by 20% for
-# some gcc
-$(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
-    NAME := awt, \
-    EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \
-    EXCLUDE_FILES := $(LIBAWT_EXCLUDE_FILES), \
-    OPTIMIZATION := HIGHEST, \
-    CFLAGS := $(LIBAWT_CFLAGS) $(X_CFLAGS), \
-    CXXFLAGS := $(LIBAWT_CFLAGS) $(X_CFLAGS), \
-    CFLAGS_gcc := -fgcse-after-reload, \
-    EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
-    DISABLED_WARNINGS_gcc_awt_LoadLibrary.c := unused-result, \
-    DISABLED_WARNINGS_gcc_debug_mem.c := format-nonliteral, \
-    DISABLED_WARNINGS_gcc_ProcessPath.c := maybe-uninitialized, \
-    DISABLED_WARNINGS_gcc_Region.c := maybe-uninitialized, \
-    DISABLED_WARNINGS_gcc_SurfaceData.c := unused-value, \
-    DISABLED_WARNINGS_gcc_TransformHelper.c := sign-compare, \
-    DISABLED_WARNINGS_clang_awt_ImagingLib.c := deprecated-non-prototype, \
-    DISABLED_WARNINGS_clang_debug_trace.c := format-nonliteral, \
-    DISABLED_WARNINGS_clang_Trace.c := format-nonliteral, \
-    DISABLED_WARNINGS_clang_TransformHelper.c := sign-compare, \
-    DISABLED_WARNINGS_microsoft := 4244 4996, \
-    DISABLED_WARNINGS_microsoft_awt_Toolkit.cpp := 4267, \
-    LDFLAGS_windows := -delayload:comctl32.dll -delayload:comdlg32.dll \
-        -delayload:gdi32.dll -delayload:imm32.dll -delayload:ole32.dll \
-        -delayload:shell32.dll -delayload:shlwapi.dll -delayload:user32.dll \
-        -delayload:winmm.dll -delayload:winspool.drv, \
-    JDK_LIBS := java.base:libjava java.base:libjvm, \
-    LIBS_unix := $(LIBM), \
-    LIBS_linux := $(LIBDL), \
-    LIBS_aix := $(LIBDL),\
-    LIBS_macosx := \
-        -framework ApplicationServices \
-        -framework AudioToolbox \
-        -framework Cocoa \
-        -framework JavaRuntimeSupport \
-        -framework Metal \
-        -framework OpenGL, \
-    LIBS_windows := advapi32.lib comctl32.lib comdlg32.lib delayimp.lib \
-        gdi32.lib imm32.lib kernel32.lib ole32.lib shell32.lib shlwapi.lib \
-        user32.lib uuid.lib winmm.lib winspool.lib, \
-    VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
-    EXTRA_RCFLAGS := $(LIBAWT_RCFLAGS), \
-))
-
-TARGETS += $(BUILD_LIBAWT)
-
-ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
-  ##############################################################################
-  ## Build libawt_xawt
-  ##############################################################################
-
-  LIBAWT_XAWT_EXTRA_SRC := \
-      common/awt \
-      common/java2d \
-      common/font \
-      #
-
-  LIBAWT_XAWT_EXTRA_HEADER_DIRS := \
-      $(LIBAWT_DEFAULT_HEADER_DIRS) \
-      libawt_xawt/awt \
-      include \
-      common/awt/debug \
-      common/awt/systemscale \
-      common/font \
-      common/java2d/opengl \
-      common/java2d/x11 \
-      libpipewire/include \
-      java.base:libjvm \
-      #
-
-  ifeq ($(call isTargetOs, linux), true)
-    ifeq ($(DISABLE_XRENDER), true)
-      LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
-    endif
-  endif
-
-  # These are the object files provided by the awt native
-  # library. Do not include these external (non-awt_xawt library)
-  # objects in the static library. When statically linking the java
-  # launcher with all JDK and VM static libraries, we use the
-  # --whole-archive linker option. The duplicate objects in different
-  # static libraries cause linking errors due to duplicate symbols.
-  LIBAWT_XAWT_STATIC_EXCLUDE_OBJS := systemScale.o
-
-  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
-      NAME := awt_xawt, \
-      EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
-      EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
-      EXCLUDES := medialib debug, \
-      OPTIMIZATION := LOW, \
-      CFLAGS := -DXAWT -DXAWT_HACK $(LIBAWT_XAWT_CFLAGS) \
-          $(FONTCONFIG_CFLAGS) $(CUPS_CFLAGS) $(X_CFLAGS), \
-      DISABLED_WARNINGS_gcc := int-to-pointer-cast, \
-      DISABLED_WARNINGS_gcc_awt_Taskbar.c := parentheses, \
-      DISABLED_WARNINGS_gcc_GLXSurfaceData.c := unused-function, \
-      DISABLED_WARNINGS_gcc_gtk2_interface.c := parentheses type-limits, \
-      DISABLED_WARNINGS_gcc_gtk3_interface.c := parentheses type-limits \
-          unused-function, \
-      DISABLED_WARNINGS_gcc_OGLBufImgOps.c := format-nonliteral, \
-      DISABLED_WARNINGS_gcc_OGLPaints.c := format-nonliteral, \
-      DISABLED_WARNINGS_gcc_screencast_pipewire.c := undef, \
-      DISABLED_WARNINGS_gcc_screencast_portal.c := undef, \
-      DISABLED_WARNINGS_gcc_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
-      DISABLED_WARNINGS_gcc_X11SurfaceData.c := implicit-fallthrough \
-          pointer-to-int-cast, \
-      DISABLED_WARNINGS_gcc_XlibWrapper.c := type-limits pointer-to-int-cast, \
-      DISABLED_WARNINGS_gcc_XRBackendNative.c := maybe-uninitialized, \
-      DISABLED_WARNINGS_gcc_XToolkit.c := unused-result, \
-      DISABLED_WARNINGS_gcc_XWindow.c := unused-function, \
-      DISABLED_WARNINGS_clang_awt_Taskbar.c := parentheses, \
-      DISABLED_WARNINGS_clang_gtk2_interface.c := parentheses, \
-      DISABLED_WARNINGS_clang_gtk3_interface.c := parentheses, \
-      DISABLED_WARNINGS_clang_OGLBufImgOps.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_screencast_pipewire.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
-      DISABLED_WARNINGS_clang_aix := deprecated-non-prototype, \
-      DISABLED_WARNINGS_clang_aix_awt_Taskbar.c := parentheses, \
-      DISABLED_WARNINGS_clang_aix_OGLPaints.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_aix_OGLBufImgOps.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_aix_gtk2_interface.c := parentheses \
-          logical-op-parentheses, \
-      DISABLED_WARNINGS_clang_aix_gtk3_interface.c := parentheses \
-          logical-op-parentheses, \
-      DISABLED_WARNINGS_clang_aix_sun_awt_X11_GtkFileDialogPeer.c := \
-          parentheses, \
-      DISABLED_WARNINGS_clang_aix_awt_InputMethod.c := sign-compare, \
-      JDK_LIBS := libawt java.base:libjava, \
-      LIBS_unix := $(LIBDL) $(LIBM) $(X_LIBS) -lX11 -lXext -lXi -lXrender \
-          -lXtst, \
-      LIBS_linux := -lpthread, \
-      STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_XAWT_STATIC_EXCLUDE_OBJS), \
-  ))
-
-  TARGETS += $(BUILD_LIBAWT_XAWT)
-endif
-
 ################################################################################
 ## Build liblcms
 ################################################################################
@@ -326,51 +127,132 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \
 
 TARGETS += $(BUILD_LIBJAVAJPEG)
 
+################################################################################
+## Build libsplashscreen
+################################################################################
 
-# Mac and Windows only use the native AWT lib, do not build libawt_headless
-ifeq ($(call isTargetOs, windows macosx), false)
-  ##############################################################################
-  ## Build libawt_headless
-  ##############################################################################
-
-  LIBAWT_HEADLESS_EXTRA_SRC := \
-      common/font \
-      common/java2d \
-      $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+ifeq ($(ENABLE_HEADLESS_ONLY), false)
+  LIBSPLASHSCREEN_EXTRA_SRC := \
+      common/awt/systemscale \
       #
 
-  LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \
-      $(LIBAWT_DEFAULT_HEADER_DIRS) \
-      common/awt/debug \
-      common/font \
-      common/java2d/opengl \
+  LIBSPLASHSCREEN_HEADER_DIRS := \
+      common/awt/utility \
+      libosxapp \
+      java.base:libjava \
       java.base:libjvm \
       #
 
-  # These are the object files provided by the awt native
-  # library. Do not include these external (non-awt_headless library)
-  # objects in the static library. When statically linking the java
-  # launcher with all JDK and VM static libraries, we use the
-  # --whole-archive linker option. The duplicate objects in different
-  # static libraries cause linking errors due to duplicate symbols.
-  LIBAWT_HEADLESS_STATIC_EXCLUDE_OBJS := systemScale.o
+  ifeq ($(USE_EXTERNAL_LIBGIF), false)
+    LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/giflib
+  else
+    LIBSPLASHSCREEN_EXCLUDES += giflib
+  endif
 
-  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
-      NAME := awt_headless, \
-      EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
-      EXCLUDES := medialib, \
+  ifeq ($(USE_EXTERNAL_LIBJPEG), false)
+    LIBSPLASHSCREEN_EXTRA_SRC += libjavajpeg
+  endif
+
+  ifeq ($(USE_EXTERNAL_LIBPNG), false)
+    LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/libpng
+  else
+    LIBSPLASHSCREEN_EXCLUDES += libpng
+  endif
+
+  ifeq ($(USE_EXTERNAL_LIBZ), false)
+    LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib
+  endif
+
+  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
+      -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0
+
+  ifeq ($(call isTargetOs, linux)+$(call isTargetCpuArch, ppc), true+true)
+    LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
+  endif
+
+  # The external libpng submitted in the jdk is a reduced version
+  # which does not contain .png_init_filter_functions_vsx.
+  # Therefore we need to disable PNG_POWERPC_VSX_OPT explicitly by setting
+  # it to 0. If this define is not set, it would be automatically set to 2,
+  # because
+  #   "#if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)"
+  # expands to true. This would results in the fact that
+  # .png_init_filter_functions_vsx is needed in libpng.
+  ifeq ($(call isTargetOs, aix), true)
+    LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
+  endif
+
+  ifeq ($(call isTargetOs, macosx), true)
+    # libsplashscreen on macosx does not use the unix code
+    LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := /unix/
+
+    BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
+    BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
+    BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
+    BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
+    BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
+    BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
+    BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
+  endif
+
+  ifeq ($(call isTargetOs, macosx), true)
+    LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
+  else ifeq ($(call isTargetOs, windows), true)
+    LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
+  else
+    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
+  endif
+
+  $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \
+      NAME := splashscreen, \
+      EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC), \
+      EXCLUDE_SRC_PATTERNS := $(LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS), \
+      EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
+      EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
       OPTIMIZATION := LOW, \
-      CFLAGS := -DHEADLESS=true $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) \
-          $(X_CFLAGS), \
-      EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
-      DISABLED_WARNINGS_gcc_X11Renderer.c := unused-function, \
-      DISABLED_WARNINGS_gcc_X11SurfaceData.c := unused-function, \
-      JDK_LIBS := libawt java.base:libjava, \
-      LIBS_linux := $(LIBDL) $(LIBM), \
-      STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_HEADLESS_STATIC_EXCLUDE_OBJS), \
+      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
+          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
+      CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
+          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
+      EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
+      DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
+      DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
+      DISABLED_WARNINGS_gcc_jdphuff.c := shift-negative-value, \
+      DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized, \
+      DISABLED_WARNINGS_gcc_pngerror.c := maybe-uninitialized, \
+      DISABLED_WARNINGS_gcc_splashscreen_gfx_impl.c := implicit-fallthrough \
+          maybe-uninitialized, \
+      DISABLED_WARNINGS_gcc_splashscreen_impl.c := implicit-fallthrough \
+          sign-compare unused-function, \
+      DISABLED_WARNINGS_gcc_splashscreen_sys.c := type-limits unused-result, \
+      DISABLED_WARNINGS_clang := deprecated-non-prototype, \
+      DISABLED_WARNINGS_clang_dgif_lib.c := sign-compare, \
+      DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_splashscreen_impl.c := sign-compare, \
+      DISABLED_WARNINGS_clang_splashscreen_png.c := \
+          incompatible-pointer-types, \
+      DISABLED_WARNINGS_clang_splashscreen_sys.m := deprecated-declarations, \
+      DISABLED_WARNINGS_microsoft_dgif_lib.c := 4018 4267, \
+      DISABLED_WARNINGS_microsoft_splashscreen_impl.c := 4018 4267 4244, \
+      DISABLED_WARNINGS_microsoft_splashscreen_png.c := 4267, \
+      DISABLED_WARNINGS_microsoft_splashscreen_sys.c := 4267 4244, \
+      LDFLAGS_windows := -delayload:user32.dll, \
+      JDK_LIBS_windows := java.base:libjava, \
+      JDK_LIBS_macosx := libosxapp, \
+      LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS), \
+      LIBS_unix := $(LIBM) -lpthread, \
+      LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
+      LIBS_macosx := -liconv \
+          -framework ApplicationServices \
+          -framework Cocoa \
+          -framework Foundation \
+          -framework Metal \
+          -framework Security, \
+      LIBS_aix := $(LIBDL) -liconv $(X_LIBS) -lX11 -lXext, \
+      LIBS_windows := delayimp.lib gdi32.lib kernel32.lib user32.lib, \
   ))
 
-  TARGETS += $(BUILD_LIBAWT_HEADLESS)
+  TARGETS += $(BUILD_LIBSPLASHSCREEN)
 endif
 
 ################################################################################
@@ -516,279 +398,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
 
 TARGETS += $(BUILD_LIBFONTMANAGER)
 
-################################################################################
-## Build libjawt
-################################################################################
-
-LIBJAWT_EXTRA_HEADER_DIRS := \
-    include \
-    java.base:libjava \
-    #
-
-ifeq ($(call isTargetOs, windows), true)
-  LIBJAWT_EXTRA_HEADER_DIRS += \
-      common/awt/debug \
-      common/awt/utility \
-      libawt/awt/image/cvutils \
-      libawt/java2d \
-      libawt/java2d/windows \
-      libawt/windows \
-      java.base:libjvm \
-      #
-else
-  LIBJAWT_EXTRA_HEADER_DIRS += \
-      common/awt \
-      #
-endif
-
 ifeq ($(call isTargetOs, macosx), true)
-  # libjawt on macosx does not use the unix code
-  LIBJAWT_EXCLUDE_SRC_PATTERNS := /unix/
-endif
-
-ifeq ($(call isTargetOs, linux)+$(ENABLE_HEADLESS_ONLY), true+true)
-  LIBJAWT_CFLAGS += -DHEADLESS
-endif
-
-ifeq ($(call isTargetOs, windows)+$(call isTargetCpu, x86), true+true)
-  LIBJAWT_LIBS_windows := kernel32.lib
-endif
-
-ifeq ($(call isTargetOsType, unix)+$(call isTargetOs, macosx), true+false)
-  LIBJAWT_JDK_LIBS_unix := libawt
-  ifeq ($(ENABLE_HEADLESS_ONLY), false)
-    LIBJAWT_JDK_LIBS_unix += libawt_xawt
-  else
-    LIBJAWT_JDK_LIBS_unix += libawt_headless
-  endif
-endif
-
-$(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
-    NAME := jawt, \
-    EXCLUDE_SRC_PATTERNS := $(LIBJAWT_EXCLUDE_SRC_PATTERNS), \
-    OPTIMIZATION := LOW, \
-    CFLAGS := $(LIBJAWT_CFLAGS), \
-    CFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
-    CXXFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
-    DISABLED_WARNINGS_clang_jawt.m := sign-compare, \
-    EXTRA_HEADER_DIRS := $(LIBJAWT_EXTRA_HEADER_DIRS), \
-    LDFLAGS_windows := $(LDFLAGS_CXX_JDK), \
-    LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
-    JDK_LIBS_unix := $(LIBJAWT_JDK_LIBS_unix), \
-    JDK_LIBS_windows := libawt, \
-    JDK_LIBS_macosx := libawt_lwawt, \
-    LIBS_macosx := -framework Cocoa, \
-    LIBS_windows := advapi32.lib $(LIBJAWT_LIBS_windows), \
-))
-
-TARGETS += $(BUILD_LIBJAWT)
-
-ifeq ($(call isTargetOs, windows), true)
-  $(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
-      FILES := $(BUILD_LIBJAWT_IMPORT_LIBRARY), \
-      DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
-  ))
-
-  $(COPY_JAWT_LIB): $(BUILD_LIBJAWT)
-
-  TARGETS += $(COPY_JAWT_LIB)
-endif
-
-################################################################################
-## Build libsplashscreen
-################################################################################
-
-ifeq ($(ENABLE_HEADLESS_ONLY), false)
-  LIBSPLASHSCREEN_EXTRA_SRC := \
-      common/awt/systemscale \
-      #
-
-  LIBSPLASHSCREEN_HEADER_DIRS := \
-      common/awt/utility \
-      libosxapp \
-      java.base:libjava \
-      java.base:libjvm \
-      #
-
-  ifeq ($(USE_EXTERNAL_LIBGIF), false)
-    LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/giflib
-  else
-    LIBSPLASHSCREEN_EXCLUDES += giflib
-  endif
-
-  ifeq ($(USE_EXTERNAL_LIBJPEG), false)
-    LIBSPLASHSCREEN_EXTRA_SRC += libjavajpeg
-  endif
-
-  ifeq ($(USE_EXTERNAL_LIBPNG), false)
-    LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/libpng
-  else
-    LIBSPLASHSCREEN_EXCLUDES += libpng
-  endif
-
-  ifeq ($(USE_EXTERNAL_LIBZ), false)
-    LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib
-  endif
-
-  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
-      -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0
-
-  ifeq ($(call isTargetOs, linux)+$(call isTargetCpuArch, ppc), true+true)
-    LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
-  endif
-
-  # The external libpng submitted in the jdk is a reduced version
-  # which does not contain .png_init_filter_functions_vsx.
-  # Therefore we need to disable PNG_POWERPC_VSX_OPT explicitly by setting
-  # it to 0. If this define is not set, it would be automatically set to 2,
-  # because
-  #   "#if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)"
-  # expands to true. This would results in the fact that
-  # .png_init_filter_functions_vsx is needed in libpng.
-  ifeq ($(call isTargetOs, aix), true)
-    LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
-  endif
-
-  ifeq ($(call isTargetOs, macosx), true)
-    # libsplashscreen on macosx does not use the unix code
-    LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := /unix/
-
-    BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
-    BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
-    BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
-    BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
-    BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
-    BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
-    BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
-  endif
-
-  ifeq ($(call isTargetOs, macosx), true)
-    LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
-  else ifeq ($(call isTargetOs, windows), true)
-    LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
-  else
-    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
-  endif
-
-  $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \
-      NAME := splashscreen, \
-      EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC), \
-      EXCLUDE_SRC_PATTERNS := $(LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS), \
-      EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
-      EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
-      OPTIMIZATION := LOW, \
-      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
-          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
-      CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
-          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
-      EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
-      DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
-      DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
-      DISABLED_WARNINGS_gcc_jdphuff.c := shift-negative-value, \
-      DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized, \
-      DISABLED_WARNINGS_gcc_pngerror.c := maybe-uninitialized, \
-      DISABLED_WARNINGS_gcc_splashscreen_gfx_impl.c := implicit-fallthrough \
-          maybe-uninitialized, \
-      DISABLED_WARNINGS_gcc_splashscreen_impl.c := implicit-fallthrough \
-          sign-compare unused-function, \
-      DISABLED_WARNINGS_gcc_splashscreen_sys.c := type-limits unused-result, \
-      DISABLED_WARNINGS_clang := deprecated-non-prototype, \
-      DISABLED_WARNINGS_clang_dgif_lib.c := sign-compare, \
-      DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_splashscreen_impl.c := sign-compare, \
-      DISABLED_WARNINGS_clang_splashscreen_png.c := \
-          incompatible-pointer-types, \
-      DISABLED_WARNINGS_clang_splashscreen_sys.m := deprecated-declarations, \
-      DISABLED_WARNINGS_microsoft_dgif_lib.c := 4018 4267, \
-      DISABLED_WARNINGS_microsoft_splashscreen_impl.c := 4018 4267 4244, \
-      DISABLED_WARNINGS_microsoft_splashscreen_png.c := 4267, \
-      DISABLED_WARNINGS_microsoft_splashscreen_sys.c := 4267 4244, \
-      LDFLAGS_windows := -delayload:user32.dll, \
-      JDK_LIBS_windows := java.base:libjava, \
-      JDK_LIBS_macosx := libosxapp, \
-      LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS), \
-      LIBS_unix := $(LIBM) -lpthread, \
-      LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
-      LIBS_macosx := -liconv \
-          -framework ApplicationServices \
-          -framework Cocoa \
-          -framework Foundation \
-          -framework Metal \
-          -framework Security, \
-      LIBS_aix := $(LIBDL) -liconv $(X_LIBS) -lX11 -lXext, \
-      LIBS_windows := delayimp.lib gdi32.lib kernel32.lib user32.lib, \
-  ))
-
-  TARGETS += $(BUILD_LIBSPLASHSCREEN)
-endif
-
-ifeq ($(call isTargetOs, macosx), true)
-  ##############################################################################
-  ## Build libawt_lwawt
-  ##############################################################################
-
-  LIBAWT_LWAWT_EXTRA_SRC := \
-      $(TOPDIR)/src/$(MODULE)/unix/native/common/awt \
-      $(TOPDIR)/src/$(MODULE)/share/native/common/font \
-      $(TOPDIR)/src/$(MODULE)/share/native/common/java2d \
-      #
-
-  LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \
-      $(LIBAWT_DEFAULT_HEADER_DIRS) \
-      libawt_lwawt/awt \
-      libawt_lwawt/font \
-      libawt_lwawt/java2d/opengl \
-      libawt_lwawt/java2d/metal \
-      include \
-      common/awt/debug \
-      common/java2d/opengl \
-      java.base:libjvm \
-      #
-
-  LIBAWT_LWAWT_EXCLUDE_FILES := fontpath.c awt_Font.c X11Color.c
-  LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib
-
-  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \
-      NAME := awt_lwawt, \
-      EXTRA_SRC := $(LIBAWT_LWAWT_EXTRA_SRC), \
-      EXCLUDE_FILES := $(LIBAWT_LWAWT_EXCLUDE_FILES), \
-      EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
-      OPTIMIZATION := LOW, \
-      EXTRA_HEADER_DIRS := $(LIBAWT_LWAWT_EXTRA_HEADER_DIRS), \
-      DISABLED_WARNINGS_clang := incomplete-implementation \
-          deprecated-declarations objc-method-access \
-          incompatible-pointer-types extra-tokens sign-compare undef, \
-      DISABLED_WARNINGS_clang_AWTWindow.m := bitwise-op-parentheses, \
-      DISABLED_WARNINGS_clang_CFileDialog.m := semicolon-before-method-body, \
-      DISABLED_WARNINGS_clang_CGGlyphImages.m := pointer-arith, \
-      DISABLED_WARNINGS_clang_CGLLayer.m := semicolon-before-method-body, \
-      DISABLED_WARNINGS_clang_ImageSurfaceData.m := enum-conversion \
-          parentheses-equality, \
-      DISABLED_WARNINGS_clang_MTLBlitLoops.m := pointer-arith, \
-      DISABLED_WARNINGS_clang_MTLPipelineStatesStorage.m := \
-          semicolon-before-method-body, \
-      DISABLED_WARNINGS_clang_MTLRenderer.m := gnu-folding-constant, \
-      DISABLED_WARNINGS_clang_MTLVertexCache.m := pointer-arith, \
-      DISABLED_WARNINGS_clang_OGLBufImgOps.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_PrinterView.m := enum-conversion, \
-      JDK_LIBS := libawt java.base:libjava libosxapp, \
-      LIBS_macosx := $(LIBM) \
-          -framework Accelerate \
-          -framework ApplicationServices \
-          -framework AudioToolbox \
-          -framework Carbon \
-          -framework Cocoa \
-          -framework ExceptionHandling \
-          -framework JavaRuntimeSupport \
-          -framework Metal \
-          -framework OpenGL \
-          -framework QuartzCore \
-          -framework Security, \
-  ))
-
-  TARGETS += $(BUILD_LIBAWT_LWAWT)
-
   ##############################################################################
   ## Build libosxui
   ##############################################################################

From 811aadd9e77356b294c9820e4d5aede81940537c Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Wed, 17 Apr 2024 12:54:12 +0000
Subject: [PATCH 083/486] 8324683: Unify AttachListener code for Posix
 platforms

Reviewed-by: jsjolen, stuefe
---
 src/hotspot/os/bsd/attachListener_bsd.cpp     | 548 ------------------
 .../attachListener_nix.cpp}                   | 116 ++--
 2 files changed, 73 insertions(+), 591 deletions(-)
 delete mode 100644 src/hotspot/os/bsd/attachListener_bsd.cpp
 rename src/hotspot/os/{linux/attachListener_linux.cpp => posix/attachListener_nix.cpp} (81%)

diff --git a/src/hotspot/os/bsd/attachListener_bsd.cpp b/src/hotspot/os/bsd/attachListener_bsd.cpp
deleted file mode 100644
index 2b7e93e33ed..00000000000
--- a/src/hotspot/os/bsd/attachListener_bsd.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Copyright (c) 2005, 2023, 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "logging/log.hpp"
-#include "os_posix.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/os.inline.hpp"
-#include "services/attachListener.hpp"
-#include "utilities/checkedCast.hpp"
-
-#include <unistd.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/stat.h>
-
-#ifndef UNIX_PATH_MAX
-#define UNIX_PATH_MAX   sizeof(((struct sockaddr_un *)0)->sun_path)
-#endif
-
-// The attach mechanism on Bsd uses a UNIX domain socket. An attach listener
-// thread is created at startup or is created on-demand via a signal from
-// the client tool. The attach listener creates a socket and binds it to a file
-// in the filesystem. The attach listener then acts as a simple (single-
-// threaded) server - it waits for a client to connect, reads the request,
-// executes it, and returns the response to the client via the socket
-// connection.
-//
-// As the socket is a UNIX domain socket it means that only clients on the
-// local machine can connect. In addition there are two other aspects to
-// the security:
-// 1. The well known file that the socket is bound to has permission 400
-// 2. When a client connect, the SO_PEERCRED socket option is used to
-//    obtain the credentials of client. We check that the effective uid
-//    of the client matches this process.
-
-// forward reference
-class BsdAttachOperation;
-
-class BsdAttachListener: AllStatic {
- private:
-  // the path to which we bind the UNIX domain socket
-  static char _path[UNIX_PATH_MAX];
-  static bool _has_path;
-
-  // the file descriptor for the listening socket
-  static volatile int _listener;
-
-  static bool _atexit_registered;
-
-  // reads a request from the given connected socket
-  static BsdAttachOperation* read_request(int s);
-
- public:
-  enum {
-    ATTACH_PROTOCOL_VER = 1                     // protocol version
-  };
-  enum {
-    ATTACH_ERROR_BADVERSION     = 101           // error codes
-  };
-
-  static void set_path(char* path) {
-    if (path == nullptr) {
-      _path[0] = '\0';
-      _has_path = false;
-    } else {
-      strncpy(_path, path, UNIX_PATH_MAX);
-      _path[UNIX_PATH_MAX-1] = '\0';
-      _has_path = true;
-    }
-  }
-
-  static void set_listener(int s)               { _listener = s; }
-
-  // initialize the listener, returns 0 if okay
-  static int init();
-
-  static char* path()                   { return _path; }
-  static bool has_path()                { return _has_path; }
-  static int listener()                 { return _listener; }
-
-  // write the given buffer to a socket
-  static int write_fully(int s, char* buf, size_t len);
-
-  static BsdAttachOperation* dequeue();
-};
-
-class BsdAttachOperation: public AttachOperation {
- private:
-  // the connection to the client
-  int _socket;
-
- public:
-  void complete(jint res, bufferedStream* st);
-
-  void set_socket(int s)                                { _socket = s; }
-  int socket() const                                    { return _socket; }
-
-  BsdAttachOperation(char* name) : AttachOperation(name) {
-    set_socket(-1);
-  }
-};
-
-// statics
-char BsdAttachListener::_path[UNIX_PATH_MAX];
-bool BsdAttachListener::_has_path;
-volatile int BsdAttachListener::_listener = -1;
-bool BsdAttachListener::_atexit_registered = false;
-
-// Supporting class to help split a buffer into individual components
-class ArgumentIterator : public StackObj {
- private:
-  char* _pos;
-  char* _end;
- public:
-  ArgumentIterator(char* arg_buffer, size_t arg_size) {
-    _pos = arg_buffer;
-    _end = _pos + arg_size - 1;
-  }
-  char* next() {
-    if (*_pos == '\0') {
-      // advance the iterator if possible (null arguments)
-      if (_pos < _end) {
-        _pos += 1;
-      }
-      return nullptr;
-    }
-    char* res = _pos;
-    char* next_pos = strchr(_pos, '\0');
-    if (next_pos < _end)  {
-      next_pos++;
-    }
-    _pos = next_pos;
-    return res;
-  }
-};
-
-
-// atexit hook to stop listener and unlink the file that it is
-// bound too.
-extern "C" {
-  static void listener_cleanup() {
-    int s = BsdAttachListener::listener();
-    if (s != -1) {
-      BsdAttachListener::set_listener(-1);
-      ::shutdown(s, SHUT_RDWR);
-      ::close(s);
-    }
-    if (BsdAttachListener::has_path()) {
-      ::unlink(BsdAttachListener::path());
-      BsdAttachListener::set_path(nullptr);
-    }
-  }
-}
-
-// Initialization - create a listener socket and bind it to a file
-
-int BsdAttachListener::init() {
-  char path[UNIX_PATH_MAX];          // socket file
-  char initial_path[UNIX_PATH_MAX];  // socket file during setup
-  int listener;                      // listener socket (file descriptor)
-
-  // register function to cleanup
-  if (!_atexit_registered) {
-    _atexit_registered = true;
-    ::atexit(listener_cleanup);
-  }
-
-  int n = snprintf(path, UNIX_PATH_MAX, "%s/.java_pid%d",
-                   os::get_temp_directory(), os::current_process_id());
-  if (n < (int)UNIX_PATH_MAX) {
-    n = snprintf(initial_path, UNIX_PATH_MAX, "%s.tmp", path);
-  }
-  if (n >= (int)UNIX_PATH_MAX) {
-    return -1;
-  }
-
-  // create the listener socket
-  listener = ::socket(PF_UNIX, SOCK_STREAM, 0);
-  if (listener == -1) {
-    return -1;
-  }
-
-  // bind socket
-  struct sockaddr_un addr;
-  memset((void *)&addr, 0, sizeof(addr));
-  addr.sun_family = AF_UNIX;
-  strcpy(addr.sun_path, initial_path);
-  ::unlink(initial_path);
-  int res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr));
-  if (res == -1) {
-    ::close(listener);
-    return -1;
-  }
-
-  // put in listen mode, set permissions, and rename into place
-  res = ::listen(listener, 5);
-  if (res == 0) {
-    RESTARTABLE(::chmod(initial_path, S_IREAD|S_IWRITE), res);
-    if (res == 0) {
-      // make sure the file is owned by the effective user and effective group
-      // e.g. default behavior on mac is that new files inherit the group of
-      // the directory that they are created in
-      RESTARTABLE(::chown(initial_path, geteuid(), getegid()), res);
-      if (res == 0) {
-        res = ::rename(initial_path, path);
-      }
-    }
-  }
-  if (res == -1) {
-    ::close(listener);
-    ::unlink(initial_path);
-    return -1;
-  }
-  set_path(path);
-  set_listener(listener);
-
-  return 0;
-}
-
-// Given a socket that is connected to a peer we read the request and
-// create an AttachOperation. As the socket is blocking there is potential
-// for a denial-of-service if the peer does not response. However this happens
-// after the peer credentials have been checked and in the worst case it just
-// means that the attach listener thread is blocked.
-//
-BsdAttachOperation* BsdAttachListener::read_request(int s) {
-  char ver_str[8];
-  size_t ver_str_len = os::snprintf_checked(ver_str, sizeof(ver_str), "%d", ATTACH_PROTOCOL_VER);
-
-  // The request is a sequence of strings so we first figure out the
-  // expected count and the maximum possible length of the request.
-  // The request is:
-  //   <ver>0<cmd>0<arg>0<arg>0<arg>0
-  // where <ver> is the protocol version (1), <cmd> is the command
-  // name ("load", "datadump", ...), and <arg> is an argument
-  int expected_str_count = 2 + AttachOperation::arg_count_max;
-  const size_t max_len = (sizeof(ver_str) + 1) + (AttachOperation::name_length_max + 1) +
-    AttachOperation::arg_count_max*(AttachOperation::arg_length_max + 1);
-
-  char buf[max_len];
-  int str_count = 0;
-
-  // Read until all (expected) strings have been read, the buffer is
-  // full, or EOF.
-
-  size_t off = 0;
-  size_t left = max_len;
-
-  do {
-    ssize_t n;
-    RESTARTABLE(read(s, buf+off, left), n);
-    assert(n <= checked_cast<ssize_t>(left), "buffer was too small, impossible!");
-    buf[max_len - 1] = '\0';
-    if (n == -1) {
-      return nullptr;      // reset by peer or other error
-    }
-    if (n == 0) {
-      break;
-    }
-    for (ssize_t i=0; i<n; i++) {
-      if (buf[off+i] == 0) {
-        // EOS found
-        str_count++;
-
-        // The first string is <ver> so check it now to
-        // check for protocol mismatch
-        if (str_count == 1) {
-          if ((strlen(buf) != ver_str_len) ||
-              (atoi(buf) != ATTACH_PROTOCOL_VER)) {
-            char msg[32];
-            int msg_len = os::snprintf_checked(msg, sizeof(msg), "%d\n", ATTACH_ERROR_BADVERSION);
-            write_fully(s, msg, msg_len);
-            return nullptr;
-          }
-        }
-      }
-    }
-    off += n;
-    left -= n;
-  } while (left > 0 && str_count < expected_str_count);
-
-  if (str_count != expected_str_count) {
-    return nullptr;        // incomplete request
-  }
-
-  // parse request
-
-  ArgumentIterator args(buf, (max_len)-left);
-
-  // version already checked
-  char* v = args.next();
-
-  char* name = args.next();
-  if (name == nullptr || strlen(name) > AttachOperation::name_length_max) {
-    return nullptr;
-  }
-
-  BsdAttachOperation* op = new BsdAttachOperation(name);
-
-  for (int i=0; i<AttachOperation::arg_count_max; i++) {
-    char* arg = args.next();
-    if (arg == nullptr) {
-      op->set_arg(i, nullptr);
-    } else {
-      if (strlen(arg) > AttachOperation::arg_length_max) {
-        delete op;
-        return nullptr;
-      }
-      op->set_arg(i, arg);
-    }
-  }
-
-  op->set_socket(s);
-  return op;
-}
-
-
-// Dequeue an operation
-//
-// In the Bsd implementation there is only a single operation and clients
-// cannot queue commands (except at the socket level).
-//
-BsdAttachOperation* BsdAttachListener::dequeue() {
-  for (;;) {
-    int s;
-
-    // wait for client to connect
-    struct sockaddr addr;
-    socklen_t len = sizeof(addr);
-    RESTARTABLE(::accept(listener(), &addr, &len), s);
-    if (s == -1) {
-      return nullptr;      // log a warning?
-    }
-
-    // get the credentials of the peer and check the effective uid/guid
-    uid_t puid;
-    gid_t pgid;
-    if (::getpeereid(s, &puid, &pgid) != 0) {
-      log_debug(attach)("Failed to get peer id");
-      ::close(s);
-      continue;
-    }
-
-    if (!os::Posix::matches_effective_uid_and_gid_or_root(puid, pgid)) {
-      log_debug(attach)("euid/egid check failed (%d/%d vs %d/%d)", puid, pgid,
-              geteuid(), getegid());
-      ::close(s);
-      continue;
-    }
-
-    // peer credential look okay so we read the request
-    BsdAttachOperation* op = read_request(s);
-    if (op == nullptr) {
-      ::close(s);
-      continue;
-    } else {
-      return op;
-    }
-  }
-}
-
-// write the given buffer to the socket
-int BsdAttachListener::write_fully(int s, char* buf, size_t len) {
-  do {
-    ssize_t n = ::write(s, buf, len);
-    if (n == -1) {
-      if (errno != EINTR) return -1;
-    } else {
-      buf += n;
-      len -= n;
-    }
-  }
-  while (len > 0);
-  return 0;
-}
-
-// Complete an operation by sending the operation result and any result
-// output to the client. At this time the socket is in blocking mode so
-// potentially we can block if there is a lot of data and the client is
-// non-responsive. For most operations this is a non-issue because the
-// default send buffer is sufficient to buffer everything. In the future
-// if there are operations that involves a very big reply then it the
-// socket could be made non-blocking and a timeout could be used.
-
-void BsdAttachOperation::complete(jint result, bufferedStream* st) {
-  JavaThread* thread = JavaThread::current();
-  ThreadBlockInVM tbivm(thread);
-
-  // write operation result
-  char msg[32];
-  int msg_len = os::snprintf_checked(msg, sizeof(msg), "%d\n", result);
-  int rc = BsdAttachListener::write_fully(this->socket(), msg, msg_len);
-
-  // write any result data
-  if (rc == 0) {
-    BsdAttachListener::write_fully(this->socket(), (char*) st->base(), st->size());
-    ::shutdown(this->socket(), 2);
-  }
-
-  // done
-  ::close(this->socket());
-
-  delete this;
-}
-
-
-// AttachListener functions
-
-AttachOperation* AttachListener::dequeue() {
-  JavaThread* thread = JavaThread::current();
-  ThreadBlockInVM tbivm(thread);
-
-  AttachOperation* op = BsdAttachListener::dequeue();
-
-  return op;
-}
-
-// Performs initialization at vm startup
-// For BSD we remove any stale .java_pid file which could cause
-// an attaching process to think we are ready to receive on the
-// domain socket before we are properly initialized
-
-void AttachListener::vm_start() {
-  char fn[UNIX_PATH_MAX];
-  struct stat st;
-  int ret;
-
-  int n = snprintf(fn, UNIX_PATH_MAX, "%s/.java_pid%d",
-           os::get_temp_directory(), os::current_process_id());
-  assert(n < (int)UNIX_PATH_MAX, "java_pid file name buffer overflow");
-
-  RESTARTABLE(::stat(fn, &st), ret);
-  if (ret == 0) {
-    ret = ::unlink(fn);
-    if (ret == -1) {
-      log_debug(attach)("Failed to remove stale attach pid file at %s", fn);
-    }
-  }
-}
-
-int AttachListener::pd_init() {
-  JavaThread* thread = JavaThread::current();
-  ThreadBlockInVM tbivm(thread);
-
-  int ret_code = BsdAttachListener::init();
-
-  return ret_code;
-}
-
-bool AttachListener::check_socket_file() {
-  int ret;
-  struct stat st;
-  ret = stat(BsdAttachListener::path(), &st);
-  if (ret == -1) { // need to restart attach listener.
-    log_debug(attach)("Socket file %s does not exist - Restart Attach Listener",
-                      BsdAttachListener::path());
-
-    listener_cleanup();
-
-    // wait to terminate current attach listener instance...
-    {
-      // avoid deadlock if AttachListener thread is blocked at safepoint
-      ThreadBlockInVM tbivm(JavaThread::current());
-      while (AttachListener::transit_state(AL_INITIALIZING,
-                                           AL_NOT_INITIALIZED) != AL_NOT_INITIALIZED) {
-        os::naked_yield();
-      }
-    }
-    return is_init_trigger();
-  }
-  return false;
-}
-
-// Attach Listener is started lazily except in the case when
-// +ReduseSignalUsage is used
-bool AttachListener::init_at_startup() {
-  if (ReduceSignalUsage) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-// If the file .attach_pid<pid> exists in the working directory
-// or /tmp then this is the trigger to start the attach mechanism
-bool AttachListener::is_init_trigger() {
-  if (init_at_startup() || is_initialized()) {
-    return false;               // initialized at startup or already initialized
-  }
-  char fn[PATH_MAX + 1];
-  int ret;
-  struct stat st;
-  snprintf(fn, PATH_MAX + 1, "%s/.attach_pid%d",
-           os::get_temp_directory(), os::current_process_id());
-  RESTARTABLE(::stat(fn, &st), ret);
-  if (ret == -1) {
-    log_debug(attach)("Failed to find attach file: %s", fn);
-  }
-  if (ret == 0) {
-    // simple check to avoid starting the attach mechanism when
-    // a bogus non-root user creates the file
-    if (os::Posix::matches_effective_uid_or_root(st.st_uid)) {
-      init();
-      log_trace(attach)("Attach triggered by %s", fn);
-      return true;
-    } else {
-      log_debug(attach)("File %s has wrong user id %d (vs %d). Attach is not triggered", fn, st.st_uid, geteuid());
-    }
-  }
-  return false;
-}
-
-// if VM aborts then remove listener
-void AttachListener::abort() {
-  listener_cleanup();
-}
-
-void AttachListener::pd_data_dump() {
-  os::signal_notify(SIGQUIT);
-}
-
-void AttachListener::pd_detachall() {
-  // do nothing for now
-}
diff --git a/src/hotspot/os/linux/attachListener_linux.cpp b/src/hotspot/os/posix/attachListener_nix.cpp
similarity index 81%
rename from src/hotspot/os/linux/attachListener_linux.cpp
rename to src/hotspot/os/posix/attachListener_nix.cpp
index 0e98bca0607..a1a5ab81b4c 100644
--- a/src/hotspot/os/linux/attachListener_linux.cpp
+++ b/src/hotspot/os/posix/attachListener_nix.cpp
@@ -30,6 +30,7 @@
 #include "os_posix.hpp"
 #include "services/attachListener.hpp"
 #include "utilities/checkedCast.hpp"
+#include "utilities/macros.hpp"
 
 #include <unistd.h>
 #include <signal.h>
@@ -38,14 +39,17 @@
 #include <sys/un.h>
 #include <sys/stat.h>
 
+#if INCLUDE_SERVICES
+#ifndef AIX
+
 #ifndef UNIX_PATH_MAX
 #define UNIX_PATH_MAX   sizeof(((struct sockaddr_un *)0)->sun_path)
 #endif
 
-// The attach mechanism on Linux uses a UNIX domain socket. An attach listener
-// thread is created at startup or is created on-demand via a signal from
-// the client tool. The attach listener creates a socket and binds it to a file
-// in the filesystem. The attach listener then acts as a simple (single-
+// The attach mechanism on Linux and BSD uses a UNIX domain socket. An attach
+// listener thread is created at startup or is created on-demand via a signal
+// from the client tool. The attach listener creates a socket and binds it to a
+// file in the filesystem. The attach listener then acts as a simple (single-
 // threaded) server - it waits for a client to connect, reads the request,
 // executes it, and returns the response to the client via the socket
 // connection.
@@ -59,9 +63,9 @@
 //    of the client matches this process.
 
 // forward reference
-class LinuxAttachOperation;
+class NixAttachOperation;
 
-class LinuxAttachListener: AllStatic {
+class NixAttachListener: AllStatic {
  private:
   // the path to which we bind the UNIX domain socket
   static char _path[UNIX_PATH_MAX];
@@ -73,7 +77,7 @@ class LinuxAttachListener: AllStatic {
   static bool _atexit_registered;
 
   // reads a request from the given connected socket
-  static LinuxAttachOperation* read_request(int s);
+  static NixAttachOperation* read_request(int s);
 
  public:
   enum {
@@ -106,10 +110,10 @@ class LinuxAttachListener: AllStatic {
   // write the given buffer to a socket
   static int write_fully(int s, char* buf, size_t len);
 
-  static LinuxAttachOperation* dequeue();
+  static NixAttachOperation* dequeue();
 };
 
-class LinuxAttachOperation: public AttachOperation {
+class NixAttachOperation: public AttachOperation {
  private:
   // the connection to the client
   int _socket;
@@ -120,16 +124,16 @@ class LinuxAttachOperation: public AttachOperation {
   void set_socket(int s)                                { _socket = s; }
   int socket() const                                    { return _socket; }
 
-  LinuxAttachOperation(char* name) : AttachOperation(name) {
+  NixAttachOperation(char* name) : AttachOperation(name) {
     set_socket(-1);
   }
 };
 
 // statics
-char LinuxAttachListener::_path[UNIX_PATH_MAX];
-bool LinuxAttachListener::_has_path;
-volatile int LinuxAttachListener::_listener = -1;
-bool LinuxAttachListener::_atexit_registered = false;
+char NixAttachListener::_path[UNIX_PATH_MAX];
+bool NixAttachListener::_has_path;
+volatile int NixAttachListener::_listener = -1;
+bool NixAttachListener::_atexit_registered = false;
 
 // Supporting class to help split a buffer into individual components
 class ArgumentIterator : public StackObj {
@@ -164,22 +168,22 @@ class ArgumentIterator : public StackObj {
 // bound too.
 extern "C" {
   static void listener_cleanup() {
-    int s = LinuxAttachListener::listener();
+    int s = NixAttachListener::listener();
     if (s != -1) {
-      LinuxAttachListener::set_listener(-1);
+      NixAttachListener::set_listener(-1);
       ::shutdown(s, SHUT_RDWR);
       ::close(s);
     }
-    if (LinuxAttachListener::has_path()) {
-      ::unlink(LinuxAttachListener::path());
-      LinuxAttachListener::set_path(nullptr);
+    if (NixAttachListener::has_path()) {
+      ::unlink(NixAttachListener::path());
+      NixAttachListener::set_path(nullptr);
     }
   }
 }
 
 // Initialization - create a listener socket and bind it to a file
 
-int LinuxAttachListener::init() {
+int NixAttachListener::init() {
   char path[UNIX_PATH_MAX];          // socket file
   char initial_path[UNIX_PATH_MAX];  // socket file during setup
   int listener;                      // listener socket (file descriptor)
@@ -225,7 +229,9 @@ int LinuxAttachListener::init() {
     RESTARTABLE(::chmod(initial_path, S_IREAD|S_IWRITE), res);
     if (res == 0) {
       // make sure the file is owned by the effective user and effective group
-      // e.g. the group could be inherited from the directory in case the s bit is set
+      // e.g. the group could be inherited from the directory in case the s bit
+      // is set. The default behavior on mac is that new files inherit the group
+      // of the directory that they are created in.
       RESTARTABLE(::chown(initial_path, geteuid(), getegid()), res);
       if (res == 0) {
         res = ::rename(initial_path, path);
@@ -249,7 +255,7 @@ int LinuxAttachListener::init() {
 // after the peer credentials have been checked and in the worst case it just
 // means that the attach listener thread is blocked.
 //
-LinuxAttachOperation* LinuxAttachListener::read_request(int s) {
+NixAttachOperation* NixAttachListener::read_request(int s) {
   char ver_str[8];
   os::snprintf_checked(ver_str, sizeof(ver_str), "%d", ATTACH_PROTOCOL_VER);
 
@@ -321,7 +327,7 @@ LinuxAttachOperation* LinuxAttachListener::read_request(int s) {
     return nullptr;
   }
 
-  LinuxAttachOperation* op = new LinuxAttachOperation(name);
+  NixAttachOperation* op = new NixAttachOperation(name);
 
   for (int i=0; i<AttachOperation::arg_count_max; i++) {
     char* arg = args.next();
@@ -340,13 +346,12 @@ LinuxAttachOperation* LinuxAttachListener::read_request(int s) {
   return op;
 }
 
-
 // Dequeue an operation
 //
-// In the Linux implementation there is only a single operation and clients
-// cannot queue commands (except at the socket level).
+// In the Linux and BSD implementations, there is only a single operation and
+// clients cannot queue commands (except at the socket level).
 //
-LinuxAttachOperation* LinuxAttachListener::dequeue() {
+NixAttachOperation* NixAttachListener::dequeue() {
   for (;;) {
     int s;
 
@@ -359,23 +364,43 @@ LinuxAttachOperation* LinuxAttachListener::dequeue() {
     }
 
     // get the credentials of the peer and check the effective uid/guid
+#ifdef LINUX
     struct ucred cred_info;
     socklen_t optlen = sizeof(cred_info);
-    if (::getsockopt(s, SOL_SOCKET, SO_PEERCRED, (void*)&cred_info, &optlen) == -1) {
+    if (::getsockopt(s, SOL_SOCKET, SO_PEERCRED, (void *)&cred_info, &optlen) ==
+        -1) {
       log_debug(attach)("Failed to get socket option SO_PEERCRED");
       ::close(s);
       continue;
     }
 
-    if (!os::Posix::matches_effective_uid_and_gid_or_root(cred_info.uid, cred_info.gid)) {
+    if (!os::Posix::matches_effective_uid_and_gid_or_root(cred_info.uid,
+                                                          cred_info.gid)) {
       log_debug(attach)("euid/egid check failed (%d/%d vs %d/%d)",
-              cred_info.uid, cred_info.gid, geteuid(), getegid());
+                        cred_info.uid, cred_info.gid, geteuid(), getegid());
+      ::close(s);
+      continue;
+    }
+#endif
+#ifdef BSD
+    uid_t puid;
+    gid_t pgid;
+    if (::getpeereid(s, &puid, &pgid) != 0) {
+      log_debug(attach)("Failed to get peer id");
       ::close(s);
       continue;
     }
 
+    if (!os::Posix::matches_effective_uid_and_gid_or_root(puid, pgid)) {
+      log_debug(attach)("euid/egid check failed (%d/%d vs %d/%d)", puid, pgid,
+                        geteuid(), getegid());
+      ::close(s);
+      continue;
+    }
+#endif
+
     // peer credential look okay so we read the request
-    LinuxAttachOperation* op = read_request(s);
+    NixAttachOperation* op = read_request(s);
     if (op == nullptr) {
       ::close(s);
       continue;
@@ -386,7 +411,7 @@ LinuxAttachOperation* LinuxAttachListener::dequeue() {
 }
 
 // write the given buffer to the socket
-int LinuxAttachListener::write_fully(int s, char* buf, size_t len) {
+int NixAttachListener::write_fully(int s, char* buf, size_t len) {
   do {
     ssize_t n = ::write(s, buf, len);
     if (n == -1) {
@@ -408,18 +433,18 @@ int LinuxAttachListener::write_fully(int s, char* buf, size_t len) {
 // if there are operations that involves a very big reply then it the
 // socket could be made non-blocking and a timeout could be used.
 
-void LinuxAttachOperation::complete(jint result, bufferedStream* st) {
+void NixAttachOperation::complete(jint result, bufferedStream* st) {
   JavaThread* thread = JavaThread::current();
   ThreadBlockInVM tbivm(thread);
 
   // write operation result
   char msg[32];
   os::snprintf_checked(msg, sizeof(msg), "%d\n", result);
-  int rc = LinuxAttachListener::write_fully(this->socket(), msg, strlen(msg));
+  int rc = NixAttachListener::write_fully(this->socket(), msg, strlen(msg));
 
   // write any result data
   if (rc == 0) {
-    LinuxAttachListener::write_fully(this->socket(), (char*) st->base(), st->size());
+    NixAttachListener::write_fully(this->socket(), (char*) st->base(), st->size());
     ::shutdown(this->socket(), 2);
   }
 
@@ -436,13 +461,13 @@ AttachOperation* AttachListener::dequeue() {
   JavaThread* thread = JavaThread::current();
   ThreadBlockInVM tbivm(thread);
 
-  AttachOperation* op = LinuxAttachListener::dequeue();
+  AttachOperation* op = NixAttachListener::dequeue();
 
   return op;
 }
 
 // Performs initialization at vm startup
-// For Linux we remove any stale .java_pid file which could cause
+// For Linux and BSD we remove any stale .java_pid file which could cause
 // an attaching process to think we are ready to receive on the
 // domain socket before we are properly initialized
 
@@ -468,7 +493,7 @@ int AttachListener::pd_init() {
   JavaThread* thread = JavaThread::current();
   ThreadBlockInVM tbivm(thread);
 
-  int ret_code = LinuxAttachListener::init();
+  int ret_code = NixAttachListener::init();
 
   return ret_code;
 }
@@ -476,10 +501,10 @@ int AttachListener::pd_init() {
 bool AttachListener::check_socket_file() {
   int ret;
   struct stat st;
-  ret = stat(LinuxAttachListener::path(), &st);
+  ret = stat(NixAttachListener::path(), &st);
   if (ret == -1) { // need to restart attach listener.
     log_debug(attach)("Socket file %s does not exist - Restart Attach Listener",
-                      LinuxAttachListener::path());
+                      NixAttachListener::path());
 
     listener_cleanup();
 
@@ -516,12 +541,13 @@ bool AttachListener::is_init_trigger() {
   char fn[PATH_MAX + 1];
   int ret;
   struct stat st;
-  os::snprintf_checked(fn, sizeof(fn), ".attach_pid%d", os::current_process_id());
+  os::snprintf_checked(fn, sizeof(fn), ".attach_pid%d",
+                       os::current_process_id());
   RESTARTABLE(::stat(fn, &st), ret);
   if (ret == -1) {
     log_trace(attach)("Failed to find attach file: %s, trying alternate", fn);
-    snprintf(fn, sizeof(fn), "%s/.attach_pid%d",
-             os::get_temp_directory(), os::current_process_id());
+    snprintf(fn, sizeof(fn), "%s/.attach_pid%d", os::get_temp_directory(),
+             os::current_process_id());
     RESTARTABLE(::stat(fn, &st), ret);
     if (ret == -1) {
       log_debug(attach)("Failed to find attach file: %s", fn);
@@ -553,3 +579,7 @@ void AttachListener::pd_data_dump() {
 void AttachListener::pd_detachall() {
   // do nothing for now
 }
+
+#endif // !AIX
+
+#endif // INCLUDE_SERVICES

From ff3e76fd0caf6e5820d618e3e7b82a1a5d008070 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Wed, 17 Apr 2024 13:36:07 +0000
Subject: [PATCH 084/486] 8330053: JFR: Use LocalDateTime instead ZonedDateTime

Reviewed-by: lmesnik, mgronlun
---
 .../classes/jdk/jfr/internal/Repository.java  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Repository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Repository.java
index e69a7851300..5fe95d179e4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Repository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Repository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,9 @@ package jdk.jfr.internal;
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.time.DateTimeException;
 import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
+import java.time.ZoneOffset;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -81,7 +82,7 @@ public final class Repository {
     }
 
     synchronized RepositoryChunk newChunk() {
-        ZonedDateTime timestamp = ZonedDateTime.now();
+        LocalDateTime timestamp = timestamp();
         try {
             if (!SecuritySupport.existDirectory(repository)) {
                 this.repository = createRepository(baseLocation);
@@ -93,7 +94,7 @@ public final class Repository {
             if (chunkFilename == null) {
                 chunkFilename = ChunkFilename.newPriviliged(repository.toPath());
             }
-            String filename = chunkFilename.next(timestamp.toLocalDateTime());
+            String filename = chunkFilename.next(timestamp);
             return new RepositoryChunk(new SafePath(filename));
         } catch (Exception e) {
             String errorMsg = String.format("Could not create chunk in repository %s, %s: %s", repository, e.getClass(), e.getMessage());
@@ -103,11 +104,20 @@ public final class Repository {
         }
     }
 
+    private static LocalDateTime timestamp() {
+        try {
+            return LocalDateTime.now();
+        } catch (DateTimeException d) {
+            Logger.log(LogTag.JFR, LogLevel.INFO, "Could not create LocalDateTime with the default time zone. Using UTC time zone for chunk filename.");
+            return LocalDateTime.ofEpochSecond(System.currentTimeMillis(), 0, ZoneOffset.UTC);
+        }
+    }
+
     private static SafePath createRepository(SafePath basePath) throws IOException {
         SafePath canonicalBaseRepositoryPath = createRealBasePath(basePath);
         SafePath f = null;
 
-        String basename = ValueFormatter.formatDateTime(LocalDateTime.now()) + "_" + JVM.getPid();
+        String basename = ValueFormatter.formatDateTime(timestamp()) + "_" + JVM.getPid();
         String name = basename;
 
         int i = 0;

From 03e84178ebfd2ca48b89d65d8f3c291e0c622fb5 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Wed, 17 Apr 2024 14:10:28 +0000
Subject: [PATCH 085/486] 8329948: Remove string template feature

Reviewed-by: jlahoda
---
 .../classes/java/lang/StringConcatHelper.java | 123 ---
 .../classes/java/lang/StringTemplate.java     | 622 ------------
 .../share/classes/java/lang/System.java       |  29 +-
 .../java/lang/invoke/StringConcatFactory.java | 318 +-----
 .../java/lang/runtime/StringTemplateImpl.java | 134 ---
 .../runtime/StringTemplateImplFactory.java    | 204 ----
 .../java/lang/runtime/TemplateRuntime.java    | 269 -----
 .../java/lang/runtime/TemplateSupport.java    | 152 ---
 .../share/classes/java/util/FormatItem.java   | 540 ----------
 .../classes/java/util/FormatProcessor.java    | 299 ------
 .../share/classes/java/util/Formatter.java    |   1 -
 .../classes/java/util/FormatterBuilder.java   | 489 ---------
 .../jdk/internal/access/JavaLangAccess.java   |  37 +-
 .../internal/access/JavaTemplateAccess.java   |  78 --
 .../jdk/internal/access/SharedSecrets.java    |  16 -
 .../jdk/internal/util/DecimalDigits.java      |  77 +-
 .../classes/jdk/internal/util/Digits.java     |  61 --
 .../jdk/internal/util/FormatConcatItem.java   |  58 --
 .../classes/jdk/internal/util/HexDigits.java  |  76 +-
 .../jdk/internal/util/OctalDigits.java        |  77 +-
 .../sun/source/tree/StringTemplateTree.java   |  59 --
 .../classes/com/sun/source/tree/Tree.java     |   9 -
 .../com/sun/source/tree/TreeVisitor.java      |  12 -
 .../sun/source/util/SimpleTreeVisitor.java    |  15 -
 .../com/sun/source/util/TreeScanner.java      |  19 -
 .../com/sun/tools/javac/code/Preview.java     |   1 -
 .../com/sun/tools/javac/code/Source.java      |   1 -
 .../com/sun/tools/javac/code/Symtab.java      |  14 +-
 .../com/sun/tools/javac/comp/Attr.java        |  28 +-
 .../com/sun/tools/javac/comp/Check.java       |  22 +-
 .../sun/tools/javac/comp/CompileStates.java   |   9 +-
 .../com/sun/tools/javac/comp/Flow.java        |   9 -
 .../sun/tools/javac/comp/TransLiterals.java   | 348 -------
 .../com/sun/tools/javac/comp/TransTypes.java  |  10 +-
 .../com/sun/tools/javac/comp/TypeEnter.java   |  24 -
 .../sun/tools/javac/main/JavaCompiler.java    |   6 -
 .../sun/tools/javac/parser/JavaTokenizer.java | 223 +---
 .../sun/tools/javac/parser/JavacParser.java   |  73 --
 .../tools/javac/resources/compiler.properties |  16 -
 .../com/sun/tools/javac/tree/JCTree.java      |  63 +-
 .../com/sun/tools/javac/tree/Pretty.java      |  17 +-
 .../com/sun/tools/javac/tree/TreeCopier.java  |  10 +-
 .../com/sun/tools/javac/tree/TreeInfo.java    |   7 +-
 .../com/sun/tools/javac/tree/TreeMaker.java   |  10 +-
 .../com/sun/tools/javac/tree/TreeScanner.java |   7 +-
 .../sun/tools/javac/tree/TreeTranslator.java  |   9 +-
 .../com/sun/tools/javac/util/Names.java       |  17 +-
 .../String/concat/MakeConcatWithTemplate.java | 139 ---
 test/jdk/java/lang/template/Basic.java        | 504 ---------
 .../java/lang/template/FormatterBuilder.java  | 961 ------------------
 .../lang/template/StringTemplateTest.java     | 304 ------
 test/jdk/java/lang/template/T8313809.java     |  43 -
 .../jdk/jshell/CompletenessTest.java          |  11 +-
 .../javac/diags/examples/StringTemplate.java  |  33 -
 .../examples/StringTemplateNoProcessor.java   |  34 -
 .../examples/StringTemplateNotProcessor.java  |  39 -
 .../examples/StringTemplateRawProcessor.java  |  44 -
 .../StringTemplateUnclosedString.java         |  37 -
 .../StringTemplateUnclosedTextBlock.java      |  42 -
 .../tools/javac/parser/JavacParserTest.java   | 103 --
 .../langtools/tools/javac/template/Basic.java | 240 -----
 .../tools/javac/template/T8312814.java        |  39 -
 .../tools/javac/template/TreeScannerTest.java | 107 --
 .../tools/javac/tree/TreeKindTest.java        |   4 -
 .../tools/jdeps/listdeps/ListModuleDeps.java  |   1 -
 .../bench/java/lang/StringTemplateFMT.java    |  78 --
 66 files changed, 183 insertions(+), 7278 deletions(-)
 delete mode 100644 src/java.base/share/classes/java/lang/StringTemplate.java
 delete mode 100644 src/java.base/share/classes/java/lang/runtime/StringTemplateImpl.java
 delete mode 100644 src/java.base/share/classes/java/lang/runtime/StringTemplateImplFactory.java
 delete mode 100644 src/java.base/share/classes/java/lang/runtime/TemplateRuntime.java
 delete mode 100644 src/java.base/share/classes/java/lang/runtime/TemplateSupport.java
 delete mode 100644 src/java.base/share/classes/java/util/FormatItem.java
 delete mode 100644 src/java.base/share/classes/java/util/FormatProcessor.java
 delete mode 100644 src/java.base/share/classes/java/util/FormatterBuilder.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/access/JavaTemplateAccess.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/util/Digits.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/util/FormatConcatItem.java
 delete mode 100644 src/jdk.compiler/share/classes/com/sun/source/tree/StringTemplateTree.java
 delete mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransLiterals.java
 delete mode 100644 test/jdk/java/lang/String/concat/MakeConcatWithTemplate.java
 delete mode 100644 test/jdk/java/lang/template/Basic.java
 delete mode 100644 test/jdk/java/lang/template/FormatterBuilder.java
 delete mode 100644 test/jdk/java/lang/template/StringTemplateTest.java
 delete mode 100644 test/jdk/java/lang/template/T8313809.java
 delete mode 100644 test/langtools/tools/javac/diags/examples/StringTemplate.java
 delete mode 100644 test/langtools/tools/javac/diags/examples/StringTemplateNoProcessor.java
 delete mode 100644 test/langtools/tools/javac/diags/examples/StringTemplateNotProcessor.java
 delete mode 100644 test/langtools/tools/javac/diags/examples/StringTemplateRawProcessor.java
 delete mode 100644 test/langtools/tools/javac/diags/examples/StringTemplateUnclosedString.java
 delete mode 100644 test/langtools/tools/javac/diags/examples/StringTemplateUnclosedTextBlock.java
 delete mode 100644 test/langtools/tools/javac/template/Basic.java
 delete mode 100644 test/langtools/tools/javac/template/T8312814.java
 delete mode 100644 test/langtools/tools/javac/template/TreeScannerTest.java
 delete mode 100644 test/micro/org/openjdk/bench/java/lang/StringTemplateFMT.java

diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index 28b9b754bbd..49f556e5aa6 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -26,8 +26,6 @@
 package java.lang;
 
 import jdk.internal.misc.Unsafe;
-import jdk.internal.javac.PreviewFeature;
-import jdk.internal.util.FormatConcatItem;
 import jdk.internal.vm.annotation.ForceInline;
 
 import java.lang.invoke.MethodHandle;
@@ -127,20 +125,6 @@ final class StringConcatHelper {
         return checkOverflow(lengthCoder);
     }
 
-    /**
-     * Mix value length and coder into current length and coder.
-     * @param lengthCoder String length with coder packed into higher bits
-     *                    the upper word.
-     * @param value       value to mix in
-     * @return            new length and coder
-     * @since 21
-     */
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    static long mix(long lengthCoder, FormatConcatItem value) {
-        lengthCoder = value.mix(lengthCoder);
-        return checkOverflow(lengthCoder);
-    }
-
     /**
      * Prepends the stringly representation of boolean value into buffer,
      * given the coder and final index. Index is measured in chars, not in bytes!
@@ -344,48 +328,6 @@ final class StringConcatHelper {
         return indexCoder;
     }
 
-    /**
-     * Prepends the stringly representation of FormatConcatItem value into buffer,
-     * given the coder and final index. Index is measured in chars, not in bytes!
-     *
-     * @param indexCoder final char index in the buffer, along with coder packed
-     *                   into higher bits.
-     * @param buf        buffer to append to
-     * @param value      String value to encode
-     * @return           updated index (coder value retained)
-     * @since 21
-     */
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    static long prepend(long indexCoder, byte[] buf, FormatConcatItem value) {
-        try {
-            return value.prepend(indexCoder, buf);
-        } catch (Error ex) {
-            throw ex;
-        } catch (Throwable ex) {
-            throw new AssertionError("FormatConcatItem prepend error", ex);
-        }
-    }
-
-    /**
-     * Prepends constant and the stringly representation of value into buffer,
-     * given the coder and final index. Index is measured in chars, not in bytes!
-     *
-     * @param indexCoder final char index in the buffer, along with coder packed
-     *                   into higher bits.
-     * @param buf        buffer to append to
-     * @param value      boolean value to encode
-     * @param prefix     a constant to prepend before value
-     * @return           updated index (coder value retained)
-     * @since 21
-     */
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    static long prepend(long indexCoder, byte[] buf,
-                        FormatConcatItem value, String prefix) {
-        indexCoder = prepend(indexCoder, buf, value);
-        indexCoder = prepend(indexCoder, buf, prefix);
-        return indexCoder;
-    }
-
     /**
      * Instantiates the String with given buffer and coder
      * @param buf           buffer to use
@@ -517,71 +459,6 @@ final class StringConcatHelper {
         return String.COMPACT_STRINGS ? LATIN1 : UTF16;
     }
 
-    /*
-     * Initialize after phase1.
-     */
-    private static class LateInit {
-        static final MethodHandle GETCHAR_LATIN1_MH;
-
-        static final MethodHandle GETCHAR_UTF16_MH;
-
-        static final MethodHandle PUTCHAR_LATIN1_MH;
-
-        static final MethodHandle PUTCHAR_UTF16_MH;
-
-        static {
-            MethodType getCharMT =
-                MethodType.methodType(char.class,
-                        byte[].class, int.class);
-            MethodType putCharMT =
-                MethodType.methodType(void.class,
-                        byte[].class, int.class, int.class);
-            GETCHAR_LATIN1_MH = lookupStatic("getCharLatin1", getCharMT);
-            GETCHAR_UTF16_MH = lookupStatic("getCharUTF16", getCharMT);
-            PUTCHAR_LATIN1_MH = lookupStatic("putCharLatin1", putCharMT);
-            PUTCHAR_UTF16_MH = lookupStatic("putCharUTF16", putCharMT);
-        }
-
-    }
-
-    @ForceInline
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    static char getCharLatin1(byte[] buffer, int index) {
-        return (char)buffer[index];
-    }
-
-    @ForceInline
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    static char getCharUTF16(byte[] buffer, int index) {
-        return StringUTF16.getChar(buffer, index);
-    }
-
-    @ForceInline
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    static void putCharLatin1(byte[] buffer, int index, int ch) {
-        buffer[index] = (byte)ch;
-    }
-
-    @ForceInline
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    static void putCharUTF16(byte[] buffer, int index, int ch) {
-        StringUTF16.putChar(buffer, index, ch);
-    }
-
-    @ForceInline
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    static MethodHandle selectGetChar(long indexCoder) {
-        return indexCoder < UTF16 ? LateInit.GETCHAR_LATIN1_MH :
-                                    LateInit.GETCHAR_UTF16_MH;
-    }
-
-    @ForceInline
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    static MethodHandle selectPutChar(long indexCoder) {
-        return indexCoder < UTF16 ? LateInit.PUTCHAR_LATIN1_MH :
-                                    LateInit.PUTCHAR_UTF16_MH;
-    }
-
     static MethodHandle lookupStatic(String name, MethodType methodType) {
         try {
             return MethodHandles.lookup()
diff --git a/src/java.base/share/classes/java/lang/StringTemplate.java b/src/java.base/share/classes/java/lang/StringTemplate.java
deleted file mode 100644
index c14876130be..00000000000
--- a/src/java.base/share/classes/java/lang/StringTemplate.java
+++ /dev/null
@@ -1,622 +0,0 @@
-/*
- * Copyright (c) 2023, 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 java.lang;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodType;
-import java.util.FormatProcessor;
-import java.util.function.Function;
-import java.util.List;
-import java.util.Objects;
-
-import jdk.internal.access.JavaTemplateAccess;
-import jdk.internal.access.SharedSecrets;
-import jdk.internal.javac.PreviewFeature;
-
-/**
- * {@link StringTemplate} is the run-time representation of a string template or
- * text block template in a template expression.
- * <p>
- * In the source code of a Java program, a string template or text block template
- * contains an interleaved succession of <em>fragment literals</em> and <em>embedded
- * expressions</em>. The {@link StringTemplate#fragments()} method returns the
- * fragment literals, and the {@link StringTemplate#values()} method returns the
- * results of evaluating the embedded expressions. {@link StringTemplate} does not
- * provide access to the source code of the embedded expressions themselves; it is
- * not a compile-time representation of a string template or text block template.
- * <p>
- * {@link StringTemplate} is primarily used in conjunction with a template processor
- * to produce a string or other meaningful value. Evaluation of a template expression
- * first produces an instance of {@link StringTemplate}, representing the right hand side
- * of the template expression, and then passes the instance to the template processor
- * given by the template expression.
- * <p>
- * For example, the following code contains a template expression that uses the template
- * processor {@code RAW}, which simply yields the {@link StringTemplate} passed to it:
- * {@snippet :
- * int x = 10;
- * int y = 20;
- * StringTemplate st = RAW."\{x} + \{y} = \{x + y}";
- * List<String> fragments = st.fragments();
- * List<Object> values = st.values();
- * }
- * {@code fragments} will be equivalent to {@code List.of("", " + ", " = ", "")},
- * which includes the empty first and last fragments. {@code values} will be the
- * equivalent of {@code List.of(10, 20, 30)}.
- * <p>
- * The following code contains a template expression with the same template but with a
- * different template processor, {@code STR}:
- * {@snippet :
- * int x = 10;
- * int y = 20;
- * String s = STR."\{x} + \{y} = \{x + y}";
- * }
- * When the template expression is evaluated, an instance of {@link StringTemplate} is
- * produced that returns the same lists from {@link StringTemplate#fragments()} and
- * {@link StringTemplate#values()} as shown above. The {@link StringTemplate#STR} template
- * processor uses these lists to yield an interpolated string. The value of {@code s} will
- * be equivalent to {@code "10 + 20 = 30"}.
- * <p>
- * The {@code interpolate()} method provides a direct way to perform string interpolation
- * of a {@link StringTemplate}. Template processors can use the following code pattern:
- * {@snippet :
- * List<String> fragments = st.fragments();
- * List<Object> values    = st.values();
- * ... check or manipulate the fragments and/or values ...
- * String result = StringTemplate.interpolate(fragments, values);
- * }
- * The {@link StringTemplate#process(Processor)} method, in conjunction with
- * the {@link StringTemplate#RAW} processor, may be used to defer processing of a
- * {@link StringTemplate}.
- * {@snippet :
- * StringTemplate st = RAW."\{x} + \{y} = \{x + y}";
- * ...other steps...
- * String result = st.process(STR);
- * }
- * The factory methods {@link StringTemplate#of(String)} and
- * {@link StringTemplate#of(List, List)} can be used to construct a {@link StringTemplate}.
- *
- * @see Processor
- * @see java.util.FormatProcessor
- *
- * @implNote Implementations of {@link StringTemplate} must minimally implement the
- * methods {@link StringTemplate#fragments()} and {@link StringTemplate#values()}.
- * Instances of {@link StringTemplate} are considered immutable. To preserve the
- * semantics of string templates and text block templates, the list returned by
- * {@link StringTemplate#fragments()} must be one element larger than the list returned
- * by {@link StringTemplate#values()}.
- *
- * @since 21
- *
- * @jls 15.8.6 Process Template Expressions
- */
-@PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-public interface StringTemplate {
-    /**
-     * Returns a list of fragment literals for this {@link StringTemplate}.
-     * The fragment literals are the character sequences preceding each of the embedded
-     * expressions in source code, plus the character sequence following the last
-     * embedded expression. Such character sequences may be zero-length if an embedded
-     * expression appears at the beginning or end of a template, or if two embedded
-     * expressions are directly adjacent in a template.
-     * In the example: {@snippet :
-     * String student = "Mary";
-     * String teacher = "Johnson";
-     * StringTemplate st = RAW."The student \{student} is in \{teacher}'s classroom.";
-     * List<String> fragments = st.fragments(); // @highlight substring="fragments()"
-     * }
-     * {@code fragments} will be equivalent to
-     * {@code List.of("The student ", " is in ", "'s classroom.")}
-     *
-     * @return list of string fragments
-     *
-     * @implSpec the list returned is immutable
-     */
-    List<String> fragments();
-
-    /**
-     * Returns a list of embedded expression results for this {@link StringTemplate}.
-     * In the example:
-     * {@snippet :
-     * String student = "Mary";
-     * String teacher = "Johnson";
-     * StringTemplate st = RAW."The student \{student} is in \{teacher}'s classroom.";
-     * List<Object> values = st.values(); // @highlight substring="values()"
-     * }
-     * {@code values} will be equivalent to {@code List.of(student, teacher)}
-     *
-     * @return list of expression values
-     *
-     * @implSpec the list returned is immutable
-     */
-    List<Object> values();
-
-    /**
-     * Returns the string interpolation of the fragments and values for this
-     * {@link StringTemplate}.
-     * @apiNote For better visibility and when practical, it is recommended to use the
-     * {@link StringTemplate#STR} processor instead of invoking the
-     * {@link StringTemplate#interpolate()} method.
-     * {@snippet :
-     * String student = "Mary";
-     * String teacher = "Johnson";
-     * StringTemplate st = RAW."The student \{student} is in \{teacher}'s classroom.";
-     * String result = st.interpolate(); // @highlight substring="interpolate()"
-     * }
-     * In the above example, the value of  {@code result} will be
-     * {@code "The student Mary is in Johnson's classroom."}. This is
-     * produced by the interleaving concatenation of fragments and values from the supplied
-     * {@link StringTemplate}. To accommodate concatenation, values are converted to strings
-     * as if invoking {@link String#valueOf(Object)}.
-     *
-     * @return interpolation of this {@link StringTemplate}
-     *
-     * @implSpec The default implementation returns the result of invoking
-     * {@code StringTemplate.interpolate(this.fragments(), this.values())}.
-     */
-    default String interpolate() {
-        return StringTemplate.interpolate(fragments(), values());
-    }
-
-    /**
-     * Returns the result of applying the specified processor to this {@link StringTemplate}.
-     * This method can be used as an alternative to string template expressions. For example,
-     * {@snippet :
-     * String student = "Mary";
-     * String teacher = "Johnson";
-     * String result1 = STR."The student \{student} is in \{teacher}'s classroom.";
-     * String result2 = RAW."The student \{student} is in \{teacher}'s classroom.".process(STR); // @highlight substring="process"
-     * }
-     * Produces an equivalent result for both {@code result1} and {@code result2}.
-     *
-     * @param processor the {@link Processor} instance to process
-     *
-     * @param <R>  Processor's process result type.
-     * @param <E>  Exception thrown type.
-     *
-     * @return constructed object of type {@code R}
-     *
-     * @throws E exception thrown by the template processor when validation fails
-     * @throws NullPointerException if processor is null
-     *
-     * @implSpec The default implementation returns the result of invoking
-     * {@code processor.process(this)}. If the invocation throws an exception that
-     * exception is forwarded to the caller.
-     */
-    default <R, E extends Throwable> R
-    process(Processor<? extends R, ? extends E> processor) throws E {
-        Objects.requireNonNull(processor, "processor should not be null");
-
-        return processor.process(this);
-    }
-
-    /**
-     * Produces a diagnostic string that describes the fragments and values of the supplied
-     * {@link StringTemplate}.
-     *
-     * @param stringTemplate  the {@link StringTemplate} to represent
-     *
-     * @return diagnostic string representing the supplied string template
-     *
-     * @throws NullPointerException if stringTemplate is null
-     */
-    static String toString(StringTemplate stringTemplate) {
-        Objects.requireNonNull(stringTemplate, "stringTemplate should not be null");
-        return "StringTemplate{ fragments = [ \"" +
-                String.join("\", \"", stringTemplate.fragments()) +
-                "\" ], values = " +
-                stringTemplate.values() +
-                " }";
-    }
-
-    /**
-     * Returns a {@link StringTemplate} as if constructed by invoking
-     * {@code StringTemplate.of(List.of(string), List.of())}. That is, a {@link StringTemplate}
-     * with one fragment and no values.
-     *
-     * @param string  single string fragment
-     *
-     * @return StringTemplate composed from string
-     *
-     * @throws NullPointerException if string is null
-     */
-    static StringTemplate of(String string) {
-        Objects.requireNonNull(string, "string must not be null");
-        JavaTemplateAccess JTA = SharedSecrets.getJavaTemplateAccess();
-        return JTA.of(List.of(string), List.of());
-    }
-
-    /**
-     * Returns a StringTemplate with the given fragments and values.
-     *
-     * @implSpec The {@code fragments} list size must be one more that the
-     * {@code values} list size.
-     *
-     * @param fragments list of string fragments
-     * @param values    list of expression values
-     *
-     * @return StringTemplate composed from string
-     *
-     * @throws IllegalArgumentException if fragments list size is not one more
-     *         than values list size
-     * @throws NullPointerException if fragments is null or values is null or if any fragment is null.
-     *
-     * @implNote Contents of both lists are copied to construct immutable lists.
-     */
-    static StringTemplate of(List<String> fragments, List<?> values) {
-        Objects.requireNonNull(fragments, "fragments must not be null");
-        Objects.requireNonNull(values, "values must not be null");
-        if (values.size() + 1 != fragments.size()) {
-            throw new IllegalArgumentException(
-                    "fragments list size is not one more than values list size");
-        }
-        JavaTemplateAccess JTA = SharedSecrets.getJavaTemplateAccess();
-        return JTA.of(fragments, values);
-    }
-
-    /**
-     * Creates a string that interleaves the elements of values between the
-     * elements of fragments. To accommodate interpolation, values are converted to strings
-     * as if invoking {@link String#valueOf(Object)}.
-     *
-     * @param fragments  list of String fragments
-     * @param values     list of expression values
-     *
-     * @return String interpolation of fragments and values
-     *
-     * @throws IllegalArgumentException if fragments list size is not one more
-     *         than values list size
-     * @throws NullPointerException fragments or values is null or if any of the fragments is null
-     */
-    static String interpolate(List<String> fragments, List<?> values) {
-        Objects.requireNonNull(fragments, "fragments must not be null");
-        Objects.requireNonNull(values, "values must not be null");
-        int fragmentsSize = fragments.size();
-        int valuesSize = values.size();
-        if (fragmentsSize != valuesSize + 1) {
-            throw new IllegalArgumentException("fragments must have one more element than values");
-        }
-        JavaTemplateAccess JTA = SharedSecrets.getJavaTemplateAccess();
-        return JTA.interpolate(fragments, values);
-    }
-
-    /**
-     * Combine zero or more {@link StringTemplate StringTemplates} into a single
-     * {@link StringTemplate}.
-     * {@snippet :
-     * StringTemplate st = StringTemplate.combine(RAW."\{a}", RAW."\{b}", RAW."\{c}");
-     * assert st.interpolate().equals(STR."\{a}\{b}\{c}");
-     * }
-     * Fragment lists from the {@link StringTemplate StringTemplates} are combined end to
-     * end with the last fragment from each {@link StringTemplate} concatenated with the
-     * first fragment of the next. To demonstrate, if we were to take two strings and we
-     * combined them as follows: {@snippet lang = "java":
-     * String s1 = "abc";
-     * String s2 = "xyz";
-     * String sc = s1 + s2;
-     * assert Objects.equals(sc, "abcxyz");
-     * }
-     * the last character {@code "c"} from the first string is juxtaposed with the first
-     * character {@code "x"} of the second string. The same would be true of combining
-     * {@link StringTemplate StringTemplates}.
-     * {@snippet lang ="java":
-     * StringTemplate st1 = RAW."a\{}b\{}c";
-     * StringTemplate st2 = RAW."x\{}y\{}z";
-     * StringTemplate st3 = RAW."a\{}b\{}cx\{}y\{}z";
-     * StringTemplate stc = StringTemplate.combine(st1, st2);
-     *
-     * assert Objects.equals(st1.fragments(), List.of("a", "b", "c"));
-     * assert Objects.equals(st2.fragments(), List.of("x", "y", "z"));
-     * assert Objects.equals(st3.fragments(), List.of("a", "b", "cx", "y", "z"));
-     * assert Objects.equals(stc.fragments(), List.of("a", "b", "cx", "y", "z"));
-     * }
-     * Values lists are simply concatenated to produce a single values list.
-     * The result is a well-formed {@link StringTemplate} with n+1 fragments and n values, where
-     * n is the total of number of values across all the supplied
-     * {@link StringTemplate StringTemplates}.
-     *
-     * @param stringTemplates  zero or more {@link StringTemplate}
-     *
-     * @return combined {@link StringTemplate}
-     *
-     * @throws NullPointerException if stringTemplates is null or if any of the
-     * {@code stringTemplates} are null
-     *
-     * @implNote If zero {@link StringTemplate} arguments are provided then a
-     * {@link StringTemplate} with an empty fragment and no values is returned, as if invoking
-     * <code>StringTemplate.of("")</code> . If only one {@link StringTemplate} argument is provided
-     * then it is returned unchanged.
-     */
-    static StringTemplate combine(StringTemplate... stringTemplates) {
-        JavaTemplateAccess JTA = SharedSecrets.getJavaTemplateAccess();
-        return JTA.combine(stringTemplates);
-    }
-
-    /**
-     * Combine a list of {@link StringTemplate StringTemplates} into a single
-     * {@link StringTemplate}.
-     * {@snippet :
-     * StringTemplate st = StringTemplate.combine(List.of(RAW."\{a}", RAW."\{b}", RAW."\{c}"));
-     * assert st.interpolate().equals(STR."\{a}\{b}\{c}");
-     * }
-     * Fragment lists from the {@link StringTemplate StringTemplates} are combined end to
-     * end with the last fragment from each {@link StringTemplate} concatenated with the
-     * first fragment of the next. To demonstrate, if we were to take two strings and we
-     * combined them as follows: {@snippet lang = "java":
-     * String s1 = "abc";
-     * String s2 = "xyz";
-     * String sc = s1 + s2;
-     * assert Objects.equals(sc, "abcxyz");
-     * }
-     * the last character {@code "c"} from the first string is juxtaposed with the first
-     * character {@code "x"} of the second string. The same would be true of combining
-     * {@link StringTemplate StringTemplates}.
-     * {@snippet lang ="java":
-     * StringTemplate st1 = RAW."a\{}b\{}c";
-     * StringTemplate st2 = RAW."x\{}y\{}z";
-     * StringTemplate st3 = RAW."a\{}b\{}cx\{}y\{}z";
-     * StringTemplate stc = StringTemplate.combine(List.of(st1, st2));
-     *
-     * assert Objects.equals(st1.fragments(), List.of("a", "b", "c"));
-     * assert Objects.equals(st2.fragments(), List.of("x", "y", "z"));
-     * assert Objects.equals(st3.fragments(), List.of("a", "b", "cx", "y", "z"));
-     * assert Objects.equals(stc.fragments(), List.of("a", "b", "cx", "y", "z"));
-     * }
-     * Values lists are simply concatenated to produce a single values list.
-     * The result is a well-formed {@link StringTemplate} with n+1 fragments and n values, where
-     * n is the total of number of values across all the supplied
-     * {@link StringTemplate StringTemplates}.
-     *
-     * @param stringTemplates  list of {@link StringTemplate}
-     *
-     * @return combined {@link StringTemplate}
-     *
-     * @throws NullPointerException if stringTemplates is null or if any of the
-     * its elements are null
-     *
-     * @implNote If {@code stringTemplates.size() == 0} then a {@link StringTemplate} with
-     * an empty fragment and no values is returned, as if invoking
-     * <code>StringTemplate.of("")</code> . If {@code stringTemplates.size() == 1}
-     * then the first element of the list is returned unchanged.
-     */
-    static StringTemplate combine(List<StringTemplate> stringTemplates) {
-        JavaTemplateAccess JTA = SharedSecrets.getJavaTemplateAccess();
-        return JTA.combine(stringTemplates.toArray(new StringTemplate[0]));
-    }
-
-    /**
-     * This {@link Processor} instance is conventionally used for the string interpolation
-     * of a supplied {@link StringTemplate}.
-     * <p>
-     * For better visibility and when practical, it is recommended that users use the
-     * {@link StringTemplate#STR} processor instead of invoking the
-     * {@link StringTemplate#interpolate()} method.
-     * Example: {@snippet :
-     * int x = 10;
-     * int y = 20;
-     * String result = STR."\{x} + \{y} = \{x + y}"; // @highlight substring="STR"
-     * }
-     * In the above example, the value of {@code result} will be {@code "10 + 20 = 30"}. This is
-     * produced by the interleaving concatenation of fragments and values from the supplied
-     * {@link StringTemplate}. To accommodate concatenation, values are converted to strings
-     * as if invoking {@link String#valueOf(Object)}.
-     * @apiNote {@link StringTemplate#STR} is statically imported implicitly into every
-     * Java compilation unit.
-     */
-    Processor<String, RuntimeException> STR = StringTemplate::interpolate;
-
-    /**
-     * This {@link Processor} instance is conventionally used to indicate that the
-     * processing of the {@link StringTemplate} is to be deferred to a later time. Deferred
-     * processing can be resumed by invoking the
-     * {@link StringTemplate#process(Processor)} or
-     * {@link Processor#process(StringTemplate)} methods.
-     * {@snippet :
-     * import static java.lang.StringTemplate.RAW;
-     * ...
-     * StringTemplate st = RAW."\{x} + \{y} = \{x + y}";
-     * ...other steps...
-     * String result = STR.process(st);
-     * }
-     * @implNote Unlike {@link StringTemplate#STR}, {@link StringTemplate#RAW} must be
-     * statically imported explicitly.
-     */
-    Processor<StringTemplate, RuntimeException> RAW = st -> st;
-
-    /**
-     * This interface describes the methods provided by a generalized string template processor. The
-     * primary method {@link Processor#process(StringTemplate)} is used to validate
-     * and compose a result using a {@link StringTemplate StringTemplate's} fragments and values lists.
-     * <p>
-     * For example:
-     * {@snippet :
-     * class MyProcessor implements Processor<String, IllegalArgumentException> {
-     *     @Override
-     *     public String process(StringTemplate st) throws IllegalArgumentException {
-     *          StringBuilder sb = new StringBuilder();
-     *          Iterator<String> fragmentsIter = st.fragments().iterator();
-     *
-     *          for (Object value : st.values()) {
-     *              sb.append(fragmentsIter.next());
-     *
-     *              if (value instanceof Boolean) {
-     *                  throw new IllegalArgumentException("I don't like Booleans");
-     *              }
-     *
-     *              sb.append(value);
-     *          }
-     *
-     *          sb.append(fragmentsIter.next());
-     *
-     *          return sb.toString();
-     *     }
-     * }
-     *
-     * MyProcessor myProcessor = new MyProcessor();
-     * try {
-     *     int x = 10;
-     *     int y = 20;
-     *     String result = myProcessor."\{x} + \{y} = \{x + y}";
-     *     ...
-     * } catch (IllegalArgumentException ex) {
-     *     ...
-     * }
-     * }
-     * Implementations of this interface may provide, but are not limited to, validating
-     * inputs, composing inputs into a result, and transforming an intermediate string
-     * result to a non-string value before delivering the final result.
-     * <p>
-     * The user has the option of validating inputs used in composition. For example an SQL
-     * processor could prevent injection vulnerabilities by sanitizing inputs or throwing an
-     * exception of type {@code E} if an SQL statement is a potential vulnerability.
-     * <p>
-     * Composing allows user control over how the result is assembled. Most often, a
-     * user will construct a new string from the string template, with placeholders
-     * replaced by string representations of value list elements. These string
-     * representations are created as if invoking {@link String#valueOf}.
-     * <p>
-     * Transforming allows the processor to return something other than a string. For
-     * instance, a JSON processor could return a JSON object, by parsing the string created
-     * by composition, instead of the composed string.
-     * <p>
-     * {@link Processor} is a {@link FunctionalInterface}. This permits
-     * declaration of a processor using lambda expressions;
-     * {@snippet :
-     * Processor<String, RuntimeException> processor = st -> {
-     *     List<String> fragments = st.fragments();
-     *     List<Object> values = st.values();
-     *     // check or manipulate the fragments and/or values
-     *     ...
-     *     return StringTemplate.interpolate(fragments, values);
-     * };
-     * }
-     * The {@link StringTemplate#interpolate()} method is available for those processors
-     * that just need to work with the string interpolation;
-     * {@snippet :
-     * Processor<String, RuntimeException> processor = StringTemplate::interpolate;
-     * }
-     * or simply transform the string interpolation into something other than
-     * {@link String};
-     * {@snippet :
-     * Processor<JSONObject, RuntimeException> jsonProcessor = st -> new JSONObject(st.interpolate());
-     * }
-     * @implNote The Java compiler automatically imports {@link StringTemplate#STR}
-     *
-     * @param <R>  Processor's process result type
-     * @param <E>  Exception thrown type
-     *
-     * @see StringTemplate
-     * @see java.util.FormatProcessor
-     *
-     * @since 21
-     *
-     * @jls 15.8.6 Process Template Expressions
-     */
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    @FunctionalInterface
-    public interface Processor<R, E extends Throwable> {
-
-        /**
-         * Constructs a result based on the template fragments and values in the
-         * supplied {@link StringTemplate stringTemplate} object.
-         * @apiNote Processing of a {@link StringTemplate} may include validation according to the particular facts relating
-         * to each situation. The {@code E} type parameter indicates the type of checked exception that is thrown by
-         * {@link #process} if validation fails, ex. {@code java.sql.SQLException}. If no checked exception is expected
-         * then {@link RuntimeException} may be used. Note that unchecked exceptions, such as {@link RuntimeException},
-         * {@link NullPointerException} or {@link IllegalArgumentException} may be thrown as part of the normal
-         * method arguments processing. Details of which exceptions are thrown will be found in the documentation
-         * of the specific implementation.
-         *
-         * @param stringTemplate  a {@link StringTemplate} instance
-         *
-         * @return constructed object of type R
-         *
-         * @throws E exception thrown by the template processor when validation fails
-         */
-        R process(StringTemplate stringTemplate) throws E;
-
-        /**
-         * This factory method can be used to create a {@link Processor} containing a
-         * {@link Processor#process} method derived from a lambda expression. As an example;
-         * {@snippet :
-         * Processor<String, RuntimeException> mySTR = Processor.of(StringTemplate::interpolate);
-         * int x = 10;
-         * int y = 20;
-         * String str = mySTR."\{x} + \{y} = \{x + y}";
-         * }
-         * The result type of the constructed {@link Processor} may be derived from
-         * the lambda expression, thus this method may be used in a var
-         * statement. For example, {@code mySTR} from above can also be declared using;
-         * {@snippet :
-         * var mySTR = Processor.of(StringTemplate::interpolate);
-         * }
-         * {@link RuntimeException} is the assumed exception thrown type.
-         *
-         * @param process a function that takes a {@link StringTemplate} as an argument
-         *                and returns the inferred result type
-         *
-         * @return a {@link Processor}
-         *
-         * @param <T>  Processor's process result type
-         */
-        static <T> Processor<T, RuntimeException> of(Function<? super StringTemplate, ? extends T> process) {
-            return process::apply;
-        }
-
-        /**
-         * Built-in policies using this additional interface have the flexibility to
-         * specialize the composition of the templated string by returning a customized
-         * {@link MethodHandle} from {@link Linkage#linkage linkage}.
-         * These specializations are typically implemented to improve performance;
-         * specializing value types or avoiding boxing and vararg arrays.
-         *
-         * @implNote This interface is sealed to only allow standard processors.
-         *
-         * @sealedGraph
-         * @since 21
-         */
-        @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-        public sealed interface Linkage permits FormatProcessor {
-            /**
-             * This method creates a {@link MethodHandle} that when invoked with arguments of
-             * those specified in {@code type} returns a result that equals that returned by
-             * the template processor's process method. The difference being that this method
-             * can preview the template's fragments and value types in advance of usage and
-             * thereby has the opportunity to produce a specialized implementation.
-             *
-             * @param fragments  string template fragments
-             * @param type       method type, includes the StringTemplate receiver as
-             * well as the value types
-             *
-             * @return {@link MethodHandle} for the processor applied to template
-             *
-             * @throws NullPointerException if any of the arguments are null
-             */
-            MethodHandle linkage(List<String> fragments, MethodType type);
-        }
-    }
-
-}
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index d6a0faa4200..3c80e82b138 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -80,7 +80,6 @@ import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.Reflection;
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
-import jdk.internal.javac.PreviewFeature;
 import jdk.internal.logger.LoggerFinderLoader;
 import jdk.internal.logger.LazyLoggers;
 import jdk.internal.logger.LocalizedLoggerWrapper;
@@ -2490,6 +2489,9 @@ public final class System {
             public char getUTF16Char(byte[] bytes, int index) {
                 return StringUTF16.getChar(bytes, index);
             }
+            public void putCharUTF16(byte[] bytes, int index, int ch) {
+                StringUTF16.putChar(bytes, index, ch);
+            }
             public byte[] getBytesNoRepl(String s, Charset cs) throws CharacterCodingException {
                 return String.getBytesNoRepl(s, cs);
             }
@@ -2530,6 +2532,10 @@ public final class System {
                 return StringConcatHelper.lookupStatic(name, methodType);
             }
 
+            public long stringConcatHelperPrepend(long indexCoder, byte[] buf, String value) {
+                return StringConcatHelper.prepend(indexCoder, buf, value);
+            }
+
             public long stringConcatInitialCoder() {
                 return StringConcatHelper.initialCoder();
             }
@@ -2538,21 +2544,20 @@ public final class System {
                 return StringConcatHelper.mix(lengthCoder, constant);
             }
 
-            @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-            public long stringConcatCoder(char value) {
-                return StringConcatHelper.coder(value);
+            public long stringConcatMix(long lengthCoder, char value) {
+                return StringConcatHelper.mix(lengthCoder, value);
             }
 
-            @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-            public long stringBuilderConcatMix(long lengthCoder,
-                                               StringBuilder sb) {
-                return sb.mix(lengthCoder);
+            public int stringSize(long i) {
+                return Long.stringSize(i);
             }
 
-            @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-            public long stringBuilderConcatPrepend(long lengthCoder, byte[] buf,
-                                                   StringBuilder sb) {
-                return sb.prepend(lengthCoder, buf);
+            public int getCharsLatin1(long i, int index, byte[] buf) {
+                return StringLatin1.getChars(i, index, buf);
+            }
+
+            public int getCharsUTF16(long i, int index, byte[] buf) {
+                return StringUTF16.getChars(i, index, buf);
             }
 
             public String join(String prefix, String suffix, String delimiter, String[] elements, int size) {
diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index cc0abfef97c..b918b756332 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -28,7 +28,6 @@ package java.lang.invoke;
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.javac.PreviewFeature;
-import jdk.internal.util.FormatConcatItem;
 import jdk.internal.vm.annotation.Stable;
 import sun.invoke.util.Wrapper;
 
@@ -115,14 +114,8 @@ public final class StringConcatFactory {
      * While the maximum number of argument slots that indy call can handle is 253,
      * we do not use all those slots, to let the strategies with MethodHandle
      * combinators to use some arguments.
-     *
-     * @since 21
      */
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    public static final int MAX_INDY_CONCAT_ARG_SLOTS;
-    // Use static initialize block to avoid MAX_INDY_CONCAT_ARG_SLOTS being treating
-    // as a constant for constant folding.
-    static { MAX_INDY_CONCAT_ARG_SLOTS = 200; }
+    private static final int MAX_INDY_CONCAT_ARG_SLOTS = 200;
 
     private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
 
@@ -712,9 +705,6 @@ public final class StringConcatFactory {
         int idx = classIndex(cl);
         MethodHandle prepend = PREPENDERS[idx];
         if (prepend == null) {
-            if (idx == STRING_CONCAT_ITEM) {
-                cl = FormatConcatItem.class;
-            }
             PREPENDERS[idx] = prepend = JLA.stringConcatHelper("prepend",
                     methodType(long.class, long.class, byte[].class,
                             Wrapper.asPrimitiveType(cl), String.class)).rebind();
@@ -726,9 +716,6 @@ public final class StringConcatFactory {
         int idx = classIndex(cl);
         MethodHandle prepend = NO_PREFIX_PREPENDERS[idx];
         if (prepend == null) {
-            if (idx == STRING_CONCAT_ITEM) {
-                cl = FormatConcatItem.class;
-            }
             NO_PREFIX_PREPENDERS[idx] = prepend = JLA.stringConcatHelper("prepend",
                     methodType(long.class, long.class, byte[].class,
                             Wrapper.asPrimitiveType(cl))).rebind();
@@ -741,15 +728,13 @@ public final class StringConcatFactory {
             LONG_IDX = 2,
             BOOLEAN_IDX = 3,
             STRING_IDX = 4,
-            STRING_CONCAT_ITEM = 5,
-            TYPE_COUNT = 6;
+            TYPE_COUNT = 5;
     private static int classIndex(Class<?> cl) {
         if (cl == String.class)                          return STRING_IDX;
         if (cl == int.class)                             return INT_IDX;
         if (cl == boolean.class)                         return BOOLEAN_IDX;
         if (cl == char.class)                            return CHAR_IDX;
         if (cl == long.class)                            return LONG_IDX;
-        if (FormatConcatItem.class.isAssignableFrom(cl)) return STRING_CONCAT_ITEM;
         throw new IllegalArgumentException("Unexpected class: " + cl);
     }
 
@@ -1047,303 +1032,4 @@ public final class StringConcatFactory {
         // no instantiation
     }
 
-    /**
-     * Simplified concatenation method to facilitate {@link StringTemplate}
-     * concatenation. This method returns a single concatenation method that
-     * interleaves fragments and values. fragment|value|fragment|value|...|value|fragment.
-     * The number of fragments must be one more that the number of ptypes.
-     * The total number of slots used by the ptypes must be less than or equal
-     * to {@link #MAX_INDY_CONCAT_ARG_SLOTS}.
-     *
-     * @param fragments list of string fragments
-     * @param ptypes    list of expression types
-     *
-     * @return the {@link MethodHandle} for concatenation
-     *
-     * @throws StringConcatException If any of the linkage invariants are violated.
-     * @throws NullPointerException If any of the incoming arguments is null.
-     * @throws IllegalArgumentException If the number of value slots exceed {@link #MAX_INDY_CONCAT_ARG_SLOTS}.
-     *
-     * @since 21
-     */
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    public static MethodHandle makeConcatWithTemplate(
-            List<String> fragments,
-            List<Class<?>> ptypes)
-            throws StringConcatException
-    {
-        Objects.requireNonNull(fragments, "fragments is null");
-        Objects.requireNonNull(ptypes, "ptypes is null");
-        ptypes = List.copyOf(ptypes);
-
-        if (fragments.size() != ptypes.size() + 1) {
-            throw new IllegalArgumentException("fragments size not equal ptypes size plus one");
-        }
-
-        if (ptypes.isEmpty()) {
-            return MethodHandles.constant(String.class, fragments.get(0));
-        }
-
-        Class<?>[] ttypes = new Class<?>[ptypes.size()];
-        MethodHandle[] filters = new MethodHandle[ptypes.size()];
-        int slots = 0;
-
-        int pos = 0;
-        for (Class<?> ptype : ptypes) {
-            slots += ptype == long.class || ptype == double.class ? 2 : 1;
-
-            if (MAX_INDY_CONCAT_ARG_SLOTS < slots) {
-                throw new StringConcatException("Too many concat argument slots: " +
-                        slots + ", can only accept " + MAX_INDY_CONCAT_ARG_SLOTS);
-            }
-
-            boolean isSpecialized = ptype.isPrimitive();
-            boolean isFormatConcatItem = FormatConcatItem.class.isAssignableFrom(ptype);
-            Class<?> ttype = isSpecialized ? promoteToIntType(ptype) :
-                             isFormatConcatItem ? FormatConcatItem.class : Object.class;
-            MethodHandle filter = isFormatConcatItem ? null : stringifierFor(ttype);
-
-            if (filter != null) {
-                filters[pos] = filter;
-                ttype = String.class;
-            }
-
-            ttypes[pos++] = ttype;
-        }
-
-        MethodHandle mh = MethodHandles.dropArguments(newString(), 2, ttypes);
-
-        long initialLengthCoder = INITIAL_CODER;
-        pos = 0;
-        for (String fragment : fragments) {
-            initialLengthCoder = JLA.stringConcatMix(initialLengthCoder, fragment);
-
-            if (ttypes.length <= pos) {
-                break;
-            }
-
-            Class<?> ttype = ttypes[pos];
-            // (long,byte[],ttype) -> long
-            MethodHandle prepender = prepender(fragment, ttype);
-            // (byte[],long,ttypes...) -> String (unchanged)
-            mh = MethodHandles.filterArgumentsWithCombiner(mh, 1, prepender,1, 0, 2 + pos);
-
-            pos++;
-        }
-
-        String lastFragment = fragments.getLast();
-        initialLengthCoder -= lastFragment.length();
-        MethodHandle newArrayCombinator = lastFragment.isEmpty() ? newArray() :
-                newArrayWithSuffix(lastFragment);
-        // (long,ttypes...) -> String
-        mh = MethodHandles.foldArgumentsWithCombiner(mh, 0, newArrayCombinator,
-                1 // index
-        );
-
-        pos = 0;
-        for (Class<?> ttype : ttypes) {
-            // (long,ttype) -> long
-            MethodHandle mix = mixer(ttypes[pos]);
-            boolean lastPType = pos == ttypes.length - 1;
-
-            if (lastPType) {
-                // (ttype) -> long
-                mix = MethodHandles.insertArguments(mix, 0, initialLengthCoder);
-                // (ttypes...) -> String
-                mh = MethodHandles.foldArgumentsWithCombiner(mh, 0, mix,
-                        1 + pos // selected argument
-                );
-            } else {
-                // (long,ttypes...) -> String
-                mh = MethodHandles.filterArgumentsWithCombiner(mh, 0, mix,
-                        0, // old-index
-                        1 + pos // selected argument
-                );
-            }
-
-            pos++;
-        }
-
-        mh = MethodHandles.filterArguments(mh, 0, filters);
-        MethodType mt = MethodType.methodType(String.class, ptypes);
-        mh = mh.viewAsType(mt, true);
-
-        return mh;
-    }
-
-    /**
-     * This method breaks up large concatenations into separate
-     * {@link MethodHandle MethodHandles} based on the number of slots required
-     * per {@link MethodHandle}. Each {@link MethodHandle} after the first will
-     * have an extra {@link String} slot for the result from the previous
-     * {@link MethodHandle}.
-     * {@link #makeConcatWithTemplate}
-     * is used to construct the {@link MethodHandle MethodHandles}. The total
-     * number of slots used by the ptypes is open ended. However, care must
-     * be given when combining the {@link MethodHandle MethodHandles} so that
-     * the combine total does not exceed the 255 slot limit.
-     *
-     * @param fragments list of string fragments
-     * @param ptypes    list of expression types
-     * @param maxSlots  maximum number of slots per {@link MethodHandle}.
-     *
-     * @return List of {@link MethodHandle MethodHandles}
-     *
-     * @throws IllegalArgumentException If maxSlots is not between 1 and
-     *                                  MAX_INDY_CONCAT_ARG_SLOTS.
-     * @throws StringConcatException If any of the linkage invariants are violated.
-     * @throws NullPointerException If any of the incoming arguments is null.
-     * @throws IllegalArgumentException If the number of value slots exceed {@link #MAX_INDY_CONCAT_ARG_SLOTS}.
-     *
-     * @since 21
-     */
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    public static List<MethodHandle> makeConcatWithTemplateCluster(
-            List<String> fragments,
-            List<Class<?>> ptypes,
-            int maxSlots)
-            throws StringConcatException
-    {
-        Objects.requireNonNull(fragments, "fragments is null");
-        Objects.requireNonNull(ptypes, "ptypes is null");
-
-        if (fragments.size() != ptypes.size() + 1) {
-            throw new StringConcatException("fragments size not equal ptypes size plus one");
-        }
-
-        if (maxSlots < 1 || MAX_INDY_CONCAT_ARG_SLOTS < maxSlots) {
-            throw new IllegalArgumentException("maxSlots must be between 1 and " +
-                    MAX_INDY_CONCAT_ARG_SLOTS);
-
-        }
-
-        if (ptypes.isEmpty()) {
-            return List.of(MethodHandles.constant(String.class, fragments.get(0)));
-        }
-
-        List<MethodHandle> mhs = new ArrayList<>();
-        List<String> fragmentsSection = new ArrayList<>();
-        List<Class<?>> ptypeSection = new ArrayList<>();
-        int slots = 0;
-
-        int pos = 0;
-        for (Class<?> ptype : ptypes) {
-            boolean lastPType = pos == ptypes.size() - 1;
-            fragmentsSection.add(fragments.get(pos));
-            ptypeSection.add(ptype);
-
-            slots += ptype == long.class || ptype == double.class ? 2 : 1;
-
-            if (maxSlots <= slots || lastPType) {
-                fragmentsSection.add(lastPType ? fragments.get(pos + 1) : "");
-                MethodHandle mh = makeConcatWithTemplate(fragmentsSection,
-                        ptypeSection);
-                mhs.add(mh);
-                fragmentsSection.clear();
-                fragmentsSection.add("");
-                ptypeSection.clear();
-                ptypeSection.add(String.class);
-                slots = 1;
-            }
-
-            pos++;
-        }
-
-        return mhs;
-    }
-
-    /**
-     * This method creates a {@link MethodHandle} expecting one input, the
-     * receiver of the supplied getters. This method uses
-     * {@link #makeConcatWithTemplateCluster}
-     * to create the intermediate {@link MethodHandle MethodHandles}.
-     *
-     * @param fragments list of string fragments
-     * @param getters   list of getter {@link MethodHandle MethodHandles}
-     * @param maxSlots  maximum number of slots per {@link MethodHandle} in
-     *                  cluster.
-     *
-     * @return the {@link MethodHandle} for concatenation
-     *
-     * @throws IllegalArgumentException If maxSlots is not between 1 and
-     *                                  MAX_INDY_CONCAT_ARG_SLOTS or if the
-     *                                  getters don't use the same argument type
-     * @throws StringConcatException If any of the linkage invariants are violated
-     * @throws NullPointerException If any of the incoming arguments is null
-     * @throws IllegalArgumentException If the number of value slots exceed {@link #MAX_INDY_CONCAT_ARG_SLOTS}.
-     *
-     * @since 21
-     */
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-    public static MethodHandle makeConcatWithTemplateGetters(
-            List<String> fragments,
-            List<MethodHandle> getters,
-            int maxSlots)
-            throws StringConcatException
-    {
-        Objects.requireNonNull(fragments, "fragments is null");
-        Objects.requireNonNull(getters, "getters is null");
-
-        if (fragments.size() != getters.size() + 1) {
-            throw new StringConcatException("fragments size not equal getters size plus one");
-        }
-
-        if (maxSlots < 1 || MAX_INDY_CONCAT_ARG_SLOTS < maxSlots) {
-            throw new IllegalArgumentException("maxSlots must be between 1 and " +
-                    MAX_INDY_CONCAT_ARG_SLOTS);
-
-        }
-
-        if (getters.size() == 0) {
-            throw new StringConcatException("no getters supplied");
-        }
-
-        Class<?> receiverType = null;
-        List<Class<?>> ptypes = new ArrayList<>();
-
-        for (MethodHandle getter : getters) {
-            MethodType mt = getter.type();
-            Class<?> returnType = mt.returnType();
-
-            if (returnType == void.class || mt.parameterCount() != 1) {
-                throw new StringConcatException("not a getter " + mt);
-            }
-
-            if (receiverType == null) {
-                receiverType = mt.parameterType(0);
-            } else if (receiverType != mt.parameterType(0)) {
-                throw new StringConcatException("not the same receiever type " +
-                        mt + " needs " + receiverType);
-            }
-
-            ptypes.add(returnType);
-        }
-
-        MethodType resultType = MethodType.methodType(String.class, receiverType);
-        List<MethodHandle> clusters = makeConcatWithTemplateCluster(fragments, ptypes,
-                maxSlots);
-
-        MethodHandle mh = null;
-        Iterator<MethodHandle> getterIterator = getters.iterator();
-
-        for (MethodHandle cluster : clusters) {
-            MethodType mt = cluster.type();
-            MethodHandle[] filters = new MethodHandle[mt.parameterCount()];
-            int pos = 0;
-
-            if (mh != null) {
-                filters[pos++] = mh;
-            }
-
-            while (pos < filters.length) {
-                filters[pos++] = getterIterator.next();
-            }
-
-            cluster = MethodHandles.filterArguments(cluster, 0, filters);
-            mh = MethodHandles.permuteArguments(cluster, resultType,
-                    new int[filters.length]);
-        }
-
-        return mh;
-    }
 }
diff --git a/src/java.base/share/classes/java/lang/runtime/StringTemplateImpl.java b/src/java.base/share/classes/java/lang/runtime/StringTemplateImpl.java
deleted file mode 100644
index be510fe62b0..00000000000
--- a/src/java.base/share/classes/java/lang/runtime/StringTemplateImpl.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2023, 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 java.lang.runtime;
-
-import java.lang.invoke.MethodHandle;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * This class implements specialized {@link StringTemplate StringTemplates} produced by
- * string template bootstrap method callsites generated by the compiler. Instances of this
- * class are produced by {@link StringTemplateImplFactory}.
- * <p>
- * Values are stored by subclassing {@link Carriers.CarrierObject}. This allows specializations
- * and sharing of value shapes without creating a new class for each shape.
- * <p>
- * {@link StringTemplate} fragments are shared via binding to the
- * {@link java.lang.invoke.CallSite CallSite's} {@link MethodHandle}.
- * <p>
- * The {@link StringTemplateImpl} instance also carries
- * specialized {@link MethodHandle MethodHandles} for producing the values list and interpolation.
- * These {@link MethodHandle MethodHandles} are  also shared by binding to the
- * {@link java.lang.invoke.CallSite CallSite}.
- *
- * @since 21
- *
- * Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
- *          Do not rely on its availability.
- */
-final class StringTemplateImpl extends Carriers.CarrierObject implements StringTemplate {
-    /**
-     * List of string fragments for the string template. This value of this list is shared by
-     * all instances created at the {@link java.lang.invoke.CallSite CallSite}.
-     */
-    private final List<String> fragments;
-
-    /**
-     * Specialized {@link MethodHandle} used to implement the {@link StringTemplate StringTemplate's}
-     * {@code values} method. This {@link MethodHandle} is shared by all instances created at the
-     * {@link java.lang.invoke.CallSite CallSite}.
-     */
-    private final MethodHandle valuesMH;
-
-    /**
-     * Specialized {@link MethodHandle} used to implement the {@link StringTemplate StringTemplate's}
-     * {@code interpolate} method. This {@link MethodHandle} is shared by all instances created at the
-     * {@link java.lang.invoke.CallSite CallSite}.
-     */
-    private final MethodHandle interpolateMH;
-
-    /**
-     * Constructor.
-     *
-     * @param primitiveCount  number of primitive slots required (bound at callsite)
-     * @param objectCount     number of object slots required (bound at callsite)
-     * @param fragments       list of string fragments (bound in (bound at callsite)
-     * @param valuesMH        {@link MethodHandle} to produce list of values (bound at callsite)
-     * @param interpolateMH   {@link MethodHandle} to produce interpolation (bound at callsite)
-     */
-    StringTemplateImpl(int primitiveCount, int objectCount,
-                       List<String> fragments, MethodHandle valuesMH, MethodHandle interpolateMH) {
-        super(primitiveCount, objectCount);
-        this.fragments = fragments;
-        this.valuesMH = valuesMH;
-        this.interpolateMH = interpolateMH;
-    }
-
-    @Override
-    public List<String> fragments() {
-        return fragments;
-    }
-
-    @Override
-    public List<Object> values() {
-        try {
-            return (List<Object>)valuesMH.invokeExact(this);
-        } catch (RuntimeException | Error ex) {
-            throw ex;
-        } catch (Throwable ex) {
-            throw new RuntimeException("string template values failure", ex);
-        }
-    }
-
-    @Override
-    public String interpolate() {
-        try {
-            return (String)interpolateMH.invokeExact(this);
-        } catch (RuntimeException | Error ex) {
-            throw ex;
-        } catch (Throwable ex) {
-            throw new RuntimeException("string template interpolate failure", ex);
-        }
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        return other instanceof StringTemplate st &&
-                Objects.equals(fragments(), st.fragments()) &&
-                Objects.equals(values(), st.values());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(fragments(), values());
-    }
-
-    @Override
-    public String toString() {
-        return StringTemplate.toString(this);
-    }
-}
diff --git a/src/java.base/share/classes/java/lang/runtime/StringTemplateImplFactory.java b/src/java.base/share/classes/java/lang/runtime/StringTemplateImplFactory.java
deleted file mode 100644
index a8e1f1f347b..00000000000
--- a/src/java.base/share/classes/java/lang/runtime/StringTemplateImplFactory.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2023, 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 java.lang.runtime;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.invoke.StringConcatException;
-import java.lang.invoke.StringConcatFactory;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * This class synthesizes {@link StringTemplate StringTemplates} based on
- * fragments and bootstrap method type. Usage is primarily from
- * {@link java.lang.runtime.TemplateRuntime}.
- *
- * @since 21
- *
- * Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
- *          Do not rely on its availability.
- */
-final class StringTemplateImplFactory {
-
-    /**
-     * Private constructor.
-     */
-    StringTemplateImplFactory() {
-        throw new AssertionError("private constructor");
-    }
-
-    /*
-     * {@link StringTemplateImpl} constructor MethodHandle.
-     */
-    private static final MethodHandle CONSTRUCTOR;
-
-
-    /*
-     * Frequently used method types.
-     */
-    private static final MethodType MT_STRING_STIMPL =
-            MethodType.methodType(String.class, StringTemplateImpl.class);
-    private static final MethodType MT_LIST_STIMPL =
-            MethodType.methodType(List.class, StringTemplateImpl.class);
-
-    /**
-     * List (for nullable) of MethodHandle;
-     */
-    private static final MethodHandle TO_LIST;
-
-    static {
-        try {
-            MethodHandles.Lookup lookup = MethodHandles.lookup();
-
-            MethodType mt = MethodType.methodType(void.class, int.class, int.class, List.class,
-                    MethodHandle.class, MethodHandle.class);
-            CONSTRUCTOR = lookup.findConstructor(StringTemplateImpl.class, mt)
-                    .asType(mt.changeReturnType(Carriers.CarrierObject.class));
-
-            mt = MethodType.methodType(List.class, Object[].class);
-            TO_LIST = lookup.findStatic(StringTemplateImplFactory.class, "toList", mt);
-        } catch(ReflectiveOperationException ex) {
-            throw new AssertionError("carrier static init fail", ex);
-        }
-    }
-
-    /**
-     * Create a new {@link StringTemplateImpl} constructor.
-     *
-     * @param fragments  string template fragments
-     * @param type       values types with StringTemplate return
-     *
-     * @return {@link MethodHandle} that can construct a {@link StringTemplateImpl} with arguments
-     * used as values.
-     */
-    static MethodHandle createStringTemplateImplMH(List<String> fragments, MethodType type) {
-        Carriers.CarrierElements elements = Carriers.CarrierFactory.of(type);
-        MethodHandle[] components = elements
-                .components()
-                .stream()
-                .map(c -> c.asType(c.type().changeParameterType(0, StringTemplateImpl.class)))
-                .toArray(MethodHandle[]::new);
-        Class<?>[] ptypes = elements
-                .components()
-                .stream()
-                .map(c -> c.type().returnType())
-                .toArray(Class<?>[]::new);
-        int[] permute = new int[ptypes.length];
-
-        MethodHandle interpolateMH;
-        MethodType mt;
-        try {
-            interpolateMH = StringConcatFactory.makeConcatWithTemplate(fragments, List.of(ptypes));
-        } catch (StringConcatException ex) {
-            throw new RuntimeException("constructing internal string template", ex);
-        }
-        interpolateMH = MethodHandles.filterArguments(interpolateMH, 0, components);
-        interpolateMH = MethodHandles.permuteArguments(interpolateMH, MT_STRING_STIMPL, permute);
-
-        mt = MethodType.methodType(List.class, ptypes);
-        MethodHandle valuesMH = TO_LIST.asCollector(Object[].class, components.length).asType(mt);
-        valuesMH = MethodHandles.filterArguments(valuesMH, 0, components);
-        valuesMH = MethodHandles.permuteArguments(valuesMH, MT_LIST_STIMPL, permute);
-
-        MethodHandle constructor = MethodHandles.insertArguments(CONSTRUCTOR, 0,
-                elements.primitiveCount(), elements.objectCount(),
-                fragments, valuesMH, interpolateMH);
-        constructor = MethodHandles.foldArguments(elements.initializer(), 0, constructor);
-
-        mt = MethodType.methodType(StringTemplate.class, ptypes);
-        constructor = constructor.asType(mt);
-
-        return constructor;
-    }
-
-    /**
-     * Generic {@link StringTemplate}.
-     *
-     * @param fragments  immutable list of string fragments from string template
-     * @param values     immutable list of expression values
-     */
-    private record SimpleStringTemplate(List<String> fragments, List<Object> values)
-            implements StringTemplate {
-        @Override
-        public String toString() {
-            return StringTemplate.toString(this);
-        }
-    }
-
-    /**
-     * Returns a new StringTemplate composed from fragments and values.
-     *
-     * @param fragments array of string fragments
-     * @param values    array of expression values
-     *
-     * @return StringTemplate composed from fragments and values
-     */
-    static StringTemplate newTrustedStringTemplate(String[] fragments, Object[] values) {
-        return new SimpleStringTemplate(List.of(fragments), toList(values));
-    }
-
-    /**
-     * Returns a new StringTemplate composed from fragments and values.
-     *
-     * @param fragments list of string fragments
-     * @param values    array of expression values
-     *
-     * @return StringTemplate composed from fragments and values
-     */
-    static StringTemplate newTrustedStringTemplate(List<String> fragments, Object[] values) {
-        return new SimpleStringTemplate(List.copyOf(fragments), toList(values));
-    }
-
-    /**
-     * Returns a new StringTemplate composed from fragments and values.
-     *
-     * @param fragments list of string fragments
-     * @param values    list of expression values
-     *
-     * @return StringTemplate composed from fragments and values
-     */
-
-    static StringTemplate newStringTemplate(List<String> fragments, List<?> values) {
-        @SuppressWarnings("unchecked")
-        List<Object> copy = (List<Object>)values.stream().toList();
-        return new SimpleStringTemplate(List.copyOf(fragments), copy);
-    }
-
-    /**
-     * Collect nullable elements from an array into a unmodifiable list.
-     * Elements are guaranteed to be safe.
-     *
-     * @param elements  elements to place in list
-     *
-     * @return unmodifiable list.
-     */
-    private static List<Object> toList(Object[] elements) {
-        return Arrays.stream(elements).toList();
-    }
-
-}
diff --git a/src/java.base/share/classes/java/lang/runtime/TemplateRuntime.java b/src/java.base/share/classes/java/lang/runtime/TemplateRuntime.java
deleted file mode 100644
index 5b41fdb506f..00000000000
--- a/src/java.base/share/classes/java/lang/runtime/TemplateRuntime.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2023, 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 java.lang.runtime;
-
-import java.lang.invoke.CallSite;
-import java.lang.invoke.ConstantCallSite;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.StringTemplate.Processor;
-import java.lang.StringTemplate.Processor.Linkage;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-import jdk.internal.access.JavaTemplateAccess;
-import jdk.internal.access.SharedSecrets;
-import jdk.internal.javac.PreviewFeature;
-
-/**
- * Manages string template bootstrap methods. These methods may be used, for example,
- * by Java compiler implementations to create {@link StringTemplate} instances. For example,
- * the java compiler will translate the following code;
- * {@snippet :
- * int x = 10;
- * int y = 20;
- * StringTemplate st = RAW."\{x} + \{y} = \{x + y}";
- * }
- * to byte code that invokes the {@link java.lang.runtime.TemplateRuntime#newStringTemplate}
- * bootstrap method to construct a {@link CallSite} that accepts two integers and produces a new
- * {@link StringTemplate} instance.
- * {@snippet :
- * MethodHandles.Lookup lookup = MethodHandles.lookup();
- * MethodType mt = MethodType.methodType(StringTemplate.class, int.class, int.class);
- * CallSite cs = TemplateRuntime.newStringTemplate(lookup, "", mt, "", " + ", " = ", "");
- * ...
- * int x = 10;
- * int y = 20;
- * StringTemplate st = (StringTemplate)cs.getTarget().invokeExact(x, y);
- * }
- * If the string template requires more than
- * {@link java.lang.invoke.StringConcatFactory#MAX_INDY_CONCAT_ARG_SLOTS} value slots,
- * then the java compiler will use the
- * {@link java.lang.runtime.TemplateRuntime#newLargeStringTemplate} bootstrap method
- * instead. For example, the java compiler will translate the following code;
- * {@snippet :
- * int[] a = new int[1000], b = new int[1000];
- * ...
- * StringTemplate st = """
- *      \{a[0]} - \{b[0]}
- *      \{a[1]} - \{b[1]}
- *      ...
- *      \{a[999]} - \{b[999]}
- *      """;
- * }
- * to byte code that invokes the {@link java.lang.runtime.TemplateRuntime#newLargeStringTemplate}
- * bootstrap method to construct a {@link CallSite} that accepts an array of integers and produces a new
- * {@link StringTemplate} instance.
- * {@snippet :
- * MethodType mt = MethodType.methodType(StringTemplate.class, String[].class, Object[].class);
- * CallSite cs = TemplateRuntime.newStringTemplate(lookup, "", mt);
- * ...
- * int[] a = new int[1000], b = new int[1000];
- * ...
- * StringTemplate st = (StringTemplate)cs.getTarget().invokeExact(
- *         new String[] { "", " - ", "\n", " - ", "\n", ... " - ", "\n" },
- *         new Object[] { a[0], b[0], a[1], b[1], ..., a[999], b[999]}
- *         );
- * }
- *
- * @since 21
- */
-@PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-public final class TemplateRuntime {
-    private static final JavaTemplateAccess JTA = SharedSecrets.getJavaTemplateAccess();
-
-    /**
-     * {@link MethodHandle} to {@link TemplateRuntime#defaultProcess}.
-     */
-    private static final MethodHandle DEFAULT_PROCESS_MH;
-
-    /**
-     * {@link MethodHandle} to {@link TemplateRuntime#newTrustedStringTemplate}.
-     */
-    private static final MethodHandle NEW_TRUSTED_STRING_TEMPLATE;
-
-    /**
-     * Initialize {@link MethodHandle MethodHandles}.
-     */
-    static {
-        try {
-            MethodHandles.Lookup lookup = MethodHandles.lookup();
-
-            MethodType mt = MethodType.methodType(Object.class,
-                    List.class, Processor.class, Object[].class);
-            DEFAULT_PROCESS_MH =
-                lookup.findStatic(TemplateRuntime.class, "defaultProcess", mt);
-
-            mt = MethodType.methodType(StringTemplate.class, String[].class, Object[].class);
-            NEW_TRUSTED_STRING_TEMPLATE =
-                lookup.findStatic(StringTemplateImplFactory.class, "newTrustedStringTemplate", mt);
-        } catch (ReflectiveOperationException ex) {
-            throw new AssertionError("string bootstrap fail", ex);
-        }
-    }
-
-    /**
-     * Private constructor.
-     */
-    private TemplateRuntime() {
-        throw new AssertionError("private constructor");
-    }
-
-    /**
-     * String template bootstrap method for creating string templates.
-     * The static arguments include the fragments list.
-     * The non-static arguments are the values.
-     *
-     * @param lookup          method lookup from call site
-     * @param name            method name - not used
-     * @param type            method type
-     *                        (ptypes...) -> StringTemplate
-     * @param fragments       fragment array for string template
-     *
-     * @return {@link CallSite} to handle create string template
-     *
-     * @throws NullPointerException if any of the arguments is null
-     * @throws Throwable            if linkage fails
-     */
-    public static CallSite newStringTemplate(MethodHandles.Lookup lookup,
-                                             String name,
-                                             MethodType type,
-                                             String... fragments) throws Throwable {
-        Objects.requireNonNull(lookup, "lookup is null");
-        Objects.requireNonNull(name, "name is null");
-        Objects.requireNonNull(type, "type is null");
-        Objects.requireNonNull(fragments, "fragments is null");
-
-        MethodHandle mh = StringTemplateImplFactory
-                .createStringTemplateImplMH(List.of(fragments), type).asType(type);
-
-        return new ConstantCallSite(mh);
-    }
-
-    /**
-     * String template bootstrap method for creating large string templates,
-     * i.e., when the number of value slots exceeds
-     * {@link java.lang.invoke.StringConcatFactory#MAX_INDY_CONCAT_ARG_SLOTS}.
-     * The non-static arguments are the fragments array and values array.
-     *
-     * @param lookup          method lookup from call site
-     * @param name            method name - not used
-     * @param type            method type
-     *                        (String[], Object[]) -> StringTemplate
-     *
-     * @return {@link CallSite} to handle create large string template
-     *
-     * @throws NullPointerException if any of the arguments is null
-     * @throws Throwable            if linkage fails
-     */
-    public static CallSite newLargeStringTemplate(MethodHandles.Lookup lookup,
-                                                  String name,
-                                                  MethodType type) throws Throwable {
-        Objects.requireNonNull(lookup, "lookup is null");
-        Objects.requireNonNull(name, "name is null");
-        Objects.requireNonNull(type, "type is null");
-
-        return new ConstantCallSite(NEW_TRUSTED_STRING_TEMPLATE.asType(type));
-    }
-
-    /**
-     * String template bootstrap method for static final processors.
-     * The static arguments include the fragments array  and a {@link MethodHandle}
-     * to retrieve the value of the static final processor.
-     * The non-static arguments are the values.
-     *
-     * @param lookup          method lookup from call site
-     * @param name            method name - not used
-     * @param type            method type
-     *                        (ptypes...) -> Object
-     * @param processorGetter {@link MethodHandle} to get static final processor
-     * @param fragments       fragments from string template
-     *
-     * @return {@link CallSite} to handle string template processing
-     *
-     * @throws NullPointerException if any of the arguments is null
-     * @throws Throwable            if linkage fails
-     *
-     * @implNote this method is likely to be revamped before exiting preview.
-     */
-    public static CallSite processStringTemplate(MethodHandles.Lookup lookup,
-                                                 String name,
-                                                 MethodType type,
-                                                 MethodHandle processorGetter,
-                                                 String... fragments) throws Throwable {
-        Objects.requireNonNull(lookup, "lookup is null");
-        Objects.requireNonNull(name, "name is null");
-        Objects.requireNonNull(type, "type is null");
-        Objects.requireNonNull(processorGetter, "processorGetter is null");
-        Objects.requireNonNull(fragments, "fragments is null");
-
-        Processor<?, ?> processor = (Processor<?, ?>)processorGetter.invoke();
-        MethodHandle mh = processor instanceof Linkage linkage
-                ? linkage.linkage(List.of(fragments), type)
-                : defaultProcessMethodHandle(type, processor, List.of(fragments));
-
-        return new ConstantCallSite(mh);
-    }
-
-    /**
-     * Creates a simple {@link StringTemplate} and then invokes the processor's process method.
-     *
-     * @param fragments fragments from string template
-     * @param processor {@link Processor} to process
-     * @param values    array of expression values
-     *
-     * @return result of processing the string template
-     *
-     * @throws Throwable when {@link Processor#process(StringTemplate)} throws
-     */
-    private static Object defaultProcess(
-            List<String> fragments,
-            Processor<?, ?> processor,
-            Object[] values
-    ) throws Throwable {
-        return processor.process(StringTemplate.of(fragments, Arrays.stream(values).toList()));
-    }
-
-    /**
-     * Generate a {@link MethodHandle} which is effectively invokes
-     * {@code processor.process(new StringTemplate(fragments, values...)}.
-     *
-     * @return default process {@link MethodHandle}
-     */
-    private static MethodHandle defaultProcessMethodHandle(
-            MethodType type,
-            Processor<?, ?> processor,
-            List<String> fragments
-    ) {
-        MethodHandle mh = MethodHandles.insertArguments(DEFAULT_PROCESS_MH, 0, fragments, processor);
-        return mh.asCollector(Object[].class, type.parameterCount()).asType(type);
-    }
-}
-
diff --git a/src/java.base/share/classes/java/lang/runtime/TemplateSupport.java b/src/java.base/share/classes/java/lang/runtime/TemplateSupport.java
deleted file mode 100644
index a754e69d794..00000000000
--- a/src/java.base/share/classes/java/lang/runtime/TemplateSupport.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2023, 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 java.lang.runtime;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-
-import jdk.internal.access.JavaLangAccess;
-import jdk.internal.access.JavaTemplateAccess;
-import jdk.internal.access.SharedSecrets;
-
-/**
- * This class provides runtime support for string templates. The methods within
- * are intended for internal use only.
- *
- * @since 21
- *
- * Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
- *          Do not rely on its availability.
- */
-final class TemplateSupport implements JavaTemplateAccess {
-
-    /**
-     * Private constructor.
-     */
-    private TemplateSupport() {
-    }
-
-    static {
-        SharedSecrets.setJavaTemplateAccess(new TemplateSupport());
-    }
-
-    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
-
-    /**
-     * Returns a StringTemplate composed from fragments and values.
-     *
-     * @implSpec The {@code fragments} list size must be one more that the
-     * {@code values} list size.
-     *
-     * @param fragments list of string fragments
-     * @param values    list of expression values
-     *
-     * @return StringTemplate composed from fragments and values
-     *
-     * @throws IllegalArgumentException if fragments list size is not one more
-     *         than values list size
-     * @throws NullPointerException if fragments is null or values is null or if any fragment is null.
-     *
-     * @implNote Contents of both lists are copied to construct immutable lists.
-     */
-    @Override
-    public StringTemplate of(List<String> fragments, List<?> values) {
-        return StringTemplateImplFactory.newStringTemplate(fragments, values);
-    }
-
-    /**
-     * Creates a string that interleaves the elements of values between the
-     * elements of fragments.
-     *
-     * @param fragments  list of String fragments
-     * @param values     list of expression values
-     *
-     * @return String interpolation of fragments and values
-     */
-    @Override
-    public String interpolate(List<String> fragments, List<?> values) {
-        int fragmentsSize = fragments.size();
-        int valuesSize = values.size();
-        if (fragmentsSize == 1) {
-            return fragments.get(0);
-        }
-        int size = fragmentsSize + valuesSize;
-        String[] strings = new String[size];
-        int i = 0, j = 0;
-        for (; j < valuesSize; j++) {
-            strings[i++] = fragments.get(j);
-            strings[i++] = String.valueOf(values.get(j));
-        }
-        strings[i] = fragments.get(j);
-        return JLA.join("", "", "", strings, size);
-    }
-
-    /**
-     * Combine one or more {@link StringTemplate StringTemplates} to produce a combined {@link StringTemplate}.
-     * {@snippet :
-     * StringTemplate st = StringTemplate.combine("\{a}", "\{b}", "\{c}");
-     * assert st.interpolate().equals("\{a}\{b}\{c}");
-     * }
-     *
-     * @param sts  zero or more {@link StringTemplate}
-     *
-     * @return combined {@link StringTemplate}
-     *
-     * @throws NullPointerException if sts is null or if any element of sts is null
-     */
-    @Override
-    public StringTemplate combine(StringTemplate... sts) {
-        Objects.requireNonNull(sts, "sts must not be null");
-        if (sts.length == 0) {
-            return StringTemplate.of("");
-        } else if (sts.length == 1) {
-            return Objects.requireNonNull(sts[0], "string templates should not be null");
-        }
-        int size = 0;
-        for (StringTemplate st : sts) {
-            Objects.requireNonNull(st, "string templates should not be null");
-            size += st.values().size();
-        }
-        String[] combinedFragments = new String[size + 1];
-        Object[] combinedValues = new Object[size];
-        combinedFragments[0] = "";
-        int fragmentIndex = 1;
-        int valueIndex = 0;
-        for (StringTemplate st : sts) {
-            Iterator<String> iterator = st.fragments().iterator();
-            combinedFragments[fragmentIndex - 1] += iterator.next();
-            while (iterator.hasNext()) {
-                combinedFragments[fragmentIndex++] = iterator.next();
-            }
-            for (Object value : st.values()) {
-                combinedValues[valueIndex++] = value;
-            }
-        }
-        return StringTemplateImplFactory.newTrustedStringTemplate(combinedFragments, combinedValues);
-    }
-
-}
diff --git a/src/java.base/share/classes/java/util/FormatItem.java b/src/java.base/share/classes/java/util/FormatItem.java
deleted file mode 100644
index adf8ef9ddd3..00000000000
--- a/src/java.base/share/classes/java/util/FormatItem.java
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * Copyright (c) 2023, 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 java.util;
-
-import java.io.IOException;
-import java.lang.invoke.*;
-import java.lang.invoke.MethodHandles.Lookup;
-import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
-import java.text.DecimalFormatSymbols;
-import java.util.Formatter.FormatSpecifier;
-
-import jdk.internal.access.JavaLangAccess;
-import jdk.internal.access.SharedSecrets;
-import jdk.internal.util.FormatConcatItem;
-import jdk.internal.util.DecimalDigits;
-import jdk.internal.util.HexDigits;
-import jdk.internal.util.OctalDigits;
-
-import static java.lang.invoke.MethodType.methodType;
-
-/**
- * A specialized objects used by FormatterBuilder that knows how to insert
- * themselves into a concatenation performed by StringConcatFactory.
- *
- * @since 21
- *
- * Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
- *          Do not rely on its availability.
- */
-class FormatItem {
-    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
-
-    private static final MethodHandle CHAR_MIX =
-            JLA.stringConcatHelper("mix",
-                    MethodType.methodType(long.class, long.class,char.class));
-
-    private static final MethodHandle STRING_PREPEND =
-            JLA.stringConcatHelper("prepend",
-                    MethodType.methodType(long.class, long.class, byte[].class,
-                            String.class));
-
-    private static final MethodHandle SELECT_GETCHAR_MH =
-            JLA.stringConcatHelper("selectGetChar",
-                    MethodType.methodType(MethodHandle.class, long.class));
-
-    private static final MethodHandle SELECT_PUTCHAR_MH =
-            JLA.stringConcatHelper("selectPutChar",
-                    MethodType.methodType(MethodHandle.class, long.class));
-
-    private static long charMix(long lengthCoder, char value) {
-        try {
-            return (long)CHAR_MIX.invokeExact(lengthCoder, value);
-        } catch (Error | RuntimeException ex) {
-            throw ex;
-        } catch (Throwable ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private static long stringMix(long lengthCoder, String value) {
-        return JLA.stringConcatMix(lengthCoder, value);
-    }
-
-    private static long stringPrepend(long lengthCoder, byte[] buffer,
-                                            String value) throws Throwable {
-        return (long)STRING_PREPEND.invokeExact(lengthCoder, buffer, value);
-    }
-
-    private static MethodHandle selectGetChar(long indexCoder) throws Throwable {
-        return (MethodHandle)SELECT_GETCHAR_MH.invokeExact(indexCoder);
-    }
-
-    private static MethodHandle selectPutChar(long indexCoder) throws Throwable {
-        return (MethodHandle)SELECT_PUTCHAR_MH.invokeExact(indexCoder);
-    }
-
-    private static final MethodHandle PUT_CHAR_DIGIT;
-
-    static {
-        try {
-            Lookup lookup = MethodHandles.lookup();
-            PUT_CHAR_DIGIT = lookup.findStatic(FormatItem.class, "putByte",
-                    MethodType.methodType(void.class,
-                            byte[].class, int.class, int.class));
-        } catch (ReflectiveOperationException ex) {
-            throw new AssertionError("putByte lookup failed", ex);
-        }
-    }
-
-    private static void putByte(byte[] buffer, int index, int ch) {
-        buffer[index] = (byte)ch;
-    }
-
-    private FormatItem() {
-        throw new AssertionError("private constructor");
-    }
-
-    /**
-     * Decimal value format item.
-     */
-    static final class FormatItemDecimal implements FormatConcatItem {
-        private final char groupingSeparator;
-        private final char zeroDigit;
-        private final char minusSign;
-        private final int digitOffset;
-        private final byte[] digits;
-        private final int length;
-        private final boolean isNegative;
-        private final int width;
-        private final byte prefixSign;
-        private final int groupSize;
-        private final long value;
-        private final boolean parentheses;
-
-        FormatItemDecimal(DecimalFormatSymbols dfs, int width, char sign,
-                          boolean parentheses, int groupSize, long value) throws Throwable {
-            this.groupingSeparator = dfs.getGroupingSeparator();
-            this.zeroDigit = dfs.getZeroDigit();
-            this.minusSign = dfs.getMinusSign();
-            this.digitOffset = this.zeroDigit - '0';
-            int length = DecimalDigits.INSTANCE.size(value);
-            this.digits = new byte[length];
-            DecimalDigits.INSTANCE.digits(value, this.digits, length, PUT_CHAR_DIGIT);
-            this.isNegative = value < 0L;
-            this.length = this.isNegative ? length - 1 : length;
-            this.width = width;
-            this.groupSize = groupSize;
-            this.value = value;
-            this.parentheses = parentheses && isNegative;
-            this.prefixSign = (byte)(isNegative ? (parentheses ? '\0' : minusSign) : sign);
-        }
-
-        private int signLength() {
-            return (prefixSign != '\0' ? 1 : 0) + (parentheses ? 2 : 0);
-        }
-
-        private int groupLength() {
-            return 0 < groupSize ? (length - 1) / groupSize : 0;
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return JLA.stringConcatCoder(zeroDigit) |
-                    (lengthCoder +
-                     Integer.max(length + signLength() + groupLength(), width));
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            MethodHandle putCharMH = selectPutChar(lengthCoder);
-
-            if (parentheses) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)')');
-            }
-
-            if (0 < groupSize) {
-                int groupIndex = groupSize;
-
-                for (int i = 1; i <= length; i++) {
-                    if (groupIndex-- == 0) {
-                        putCharMH.invokeExact(buffer, (int)--lengthCoder,
-                                (int)groupingSeparator);
-                        groupIndex = groupSize - 1;
-                    }
-
-                    putCharMH.invokeExact(buffer, (int)--lengthCoder,
-                            digits[digits.length - i] + digitOffset);
-                }
-            } else {
-                for (int i = 1; i <= length; i++) {
-                    putCharMH.invokeExact(buffer, (int)--lengthCoder,
-                            digits[digits.length - i] + digitOffset);
-                }
-            }
-
-            for (int i = length + signLength() + groupLength(); i < width; i++) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'0');
-            }
-
-            if (parentheses) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'(');
-            }
-            if (prefixSign != '\0') {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)prefixSign);
-            }
-
-            return lengthCoder;
-        }
-    }
-
-    /**
-     * Hexadecimal format item.
-     */
-    static final class FormatItemHexadecimal implements FormatConcatItem {
-        private final int width;
-        private final boolean hasPrefix;
-        private final long value;
-        private final int length;
-
-        FormatItemHexadecimal(int width, boolean hasPrefix, long value) {
-            this.width = width;
-            this.hasPrefix = hasPrefix;
-            this.value = value;
-            this.length = HexDigits.INSTANCE.size(value);
-        }
-
-        private int prefixLength() {
-            return hasPrefix ? 2 : 0;
-        }
-
-        private int zeroesLength() {
-            return Integer.max(0, width - length - prefixLength());
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return lengthCoder + length + prefixLength() + zeroesLength();
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            MethodHandle putCharMH = selectPutChar(lengthCoder);
-            HexDigits.INSTANCE.digits(value, buffer, (int)lengthCoder, putCharMH);
-            lengthCoder -= length;
-
-            for (int i = 0; i < zeroesLength(); i++) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'0');
-            }
-
-            if (hasPrefix) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'x');
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'0');
-            }
-
-            return lengthCoder;
-        }
-    }
-
-    /**
-     * Hexadecimal format item.
-     */
-    static final class FormatItemOctal implements FormatConcatItem {
-        private final int width;
-        private final boolean hasPrefix;
-        private final long value;
-        private final int length;
-
-        FormatItemOctal(int width, boolean hasPrefix, long value) {
-            this.width = width;
-            this.hasPrefix = hasPrefix;
-            this.value = value;
-            this.length = OctalDigits.INSTANCE.size(value);
-        }
-
-        private int prefixLength() {
-            return hasPrefix && value != 0 ? 1 : 0;
-        }
-
-        private int zeroesLength() {
-            return Integer.max(0, width - length - prefixLength());
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return lengthCoder + length + prefixLength() + zeroesLength();
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            MethodHandle putCharMH = selectPutChar(lengthCoder);
-            OctalDigits.INSTANCE.digits(value, buffer, (int)lengthCoder, putCharMH);
-            lengthCoder -= length;
-
-            for (int i = 0; i < zeroesLength(); i++) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'0');
-            }
-
-            if (hasPrefix && value != 0) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'0');
-            }
-
-            return lengthCoder;
-        }
-    }
-
-    /**
-     * Boolean format item.
-     */
-    static final class FormatItemBoolean implements FormatConcatItem {
-        private final boolean value;
-
-        FormatItemBoolean(boolean value) {
-            this.value = value;
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return lengthCoder + (value ? "true".length() : "false".length());
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            MethodHandle putCharMH = selectPutChar(lengthCoder);
-
-            if (value) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'e');
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'u');
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'r');
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'t');
-            } else {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'e');
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'s');
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'l');
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'a');
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'f');
-            }
-
-            return lengthCoder;
-         }
-    }
-
-    /**
-     * Character format item.
-     */
-    static final class FormatItemCharacter implements FormatConcatItem {
-        private final char value;
-
-        FormatItemCharacter(char value) {
-            this.value = value;
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return charMix(lengthCoder, value);
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            MethodHandle putCharMH = selectPutChar(lengthCoder);
-            putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)value);
-
-            return lengthCoder;
-        }
-    }
-
-    /**
-     * String format item.
-     */
-    static final class FormatItemString implements FormatConcatItem {
-        private String value;
-
-        FormatItemString(String value) {
-            this.value = value;
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return stringMix(lengthCoder, value);
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            return stringPrepend(lengthCoder, buffer, value);
-        }
-    }
-
-    /**
-     * FormatSpecifier format item.
-     */
-    static final class FormatItemFormatSpecifier implements FormatConcatItem {
-        private StringBuilder sb;
-
-        FormatItemFormatSpecifier(FormatSpecifier fs, Locale locale, Object value) {
-            this.sb = new StringBuilder(64);
-            Formatter formatter = new Formatter(this.sb, locale);
-
-            try {
-                fs.print(formatter, value, locale);
-            } catch (IOException ex) {
-                throw new AssertionError("FormatItemFormatSpecifier IOException", ex);
-            }
-        }
-
-        FormatItemFormatSpecifier(Locale locale,
-                                  int flags, int width, int precision,
-                                  Formattable formattable) {
-            this.sb = new StringBuilder(64);
-            Formatter formatter = new Formatter(this.sb, locale);
-            formattable.formatTo(formatter, flags, width, precision);
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return JLA.stringBuilderConcatMix(lengthCoder, sb);
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            return JLA.stringBuilderConcatPrepend(lengthCoder, buffer, sb);
-        }
-    }
-
-    abstract static sealed class FormatItemModifier implements FormatConcatItem
-        permits FormatItemFillLeft,
-                FormatItemFillRight
-    {
-        private final long itemLengthCoder;
-        protected final FormatConcatItem item;
-
-        FormatItemModifier(FormatConcatItem item) {
-            this.itemLengthCoder = item.mix(0L);
-            this.item = item;
-        }
-
-        int length() {
-            return (int)itemLengthCoder;
-        }
-
-        long coder() {
-            return itemLengthCoder & ~Integer.MAX_VALUE;
-        }
-
-        @Override
-        public abstract long mix(long lengthCoder);
-
-        @Override
-        public abstract long prepend(long lengthCoder, byte[] buffer) throws Throwable;
-    }
-
-    /**
-     * Fill left format item.
-     */
-    static final class FormatItemFillLeft extends FormatItemModifier
-            implements FormatConcatItem {
-        private final int width;
-
-        FormatItemFillLeft(int width, FormatConcatItem item) {
-            super(item);
-            this.width = Integer.max(length(), width);
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return (lengthCoder | coder()) + width;
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            MethodHandle putCharMH = selectPutChar(lengthCoder);
-            lengthCoder = item.prepend(lengthCoder, buffer);
-
-            for (int i = length(); i < width; i++) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)' ');
-            }
-
-            return lengthCoder;
-        }
-    }
-
-    /**
-     * Fill right format item.
-     */
-    static final class FormatItemFillRight extends FormatItemModifier
-            implements FormatConcatItem {
-        private final int width;
-
-        FormatItemFillRight(int width, FormatConcatItem item) {
-            super(item);
-            this.width = Integer.max(length(), width);
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return (lengthCoder | coder()) + width;
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            MethodHandle putCharMH = selectPutChar(lengthCoder);
-
-            for (int i = length(); i < width; i++) {
-                putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)' ');
-            }
-
-            lengthCoder = item.prepend(lengthCoder, buffer);
-
-            return lengthCoder;
-        }
-    }
-
-
-    /**
-     * Null format item.
-     */
-    static final class FormatItemNull implements FormatConcatItem {
-        FormatItemNull() {
-        }
-
-        @Override
-        public long mix(long lengthCoder) {
-            return lengthCoder + "null".length();
-        }
-
-        @Override
-        public long prepend(long lengthCoder, byte[] buffer) throws Throwable {
-            MethodHandle putCharMH = selectPutChar(lengthCoder);
-
-            putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'l');
-            putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'l');
-            putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'u');
-            putCharMH.invokeExact(buffer, (int)--lengthCoder, (int)'n');
-
-            return lengthCoder;
-        }
-    }
-}
diff --git a/src/java.base/share/classes/java/util/FormatProcessor.java b/src/java.base/share/classes/java/util/FormatProcessor.java
deleted file mode 100644
index 20fbc1cedcf..00000000000
--- a/src/java.base/share/classes/java/util/FormatProcessor.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, Alibaba Group Holding Limited. 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 java.util;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.StringTemplate.Processor;
-import java.lang.StringTemplate.Processor.Linkage;
-
-import jdk.internal.javac.PreviewFeature;
-
-/**
- * This {@link Processor} constructs a {@link String} result using
- * {@link Formatter} specifications and values found in the {@link StringTemplate}.
- * Unlike {@link Formatter}, {@link FormatProcessor} uses the value from the
- * embedded expression that immediately follows, without whitespace, the
- * <a href="../util/Formatter.html#syntax">format specifier</a>.
- * For example:
- * {@snippet :
- * FormatProcessor fmt = FormatProcessor.create(Locale.ROOT);
- * int x = 10;
- * int y = 20;
- * String result = fmt."%05d\{x} + %05d\{y} = %05d\{x + y}";
- * }
- * In the above example, the value of {@code result} will be {@code "00010 + 00020 = 00030"}.
- * <p>
- * Embedded expressions without a preceeding format specifier, use {@code %s}
- * by default.
- * {@snippet :
- * FormatProcessor fmt = FormatProcessor.create(Locale.ROOT);
- * int x = 10;
- * int y = 20;
- * String result1 = fmt."\{x} + \{y} = \{x + y}";
- * String result2 = fmt."%s\{x} + %s\{y} = %s\{x + y}";
- * }
- * In the above example, the value of {@code result1} and {@code result2} will
- * both be {@code "10 + 20 = 30"}.
- * <p>
- * The {@link FormatProcessor} format specification used and exceptions thrown are the
- * same as those of {@link Formatter}.
- * <p>
- * However, there are two significant differences related to the position of arguments.
- * An explict {@code n$} and relative {@code <} index will cause an exception due to
- * a missing argument list.
- * Whitespace appearing between the specification and the embedded expression will
- * also cause an exception.
- * <p>
- * {@link FormatProcessor} allows the use of different locales. For example:
- * {@snippet :
- * Locale locale = Locale.forLanguageTag("th-TH-u-nu-thai");
- * FormatProcessor thaiFMT = FormatProcessor.create(locale);
- * int x = 10;
- * int y = 20;
- * String result = thaiFMT."%4d\{x} + %4d\{y} = %5d\{x + y}";
- * }
- * In the above example, the value of {@code result} will be
- * {@code "  \u0E51\u0E50 +   \u0E52\u0E50 =    \u0E53\u0E50"}.
- * <p>
- * For day to day use, the predefined {@link FormatProcessor#FMT} {@link FormatProcessor}
- * is available. {@link FormatProcessor#FMT} is defined using the {@link Locale#ROOT}.
- * Example: {@snippet :
- * int x = 10;
- * int y = 20;
- * String result = FMT."0x%04x\{x} + 0x%04x\{y} = 0x%04x\{x + y}"; // @highlight substring="FMT"
- * }
- * In the above example, the value of {@code result} will be {@code "0x000a + 0x0014 = 0x001E"}.
- *
- * @since 21
- *
- * @see Processor
- */
-@PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES)
-public final class FormatProcessor implements Processor<String, RuntimeException>, Linkage {
-    /**
-     * {@link Locale} used to format
-     */
-    private final Locale locale;
-
-    /**
-     * Constructor.
-     *
-     * @param locale  {@link Locale} used to format
-     */
-    private FormatProcessor(Locale locale) {
-        this.locale = locale;
-    }
-
-    /**
-     * Create a new {@link FormatProcessor} using the specified locale.
-     *
-     * @param locale {@link Locale} used to format
-     *
-     * @return a new instance of {@link FormatProcessor}
-     *
-     * @throws java.lang.NullPointerException if locale is null
-     */
-    public static FormatProcessor create(Locale locale) {
-        Objects.requireNonNull(locale);
-        return new FormatProcessor(locale);
-    }
-
-    /**
-     * Constructs a {@link String} based on the fragments, format
-     * specifications found in the fragments and values in the
-     * supplied {@link StringTemplate} object. This method constructs a
-     * format string from the fragments, gathers up the values and
-     * evaluates the expression asif evaulating
-     * {@code new Formatter(locale).format(format, values).toString()}.
-     * <p>
-     * If an embedded expression is not immediately preceded by a
-     * specifier then a {@code %s} is inserted in the format.
-     *
-     * @param stringTemplate  a {@link StringTemplate} instance
-     *
-     * @return constructed {@link String}
-
-     * @throws  IllegalFormatException
-     *          If a format specifier contains an illegal syntax, a format
-     *          specifier that is incompatible with the given arguments,
-     *          a specifier not followed immediately by an embedded expression or
-     *          other illegal conditions. For specification of all possible
-     *          formatting errors, see the
-     *          <a href="../util/Formatter.html#detail">details</a>
-     *          section of the formatter class specification.
-     * @throws NullPointerException if stringTemplate is null
-     *
-     * @see java.util.Formatter
-     */
-    @Override
-    public final String process(StringTemplate stringTemplate) {
-        Objects.requireNonNull(stringTemplate);
-        String format = stringTemplateFormat(stringTemplate.fragments());
-        Object[] values = stringTemplate.values().toArray();
-
-        return new Formatter(locale).format(format, values).toString();
-    }
-
-    /**
-     * Constructs a {@link MethodHandle} that when supplied with the values from
-     * a {@link StringTemplate} will produce a result equivalent to that provided by
-     * {@link FormatProcessor#process(StringTemplate)}. This {@link MethodHandle}
-     * is used by {@link FormatProcessor#FMT} and the ilk to perform a more
-     * specialized composition of a result. This specialization is done by
-     * prescanning the fragments and value types of a {@link StringTemplate}.
-     * <p>
-     * Process template expressions can be specialized  when the processor is
-     * of type {@link Linkage} and fetched from a static constant as is
-     * {@link FormatProcessor#FMT} ({@code static final FormatProcessor}).
-     * <p>
-     * Other {@link FormatProcessor FormatProcessors} can be specialized when stored in a static
-     * final.
-     * For example:
-     * {@snippet :
-     * FormatProcessor THAI_FMT = FormatProcessor.create(Locale.forLanguageTag("th-TH-u-nu-thai"));
-     * }
-     * {@code THAI_FMT} will now produce specialized {@link MethodHandle MethodHandles} by way
-     * of {@link FormatProcessor#linkage(List, MethodType)}.
-     *
-     * See {@link FormatProcessor#process(StringTemplate)} for more information.
-     *
-     * @throws  IllegalFormatException
-     *          If a format specifier contains an illegal syntax, a format
-     *          specifier that is incompatible with the given arguments,
-     *          a specifier not followed immediately by an embedded expression or
-     *          other illegal conditions. For specification of all possible
-     *          formatting errors, see the
-     *          <a href="../util/Formatter.html#detail">details</a>
-     *          section of the formatter class specification.
-     * @throws NullPointerException if fragments or type is null
-     *
-     * @see java.util.Formatter
-     */
-    @Override
-    public MethodHandle linkage(List<String> fragments, MethodType type) {
-        Objects.requireNonNull(fragments);
-        Objects.requireNonNull(type);
-        String format = stringTemplateFormat(fragments);
-        Class<?>[] ptypes = type.dropParameterTypes(0, 1).parameterArray();
-        MethodHandle mh = new FormatterBuilder(format, locale, ptypes).build();
-        mh = MethodHandles.dropArguments(mh, 0, type.parameterType(0));
-
-        return mh;
-    }
-
-    /**
-     * Find a format specification at the end of a fragment.
-     *
-     * @param fragment  fragment to check
-     * @param needed    if the specification is needed
-     *
-     * @return true if the specification is found and needed
-     *
-     * @throws MissingFormatArgumentException if not at end or found and not needed
-     */
-    private static boolean findFormat(String fragment, boolean needed) {
-        int max = fragment.length();
-        for (int i = 0; i < max;) {
-            int n = fragment.indexOf('%', i);
-            if (n < 0) {
-                return false;
-            }
-
-            i = n + 1;
-            if (i >= max) {
-                return false;
-            }
-
-            char c = fragment.charAt(i);
-            if (c == '%' || c == 'n') {
-                i++;
-                continue;
-            }
-            int off = new Formatter.FormatSpecifierParser(null, c, i, fragment, max)
-                    .parse();
-            if (off == 0) {
-                return false;
-            }
-            if (i + off == max && needed) {
-                return true;
-            }
-            throw new MissingFormatArgumentException(
-                    fragment.substring(i - 1, i + off)
-                    + " is not immediately followed by an embedded expression");
-        }
-        return false;
-    }
-
-    /**
-     * Convert {@link StringTemplate} fragments, containing format specifications,
-     * to a form that can be passed on to {@link Formatter}. The method scans each fragment,
-     * matching up formatter specifications with the following expression. If no
-     * specification is found, the method inserts "%s".
-     *
-     * @param fragments  string template fragments
-     *
-     * @return  format string
-     */
-    private static String stringTemplateFormat(List<String> fragments) {
-        StringBuilder sb = new StringBuilder();
-        int lastIndex = fragments.size() - 1;
-        List<String> formats = fragments.subList(0, lastIndex);
-        String last = fragments.get(lastIndex);
-
-        for (String format : formats) {
-            if (findFormat(format, true)) {
-                sb.append(format);
-            } else {
-                sb.append(format);
-                sb.append("%s");
-            }
-        }
-
-        if (!findFormat(last, false)) {
-            sb.append(last);
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * This predefined {@link FormatProcessor} instance constructs a {@link String} result using
-     * the Locale.ROOT {@link Locale}. See {@link FormatProcessor} for more details.
-     * Example: {@snippet :
-     * int x = 10;
-     * int y = 20;
-     * String result = FMT."0x%04x\{x} + 0x%04x\{y} = 0x%04x\{x + y}"; // @highlight substring="FMT"
-     * }
-     * In the above example, the value of {@code result} will be {@code "0x000a + 0x0014 = 0x001E"}.
-     *
-     * @see java.util.FormatProcessor
-     */
-    public static final FormatProcessor FMT = FormatProcessor.create(Locale.ROOT);
-
-}
diff --git a/src/java.base/share/classes/java/util/Formatter.java b/src/java.base/share/classes/java/util/Formatter.java
index 3f37774469d..a7d95ee5780 100644
--- a/src/java.base/share/classes/java/util/Formatter.java
+++ b/src/java.base/share/classes/java/util/Formatter.java
@@ -61,7 +61,6 @@ import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalQueries;
 import java.time.temporal.UnsupportedTemporalTypeException;
 
-import jdk.internal.javac.PreviewFeature;
 import jdk.internal.math.DoubleConsts;
 import jdk.internal.math.FormattedFPDecimal;
 import sun.util.locale.provider.LocaleProviderAdapter;
diff --git a/src/java.base/share/classes/java/util/FormatterBuilder.java b/src/java.base/share/classes/java/util/FormatterBuilder.java
deleted file mode 100644
index 854fdfef68d..00000000000
--- a/src/java.base/share/classes/java/util/FormatterBuilder.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Copyright (c) 2023, 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 java.util;
-
-import java.io.IOException;
-import java.lang.invoke.*;
-import java.lang.invoke.MethodHandles.Lookup;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
-import java.text.spi.NumberFormatProvider;
-import java.util.FormatItem.*;
-import java.util.Formatter.*;
-
-import jdk.internal.util.FormatConcatItem;
-
-import sun.invoke.util.Wrapper;
-import sun.util.locale.provider.LocaleProviderAdapter;
-import sun.util.locale.provider.ResourceBundleBasedAdapter;
-
-import static java.util.Formatter.Conversion.*;
-import static java.util.Formatter.Flags.*;
-import static java.lang.invoke.MethodHandles.*;
-import static java.lang.invoke.MethodType.*;
-
-/**
- * This package private class supports the construction of the {@link MethodHandle}
- * used by {@link FormatProcessor}.
- *
- * @since 21
- *
- * Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
- *          Do not rely on its availability.
- */
-final class FormatterBuilder {
-    private static final Lookup LOOKUP = lookup();
-
-    private final String format;
-    private final Locale locale;
-    private final Class<?>[] ptypes;
-    private final DecimalFormatSymbols dfs;
-    private final boolean isGenericDFS;
-
-    FormatterBuilder(String format, Locale locale, Class<?>[] ptypes) {
-        this.format = format;
-        this.locale = locale;
-        this.ptypes = ptypes;
-        this.dfs = DecimalFormatSymbols.getInstance(locale);
-        this.isGenericDFS = isGenericDFS(this.dfs);
-    }
-
-    private static boolean isGenericDFS(DecimalFormatSymbols dfs) {
-        return dfs.getZeroDigit() == '0' &&
-               dfs.getDecimalSeparator() == '.' &&
-               dfs.getGroupingSeparator() == ',' &&
-               dfs.getMinusSign() == '-';
-    }
-
-    private static Class<?> mapType(Class<?> type) {
-        return type.isPrimitive() || type == String.class ? type : Object.class;
-    }
-
-    private static MethodHandle findStringConcatItemConstructor(Class<?> cls,
-                                          Class<?>... ptypes) {
-        MethodType methodType = methodType(void.class, ptypes);
-
-        try {
-            MethodHandle mh = LOOKUP.findConstructor(cls, methodType);
-
-            return mh.asType(mh.type().changeReturnType(FormatConcatItem.class));
-        } catch (ReflectiveOperationException e) {
-            throw new AssertionError("Missing constructor in " +
-                    cls + ": " + methodType);
-        }
-    }
-
-    private static MethodHandle findMethod(Class<?> cls, String name,
-                                           Class<?> rType, Class<?>... ptypes) {
-        MethodType methodType = methodType(rType, ptypes);
-
-        try {
-            return LOOKUP.findVirtual(cls, name, methodType);
-        } catch (ReflectiveOperationException e) {
-            throw new AssertionError("Missing method in " +
-                    cls + ": " + name + " " + methodType);
-        }
-    }
-
-    private static MethodHandle findStaticMethod(Class<?> cls, String name,
-                                                 Class<?> rType, Class<?>... ptypes) {
-        MethodType methodType = methodType(rType, ptypes);
-
-        try {
-            return LOOKUP.findStatic(cls, name, methodType);
-        } catch (ReflectiveOperationException e) {
-            throw new AssertionError("Missing static method in " +
-                    cls + ": " + name + " " + methodType);
-        }
-    }
-
-    private static final MethodHandle FIDecimal_MH =
-            findStringConcatItemConstructor(FormatItemDecimal.class,
-                    DecimalFormatSymbols.class, int.class, char.class, boolean.class,
-                    int.class, long.class);
-
-    private static final MethodHandle FIHexadecimal_MH =
-            findStringConcatItemConstructor(FormatItemHexadecimal.class,
-                    int.class, boolean.class, long.class);
-
-    private static final MethodHandle FIOctal_MH =
-            findStringConcatItemConstructor(FormatItemOctal.class,
-                    int.class, boolean.class, long.class);
-
-    private static final MethodHandle FIBoolean_MH =
-            findStringConcatItemConstructor(FormatItemBoolean.class,
-                    boolean.class);
-
-    private static final MethodHandle FICharacter_MH =
-            findStringConcatItemConstructor(FormatItemCharacter.class,
-                    char.class);
-
-    private static final MethodHandle FIString_MH =
-            findStringConcatItemConstructor(FormatItemString.class,
-                    String.class);
-
-    private static final MethodHandle FIFormatSpecifier_MH =
-            findStringConcatItemConstructor(FormatItemFormatSpecifier.class,
-                    FormatSpecifier.class, Locale.class, Object.class);
-
-    private static final MethodHandle FIFormattable_MH =
-            findStringConcatItemConstructor(FormatItemFormatSpecifier.class,
-                    Locale.class, int.class, int.class, int.class,
-                    Formattable.class);
-
-    private static final MethodHandle FIFillLeft_MH =
-             findStringConcatItemConstructor(FormatItemFillLeft.class,
-                    int.class, FormatConcatItem.class);
-
-    private static final MethodHandle FIFillRight_MH =
-            findStringConcatItemConstructor(FormatItemFillRight.class,
-                     int.class, FormatConcatItem.class);
-
-    private static final MethodHandle FINull_MH =
-            findStringConcatItemConstructor(FormatItemNull.class);
-
-    private static final MethodHandle NullCheck_MH =
-            findStaticMethod(FormatterBuilder.class, "nullCheck", boolean.class,
-                    Object.class);
-
-    private static final MethodHandle FormattableCheck_MH =
-            findStaticMethod(FormatterBuilder.class, "formattableCheck", boolean.class,
-                    Object.class);
-
-    private static final MethodHandle ToLong_MH =
-            findStaticMethod(java.util.FormatterBuilder.class, "toLong", long.class,
-                    int.class);
-
-    private static final MethodHandle ToString_MH =
-            findStaticMethod(String.class, "valueOf", String.class,
-                    Object.class);
-
-    private static final MethodHandle HashCode_MH =
-            findStaticMethod(Objects.class, "hashCode", int.class,
-                    Object.class);
-
-    private static boolean nullCheck(Object object) {
-        return object == null;
-    }
-
-    private static boolean formattableCheck(Object object) {
-        return Formattable.class.isAssignableFrom(object.getClass());
-    }
-
-    private static long toLong(int value) {
-        return (long)value & 0xFFFFFFFFL;
-    }
-
-    private static boolean isFlag(int value, int flags) {
-        return (value & flags) != 0;
-    }
-
-    private static boolean validFlags(int value, int flags) {
-        return (value & ~flags) == 0;
-    }
-
-    private static int groupSize(Locale locale, DecimalFormatSymbols dfs) {
-        if (isGenericDFS(dfs)) {
-            return 3;
-        }
-
-        DecimalFormat df;
-        NumberFormat nf = NumberFormat.getNumberInstance(locale);
-
-        if (nf instanceof DecimalFormat) {
-            df = (DecimalFormat)nf;
-        } else {
-            LocaleProviderAdapter adapter = LocaleProviderAdapter
-                    .getAdapter(NumberFormatProvider.class, locale);
-
-            if (!(adapter instanceof ResourceBundleBasedAdapter)) {
-                adapter = LocaleProviderAdapter.getResourceBundleBased();
-            }
-
-            String[] all = adapter.getLocaleResources(locale)
-                    .getNumberPatterns();
-
-            df = new DecimalFormat(all[0], dfs);
-        }
-
-        return df.isGroupingUsed() ? df.getGroupingSize() : 0;
-    }
-
-    private MethodHandle formatSpecifier(FormatSpecifier fs, Class<?> ptype) {
-        boolean isPrimitive = ptype.isPrimitive();
-        MethodHandle mh = identity(ptype);
-        MethodType mt = mh.type();
-
-//cannot cast to primitive types as it breaks null values formatting
-//        if (ptype == byte.class || ptype == short.class ||
-//            ptype == Byte.class || ptype == Short.class ||
-//            ptype == Integer.class) {
-//            mt = mt.changeReturnType(int.class);
-//        } else if (ptype == Long.class) {
-//            mt = mt.changeReturnType(long.class);
-//        } else if (ptype == float.class || ptype == Float.class ||
-//                   ptype == Double.class) {
-//            mt = mt.changeReturnType(double.class);
-//        } else if (ptype == Boolean.class) {
-//            mt = mt.changeReturnType(boolean.class);
-//        } else if (ptype == Character.class) {
-//            mt = mt.changeReturnType(char.class);
-//        }
-
-        Class<?> itype = mt.returnType();
-
-        if (itype != ptype) {
-            mh = explicitCastArguments(mh, mt);
-        }
-
-        boolean handled = false;
-        int flags = fs.flags;
-        int width = fs.width;
-        int precision = fs.precision;
-        Character conv = fs.dt ? 't' : fs.c;
-
-        switch (Character.toLowerCase(conv)) {
-            case BOOLEAN -> {
-                if (itype == boolean.class && precision == -1) {
-                    if (flags == 0 && width == -1 && isPrimitive) {
-                        return null;
-                    }
-
-                    if (validFlags(flags, LEFT_JUSTIFY)) {
-                        handled = true;
-                        mh = filterReturnValue(mh, FIBoolean_MH);
-                    }
-                }
-            }
-            case STRING -> {
-                if (flags == 0 && width == -1 && precision == -1) {
-                    if (isPrimitive || ptype == String.class) {
-                        return null;
-                    } else if (itype.isPrimitive()) {
-                        return mh;
-                    }
-                }
-
-                if (validFlags(flags, LEFT_JUSTIFY) && precision == -1) {
-                    if (itype == String.class) {
-                        handled = true;
-                        mh = filterReturnValue(mh, FIString_MH);
-                    } else if (!itype.isPrimitive()) {
-                        handled = true;
-                        MethodHandle test = FormattableCheck_MH;
-                        test = test.asType(test.type().changeParameterType(0, ptype));
-                        MethodHandle pass = insertArguments(FIFormattable_MH,
-                                0, locale, flags, width, precision);
-                        pass = pass.asType(pass.type().changeParameterType(0, ptype));
-                        MethodHandle fail = ToString_MH;
-                        fail = filterReturnValue(fail, FIString_MH);
-                        fail = fail.asType(fail.type().changeParameterType(0, ptype));
-                        mh = guardWithTest(test, pass, fail);
-                    }
-                }
-            }
-            case CHARACTER -> {
-                if (itype == char.class && precision == -1) {
-                    if (flags == 0 && width == -1) {
-                        return isPrimitive ? null : mh;
-                    }
-
-                    if (validFlags(flags, LEFT_JUSTIFY)) {
-                        handled = true;
-                        mh = filterReturnValue(mh, FICharacter_MH);
-                    }
-                }
-            }
-            case DECIMAL_INTEGER -> {
-                if ((itype == int.class || itype == long.class) && precision == -1) {
-                    if (itype == int.class) {
-                        mh = explicitCastArguments(mh,
-                                mh.type().changeReturnType(long.class));
-                    }
-
-                    if (flags == 0 && isGenericDFS && width == -1) {
-                        return mh;
-                    } else if (validFlags(flags, PLUS | LEADING_SPACE |
-                                                 ZERO_PAD | GROUP |
-                                                 PARENTHESES)) {
-                        handled = true;
-                        int zeroPad = isFlag(flags, ZERO_PAD) ? width : -1;
-                        char sign = isFlag(flags, PLUS)          ? '+' :
-                                    isFlag(flags, LEADING_SPACE) ? ' ' : '\0';
-                        boolean parentheses = isFlag(flags, PARENTHESES);
-                        int groupSize = isFlag(flags, GROUP) ?
-                                groupSize(locale, dfs) : 0;
-                        mh = filterReturnValue(mh,
-                                insertArguments(FIDecimal_MH, 0, dfs, zeroPad,
-                                        sign, parentheses, groupSize));
-                    }
-                }
-            }
-            case OCTAL_INTEGER -> {
-                if ((itype == int.class || itype == long.class) &&
-                         precision == -1 &&
-                         validFlags(flags, ZERO_PAD | ALTERNATE)) {
-                    handled = true;
-
-                    if (itype == int.class) {
-                        mh = filterReturnValue(mh, ToLong_MH);
-                    }
-
-                    int zeroPad = isFlag(flags, ZERO_PAD) ? width : -1;
-                    boolean hasPrefix = isFlag(flags, ALTERNATE);
-                    mh = filterReturnValue(mh,
-                            insertArguments(FIOctal_MH, 0, zeroPad, hasPrefix));
-                }
-            }
-            case HEXADECIMAL_INTEGER -> {
-                if ((itype == int.class || itype == long.class) &&
-                        precision == -1 &&
-                        validFlags(flags, ZERO_PAD | ALTERNATE)) {
-                    handled = true;
-
-                    if (itype == int.class) {
-                        mh = filterReturnValue(mh, ToLong_MH);
-                    }
-
-                    int zeroPad = isFlag(flags, ZERO_PAD) ? width : -1;
-                    boolean hasPrefix = isFlag(flags, ALTERNATE);
-                    mh = filterReturnValue(mh,
-                            insertArguments(FIHexadecimal_MH, 0, zeroPad, hasPrefix));
-                }
-            }
-            default -> {
-                // pass thru
-            }
-        }
-
-        if (handled) {
-            if (!isPrimitive) {
-                MethodHandle test = NullCheck_MH.asType(
-                        NullCheck_MH.type().changeParameterType(0, ptype));
-                MethodHandle pass = dropArguments(FINull_MH, 0, ptype);
-                mh = guardWithTest(test, pass, mh);
-            }
-
-            if (0 < width) {
-                if (isFlag(flags, LEFT_JUSTIFY)) {
-                    mh = filterReturnValue(mh,
-                            insertArguments(FIFillRight_MH, 0, width));
-                } else {
-                    mh = filterReturnValue(mh,
-                            insertArguments(FIFillLeft_MH, 0, width));
-                }
-            }
-
-            if (!isFlag(flags, UPPERCASE)) {
-                return mh;
-            }
-        }
-
-        mh = insertArguments(FIFormatSpecifier_MH, 0, fs, locale);
-        mh = mh.asType(mh.type().changeParameterType(0, ptype));
-
-        return mh;
-    }
-
-    /**
-     * Construct concat {@link MethodHandle} for based on format.
-     *
-     * @param fsa  list of specifiers
-     *
-     * @return concat {@link MethodHandle} for based on format
-     */
-    private MethodHandle buildFilters(List<FormatString> fsa,
-                                      List<String> segments,
-                                      MethodHandle[] filters) {
-        MethodHandle mh = null;
-        int iParam = 0;
-        StringBuilder segment = new StringBuilder();
-
-        for (FormatString fs : fsa) {
-            int index = fs.index();
-
-            switch (index) {
-                case -2:  // fixed string, "%n", or "%%"
-                    String string = fs.toString();
-
-                    if ("%%".equals(string)) {
-                        segment.append('%');
-                    } else if ("%n".equals(string)) {
-                        segment.append(System.lineSeparator());
-                    } else {
-                        segment.append(string);
-                    }
-                    break;
-                case 0:  // ordinary index
-                    segments.add(segment.toString());
-                    segment.setLength(0);
-
-                    if (iParam < ptypes.length) {
-                        Class<?> ptype = ptypes[iParam];
-                        filters[iParam++] = formatSpecifier((FormatSpecifier)fs, ptype);
-                    } else {
-                        throw new MissingFormatArgumentException(fs.toString());
-                    }
-                    break;
-                case -1:  // relative index
-                default:  // explicit index
-                    throw new IllegalFormatFlagsException("Indexing not allowed: " + fs.toString());
-            }
-        }
-
-        segments.add(segment.toString());
-
-        return mh;
-    }
-
-    /**
-     * Build a {@link MethodHandle} to format arguments.
-     *
-     * @return new {@link MethodHandle} to format arguments
-     */
-    MethodHandle build() {
-        List<String> segments = new ArrayList<>();
-        MethodHandle[] filters = new MethodHandle[ptypes.length];
-        buildFilters(Formatter.parse(format), segments, filters);
-        Class<?>[] ftypes = new Class<?>[filters.length];
-
-        for (int i = 0; i < filters.length; i++) {
-            MethodHandle filter = filters[i];
-            ftypes[i] = filter == null ? ptypes[i] : filter.type().returnType();
-        }
-
-        try {
-            MethodHandle mh = StringConcatFactory.makeConcatWithTemplate(segments,
-                    List.of(ftypes));
-            mh = filterArguments(mh, 0, filters);
-
-            return mh;
-        } catch (StringConcatException ex) {
-            throw new AssertionError("concat fail", ex);
-        }
-    }
-}
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index c6200520fdd..af7ff2e4aa2 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -364,6 +364,15 @@ public interface JavaLangAccess {
      */
     char getUTF16Char(byte[] bytes, int index);
 
+    /**
+     * Put the char at index in a byte[] in internal UTF-16 representation,
+     * with no bounds checks.
+     *
+     * @param bytes the UTF-16 encoded bytes
+     * @param index of the char to retrieve, 0 <= index < (bytes.length >> 1)
+     */
+    void putCharUTF16(byte[] bytes, int index, int ch);
+
     /**
      * Encode the given string into a sequence of bytes using utf8.
      *
@@ -417,6 +426,12 @@ public interface JavaLangAccess {
      */
     MethodHandle stringConcatHelper(String name, MethodType methodType);
 
+    /**
+     * Prepends constant and the stringly representation of value into buffer,
+     * given the coder and final index. Index is measured in chars, not in bytes!
+     */
+    long stringConcatHelperPrepend(long indexCoder, byte[] buf, String value);
+
     /**
      * Get the string concat initial coder
      */
@@ -427,20 +442,10 @@ public interface JavaLangAccess {
      */
     long stringConcatMix(long lengthCoder, String constant);
 
-   /**
-    * Get the coder for the supplied character.
-    */
-   long stringConcatCoder(char value);
-
-   /**
-    * Update lengthCoder for StringBuilder.
-    */
-   long stringBuilderConcatMix(long lengthCoder, StringBuilder sb);
-
     /**
-     * Prepend StringBuilder content.
-    */
-   long stringBuilderConcatPrepend(long lengthCoder, byte[] buf, StringBuilder sb);
+     * Mix value length and coder into current length and coder.
+     */
+    long stringConcatMix(long lengthCoder, char value);
 
     /**
      * Join strings
@@ -454,6 +459,12 @@ public interface JavaLangAccess {
      */
     Object classData(Class<?> c);
 
+    int stringSize(long i);
+
+    int getCharsLatin1(long i, int index, byte[] buf);
+
+    int getCharsUTF16(long i, int index, byte[] buf);
+
     long findNative(ClassLoader loader, String entry);
 
     /**
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaTemplateAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaTemplateAccess.java
deleted file mode 100644
index da99f7806d1..00000000000
--- a/src/java.base/share/classes/jdk/internal/access/JavaTemplateAccess.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2023, 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.access;
-
-import java.util.List;
-
-public interface JavaTemplateAccess {
-
-    /**
-     * Returns a StringTemplate composed from fragments and values.
-     *
-     * @implSpec The {@code fragments} list size must be one more that the
-     * {@code values} list size.
-     *
-     * @param fragments list of string fragments
-     * @param values    list of expression values
-     *
-     * @return StringTemplate composed from fragments and values
-     *
-     * @throws IllegalArgumentException if fragments list size is not one more
-     *         than values list size
-     * @throws NullPointerException if fragments is null or values is null or if any fragment is null.
-     *
-     * @implNote Contents of both lists are copied to construct immutable lists.
-     */
-    StringTemplate of(List<String> fragments, List<?> values);
-
-    /**
-     * Creates a string that interleaves the elements of values between the
-     * elements of fragments.
-     *
-     * @param fragments  list of String fragments
-     * @param values     list of expression values
-     *
-     * @return String interpolation of fragments and values
-     */
-    String interpolate(List<String> fragments, List<?> values);
-
-    /**
-     * Combine one or more {@link StringTemplate StringTemplates} to produce a combined {@link StringTemplate}.
-     * {@snippet :
-     * StringTemplate st = StringTemplate.combine("\{a}", "\{b}", "\{c}");
-     * assert st.interpolate().equals("\{a}\{b}\{c}");
-     * }
-     *
-     * @param sts  zero or more {@link StringTemplate}
-     *
-     * @return combined {@link StringTemplate}
-     *
-     * @throws NullPointerException if sts is null or if any element of sts is null
-     */
-    StringTemplate combine(StringTemplate... sts);
-
-}
-
diff --git a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
index eb0a7821d0d..0dacbef993a 100644
--- a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
+++ b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
@@ -91,7 +91,6 @@ public class SharedSecrets {
     private static JavaxCryptoSealedObjectAccess javaxCryptoSealedObjectAccess;
     private static JavaxCryptoSpecAccess javaxCryptoSpecAccess;
     private static JavaxSecurityAccess javaxSecurityAccess;
-    private static JavaTemplateAccess javaTemplateAccess;
 
     public static void setJavaUtilCollectionAccess(JavaUtilCollectionAccess juca) {
         javaUtilCollectionAccess = juca;
@@ -532,21 +531,6 @@ public class SharedSecrets {
         return access;
     }
 
-    public static void setJavaTemplateAccess(JavaTemplateAccess jta) {
-        javaTemplateAccess = jta;
-    }
-
-    public static JavaTemplateAccess getJavaTemplateAccess() {
-        var access = javaTemplateAccess;
-        if (access == null) {
-            try {
-                Class.forName("java.lang.runtime.TemplateSupport", true, null);
-                access = javaTemplateAccess;
-            } catch (ClassNotFoundException e) {}
-        }
-        return access;
-    }
-
     private static void ensureClassInitialized(Class<?> c) {
         try {
             MethodHandles.lookup().ensureInitialized(c);
diff --git a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
index f078c7d5726..bdcbe15ea84 100644
--- a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
@@ -25,8 +25,6 @@
 
 package jdk.internal.util;
 
-import java.lang.invoke.MethodHandle;
-
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -34,7 +32,7 @@ import jdk.internal.vm.annotation.Stable;
  *
  * @since 21
  */
-public final class DecimalDigits implements Digits {
+public final class DecimalDigits {
 
     /**
      * Each element of the array represents the packaging of two ascii characters based on little endian:<p>
@@ -72,85 +70,12 @@ public final class DecimalDigits implements Digits {
         DIGITS = digits;
     }
 
-    /**
-     * Singleton instance of DecimalDigits.
-     */
-    public static final Digits INSTANCE = new DecimalDigits();
-
     /**
      * Constructor.
      */
     private DecimalDigits() {
     }
 
-    @Override
-    public int digits(long value, byte[] buffer, int index,
-                      MethodHandle putCharMH) throws Throwable {
-        boolean negative = value < 0;
-        if (!negative) {
-            value = -value;
-        }
-
-        long q;
-        int r;
-        while (value <= Integer.MIN_VALUE) {
-            q = value / 100;
-            r = (int)((q * 100) - value);
-            value = q;
-            int digits = DIGITS[r];
-
-            putCharMH.invokeExact(buffer, --index, digits >> 8);
-            putCharMH.invokeExact(buffer, --index, digits & 0xFF);
-        }
-
-        int iq, ivalue = (int)value;
-        while (ivalue <= -100) {
-            iq = ivalue / 100;
-            r = (iq * 100) - ivalue;
-            ivalue = iq;
-            int digits = DIGITS[r];
-            putCharMH.invokeExact(buffer, --index, digits >> 8);
-            putCharMH.invokeExact(buffer, --index, digits & 0xFF);
-        }
-
-        if (ivalue < 0) {
-            ivalue = -ivalue;
-        }
-
-        int digits = DIGITS[ivalue];
-        putCharMH.invokeExact(buffer, --index, digits >> 8);
-
-        if (9 < ivalue) {
-            putCharMH.invokeExact(buffer, --index, digits & 0xFF);
-        }
-
-        if (negative) {
-            putCharMH.invokeExact(buffer, --index, (int)'-');
-        }
-
-        return index;
-    }
-
-    @Override
-    public int size(long value) {
-        boolean negative = value < 0;
-        int sign = negative ? 1 : 0;
-
-        if (!negative) {
-            value = -value;
-        }
-
-        long precision = -10;
-        for (int i = 1; i < 19; i++) {
-            if (value > precision)
-                return i + sign;
-
-            precision = 10 * precision;
-        }
-
-        return 19 + sign;
-    }
-
     /**
      * For values from 0 to 99 return a short encoding a pair of ASCII-encoded digit characters in little-endian
      * @param i value to convert
diff --git a/src/java.base/share/classes/jdk/internal/util/Digits.java b/src/java.base/share/classes/jdk/internal/util/Digits.java
deleted file mode 100644
index e301688ff4e..00000000000
--- a/src/java.base/share/classes/jdk/internal/util/Digits.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2023, 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.util;
-
-import java.lang.invoke.MethodHandle;
-
-/**
- * Digits provides a fast methodology for converting integers and longs to
- * ASCII strings.
- *
- * @since 21
- */
-public sealed interface Digits permits DecimalDigits, HexDigits, OctalDigits {
-    /**
-     * Insert digits for long value in buffer from high index to low index.
-     *
-     * @param value      value to convert
-     * @param buffer     byte buffer to copy into
-     * @param index      insert point + 1
-     * @param putCharMH  method to put character
-     *
-     * @return the last index used
-     *
-     * @throws Throwable if putCharMH fails (unusual).
-     */
-    int digits(long value, byte[] buffer, int index,
-               MethodHandle putCharMH) throws Throwable;
-
-    /**
-     * Calculate the number of digits required to represent the long.
-     *
-     * @param value value to convert
-     *
-     * @return number of digits
-     */
-    int size(long value);
-
-}
diff --git a/src/java.base/share/classes/jdk/internal/util/FormatConcatItem.java b/src/java.base/share/classes/jdk/internal/util/FormatConcatItem.java
deleted file mode 100644
index b4588968a3e..00000000000
--- a/src/java.base/share/classes/jdk/internal/util/FormatConcatItem.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2023, 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.util;
-
-/**
- * Implementations of this class provide information necessary to
- * assist {@link java.lang.invoke.StringConcatFactory} perform optimal
- * insertion.
- *
- * @since 21
- *
- * Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
- *          Do not rely on its availability.
- */
-public interface FormatConcatItem {
-    /**
-     * Calculate the length of the insertion.
-     *
-     * @param lengthCoder current value of the length + coder
-     * @return adjusted value of the length + coder
-     */
-    long mix(long lengthCoder);
-
-    /**
-     * Insert content into buffer prior to the current length.
-     *
-     * @param lengthCoder current value of the length + coder
-     * @param buffer      buffer to append to
-     *
-     * @return adjusted value of the length + coder
-     *
-     * @throws Throwable if fails to prepend value (unusual).
-     */
-    long prepend(long lengthCoder, byte[] buffer) throws Throwable;
-}
diff --git a/src/java.base/share/classes/jdk/internal/util/HexDigits.java b/src/java.base/share/classes/jdk/internal/util/HexDigits.java
index 1adda90a65a..075443571e1 100644
--- a/src/java.base/share/classes/jdk/internal/util/HexDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/HexDigits.java
@@ -25,16 +25,19 @@
 
 package jdk.internal.util;
 
-import java.lang.invoke.MethodHandle;
-
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
 import jdk.internal.vm.annotation.Stable;
 
 /**
- * Digits class for hexadecimal digits.
+ * Digits provides a fast methodology for converting integers and longs to
+ * hexadecimal digits ASCII strings.
  *
  * @since 21
  */
-public final class HexDigits implements Digits {
+public final class HexDigits {
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+
     /**
      * Each element of the array represents the ascii encoded
      * hex relative to its index, for example:<p>
@@ -65,11 +68,6 @@ public final class HexDigits implements Digits {
     @Stable
     private static final short[] DIGITS;
 
-    /**
-     * Singleton instance of HexDigits.
-     */
-    public static final Digits INSTANCE = new HexDigits();
-
     static {
         short[] digits = new short[16 * 16];
 
@@ -136,28 +134,68 @@ public final class HexDigits implements Digits {
                 | (((long) DIGITS[b3 & 0xff]) << 48);
     }
 
-    @Override
-    public int digits(long value, byte[] buffer, int index,
-                      MethodHandle putCharMH) throws Throwable {
+    /**
+     * Insert digits for long value in buffer from high index to low index.
+     *
+     * @param value      value to convert
+     * @param index      insert point + 1
+     * @param buffer     byte buffer to copy into
+     *
+     * @return the last index used
+     */
+    public static int getCharsLatin1(long value, int index, byte[] buffer) {
         while ((value & ~0xFF) != 0) {
-            int digits = DIGITS[(int) (value & 0xFF)];
+            short pair = DIGITS[((int) value) & 0xFF];
+            buffer[--index] = (byte)(pair >> 8);
+            buffer[--index] = (byte)(pair);
             value >>>= 8;
-            putCharMH.invokeExact(buffer, --index, digits >> 8);
-            putCharMH.invokeExact(buffer, --index, digits & 0xFF);
         }
 
         int digits = DIGITS[(int) (value & 0xFF)];
-        putCharMH.invokeExact(buffer, --index, digits >> 8);
+        buffer[--index] = (byte) (digits >> 8);
 
         if (0xF < value) {
-            putCharMH.invokeExact(buffer, --index, digits & 0xFF);
+            buffer[--index] = (byte) (digits & 0xFF);
         }
 
         return index;
     }
 
-    @Override
-    public int size(long value) {
+    /**
+     * Insert digits for long value in buffer from high index to low index.
+     *
+     * @param value      value to convert
+     * @param index      insert point + 1
+     * @param buffer     byte buffer to copy into
+     *
+     * @return the last index used
+     */
+    public static int getCharsUTF16(long value, int index, byte[] buffer) {
+        while ((value & ~0xFF) != 0) {
+            int pair = (int) DIGITS[((int) value) & 0xFF];
+            JLA.putCharUTF16(buffer, --index, pair >> 8);
+            JLA.putCharUTF16(buffer, --index, pair & 0xFF);
+            value >>>= 8;
+        }
+
+        int digits = DIGITS[(int) (value & 0xFF)];
+        JLA.putCharUTF16(buffer, --index, (byte) (digits >> 8));
+
+        if (0xF < value) {
+            JLA.putCharUTF16(buffer, --index, (byte) (digits & 0xFF));
+        }
+
+        return index;
+    }
+
+    /**
+     * Calculate the number of digits required to represent the long.
+     *
+     * @param value value to convert
+     *
+     * @return number of digits
+     */
+    public static int stringSize(long value) {
         return value == 0 ? 1 :
                 67 - Long.numberOfLeadingZeros(value) >> 2;
     }
diff --git a/src/java.base/share/classes/jdk/internal/util/OctalDigits.java b/src/java.base/share/classes/jdk/internal/util/OctalDigits.java
index 785947442e8..97b1f882f59 100644
--- a/src/java.base/share/classes/jdk/internal/util/OctalDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/OctalDigits.java
@@ -25,8 +25,8 @@
 
 package jdk.internal.util;
 
-import java.lang.invoke.MethodHandle;
-
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -34,15 +34,12 @@ import jdk.internal.vm.annotation.Stable;
  *
  * @since 21
  */
-public final class OctalDigits implements Digits {
+public final class OctalDigits {
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+
     @Stable
     private static final short[] DIGITS;
 
-    /**
-     * Singleton instance of OctalDigits.
-     */
-    public static final Digits INSTANCE = new OctalDigits();
-
     static {
         short[] digits = new short[8 * 8];
 
@@ -64,28 +61,70 @@ public final class OctalDigits implements Digits {
     private OctalDigits() {
     }
 
-    @Override
-    public int digits(long value, byte[] buffer, int index,
-                      MethodHandle putCharMH) throws Throwable {
+    /**
+     * Insert digits for long value in buffer from high index to low index.
+     *
+     * @param value      value to convert
+     * @param index      insert point + 1
+     * @param buffer     byte buffer to copy into
+     *
+     * @return the last index used
+     */
+    public static int getCharsLatin1(long value, int index, byte[] buffer){
         while ((value & ~0x3F) != 0) {
-            int digits = DIGITS[(int) (value & 0x3F)];
+            int digits = DIGITS[((int) value) & 0x3F];
             value >>>= 6;
-            putCharMH.invokeExact(buffer, --index, digits >> 8);
-            putCharMH.invokeExact(buffer, --index, digits & 0xFF);
+            buffer[--index] = (byte) (digits >> 8);
+            buffer[--index] = (byte) (digits & 0xFF);
         }
 
         int digits = DIGITS[(int) (value & 0x3F)];
-        putCharMH.invokeExact(buffer, --index, digits >> 8);
+        buffer[--index] = (byte) (digits >> 8);
 
         if (7 < value) {
-            putCharMH.invokeExact(buffer, --index, digits & 0xFF);
+            buffer[--index] = (byte) (digits & 0xFF);
         }
 
         return index;
     }
 
-    @Override
-    public int size(long value) {
-        return (66 - Long.numberOfLeadingZeros(value)) / 3;
+
+    /**
+     * This is a variant of {@link OctalDigits#getCharsLatin1(long, int, byte[])}, but for
+     * UTF-16 coder.
+     *
+     * @param value      value to convert
+     * @param index      insert point + 1
+     * @param buffer     byte buffer to copy into
+     *
+     * @return the last index used
+     */
+    public static int getCharsUTF16(long value, int index, byte[] buffer){
+        while ((value & ~0x3F) != 0) {
+            int pair = (int) DIGITS[((int) value) & 0x3F];
+            JLA.putCharUTF16(buffer, --index, pair >> 8);
+            JLA.putCharUTF16(buffer, --index, pair & 0xFF);
+            value >>>= 6;
+        }
+
+        int digits = DIGITS[(int) (value & 0x3F)];
+        JLA.putCharUTF16(buffer, --index, digits >> 8);
+
+        if (7 < value) {
+            JLA.putCharUTF16(buffer, --index, digits & 0xFF);
+        }
+
+        return index;
+    }
+
+    /**
+     * Calculate the number of digits required to represent the long.
+     *
+     * @param value value to convert
+     *
+     * @return number of digits
+     */
+    public static int stringSize(long value) {
+        return value == 0 ? 1 : ((66 - Long.numberOfLeadingZeros(value)) / 3);
     }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/StringTemplateTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/StringTemplateTree.java
deleted file mode 100644
index 9cf94d1cbd3..00000000000
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/StringTemplateTree.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2023, 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 com.sun.source.tree;
-
-import java.util.List;
-
-import jdk.internal.javac.PreviewFeature;
-
-/**
- * A tree node for a string template expression.
- *
- * @since 21
- */
-@PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES, reflective=true)
-public interface StringTemplateTree extends ExpressionTree {
-    /**
-     * Returns templated string processor (may be qualified) or null.
-     *
-     * @return templated string processor
-     */
-    ExpressionTree getProcessor();
-
-    /**
-     * Returns string fragments.
-     *
-     * @return string fragments
-     */
-    List<String> getFragments();
-
-    /**
-     * Returns list of expressions.
-     *
-     * @return list of expressions
-     */
-    List<? extends ExpressionTree> getExpressions();
-}
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
index 9150c4cf4b0..0bd3823307b 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
@@ -25,8 +25,6 @@
 
 package com.sun.source.tree;
 
-import jdk.internal.javac.PreviewFeature;
-
 /**
  * Common interface for all nodes in an abstract syntax tree.
  *
@@ -175,13 +173,6 @@ public interface Tree {
          */
         INSTANCE_OF(InstanceOfTree.class),
 
-        /**
-         * Used for instances of {@link StringTemplateTree}.
-         * @since 21
-         */
-        @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES, reflective=true)
-        TEMPLATE(StringTemplateTree.class),
-
         /**
          * Used for instances of {@link LabeledStatementTree}.
          */
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
index d01625ff4b0..3f7a683350c 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
@@ -25,8 +25,6 @@
 
 package com.sun.source.tree;
 
-import jdk.internal.javac.PreviewFeature;
-
 /**
  * A visitor of trees, in the style of the visitor design pattern.
  * Classes implementing this interface are used to operate
@@ -259,16 +257,6 @@ public interface TreeVisitor<R,P> {
      */
     R visitLiteral(LiteralTree node, P p);
 
-    /**
-     * Visits a StringTemplateTree node.
-     * @param node the node being visited
-     * @param p a parameter value
-     * @return a result value
-     * @since 21
-     */
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES, reflective=true)
-    R visitStringTemplate(StringTemplateTree node, P p);
-
     /**
      * Visits a {@code AnyPatternTree} node.
      * @param node the node being visited
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
index 22a2e479a80..5179061b4bb 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
@@ -26,7 +26,6 @@
 package com.sun.source.util;
 
 import com.sun.source.tree.*;
-import jdk.internal.javac.PreviewFeature;
 
 /**
  * A simple visitor for tree nodes.
@@ -628,20 +627,6 @@ public class SimpleTreeVisitor <R,P> implements TreeVisitor<R,P> {
         return defaultAction(node, p);
     }
 
-    /**
-     * {@inheritDoc} This implementation calls {@code defaultAction}.
-     *
-     * @param node {@inheritDoc}
-     * @param p {@inheritDoc}
-     * @return  the result of {@code defaultAction}
-     * @since 21
-     */
-    @Override
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES, reflective=true)
-    public R visitStringTemplate(StringTemplateTree node, P p) {
-        return defaultAction(node, p);
-    }
-
     /**
      * {@inheritDoc}
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
index fc3a7823914..49bec302100 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
@@ -26,7 +26,6 @@
 package com.sun.source.util;
 
 import com.sun.source.tree.*;
-import jdk.internal.javac.PreviewFeature;
 
 /**
  * A TreeVisitor that visits all the child tree nodes.
@@ -775,24 +774,6 @@ public class TreeScanner<R,P> implements TreeVisitor<R,P> {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @implSpec This implementation scans the children in left to right order.
-     *
-     * @param node  {@inheritDoc}
-     * @param p  {@inheritDoc}
-     * @return the result of scanning
-     * @since 21
-     */
-    @Override
-    @PreviewFeature(feature=PreviewFeature.Feature.STRING_TEMPLATES, reflective=true)
-    public R visitStringTemplate(StringTemplateTree node, P p) {
-        R r = scan(node.getProcessor(), p);
-        r = scanAndReduce(node.getExpressions(), p, r);
-        return r;
-    }
-
     /**
      * {@inheritDoc}
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
index 32a7d068715..1572973179b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
@@ -207,7 +207,6 @@ public class Preview {
      */
     public boolean isPreview(Feature feature) {
         return switch (feature) {
-            case STRING_TEMPLATES -> true;
             case IMPLICIT_CLASSES -> true;
             case SUPER_INIT -> true;
             case PRIMITIVE_PATTERNS -> true;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index 54e5cfec32a..80f60aa7209 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -250,7 +250,6 @@ public enum Source {
         REDUNDANT_STRICTFP(JDK17),
         UNCONDITIONAL_PATTERN_IN_INSTANCEOF(JDK21, Fragments.FeatureUnconditionalPatternsInInstanceof, DiagKind.PLURAL),
         RECORD_PATTERNS(JDK21, Fragments.FeatureDeconstructionPatterns, DiagKind.PLURAL),
-        STRING_TEMPLATES(JDK21, Fragments.FeatureStringTemplates, DiagKind.PLURAL),
         IMPLICIT_CLASSES(JDK21, Fragments.FeatureImplicitClasses, DiagKind.PLURAL),
         WARN_ON_ILLEGAL_UTF8(MIN, JDK21),
         UNNAMED_VARIABLES(JDK22, Fragments.FeatureUnnamedVariables, DiagKind.PLURAL),
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
index b1dd2186d7e..89de932ab72 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -242,12 +242,6 @@ public class Symtab {
     public final Type objectInputType;
     public final Type objectOutputType;
 
-    // For string templates
-    public final Type stringTemplateType;
-    public final Type templateRuntimeType;
-    public final Type processorType;
-    public final Type linkageType;
-
     /** The symbol representing the length field of an array.
      */
     public final VarSymbol lengthVar;
@@ -641,12 +635,6 @@ public class Symtab {
         synthesizeBoxTypeIfMissing(floatType);
         synthesizeBoxTypeIfMissing(voidType);
 
-        // For string templates
-        stringTemplateType = enterClass("java.lang.StringTemplate");
-        templateRuntimeType = enterClass("java.lang.runtime.TemplateRuntime");
-        processorType = enterClass("java.lang.StringTemplate$Processor");
-        linkageType = enterClass("java.lang.StringTemplate$Processor$Linkage");
-
         // Enter a synthetic class that is used to mark internal
         // proprietary classes in ct.sym.  This class does not have a
         // class file.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 65da42f3fbc..0d6e39c8b06 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -4992,32 +4992,6 @@ public class Attr extends JCTree.Visitor {
         return (tag == CLASS) ? syms.stringType : syms.typeOfTag[tag.ordinal()];
     }
 
-    public void visitStringTemplate(JCStringTemplate tree) {
-        JCExpression processor = tree.processor;
-        Type processorType = attribTree(processor, env, new ResultInfo(KindSelector.VAL, Type.noType));
-        chk.checkProcessorType(processor, processorType, env);
-        Type processMethodType = getProcessMethodType(tree, processorType);
-        tree.processMethodType = processMethodType;
-        Type resultType = processMethodType.getReturnType();
-
-        Env<AttrContext> localEnv = env.dup(tree, env.info.dup());
-
-        for (JCExpression arg : tree.expressions) {
-            chk.checkNonVoid(arg.pos(), attribExpr(arg, localEnv));
-        }
-
-        tree.type = resultType;
-        result = resultType;
-        check(tree, resultType, KindSelector.VAL, resultInfo);
-    }
-
-    private Type getProcessMethodType(JCStringTemplate tree, Type processorType) {
-        MethodSymbol processSymbol = rs.resolveInternalMethod(tree.pos(),
-                env, types.skipTypeVars(processorType, false),
-                names.process, List.of(syms.stringTemplateType), List.nil());
-        return types.memberType(processorType, processSymbol);
-    }
-
     public void visitTypeIdent(JCPrimitiveTypeTree tree) {
         result = check(tree, syms.typeOfTag[tree.typetag.ordinal()], KindSelector.TYP, resultInfo);
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index 834d976a7c8..1e717b2b034 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -4475,26 +4475,6 @@ public class Check {
         }
     }
 
-    public Type checkProcessorType(JCExpression processor, Type resultType, Env<AttrContext> env) {
-        Type processorType = processor.type;
-        Type interfaceType = types.asSuper(processorType, syms.processorType.tsym);
-
-        if (interfaceType != null) {
-            List<Type> typeArguments = interfaceType.getTypeArguments();
-
-            if (typeArguments.size() == 2) {
-                resultType = typeArguments.head;
-            } else {
-                resultType = syms.objectType;
-            }
-        } else {
-            log.error(DiagnosticFlag.RESOLVE_ERROR, processor.pos,
-                    Errors.NotAProcessorType(processorType.tsym));
-        }
-
-        return resultType;
-    }
-
     public void checkLeaksNotAccessible(Env<AttrContext> env, JCClassDecl check) {
         JCCompilationUnit toplevel = env.toplevel;
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java
index 0f808af0308..b044f956fdf 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/CompileStates.java
@@ -59,11 +59,10 @@ public class CompileStates extends HashMap<Env<AttrContext>, CompileStates.Compi
         ATTR(4),
         FLOW(5),
         TRANSTYPES(6),
-        TRANSLITERALS(7),
-        TRANSPATTERNS(8),
-        UNLAMBDA(9),
-        LOWER(10),
-        GENERATE(11);
+        TRANSPATTERNS(7),
+        UNLAMBDA(8),
+        LOWER(9),
+        GENERATE(10);
 
         CompileState(int value) {
             this.value = value;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
index 98a060d6bf8..4c9a28102e0 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -1744,15 +1744,6 @@ public class Flow {
             }
         }
 
-        @Override
-        public void visitStringTemplate(JCStringTemplate tree) {
-            for (Type thrown : tree.processMethodType.getThrownTypes()) {
-                markThrown(tree, thrown);
-            }
-
-            scan(tree.expressions);
-        }
-
         void checkCaughtType(DiagnosticPosition pos, Type exc, List<Type> thrownInTry, List<Type> caughtInTry) {
             if (chk.subset(exc, caughtInTry)) {
                 log.error(pos, Errors.ExceptAlreadyCaught(exc));
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransLiterals.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransLiterals.java
deleted file mode 100644
index fef3a6c0526..00000000000
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransLiterals.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright (c) 2023, 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 com.sun.tools.javac.comp;
-
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
-import com.sun.tools.javac.code.Symbol.DynamicMethodSymbol;
-import com.sun.tools.javac.code.Symbol.MethodSymbol;
-import com.sun.tools.javac.code.Symbol.VarSymbol;
-import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.code.Type.*;
-import com.sun.tools.javac.code.Types;
-import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.*;
-import com.sun.tools.javac.tree.TreeInfo;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.TreeTranslator;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.Names;
-
-import java.util.Iterator;
-
-/** This pass translates constructed literals (string templates, ...) to conventional Java.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- */
-public final class TransLiterals extends TreeTranslator {
-    /**
-     * The context key for the TransTypes phase.
-     */
-    protected static final Context.Key<TransLiterals> transLiteralsKey = new Context.Key<>();
-
-    /**
-     * Get the instance for this context.
-     */
-    public static TransLiterals instance(Context context) {
-        TransLiterals instance = context.get(transLiteralsKey);
-        if (instance == null)
-            instance = new TransLiterals(context);
-        return instance;
-    }
-
-    private final Symtab syms;
-    private final Resolve rs;
-    private final Types types;
-    private final Operators operators;
-    private final Names names;
-    private TreeMaker make = null;
-    private Env<AttrContext> env = null;
-    private ClassSymbol currentClass = null;
-    private MethodSymbol currentMethodSym = null;
-
-    protected TransLiterals(Context context) {
-        context.put(transLiteralsKey, this);
-        syms = Symtab.instance(context);
-        rs = Resolve.instance(context);
-        make = TreeMaker.instance(context);
-        types = Types.instance(context);
-        operators = Operators.instance(context);
-        names = Names.instance(context);
-    }
-
-    JCExpression makeLit(Type type, Object value) {
-        return make.Literal(type.getTag(), value).setType(type.constType(value));
-    }
-
-    JCExpression makeString(String string) {
-        return makeLit(syms.stringType, string);
-    }
-
-    List<JCExpression> makeStringList(List<String> strings) {
-        List<JCExpression> exprs = List.nil();
-        for (String string : strings) {
-            exprs = exprs.append(makeString(string));
-        }
-        return exprs;
-    }
-
-    JCBinary makeBinary(JCTree.Tag optag, JCExpression lhs, JCExpression rhs) {
-        JCBinary tree = make.Binary(optag, lhs, rhs);
-        tree.operator = operators.resolveBinary(tree, optag, lhs.type, rhs.type);
-        tree.type = tree.operator.type.getReturnType();
-        return tree;
-    }
-
-    MethodSymbol lookupMethod(DiagnosticPosition pos, Name name, Type qual, List<Type> args) {
-        return rs.resolveInternalMethod(pos, env, qual, name, args, List.nil());
-    }
-
-    @Override
-    public void visitClassDef(JCClassDecl tree) {
-        ClassSymbol prevCurrentClass = currentClass;
-        try {
-            currentClass = tree.sym;
-            super.visitClassDef(tree);
-        } finally {
-            currentClass = prevCurrentClass;
-        }
-    }
-
-    @Override
-    public void visitMethodDef(JCMethodDecl tree) {
-        MethodSymbol prevMethodSym = currentMethodSym;
-        try {
-            currentMethodSym = tree.sym;
-            super.visitMethodDef(tree);
-        } finally {
-            currentMethodSym = prevMethodSym;
-        }
-    }
-
-    final class TransStringTemplate {
-        final JCStringTemplate tree;
-        final JCExpression processor;
-        final List<String> fragments;
-        final List<JCExpression> expressions;
-        final List<Type> expressionTypes;
-        final boolean useValuesList;
-
-        TransStringTemplate(JCStringTemplate tree) {
-            this.tree = tree;
-            this.processor = tree.processor;
-            this.fragments = tree.fragments;
-            this.expressions = translate(tree.expressions);
-            this.expressionTypes = expressions.stream()
-                    .map(arg -> arg.type == syms.botType ? syms.objectType : arg.type)
-                    .collect(List.collector());
-            int slots = expressionTypes.stream()
-                    .mapToInt(t -> types.isSameType(t, syms.longType) ||
-                            types.isSameType(t, syms.doubleType) ? 2 : 1).sum();
-            this.useValuesList = 200 < slots; // StringConcatFactory.MAX_INDY_CONCAT_ARG_SLOTS
-         }
-
-        JCExpression concatExpression(List<String> fragments, List<JCExpression> expressions) {
-            JCExpression expr = null;
-            Iterator<JCExpression> iterator = expressions.iterator();
-            for (String fragment : fragments) {
-                expr = expr == null ? makeString(fragment)
-                        : makeBinary(Tag.PLUS, expr, makeString(fragment));
-                if (iterator.hasNext()) {
-                    JCExpression expression = iterator.next();
-                    Type expressionType = expression.type;
-                    expr = makeBinary(Tag.PLUS, expr, expression.setType(expressionType));
-                }
-            }
-            return expr;
-        }
-
-        JCExpression bsmCall(Name name, Name bootstrapName, Type type,
-                             List<JCExpression> args,
-                             List<Type> argTypes,
-                             List<LoadableConstant> staticArgValues,
-                             List<Type> staticArgsTypes) {
-            Symbol bsm = rs.resolveQualifiedMethod(tree.pos(), env,
-                    syms.templateRuntimeType, bootstrapName, staticArgsTypes, List.nil());
-            MethodType indyType = new MethodType(argTypes, type, List.nil(), syms.methodClass);
-            DynamicMethodSymbol dynSym = new DynamicMethodSymbol(
-                    name,
-                    syms.noSymbol,
-                    ((MethodSymbol)bsm).asHandle(),
-                    indyType,
-                    staticArgValues.toArray(new LoadableConstant[0])
-            );
-            JCFieldAccess qualifier = make.Select(make.Type(syms.processorType), dynSym.name);
-            qualifier.sym = dynSym;
-            qualifier.type = type;
-            JCMethodInvocation apply = make.Apply(List.nil(), qualifier, args);
-            apply.type = type;
-            return apply;
-        }
-
-        JCExpression processCall(JCExpression stringTemplate) {
-            MethodSymbol appyMeth = lookupMethod(tree.pos(), names.process,
-                    syms.processorType, List.of(syms.stringTemplateType));
-            JCExpression applySelect = make.Select(processor, appyMeth);
-            JCExpression process = make.Apply(null, applySelect, List.of(stringTemplate))
-                    .setType(syms.objectType);
-            JCTypeCast cast = make.TypeCast(tree.type, process);
-            return cast;
-        }
-
-        JCExpression newStringTemplate() {
-            List<LoadableConstant> staticArgValues = List.nil();
-            List<Type> staticArgsTypes =
-                    List.of(syms.methodHandleLookupType, syms.stringType,
-                            syms.methodTypeType);
-            if (useValuesList) {
-                JCNewArray fragmentArray = make.NewArray(make.Type(syms.stringType),
-                        List.nil(), makeStringList(fragments));
-                fragmentArray.type = new ArrayType(syms.stringType, syms.arrayClass);
-                JCNewArray valuesArray = make.NewArray(make.Type(syms.objectType),
-                        List.nil(), expressions);
-                valuesArray.type = new ArrayType(syms.objectType, syms.arrayClass);
-                return bsmCall(names.process, names.newLargeStringTemplate, syms.stringTemplateType,
-                        List.of(fragmentArray, valuesArray),
-                        List.of(fragmentArray.type, valuesArray.type),
-                        staticArgValues, staticArgsTypes);
-            } else {
-                for (String fragment : fragments) {
-                    staticArgValues = staticArgValues.append(LoadableConstant.String(fragment));
-                    staticArgsTypes = staticArgsTypes.append(syms.stringType);
-                }
-                return bsmCall(names.process, names.newStringTemplate, syms.stringTemplateType,
-                        expressions, expressionTypes, staticArgValues, staticArgsTypes);
-            }
-        }
-
-        JCExpression bsmProcessCall() {
-            List<JCExpression> args = expressions.prepend(processor);
-            List<Type> argTypes = expressionTypes.prepend(processor.type);
-            VarSymbol processorSym = (VarSymbol)TreeInfo.symbol(processor);
-            List<LoadableConstant> staticArgValues = List.of(processorSym.asMethodHandle(true));
-            List<Type> staticArgsTypes =
-                    List.of(syms.methodHandleLookupType, syms.stringType,
-                            syms.methodTypeType, syms.methodHandleType);
-            for (String fragment : fragments) {
-                staticArgValues = staticArgValues.append(LoadableConstant.String(fragment));
-                staticArgsTypes = staticArgsTypes.append(syms.stringType);
-            }
-            return bsmCall(names.process, names.processStringTemplate, tree.type,
-                    args, argTypes, staticArgValues, staticArgsTypes);
-        }
-
-        boolean isNamedProcessor(Name name) {
-            Symbol sym = switch (processor) {
-                case JCIdent ident -> ident.sym;
-                case JCFieldAccess access -> access.sym;
-                default -> null;
-            };
-            if (sym instanceof VarSymbol varSym) {
-                if (varSym.flags() == (Flags.PUBLIC | Flags.FINAL | Flags.STATIC) &&
-                        varSym.name == name &&
-                        types.isSameType(varSym.owner.type, syms.stringTemplateType)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        boolean isLinkageProcessor() {
-            return !useValuesList &&
-                   types.isSubtype(processor.type, syms.linkageType) &&
-                   processor.type.isFinal() &&
-                   TreeInfo.symbol(processor) instanceof VarSymbol varSymbol &&
-                   varSymbol.isStatic() &&
-                   varSymbol.isFinal();
-        }
-
-        JCExpression visit() {
-            JCExpression result;
-            make.at(tree.pos);
-
-            if (isNamedProcessor(names.RAW)) {
-                result = newStringTemplate();
-            } else if (isNamedProcessor(names.STR)) {
-                result = concatExpression(fragments, expressions);
-            } else if (isLinkageProcessor()) {
-                result = bsmProcessCall();
-            } else {
-                result = processCall(newStringTemplate());
-            }
-
-            return result;
-        }
-    }
-
-    public void visitStringTemplate(JCStringTemplate tree) {
-        int prevPos = make.pos;
-        try {
-            tree.processor = translate(tree.processor);
-            tree.expressions = translate(tree.expressions);
-
-            TransStringTemplate transStringTemplate = new TransStringTemplate(tree);
-
-            result = transStringTemplate.visit();
-        } catch (Throwable ex) {
-            ex.printStackTrace();
-            throw ex;
-        } finally {
-            make.at(prevPos);
-        }
-    }
-
-    public void visitVarDef(JCVariableDecl tree) {
-        MethodSymbol prevMethodSym = currentMethodSym;
-        try {
-            tree.mods = translate(tree.mods);
-            tree.vartype = translate(tree.vartype);
-            if (currentMethodSym == null) {
-                // A class or instance field initializer.
-                currentMethodSym =
-                        new MethodSymbol((tree.mods.flags& Flags.STATIC) | Flags.BLOCK,
-                                names.empty, null,
-                                currentClass);
-            }
-            if (tree.init != null) tree.init = translate(tree.init);
-            result = tree;
-        } finally {
-            currentMethodSym = prevMethodSym;
-        }
-    }
-
-    public JCTree translateTopLevelClass(Env<AttrContext> env, JCTree cdef, TreeMaker make) {
-        try {
-            this.make = make;
-            this.env = env;
-            translate(cdef);
-        } finally {
-            this.make = null;
-            this.env = null;
-        }
-
-        return cdef;
-    }
-
-}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
index 36d3a2b24bd..fd3b507b038 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -837,14 +837,6 @@ public class TransTypes extends TreeTranslator {
         }
     }
 
-    public void visitStringTemplate(JCStringTemplate tree) {
-        tree.processor = translate(tree.processor, erasure(tree.processor.type));
-        tree.expressions = tree.expressions.stream()
-                .map(e -> translate(e, erasure(e.type))).collect(List.collector());
-        tree.type = erasure(tree.type);
-        result = tree;
-    }
-
     public void visitSelect(JCFieldAccess tree) {
         Type t = types.skipTypeVars(tree.selected.type, false);
         if (t.isCompound()) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
index a421bd6bca4..af5f3dccdd6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
@@ -340,29 +340,6 @@ public class TypeEnter implements Completer {
                 javaLang, env);
         }
 
-        private void staticImports(JCCompilationUnit tree, Env<AttrContext> env, ImportFilter staticImportFilter) {
-             if (preview.isEnabled() && preview.isPreview(Feature.STRING_TEMPLATES)) {
-                Lint prevLint = chk.setLint(lint.suppress(LintCategory.DEPRECATION, LintCategory.REMOVAL, LintCategory.PREVIEW));
-                boolean prevPreviewCheck = chk.disablePreviewCheck;
-
-                try {
-                    chk.disablePreviewCheck = true;
-                    String autoImports = """
-                            import static java.lang.StringTemplate.STR;
-                            """;
-                    Parser parser = parserFactory.newParser(autoImports, false, false, false, false);
-                    JCCompilationUnit importTree = parser.parseCompilationUnit();
-
-                    for (JCImport imp : importTree.getImports()) {
-                        doImport(imp);
-                    }
-                } finally {
-                    chk.setLint(prevLint);
-                    chk.disablePreviewCheck = prevPreviewCheck;
-                }
-            }
-        }
-
         private void resolveImports(JCCompilationUnit tree, Env<AttrContext> env) {
             if (tree.starImportScope.isFilled()) {
                 // we must have already processed this toplevel
@@ -386,7 +363,6 @@ public class TypeEnter implements Completer {
                                          chk.importAccessible(sym, packge);
 
                 importJavaLang(tree, env, typeImportFilter);
-                staticImports(tree, env, staticImportFilter);
 
                 JCModuleDecl decl = tree.getModuleDecl();
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 63950ed2f68..9d5def3f781 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -1612,12 +1612,6 @@ public class JavaCompiler {
             env.tree = transTypes.translateTopLevelClass(env.tree, localMake);
             compileStates.put(env, CompileState.TRANSTYPES);
 
-            if (shouldStop(CompileState.TRANSLITERALS))
-                return;
-
-            env.tree = TransLiterals.instance(context).translateTopLevelClass(env, env.tree, localMake);
-            compileStates.put(env, CompileState.TRANSLITERALS);
-
             if (shouldStop(CompileState.TRANSPATTERNS))
                 return;
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
index 406ed328769..88de2333069 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -99,16 +99,6 @@ public class JavaTokenizer extends UnicodeReader {
      */
     protected final StringBuilder sb;
 
-    /**
-     * Tokens pending to be read from string template embedded expressions.
-     */
-    protected List<Token> pendingTokens;
-
-    /**
-     * String template fragment ranges; end-endPos pairs.
-     */
-    protected List<Integer> fragmentRanges;
-
     /**
      * The token kind, set by nextToken().
      */
@@ -139,16 +129,6 @@ public class JavaTokenizer extends UnicodeReader {
      */
     protected boolean hasEscapeSequences;
 
-    /**
-     * true if contains templated string escape sequences, set by nextToken().
-     */
-    protected boolean isStringTemplate;
-
-    /**
-     * true if errors are pending from embedded expressions.
-     */
-    protected boolean hasStringTemplateErrors;
-
     /**
      * The set of lint options currently in effect. It is initialized
      * from the context, and then is set/reset as needed by Attr as it
@@ -183,8 +163,6 @@ public class JavaTokenizer extends UnicodeReader {
         this.preview = fac.preview;
         this.lint = fac.lint;
         this.sb = new StringBuilder(256);
-        this.pendingTokens = List.nil();
-        this.fragmentRanges = List.nil();
     }
 
     /**
@@ -339,86 +317,6 @@ public class JavaTokenizer extends UnicodeReader {
         processLineTerminator(start, position());
     }
 
-    /**
-     * Scan the content of a string template expression.
-     *
-     * @param pos     start of literal
-     * @param endPos  start of embedded expression
-     */
-    private void scanEmbeddedExpression(int pos, int endPos) {
-        // If first embedded expression.
-        if (!isStringTemplate) {
-            checkSourceLevel(pos, Feature.STRING_TEMPLATES);
-            fragmentRanges = fragmentRanges.append(pos);
-            isStringTemplate = true;
-        }
-        // Track end of previous fragment.
-        fragmentRanges = fragmentRanges.append(endPos);
-        // Keep backslash and add rest of placeholder.
-        sb.append("{}");
-
-        // Separate tokenizer for the embedded expression.
-        JavaTokenizer tokenizer = new JavaTokenizer(fac, buffer(), length());
-        tokenizer.reset(position());
-
-        // Track brace depth.
-        int braceCount = 0;
-
-        // Accumulate tokens.
-        List<Token> tokens = List.nil();
-
-        // Stash first left brace.
-        Token token = tokenizer.readToken();
-        tokens = tokens.append(token);
-
-        while (isAvailable()) {
-            // Read and stash next token.
-            token = tokenizer.readToken();
-            tokens = tokens.append(token);
-
-            // Intercept errors
-            if (token.kind == TokenKind.ERROR) {
-                // Track start of next fragment.
-                if (isTextBlock) {
-                    reset(length());
-                } else {
-                    skipToEOLN();
-                }
-                hasStringTemplateErrors = true;
-                return;
-            }
-
-            if (token.kind == TokenKind.RBRACE) {
-                // Potential closing brace.
-                if (braceCount == 0) {
-                    break;
-                }
-
-                braceCount--;
-            } else if (token.kind == TokenKind.LBRACE) {
-                // Nesting deeper.
-                braceCount++;
-            } else if (token.kind == TokenKind.STRINGFRAGMENT) {
-                tokens = tokens.appendList(tokenizer.pendingTokens);
-                tokenizer.pendingTokens = List.nil();
-            } else if (token.kind == TokenKind.EOF) {
-                break;
-            }
-        }
-
-        // If no closing brace will be picked up as an unterminated string.
-
-        // Set main tokenizer to continue at next position.
-        int position = tokenizer.position();
-        reset(position);
-
-        // Track start of next fragment.
-        fragmentRanges = fragmentRanges.append(position);
-
-        // Pend the expression tokens after the STRINGFRAGMENT.
-        pendingTokens = pendingTokens.appendList(tokens);
-    }
-
     /**
      * Processes the current character and places in the literal buffer. If the current
      * character is a backslash then the next character is assumed to be a proper
@@ -480,17 +378,6 @@ public class JavaTokenizer extends UnicodeReader {
                     }
                     break;
 
-                case '{':
-                    if (isString) {
-                        scanEmbeddedExpression(pos, backslash);
-                        if (hasStringTemplateErrors) {
-                            return;
-                        }
-                    } else {
-                        lexError(position(), Errors.IllegalEscChar);
-                    }
-                    break;
-
                 default:
                     lexError(position(), Errors.IllegalEscChar);
                     break;
@@ -530,13 +417,7 @@ public class JavaTokenizer extends UnicodeReader {
 
             // While characters are available.
             while (isAvailable()) {
-                if (hasStringTemplateErrors) {
-                    break;
-                } else if (accept("\"\"\"")) {
-                    if (isStringTemplate && tk == TokenKind.STRINGLITERAL) {
-                        tk = TokenKind.STRINGFRAGMENT;
-                    }
-
+                if (accept("\"\"\"")) {
                     return;
                 }
 
@@ -560,12 +441,7 @@ public class JavaTokenizer extends UnicodeReader {
 
             // While characters are available.
             while (isAvailable()) {
-                if (hasStringTemplateErrors) {
-                    break;
-                } else if (accept('\"')) {
-                    if (isStringTemplate && tk == TokenKind.STRINGLITERAL) {
-                        tk = TokenKind.STRINGFRAGMENT;
-                    }
+                if (accept('\"')) {
                     return;
                 }
 
@@ -580,18 +456,11 @@ public class JavaTokenizer extends UnicodeReader {
             }
         }
 
-        // String ended without close delimiter sequence or has embedded expression errors.
-        if (isStringTemplate) {
-            lexError(pos, isTextBlock ? Errors.TextBlockTemplateIsNotWellFormed
-                                      : Errors.StringTemplateIsNotWellFormed);
-            fragmentRanges = List.nil();
-            pendingTokens = List.nil();
-        } else {
-            lexError(pos, isTextBlock ? Errors.UnclosedTextBlock
-                                      : Errors.UnclosedStrLit);
-        }
+        // String ended without close delimiter sequence.
+        lexError(pos, isTextBlock ? Errors.UnclosedTextBlock
+                                  : Errors.UnclosedStrLit);
 
-        if (!hasStringTemplateErrors && firstEOLN  != NOT_FOUND) {
+        if (firstEOLN  != NOT_FOUND) {
             // Reset recovery position to point after text block open delimiter sequence.
             reset(firstEOLN);
         }
@@ -906,20 +775,11 @@ public class JavaTokenizer extends UnicodeReader {
      * Read token (main entrypoint.)
      */
     public Token readToken() {
-        if (pendingTokens.nonEmpty()) {
-            Token token = pendingTokens.head;
-            pendingTokens = pendingTokens.tail;
-            return token;
-        }
-
         sb.setLength(0);
         name = null;
         radix = 0;
         isTextBlock = false;
         hasEscapeSequences = false;
-        isStringTemplate = false;
-        hasStringTemplateErrors = false;
-        fragmentRanges = List.nil();
 
         int pos;
         List<Comment> comments = null;
@@ -1134,7 +994,6 @@ public class JavaTokenizer extends UnicodeReader {
                 case '\"': // (Spec. 3.10)
                     scanString(pos);
                     break loop;
-
                 default:
                     if (isSpecial(get())) {
                         scanOperator();
@@ -1181,11 +1040,6 @@ public class JavaTokenizer extends UnicodeReader {
 
             int endPos = position();
 
-            // Track end of final fragment.
-            if (isStringTemplate) {
-                fragmentRanges = fragmentRanges.append(endPos);
-            }
-
             if (tk.tag == Token.Tag.DEFAULT) {
                 return new Token(tk, pos, endPos, comments);
             } else  if (tk.tag == Token.Tag.NAMED) {
@@ -1217,11 +1071,6 @@ public class JavaTokenizer extends UnicodeReader {
                     }
                 }
 
-                if (isStringTemplate) {
-                    // Break string into fragments and then return the first of the framents.
-                    return getFragments(string, comments);
-                }
-
                 // Translate escape sequences if present.
                 if (hasEscapeSequences) {
                     try {
@@ -1251,66 +1100,6 @@ public class JavaTokenizer extends UnicodeReader {
         }
     }
 
-    /**
-     * Convert the string into a list of pending tokens to precede embedded
-     * expressions.
-     *
-     * @param string    string to fragment
-     * @param comments  comments for first token
-     *
-     * @return first pending token.
-     */
-    private Token getFragments(String string, List<Comment> comments) {
-        List<Token> tokens = List.nil();
-        Iterator<Integer> rangeIter = fragmentRanges.iterator();
-        for (String fragment : fragment(string)) {
-            fragment = fragment.translateEscapes();
-            int fragmentPos = rangeIter.next();
-            int fragmentEndPos = rangeIter.next();
-            Token token = new StringToken(TokenKind.STRINGFRAGMENT,
-                    fragmentPos, fragmentEndPos, fragment, comments);
-            comments = null;
-            tokens = tokens.append(token);
-        }
-        pendingTokens = tokens.appendList(pendingTokens);
-        Token first = pendingTokens.head;
-        pendingTokens = pendingTokens.tail;
-        return first;
-    }
-
-    /**
-     * Break string template up into fragments. "\{}" indicates where
-     * embedded expressions occur.
-     *
-     * @param string string template
-     *
-     * @return list of fragment strings
-     */
-    List<String> fragment(String string) {
-        List<String> fragments = List.nil();
-        StringBuilder sb = new StringBuilder();
-        int length = string.length();
-        for (int i = 0; i < length; i++) {
-            char ch = string.charAt(i);
-            if (ch != '\\') {
-                sb.append(ch);
-            } else if (i + 2 < length && string.charAt(i + 1) == '{'
-                    && string.charAt(i + 2) == '}') {
-                fragments = fragments.append(sb.toString());
-                sb.setLength(0);
-                i += 2;
-            } else if (i + 1 < length){
-                sb.append('\\');
-                sb.append(string.charAt(i + 1));
-                i++;
-            } else {
-                // Error already reported.
-            }
-        }
-        fragments = fragments.append(sb.toString());
-        return fragments;
-    }
-
     /**
      * Appends a comment to the list of comments preceding the current token.
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 4df24ef8c9d..bc53b18b3a5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -692,59 +692,6 @@ public class JavacParser implements Parser {
         return t;
     }
 
-    /**
-     * StringTemplate =
-     *    [STRINGFRAGMENT] [EmbeddedExpression]
-     *  | STRINGLITERAL
-     *
-     * EmbeddedExpression =
-     *  LBRACE term RBRACE
-     */
-    JCExpression stringTemplate(JCExpression processor) {
-        checkSourceLevel(Feature.STRING_TEMPLATES);
-        // Disable standalone string templates
-        if (processor == null) {
-            log.error(DiagnosticFlag.SYNTAX, token.pos,
-                    Errors.ProcessorMissingFromStringTemplateExpression);
-        }
-        int oldmode = mode;
-        selectExprMode();
-        Token stringToken = token;
-        int pos = stringToken.pos;
-        int endPos = stringToken.endPos;
-        TokenKind kind = stringToken.kind;
-        String string = token.stringVal();
-        List<String> fragments = List.of(string);
-        List<JCExpression> expressions = List.nil();
-        nextToken();
-        if (kind != STRINGLITERAL) {
-            while (token.kind == STRINGFRAGMENT) {
-                stringToken = token;
-                endPos = stringToken.endPos;
-                string = stringToken.stringVal();
-                fragments = fragments.append(string);
-                nextToken();
-             }
-            while (token.pos < endPos && token.kind != DEFAULT && token.kind != ERROR) {
-                accept(LBRACE);
-                JCExpression expression = token.kind == RBRACE ? F.at(pos).Literal(TypeTag.BOT, null)
-                                                               : term(EXPR);
-                expressions = expressions.append(expression);
-                if (token.kind != ERROR) {
-                    accept(RBRACE);
-                }
-            }
-            // clean up remaining expression tokens if error
-            while (token.pos < endPos && token.kind != DEFAULT) {
-                nextToken();
-            }
-            S.setPrevToken(stringToken);
-        }
-        JCExpression t = toP(F.at(pos).StringTemplate(processor, fragments, expressions));
-        setMode(oldmode);
-        return t;
-    }
-
     JCExpression literal(Name prefix) {
         return literal(prefix, token.pos);
     }
@@ -1422,14 +1369,6 @@ public class JavacParser implements Parser {
                 t = literal(names.empty);
             } else return illegal();
             break;
-         case STRINGFRAGMENT:
-             if (typeArgs == null && isMode(EXPR)) {
-                 selectExprMode();
-                 t = stringTemplate(null);
-             } else {
-                 return illegal();
-             }
-             break;
         case NEW:
             if (typeArgs != null) return illegal();
             if (isMode(EXPR)) {
@@ -1560,12 +1499,6 @@ public class JavacParser implements Parser {
                                 t = innerCreator(pos1, typeArgs, t);
                                 typeArgs = null;
                                 break loop;
-                            case STRINGFRAGMENT:
-                            case STRINGLITERAL:
-                                if (typeArgs != null) return illegal();
-                                t = stringTemplate(t);
-                                typeArgs = null;
-                                break loop;
                             }
                         }
 
@@ -1789,12 +1722,6 @@ public class JavacParser implements Parser {
                     if (token.kind == LT) typeArgs = typeArguments(false);
                     t = innerCreator(pos2, typeArgs, t);
                     typeArgs = null;
-                } else if (token.kind == TokenKind.STRINGFRAGMENT ||
-                           token.kind == TokenKind.STRINGLITERAL) {
-                    if (typeArgs != null) {
-                        return illegal();
-                    }
-                    t = stringTemplate(t);
                 } else {
                     List<JCAnnotation> tyannos = null;
                     if (isMode(TYPE) && token.kind == MONKEYS_AT) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index b672c1546fc..273c5bef7b4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1361,19 +1361,6 @@ compiler.err.unclosed.str.lit=\
 compiler.err.unclosed.text.block=\
     unclosed text block
 
-compiler.err.string.template.is.not.well.formed=\
-    string template is not well formed
-
-compiler.err.text.block.template.is.not.well.formed=\
-    text block template is not well formed
-
-compiler.err.processor.missing.from.string.template.expression=\
-    processor missing from string template expression
-
-# 0: symbol
-compiler.err.not.a.processor.type=\
-    not a processor type: {0}
-
 # 0: string
 compiler.err.unsupported.encoding=\
     unsupported encoding: {0}
@@ -3219,9 +3206,6 @@ compiler.misc.feature.case.null=\
 compiler.misc.feature.pattern.switch=\
     patterns in switch statements
 
-compiler.misc.feature.string.templates=\
-    string templates
-
 compiler.misc.feature.unconditional.patterns.in.instanceof=\
     unconditional patterns in instanceof
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
index fcb73c59686..56daece2b2f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -269,10 +269,6 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
          */
         LITERAL,
 
-        /** String template expression.
-         */
-        STRING_TEMPLATE,
-
         /** Basic type identifiers, of type TypeIdent.
          */
         TYPEIDENT,
@@ -2481,59 +2477,6 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
 
     }
 
-    /**
-     * String template expression.
-     */
-    public static class JCStringTemplate extends JCExpression implements StringTemplateTree {
-        public JCExpression processor;
-        public List<String> fragments;
-        public List<JCExpression> expressions;
-        public Type processMethodType;
-
-        protected JCStringTemplate(JCExpression processor,
-                                   List<String> fragments,
-                                   List<JCExpression> expressions) {
-            this.processor = processor;
-            this.fragments = fragments;
-            this.expressions = expressions;
-        }
-
-        @Override
-        public ExpressionTree getProcessor() {
-            return processor;
-        }
-
-        @Override
-        public List<String> getFragments() {
-            return fragments;
-        }
-
-        @Override
-        public List<? extends ExpressionTree> getExpressions() {
-            return expressions;
-        }
-
-        @Override @DefinedBy(Api.COMPILER_TREE)
-        public Kind getKind() {
-            return Kind.TEMPLATE;
-        }
-
-        @Override @DefinedBy(Api.COMPILER_TREE)
-        public Tag getTag() {
-            return STRING_TEMPLATE;
-        }
-
-        @Override @DefinedBy(Api.COMPILER_TREE)
-        public void accept(Visitor v) {
-            v.visitStringTemplate(this);
-        }
-
-        @Override @DefinedBy(Api.COMPILER_TREE)
-        public <R, D> R accept(TreeVisitor<R, D> v, D d) {
-            return v.visitStringTemplate(this, d);
-        }
-    }
-
     /**
      * An array selection
      */
@@ -3513,9 +3456,6 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         JCFieldAccess Select(JCExpression selected, Name selector);
         JCIdent Ident(Name idname);
         JCLiteral Literal(TypeTag tag, Object value);
-        JCStringTemplate StringTemplate(JCExpression processor,
-                                        List<String> fragments,
-                                        List<JCExpression> expressions);
         JCPrimitiveTypeTree TypeIdent(TypeTag typetag);
         JCArrayTypeTree TypeArray(JCExpression elemtype);
         JCTypeApply TypeApply(JCExpression clazz, List<JCExpression> arguments);
@@ -3587,7 +3527,6 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public void visitReference(JCMemberReference that)   { visitTree(that); }
         public void visitIdent(JCIdent that)                 { visitTree(that); }
         public void visitLiteral(JCLiteral that)             { visitTree(that); }
-        public void visitStringTemplate(JCStringTemplate that) { visitTree(that); }
         public void visitTypeIdent(JCPrimitiveTypeTree that) { visitTree(that); }
         public void visitTypeArray(JCArrayTypeTree that)     { visitTree(that); }
         public void visitTypeApply(JCTypeApply that)         { visitTree(that); }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
index 06a8f6f143f..c63706639b3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -1476,21 +1476,6 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
-    public void visitStringTemplate(JCStringTemplate tree) {
-        try {
-            JCExpression processor = tree.processor;
-            print("[");
-            printExpr(processor);
-            print("]");
-            print("\"" + tree.fragments.stream().collect(Collectors.joining("\\{}")) + "\"");
-            print("(");
-            printExprs(tree.expressions);
-            print(")");
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
     public void visitTypeIdent(JCPrimitiveTypeTree tree) {
         try {
             switch(tree.typetag) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
index 4d15bb8f9ae..7c2ef075ccb 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -283,14 +283,6 @@ public class TreeCopier<P> implements TreeVisitor<JCTree,P> {
         return M.at(t.pos).Literal(t.typetag, t.value);
     }
 
-    @DefinedBy(Api.COMPILER_TREE)
-    public JCTree visitStringTemplate(StringTemplateTree node, P p) {
-        JCStringTemplate t = (JCStringTemplate) node;
-        JCExpression processor = copy(t.processor, p);
-        List<JCExpression> expressions = copy(t.expressions, p);
-        return M.at(t.pos).StringTemplate(processor, t.fragments, expressions);
-    }
-
     @DefinedBy(Api.COMPILER_TREE)
     public JCTree visitMethod(MethodTree node, P p) {
         JCMethodDecl t  = (JCMethodDecl) node;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index ee4477135c6..0a2fe85d1c3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -371,7 +371,6 @@ public class TreeInfo {
             case PLUS_ASG: case MINUS_ASG:
             case MUL_ASG: case DIV_ASG: case MOD_ASG:
             case APPLY: case NEWCLASS:
-            case STRING_TEMPLATE:
             case ERRONEOUS:
                 return true;
             default:
@@ -587,10 +586,6 @@ public class TreeInfo {
                 JCBindingPattern node = (JCBindingPattern)tree;
                 return getStartPos(node.var);
             }
-            case STRING_TEMPLATE: {
-                JCStringTemplate node = (JCStringTemplate) tree;
-                return node.processor == null ? node.pos : getStartPos(node.processor);
-            }
             case ERRONEOUS: {
                 JCErroneous node = (JCErroneous)tree;
                 if (node.errs != null && node.errs.nonEmpty()) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
index 21ced44c80e..fe6ca849f31 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -552,14 +552,6 @@ public class TreeMaker implements JCTree.Factory {
         return tree;
     }
 
-    public JCStringTemplate StringTemplate(JCExpression processor,
-                                           List<String> fragments,
-                                           List<JCExpression> expressions) {
-        JCStringTemplate tree = new JCStringTemplate(processor, fragments, expressions);
-        tree.pos = pos;
-        return tree;
-    }
-
     public JCPrimitiveTypeTree TypeIdent(TypeTag typetag) {
         JCPrimitiveTypeTree tree = new JCPrimitiveTypeTree(typetag);
         tree.pos = pos;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java
index f07871eff24..fc356047542 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -353,11 +353,6 @@ public class TreeScanner extends Visitor {
     public void visitLiteral(JCLiteral tree) {
     }
 
-    public void visitStringTemplate(JCStringTemplate tree) {
-        scan(tree.processor);
-        scan(tree.expressions);
-    }
-
     public void visitTypeIdent(JCPrimitiveTypeTree tree) {
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
index a3b7e4fc5d6..59a7457e6d0 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -409,13 +409,6 @@ public class TreeTranslator extends JCTree.Visitor {
         result = tree;
     }
 
-    public void visitStringTemplate(JCStringTemplate tree) {
-        tree.processor = translate(tree.processor);
-        tree.expressions = translate(tree.expressions);
-
-        result = tree;
-    }
-
     public void visitTypeIdent(JCPrimitiveTypeTree tree) {
         result = tree;
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
index 229c710f7df..6c48490cf16 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -227,14 +227,6 @@ public class Names {
     public final Name enumSwitch;
     public final Name enumConstant;
 
-    // templated string
-    public final Name process;
-    public final Name STR;
-    public final Name RAW;
-    public final Name newStringTemplate;
-    public final Name newLargeStringTemplate;
-    public final Name processStringTemplate;
-
     public final Name.Table table;
 
     @SuppressWarnings("this-escape")
@@ -413,13 +405,6 @@ public class Names {
         permits = fromString("permits");
         sealed = fromString("sealed");
 
-        // templated string
-        process = fromString("process");
-        STR = fromString("STR");
-        RAW = fromString("RAW");
-        newStringTemplate = fromString("newStringTemplate");
-        newLargeStringTemplate = fromString("newLargeStringTemplate");
-        processStringTemplate = fromString("processStringTemplate");
 
         // pattern switches
         typeSwitch = fromString("typeSwitch");
diff --git a/test/jdk/java/lang/String/concat/MakeConcatWithTemplate.java b/test/jdk/java/lang/String/concat/MakeConcatWithTemplate.java
deleted file mode 100644
index 2927afe4f9d..00000000000
--- a/test/jdk/java/lang/String/concat/MakeConcatWithTemplate.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.StringConcatFactory;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @test
- * @summary Test StringConcatFactory.makeConcatWithTemplate... methods.
- * @enablePreview true
- */
-
-public class MakeConcatWithTemplate {
-    public static void main(String... args) {
-        makeConcatWithTemplate();
-        makeConcatWithTemplateCluster();
-        makeConcatWithTemplateGetters();
-    }
-
-    static List<String> fragments(int n) {
-        String[] array = new String[n];
-        Arrays.fill(array, "abc");
-        return Arrays.asList(array);
-    }
-
-    static List<Class<?>> types(int n) {
-        Class<?>[] array = new Class<?>[n];
-        Arrays.fill(array, int.class);
-        return Arrays.asList(array);
-    }
-
-    static List<Integer> values(int n) {
-        Integer[] array = new Integer[n];
-        Arrays.fill(array, 123);
-        return Arrays.asList(array);
-    }
-
-    static List<MethodHandle> getters(int n) {
-        MethodHandle[] array = new MethodHandle[n];
-        MethodHandle m = MethodHandles.dropArguments(MethodHandles.constant(int.class, 123), 0, Object.class);
-        Arrays.fill(array, m);
-        return Arrays.asList(array);
-    }
-
-    static void makeConcatWithTemplate() {
-        try {
-            int n = StringConcatFactory.MAX_INDY_CONCAT_ARG_SLOTS - 1;
-            MethodHandle m = StringConcatFactory.makeConcatWithTemplate(fragments(n + 1), types(n));
-            m.invokeWithArguments(values(n));
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
-        }
-
-        try {
-            int n = StringConcatFactory.MAX_INDY_CONCAT_ARG_SLOTS;
-            MethodHandle m = StringConcatFactory.makeConcatWithTemplate(fragments(n + 1), types(n));
-            m.invokeWithArguments(values(n));
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
-        }
-
-        boolean threw = false;
-        try {
-            int n = StringConcatFactory.MAX_INDY_CONCAT_ARG_SLOTS + 1;
-            MethodHandle m = StringConcatFactory.makeConcatWithTemplate(fragments(n + 1), types(n));
-            m.invokeWithArguments(values(n));
-        } catch (Throwable e) {
-            threw = true;
-        }
-
-        if (!threw) {
-            throw new RuntimeException("Exception expected - makeConcatWithTemplate");
-        }
-    }
-
-    static void makeConcatWithTemplateCluster() {
-        int n = StringConcatFactory.MAX_INDY_CONCAT_ARG_SLOTS;
-        int c = 3;
-        try {
-            List<MethodHandle> ms = StringConcatFactory.makeConcatWithTemplateCluster(fragments(c * n + 1), types(c * n), n);
-            MethodHandle m0 = ms.get(0);
-            MethodHandle m1 = ms.get(1);
-            MethodHandle m2 = ms.get(2);
-            MethodHandle m3 = ms.get(3);
-
-            String s = (String)m0.invokeWithArguments(values(n));
-            List<Object> args = new ArrayList<>();
-            args.add(s);
-            args.addAll(values(n - 1)); // one less for carry over string
-            s = (String)m1.invokeWithArguments(args);
-            args.clear();
-            args.add(s);
-            args.addAll(values(n - 1)); // one less for carry over string
-            s = (String)m2.invokeWithArguments(args);
-            args.clear();
-            args.add(s);
-            args.addAll(values(2)); // two remaining carry overs
-            s = (String)m3.invokeWithArguments(args);
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    static void makeConcatWithTemplateGetters() {
-        int n = StringConcatFactory.MAX_INDY_CONCAT_ARG_SLOTS;
-        int c = 3;
-        try {
-            MethodHandle m = StringConcatFactory.makeConcatWithTemplateGetters(fragments(c * n + 1), getters(c * n), n);
-            String s = (String)m.invoke(null);
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/test/jdk/java/lang/template/Basic.java b/test/jdk/java/lang/template/Basic.java
deleted file mode 100644
index e0096ce0b57..00000000000
--- a/test/jdk/java/lang/template/Basic.java
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- * Copyright (c) 2023, 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 0000000
- * @summary Exercise runtime handing of templated strings.
- * @enablePreview true
- */
-
-import java.lang.StringTemplate.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.function.*;
-
-import static java.lang.StringTemplate.RAW;
-
-public class Basic {
-    public static void main(String... arg) {
-        equalsHashCode();
-        concatenationTests();
-        componentTests();
-        limitsTests();
-        processorTests();
-        stringTemplateCoverage();
-        simpleProcessorCoverage();
-    }
-
-    static void ASSERT(String a, String b) {
-        if (!Objects.equals(a, b)) {
-            System.out.println(a);
-            System.out.println(b);
-            throw new RuntimeException("Test failed");
-        }
-    }
-
-    static void ASSERT(Object a, Object b) {
-        if (!Objects.deepEquals(a, b)) {
-            System.out.println(a);
-            System.out.println(b);
-            throw new RuntimeException("Test failed");
-        }
-    }
-
-    /*
-     * equals and hashCode tests.
-     */
-    static void equalsHashCode() {
-        int x = 10;
-        int y = 20;
-        int a = 10;
-        int b = 20;
-
-        StringTemplate st0 = RAW."\{x} + \{y} = \{x + y}";
-        StringTemplate st1 = RAW."\{a} + \{b} = \{a + b}";
-        StringTemplate st2 = RAW."\{x} + \{y} = \{x + y}!";
-        x++;
-        StringTemplate st3 = RAW."\{x} + \{y} = \{x + y}";
-
-        if (!st0.equals(st1)) throw new RuntimeException("st0 != st1");
-        if (st0.equals(st2)) throw new RuntimeException("st0 == st2");
-        if (st0.equals(st3)) throw new RuntimeException("st0 == st3");
-
-        if (st0.hashCode() != st1.hashCode()) throw new RuntimeException("st0.hashCode() != st1.hashCode()");
-    }
-
-    /*
-     * Concatenation tests.
-     */
-    static void concatenationTests() {
-        int x = 10;
-        int y = 20;
-
-        ASSERT(STR."\{x} \{y}", x + " " + y);
-        ASSERT(STR."\{x + y}", "" + (x + y));
-        ASSERT(STR.process(RAW."\{x} \{y}"), x + " " + y);
-        ASSERT(STR.process(RAW."\{x + y}"), "" + (x + y));
-        ASSERT((RAW."\{x} \{y}").process(STR), x + " " + y);
-        ASSERT((RAW."\{x + y}").process(STR), "" + (x + y));
-    }
-
-    /*
-     * Component tests.
-     */
-    static void componentTests() {
-        int x = 10;
-        int y = 20;
-
-        StringTemplate st = RAW."\{x} + \{y} = \{x + y}";
-        ASSERT(st.values(), List.of(x, y, x + y));
-        ASSERT(st.fragments(), List.of("", " + ", " = ", ""));
-        ASSERT(st.interpolate(), x + " + " + y + " = " + (x + y));
-    }
-
-    /*
-     * Limits tests.
-     */
-    static void limitsTests() {
-        int x = 9;
-
-        StringTemplate ts250 = RAW."""
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             """;
-        ASSERT(ts250.values().size(), 250);
-        ASSERT(ts250.interpolate(), """
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999
-               """);
-
-        StringTemplate ts251 = RAW."""
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}
-             """;
-        ASSERT(ts251.values().size(), 251);
-        ASSERT(ts251.interpolate(), """
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9
-               """);
-
-        StringTemplate ts252 = RAW."""
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}
-             """;
-        ASSERT(ts252.values().size(), 252);
-        ASSERT(ts252.interpolate(), """
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 99
-               """);
-
-        StringTemplate ts253 = RAW."""
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}
-             """;
-        ASSERT(ts253.values().size(), 253);
-        ASSERT(ts253.interpolate(), """
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 999
-               """);
-
-        StringTemplate ts254 = RAW."""
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}
-             """;
-        ASSERT(ts254.values().size(), 254);
-        ASSERT(ts254.interpolate(), """
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999
-               """);
-
-        StringTemplate ts255 = RAW."""
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}
-             """;
-        ASSERT(ts255.values().size(), 255);
-        ASSERT(ts255.interpolate(), """
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 99999
-               """);
-
-        StringTemplate ts256 = RAW."""
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}
-             \{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x}\{x} \{x}\{x}\{x}\{x}\{x}\{x}
-             """;
-        ASSERT(ts256.values().size(), 256);
-        ASSERT(ts256.interpolate(), """
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 9999999999
-
-               9999999999 9999999999
-               9999999999 9999999999
-               9999999999 999999
-               """);
-
-    }
-
-    /*
-     * Processor tests.
-     */
-    public static final Processor<StringTemplate, RuntimeException> STRINGIFY = st -> {
-        List<Object> values = st.values()
-                .stream()
-                .map(v -> (Object)String.valueOf(v))
-                .toList();
-
-        return StringTemplate.of(st.fragments(), values);
-    };
-
-    public static final Processor<StringTemplate, RuntimeException> UPPER = st -> {
-        List<String> fragments = st.fragments()
-                .stream()
-                .map(String::toUpperCase)
-                .toList();
-
-        return StringTemplate.of(fragments, st.values());
-    };
-
-    public static final Processor<String, RuntimeException> CHAIN = st -> {
-        st = STRINGIFY.process(st);
-        st = UPPER.process(st);
-        return STR.process(st);
-    };
-
-    static void processorTests() {
-        String name = "Joan";
-        int age = 25;
-        ASSERT(CHAIN."\{name} is \{age} years old", "Joan IS 25 YEARS OLD");
-    }
-
-    /*
-     *  StringTemplate coverage
-     */
-    static void stringTemplateCoverage() {
-        StringTemplate tsNoValues = StringTemplate.of("No Values");
-
-        ASSERT(tsNoValues.values(), List.of());
-        ASSERT(tsNoValues.fragments(), List.of("No Values"));
-        ASSERT(tsNoValues.interpolate(), STR."No Values");
-
-        int x = 10, y = 20;
-        StringTemplate src = RAW."\{x} + \{y} = \{x + y}";
-        StringTemplate tsValues = StringTemplate.of(src.fragments(), src.values());
-        ASSERT(tsValues.fragments(), List.of("", " + ", " = ", ""));
-        ASSERT(tsValues.values(), List.of(x, y, x + y));
-        ASSERT(tsValues.interpolate(), x + " + " + y + " = " + (x + y));
-        ASSERT(StringTemplate.combine(src, src).interpolate(),
-                RAW."\{x} + \{y} = \{x + y}\{x} + \{y} = \{x + y}".interpolate());
-        ASSERT(StringTemplate.combine(src), src);
-        ASSERT(StringTemplate.combine().interpolate(), "");
-        ASSERT(StringTemplate.combine(List.of(src, src)).interpolate(),
-                RAW."\{x} + \{y} = \{x + y}\{x} + \{y} = \{x + y}".interpolate());
-    }
-
-    /*
-     * SimpleProcessor coverage.
-     */
-
-    static class Processor0 implements Processor<String, IllegalArgumentException> {
-        @Override
-        public String process(StringTemplate stringTemplate) throws IllegalArgumentException {
-            StringBuilder sb = new StringBuilder();
-            Iterator<String> fragmentsIter = stringTemplate.fragments().iterator();
-
-            for (Object value : stringTemplate.values()) {
-                sb.append(fragmentsIter.next());
-
-                if (value instanceof Boolean) {
-                    throw new IllegalArgumentException("I don't like Booleans");
-                }
-
-                sb.append(value);
-            }
-
-            sb.append(fragmentsIter.next());
-
-            return sb.toString();
-        }
-    }
-
-    static Processor0 processor0 = new Processor0();
-
-    static Processor<String, RuntimeException> processor1 =
-        st -> st.interpolate();
-
-    static Processor<String, RuntimeException> processor2 = st -> st.interpolate();
-
-    static Processor<String, RuntimeException> processor3 = st -> st.interpolate();
-
-    static Processor<String, RuntimeException> processor4 = st ->
-        StringTemplate.interpolate(st.fragments(), st.values());
-
-
-    static void simpleProcessorCoverage() {
-        try {
-            int x = 10;
-            int y = 20;
-            ASSERT(processor0."\{x} + \{y} = \{x + y}", "10 + 20 = 30");
-            ASSERT(processor1."\{x} + \{y} = \{x + y}", "10 + 20 = 30");
-            ASSERT(processor2."\{x} + \{y} = \{x + y}", "10 + 20 = 30");
-            ASSERT(processor3."\{x} + \{y} = \{x + y}", "10 + 20 = 30");
-            ASSERT(processor4."\{x} + \{y} = \{x + y}", "10 + 20 = 30");
-        } catch (IllegalArgumentException ex) {
-            throw new RuntimeException("processor fail");
-        }
-    }
-
-    static String justify(String string, int width) {
-        boolean leftJustify = width < 0;
-        int length = string.length();
-        width = Math.abs(width);
-        int diff = width - length;
-
-        if (diff < 0) {
-            string = "*".repeat(width);
-        } else if (0 < diff) {
-            if (leftJustify) {
-                string += " ".repeat(diff);
-            } else {
-                string = " ".repeat(diff) + string;
-            }
-        }
-
-        return string;
-    }
-
-}
diff --git a/test/jdk/java/lang/template/FormatterBuilder.java b/test/jdk/java/lang/template/FormatterBuilder.java
deleted file mode 100644
index 1fc79e89846..00000000000
--- a/test/jdk/java/lang/template/FormatterBuilder.java
+++ /dev/null
@@ -1,961 +0,0 @@
-/*
- * Copyright (c) 2023, 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 0000000
- * @summary Exercise format builder.
- * @enablePreview true
- */
-
-import java.util.FormatProcessor;
-import java.util.Objects;
-import java.util.Locale;
-import java.util.MissingFormatArgumentException;
-import java.util.UnknownFormatConversionException;
-
-import static java.util.FormatProcessor.FMT;
-
-public class FormatterBuilder {
-    public static void main(String... args) {
-        Locale.setDefault(Locale.US);
-        suite(FMT);
-        Locale thai = Locale.forLanguageTag("th-TH-u-nu-thai");
-        FormatProcessor thaiFormat = FormatProcessor.create(thai);
-        Locale.setDefault(thai);
-        suite(thaiFormat);
-    }
-
-    static void test(String a, String b) {
-        if (!Objects.equals(a, b)) {
-            throw new RuntimeException("format and FMT do not match: " + a + " : " + b);
-        }
-    }
-
-    public interface Executable {
-        void execute() throws Throwable;
-    }
-
-    static <T extends Throwable> void assertThrows(Class<T> expectedType, Executable executable, String message) {
-        Throwable actualException = null;
-        try {
-            executable.execute();
-        } catch (Throwable e) {
-            actualException = e;
-        }
-        if (actualException == null) {
-            throw new RuntimeException("Expected " + expectedType + " to be thrown, but nothing was thrown.");
-        }
-        if (!expectedType.isInstance(actualException)) {
-            throw new RuntimeException("Expected " + expectedType + " to be thrown, but was thrown " + actualException.getClass());
-        }
-        if (message != null && !message.equals(actualException.getMessage())) {
-            throw new RuntimeException("Expected " + message + " to be thrown, but was thrown " + actualException.getMessage());
-        }
-    }
-
-    static void suite(FormatProcessor fmt) {
-        Object nullObject = null;
-        test(String.format("%b", false), fmt."%b\{false}");
-        test(String.format("%b", true), fmt."%b\{true}");
-        test(String.format("%10b", false), fmt."%10b\{false}");
-        test(String.format("%10b", true), fmt."%10b\{true}");
-        test(String.format("%-10b", false), fmt."%-10b\{false}");
-        test(String.format("%-10b", true), fmt."%-10b\{true}");
-        test(String.format("%B", false), fmt."%B\{false}");
-        test(String.format("%B", true), fmt."%B\{true}");
-        test(String.format("%10B", false), fmt."%10B\{false}");
-        test(String.format("%10B", true), fmt."%10B\{true}");
-        test(String.format("%-10B", false), fmt."%-10B\{false}");
-        test(String.format("%-10B", true), fmt."%-10B\{true}");
-
-        test(String.format("%h", 12345), fmt."%h\{12345}");
-        test(String.format("%h", 0xABCDE), fmt."%h\{0xABCDE}");
-        test(String.format("%10h", 12345), fmt."%10h\{12345}");
-        test(String.format("%10h", 0xABCDE), fmt."%10h\{0xABCDE}");
-        test(String.format("%-10h", 12345), fmt."%-10h\{12345}");
-        test(String.format("%-10h", 0xABCDE), fmt."%-10h\{0xABCDE}");
-        test(String.format("%H", 12345), fmt."%H\{12345}");
-        test(String.format("%H", 0xABCDE), fmt."%H\{0xABCDE}");
-        test(String.format("%10H", 12345), fmt."%10H\{12345}");
-        test(String.format("%10H", 0xABCDE), fmt."%10H\{0xABCDE}");
-        test(String.format("%-10H", 12345), fmt."%-10H\{12345}");
-        test(String.format("%-10H", 0xABCDE), fmt."%-10H\{0xABCDE}");
-
-        test(String.format("%s", (byte)0xFF), fmt."%s\{(byte)0xFF}");
-        test(String.format("%s", (short)0xFFFF), fmt."%s\{(short)0xFFFF}");
-        test(String.format("%s", 12345), fmt."%s\{12345}");
-        test(String.format("%s", 12345L), fmt."%s\{12345L}");
-        test(String.format("%s", 1.33f), fmt."%s\{1.33f}");
-        test(String.format("%s", 1.33), fmt."%s\{1.33}");
-        test(String.format("%s", "abcde"), fmt."%s\{"abcde"}");
-        test(String.format("%s", nullObject), fmt."%s\{nullObject}");
-        test(String.format("%10s", (byte)0xFF), fmt."%10s\{(byte)0xFF}");
-        test(String.format("%10s", (short)0xFFFF), fmt."%10s\{(short)0xFFFF}");
-        test(String.format("%10s", 12345), fmt."%10s\{12345}");
-        test(String.format("%10s", 12345L), fmt."%10s\{12345L}");
-        test(String.format("%10s", 1.33f), fmt."%10s\{1.33f}");
-        test(String.format("%10s", 1.33), fmt."%10s\{1.33}");
-        test(String.format("%10s", "abcde"), fmt."%10s\{"abcde"}");
-        test(String.format("%10s", nullObject), fmt."%10s\{nullObject}");
-        test(String.format("%-10s", (byte)0xFF), fmt."%-10s\{(byte)0xFF}");
-        test(String.format("%-10s", (short)0xFFFF), fmt."%-10s\{(short)0xFFFF}");
-        test(String.format("%-10s", 12345), fmt."%-10s\{12345}");
-        test(String.format("%-10s", 12345L), fmt."%-10s\{12345L}");
-        test(String.format("%-10s", 1.33f), fmt."%-10s\{1.33f}");
-        test(String.format("%-10s", 1.33), fmt."%-10s\{1.33}");
-        test(String.format("%-10s", "abcde"), fmt."%-10s\{"abcde"}");
-        test(String.format("%-10s", nullObject), fmt."%-10s\{nullObject}");
-        test(String.format("%S", (byte)0xFF), fmt."%S\{(byte)0xFF}");
-        test(String.format("%S", (short)0xFFFF), fmt."%S\{(short)0xFFFF}");
-        test(String.format("%S", 12345), fmt."%S\{12345}");
-        test(String.format("%S", 12345L), fmt."%S\{12345L}");
-        test(String.format("%S", 1.33f), fmt."%S\{1.33f}");
-        test(String.format("%S", 1.33), fmt."%S\{1.33}");
-        test(String.format("%S", "abcde"), fmt."%S\{"abcde"}");
-        test(String.format("%S", nullObject), fmt."%S\{nullObject}");
-        test(String.format("%10S", (byte)0xFF), fmt."%10S\{(byte)0xFF}");
-        test(String.format("%10S", (short)0xFFFF), fmt."%10S\{(short)0xFFFF}");
-        test(String.format("%10S", 12345), fmt."%10S\{12345}");
-        test(String.format("%10S", 12345L), fmt."%10S\{12345L}");
-        test(String.format("%10S", 1.33f), fmt."%10S\{1.33f}");
-        test(String.format("%10S", 1.33), fmt."%10S\{1.33}");
-        test(String.format("%10S", "abcde"), fmt."%10S\{"abcde"}");
-        test(String.format("%10S", nullObject), fmt."%10S\{nullObject}");
-        test(String.format("%-10S", (byte)0xFF), fmt."%-10S\{(byte)0xFF}");
-        test(String.format("%-10S", (short)0xFFFF), fmt."%-10S\{(short)0xFFFF}");
-        test(String.format("%-10S", 12345), fmt."%-10S\{12345}");
-        test(String.format("%-10S", 12345L), fmt."%-10S\{12345L}");
-        test(String.format("%-10S", 1.33f), fmt."%-10S\{1.33f}");
-        test(String.format("%-10S", 1.33), fmt."%-10S\{1.33}");
-        test(String.format("%-10S", "abcde"), fmt."%-10S\{"abcde"}");
-        test(String.format("%-10S", nullObject), fmt."%-10S\{nullObject}");
-
-        test(String.format("%c", 'a'), fmt."%c\{'a'}");
-        test(String.format("%10c", 'a'), fmt."%10c\{'a'}");
-        test(String.format("%-10c", 'a'), fmt."%-10c\{'a'}");
-        test(String.format("%C", 'a'), fmt."%C\{'a'}");
-        test(String.format("%10C", 'a'), fmt."%10C\{'a'}");
-        test(String.format("%-10C", 'a'), fmt."%-10C\{'a'}");
-
-        test(String.format("%d", -12345), fmt."%d\{-12345}");
-        test(String.format("%d", 0), fmt."%d\{0}");
-        test(String.format("%d", 12345), fmt."%d\{12345}");
-        test(String.format("%10d", -12345), fmt."%10d\{-12345}");
-        test(String.format("%10d", 0), fmt."%10d\{0}");
-        test(String.format("%10d", 12345), fmt."%10d\{12345}");
-        test(String.format("%-10d", -12345), fmt."%-10d\{-12345}");
-        test(String.format("%-10d", 0), fmt."%-10d\{0}");
-        test(String.format("%-10d", 12345), fmt."%-10d\{12345}");
-        test(String.format("%,d", -12345), fmt."%,d\{-12345}");
-        test(String.format("%,d", 0), fmt."%,d\{0}");
-        test(String.format("%,d", 12345), fmt."%,d\{12345}");
-        test(String.format("%,10d", -12345), fmt."%,10d\{-12345}");
-        test(String.format("%,10d", 0), fmt."%,10d\{0}");
-        test(String.format("%,10d", 12345), fmt."%,10d\{12345}");
-        test(String.format("%,-10d", -12345), fmt."%,-10d\{-12345}");
-        test(String.format("%,-10d", 0), fmt."%,-10d\{0}");
-        test(String.format("%,-10d", 12345), fmt."%,-10d\{12345}");
-        test(String.format("%010d", -12345), fmt."%010d\{-12345}");
-        test(String.format("%010d", 0), fmt."%010d\{0}");
-        test(String.format("%010d", 12345), fmt."%010d\{12345}");
-        test(String.format("%,010d", -12345), fmt."%,010d\{-12345}");
-        test(String.format("%,010d", 0), fmt."%,010d\{0}");
-        test(String.format("%,010d", 12345), fmt."%,010d\{12345}");
-
-        test(String.format("%d", -12345), fmt."%d\{-12345}");
-        test(String.format("%d", 0), fmt."%d\{0}");
-        test(String.format("%d", 12345), fmt."%d\{12345}");
-        test(String.format("%10d", -12345), fmt."%10d\{-12345}");
-        test(String.format("%10d", 0), fmt."%10d\{0}");
-        test(String.format("%10d", 12345), fmt."%10d\{12345}");
-        test(String.format("%-10d", -12345), fmt."%-10d\{-12345}");
-        test(String.format("%-10d", 0), fmt."%-10d\{0}");
-        test(String.format("%-10d", 12345), fmt."%-10d\{12345}");
-        test(String.format("%,d", -12345), fmt."%,d\{-12345}");
-        test(String.format("%,d", 0), fmt."%,d\{0}");
-        test(String.format("%,d", 12345), fmt."%,d\{12345}");
-        test(String.format("%,10d", -12345), fmt."%,10d\{-12345}");
-        test(String.format("%,10d", 0), fmt."%,10d\{0}");
-        test(String.format("%,10d", 12345), fmt."%,10d\{12345}");
-        test(String.format("%,-10d", -12345), fmt."%,-10d\{-12345}");
-        test(String.format("%,-10d", 0), fmt."%,-10d\{0}");
-        test(String.format("%,-10d", 12345), fmt."%,-10d\{12345}");
-        test(String.format("% d", -12345), fmt."% d\{-12345}");
-        test(String.format("% d", 0), fmt."% d\{0}");
-        test(String.format("% d", 12345), fmt."% d\{12345}");
-        test(String.format("% 10d", -12345), fmt."% 10d\{-12345}");
-        test(String.format("% 10d", 0), fmt."% 10d\{0}");
-        test(String.format("% 10d", 12345), fmt."% 10d\{12345}");
-        test(String.format("% -10d", -12345), fmt."% -10d\{-12345}");
-        test(String.format("% -10d", 0), fmt."% -10d\{0}");
-        test(String.format("% -10d", 12345), fmt."% -10d\{12345}");
-        test(String.format("%, d", -12345), fmt."%, d\{-12345}");
-        test(String.format("%, d", 0), fmt."%, d\{0}");
-        test(String.format("%, d", 12345), fmt."%, d\{12345}");
-        test(String.format("%, 10d", -12345), fmt."%, 10d\{-12345}");
-        test(String.format("%, 10d", 0), fmt."%, 10d\{0}");
-        test(String.format("%, 10d", 12345), fmt."%, 10d\{12345}");
-        test(String.format("%, -10d", -12345), fmt."%, -10d\{-12345}");
-        test(String.format("%, -10d", 0), fmt."%, -10d\{0}");
-        test(String.format("%, -10d", 12345), fmt."%, -10d\{12345}");
-        test(String.format("%010d", -12345), fmt."%010d\{-12345}");
-        test(String.format("%010d", 0), fmt."%010d\{0}");
-        test(String.format("%010d", 12345), fmt."%010d\{12345}");
-        test(String.format("%,010d", -12345), fmt."%,010d\{-12345}");
-        test(String.format("%,010d", 0), fmt."%,010d\{0}");
-        test(String.format("%,010d", 12345), fmt."%,010d\{12345}");
-        test(String.format("% 010d", -12345), fmt."% 010d\{-12345}");
-        test(String.format("% 010d", 0), fmt."% 010d\{0}");
-        test(String.format("% 010d", 12345), fmt."% 010d\{12345}");
-        test(String.format("%, 010d", -12345), fmt."%, 010d\{-12345}");
-        test(String.format("%, 010d", 0), fmt."%, 010d\{0}");
-        test(String.format("%, 010d", 12345), fmt."%, 010d\{12345}");
-
-        test(String.format("%d", -12345), fmt."%d\{-12345}");
-        test(String.format("%d", 0), fmt."%d\{0}");
-        test(String.format("%d", 12345), fmt."%d\{12345}");
-        test(String.format("%10d", -12345), fmt."%10d\{-12345}");
-        test(String.format("%10d", 0), fmt."%10d\{0}");
-        test(String.format("%10d", 12345), fmt."%10d\{12345}");
-        test(String.format("%-10d", -12345), fmt."%-10d\{-12345}");
-        test(String.format("%-10d", 0), fmt."%-10d\{0}");
-        test(String.format("%-10d", 12345), fmt."%-10d\{12345}");
-        test(String.format("%,d", -12345), fmt."%,d\{-12345}");
-        test(String.format("%,d", 0), fmt."%,d\{0}");
-        test(String.format("%,d", 12345), fmt."%,d\{12345}");
-        test(String.format("%,10d", -12345), fmt."%,10d\{-12345}");
-        test(String.format("%,10d", 0), fmt."%,10d\{0}");
-        test(String.format("%,10d", 12345), fmt."%,10d\{12345}");
-        test(String.format("%,-10d", -12345), fmt."%,-10d\{-12345}");
-        test(String.format("%,-10d", 0), fmt."%,-10d\{0}");
-        test(String.format("%,-10d", 12345), fmt."%,-10d\{12345}");
-        test(String.format("%+d", -12345), fmt."%+d\{-12345}");
-        test(String.format("%+d", 0), fmt."%+d\{0}");
-        test(String.format("%+d", 12345), fmt."%+d\{12345}");
-        test(String.format("%+10d", -12345), fmt."%+10d\{-12345}");
-        test(String.format("%+10d", 0), fmt."%+10d\{0}");
-        test(String.format("%+10d", 12345), fmt."%+10d\{12345}");
-        test(String.format("%+-10d", -12345), fmt."%+-10d\{-12345}");
-        test(String.format("%+-10d", 0), fmt."%+-10d\{0}");
-        test(String.format("%+-10d", 12345), fmt."%+-10d\{12345}");
-        test(String.format("%,+d", -12345), fmt."%,+d\{-12345}");
-        test(String.format("%,+d", 0), fmt."%,+d\{0}");
-        test(String.format("%,+d", 12345), fmt."%,+d\{12345}");
-        test(String.format("%,+10d", -12345), fmt."%,+10d\{-12345}");
-        test(String.format("%,+10d", 0), fmt."%,+10d\{0}");
-        test(String.format("%,+10d", 12345), fmt."%,+10d\{12345}");
-        test(String.format("%,+-10d", -12345), fmt."%,+-10d\{-12345}");
-        test(String.format("%,+-10d", 0), fmt."%,+-10d\{0}");
-        test(String.format("%,+-10d", 12345), fmt."%,+-10d\{12345}");
-        test(String.format("%010d", -12345), fmt."%010d\{-12345}");
-        test(String.format("%010d", 0), fmt."%010d\{0}");
-        test(String.format("%010d", 12345), fmt."%010d\{12345}");
-        test(String.format("%,010d", -12345), fmt."%,010d\{-12345}");
-        test(String.format("%,010d", 0), fmt."%,010d\{0}");
-        test(String.format("%,010d", 12345), fmt."%,010d\{12345}");
-        test(String.format("%+010d", -12345), fmt."%+010d\{-12345}");
-        test(String.format("%+010d", 0), fmt."%+010d\{0}");
-        test(String.format("%+010d", 12345), fmt."%+010d\{12345}");
-        test(String.format("%,+010d", -12345), fmt."%,+010d\{-12345}");
-        test(String.format("%,+010d", 0), fmt."%,+010d\{0}");
-        test(String.format("%,+010d", 12345), fmt."%,+010d\{12345}");
-
-        test(String.format("%d", -12345), fmt."%d\{-12345}");
-        test(String.format("%d", 0), fmt."%d\{0}");
-        test(String.format("%d", 12345), fmt."%d\{12345}");
-        test(String.format("%10d", -12345), fmt."%10d\{-12345}");
-        test(String.format("%10d", 0), fmt."%10d\{0}");
-        test(String.format("%10d", 12345), fmt."%10d\{12345}");
-        test(String.format("%-10d", -12345), fmt."%-10d\{-12345}");
-        test(String.format("%-10d", 0), fmt."%-10d\{0}");
-        test(String.format("%-10d", 12345), fmt."%-10d\{12345}");
-        test(String.format("%,d", -12345), fmt."%,d\{-12345}");
-        test(String.format("%,d", 0), fmt."%,d\{0}");
-        test(String.format("%,d", 12345), fmt."%,d\{12345}");
-        test(String.format("%,10d", -12345), fmt."%,10d\{-12345}");
-        test(String.format("%,10d", 0), fmt."%,10d\{0}");
-        test(String.format("%,10d", 12345), fmt."%,10d\{12345}");
-        test(String.format("%,-10d", -12345), fmt."%,-10d\{-12345}");
-        test(String.format("%,-10d", 0), fmt."%,-10d\{0}");
-        test(String.format("%,-10d", 12345), fmt."%,-10d\{12345}");
-        test(String.format("%(d", -12345), fmt."%(d\{-12345}");
-        test(String.format("%(d", 0), fmt."%(d\{0}");
-        test(String.format("%(d", 12345), fmt."%(d\{12345}");
-        test(String.format("%(10d", -12345), fmt."%(10d\{-12345}");
-        test(String.format("%(10d", 0), fmt."%(10d\{0}");
-        test(String.format("%(10d", 12345), fmt."%(10d\{12345}");
-        test(String.format("%(-10d", -12345), fmt."%(-10d\{-12345}");
-        test(String.format("%(-10d", 0), fmt."%(-10d\{0}");
-        test(String.format("%(-10d", 12345), fmt."%(-10d\{12345}");
-        test(String.format("%,(d", -12345), fmt."%,(d\{-12345}");
-        test(String.format("%,(d", 0), fmt."%,(d\{0}");
-        test(String.format("%,(d", 12345), fmt."%,(d\{12345}");
-        test(String.format("%,(10d", -12345), fmt."%,(10d\{-12345}");
-        test(String.format("%,(10d", 0), fmt."%,(10d\{0}");
-        test(String.format("%,(10d", 12345), fmt."%,(10d\{12345}");
-        test(String.format("%,(-10d", -12345), fmt."%,(-10d\{-12345}");
-        test(String.format("%,(-10d", 0), fmt."%,(-10d\{0}");
-        test(String.format("%,(-10d", 12345), fmt."%,(-10d\{12345}");
-        test(String.format("%010d", -12345), fmt."%010d\{-12345}");
-        test(String.format("%010d", 0), fmt."%010d\{0}");
-        test(String.format("%010d", 12345), fmt."%010d\{12345}");
-        test(String.format("%,010d", -12345), fmt."%,010d\{-12345}");
-        test(String.format("%,010d", 0), fmt."%,010d\{0}");
-        test(String.format("%,010d", 12345), fmt."%,010d\{12345}");
-        test(String.format("%(010d", -12345), fmt."%(010d\{-12345}");
-        test(String.format("%(010d", 0), fmt."%(010d\{0}");
-        test(String.format("%(010d", 12345), fmt."%(010d\{12345}");
-        test(String.format("%,(010d", -12345), fmt."%,(010d\{-12345}");
-        test(String.format("%,(010d", 0), fmt."%,(010d\{0}");
-        test(String.format("%,(010d", 12345), fmt."%,(010d\{12345}");
-
-        test(String.format("%o", -12345), fmt."%o\{-12345}");
-        test(String.format("%o", 0), fmt."%o\{0}");
-        test(String.format("%o", 12345), fmt."%o\{12345}");
-        test(String.format("%10o", -12345), fmt."%10o\{-12345}");
-        test(String.format("%10o", 0), fmt."%10o\{0}");
-        test(String.format("%10o", 12345), fmt."%10o\{12345}");
-        test(String.format("%-10o", -12345), fmt."%-10o\{-12345}");
-        test(String.format("%-10o", 0), fmt."%-10o\{0}");
-        test(String.format("%-10o", 12345), fmt."%-10o\{12345}");
-        test(String.format("%#o", -12345), fmt."%#o\{-12345}");
-        test(String.format("%#o", 0), fmt."%#o\{0}");
-        test(String.format("%#o", 12345), fmt."%#o\{12345}");
-        test(String.format("%#10o", -12345), fmt."%#10o\{-12345}");
-        test(String.format("%#10o", 0), fmt."%#10o\{0}");
-        test(String.format("%#10o", 12345), fmt."%#10o\{12345}");
-        test(String.format("%#-10o", -12345), fmt."%#-10o\{-12345}");
-        test(String.format("%#-10o", 0), fmt."%#-10o\{0}");
-        test(String.format("%#-10o", 12345), fmt."%#-10o\{12345}");
-        test(String.format("%010o", -12345), fmt."%010o\{-12345}");
-        test(String.format("%010o", 0), fmt."%010o\{0}");
-        test(String.format("%010o", 12345), fmt."%010o\{12345}");
-        test(String.format("%#010o", -12345), fmt."%#010o\{-12345}");
-        test(String.format("%#010o", 0), fmt."%#010o\{0}");
-        test(String.format("%#010o", 12345), fmt."%#010o\{12345}");
-
-        test(String.format("%x", -12345), fmt."%x\{-12345}");
-        test(String.format("%x", 0), fmt."%x\{0}");
-        test(String.format("%x", 12345), fmt."%x\{12345}");
-        test(String.format("%10x", -12345), fmt."%10x\{-12345}");
-        test(String.format("%10x", 0), fmt."%10x\{0}");
-        test(String.format("%10x", 12345), fmt."%10x\{12345}");
-        test(String.format("%-10x", -12345), fmt."%-10x\{-12345}");
-        test(String.format("%-10x", 0), fmt."%-10x\{0}");
-        test(String.format("%-10x", 12345), fmt."%-10x\{12345}");
-        test(String.format("%X", -12345), fmt."%X\{-12345}");
-        test(String.format("%X", 0), fmt."%X\{0}");
-        test(String.format("%X", 12345), fmt."%X\{12345}");
-        test(String.format("%10X", -12345), fmt."%10X\{-12345}");
-        test(String.format("%10X", 0), fmt."%10X\{0}");
-        test(String.format("%10X", 12345), fmt."%10X\{12345}");
-        test(String.format("%-10X", -12345), fmt."%-10X\{-12345}");
-        test(String.format("%-10X", 0), fmt."%-10X\{0}");
-        test(String.format("%-10X", 12345), fmt."%-10X\{12345}");
-        test(String.format("%#x", -12345), fmt."%#x\{-12345}");
-        test(String.format("%#x", 0), fmt."%#x\{0}");
-        test(String.format("%#x", 12345), fmt."%#x\{12345}");
-        test(String.format("%#10x", -12345), fmt."%#10x\{-12345}");
-        test(String.format("%#10x", 0), fmt."%#10x\{0}");
-        test(String.format("%#10x", 12345), fmt."%#10x\{12345}");
-        test(String.format("%#-10x", -12345), fmt."%#-10x\{-12345}");
-        test(String.format("%#-10x", 0), fmt."%#-10x\{0}");
-        test(String.format("%#-10x", 12345), fmt."%#-10x\{12345}");
-        test(String.format("%#X", -12345), fmt."%#X\{-12345}");
-        test(String.format("%#X", 0), fmt."%#X\{0}");
-        test(String.format("%#X", 12345), fmt."%#X\{12345}");
-        test(String.format("%#10X", -12345), fmt."%#10X\{-12345}");
-        test(String.format("%#10X", 0), fmt."%#10X\{0}");
-        test(String.format("%#10X", 12345), fmt."%#10X\{12345}");
-        test(String.format("%#-10X", -12345), fmt."%#-10X\{-12345}");
-        test(String.format("%#-10X", 0), fmt."%#-10X\{0}");
-        test(String.format("%#-10X", 12345), fmt."%#-10X\{12345}");
-        test(String.format("%010x", -12345), fmt."%010x\{-12345}");
-        test(String.format("%010x", 0), fmt."%010x\{0}");
-        test(String.format("%010x", 12345), fmt."%010x\{12345}");
-        test(String.format("%010X", -12345), fmt."%010X\{-12345}");
-        test(String.format("%010X", 0), fmt."%010X\{0}");
-        test(String.format("%010X", 12345), fmt."%010X\{12345}");
-        test(String.format("%#010x", -12345), fmt."%#010x\{-12345}");
-        test(String.format("%#010x", 0), fmt."%#010x\{0}");
-        test(String.format("%#010x", 12345), fmt."%#010x\{12345}");
-        test(String.format("%#010X", -12345), fmt."%#010X\{-12345}");
-        test(String.format("%#010X", 0), fmt."%#010X\{0}");
-        test(String.format("%#010X", 12345), fmt."%#010X\{12345}");
-
-        test(String.format("%f", -12345.6), fmt."%f\{-12345.6}");
-        test(String.format("%f", 0.0), fmt."%f\{0.0}");
-        test(String.format("%f", 12345.6), fmt."%f\{12345.6}");
-        test(String.format("%10f", -12345.6), fmt."%10f\{-12345.6}");
-        test(String.format("%10f", 0.0), fmt."%10f\{0.0}");
-        test(String.format("%10f", 12345.6), fmt."%10f\{12345.6}");
-        test(String.format("%-10f", -12345.6), fmt."%-10f\{-12345.6}");
-        test(String.format("%-10f", 0.0), fmt."%-10f\{0.0}");
-        test(String.format("%-10f", 12345.6), fmt."%-10f\{12345.6}");
-        test(String.format("%,f", -12345.6), fmt."%,f\{-12345.6}");
-        test(String.format("%,f", 0.0), fmt."%,f\{0.0}");
-        test(String.format("%,f", 12345.6), fmt."%,f\{12345.6}");
-        test(String.format("%,10f", -12345.6), fmt."%,10f\{-12345.6}");
-        test(String.format("%,10f", 0.0), fmt."%,10f\{0.0}");
-        test(String.format("%,10f", 12345.6), fmt."%,10f\{12345.6}");
-        test(String.format("%,-10f", -12345.6), fmt."%,-10f\{-12345.6}");
-        test(String.format("%,-10f", 0.0), fmt."%,-10f\{0.0}");
-        test(String.format("%,-10f", 12345.6), fmt."%,-10f\{12345.6}");
-
-        test(String.format("%f", -12345.6), fmt."%f\{-12345.6}");
-        test(String.format("%f", 0.0), fmt."%f\{0.0}");
-        test(String.format("%f", 12345.6), fmt."%f\{12345.6}");
-        test(String.format("%10f", -12345.6), fmt."%10f\{-12345.6}");
-        test(String.format("%10f", 0.0), fmt."%10f\{0.0}");
-        test(String.format("%10f", 12345.6), fmt."%10f\{12345.6}");
-        test(String.format("%-10f", -12345.6), fmt."%-10f\{-12345.6}");
-        test(String.format("%-10f", 0.0), fmt."%-10f\{0.0}");
-        test(String.format("%-10f", 12345.6), fmt."%-10f\{12345.6}");
-        test(String.format("%,f", -12345.6), fmt."%,f\{-12345.6}");
-        test(String.format("%,f", 0.0), fmt."%,f\{0.0}");
-        test(String.format("%,f", 12345.6), fmt."%,f\{12345.6}");
-        test(String.format("%,10f", -12345.6), fmt."%,10f\{-12345.6}");
-        test(String.format("%,10f", 0.0), fmt."%,10f\{0.0}");
-        test(String.format("%,10f", 12345.6), fmt."%,10f\{12345.6}");
-        test(String.format("%,-10f", -12345.6), fmt."%,-10f\{-12345.6}");
-        test(String.format("%,-10f", 0.0), fmt."%,-10f\{0.0}");
-        test(String.format("%,-10f", 12345.6), fmt."%,-10f\{12345.6}");
-        test(String.format("% f", -12345.6), fmt."% f\{-12345.6}");
-        test(String.format("% f", 0.0), fmt."% f\{0.0}");
-        test(String.format("% f", 12345.6), fmt."% f\{12345.6}");
-        test(String.format("% 10f", -12345.6), fmt."% 10f\{-12345.6}");
-        test(String.format("% 10f", 0.0), fmt."% 10f\{0.0}");
-        test(String.format("% 10f", 12345.6), fmt."% 10f\{12345.6}");
-        test(String.format("% -10f", -12345.6), fmt."% -10f\{-12345.6}");
-        test(String.format("% -10f", 0.0), fmt."% -10f\{0.0}");
-        test(String.format("% -10f", 12345.6), fmt."% -10f\{12345.6}");
-        test(String.format("%, f", -12345.6), fmt."%, f\{-12345.6}");
-        test(String.format("%, f", 0.0), fmt."%, f\{0.0}");
-        test(String.format("%, f", 12345.6), fmt."%, f\{12345.6}");
-        test(String.format("%, 10f", -12345.6), fmt."%, 10f\{-12345.6}");
-        test(String.format("%, 10f", 0.0), fmt."%, 10f\{0.0}");
-        test(String.format("%, 10f", 12345.6), fmt."%, 10f\{12345.6}");
-        test(String.format("%, -10f", -12345.6), fmt."%, -10f\{-12345.6}");
-        test(String.format("%, -10f", 0.0), fmt."%, -10f\{0.0}");
-        test(String.format("%, -10f", 12345.6), fmt."%, -10f\{12345.6}");
-
-        test(String.format("%f", -12345.6), fmt."%f\{-12345.6}");
-        test(String.format("%f", 0.0), fmt."%f\{0.0}");
-        test(String.format("%f", 12345.6), fmt."%f\{12345.6}");
-        test(String.format("%10f", -12345.6), fmt."%10f\{-12345.6}");
-        test(String.format("%10f", 0.0), fmt."%10f\{0.0}");
-        test(String.format("%10f", 12345.6), fmt."%10f\{12345.6}");
-        test(String.format("%-10f", -12345.6), fmt."%-10f\{-12345.6}");
-        test(String.format("%-10f", 0.0), fmt."%-10f\{0.0}");
-        test(String.format("%-10f", 12345.6), fmt."%-10f\{12345.6}");
-        test(String.format("%,f", -12345.6), fmt."%,f\{-12345.6}");
-        test(String.format("%,f", 0.0), fmt."%,f\{0.0}");
-        test(String.format("%,f", 12345.6), fmt."%,f\{12345.6}");
-        test(String.format("%,10f", -12345.6), fmt."%,10f\{-12345.6}");
-        test(String.format("%,10f", 0.0), fmt."%,10f\{0.0}");
-        test(String.format("%,10f", 12345.6), fmt."%,10f\{12345.6}");
-        test(String.format("%,-10f", -12345.6), fmt."%,-10f\{-12345.6}");
-        test(String.format("%,-10f", 0.0), fmt."%,-10f\{0.0}");
-        test(String.format("%,-10f", 12345.6), fmt."%,-10f\{12345.6}");
-        test(String.format("%+f", -12345.6), fmt."%+f\{-12345.6}");
-        test(String.format("%+f", 0.0), fmt."%+f\{0.0}");
-        test(String.format("%+f", 12345.6), fmt."%+f\{12345.6}");
-        test(String.format("%+10f", -12345.6), fmt."%+10f\{-12345.6}");
-        test(String.format("%+10f", 0.0), fmt."%+10f\{0.0}");
-        test(String.format("%+10f", 12345.6), fmt."%+10f\{12345.6}");
-        test(String.format("%+-10f", -12345.6), fmt."%+-10f\{-12345.6}");
-        test(String.format("%+-10f", 0.0), fmt."%+-10f\{0.0}");
-        test(String.format("%+-10f", 12345.6), fmt."%+-10f\{12345.6}");
-        test(String.format("%,+f", -12345.6), fmt."%,+f\{-12345.6}");
-        test(String.format("%,+f", 0.0), fmt."%,+f\{0.0}");
-        test(String.format("%,+f", 12345.6), fmt."%,+f\{12345.6}");
-        test(String.format("%,+10f", -12345.6), fmt."%,+10f\{-12345.6}");
-        test(String.format("%,+10f", 0.0), fmt."%,+10f\{0.0}");
-        test(String.format("%,+10f", 12345.6), fmt."%,+10f\{12345.6}");
-        test(String.format("%,+-10f", -12345.6), fmt."%,+-10f\{-12345.6}");
-        test(String.format("%,+-10f", 0.0), fmt."%,+-10f\{0.0}");
-        test(String.format("%,+-10f", 12345.6), fmt."%,+-10f\{12345.6}");
-
-        test(String.format("%f", -12345.6), fmt."%f\{-12345.6}");
-        test(String.format("%f", 0.0), fmt."%f\{0.0}");
-        test(String.format("%f", 12345.6), fmt."%f\{12345.6}");
-        test(String.format("%10f", -12345.6), fmt."%10f\{-12345.6}");
-        test(String.format("%10f", 0.0), fmt."%10f\{0.0}");
-        test(String.format("%10f", 12345.6), fmt."%10f\{12345.6}");
-        test(String.format("%-10f", -12345.6), fmt."%-10f\{-12345.6}");
-        test(String.format("%-10f", 0.0), fmt."%-10f\{0.0}");
-        test(String.format("%-10f", 12345.6), fmt."%-10f\{12345.6}");
-        test(String.format("%,f", -12345.6), fmt."%,f\{-12345.6}");
-        test(String.format("%,f", 0.0), fmt."%,f\{0.0}");
-        test(String.format("%,f", 12345.6), fmt."%,f\{12345.6}");
-        test(String.format("%,10f", -12345.6), fmt."%,10f\{-12345.6}");
-        test(String.format("%,10f", 0.0), fmt."%,10f\{0.0}");
-        test(String.format("%,10f", 12345.6), fmt."%,10f\{12345.6}");
-        test(String.format("%,-10f", -12345.6), fmt."%,-10f\{-12345.6}");
-        test(String.format("%,-10f", 0.0), fmt."%,-10f\{0.0}");
-        test(String.format("%,-10f", 12345.6), fmt."%,-10f\{12345.6}");
-        test(String.format("%(f", -12345.6), fmt."%(f\{-12345.6}");
-        test(String.format("%(f", 0.0), fmt."%(f\{0.0}");
-        test(String.format("%(f", 12345.6), fmt."%(f\{12345.6}");
-        test(String.format("%(10f", -12345.6), fmt."%(10f\{-12345.6}");
-        test(String.format("%(10f", 0.0), fmt."%(10f\{0.0}");
-        test(String.format("%(10f", 12345.6), fmt."%(10f\{12345.6}");
-        test(String.format("%(-10f", -12345.6), fmt."%(-10f\{-12345.6}");
-        test(String.format("%(-10f", 0.0), fmt."%(-10f\{0.0}");
-        test(String.format("%(-10f", 12345.6), fmt."%(-10f\{12345.6}");
-        test(String.format("%,(f", -12345.6), fmt."%,(f\{-12345.6}");
-        test(String.format("%,(f", 0.0), fmt."%,(f\{0.0}");
-        test(String.format("%,(f", 12345.6), fmt."%,(f\{12345.6}");
-        test(String.format("%,(10f", -12345.6), fmt."%,(10f\{-12345.6}");
-        test(String.format("%,(10f", 0.0), fmt."%,(10f\{0.0}");
-        test(String.format("%,(10f", 12345.6), fmt."%,(10f\{12345.6}");
-        test(String.format("%,(-10f", -12345.6), fmt."%,(-10f\{-12345.6}");
-        test(String.format("%,(-10f", 0.0), fmt."%,(-10f\{0.0}");
-        test(String.format("%,(-10f", 12345.6), fmt."%,(-10f\{12345.6}");
-        test(String.format("%+f", -12345.6), fmt."%+f\{-12345.6}");
-        test(String.format("%+f", 0.0), fmt."%+f\{0.0}");
-        test(String.format("%+f", 12345.6), fmt."%+f\{12345.6}");
-        test(String.format("%+10f", -12345.6), fmt."%+10f\{-12345.6}");
-        test(String.format("%+10f", 0.0), fmt."%+10f\{0.0}");
-        test(String.format("%+10f", 12345.6), fmt."%+10f\{12345.6}");
-        test(String.format("%+-10f", -12345.6), fmt."%+-10f\{-12345.6}");
-        test(String.format("%+-10f", 0.0), fmt."%+-10f\{0.0}");
-        test(String.format("%+-10f", 12345.6), fmt."%+-10f\{12345.6}");
-        test(String.format("%,+f", -12345.6), fmt."%,+f\{-12345.6}");
-        test(String.format("%,+f", 0.0), fmt."%,+f\{0.0}");
-        test(String.format("%,+f", 12345.6), fmt."%,+f\{12345.6}");
-        test(String.format("%,+10f", -12345.6), fmt."%,+10f\{-12345.6}");
-        test(String.format("%,+10f", 0.0), fmt."%,+10f\{0.0}");
-        test(String.format("%,+10f", 12345.6), fmt."%,+10f\{12345.6}");
-        test(String.format("%,+-10f", -12345.6), fmt."%,+-10f\{-12345.6}");
-        test(String.format("%,+-10f", 0.0), fmt."%,+-10f\{0.0}");
-        test(String.format("%,+-10f", 12345.6), fmt."%,+-10f\{12345.6}");
-        test(String.format("%(+f", -12345.6), fmt."%(+f\{-12345.6}");
-        test(String.format("%(+f", 0.0), fmt."%(+f\{0.0}");
-        test(String.format("%(+f", 12345.6), fmt."%(+f\{12345.6}");
-        test(String.format("%(+10f", -12345.6), fmt."%(+10f\{-12345.6}");
-        test(String.format("%(+10f", 0.0), fmt."%(+10f\{0.0}");
-        test(String.format("%(+10f", 12345.6), fmt."%(+10f\{12345.6}");
-        test(String.format("%(+-10f", -12345.6), fmt."%(+-10f\{-12345.6}");
-        test(String.format("%(+-10f", 0.0), fmt."%(+-10f\{0.0}");
-        test(String.format("%(+-10f", 12345.6), fmt."%(+-10f\{12345.6}");
-        test(String.format("%,(+f", -12345.6), fmt."%,(+f\{-12345.6}");
-        test(String.format("%,(+f", 0.0), fmt."%,(+f\{0.0}");
-        test(String.format("%,(+f", 12345.6), fmt."%,(+f\{12345.6}");
-        test(String.format("%,(+10f", -12345.6), fmt."%,(+10f\{-12345.6}");
-        test(String.format("%,(+10f", 0.0), fmt."%,(+10f\{0.0}");
-        test(String.format("%,(+10f", 12345.6), fmt."%,(+10f\{12345.6}");
-        test(String.format("%,(+-10f", -12345.6), fmt."%,(+-10f\{-12345.6}");
-        test(String.format("%,(+-10f", 0.0), fmt."%,(+-10f\{0.0}");
-        test(String.format("%,(+-10f", 12345.6), fmt."%,(+-10f\{12345.6}");
-
-        test(String.format("%e", -12345.6), fmt."%e\{-12345.6}");
-        test(String.format("%e", 0.0), fmt."%e\{0.0}");
-        test(String.format("%e", 12345.6), fmt."%e\{12345.6}");
-        test(String.format("%10e", -12345.6), fmt."%10e\{-12345.6}");
-        test(String.format("%10e", 0.0), fmt."%10e\{0.0}");
-        test(String.format("%10e", 12345.6), fmt."%10e\{12345.6}");
-        test(String.format("%-10e", -12345.6), fmt."%-10e\{-12345.6}");
-        test(String.format("%-10e", 0.0), fmt."%-10e\{0.0}");
-        test(String.format("%-10e", 12345.6), fmt."%-10e\{12345.6}");
-        test(String.format("%E", -12345.6), fmt."%E\{-12345.6}");
-        test(String.format("%E", 0.0), fmt."%E\{0.0}");
-        test(String.format("%E", 12345.6), fmt."%E\{12345.6}");
-        test(String.format("%10E", -12345.6), fmt."%10E\{-12345.6}");
-        test(String.format("%10E", 0.0), fmt."%10E\{0.0}");
-        test(String.format("%10E", 12345.6), fmt."%10E\{12345.6}");
-        test(String.format("%-10E", -12345.6), fmt."%-10E\{-12345.6}");
-        test(String.format("%-10E", 0.0), fmt."%-10E\{0.0}");
-        test(String.format("%-10E", 12345.6), fmt."%-10E\{12345.6}");
-
-        test(String.format("%g", -12345.6), fmt."%g\{-12345.6}");
-        test(String.format("%g", 0.0), fmt."%g\{0.0}");
-        test(String.format("%g", 12345.6), fmt."%g\{12345.6}");
-        test(String.format("%10g", -12345.6), fmt."%10g\{-12345.6}");
-        test(String.format("%10g", 0.0), fmt."%10g\{0.0}");
-        test(String.format("%10g", 12345.6), fmt."%10g\{12345.6}");
-        test(String.format("%-10g", -12345.6), fmt."%-10g\{-12345.6}");
-        test(String.format("%-10g", 0.0), fmt."%-10g\{0.0}");
-        test(String.format("%-10g", 12345.6), fmt."%-10g\{12345.6}");
-        test(String.format("%G", -12345.6), fmt."%G\{-12345.6}");
-        test(String.format("%G", 0.0), fmt."%G\{0.0}");
-        test(String.format("%G", 12345.6), fmt."%G\{12345.6}");
-        test(String.format("%10G", -12345.6), fmt."%10G\{-12345.6}");
-        test(String.format("%10G", 0.0), fmt."%10G\{0.0}");
-        test(String.format("%10G", 12345.6), fmt."%10G\{12345.6}");
-        test(String.format("%-10G", -12345.6), fmt."%-10G\{-12345.6}");
-        test(String.format("%-10G", 0.0), fmt."%-10G\{0.0}");
-        test(String.format("%-10G", 12345.6), fmt."%-10G\{12345.6}");
-        test(String.format("%,g", -12345.6), fmt."%,g\{-12345.6}");
-        test(String.format("%,g", 0.0), fmt."%,g\{0.0}");
-        test(String.format("%,g", 12345.6), fmt."%,g\{12345.6}");
-        test(String.format("%,10g", -12345.6), fmt."%,10g\{-12345.6}");
-        test(String.format("%,10g", 0.0), fmt."%,10g\{0.0}");
-        test(String.format("%,10g", 12345.6), fmt."%,10g\{12345.6}");
-        test(String.format("%,-10g", -12345.6), fmt."%,-10g\{-12345.6}");
-        test(String.format("%,-10g", 0.0), fmt."%,-10g\{0.0}");
-        test(String.format("%,-10g", 12345.6), fmt."%,-10g\{12345.6}");
-        test(String.format("%,G", -12345.6), fmt."%,G\{-12345.6}");
-        test(String.format("%,G", 0.0), fmt."%,G\{0.0}");
-        test(String.format("%,G", 12345.6), fmt."%,G\{12345.6}");
-        test(String.format("%,10G", -12345.6), fmt."%,10G\{-12345.6}");
-        test(String.format("%,10G", 0.0), fmt."%,10G\{0.0}");
-        test(String.format("%,10G", 12345.6), fmt."%,10G\{12345.6}");
-        test(String.format("%,-10G", -12345.6), fmt."%,-10G\{-12345.6}");
-        test(String.format("%,-10G", 0.0), fmt."%,-10G\{0.0}");
-        test(String.format("%,-10G", 12345.6), fmt."%,-10G\{12345.6}");
-
-        test(String.format("%g", -12345.6), fmt."%g\{-12345.6}");
-        test(String.format("%g", 0.0), fmt."%g\{0.0}");
-        test(String.format("%g", 12345.6), fmt."%g\{12345.6}");
-        test(String.format("%10g", -12345.6), fmt."%10g\{-12345.6}");
-        test(String.format("%10g", 0.0), fmt."%10g\{0.0}");
-        test(String.format("%10g", 12345.6), fmt."%10g\{12345.6}");
-        test(String.format("%-10g", -12345.6), fmt."%-10g\{-12345.6}");
-        test(String.format("%-10g", 0.0), fmt."%-10g\{0.0}");
-        test(String.format("%-10g", 12345.6), fmt."%-10g\{12345.6}");
-        test(String.format("%G", -12345.6), fmt."%G\{-12345.6}");
-        test(String.format("%G", 0.0), fmt."%G\{0.0}");
-        test(String.format("%G", 12345.6), fmt."%G\{12345.6}");
-        test(String.format("%10G", -12345.6), fmt."%10G\{-12345.6}");
-        test(String.format("%10G", 0.0), fmt."%10G\{0.0}");
-        test(String.format("%10G", 12345.6), fmt."%10G\{12345.6}");
-        test(String.format("%-10G", -12345.6), fmt."%-10G\{-12345.6}");
-        test(String.format("%-10G", 0.0), fmt."%-10G\{0.0}");
-        test(String.format("%-10G", 12345.6), fmt."%-10G\{12345.6}");
-        test(String.format("%,g", -12345.6), fmt."%,g\{-12345.6}");
-        test(String.format("%,g", 0.0), fmt."%,g\{0.0}");
-        test(String.format("%,g", 12345.6), fmt."%,g\{12345.6}");
-        test(String.format("%,10g", -12345.6), fmt."%,10g\{-12345.6}");
-        test(String.format("%,10g", 0.0), fmt."%,10g\{0.0}");
-        test(String.format("%,10g", 12345.6), fmt."%,10g\{12345.6}");
-        test(String.format("%,-10g", -12345.6), fmt."%,-10g\{-12345.6}");
-        test(String.format("%,-10g", 0.0), fmt."%,-10g\{0.0}");
-        test(String.format("%,-10g", 12345.6), fmt."%,-10g\{12345.6}");
-        test(String.format("%,G", -12345.6), fmt."%,G\{-12345.6}");
-        test(String.format("%,G", 0.0), fmt."%,G\{0.0}");
-        test(String.format("%,G", 12345.6), fmt."%,G\{12345.6}");
-        test(String.format("%,10G", -12345.6), fmt."%,10G\{-12345.6}");
-        test(String.format("%,10G", 0.0), fmt."%,10G\{0.0}");
-        test(String.format("%,10G", 12345.6), fmt."%,10G\{12345.6}");
-        test(String.format("%,-10G", -12345.6), fmt."%,-10G\{-12345.6}");
-        test(String.format("%,-10G", 0.0), fmt."%,-10G\{0.0}");
-        test(String.format("%,-10G", 12345.6), fmt."%,-10G\{12345.6}");
-        test(String.format("% g", -12345.6), fmt."% g\{-12345.6}");
-        test(String.format("% g", 0.0), fmt."% g\{0.0}");
-        test(String.format("% g", 12345.6), fmt."% g\{12345.6}");
-        test(String.format("% 10g", -12345.6), fmt."% 10g\{-12345.6}");
-        test(String.format("% 10g", 0.0), fmt."% 10g\{0.0}");
-        test(String.format("% 10g", 12345.6), fmt."% 10g\{12345.6}");
-        test(String.format("% -10g", -12345.6), fmt."% -10g\{-12345.6}");
-        test(String.format("% -10g", 0.0), fmt."% -10g\{0.0}");
-        test(String.format("% -10g", 12345.6), fmt."% -10g\{12345.6}");
-        test(String.format("% G", -12345.6), fmt."% G\{-12345.6}");
-        test(String.format("% G", 0.0), fmt."% G\{0.0}");
-        test(String.format("% G", 12345.6), fmt."% G\{12345.6}");
-        test(String.format("% 10G", -12345.6), fmt."% 10G\{-12345.6}");
-        test(String.format("% 10G", 0.0), fmt."% 10G\{0.0}");
-        test(String.format("% 10G", 12345.6), fmt."% 10G\{12345.6}");
-        test(String.format("% -10G", -12345.6), fmt."% -10G\{-12345.6}");
-        test(String.format("% -10G", 0.0), fmt."% -10G\{0.0}");
-        test(String.format("% -10G", 12345.6), fmt."% -10G\{12345.6}");
-        test(String.format("%, g", -12345.6), fmt."%, g\{-12345.6}");
-        test(String.format("%, g", 0.0), fmt."%, g\{0.0}");
-        test(String.format("%, g", 12345.6), fmt."%, g\{12345.6}");
-        test(String.format("%, 10g", -12345.6), fmt."%, 10g\{-12345.6}");
-        test(String.format("%, 10g", 0.0), fmt."%, 10g\{0.0}");
-        test(String.format("%, 10g", 12345.6), fmt."%, 10g\{12345.6}");
-        test(String.format("%, -10g", -12345.6), fmt."%, -10g\{-12345.6}");
-        test(String.format("%, -10g", 0.0), fmt."%, -10g\{0.0}");
-        test(String.format("%, -10g", 12345.6), fmt."%, -10g\{12345.6}");
-        test(String.format("%, G", -12345.6), fmt."%, G\{-12345.6}");
-        test(String.format("%, G", 0.0), fmt."%, G\{0.0}");
-        test(String.format("%, G", 12345.6), fmt."%, G\{12345.6}");
-        test(String.format("%, 10G", -12345.6), fmt."%, 10G\{-12345.6}");
-        test(String.format("%, 10G", 0.0), fmt."%, 10G\{0.0}");
-        test(String.format("%, 10G", 12345.6), fmt."%, 10G\{12345.6}");
-        test(String.format("%, -10G", -12345.6), fmt."%, -10G\{-12345.6}");
-        test(String.format("%, -10G", 0.0), fmt."%, -10G\{0.0}");
-        test(String.format("%, -10G", 12345.6), fmt."%, -10G\{12345.6}");
-
-        test(String.format("%g", -12345.6), fmt."%g\{-12345.6}");
-        test(String.format("%g", 0.0), fmt."%g\{0.0}");
-        test(String.format("%g", 12345.6), fmt."%g\{12345.6}");
-        test(String.format("%10g", -12345.6), fmt."%10g\{-12345.6}");
-        test(String.format("%10g", 0.0), fmt."%10g\{0.0}");
-        test(String.format("%10g", 12345.6), fmt."%10g\{12345.6}");
-        test(String.format("%-10g", -12345.6), fmt."%-10g\{-12345.6}");
-        test(String.format("%-10g", 0.0), fmt."%-10g\{0.0}");
-        test(String.format("%-10g", 12345.6), fmt."%-10g\{12345.6}");
-        test(String.format("%G", -12345.6), fmt."%G\{-12345.6}");
-        test(String.format("%G", 0.0), fmt."%G\{0.0}");
-        test(String.format("%G", 12345.6), fmt."%G\{12345.6}");
-        test(String.format("%10G", -12345.6), fmt."%10G\{-12345.6}");
-        test(String.format("%10G", 0.0), fmt."%10G\{0.0}");
-        test(String.format("%10G", 12345.6), fmt."%10G\{12345.6}");
-        test(String.format("%-10G", -12345.6), fmt."%-10G\{-12345.6}");
-        test(String.format("%-10G", 0.0), fmt."%-10G\{0.0}");
-        test(String.format("%-10G", 12345.6), fmt."%-10G\{12345.6}");
-        test(String.format("%,g", -12345.6), fmt."%,g\{-12345.6}");
-        test(String.format("%,g", 0.0), fmt."%,g\{0.0}");
-        test(String.format("%,g", 12345.6), fmt."%,g\{12345.6}");
-        test(String.format("%,10g", -12345.6), fmt."%,10g\{-12345.6}");
-        test(String.format("%,10g", 0.0), fmt."%,10g\{0.0}");
-        test(String.format("%,10g", 12345.6), fmt."%,10g\{12345.6}");
-        test(String.format("%,-10g", -12345.6), fmt."%,-10g\{-12345.6}");
-        test(String.format("%,-10g", 0.0), fmt."%,-10g\{0.0}");
-        test(String.format("%,-10g", 12345.6), fmt."%,-10g\{12345.6}");
-        test(String.format("%,G", -12345.6), fmt."%,G\{-12345.6}");
-        test(String.format("%,G", 0.0), fmt."%,G\{0.0}");
-        test(String.format("%,G", 12345.6), fmt."%,G\{12345.6}");
-        test(String.format("%,10G", -12345.6), fmt."%,10G\{-12345.6}");
-        test(String.format("%,10G", 0.0), fmt."%,10G\{0.0}");
-        test(String.format("%,10G", 12345.6), fmt."%,10G\{12345.6}");
-        test(String.format("%,-10G", -12345.6), fmt."%,-10G\{-12345.6}");
-        test(String.format("%,-10G", 0.0), fmt."%,-10G\{0.0}");
-        test(String.format("%,-10G", 12345.6), fmt."%,-10G\{12345.6}");
-        test(String.format("%+g", -12345.6), fmt."%+g\{-12345.6}");
-        test(String.format("%+g", 0.0), fmt."%+g\{0.0}");
-        test(String.format("%+g", 12345.6), fmt."%+g\{12345.6}");
-        test(String.format("%+10g", -12345.6), fmt."%+10g\{-12345.6}");
-        test(String.format("%+10g", 0.0), fmt."%+10g\{0.0}");
-        test(String.format("%+10g", 12345.6), fmt."%+10g\{12345.6}");
-        test(String.format("%+-10g", -12345.6), fmt."%+-10g\{-12345.6}");
-        test(String.format("%+-10g", 0.0), fmt."%+-10g\{0.0}");
-        test(String.format("%+-10g", 12345.6), fmt."%+-10g\{12345.6}");
-        test(String.format("%+G", -12345.6), fmt."%+G\{-12345.6}");
-        test(String.format("%+G", 0.0), fmt."%+G\{0.0}");
-        test(String.format("%+G", 12345.6), fmt."%+G\{12345.6}");
-        test(String.format("%+10G", -12345.6), fmt."%+10G\{-12345.6}");
-        test(String.format("%+10G", 0.0), fmt."%+10G\{0.0}");
-        test(String.format("%+10G", 12345.6), fmt."%+10G\{12345.6}");
-        test(String.format("%+-10G", -12345.6), fmt."%+-10G\{-12345.6}");
-        test(String.format("%+-10G", 0.0), fmt."%+-10G\{0.0}");
-        test(String.format("%+-10G", 12345.6), fmt."%+-10G\{12345.6}");
-        test(String.format("%,+g", -12345.6), fmt."%,+g\{-12345.6}");
-        test(String.format("%,+g", 0.0), fmt."%,+g\{0.0}");
-        test(String.format("%,+g", 12345.6), fmt."%,+g\{12345.6}");
-        test(String.format("%,+10g", -12345.6), fmt."%,+10g\{-12345.6}");
-        test(String.format("%,+10g", 0.0), fmt."%,+10g\{0.0}");
-        test(String.format("%,+10g", 12345.6), fmt."%,+10g\{12345.6}");
-        test(String.format("%,+-10g", -12345.6), fmt."%,+-10g\{-12345.6}");
-        test(String.format("%,+-10g", 0.0), fmt."%,+-10g\{0.0}");
-        test(String.format("%,+-10g", 12345.6), fmt."%,+-10g\{12345.6}");
-        test(String.format("%,+G", -12345.6), fmt."%,+G\{-12345.6}");
-        test(String.format("%,+G", 0.0), fmt."%,+G\{0.0}");
-        test(String.format("%,+G", 12345.6), fmt."%,+G\{12345.6}");
-        test(String.format("%,+10G", -12345.6), fmt."%,+10G\{-12345.6}");
-        test(String.format("%,+10G", 0.0), fmt."%,+10G\{0.0}");
-        test(String.format("%,+10G", 12345.6), fmt."%,+10G\{12345.6}");
-        test(String.format("%,+-10G", -12345.6), fmt."%,+-10G\{-12345.6}");
-        test(String.format("%,+-10G", 0.0), fmt."%,+-10G\{0.0}");
-        test(String.format("%,+-10G", 12345.6), fmt."%,+-10G\{12345.6}");
-
-        test(String.format("%g", -12345.6), fmt."%g\{-12345.6}");
-        test(String.format("%g", 0.0), fmt."%g\{0.0}");
-        test(String.format("%g", 12345.6), fmt."%g\{12345.6}");
-        test(String.format("%10g", -12345.6), fmt."%10g\{-12345.6}");
-        test(String.format("%10g", 0.0), fmt."%10g\{0.0}");
-        test(String.format("%10g", 12345.6), fmt."%10g\{12345.6}");
-        test(String.format("%-10g", -12345.6), fmt."%-10g\{-12345.6}");
-        test(String.format("%-10g", 0.0), fmt."%-10g\{0.0}");
-        test(String.format("%-10g", 12345.6), fmt."%-10g\{12345.6}");
-        test(String.format("%G", -12345.6), fmt."%G\{-12345.6}");
-        test(String.format("%G", 0.0), fmt."%G\{0.0}");
-        test(String.format("%G", 12345.6), fmt."%G\{12345.6}");
-        test(String.format("%10G", -12345.6), fmt."%10G\{-12345.6}");
-        test(String.format("%10G", 0.0), fmt."%10G\{0.0}");
-        test(String.format("%10G", 12345.6), fmt."%10G\{12345.6}");
-        test(String.format("%-10G", -12345.6), fmt."%-10G\{-12345.6}");
-        test(String.format("%-10G", 0.0), fmt."%-10G\{0.0}");
-        test(String.format("%-10G", 12345.6), fmt."%-10G\{12345.6}");
-        test(String.format("%,g", -12345.6), fmt."%,g\{-12345.6}");
-        test(String.format("%,g", 0.0), fmt."%,g\{0.0}");
-        test(String.format("%,g", 12345.6), fmt."%,g\{12345.6}");
-        test(String.format("%,10g", -12345.6), fmt."%,10g\{-12345.6}");
-        test(String.format("%,10g", 0.0), fmt."%,10g\{0.0}");
-        test(String.format("%,10g", 12345.6), fmt."%,10g\{12345.6}");
-        test(String.format("%,-10g", -12345.6), fmt."%,-10g\{-12345.6}");
-        test(String.format("%,-10g", 0.0), fmt."%,-10g\{0.0}");
-        test(String.format("%,-10g", 12345.6), fmt."%,-10g\{12345.6}");
-        test(String.format("%,G", -12345.6), fmt."%,G\{-12345.6}");
-        test(String.format("%,G", 0.0), fmt."%,G\{0.0}");
-        test(String.format("%,G", 12345.6), fmt."%,G\{12345.6}");
-        test(String.format("%,10G", -12345.6), fmt."%,10G\{-12345.6}");
-        test(String.format("%,10G", 0.0), fmt."%,10G\{0.0}");
-        test(String.format("%,10G", 12345.6), fmt."%,10G\{12345.6}");
-        test(String.format("%,-10G", -12345.6), fmt."%,-10G\{-12345.6}");
-        test(String.format("%,-10G", 0.0), fmt."%,-10G\{0.0}");
-        test(String.format("%,-10G", 12345.6), fmt."%,-10G\{12345.6}");
-        test(String.format("%(g", -12345.6), fmt."%(g\{-12345.6}");
-        test(String.format("%(g", 0.0), fmt."%(g\{0.0}");
-        test(String.format("%(g", 12345.6), fmt."%(g\{12345.6}");
-        test(String.format("%(10g", -12345.6), fmt."%(10g\{-12345.6}");
-        test(String.format("%(10g", 0.0), fmt."%(10g\{0.0}");
-        test(String.format("%(10g", 12345.6), fmt."%(10g\{12345.6}");
-        test(String.format("%(-10g", -12345.6), fmt."%(-10g\{-12345.6}");
-        test(String.format("%(-10g", 0.0), fmt."%(-10g\{0.0}");
-        test(String.format("%(-10g", 12345.6), fmt."%(-10g\{12345.6}");
-        test(String.format("%(G", -12345.6), fmt."%(G\{-12345.6}");
-        test(String.format("%(G", 0.0), fmt."%(G\{0.0}");
-        test(String.format("%(G", 12345.6), fmt."%(G\{12345.6}");
-        test(String.format("%(10G", -12345.6), fmt."%(10G\{-12345.6}");
-        test(String.format("%(10G", 0.0), fmt."%(10G\{0.0}");
-        test(String.format("%(10G", 12345.6), fmt."%(10G\{12345.6}");
-        test(String.format("%(-10G", -12345.6), fmt."%(-10G\{-12345.6}");
-        test(String.format("%(-10G", 0.0), fmt."%(-10G\{0.0}");
-        test(String.format("%(-10G", 12345.6), fmt."%(-10G\{12345.6}");
-        test(String.format("%,(g", -12345.6), fmt."%,(g\{-12345.6}");
-        test(String.format("%,(g", 0.0), fmt."%,(g\{0.0}");
-        test(String.format("%,(g", 12345.6), fmt."%,(g\{12345.6}");
-        test(String.format("%,(10g", -12345.6), fmt."%,(10g\{-12345.6}");
-        test(String.format("%,(10g", 0.0), fmt."%,(10g\{0.0}");
-        test(String.format("%,(10g", 12345.6), fmt."%,(10g\{12345.6}");
-        test(String.format("%,(-10g", -12345.6), fmt."%,(-10g\{-12345.6}");
-        test(String.format("%,(-10g", 0.0), fmt."%,(-10g\{0.0}");
-        test(String.format("%,(-10g", 12345.6), fmt."%,(-10g\{12345.6}");
-        test(String.format("%,(G", -12345.6), fmt."%,(G\{-12345.6}");
-        test(String.format("%,(G", 0.0), fmt."%,(G\{0.0}");
-        test(String.format("%,(G", 12345.6), fmt."%,(G\{12345.6}");
-        test(String.format("%,(10G", -12345.6), fmt."%,(10G\{-12345.6}");
-        test(String.format("%,(10G", 0.0), fmt."%,(10G\{0.0}");
-        test(String.format("%,(10G", 12345.6), fmt."%,(10G\{12345.6}");
-        test(String.format("%,(-10G", -12345.6), fmt."%,(-10G\{-12345.6}");
-        test(String.format("%,(-10G", 0.0), fmt."%,(-10G\{0.0}");
-        test(String.format("%,(-10G", 12345.6), fmt."%,(-10G\{12345.6}");
-        test(String.format("%+g", -12345.6), fmt."%+g\{-12345.6}");
-        test(String.format("%+g", 0.0), fmt."%+g\{0.0}");
-        test(String.format("%+g", 12345.6), fmt."%+g\{12345.6}");
-        test(String.format("%+10g", -12345.6), fmt."%+10g\{-12345.6}");
-        test(String.format("%+10g", 0.0), fmt."%+10g\{0.0}");
-        test(String.format("%+10g", 12345.6), fmt."%+10g\{12345.6}");
-        test(String.format("%+-10g", -12345.6), fmt."%+-10g\{-12345.6}");
-        test(String.format("%+-10g", 0.0), fmt."%+-10g\{0.0}");
-        test(String.format("%+-10g", 12345.6), fmt."%+-10g\{12345.6}");
-        test(String.format("%+G", -12345.6), fmt."%+G\{-12345.6}");
-        test(String.format("%+G", 0.0), fmt."%+G\{0.0}");
-        test(String.format("%+G", 12345.6), fmt."%+G\{12345.6}");
-        test(String.format("%+10G", -12345.6), fmt."%+10G\{-12345.6}");
-        test(String.format("%+10G", 0.0), fmt."%+10G\{0.0}");
-        test(String.format("%+10G", 12345.6), fmt."%+10G\{12345.6}");
-        test(String.format("%+-10G", -12345.6), fmt."%+-10G\{-12345.6}");
-        test(String.format("%+-10G", 0.0), fmt."%+-10G\{0.0}");
-        test(String.format("%+-10G", 12345.6), fmt."%+-10G\{12345.6}");
-        test(String.format("%,+g", -12345.6), fmt."%,+g\{-12345.6}");
-        test(String.format("%,+g", 0.0), fmt."%,+g\{0.0}");
-        test(String.format("%,+g", 12345.6), fmt."%,+g\{12345.6}");
-        test(String.format("%,+10g", -12345.6), fmt."%,+10g\{-12345.6}");
-        test(String.format("%,+10g", 0.0), fmt."%,+10g\{0.0}");
-        test(String.format("%,+10g", 12345.6), fmt."%,+10g\{12345.6}");
-        test(String.format("%,+-10g", -12345.6), fmt."%,+-10g\{-12345.6}");
-        test(String.format("%,+-10g", 0.0), fmt."%,+-10g\{0.0}");
-        test(String.format("%,+-10g", 12345.6), fmt."%,+-10g\{12345.6}");
-        test(String.format("%,+G", -12345.6), fmt."%,+G\{-12345.6}");
-        test(String.format("%,+G", 0.0), fmt."%,+G\{0.0}");
-        test(String.format("%,+G", 12345.6), fmt."%,+G\{12345.6}");
-        test(String.format("%,+10G", -12345.6), fmt."%,+10G\{-12345.6}");
-        test(String.format("%,+10G", 0.0), fmt."%,+10G\{0.0}");
-        test(String.format("%,+10G", 12345.6), fmt."%,+10G\{12345.6}");
-        test(String.format("%,+-10G", -12345.6), fmt."%,+-10G\{-12345.6}");
-        test(String.format("%,+-10G", 0.0), fmt."%,+-10G\{0.0}");
-        test(String.format("%,+-10G", 12345.6), fmt."%,+-10G\{12345.6}");
-        test(String.format("%(+g", -12345.6), fmt."%(+g\{-12345.6}");
-        test(String.format("%(+g", 0.0), fmt."%(+g\{0.0}");
-        test(String.format("%(+g", 12345.6), fmt."%(+g\{12345.6}");
-        test(String.format("%(+10g", -12345.6), fmt."%(+10g\{-12345.6}");
-        test(String.format("%(+10g", 0.0), fmt."%(+10g\{0.0}");
-        test(String.format("%(+10g", 12345.6), fmt."%(+10g\{12345.6}");
-        test(String.format("%(+-10g", -12345.6), fmt."%(+-10g\{-12345.6}");
-        test(String.format("%(+-10g", 0.0), fmt."%(+-10g\{0.0}");
-        test(String.format("%(+-10g", 12345.6), fmt."%(+-10g\{12345.6}");
-        test(String.format("%(+G", -12345.6), fmt."%(+G\{-12345.6}");
-        test(String.format("%(+G", 0.0), fmt."%(+G\{0.0}");
-        test(String.format("%(+G", 12345.6), fmt."%(+G\{12345.6}");
-        test(String.format("%(+10G", -12345.6), fmt."%(+10G\{-12345.6}");
-        test(String.format("%(+10G", 0.0), fmt."%(+10G\{0.0}");
-        test(String.format("%(+10G", 12345.6), fmt."%(+10G\{12345.6}");
-        test(String.format("%(+-10G", -12345.6), fmt."%(+-10G\{-12345.6}");
-        test(String.format("%(+-10G", 0.0), fmt."%(+-10G\{0.0}");
-        test(String.format("%(+-10G", 12345.6), fmt."%(+-10G\{12345.6}");
-        test(String.format("%,(+g", -12345.6), fmt."%,(+g\{-12345.6}");
-        test(String.format("%,(+g", 0.0), fmt."%,(+g\{0.0}");
-        test(String.format("%,(+g", 12345.6), fmt."%,(+g\{12345.6}");
-        test(String.format("%,(+10g", -12345.6), fmt."%,(+10g\{-12345.6}");
-        test(String.format("%,(+10g", 0.0), fmt."%,(+10g\{0.0}");
-        test(String.format("%,(+10g", 12345.6), fmt."%,(+10g\{12345.6}");
-        test(String.format("%,(+-10g", -12345.6), fmt."%,(+-10g\{-12345.6}");
-        test(String.format("%,(+-10g", 0.0), fmt."%,(+-10g\{0.0}");
-        test(String.format("%,(+-10g", 12345.6), fmt."%,(+-10g\{12345.6}");
-        test(String.format("%,(+G", -12345.6), fmt."%,(+G\{-12345.6}");
-        test(String.format("%,(+G", 0.0), fmt."%,(+G\{0.0}");
-        test(String.format("%,(+G", 12345.6), fmt."%,(+G\{12345.6}");
-        test(String.format("%,(+10G", -12345.6), fmt."%,(+10G\{-12345.6}");
-        test(String.format("%,(+10G", 0.0), fmt."%,(+10G\{0.0}");
-        test(String.format("%,(+10G", 12345.6), fmt."%,(+10G\{12345.6}");
-        test(String.format("%,(+-10G", -12345.6), fmt."%,(+-10G\{-12345.6}");
-        test(String.format("%,(+-10G", 0.0), fmt."%,(+-10G\{0.0}");
-        test(String.format("%,(+-10G", 12345.6), fmt."%,(+-10G\{12345.6}");
-
-        test(String.format("%a", -12345.6), fmt."%a\{-12345.6}");
-        test(String.format("%a", 0.0), fmt."%a\{0.0}");
-        test(String.format("%a", 12345.6), fmt."%a\{12345.6}");
-        test(String.format("%10a", -12345.6), fmt."%10a\{-12345.6}");
-        test(String.format("%10a", 0.0), fmt."%10a\{0.0}");
-        test(String.format("%10a", 12345.6), fmt."%10a\{12345.6}");
-        test(String.format("%-10a", -12345.6), fmt."%-10a\{-12345.6}");
-        test(String.format("%-10a", 0.0), fmt."%-10a\{0.0}");
-        test(String.format("%-10a", 12345.6), fmt."%-10a\{12345.6}");
-        test(String.format("%A", -12345.6), fmt."%A\{-12345.6}");
-        test(String.format("%A", 0.0), fmt."%A\{0.0}");
-        test(String.format("%A", 12345.6), fmt."%A\{12345.6}");
-        test(String.format("%10A", -12345.6), fmt."%10A\{-12345.6}");
-        test(String.format("%10A", 0.0), fmt."%10A\{0.0}");
-        test(String.format("%10A", 12345.6), fmt."%10A\{12345.6}");
-        test(String.format("%-10A", -12345.6), fmt."%-10A\{-12345.6}");
-        test(String.format("%-10A", 0.0), fmt."%-10A\{0.0}");
-        test(String.format("%-10A", 12345.6), fmt."%-10A\{12345.6}");
-
-        test("aaa%false", fmt."aaa%%%b\{false}");
-        test("aaa" + System.lineSeparator() + "false", fmt."aaa%n%b\{false}");
-
-        assertThrows(
-                MissingFormatArgumentException.class,
-                () -> fmt. "%10ba\{ false }",
-                "Format specifier '%10b is not immediately followed by an embedded expression'");
-
-        assertThrows(
-                MissingFormatArgumentException.class,
-                () ->fmt. "%ba\{ false }",
-                "Format specifier '%b is not immediately followed by an embedded expression'");
-
-        assertThrows(
-                MissingFormatArgumentException.class,
-                () ->fmt. "%b",
-                "Format specifier '%b is not immediately followed by an embedded expression'");
-        assertThrows(
-                UnknownFormatConversionException.class,
-                () ->fmt. "%0",
-                "Conversion = '0'");
-    }
-}
diff --git a/test/jdk/java/lang/template/StringTemplateTest.java b/test/jdk/java/lang/template/StringTemplateTest.java
deleted file mode 100644
index 53aca6d83ff..00000000000
--- a/test/jdk/java/lang/template/StringTemplateTest.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Copyright (c) 2023, 2024, 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 0000000
- * @summary Exercise runtime handing of templated strings.
- * @enablePreview true
- */
-
-import java.io.ByteArrayOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URI;
-import java.util.*;
-import java.util.function.Supplier;
-import javax.tools.FileObject;
-import javax.tools.ForwardingJavaFileManager;
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileObject;
-import javax.tools.SimpleJavaFileObject;
-import static javax.tools.StandardLocation.CLASS_OUTPUT;
-import javax.tools.ToolProvider;
-
-public class StringTemplateTest {
-    enum Category{GENERAL, CHARACTER, INTEGRAL, BIG_INT, FLOATING, BIG_FLOAT, DATE};
-
-    static final String[] GENERAL = {"true", "false", "(Object)null", "STR", "BO", "BOOL", "(Boolean)null"};
-    static final String[] CHARS = {"C", "CHAR", "(Character)null"};
-    static final String[] INTS = {"L", "LONG", "I", "INT", "S", "SHORT", "BY", "BYTE", "Long.MAX_VALUE", "Long.MIN_VALUE", "(Long)null", "(Integer)null", "(Short)null", "(Byte)null"};
-    static final String[] BIGINTS = {};
-    static final String[] FLOATS = {"F", "FLOAT", "D", "DOUBLE", "Double.NEGATIVE_INFINITY", "Double.NaN", "Double.MAX_VALUE", "(Double)null", "(Float)null"};
-    static final String[] BIGFLOATS = {};
-    static final String[] DATES = {};
-
-    final Random r = new Random(1);
-
-    String randomValue(Category category) {
-        return switch (category) {
-            case GENERAL -> randomChoice(
-                    GENERAL,
-                    () -> randomValue(Category.CHARACTER),
-                    () -> randomValue(Category.INTEGRAL),
-                    () -> randomValue(Category.BIG_INT),
-                    () -> randomValue(Category.FLOATING),
-                    () -> randomValue(Category.BIG_FLOAT),
-                    () -> randomValue(Category.DATE),
-                    () -> "\"" + randomString(r.nextInt(10)) + "\"");
-            case CHARACTER -> randomChoice(
-                    CHARS,
-                    () -> "\'" + randomString(1) + "\'");
-            case INTEGRAL -> randomChoice(
-                    INTS,
-                    () -> "(byte)" + String.valueOf(r.nextInt(Byte.MIN_VALUE, Byte.MAX_VALUE)),
-                    () -> "(short)" + String.valueOf(r.nextInt(Short.MIN_VALUE, Short.MAX_VALUE)),
-                    () -> String.valueOf(r.nextInt()),
-                    () -> r.nextLong() + "l");
-            case BIG_INT -> randomChoice(
-                    BIGINTS,
-                    () -> "new java.math.BigInteger(\"" + r.nextLong() + "\")");
-            case FLOATING -> randomChoice(
-                    FLOATS,
-                    () -> String.valueOf(r.nextDouble()),
-                    () -> r.nextFloat() + "f");
-            case BIG_FLOAT -> randomChoice(
-                    BIGFLOATS,
-                    () -> "new java.math.BigDecimal(" + r.nextDouble() + ")");
-            case DATE -> randomChoice(
-                    DATES,
-                    () -> "new java.util.Date(" + r.nextLong() + "l)",
-                    () -> r.nextLong() + "l");
-        };
-    }
-
-    String randomChoice(Supplier<String>... suppl) {
-        return suppl[r.nextInt(suppl.length)].get();
-    }
-
-    String randomChoice(String... values) {
-        return values[r.nextInt(values.length)];
-    }
-
-    String randomChoice(String[] values, Supplier<String>... suppl) {
-        int i = r.nextInt(values.length + suppl.length);
-        return i < values.length ? values[i] : suppl[i - values.length].get();
-    }
-
-    String randomString(int length) {
-        var sb = new StringBuilder(length << 2);
-        while (length-- > 0) {
-            char ch = (char)r.nextInt(9, 128);
-            var s = switch (ch) {
-                case '\t' -> "\\t";
-                case '\'' -> "\\\'";
-                case '"' -> "\\\"";
-                case '\r' -> "\\r";
-                case '\\' -> "\\\\";
-                case '\n' -> "\\n";
-                case '\f' -> "\\f";
-                case '\b' -> "\\b";
-                default -> ch + "";
-            };
-            sb.append(s);
-        }
-        return sb.toString();
-    }
-
-    String randomFormat(Category category) {
-        char c;
-        return "%" + switch (category) {
-            case GENERAL -> randomWidth("-") + randomPrecision() + randomChar("bBhHsS");
-            case CHARACTER -> randomWidth("-") + randomChar("cC");
-            case INTEGRAL -> switch (c = randomChar("doxX")) {
-                case 'd' -> randomFlags("+ ,(");
-                default -> randomFlags("");
-            } + randomWidth("-0") + c;
-            case BIG_INT -> switch (c = randomChar("doxX")) {
-                case 'd' -> randomFlags("+ ,(");
-                default -> randomFlags("+ (");
-            } + randomWidth("-0") + c;
-            case FLOATING -> switch (c = randomChar("eEfaAgG")) {
-                case 'a', 'A' -> randomFlags("+ ") + randomWidth("-0");
-                case 'e', 'E' -> randomFlags("+ (") + randomWidth("-0") + randomPrecision();
-                default -> randomFlags("+ ,(") + randomWidth("-0") + randomPrecision();
-            } + c;
-            case BIG_FLOAT -> switch (c = randomChar("eEfgG")) {
-                case 'e', 'E' -> randomFlags("+ (") + randomWidth("-0") + randomPrecision();
-                default -> randomFlags("+ ,(") + randomWidth("-0") + randomPrecision();
-            } + c;
-            case DATE ->  randomWidth("-") + randomChar("tT") + randomChar("BbhAaCYyjmdeRTrDFc");
-        };
-    }
-
-    String randomFlags(String flags) {
-        var sb = new StringBuilder(flags.length());
-        for (var f : flags.toCharArray()) {
-            if (r.nextBoolean() && (f != ' ' || sb.length() == 0 || sb.charAt(sb.length() - 1) != '+')) sb.append(f);
-        }
-        return sb.toString();
-    }
-
-    char randomChar(String chars) {
-        return chars.charAt(r.nextInt(chars.length()));
-    }
-
-    String randomWidth(String flags) {
-        var f = r.nextInt(flags.length() + 1);
-        return r.nextBoolean() ? (r.nextBoolean() ? flags.charAt(r.nextInt(flags.length())) : "") + String.valueOf(r.nextInt(10) + 1) : "";
-    }
-
-    String randomPrecision() {
-        return r.nextBoolean() ? '.' + String.valueOf(r.nextInt(10) + 1) : "";
-    }
-
-    public Class<?> compile() throws Exception {
-        var classes = new HashMap<String, byte[]>();
-        var fileManager = new ForwardingJavaFileManager(ToolProvider.getSystemJavaCompiler().getStandardFileManager(null, null, null)) {
-            @Override
-            public ClassLoader getClassLoader(JavaFileManager.Location location) {
-                return new ClassLoader() {
-                    @Override
-                    public Class<?> loadClass(String name) throws ClassNotFoundException {
-                        try {
-                            return super.loadClass(name);
-                        } catch (ClassNotFoundException e) {
-                            byte[] classData = classes.get(name);
-                            return defineClass(name, classData, 0, classData.length);
-                        }
-                    }
-                };
-            }
-            @Override
-            public JavaFileObject getJavaFileForOutput(JavaFileManager.Location location, String name, JavaFileObject.Kind kind, FileObject originatingSource) throws UnsupportedOperationException {
-                return new SimpleJavaFileObject(URI.create(name + ".class"), JavaFileObject.Kind.CLASS) {
-                    @Override
-                    public OutputStream openOutputStream() {
-                        return new FilterOutputStream(new ByteArrayOutputStream()) {
-                            @Override
-                            public void close() throws IOException {
-                                classes.put(name, ((ByteArrayOutputStream)out).toByteArray());
-                            }
-                        };
-                    }
-                };
-            }
-        };
-        var source = genSource();
-//        System.out.println(source);
-        if (ToolProvider.getSystemJavaCompiler().getTask(null, fileManager, null,
-                List.of("--enable-preview", "-source", String.valueOf(Runtime.version().feature())), null,
-                List.of(SimpleJavaFileObject.forSource(URI.create("StringTemplateTest$.java"), source))
-           ).call()) {
-            return fileManager.getClassLoader(CLASS_OUTPUT).loadClass("StringTemplateTest$");
-        } else {
-            throw new AssertionError("compilation failed");
-        }
-    }
-
-    String genFragments(Category c) {
-        var fragments = new LinkedList<String>();
-        for (int i = 0; i < 1500; i++) {
-            var format = randomFormat(c);
-            var value = randomValue(c);
-            var qValue = value.replace("\\", "\\\\").replace("\"", "\\\"");
-            fragments.add(STR."test(FMT.\"\{format}\\{\{value}}\", \"\{format}\", \"\{qValue}\", \{value}, log);");
-        }
-        return String.join("\n        ", fragments);
-    }
-
-    String genSource() {
-        return STR."""
-            import java.util.FormatProcessor;
-            import java.util.Locale;
-
-            public class StringTemplateTest$ {
-                static final FormatProcessor FMT = FormatProcessor.create(Locale.US);
-                static String STR = "this is static String";
-                static char C = 'c';
-                static Character CHAR = 'C';
-                static long L = -12345678910l;
-                static Long LONG = 9876543210l;
-                static int I = 42;
-                static Integer INT = -49;
-                static boolean BO = true;
-                static Boolean BOOL = false;
-                static short S = 13;
-                static Short SHORT = -17;
-                static byte BY = -3;
-                static Byte BYTE = 12;
-                static float F = 4.789f;
-                static Float FLOAT = -0.000006f;
-                static double D = 6545745.6734654563;
-                static Double DOUBLE = -4323.7645676574;
-
-                public static void run(java.util.List<String> log) {
-                    runGeneral(log);
-                    runCharacter(log);
-                    runIntegral(log);
-                    runBigInt(log);
-                    runFloating(log);
-                    runBigFloat(log);
-                    runDate(log);
-                }
-                public static void runGeneral(java.util.List<String> log) {
-                    \{genFragments(Category.GENERAL)}
-                }
-                public static void runCharacter(java.util.List<String> log) {
-                    \{genFragments(Category.CHARACTER)}
-                }
-                public static void runIntegral(java.util.List<String> log) {
-                    \{genFragments(Category.INTEGRAL)}
-                }
-                public static void runBigInt(java.util.List<String> log) {
-                    \{genFragments(Category.BIG_INT)}
-                }
-                public static void runFloating(java.util.List<String> log) {
-                    \{genFragments(Category.FLOATING)}
-                }
-                public static void runBigFloat(java.util.List<String> log) {
-                    \{genFragments(Category.BIG_FLOAT)}
-                }
-                public static void runDate(java.util.List<String> log) {
-                    \{genFragments(Category.DATE)}
-                }
-                static void test(String fmt, String format, String expression, Object value, java.util.List<String> log) {
-                    var formatted = String.format(java.util.Locale.US, format, value);
-                    if (!fmt.equals(formatted)) {
-                        log.add("  format: '%s' expression: '%s' value: '%s' expected: '%s' found: '%s'".formatted(format, expression, value, formatted, fmt));
-                    }
-                }
-            }
-            """;
-    }
-
-    public static void main(String... args) throws Exception {
-        var log = new LinkedList<String>();
-        new StringTemplateTest().compile().getMethod("run", List.class).invoke(null, log);
-        if (!log.isEmpty()) {
-            log.forEach(System.out::println);
-            throw new AssertionError(STR."failed \{log.size()} tests");
-        }
-    }
-}
diff --git a/test/jdk/java/lang/template/T8313809.java b/test/jdk/java/lang/template/T8313809.java
deleted file mode 100644
index b673b2b9c44..00000000000
--- a/test/jdk/java/lang/template/T8313809.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2023, 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 8313809
- * @summary String template fails with java.lang.StringIndexOutOfBoundsException if last fragment is UTF16
-.
- * @enablePreview true
- */
-
-import static java.util.FormatProcessor.FMT;
-
-public class T8313809 {
-    public static void main(final String[] args) throws Exception {
-        double sum = 12.34;
-        final String message = FMT."The sum is : %f\{sum} €"; // this fails
-        if (!message.equals("The sum is : 12.340000 €")) {
-            throw new RuntimeException("Incorrect result");
-        }
-    }
-}
-
diff --git a/test/langtools/jdk/jshell/CompletenessTest.java b/test/langtools/jdk/jshell/CompletenessTest.java
index 09fcbfbdd39..06cbc6bd41f 100644
--- a/test/langtools/jdk/jshell/CompletenessTest.java
+++ b/test/langtools/jdk/jshell/CompletenessTest.java
@@ -89,8 +89,7 @@ public class CompletenessTest extends KullaTesting {
         "record.any",
         "record()",
         "record(1)",
-        "record.length()",
-        "\"\\{0}\""
+        "record.length()"
     };
 
     static final String[] complete_with_semi = new String[] {
@@ -235,10 +234,7 @@ public class CompletenessTest extends KullaTesting {
     static final String[] unknown = new String[] {
         "new ;",
         "\"",
-        "\"\\",
-        "\"\\{",
-        "\"\\{0",
-        "\"\\{0}",
+        "\"\\"
     };
 
     static final Map<Completeness, String[]> statusToCases = new HashMap<>();
@@ -384,9 +380,6 @@ public class CompletenessTest extends KullaTesting {
         assertStatus("\"\"\"\ntext\\\"\"\"\\\"\"\"", DEFINITELY_INCOMPLETE, null);
         assertStatus("\"\"\"\ntext\\\"\"\"\\\"\"\"\"\"\"", COMPLETE, "\"\"\"\ntext\\\"\"\"\\\"\"\"\"\"\"");
         assertStatus("\"\"\"\n\\", DEFINITELY_INCOMPLETE, null);
-        assertStatus("\"\"\"\n\\{", DEFINITELY_INCOMPLETE, null);
-        assertStatus("\"\"\"\n\\{0", DEFINITELY_INCOMPLETE, null);
-        assertStatus("\"\"\"\n\\{0}", DEFINITELY_INCOMPLETE, null);
     }
 
     public void testMiscSource() {
diff --git a/test/langtools/tools/javac/diags/examples/StringTemplate.java b/test/langtools/tools/javac/diags/examples/StringTemplate.java
deleted file mode 100644
index e35cbab11e4..00000000000
--- a/test/langtools/tools/javac/diags/examples/StringTemplate.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- */
-
- // key: compiler.misc.feature.string.templates
- // key: compiler.warn.preview.feature.use.plural
- // options: --enable-preview -source ${jdk.version} -Xlint:preview
-
-class StringTemplate {
-    String m() {
-        int x = 10, y = 20;
-        return STR."\{x} + \{y} = \{x + y}";
-    }
-}
diff --git a/test/langtools/tools/javac/diags/examples/StringTemplateNoProcessor.java b/test/langtools/tools/javac/diags/examples/StringTemplateNoProcessor.java
deleted file mode 100644
index f909ec726d2..00000000000
--- a/test/langtools/tools/javac/diags/examples/StringTemplateNoProcessor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- */
-
- // key: compiler.err.processor.missing.from.string.template.expression
- // key: compiler.misc.feature.string.templates
- // key: compiler.warn.preview.feature.use.plural
- // options: --enable-preview -source ${jdk.version} -Xlint:preview
-
-class StringTemplateNoProcessor {
-    String m() {
-        int x = 10, y = 20;
-        return "\{x} + \{y} = \{x + y}";
-    }
-}
diff --git a/test/langtools/tools/javac/diags/examples/StringTemplateNotProcessor.java b/test/langtools/tools/javac/diags/examples/StringTemplateNotProcessor.java
deleted file mode 100644
index cd71f7df7e1..00000000000
--- a/test/langtools/tools/javac/diags/examples/StringTemplateNotProcessor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- */
-
- // key: compiler.note.preview.filename
- // key: compiler.err.cant.resolve.location.args
- // key: compiler.misc.location
- // key: compiler.note.preview.recompile
- // key: compiler.err.not.a.processor.type
- // options: --enable-preview  -source ${jdk.version}
-
-import java.lang.*;
-
-class StringTemplateNotProcessor {
-    String m() {
-        String processor = "";
-        int x = 10, y = 20;
-        return processor."\{x} + \{y} = \{x + y}";
-    }
-}
diff --git a/test/langtools/tools/javac/diags/examples/StringTemplateRawProcessor.java b/test/langtools/tools/javac/diags/examples/StringTemplateRawProcessor.java
deleted file mode 100644
index 9ab344fb021..00000000000
--- a/test/langtools/tools/javac/diags/examples/StringTemplateRawProcessor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- */
-
- // key: compiler.note.preview.filename
- // key: compiler.note.preview.recompile
- // key: compiler.misc.unexpected.ret.val
- // key: compiler.err.prob.found.req
- // options: --enable-preview -source ${jdk.version}
-
-import java.lang.*;
-import java.lang.StringTemplate.Processor;
-
-class StringTemplateRawProcessor {
-    void m() {
-        Processor processor = ts -> ts.interpolate();
-        try {
-            int x = 10, y = 20;
-            return processor."\{x} + \{y} = \{x + y}";
-        } catch (Throwable x) {
-            throw new RuntimeException(x);
-        }
-    }
-}
-
diff --git a/test/langtools/tools/javac/diags/examples/StringTemplateUnclosedString.java b/test/langtools/tools/javac/diags/examples/StringTemplateUnclosedString.java
deleted file mode 100644
index c96ccf96ee3..00000000000
--- a/test/langtools/tools/javac/diags/examples/StringTemplateUnclosedString.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- */
-
- // key: compiler.note.preview.filename
- // key: compiler.note.preview.recompile
- // key: compiler.err.unclosed.str.lit
- // key: compiler.err.string.template.is.not.well.formed
- // options: --enable-preview -source ${jdk.version}
-
-import java.lang.*;
-
-class StringTemplateUnclosedString {
-    String m() {
-        int x = 10;
-        return STR."\{x";
-    }
-}
diff --git a/test/langtools/tools/javac/diags/examples/StringTemplateUnclosedTextBlock.java b/test/langtools/tools/javac/diags/examples/StringTemplateUnclosedTextBlock.java
deleted file mode 100644
index 87460aba029..00000000000
--- a/test/langtools/tools/javac/diags/examples/StringTemplateUnclosedTextBlock.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- */
-
- // key: compiler.note.preview.filename
- // key: compiler.note.preview.recompile
- // key: compiler.err.unclosed.text.block
- // key: compiler.err.text.block.template.is.not.well.formed
- // key: compiler.err.premature.eof
- // options: --enable-preview -source ${jdk.version}
-
-import java.lang.*;
-
-class StringTemplateUnclosedTextBlock {
-    String m() {
-        int x = 10;
-        return STR."""
-                aaa
-                \{x
-                """
-        ;
-    }
-}
diff --git a/test/langtools/tools/javac/parser/JavacParserTest.java b/test/langtools/tools/javac/parser/JavacParserTest.java
index f9ccb39c05e..93b2b51a8fa 100644
--- a/test/langtools/tools/javac/parser/JavacParserTest.java
+++ b/test/langtools/tools/javac/parser/JavacParserTest.java
@@ -1917,52 +1917,6 @@ public class JavacParserTest extends TestCase {
         }.scan(cut, null);
     }
 
-    @Test
-    void testStringTemplate1() throws IOException {
-        String code = """
-                      package test;
-                      public class Test {
-                           Test(int a) {
-                               String s = "prefix \\{a} suffix";
-                           }
-                      }
-                      """;
-
-        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null,
-                null, null, Arrays.asList(new MyFileObject(code)));
-        CompilationUnitTree cut = ct.parse().iterator().next();
-        ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
-        MethodTree constr = (MethodTree) clazz.getMembers().get(0);
-        VariableTree decl = (VariableTree) constr.getBody().getStatements().get(0);
-        SourcePositions sp = Trees.instance(ct).getSourcePositions();
-        int initStart = (int) sp.getStartPosition(cut, decl.getInitializer());
-        int initEnd   = (int) sp.getEndPosition(cut, decl.getInitializer());
-        assertEquals("correct templated String span expected", code.substring(initStart, initEnd), "\"prefix \\{a} suffix\"");
-    }
-
-    @Test
-    void testStringTemplate2() throws IOException {
-        String code = """
-                      package test;
-                      public class Test {
-                           Test(int a) {
-                               String s = STR."prefix \\{a} suffix";
-                           }
-                      }
-                      """;
-
-        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null,
-                null, null, Arrays.asList(new MyFileObject(code)));
-        CompilationUnitTree cut = ct.parse().iterator().next();
-        ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
-        MethodTree constr = (MethodTree) clazz.getMembers().get(0);
-        VariableTree decl = (VariableTree) constr.getBody().getStatements().get(0);
-        SourcePositions sp = Trees.instance(ct).getSourcePositions();
-        int initStart = (int) sp.getStartPosition(cut, decl.getInitializer());
-        int initEnd   = (int) sp.getEndPosition(cut, decl.getInitializer());
-        assertEquals("correct templated String span expected", code.substring(initStart, initEnd), "STR.\"prefix \\{a} suffix\"");
-    }
-
     @Test //JDK-8293897
     void testImplicitFinalInTryWithResources() throws IOException {
         String code = """
@@ -2044,63 +1998,6 @@ public class JavacParserTest extends TestCase {
         }.scan(cut, null);
     }
 
-    @Test
-    void testIncompleteStringTemplate() throws IOException {
-        String template = "\"\\{o.toString()}\"";
-        String prefix = """
-                      package t;
-                      class Test {
-                          void test(Object o) {
-                              String s = STR.""";
-
-        Worker<Void> verifyParseable = task -> {
-            try {
-                task.parse().iterator().next();
-                return null;
-            } catch (IOException ex) {
-                throw new AssertionError(ex);
-            }
-        };
-        JavacTaskPool pool = new JavacTaskPool(1);
-        DiagnosticListener<JavaFileObject> dl = d -> {};
-        List<String> options = List.of("--enable-preview",
-                                       "-source", System.getProperty("java.specification.version"));
-        for (int i = 0; i < template.length(); i++) {
-            pool.getTask(null, fm, dl, options,
-                    null, Arrays.asList(new MyFileObject(prefix + template.substring(0, i))),
-                    verifyParseable
-            );
-        }
-        for (int i = 0; i < template.length() - 1; i++) {
-            pool.getTask(null, fm, dl, options,
-                    null, Arrays.asList(new MyFileObject(prefix + template.substring(0, i) + "\"")),
-                    verifyParseable);
-        }
-        String incomplete = prefix + "\"\\{o.";
-        pool.getTask(null, fm, dl, options,
-                null, Arrays.asList(new MyFileObject(incomplete)), task -> {
-            try {
-                CompilationUnitTree cut = task.parse().iterator().next();
-                String result = cut.toString().replaceAll("\\R", "\n");
-                System.out.println("RESULT\n" + result);
-                assertEquals("incorrect AST",
-                             result,
-                             """
-                             package t;
-                             \n\
-                             class Test {
-                                 \n\
-                                 void test(Object o) {
-                                     String s = STR.<error>;
-                                 }
-                             }""");
-                return null;
-            } catch (IOException ex) {
-                throw new AssertionError(ex);
-            }
-        });
-    }
-
     @Test //JDK-8295401
     void testModuleInfoProvidesRecovery() throws IOException {
         String code = """
diff --git a/test/langtools/tools/javac/template/Basic.java b/test/langtools/tools/javac/template/Basic.java
deleted file mode 100644
index d6d36de18ca..00000000000
--- a/test/langtools/tools/javac/template/Basic.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2023, 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 0000000
- * @summary Exercise javac handing of templated strings.
- * @library /tools/lib
- * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.main
- * @build toolbox.ToolBox toolbox.JavacTask
- * @run main Basic
- */
-
-
-import toolbox.JavacTask;
-import toolbox.JavaTask;
-import toolbox.Task;
-import toolbox.ToolBox;
-
-public class Basic {
-    private static ToolBox TOOLBOX = new ToolBox();
-    private static final String JAVA_VERSION = System.getProperty("java.specification.version");
-
-    public static void main(String... arg) {
-        primitivesTest();
-        missingPartsTest();
-        expressionsTest();
-        invalidExpressionsTest();
-        processorTest();
-    }
-
-    /*
-     * Primitive types test.
-     */
-    static void primitivesTest() {
-        for (String type : new String[] {
-            "byte",
-            "short",
-            "int",
-            "long",
-            "float",
-            "double"
-        }) {
-            compPass(type + " x = 10; " + type + "  y = 20; StringTemplate result = RAW.\"\\{x} + \\{y} = \\{x + y}\";");
-        }
-    }
-
-    /*
-     * Missing parts test.
-     */
-    static void missingPartsTest() {
-        compFail("""
-            int x = 10;
-            StringTemplate result = RAW."\\{x";
-        """);
-        compFail("""
-            int x = 10;
-            StringTemplate result = RAW."\\{{x}";
-        """);
-        compFail("""
-            int x = 10;
-            StringTemplate result = RAW."\\{x + }";
-        """);
-        compFail("""
-            int x = 10;
-            StringTemplate result = RAW."\\{ * x }";
-        """);
-        compFail("""
-            int x = 10;
-            StringTemplate result = RAW."\\{ (x + x }";
-        """);
-    }
-
-    /*
-     * Expressions test.
-     */
-    static void expressionsTest() {
-        compPass("""
-            int x = 10;
-            int[] y = new int[] { 10, 20, 30 };
-            StringTemplate result1 = RAW."\\{x + 1}";
-            StringTemplate result2 = RAW."\\{x + x}";
-            StringTemplate result3 = RAW."\\{x - x}";
-            StringTemplate result4 = RAW."\\{x * x}";
-            StringTemplate result5 = RAW."\\{x / x}";
-            StringTemplate result6 = RAW."\\{x % x}";
-            StringTemplate result7 = RAW."\\{x + (x + x)}";
-            StringTemplate result8 = RAW."\\{y[x - 9]}";
-            StringTemplate result9 = RAW."\\{System.out}";
-            StringTemplate result10 = RAW.\"""
-                    \\{ "a string" }
-                    \""";
-                    """);
-        compPass("""
-            StringTemplate result = RAW.\"""
-                 \\{
-                     new Collection<String>() {
-                          @Override public int size() { return 0; }
-                          @Override public boolean isEmpty() { return false; }
-                          @Override public boolean contains(Object o) { return false; }
-                          @Override public Iterator<String> iterator() { return null; }
-                          @Override public Object[] toArray() { return new Object[0]; }
-                          @Override public <T> T[] toArray(T[] a) { return null; }
-                          @Override public boolean add(String s) { return false; }
-                          @Override public boolean remove(Object o) { return false; }
-                          @Override public boolean containsAll(Collection<?> c) { return false; }
-                          @Override public boolean addAll(Collection<? extends String> c) { return false; }
-                          @Override public boolean removeAll(Collection<?> c) { return false; }
-                          @Override public boolean retainAll(Collection<?> c) { return false; }
-                          @Override public void clear() { }
-                      }
-                 }
-                 \""";
-         """);
-    }
-
-    /*
-     * Invalid expressions test.
-     */
-    static void invalidExpressionsTest() {
-        compFail("""
-            int x = 10;
-            StringTemplate result = RAW."\\{ (x == x }";
-        """);
-        compFail("""
-            int x = 10;
-            StringTemplate result = RAW."\\{ true ?  : x - 1 }";
-        """);
-        compFail("""
-             String result = RAW."\\{ 'a }";
-        """);
-        compFail("""
-            int x = 10;
-            StringTemplate result = RAW."\\{ Math.min(, x - 1) }";
-        """);
-        compFail("""
-            int x = 10;
-            StringTemplate result = RAW."\\{ \\tx }";
-        """);
-    }
-
-    /*
-     * Processor test.
-     */
-    static void processorTest() {
-        compPass("""
-         int x = 10, y = 20;
-         String string = STR."\\{x} + \\{y} = \\{x + y}";
-         """);
-        compFail("""
-         int x = 10, y = 20;
-         String processor = "abc";
-         String string = processor."\\{x} + \\{y} = \\{x + y}";
-         """);
-        compFail("""
-         int x = 10, y = 20;
-         long processor = 100;
-         String string = processor."\\{x} + \\{y} = \\{x + y}";
-         """);
-    }
-
-    /*
-     * Test source for successful compile.
-     */
-    static void compPass(String code) {
-        String source = """
-            import java.lang.*;
-            import java.util.*;
-            import static java.lang.StringTemplate.RAW;
-            public class TEST {
-                public static void main(String... arg) {
-            """ +
-            code.indent(8) +
-            """
-                }
-            }
-            """;
-        String output = new JavacTask(TOOLBOX)
-                .sources(source)
-                .classpath(".")
-                .options("-encoding", "utf8", "--enable-preview", "-source", JAVA_VERSION)
-                .run()
-                .writeAll()
-                .getOutput(Task.OutputKind.DIRECT);
-
-        if (output.contains("compiler.err")) {
-            throw new RuntimeException("Error detected");
-        }
-    }
-
-    /*
-     * Test source for unsuccessful compile and specific error.
-     */
-    static void compFail(String code) {
-        String source = """
-            import java.lang.*;
-            import java.util.*;
-            import static java.lang.StringTemplate.RAW;
-            public class TEST {
-                public static void main(String... arg) {
-            """ +
-            code.indent(8) +
-            """
-                }
-            }
-            """;
-        String errors = new JavacTask(TOOLBOX)
-                .sources(source)
-                .classpath(".")
-                .options("-XDrawDiagnostics", "-encoding", "utf8", "--enable-preview", "-source", JAVA_VERSION)
-                .run(Task.Expect.FAIL)
-                .writeAll()
-                .getOutput(Task.OutputKind.DIRECT);
-
-        if (!errors.contains("compiler.err")) {
-            throw new RuntimeException("No error detected");
-        }
-    }
-}
diff --git a/test/langtools/tools/javac/template/T8312814.java b/test/langtools/tools/javac/template/T8312814.java
deleted file mode 100644
index 15207828a7d..00000000000
--- a/test/langtools/tools/javac/template/T8312814.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2023, 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 T8312814
- * @summary Verify proper behavior of TransType w.r.t. templated Strings
- * @enablePreview
- * @compile T8312814.java
- */
-
-
-import java.util.List;
-
-public class T8312814 {
-    void x(List<? extends StringTemplate.Processor<String, RuntimeException>> list) {
-        list.get(0)."";
-    }
-}
-
diff --git a/test/langtools/tools/javac/template/TreeScannerTest.java b/test/langtools/tools/javac/template/TreeScannerTest.java
deleted file mode 100644
index ffd7112ab47..00000000000
--- a/test/langtools/tools/javac/template/TreeScannerTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2023, 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
- * @summary Verify proper behavior of TreeScanner w.r.t. templated Strings
- * @modules jdk.compiler
- */
-
-import java.io.*;
-import java.util.*;
-import javax.tools.*;
-import com.sun.source.tree.*;
-import com.sun.source.util.*;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-public class TreeScannerTest {
-    private static final String JAVA_VERSION = System.getProperty("java.specification.version");
-
-    public static void main(String... args) throws Exception {
-        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
-        String code = """
-                      public class Test {
-                          private void test(int a) {
-                              String s1 = TEST."p\\{a}s";
-                              String s2 = "p\\{a}s";
-                          }
-                      }
-                      """;
-        JavacTask task = (JavacTask) compiler.getTask(null, null, null,
-            List.of("--enable-preview", "-source", JAVA_VERSION), null, List.of(new TestJFO(code)));
-        StringBuilder output = new StringBuilder();
-        TreeScanner<Void,Void> checker = new TreeScanner<Void, Void>() {
-            private boolean log;
-
-            @Override
-            public Void visitStringTemplate(StringTemplateTree node, Void p) {
-                boolean prevLog = log;
-                try {
-                    log = true;
-                    return super.visitStringTemplate(node, p);
-                } finally {
-                    log = prevLog;
-                }
-            }
-
-            @Override
-            public Void scan(Tree tree, Void p) {
-                if (log) {
-                    output.append("(");
-                    output.append(tree != null ? tree.getKind() : "null");
-                    try {
-                        return super.scan(tree, p);
-                    } finally {
-                        output.append(")");
-                    }
-                } else {
-                    return super.scan(tree, p);
-                }
-            }
-
-        };
-
-        checker.scan(task.parse(), null);
-
-        String expected = "(IDENTIFIER)(IDENTIFIER)(null)(IDENTIFIER)";
-        if (!expected.equals(output.toString())) {
-            throw new AssertionError("expected output not found, found: " + output);
-        }
-    }
-
-    private static final class TestJFO extends SimpleJavaFileObject {
-        private final String code;
-
-        public TestJFO(String code) throws URISyntaxException, IOException {
-            super(new URI("mem://Test.java"), Kind.SOURCE);
-            this.code = code;
-        }
-
-        @Override
-        public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-            return code;
-        }
-
-    }
-}
diff --git a/test/langtools/tools/javac/tree/TreeKindTest.java b/test/langtools/tools/javac/tree/TreeKindTest.java
index 626288af168..15b4ae37bbe 100644
--- a/test/langtools/tools/javac/tree/TreeKindTest.java
+++ b/test/langtools/tools/javac/tree/TreeKindTest.java
@@ -123,10 +123,6 @@ public class TreeKindTest {
                 ok = ok & verify(k, i, i == OpensTree.class);
                 break;
 
-            case TEMPLATE:
-                ok = ok & verify(k, i, i == StringTemplateTree.class);
-                break;
-
             case OTHER:
                 ok = ok & verify(k, i, i == null);
                 break;
diff --git a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
index 63814220c03..aa30682e1bc 100644
--- a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
+++ b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
@@ -92,7 +92,6 @@ public class ListModuleDeps {
     public Object[][] jdkModules() {
         return new Object[][]{
             {"jdk.compiler", new String[]{
-                                "java.base/jdk.internal.javac",
                                 "java.base/jdk.internal.jmod",
                                 "java.base/jdk.internal.misc",
                                 "java.base/jdk.internal.module",
diff --git a/test/micro/org/openjdk/bench/java/lang/StringTemplateFMT.java b/test/micro/org/openjdk/bench/java/lang/StringTemplateFMT.java
deleted file mode 100644
index 60a3024c7f8..00000000000
--- a/test/micro/org/openjdk/bench/java/lang/StringTemplateFMT.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- */
-package org.openjdk.bench.java.lang;
-
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
-
-import java.util.concurrent.TimeUnit;
-
-import static java.util.FormatProcessor.FMT;
-
-/*
- * This benchmark measures StringTemplate.FMT FormatProcessor performance;
- * exactly mirroring {@link org.openjdk.bench.java.lang.StringFormat} benchmark
- */
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.NANOSECONDS)
-@State(Scope.Thread)
-@Warmup(iterations = 5, time = 1)
-@Measurement(iterations = 5, time = 1)
-@Fork(value = 3, jvmArgsAppend = "--enable-preview")
-public class StringTemplateFMT {
-
-    public String s = "str";
-    public int i = 17;
-
-    @Benchmark
-    public String stringFormat() {
-        return FMT."%s\{s}";
-    }
-
-    @Benchmark
-    public String stringIntFormat() {
-        return FMT."%s\{s} %d\{i}";
-    }
-
-    @Benchmark
-    public String widthStringFormat() {
-        return FMT."%3s\{s}";
-    }
-
-    @Benchmark
-    public String widthStringIntFormat() {
-        return FMT."%3s\{s} %d\{i}";
-    }
-
-    @Benchmark
-    public String complexFormat() {
-        return FMT."%3s\{s} %10d\{i} %4S\{s} %04X\{i} %4S\{s} %04X\{i} %4S\{s} %04X\{i}";
-    }
-}

From 192ec387bc074b25465decf598a4dd87651cbcbb Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Wed, 17 Apr 2024 14:31:40 +0000
Subject: [PATCH 086/486] 8329595: spurious  variable "might not have been
 initialized" on static final field

Reviewed-by: vromero
---
 .../com/sun/tools/javac/comp/Flow.java        | 43 +++++++++++-------
 .../StaticFinalNestedClass.java               | 45 +++++++++++++++++++
 2 files changed, 73 insertions(+), 15 deletions(-)
 create mode 100644 test/langtools/tools/javac/DefiniteAssignment/StaticFinalNestedClass.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
index 4c9a28102e0..e36280ca018 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -481,7 +481,6 @@ public class Flow {
         }
 
         // Do something with all static or non-static field initializers and initialization blocks.
-        // Note: This method also sends nested class definitions to the handler.
         protected void forEachInitializer(JCClassDecl classDef, boolean isStatic, Consumer<? super JCTree> handler) {
             if (classDef == initScanClass)          // avoid infinite loops
                 return;
@@ -490,6 +489,11 @@ public class Flow {
             try {
                 for (List<JCTree> defs = classDef.defs; defs.nonEmpty(); defs = defs.tail) {
                     JCTree def = defs.head;
+
+                    // Don't recurse into nested classes
+                    if (def.hasTag(CLASSDEF))
+                        continue;
+
                     /* we need to check for flags in the symbol too as there could be cases for which implicit flags are
                      * represented in the symbol but not in the tree modifiers as they were not originally in the source
                      * code
@@ -566,6 +570,13 @@ public class Flow {
             lint = lint.augment(tree.sym);
 
             try {
+                // process all the nested classes
+                for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
+                    if (l.head.hasTag(CLASSDEF)) {
+                        scan(l.head);
+                    }
+                }
+
                 // process all the static initializers
                 forEachInitializer(tree, true, def -> {
                     scanDef(def);
@@ -1459,6 +1470,13 @@ public class Flow {
             lint = lint.augment(tree.sym);
 
             try {
+                // process all the nested classes
+                for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
+                    if (l.head.hasTag(CLASSDEF)) {
+                        scan(l.head);
+                    }
+                }
+
                 // process all the static initializers
                 forEachInitializer(tree, true, def -> {
                     scan(def);
@@ -2168,15 +2186,7 @@ public class Flow {
 
         @Override
         protected void markDead() {
-            if (!isConstructor) {
-                inits.inclRange(returnadr, nextadr);
-            } else {
-                for (int address = returnadr; address < nextadr; address++) {
-                    if (!(isFinalUninitializedStaticField(vardecls[address].sym))) {
-                        inits.incl(address);
-                    }
-                }
-            }
+            inits.inclRange(returnadr, nextadr);
             uninits.inclRange(returnadr, nextadr);
         }
 
@@ -2198,10 +2208,6 @@ public class Flow {
                    classDef.sym.isEnclosedBy((ClassSymbol)sym.owner));
         }
 
-        boolean isFinalUninitializedStaticField(VarSymbol sym) {
-            return isFinalUninitializedField(sym) && sym.isStatic();
-        }
-
         /** Initialize new trackable variable by setting its address field
          *  to the next available sequence number and entering it under that
          *  index into the vars array.
@@ -2420,7 +2426,7 @@ public class Flow {
                         clearPendingExits(false);
                     });
 
-                    // verify all static final fields got initailized
+                    // verify all static final fields got initialized
                     for (int i = firstadr; i < nextadr; i++) {
                         JCVariableDecl vardecl = vardecls[i];
                         VarSymbol var = vardecl.sym;
@@ -2448,6 +2454,13 @@ public class Flow {
                             scan(l.head);
                         }
                     }
+
+                    // process all the nested classes
+                    for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
+                        if (l.head.hasTag(CLASSDEF)) {
+                            scan(l.head);
+                        }
+                    }
                 } finally {
                     pendingExits = pendingExitsPrev;
                     nextadr = nextadrPrev;
diff --git a/test/langtools/tools/javac/DefiniteAssignment/StaticFinalNestedClass.java b/test/langtools/tools/javac/DefiniteAssignment/StaticFinalNestedClass.java
new file mode 100644
index 00000000000..57ffe9e6a55
--- /dev/null
+++ b/test/langtools/tools/javac/DefiniteAssignment/StaticFinalNestedClass.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024, 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 8329595
+ * @summary Verify spurious "might not have been initialized" error on static final field
+ * @run main StaticFinalNestedClass
+ */
+public class StaticFinalNestedClass {
+    public class Inner {                    // note this inner class is NOT static
+        public static final String NAME;
+        static {
+            try {
+                NAME = "bob";
+            } catch (Exception e) {
+                throw new Error(e);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        new StaticFinalNestedClass().new Inner();
+    }
+}

From 9fd78022b19149ade40f92749f0b585ecfd41410 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Wed, 17 Apr 2024 15:25:41 +0000
Subject: [PATCH 087/486] 8325494: C2: Broken graph after not skipping CastII
 node anymore for Assertion Predicates after JDK-8309902

Reviewed-by: chagedorn, epeter
---
 src/hotspot/share/opto/loopTransform.cpp      |  6 ++
 ...tAssertionPredicateDoesntConstantFold.java | 61 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/predicates/TestAssertionPredicateDoesntConstantFold.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index e7b92fbc2ac..d49117beb87 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1977,6 +1977,12 @@ bool IdealLoopTree::is_invariant(Node* n) const {
 // to the new stride.
 void PhaseIdealLoop::update_main_loop_assertion_predicates(Node* ctrl, CountedLoopNode* loop_head, Node* init,
                                                            const int stride_con) {
+  if (init->is_CastII()) {
+    // skip over the cast added by PhaseIdealLoop::cast_incr_before_loop() when pre/post/main loops are created because
+    // it can get in the way of type propagation
+    assert(init->as_CastII()->carry_dependency() && loop_head->skip_assertion_predicates_with_halt() == init->in(0), "casted iv phi from pre loop expected");
+    init = init->in(1);
+  }
   Node* entry = ctrl;
   Node* prev_proj = ctrl;
   LoopNode* outer_loop_head = loop_head->skip_strip_mined();
diff --git a/test/hotspot/jtreg/compiler/predicates/TestAssertionPredicateDoesntConstantFold.java b/test/hotspot/jtreg/compiler/predicates/TestAssertionPredicateDoesntConstantFold.java
new file mode 100644
index 00000000000..25b15c90db7
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/predicates/TestAssertionPredicateDoesntConstantFold.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2024, 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 8325494
+ * @summary C2: Broken graph after not skipping CastII node anymore for Assertion Predicates after JDK-8309902
+ * @run main/othervm -XX:-TieredCompilation -Xcomp -XX:CompileOnly=TestAssertionPredicateDoesntConstantFold::test TestAssertionPredicateDoesntConstantFold
+ *
+ */
+
+public class TestAssertionPredicateDoesntConstantFold {
+    static boolean bFld;
+    static int iArrFld[];
+    static long lArrFld[];
+
+    public static void main(String[] strArr) {
+        try {
+            test();
+        } catch (NullPointerException npe) {}
+    }
+
+    static long test() {
+        int i6 = 1, i7, i11;
+        do {
+            for (i7 = 1; i7 < 9; ++i7) {
+                for (i11 = 2; i6 < i11; i11 -= 2) {
+                    if (bFld) {
+                        break;
+                    }
+
+                    lArrFld[i11 + 1] = 6;
+                    iArrFld[i11 % 20] = 3;
+                }
+            }
+        } while (++i6 < 8);
+
+        return i6;
+    }
+}
+

From fd331ff17330329a656181cb58714f1bd1623fcb Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Wed, 17 Apr 2024 16:18:55 +0000
Subject: [PATCH 088/486] 8325469: Freeze/Thaw code can crash in the presence
 of OSR frames

Reviewed-by: rpressler, dlong
---
 .../cpu/aarch64/frame_aarch64.inline.hpp      |   2 +-
 .../stackChunkFrameStream_aarch64.inline.hpp  |   2 +-
 src/hotspot/cpu/ppc/frame_ppc.inline.hpp      |   2 +-
 .../ppc/stackChunkFrameStream_ppc.inline.hpp  |   2 +-
 src/hotspot/cpu/riscv/frame_riscv.inline.hpp  |   2 +-
 .../stackChunkFrameStream_riscv.inline.hpp    |   2 +-
 src/hotspot/cpu/x86/frame_x86.inline.hpp      |   2 +-
 .../x86/stackChunkFrameStream_x86.inline.hpp  |   2 +-
 src/hotspot/share/code/nmethod.cpp            |  14 +-
 src/hotspot/share/code/nmethod.hpp            |   6 +
 src/hotspot/share/oops/method.hpp             |   4 -
 src/hotspot/share/oops/stackChunkOop.cpp      |   4 +-
 .../share/runtime/continuationFreezeThaw.cpp  |   3 +-
 src/hotspot/share/runtime/frame.cpp           |   2 +-
 .../runtime/stackChunkFrameStream.inline.hpp  |   2 +-
 .../jdk/internal/vm/Continuation/OSRTest.java | 238 ++++++++++++++++++
 16 files changed, 265 insertions(+), 24 deletions(-)
 create mode 100644 test/jdk/jdk/internal/vm/Continuation/OSRTest.java

diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
index f7b33931f8d..d22442db0d7 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
@@ -241,7 +241,7 @@ inline int frame::frame_size() const {
 
 inline int frame::compiled_frame_stack_argsize() const {
   assert(cb()->is_nmethod(), "");
-  return (cb()->as_nmethod()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
+  return (cb()->as_nmethod()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
 }
 
 inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
diff --git a/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
index aa4eff19766..7c5cf63e382 100644
--- a/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
@@ -35,7 +35,7 @@ template <ChunkFrames frame_kind>
 inline bool StackChunkFrameStream<frame_kind>::is_in_frame(void* p0) const {
   assert(!is_done(), "");
   intptr_t* p = (intptr_t*)p0;
-  int argsize = is_compiled() ? (_cb->as_nmethod()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord : 0;
+  int argsize = is_compiled() ? (_cb->as_nmethod()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord : 0;
   int frame_size = _cb->frame_size() + argsize;
   return p == sp() - frame::sender_sp_offset || ((p - unextended_sp()) >= 0 && (p - unextended_sp()) < frame_size);
 }
diff --git a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
index 9966ae3f478..2beb7a84d34 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
@@ -369,7 +369,7 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
 
 inline int frame::compiled_frame_stack_argsize() const {
   assert(cb()->is_nmethod(), "");
-  return (cb()->as_nmethod()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
+  return (cb()->as_nmethod()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
 }
 
 inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
diff --git a/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp b/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
index 2fb15d60c8f..cb4af1a3ff7 100644
--- a/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
@@ -35,7 +35,7 @@ inline bool StackChunkFrameStream<frame_kind>::is_in_frame(void* p0) const {
   assert(!is_done(), "");
   assert(is_compiled(), "");
   intptr_t* p = (intptr_t*)p0;
-  int argsize = (_cb->as_nmethod()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
+  int argsize = (_cb->as_nmethod()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
   int frame_size = _cb->frame_size() + (argsize > 0 ? argsize + frame::metadata_words_at_top : 0);
   return (p - unextended_sp()) >= 0 && (p - unextended_sp()) < frame_size;
 }
diff --git a/src/hotspot/cpu/riscv/frame_riscv.inline.hpp b/src/hotspot/cpu/riscv/frame_riscv.inline.hpp
index 06c5c9f1cdb..2e79c89e7b0 100644
--- a/src/hotspot/cpu/riscv/frame_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/frame_riscv.inline.hpp
@@ -232,7 +232,7 @@ inline int frame::frame_size() const {
 
 inline int frame::compiled_frame_stack_argsize() const {
   assert(cb()->is_nmethod(), "");
-  return (cb()->as_nmethod()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
+  return (cb()->as_nmethod()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
 }
 
 inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
diff --git a/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp b/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
index 7a7ee6d0040..e226c7b7a53 100644
--- a/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
@@ -34,7 +34,7 @@ template <ChunkFrames frame_kind>
 inline bool StackChunkFrameStream<frame_kind>::is_in_frame(void* p0) const {
   assert(!is_done(), "");
   intptr_t* p = (intptr_t*)p0;
-  int argsize = is_compiled() ? (_cb->as_nmethod()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord : 0;
+  int argsize = is_compiled() ? (_cb->as_nmethod()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord : 0;
   int frame_size = _cb->frame_size() + argsize;
   return p == sp() - 2 || ((p - unextended_sp()) >= 0 && (p - unextended_sp()) < frame_size);
 }
diff --git a/src/hotspot/cpu/x86/frame_x86.inline.hpp b/src/hotspot/cpu/x86/frame_x86.inline.hpp
index 0f7e536a494..c74731d0410 100644
--- a/src/hotspot/cpu/x86/frame_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/frame_x86.inline.hpp
@@ -227,7 +227,7 @@ inline int frame::frame_size() const {
 
 inline int frame::compiled_frame_stack_argsize() const {
   assert(cb()->is_nmethod(), "");
-  return (cb()->as_nmethod()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
+  return (cb()->as_nmethod()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
 }
 
 inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
diff --git a/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp b/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
index 71b938248ec..d69facadbea 100644
--- a/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
@@ -34,7 +34,7 @@ template <ChunkFrames frame_kind>
 inline bool StackChunkFrameStream<frame_kind>::is_in_frame(void* p0) const {
   assert(!is_done(), "");
   intptr_t* p = (intptr_t*)p0;
-  int argsize = is_compiled() ? (_cb->as_nmethod()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord : 0;
+  int argsize = is_compiled() ? (_cb->as_nmethod()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord : 0;
   int frame_size = _cb->frame_size() + argsize;
   return p == sp() - frame::sender_sp_offset || ((p - unextended_sp()) >= 0 && (p - unextended_sp()) < frame_size);
 }
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 4f0f6c15af1..dd330714e67 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1230,6 +1230,7 @@ nmethod::nmethod(
     init_defaults();
     _comp_level              = CompLevel_none;
     _entry_bci               = InvocationEntryBci;
+    _num_stack_arg_slots     = _method->constMethod()->num_stack_arg_slots();
     // We have no exception handler or deopt handler make the
     // values something that will never match a pc like the nmethod vtable entry
     _exception_offset        = 0;
@@ -1374,12 +1375,13 @@ nmethod::nmethod(
     assert_locked_or_safepoint(CodeCache_lock);
 
     init_defaults();
-    _entry_bci      = entry_bci;
-    _compile_id     = compile_id;
-    _compiler_type  = type;
-    _comp_level     = comp_level;
-    _orig_pc_offset = orig_pc_offset;
-    _gc_epoch       = CodeCache::gc_epoch();
+    _entry_bci               = entry_bci;
+    _num_stack_arg_slots     = entry_bci != InvocationEntryBci ? 0 : _method->constMethod()->num_stack_arg_slots();
+    _compile_id              = compile_id;
+    _compiler_type           = type;
+    _comp_level              = comp_level;
+    _orig_pc_offset          = orig_pc_offset;
+    _gc_epoch                = CodeCache::gc_epoch();
 
     // Section offsets
     _consts_offset  = content_offset() + code_buffer->total_offset_of(code_buffer->consts());
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index e4552992f4b..9fd87020309 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -243,6 +243,8 @@ class nmethod : public CodeBlob {
 
   int _compile_id;                        // which compilation made this nmethod
 
+  int _num_stack_arg_slots;               // Number of arguments passed on the stack
+
   CompilerType _compiler_type;            // which compiler made this nmethod (u1)
 
   bool _is_unlinked;
@@ -792,6 +794,10 @@ public:
   nmethod* osr_link() const                       { return _osr_link; }
   void     set_osr_link(nmethod *n)               { _osr_link = n; }
 
+  int num_stack_arg_slots(bool rounded = true) const {
+    return rounded ? align_up(_num_stack_arg_slots, 2) : _num_stack_arg_slots;
+  }
+
   // Verify calls to dead methods have been cleaned.
   void verify_clean_inline_caches();
 
diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
index 838178d2de2..b5634c8a099 100644
--- a/src/hotspot/share/oops/method.hpp
+++ b/src/hotspot/share/oops/method.hpp
@@ -394,10 +394,6 @@ public:
   void unlink_method() NOT_CDS_RETURN;
   void remove_unshareable_flags() NOT_CDS_RETURN;
 
-  // the number of argument reg slots that the compiled method uses on the stack.
-  int num_stack_arg_slots(bool rounded = true) const {
-    return rounded ? align_up(constMethod()->num_stack_arg_slots(), 2) : constMethod()->num_stack_arg_slots(); }
-
   virtual void metaspace_pointers_do(MetaspaceClosure* iter);
   virtual MetaspaceObj::Type type() const { return MethodType; }
 
diff --git a/src/hotspot/share/oops/stackChunkOop.cpp b/src/hotspot/share/oops/stackChunkOop.cpp
index a8c6cbc2bd2..c0bef6659a3 100644
--- a/src/hotspot/share/oops/stackChunkOop.cpp
+++ b/src/hotspot/share/oops/stackChunkOop.cpp
@@ -562,9 +562,9 @@ bool stackChunkOopDesc::verify(size_t* out_size, int* out_oops, int* out_frames,
   assert(!is_empty() || closure._cb == nullptr, "");
   if (closure._cb != nullptr && closure._cb->is_nmethod()) {
     assert(argsize() ==
-      (closure._cb->as_nmethod()->method()->num_stack_arg_slots()*VMRegImpl::stack_slot_size) >>LogBytesPerWord,
+      (closure._cb->as_nmethod()->num_stack_arg_slots()*VMRegImpl::stack_slot_size) >>LogBytesPerWord,
       "chunk argsize: %d bottom frame argsize: %d", argsize(),
-      (closure._cb->as_nmethod()->method()->num_stack_arg_slots()*VMRegImpl::stack_slot_size) >>LogBytesPerWord);
+      (closure._cb->as_nmethod()->num_stack_arg_slots()*VMRegImpl::stack_slot_size) >>LogBytesPerWord);
   }
 
   assert(closure._num_interpreted_frames == 0 || has_mixed_frames(), "");
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index d3375d1dfbb..527e0da15a8 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -1242,7 +1242,6 @@ NOINLINE freeze_result FreezeBase::recurse_freeze_stub_frame(frame& f, frame& ca
 
 NOINLINE void FreezeBase::finish_freeze(const frame& f, const frame& top) {
   stackChunkOop chunk = _cont.tail();
-  assert(chunk->to_offset(top.sp()) <= chunk->sp(), "");
 
   LogTarget(Trace, continuations) lt;
   if (lt.develop_is_enabled()) {
@@ -2309,7 +2308,7 @@ void ThawBase::recurse_thaw_compiled_frame(const frame& hf, frame& caller, int n
     _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance);
   } else if (_cont.tail()->has_bitmap() && added_argsize > 0) {
     address start = (address)(heap_frame_top + ContinuationHelper::CompiledFrame::size(hf) + frame::metadata_words_at_top);
-    int stack_args_slots = f.cb()->as_nmethod()->method()->num_stack_arg_slots(false /* rounded */);
+    int stack_args_slots = f.cb()->as_nmethod()->num_stack_arg_slots(false /* rounded */);
     int argsize_in_bytes = stack_args_slots * VMRegImpl::stack_slot_size;
     clear_bitmap_bits(start, start + argsize_in_bytes);
   }
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index 3a8eb2ebaaa..c0c6431418c 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -1435,7 +1435,7 @@ void frame::describe(FrameValues& values, int frame_no, const RegisterMap* reg_m
         assert(sig_index == sizeargs, "");
       }
       int stack_arg_slots = SharedRuntime::java_calling_convention(sig_bt, regs, sizeargs);
-      assert(stack_arg_slots ==  m->num_stack_arg_slots(false /* rounded */), "");
+      assert(stack_arg_slots ==  nm->as_nmethod()->num_stack_arg_slots(false /* rounded */) || nm->is_osr_method(), "");
       int out_preserve = SharedRuntime::out_preserve_stack_slots();
       int sig_index = 0;
       int arg_index = (m->is_static() ? 0 : -1);
diff --git a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
index 8ead76211b7..c56034786c9 100644
--- a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
+++ b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
@@ -191,7 +191,7 @@ inline int StackChunkFrameStream<frame_kind>::stack_argsize() const {
   assert(cb() != nullptr, "");
   assert(cb()->is_nmethod(), "");
   assert(cb()->as_nmethod()->method() != nullptr, "");
-  return (cb()->as_nmethod()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
+  return (cb()->as_nmethod()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord;
 }
 
 template <ChunkFrames frame_kind>
diff --git a/test/jdk/jdk/internal/vm/Continuation/OSRTest.java b/test/jdk/jdk/internal/vm/Continuation/OSRTest.java
new file mode 100644
index 00000000000..bf0bfeab674
--- /dev/null
+++ b/test/jdk/jdk/internal/vm/Continuation/OSRTest.java
@@ -0,0 +1,238 @@
+/*
+* Copyright (c) 2024, 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 8325469
+* @summary Test freeze/thaw with OSR frames
+* @requires vm.continuations
+* @requires vm.compMode != "Xint" & vm.compMode != "Xcomp"
+* @modules java.base/jdk.internal.vm
+* @library /test/lib /test/hotspot/jtreg
+* @build jdk.test.whitebox.WhiteBox
+* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+*
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI OSRTest true true true
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=inline,*::yield0 OSRTest true true false
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=dontinline,*::yield* OSRTest true true false
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=exclude,*::bar() OSRTest true false false
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI OSRTest false true true
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI OSRTest false true false
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=exclude,*::bar() OSRTest false false false
+*
+*/
+
+import jdk.internal.vm.Continuation;
+import jdk.internal.vm.ContinuationScope;
+
+import java.lang.reflect.Method;
+import jdk.test.whitebox.WhiteBox;
+
+public class OSRTest {
+    static final WhiteBox wb = WhiteBox.getWhiteBox();
+    static final ContinuationScope FOO = new ContinuationScope() {};
+    static final Method foo = getMethod("foo");
+    static final Method fooBigFrame = getMethod("fooBigFrame");
+    boolean osrAtBottom;
+    boolean freezeFast;
+    boolean thawFast;
+    int fooCallCount;
+
+    public static void main(String[] args) {
+        if (args.length != 3) {
+            throw new Error("Error: args.length must be 3");
+        }
+        boolean TEST_OSR_AT_BOTTOM = Boolean.parseBoolean(args[0]);
+        boolean FREEZE_FAST = Boolean.parseBoolean(args[1]);
+        boolean THAW_FAST = Boolean.parseBoolean(args[2]);
+        assert !THAW_FAST || FREEZE_FAST : "THAW_FAST requires FREEZE_FAST";
+
+        OSRTest test = new OSRTest(TEST_OSR_AT_BOTTOM, FREEZE_FAST, THAW_FAST);
+        test.runTest();
+    }
+
+    public OSRTest(boolean osrAtBottom, boolean freezeFast, boolean thawFast) {
+        this.osrAtBottom = osrAtBottom;
+        this.freezeFast = freezeFast;
+        this.thawFast = thawFast;
+    }
+
+    public void runTest() {
+        Runnable testCase =  osrAtBottom ? ()-> testOSRAtStackBottom() : ()-> TestOSRNotAtStackBottom();
+        Continuation cont = new Continuation(FOO, testCase);
+
+        while (!cont.isDone()) {
+            cont.run();
+            if (freezeFast && !thawFast && fooCallCount == 2) {
+                // All frames frozen in last yield should be compiled
+                // including OSR version of foo. Invoke full GC now so
+                // that chunk is marked and we force thaw slow path.
+                System.gc();
+                fooCallCount++; // Don't call again
+            }
+        }
+    }
+
+    public void testOSRAtStackBottom() {
+        if (freezeFast) {
+            // Trigger compilation of Continuation.yield/yield0
+            for (int i = 0; i < 10_000; i++) {
+                Continuation.yield(FOO);
+            }
+        }
+        for (int i = 0; i < 2; i++) {
+            if (freezeFast && !thawFast) {
+                foo(new Object(), new Object(), new Object(), new Object(), new Object(),
+                    new Object(), new Object(), new Object(), new Object(), new Object(),
+                    1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f);
+            } else {
+                fooBigFrame(new Object(), new Object(), new Object(), new Object(), new Object(),
+                            new Object(), new Object(), new Object(), new Object(), new Object(),
+                            1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f);
+            }
+        }
+    }
+
+    // Declare many parameters and unused locals so that size of interpreter frame is bigger
+    // than size of OSR frame + size of Continuation.yield/yield0 frames. This is so that once
+    // foo is OSR, on yield we clear cont_fastpath() forcing the freeze fast path.
+    public void foo(Object o1, Object o2, Object o3, Object o4, Object o5,
+                    Object o6, Object o7, Object o8, Object o9, Object o10,
+                    float f1, float f2, float f3, float f4, float f5, float f6, float f7) {
+        int i1 = 1;
+        int i2 = i1 + 1;
+        int i3 = i2 + 1;
+        int i4 = i3 + 1;
+        int i5 = i4 + 1;
+        int i6 = i5 + 1;
+        int i7 = i6 + 1;
+        long ll = 2*(long)i1;
+        float ff = ll + 1.2f;
+        double dd = ff + 1.3D;
+
+        if (osrAtBottom) {
+            // freeze all frames so that we only run with foo on the stack
+            Continuation.yield(FOO);
+        }
+
+        // Provoke OSR compilation. After we verified the method was compiled keep looping
+        // until we trigger the _backedge_counter overflow to actually trigger OSR.
+        for (int i = 0; fooCallCount > 0 && (!wb.isMethodCompiled(foo, true) || i++ < 2_000);) {
+        }
+        fooCallCount++;
+
+        if (freezeFast) {
+            Continuation.yield(FOO);
+        } else {
+            bar();
+        }
+    }
+
+    public void bar() {
+        Continuation.yield(FOO);
+    }
+
+    public double fooBigFrame(Object o1, Object o2, Object o3, Object o4, Object o5,
+                              Object o6, Object o7, Object o8, Object o9, Object o10,
+                              float f1, float f2, float f3, float f4, float f5, float f6, float f7) {
+        double d1=1,d2=2,d3=3,d4=4,d5=5,d6=6,d7=7,d8=8,d9=9,d10=10,d11=11,d12=12,d13=13,d14=14,d15=15,d16=16,d17=17,d18=18,d19=19,d20=20,d21=21,d22=22,d23=23,d24=24,d25=25;
+        double d26=26,d27=27,d28=28,d29=29,d30=30,d31=31,d32=32,d33=33,d34=34,d35=35,d36=36,d37=37,d38=38,d39=39,d40=40,d41=41,d42=42,d43=43,d44=44,d45=45,d46=46,d47=47,d48=48,d49=49,d50=50;
+        double d51=51,d52=52,d53=53,d54=54,d55=55,d56=56,d57=57,d58=58,d59=59,d60=60,d61=61,d62=62,d63=63,d64=64,d65=65,d66=66,d67=67,d68=68,d69=69,d70=70,d71=71,d72=72,d73=73,d74=74,d75=75;
+        double d76=76,d77=77,d78=78,d79=79,d80=80,d81=81,d82=82,d83=83,d84=84,d85=85,d86=86,d87=87,d88=88,d89=89,d90=90,d91=91,d92=92,d93=93,d94=94,d95=95,d96=96,d97=97,d98=98,d99=99,d100=100;
+        double d101=101,d102=102,d103=103,d104=104,d105=105,d106=106,d107=107,d108=108,d109=109,d110=110,d111=111,d112=112,d113=113,d114=114,d115=115,d116=116,d117=117,d118=118,d119=119,d120=120,d121=121,d122=122,d123=123,d124=124,d125=125;
+        double d126=126,d127=127,d128=128,d129=129,d130=130,d131=131,d132=132,d133=133,d134=134,d135=135,d136=136,d137=137,d138=138,d139=139,d140=140,d141=141,d142=142,d143=143,d144=144,d145=145,d146=146,d147=147,d148=148,d149=149,d150=150;
+        double d151=151,d152=152,d153=153,d154=154,d155=155,d156=156,d157=157,d158=158,d159=159,d160=160,d161=161,d162=162,d163=163,d164=164,d165=165,d166=166,d167=167,d168=168,d169=169,d170=170,d171=171,d172=172,d173=173,d174=174,d175=175;
+        double d176=176,d177=177,d178=178,d179=179,d180=180,d181=181,d182=182,d183=183,d184=184,d185=185,d186=186,d187=187,d188=188,d189=189,d190=190,d191=191,d192=192,d193=193,d194=194,d195=195,d196=196,d197=197,d198=198,d199=199,d200=200;
+        double d201=201,d202=202,d203=203,d204=204,d205=205,d206=206,d207=207,d208=208,d209=209,d210=210,d211=211,d212=212,d213=213,d214=214,d215=215,d216=216,d217=217,d218=218,d219=219,d220=220,d221=221,d222=222,d223=223,d224=224,d225=225;
+        double d226=226,d227=227,d228=228,d229=229,d230=230,d231=231,d232=232,d233=233,d234=234,d235=235,d236=236,d237=237,d238=238,d239=239,d240=240,d241=241,d242=242,d243=243,d244=244,d245=245,d246=246,d247=247,d248=248,d249=249,d250=250;
+        double d251=251,d252=252,d253=253,d254=254,d255=255,d256=256,d257=257,d258=258,d259=259,d260=260,d261=261,d262=262,d263=263,d264=264,d265=265,d266=266,d267=267,d268=268,d269=269,d270=270,d271=271,d272=272,d273=273,d274=274,d275=275;
+        double d276=276,d277=277,d278=278,d279=279,d280=280,d281=281,d282=282,d283=283,d284=284,d285=285,d286=286,d287=287,d288=288,d289=289,d290=290,d291=291,d292=292,d293=293,d294=294,d295=295,d296=296,d297=297,d298=298,d299=299,d300=300;
+
+        // freeze all frames so that we only run with fooBigFrame on the stack
+        Continuation.yield(FOO);
+
+        // Provoke OSR compilation. After we verified the method was compiled keep looping
+        // until we trigger the _backedge_counter overflow to actually trigger OSR.
+        for (int i = 0; fooCallCount > 0 && (!wb.isMethodCompiled(fooBigFrame, true) || i++ < 2_000);) {
+        }
+        fooCallCount++;
+
+        Continuation.yield(FOO);
+
+        // For the thaw fast case we want to trigger the case of thawing one
+        // frame at a time. Because the OSR frame is at the bottom we have to
+        // make its size > 500 words, so we use a lot of locals. We also want
+        // the interpreted frame size be bigger than OSR frame + size of
+        // Continuation.yield/yield0, so that we clear cont_fastpath() on yield
+        // forcing the freeze fast path (same as with foo). For that, we just
+        // declare more locals than the ones we use after OSR happens.
+        // For the freeze slow case we also want the interpreted frame size to
+        // be bigger than OSR frame + size of Continuation.yield/yield0, so the
+        // last technique serves for this case too.
+        double res = d1*d2*d3*d4*d5*d6*d7*d8*d9*d10*d11*d12*d13*d14*d15*d16*d17*d18*d19*d20*d21*d22*d23*d24*d25*d26*d27*d28*d29*d30*d31*d32*d33*d34*d35*d36*d37*d38*d39*d40*d41*d42*d43*d44*d45*d46*d47*d48*d49*d50*
+                     d51*d52*d53*d54*d55*d56*d57*d58*d59*d60*d61*d62*d63*d64*d65*d66*d67*d68*d69*d70*d71*d72*d73*d74*d75*d76*d77*d78*d79*d80*d81*d82*d83*d84*d85*d86*d87*d88*d89*d90*d91*d92*d93*d94*d95*d96*d97*d98*d99*d100*
+                     d101*d102*d103*d104*d105*d106*d107*d108*d109*d110*d111*d112*d113*d114*d115*d116*d117*d118*d119*d120*d121*d122*d123*d124*d125*d126*d127*d128*d129*d130*d131*d132*d133*d134*d135*d136*d137*d138*d139*d140*
+                     d141*d142*d143*d144*d145*d146*d147*d148*d149*d150*d151*d152*d153*d154*d155*d156*d157*d158*d159*d160*d161*d162*d163*d164*d165*d166*d167*d168*d169*d170*d171*d172*d173*d174*d175*d176*d177*d178*d179*d180*
+                     d181*d182*d183*d184*d185*d186*d187*d188*d189*d190*d191*d192*d193*d194*d195*d196*d197*d198*d199*d200*d201*d202*d203*d204*d205*d206*d207*d208*d209*d210*d211*d212*d213*d214*d215*d216*d217*d218*d219*d220*
+                     d221*d222*d223*d224*d225*d226*d227*d228*d229*d230*d231*d232*d233*d234*d235*d236*d237*d238*d239*d240*d241*d242*d243*d244*d245*d246*d247*d248*d249*d250*d251*d252*d253*d254*d255*d256*d257*d258*d259*d260*
+                     d261*d262*d263*d264*d265*d266*d267*d268*d269*d270*d271*d272*d273*d274*d275;
+        return res;
+    }
+
+    public void TestOSRNotAtStackBottom() {
+        // freeze all frames currently in the stack
+        boolean res = Continuation.yield(FOO);
+
+        for (int i = 1; i < 100000; i++) {
+            // When testing the thaw fast path make recursion big enough so that
+            // the size of all frames at freeze time is more than 500 words. This
+            // way we later force thawing one frame at a time.
+            recurse(thawFast ? 60 : 5, i);
+        }
+    }
+
+    public void recurse(int depth, int iteration) {
+        if (depth > 0) {
+            recurse(depth - 1, iteration);
+        } else {
+            // Make compiler see this branch but not enough times to avoid foo
+            // getting compiled, since we want the OSR version.
+            if (iteration % 45000 == 0) {
+                foo(new Object(), new Object(), new Object(), new Object(), new Object(),
+                    new Object(), new Object(), new Object(), new Object(), new Object(),
+                    1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f);
+            } else {
+                Continuation.yield(FOO);
+            }
+        }
+    }
+
+    static Method getMethod(String method) {
+        try {
+            return OSRTest.class.getMethod(method, Object.class, Object.class, Object.class, Object.class, Object.class, Object.class, Object.class, Object.class,
+                                           Object.class, Object.class, Float.TYPE, Float.TYPE, Float.TYPE, Float.TYPE, Float.TYPE, Float.TYPE, Float.TYPE);
+        } catch (Exception e) {
+            throw new RuntimeException("Exception: couldn't found method " + method + ". " + e.getMessage());
+        }
+    }
+}
\ No newline at end of file

From 4895a15a779fab70290b4df3b464d79a14937e28 Mon Sep 17 00:00:00 2001
From: Suchismith Roy <sroy@openjdk.org>
Date: Wed, 17 Apr 2024 17:03:40 +0000
Subject: [PATCH 089/486] 8319516: AIX System::loadLibrary needs support to
 load a shared library from an archive object

Reviewed-by: mdoerr, mchung
---
 .../internal/loader/ClassLoaderHelper.java    | 77 +++++++++++++++++++
 .../aix/LoadAIXLibraryFromArchiveObject.java  | 72 +++++++++++++++++
 2 files changed, 149 insertions(+)
 create mode 100644 src/java.base/aix/classes/jdk/internal/loader/ClassLoaderHelper.java
 create mode 100644 test/jdk/java/lang/RuntimeTests/loadLibrary/aix/LoadAIXLibraryFromArchiveObject.java

diff --git a/src/java.base/aix/classes/jdk/internal/loader/ClassLoaderHelper.java b/src/java.base/aix/classes/jdk/internal/loader/ClassLoaderHelper.java
new file mode 100644
index 00000000000..1e3aa95729a
--- /dev/null
+++ b/src/java.base/aix/classes/jdk/internal/loader/ClassLoaderHelper.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2024, 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.loader;
+
+import java.io.File;
+import java.util.ArrayList;
+
+class ClassLoaderHelper {
+
+    private ClassLoaderHelper() {}
+
+    /**
+     * Shared objects may be loaded from .a archive object on AIX and .so may not exist.
+     * This method returns false so that loading of shared library continues if
+     * libname.so is not present.
+     */
+    static boolean loadLibraryOnlyIfPresent() {
+        return false;
+    }
+
+    /**
+     * AIX implementation of JVM_LoadLibrary handles the alternate path name mapping.
+     * If loading of the given library name with ".so" suffix fails, it will attempt
+     * to load the library of the same name with ".a" suffix as the alternate name.
+     * This method simply returns null.  It could implement the alternate name
+     * converting ".so" with ".a" suffix but redundant.
+     */
+    static File mapAlternativeName(File lib) {
+        return null;
+    }
+
+    /**
+     * Parse a PATH env variable.
+     *
+     * Empty elements will be replaced by dot.
+     */
+    static String[] parsePath(String ldPath) {
+        char ps = File.pathSeparatorChar;
+        ArrayList<String> paths = new ArrayList<>();
+        int pathStart = 0;
+        int pathEnd;
+        while ((pathEnd = ldPath.indexOf(ps, pathStart)) >= 0) {
+            paths.add((pathStart < pathEnd) ?
+                    ldPath.substring(pathStart, pathEnd) : ".");
+            pathStart = pathEnd + 1;
+        }
+        int ldLen = ldPath.length();
+        paths.add((pathStart < ldLen) ?
+                ldPath.substring(pathStart, ldLen) : ".");
+        return paths.toArray(new String[paths.size()]);
+    }
+}
+
diff --git a/test/jdk/java/lang/RuntimeTests/loadLibrary/aix/LoadAIXLibraryFromArchiveObject.java b/test/jdk/java/lang/RuntimeTests/loadLibrary/aix/LoadAIXLibraryFromArchiveObject.java
new file mode 100644
index 00000000000..b80bb8e734e
--- /dev/null
+++ b/test/jdk/java/lang/RuntimeTests/loadLibrary/aix/LoadAIXLibraryFromArchiveObject.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2024, IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import jdk.test.lib.process.ProcessTools;
+
+/**
+ * @test
+ * @bug 8319516
+ * @summary verify that System.loadLibrary on AIX is able to load libraries from ".a" (archive) file
+ * @requires os.family == "aix"
+ * @library /test/lib/
+ * @build jdk.test.lib.process.ProcessTools
+ * @run  main/othervm   LoadAIXLibraryFromArchiveObject
+ */
+public class LoadAIXLibraryFromArchiveObject {
+
+    private static final String TEST_LIBRARY_NAME = "foobar";
+    // creates a ".a" archive file in a test specific directory and then
+    // launches a java application passing this directory through "-Djava.library.path".
+    // the java application then attempts to load the library using System.loadLibrary()
+    public static void main(String[] args) throws Exception {
+        String javaHome = System.getProperty("java.home");
+        Path libj2pcscSo = Path.of(javaHome).resolve("lib", "libj2pcsc.so");
+        if (!Files.exists(libj2pcscSo)) {
+            throw new AssertionError(libj2pcscSo + " is missing");
+        }
+        String archiveFileName = "lib" + TEST_LIBRARY_NAME + ".a";
+        // copy over libj2pcsc.so as an archive file to test specific scratch dir
+        Path testNativeLibDir = Path.of("native").toAbsolutePath();
+        Files.createDirectories(testNativeLibDir);
+        Path libFooBarArchive = testNativeLibDir.resolve(archiveFileName);
+        Files.copy(libj2pcscSo, libFooBarArchive);
+        // launch a java application which calls System.loadLibrary and is passed
+        // the directory containing the native library archive file, through
+        // -Djava.library.path
+        ProcessBuilder processBuilder = ProcessTools.createTestJavaProcessBuilder(
+                "-Djava.library.path=" + testNativeLibDir,
+                LoadAIXLibraryFromArchiveObject.LoadLibraryApp.class.getName());
+        ProcessTools.executeCommand(processBuilder).shouldHaveExitValue(0);
+    }
+
+    static class LoadLibraryApp {
+        public static void main(final String[] args) throws Exception {
+            System.out.println("attempting to load library " + TEST_LIBRARY_NAME);
+            System.loadLibrary(TEST_LIBRARY_NAME);
+            System.out.println(TEST_LIBRARY_NAME + " successfully loaded");
+        }
+    }
+}
+

From 064628471b83616b4463baa78618d1b7a66d0c7c Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Wed, 17 Apr 2024 17:35:17 +0000
Subject: [PATCH 090/486] 8317376: Minor improvements to the 'this' escape
 analyzer

Reviewed-by: vromero
---
 make/CompileModuleTools.gmk                   |   2 +-
 make/modules/java.net.http/Java.gmk           |  26 -
 make/modules/java.sql.rowset/Java.gmk         |   2 -
 make/modules/jdk.charsets/Java.gmk            |   2 -
 make/modules/jdk.compiler/Gendata.gmk         |   2 +-
 make/modules/jdk.crypto.ec/Java.gmk           |  26 -
 make/modules/jdk.javadoc/Gendata.gmk          |   2 +-
 make/modules/jdk.jcmd/Java.gmk                |   2 -
 make/modules/jdk.jconsole/Java.gmk            |   2 -
 make/modules/jdk.jdeps/Gensrc.gmk             |   2 -
 make/modules/jdk.jdeps/Launcher.gmk           |   2 -
 make/modules/jdk.jdi/Java.gmk                 |   2 -
 make/modules/jdk.jpackage/Java.gmk            |   2 -
 make/modules/jdk.localedata/Java.gmk          |   2 -
 make/modules/jdk.sctp/Java.gmk                |   2 -
 .../com/sun/tools/javac/comp/Flow.java        |   2 +-
 .../tools/javac/comp/ThisEscapeAnalyzer.java  | 882 ++++++++++++------
 .../com/sun/tools/javac/tree/TreeInfo.java    |  35 +
 .../tools/javac/warnings/ThisEscape.java      | 120 ++-
 .../tools/javac/warnings/ThisEscape.out       |  14 +-
 20 files changed, 756 insertions(+), 375 deletions(-)
 delete mode 100644 make/modules/java.net.http/Java.gmk
 delete mode 100644 make/modules/jdk.crypto.ec/Java.gmk

diff --git a/make/CompileModuleTools.gmk b/make/CompileModuleTools.gmk
index bb3948f377e..0a3039b34d2 100644
--- a/make/CompileModuleTools.gmk
+++ b/make/CompileModuleTools.gmk
@@ -53,7 +53,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
                 build/tools/jigsaw, \
     COPY := .properties .html, \
     BIN := $(TOOLS_CLASSES_DIR), \
-    DISABLED_WARNINGS := fallthrough this-escape, \
+    DISABLED_WARNINGS := fallthrough, \
     JAVAC_FLAGS := \
         --add-modules jdk.jdeps \
         --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
diff --git a/make/modules/java.net.http/Java.gmk b/make/modules/java.net.http/Java.gmk
deleted file mode 100644
index 269a1195b6a..00000000000
--- a/make/modules/java.net.http/Java.gmk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2023, 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.
-#
-
-DISABLED_WARNINGS_java += this-escape
diff --git a/make/modules/java.sql.rowset/Java.gmk b/make/modules/java.sql.rowset/Java.gmk
index 6548dd46cae..2dc60515a1b 100644
--- a/make/modules/java.sql.rowset/Java.gmk
+++ b/make/modules/java.sql.rowset/Java.gmk
@@ -23,8 +23,6 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
-
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
 CLEAN_FILES += $(wildcard \
diff --git a/make/modules/jdk.charsets/Java.gmk b/make/modules/jdk.charsets/Java.gmk
index fad05cc29f1..3adf141e8e1 100644
--- a/make/modules/jdk.charsets/Java.gmk
+++ b/make/modules/jdk.charsets/Java.gmk
@@ -23,6 +23,4 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
-
 COPY += .dat
diff --git a/make/modules/jdk.compiler/Gendata.gmk b/make/modules/jdk.compiler/Gendata.gmk
index 32fa70462b2..78847074c88 100644
--- a/make/modules/jdk.compiler/Gendata.gmk
+++ b/make/modules/jdk.compiler/Gendata.gmk
@@ -66,7 +66,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
     SRC := $(TOPDIR)/make/langtools/src/classes, \
     INCLUDES := build/tools/symbolgenerator com/sun/tools/classfile, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols_javac, \
-    DISABLED_WARNINGS := options this-escape, \
+    DISABLED_WARNINGS := options, \
     JAVAC_FLAGS := \
         $(COMPILECREATESYMBOLS_ADD_EXPORTS), \
 ))
diff --git a/make/modules/jdk.crypto.ec/Java.gmk b/make/modules/jdk.crypto.ec/Java.gmk
deleted file mode 100644
index 269a1195b6a..00000000000
--- a/make/modules/jdk.crypto.ec/Java.gmk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2023, 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.
-#
-
-DISABLED_WARNINGS_java += this-escape
diff --git a/make/modules/jdk.javadoc/Gendata.gmk b/make/modules/jdk.javadoc/Gendata.gmk
index 412559c5fe1..95719c7b452 100644
--- a/make/modules/jdk.javadoc/Gendata.gmk
+++ b/make/modules/jdk.javadoc/Gendata.gmk
@@ -56,7 +56,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
         $(TOPDIR)/src/jdk.jdeps/share/classes, \
     INCLUDES := build/tools/symbolgenerator com/sun/tools/classfile, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols_javadoc, \
-    DISABLED_WARNINGS := options this-escape, \
+    DISABLED_WARNINGS := options, \
     JAVAC_FLAGS := \
         $(INTERIM_LANGTOOLS_ARGS) \
         $(COMPILECREATESYMBOLS_ADD_EXPORTS), \
diff --git a/make/modules/jdk.jcmd/Java.gmk b/make/modules/jdk.jcmd/Java.gmk
index 08209e93538..2cae8b0fdd5 100644
--- a/make/modules/jdk.jcmd/Java.gmk
+++ b/make/modules/jdk.jcmd/Java.gmk
@@ -23,6 +23,4 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
-
 COPY += _options
diff --git a/make/modules/jdk.jconsole/Java.gmk b/make/modules/jdk.jconsole/Java.gmk
index 9166d6a7c11..b60b84cdc3c 100644
--- a/make/modules/jdk.jconsole/Java.gmk
+++ b/make/modules/jdk.jconsole/Java.gmk
@@ -23,8 +23,6 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
-
 COPY += .gif .png
 
 CLEAN_FILES += $(wildcard \
diff --git a/make/modules/jdk.jdeps/Gensrc.gmk b/make/modules/jdk.jdeps/Gensrc.gmk
index 640143b1b56..a81297348f3 100644
--- a/make/modules/jdk.jdeps/Gensrc.gmk
+++ b/make/modules/jdk.jdeps/Gensrc.gmk
@@ -26,8 +26,6 @@
 include GensrcCommon.gmk
 include GensrcProperties.gmk
 
-DISABLED_WARNINGS_java += this-escape
-
 $(eval $(call SetupVersionProperties, JAVAP_VERSION, \
     com/sun/tools/javap/resources/version.properties))
 
diff --git a/make/modules/jdk.jdeps/Launcher.gmk b/make/modules/jdk.jdeps/Launcher.gmk
index 628b0cd5589..ceab7931245 100644
--- a/make/modules/jdk.jdeps/Launcher.gmk
+++ b/make/modules/jdk.jdeps/Launcher.gmk
@@ -25,8 +25,6 @@
 
 include LauncherCommon.gmk
 
-DISABLED_WARNINGS_java += this-escape
-
 ################################################################################
 ## Build javap
 ################################################################################
diff --git a/make/modules/jdk.jdi/Java.gmk b/make/modules/jdk.jdi/Java.gmk
index 76d05b06df4..2e7cf805bc0 100644
--- a/make/modules/jdk.jdi/Java.gmk
+++ b/make/modules/jdk.jdi/Java.gmk
@@ -23,8 +23,6 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
-
 EXCLUDES += \
     com/sun/tools/example/debug/bdi \
     com/sun/tools/example/debug/event \
diff --git a/make/modules/jdk.jpackage/Java.gmk b/make/modules/jdk.jpackage/Java.gmk
index 60fe53475c9..acb8529f9ef 100644
--- a/make/modules/jdk.jpackage/Java.gmk
+++ b/make/modules/jdk.jpackage/Java.gmk
@@ -23,8 +23,6 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
-
 COPY += .gif .png .txt .spec .script .prerm .preinst \
     .postrm .postinst .list .sh .desktop .copyright .control .plist .template \
     .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff .service
diff --git a/make/modules/jdk.localedata/Java.gmk b/make/modules/jdk.localedata/Java.gmk
index d794dde2124..cb12bc560b2 100644
--- a/make/modules/jdk.localedata/Java.gmk
+++ b/make/modules/jdk.localedata/Java.gmk
@@ -23,8 +23,6 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
-
 COPY += _dict _th
 # Exclude BreakIterator classes that are just used in compile process to generate
 # data files and shouldn't go in the product
diff --git a/make/modules/jdk.sctp/Java.gmk b/make/modules/jdk.sctp/Java.gmk
index 9fc531689ee..b1fbdcda9f4 100644
--- a/make/modules/jdk.sctp/Java.gmk
+++ b/make/modules/jdk.sctp/Java.gmk
@@ -23,8 +23,6 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
-
 # No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
 SCTP_IMPL_CLASSES = \
     $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
index e36280ca018..c103ee342af 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -231,7 +231,7 @@ public class Flow {
         new AssignAnalyzer().analyzeTree(env, make);
         new FlowAnalyzer().analyzeTree(env, make);
         new CaptureAnalyzer().analyzeTree(env, make);
-        new ThisEscapeAnalyzer(names, syms, types, log, lint).analyzeTree(env);
+        new ThisEscapeAnalyzer(names, syms, types, rs, log, lint).analyzeTree(env);
     }
 
     public void analyzeLambda(Env<AttrContext> env, JCLambda that, TreeMaker make, boolean speculative) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java
index f6ce19fac06..c063058d11c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java
@@ -29,6 +29,7 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.Map;
@@ -39,6 +40,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -72,9 +75,16 @@ import static com.sun.tools.javac.tree.JCTree.Tag.*;
  * Looks for possible 'this' escapes and generates corresponding warnings.
  *
  * <p>
- * A 'this' escape is when a constructor invokes a method that could be overridden in a
- * subclass, in which case the method will execute before the subclass constructor has
- * finished initializing the instance.
+ * A 'this' escape occurs in the following scenario:
+ * <ul>
+ *  <li>There is some class {@code A} and some subclass {@code B} that extends it
+ *  <li>{@code A} defines an instance method {@code m()} which is overridden in {@code B}
+ *  <li>Some constructor {@code B()} invokes some superclass constructor {@code A()}
+ *  <li>At some point during the execution of {@code A()}, method {@code m()} is invoked and the
+ *      reciever for the instance method is the new instance being constructed by {@code B()}
+ * </ul>
+ * This represents a problem because the method {@code B.m()} will execute before the constructor
+ * {@code B()} has performed any of its own initialization.
  *
  * <p>
  * This class attempts to identify possible 'this' escapes while also striking a balance
@@ -83,34 +93,41 @@ import static com.sun.tools.javac.tree.JCTree.Tag.*;
  * If it passes to code outside of the current module, we declare a possible leak.
  *
  * <p>
- * As we analyze constructors and the methods they invoke, we track the various things in scope
- * that could possibly reference the 'this' instance we are following. Such references are
- * represented by {@link Ref} instances, of which there are these varieties:
+ * As we analyze constructors and the methods they invoke, we track the various object references that
+ * might reference the 'this' instance we are watching (i.e., the one under construction). Such object
+ * references are represented by the {@link Ref} class hierarchy, which models the various ways in which,
+ * at any point during the execution of a constructor or some other method or constructor that it invokes,
+ * there can live references to the object under construction lying around. In a nutshell, the analyzer
+ * keeps track of these references and watches what happens to them as the code executes so it can catch
+ * them in the act of trying to "escape".
+ *
+ * <p>
+ * The {@link Ref} sub-types are:
  * <ul>
- *  <li>The current 'this' reference; see {@link ThisRef}
- *  <li>The current outer 'this' reference; see {@link OuterRef}
- *  <li>Local variables and method parameters; see {@link VarRef}
- *  <li>The current expression being evaluated, i.e.,what's on top of the Java stack; see {@link ExprRef}
- *  <li>The current switch expressions's yield value; see {@link YieldRef}
- *  <li>The current method's return value; see {@link ReturnRef}
+ *  <li>{@link ThisRef} - The current 'this' instance of the (instance) method being analyzed
+ *  <li>{@link ExprRef} - The current expression being evaluated, i.e., what's on top of the Java stack
+ *  <li>{@link VarRef} - Local variables and method parameters currently in scope
+ *  <li>{@link YieldRef} - The current switch expression's yield value(s)
+ *  <li>{@link ReturnRef} - The current method's return value(s)
  * </ul>
  *
  * <p>
- * For each type of reference, we distinguish between <i>direct</i> and <i>indirect</i> references.
- * A direct reference means the reference directly refers to the 'this' instance we are tracking.
- * An indirect reference means the reference refers to the 'this' instance we are tracking through
- * at least one level of indirection.
+ * Currently we don't attempt to explicitly track references stored in fields (for future study).
  *
  * <p>
- * Currently we do not attempt to explicitly track references stored in fields (for future study).
+ * For each object reference represented by a {@link Ref}, we track up to three distinct ways in which
+ * it might refer to the new 'this' instance: the reference can be direct, indirect, or via an associated
+ * enclosing instance (see {@link Indirection}).
  *
  * <p>
  * A few notes on this implementation:
  * <ul>
- *  <li>We "execute" constructors and track where the 'this' reference goes as the constructor executes.
- *  <li>We use a very simplified flow analysis that you might call a "flood analysis", where the union
- *      of every possible code branch is taken.
- *  <li>A "leak" is defined as the possible passing of a subclassed 'this' reference to code defined
+ *  <li>We "execute" constructors and track how the {@link Ref}'s evolve as the constructor executes.
+ *  <li>We use a simplified "flooding" flow analysis where every possible code branch is taken and
+ *      we take the union of the resulting {@link Ref}'s that are generated.
+ *  <li>Loops are repeated until the set of {@link Ref}'s stabilizes; the maximum number of iterations
+ *      possible is proportional to the number of variables in scope.
+ *  <li>An "escape" is defined as the possible passing of a subclassed 'this' reference to code defined
  *      outside of the current module.
  *  <ul>
  *      <li>In other words, we don't try to protect the current module's code from itself.
@@ -131,11 +148,16 @@ class ThisEscapeAnalyzer extends TreeScanner {
     private final Names names;
     private final Symtab syms;
     private final Types types;
+    private final Resolve rs;
     private final Log log;
     private       Lint lint;
 
 // These fields are scoped to the entire compilation unit
 
+    /** Environment for symbol lookup.
+     */
+    private Env<AttrContext> attrEnv;
+
     /** Maps symbols of all methods to their corresponding declarations.
      */
     private final Map<Symbol, MethodInfo> methodMap = new LinkedHashMap<>();
@@ -144,6 +166,10 @@ class ThisEscapeAnalyzer extends TreeScanner {
      */
     private final Set<Symbol> suppressed = new HashSet<>();
 
+    /** Contains classes whose outer instance (if any) is non-public.
+     */
+    private final Set<ClassSymbol> nonPublicOuters = new HashSet<>();
+
     /** The declaring class of the constructor we're currently analyzing.
      *  This is the 'this' type we're trying to detect leaks of.
      */
@@ -189,10 +215,11 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
 // Constructor
 
-    ThisEscapeAnalyzer(Names names, Symtab syms, Types types, Log log, Lint lint) {
+    ThisEscapeAnalyzer(Names names, Symtab syms, Types types, Resolve rs, Log log, Lint lint) {
         this.names = names;
         this.syms = syms;
         this.types = types;
+        this.rs = rs;
         this.log = log;
         this.lint = lint;
     }
@@ -221,19 +248,10 @@ class ThisEscapeAnalyzer extends TreeScanner {
                             .collect(Collectors.toSet()))
             .orElse(null);
 
-        // Build a set of symbols for classes declared in this file
-        final Set<Symbol> classSyms = new HashSet<>();
-        new TreeScanner() {
-            @Override
-            public void visitClassDef(JCClassDecl tree) {
-                classSyms.add(tree.sym);
-                super.visitClassDef(tree);
-            }
-        }.scan(env.tree);
-
         // Build a mapping from symbols of methods to their declarations.
         // Classify all ctors and methods as analyzable and/or invokable.
         // Track which constructors and fields have warnings suppressed.
+        // Record classes whose outer instance (if any) is non-public.
         new TreeScanner() {
 
             private Lint lint = ThisEscapeAnalyzer.this.lint;
@@ -248,8 +266,12 @@ class ThisEscapeAnalyzer extends TreeScanner {
                 lint = lint.augment(tree.sym);
                 try {
                     currentClass = tree;
+
+                    // Track which clases have non-public outer instances
                     nonPublicOuter |= tree.sym.isAnonymous();
                     nonPublicOuter |= (tree.mods.flags & Flags.PUBLIC) == 0;
+                    if (nonPublicOuter)
+                        nonPublicOuters.add(currentClass.sym);
 
                     // Recurse
                     super.visitClassDef(tree);
@@ -335,7 +357,7 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
                 // Handle field initializers
                 if (defs.head instanceof JCVariableDecl vardef) {
-                    visitTopLevel(klass, () -> {
+                    visitTopLevel(env, klass, () -> {
                         scan(vardef);
                         copyPendingWarning();
                     });
@@ -344,7 +366,7 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
                 // Handle initialization blocks
                 if (defs.head instanceof JCBlock block) {
-                    visitTopLevel(klass, () -> analyzeStatements(block.stats));
+                    visitTopLevel(env, klass, () -> analyzeStatements(block.stats));
                     continue;
                 }
             }
@@ -354,7 +376,7 @@ class ThisEscapeAnalyzer extends TreeScanner {
         methodMap.values().stream()
                 .filter(MethodInfo::analyzable)
                 .forEach(methodInfo -> {
-            visitTopLevel(methodInfo.declaringClass(),
+            visitTopLevel(env, methodInfo.declaringClass(),
                 () -> analyzeStatements(methodInfo.declaration().body.stats));
         });
 
@@ -480,15 +502,19 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
     @Override
     public void visitVarDef(JCVariableDecl tree) {
+        visitVarDef(tree.sym, tree.init);
+    }
+
+    private void visitVarDef(VarSymbol sym, JCExpression expr) {
 
         // Skip if ignoring warnings for this field
-        if (suppressed.contains(tree.sym))
+        if (suppressed.contains(sym))
             return;
 
         // Scan initializer, if any
-        scan(tree.init);
-        if (isParamOrVar(tree.sym))
-            refs.replaceExprs(depth, direct -> new VarRef(tree.sym, direct));
+        scan(expr);
+        if (isParamOrVar(sym))
+            refs.replaceExprs(depth, ref -> new VarRef(sym, ref));
         else
             refs.discardExprs(depth);           // we don't track fields yet
     }
@@ -508,19 +534,15 @@ class ThisEscapeAnalyzer extends TreeScanner {
         // Get method symbol
         Symbol sym = TreeInfo.symbolFor(invoke.meth);
 
-        // Recurse on method expression
+        // Recurse on method expression and gather references from the method itself (if non-static)
         scan(invoke.meth);
-        boolean direct = refs.remove(ExprRef.direct(depth));
-        boolean indirect = refs.remove(ExprRef.indirect(depth));
-
-        // Determine if method receiver represents a possible reference
         RefSet<ThisRef> receiverRefs = RefSet.newEmpty();
         if (sym != null && !sym.isStatic()) {
-            if (direct)
-                receiverRefs.add(ThisRef.direct());
-            if (indirect)
-                receiverRefs.add(ThisRef.indirect());
-        }
+            refs.removeExprs(depth)
+              .map(ThisRef::new)
+              .forEach(receiverRefs::add);
+        } else
+            refs.discardExprs(depth);
 
         // If "super()": ignore - we don't try to track into superclasses
         if (TreeInfo.name(invoke.meth) == names._super)
@@ -530,7 +552,7 @@ class ThisEscapeAnalyzer extends TreeScanner {
         invoke(invoke, sym, invoke.args, receiverRefs);
     }
 
-    private void invoke(JCTree site, Symbol sym, List<JCExpression> args, RefSet<?> receiverRefs) {
+    private void invoke(JCTree site, Symbol sym, List<JCExpression> args, RefSet<ThisRef> receiverRefs) {
 
         // Skip if ignoring warnings for a constructor invoked via 'this()'
         if (suppressed.contains(sym))
@@ -544,17 +566,51 @@ class ThisEscapeAnalyzer extends TreeScanner {
             return;
         }
 
-        // Analyze method if possible, otherwise assume nothing
+        // See if this method is known because it's declared somewhere in our file
         MethodInfo methodInfo = methodMap.get(sym);
+
+        // If the method is not matched exactly, look a little harder. This especially helps
+        // with anonymous interface classes, where the method symbols won't match.
+        //
+        // For example:
+        //
+        //  public Leaker() {
+        //      Runnable r = new Runnable() {
+        //          public void run() {
+        //              Leaker.this.mightLeak();
+        //          }
+        //      };
+        //      r.run();    // "r" has type Runnable, but we know it's really a Leaker$1
+        //  }
+        //
+        if (methodInfo == null && receiverRefs.size() == 1) {
+            ThisRef receiverRef = receiverRefs.iterator().next();
+            methodInfo = methodMap.values().stream()
+              .filter(info -> isTargetMethod(info, sym, receiverRef.tsym))
+              .findFirst()
+              .orElse(null);
+        }
+
+        // Analyze method if possible, otherwise assume nothing
         if (methodInfo != null && methodInfo.invokable())
             invokeInvokable(site, args, receiverRefs, methodInfo);
         else
             invokeUnknown(site, args, receiverRefs);
     }
 
+    // Can we conclude that "info" represents the actual method invoked?
+    private boolean isTargetMethod(MethodInfo info, Symbol method, TypeSymbol receiverType) {
+        return method.kind == MTH &&                                            // not an error symbol, etc.
+          info.declaration.name == method.name &&                               // method name matches
+          info.declaringClass.sym == receiverType &&                            // same class as receiver
+          !info.declaration.sym.isConstructor() &&                              // not a constructor
+          (info.declaration.sym.flags() & Flags.STATIC) == 0 &&                 // not a static method
+          info.declaration.sym.overrides(method, receiverType, types, false);   // method overrides
+    }
+
     // Handle the invocation of a local analyzable method or constructor
     private void invokeInvokable(JCTree site, List<JCExpression> args,
-        RefSet<?> receiverRefs, MethodInfo methodInfo) {
+            RefSet<ThisRef> receiverRefs, MethodInfo methodInfo) {
         Assert.check(methodInfo.invokable());
 
         // Collect 'this' references found in method parameters
@@ -564,7 +620,9 @@ class ThisEscapeAnalyzer extends TreeScanner {
         while (args.nonEmpty() && params.nonEmpty()) {
             VarSymbol sym = params.head.sym;
             scan(args.head);
-            refs.removeExprs(depth, direct -> paramRefs.add(new VarRef(sym, direct)));
+            refs.removeExprs(depth)
+              .map(ref -> new VarRef(sym, ref))
+              .forEach(paramRefs::add);
             args = args.tail;
             params = params.tail;
         }
@@ -601,8 +659,17 @@ class ThisEscapeAnalyzer extends TreeScanner {
                 invocations.remove(invocation);
             }
 
-            // "Return" any references from method return value
-            refs.mapInto(refsPrev, ReturnRef.class, direct -> new ExprRef(depthPrev, direct));
+            // Constructors "return" their new instances
+            if (TreeInfo.isConstructor(methodInfo.declaration)) {
+                refs.remove(ThisRef.class)
+                  .map(ReturnRef::new)
+                  .forEach(refs::add);
+            }
+
+            // "Return" any references from method return statements
+            refs.remove(ReturnRef.class)
+              .map(ref -> new ExprRef(depthPrev, ref))
+              .forEach(refsPrev::add);
         } finally {
             callStack.pop();
             depth = depthPrev;
@@ -611,19 +678,33 @@ class ThisEscapeAnalyzer extends TreeScanner {
         }
     }
 
-    // Handle invocation of an unknown or overridable method or constructor
-    private void invokeUnknown(JCTree invoke, List<JCExpression> args, RefSet<?> receiverRefs) {
+    // Handle invocation of an unknown or overridable method or constructor.
+    private void invokeUnknown(JCTree invoke, List<JCExpression> args, RefSet<ThisRef> receiverRefs) {
 
         // Detect leak via receiver
-        if (!receiverRefs.isEmpty())
+        if (receiverRefs.stream().anyMatch(this::triggersUnknownInvokeLeak))
             leakAt(invoke);
 
-        // Detect leaks via method parameters
+        // Detect leaks via method parameters (except via non-public outer instance)
         for (JCExpression arg : args) {
             scan(arg);
-            if (refs.discardExprs(depth))
+            if (refs.removeExprs(depth).anyMatch(this::triggersUnknownInvokeLeak))
                 leakAt(arg);
         }
+
+        // Constructors "return" their new instance, so we should return the receiver refs
+        if (invoke.hasTag(NEWCLASS)) {
+            receiverRefs.stream()
+              .map(ref -> new ExprRef(depth, ref))
+              .forEach(refs::add);
+        }
+    }
+
+    // Determine if a reference should qualify as a leak if it's passed to an unknown method.
+    // To avoid false positives, we exclude references from non-public outer instances.
+    private boolean triggersUnknownInvokeLeak(Ref ref) {
+        return !nonPublicOuters.contains(ref.tsym) ||
+          ref.indirections.stream().anyMatch(i -> i != Indirection.OUTER);
     }
 
 //
@@ -633,22 +714,47 @@ class ThisEscapeAnalyzer extends TreeScanner {
     @Override
     public void visitNewClass(JCNewClass tree) {
         MethodInfo methodInfo = methodMap.get(tree.constructor);
+        TypeSymbol tsym = tree.def != null ? tree.def.sym : tree.clazz.type.tsym;
+
+        // Gather 'this' reference that the new instance itself will have
+        RefSet<ThisRef> receiverRefs = receiverRefsForConstructor(tree.encl, tsym);
+
+        // "Invoke" the constructor
         if (methodInfo != null && methodInfo.invokable())
-            invokeInvokable(tree, tree.args, outerThisRefs(tree.encl, tree.clazz.type), methodInfo);
+            invokeInvokable(tree, tree.args, receiverRefs, methodInfo);
         else
-            invokeUnknown(tree, tree.args, outerThisRefs(tree.encl, tree.clazz.type));
+            invokeUnknown(tree, tree.args, receiverRefs);
     }
 
-    // Determine 'this' references passed to a constructor via the outer 'this' instance
-    private RefSet<OuterRef> outerThisRefs(JCExpression explicitOuterThis, Type type) {
-        RefSet<OuterRef> outerRefs = RefSet.newEmpty();
+    // Determine the references a constructor will inherit from its outer 'this' instance, if any
+    private RefSet<ThisRef> receiverRefsForConstructor(JCExpression explicitOuterThis, TypeSymbol tsym) {
+
+        // Create references based on explicit outer instance, if any
         if (explicitOuterThis != null) {
             scan(explicitOuterThis);
-            refs.removeExprs(depth, direct -> outerRefs.add(new OuterRef(direct)));
-        } else if (type.tsym != methodClass.sym && type.tsym.isEnclosedBy(methodClass.sym)) {
-            refs.mapInto(outerRefs, ThisRef.class, OuterRef::new);
+            return refs.removeExprs(depth)
+              .map(ref -> ref.toOuter(explicitOuterThis.type.tsym))
+              .flatMap(Optional::stream)
+              .collect(RefSet.collector());
         }
-        return outerRefs;
+
+        // Create references based on current outer instance, if any
+        if (hasImplicitOuterInstance(tsym)) {
+            return refs.find(ThisRef.class)
+              .map(ref -> ref.toOuter(tsym))
+              .flatMap(Optional::stream)
+              .collect(RefSet.collector());
+        }
+
+        // None
+        return RefSet.newEmpty();
+    }
+
+    // Determine if an unqualified "new Foo()" constructor gets 'this' as an implicit outer instance
+    private boolean hasImplicitOuterInstance(TypeSymbol tsym) {
+        return tsym != methodClass.sym
+          && tsym.hasOuterInstance()
+          && tsym.isEnclosedBy(methodClass.sym);
     }
 
 //
@@ -678,9 +784,72 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
     @Override
     public void visitForeachLoop(JCEnhancedForLoop tree) {
+
+        // Check for loop on array
+        Type elemType = types.elemtype(tree.expr.type);
+
+        // If not array, resolve the Iterable and Iterator methods
+        record ForeachMethods(MethodSymbol iterator, MethodSymbol hasNext, MethodSymbol next) { };
+        MethodSymbol iterator = null;
+        MethodSymbol hasNext = null;
+        MethodSymbol next = null;
+        if (elemType == null) {
+            Symbol iteratorSym = rs.resolveQualifiedMethod(tree.expr.pos(), attrEnv,
+              tree.expr.type, names.iterator, List.nil(), List.nil());
+            if (iteratorSym instanceof MethodSymbol) {
+                iterator = (MethodSymbol)iteratorSym;
+                Symbol hasNextSym = rs.resolveQualifiedMethod(tree.expr.pos(), attrEnv,
+                  iterator.getReturnType(), names.hasNext, List.nil(), List.nil());
+                Symbol nextSym = rs.resolveQualifiedMethod(tree.expr.pos(), attrEnv,
+                  iterator.getReturnType(), names.next, List.nil(), List.nil());
+                if (hasNextSym instanceof MethodSymbol)
+                    hasNext = (MethodSymbol)hasNextSym;
+                if (nextSym instanceof MethodSymbol)
+                    next = (MethodSymbol)nextSym;
+            }
+        }
+        ForeachMethods foreachMethods = iterator != null && hasNext != null && next != null ?
+          new ForeachMethods(iterator, hasNext, next) : null;
+
+        // Iterate loop
         visitLooped(tree, foreach -> {
+
+            // Scan iteration target
             scan(foreach.expr);
-            refs.discardExprs(depth);       // we don't handle iterator() yet
+            if (elemType != null) {                     // array iteration
+                if (isParamOrVar(foreach.var.sym)) {
+                    refs.removeExprs(depth)
+                      .map(ref -> ref.toIndirect(elemType.tsym))
+                      .flatMap(Optional::stream)
+                      .map(ref -> new VarRef(foreach.var.sym, ref))
+                      .forEach(refs::add);
+                } else
+                    refs.discardExprs(depth);           // we don't track fields yet
+            } else if (foreachMethods != null) {        // Iterable iteration
+
+                // "Invoke" the iterator() method
+                RefSet<ThisRef> receiverRefs = refs.removeExprs(depth)
+                  .map(ThisRef::new)
+                  .collect(RefSet.collector());
+                invoke(foreach.expr, foreachMethods.iterator, List.nil(), receiverRefs);
+
+                // "Invoke" the hasNext() method
+                receiverRefs = refs.removeExprs(depth)
+                  .map(ThisRef::new)
+                  .collect(RefSet.collector());
+                invoke(foreach.expr, foreachMethods.hasNext, List.nil(), receiverRefs);
+                refs.discardExprs(depth);
+
+                // "Invoke" the next() method
+                invoke(foreach.expr, foreachMethods.next, List.nil(), receiverRefs);
+                if (isParamOrVar(foreach.var.sym))
+                    refs.replaceExprs(depth, ref -> new VarRef(foreach.var.sym, ref));
+                else
+                    refs.discardExprs(depth);           // we don't track fields yet
+            } else                                      // what is it???
+                refs.discardExprs(depth);
+
+            // Scan loop body
             scan(foreach.body);
         });
     }
@@ -699,11 +868,14 @@ class ThisEscapeAnalyzer extends TreeScanner {
         visitScoped(true, () -> {
             scan(tree.selector);
             refs.discardExprs(depth);
-            RefSet<ExprRef> combinedRefs = new RefSet<>();
+            RefSet<ExprRef> combinedRefs = RefSet.newEmpty();
             for (List<JCCase> cases = tree.cases; cases.nonEmpty(); cases = cases.tail) {
                 scan(cases.head.stats);
-                refs.replace(YieldRef.class, direct -> new ExprRef(depth, direct));
-                combinedRefs.addAll(refs.removeExprs(depth));
+                refs.remove(YieldRef.class)
+                  .map(ref -> new ExprRef(depth, ref))
+                  .forEach(combinedRefs::add);
+                refs.removeExprs(depth)
+                  .forEach(combinedRefs::add);
             }
             refs.addAll(combinedRefs);
         });
@@ -733,79 +905,60 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
     @Override
     public void visitLambda(JCLambda lambda) {
-        visitDeferred(() -> visitScoped(false, () -> {
-            scan(lambda.body);
-            refs.discardExprs(depth);       // needed in case body is a JCExpression
-        }));
+        visitDeferred(() -> visitScoped(true, () -> scan(lambda.body)));
     }
 
     @Override
     public void visitAssign(JCAssign tree) {
+        VarSymbol sym = (VarSymbol)TreeInfo.symbolFor(tree.lhs);
         scan(tree.lhs);
         refs.discardExprs(depth);
         scan(tree.rhs);
-        VarSymbol sym = (VarSymbol)TreeInfo.symbolFor(tree.lhs);
         if (isParamOrVar(sym))
-            refs.replaceExprs(depth, direct -> new VarRef(sym, direct));
+            refs.replaceExprs(depth, ref -> new VarRef(sym, ref));
         else
             refs.discardExprs(depth);         // we don't track fields yet
     }
 
     @Override
     public void visitIndexed(JCArrayAccess tree) {
-        scan(tree.indexed);
-        refs.remove(ExprRef.direct(depth));
-        boolean indirectRef = refs.remove(ExprRef.indirect(depth));
         scan(tree.index);
         refs.discardExprs(depth);
-        if (indirectRef) {
-            refs.add(ExprRef.direct(depth));
-            refs.add(ExprRef.indirect(depth));
-        }
+        scan(tree.indexed);
+        refs.removeExprs(depth)
+          .map(ref -> ref.toDirect(tree.type.tsym))
+          .flatMap(Optional::stream)
+          .forEach(refs::add);
     }
 
     @Override
     public void visitSelect(JCFieldAccess tree) {
 
-        // Scan the selected thing
+        // Scan the selection target (i.e., the method)
         scan(tree.selected);
-        boolean selectedDirectRef = refs.remove(ExprRef.direct(depth));
-        boolean selectedIndirectRef = refs.remove(ExprRef.indirect(depth));
+        Stream<ExprRef> methodRefs = refs.removeExprs(depth);
 
-        // Explicit 'this' reference?
+        // Explicit 'this' reference? The expression references whatever 'this' references
         Type.ClassType currentClassType = (Type.ClassType)methodClass.sym.type;
-        if (isExplicitThisReference(types, currentClassType, tree)) {
-            refs.mapInto(refs, ThisRef.class, direct -> new ExprRef(depth, direct));
+        if (TreeInfo.isExplicitThisReference(types, currentClassType, tree)) {
+            refs.find(ThisRef.class)
+              .map(ref -> new ExprRef(depth, ref))
+              .forEach(refs::add);
             return;
         }
 
-        // Explicit outer 'this' reference?
-        Type selectedType = types.erasure(tree.selected.type);
-        if (selectedType.hasTag(CLASS)) {
-            ClassSymbol currentClassSym = (ClassSymbol)currentClassType.tsym;
-            ClassSymbol selectedTypeSym = (ClassSymbol)selectedType.tsym;
-            if (tree.name == names._this &&
-                    selectedTypeSym != currentClassSym &&
-                    currentClassSym.isEnclosedBy(selectedTypeSym)) {
-                refs.mapInto(refs, OuterRef.class, direct -> new ExprRef(depth, direct));
-                return;
-            }
-        }
-
-        // Methods - the "value" of a non-static method is a reference to its instance
-        Symbol sym = tree.sym;
-        if (sym.kind == MTH) {
-            if ((sym.flags() & Flags.STATIC) == 0) {
-                if (selectedDirectRef)
-                    refs.add(ExprRef.direct(depth));
-                if (selectedIndirectRef)
-                    refs.add(ExprRef.indirect(depth));
-            }
+        // Explicit outer 'this' reference? The expression references whatever the outer 'this' references
+        if (isExplicitOuterThisReference(types, currentClassType, tree)) {
+            refs.find(ThisRef.class)
+              .map(ref -> ref.fromOuter(depth))
+              .flatMap(Optional::stream)
+              .forEach(refs::add);
             return;
         }
 
-        // Unknown
-        return;
+        // For regular non-static methods, our expression "value" is the method's target instance
+        if (tree.sym.kind == MTH && (tree.sym.flags() & Flags.STATIC) == 0)
+            methodRefs.forEach(refs::add);
     }
 
     @Override
@@ -817,28 +970,25 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
         // Scan target expression and extract 'this' references, if any
         scan(tree.expr);
-        boolean direct = refs.remove(ExprRef.direct(depth));
-        boolean indirect = refs.remove(ExprRef.indirect(depth));
 
         // Gather receiver references for deferred invocation
-        RefSet<Ref> receiverRefs = RefSet.newEmpty();
+        RefSet<ThisRef> receiverRefs = RefSet.newEmpty();
         switch (tree.kind) {
         case UNBOUND:
         case STATIC:
         case TOPLEVEL:
         case ARRAY_CTOR:
+            refs.discardExprs(depth);
             return;
         case SUPER:
-            refs.mapInto(receiverRefs, ThisRef.class, ThisRef::new);
-            break;
         case BOUND:
-            if (direct)
-                receiverRefs.add(ThisRef.direct());
-            if (indirect)
-                receiverRefs.add(ThisRef.indirect());
+            refs.removeExprs(depth)
+              .map(ThisRef::new)
+              .forEach(receiverRefs::add);
             break;
         case IMPLICIT_INNER:
-            receiverRefs.addAll(outerThisRefs(null, tree.expr.type));
+            receiverRefsForConstructor(null, tree.expr.type.tsym)
+              .forEach(receiverRefs::add);
             break;
         default:
             throw new RuntimeException("non-exhaustive?");
@@ -851,37 +1001,43 @@ class ThisEscapeAnalyzer extends TreeScanner {
     @Override
     public void visitIdent(JCIdent tree) {
 
-        // Reference to this?
+        // Explicit 'this' reference? The expression references whatever 'this' references
         if (tree.name == names._this || tree.name == names._super) {
-            refs.mapInto(refs, ThisRef.class, direct -> new ExprRef(depth, direct));
+            refs.find(ThisRef.class)
+              .map(ref -> new ExprRef(depth, ref))
+              .forEach(refs::add);
             return;
         }
 
-        // Parameter or local variable?
+        // Parameter or local variable? The expression references whatever the variable references
         if (isParamOrVar(tree.sym)) {
             VarSymbol sym = (VarSymbol)tree.sym;
-            if (refs.contains(VarRef.direct(sym)))
-                refs.add(ExprRef.direct(depth));
-            if (refs.contains(VarRef.indirect(sym)))
-                refs.add(ExprRef.indirect(depth));
+            refs.find(VarRef.class, ref -> ref.sym == sym)
+              .map(ref -> new ExprRef(depth, ref))
+              .forEach(refs::add);
             return;
         }
 
         // An unqualified, non-static method invocation must reference 'this' or outer 'this'.
-        // The "value" of a non-static method is a reference to its instance.
+        // The expression "value" of a non-static method is a reference to its target instance.
         if (tree.sym.kind == MTH && (tree.sym.flags() & Flags.STATIC) == 0) {
             MethodSymbol sym = (MethodSymbol)tree.sym;
 
             // Check for implicit 'this' reference
             ClassSymbol methodClassSym = methodClass.sym;
             if (methodClassSym.isSubClass(sym.owner, types)) {
-                refs.mapInto(refs, ThisRef.class, direct -> new ExprRef(depth, direct));
+                refs.find(ThisRef.class)
+                  .map(ref -> new ExprRef(depth, ref))
+                  .forEach(refs::add);
                 return;
             }
 
             // Check for implicit outer 'this' reference
             if (methodClassSym.isEnclosedBy((ClassSymbol)sym.owner)) {
-                refs.mapInto(refs, OuterRef.class, direct -> new ExprRef(depth, direct));
+                refs.find(ThisRef.class)
+                  .map(ref -> ref.fromOuter(depth))
+                  .flatMap(Optional::stream)
+                  .forEach(refs::add);
                 return;
             }
 
@@ -905,11 +1061,13 @@ class ThisEscapeAnalyzer extends TreeScanner {
     public void visitConditional(JCConditional tree) {
         scan(tree.cond);
         refs.discardExprs(depth);
-        RefSet<ExprRef> combinedRefs = new RefSet<>();
+        RefSet<ExprRef> combinedRefs = RefSet.newEmpty();
         scan(tree.truepart);
-        combinedRefs.addAll(refs.removeExprs(depth));
+        refs.removeExprs(depth)
+          .forEach(combinedRefs::add);
         scan(tree.falsepart);
-        combinedRefs.addAll(refs.removeExprs(depth));
+        refs.removeExprs(depth)
+          .forEach(combinedRefs::add);
         refs.addAll(combinedRefs);
     }
 
@@ -944,20 +1102,24 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
     @Override
     public void visitNewArray(JCNewArray tree) {
-        boolean ref = false;
+        RefSet<ExprRef> combinedRefs = RefSet.newEmpty();
         if (tree.elems != null) {
             for (List<JCExpression> elems = tree.elems; elems.nonEmpty(); elems = elems.tail) {
                 scan(elems.head);
-                ref |= refs.discardExprs(depth);
+                refs.removeExprs(depth)
+                  .map(ref -> ref.toIndirect(tree.type.tsym))
+                  .flatMap(Optional::stream)
+                  .forEach(combinedRefs::add);
             }
         }
-        if (ref)
-            refs.add(ExprRef.indirect(depth));
+        combinedRefs.stream()
+          .forEach(refs::add);
     }
 
     @Override
     public void visitTypeCast(JCTypeCast tree) {
         scan(tree.expr);
+        refs.replaceExprs(depth, ref -> ref.withType(tree.expr.type.tsym));
     }
 
     @Override
@@ -1046,23 +1208,26 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
 // Helper methods
 
-    private void visitTopLevel(JCClassDecl klass, Runnable action) {
+    private void visitTopLevel(Env<AttrContext> env, JCClassDecl klass, Runnable action) {
+        Assert.check(attrEnv == null);
         Assert.check(targetClass == null);
         Assert.check(methodClass == null);
         Assert.check(depth == -1);
         Assert.check(refs == null);
+        attrEnv = env;
         targetClass = klass;
         methodClass = klass;
         try {
 
             // Add the initial 'this' reference
             refs = RefSet.newEmpty();
-            refs.add(ThisRef.direct());
+            refs.add(new ThisRef(targetClass.sym, EnumSet.of(Indirection.DIRECT)));
 
             // Perform action
             this.visitScoped(false, action);
         } finally {
             Assert.check(depth == -1);
+            attrEnv = null;
             methodClass = null;
             targetClass = null;
             refs = null;
@@ -1075,20 +1240,24 @@ class ThisEscapeAnalyzer extends TreeScanner {
     // pending warning and the current RefSet. Finally, if the deferred code would have
     // leaked, we create an indirect ExprRef because it must be holding a 'this' reference.
     // If the deferred code would not leak, then obviously no leak is possible, period.
-    private <T extends JCTree> void visitDeferred(Runnable recurse) {
+    private <T extends JCTree> void visitDeferred(Runnable deferredCode) {
         DiagnosticPosition[] pendingWarningPrev = pendingWarning;
         pendingWarning = null;
         RefSet<Ref> refsPrev = refs.clone();
         boolean deferredCodeLeaks;
         try {
-            recurse.run();
+            deferredCode.run();
             deferredCodeLeaks = pendingWarning != null;
+
+            // There can be ExprRef's if the deferred code returns something.
+            // Don't let them escape unnoticed.
+            deferredCodeLeaks |= refs.discardExprs(depth);
         } finally {
             refs = refsPrev;
             pendingWarning = pendingWarningPrev;
         }
         if (deferredCodeLeaks)
-            refs.add(ExprRef.indirect(depth));
+            refs.add(new ExprRef(depth, syms.objectType.tsym, EnumSet.of(Indirection.INDIRECT)));
     }
 
     // Repeat loop as needed until the current set of references converges
@@ -1116,7 +1285,9 @@ class ThisEscapeAnalyzer extends TreeScanner {
             // "Promote" ExprRef's to the enclosing lexical scope, if requested
             if (promote) {
                 Assert.check(depth > 0);
-                refs.removeExprs(depth, direct -> refs.add(new ExprRef(depth - 1, direct)));
+                refs.removeExprs(depth)
+                  .map(ref -> new ExprRef(depth - 1, ref))
+                  .forEach(refs::add);
             }
         } finally {
             popScope();
@@ -1129,8 +1300,8 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
     private void popScope() {
         Assert.check(depth >= 0);
+        refs.discardExprs(depth);
         depth--;
-        refs.removeIf(ref -> ref.getDepth() > depth);
     }
 
     // Note a possible 'this' reference leak at the specified location
@@ -1162,41 +1333,21 @@ class ThisEscapeAnalyzer extends TreeScanner {
             (sym.owner.kind == MTH || sym.owner.kind == VAR);
     }
 
-    /** Check if the given tree is an explicit reference to the 'this' instance of the
-     *  class currently being compiled. This is true if tree is:
-     *  - An unqualified 'this' identifier
-     *  - A 'super' identifier qualified by a class name whose type is 'currentClass' or a supertype
-     *  - A 'this' identifier qualified by a class name whose type is 'currentClass' or a supertype
-     *    but also NOT an enclosing outer class of 'currentClass'.
+    /** Check if the given tree is an explicit reference to the outer 'this' instance of the
+     *  class currently being compiled. This is true if tree is 'Foo.this' where 'Foo' is
+     *  the immediately enclosing class of the current class.
      */
-    private boolean isExplicitThisReference(Types types, Type.ClassType currentClass, JCTree tree) {
-        switch (tree.getTag()) {
-            case PARENS:
-                return isExplicitThisReference(types, currentClass, TreeInfo.skipParens(tree));
-            case IDENT:
-            {
-                JCIdent ident = (JCIdent)tree;
-                Names names = ident.name.table.names;
-                return ident.name == names._this;
-            }
-            case SELECT:
-            {
-                JCFieldAccess select = (JCFieldAccess)tree;
-                Type selectedType = types.erasure(select.selected.type);
-                if (!selectedType.hasTag(CLASS))
-                    return false;
-                ClassSymbol currentClassSym = (ClassSymbol)((Type.ClassType)types.erasure(currentClass)).tsym;
-                ClassSymbol selectedClassSym = (ClassSymbol)((Type.ClassType)selectedType).tsym;
-                Names names = select.name.table.names;
-                return currentClassSym.isSubClass(selectedClassSym, types) &&
-                        (select.name == names._super ||
-                        (select.name == names._this &&
-                            (currentClassSym == selectedClassSym ||
-                            !currentClassSym.isEnclosedBy(selectedClassSym))));
-            }
-            default:
-                return false;
+    private boolean isExplicitOuterThisReference(Types types, Type.ClassType currentClass, JCFieldAccess select) {
+        Type selectedType = types.erasure(select.selected.type);
+        if (selectedType.hasTag(CLASS)) {
+            ClassSymbol currentClassSym = (ClassSymbol)currentClass.tsym;
+            ClassSymbol selectedTypeSym = (ClassSymbol)selectedType.tsym;
+            if (select.name == names._this &&
+                    currentClassSym.hasOuterInstance() &&
+                    currentClassSym.owner.enclClass() == selectedTypeSym)
+                return true;
         }
+        return false;
     }
 
     // When scanning nodes we can be in one of two modes:
@@ -1216,9 +1367,8 @@ class ThisEscapeAnalyzer extends TreeScanner {
             Assert.check(targetClass != null);
             Assert.check(refs != null);
             Assert.check(depth >= 0);
-            Assert.check(refs.stream().noneMatch(ref -> ref.getDepth() > depth));
-            Assert.check(allowExpr || !refs.contains(ExprRef.direct(depth)));
-            Assert.check(allowExpr || !refs.contains(ExprRef.indirect(depth)));
+            Assert.check(refs.find(ExprRef.class)
+              .allMatch(ref -> allowExpr && ref.depth <= depth));
         } else {
             Assert.check(targetClass == null);
             Assert.check(refs == null);
@@ -1232,34 +1382,46 @@ class ThisEscapeAnalyzer extends TreeScanner {
 
 // Ref's
 
-    /** Represents a location that could possibly hold a 'this' reference.
-     *
-     *  <p>
-     *  If not "direct", the reference is found through at least one indirection.
+    /** Describes how the 'this' we care about is referenced by a {@link Ref} that is being tracked.
+     */
+    enum Indirection {
+
+        /** The {@link Ref} directly references 'this'. */
+        DIRECT,
+
+        /** The {@link Ref} references 'this' via its outer instance. */
+        OUTER,
+
+        /** The {@link Ref} references 'this' indirectly somehow through
+            at least one level of indirection. */
+        INDIRECT;
+    }
+
+    /** Represents an object reference that could refer to the 'this' we care about.
      */
     private abstract static class Ref {
 
-        private final int depth;
-        private final boolean direct;
+        final TypeSymbol tsym;
+        final EnumSet<Indirection> indirections;
 
-        Ref(int depth, boolean direct) {
-            this.depth = depth;
-            this.direct = direct;
+        Ref(Ref ref) {
+            this(ref.tsym, ref.indirections);
         }
 
-        public int getDepth() {
-            return depth;
+        Ref(TypeSymbol tsym, EnumSet<Indirection> indirections) {
+            Assert.check(tsym != null);
+            Assert.check(indirections != null);
+            this.tsym = tsym;
+            this.indirections = EnumSet.copyOf(indirections);
         }
 
-        public boolean isDirect() {
-            return direct;
-        }
+        public abstract Ref withType(TypeSymbol tsym);
 
         @Override
         public int hashCode() {
             return getClass().hashCode()
-                ^ Integer.hashCode(depth)
-                ^ Boolean.hashCode(direct);
+                ^ tsym.hashCode()
+                ^ indirections.hashCode();
         }
 
         @Override
@@ -1269,65 +1431,155 @@ class ThisEscapeAnalyzer extends TreeScanner {
             if (obj == null || obj.getClass() != getClass())
                 return false;
             Ref that = (Ref)obj;
-            return depth == that.depth
-              && direct == that.direct;
+            return tsym == that.tsym
+              && indirections.equals(that.indirections);
         }
 
         @Override
-        public String toString() {
+        public final String toString() {
             ArrayList<String> properties = new ArrayList<>();
+            properties.add("tsym=" + tsym);
             addProperties(properties);
+            properties.add(indirections.stream()
+              .map(Indirection::name)
+              .collect(Collectors.joining(",")));
             return getClass().getSimpleName()
               + "[" + properties.stream().collect(Collectors.joining(",")) + "]";
         }
 
         protected void addProperties(ArrayList<String> properties) {
-            properties.add("depth=" + depth);
-            properties.add(direct ? "direct" : "indirect");
+        }
+
+        // Return a modified copy of this Ref's Indirections. The modified set must not be empty.
+        public EnumSet<Indirection> modifiedIndirections(Consumer<? super EnumSet<Indirection>> modifier) {
+            EnumSet<Indirection> newIndirections = EnumSet.copyOf(indirections);
+            modifier.accept(newIndirections);
+            Assert.check(!newIndirections.isEmpty());
+            return newIndirections;
+        }
+
+        // Add one level of indirection through an outer instance
+        //  - DIRECT references become OUTER
+        //  - OUTER references disappear (we don't try to track indirect outer 'this' references)
+        //  - INDIRECT references disappear (we don't try to track outer indirect 'this' references)
+        public Optional<ThisRef> toOuter(TypeSymbol tsym) {
+            return Optional.of(this)
+              .filter(ref -> ref.indirections.contains(Indirection.DIRECT))
+              .map(ref -> new ThisRef(tsym, ref.modifiedIndirections(indirections -> {
+                indirections.remove(Indirection.DIRECT);
+                indirections.remove(Indirection.INDIRECT);
+                indirections.add(Indirection.OUTER);
+              })));
         }
     }
 
-    /** A reference from the current 'this' instance.
+    /** A reference originating from the current 'this' instance.
      */
     private static class ThisRef extends Ref {
 
-        ThisRef(boolean direct) {
-            super(0, direct);
+        ThisRef(Ref ref) {
+            super(ref);
         }
 
-        public static ThisRef direct() {
-            return new ThisRef(true);
+        ThisRef(TypeSymbol tsym, EnumSet<Indirection> indirections) {
+            super(tsym, indirections);
         }
 
-        public static ThisRef indirect() {
-            return new ThisRef(false);
+        @Override
+        public ThisRef withType(TypeSymbol tsym) {
+            return new ThisRef(tsym, indirections);
+        }
+
+        // Remove one level of indirection through the outer instance
+        //  - DIRECT references disappear
+        //  - OUTER references become DIRECT
+        //  - INDIRECT references disappear
+        public Optional<ExprRef> fromOuter(int depth) {
+            ClassSymbol outerType = Optional.of(tsym.owner)
+              .map(Symbol::enclClass)
+              .orElse(null);
+            if (outerType == null)
+                return Optional.empty();        // weird
+            return Optional.of(this)
+              .filter(ref -> ref.indirections.contains(Indirection.OUTER))
+              .map(ref -> new ExprRef(depth, outerType, ref.modifiedIndirections(indirections -> {
+                indirections.remove(Indirection.OUTER);
+                indirections.remove(Indirection.INDIRECT);
+                indirections.add(Indirection.DIRECT);
+              })));
         }
     }
 
-    /** A reference from the current outer 'this' instance.
-     */
-    private static class OuterRef extends Ref {
-
-        OuterRef(boolean direct) {
-            super(0, direct);
-        }
-    }
-
-    /** A reference from the expression that was just evaluated.
+    /** A reference originating from the expression that was just evaluated.
      *  In other words, a reference that's sitting on top of the stack.
      */
     private static class ExprRef extends Ref {
 
-        ExprRef(int depth, boolean direct) {
-            super(depth, direct);
+        final int depth;
+
+        ExprRef(int depth, Ref ref) {
+            super(ref);
+            this.depth = depth;
         }
 
-        public static ExprRef direct(int depth) {
-            return new ExprRef(depth, true);
+        ExprRef(int depth, TypeSymbol tsym, EnumSet<Indirection> indirections) {
+            super(tsym, indirections);
+            this.depth = depth;
         }
 
-        public static ExprRef indirect(int depth) {
-            return new ExprRef(depth, false);
+        @Override
+        public ExprRef withType(TypeSymbol tsym) {
+            return new ExprRef(depth, tsym, indirections);
+        }
+
+        // Add one level of indirection
+        //  - DIRECT references convert to INDIRECT
+        //  - OUTER references disappear (we don't try to track indirect outer 'this' references)
+        //  - INDIRECT references stay INDIRECT
+        public Optional<ExprRef> toIndirect(TypeSymbol indirectType) {
+            return Optional.of(this)
+              .filter(ref -> ref.indirections.contains(Indirection.DIRECT) ||
+                             ref.indirections.contains(Indirection.INDIRECT))
+              .map(ref -> new ExprRef(depth, indirectType, ref.modifiedIndirections(indirections -> {
+                indirections.remove(Indirection.DIRECT);
+                indirections.remove(Indirection.OUTER);
+                indirections.add(Indirection.INDIRECT);
+              })));
+        }
+
+        // Remove one level of indirection
+        //  - DIRECT references disappear
+        //  - OUTER references disappear
+        //  - INDIRECT references become both DIRECT and INDIRECT
+        public Optional<ExprRef> toDirect(TypeSymbol directType) {
+            return Optional.of(this)
+              .filter(ref -> ref.indirections.contains(Indirection.INDIRECT))
+              .map(ref -> new ExprRef(depth, directType, ref.modifiedIndirections(indirections -> {
+                indirections.remove(Indirection.OUTER);
+                indirections.add(Indirection.DIRECT);
+              })));
+        }
+
+        @Override
+        public int hashCode() {
+            return super.hashCode()
+                ^ Integer.hashCode(depth);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == this)
+                return true;
+            if (!super.equals(obj))
+                return false;
+            ExprRef that = (ExprRef)obj;
+            return depth == that.depth;
+        }
+
+        @Override
+        protected void addProperties(ArrayList<String> properties) {
+            super.addProperties(properties);
+            properties.add("depth=" + depth);
         }
     }
 
@@ -1335,8 +1587,17 @@ class ThisEscapeAnalyzer extends TreeScanner {
      */
     private static class ReturnRef extends Ref {
 
-        ReturnRef(boolean direct) {
-            super(0, direct);
+        ReturnRef(Ref ref) {
+            super(ref);
+        }
+
+        ReturnRef(TypeSymbol tsym, EnumSet<Indirection> indirections) {
+            super(tsym, indirections);
+        }
+
+        @Override
+        public ReturnRef withType(TypeSymbol tsym) {
+            return new ReturnRef(tsym, indirections);
         }
     }
 
@@ -1344,8 +1605,17 @@ class ThisEscapeAnalyzer extends TreeScanner {
      */
     private static class YieldRef extends Ref {
 
-        YieldRef(boolean direct) {
-            super(0, direct);
+        YieldRef(Ref ref) {
+            super(ref);
+        }
+
+        YieldRef(TypeSymbol tsym, EnumSet<Indirection> indirections) {
+            super(tsym, indirections);
+        }
+
+        @Override
+        public YieldRef withType(TypeSymbol tsym) {
+            return new YieldRef(tsym, indirections);
         }
     }
 
@@ -1353,23 +1623,21 @@ class ThisEscapeAnalyzer extends TreeScanner {
      */
     private static class VarRef extends Ref {
 
-        private final VarSymbol sym;
+        final VarSymbol sym;
 
-        VarRef(VarSymbol sym, boolean direct) {
-            super(0, direct);
+        VarRef(VarSymbol sym, Ref ref) {
+            super(ref);
             this.sym = sym;
         }
 
-        public VarSymbol getSymbol() {
-            return sym;
+        VarRef(VarSymbol sym, TypeSymbol tsym, EnumSet<Indirection> indirections) {
+            super(tsym, indirections);
+            this.sym = sym;
         }
 
-        public static VarRef direct(VarSymbol sym) {
-            return new VarRef(sym, true);
-        }
-
-        public static VarRef indirect(VarSymbol sym) {
-            return new VarRef(sym, false);
+        @Override
+        public VarRef withType(TypeSymbol tsym) {
+            return new VarRef(sym, tsym, indirections);
         }
 
         @Override
@@ -1398,80 +1666,91 @@ class ThisEscapeAnalyzer extends TreeScanner {
 // RefSet
 
     /** Contains locations currently known to hold a possible 'this' reference.
+     *  All methods that return Stream return a copy to avoid ConcurrentModificationException.
      */
     @SuppressWarnings("serial")
     private static class RefSet<T extends Ref> extends HashSet<T> {
 
+        private RefSet() {
+            super(8);
+        }
+
         public static <T extends Ref> RefSet<T> newEmpty() {
             return new RefSet<>();
         }
 
-        /**
-         * Discard any {@link ExprRef}'s at the specified depth.
-         * Do this when discarding whatever is on top of the stack.
+        /** Find all {@link Ref}'s of the given type.
+         */
+        public <T extends Ref> Stream<T> find(Class<T> refType) {
+            return find(refType, ref -> true);
+        }
+
+        /** Find all {@link Ref}'s of the given type and matching the given predicate.
+         */
+        public <T extends Ref> Stream<T> find(Class<T> refType, Predicate<? super T> filter) {
+            return stream()
+              .filter(refType::isInstance)
+              .map(refType::cast)
+              .filter(filter)
+              .collect(Collectors.toList())         // avoid ConcurrentModificationException
+              .stream();
+        }
+
+        /** Find the {@link ExprRef} at the given depth, if any.
+         */
+        public Stream<ExprRef> findExprs(int depth) {
+            return find(ExprRef.class, ref -> ref.depth == depth);
+        }
+
+        /** Extract (i.e., find and remove) all {@link Ref}'s of the given type.
+         */
+        public <T extends Ref> Stream<T> remove(Class<T> refType) {
+            return remove(refType, ref -> true);
+        }
+
+        /** Extract (i.e., find and remove) all {@link Ref}'s of the given type
+         *  and matching the given predicate.
+         */
+        public <T extends Ref> Stream<T> remove(Class<T> refType, Predicate<? super T> filter) {
+            ArrayList<T> list = stream()
+              .filter(refType::isInstance)
+              .map(refType::cast)
+              .filter(filter)
+              .collect(Collectors.toCollection(ArrayList::new)); // avoid ConcurrentModificationException
+            removeAll(list);
+            return list.stream();
+        }
+
+        /** Extract (i.e., find and remove) all {@link ExprRef}'s at the given depth.
+         */
+        public Stream<ExprRef> removeExprs(int depth) {
+            return remove(ExprRef.class, ref -> ref.depth == depth);
+        }
+
+        /** Discard all {@link ExprRef}'s at the given depth.
          */
         public boolean discardExprs(int depth) {
-            return remove(ExprRef.direct(depth)) | remove(ExprRef.indirect(depth));
+            return removeIf(ref -> ref instanceof ExprRef exprRef && exprRef.depth == depth);
         }
 
-        /**
-         * Extract any {@link ExprRef}'s at the specified depth.
+        /** Replace all {@link ExprRef}'s at the given depth after mapping them somehow.
          */
-        public RefSet<ExprRef> removeExprs(int depth) {
-            return Stream.of(ExprRef.direct(depth), ExprRef.indirect(depth))
-              .filter(this::remove)
-              .collect(Collectors.toCollection(RefSet::new));
-        }
-
-        /**
-         * Extract any {@link ExprRef}'s at the specified depth and do something with them.
-         */
-        public void removeExprs(int depth, Consumer<? super Boolean> handler) {
-            Stream.of(ExprRef.direct(depth), ExprRef.indirect(depth))
-              .filter(this::remove)
-              .map(ExprRef::isDirect)
-              .forEach(handler);
-        }
-
-        /**
-         * Replace any references of the given type.
-         */
-        public void replace(Class<? extends Ref> type, Function<Boolean, ? extends T> mapper) {
-            final List<Ref> oldRefs = this.stream()
-              .filter(type::isInstance)
-              .collect(List.collector());             // avoid ConcurrentModificationException
-            this.removeAll(oldRefs);
-            oldRefs.stream()
-              .map(Ref::isDirect)
+        public void replaceExprs(int depth, Function<? super ExprRef, ? extends T> mapper) {
+            removeExprs(depth)
               .map(mapper)
               .forEach(this::add);
         }
 
-        /**
-         * Replace any {@link ExprRef}'s at the specified depth.
-         */
-        public void replaceExprs(int depth, Function<Boolean, ? extends T> mapper) {
-            removeExprs(depth, direct -> add(mapper.apply(direct)));
-        }
-
-        /**
-         * Find references of the given type, map them, and add them to {@code dest}.
-         */
-        public <S extends Ref> void mapInto(RefSet<S> dest, Class<? extends Ref> type,
-                Function<Boolean, ? extends S> mapper) {
-            final List<S> newRefs = this.stream()
-              .filter(type::isInstance)
-              .map(Ref::isDirect)
-              .map(mapper)
-              .collect(List.collector());             // avoid ConcurrentModificationException
-            dest.addAll(newRefs);
-        }
-
         @Override
         @SuppressWarnings("unchecked")
         public RefSet<T> clone() {
             return (RefSet<T>)super.clone();
         }
+
+        // Return a collector that builds a RefSet
+        public static <T extends Ref> Collector<T, ?, RefSet<T>> collector() {
+            return Collectors.toCollection(RefSet::new);
+        }
     }
 
 // MethodInfo
@@ -1482,5 +1761,14 @@ class ThisEscapeAnalyzer extends TreeScanner {
         JCMethodDecl declaration,       // the method or constructor itself
         boolean analyzable,             // it's a constructor that we should analyze
         boolean invokable) {            // it may be safely "invoked" during analysis
+
+        @Override
+        public String toString() {
+            return "MethodInfo"
+              + "[method=" + declaringClass.sym.flatname + "." + declaration.sym
+              + ",analyzable=" + analyzable
+              + ",invokable=" + invokable
+              + "]";
+        }
     }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 0a2fe85d1c3..42cfd9ac675 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -182,6 +182,41 @@ public class TreeInfo {
         }
     }
 
+    /** Check if the given tree is an explicit reference to the 'this' instance of the
+     *  class currently being compiled. This is true if tree is:
+     *  - An unqualified 'this' identifier
+     *  - A 'super' identifier qualified by a class name whose type is 'currentClass' or a supertype
+     *  - A 'this' identifier qualified by a class name whose type is 'currentClass' or a supertype
+     *    but also NOT an enclosing outer class of 'currentClass'.
+     */
+    public static boolean isExplicitThisReference(Types types, Type.ClassType currentClass, JCTree tree) {
+        switch (tree.getTag()) {
+            case PARENS:
+                return isExplicitThisReference(types, currentClass, skipParens(tree));
+            case IDENT: {
+                JCIdent ident = (JCIdent)tree;
+                Names names = ident.name.table.names;
+                return ident.name == names._this || ident.name == names._super;
+            }
+            case SELECT: {
+                JCFieldAccess select = (JCFieldAccess)tree;
+                Type selectedType = types.erasure(select.selected.type);
+                if (!selectedType.hasTag(TypeTag.CLASS))
+                    return false;
+                Symbol.ClassSymbol currentClassSym = (Symbol.ClassSymbol)((Type.ClassType)types.erasure(currentClass)).tsym;
+                Symbol.ClassSymbol selectedClassSym = (Symbol.ClassSymbol)((Type.ClassType)selectedType).tsym;
+                Names names = select.name.table.names;
+                return currentClassSym.isSubClass(selectedClassSym, types) &&
+                        (select.name == names._super ||
+                        (select.name == names._this &&
+                            (currentClassSym == selectedClassSym ||
+                            !currentClassSym.isEnclosedBy(selectedClassSym))));
+            }
+            default:
+                return false;
+        }
+    }
+
     /** Is this a call to super?
      */
     public static boolean isSuperCall(JCTree tree) {
diff --git a/test/langtools/tools/javac/warnings/ThisEscape.java b/test/langtools/tools/javac/warnings/ThisEscape.java
index 25402c2c547..93ccb6e0830 100644
--- a/test/langtools/tools/javac/warnings/ThisEscape.java
+++ b/test/langtools/tools/javac/warnings/ThisEscape.java
@@ -313,7 +313,7 @@ public class ThisEscape {
                 }
             }
 
-            public class Inner2 {
+            public static class Inner2 {
                 public Inner2() {
                     new Test3().mightLeak();
                 }
@@ -585,6 +585,124 @@ public class ThisEscape {
         }
     }
 
+    // Verify 'this' escape correctly follows outer instances through member classes
+    public static class ThisEscapeOuterRef1 {
+        class Inner {
+            void foo() {
+                ThisEscapeOuterRef1.this.hashCode();
+            }
+        }
+        public ThisEscapeOuterRef1() {
+            new Inner().foo();
+        }
+    }
+
+    // Verify 'this' escape correctly follows outer instances through local classes
+    public static class ThisEscapeOuterRef2 {
+        public ThisEscapeOuterRef2() {
+            class Inner {
+                void foo() {
+                    ThisEscapeOuterRef2.this.hashCode();
+                }
+            }
+            new Inner().foo();
+        }
+    }
+
+    // Verify 'this' escape correctly follows outer instances through anonymous classes
+    public static class ThisEscapeOuterRef3 {
+        public ThisEscapeOuterRef3() {
+            new Runnable() {
+                public void run() {
+                    ThisEscapeOuterRef3.this.hashCode();    // leak here
+                }
+            }.run();
+        }
+    }
+
+    // Verify 'this' escape knows that enhanced for loops invoke iterator(), etc.
+    public static class ThisEscapeForeach1 implements Iterable<Object> {
+        public ThisEscapeForeach1() {
+            for (Object v : this)
+                v.hashCode();           // possible leak here
+        }
+        @Override
+        public final java.util.Iterator<Object> iterator() {
+            return new java.util.Iterator<Object>() {
+                @Override
+                public boolean hasNext() {
+                    return true;
+                }
+                @Override
+                public Object next() {
+                    return ThisEscapeForeach1.this;
+                }
+            };
+        }
+    }
+
+    // Verify 'this' escape tracks deferred return values
+    public static class DeferredReturn {
+
+        public DeferredReturn(int x) {
+            ((Supplier<DeferredReturn>)this::self).get().mightLeak();  // leak here
+        }
+
+        public DeferredReturn(float x) {
+            ((Supplier<DeferredReturn>)() -> this).get().mightLeak();  // leak here
+        }
+
+        private final DeferredReturn self() {
+            return this;
+        }
+
+        protected void mightLeak() {
+        }
+    }
+
+    // Verify 'this' escape properly tracks variable types
+    public static class TypeTracking {
+
+        public TypeTracking() {
+            Runnable r = new Runnable() {
+                public void run() {
+                    TypeTracking.this.mightLeak();
+                }
+            };
+            r.run();        // leak here - we know "r" has type TypeTracking$1
+        }
+
+        protected void mightLeak() {
+        }
+    }
+
+    // Verify 'this' escape doesn't warn for outer instances of anonymous classes that don't use them
+    public static class ThisEscapeOuterRef4 {
+        public ThisEscapeOuterRef4() {
+            new Runnable() {
+                public void run() {
+                    // there is no leak in here
+                }
+            }.run();
+        }
+    }
+
+    // Verify 'this' escape doesn't warn for doubly-outer instance references
+    public static class ThisEscapeDoubleOuter {
+        public class Inner1 {
+
+            public Inner1() {
+                new Inner2().foo();     // NOT a 'this' leak
+            }
+
+            class Inner2 {
+                void foo() {
+                    ThisEscapeDoubleOuter.this.hashCode();
+                }
+            }
+        }
+    }
+
     // Verify 'this' escape detection doesn't warn for sealed classes with local permits
     public static sealed class ThisEscapeSealed permits ThisEscapeSealed.Sub1, ThisEscapeSealed.Sub2 {
 
diff --git a/test/langtools/tools/javac/warnings/ThisEscape.out b/test/langtools/tools/javac/warnings/ThisEscape.out
index 70c3bb06072..a444c2828b7 100644
--- a/test/langtools/tools/javac/warnings/ThisEscape.out
+++ b/test/langtools/tools/javac/warnings/ThisEscape.out
@@ -23,4 +23,16 @@ ThisEscape.java:396:17: compiler.warn.possible.this.escape
 ThisEscape.java:401:30: compiler.warn.possible.this.escape.location
 ThisEscape.java:444:28: compiler.warn.possible.this.escape
 ThisEscape.java:473:27: compiler.warn.possible.this.escape
-25 warnings
+ThisEscape.java:596:28: compiler.warn.possible.this.escape
+ThisEscape.java:592:50: compiler.warn.possible.this.escape.location
+ThisEscape.java:608:28: compiler.warn.possible.this.escape
+ThisEscape.java:605:54: compiler.warn.possible.this.escape.location
+ThisEscape.java:619:18: compiler.warn.possible.this.escape
+ThisEscape.java:617:54: compiler.warn.possible.this.escape.location
+ThisEscape.java:627:27: compiler.warn.possible.this.escape
+ThisEscape.java:648:55: compiler.warn.possible.this.escape
+ThisEscape.java:652:55: compiler.warn.possible.this.escape
+ThisEscape.java:672:18: compiler.warn.possible.this.escape
+ThisEscape.java:669:48: compiler.warn.possible.this.escape.location
+ThisEscape.java:726:32: compiler.warn.possible.this.escape
+37 warnings

From fe0227e97858be15bda813dba42ab466123aee1f Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 18 Apr 2024 03:35:15 +0000
Subject: [PATCH 091/486] 8311098: Change comment in verificationType.hpp to
 refer to _sym

Reviewed-by: ccheung
---
 src/hotspot/share/classfile/verificationType.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/classfile/verificationType.hpp b/src/hotspot/share/classfile/verificationType.hpp
index 5d674e19037..4f0609f0cce 100644
--- a/src/hotspot/share/classfile/verificationType.hpp
+++ b/src/hotspot/share/classfile/verificationType.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -49,10 +49,10 @@ class ClassVerifier;
 
 class VerificationType {
   private:
-    // Least significant bits of _handle are always 0, so we use these as
-    // the indicator that the _handle is valid.  Otherwise, the _data field
+    // Least significant 2 bits of _sym are always 0, so we use these as
+    // the indicator that _sym is a valid pointer.  Otherwise, the _data field
     // contains encoded data (as specified below).  Should the VM change
-    // and the lower bits on oops aren't 0, the assert in the constructor
+    // and the lower 2 bits of Symbol* aren't 0, the assert in the constructor
     // will catch this and we'll have to add a descriminator tag to this
     // structure.
     union {

From 706b421ccaff2129512ee3ea15ef1d6c264cbe01 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 18 Apr 2024 05:50:24 +0000
Subject: [PATCH 092/486] 8330467: NoClassDefFoundError when lambda is in a
 hidden class

Reviewed-by: psandoz, mchung
---
 .../invoke/InnerClassLambdaMetafactory.java   | 12 ++++---
 .../invoke/defineHiddenClass/BasicTest.java   | 15 ++++++++
 .../defineHiddenClass/src/HiddenLambda.java   | 36 +++++++++++++++++++
 3 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/java/lang/invoke/defineHiddenClass/src/HiddenLambda.java

diff --git a/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java b/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
index 83b2b21562e..b4afbc098c9 100644
--- a/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
@@ -175,13 +175,15 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
         lambdaClassName = lambdaClassName(targetClass);
         // If the target class invokes a protected method inherited from a
         // superclass in a different package, or does 'invokespecial', the
-        // lambda class has no access to the resolved method. Instead, we need
-        // to pass the live implementation method handle to the proxy class
-        // to invoke directly. (javac prefers to avoid this situation by
-        // generating bridges in the target class)
+        // lambda class has no access to the resolved method, or does
+        // 'invokestatic' on a hidden class which cannot be resolved by name.
+        // Instead, we need to pass the live implementation method handle to
+        // the proxy class to invoke directly. (javac prefers to avoid this
+        // situation by generating bridges in the target class)
         useImplMethodHandle = (Modifier.isProtected(implInfo.getModifiers()) &&
                                !VerifyAccess.isSamePackage(targetClass, implInfo.getDeclaringClass())) ||
-                               implKind == H_INVOKESPECIAL;
+                               implKind == H_INVOKESPECIAL ||
+                               implKind == H_INVOKESTATIC && implClass.isHidden();
         cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
         int parameterCount = factoryType.parameterCount();
         if (parameterCount > 0) {
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
index 2ca27be4248..08138a86ed0 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8330467
  * @modules jdk.compiler
  * @library /test/lib
  * @enablePreview
@@ -181,6 +182,20 @@ public class BasicTest {
         }
     }
 
+    // Define a hidden class that uses lambda and contains its implementation
+    // This verifies LambdaMetaFactory supports the caller which is a hidden class
+    @Test
+    public void testHiddenLambda() throws Throwable {
+        HiddenTest t = (HiddenTest)defineHiddenClass("HiddenLambda").newInstance();
+        try {
+            t.test();
+        } catch (Error e) {
+            if (!e.getMessage().equals("thrown by " + t.getClass().getName())) {
+                throw e;
+            }
+        }
+    }
+
     // Verify the nest host and nest members of a hidden class and hidden nestmate class
     @Test
     public void testHiddenNestHost() throws Throwable {
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/src/HiddenLambda.java b/test/jdk/java/lang/invoke/defineHiddenClass/src/HiddenLambda.java
new file mode 100644
index 00000000000..f7a6e7a58da
--- /dev/null
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/src/HiddenLambda.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.function.Function;
+
+public class HiddenLambda implements HiddenTest {
+     public void test() {
+         Function<Object, String> f = o -> o.toString();
+         String s = f.apply(this);
+         throw new Error("thrown by " + s);
+     }
+
+     public String toString() {
+         return getClass().getName();
+     }
+}

From 003e86fe38ca1b809418f6282336e259862d0776 Mon Sep 17 00:00:00 2001
From: Soumadipta Roy <roysouma@amazon.com>
Date: Thu, 18 Apr 2024 07:57:11 +0000
Subject: [PATCH 093/486] 8324755: Enable parallelism in
 vmTestbase/gc/gctests/LargeObjects tests

Reviewed-by: shade, lmesnik
---
 .../LargeObjects/large001/TEST.properties     | 23 -------------------
 .../LargeObjects/large002/TEST.properties     | 23 -------------------
 .../LargeObjects/large003/TEST.properties     | 23 -------------------
 .../LargeObjects/large004/TEST.properties     | 23 -------------------
 .../LargeObjects/large005/TEST.properties     | 23 -------------------
 5 files changed, 115 deletions(-)
 delete mode 100644 test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TEST.properties
 delete mode 100644 test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TEST.properties

diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/TEST.properties b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TEST.properties b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TEST.properties b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TEST.properties b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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.
-#
-exclusiveAccess.dirs=.
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TEST.properties b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TEST.properties
deleted file mode 100644
index 04b22a107ac..00000000000
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TEST.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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.
-#
-exclusiveAccess.dirs=.

From 5eb2c596e2ca38025dfb9f8e37703036d0bcda19 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 18 Apr 2024 08:25:19 +0000
Subject: [PATCH 094/486] 8330475: Remove unused default value for
 ModRefBarrierSet::write_ref_array_pre

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/shared/modRefBarrierSet.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
index 6c591e2b8b5..b490524feed 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
@@ -61,9 +61,9 @@ public:
 
   // Below length is the # array elements being written
   virtual void write_ref_array_pre(oop* dst, size_t length,
-                                   bool dest_uninitialized = false) {}
+                                   bool dest_uninitialized) {}
   virtual void write_ref_array_pre(narrowOop* dst, size_t length,
-                                   bool dest_uninitialized = false) {}
+                                   bool dest_uninitialized) {}
   // Below count is the # array elements being written, starting
   // at the address "start", which may not necessarily be HeapWord-aligned
   inline void write_ref_array(HeapWord* start, size_t count);

From 4b55fe577701317e6570f045ed9fe28aa97fc7ea Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 18 Apr 2024 10:03:41 +0000
Subject: [PATCH 095/486] 8330520: linux clang build fails in os_linux.cpp with
 static_assert with no message is a C++17 extension

Reviewed-by: stefank, mdoerr
---
 src/hotspot/os/linux/os_linux.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 974ca7c8553..24e80accfde 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -2972,7 +2972,7 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,
   #define MADV_POPULATE_WRITE MADV_POPULATE_WRITE_value
 #else
   // Sanity-check our assumed default value if we build with a new enough libc.
-  static_assert(MADV_POPULATE_WRITE == MADV_POPULATE_WRITE_value);
+  STATIC_ASSERT(MADV_POPULATE_WRITE == MADV_POPULATE_WRITE_value);
 #endif
 
 // Note that the value for MAP_FIXED_NOREPLACE differs between architectures, but all architectures
@@ -2982,7 +2982,7 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,
   #define MAP_FIXED_NOREPLACE MAP_FIXED_NOREPLACE_value
 #else
   // Sanity-check our assumed default value if we build with a new enough libc.
-  static_assert(MAP_FIXED_NOREPLACE == MAP_FIXED_NOREPLACE_value, "MAP_FIXED_NOREPLACE != MAP_FIXED_NOREPLACE_value");
+  STATIC_ASSERT(MAP_FIXED_NOREPLACE == MAP_FIXED_NOREPLACE_value);
 #endif
 
 int os::Linux::commit_memory_impl(char* addr, size_t size,

From b0496096dc8d7dc7acf28aa006141a3ecea446de Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Thu, 18 Apr 2024 11:13:10 +0000
Subject: [PATCH 096/486] 8330094: RISC-V: Save and restore FRM in the call
 stub

Reviewed-by: fyang, luhenry
---
 src/hotspot/cpu/riscv/frame_riscv.hpp         |  2 +-
 src/hotspot/cpu/riscv/riscv_v.ad              |  9 -------
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 27 ++++++++++++++++---
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/cpu/riscv/frame_riscv.hpp b/src/hotspot/cpu/riscv/frame_riscv.hpp
index 15fe0e8f1f8..3692c99193e 100644
--- a/src/hotspot/cpu/riscv/frame_riscv.hpp
+++ b/src/hotspot/cpu/riscv/frame_riscv.hpp
@@ -131,7 +131,7 @@
     // Entry frames
     // n.b. these values are determined by the layout defined in
     // stubGenerator for the Java call stub
-    entry_frame_after_call_words                     =  34,
+    entry_frame_after_call_words                     =  35,
     entry_frame_call_wrapper_offset                  = -10,
 
     // we don't need a save area
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 36f4d499c38..86309ec9128 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -2986,7 +2986,6 @@ instruct vloadcon(vReg dst, immI0 src) %{
     __ vsetvli_helper(bt, Matcher::vector_length(this));
     __ vid_v(as_VectorRegister($dst$$reg));
     if (is_floating_point_type(bt)) {
-      __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
       __ vfcvt_f_x_v(as_VectorRegister($dst$$reg), as_VectorRegister($dst$$reg));
     }
   %}
@@ -3201,7 +3200,6 @@ instruct vcvtBtoX(vReg dst, vReg src) %{
       __ integer_extend_v(as_VectorRegister($dst$$reg), bt == T_FLOAT ? T_INT : T_LONG,
                           Matcher::vector_length(this), as_VectorRegister($src$$reg), T_BYTE,
                           true /* is_signed */);
-      __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
       __ vfcvt_f_x_v(as_VectorRegister($dst$$reg), as_VectorRegister($dst$$reg));
     } else {
       __ integer_extend_v(as_VectorRegister($dst$$reg), bt,
@@ -3267,7 +3265,6 @@ instruct vcvtStoX_fp(vReg dst, vReg src) %{
                         Matcher::vector_length(this), as_VectorRegister($src$$reg), T_SHORT,
                         true /* is_signed */);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
     __ vfcvt_f_x_v(as_VectorRegister($dst$$reg), as_VectorRegister($dst$$reg));
   %}
   ins_pipe(pipe_slow);
@@ -3335,7 +3332,6 @@ instruct vcvtItoF(vReg dst, vReg src) %{
   format %{ "vcvtItoF $dst, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_FLOAT, Matcher::vector_length(this));
-    __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
     __ vfcvt_f_x_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
   %}
   ins_pipe(pipe_slow);
@@ -3348,7 +3344,6 @@ instruct vcvtItoD(vReg dst, vReg src) %{
   format %{ "vcvtItoD $dst, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_INT, Matcher::vector_length(this), Assembler::mf2);
-    __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
     __ vfwcvt_f_x_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
   %}
   ins_pipe(pipe_slow);
@@ -3376,7 +3371,6 @@ instruct vcvtLtoF(vReg dst, vReg src) %{
   format %{ "vcvtLtoF $dst, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_FLOAT, Matcher::vector_length(this), Assembler::mf2);
-    __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
     __ vfncvt_f_x_w(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
   %}
   ins_pipe(pipe_slow);
@@ -3388,7 +3382,6 @@ instruct vcvtLtoD(vReg dst, vReg src) %{
   format %{ "vcvtLtoD $dst, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_DOUBLE, Matcher::vector_length(this));
-    __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
     __ vfcvt_f_x_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
   %}
   ins_pipe(pipe_slow);
@@ -3446,7 +3439,6 @@ instruct vcvtFtoD(vReg dst, vReg src) %{
   format %{ "vcvtFtoD $dst, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_FLOAT, Matcher::vector_length(this), Assembler::mf2);
-    __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
     __ vfwcvt_f_f_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
   %}
   ins_pipe(pipe_slow);
@@ -3494,7 +3486,6 @@ instruct vcvtDtoF(vReg dst, vReg src) %{
   format %{ "vcvtDtoF $dst, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_FLOAT, Matcher::vector_length(this), Assembler::mf2);
-    __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
     __ vfncvt_f_f_w(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
   %}
   ins_pipe(pipe_slow);
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index df447abaa06..7ee17438b28 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -127,8 +127,9 @@ class StubGenerator: public StubCodeGenerator {
   //     [ return_from_Java     ] <--- sp
   //     [ argument word n      ]
   //      ...
-  // -34 [ argument word 1      ]
-  // -33 [ saved f27            ] <--- sp_after_call
+  // -35 [ argument word 1      ]
+  // -34 [ saved FRM in Floating-point Control and Status Register ] <--- sp_after_call
+  // -33 [ saved f27            ]
   // -32 [ saved f26            ]
   // -31 [ saved f25            ]
   // -30 [ saved f24            ]
@@ -165,8 +166,9 @@ class StubGenerator: public StubCodeGenerator {
 
   // Call stub stack layout word offsets from fp
   enum call_stub_layout {
-    sp_after_call_off  = -33,
+    sp_after_call_off  = -34,
 
+    frm_off            = sp_after_call_off,
     f27_off            = -33,
     f26_off            = -32,
     f25_off            = -31,
@@ -214,6 +216,7 @@ class StubGenerator: public StubCodeGenerator {
 
     const Address sp_after_call (fp, sp_after_call_off  * wordSize);
 
+    const Address frm_save      (fp, frm_off           * wordSize);
     const Address call_wrapper  (fp, call_wrapper_off   * wordSize);
     const Address result        (fp, result_off         * wordSize);
     const Address result_type   (fp, result_type_off    * wordSize);
@@ -296,6 +299,16 @@ class StubGenerator: public StubCodeGenerator {
     __ fsd(f26, f26_save);
     __ fsd(f27, f27_save);
 
+    __ frrm(t0);
+    __ sd(t0, frm_save);
+    // Set frm to the state we need. We do want Round to Nearest. We
+    // don't want non-IEEE rounding modes.
+    Label skip_fsrmi;
+    guarantee(__ RoundingMode::rne == 0, "must be");
+    __ beqz(t0, skip_fsrmi);
+    __ fsrmi(__ RoundingMode::rne);
+    __ bind(skip_fsrmi);
+
     // install Java thread in global register now we have saved
     // whatever value it held
     __ mv(xthread, c_rarg7);
@@ -415,6 +428,14 @@ class StubGenerator: public StubCodeGenerator {
 
     __ ld(x9, x9_save);
 
+    // restore frm
+    Label skip_fsrm;
+    __ ld(t0, frm_save);
+    __ frrm(t1);
+    __ beq(t0, t1, skip_fsrm);
+    __ fsrm(t0);
+    __ bind(skip_fsrm);
+
     __ ld(c_rarg0, call_wrapper);
     __ ld(c_rarg1, result);
     __ ld(c_rarg2, result_type);

From 60b65e60906026b3cd5e8829c464a31df5898bdc Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Thu, 18 Apr 2024 11:21:39 +0000
Subject: [PATCH 097/486] 8325872: Make GuaranteedSafepointInterval default 0

Reviewed-by: shade, eosterlund, dcubed
---
 src/hotspot/share/runtime/arguments.cpp       |  5 +++
 src/hotspot/share/runtime/globals.hpp         |  7 ++-
 .../share/runtime/monitorDeflationThread.cpp  |  9 +---
 src/hotspot/share/runtime/vmThread.cpp        | 43 ++++++-------------
 src/hotspot/share/runtime/vmThread.hpp        |  5 +--
 5 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index f8e9629d94a..9ff8b878692 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -3646,6 +3646,11 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
 
   apply_debugger_ergo();
 
+  // The VMThread needs to stop now and then to execute these debug options.
+  if ((HandshakeALot || SafepointALot) && FLAG_IS_DEFAULT(GuaranteedSafepointInterval)) {
+    FLAG_SET_DEFAULT(GuaranteedSafepointInterval, 1000);
+  }
+
   if (log_is_enabled(Info, arguments)) {
     LogStream st(Log(arguments)::info());
     Arguments::print_on(&st);
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index ef6c0dcd9f6..d62403a29d5 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -744,9 +744,8 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   product(int, MonitorUsedDeflationThreshold, 90, DIAGNOSTIC,               \
           "Percentage of used monitors before triggering deflation (0 is "  \
-          "off). The check is performed on GuaranteedSafepointInterval, "   \
-          "AsyncDeflationInterval or GuaranteedAsyncDeflationInterval, "    \
-          "whichever is lower.")                                            \
+          "off). The check is performed on AsyncDeflationInterval or "      \
+          "GuaranteedAsyncDeflationInterval, whichever is lower.")          \
           range(0, 100)                                                     \
                                                                             \
   product(uintx, NoAsyncDeflationProgressMax, 3, DIAGNOSTIC,                \
@@ -1277,7 +1276,7 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   /* notice: the max range value here is max_jint, not max_intx  */         \
   /* because of overflow issue                                   */         \
-  product(intx, GuaranteedSafepointInterval, 1000, DIAGNOSTIC,              \
+  product(intx, GuaranteedSafepointInterval, 0, DIAGNOSTIC,                 \
           "Guarantee a safepoint (at least) every so many milliseconds "    \
           "(0 means none)")                                                 \
           range(0, max_jint)                                                \
diff --git a/src/hotspot/share/runtime/monitorDeflationThread.cpp b/src/hotspot/share/runtime/monitorDeflationThread.cpp
index d3109c07c16..128e1dd1a71 100644
--- a/src/hotspot/share/runtime/monitorDeflationThread.cpp
+++ b/src/hotspot/share/runtime/monitorDeflationThread.cpp
@@ -50,11 +50,7 @@ void MonitorDeflationThread::initialize() {
 
 void MonitorDeflationThread::monitor_deflation_thread_entry(JavaThread* jt, TRAPS) {
 
-  // We wait for the lowest of these three intervals:
-  //  - GuaranteedSafepointInterval
-  //      While deflation is not related to safepoint anymore, this keeps compatibility with
-  //      the old behavior when deflation also happened at safepoints. Users who set this
-  //      option to get more/less frequent deflations would be served with this option.
+  // We wait for the lowest of these two intervals:
   //  - AsyncDeflationInterval
   //      Normal threshold-based deflation heuristic checks the conditions at this interval.
   //      See is_async_deflation_needed().
@@ -63,9 +59,6 @@ void MonitorDeflationThread::monitor_deflation_thread_entry(JavaThread* jt, TRAP
   //      See is_async_deflation_needed().
   //
   intx wait_time = max_intx;
-  if (GuaranteedSafepointInterval > 0) {
-    wait_time = MIN2(wait_time, GuaranteedSafepointInterval);
-  }
   if (AsyncDeflationInterval > 0) {
     wait_time = MIN2(wait_time, AsyncDeflationInterval);
   }
diff --git a/src/hotspot/share/runtime/vmThread.cpp b/src/hotspot/share/runtime/vmThread.cpp
index de0567ab037..8ed212d515a 100644
--- a/src/hotspot/share/runtime/vmThread.cpp
+++ b/src/hotspot/share/runtime/vmThread.cpp
@@ -308,40 +308,26 @@ class HandshakeALotClosure : public HandshakeClosure {
   }
 };
 
-bool VMThread::handshake_alot() {
+bool VMThread::handshake_or_safepoint_alot() {
   assert(_cur_vm_operation == nullptr, "should not have an op yet");
   assert(_next_vm_operation == nullptr, "should not have an op yet");
-  if (!HandshakeALot) {
+  if (!HandshakeALot && !SafepointALot) {
     return false;
   }
-  static jlong last_halot_ms = 0;
+  static jlong last_alot_ms = 0;
   jlong now_ms = nanos_to_millis(os::javaTimeNanos());
-  // If only HandshakeALot is set, but GuaranteedSafepointInterval is 0,
-  // we emit a handshake if it's been more than a second since the last one.
+  // If HandshakeALot or SafepointALot are set, but GuaranteedSafepointInterval is explicitly
+  // set to 0 on the command line, we emit the operation if it's been more than a second
+  // since the last one.
   jlong interval = GuaranteedSafepointInterval != 0 ? GuaranteedSafepointInterval : 1000;
-  jlong deadline_ms = interval + last_halot_ms;
+  jlong deadline_ms = interval + last_alot_ms;
   if (now_ms > deadline_ms) {
-    last_halot_ms = now_ms;
+    last_alot_ms = now_ms;
     return true;
   }
   return false;
 }
 
-void VMThread::setup_periodic_safepoint_if_needed() {
-  assert(_cur_vm_operation  == nullptr, "Already have an op");
-  assert(_next_vm_operation == nullptr, "Already have an op");
-  // Check for a cleanup before SafepointALot to keep stats correct.
-  jlong interval_ms = SafepointTracing::time_since_last_safepoint_ms();
-  bool max_time_exceeded = GuaranteedSafepointInterval != 0 &&
-                           (interval_ms >= GuaranteedSafepointInterval);
-  if (!max_time_exceeded) {
-    return;
-  }
-  if (SafepointALot) {
-    _next_vm_operation = &safepointALot_op;
-  }
-}
-
 bool VMThread::set_next_operation(VM_Operation *op) {
   if (_next_vm_operation != nullptr) {
     return false;
@@ -465,8 +451,8 @@ void VMThread::wait_for_operation() {
     if (_next_vm_operation != nullptr) {
       return;
     }
-    if (handshake_alot()) {
-      {
+    if (handshake_or_safepoint_alot()) {
+      if (HandshakeALot) {
         MutexUnlocker mul(VMOperation_lock);
         HandshakeALotClosure hal_cl;
         Handshake::execute(&hal_cl);
@@ -475,15 +461,14 @@ void VMThread::wait_for_operation() {
       if (_next_vm_operation != nullptr) {
         return;
       }
+      if (SafepointALot) {
+        _next_vm_operation = &safepointALot_op;
+        return;
+      }
     }
     assert(_next_vm_operation == nullptr, "Must be");
     assert(_cur_vm_operation  == nullptr, "Must be");
 
-    setup_periodic_safepoint_if_needed();
-    if (_next_vm_operation != nullptr) {
-      return;
-    }
-
     // We didn't find anything to execute, notify any waiter so they can install an op.
     ml_op_lock.notify_all();
     ml_op_lock.wait(GuaranteedSafepointInterval);
diff --git a/src/hotspot/share/runtime/vmThread.hpp b/src/hotspot/share/runtime/vmThread.hpp
index 6c87544acab..668ea4ce4e2 100644
--- a/src/hotspot/share/runtime/vmThread.hpp
+++ b/src/hotspot/share/runtime/vmThread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -70,8 +70,7 @@ class VMThread: public NamedThread {
 
   static VMOperationTimeoutTask* _timeout_task;
 
-  static bool handshake_alot();
-  static void setup_periodic_safepoint_if_needed();
+  static bool handshake_or_safepoint_alot();
 
   void evaluate_operation(VM_Operation* op);
   void inner_execute(VM_Operation* op);

From b648ed0a08b5ed47c1a7d7cbca89d8f389b17013 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Thu, 18 Apr 2024 11:22:47 +0000
Subject: [PATCH 098/486] 8329997: Add provisions for checking memory segment
 alignment constraints

Reviewed-by: jvernee, mcimadamore
---
 .../java/lang/foreign/MemorySegment.java      | 39 ++++++++-
 .../foreign/HeapMemorySegmentImpl.java        |  9 +-
 .../foreign/NativeMemorySegmentImpl.java      |  9 +-
 .../jdk/java/foreign/TestMemoryAlignment.java | 82 ++++++++++++++++++-
 4 files changed, 133 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
index a58595cb541..95195ef81bf 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -44,7 +44,6 @@ import java.util.stream.Stream;
 import jdk.internal.foreign.AbstractMemorySegmentImpl;
 import jdk.internal.foreign.MemorySessionImpl;
 import jdk.internal.foreign.SegmentFactories;
-import jdk.internal.foreign.Utils;
 import jdk.internal.javac.Restricted;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.vm.annotation.ForceInline;
@@ -95,6 +94,11 @@ import jdk.internal.vm.annotation.ForceInline;
  * address of the region of memory which backs the segment.</li>
  * </ul>
  * <p>
+ * Every memory segment has a {@linkplain #maxByteAlignment() maximum byte alignment},
+ * expressed as a {@code long} value. The maximum alignment is always a power of two,
+ * derived from the segment address, and the segment type, as explained in more detail
+ * <a href="#segment-alignment">below</a>.
+ * <p>
  * Every memory segment has a {@linkplain #byteSize() size}. The size of a heap segment
  * is derived from the Java array from which it is obtained. This size is predictable
  * across Java runtimes. The size of a native segment is either passed explicitly
@@ -394,6 +398,14 @@ import jdk.internal.vm.annotation.ForceInline;
  * byteSegment.get(ValueLayout.JAVA_INT_UNALIGNED, 0); // ok: ValueLayout.JAVA_INT_UNALIGNED.byteAlignment() == ValueLayout.JAVA_BYTE.byteAlignment()
  * }
  *
+ * Clients can use the {@linkplain MemorySegment#maxByteAlignment()} method to check if
+ * a memory segment supports the alignment constraint of a memory layout, as follows:
+ * {@snippet lang=java:
+ * MemoryLayout layout = ...
+ * MemorySegment segment = ...
+ * boolean isAligned = segment.maxByteAlignment() >= layout.byteAlignment();
+ * }
+ *
  * <h2 id="wrapping-addresses">Zero-length memory segments</h2>
  *
  * When interacting with <a href="package-summary.html#ffa">foreign functions</a>, it is
@@ -589,6 +601,26 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      */
     long byteSize();
 
+    /**
+     * {@return the <a href="#segment-alignment">maximum byte alignment</a>
+     * associated with this memory segment}
+     * <p>
+     * The returned alignment is always a power of two and is derived from
+     * the segment {@linkplain #address() address()} and, if it is a heap segment,
+     * the type of the {@linkplain #heapBase() backing heap storage}.
+     * <p>
+     * This method can be used to ensure that a segment is sufficiently aligned
+     * with a layout:
+     * {@snippet lang=java:
+     * MemoryLayout layout = ...
+     * MemorySegment segment = ...
+     * if (segment.maxByteAlignment() < layout.byteAlignment()) {
+     *     // Take action (e.g. throw an Exception)
+     * }
+     * }
+     */
+    long maxByteAlignment();
+
     /**
      * Returns a slice of this memory segment, at the given offset. The returned
      * segment's address is the address of this segment plus the given offset;
@@ -1424,6 +1456,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
     /**
      * A zero-length native segment modelling the {@code NULL} address. Equivalent to
      * {@code MemorySegment.ofAddress(0L)}.
+     * <p>
+     * The {@linkplain MemorySegment#maxByteAlignment() maximum byte alignment} for
+     * the {@code NULL} segment is of 2<sup>62</sup>.
      */
     MemorySegment NULL = MemorySegment.ofAddress(0L);
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java b/src/java.base/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java
index 0b95c43b440..2512b9e54a4 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -77,6 +77,13 @@ abstract sealed class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl {
         return offset;
     }
 
+    @Override
+    public final long maxByteAlignment() {
+        return address() == 0
+            ? maxAlignMask()
+            : Math.min(maxAlignMask(), Long.lowestOneBit(address()));
+    }
+
     @Override
     abstract HeapMemorySegmentImpl dup(long offset, long size, boolean readOnly, MemorySessionImpl scope);
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/NativeMemorySegmentImpl.java b/src/java.base/share/classes/jdk/internal/foreign/NativeMemorySegmentImpl.java
index 5427c9f810f..c2043cf4267 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/NativeMemorySegmentImpl.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/NativeMemorySegmentImpl.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 
 package jdk.internal.foreign;
 
-import java.lang.foreign.MemorySegment;
 import java.nio.ByteBuffer;
 import java.util.Optional;
 
@@ -61,6 +60,12 @@ sealed class NativeMemorySegmentImpl extends AbstractMemorySegmentImpl permits M
         return Optional.empty();
     }
 
+    public final long maxByteAlignment() {
+        return address() == 0
+                ? 1L << 62
+                : Long.lowestOneBit(address());
+    }
+
     @ForceInline
     @Override
     NativeMemorySegmentImpl dup(long offset, long size, boolean readOnly, MemorySessionImpl scope) {
diff --git a/test/jdk/java/foreign/TestMemoryAlignment.java b/test/jdk/java/foreign/TestMemoryAlignment.java
index 4d59ba9e4d7..44d28a07b05 100644
--- a/test/jdk/java/foreign/TestMemoryAlignment.java
+++ b/test/jdk/java/foreign/TestMemoryAlignment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,25 @@
  * @run testng TestMemoryAlignment
  */
 
+import java.io.File;
+import java.io.IOException;
 import java.lang.foreign.*;
 import java.lang.foreign.MemoryLayout.PathElement;
 import java.lang.invoke.VarHandle;
+import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.CharBuffer;
+import java.nio.DoubleBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.LongBuffer;
+import java.nio.ShortBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 import java.util.stream.LongStream;
+import java.util.stream.Stream;
 
 import org.testng.annotations.*;
 import static org.testng.Assert.*;
@@ -124,10 +138,76 @@ public class TestMemoryAlignment {
         }
     }
 
+    @Test(dataProvider = "alignments")
+    public void testActualByteAlignment(long align) {
+        if (align > (1L << 10)) {
+            return;
+        }
+        try (Arena arena = Arena.ofConfined()) {
+            var segment = arena.allocate(4, align);
+            assertTrue(segment.maxByteAlignment() >= align);
+            // Power of two?
+            assertEquals(Long.bitCount(segment.maxByteAlignment()), 1);
+            assertEquals(segment.asSlice(1).maxByteAlignment(), 1);
+        }
+    }
+
+    public void testActualByteAlignmentMappedSegment() throws IOException {
+        File tmp = File.createTempFile("tmp", "txt");
+        try (FileChannel channel = FileChannel.open(tmp.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE);
+             Arena arena = Arena.ofConfined()) {
+            var segment =channel.map(FileChannel.MapMode.READ_WRITE, 0L, 32L, arena);
+            // We do not know anything about mapping alignment other than it should
+            // be positive.
+            assertTrue(segment.maxByteAlignment() >= Byte.BYTES);
+            // Power of two?
+            assertEquals(Long.bitCount(segment.maxByteAlignment()), 1);
+            assertEquals(segment.asSlice(1).maxByteAlignment(), 1);
+        } finally {
+            tmp.delete();
+        }
+    }
+
+    @Test()
+    public void testActualByteAlignmentNull() {
+        long alignment = MemorySegment.NULL.maxByteAlignment();
+        assertEquals(1L << 62, alignment);
+    }
+
+    @Test(dataProvider = "heapSegments")
+    public void testActualByteAlignmentHeap(MemorySegment segment, int bytes) {
+        assertEquals(segment.maxByteAlignment(), bytes);
+        // A slice at offset 1 should always have an alignment of 1
+        var segmentSlice = segment.asSlice(1);
+        assertEquals(segmentSlice.maxByteAlignment(), 1);
+    }
+
     @DataProvider(name = "alignments")
     public Object[][] createAlignments() {
         return LongStream.range(1, 20)
                 .mapToObj(v -> new Object[] { 1L << v })
                 .toArray(Object[][]::new);
     }
+
+    @DataProvider(name = "heapSegments")
+    public Object[][] heapSegments() {
+        return Stream.of(
+                        new Object[]{MemorySegment.ofArray(new byte[]{1}), Byte.BYTES},
+                        new Object[]{MemorySegment.ofArray(new short[]{1}), Short.BYTES},
+                        new Object[]{MemorySegment.ofArray(new char[]{1}), Character.BYTES},
+                        new Object[]{MemorySegment.ofArray(new int[]{1}), Integer.BYTES},
+                        new Object[]{MemorySegment.ofArray(new long[]{1}), Long.BYTES},
+                        new Object[]{MemorySegment.ofArray(new float[]{1}), Float.BYTES},
+                        new Object[]{MemorySegment.ofArray(new double[]{1}), Double.BYTES},
+                        new Object[]{MemorySegment.ofBuffer(ByteBuffer.allocate(8)), Byte.BYTES},
+                        new Object[]{MemorySegment.ofBuffer(CharBuffer.allocate(8)), Character.BYTES},
+                        new Object[]{MemorySegment.ofBuffer(ShortBuffer.allocate(8)), Short.BYTES},
+                        new Object[]{MemorySegment.ofBuffer(IntBuffer.allocate(8)), Integer.BYTES},
+                        new Object[]{MemorySegment.ofBuffer(LongBuffer.allocate(8)), Long.BYTES},
+                        new Object[]{MemorySegment.ofBuffer(FloatBuffer.allocate(8)), Float.BYTES},
+                        new Object[]{MemorySegment.ofBuffer(DoubleBuffer.allocate(8)), Double.BYTES}
+        )
+                .toArray(Object[][]::new);
+    }
+
 }

From 5853a2c00983028bab684241f428820587186a4e Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 18 Apr 2024 11:59:57 +0000
Subject: [PATCH 099/486] 8330533: JFR: LocalDateTime should not use
 milliseconds since epoch

Reviewed-by: aturbanov, mgronlun
---
 src/jdk.jfr/share/classes/jdk/jfr/internal/Repository.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Repository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Repository.java
index 5fe95d179e4..ff09d58a9c0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Repository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Repository.java
@@ -109,7 +109,7 @@ public final class Repository {
             return LocalDateTime.now();
         } catch (DateTimeException d) {
             Logger.log(LogTag.JFR, LogLevel.INFO, "Could not create LocalDateTime with the default time zone. Using UTC time zone for chunk filename.");
-            return LocalDateTime.ofEpochSecond(System.currentTimeMillis(), 0, ZoneOffset.UTC);
+            return LocalDateTime.now(ZoneOffset.UTC);
         }
     }
 

From 571e6bc3f7d521d3be7ee1c6c32705c768645b75 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Thu, 18 Apr 2024 12:48:24 +0000
Subject: [PATCH 100/486] 8330419: Unused code in
 ConnectionGraph::specialize_castpp

Reviewed-by: chagedorn
---
 src/hotspot/share/opto/escape.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 8e08cde6861..2fb5e6b13b3 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -697,10 +697,9 @@ Node* ConnectionGraph::specialize_cmp(Node* base, Node* curr_ctrl) {
 //
 Node* ConnectionGraph::specialize_castpp(Node* castpp, Node* base, Node* current_control) {
   Node* control_successor  = current_control->unique_ctrl_out();
-  Node* minus_one          = _igvn->transform(ConINode::make(-1));
   Node* cmp                = _igvn->transform(specialize_cmp(base, castpp->in(0)));
-  Node* boll               = _igvn->transform(new BoolNode(cmp, BoolTest::ne));
-  IfNode* if_ne            = _igvn->transform(new IfNode(current_control, boll, PROB_MIN, COUNT_UNKNOWN))->as_If();
+  Node* bol                = _igvn->transform(new BoolNode(cmp, BoolTest::ne));
+  IfNode* if_ne            = _igvn->transform(new IfNode(current_control, bol, PROB_MIN, COUNT_UNKNOWN))->as_If();
   Node* not_eq_control     = _igvn->transform(new IfTrueNode(if_ne));
   Node* yes_eq_control     = _igvn->transform(new IfFalseNode(if_ne));
   Node* end_region         = _igvn->transform(new RegionNode(3));
@@ -964,8 +963,8 @@ void ConnectionGraph::reduce_phi_on_cmp(Node* cmp) {
       Node* ncmp = _igvn->transform(cmp->clone());
       ncmp->set_req(1, ophi_input);
       ncmp->set_req(2, other);
-      Node* boll = _igvn->transform(new BoolNode(ncmp, mask));
-      res_phi_input = boll->as_Bool()->as_int_value(_igvn);
+      Node* bol = _igvn->transform(new BoolNode(ncmp, mask));
+      res_phi_input = bol->as_Bool()->as_int_value(_igvn);
     }
 
     res_phi->set_req(i, res_phi_input);

From ec180d4782d39d50d2db3dfbe78e62a215c0a414 Mon Sep 17 00:00:00 2001
From: Tobias Holenstein <tholenstein@openjdk.org>
Date: Thu, 18 Apr 2024 12:53:47 +0000
Subject: [PATCH 101/486] 8324950: IGV: save the state to a file

Reviewed-by: rcastanedalo, chagedorn
---
 .../IdealGraphVisualizer/Coordinator/pom.xml  |   5 +
 .../igv/coordinator/OutlineTopComponent.java  | 464 +++++++++---
 .../igv/coordinator/actions/ImportAction.java | 110 +--
 .../igv/coordinator/actions/OpenAction.java   |  68 ++
 .../igv/coordinator/actions/RemoveAction.java |  12 +-
 .../coordinator/actions/RemoveAllAction.java  |   8 +-
 .../{SaveAllAction.java => SaveAction.java}   |  29 +-
 .../igv/coordinator/actions/SaveAsAction.java |  81 +-
 .../hotspot/igv/coordinator/Bundle.properties |   7 +-
 .../igv/coordinator/actions/Bundle.properties |  11 +-
 .../hotspot/igv/coordinator/images/import.png | Bin 3497 -> 1294 bytes
 .../hotspot/igv/coordinator/images/open.png   | Bin 0 -> 1143 bytes
 .../images/{saveall.gif => save_as.gif}       | Bin
 .../com/sun/hotspot/igv/coordinator/layer.xml |  19 +-
 .../java/com/sun/hotspot/igv/data/Folder.java |   5 +-
 .../sun/hotspot/igv/data/FolderElement.java   |   5 +-
 .../sun/hotspot/igv/data/GraphDocument.java   |   4 +-
 .../java/com/sun/hotspot/igv/data/Group.java  |  13 +-
 .../igv/data/serialization/Parser.java        | 707 ++++++++++--------
 .../igv/data/serialization/Printer.java       | 151 ++--
 .../igv/data/services/GraphViewer.java        |   6 +-
 .../igv/data/services/GroupCallback.java      |  36 -
 .../igv/data/serialization/ParserTest.java    |  13 +-
 .../sun/hotspot/igv/connection/Client.java    |  60 --
 .../sun/hotspot/igv/connection/Server.java    |  93 ++-
 .../sun/hotspot/igv/view/DiagramScene.java    |  34 +-
 .../hotspot/igv/view/DiagramViewModel.java    |   8 +
 .../hotspot/igv/view/EditorTopComponent.java  |  35 +-
 .../igv/view/GraphViewerImplementation.java   |  26 +-
 29 files changed, 1116 insertions(+), 894 deletions(-)
 create mode 100644 src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/OpenAction.java
 rename src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/{SaveAllAction.java => SaveAction.java} (77%)
 create mode 100644 src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/open.png
 rename src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/{saveall.gif => save_as.gif} (100%)
 delete mode 100644 src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GroupCallback.java
 delete mode 100644 src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Client.java

diff --git a/src/utils/IdealGraphVisualizer/Coordinator/pom.xml b/src/utils/IdealGraphVisualizer/Coordinator/pom.xml
index 4d773f0d8b3..fcfad0ba233 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/pom.xml
+++ b/src/utils/IdealGraphVisualizer/Coordinator/pom.xml
@@ -88,6 +88,11 @@
             <artifactId>org-openide-util-lookup</artifactId>
             <version>${netbeans.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-modules</artifactId>
+            <version>${netbeans.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-ui</artifactId>
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
index d4764648adf..c66c40810c0 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,21 +28,32 @@ import com.sun.hotspot.igv.coordinator.actions.*;
 import com.sun.hotspot.igv.data.ChangedListener;
 import com.sun.hotspot.igv.data.GraphDocument;
 import com.sun.hotspot.igv.data.InputGraph;
-import com.sun.hotspot.igv.data.services.GroupCallback;
+import com.sun.hotspot.igv.data.serialization.ParseMonitor;
+import com.sun.hotspot.igv.data.serialization.Parser;
+import com.sun.hotspot.igv.data.serialization.Printer;
+import com.sun.hotspot.igv.data.serialization.Printer.GraphContext;
+import com.sun.hotspot.igv.data.services.GraphViewer;
 import com.sun.hotspot.igv.data.services.InputGraphProvider;
+import com.sun.hotspot.igv.settings.Settings;
 import com.sun.hotspot.igv.util.LookupHistory;
 import com.sun.hotspot.igv.view.EditorTopComponent;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.HashSet;
-import java.util.Set;
-import javax.swing.UIManager;
+import java.io.*;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.swing.*;
 import javax.swing.border.Border;
+import javax.swing.filechooser.FileFilter;
+import org.netbeans.api.progress.ProgressHandle;
+import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.ErrorManager;
-import org.openide.actions.GarbageCollectAction;
 import org.openide.awt.Toolbar;
 import org.openide.awt.ToolbarPool;
 import org.openide.explorer.ExplorerManager;
@@ -50,7 +61,9 @@ import org.openide.explorer.ExplorerUtils;
 import org.openide.explorer.view.BeanTreeView;
 import org.openide.nodes.Node;
 import org.openide.util.Exceptions;
+import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
+import org.openide.windows.Mode;
 import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
 
@@ -60,97 +73,42 @@ import org.openide.windows.WindowManager;
  */
 public final class OutlineTopComponent extends TopComponent implements ExplorerManager.Provider, ChangedListener<InputGraphProvider> {
 
-    public static OutlineTopComponent instance;
     public static final String PREFERRED_ID = "OutlineTopComponent";
+    private static final GraphDocument document = new GraphDocument();
+    private static final int WORK_UNITS = 10000;
+    private static final FileFilter xmlFileFilter = new FileFilter() {
+        @Override
+        public boolean accept(File f) {
+            return f.getName().toLowerCase().endsWith(".xml") || f.isDirectory();
+        }
+
+        @Override
+        public String getDescription() {
+            return "Graph files (*.xml)";
+        }
+    };
+    private static final Server server = new Server(document, OutlineTopComponent::loadContext);
+    public static OutlineTopComponent instance;
+    private final Set<FolderNode> selectedFolders = new HashSet<>();
     private ExplorerManager manager;
-    private final GraphDocument document;
     private FolderNode root;
-    private SaveAllAction saveAllAction;
+    private SaveAction saveAction;
+    private SaveAsAction saveAsAction;
     private RemoveAllAction removeAllAction;
     private GraphNode[] selectedGraphs = new GraphNode[0];
-    private final Set<FolderNode> selectedFolders = new HashSet<>();
+    private Path documentPath = null;
 
     private OutlineTopComponent() {
         initComponents();
 
         setName(NbBundle.getMessage(OutlineTopComponent.class, "CTL_OutlineTopComponent"));
         setToolTipText(NbBundle.getMessage(OutlineTopComponent.class, "HINT_OutlineTopComponent"));
-
-        document = new GraphDocument();
         initListView();
         initToolbar();
-        initReceivers();
+        server.startServer();
     }
 
-    private void initListView() {
-        manager = new ExplorerManager();
-        root = new FolderNode(document);
-        manager.setRootContext(root);
-        ((BeanTreeView) this.treeView).setRootVisible(false);
-
-        associateLookup(ExplorerUtils.createLookup(manager, getActionMap()));
-    }
-
-    private void initToolbar() {
-        Toolbar toolbar = new Toolbar();
-        toolbar.setBorder((Border) UIManager.get("Nb.Editor.Toolbar.border")); //NOI18N
-        toolbar.setMinimumSize(new Dimension(0,0)); // MacOS BUG with ToolbarWithOverflow
-
-        this.add(toolbar, BorderLayout.NORTH);
-
-        toolbar.add(ImportAction.get(ImportAction.class));
-        toolbar.add(SaveAsAction.get(SaveAsAction.class).createContextAwareInstance(this.getLookup()));
-
-        saveAllAction = SaveAllAction.get(SaveAllAction.class);
-        saveAllAction.setEnabled(false);
-        toolbar.add(saveAllAction);
-
-        toolbar.add(RemoveAction.get(RemoveAction.class).createContextAwareInstance(this.getLookup()));
-
-        removeAllAction = RemoveAllAction.get(RemoveAllAction.class);
-        removeAllAction.setEnabled(false);
-        toolbar.add(removeAllAction);
-
-        toolbar.add(GarbageCollectAction.get(GarbageCollectAction.class).getToolbarPresenter());
-
-        for (Toolbar tb : ToolbarPool.getDefault().getToolbars()) {
-            tb.setVisible(false);
-        }
-
-        document.getChangedEvent().addListener(g -> documentChanged());
-    }
-
-    private void documentChanged() {
-        boolean enableButton = !document.getElements().isEmpty();
-        saveAllAction.setEnabled(enableButton);
-        removeAllAction.setEnabled(enableButton);
-    }
-
-    private void initReceivers() {
-
-        final GroupCallback callback = g -> {
-            synchronized(OutlineTopComponent.this) {
-                g.setParent(getDocument());
-                getDocument().addElement(g);
-            }
-        };
-
-        new Server(callback);
-    }
-
-    public void clear() {
-        document.clear();
-        FolderNode.clearGraphNodeMap();
-        root = new FolderNode(document);
-        manager.setRootContext(root);
-    }
-
-    @Override
-    public ExplorerManager getExplorerManager() {
-        return manager;
-    }
-
-    public GraphDocument getDocument() {
+    public static GraphDocument getDocument() {
         return document;
     }
 
@@ -159,7 +117,7 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
      * i.e. deserialization routines; otherwise you could get a non-deserialized instance.
      * To obtain the singleton instance, use {@link #findInstance()}.
      */
-    public static synchronized OutlineTopComponent getDefault() {
+    private static synchronized OutlineTopComponent getDefault() {
         if (instance == null) {
             instance = new OutlineTopComponent();
         }
@@ -182,6 +140,97 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
         return getDefault();
     }
 
+    /**
+     * Stores the provided graph document to the designated file path with associated contexts.
+     */
+    private static void saveGraphDocument(GraphDocument doc, String path) throws IOException {
+        List<GraphContext> saveContexts = new ArrayList<>();
+        WindowManager manager = WindowManager.getDefault();
+        for (Mode mode : manager.getModes()) {
+            List<TopComponent> compList = new ArrayList<>(Arrays.asList(manager.getOpenedTopComponents(mode)));
+            for (TopComponent comp : compList) {
+                if (comp instanceof EditorTopComponent etc) {
+                    InputGraph graph = etc.getModel().getGraph();
+                    if (graph.isDiffGraph() && graph.getFirstGraph().getGroup() != graph.getSecondGraph().getGroup()) {
+                        // don't save diff graphs comparing graphs from different groups
+                        continue;
+                    }
+                    GraphContext graphContext = getGraphContext(etc);
+                    saveContexts.add(graphContext);
+                }
+            }
+        }
+
+        try (Writer writer = new OutputStreamWriter(new FileOutputStream(path))) {
+            Printer.exportGraphDocument(writer, doc, saveContexts);
+        }
+    }
+
+    private static GraphContext getGraphContext(EditorTopComponent etc) {
+        InputGraph openedGraph = etc.getModel().getFirstGraph();
+        int posDiff = etc.getModel().getSecondPosition() - etc.getModel().getFirstPosition();
+        if (etc.getModel().getHiddenNodes().isEmpty()) {
+            return new GraphContext(openedGraph, new AtomicInteger(posDiff), new HashSet<>(), new AtomicBoolean(true));
+        } else {
+            Set<Integer> visibleNodes = new HashSet<>(etc.getModel().getVisibleNodes());
+            return new GraphContext(openedGraph, new AtomicInteger(posDiff), visibleNodes, new AtomicBoolean(false));
+        }
+    }
+
+    private void initListView() {
+        setDocumentPath(null);
+        FolderNode.clearGraphNodeMap();
+        document.clear();
+        root = new FolderNode(document);
+        manager = new ExplorerManager();
+        manager.setRootContext(root);
+        ((BeanTreeView) this.treeView).setRootVisible(false);
+        associateLookup(ExplorerUtils.createLookup(manager, getActionMap()));
+    }
+
+    private void initToolbar() {
+        Toolbar toolbar = new Toolbar();
+        toolbar.setBorder((Border) UIManager.get("Nb.Editor.Toolbar.border")); //NOI18N
+        toolbar.setMinimumSize(new Dimension(0, 0)); // MacOS BUG with ToolbarWithOverflow
+
+        this.add(toolbar, BorderLayout.NORTH);
+
+        toolbar.add(OpenAction.get(OpenAction.class));
+        toolbar.add(ImportAction.get(ImportAction.class));
+        toolbar.addSeparator();
+
+        saveAction = SaveAction.get(SaveAction.class);
+        saveAction.setEnabled(false);
+        toolbar.add(saveAction);
+        saveAsAction = SaveAsAction.get(SaveAsAction.class);
+        saveAsAction.setEnabled(false);
+        toolbar.add(saveAsAction);
+
+        toolbar.addSeparator();
+        toolbar.add(RemoveAction.get(RemoveAction.class).createContextAwareInstance(this.getLookup()));
+        removeAllAction = RemoveAllAction.get(RemoveAllAction.class);
+        removeAllAction.setEnabled(false);
+        toolbar.add(removeAllAction);
+
+        for (Toolbar tb : ToolbarPool.getDefault().getToolbars()) {
+            tb.setVisible(false);
+        }
+
+        document.getChangedEvent().addListener(g -> documentChanged());
+    }
+
+    private void documentChanged() {
+        boolean enableButton = !document.getElements().isEmpty();
+        saveAction.setEnabled(enableButton);
+        saveAsAction.setEnabled(enableButton);
+        removeAllAction.setEnabled(enableButton);
+    }
+
+    @Override
+    public ExplorerManager getExplorerManager() {
+        return manager;
+    }
+
     @Override
     public int getPersistenceType() {
         return TopComponent.PERSISTENCE_ALWAYS;
@@ -236,15 +285,12 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
             InputGraph graph = lastProvider.getGraph();
             if (graph != null) {
                 if (graph.isDiffGraph()) {
-                    EditorTopComponent editor = EditorTopComponent.getActive();
-                    if (editor != null) {
-                        InputGraph firstGraph = editor.getModel().getFirstGraph();
-                        GraphNode firstNode = FolderNode.getGraphNode(firstGraph);
-                        InputGraph secondGraph = editor.getModel().getSecondGraph();
-                        GraphNode secondNode = FolderNode.getGraphNode(secondGraph);
-                        if (firstNode != null && secondNode != null) {
-                            selectedGraphs = new GraphNode[]{firstNode, secondNode};
-                        }
+                    InputGraph firstGraph = graph.getFirstGraph();
+                    GraphNode firstNode = FolderNode.getGraphNode(firstGraph);
+                    InputGraph secondGraph = graph.getSecondGraph();
+                    GraphNode secondNode = FolderNode.getGraphNode(secondGraph);
+                    if (firstNode != null && secondNode != null) {
+                        selectedGraphs = new GraphNode[]{firstNode, secondNode};
                     }
                 } else {
                     GraphNode graphNode = FolderNode.getGraphNode(graph);
@@ -271,15 +317,229 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
     }
 
     @Override
-    public void readExternal(ObjectInput objectInput) throws IOException, ClassNotFoundException {
-        // Not called when user starts application for the first time
-        super.readExternal(objectInput);
-        ((BeanTreeView) this.treeView).setRootVisible(false);
+    public boolean canClose() {
+        SwingUtilities.invokeLater(() -> {
+            clearWorkspace();
+            open(); // Reopen the OutlineTopComponent
+            requestActive();
+        });
+        return true;
     }
 
-    @Override
-    public void writeExternal(ObjectOutput objectOutput) throws IOException {
-        super.writeExternal(objectOutput);
+    private void setDocumentPath(String path) {
+        if (path != null) {
+            documentPath = Paths.get(path);
+            setHtmlDisplayName("<html><b>" + documentPath.getFileName().toString() + "</b></html>");
+            setToolTipText("File: " + path);
+        } else {
+            documentPath = null;
+            setHtmlDisplayName("<html><i>untitled</i></html>");
+            setToolTipText("No file");
+        }
+
+    }
+
+    /**
+     * Clears the workspace by resetting the document path, clearing the document, and resetting the folder structure.
+     * After clearing the workspace, it will be ready for new documents.
+     */
+    public void clearWorkspace() {
+        setDocumentPath(null);
+        document.clear();
+        FolderNode.clearGraphNodeMap();
+        root = new FolderNode(document);
+        manager.setRootContext(root);
+        EditorTopComponent.closeAllInstances();
+    }
+
+    /**
+     * Opens a file dialog to select and load a graph document.
+     * Clears the workspace and adds the loaded document to the workspace.
+     **/
+    public void openFile() {
+        JFileChooser fc = new JFileChooser(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT));
+        fc.setFileFilter(xmlFileFilter);
+        if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
+            clearWorkspace();
+            String path = fc.getSelectedFile().getAbsolutePath();
+            Settings.get().put(Settings.DIRECTORY, path);
+            setDocumentPath(path);
+            try {
+                loadGraphDocument(path, true);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private boolean overwriteDialog(String filename) {
+        JFrame frame = new JFrame();
+        String message = "Do you want to overwrite " + filename + "?";
+        int result = JOptionPane.showConfirmDialog(frame, message, "Confirm Overwrite", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+        frame.dispose();
+        return result == JOptionPane.YES_OPTION;
+    }
+
+    /**
+     * Saves the current graph document.
+     * If the document has no location, let the user specify the file location.
+     */
+    public void save() {
+        if (documentPath == null) {
+            saveAs();
+            return;
+        }
+
+        String filePath = documentPath.toAbsolutePath().toString();
+        if (Files.exists(Paths.get(filePath)) && overwriteDialog(documentPath.getFileName().toString())) {
+            try {
+                saveGraphDocument(getDocument(), filePath);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            saveAs();
+        }
+    }
+
+    public void saveAs() {
+        JFileChooser fc = new JFileChooser();
+        fc.setDialogTitle("Save As...");
+        fc.setFileFilter(xmlFileFilter);
+        fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
+        if (fc.showSaveDialog(null) == JFileChooser.APPROVE_OPTION) {
+            String path = fc.getSelectedFile().getAbsolutePath();
+
+            // Ask if the user wants to overwrite the file if it already exists
+            if (Files.exists(Paths.get(path)) && !overwriteDialog(fc.getSelectedFile().getName())) {
+                return; // user does not want to overwrite
+            }
+
+            Settings.get().put(Settings.DIRECTORY, path);
+            setDocumentPath(path);
+            try {
+                saveGraphDocument(getDocument(), path);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    /**
+     * Imports graph documents from one or more XML files.
+     * Displays a file chooser dialog to select one or multiple XML files for import.
+     * Each selected file is added to the workspace.
+     **/
+    public void importFromXML() {
+        JFileChooser fc = new JFileChooser();
+        fc.setFileFilter(xmlFileFilter);
+        fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
+        fc.setMultiSelectionEnabled(true);
+        if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
+            for (final File file : fc.getSelectedFiles()) {
+                String path = file.getAbsolutePath();
+                Settings.get().put(Settings.DIRECTORY, path);
+                try {
+                    loadGraphDocument(path, false);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    /**
+     * Loads and opens the given graph context (opened graphs and visible nodes).
+     */
+    private static void loadContext(GraphContext context) {
+        final GraphViewer viewer = Lookup.getDefault().lookup(GraphViewer.class);
+        if (viewer != null) {
+            final int difference = context.posDiff().get();
+            final InputGraph firstGraph = context.inputGraph();
+            final Set<Integer> visibleNodes = context.visibleNodes();
+            final boolean showAll = context.showAll().get();
+
+            SwingUtilities.invokeLater(() -> {
+                InputGraph openedGraph = viewer.view(firstGraph, true);
+                if (openedGraph != null) {
+                    EditorTopComponent etc = EditorTopComponent.findEditorForGraph(firstGraph);
+                    if (etc != null) {
+                        if (showAll) {
+                            etc.getModel().setHiddenNodes(new HashSet<>());
+                        } else {
+                            etc.getModel().showOnly(visibleNodes);
+                        }
+                        int firstGraphIdx = firstGraph.getIndex();
+                        if (difference > 0) {
+                            etc.getModel().setPositions(firstGraphIdx, firstGraphIdx + difference);
+                        } else if (difference < 0) {
+                            etc.getModel().setPositions(firstGraphIdx + difference, firstGraphIdx);
+                        }
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * Loads a graph document from the given file path, updating progress via a ProgressHandle.
+     * Parse the XML file, add the parsed document to the workspace, and load associated contexts if specified.
+     */
+    private void loadGraphDocument(String path, boolean loadContext) throws IOException {
+        if (Files.notExists(Path.of(path))) {
+            return;
+        }
+        File file = new File(path);
+        final FileChannel channel;
+        final long start;
+        try {
+            channel = FileChannel.open(file.toPath(), StandardOpenOption.READ);
+            start = channel.size();
+        } catch (Exception ex) {
+            Exceptions.printStackTrace(ex);
+            return;
+        }
+
+        final ProgressHandle handle = ProgressHandleFactory.createHandle("Opening file " + file.getName());
+        handle.start(WORK_UNITS);
+
+        ParseMonitor monitor = new ParseMonitor() {
+            @Override
+            public void updateProgress() {
+                try {
+                    int prog = (int) (WORK_UNITS * (double) channel.position() / (double) start);
+                    handle.progress(prog);
+                } catch (IOException ignored) {
+                }
+            }
+
+            @Override
+            public void setState(String state) {
+                updateProgress();
+                handle.progress(state);
+            }
+        };
+        try {
+            if (file.getName().endsWith(".xml")) {
+                ArrayList<GraphContext> contexts = new ArrayList<>();
+                final Parser parser = new Parser(channel, monitor, document, loadContext ? contexts::add : null);
+                parser.parse();
+                SwingUtilities.invokeLater(() -> {
+                    for (Node child : manager.getRootContext().getChildren().getNodes(true)) {
+                        // Nodes are lazily created. By expanding and collapsing they are all initialized
+                        ((BeanTreeView) this.treeView).expandNode(child);
+                        ((BeanTreeView) this.treeView).collapseNode(child);
+                    }
+                    requestActive();
+                });
+                for (GraphContext ctx : contexts) {
+                    loadContext(ctx);
+                }
+            }
+        } catch (IOException ex) {
+            Exceptions.printStackTrace(ex);
+        }
+        handle.finish();
     }
 
     /** This method is called from within the constructor to
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/ImportAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/ImportAction.java
index 03d062d8041..f503e6c2eb7 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/ImportAction.java
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/ImportAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,24 +25,10 @@
 package com.sun.hotspot.igv.coordinator.actions;
 
 import com.sun.hotspot.igv.coordinator.OutlineTopComponent;
-import com.sun.hotspot.igv.data.GraphDocument;
-import com.sun.hotspot.igv.data.serialization.GraphParser;
-import com.sun.hotspot.igv.data.serialization.ParseMonitor;
-import com.sun.hotspot.igv.data.serialization.Parser;
-import com.sun.hotspot.igv.settings.Settings;
-import java.io.File;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import java.nio.file.StandardOpenOption;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.Action;
-import javax.swing.JFileChooser;
-import javax.swing.SwingUtilities;
-import javax.swing.filechooser.FileFilter;
-import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
-import org.openide.util.*;
+import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 
 /**
@@ -51,89 +37,15 @@ import org.openide.util.actions.CallableSystemAction;
  */
 
 public final class ImportAction extends CallableSystemAction {
-    private static final int WORKUNITS = 10000;
 
-    public static FileFilter getFileFilter() {
-        return new FileFilter() {
-
-            @Override
-            public boolean accept(File f) {
-                return f.getName().toLowerCase().endsWith(".xml") || f.isDirectory();
-            }
-
-            @Override
-            public String getDescription() {
-                return "Graph files (*.xml)";
-            }
-        };
+    public ImportAction() {
+        putValue(Action.SHORT_DESCRIPTION, "Import from XML...");
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
     }
 
     @Override
     public void performAction() {
-        JFileChooser fc = new JFileChooser();
-        fc.setFileFilter(ImportAction.getFileFilter());
-        fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
-        fc.setMultiSelectionEnabled(true);
-
-        if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
-            for (final File file : fc.getSelectedFiles()) {
-                File dir = file;
-                if (!dir.isDirectory()) {
-                    dir = dir.getParentFile();
-                }
-
-                Settings.get().put(Settings.DIRECTORY, dir.getAbsolutePath());
-                try {
-                    final FileChannel channel = FileChannel.open(file.toPath(), StandardOpenOption.READ);
-                    final ProgressHandle handle = ProgressHandleFactory.createHandle("Opening file " + file.getName());
-                    handle.start(WORKUNITS);
-                    final long startTime = System.currentTimeMillis();
-                    final long start = channel.size();
-                    ParseMonitor monitor = new ParseMonitor() {
-                            @Override
-                            public void updateProgress() {
-                                try {
-                                    int prog = (int) (WORKUNITS * (double) channel.position() / (double) start);
-                                    handle.progress(prog);
-                                } catch (IOException ignored) {}
-                            }
-                            @Override
-                            public void setState(String state) {
-                                updateProgress();
-                                handle.progress(state);
-                            }
-                        };
-                    final GraphParser parser;
-                    final OutlineTopComponent component = OutlineTopComponent.findInstance();
-                    if (file.getName().endsWith(".xml")) {
-                        parser = new Parser(channel, monitor, null);
-                    } else {
-                        parser = null;
-                    }
-                    RequestProcessor.getDefault().post(new Runnable() {
-                            @Override
-                            public void run() {
-                                try {
-                                    final GraphDocument document = parser.parse();
-                                    if (document != null) {
-                                        SwingUtilities.invokeLater(() -> {
-                                            component.requestActive();
-                                            component.getDocument().addGraphDocument(document);
-                                        });
-                                    }
-                                } catch (IOException ex) {
-                                    Exceptions.printStackTrace(ex);
-                                }
-                                handle.finish();
-                                long stop = System.currentTimeMillis();
-                                Logger.getLogger(getClass().getName()).log(Level.INFO, "Loaded in " + file + " in " + ((stop - startTime) / 1000.0) + " seconds");
-                            }
-                        });
-                } catch (IOException ex) {
-                    Exceptions.printStackTrace(ex);
-                }
-            }
-        }
+        OutlineTopComponent.findInstance().importFromXML();
     }
 
     @Override
@@ -141,12 +53,6 @@ public final class ImportAction extends CallableSystemAction {
         return NbBundle.getMessage(ImportAction.class, "CTL_ImportAction");
     }
 
-    public ImportAction() {
-        putValue(Action.SHORT_DESCRIPTION, "Open");
-        // D is the Control key on most platforms, the Command (meta) key on Macintosh
-        putValue(Action.ACCELERATOR_KEY, Utilities.stringToKey("D-O"));
-    }
-
     @Override
     public HelpCtx getHelpCtx() {
         return HelpCtx.DEFAULT_HELP;
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/OpenAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/OpenAction.java
new file mode 100644
index 00000000000..cd322efe619
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/OpenAction.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024, 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.
+ *
+ */
+
+package com.sun.hotspot.igv.coordinator.actions;
+
+import com.sun.hotspot.igv.coordinator.OutlineTopComponent;
+import javax.swing.Action;
+import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
+import org.openide.util.NbBundle;
+import org.openide.util.Utilities;
+import org.openide.util.actions.CallableSystemAction;
+
+public final class OpenAction extends CallableSystemAction {
+
+    public OpenAction() {
+        putValue(Action.SHORT_DESCRIPTION, "Open...");
+        // D is the Control key on most platforms, the Command (meta) key on Macintosh
+        putValue(Action.ACCELERATOR_KEY, Utilities.stringToKey("D-O"));
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
+    }
+
+    @Override
+    public void performAction() {
+        OutlineTopComponent.findInstance().openFile();
+    }
+
+    @Override
+    public String getName() {
+        return NbBundle.getMessage(OpenAction.class, "CTL_OpenAction");
+    }
+
+    @Override
+    public HelpCtx getHelpCtx() {
+        return HelpCtx.DEFAULT_HELP;
+    }
+
+    @Override
+    protected boolean asynchronous() {
+        return false;
+    }
+
+    @Override
+    protected String iconResource() {
+        return "com/sun/hotspot/igv/coordinator/images/open.png";
+    }
+}
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java
index e1b3a62f0eb..9f2ac69aa64 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@ import com.sun.hotspot.igv.coordinator.FolderNode;
 import javax.swing.Action;
 import org.openide.nodes.Node;
 import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.NodeAction;
 
@@ -37,6 +38,11 @@ import org.openide.util.actions.NodeAction;
  */
 public final class RemoveAction extends NodeAction {
 
+    public RemoveAction() {
+        putValue(Action.SHORT_DESCRIPTION, getName());
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
+    }
+
     @Override
     protected void performAction(Node[] activatedNodes) {
         for (Node n : activatedNodes) {
@@ -47,10 +53,6 @@ public final class RemoveAction extends NodeAction {
         }
     }
 
-    public RemoveAction() {
-        putValue(Action.SHORT_DESCRIPTION, getName());
-    }
-
     @Override
     public String getName() {
         return NbBundle.getMessage(RemoveAction.class, "CTL_RemoveAction");
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java
index e95099d0f97..04158b23b52 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package com.sun.hotspot.igv.coordinator.actions;
 import com.sun.hotspot.igv.coordinator.OutlineTopComponent;
 import javax.swing.Action;
 import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 
@@ -42,7 +43,8 @@ public final class RemoveAllAction extends CallableSystemAction {
     }
 
     public RemoveAllAction() {
-        putValue(Action.SHORT_DESCRIPTION, "Remove all graphs and groups");
+        putValue(Action.SHORT_DESCRIPTION, "Clear workspace");
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
     }
 
     @Override
@@ -62,6 +64,6 @@ public final class RemoveAllAction extends CallableSystemAction {
 
     @Override
     public void performAction() {
-        OutlineTopComponent.findInstance().clear();
+        OutlineTopComponent.findInstance().clearWorkspace();
     }
 }
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAction.java
similarity index 77%
rename from src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java
rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAction.java
index dde018f60e9..77ec88d0659 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,37 +27,34 @@ package com.sun.hotspot.igv.coordinator.actions;
 import com.sun.hotspot.igv.coordinator.OutlineTopComponent;
 import javax.swing.Action;
 import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 import org.openide.util.actions.CallableSystemAction;
 
-/**
- *
- * @author Thomas Wuerthinger
- */
 
-public final class SaveAllAction extends CallableSystemAction {
+public final class SaveAction extends CallableSystemAction {
+
+    public SaveAction() {
+        putValue(Action.SHORT_DESCRIPTION, "Save");
+        // D is the Control key on most platforms, the Command (meta) key on Macintosh
+        putValue(Action.ACCELERATOR_KEY, Utilities.stringToKey("D-S"));
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
+    }
 
     @Override
     public void performAction() {
-        final OutlineTopComponent component = OutlineTopComponent.findInstance();
-        SaveAsAction.save(component.getDocument());
+        OutlineTopComponent.findInstance().save();
     }
 
     @Override
     public String getName() {
-        return NbBundle.getMessage(SaveAllAction.class, "CTL_SaveAllAction");
-    }
-
-    public SaveAllAction() {
-        putValue(Action.SHORT_DESCRIPTION, "Save all groups to XML file...");
-        // D is the Control key on most platforms, the Command (meta) key on Macintosh
-        putValue(Action.ACCELERATOR_KEY, Utilities.stringToKey("D-S"));
+        return NbBundle.getMessage(SaveAction.class, "CTL_SaveAction");
     }
 
     @Override
     protected String iconResource() {
-        return "com/sun/hotspot/igv/coordinator/images/saveall.gif";
+        return "com/sun/hotspot/igv/coordinator/images/save.png";
     }
 
     @Override
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java
index 4be57a51dba..65b13dfbf06 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,75 +24,27 @@
 
 package com.sun.hotspot.igv.coordinator.actions;
 
-import com.sun.hotspot.igv.coordinator.FolderNode;
-import com.sun.hotspot.igv.data.Folder;
-import com.sun.hotspot.igv.data.GraphDocument;
-import com.sun.hotspot.igv.data.Group;
-import com.sun.hotspot.igv.data.serialization.Printer;
-import com.sun.hotspot.igv.settings.Settings;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.file.Files;
+import com.sun.hotspot.igv.coordinator.OutlineTopComponent;
 import javax.swing.Action;
-import javax.swing.JFileChooser;
-import org.openide.nodes.Node;
 import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
-import org.openide.util.actions.NodeAction;
+import org.openide.util.actions.CallableSystemAction;
 
 /**
  *
  * @author Thomas Wuerthinger
  */
-public final class SaveAsAction extends NodeAction {
+public final class SaveAsAction extends CallableSystemAction {
 
     public SaveAsAction() {
-        putValue(Action.SHORT_DESCRIPTION, "Save selected groups to XML file...");
+        putValue(Action.SHORT_DESCRIPTION, "Save as...");
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
     }
 
     @Override
-    protected void performAction(Node[] activatedNodes) {
-        GraphDocument doc = new GraphDocument();
-        for (Node node : activatedNodes) {
-            if (node instanceof FolderNode) {
-                FolderNode folderNode = (FolderNode) node;
-                Folder folder = folderNode.getFolder();
-                if (folder instanceof Group) {
-                    Group group = (Group) folder;
-                    doc.addElement(group);
-                }
-            }
-        }
-        save(doc);
-    }
-
-    public static void save(GraphDocument doc) {
-        JFileChooser fc = new JFileChooser();
-        fc.setFileFilter(ImportAction.getFileFilter());
-        fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
-
-        if (fc.showSaveDialog(null) == JFileChooser.APPROVE_OPTION) {
-            File file = fc.getSelectedFile();
-            if (!file.getName().contains(".")) {
-                file = new File(file.getAbsolutePath() + ".xml");
-            }
-
-            File dir = file;
-            if (!dir.isDirectory()) {
-                dir = dir.getParentFile();
-            }
-            Settings.get().put(Settings.DIRECTORY, dir.getAbsolutePath());
-            try {
-                try (Writer writer = new OutputStreamWriter(Files.newOutputStream(file.toPath()))) {
-                    Printer p = new Printer();
-                    p.export(writer, doc);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+    public void performAction() {
+        OutlineTopComponent.findInstance().saveAs();
     }
 
     @Override
@@ -102,7 +54,7 @@ public final class SaveAsAction extends NodeAction {
 
     @Override
     protected String iconResource() {
-        return "com/sun/hotspot/igv/coordinator/images/save.png";
+        return "com/sun/hotspot/igv/coordinator/images/save_as.gif";
     }
 
     @Override
@@ -114,17 +66,4 @@ public final class SaveAsAction extends NodeAction {
     protected boolean asynchronous() {
         return false;
     }
-
-    @Override
-    protected boolean enable(Node[] nodes) {
-        if (nodes.length > 0) {
-            for (Node n : nodes) {
-                if (!(n instanceof FolderNode) || ((FolderNode) n).isRootNode()) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
 }
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/Bundle.properties b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/Bundle.properties
index 1b17042508e..2bebc0e2797 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/Bundle.properties
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/Bundle.properties
@@ -1,6 +1,3 @@
-AdvancedOption_DisplayName_Coordinator=Settings
-AdvancedOption_Tooltip_Coordinator=Visualization Tool Settings
-CTL_OutlineTopComponent=Outline
-CTL_SomeAction=test
-HINT_OutlineTopComponent=Displays loaded groups of graphs.
+CTL_OutlineTopComponent=Workspace
+HINT_OutlineTopComponent=Opened groups of graphs.
 OpenIDE-Module-Name=Coordinator
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/actions/Bundle.properties b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/actions/Bundle.properties
index de3aa509a31..f192e91fceb 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/actions/Bundle.properties
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/actions/Bundle.properties
@@ -1,8 +1,9 @@
-CTL_ImportAction=Open...
+CTL_ImportAction=Import...
+CTL_OpenAction=Open...
 CTL_DiffGraphAction=Difference to current graph
 CTL_RemoveAction=Remove selected graphs and groups
-CTL_RemoveAllAction=Remove all graphs and groups
-CTL_OutlineAction=Outline
-CTL_SaveAsAction=Save selected groups...
-CTL_SaveAllAction=Save all groups...
+CTL_RemoveAllAction=Clear workspace
+CTL_OutlineAction=Workspace
+CTL_SaveAction=Save
+CTL_SaveAsAction=Save as...
 CTL_NewFilterAction=New filter...
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/import.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/import.png
index 7e4a6badcb151986e6f33e30a4e57445ccb5815c..d8c8c766b88fde6c301ed94cac05487b277e2db5 100644
GIT binary patch
literal 1294
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBDAAG{;hE;^%b*2hb1<+n
z3NbJPS&Tr)z$nE4G7ZRL@M4sPvx68lplX;H7}_%#SfFa6fHVkr05M1pgl1mAh%j*h
z6I`{x0%imor0saV%ts)_S>O>_%)r1c48n{Iv*t)JFfg6S42dX-@b$4u&d=3LOvz75
z)vL%Y0O?||sjvbvb5lza6)JLb@`|l0Y?Z(&tblBgu)dN4SV>8?tx|+<fP!;=QL2KO
zo`If$k{y?Vf`Uy^N}5%WiyKrskY}ruQBqQ1rLSLJUanVete0Puu5V~*X{m2uq;F)T
z3sj+7T$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv5?duDkVS9+ac4<p8p5W$
zVyL%(9@GcP=o{)8=ws8CT9JuE8%PGC4eT$7bv7WwtRjO_i}Q0zLC&%>H?jfSfFg)+
zA4CH}eP~{0i5*M}nlQSq2!uSs8e~Cq4gN)$slb2)yUP&jEMzex^&sC_1!PvF=0vz;
z=BDNqgZyG>W}}Z)0$rnXeolT-a6w{nsvXcCuofgCbk$&MB5_%RBmvcEqYsK}q_~G9
zEU+jrW!Z7r=)+T~9hY78;(5RvqTuP`7-AuqoZ`UTcb5I{zWw$41y%mMe$L(&KmUGn
zXiQ{C22;u$*5U~qVk%}WCr_N<NYYvPCFRGL&-RD;75uX2G%n;(JHV2B;N}1S{}11E
zF)-k5*ww(XH$k;Pzv0in-^bVY+V8JDxGLOu)!#Gw?e|OMty|^J$-RS-Ct&vWtGkT<
z{P^1ckXzvJfhDs{+T!aaB|g2bPH?)BIYE2Ps%^D3A3uKoZ@s?$pZ)hI$Nwjn@Be?l
z{PpYl1>6pa$vv^^lUCGzEDP>l#9Kd+_d@4ubwA@XGRyD8<}KT)eNgX$|6IRWX)_eB
zot3`YyGeY)a>+D~*bKLbKmULKm(F>(Uw;1sG3Dp16CT{Rw^zt&c*)4(klDm3_CG<;
kh(nD{=(61|S&`ig4CmXs>aY4otpMe6Pgg&ebxsLQ0G~vdNB{r;

delta 3467
zcmV;64RrF33aJ~AEPsxC`%#ks017>6Lqkw$V`BgSc-oy)XH-+^7Crag^g>IBfRsyb
zQWXdwQbLP>RB56Tk^rHE7!pA2h^WAbq9TG785D8A(GifbB8r7UvG)Oa2q@#=C^l5y
z58fJmv*x`wZ}zXf_Bm&r@0@);07hW2M4E-F0c1)Q@`wN*JbyMW9w&DL3RED01Asu7
zEenbCj{*ST`|<GXhyWk>0tDdAZ9o73ZrB8d;W+$%P#4PN3IHSw0H%w?*+KxM5CAfA
z6*2_?G713fq;#1A03`qbTOJ!14}fX`06S%pPXhpU(j@l+0JbPoDgr>G06-?n6o~-P
z4ggq}qZEq(uzz3xD9VwDa{;iM0AP}#%#;9N?*M?EDHdb{5EuYpq7VyH0SNX0z>r5p
z@Bj!i0Vs@=uXxf|Tp`X=008i^WQ*mJlvD+7A+*FDTwS?%pg1=}tWem5354kaxd`WF
zWy%E7#Q>8t0|0<Vc0_;=&iCUvJGeSK+c?@fe6^_m8h`wYh>eT?mp`w<0RaGn)AdFB
zv%IVt0PYw7w(*OWv>l*j4S?4DFPh070M$Z(=Br=L!{Ph!@Kl9D=4NM?o11GZ5esdF
zsbBT^p9y~fU-h%)`|<GK*Ms|tlLg8Q1s)OLgA21VvXpW>TP6^SahpFL@!u}|^LI>(
z5GRY}Vt=Vnj7Lkvxe{p#&dZXDBnnBE6qiW<lZk(`><^f{YXD%?eg^hJTTr{o2JDwE
zAh76wCF}wK<aghKsnHMy05JxGlXnjQF!`JR9cUQ<pxKfX8~}h95rqqt@|?*S0RVsq
zG*AULXoEf&g9X@tBe;M&c!3|xhERxtI9LEeNPmS)kV7skg;h`lC9n~;LKW<WTBwIc
zI07wj0?xt(xB}PU7CeAn7=Y(63U6Q>K@c*+L|BM6Vt|+;)`%m*MP?y>NH7wC#36}D
z3L-_6$WmlAQi7BtRmfhX9{C<Qj+{j<Aw9@Fqz@TJenUQ>7|KA|s2*yD+M!(38x2CE
z(0}=83c3i*M+?ynXeC;M9zvVZv*;D{7TSwGN5?S0=okkx#B4Aw#=}Cfcq|!{W6QB(
ztOBdS8nHI46T5-+Vk6jl0*SyP-~=0jJ0XxTmmnl8A}lAA5~>IX2+f2J!VN+nVU+Nh
z$Rz3#t%+_#J~5V<Ld+!=5i5vw#AC$s#D81F0pc4HiNqn9lUzuFq&QL<X$h&6w3F0C
zIz#Fq^^?ZPWU@Bdn(RRiB@4(3auInu`4IUu`8s)k{EkAW7*HH3{*-u%lu|&cpd6%}
zqFkp8QpTxjR8y)OHIyo%E~b`IYpHG2tJDGNI8B{qPV=Be(b8zEXqB`^+IiYT+J7rL
zoo+;TrH9ic^p*5V`eFJ-dLR8gLxW+(;4u;yO2!7pe#RNbJ;p00lWE5EV#YHS%ni(X
z<~inL<~tRZimeJ?MWnJqrCOy~<+{oXRjR6~s<-L_)qK?o)uXCcRY%mQYG!IYHG$f4
zwQ9BFYIoGe)LH5d>Y?hH>ZR%j)qgLk4{4A!%ryKoL>h$}`!vpJ^s_LQF^k6%vR1Qd
zS?5^;Y!cg?&1a{vOW5DByV;|f8k#dSqc!t1t2Iw*_Hr<e8Hdlw;FNKWaBg!xOwpU-
zJw-fa{glQj*QdPInyTfcCDtm|YSOx;^+6lg_R~(+-lW~4{YZzPW2F<WlYgtTOXs}K
z$W-=J_o>3E#Z!+=y|0VvTIojUF45hm+oe0Er>_^FC)3-mcTR6apQG=kpQgV>|CIi)
z0n1>Pfy7{o!D)kMxF+t6XW*512R>@3YZz##G~8?0Z8&aZZZy}Zz^KXSkulAfYn*Jn
z#kk#g)WpCf#AK;SgUNkUs(&fhG}UyQX{YI1Gjp>Tv$bX|W<%y$=6v&f^9J*W7EB9I
zi$xYS7B?+PmR!qp%bk|jtWYZ_t5mCMtE<+iwX?OvdZ%^IG~zVZY0_ym)9%<XY`kr9
zY#MC(Y&o{Uwgt8=wlC~V?BeY<*>&1|ws*46u&=d$;Gp3!+o8ar&41xHM=M96W3}VW
z>CEZ=(^pJyo&Iu$^$hWhT{G@Fv7ADj);hI2eR6hjmOD2(54)JSB)aTyxx;01!?>l~
zi>^dhAJ-MGCtTmVIlC#`j=25mZsVTre$ahrruj_q%-Wg#9!4GlkG&qfv+!Aov-ZsD
z^)&Ppc-DA6@iO)jd4JV;4SHL8r+FXpe&J*9BlkJx^OonvTgE%%i}?ol7W;PlY52|c
ztMYs7Z{(li-{3zQ;1sYV;7lMfFeq?S;2pjmU&ycLkIr_Py=-<z5F;ous4D15uvM@;
zxGe+?nH{n@<l!9CInp^Tp%BUs-5mNT%sgyS*pK0)@UZae@PDTf4iQTuIwM(;3nLFk
zzKQaQDvNqB*J7@6ZhN$9bV77}^xGKUnDUt3Si9I|u~*`B;v{jc@#OgE_`3M9d4BV@
z&KpQ@N+?RWJ>PtO-uz1obQWYRIJr=Dp<v<BL}Fr0;=#m^f>1$?U@VEBv?FO$$P;c8
zJ{Nh3wupws9)IF;@nEt?a(VJlibu-kl;Kp*)QZ#*2~Scbd6^cNwma=@dT9Fo^ofj^
zjHXOVW@6@XsfILN+L5K7m6z2cvz8UfdKbAZ+PY{|9we{JMzZH;w<_2QnW9T+p<JWv
z%bAr^o%1d?I`?RvdY&||Yq8bh^@|7d{qw(FLRcbP(tp0xaOtY0eapO;?Ol#6Pg>r-
z!gxjDih-2@D-W!qtx8|@Q-OU!dBN+|F{|4O^$J%O_OA(8(@>;RBrm$N)_v{nb%b@2
zb=~Wyuiw7@bFrxSa*2IOMajofVd>>>9KNaiW@1C~hVC-wvRxZV8>Jg>Z}Qx9pj^E?
zzr25Q$baVME%=t=Ew8sO+<K{EM#b)Jv~9|5y_Lb0t=mnuZ`}T|Dz)lXwNG`^4&5E=
zcf8#x+IfAK*RIChdb>+@f7m10b9ZmR-sT#!nu>j-eL4G{)<)NMe#`x~zD}pEr0&yx
z>HgjW5eGWzUFz!(>K-g>KpT_|!-o<MUHi`WyMNY3o5sCOoTie)a9DZx+4qUx-#!v_
zr2Q!OXyXs2KkPWhI#%3_G%s!*ZAoqEZH;T~IX?S%dz*XPu^(-J+<(IGMD<C{lVzu9
zrwUI^oX$Tzc1Ct)<ZQ~>{`Q6K56;D&yV()m(S1JX{KX6Y7tVEhcb>lJaq+|@w@b$_
zbAK<lTyehA+~w4D>?fz6j&(bCH(zzR+Ir3PT3gS|o>SL7ub;i)d*i}Q{>>}5=G^MJ
zJ@@wAI|+As?~3jY-OIT5@_x?!@dqm(5+4>nQhQYKSod+w&z3(o^*Z;S?DOsGdJ_5M
zLBFv7`9HG%@o}K=Df4N?puu4MkmJyaVSoSOYtQCA8+a~zK0Z?Pi~27+URb>N;a9I;
zyGCP22VTlwPW)E-O8eFR*E3$XkA;mrev|oT{B7|&?RN*>bKiG<i1{!$p8JvfvGSAU
zr?$^QpC3+SPE7n01DNytC1W$90000WV@Og>004R=004l4008;_004mL004C`03iVC
zU;qF*m;eA5Z<1fdMgRZ+24YJ`L;(K){{a7>y{D6r?H7Ll33hNnX8-^I5C8xG5CB}p
zt-}BS0!>LoK~y-)jm_UnQ(+v(@%M8)o290x5eh@u$UudLPSKIl59=mnSr8Om1rY^y
zF`@sVn}V(iy^t;pOAt$lX#@))BP&v<8+9?;&Ss}gw~0HR?VQt%g(Aq_cV8YpuSZyx
z#gmb-+gpE{{<Ns52mr${C^=-mbNA-8A$D@ypZV7As&ccd`A~8}4uvD-YBJ^P@Arw_
zz~tm>Unm?IbJaW20B*+-_oEwayY~!?%(>;^(TP--w-dt@7^b=NB=EGh^ag@+DP7M2
zpvO&`29~+!YvW2+BLJGFBUe>c;&eLE^X4Ai>2iPJa=HHBpT|FO>qIrZ-bS9yEYN?(
zO>SF9HZ6;sVIYLq1LX1s0GTbF;ps(cYil@r%ERO5@0bdH;hfh^emjdS5C|dm0smV3
zxkg!8DV-f2M&EoS`eUAIYkleA(0Iera%f3LfOG(Wktdwc7<m!Eo{li!YbEgN<%3*!
zJXn8cBP$CI2Ab=SvZh1<=<e~dnMpC|_h&rr<`94k0!b3Y)dbP_A57ESha9gv20%<r
zq9`%cM8cce%3+xXvJfB%2+n;)v+R^tRB&L2t59|P(eH}?!)#EIg@BDznqR*+X!W#V
zx7#VCSWGe2)!4W!5JX~YSO_wiOhIFSmF0h>jjMe<Z)M9gh{jcHHXG@5x?mu#D9ZH<
zo)tNnP&e&)sZ5e2G)*fQNUCeArjcKj15*>z6^_Qfn)-&~j3f#gYuT*c-PSyN@%-s6
zVY3&v+los%glsD<^!Gu(KXUn!?|sY3rpR9<ko@yrt+&|#001R)MObuXVRU6WV{%_*
zVRU5xGB7bQEigANFf>##H##vhIx#mZFfuwYFq)r<wEzGBC3HntbYx+4WjbwdWNBu3
t05UK!F)c7REig1xF*Z6fHaajkD=;!TFfem{HNF4<002ovPDHLkV1f_`py>br

diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/open.png b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..212763d1263e3f719bcf76ddbd4138847e9699ba
GIT binary patch
literal 1143
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`)Ym%P6qN7l0AZa
z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsJ10F!ZXd+mq822=3roD
z6k=covKWDofl-Qq70hN}@M4sPvx68lplX;H7}_%#SfFa6fHVkr05MQElxAMQh%j*h
z6I`{x0%imor0saV%ts)_S>O>_%)r1c48n{Iv*t(uO^eJ7i71Ki^|4CM&(%vz$xlkv
ztH><?>0+>{umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuG
zfu4bq9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)Btk
zRH0j3nOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXGvxn!lt}p
zsJDO~)CbAv8|oS8!_5Y2wE>A*`4?rT0&NDFZ)a!&R*518wZ}#uWI2*!AU*|)0=;U-
zWup%dHajlKxQFb(K>p$B;uvBfn4H4Ul=(SqN$u~C#camL#vP|We19L$rpNcKXU&q1
z$OJ|kmeX%<Z~r+h_s(l^fd|Jsat^fd&i>O-q#Y6(YX9)!`2!Ibtv>GWUCP=#rAMY~
zSGvEPp-s(~2@kKYzn}2&|Nno@vB%DyoY(ipNKDbuk<HcBwJpB>-$IE6E0!Etz;eXk
z!~6gC8yMUD<L7j~F`8EY|G)7cwqG+RP83`w=JWsGXYtnm{4bc;*xcAy3l-a9-Otyv
z6gRMND+dTHk-W<wa@T?Hf}DZFcP;J!duCxlHUq}BOpV3Q&l|tFvqekt45N^bLgEC*
zBS~>`a&3qHEIMz%9O3XUiAn17qp#6z%k}RW{Q2E3HN&9Q;MdK~&w1A0-?#Nn^&1<F
zgA9im-mtQ@F&{r~_~*y@V+W3(=MV0l`%EOM;&1oD4==B#w;tz{uV6EKaQL`CPk(%E
zf`O4)VnTBA;dO$(Uw(d0ufM;yZl9D4xBtBTDL?qXoO*t~VEsbP<4^AGE&lDiV*Tm7
zX~2+S`ulHI<J75BA6{19vr_En6!G)(Y`e>h_n!Xr?(J*+ocb9RGiJ<?sQdGyaS@07
z^SiI7_t(`XRv+1ve0kU0KbvOR34L1iX8ys6UH;N8?~ZSOzyFQT7XIJAX4NF8q&_uD
yO-wgWPfC5LwnlW(q8$rfcosBVcdV`btIiM?df=H#aa0c|J9)bLxvX<aXaWG?eVUN~

literal 0
HcmV?d00001

diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/saveall.gif b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/save_as.gif
similarity index 100%
rename from src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/saveall.gif
rename to src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/images/save_as.gif
diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/layer.xml b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/layer.xml
index 60e73788c95..dd1a2c0d2ab 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/layer.xml
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/layer.xml
@@ -26,8 +26,9 @@
     </folder>
     <folder name="Actions">
         <folder name="File">
+            <file name="com-sun-hotspot-igv-coordinator-actions-OpenAction.instance"/>
+            <file name="com-sun-hotspot-igv-coordinator-actions-SaveAction.instance"/>
             <file name="com-sun-hotspot-igv-coordinator-actions-SaveAsAction.instance"/>
-            <file name="com-sun-hotspot-igv-coordinator-actions-SaveAllAction.instance"/>
             <file name="com-sun-hotspot-igv-coordinator-actions-ImportAction.instance"/>
             <file name="com-sun-hotspot-igv-coordinator-actions-RemoveAction.instance"/>
             <file name="com-sun-hotspot-igv-coordinator-actions-RemoveAllAction.instance"/>
@@ -55,6 +56,10 @@
             <file name="Separator2.instance_hidden"/>
             <file name="Separator3.instance_hidden"/>
             <file name="SeparatorOpen.instance_hidden"/>
+            <file name="com-sun-hotspot-igv-coordinator-actions-OpenAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-coordinator-actions-OpenAction.instance"/>
+                <attr name="position" intvalue="50"/>
+            </file>
             <file name="com-sun-hotspot-igv-coordinator-actions-ImportAction.shadow">
                 <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-coordinator-actions-ImportAction.instance"/>
                 <attr name="position" intvalue="100"/>
@@ -71,13 +76,13 @@
                 <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                 <attr name="position" intvalue="400"/>
             </file>
+            <file name="com-sun-hotspot-igv-coordinator-actions-SaveAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-coordinator-actions-SaveAction.instance"/>
+                <attr name="position" intvalue="600"/>
+            </file>
             <file name="com-sun-hotspot-igv-coordinator-actions-SaveAsAction.shadow">
                 <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-coordinator-actions-SaveAsAction.instance"/>
-                <attr name="position" intvalue="500"/>
-            </file>
-            <file name="com-sun-hotspot-igv-coordinator-actions-SaveAllAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-coordinator-actions-SaveAllAction.instance"/>
-                <attr name="position" intvalue="600"/>
+                <attr name="position" intvalue="650"/>
             </file>
             <file name="SeparatorRemove.instance">
                 <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
@@ -105,8 +110,8 @@
             <file name="org-netbeans-modules-project-ui-RecentProjects.shadow_hidden"/>
             <file name="org-netbeans-modules-project-ui-groups-GroupsMenu.shadow_hidden"/>
             <file name="org-openide-actions-SaveAction.shadow_hidden"/>
-            <file name="org-openide-actions-SaveAllAction.shadow_hidden"/>
             <file name="org-openide-actions-SaveAsAction.shadow_hidden"/>
+            <file name="org-openide-actions-SaveAllAction.shadow_hidden"/>
         </folder>
 
         <folder name="Edit">
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Folder.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Folder.java
index 9ff7c32bd1f..3bd92a49cbf 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Folder.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Folder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@ package com.sun.hotspot.igv.data;
 
 import java.util.List;
 
-public interface Folder {
+public interface Folder extends Properties.Provider {
     void setName(String name);
     String getName();
     String getDisplayName();
@@ -33,4 +33,5 @@ public interface Folder {
     void removeElement(FolderElement element);
     void addElement(FolderElement group);
     ChangedEvent<? extends Folder> getChangedEvent();
+    Properties getProperties();
 }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/FolderElement.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/FolderElement.java
index eb0a874278f..2bf153674c7 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/FolderElement.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/FolderElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,12 @@
  */
 package com.sun.hotspot.igv.data;
 
-public interface FolderElement {
+public interface FolderElement extends Properties.Provider {
     ChangedEvent<? extends FolderElement> getDisplayNameChangedEvent();
     void setName(String name);
     String getName();
     String getDisplayName();
     void setParent(Folder parent);
     Folder getParent();
+    Properties getProperties();
 }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/GraphDocument.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/GraphDocument.java
index 1f13cb3b433..4bf933d43c2 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/GraphDocument.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/GraphDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
@@ -54,7 +54,7 @@ public class GraphDocument extends Properties.Entity implements ChangedEventProv
 
     public void addGraphDocument(GraphDocument document) {
         if (document != this) {
-            for (FolderElement e : document.elements) {
+            for (FolderElement e : document.getElements()) {
                 e.setParent(this);
                 this.addElement(e);
             }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Group.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Group.java
index 01af950a093..e98164409b6 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Group.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/Group.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
@@ -126,13 +126,22 @@ public class Group extends Properties.Entity implements ChangedEventProvider<Gro
 
     @Override
     public String getDisplayName() {
-        String displayName = (getParent() == null ? "" : getParent().getElements().indexOf(this) + 1 + " - ") + getName();
+        String displayName = (getParent() == null ? "" : getIndex() + 1 + " - ") + getName();
         if (getProperties().get("osr") != null) {
             displayName += " [OSR]";
         }
         return displayName;
     }
 
+    public int getIndex() {
+        Folder parent = getParent();
+        if (parent != null) {
+            return parent.getElements().indexOf(this);
+        } else {
+            return -1;
+        }
+    }
+
     public String getType() {
         return getProperties().get("type");
     }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java
index 26dc2c6cfb2..9db0d83e0eb 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,18 +23,19 @@
  */
 package com.sun.hotspot.igv.data.serialization;
 
+import com.sun.hotspot.igv.data.Properties;
 import com.sun.hotspot.igv.data.*;
+import com.sun.hotspot.igv.data.serialization.Printer.GraphContext;
+import com.sun.hotspot.igv.data.serialization.Printer.GraphContextAction;
 import com.sun.hotspot.igv.data.serialization.XMLParser.ElementHandler;
 import com.sun.hotspot.igv.data.serialization.XMLParser.HandoverElementHandler;
 import com.sun.hotspot.igv.data.serialization.XMLParser.TopElementHandler;
-import com.sun.hotspot.igv.data.services.GroupCallback;
 import java.io.IOException;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import javax.swing.SwingUtilities;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
@@ -49,10 +50,13 @@ import org.xml.sax.XMLReader;
  */
 public class Parser implements GraphParser {
 
-    public static final String INDENT = "  ";
     public static final String TOP_ELEMENT = "graphDocument";
     public static final String GROUP_ELEMENT = "group";
     public static final String GRAPH_ELEMENT = "graph";
+    public static final String GRAPH_STATES_ELEMENT = "graphStates";
+    public static final String STATE_ELEMENT = "state";
+    public static final String STATE_POSITION_DIFFERENCE = "difference";
+    public static final String POSITION_DIFFERENCE_PROPERTY = "value";
     public static final String ROOT_ELEMENT = "graphDocument";
     public static final String PROPERTIES_ELEMENT = "properties";
     public static final String EDGES_ELEMENT = "edges";
@@ -60,15 +64,11 @@ public class Parser implements GraphParser {
     public static final String EDGE_ELEMENT = "edge";
     public static final String NODE_ELEMENT = "node";
     public static final String NODES_ELEMENT = "nodes";
+    public static final String VISIBLE_NODES_ELEMENT = "visibleNodes";
+    public static final String ALL_PROPERTY = "all";
     public static final String REMOVE_EDGE_ELEMENT = "removeEdge";
     public static final String REMOVE_NODE_ELEMENT = "removeNode";
     public static final String METHOD_NAME_PROPERTY = "name";
-    public static final String GROUP_NAME_PROPERTY = "name";
-    public static final String METHOD_IS_PUBLIC_PROPERTY = "public";
-    public static final String METHOD_IS_STATIC_PROPERTY = "static";
-    public static final String TRUE_VALUE = "true";
-    public static final String NODE_NAME_PROPERTY = "name";
-    public static final String EDGE_NAME_PROPERTY = "name";
     public static final String NODE_ID_PROPERTY = "id";
     public static final String FROM_PROPERTY = "from";
     public static final String TO_PROPERTY = "to";
@@ -89,49 +89,242 @@ public class Parser implements GraphParser {
     public static final String BLOCK_ELEMENT = "block";
     public static final String SUCCESSORS_ELEMENT = "successors";
     public static final String SUCCESSOR_ELEMENT = "successor";
-    public static final String ASSEMBLY_ELEMENT = "assembly";
     public static final String DIFFERENCE_PROPERTY = "difference";
-    private final TopElementHandler<GraphDocument> xmlDocument = new TopElementHandler<>();
+    private final TopElementHandler<GraphDocument> xmlData = new TopElementHandler<>();
     private final Map<Group, Boolean> differenceEncoding = new HashMap<>();
     private final Map<Group, InputGraph> lastParsedGraph = new HashMap<>();
-    private final GroupCallback groupCallback;
+    private final GraphDocument callbackDocument;
+    private final GraphContextAction contextAction;
+    private final ArrayList<GraphContext> contexts = new ArrayList<>();
     private final HashMap<String, Integer> idCache = new HashMap<>();
     private final ArrayList<Pair<String, String>> blockConnections = new ArrayList<>();
-    private int maxId = 0;
-    private GraphDocument graphDocument;
     private final ParseMonitor monitor;
     private final ReadableByteChannel channel;
     private boolean invokeLater = true;
 
-    private int lookupID(String i) {
-        try {
-            return Integer.parseInt(i);
-        } catch (NumberFormatException nfe) {
-            // ignore
-        }
-        Integer id = idCache.get(i);
-        if (id == null) {
-            id = maxId++;
-            idCache.put(i, id);
-        }
-        return id;
-    }
-
-    // <graphDocument>
-    private ElementHandler<GraphDocument, Object> topHandler = new ElementHandler<GraphDocument, Object>(TOP_ELEMENT) {
+    // <method>
+    private final ElementHandler<InputMethod, Group> methodHandler = new XMLParser.ElementHandler<>(METHOD_ELEMENT) {
 
         @Override
-        protected GraphDocument start() throws SAXException {
+        protected InputMethod start() throws SAXException {
+            Group group = getParentObject();
+            InputMethod method = parseMethod(this, group);
+            group.setMethod(method);
+            return method;
+        }
+    };
+    // <bytecodes>
+    private final HandoverElementHandler<InputMethod> bytecodesHandler = new XMLParser.HandoverElementHandler<>(BYTECODES_ELEMENT, true) {
+
+        @Override
+        protected void end(String text) {
+            getParentObject().setBytecodes(text);
+        }
+    };
+    // <inlined>
+    private final HandoverElementHandler<InputMethod> inlinedHandler = new XMLParser.HandoverElementHandler<>(INLINE_ELEMENT);
+    // <inlined><method>
+    private final ElementHandler<InputMethod, InputMethod> inlinedMethodHandler = new XMLParser.ElementHandler<>(METHOD_ELEMENT) {
+
+        @Override
+        protected InputMethod start() throws SAXException {
+            InputMethod method = parseMethod(this, getParentObject().getGroup());
+            getParentObject().addInlined(method);
+            return method;
+        }
+    };
+    // <nodes>
+    private final HandoverElementHandler<InputGraph> nodesHandler = new HandoverElementHandler<>(NODES_ELEMENT);
+    // <controlFlow>
+    private final HandoverElementHandler<InputGraph> controlFlowHandler = new HandoverElementHandler<>(CONTROL_FLOW_ELEMENT);
+    private final HandoverElementHandler<InputGraph> graphStatesHandler = new HandoverElementHandler<>(GRAPH_STATES_ELEMENT);
+    private final ElementHandler<GraphContext, InputGraph> stateHandler = new ElementHandler<>(STATE_ELEMENT) {
+
+        @Override
+        protected GraphContext start() {
+            InputGraph inputGraph = getParentObject();
+            GraphContext graphContext = new GraphContext(inputGraph, new AtomicInteger(0), new HashSet<>(), new AtomicBoolean(false));
+            if (contextAction != null) {
+                contexts.add(graphContext);
+            }
+            return graphContext;
+        }
+    };
+    private final ElementHandler<GraphContext, GraphContext> visibleNodesHandler = new ElementHandler<>(VISIBLE_NODES_ELEMENT) {
+
+        @Override
+        protected GraphContext start() throws SAXException {
+            String s = readRequiredAttribute(ALL_PROPERTY);
+            try {
+                boolean all = Boolean.parseBoolean(s);
+                getParentObject().showAll().set(all);
+            } catch (NumberFormatException e) {
+                throw new SAXException(e);
+            }
+            return getParentObject();
+        }
+    };
+    private final ElementHandler<GraphContext, GraphContext> visibleNodeHandler = new ElementHandler<>(NODE_ELEMENT) {
+
+        @Override
+        protected GraphContext start() throws SAXException {
+            String s = readRequiredAttribute(NODE_ID_PROPERTY);
+            int nodeID;
+            try {
+                nodeID = Integer.parseInt(s);
+            } catch (NumberFormatException e) {
+                throw new SAXException(e);
+            }
+            getParentObject().visibleNodes().add(nodeID);
+            return getParentObject();
+        }
+    };
+    private final ElementHandler<GraphContext, GraphContext> differenceHandler = new ElementHandler<>(STATE_POSITION_DIFFERENCE) {
+
+        @Override
+        protected GraphContext start() throws SAXException {
+            String s = readRequiredAttribute(POSITION_DIFFERENCE_PROPERTY);
+            int posDiff;
+            try {
+                posDiff = Integer.parseInt(s);
+            } catch (NumberFormatException e) {
+                throw new SAXException(e);
+            }
+            getParentObject().posDiff().set(posDiff);
+            return getParentObject();
+        }
+    };
+    // <block>
+    private final ElementHandler<InputBlock, InputGraph> blockHandler = new ElementHandler<>(BLOCK_ELEMENT) {
+
+        @Override
+        protected InputBlock start() throws SAXException {
+            InputGraph graph = getParentObject();
+            String name = readRequiredAttribute(BLOCK_NAME_PROPERTY);
+            InputBlock b = graph.addBlock(name);
+            for (InputNode n : b.getNodes()) {
+                assert graph.getBlock(n).equals(b);
+            }
+            return b;
+        }
+    };
+    // <nodes>
+    private final HandoverElementHandler<InputBlock> blockNodesHandler = new HandoverElementHandler<>(NODES_ELEMENT);
+    // <successors>
+    private final HandoverElementHandler<InputBlock> successorsHandler = new HandoverElementHandler<>(SUCCESSORS_ELEMENT);
+    // <successor>
+    private final ElementHandler<InputBlock, InputBlock> successorHandler = new ElementHandler<>(SUCCESSOR_ELEMENT) {
+
+        @Override
+        protected InputBlock start() throws SAXException {
+            String name = readRequiredAttribute(BLOCK_NAME_PROPERTY);
+            blockConnections.add(new Pair<>(getParentObject().getName(), name));
+            return getParentObject();
+        }
+    };
+    // <graph>
+    private final HandoverElementHandler<InputGraph> edgesHandler = new HandoverElementHandler<>(EDGES_ELEMENT);
+    // <edge>
+    private final EdgeElementHandler edgeHandler = new EdgeElementHandler(EDGE_ELEMENT) {
+
+        @Override
+        protected InputEdge start(InputEdge conn) {
+            InputGraph inputGraph = getParentObject();
+            inputGraph.addEdge(conn);
+            return conn;
+        }
+    };
+    // <removeEdge>
+    private final EdgeElementHandler removeEdgeHandler = new EdgeElementHandler(REMOVE_EDGE_ELEMENT) {
+
+        @Override
+        protected InputEdge start(InputEdge conn) {
+            getParentObject().removeEdge(conn);
+            return conn;
+        }
+    };
+    // <properties>
+    private final HandoverElementHandler<Properties.Provider> propertiesHandler = new HandoverElementHandler<>(PROPERTIES_ELEMENT);
+    // <property>
+    private final ElementHandler<String, Properties.Provider> propertyHandler = new XMLParser.ElementHandler<>(PROPERTY_ELEMENT, true) {
+
+        @Override
+        public String start() throws SAXException {
+            return readRequiredAttribute(PROPERTY_NAME_PROPERTY);
+        }
+
+        @Override
+        public void end(String text) {
+            getParentObject().getProperties().setProperty(getObject(), text.trim());
+        }
+    };
+    private int maxId = 0;
+    // <node>
+    private final ElementHandler<InputBlock, InputBlock> blockNodeHandler = new ElementHandler<>(NODE_ELEMENT) {
+
+        @Override
+        protected InputBlock start() throws SAXException {
+            String s = readRequiredAttribute(NODE_ID_PROPERTY);
+
+            int id;
+            try {
+                id = lookupID(s);
+            } catch (NumberFormatException e) {
+                throw new SAXException(e);
+            }
+            getParentObject().addNode(id);
+            return getParentObject();
+        }
+    };
+    // <node>
+    private final ElementHandler<InputNode, InputGraph> nodeHandler = new ElementHandler<>(NODE_ELEMENT) {
+
+        @Override
+        protected InputNode start() throws SAXException {
+            String s = readRequiredAttribute(NODE_ID_PROPERTY);
+            int id;
+            try {
+                id = lookupID(s);
+            } catch (NumberFormatException e) {
+                throw new SAXException(e);
+            }
+            InputNode node = new InputNode(id);
+            getParentObject().addNode(node);
+            return node;
+        }
+    };
+    // <removeNode>
+    private final ElementHandler<InputNode, InputGraph> removeNodeHandler = new ElementHandler<>(REMOVE_NODE_ELEMENT) {
+
+        @Override
+        protected InputNode start() throws SAXException {
+            String s = readRequiredAttribute(NODE_ID_PROPERTY);
+            int id;
+            try {
+                id = lookupID(s);
+            } catch (NumberFormatException e) {
+                throw new SAXException(e);
+            }
+            return getParentObject().removeNode(id);
+        }
+    };
+    private GraphDocument graphDocument;
+    // <graphDocument>
+    private final ElementHandler<GraphDocument, Object> topHandler = new ElementHandler<>(TOP_ELEMENT) {
+
+        @Override
+        protected GraphDocument start() {
             graphDocument = new GraphDocument();
             return graphDocument;
         }
     };
     // <group>
-    private ElementHandler<Group, Folder> groupHandler = new XMLParser.ElementHandler<Group, Folder>(GROUP_ELEMENT) {
+    private final ElementHandler<Group, Folder> groupHandler = new XMLParser.ElementHandler<>(GROUP_ELEMENT) {
 
         @Override
-        protected Group start() throws SAXException {
-            final Group group = new Group(this.getParentObject());
+        protected Group start() {
+            final Folder folder = getParentObject();
+            final Group group = new Group(folder);
 
             String differenceProperty = this.readAttribute(DIFFERENCE_PROPERTY);
             Parser.this.differenceEncoding.put(group, (differenceProperty != null && (differenceProperty.equals("1") || differenceProperty.equals("true"))));
@@ -141,13 +334,11 @@ public class Parser implements GraphParser {
                 monitor.setState(group.getName());
             }
 
-            final Folder parent = getParentObject();
-            if (groupCallback == null || parent instanceof Group) {
-                Runnable addToParent = () -> parent.addElement(group);
+            if (callbackDocument == null || folder instanceof Group) {
                 if (invokeLater) {
-                    SwingUtilities.invokeLater(addToParent);
+                    SwingUtilities.invokeLater(() -> folder.addElement(group));
                 } else {
-                    addToParent.run();
+                    folder.addElement(group);
                 }
             }
 
@@ -155,62 +346,20 @@ public class Parser implements GraphParser {
         }
 
         @Override
-        protected void end(String text) throws SAXException {
-        }
-    };
-    // <method>
-    private ElementHandler<InputMethod, Group> methodHandler = new XMLParser.ElementHandler<InputMethod, Group>(METHOD_ELEMENT) {
-
-        @Override
-        protected InputMethod start() throws SAXException {
-
-            InputMethod method = parseMethod(this, getParentObject());
-            getParentObject().setMethod(method);
-            return method;
-        }
-    };
-
-    private InputMethod parseMethod(XMLParser.ElementHandler<?,?> handler, Group group) throws SAXException {
-        String s = handler.readRequiredAttribute(METHOD_BCI_PROPERTY);
-        int bci = 0;
-        try {
-            bci = Integer.parseInt(s);
-        } catch (NumberFormatException e) {
-            throw new SAXException(e);
-        }
-        InputMethod method = new InputMethod(group, handler.readRequiredAttribute(METHOD_NAME_PROPERTY), handler.readRequiredAttribute(METHOD_SHORT_NAME_PROPERTY), bci);
-        return method;
-    }
-    // <bytecodes>
-    private HandoverElementHandler<InputMethod> bytecodesHandler = new XMLParser.HandoverElementHandler<InputMethod>(BYTECODES_ELEMENT, true) {
-
-        @Override
-        protected void end(String text) throws SAXException {
-            getParentObject().setBytecodes(text);
-        }
-    };
-    // <inlined>
-    private HandoverElementHandler<InputMethod> inlinedHandler = new XMLParser.HandoverElementHandler<>(INLINE_ELEMENT);
-    // <inlined><method>
-    private ElementHandler<InputMethod, InputMethod> inlinedMethodHandler = new XMLParser.ElementHandler<InputMethod, InputMethod>(METHOD_ELEMENT) {
-
-        @Override
-        protected InputMethod start() throws SAXException {
-            InputMethod method = parseMethod(this, getParentObject().getGroup());
-            getParentObject().addInlined(method);
-            return method;
+        protected void end(String text) {
         }
     };
     // <graph>
-    private ElementHandler<InputGraph, Group> graphHandler = new XMLParser.ElementHandler<InputGraph, Group>(GRAPH_ELEMENT) {
+    private final ElementHandler<InputGraph, Group> graphHandler = new XMLParser.ElementHandler<>(GRAPH_ELEMENT) {
 
         @Override
-        protected InputGraph start() throws SAXException {
+        protected InputGraph start() {
+            Group group = getParentObject();
             String name = readAttribute(GRAPH_NAME_PROPERTY);
             InputGraph curGraph = new InputGraph(name);
-            if (differenceEncoding.get(getParentObject())) {
-                InputGraph previous = lastParsedGraph.get(getParentObject());
-                lastParsedGraph.put(getParentObject(), curGraph);
+            if (differenceEncoding.get(group)) {
+                InputGraph previous = lastParsedGraph.get(group);
+                lastParsedGraph.put(group, curGraph);
                 if (previous != null) {
                     for (InputNode n : previous.getNodes()) {
                         curGraph.addNode(n);
@@ -228,8 +377,8 @@ public class Parser implements GraphParser {
         }
 
         @Override
-        protected void end(String text) throws SAXException {
-            // NOTE: Some graphs intentionally don't provide blocks. Instead
+        protected void end(String text) {
+            // NOTE: Some graphs intentionally don't provide blocks. Instead,
             //       they later generate the blocks from other information such
             //       as node properties (example: ServerCompilerScheduler).
             //       Thus, we shouldn't assign nodes that don't belong to any
@@ -237,11 +386,12 @@ public class Parser implements GraphParser {
             //       defined and nodes are assigned to them.
 
             final InputGraph graph = getObject();
+
             final Group parent = getParentObject();
-            if (graph.getBlocks().size() > 0) {
+            if (!graph.getBlocks().isEmpty()) {
                 boolean blocksContainNodes = false;
                 for (InputBlock b : graph.getBlocks()) {
-                    if (b.getNodes().size() > 0) {
+                    if (!b.getNodes().isEmpty()) {
                         blocksContainNodes = true;
                         break;
                     }
@@ -252,7 +402,7 @@ public class Parser implements GraphParser {
                     blockConnections.clear();
                 } else {
                     // Blocks and their nodes defined: add other nodes to an
-                    //  artificial "no block" block
+                    // artificial "no block" block
                     InputBlock noBlock = null;
                     for (InputNode n : graph.getNodes()) {
                         if (graph.getBlock(n) == null) {
@@ -278,97 +428,154 @@ public class Parser implements GraphParser {
             }
             blockConnections.clear();
 
-            Runnable addToParent = () -> parent.addElement(graph);
             if (invokeLater) {
-                SwingUtilities.invokeLater(addToParent);
+                SwingUtilities.invokeLater(() -> parent.addElement(graph));
             } else {
-                addToParent.run();
+                parent.addElement(graph);
+            }
+            if (contextAction != null) {
+                for (GraphContext ctx : contexts) {
+                    contextAction.performAction(ctx);
+                }
+            }
+            contexts.clear();
+        }
+    };
+    // <properties>
+    private final HandoverElementHandler<Group> groupPropertiesHandler = new HandoverElementHandler<>(PROPERTIES_ELEMENT) {
+
+        @Override
+        public void end(String text) {
+            final Group group = getParentObject();
+            if (callbackDocument != null && group.getParent() instanceof GraphDocument) {
+                group.setParent(callbackDocument);
+                if (invokeLater) {
+                    SwingUtilities.invokeLater(() -> callbackDocument.addElement(group));
+                } else {
+                    callbackDocument.addElement(group);
+                }
             }
         }
     };
-    // <nodes>
-    private HandoverElementHandler<InputGraph> nodesHandler = new HandoverElementHandler<>(NODES_ELEMENT);
-    // <controlFlow>
-    private HandoverElementHandler<InputGraph> controlFlowHandler = new HandoverElementHandler<>(CONTROL_FLOW_ELEMENT);
-    // <block>
-    private ElementHandler<InputBlock, InputGraph> blockHandler = new ElementHandler<InputBlock, InputGraph>(BLOCK_ELEMENT) {
 
-        @Override
-        protected InputBlock start() throws SAXException {
-            InputGraph graph = getParentObject();
-            String name = readRequiredAttribute(BLOCK_NAME_PROPERTY);
-            InputBlock b = graph.addBlock(name);
-            for (InputNode n : b.getNodes()) {
-                assert graph.getBlock(n).equals(b);
+    public Parser(ReadableByteChannel channel, ParseMonitor monitor, GraphDocument callbackDocument, GraphContextAction contextAction) {
+        this.callbackDocument = callbackDocument;
+        this.contextAction = contextAction;
+        this.monitor = monitor;
+        this.channel = channel;
+
+        // Initialize dependencies
+        xmlData.addChild(topHandler);
+        topHandler.addChild(groupHandler);
+
+        groupHandler.addChild(methodHandler);
+        groupHandler.addChild(graphHandler);
+        groupHandler.addChild(groupHandler);
+
+        methodHandler.addChild(inlinedHandler);
+        methodHandler.addChild(bytecodesHandler);
+
+        inlinedHandler.addChild(inlinedMethodHandler);
+        inlinedMethodHandler.addChild(bytecodesHandler);
+        inlinedMethodHandler.addChild(inlinedHandler);
+
+        graphHandler.addChild(nodesHandler);
+        graphHandler.addChild(edgesHandler);
+        graphHandler.addChild(controlFlowHandler);
+        graphHandler.addChild(graphStatesHandler);
+
+        controlFlowHandler.addChild(blockHandler);
+
+        graphStatesHandler.addChild(stateHandler);
+        stateHandler.addChild(differenceHandler);
+        stateHandler.addChild(visibleNodesHandler);
+        visibleNodesHandler.addChild(visibleNodeHandler);
+
+        blockHandler.addChild(successorsHandler);
+        successorsHandler.addChild(successorHandler);
+        blockHandler.addChild(blockNodesHandler);
+        blockNodesHandler.addChild(blockNodeHandler);
+
+        nodesHandler.addChild(nodeHandler);
+        nodesHandler.addChild(removeNodeHandler);
+        edgesHandler.addChild(edgeHandler);
+        edgesHandler.addChild(removeEdgeHandler);
+
+        methodHandler.addChild(propertiesHandler);
+        inlinedMethodHandler.addChild(propertiesHandler);
+        topHandler.addChild(propertiesHandler);
+        groupHandler.addChild(groupPropertiesHandler);
+        graphHandler.addChild(propertiesHandler);
+        nodeHandler.addChild(propertiesHandler);
+        propertiesHandler.addChild(propertyHandler);
+        groupPropertiesHandler.addChild(propertyHandler);
+    }
+
+    private int lookupID(String i) {
+        try {
+            return Integer.parseInt(i);
+        } catch (NumberFormatException nfe) {
+            // ignore
+        }
+        Integer id = idCache.get(i);
+        if (id == null) {
+            id = maxId++;
+            idCache.put(i, id);
+        }
+        return id;
+    }
+
+    private InputMethod parseMethod(XMLParser.ElementHandler<?, ?> handler, Group group) throws SAXException {
+        String s = handler.readRequiredAttribute(METHOD_BCI_PROPERTY);
+        int bci;
+        try {
+            bci = Integer.parseInt(s);
+        } catch (NumberFormatException e) {
+            throw new SAXException(e);
+        }
+        return new InputMethod(group, handler.readRequiredAttribute(METHOD_NAME_PROPERTY), handler.readRequiredAttribute(METHOD_SHORT_NAME_PROPERTY), bci);
+    }
+
+    // Returns a new GraphDocument object deserialized from an XML input source.
+    @Override
+    public GraphDocument parse() throws IOException {
+        if (monitor != null) {
+            monitor.setState("Starting parsing");
+        }
+        try {
+            XMLReader reader = createReader();
+            // To enforce using English for non-English users, we must use Locale.ROOT rather than Locale.ENGLISH
+            reader.setProperty("http://apache.org/xml/properties/locale", Locale.ROOT);
+            reader.setContentHandler(new XMLParser(xmlData, monitor));
+            reader.parse(new InputSource(Channels.newInputStream(channel)));
+        } catch (SAXException ex) {
+            if (!(ex instanceof SAXParseException) || !"XML document structures must start and end within the same entity.".equals(ex.getMessage())) {
+                throw new IOException(ex);
             }
-            return b;
         }
-    };
-    // <nodes>
-    private HandoverElementHandler<InputBlock> blockNodesHandler = new HandoverElementHandler<>(NODES_ELEMENT);
-    // <node>
-    private ElementHandler<InputBlock, InputBlock> blockNodeHandler = new ElementHandler<InputBlock, InputBlock>(NODE_ELEMENT) {
-
-        @Override
-        protected InputBlock start() throws SAXException {
-            String s = readRequiredAttribute(NODE_ID_PROPERTY);
-
-            int id = 0;
-            try {
-                id = lookupID(s);
-            } catch (NumberFormatException e) {
-                throw new SAXException(e);
-            }
-            getParentObject().addNode(id);
-            return getParentObject();
+        if (monitor != null) {
+            monitor.setState("Finished parsing");
         }
-    };
-    // <successors>
-    private HandoverElementHandler<InputBlock> successorsHandler = new HandoverElementHandler<>(SUCCESSORS_ELEMENT);
-    // <successor>
-    private ElementHandler<InputBlock, InputBlock> successorHandler = new ElementHandler<InputBlock, InputBlock>(SUCCESSOR_ELEMENT) {
 
-        @Override
-        protected InputBlock start() throws SAXException {
-            String name = readRequiredAttribute(BLOCK_NAME_PROPERTY);
-            blockConnections.add(new Pair<>(getParentObject().getName(), name));
-            return getParentObject();
-        }
-    };
-    // <node>
-    private ElementHandler<InputNode, InputGraph> nodeHandler = new ElementHandler<InputNode, InputGraph>(NODE_ELEMENT) {
+        return graphDocument;
+    }
 
-        @Override
-        protected InputNode start() throws SAXException {
-            String s = readRequiredAttribute(NODE_ID_PROPERTY);
-            int id = 0;
-            try {
-                id = lookupID(s);
-            } catch (NumberFormatException e) {
-                throw new SAXException(e);
-            }
-            InputNode node = new InputNode(id);
-            getParentObject().addNode(node);
-            return node;
-        }
-    };
-    // <removeNode>
-    private ElementHandler<InputNode, InputGraph> removeNodeHandler = new ElementHandler<InputNode, InputGraph>(REMOVE_NODE_ELEMENT) {
+    // Whether the parser is allowed to defer connecting the parsed elements.
+    // Setting to false is useful for synchronization in unit tests.
+    public void setInvokeLater(boolean invokeLater) {
+        this.invokeLater = invokeLater;
+    }
 
-        @Override
-        protected InputNode start() throws SAXException {
-            String s = readRequiredAttribute(NODE_ID_PROPERTY);
-            int id = 0;
-            try {
-                id = lookupID(s);
-            } catch (NumberFormatException e) {
-                throw new SAXException(e);
-            }
-            return getParentObject().removeNode(id);
+    private XMLReader createReader() throws SAXException {
+        try {
+            SAXParserFactory pFactory = SAXParserFactory.newInstance();
+            pFactory.setValidating(false);
+            pFactory.setNamespaceAware(true);
+            return pFactory.newSAXParser().getXMLReader();
+        } catch (ParserConfigurationException ex) {
+            throw new SAXException(ex);
         }
-    };
-    // <graph>
-    private HandoverElementHandler<InputGraph> edgesHandler = new HandoverElementHandler<>(EDGES_ELEMENT);
+    }
 
     // Local class for edge elements
     private class EdgeElementHandler extends ElementHandler<InputEdge, InputGraph> {
@@ -381,10 +588,10 @@ public class Parser implements GraphParser {
         protected InputEdge start() throws SAXException {
             int fromIndex = 0;
             int toIndex = 0;
-            int from = -1;
-            int to = -1;
-            String label = null;
-            String type = null;
+            int from;
+            int to;
+            String label;
+            String type;
 
             try {
                 String fromIndexString = readAttribute(FROM_INDEX_PROPERTY);
@@ -413,148 +620,8 @@ public class Parser implements GraphParser {
             return start(conn);
         }
 
-        protected InputEdge start(InputEdge conn) throws SAXException {
+        protected InputEdge start(InputEdge conn) {
             return conn;
         }
     }
-    // <edge>
-    private EdgeElementHandler edgeHandler = new EdgeElementHandler(EDGE_ELEMENT) {
-
-        @Override
-        protected InputEdge start(InputEdge conn) throws SAXException {
-            getParentObject().addEdge(conn);
-            return conn;
-        }
-    };
-    // <removeEdge>
-    private EdgeElementHandler removeEdgeHandler = new EdgeElementHandler(REMOVE_EDGE_ELEMENT) {
-
-        @Override
-        protected InputEdge start(InputEdge conn) throws SAXException {
-            getParentObject().removeEdge(conn);
-            return conn;
-        }
-    };
-    // <properties>
-    private HandoverElementHandler<Properties.Provider> propertiesHandler = new HandoverElementHandler<>(PROPERTIES_ELEMENT);
-    // <properties>
-    private HandoverElementHandler<Group> groupPropertiesHandler = new HandoverElementHandler<Group>(PROPERTIES_ELEMENT) {
-
-        @Override
-        public void end(String text) throws SAXException {
-            if (groupCallback != null && getParentObject().getParent() instanceof GraphDocument) {
-                final Group group = getParentObject();
-                Runnable addStarted = () -> groupCallback.started(group);
-                if (invokeLater) {
-                    SwingUtilities.invokeLater(addStarted);
-                } else {
-                    addStarted.run();
-                }
-            }
-        }
-    };
-    // <property>
-    private ElementHandler<String, Properties.Provider> propertyHandler = new XMLParser.ElementHandler<String, Properties.Provider>(PROPERTY_ELEMENT, true) {
-
-        @Override
-        public String start() throws SAXException {
-            return readRequiredAttribute(PROPERTY_NAME_PROPERTY);
-         }
-
-        @Override
-        public void end(String text) {
-            getParentObject().getProperties().setProperty(getObject(), text.trim());
-        }
-    };
-
-    public Parser(ReadableByteChannel channel) {
-        this(channel, null, null);
-    }
-
-    public Parser(ReadableByteChannel channel, ParseMonitor monitor, GroupCallback groupCallback) {
-
-        this.groupCallback = groupCallback;
-        this.monitor = monitor;
-        this.channel = channel;
-
-        // Initialize dependencies
-        xmlDocument.addChild(topHandler);
-        topHandler.addChild(groupHandler);
-
-        groupHandler.addChild(methodHandler);
-        groupHandler.addChild(graphHandler);
-        groupHandler.addChild(groupHandler);
-
-        methodHandler.addChild(inlinedHandler);
-        methodHandler.addChild(bytecodesHandler);
-
-        inlinedHandler.addChild(inlinedMethodHandler);
-        inlinedMethodHandler.addChild(bytecodesHandler);
-        inlinedMethodHandler.addChild(inlinedHandler);
-
-        graphHandler.addChild(nodesHandler);
-        graphHandler.addChild(edgesHandler);
-        graphHandler.addChild(controlFlowHandler);
-
-        controlFlowHandler.addChild(blockHandler);
-
-        blockHandler.addChild(successorsHandler);
-        successorsHandler.addChild(successorHandler);
-        blockHandler.addChild(blockNodesHandler);
-        blockNodesHandler.addChild(blockNodeHandler);
-
-        nodesHandler.addChild(nodeHandler);
-        nodesHandler.addChild(removeNodeHandler);
-        edgesHandler.addChild(edgeHandler);
-        edgesHandler.addChild(removeEdgeHandler);
-
-        methodHandler.addChild(propertiesHandler);
-        inlinedMethodHandler.addChild(propertiesHandler);
-        topHandler.addChild(propertiesHandler);
-        groupHandler.addChild(groupPropertiesHandler);
-        graphHandler.addChild(propertiesHandler);
-        nodeHandler.addChild(propertiesHandler);
-        propertiesHandler.addChild(propertyHandler);
-        groupPropertiesHandler.addChild(propertyHandler);
-    }
-
-    // Returns a new GraphDocument object deserialized from an XML input source.
-    @Override
-    public GraphDocument parse() throws IOException {
-        if (monitor != null) {
-            monitor.setState("Starting parsing");
-        }
-        try {
-            XMLReader reader = createReader();
-            // To enforce using English for non-English users, we must use Locale.ROOT rather than Locale.ENGLISH
-            reader.setProperty("http://apache.org/xml/properties/locale", Locale.ROOT);
-            reader.setContentHandler(new XMLParser(xmlDocument, monitor));
-            reader.parse(new InputSource(Channels.newInputStream(channel)));
-        } catch (SAXException ex) {
-            if (!(ex instanceof SAXParseException) || !"XML document structures must start and end within the same entity.".equals(ex.getMessage())) {
-                throw new IOException(ex);
-            }
-        }
-        if (monitor != null) {
-            monitor.setState("Finished parsing");
-        }
-        return graphDocument;
-    }
-
-    // Whether the parser is allowed to defer connecting the parsed elements.
-    // Setting to false is useful for synchronization in unit tests.
-    public void setInvokeLater(boolean invokeLater) {
-        this.invokeLater = invokeLater;
-    }
-
-    private XMLReader createReader() throws SAXException {
-        try {
-            SAXParserFactory pfactory = SAXParserFactory.newInstance();
-            pfactory.setValidating(false);
-            pfactory.setNamespaceAware(true);
-            return pfactory.newSAXParser().getXMLReader();
-        } catch (ParserConfigurationException ex) {
-            throw new SAXException(ex);
-        }
-    }
 }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java
index eb3f1451703..f930e478776 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,13 @@ package com.sun.hotspot.igv.data.serialization;
 
 import com.sun.hotspot.igv.data.*;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.Writer;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -36,76 +39,47 @@ import java.util.Set;
  */
 public class Printer {
 
-    private final InputStream in;
-
-    public Printer() {
-        this(null);
-    }
-
-    public Printer(InputStream inputStream) {
-        this.in = inputStream;
-    }
-
-    public void export(Writer writer, GraphDocument document) {
-
+    public static void exportGraphDocument(Writer writer, Folder folder, List<GraphContext> contexts) {
         XMLWriter xmlWriter = new XMLWriter(writer);
-
         try {
-            export(xmlWriter, document);
+            xmlWriter.startTag(Parser.ROOT_ELEMENT);
+            xmlWriter.writeProperties(folder.getProperties());
+            for (FolderElement e : folder.getElements()) {
+                if (e instanceof Group group) {
+                    exportGroup(xmlWriter, group, contexts);
+                } else if (e instanceof InputGraph graph) {
+                    exportInputGraph(xmlWriter, graph, null, false, contexts);
+                }
+            }
+            xmlWriter.endTag();
+            xmlWriter.flush();
         } catch (IOException ignored) {}
     }
 
-    private void export(XMLWriter xmlWriter, GraphDocument document) throws IOException {
-        xmlWriter.startTag(Parser.ROOT_ELEMENT);
-        xmlWriter.writeProperties(document.getProperties());
-        for (FolderElement e : document.getElements()) {
-            if (e instanceof Group) {
-                export(xmlWriter, (Group) e);
-            } else if (e instanceof InputGraph) {
-                export(xmlWriter, (InputGraph)e, null, false);
-            }
-        }
-
-        xmlWriter.endTag();
-        xmlWriter.flush();
-    }
-
-    private void export(XMLWriter writer, Group g) throws IOException {
+    private static void exportGroup(XMLWriter writer, Group g, List<GraphContext> contexts) throws IOException {
         Properties attributes = new Properties();
         attributes.setProperty("difference", Boolean.toString(true));
         writer.startTag(Parser.GROUP_ELEMENT, attributes);
         writer.writeProperties(g.getProperties());
 
-        boolean shouldExport = true;
-        if (in != null) {
-            char c = (char) in.read();
-            if (c != 'y') {
-                shouldExport = false;
-            }
+        if (g.getMethod() != null) {
+            exportInputMethod(writer, g.getMethod());
         }
 
-        if (shouldExport) {
-            if (g.getMethod() != null) {
-                export(writer, g.getMethod());
-            }
-
-            InputGraph previous = null;
-            for (FolderElement e : g.getElements()) {
-                if (e instanceof InputGraph) {
-                    InputGraph graph = (InputGraph) e;
-                    export(writer, graph, previous, true);
-                    previous = graph;
-                } else if (e instanceof Group) {
-                    export(writer, (Group) e);
-                }
+        InputGraph previous = null;
+        for (FolderElement e : g.getElements()) {
+            if (e instanceof InputGraph graph) {
+                exportInputGraph(writer, graph, previous, true, contexts);
+                previous = graph;
+            } else if (e instanceof Group group) {
+                exportGroup(writer, group, contexts);
             }
         }
 
         writer.endTag();
     }
 
-    public void export(XMLWriter writer, InputGraph graph, InputGraph previous, boolean difference) throws IOException {
-
+    private static void exportInputGraph(XMLWriter writer, InputGraph graph, InputGraph previous, boolean difference, List<GraphContext> contexts) throws IOException {
         writer.startTag(Parser.GRAPH_ELEMENT);
         writer.writeProperties(graph.getProperties());
         writer.startTag(Parser.NODES_ELEMENT);
@@ -135,11 +109,11 @@ public class Printer {
             if (!difference || !equal.contains(n)) {
                 writer.startTag(Parser.NODE_ELEMENT, new Properties(Parser.NODE_ID_PROPERTY, Integer.toString(n.getId())));
                 writer.writeProperties(n.getProperties());
-                writer.endTag();
+                writer.endTag(); // Parser.NODE_ELEMENT
             }
         }
 
-        writer.endTag();
+        writer.endTag(); // Parser.NODES_ELEMENT
 
         writer.startTag(Parser.EDGES_ELEMENT);
         Set<InputEdge> removedEdges = new HashSet<>();
@@ -169,45 +143,78 @@ public class Printer {
             }
         }
 
-        writer.endTag();
+        writer.endTag(); // Parser.EDGES_ELEMENT
 
         writer.startTag(Parser.CONTROL_FLOW_ELEMENT);
         for (InputBlock b : graph.getBlocks()) {
             writer.startTag(Parser.BLOCK_ELEMENT, new Properties(Parser.BLOCK_NAME_PROPERTY, b.getName()));
 
-            if (b.getSuccessors().size() > 0) {
+            if (!b.getSuccessors().isEmpty()) {
                 writer.startTag(Parser.SUCCESSORS_ELEMENT);
                 for (InputBlock s : b.getSuccessors()) {
                     writer.simpleTag(Parser.SUCCESSOR_ELEMENT, new Properties(Parser.BLOCK_NAME_PROPERTY, s.getName()));
                 }
-                writer.endTag();
+                writer.endTag(); // Parser.SUCCESSORS_ELEMENT
             }
 
-            if (b.getNodes().size() > 0) {
-            writer.startTag(Parser.NODES_ELEMENT);
+            if (!b.getNodes().isEmpty()) {
+                writer.startTag(Parser.NODES_ELEMENT);
                 for (InputNode n : b.getNodes()) {
                     writer.simpleTag(Parser.NODE_ELEMENT, new Properties(Parser.NODE_ID_PROPERTY, n.getId() + ""));
                 }
-                writer.endTag();
+                writer.endTag(); // Parser.NODES_ELEMENT
             }
 
-            writer.endTag();
+            writer.endTag(); // Parser.BLOCK_ELEMENT
         }
 
-        writer.endTag();
-        writer.endTag();
+        writer.endTag(); // Parser.CONTROL_FLOW_ELEMENT
+
+        exportStates(writer, graph, contexts);
+
+        writer.endTag(); // Parser.GRAPH_ELEMENT
     }
 
-    private void export(XMLWriter w, InputMethod method) throws IOException {
+    private static void exportStates(XMLWriter writer, InputGraph exportingGraph, List<GraphContext> contexts) throws IOException {
+        List<GraphContext> contextsContainingGraph = contexts.stream()
+                .filter(context -> context.inputGraph().equals(exportingGraph))
+                .toList();
 
+        if (contextsContainingGraph.isEmpty()) {
+            return;
+        }
+
+        writer.startTag(Parser.GRAPH_STATES_ELEMENT);
+
+        for (GraphContext context : contextsContainingGraph) {
+            assert exportingGraph == context.inputGraph();
+
+            writer.startTag(Parser.STATE_ELEMENT);
+
+            writer.simpleTag(Parser.STATE_POSITION_DIFFERENCE,
+                    new Properties(Parser.POSITION_DIFFERENCE_PROPERTY, Integer.toString(context.posDiff().get())));
+
+            writer.startTag(Parser.VISIBLE_NODES_ELEMENT, new Properties(Parser.ALL_PROPERTY, Boolean.toString(context.showAll().get())));
+            for (Integer hiddenNodeID : context.visibleNodes()) {
+                writer.simpleTag(Parser.NODE_ELEMENT, new Properties(Parser.NODE_ID_PROPERTY, hiddenNodeID.toString()));
+            }
+            writer.endTag(); // Parser.VISIBLE_NODES_ELEMENT
+
+            writer.endTag(); // Parser.STATES_ELEMENT
+        }
+
+        writer.endTag(); // Parser.GRAPH_STATE_ELEMENT
+    }
+
+    private static void exportInputMethod(XMLWriter w, InputMethod method) throws IOException {
         w.startTag(Parser.METHOD_ELEMENT, new Properties(Parser.METHOD_BCI_PROPERTY, method.getBci() + "", Parser.METHOD_NAME_PROPERTY, method.getName(), Parser.METHOD_SHORT_NAME_PROPERTY, method.getShortName()));
 
         w.writeProperties(method.getProperties());
 
-        if (method.getInlined().size() > 0) {
+        if (!method.getInlined().isEmpty()) {
             w.startTag(Parser.INLINE_ELEMENT);
             for (InputMethod m : method.getInlined()) {
-                export(w, m);
+                exportInputMethod(w, m);
             }
             w.endTag();
         }
@@ -229,7 +236,7 @@ public class Printer {
         w.endTag();
     }
 
-    private Properties createProperties(InputEdge edge) {
+    private static Properties createProperties(InputEdge edge) {
         Properties p = new Properties();
         if (edge.getToIndex() != 0) {
             p.setProperty(Parser.TO_INDEX_PROPERTY, Integer.toString(edge.getToIndex()));
@@ -242,4 +249,10 @@ public class Printer {
         p.setProperty(Parser.TYPE_PROPERTY, edge.getType());
         return p;
     }
+
+    public record GraphContext(InputGraph inputGraph, AtomicInteger posDiff, Set<Integer> visibleNodes, AtomicBoolean showAll) { }
+
+    public interface GraphContextAction {
+        void performAction(GraphContext context);
+    }
 }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GraphViewer.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GraphViewer.java
index ebaa03df282..3cef9c4fc95 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GraphViewer.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GraphViewer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ import com.sun.hotspot.igv.data.InputGraph;
  */
 public interface GraphViewer {
 
-    void view(InputGraph graph, boolean newTab);
+    InputGraph view(InputGraph graph, boolean newTab);
 
-    void viewDifference(InputGraph firstGraph, InputGraph secondGraph);
+    InputGraph viewDifference(InputGraph firstGraph, InputGraph secondGraph);
 }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GroupCallback.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GroupCallback.java
deleted file mode 100644
index b35f3eabf89..00000000000
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GroupCallback.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.hotspot.igv.data.services;
-
-import com.sun.hotspot.igv.data.Group;
-
-/**
- *
- * @author Thomas Wuerthinger
- */
-public interface GroupCallback {
-
-    public void started(Group g);
-}
diff --git a/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/serialization/ParserTest.java b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/serialization/ParserTest.java
index 43426046448..9788ee4443c 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/serialization/ParserTest.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/test/java/com/sun/hotspot/igv/data/serialization/ParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.Channels;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import java.util.ArrayList;
+import java.util.HashSet;
 import org.junit.*;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -62,19 +64,18 @@ public class ParserTest {
     }
 
     private void test(GraphDocument document) {
-        final Printer printer = new Printer();
         final CharArrayWriter writer = new CharArrayWriter();
-        printer.export(writer, document);
+        Printer.exportGraphDocument(writer, document, new ArrayList<>());
         test(document, writer.toString());
     }
 
     private void test(GraphDocument document, String xmlString) {
         InputStream in = new ByteArrayInputStream(xmlString.getBytes(UTF_8));
         try {
-            Parser parser = new Parser(Channels.newChannel(in));
+            Parser parser = new Parser(Channels.newChannel(in), null, null, null);
             parser.setInvokeLater(false);
-            final GraphDocument parsedDocument = parser.parse();
-            Util.assertGraphDocumentEquals(document, parsedDocument);
+            final GraphDocument exportData = parser.parse();
+            Util.assertGraphDocumentEquals(document, exportData);
         } catch (IOException ex) {
             fail(ex.toString());
         }
diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Client.java b/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Client.java
deleted file mode 100644
index 2f4b6cff0db..00000000000
--- a/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Client.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2012, 2022, 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 com.sun.hotspot.igv.connection;
-
-import com.sun.hotspot.igv.data.serialization.Parser;
-import com.sun.hotspot.igv.data.services.GroupCallback;
-import java.io.IOException;
-import java.nio.channels.SocketChannel;
-import org.openide.util.Exceptions;
-
-public class Client implements Runnable {
-    private final SocketChannel socket;
-    private final GroupCallback callback;
-
-    public Client(SocketChannel socket, GroupCallback callback) {
-        this.callback = callback;
-        this.socket = socket;
-    }
-
-    @Override
-    public void run() {
-
-        try {
-            final SocketChannel channel = socket;
-            channel.configureBlocking(true);
-            channel.socket().getOutputStream().write('y');
-            new Parser(channel, null, callback).parse();
-        } catch (IOException ex) {
-            Exceptions.printStackTrace(ex);
-        } finally {
-            try {
-                socket.close();
-            } catch (IOException ex) {
-                Exceptions.printStackTrace(ex);
-            }
-        }
-    }
-}
diff --git a/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Server.java b/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Server.java
index 523f4d2017d..a507c568be2 100644
--- a/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Server.java
+++ b/src/utils/IdealGraphVisualizer/NetworkConnection/src/main/java/com/sun/hotspot/igv/connection/Server.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,9 @@
  */
 package com.sun.hotspot.igv.connection;
 
-import com.sun.hotspot.igv.data.services.GroupCallback;
+import com.sun.hotspot.igv.data.GraphDocument;
+import com.sun.hotspot.igv.data.serialization.Parser;
+import com.sun.hotspot.igv.data.serialization.Printer.GraphContextAction;
 import com.sun.hotspot.igv.settings.Settings;
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -32,9 +34,6 @@ import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.util.prefs.PreferenceChangeEvent;
 import java.util.prefs.PreferenceChangeListener;
-import org.openide.DialogDisplayer;
-import org.openide.NotifyDescriptor;
-import org.openide.util.RequestProcessor;
 
 /**
  *
@@ -42,13 +41,16 @@ import org.openide.util.RequestProcessor;
  */
 public class Server implements PreferenceChangeListener {
     private ServerSocketChannel serverSocket;
-    private final GroupCallback callback;
+    private final GraphDocument graphDocument;
+    private final GraphContextAction contextAction;
     private int port;
-    private Runnable serverRunnable;
 
-    public Server(GroupCallback callback) {
-        this.callback = callback;
-        initializeNetwork();
+    private volatile boolean isServerRunning;
+
+    public Server(GraphDocument graphDocument, GraphContextAction contextAction) {
+        this.graphDocument = graphDocument;
+        this.contextAction = contextAction;
+        port = Integer.parseInt(Settings.get().get(Settings.PORT, Settings.PORT_DEFAULT));
         Settings.get().addPreferenceChangeListener(this);
     }
 
@@ -56,46 +58,65 @@ public class Server implements PreferenceChangeListener {
     public void preferenceChange(PreferenceChangeEvent e) {
         int curPort = Integer.parseInt(Settings.get().get(Settings.PORT, Settings.PORT_DEFAULT));
         if (curPort != port) {
-            initializeNetwork();
+            port = curPort;
+            shutdownServer();
+            startServer();
         }
     }
 
-    private void initializeNetwork() {
-        int curPort = Integer.parseInt(Settings.get().get(Settings.PORT, Settings.PORT_DEFAULT));
-        this.port = curPort;
+    public void startServer() {
+        isServerRunning = true;
+
         try {
             serverSocket = ServerSocketChannel.open();
-            serverSocket.bind(new InetSocketAddress(curPort));
-        } catch (Throwable ex) {
-            NotifyDescriptor message = new NotifyDescriptor.Message("Could not create server. Listening for incoming data is disabled.", NotifyDescriptor.ERROR_MESSAGE);
-            DialogDisplayer.getDefault().notifyLater(message);
+            serverSocket.bind(new InetSocketAddress(port));
+        } catch (IOException ex) {
+            ex.printStackTrace();
             return;
         }
 
-        Runnable runnable = new Runnable() {
-
-            @Override
-            public void run() {
-                while (true) {
-                    try {
-                        SocketChannel clientSocket = serverSocket.accept();
-                        if (serverRunnable != this) {
-                            clientSocket.close();
-                            return;
-                        }
-                        RequestProcessor.getDefault().post(new Client(clientSocket, callback), 0, Thread.MAX_PRIORITY);
-                    } catch (IOException ex) {
-                        serverSocket = null;
-                        NotifyDescriptor message = new NotifyDescriptor.Message("Error during listening for incoming connections. Listening for incoming data is disabled.", NotifyDescriptor.ERROR_MESSAGE);
-                        DialogDisplayer.getDefault().notifyLater(message);
+        Runnable client = () -> {
+            while (isServerRunning) {
+                try {
+                    SocketChannel clientSocket = serverSocket.accept();
+                    if (!isServerRunning) {
+                        clientSocket.close();
                         return;
                     }
+                    new Thread(() -> {
+                        try (clientSocket) {
+                            clientSocket.configureBlocking(true);
+                            clientSocket.socket().getOutputStream().write('y');
+                            new Parser(clientSocket, null, graphDocument, contextAction).parse();
+                        } catch (IOException ignored) {}
+                    }).start();
+                } catch (IOException ex) {
+                    if (isServerRunning) {
+                        ex.printStackTrace();
+                    }
+                    return;
                 }
             }
+            try {
+                if (serverSocket != null) {
+                    serverSocket.close();
+                }
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
         };
 
-        serverRunnable = runnable;
+        new Thread(client).start();
+    }
 
-        RequestProcessor.getDefault().post(runnable, 0, Thread.MAX_PRIORITY);
+    public void shutdownServer() {
+        isServerRunning = false;
+        try {
+            if (serverSocket != null) {
+                serverSocket.close();
+            }
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
     }
 }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
index 23cd4a4360f..e47518de4a7 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
@@ -652,7 +652,7 @@ public class DiagramScene extends ObjectScene implements DiagramViewer, DoubleCl
                         Rectangle bounds = rootWidget.getBounds();
                         if (bounds != null) {
                             Point location = rootWidget.getLocation();
-                            centerRectangle(new Rectangle(location.x, location.y, bounds.width, bounds.height));
+                            centerRectangle(new Rectangle(location.x, location.y, bounds.width, bounds.height), false);
                         }
                     }
                 }
@@ -872,7 +872,7 @@ public class DiagramScene extends ObjectScene implements DiagramViewer, DoubleCl
     private void gotoBlock(final Block block) {
         BlockWidget bw = getWidget(block.getInputBlock());
         if (bw != null) {
-            centerRectangle(bw.getBounds());
+            centerRectangle(bw.getBounds(), true);
         }
     }
 
@@ -919,26 +919,28 @@ public class DiagramScene extends ObjectScene implements DiagramViewer, DoubleCl
             }
         }
         if (overallRect != null) {
-            centerRectangle(overallRect);
+            centerRectangle(overallRect, true);
         }
     }
 
-    private void centerRectangle(Rectangle r) {
+    private void centerRectangle(Rectangle r, boolean zoomToFit) {
         Rectangle rect = convertSceneToView(r);
         Rectangle viewRect = scrollPane.getViewport().getViewRect();
-
-        double factor = Math.min(viewRect.getWidth() / rect.getWidth(),  viewRect.getHeight() / rect.getHeight());
-        double zoomFactor = getZoomFactor();
-        double newZoomFactor = zoomFactor * factor;
-        if (factor < 1.0 || zoomFactor < 1.0) {
-            newZoomFactor = Math.min(1.0, newZoomFactor);
-            centredZoom(newZoomFactor, null);
-            factor = newZoomFactor / zoomFactor;
-            rect.x *= factor;
-            rect.y *= factor;
-            rect.width *= factor;
-            rect.height *= factor;
+        if (zoomToFit) {
+            double factor = Math.min(viewRect.getWidth() / rect.getWidth(),  viewRect.getHeight() / rect.getHeight());
+            double zoomFactor = getZoomFactor();
+            double newZoomFactor = zoomFactor * factor;
+            if (factor < 1.0 || zoomFactor < 1.0) {
+                newZoomFactor = Math.min(1.0, newZoomFactor);
+                centredZoom(newZoomFactor, null);
+                factor = newZoomFactor / zoomFactor;
+                rect.x *= factor;
+                rect.y *= factor;
+                rect.width *= factor;
+                rect.height *= factor;
+            }
         }
+
         viewRect.x = rect.x + rect.width / 2 - viewRect.width / 2;
         viewRect.y = rect.y + rect.height / 2 - viewRect.height / 2;
         // Ensure to be within area
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java
index f48e05ec6b9..6d7599e6d34 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java
@@ -332,6 +332,14 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
         final HashSet<Integer> allNodes = new HashSet<>(getGroup().getAllNodes());
         allNodes.removeAll(nodes);
         setHiddenNodes(allNodes);
+
+
+    }
+
+    public Set<Integer> getVisibleNodes() {
+        final Set<Integer> visibleNodes = new HashSet<>(getGraph().getNodesAsSet());
+        visibleNodes.removeAll(hiddenNodes);
+        return visibleNodes;
     }
 
     public void setHiddenNodes(Set<Integer> nodes) {
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
index 57d2b006ac0..617f59a591d 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,8 +125,7 @@ public final class EditorTopComponent extends TopComponent implements TopCompone
 
         Group group = diagramViewModel.getGroup();
         group.getChangedEvent().addListener(g -> closeOnRemovedOrEmptyGroup());
-        if (group.getParent() instanceof GraphDocument) {
-            final GraphDocument doc = (GraphDocument) group.getParent();
+        if (group.getParent() instanceof GraphDocument doc) {
             doc.getChangedEvent().addListener(d -> closeOnRemovedOrEmptyGroup());
         }
 
@@ -309,8 +308,7 @@ public final class EditorTopComponent extends TopComponent implements TopCompone
             l.add(m.getSelectedTopComponent());
             l.addAll(Arrays.asList(manager.getOpenedTopComponents(m)));
             for (TopComponent t : l) {
-                if (t instanceof EditorTopComponent) {
-                    EditorTopComponent etc = (EditorTopComponent) t;
+                if (t instanceof EditorTopComponent etc) {
                     if (etc.getModel().getGroup().getGraphs().contains(graph)) {
                         return etc;
                     }
@@ -320,17 +318,31 @@ public final class EditorTopComponent extends TopComponent implements TopCompone
         return null;
     }
 
+    public static void closeAllInstances() {
+        WindowManager manager = WindowManager.getDefault();
+        for (Mode mode : manager.getModes()) {
+            TopComponent[] openedTopComponents = manager.getOpenedTopComponents(mode);
+            for (TopComponent tc : openedTopComponents) {
+                if (tc instanceof EditorTopComponent etc) {
+                    etc.close();
+                }
+            }
+        }
+    }
+
     @Override
     public int getPersistenceType() {
         return TopComponent.PERSISTENCE_NEVER;
     }
 
     private void closeOnRemovedOrEmptyGroup() {
-        Group group = getModel().getGroup();
-        if (!group.getParent().getElements().contains(group) ||
-            group.getGraphs().isEmpty()) {
-            close();
-        }
+        SwingUtilities.invokeLater(() -> {
+            Group group = getModel().getGroup();
+            if (!group.getParent().getElements().contains(group) ||
+                    group.getGraphs().isEmpty()) {
+                close();
+            }
+        });
     }
 
     public void addSelectedNodes(Collection<InputNode> nodes, boolean showIfHidden) {
@@ -405,8 +417,7 @@ public final class EditorTopComponent extends TopComponent implements TopCompone
         WindowManager manager = WindowManager.getDefault();
         for (Mode m : manager.getModes()) {
             for (TopComponent topComponent : manager.getOpenedTopComponents(m)) {
-                if (topComponent instanceof EditorTopComponent) {
-                    EditorTopComponent editor = (EditorTopComponent) topComponent;
+                if (topComponent instanceof EditorTopComponent editor) {
                     editor.setBoldDisplayName(false);
                 }
             }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java
index d4b88135408..04e63ebbc5f 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@ package com.sun.hotspot.igv.view;
 import com.sun.hotspot.igv.data.InputGraph;
 import com.sun.hotspot.igv.data.services.GraphViewer;
 import com.sun.hotspot.igv.difference.Difference;
-import com.sun.hotspot.igv.graph.Diagram;
-import com.sun.hotspot.igv.settings.Settings;
 import org.openide.util.lookup.ServiceProvider;
 
 /**
@@ -38,33 +36,37 @@ import org.openide.util.lookup.ServiceProvider;
 public class GraphViewerImplementation implements GraphViewer {
 
     @Override
-    public void viewDifference(InputGraph firstGraph, InputGraph secondGraph) {
+    public InputGraph viewDifference(InputGraph firstGraph, InputGraph secondGraph) {
         if (firstGraph.getGroup() != secondGraph.getGroup()) {
             InputGraph diffGraph = Difference.createDiffGraph(firstGraph, secondGraph);
-            view(diffGraph, true);
+            return view(diffGraph, true);
         } else {
-            view(firstGraph, true);
-            EditorTopComponent etc = EditorTopComponent.findEditorForGraph(firstGraph);
-            if (etc != null) {
-                etc.getModel().selectDiffGraph(secondGraph);
-                etc.requestActive();
+            if (view(firstGraph, true) != null) {
+                EditorTopComponent etc = EditorTopComponent.findEditorForGraph(firstGraph);
+                if (etc != null) {
+                    etc.getModel().selectDiffGraph(secondGraph);
+                    etc.requestActive();
+                    return etc.getModel().getGraph();
+                }
             }
+            return null;
         }
     }
 
     @Override
-    public void view(InputGraph graph, boolean newTab) {
+    public InputGraph view(InputGraph graph, boolean newTab) {
         if (!newTab) {
             EditorTopComponent etc = EditorTopComponent.findEditorForGraph(graph);
             if (etc != null) {
                 etc.getModel().selectGraph(graph);
                 etc.requestActive();
-                return;
+                return etc.getModel().getGraph();
             }
         }
         DiagramViewModel model = new DiagramViewModel(graph);
         EditorTopComponent etc = new EditorTopComponent(model);
         etc.open();
         etc.requestActive();
+        return etc.getModel().getGraph();
     }
 }

From f713766cab649947e543f0290717e7bcc501f063 Mon Sep 17 00:00:00 2001
From: Renjith Kannath Pariyangad <rkannathpari@openjdk.org>
Date: Thu, 18 Apr 2024 13:32:35 +0000
Subject: [PATCH 102/486] 8329322: Convert PageFormat/Orient.java to use
 PassFailJFrame

Reviewed-by: abhiscxk, aivanov
---
 .../jdk/java/awt/print/PageFormat/Orient.java | 462 +++---------------
 1 file changed, 63 insertions(+), 399 deletions(-)

diff --git a/test/jdk/java/awt/print/PageFormat/Orient.java b/test/jdk/java/awt/print/PageFormat/Orient.java
index ea6facaf570..c23e3faf270 100644
--- a/test/jdk/java/awt/print/PageFormat/Orient.java
+++ b/test/jdk/java/awt/print/PageFormat/Orient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,64 +21,47 @@
  * questions.
  */
 
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.Ellipse2D;
+import java.awt.print.Book;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+
 /*
-  @test
-  @bug 4236095
-  @summary  Confirm that the you get three pages of output, one
-            each in portrait, landscape, and reverse landscape
-            orientations.
-  @key printer
-  @run main/manual Orient
-*/
-
-
-//*** global search and replace Orient with name of the test ***
-
-/**
- * Orient.java
- *
- * summary:
+ * @test
+ * @bug 4236095
+ * @summary  Confirm that you get three pages of output, one
+ *           each in portrait, landscape and reverse landscape
+ *           orientations.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @key printer
+ * @run main/manual Orient
  */
-
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-import java.awt.print.*;
-
-// This test is a "main" test as applets would need Runtime permission
-// "queuePrintJob".
-
 public class Orient implements Printable {
+    private static final String INSTRUCTIONS =
+            """
+             This test will automatically initiate a print.
 
-   private static void init()
-    {
-        //*** Create instructions for the user here ***
+             A passing test will print three pages each containing a large oval
+             with the text describing the orientation: PORTRAIT, LANDSCAPE
+             or REVERSE_LANDSCAPE, inside of it. The first page will
+             be emitted in portrait orientation, the second page in landscape
+             orientation and the third page in reverse-landscape orientation.
 
-        String[] instructions =
-        {
-         "On-screen inspection is not possible for this printing-specific",
-         "test therefore its only output is three printed pages.",
-         "To be able to run this test it is required to have a default",
-         "printer configured in your user environment.",
-         "",
-         "Visual inspection of the printed page is needed. A passing",
-         "test will print three pages each containing a large oval ",
-         "with the text describing the orientation: PORTRAIT, LANDSCAPE",
-         "or REVERSE_LANDSCAPE, inside of it. The first page will ",
-         "be emitted in portait orientation, the second page in landscape ",
-         "orientation and the third page in reverse-landscape orientation. ",
-         "On each page the oval will be wholly within the imageable area ",
-         "of the page. In a failing test the oval on the third page ",
-         "will be clipped against the imageable area.",
-         "Axes will indicate the direction of increasing X and Y"
-       };
-      Sysout.createDialog( );
-      Sysout.printInstructions( instructions );
+             On each page the oval will be wholly within the imageable area of the page.
+             Axes will indicate the direction of increasing X and Y.
 
+             Test failed if the oval on the page clipped against the imageable area.
+            """;
+
+    private static void printOrientationJob() throws PrinterException {
         PrinterJob pjob = PrinterJob.getPrinterJob();
-
         Book book = new Book();
-
         // Page 1
         PageFormat portrait = pjob.defaultPage();
         portrait.setOrientation(PageFormat.PORTRAIT);
@@ -95,366 +78,47 @@ public class Orient implements Printable {
         book.append(new Orient(), reverseLandscape);
 
         pjob.setPageable(book);
-        try {
-            pjob.print();
-        } catch (PrinterException e) {
-            e.printStackTrace();
-        }
 
-    }//End  init()
+        pjob.print();
+    }
 
+    @Override
     public int print(Graphics g, PageFormat pf, int pageIndex) {
-
-        Graphics2D g2d = (Graphics2D)g;
+        Graphics2D g2d = (Graphics2D) g;
         g2d.translate(pf.getImageableX(), pf.getImageableY());
         drawGraphics(g2d, pf);
         return Printable.PAGE_EXISTS;
     }
 
     void drawGraphics(Graphics2D g, PageFormat pf) {
-        double iw = pf.getImageableWidth();
-        double ih = pf.getImageableHeight();
-
+        String orientation = switch (pf.getOrientation()) {
+            case PageFormat.PORTRAIT -> "PORTRAIT";
+            case PageFormat.LANDSCAPE -> "LANDSCAPE";
+            case PageFormat.REVERSE_LANDSCAPE -> "REVERSE_LANDSCAPE";
+            default -> "INVALID";
+        };
         g.setColor(Color.black);
-        String orientation;
-        switch (pf.getOrientation()) {
-           case PageFormat.PORTRAIT  : orientation = "PORTRAIT";
-                                       break;
-           case PageFormat.LANDSCAPE : orientation = "LANDSCAPE";
-                                       break;
-           case PageFormat.REVERSE_LANDSCAPE :
-                                       orientation = "REVERSE_LANDSCAPE";
-                                       break;
-           default                   : orientation = "INVALID";
-        }
         g.drawString(orientation, 100, 300);
-        g.draw(new Ellipse2D.Double(0, 0, iw, ih));
-        g.drawString("(0,0)", 5,15);
-        g.drawLine(0,0,300,0);
-        g.drawString("X", 300,15);
-        g.drawLine(0,0,0,300);
-        g.drawString("Y",5,300);
+        g.draw(new Ellipse2D.Double(0, 0,
+                pf.getImageableWidth(), pf.getImageableHeight()));
+        g.drawString("(0,0)", 5, 15);
+        g.drawLine(0, 0, 300, 0);
+        g.drawString("X", 300, 15);
+        g.drawLine(0, 0, 0, 300);
+        g.drawString("Y", 5, 300);
     }
 
+    public static void main(String args[]) throws Exception {
+        if (PrinterJob.lookupPrintServices().length == 0) {
+            throw new RuntimeException("Printer not configured or available.");
+        }
 
-   /*****************************************************
-     Standard Test Machinery Section
-      DO NOT modify anything in this section -- it's a
-      standard chunk of code which has all of the
-      synchronisation necessary for the test harness.
-      By keeping it the same in all tests, it is easier
-      to read and understand someone else's test, as
-      well as insuring that all tests behave correctly
-      with the test harness.
-     There is a section following this for test-defined
-      classes
-   ******************************************************/
-   private static boolean theTestPassed = false;
-   private static boolean testGeneratedInterrupt = false;
-   private static String failureMessage = "";
-
-   private static Thread mainThread = null;
-
-   private static int sleepTime = 300000;
-
-   public static void main( String args[] ) throws InterruptedException
-    {
-      mainThread = Thread.currentThread();
-      try
-       {
-         init();
-       }
-      catch( TestPassedException e )
-       {
-         //The test passed, so just return from main and harness will
-         // interepret this return as a pass
-         return;
-       }
-      //At this point, neither test passed nor test failed has been
-      // called -- either would have thrown an exception and ended the
-      // test, so we know we have multiple threads.
-
-      //Test involves other threads, so sleep and wait for them to
-      // called pass() or fail()
-      try
-       {
-         Thread.sleep( sleepTime );
-         //Timed out, so fail the test
-         throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
-       }
-      catch (InterruptedException e)
-       {
-         if( ! testGeneratedInterrupt ) throw e;
-
-         //reset flag in case hit this code more than once for some reason (just safety)
-         testGeneratedInterrupt = false;
-         if ( theTestPassed == false )
-          {
-            throw new RuntimeException( failureMessage );
-          }
-       }
-
-    }//main
-
-   public static synchronized void setTimeoutTo( int seconds )
-    {
-      sleepTime = seconds * 1000;
+        PassFailJFrame passFailJFrame = PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .rows((int) INSTRUCTIONS.lines().count() + 1)
+                .columns(45)
+                .build();
+        printOrientationJob();
+        passFailJFrame.awaitAndCheck();
     }
-
-   public static synchronized void pass()
-    {
-      Sysout.println( "The test passed." );
-      Sysout.println( "The test is over, hit  Ctl-C to stop Java VM" );
-      //first check if this is executing in main thread
-      if ( mainThread == Thread.currentThread() )
-       {
-         //Still in the main thread, so set the flag just for kicks,
-         // and throw a test passed exception which will be caught
-         // and end the test.
-         theTestPassed = true;
-         throw new TestPassedException();
-       }
-      //pass was called from a different thread, so set the flag and interrupt
-      // the main thead.
-      theTestPassed = true;
-      testGeneratedInterrupt = true;
-      mainThread.interrupt();
-    }//pass()
-
-   public static synchronized void fail()
-    {
-      //test writer didn't specify why test failed, so give generic
-      fail( "it just plain failed! :-)" );
-    }
-
-   public static synchronized void fail( String whyFailed )
-    {
-      Sysout.println( "The test failed: " + whyFailed );
-      Sysout.println( "The test is over, hit  Ctl-C to stop Java VM" );
-      //check if this called from main thread
-      if ( mainThread == Thread.currentThread() )
-       {
-         //If main thread, fail now 'cause not sleeping
-         throw new RuntimeException( whyFailed );
-       }
-      theTestPassed = false;
-      testGeneratedInterrupt = true;
-      failureMessage = whyFailed;
-      mainThread.interrupt();
-    }//fail()
-
- }// class Orient
-
-//This exception is used to exit from any level of call nesting
-// when it's determined that the test has passed, and immediately
-// end the test.
-class TestPassedException extends RuntimeException
- {
- }
-
-//*********** End Standard Test Machinery Section **********
-
-
-//************ Begin classes defined for the test ****************
-
-// make listeners in a class defined here, and instantiate them in init()
-
-/* Example of a class which may be written as part of a test
-class NewClass implements anInterface
- {
-   static int newVar = 0;
-
-   public void eventDispatched(AWTEvent e)
-    {
-      //Counting events to see if we get enough
-      eventCount++;
-
-      if( eventCount == 20 )
-       {
-         //got enough events, so pass
-
-         Orient.pass();
-       }
-      else if( tries == 20 )
-       {
-         //tried too many times without getting enough events so fail
-
-         Orient.fail();
-       }
-
-    }// eventDispatched()
-
- }// NewClass class
-
-*/
-
-
-//************** End classes defined for the test *******************
-
-
-
-
-/****************************************************
- Standard Test Machinery
- DO NOT modify anything below -- it's a standard
-  chunk of code whose purpose is to make user
-  interaction uniform, and thereby make it simpler
-  to read and understand someone else's test.
- ****************************************************/
-
-/**
- This is part of the standard test machinery.
- It creates a dialog (with the instructions), and is the interface
-  for sending text messages to the user.
- To print the instructions, send an array of strings to Sysout.createDialog
-  WithInstructions method.  Put one line of instructions per array entry.
- To display a message for the tester to see, simply call Sysout.println
-  with the string to be displayed.
- This mimics System.out.println but works within the test harness as well
-  as standalone.
- */
-
-class Sysout
- {
-   private static TestDialog dialog;
-
-   public static void createDialogWithInstructions( String[] instructions )
-    {
-      dialog = new TestDialog( new Frame(), "Instructions" );
-      dialog.printInstructions( instructions );
-      dialog.show();
-      println( "Any messages for the tester will display here." );
-    }
-
-   public static void createDialog( )
-    {
-      dialog = new TestDialog( new Frame(), "Instructions" );
-      String[] defInstr = { "Instructions will appear here. ", "" } ;
-      dialog.printInstructions( defInstr );
-      dialog.show();
-      println( "Any messages for the tester will display here." );
-    }
-
-
-   public static void printInstructions( String[] instructions )
-    {
-      dialog.printInstructions( instructions );
-    }
-
-
-   public static void println( String messageIn )
-    {
-      dialog.displayMessage( messageIn );
-    }
-
- }// Sysout  class
-
-/**
-  This is part of the standard test machinery.  It provides a place for the
-   test instructions to be displayed, and a place for interactive messages
-   to the user to be displayed.
-  To have the test instructions displayed, see Sysout.
-  To have a message to the user be displayed, see Sysout.
-  Do not call anything in this dialog directly.
-  */
-class TestDialog extends Dialog implements ActionListener
- {
-
-   TextArea instructionsText;
-   TextArea messageText;
-   int maxStringLength = 80;
-   Panel  buttonP = new Panel();
-   Button passB = new Button( "pass" );
-   Button failB = new Button( "fail" );
-
-   //DO NOT call this directly, go through Sysout
-   public TestDialog( Frame frame, String name )
-    {
-      super( frame, name );
-      int scrollBoth = TextArea.SCROLLBARS_BOTH;
-      instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
-      add( "North", instructionsText );
-
-      messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
-      add("Center", messageText);
-
-      passB = new Button( "pass" );
-      passB.setActionCommand( "pass" );
-      passB.addActionListener( this );
-      buttonP.add( "East", passB );
-
-      failB = new Button( "fail" );
-      failB.setActionCommand( "fail" );
-      failB.addActionListener( this );
-      buttonP.add( "West", failB );
-
-      add( "South", buttonP );
-      pack();
-
-      show();
-    }// TestDialog()
-
-   //DO NOT call this directly, go through Sysout
-   public void printInstructions( String[] instructions )
-    {
-      //Clear out any current instructions
-      instructionsText.setText( "" );
-
-      //Go down array of instruction strings
-
-      String printStr, remainingStr;
-      for( int i=0; i < instructions.length; i++ )
-       {
-         //chop up each into pieces maxSringLength long
-         remainingStr = instructions[ i ];
-         while( remainingStr.length() > 0 )
-          {
-            //if longer than max then chop off first max chars to print
-            if( remainingStr.length() >= maxStringLength )
-             {
-               //Try to chop on a word boundary
-               int posOfSpace = remainingStr.
-                  lastIndexOf( ' ', maxStringLength - 1 );
-
-               if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-
-               printStr = remainingStr.substring( 0, posOfSpace + 1 );
-               remainingStr = remainingStr.substring( posOfSpace + 1 );
-             }
-            //else just print
-            else
-             {
-               printStr = remainingStr;
-               remainingStr = "";
-             }
-
-            instructionsText.append( printStr + "\n" );
-
-          }// while
-
-       }// for
-
-    }//printInstructions()
-
-   //DO NOT call this directly, go through Sysout
-   public void displayMessage( String messageIn )
-    {
-      messageText.append( messageIn + "\n" );
-    }
-
-   //catch presses of the passed and failed buttons.
-   //simply call the standard pass() or fail() static methods of
-   //Orient
-   public void actionPerformed( ActionEvent e )
-    {
-      if( e.getActionCommand() == "pass" )
-       {
-         Orient.pass();
-       }
-      else
-       {
-         Orient.fail();
-       }
-    }
-
- }// TestDialog  class
+}

From 235ba9a7025964b1e43149c7102e26b82b2081ad Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Thu, 18 Apr 2024 16:12:50 +0000
Subject: [PATCH 103/486] 8330458: Add missing @since tag to
 ClassFile.JAVA_23_VERSION

Reviewed-by: jjg, iris, asotona
---
 .../share/classes/java/lang/classfile/ClassFile.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/ClassFile.java b/src/java.base/share/classes/java/lang/classfile/ClassFile.java
index 27c2f18fe96..68618252999 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassFile.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -1475,7 +1475,10 @@ public sealed interface ClassFile
     /** The class major version of JAVA_22. */
     int JAVA_22_VERSION = 66;
 
-    /** 67 */
+    /**
+     * The class major version of JAVA_23.
+     * @since 23
+     */
     int JAVA_23_VERSION = 67;
 
     /**

From 6ee8407758c92d32e18642b0758d2d5c71ad09f5 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Thu, 18 Apr 2024 18:49:08 +0000
Subject: [PATCH 104/486] 8324342: Doclet should default @since for a nested
 class to that of its enclosing class

Reviewed-by: prappo, hannesw
---
 .../formats/html/taglets/SimpleTaglet.java    |  58 +++++++++-
 .../formats/html/taglets/TagletManager.java   |   8 +-
 src/jdk.javadoc/share/man/javadoc.1           |  34 +++---
 .../javadoc/doclet/testAuthor/TestAuthor.java | 104 +++++++++++++++++-
 .../doclet/testSinceTag/TestSinceTag.java     |  79 ++++++++++++-
 .../doclet/testVersionTag/TestVersionTag.java |  37 ++++++-
 6 files changed, 286 insertions(+), 34 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SimpleTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SimpleTaglet.java
index 119da6a7610..110a3e1246e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SimpleTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SimpleTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,10 +29,13 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.NestingKind;
+import javax.lang.model.element.TypeElement;
 
 import com.sun.source.doctree.BlockTagTree;
 import com.sun.source.doctree.DocTree;
@@ -100,6 +103,7 @@ public class SimpleTaglet extends BaseTaglet implements InheritableTaglet {
      * @param tagName   the name of this tag
      * @param header    the header to output
      * @param locations the possible locations that this tag can appear in
+     * @param enabled   whether this tag is enabled
      */
     private SimpleTaglet(HtmlConfiguration config, String tagName, String header, Set<Taglet.Location> locations, boolean enabled) {
         super(config, tagName, false, locations);
@@ -113,6 +117,7 @@ public class SimpleTaglet extends BaseTaglet implements InheritableTaglet {
      * @param tagKind   the kind of this tag
      * @param header    the header to output
      * @param locations the possible locations that this tag can appear in
+     * @param enabled   whether this tag is enabled
      */
     protected SimpleTaglet(HtmlConfiguration config, DocTree.Kind tagKind, String header, Set<Taglet.Location> locations, boolean enabled) {
         super(config, tagKind, false, locations);
@@ -120,6 +125,37 @@ public class SimpleTaglet extends BaseTaglet implements InheritableTaglet {
         this.enabled = enabled;
     }
 
+    /**
+     * Constructs a {@code SimpleTaglet} that will look for tags on enclosing type elements
+     * if there are no relevant tags on a nested (member) type element.
+     *
+     * @param tagKind   the kind of this tag
+     * @param header    the header to output
+     * @param locations the possible locations that this tag can appear in
+     * @param enabled   whether this tag is enabled
+     */
+    static SimpleTaglet createWithDefaultForNested(HtmlConfiguration config, DocTree.Kind tagKind, String header, Set<Taglet.Location> locations, boolean enabled) {
+        return new SimpleTaglet(config, tagKind, header, locations, enabled) {
+            @Override
+            protected List<? extends BlockTagTree> getDefaultBlockTags(Element e, Predicate<? super BlockTagTree> accepts) {
+                while (isNestedType(e)) {
+                    e = e.getEnclosingElement();
+                    var tags = utils.getBlockTags(e, accepts);
+                    if (!tags.isEmpty()) {
+                        return tags;
+                    }
+                }
+
+                return List.of();
+            }
+
+            private boolean isNestedType(Element e) {
+                return e.getKind().isDeclaredType()
+                        && ((TypeElement) e).getNestingKind() == NestingKind.MEMBER;
+            }
+        };
+    }
+
     @Override
     public Output inherit(Element dst, Element src, DocTree tag, boolean isFirstSentence) {
         assert dst.getKind() == ElementKind.METHOD;
@@ -153,8 +189,8 @@ public class SimpleTaglet extends BaseTaglet implements InheritableTaglet {
 
     /**
      * Returns whether this taglet accepts a {@code BlockTagTree} node.
-     * The taglet accepts a tree node if it has the same kind, and
-     * if the kind is {@code UNKNOWN_BLOCK_TAG} the same tag name.
+     * The taglet accepts a tree node if it has the same kind, or
+     * if the kind is {@code UNKNOWN_BLOCK_TAG} with the same tag name.
      *
      * @param tree the tree node
      * @return {@code true} if this taglet accepts this tree node
@@ -168,7 +204,7 @@ public class SimpleTaglet extends BaseTaglet implements InheritableTaglet {
     record Documentation(DocTree tag, List<? extends DocTree> description, ExecutableElement method) { }
 
     private Optional<Documentation> extractFirst(ExecutableElement m) {
-        List<? extends DocTree> tags = utils.getBlockTags(m, this::accepts);
+        List<? extends DocTree> tags = getBlockTags(m);
         if (tags.isEmpty()) {
             return Optional.empty();
         }
@@ -179,13 +215,25 @@ public class SimpleTaglet extends BaseTaglet implements InheritableTaglet {
     @Override
     public Content getAllBlockTagOutput(Element holder, TagletWriter tagletWriter) {
         this.tagletWriter = tagletWriter;
-        List<? extends DocTree> tags = utils.getBlockTags(holder, this::accepts);
+        List<? extends DocTree> tags = getBlockTags(holder);
         if (header == null || tags.isEmpty()) {
             return null;
         }
         return simpleBlockTagOutput(holder, tags, header);
     }
 
+    private List<? extends BlockTagTree> getBlockTags(Element e) {
+        var tags = utils.getBlockTags(e, this::accepts);
+        if (tags.isEmpty()) {
+            tags = getDefaultBlockTags(e, this::accepts);
+        }
+        return tags;
+    }
+
+    protected List<? extends BlockTagTree> getDefaultBlockTags(Element e, Predicate<? super BlockTagTree> accepts) {
+        return List.of();
+    }
+
     /**
      * Returns the output for a series of simple tags.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletManager.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletManager.java
index 804704528ce..0e7b2959028 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletManager.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -590,13 +590,13 @@ public class TagletManager {
         addStandardTaglet(new ReturnTaglet(config));
         addStandardTaglet(new ThrowsTaglet(config), EXCEPTION);
         addStandardTaglet(
-                new SimpleTaglet(config, SINCE, resources.getText("doclet.Since"),
+                SimpleTaglet.createWithDefaultForNested(config, SINCE, resources.getText("doclet.Since"),
                     EnumSet.allOf(Location.class), !nosince));
         addStandardTaglet(
-                new SimpleTaglet(config, VERSION, resources.getText("doclet.Version"),
+                SimpleTaglet.createWithDefaultForNested(config, VERSION, resources.getText("doclet.Version"),
                     EnumSet.of(Location.OVERVIEW, Location.MODULE, Location.PACKAGE, Location.TYPE), showversion));
         addStandardTaglet(
-                new SimpleTaglet(config, AUTHOR, resources.getText("doclet.Author"),
+                SimpleTaglet.createWithDefaultForNested(config, AUTHOR, resources.getText("doclet.Author"),
                     EnumSet.of(Location.OVERVIEW, Location.MODULE, Location.PACKAGE, Location.TYPE), showauthor));
         addStandardTaglet(
                 new SimpleTaglet(config, SERIAL_DATA, resources.getText("doclet.SerialData"),
diff --git a/src/jdk.javadoc/share/man/javadoc.1 b/src/jdk.javadoc/share/man/javadoc.1
index a6437c0288b..30256207b3e 100644
--- a/src/jdk.javadoc/share/man/javadoc.1
+++ b/src/jdk.javadoc/share/man/javadoc.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1994, 2024, 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
@@ -110,8 +110,8 @@ also recommended to check the generated output with any appropriate
 conformance and other checking tools.
 .PP
 For more details on the conformance requirements for HTML5 documents,
-see \f[B]Conformance requirements\f[R]
-[https://www.w3.org/TR/html5/infrastructure.html#conformance-requirements]
+see \f[B]Conformance requirements for authors\f[R]
+[https://html.spec.whatwg.org/multipage/introduction.html#conformance-requirements-for-authors]
 in the HTML5 Specification.
 For more details on security issues related to web pages, see the
 \f[B]Open Web Application Security Project (OWASP)\f[R]
@@ -489,7 +489,8 @@ Allow JavaScript in documentation comments, and options whose value is
 \f[I]html-code\f[R].
 .TP
 \f[V]-author\f[R]
-Includes the \f[V]\[at]author\f[R] text in the generated docs.
+Includes the text of any \f[V]author\f[R] tags in the generated
+documentation.
 .TP
 \f[V]-bottom\f[R] \f[I]html-code\f[R]
 Specifies the text to be placed at the bottom of each generated page.
@@ -512,18 +513,16 @@ javadoc -charset \[dq]iso-8859-1\[dq] mypackage
 \f[R]
 .fi
 .PP
-This command inserts the following line in the head of every generated
-page:
+This command inserts the following line, containing a
+\f[B]\f[VB]meta\f[B] element\f[R]
+[https://html.spec.whatwg.org/multipage/semantics.html#the-meta-element]
+in the head of every generated page:
 .IP
 .nf
 \f[CB]
 <meta http-equiv=\[dq]Content-Type\[dq] content=\[dq]text/html; charset=ISO-8859-1\[dq]>
 \f[R]
 .fi
-.PP
-The \f[V]meta\f[R] tag is described in the \f[B]HTML standard (4197265
-and 4137321), HTML Document Representation\f[R]
-[http://www.w3.org/TR/REC-html40/charset.html#h-5.2.2].
 .RE
 .TP
 \f[V]-d\f[R] \f[I]directory\f[R]
@@ -723,8 +722,8 @@ documentation shares the same file system.
 In all cases, and on all operating systems, use a slash as the
 separator, whether the URL is absolute or relative, and
 \f[V]https:\f[R], \f[V]http:\f[R], or \f[V]file:\f[R] as specified in
-the \f[B]URL Memo: Uniform Resource Locators\f[R]
-[http://www.ietf.org/rfc/rfc1738.txt].
+the \f[B]RFC 1738: Uniform Resource Locators (URL)\f[R]
+[https://www.rfc-editor.org/info/rfc1738].
 .IP
 .nf
 \f[CB]
@@ -950,8 +949,8 @@ is used.
 .RE
 .TP
 \f[V]-nosince\f[R]
-Omits from the generated documents the \f[V]Since\f[R] sections
-associated with the \f[V]\[at]since\f[R] tags.
+Omits from the generated documentation the \f[V]Since\f[R] sections
+derived from any \f[V]since\f[R] tags.
 .TP
 \f[V]-notimestamp\f[R]
 Suppresses the time stamp, which is hidden in an HTML comment in the
@@ -1181,10 +1180,11 @@ To access the generated Use page, go to the class or package and click
 the \f[B]USE\f[R] link in the navigation bar.
 .TP
 \f[V]-version\f[R]
-Includes the version text in the generated docs.
+Includes the text of any \f[V]version\f[R] tags in the generated
+documentation.
 This text is omitted by default.
-To find out what version of the \f[V]javadoc\f[R] tool you are using,
-use the \f[V]--version\f[R] option (with two hyphens).
+Note: To find out what version of the \f[V]javadoc\f[R] tool you are
+using, use the \f[V]--version\f[R] option (with two hyphens).
 .TP
 \f[V]-windowtitle\f[R] \f[I]title\f[R]
 Specifies the title to be placed in the HTML \f[V]<title>\f[R] tag.
diff --git a/test/langtools/jdk/javadoc/doclet/testAuthor/TestAuthor.java b/test/langtools/jdk/javadoc/doclet/testAuthor/TestAuthor.java
index 5229f8ccab5..799185f4dee 100644
--- a/test/langtools/jdk/javadoc/doclet/testAuthor/TestAuthor.java
+++ b/test/langtools/jdk/javadoc/doclet/testAuthor/TestAuthor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      8202947 8239804
+ * @bug      8202947 8239804 8324342
  * @summary  test the at-author tag, and corresponding option
  * @library  /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -129,4 +129,104 @@ public class TestAuthor extends JavadocTester {
                     <dd>anonymous</dd>
                     </dl>""");
     }
+
+    @Test
+    public void testAuthorDefault(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /**
+                 * Class C.
+                 * @author J. Duke
+                 */
+                 public class C {
+                     /** Class Nested, with no explicit at-author. */
+                     public class Nested { }
+                 }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-author",
+                "-sourcepath", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Author:</dt>
+                    <dd>J. Duke</dd>""");
+
+        checkOutput("p/C.Nested.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Author:</dt>
+                    <dd>J. Duke</dd>""");
+    }
+
+    @Test
+    public void testAuthorDefault_Multiple(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /**
+                 * Class C.
+                 * @author J. Duke
+                 * @author A. N. Other
+                 */
+                 public class C {
+                     /** Class Nested, with no explicit at-author. */
+                     public class Nested { }
+                 }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-author",
+                "-sourcepath", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Author:</dt>
+                    <dd>J. Duke, A. N. Other</dd>""");
+
+        checkOutput("p/C.Nested.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Author:</dt>
+                    <dd>J. Duke, A. N. Other</dd>""");
+    }
+
+    @Test
+    public void testAuthorDefault_Nested(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /**
+                 * Class C.
+                 * @author J. Duke
+                 * @author A. N. Other
+                 */
+                 public class C {
+                     public class Nested1 {
+                         /** Class Nested, with no explicit at-author. */
+                         public class Nested { }
+                     }
+                 }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-author",
+                "-sourcepath", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Author:</dt>
+                    <dd>J. Duke, A. N. Other</dd>""");
+
+        checkOutput("p/C.Nested1.Nested.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Author:</dt>
+                    <dd>J. Duke, A. N. Other</dd>""");
+    }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testSinceTag/TestSinceTag.java b/test/langtools/jdk/javadoc/doclet/testSinceTag/TestSinceTag.java
index 5f47be2c09a..8d85fa176f6 100644
--- a/test/langtools/jdk/javadoc/doclet/testSinceTag/TestSinceTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSinceTag/TestSinceTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,18 @@
 
 /*
  * @test
- * @bug      7180906 8026567 8239804
+ * @bug      7180906 8026567 8239804 8324342
  * @summary  Test to make sure that the since tag works correctly
- * @library  ../../lib
+ * @library  /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
- * @build    javadoc.tester.*
+ * @build    toolbox.ToolBox javadoc.tester.*
  * @run main TestSinceTag
  */
 
+import java.nio.file.Path;
+
 import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
 
 public class TestSinceTag extends JavadocTester {
 
@@ -41,6 +44,8 @@ public class TestSinceTag extends JavadocTester {
         tester.printSummary();
     }
 
+    private final ToolBox tb = new ToolBox();
+
     @Test
     public void testSince() {
         javadoc("-d", "out-since",
@@ -75,4 +80,70 @@ public class TestSinceTag extends JavadocTester {
                     <dt>Since:</dt>
                     <dd>1.4</dd>""");
     }
+
+    @Test
+    public void testSinceDefault(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /**
+                 * Class C.
+                 * @since 99
+                 */
+                 public class C {
+                     /** Class Nested, with no explicit at-since. */
+                     public class Nested { }
+                 }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-sourcepath", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Since:</dt>
+                    <dd>99</dd>""");
+
+        checkOutput("p/C.Nested.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Since:</dt>
+                    <dd>99</dd>""");
+
+    }
+
+    @Test
+    public void testSinceDefault_Nested(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /**
+                 * Class C.
+                 * @since 99
+                 */
+                 public class C {
+                     public class Nested1 {
+                         /** Class Nested, with no explicit at-since. */
+                         public class Nested { }
+                     }
+                 }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-sourcepath", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Since:</dt>
+                    <dd>99</dd>""");
+
+        checkOutput("p/C.Nested1.Nested.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Since:</dt>
+                    <dd>99</dd>""");
+
+    }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testVersionTag/TestVersionTag.java b/test/langtools/jdk/javadoc/doclet/testVersionTag/TestVersionTag.java
index e04fa956e74..6f01b407ae3 100644
--- a/test/langtools/jdk/javadoc/doclet/testVersionTag/TestVersionTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testVersionTag/TestVersionTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      8202947 8239804
+ * @bug      8202947 8239804 8324342
  * @summary  test the at-version tag, and corresponding option
  * @library  /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -129,4 +129,37 @@ public class TestVersionTag extends JavadocTester {
                     <dd>1.2.3</dd>
                     </dl>""");
     }
+
+    @Test
+    public void testVersionDefault(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /**
+                 * Class C.
+                 * @version 42
+                 */
+                 public class C {
+                     /** Class Nested, with no explicit at-version. */
+                     public class Nested { }
+                 }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-version",
+                "-sourcepath", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Version:</dt>
+                    <dd>42</dd>""");
+
+        checkOutput("p/C.Nested.html", true,
+                """
+                    <dl class="notes">
+                    <dt>Version:</dt>
+                    <dd>42</dd>""");
+
+    }
 }

From 32946e1882e9b22c983cbba3c6bda3cc7295946a Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Thu, 18 Apr 2024 22:09:32 +0000
Subject: [PATCH 105/486] 8295111: dpkg appears to have problems resolving
 symbolically linked native libraries

Reviewed-by: almatvee
---
 .../jpackage/internal/LinuxDebBundler.java    | 64 ++++++++++++-------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
index e97cfc90a80..478ec078797 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -201,6 +201,24 @@ public class LinuxDebBundler extends LinuxPackageBundler {
             Map<String, ? super Object> params,
             LibProvidersLookup libProvidersLookup) {
 
+        libProvidersLookup.setPackageLookup(file -> {
+            Path realPath = file.toRealPath();
+
+            try {
+                // Try the real path first as it works better on newer Ubuntu versions
+                return findProvidingPackages(realPath);
+            } catch (IOException ex) {
+                // Try the default path if differ
+                if (!realPath.toString().equals(file.toString())) {
+                    return findProvidingPackages(file);
+                } else {
+                    throw ex;
+                }
+            }
+        });
+    }
+
+    private static Stream<String> findProvidingPackages(Path file) throws IOException {
         //
         // `dpkg -S` command does glob pattern lookup. If not the absolute path
         // to the file is specified it might return mltiple package names.
@@ -243,32 +261,30 @@ public class LinuxDebBundler extends LinuxPackageBundler {
         // 4. Arch suffix should be stripped from accepted package names.
         //
 
-        libProvidersLookup.setPackageLookup(file -> {
-            Set<String> archPackages = new HashSet<>();
-            Set<String> otherPackages = new HashSet<>();
+        Set<String> archPackages = new HashSet<>();
+        Set<String> otherPackages = new HashSet<>();
 
-            Executor.of(TOOL_DPKG, "-S", file.toString())
-                    .saveOutput(true).executeExpectSuccess()
-                    .getOutput().forEach(line -> {
-                        Matcher matcher = PACKAGE_NAME_REGEX.matcher(line);
-                        if (matcher.find()) {
-                            String name = matcher.group(1);
-                            if (name.endsWith(":" + DEB_ARCH)) {
-                                // Strip arch suffix
-                                name = name.substring(0,
-                                        name.length() - (DEB_ARCH.length() + 1));
-                                archPackages.add(name);
-                            } else {
-                                otherPackages.add(name);
-                            }
+        Executor.of(TOOL_DPKG, "-S", file.toString())
+                .saveOutput(true).executeExpectSuccess()
+                .getOutput().forEach(line -> {
+                    Matcher matcher = PACKAGE_NAME_REGEX.matcher(line);
+                    if (matcher.find()) {
+                        String name = matcher.group(1);
+                        if (name.endsWith(":" + DEB_ARCH)) {
+                            // Strip arch suffix
+                            name = name.substring(0,
+                                    name.length() - (DEB_ARCH.length() + 1));
+                            archPackages.add(name);
+                        } else {
+                            otherPackages.add(name);
                         }
-                    });
+                    }
+                });
 
-            if (!archPackages.isEmpty()) {
-                return archPackages.stream();
-            }
-            return otherPackages.stream();
-        });
+        if (!archPackages.isEmpty()) {
+            return archPackages.stream();
+        }
+        return otherPackages.stream();
     }
 
     @Override

From 252c62a66dd955a5d22f307544f38cc0dd4f2550 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 19 Apr 2024 10:02:44 +0000
Subject: [PATCH 106/486] 8330524: Linux ppc64le compile warning with clang  in
 os_linux_ppc.cpp

Reviewed-by: mdoerr, clanger
---
 src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
index 55963b06806..90640a6f06a 100644
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2021 SAP SE. All rights reserved.
+ * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -254,7 +254,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         stub = SharedRuntime::get_handle_wrong_method_stub();
       }
 
-      else if ((sig == USE_POLL_BIT_ONLY ? SIGTRAP : SIGSEGV) &&
+      else if ((sig == (USE_POLL_BIT_ONLY ? SIGTRAP : SIGSEGV)) &&
                // A linux-ppc64 kernel before 2.6.6 doesn't set si_addr on some segfaults
                // in 64bit mode (cf. http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.6),
                // especially when we try to read from the safepoint polling page. So the check

From 46a2ce4eb4c961649a70d52a6317a2c022e87d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 19 Apr 2024 10:03:59 +0000
Subject: [PATCH 107/486] 8330063: Upgrade jQuery to 3.7.1

Reviewed-by: prappo
---
 .../html/resources/jquery/jquery-3.6.1.min.js |    2 -
 .../{jquery-3.6.1.js => jquery-3.7.1.js}      | 1921 ++++++++---------
 .../html/resources/jquery/jquery-3.7.1.min.js |    2 +
 .../doclets/toolkit/util/DocPaths.java        |    2 +-
 src/jdk.javadoc/share/legal/jquery.md         |   50 +-
 .../javadoc/doclet/testSearch/TestSearch.java |    4 +-
 .../doclet/testSearchScript/javadoc-search.js |   10 +-
 .../jdk/javadoc/tool/api/basic/APITest.java   |    2 +-
 8 files changed, 880 insertions(+), 1113 deletions(-)
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.1.min.js
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/{jquery-3.6.1.js => jquery-3.7.1.js} (88%)
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.min.js

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.1.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.1.min.js
deleted file mode 100644
index 2c69bc908b1..00000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.6.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,y=n.hasOwnProperty,a=y.toString,l=a.call(Object),v={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=y.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:v}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,y,s,c,v,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",$=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&v(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!y||!y.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ve(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ye(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ve(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],y=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||y.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||y.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||y.push(".#.+[+~]"),e.querySelectorAll("\\\f"),y.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),y=y.length&&new RegExp(y.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),v=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&v(p,e)?-1:t==C||t.ownerDocument==p&&v(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!y||!y.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),v(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace($," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,y){var v="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===y?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=v!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(v){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=y)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ye(function(){return[0]}),last:ye(function(e,t){return[t-1]}),eq:ye(function(e,t,n){return[n<0?n+t:n]}),even:ye(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ye(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ye(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ye(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,y,v,e){return y&&!y[S]&&(y=Ce(y)),v&&!v[S]&&(v=Ce(v,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?v||(e?d:l||y)?[]:t:f;if(g&&g(f,p,n,r),y){i=Te(p,u),y(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(v||d){if(v){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);v(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=v?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),v?v(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,y,v,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(y=o,m=0<(v=i).length,x=0<y.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=y[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=v[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+v.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ve(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ve(t.parentNode)||t),n},d.sortStable=S.split("").sort(j).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function $(){E.removeEventListener("DOMContentLoaded",$),C.removeEventListener("load",$),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",$),C.addEventListener("load",$));var B=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)B(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):B(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),v.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",v.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",v.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,v.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ee(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=y.events)||(u=y.events=Object.create(null)),(a=y.handle)||(a=y.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=Y.hasData(e)&&Y.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||S.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(t,e){S.event.special[t]={setup:function(){return Se(this,t,Ce),!1},trigger:function(){return Se(this,t),!0},_default:function(e){return Y.get(e.target,t)},delegateType:e}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!\[CDATA\[|\]\]>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!v.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ye(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ye(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ye(r)),r.parentNode&&(n&&ie(r)&&ve(ye(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(v.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ye(c),r=0,i=(o=ye(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ye(e),a=a||ye(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ye(c,"script")).length&&ve(a,!f&&ye(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return B(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return B(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ye(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ye(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=/^--/,Me=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Ie=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},We=new RegExp(ne.join("|"),"i"),Fe="[\\x20\\t\\r\\n\\f]",$e=new RegExp("^"+Fe+"+|((?:^|[^\\\\])(?:\\\\.)*)"+Fe+"+$","g");function Be(e,t,n){var r,i,o,a,s=Re.test(t),u=e.style;return(n=n||Me(e))&&(a=n.getPropertyValue(t)||n[t],s&&(a=a.replace($e,"$1")),""!==a||ie(e)||(a=S.style(e,t)),!v.pixelBoxStyles()&&Pe.test(a)&&We.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=n.width,u.width=r,u.minWidth=i,u.maxWidth=o)),void 0!==a?a+"":a}function _e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",v.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(v,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var ze=["Webkit","Moz","ms"],Ue=E.createElement("div").style,Xe={};function Ve(e){var t=S.cssProps[e]||Xe[e];return t||(e in Ue?e:Xe[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=ze.length;while(n--)if((e=ze[n]+t)in Ue)return e}(e)||e)}var Ge=/^(none|table(?!-c[ea]).+)/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Me(e),i=(!v.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!v.boxSizingReliable()&&i||!v.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Re.test(t),l=e.style;if(u||(t=Ve(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),v.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Re.test(t)||(t=Ve(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ge.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):Ie(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Me(e),o=!v.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=_e(v.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-Ie(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return B(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Me(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Ve(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),y=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!y||void 0===y[r])continue;g=!0}d[r]=y&&y[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=y&&y.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(y?"hidden"in y&&(g=y.hidden):y=Y.access(e,"fxshow",{display:l}),o&&(y.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?y[r]:0,r,p),r in y||(y[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",v.checkOn=""!==rt.value,v.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",v.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return B(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!v.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function yt(e){return(e.match(P)||[]).join(" ")}function vt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return B(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),v.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a;return m(t)?this.each(function(e){S(this).addClass(t.call(this,e,vt(this)))}):(e=mt(t)).length?this.each(function(){if(r=vt(this),n=1===this.nodeType&&" "+yt(r)+" "){for(o=0;o<e.length;o++)i=e[o],n.indexOf(" "+i+" ")<0&&(n+=i+" ");a=yt(n),r!==a&&this.setAttribute("class",a)}}):this},removeClass:function(t){var e,n,r,i,o,a;return m(t)?this.each(function(e){S(this).removeClass(t.call(this,e,vt(this)))}):arguments.length?(e=mt(t)).length?this.each(function(){if(r=vt(this),n=1===this.nodeType&&" "+yt(r)+" "){for(o=0;o<e.length;o++){i=e[o];while(-1<n.indexOf(" "+i+" "))n=n.replace(" "+i+" "," ")}a=yt(n),r!==a&&this.setAttribute("class",a)}}):this:this.attr("class","")},toggleClass:function(t,n){var e,r,i,o,a=typeof t,s="string"===a||Array.isArray(t);return m(t)?this.each(function(e){S(this).toggleClass(t.call(this,e,vt(this),n),n)}):"boolean"==typeof n&&s?n?this.addClass(t):this.removeClass(t):(e=mt(t),this.each(function(){if(s)for(o=S(this),i=0;i<e.length;i++)r=e[i],o.hasClass(r)?o.removeClass(r):o.addClass(r);else void 0!==t&&"boolean"!==a||((r=vt(this))&&Y.set(this,"__className__",r),this.setAttribute&&this.setAttribute("class",r||!1===t?"":Y.get(this,"__className__")||""))}))},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+yt(vt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:yt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},v.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),v.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=y.call(e,"type")?e.type:e,h=y.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),v.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function jt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):jt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)jt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var Dt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function $t(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Bt(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Bt(Bt(e,S.ajaxSettings),t):Bt(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,y=S.ajaxSetup({},t),v=y.context||y,m=y.context&&(v.nodeType||v.jquery)?S(v):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=y.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(y.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),y.url=((e||y.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),y.type=t.method||t.type||y.method||y.type,y.dataTypes=(y.dataType||"*").toLowerCase().match(P)||[""],null==y.crossDomain){r=E.createElement("a");try{r.href=y.url,r.href=r.href,y.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){y.crossDomain=!0}}if(y.data&&y.processData&&"string"!=typeof y.data&&(y.data=S.param(y.data,y.traditional)),$t(Rt,y,t,T),h)return T;for(i in(g=S.event&&y.global)&&0==S.active++&&S.event.trigger("ajaxStart"),y.type=y.type.toUpperCase(),y.hasContent=!Ot.test(y.type),f=y.url.replace(qt,""),y.hasContent?y.data&&y.processData&&0===(y.contentType||"").indexOf("application/x-www-form-urlencoded")&&(y.data=y.data.replace(Dt,"+")):(o=y.url.slice(f.length),y.data&&(y.processData||"string"==typeof y.data)&&(f+=(Et.test(f)?"&":"?")+y.data,delete y.data),!1===y.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),y.url=f+o),y.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(y.data&&y.hasContent&&!1!==y.contentType||t.contentType)&&T.setRequestHeader("Content-Type",y.contentType),T.setRequestHeader("Accept",y.dataTypes[0]&&y.accepts[y.dataTypes[0]]?y.accepts[y.dataTypes[0]]+("*"!==y.dataTypes[0]?", "+It+"; q=0.01":""):y.accepts["*"]),y.headers)T.setRequestHeader(i,y.headers[i]);if(y.beforeSend&&(!1===y.beforeSend.call(v,T,y)||h))return T.abort();if(u="abort",b.add(y.complete),T.done(y.success),T.fail(y.error),c=$t(Mt,y,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,y]),h)return T;y.async&&0<y.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},y.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(y,T,n)),!i&&-1<S.inArray("script",y.dataTypes)&&S.inArray("json",y.dataTypes)<0&&(y.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(y,s,T,i),i?(y.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===y.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(v,[o,l,T]):x.rejectWith(v,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,y,i?o:a]),b.fireWith(v,[T,l]),g&&(m.trigger("ajaxComplete",[T,y]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();v.cors=!!zt&&"withCredentials"in zt,v.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(v.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),v.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(v.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=yt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return B(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=_e(v.pixelPosition,function(e,t){if(t)return t=Be(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return B(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|([^\s\uFEFF\xA0])[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"$1")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.1.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.js
similarity index 88%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.1.js
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.js
index 12e65d069fe..1a86433c223 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.6.1.js
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.js
@@ -1,15 +1,12 @@
 /*!
- * jQuery JavaScript Library v3.6.1
+ * jQuery JavaScript Library v3.7.1
  * https://jquery.com/
  *
- * Includes Sizzle.js
- * https://sizzlejs.com/
- *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2022-08-26T17:52Z
+ * Date: 2023-08-28T13:37Z
  */
 ( function( global, factory ) {
 
@@ -150,8 +147,9 @@ function toType( obj ) {
 
 
 
-var
-	version = "3.6.1",
+var version = "3.7.1",
+
+	rhtmlSuffix = /HTML$/i,
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -397,6 +395,38 @@ jQuery.extend( {
 		return obj;
 	},
 
+
+	// Retrieve the text value of an array of DOM nodes
+	text: function( elem ) {
+		var node,
+			ret = "",
+			i = 0,
+			nodeType = elem.nodeType;
+
+		if ( !nodeType ) {
+
+			// If no nodeType, this is expected to be an array
+			while ( ( node = elem[ i++ ] ) ) {
+
+				// Do not traverse comment nodes
+				ret += jQuery.text( node );
+			}
+		}
+		if ( nodeType === 1 || nodeType === 11 ) {
+			return elem.textContent;
+		}
+		if ( nodeType === 9 ) {
+			return elem.documentElement.textContent;
+		}
+		if ( nodeType === 3 || nodeType === 4 ) {
+			return elem.nodeValue;
+		}
+
+		// Do not include comment or processing instruction nodes
+
+		return ret;
+	},
+
 	// results is for internal usage only
 	makeArray: function( arr, results ) {
 		var ret = results || [];
@@ -419,6 +449,15 @@ jQuery.extend( {
 		return arr == null ? -1 : indexOf.call( arr, elem, i );
 	},
 
+	isXMLDoc: function( elem ) {
+		var namespace = elem && elem.namespaceURI,
+			docElem = elem && ( elem.ownerDocument || elem ).documentElement;
+
+		// Assume HTML when documentElement doesn't yet exist, such as inside
+		// document fragments.
+		return !rhtmlSuffix.test( namespace || docElem && docElem.nodeName || "HTML" );
+	},
+
 	// Support: Android <=4.0 only, PhantomJS 1 only
 	// push.apply(_, arraylike) throws on ancient WebKit
 	merge: function( first, second ) {
@@ -520,43 +559,98 @@ function isArrayLike( obj ) {
 	return type === "array" || length === 0 ||
 		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
 }
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.3.6
- * https://sizzlejs.com/
- *
- * Copyright JS Foundation and other contributors
- * Released under the MIT license
- * https://js.foundation/
- *
- * Date: 2021-02-16
- */
-( function( window ) {
+
+
+function nodeName( elem, name ) {
+
+	return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+
+}
+var pop = arr.pop;
+
+
+var sort = arr.sort;
+
+
+var splice = arr.splice;
+
+
+var whitespace = "[\\x20\\t\\r\\n\\f]";
+
+
+var rtrimCSS = new RegExp(
+	"^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$",
+	"g"
+);
+
+
+
+
+// Note: an element does not contain itself
+jQuery.contains = function( a, b ) {
+	var bup = b && b.parentNode;
+
+	return a === bup || !!( bup && bup.nodeType === 1 && (
+
+		// Support: IE 9 - 11+
+		// IE doesn't have `contains` on SVG.
+		a.contains ?
+			a.contains( bup ) :
+			a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+	) );
+};
+
+
+
+
+// CSS string/identifier serialization
+// https://drafts.csswg.org/cssom/#common-serializing-idioms
+var rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;
+
+function fcssescape( ch, asCodePoint ) {
+	if ( asCodePoint ) {
+
+		// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
+		if ( ch === "\0" ) {
+			return "\uFFFD";
+		}
+
+		// Control characters and (dependent upon position) numbers get escaped as code points
+		return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+	}
+
+	// Other potentially-special ASCII characters get backslash-escaped
+	return "\\" + ch;
+}
+
+jQuery.escapeSelector = function( sel ) {
+	return ( sel + "" ).replace( rcssescape, fcssescape );
+};
+
+
+
+
+var preferredDoc = document,
+	pushNative = push;
+
+( function() {
+
 var i,
-	support,
 	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
 	outermostContext,
 	sortInput,
 	hasDuplicate,
+	push = pushNative,
 
 	// Local document vars
-	setDocument,
 	document,
-	docElem,
+	documentElement,
 	documentIsHTML,
 	rbuggyQSA,
-	rbuggyMatches,
 	matches,
-	contains,
 
 	// Instance-specific data
-	expando = "sizzle" + 1 * new Date(),
-	preferredDoc = window.document,
+	expando = jQuery.expando,
 	dirruns = 0,
 	done = 0,
 	classCache = createCache(),
@@ -570,47 +664,22 @@ var i,
 		return 0;
 	},
 
-	// Instance methods
-	hasOwn = ( {} ).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	pushNative = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-
-	// Use a stripped-down indexOf as it's faster than native
-	// https://jsperf.com/thor-indexof-vs-for/5
-	indexOf = function( list, elem ) {
-		var i = 0,
-			len = list.length;
-		for ( ; i < len; i++ ) {
-			if ( list[ i ] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" +
-		"ismap|loop|multiple|open|readonly|required|scoped",
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|" +
+		"loop|multiple|open|readonly|required|scoped",
 
 	// Regular expressions
 
-	// http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-
 	// https://www.w3.org/TR/css-syntax-3/#ident-token-diagram
 	identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace +
 		"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",
 
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+	// Attribute selectors: https://www.w3.org/TR/selectors/#attribute-selectors
 	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
 
 		// Operator (capture 2)
 		"*([*^$|!~]?=)" + whitespace +
 
-		// "Attribute values must be CSS identifiers [capture 5]
-		// or strings [capture 3 or capture 4]"
+		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
 		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" +
 		whitespace + "*\\]",
 
@@ -629,101 +698,88 @@ var i,
 
 	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
 	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" +
-		whitespace + "+$", "g" ),
 
 	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace +
-		"*" ),
+	rleadingCombinator = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" +
+		whitespace + "*" ),
 	rdescend = new RegExp( whitespace + "|>" ),
 
 	rpseudo = new RegExp( pseudos ),
 	ridentifier = new RegExp( "^" + identifier + "$" ),
 
 	matchExpr = {
-		"ID": new RegExp( "^#(" + identifier + ")" ),
-		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
-		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" +
-			whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" +
-			whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+		ID: new RegExp( "^#(" + identifier + ")" ),
+		CLASS: new RegExp( "^\\.(" + identifier + ")" ),
+		TAG: new RegExp( "^(" + identifier + "|[*])" ),
+		ATTR: new RegExp( "^" + attributes ),
+		PSEUDO: new RegExp( "^" + pseudos ),
+		CHILD: new RegExp(
+			"^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" +
+				whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" +
+				whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		bool: new RegExp( "^(?:" + booleans + ")$", "i" ),
 
 		// For use in libraries implementing .is()
 		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace +
+		needsContext: new RegExp( "^" + whitespace +
 			"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
 			"*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
 	},
 
-	rhtml = /HTML$/i,
 	rinputs = /^(?:input|select|textarea|button)$/i,
 	rheader = /^h\d$/i,
 
-	rnative = /^[^{]+\{\s*\[native \w/,
-
 	// Easily-parseable/retrievable ID or TAG or CLASS selectors
 	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
 
 	rsibling = /[+~]/,
 
 	// CSS escapes
-	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ),
+	// https://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace +
+		"?|\\\\([^\\r\\n\\f])", "g" ),
 	funescape = function( escape, nonHex ) {
 		var high = "0x" + escape.slice( 1 ) - 0x10000;
 
-		return nonHex ?
+		if ( nonHex ) {
 
 			// Strip the backslash prefix from a non-hex escape sequence
-			nonHex :
-
-			// Replace a hexadecimal escape sequence with the encoded Unicode code point
-			// Support: IE <=11+
-			// For values outside the Basic Multilingual Plane (BMP), manually construct a
-			// surrogate pair
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	},
-
-	// CSS string/identifier serialization
-	// https://drafts.csswg.org/cssom/#common-serializing-idioms
-	rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,
-	fcssescape = function( ch, asCodePoint ) {
-		if ( asCodePoint ) {
-
-			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
-			if ( ch === "\0" ) {
-				return "\uFFFD";
-			}
-
-			// Control characters and (dependent upon position) numbers get escaped as code points
-			return ch.slice( 0, -1 ) + "\\" +
-				ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+			return nonHex;
 		}
 
-		// Other potentially-special ASCII characters get backslash-escaped
-		return "\\" + ch;
+		// Replace a hexadecimal escape sequence with the encoded Unicode code point
+		// Support: IE <=11+
+		// For values outside the Basic Multilingual Plane (BMP), manually construct a
+		// surrogate pair
+		return high < 0 ?
+			String.fromCharCode( high + 0x10000 ) :
+			String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
 	},
 
-	// Used for iframes
-	// See setDocument()
+	// Used for iframes; see `setDocument`.
+	// Support: IE 9 - 11+, Edge 12 - 18+
 	// Removing the function wrapper causes a "Permission Denied"
-	// error in IE
+	// error in IE/Edge.
 	unloadHandler = function() {
 		setDocument();
 	},
 
 	inDisabledFieldset = addCombinator(
 		function( elem ) {
-			return elem.disabled === true && elem.nodeName.toLowerCase() === "fieldset";
+			return elem.disabled === true && nodeName( elem, "fieldset" );
 		},
 		{ dir: "parentNode", next: "legend" }
 	);
 
+// Support: IE <=9 only
+// Accessing document.activeElement can throw unexpectedly
+// https://bugs.jquery.com/ticket/13393
+function safeActiveElement() {
+	try {
+		return document.activeElement;
+	} catch ( err ) { }
+}
+
 // Optimize for push.apply( _, NodeList )
 try {
 	push.apply(
@@ -731,32 +787,22 @@ try {
 		preferredDoc.childNodes
 	);
 
-	// Support: Android<4.0
+	// Support: Android <=4.0
 	// Detect silently failing push.apply
 	// eslint-disable-next-line no-unused-expressions
 	arr[ preferredDoc.childNodes.length ].nodeType;
 } catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
+	push = {
+		apply: function( target, els ) {
 			pushNative.apply( target, slice.call( els ) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-
-			// Can't trust NodeList.length
-			while ( ( target[ j++ ] = els[ i++ ] ) ) {}
-			target.length = j - 1;
+		},
+		call: function( target ) {
+			pushNative.apply( target, slice.call( arguments, 1 ) );
 		}
 	};
 }
 
-function Sizzle( selector, context, results, seed ) {
+function find( selector, context, results, seed ) {
 	var m, i, elem, nid, match, groups, newSelector,
 		newContext = context && context.ownerDocument,
 
@@ -790,11 +836,10 @@ function Sizzle( selector, context, results, seed ) {
 					if ( nodeType === 9 ) {
 						if ( ( elem = context.getElementById( m ) ) ) {
 
-							// Support: IE, Opera, Webkit
-							// TODO: identify versions
+							// Support: IE 9 only
 							// getElementById can match elements by name instead of ID
 							if ( elem.id === m ) {
-								results.push( elem );
+								push.call( results, elem );
 								return results;
 							}
 						} else {
@@ -804,14 +849,13 @@ function Sizzle( selector, context, results, seed ) {
 					// Element context
 					} else {
 
-						// Support: IE, Opera, Webkit
-						// TODO: identify versions
+						// Support: IE 9 only
 						// getElementById can match elements by name instead of ID
 						if ( newContext && ( elem = newContext.getElementById( m ) ) &&
-							contains( context, elem ) &&
+							find.contains( context, elem ) &&
 							elem.id === m ) {
 
-							results.push( elem );
+							push.call( results, elem );
 							return results;
 						}
 					}
@@ -822,22 +866,15 @@ function Sizzle( selector, context, results, seed ) {
 					return results;
 
 				// Class selector
-				} else if ( ( m = match[ 3 ] ) && support.getElementsByClassName &&
-					context.getElementsByClassName ) {
-
+				} else if ( ( m = match[ 3 ] ) && context.getElementsByClassName ) {
 					push.apply( results, context.getElementsByClassName( m ) );
 					return results;
 				}
 			}
 
 			// Take advantage of querySelectorAll
-			if ( support.qsa &&
-				!nonnativeSelectorCache[ selector + " " ] &&
-				( !rbuggyQSA || !rbuggyQSA.test( selector ) ) &&
-
-				// Support: IE 8 only
-				// Exclude object elements
-				( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) {
+			if ( !nonnativeSelectorCache[ selector + " " ] &&
+				( !rbuggyQSA || !rbuggyQSA.test( selector ) ) ) {
 
 				newSelector = selector;
 				newContext = context;
@@ -850,7 +887,7 @@ function Sizzle( selector, context, results, seed ) {
 				// as such selectors are not recognized by querySelectorAll.
 				// Thanks to Andrew Dupont for this technique.
 				if ( nodeType === 1 &&
-					( rdescend.test( selector ) || rcombinators.test( selector ) ) ) {
+					( rdescend.test( selector ) || rleadingCombinator.test( selector ) ) ) {
 
 					// Expand context for sibling selectors
 					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
@@ -858,11 +895,15 @@ function Sizzle( selector, context, results, seed ) {
 
 					// We can use :scope instead of the ID hack if the browser
 					// supports it & if we're not changing the context.
-					if ( newContext !== context || !support.scope ) {
+					// Support: IE 11+, Edge 17 - 18+
+					// IE/Edge sometimes throw a "Permission denied" error when
+					// strict-comparing two documents; shallow comparisons work.
+					// eslint-disable-next-line eqeqeq
+					if ( newContext != context || !support.scope ) {
 
 						// Capture the context ID, setting it first if necessary
 						if ( ( nid = context.getAttribute( "id" ) ) ) {
-							nid = nid.replace( rcssescape, fcssescape );
+							nid = jQuery.escapeSelector( nid );
 						} else {
 							context.setAttribute( "id", ( nid = expando ) );
 						}
@@ -895,7 +936,7 @@ function Sizzle( selector, context, results, seed ) {
 	}
 
 	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+	return select( selector.replace( rtrimCSS, "$1" ), context, results, seed );
 }
 
 /**
@@ -909,7 +950,8 @@ function createCache() {
 
 	function cache( key, value ) {
 
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+		// Use (key + " ") to avoid collision with native prototype properties
+		// (see https://github.com/jquery/sizzle/issues/157)
 		if ( keys.push( key + " " ) > Expr.cacheLength ) {
 
 			// Only keep the most recent entries
@@ -921,7 +963,7 @@ function createCache() {
 }
 
 /**
- * Mark a function for special use by Sizzle
+ * Mark a function for special use by jQuery selector module
  * @param {Function} fn The function to mark
  */
 function markFunction( fn ) {
@@ -952,56 +994,13 @@ function assert( fn ) {
 	}
 }
 
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split( "|" ),
-		i = arr.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[ i ] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			a.sourceIndex - b.sourceIndex;
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( ( cur = cur.nextSibling ) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
 /**
  * Returns a function to use in pseudos for input types
  * @param {String} type
  */
 function createInputPseudo( type ) {
 	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
+		return nodeName( elem, "input" ) && elem.type === type;
 	};
 }
 
@@ -1011,8 +1010,8 @@ function createInputPseudo( type ) {
  */
 function createButtonPseudo( type ) {
 	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return ( name === "input" || name === "button" ) && elem.type === type;
+		return ( nodeName( elem, "input" ) || nodeName( elem, "button" ) ) &&
+			elem.type === type;
 	};
 }
 
@@ -1048,14 +1047,13 @@ function createDisabledPseudo( disabled ) {
 					}
 				}
 
-				// Support: IE 6 - 11
+				// Support: IE 6 - 11+
 				// Use the isDisabled shortcut property to check for disabled fieldset ancestors
 				return elem.isDisabled === disabled ||
 
 					// Where there is no isDisabled, check manually
-					/* jshint -W018 */
 					elem.isDisabled !== !disabled &&
-					inDisabledFieldset( elem ) === disabled;
+						inDisabledFieldset( elem ) === disabled;
 			}
 
 			return elem.disabled === disabled;
@@ -1095,7 +1093,7 @@ function createPositionalPseudo( fn ) {
 }
 
 /**
- * Checks a node for validity as a Sizzle context
+ * Checks a node for validity as a jQuery selector context
  * @param {Element|Object=} context
  * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
  */
@@ -1103,31 +1101,13 @@ function testContext( context ) {
 	return context && typeof context.getElementsByTagName !== "undefined" && context;
 }
 
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	var namespace = elem && elem.namespaceURI,
-		docElem = elem && ( elem.ownerDocument || elem ).documentElement;
-
-	// Support: IE <=8
-	// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
-	// https://bugs.jquery.com/ticket/4833
-	return !rhtml.test( namespace || docElem && docElem.nodeName || "HTML" );
-};
-
 /**
  * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @param {Element|Object} [node] An element or document object to use to set the document
  * @returns {Object} Returns the current document
  */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, subWindow,
+function setDocument( node ) {
+	var subWindow,
 		doc = node ? node.ownerDocument || node : preferredDoc;
 
 	// Return early if doc is invalid or already selected
@@ -1141,87 +1121,90 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Update global variables
 	document = doc;
-	docElem = document.documentElement;
-	documentIsHTML = !isXML( document );
+	documentElement = document.documentElement;
+	documentIsHTML = !jQuery.isXMLDoc( document );
+
+	// Support: iOS 7 only, IE 9 - 11+
+	// Older browsers didn't support unprefixed `matches`.
+	matches = documentElement.matches ||
+		documentElement.webkitMatchesSelector ||
+		documentElement.msMatchesSelector;
 
 	// Support: IE 9 - 11+, Edge 12 - 18+
-	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	// Support: IE 11+, Edge 17 - 18+
-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-	// two documents; shallow comparisons work.
-	// eslint-disable-next-line eqeqeq
-	if ( preferredDoc != document &&
+	// Accessing iframe documents after unload throws "permission denied" errors
+	// (see trac-13936).
+	// Limit the fix to IE & Edge Legacy; despite Edge 15+ implementing `matches`,
+	// all IE 9+ and Edge Legacy versions implement `msMatchesSelector` as well.
+	if ( documentElement.msMatchesSelector &&
+
+		// Support: IE 11+, Edge 17 - 18+
+		// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+		// two documents; shallow comparisons work.
+		// eslint-disable-next-line eqeqeq
+		preferredDoc != document &&
 		( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
 
-		// Support: IE 11, Edge
-		if ( subWindow.addEventListener ) {
-			subWindow.addEventListener( "unload", unloadHandler, false );
-
-		// Support: IE 9 - 10 only
-		} else if ( subWindow.attachEvent ) {
-			subWindow.attachEvent( "onunload", unloadHandler );
-		}
+		// Support: IE 9 - 11+, Edge 12 - 18+
+		subWindow.addEventListener( "unload", unloadHandler );
 	}
 
-	// Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only,
-	// Safari 4 - 5 only, Opera <=11.6 - 12.x only
-	// IE/Edge & older browsers don't support the :scope pseudo-class.
-	// Support: Safari 6.0 only
-	// Safari 6.0 supports :scope but it's an alias of :root there.
-	support.scope = assert( function( el ) {
-		docElem.appendChild( el ).appendChild( document.createElement( "div" ) );
-		return typeof el.querySelectorAll !== "undefined" &&
-			!el.querySelectorAll( ":scope fieldset div" ).length;
-	} );
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties
-	// (excepting IE8 booleans)
-	support.attributes = assert( function( el ) {
-		el.className = "i";
-		return !el.getAttribute( "className" );
-	} );
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert( function( el ) {
-		el.appendChild( document.createComment( "" ) );
-		return !el.getElementsByTagName( "*" ).length;
-	} );
-
-	// Support: IE<9
-	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
-
-	// Support: IE<10
+	// Support: IE <10
 	// Check if getElementById returns elements by name
 	// The broken getElementById methods don't pick up programmatically-set names,
 	// so use a roundabout getElementsByName test
 	support.getById = assert( function( el ) {
-		docElem.appendChild( el ).id = expando;
-		return !document.getElementsByName || !document.getElementsByName( expando ).length;
+		documentElement.appendChild( el ).id = jQuery.expando;
+		return !document.getElementsByName ||
+			!document.getElementsByName( jQuery.expando ).length;
+	} );
+
+	// Support: IE 9 only
+	// Check to see if it's possible to do matchesSelector
+	// on a disconnected node.
+	support.disconnectedMatch = assert( function( el ) {
+		return matches.call( el, "*" );
+	} );
+
+	// Support: IE 9 - 11+, Edge 12 - 18+
+	// IE/Edge don't support the :scope pseudo-class.
+	support.scope = assert( function() {
+		return document.querySelectorAll( ":scope" );
+	} );
+
+	// Support: Chrome 105 - 111 only, Safari 15.4 - 16.3 only
+	// Make sure the `:has()` argument is parsed unforgivingly.
+	// We include `*` in the test to detect buggy implementations that are
+	// _selectively_ forgiving (specifically when the list includes at least
+	// one valid selector).
+	// Note that we treat complete lack of support for `:has()` as if it were
+	// spec-compliant support, which is fine because use of `:has()` in such
+	// environments will fail in the qSA path and fall back to jQuery traversal
+	// anyway.
+	support.cssHas = assert( function() {
+		try {
+			document.querySelector( ":has(*,:jqfake)" );
+			return false;
+		} catch ( e ) {
+			return true;
+		}
 	} );
 
 	// ID filter and find
 	if ( support.getById ) {
-		Expr.filter[ "ID" ] = function( id ) {
+		Expr.filter.ID = function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
 				return elem.getAttribute( "id" ) === attrId;
 			};
 		};
-		Expr.find[ "ID" ] = function( id, context ) {
+		Expr.find.ID = function( id, context ) {
 			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var elem = context.getElementById( id );
 				return elem ? [ elem ] : [];
 			}
 		};
 	} else {
-		Expr.filter[ "ID" ] =  function( id ) {
+		Expr.filter.ID =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
 				var node = typeof elem.getAttributeNode !== "undefined" &&
@@ -1232,7 +1215,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Support: IE 6 - 7 only
 		// getElementById is not reliable as a find shortcut
-		Expr.find[ "ID" ] = function( id, context ) {
+		Expr.find.ID = function( id, context ) {
 			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var node, i, elems,
 					elem = context.getElementById( id );
@@ -1262,40 +1245,18 @@ setDocument = Sizzle.setDocument = function( node ) {
 	}
 
 	// Tag
-	Expr.find[ "TAG" ] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( tag );
+	Expr.find.TAG = function( tag, context ) {
+		if ( typeof context.getElementsByTagName !== "undefined" ) {
+			return context.getElementsByTagName( tag );
 
-			// DocumentFragment nodes don't have gEBTN
-			} else if ( support.qsa ) {
-				return context.querySelectorAll( tag );
-			}
-		} :
-
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-
-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( ( elem = results[ i++ ] ) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
+		// DocumentFragment nodes don't have gEBTN
+		} else {
+			return context.querySelectorAll( tag );
+		}
+	};
 
 	// Class
-	Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) {
+	Expr.find.CLASS = function( className, context ) {
 		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
 			return context.getElementsByClassName( className );
 		}
@@ -1306,177 +1267,94 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// QSA and matchesSelector support
 
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See https://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
-	if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) {
+	// Build QSA regex
+	// Regex strategy adopted from Diego Perini
+	assert( function( el ) {
 
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert( function( el ) {
+		var input;
 
-			var input;
+		documentElement.appendChild( el ).innerHTML =
+			"<a id='" + expando + "' href='' disabled='disabled'></a>" +
+			"<select id='" + expando + "-\r\\' disabled='disabled'>" +
+			"<option selected=''></option></select>";
 
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// https://bugs.jquery.com/ticket/12359
-			docElem.appendChild( el ).innerHTML = "<a id='" + expando + "'></a>" +
-				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
-				"<option selected=''></option></select>";
+		// Support: iOS <=7 - 8 only
+		// Boolean attributes and "value" are not treated correctly in some XML documents
+		if ( !el.querySelectorAll( "[selected]" ).length ) {
+			rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+		}
 
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
+		// Support: iOS <=7 - 8 only
+		if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+			rbuggyQSA.push( "~=" );
+		}
 
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !el.querySelectorAll( "[selected]" ).length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
+		// Support: iOS 8 only
+		// https://bugs.webkit.org/show_bug.cgi?id=136851
+		// In-page `selector#id sibling-combinator selector` fails
+		if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
+			rbuggyQSA.push( ".#.+[+~]" );
+		}
 
-			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
-			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push( "~=" );
-			}
+		// Support: Chrome <=105+, Firefox <=104+, Safari <=15.4+
+		// In some of the document kinds, these selectors wouldn't work natively.
+		// This is probably OK but for backwards compatibility we want to maintain
+		// handling them through jQuery traversal in jQuery 3.x.
+		if ( !el.querySelectorAll( ":checked" ).length ) {
+			rbuggyQSA.push( ":checked" );
+		}
 
-			// Support: IE 11+, Edge 15 - 18+
-			// IE 11/Edge don't find elements on a `[name='']` query in some cases.
-			// Adding a temporary attribute to the document before the selection works
-			// around the issue.
-			// Interestingly, IE 10 & older don't seem to have the issue.
-			input = document.createElement( "input" );
-			input.setAttribute( "name", "" );
-			el.appendChild( input );
-			if ( !el.querySelectorAll( "[name='']" ).length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" +
-					whitespace + "*(?:''|\"\")" );
-			}
+		// Support: Windows 8 Native Apps
+		// The type and name attributes are restricted during .innerHTML assignment
+		input = document.createElement( "input" );
+		input.setAttribute( "type", "hidden" );
+		el.appendChild( input ).setAttribute( "name", "D" );
 
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !el.querySelectorAll( ":checked" ).length ) {
-				rbuggyQSA.push( ":checked" );
-			}
+		// Support: IE 9 - 11+
+		// IE's :disabled selector does not pick up the children of disabled fieldsets
+		// Support: Chrome <=105+, Firefox <=104+, Safari <=15.4+
+		// In some of the document kinds, these selectors wouldn't work natively.
+		// This is probably OK but for backwards compatibility we want to maintain
+		// handling them through jQuery traversal in jQuery 3.x.
+		documentElement.appendChild( el ).disabled = true;
+		if ( el.querySelectorAll( ":disabled" ).length !== 2 ) {
+			rbuggyQSA.push( ":enabled", ":disabled" );
+		}
 
-			// Support: Safari 8+, iOS 8+
-			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibling-combinator selector` fails
-			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push( ".#.+[+~]" );
-			}
+		// Support: IE 11+, Edge 15 - 18+
+		// IE 11/Edge don't find elements on a `[name='']` query in some cases.
+		// Adding a temporary attribute to the document before the selection works
+		// around the issue.
+		// Interestingly, IE 10 & older don't seem to have the issue.
+		input = document.createElement( "input" );
+		input.setAttribute( "name", "" );
+		el.appendChild( input );
+		if ( !el.querySelectorAll( "[name='']" ).length ) {
+			rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" +
+				whitespace + "*(?:''|\"\")" );
+		}
+	} );
 
-			// Support: Firefox <=3.6 - 5 only
-			// Old Firefox doesn't throw on a badly-escaped identifier.
-			el.querySelectorAll( "\\\f" );
-			rbuggyQSA.push( "[\\r\\n\\f]" );
-		} );
+	if ( !support.cssHas ) {
 
-		assert( function( el ) {
-			el.innerHTML = "<a href='' disabled='disabled'></a>" +
-				"<select disabled='disabled'><option/></select>";
-
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = document.createElement( "input" );
-			input.setAttribute( "type", "hidden" );
-			el.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( el.querySelectorAll( "[name=d]" ).length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( el.querySelectorAll( ":enabled" ).length !== 2 ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Support: IE9-11+
-			// IE's :disabled selector does not pick up the children of disabled fieldsets
-			docElem.appendChild( el ).disabled = true;
-			if ( el.querySelectorAll( ":disabled" ).length !== 2 ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Support: Opera 10 - 11 only
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			el.querySelectorAll( "*,:x" );
-			rbuggyQSA.push( ",.*:" );
-		} );
-	}
-
-	if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector ) ) ) ) {
-
-		assert( function( el ) {
-
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( el, "*" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( el, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		} );
+		// Support: Chrome 105 - 110+, Safari 15.4 - 16.3+
+		// Our regular `try-catch` mechanism fails to detect natively-unsupported
+		// pseudo-classes inside `:has()` (such as `:has(:contains("Foo"))`)
+		// in browsers that parse the `:has()` argument as a forgiving selector list.
+		// https://drafts.csswg.org/selectors/#relational now requires the argument
+		// to be parsed unforgivingly, but browsers have not yet fully adjusted.
+		rbuggyQSA.push( ":has" );
 	}
 
 	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully self-exclusive
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			) );
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( ( b = b.parentNode ) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
 
 	/* Sorting
 	---------------------------------------------------------------------- */
 
 	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
+	sortOrder = function( a, b ) {
 
 		// Flag for duplicate removal
 		if ( a === b ) {
@@ -1510,8 +1388,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
 			// two documents; shallow comparisons work.
 			// eslint-disable-next-line eqeqeq
-			if ( a == document || a.ownerDocument == preferredDoc &&
-				contains( preferredDoc, a ) ) {
+			if ( a === document || a.ownerDocument == preferredDoc &&
+				find.contains( preferredDoc, a ) ) {
 				return -1;
 			}
 
@@ -1519,100 +1397,33 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
 			// two documents; shallow comparisons work.
 			// eslint-disable-next-line eqeqeq
-			if ( b == document || b.ownerDocument == preferredDoc &&
-				contains( preferredDoc, b ) ) {
+			if ( b === document || b.ownerDocument == preferredDoc &&
+				find.contains( preferredDoc, b ) ) {
 				return 1;
 			}
 
 			// Maintain original order
 			return sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
 				0;
 		}
 
 		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-
-			// Support: IE 11+, Edge 17 - 18+
-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-			// two documents; shallow comparisons work.
-			/* eslint-disable eqeqeq */
-			return a == document ? -1 :
-				b == document ? 1 :
-				/* eslint-enable eqeqeq */
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( ( cur = cur.parentNode ) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( ( cur = cur.parentNode ) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[ i ] === bp[ i ] ) {
-			i++;
-		}
-
-		return i ?
-
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[ i ], bp[ i ] ) :
-
-			// Otherwise nodes in our document sort first
-			// Support: IE 11+, Edge 17 - 18+
-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-			// two documents; shallow comparisons work.
-			/* eslint-disable eqeqeq */
-			ap[ i ] == preferredDoc ? -1 :
-			bp[ i ] == preferredDoc ? 1 :
-			/* eslint-enable eqeqeq */
-			0;
 	};
 
 	return document;
+}
+
+find.matches = function( expr, elements ) {
+	return find( expr, null, null, elements );
 };
 
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
+find.matchesSelector = function( elem, expr ) {
 	setDocument( elem );
 
-	if ( support.matchesSelector && documentIsHTML &&
+	if ( documentIsHTML &&
 		!nonnativeSelectorCache[ expr + " " ] &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+		( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) {
 
 		try {
 			var ret = matches.call( elem, expr );
@@ -1620,9 +1431,9 @@ Sizzle.matchesSelector = function( elem, expr ) {
 			// IE 9's matchesSelector returns false on disconnected nodes
 			if ( ret || support.disconnectedMatch ||
 
-				// As well, disconnected nodes are said to be in a document
-				// fragment in IE 9
-				elem.document && elem.document.nodeType !== 11 ) {
+					// As well, disconnected nodes are said to be in a document
+					// fragment in IE 9
+					elem.document && elem.document.nodeType !== 11 ) {
 				return ret;
 			}
 		} catch ( e ) {
@@ -1630,10 +1441,10 @@ Sizzle.matchesSelector = function( elem, expr ) {
 		}
 	}
 
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
+	return find( expr, document, null, [ elem ] ).length > 0;
 };
 
-Sizzle.contains = function( context, elem ) {
+find.contains = function( context, elem ) {
 
 	// Set document vars if needed
 	// Support: IE 11+, Edge 17 - 18+
@@ -1643,10 +1454,11 @@ Sizzle.contains = function( context, elem ) {
 	if ( ( context.ownerDocument || context ) != document ) {
 		setDocument( context );
 	}
-	return contains( context, elem );
+	return jQuery.contains( context, elem );
 };
 
-Sizzle.attr = function( elem, name ) {
+
+find.attr = function( elem, name ) {
 
 	// Set document vars if needed
 	// Support: IE 11+, Edge 17 - 18+
@@ -1659,25 +1471,19 @@ Sizzle.attr = function( elem, name ) {
 
 	var fn = Expr.attrHandle[ name.toLowerCase() ],
 
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
+		// Don't get fooled by Object.prototype properties (see trac-13807)
 		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
 			fn( elem, name, !documentIsHTML ) :
 			undefined;
 
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			( val = elem.getAttributeNode( name ) ) && val.specified ?
-				val.value :
-				null;
+	if ( val !== undefined ) {
+		return val;
+	}
+
+	return elem.getAttribute( name );
 };
 
-Sizzle.escape = function( sel ) {
-	return ( sel + "" ).replace( rcssescape, fcssescape );
-};
-
-Sizzle.error = function( msg ) {
+find.error = function( msg ) {
 	throw new Error( "Syntax error, unrecognized expression: " + msg );
 };
 
@@ -1685,16 +1491,20 @@ Sizzle.error = function( msg ) {
  * Document sorting and removing duplicates
  * @param {ArrayLike} results
  */
-Sizzle.uniqueSort = function( results ) {
+jQuery.uniqueSort = function( results ) {
 	var elem,
 		duplicates = [],
 		j = 0,
 		i = 0;
 
 	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
+	//
+	// Support: Android <=4.0+
+	// Testing for detecting duplicates is unpredictable so instead assume we can't
+	// depend on duplicate detection in all browsers without a stable sort.
+	hasDuplicate = !support.sortStable;
+	sortInput = !support.sortStable && slice.call( results, 0 );
+	sort.call( results, sortOrder );
 
 	if ( hasDuplicate ) {
 		while ( ( elem = results[ i++ ] ) ) {
@@ -1703,7 +1513,7 @@ Sizzle.uniqueSort = function( results ) {
 			}
 		}
 		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
+			splice.call( results, duplicates[ j ], 1 );
 		}
 	}
 
@@ -1714,47 +1524,11 @@ Sizzle.uniqueSort = function( results ) {
 	return results;
 };
 
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-
-		// If no nodeType, this is expected to be an array
-		while ( ( node = elem[ i++ ] ) ) {
-
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-
-	// Do not include comment or processing instruction nodes
-
-	return ret;
+jQuery.fn.uniqueSort = function() {
+	return this.pushStack( jQuery.uniqueSort( slice.apply( this ) ) );
 };
 
-Expr = Sizzle.selectors = {
+Expr = jQuery.expr = {
 
 	// Can be adjusted by the user
 	cacheLength: 50,
@@ -1775,12 +1549,12 @@ Expr = Sizzle.selectors = {
 	},
 
 	preFilter: {
-		"ATTR": function( match ) {
+		ATTR: function( match ) {
 			match[ 1 ] = match[ 1 ].replace( runescape, funescape );
 
 			// Move the given value to match[3] whether quoted or unquoted
-			match[ 3 ] = ( match[ 3 ] || match[ 4 ] ||
-				match[ 5 ] || "" ).replace( runescape, funescape );
+			match[ 3 ] = ( match[ 3 ] || match[ 4 ] || match[ 5 ] || "" )
+				.replace( runescape, funescape );
 
 			if ( match[ 2 ] === "~=" ) {
 				match[ 3 ] = " " + match[ 3 ] + " ";
@@ -1789,7 +1563,7 @@ Expr = Sizzle.selectors = {
 			return match.slice( 0, 4 );
 		},
 
-		"CHILD": function( match ) {
+		CHILD: function( match ) {
 
 			/* matches from matchExpr["CHILD"]
 				1 type (only|nth|...)
@@ -1807,29 +1581,30 @@ Expr = Sizzle.selectors = {
 
 				// nth-* requires argument
 				if ( !match[ 3 ] ) {
-					Sizzle.error( match[ 0 ] );
+					find.error( match[ 0 ] );
 				}
 
 				// numeric x and y parameters for Expr.filter.CHILD
 				// remember that false/true cast respectively to 0/1
 				match[ 4 ] = +( match[ 4 ] ?
 					match[ 5 ] + ( match[ 6 ] || 1 ) :
-					2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" ) );
+					2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" )
+				);
 				match[ 5 ] = +( ( match[ 7 ] + match[ 8 ] ) || match[ 3 ] === "odd" );
 
-				// other types prohibit arguments
+			// other types prohibit arguments
 			} else if ( match[ 3 ] ) {
-				Sizzle.error( match[ 0 ] );
+				find.error( match[ 0 ] );
 			}
 
 			return match;
 		},
 
-		"PSEUDO": function( match ) {
+		PSEUDO: function( match ) {
 			var excess,
 				unquoted = !match[ 6 ] && match[ 2 ];
 
-			if ( matchExpr[ "CHILD" ].test( match[ 0 ] ) ) {
+			if ( matchExpr.CHILD.test( match[ 0 ] ) ) {
 				return null;
 			}
 
@@ -1858,36 +1633,36 @@ Expr = Sizzle.selectors = {
 
 	filter: {
 
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+		TAG: function( nodeNameSelector ) {
+			var expectedNodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
 			return nodeNameSelector === "*" ?
 				function() {
 					return true;
 				} :
 				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+					return nodeName( elem, expectedNodeName );
 				};
 		},
 
-		"CLASS": function( className ) {
+		CLASS: function( className ) {
 			var pattern = classCache[ className + " " ];
 
 			return pattern ||
-				( pattern = new RegExp( "(^|" + whitespace +
-					")" + className + "(" + whitespace + "|$)" ) ) && classCache(
-						className, function( elem ) {
-							return pattern.test(
-								typeof elem.className === "string" && elem.className ||
-								typeof elem.getAttribute !== "undefined" &&
-									elem.getAttribute( "class" ) ||
-								""
-							);
+				( pattern = new RegExp( "(^|" + whitespace + ")" + className +
+					"(" + whitespace + "|$)" ) ) &&
+				classCache( className, function( elem ) {
+					return pattern.test(
+						typeof elem.className === "string" && elem.className ||
+							typeof elem.getAttribute !== "undefined" &&
+								elem.getAttribute( "class" ) ||
+							""
+					);
 				} );
 		},
 
-		"ATTR": function( name, operator, check ) {
+		ATTR: function( name, operator, check ) {
 			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
+				var result = find.attr( elem, name );
 
 				if ( result == null ) {
 					return operator === "!=";
@@ -1898,22 +1673,34 @@ Expr = Sizzle.selectors = {
 
 				result += "";
 
-				/* eslint-disable max-len */
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-				/* eslint-enable max-len */
+				if ( operator === "=" ) {
+					return result === check;
+				}
+				if ( operator === "!=" ) {
+					return result !== check;
+				}
+				if ( operator === "^=" ) {
+					return check && result.indexOf( check ) === 0;
+				}
+				if ( operator === "*=" ) {
+					return check && result.indexOf( check ) > -1;
+				}
+				if ( operator === "$=" ) {
+					return check && result.slice( -check.length ) === check;
+				}
+				if ( operator === "~=" ) {
+					return ( " " + result.replace( rwhitespace, " " ) + " " )
+						.indexOf( check ) > -1;
+				}
+				if ( operator === "|=" ) {
+					return result === check || result.slice( 0, check.length + 1 ) === check + "-";
+				}
 
+				return false;
 			};
 		},
 
-		"CHILD": function( type, what, _argument, first, last ) {
+		CHILD: function( type, what, _argument, first, last ) {
 			var simple = type.slice( 0, 3 ) !== "nth",
 				forward = type.slice( -4 ) !== "last",
 				ofType = what === "of-type";
@@ -1926,7 +1713,7 @@ Expr = Sizzle.selectors = {
 				} :
 
 				function( elem, _context, xml ) {
-					var cache, uniqueCache, outerCache, node, nodeIndex, start,
+					var cache, outerCache, node, nodeIndex, start,
 						dir = simple !== forward ? "nextSibling" : "previousSibling",
 						parent = elem.parentNode,
 						name = ofType && elem.nodeName.toLowerCase(),
@@ -1941,7 +1728,7 @@ Expr = Sizzle.selectors = {
 								node = elem;
 								while ( ( node = node[ dir ] ) ) {
 									if ( ofType ?
-										node.nodeName.toLowerCase() === name :
+										nodeName( node, name ) :
 										node.nodeType === 1 ) {
 
 										return false;
@@ -1960,17 +1747,8 @@ Expr = Sizzle.selectors = {
 						if ( forward && useCache ) {
 
 							// Seek `elem` from a previously-cached index
-
-							// ...in a gzip-friendly way
-							node = parent;
-							outerCache = node[ expando ] || ( node[ expando ] = {} );
-
-							// Support: IE <9 only
-							// Defend against cloned attroperties (jQuery gh-1709)
-							uniqueCache = outerCache[ node.uniqueID ] ||
-								( outerCache[ node.uniqueID ] = {} );
-
-							cache = uniqueCache[ type ] || [];
+							outerCache = parent[ expando ] || ( parent[ expando ] = {} );
+							cache = outerCache[ type ] || [];
 							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
 							diff = nodeIndex && cache[ 2 ];
 							node = nodeIndex && parent.childNodes[ nodeIndex ];
@@ -1982,7 +1760,7 @@ Expr = Sizzle.selectors = {
 
 								// When found, cache indexes on `parent` and break
 								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
+									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
 									break;
 								}
 							}
@@ -1991,17 +1769,8 @@ Expr = Sizzle.selectors = {
 
 							// Use previously-cached element index if available
 							if ( useCache ) {
-
-								// ...in a gzip-friendly way
-								node = elem;
-								outerCache = node[ expando ] || ( node[ expando ] = {} );
-
-								// Support: IE <9 only
-								// Defend against cloned attroperties (jQuery gh-1709)
-								uniqueCache = outerCache[ node.uniqueID ] ||
-									( outerCache[ node.uniqueID ] = {} );
-
-								cache = uniqueCache[ type ] || [];
+								outerCache = elem[ expando ] || ( elem[ expando ] = {} );
+								cache = outerCache[ type ] || [];
 								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
 								diff = nodeIndex;
 							}
@@ -2015,7 +1784,7 @@ Expr = Sizzle.selectors = {
 									( diff = nodeIndex = 0 ) || start.pop() ) ) {
 
 									if ( ( ofType ?
-										node.nodeName.toLowerCase() === name :
+										nodeName( node, name ) :
 										node.nodeType === 1 ) &&
 										++diff ) {
 
@@ -2023,13 +1792,7 @@ Expr = Sizzle.selectors = {
 										if ( useCache ) {
 											outerCache = node[ expando ] ||
 												( node[ expando ] = {} );
-
-											// Support: IE <9 only
-											// Defend against cloned attroperties (jQuery gh-1709)
-											uniqueCache = outerCache[ node.uniqueID ] ||
-												( outerCache[ node.uniqueID ] = {} );
-
-											uniqueCache[ type ] = [ dirruns, diff ];
+											outerCache[ type ] = [ dirruns, diff ];
 										}
 
 										if ( node === elem ) {
@@ -2047,19 +1810,19 @@ Expr = Sizzle.selectors = {
 				};
 		},
 
-		"PSEUDO": function( pseudo, argument ) {
+		PSEUDO: function( pseudo, argument ) {
 
 			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// https://www.w3.org/TR/selectors/#pseudo-classes
 			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
 			// Remember that setFilters inherits from pseudos
 			var args,
 				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
+					find.error( "unsupported pseudo: " + pseudo );
 
 			// The user may use createPseudo to indicate that
 			// arguments are needed to create the filter function
-			// just as Sizzle does
+			// just as jQuery does
 			if ( fn[ expando ] ) {
 				return fn( argument );
 			}
@@ -2073,7 +1836,7 @@ Expr = Sizzle.selectors = {
 							matched = fn( seed, argument ),
 							i = matched.length;
 						while ( i-- ) {
-							idx = indexOf( seed, matched[ i ] );
+							idx = indexOf.call( seed, matched[ i ] );
 							seed[ idx ] = !( matches[ idx ] = matched[ i ] );
 						}
 					} ) :
@@ -2089,14 +1852,14 @@ Expr = Sizzle.selectors = {
 	pseudos: {
 
 		// Potentially complex pseudos
-		"not": markFunction( function( selector ) {
+		not: markFunction( function( selector ) {
 
 			// Trim the selector passed to compile
 			// to avoid treating leading and trailing
 			// spaces as combinators
 			var input = [],
 				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
+				matcher = compile( selector.replace( rtrimCSS, "$1" ) );
 
 			return matcher[ expando ] ?
 				markFunction( function( seed, matches, _context, xml ) {
@@ -2115,22 +1878,23 @@ Expr = Sizzle.selectors = {
 					input[ 0 ] = elem;
 					matcher( input, null, xml, results );
 
-					// Don't keep the element (issue #299)
+					// Don't keep the element
+					// (see https://github.com/jquery/sizzle/issues/299)
 					input[ 0 ] = null;
 					return !results.pop();
 				};
 		} ),
 
-		"has": markFunction( function( selector ) {
+		has: markFunction( function( selector ) {
 			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
+				return find( selector, elem ).length > 0;
 			};
 		} ),
 
-		"contains": markFunction( function( text ) {
+		contains: markFunction( function( text ) {
 			text = text.replace( runescape, funescape );
 			return function( elem ) {
-				return ( elem.textContent || getText( elem ) ).indexOf( text ) > -1;
+				return ( elem.textContent || jQuery.text( elem ) ).indexOf( text ) > -1;
 			};
 		} ),
 
@@ -2140,12 +1904,12 @@ Expr = Sizzle.selectors = {
 		// or beginning with the identifier C immediately followed by "-".
 		// The matching of C against the element's language value is performed case-insensitively.
 		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
+		// https://www.w3.org/TR/selectors/#lang-pseudo
+		lang: markFunction( function( lang ) {
 
 			// lang value must be a valid identifier
 			if ( !ridentifier.test( lang || "" ) ) {
-				Sizzle.error( "unsupported lang: " + lang );
+				find.error( "unsupported lang: " + lang );
 			}
 			lang = lang.replace( runescape, funescape ).toLowerCase();
 			return function( elem ) {
@@ -2164,38 +1928,39 @@ Expr = Sizzle.selectors = {
 		} ),
 
 		// Miscellaneous
-		"target": function( elem ) {
+		target: function( elem ) {
 			var hash = window.location && window.location.hash;
 			return hash && hash.slice( 1 ) === elem.id;
 		},
 
-		"root": function( elem ) {
-			return elem === docElem;
+		root: function( elem ) {
+			return elem === documentElement;
 		},
 
-		"focus": function( elem ) {
-			return elem === document.activeElement &&
-				( !document.hasFocus || document.hasFocus() ) &&
+		focus: function( elem ) {
+			return elem === safeActiveElement() &&
+				document.hasFocus() &&
 				!!( elem.type || elem.href || ~elem.tabIndex );
 		},
 
 		// Boolean properties
-		"enabled": createDisabledPseudo( false ),
-		"disabled": createDisabledPseudo( true ),
+		enabled: createDisabledPseudo( false ),
+		disabled: createDisabledPseudo( true ),
 
-		"checked": function( elem ) {
+		checked: function( elem ) {
 
 			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return ( nodeName === "input" && !!elem.checked ) ||
-				( nodeName === "option" && !!elem.selected );
+			// https://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			return ( nodeName( elem, "input" ) && !!elem.checked ) ||
+				( nodeName( elem, "option" ) && !!elem.selected );
 		},
 
-		"selected": function( elem ) {
+		selected: function( elem ) {
 
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
+			// Support: IE <=11+
+			// Accessing the selectedIndex property
+			// forces the browser to treat the default option as
+			// selected when in an optgroup.
 			if ( elem.parentNode ) {
 				// eslint-disable-next-line no-unused-expressions
 				elem.parentNode.selectedIndex;
@@ -2205,9 +1970,9 @@ Expr = Sizzle.selectors = {
 		},
 
 		// Contents
-		"empty": function( elem ) {
+		empty: function( elem ) {
 
-			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// https://www.w3.org/TR/selectors/#empty-pseudo
 			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
 			//   but not by others (comment: 8; processing instruction: 7; etc.)
 			// nodeType < 6 works because attributes (2) do not appear as children
@@ -2219,49 +1984,49 @@ Expr = Sizzle.selectors = {
 			return true;
 		},
 
-		"parent": function( elem ) {
-			return !Expr.pseudos[ "empty" ]( elem );
+		parent: function( elem ) {
+			return !Expr.pseudos.empty( elem );
 		},
 
 		// Element/input types
-		"header": function( elem ) {
+		header: function( elem ) {
 			return rheader.test( elem.nodeName );
 		},
 
-		"input": function( elem ) {
+		input: function( elem ) {
 			return rinputs.test( elem.nodeName );
 		},
 
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
+		button: function( elem ) {
+			return nodeName( elem, "input" ) && elem.type === "button" ||
+				nodeName( elem, "button" );
 		},
 
-		"text": function( elem ) {
+		text: function( elem ) {
 			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
+			return nodeName( elem, "input" ) && elem.type === "text" &&
 
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+				// Support: IE <10 only
+				// New HTML5 attribute values (e.g., "search") appear
+				// with elem.type === "text"
 				( ( attr = elem.getAttribute( "type" ) ) == null ||
 					attr.toLowerCase() === "text" );
 		},
 
 		// Position-in-collection
-		"first": createPositionalPseudo( function() {
+		first: createPositionalPseudo( function() {
 			return [ 0 ];
 		} ),
 
-		"last": createPositionalPseudo( function( _matchIndexes, length ) {
+		last: createPositionalPseudo( function( _matchIndexes, length ) {
 			return [ length - 1 ];
 		} ),
 
-		"eq": createPositionalPseudo( function( _matchIndexes, length, argument ) {
+		eq: createPositionalPseudo( function( _matchIndexes, length, argument ) {
 			return [ argument < 0 ? argument + length : argument ];
 		} ),
 
-		"even": createPositionalPseudo( function( matchIndexes, length ) {
+		even: createPositionalPseudo( function( matchIndexes, length ) {
 			var i = 0;
 			for ( ; i < length; i += 2 ) {
 				matchIndexes.push( i );
@@ -2269,7 +2034,7 @@ Expr = Sizzle.selectors = {
 			return matchIndexes;
 		} ),
 
-		"odd": createPositionalPseudo( function( matchIndexes, length ) {
+		odd: createPositionalPseudo( function( matchIndexes, length ) {
 			var i = 1;
 			for ( ; i < length; i += 2 ) {
 				matchIndexes.push( i );
@@ -2277,19 +2042,24 @@ Expr = Sizzle.selectors = {
 			return matchIndexes;
 		} ),
 
-		"lt": createPositionalPseudo( function( matchIndexes, length, argument ) {
-			var i = argument < 0 ?
-				argument + length :
-				argument > length ?
-					length :
-					argument;
+		lt: createPositionalPseudo( function( matchIndexes, length, argument ) {
+			var i;
+
+			if ( argument < 0 ) {
+				i = argument + length;
+			} else if ( argument > length ) {
+				i = length;
+			} else {
+				i = argument;
+			}
+
 			for ( ; --i >= 0; ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
 		} ),
 
-		"gt": createPositionalPseudo( function( matchIndexes, length, argument ) {
+		gt: createPositionalPseudo( function( matchIndexes, length, argument ) {
 			var i = argument < 0 ? argument + length : argument;
 			for ( ; ++i < length; ) {
 				matchIndexes.push( i );
@@ -2299,7 +2069,7 @@ Expr = Sizzle.selectors = {
 	}
 };
 
-Expr.pseudos[ "nth" ] = Expr.pseudos[ "eq" ];
+Expr.pseudos.nth = Expr.pseudos.eq;
 
 // Add button/input type pseudos
 for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
@@ -2314,7 +2084,7 @@ function setFilters() {}
 setFilters.prototype = Expr.filters = Expr.pseudos;
 Expr.setFilters = new setFilters();
 
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
+function tokenize( selector, parseOnly ) {
 	var matched, match, tokens, type,
 		soFar, groups, preFilters,
 		cached = tokenCache[ selector + " " ];
@@ -2342,13 +2112,13 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 		matched = false;
 
 		// Combinators
-		if ( ( match = rcombinators.exec( soFar ) ) ) {
+		if ( ( match = rleadingCombinator.exec( soFar ) ) ) {
 			matched = match.shift();
 			tokens.push( {
 				value: matched,
 
 				// Cast descendant combinators to space
-				type: match[ 0 ].replace( rtrim, " " )
+				type: match[ 0 ].replace( rtrimCSS, " " )
 			} );
 			soFar = soFar.slice( matched.length );
 		}
@@ -2375,14 +2145,16 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 	// Return the length of the invalid excess
 	// if we're just parsing
 	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
+	if ( parseOnly ) {
+		return soFar.length;
+	}
 
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
+	return soFar ?
+		find.error( selector ) :
+
+		// Cache the tokens
+		tokenCache( selector, groups ).slice( 0 );
+}
 
 function toSelector( tokens ) {
 	var i = 0,
@@ -2415,7 +2187,7 @@ function addCombinator( matcher, combinator, base ) {
 
 		// Check against all ancestor/preceding elements
 		function( elem, context, xml ) {
-			var oldCache, uniqueCache, outerCache,
+			var oldCache, outerCache,
 				newCache = [ dirruns, doneName ];
 
 			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
@@ -2432,14 +2204,9 @@ function addCombinator( matcher, combinator, base ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
 						outerCache = elem[ expando ] || ( elem[ expando ] = {} );
 
-						// Support: IE <9 only
-						// Defend against cloned attroperties (jQuery gh-1709)
-						uniqueCache = outerCache[ elem.uniqueID ] ||
-							( outerCache[ elem.uniqueID ] = {} );
-
-						if ( skip && skip === elem.nodeName.toLowerCase() ) {
+						if ( skip && nodeName( elem, skip ) ) {
 							elem = elem[ dir ] || elem;
-						} else if ( ( oldCache = uniqueCache[ key ] ) &&
+						} else if ( ( oldCache = outerCache[ key ] ) &&
 							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
 
 							// Assign to newCache so results back-propagate to previous elements
@@ -2447,7 +2214,7 @@ function addCombinator( matcher, combinator, base ) {
 						} else {
 
 							// Reuse newcache so results back-propagate to previous elements
-							uniqueCache[ key ] = newCache;
+							outerCache[ key ] = newCache;
 
 							// A match means we're done; a fail means we have to keep checking
 							if ( ( newCache[ 2 ] = matcher( elem, context, xml ) ) ) {
@@ -2479,7 +2246,7 @@ function multipleContexts( selector, contexts, results ) {
 	var i = 0,
 		len = contexts.length;
 	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[ i ], results );
+		find( selector, contexts[ i ], results );
 	}
 	return results;
 }
@@ -2513,38 +2280,37 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 		postFinder = setMatcher( postFinder, postSelector );
 	}
 	return markFunction( function( seed, results, context, xml ) {
-		var temp, i, elem,
+		var temp, i, elem, matcherOut,
 			preMap = [],
 			postMap = [],
 			preexisting = results.length,
 
 			// Get initial elements from seed or context
-			elems = seed || multipleContexts(
-				selector || "*",
-				context.nodeType ? [ context ] : context,
-				[]
-			),
+			elems = seed ||
+				multipleContexts( selector || "*",
+					context.nodeType ? [ context ] : context, [] ),
 
 			// Prefilter to get matcher input, preserving a map for seed-results synchronization
 			matcherIn = preFilter && ( seed || !selector ) ?
 				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
+				elems;
 
-			matcherOut = matcher ?
-
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
 		if ( matcher ) {
+
+			// If we have a postFinder, or filtered seed, or non-seed postFilter
+			// or preexisting results,
+			matcherOut = postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+				// ...intermediate processing is necessary
+				[] :
+
+				// ...otherwise use results directly
+				results;
+
+			// Find primary matches
 			matcher( matcherIn, matcherOut, context, xml );
+		} else {
+			matcherOut = matcherIn;
 		}
 
 		// Apply postFilter
@@ -2582,7 +2348,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				i = matcherOut.length;
 				while ( i-- ) {
 					if ( ( elem = matcherOut[ i ] ) &&
-						( temp = postFinder ? indexOf( seed, elem ) : preMap[ i ] ) > -1 ) {
+						( temp = postFinder ? indexOf.call( seed, elem ) : preMap[ i ] ) > -1 ) {
 
 						seed[ temp ] = !( results[ temp ] = elem );
 					}
@@ -2617,15 +2383,21 @@ function matcherFromTokens( tokens ) {
 			return elem === checkContext;
 		}, implicitRelative, true ),
 		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf( checkContext, elem ) > -1;
+			return indexOf.call( checkContext, elem ) > -1;
 		}, implicitRelative, true ),
 		matchers = [ function( elem, context, xml ) {
-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			// eslint-disable-next-line eqeqeq
+			var ret = ( !leadingRelative && ( xml || context != outermostContext ) ) || (
 				( checkContext = context ).nodeType ?
 					matchContext( elem, context, xml ) :
 					matchAnyContext( elem, context, xml ) );
 
-			// Avoid hanging onto element (issue #299)
+			// Avoid hanging onto element
+			// (see https://github.com/jquery/sizzle/issues/299)
 			checkContext = null;
 			return ret;
 		} ];
@@ -2650,11 +2422,10 @@ function matcherFromTokens( tokens ) {
 					i > 1 && elementMatcher( matchers ),
 					i > 1 && toSelector(
 
-					// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-					tokens
-						.slice( 0, i - 1 )
-						.concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } )
-					).replace( rtrim, "$1" ),
+						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+						tokens.slice( 0, i - 1 )
+							.concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } )
+					).replace( rtrimCSS, "$1" ),
 					matcher,
 					i < j && matcherFromTokens( tokens.slice( i, j ) ),
 					j < len && matcherFromTokens( ( tokens = tokens.slice( j ) ) ),
@@ -2680,7 +2451,7 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 				contextBackup = outermostContext,
 
 				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find[ "TAG" ]( "*", outermost ),
+				elems = seed || byElement && Expr.find.TAG( "*", outermost ),
 
 				// Use integer dirruns iff this is the outermost matcher
 				dirrunsUnique = ( dirruns += contextBackup == null ? 1 : Math.random() || 0.1 ),
@@ -2696,8 +2467,9 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 			}
 
 			// Add elements passing elementMatchers directly to results
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+			// Support: iOS <=7 - 9 only
+			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching
+			// elements by id. (see trac-14142)
 			for ( ; i !== len && ( elem = elems[ i ] ) != null; i++ ) {
 				if ( byElement && elem ) {
 					j = 0;
@@ -2712,7 +2484,7 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 					}
 					while ( ( matcher = elementMatchers[ j++ ] ) ) {
 						if ( matcher( elem, context || document, xml ) ) {
-							results.push( elem );
+							push.call( results, elem );
 							break;
 						}
 					}
@@ -2775,7 +2547,7 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 				if ( outermost && !seed && setMatched.length > 0 &&
 					( matchedCount + setMatchers.length ) > 1 ) {
 
-					Sizzle.uniqueSort( results );
+					jQuery.uniqueSort( results );
 				}
 			}
 
@@ -2793,7 +2565,7 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 		superMatcher;
 }
 
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
+function compile( selector, match /* Internal Use Only */ ) {
 	var i,
 		setMatchers = [],
 		elementMatchers = [],
@@ -2816,27 +2588,25 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 		}
 
 		// Cache the compiled function
-		cached = compilerCache(
-			selector,
-			matcherFromGroupMatchers( elementMatchers, setMatchers )
-		);
+		cached = compilerCache( selector,
+			matcherFromGroupMatchers( elementMatchers, setMatchers ) );
 
 		// Save selector and tokenization
 		cached.selector = selector;
 	}
 	return cached;
-};
+}
 
 /**
- * A low-level selection function that works with Sizzle's compiled
+ * A low-level selection function that works with jQuery's compiled
  *  selector functions
  * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
+ *  selector function built with jQuery selector compile
  * @param {Element} context
  * @param {Array} [results]
  * @param {Array} [seed] A set of elements to match against
  */
-select = Sizzle.select = function( selector, context, results, seed ) {
+function select( selector, context, results, seed ) {
 	var i, tokens, token, type, find,
 		compiled = typeof selector === "function" && selector,
 		match = !seed && tokenize( ( selector = compiled.selector || selector ) );
@@ -2850,10 +2620,12 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 		// Reduce context if the leading compound selector is an ID
 		tokens = match[ 0 ] = match[ 0 ].slice( 0 );
 		if ( tokens.length > 2 && ( token = tokens[ 0 ] ).type === "ID" &&
-			context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) {
+				context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) {
 
-			context = ( Expr.find[ "ID" ]( token.matches[ 0 ]
-				.replace( runescape, funescape ), context ) || [] )[ 0 ];
+			context = ( Expr.find.ID(
+				token.matches[ 0 ].replace( runescape, funescape ),
+				context
+			) || [] )[ 0 ];
 			if ( !context ) {
 				return results;
 
@@ -2866,7 +2638,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 		}
 
 		// Fetch a seed set for right-to-left matching
-		i = matchExpr[ "needsContext" ].test( selector ) ? 0 : tokens.length;
+		i = matchExpr.needsContext.test( selector ) ? 0 : tokens.length;
 		while ( i-- ) {
 			token = tokens[ i ];
 
@@ -2879,8 +2651,8 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 				// Search, expanding context for leading sibling combinators
 				if ( ( seed = find(
 					token.matches[ 0 ].replace( runescape, funescape ),
-					rsibling.test( tokens[ 0 ].type ) && testContext( context.parentNode ) ||
-						context
+					rsibling.test( tokens[ 0 ].type ) &&
+						testContext( context.parentNode ) || context
 				) ) ) {
 
 					// If seed is empty or no tokens remain, we can return early
@@ -2907,21 +2679,18 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
 	);
 	return results;
-};
+}
 
 // One-time assignments
 
+// Support: Android <=4.0 - 4.1+
 // Sort stability
 support.sortStable = expando.split( "" ).sort( sortOrder ).join( "" ) === expando;
 
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
 // Initialize against the default document
 setDocument();
 
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Support: Android <=4.0 - 4.1+
 // Detached nodes confoundingly follow *each other*
 support.sortDetached = assert( function( el ) {
 
@@ -2929,68 +2698,29 @@ support.sortDetached = assert( function( el ) {
 	return el.compareDocumentPosition( document.createElement( "fieldset" ) ) & 1;
 } );
 
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert( function( el ) {
-	el.innerHTML = "<a href='#'></a>";
-	return el.firstChild.getAttribute( "href" ) === "#";
-} ) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	} );
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert( function( el ) {
-	el.innerHTML = "<input/>";
-	el.firstChild.setAttribute( "value", "" );
-	return el.firstChild.getAttribute( "value" ) === "";
-} ) ) {
-	addHandle( "value", function( elem, _name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	} );
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert( function( el ) {
-	return el.getAttribute( "disabled" ) == null;
-} ) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-				( val = elem.getAttributeNode( name ) ) && val.specified ?
-					val.value :
-					null;
-		}
-	} );
-}
-
-return Sizzle;
-
-} )( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
+jQuery.find = find;
 
 // Deprecated
 jQuery.expr[ ":" ] = jQuery.expr.pseudos;
-jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-jQuery.escapeSelector = Sizzle.escape;
+jQuery.unique = jQuery.uniqueSort;
 
+// These have always been private, but they used to be documented as part of
+// Sizzle so let's maintain them for now for backwards compatibility purposes.
+find.compile = compile;
+find.select = select;
+find.setDocument = setDocument;
+find.tokenize = tokenize;
 
+find.escape = jQuery.escapeSelector;
+find.getText = jQuery.text;
+find.isXML = jQuery.isXMLDoc;
+find.selectors = jQuery.expr;
+find.support = jQuery.support;
+find.uniqueSort = jQuery.uniqueSort;
+
+	/* eslint-enable */
+
+} )();
 
 
 var dir = function( elem, dir, until ) {
@@ -3024,13 +2754,6 @@ var siblings = function( n, elem ) {
 
 var rneedsContext = jQuery.expr.match.needsContext;
 
-
-
-function nodeName( elem, name ) {
-
-	return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-
-}
 var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
 
 
@@ -3281,7 +3004,7 @@ jQuery.fn.extend( {
 					if ( cur.nodeType < 11 && ( targets ?
 						targets.index( cur ) > -1 :
 
-						// Don't pass non-elements to Sizzle
+						// Don't pass non-elements to jQuery#find
 						cur.nodeType === 1 &&
 							jQuery.find.matchesSelector( cur, selectors ) ) ) {
 
@@ -3836,7 +3559,7 @@ jQuery.extend( {
 
 											if ( jQuery.Deferred.exceptionHook ) {
 												jQuery.Deferred.exceptionHook( e,
-													process.stackTrace );
+													process.error );
 											}
 
 											// Support: Promises/A+ section 2.3.3.3.4.1
@@ -3864,10 +3587,17 @@ jQuery.extend( {
 								process();
 							} else {
 
-								// Call an optional hook to record the stack, in case of exception
+								// Call an optional hook to record the error, in case of exception
 								// since it's otherwise lost when execution goes async
-								if ( jQuery.Deferred.getStackHook ) {
-									process.stackTrace = jQuery.Deferred.getStackHook();
+								if ( jQuery.Deferred.getErrorHook ) {
+									process.error = jQuery.Deferred.getErrorHook();
+
+								// The deprecated alias of the above. While the name suggests
+								// returning the stack, not an error instance, jQuery just passes
+								// it directly to `console.warn` so both will work; an instance
+								// just better cooperates with source maps.
+								} else if ( jQuery.Deferred.getStackHook ) {
+									process.error = jQuery.Deferred.getStackHook();
 								}
 								window.setTimeout( process );
 							}
@@ -4042,12 +3772,16 @@ jQuery.extend( {
 // warn about them ASAP rather than swallowing them by default.
 var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
 
-jQuery.Deferred.exceptionHook = function( error, stack ) {
+// If `jQuery.Deferred.getErrorHook` is defined, `asyncError` is an error
+// captured before the async barrier to get the original error cause
+// which may otherwise be hidden.
+jQuery.Deferred.exceptionHook = function( error, asyncError ) {
 
 	// Support: IE 8 - 9 only
 	// Console exists when dev tools are open, which can happen at any time
 	if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) {
-		window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack );
+		window.console.warn( "jQuery.Deferred exception: " + error.message,
+			error.stack, asyncError );
 	}
 };
 
@@ -5103,25 +4837,6 @@ function returnFalse() {
 	return false;
 }
 
-// Support: IE <=9 - 11+
-// focus() and blur() are asynchronous, except when they are no-op.
-// So expect focus to be synchronous when the element is already active,
-// and blur to be synchronous when the element is not already active.
-// (focus and blur are always synchronous in other supported browsers,
-// this just defines when we can count on it).
-function expectSync( elem, type ) {
-	return ( elem === safeActiveElement() ) === ( type === "focus" );
-}
-
-// Support: IE <=9 only
-// Accessing document.activeElement can throw unexpectedly
-// https://bugs.jquery.com/ticket/13393
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
 function on( elem, types, selector, data, fn, one ) {
 	var origFn, type;
 
@@ -5559,7 +5274,7 @@ jQuery.event = {
 					el.click && nodeName( el, "input" ) ) {
 
 					// dataPriv.set( el, "click", ... )
-					leverageNative( el, "click", returnTrue );
+					leverageNative( el, "click", true );
 				}
 
 				// Return false to allow normal processing in the caller
@@ -5610,10 +5325,10 @@ jQuery.event = {
 // synthetic events by interrupting progress until reinvoked in response to
 // *native* events that it fires directly, ensuring that state changes have
 // already occurred before other listeners are invoked.
-function leverageNative( el, type, expectSync ) {
+function leverageNative( el, type, isSetup ) {
 
-	// Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add
-	if ( !expectSync ) {
+	// Missing `isSetup` indicates a trigger call, which must force setup through jQuery.event.add
+	if ( !isSetup ) {
 		if ( dataPriv.get( el, type ) === undefined ) {
 			jQuery.event.add( el, type, returnTrue );
 		}
@@ -5625,15 +5340,13 @@ function leverageNative( el, type, expectSync ) {
 	jQuery.event.add( el, type, {
 		namespace: false,
 		handler: function( event ) {
-			var notAsync, result,
+			var result,
 				saved = dataPriv.get( this, type );
 
 			if ( ( event.isTrigger & 1 ) && this[ type ] ) {
 
 				// Interrupt processing of the outer synthetic .trigger()ed event
-				// Saved data should be false in such cases, but might be a leftover capture object
-				// from an async native handler (gh-4350)
-				if ( !saved.length ) {
+				if ( !saved ) {
 
 					// Store arguments for use when handling the inner native event
 					// There will always be at least one argument (an event object), so this array
@@ -5642,33 +5355,22 @@ function leverageNative( el, type, expectSync ) {
 					dataPriv.set( this, type, saved );
 
 					// Trigger the native event and capture its result
-					// Support: IE <=9 - 11+
-					// focus() and blur() are asynchronous
-					notAsync = expectSync( this, type );
 					this[ type ]();
 					result = dataPriv.get( this, type );
-					if ( saved !== result || notAsync ) {
-						dataPriv.set( this, type, false );
-					} else {
-						result = {};
-					}
+					dataPriv.set( this, type, false );
+
 					if ( saved !== result ) {
 
 						// Cancel the outer synthetic event
 						event.stopImmediatePropagation();
 						event.preventDefault();
 
-						// Support: Chrome 86+
-						// In Chrome, if an element having a focusout handler is blurred by
-						// clicking outside of it, it invokes the handler synchronously. If
-						// that handler calls `.remove()` on the element, the data is cleared,
-						// leaving `result` undefined. We need to guard against this.
-						return result && result.value;
+						return result;
 					}
 
 				// If this is an inner synthetic event for an event with a bubbling surrogate
-				// (focus or blur), assume that the surrogate already propagated from triggering the
-				// native event and prevent that from happening again here.
+				// (focus or blur), assume that the surrogate already propagated from triggering
+				// the native event and prevent that from happening again here.
 				// This technically gets the ordering wrong w.r.t. to `.trigger()` (in which the
 				// bubbling surrogate propagates *after* the non-bubbling base), but that seems
 				// less bad than duplication.
@@ -5678,22 +5380,25 @@ function leverageNative( el, type, expectSync ) {
 
 			// If this is a native event triggered above, everything is now in order
 			// Fire an inner synthetic event with the original arguments
-			} else if ( saved.length ) {
+			} else if ( saved ) {
 
 				// ...and capture the result
-				dataPriv.set( this, type, {
-					value: jQuery.event.trigger(
+				dataPriv.set( this, type, jQuery.event.trigger(
+					saved[ 0 ],
+					saved.slice( 1 ),
+					this
+				) );
 
-						// Support: IE <=9 - 11+
-						// Extend with the prototype to reset the above stopImmediatePropagation()
-						jQuery.extend( saved[ 0 ], jQuery.Event.prototype ),
-						saved.slice( 1 ),
-						this
-					)
-				} );
-
-				// Abort handling of the native event
-				event.stopImmediatePropagation();
+				// Abort handling of the native event by all jQuery handlers while allowing
+				// native handlers on the same element to run. On target, this is achieved
+				// by stopping immediate propagation just on the jQuery event. However,
+				// the native event is re-wrapped by a jQuery one on each level of the
+				// propagation so the only way to stop it for jQuery is to stop it for
+				// everyone via native `stopPropagation()`. This is not a problem for
+				// focus/blur which don't bubble, but it does also stop click on checkboxes
+				// and radios. We accept this limitation.
+				event.stopPropagation();
+				event.isImmediatePropagationStopped = returnTrue;
 			}
 		}
 	} );
@@ -5832,18 +5537,73 @@ jQuery.each( {
 }, jQuery.event.addProp );
 
 jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) {
+
+	function focusMappedHandler( nativeEvent ) {
+		if ( document.documentMode ) {
+
+			// Support: IE 11+
+			// Attach a single focusin/focusout handler on the document while someone wants
+			// focus/blur. This is because the former are synchronous in IE while the latter
+			// are async. In other browsers, all those handlers are invoked synchronously.
+
+			// `handle` from private data would already wrap the event, but we need
+			// to change the `type` here.
+			var handle = dataPriv.get( this, "handle" ),
+				event = jQuery.event.fix( nativeEvent );
+			event.type = nativeEvent.type === "focusin" ? "focus" : "blur";
+			event.isSimulated = true;
+
+			// First, handle focusin/focusout
+			handle( nativeEvent );
+
+			// ...then, handle focus/blur
+			//
+			// focus/blur don't bubble while focusin/focusout do; simulate the former by only
+			// invoking the handler at the lower level.
+			if ( event.target === event.currentTarget ) {
+
+				// The setup part calls `leverageNative`, which, in turn, calls
+				// `jQuery.event.add`, so event handle will already have been set
+				// by this point.
+				handle( event );
+			}
+		} else {
+
+			// For non-IE browsers, attach a single capturing handler on the document
+			// while someone wants focusin/focusout.
+			jQuery.event.simulate( delegateType, nativeEvent.target,
+				jQuery.event.fix( nativeEvent ) );
+		}
+	}
+
 	jQuery.event.special[ type ] = {
 
 		// Utilize native event if possible so blur/focus sequence is correct
 		setup: function() {
 
+			var attaches;
+
 			// Claim the first handler
 			// dataPriv.set( this, "focus", ... )
 			// dataPriv.set( this, "blur", ... )
-			leverageNative( this, type, expectSync );
+			leverageNative( this, type, true );
 
-			// Return false to allow normal processing in the caller
-			return false;
+			if ( document.documentMode ) {
+
+				// Support: IE 9 - 11+
+				// We use the same native handler for focusin & focus (and focusout & blur)
+				// so we need to coordinate setup & teardown parts between those events.
+				// Use `delegateType` as the key as `type` is already used by `leverageNative`.
+				attaches = dataPriv.get( this, delegateType );
+				if ( !attaches ) {
+					this.addEventListener( delegateType, focusMappedHandler );
+				}
+				dataPriv.set( this, delegateType, ( attaches || 0 ) + 1 );
+			} else {
+
+				// Return false to allow normal processing in the caller
+				return false;
+			}
 		},
 		trigger: function() {
 
@@ -5854,6 +5614,24 @@ jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateTyp
 			return true;
 		},
 
+		teardown: function() {
+			var attaches;
+
+			if ( document.documentMode ) {
+				attaches = dataPriv.get( this, delegateType ) - 1;
+				if ( !attaches ) {
+					this.removeEventListener( delegateType, focusMappedHandler );
+					dataPriv.remove( this, delegateType );
+				} else {
+					dataPriv.set( this, delegateType, attaches );
+				}
+			} else {
+
+				// Return false to indicate standard teardown should be applied
+				return false;
+			}
+		},
+
 		// Suppress native focus or blur if we're currently inside
 		// a leveraged native-event stack
 		_default: function( event ) {
@@ -5862,6 +5640,58 @@ jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateTyp
 
 		delegateType: delegateType
 	};
+
+	// Support: Firefox <=44
+	// Firefox doesn't have focus(in | out) events
+	// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
+	//
+	// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1
+	// focus(in | out) events fire after focus & blur events,
+	// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
+	// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857
+	//
+	// Support: IE 9 - 11+
+	// To preserve relative focusin/focus & focusout/blur event order guaranteed on the 3.x branch,
+	// attach a single handler for both events in IE.
+	jQuery.event.special[ delegateType ] = {
+		setup: function() {
+
+			// Handle: regular nodes (via `this.ownerDocument`), window
+			// (via `this.document`) & document (via `this`).
+			var doc = this.ownerDocument || this.document || this,
+				dataHolder = document.documentMode ? this : doc,
+				attaches = dataPriv.get( dataHolder, delegateType );
+
+			// Support: IE 9 - 11+
+			// We use the same native handler for focusin & focus (and focusout & blur)
+			// so we need to coordinate setup & teardown parts between those events.
+			// Use `delegateType` as the key as `type` is already used by `leverageNative`.
+			if ( !attaches ) {
+				if ( document.documentMode ) {
+					this.addEventListener( delegateType, focusMappedHandler );
+				} else {
+					doc.addEventListener( type, focusMappedHandler, true );
+				}
+			}
+			dataPriv.set( dataHolder, delegateType, ( attaches || 0 ) + 1 );
+		},
+		teardown: function() {
+			var doc = this.ownerDocument || this.document || this,
+				dataHolder = document.documentMode ? this : doc,
+				attaches = dataPriv.get( dataHolder, delegateType ) - 1;
+
+			if ( !attaches ) {
+				if ( document.documentMode ) {
+					this.removeEventListener( delegateType, focusMappedHandler );
+				} else {
+					doc.removeEventListener( type, focusMappedHandler, true );
+				}
+				dataPriv.remove( dataHolder, delegateType );
+			} else {
+				dataPriv.set( dataHolder, delegateType, attaches );
+			}
+		}
+	};
 } );
 
 // Create mouseenter/leave events using mouseover/out and event-time checks
@@ -6093,7 +5923,7 @@ function domManip( collection, args, callback, ignored ) {
 			if ( hasScripts ) {
 				doc = scripts[ scripts.length - 1 ].ownerDocument;
 
-				// Reenable scripts
+				// Re-enable scripts
 				jQuery.map( scripts, restoreScript );
 
 				// Evaluate executable scripts on first document insertion
@@ -6164,7 +5994,8 @@ jQuery.extend( {
 		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
 				!jQuery.isXMLDoc( elem ) ) {
 
-			// We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
+			// We eschew jQuery#find here for performance reasons:
+			// https://jsperf.com/getall-vs-sizzle/2
 			destElements = getAll( clone );
 			srcElements = getAll( elem );
 
@@ -6440,15 +6271,6 @@ var swap = function( elem, options, callback ) {
 
 var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 
-var whitespace = "[\\x20\\t\\r\\n\\f]";
-
-
-var rtrimCSS = new RegExp(
-	"^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$",
-	"g"
-);
-
-
 
 
 ( function() {
@@ -6558,7 +6380,7 @@ var rtrimCSS = new RegExp(
 				trChild = document.createElement( "div" );
 
 				table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate";
-				tr.style.cssText = "border:1px solid";
+				tr.style.cssText = "box-sizing:content-box;border:1px solid";
 
 				// Support: Chrome 86+
 				// Height set through cssText does not get applied.
@@ -6570,7 +6392,7 @@ var rtrimCSS = new RegExp(
 				// In our bodyBackground.html iframe,
 				// display for all div elements is set to "inline",
 				// which causes a problem only in Android 8 Chrome 86.
-				// Ensuring the div is display: block
+				// Ensuring the div is `display: block`
 				// gets around this issue.
 				trChild.style.display = "block";
 
@@ -6608,17 +6430,37 @@ function curCSS( elem, name, computed ) {
 	//   .css('filter') (IE 9 only, trac-12537)
 	//   .css('--customProperty) (gh-3144)
 	if ( computed ) {
+
+		// Support: IE <=9 - 11+
+		// IE only supports `"float"` in `getPropertyValue`; in computed styles
+		// it's only available as `"cssFloat"`. We no longer modify properties
+		// sent to `.css()` apart from camelCasing, so we need to check both.
+		// Normally, this would create difference in behavior: if
+		// `getPropertyValue` returns an empty string, the value returned
+		// by `.css()` would be `undefined`. This is usually the case for
+		// disconnected elements. However, in IE even disconnected elements
+		// with no styles return `"none"` for `getPropertyValue( "float" )`
 		ret = computed.getPropertyValue( name ) || computed[ name ];
 
-		// trim whitespace for custom property (issue gh-4926)
-		if ( isCustomProp ) {
+		if ( isCustomProp && ret ) {
 
-			// rtrim treats U+000D CARRIAGE RETURN and U+000C FORM FEED
+			// Support: Firefox 105+, Chrome <=105+
+			// Spec requires trimming whitespace for custom properties (gh-4926).
+			// Firefox only trims leading whitespace. Chrome just collapses
+			// both leading & trailing whitespace to a single space.
+			//
+			// Fall back to `undefined` if empty string returned.
+			// This collapses a missing definition with property defined
+			// and set to an empty string but there's no standard API
+			// allowing us to differentiate them without a performance penalty
+			// and returning `undefined` aligns with older jQuery.
+			//
+			// rtrimCSS treats U+000D CARRIAGE RETURN and U+000C FORM FEED
 			// as whitespace while CSS does not, but this is not a problem
 			// because CSS preprocessing replaces them with U+000A LINE FEED
 			// (which *is* CSS whitespace)
 			// https://www.w3.org/TR/css-syntax-3/#input-preprocessing
-			ret = ret.replace( rtrimCSS, "$1" );
+			ret = ret.replace( rtrimCSS, "$1" ) || undefined;
 		}
 
 		if ( ret === "" && !isAttached( elem ) ) {
@@ -6737,7 +6579,8 @@ function setPositiveNumber( _elem, value, subtract ) {
 function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computedVal ) {
 	var i = dimension === "width" ? 1 : 0,
 		extra = 0,
-		delta = 0;
+		delta = 0,
+		marginDelta = 0;
 
 	// Adjustment may not be necessary
 	if ( box === ( isBorderBox ? "border" : "content" ) ) {
@@ -6747,8 +6590,10 @@ function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computed
 	for ( ; i < 4; i += 2 ) {
 
 		// Both box models exclude margin
+		// Count margin delta separately to only add it after scroll gutter adjustment.
+		// This is needed to make negative margins work with `outerHeight( true )` (gh-3982).
 		if ( box === "margin" ) {
-			delta += jQuery.css( elem, box + cssExpand[ i ], true, styles );
+			marginDelta += jQuery.css( elem, box + cssExpand[ i ], true, styles );
 		}
 
 		// If we get here with a content-box, we're seeking "padding" or "border" or "margin"
@@ -6799,7 +6644,7 @@ function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computed
 		) ) || 0;
 	}
 
-	return delta;
+	return delta + marginDelta;
 }
 
 function getWidthOrHeight( elem, dimension, extra ) {
@@ -6897,26 +6742,35 @@ jQuery.extend( {
 
 	// Don't automatically add "px" to these possibly-unitless properties
 	cssNumber: {
-		"animationIterationCount": true,
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"gridArea": true,
-		"gridColumn": true,
-		"gridColumnEnd": true,
-		"gridColumnStart": true,
-		"gridRow": true,
-		"gridRowEnd": true,
-		"gridRowStart": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
+		animationIterationCount: true,
+		aspectRatio: true,
+		borderImageSlice: true,
+		columnCount: true,
+		flexGrow: true,
+		flexShrink: true,
+		fontWeight: true,
+		gridArea: true,
+		gridColumn: true,
+		gridColumnEnd: true,
+		gridColumnStart: true,
+		gridRow: true,
+		gridRowEnd: true,
+		gridRowStart: true,
+		lineHeight: true,
+		opacity: true,
+		order: true,
+		orphans: true,
+		scale: true,
+		widows: true,
+		zIndex: true,
+		zoom: true,
+
+		// SVG-related
+		fillOpacity: true,
+		floodOpacity: true,
+		stopOpacity: true,
+		strokeMiterlimit: true,
+		strokeOpacity: true
 	},
 
 	// Add in properties whose names you wish to fix before
@@ -8642,9 +8496,39 @@ jQuery.each( [ "radio", "checkbox" ], function() {
 
 
 // Return jQuery for attributes-only inclusion
+var location = window.location;
+
+var nonce = { guid: Date.now() };
+
+var rquery = ( /\?/ );
 
 
-support.focusin = "onfocusin" in window;
+
+// Cross-browser xml parsing
+jQuery.parseXML = function( data ) {
+	var xml, parserErrorElem;
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+
+	// Support: IE 9 - 11 only
+	// IE throws on parseFromString with invalid input.
+	try {
+		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
+	} catch ( e ) {}
+
+	parserErrorElem = xml && xml.getElementsByTagName( "parsererror" )[ 0 ];
+	if ( !xml || parserErrorElem ) {
+		jQuery.error( "Invalid XML: " + (
+			parserErrorElem ?
+				jQuery.map( parserErrorElem.childNodes, function( el ) {
+					return el.textContent;
+				} ).join( "\n" ) :
+				data
+		) );
+	}
+	return xml;
+};
 
 
 var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
@@ -8832,85 +8716,6 @@ jQuery.fn.extend( {
 } );
 
 
-// Support: Firefox <=44
-// Firefox doesn't have focus(in | out) events
-// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
-//
-// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1
-// focus(in | out) events fire after focus & blur events,
-// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
-// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857
-if ( !support.focusin ) {
-	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
-		};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-
-				// Handle: regular nodes (via `this.ownerDocument`), window
-				// (via `this.document`) & document (via `this`).
-				var doc = this.ownerDocument || this.document || this,
-					attaches = dataPriv.access( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this.document || this,
-					attaches = dataPriv.access( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					dataPriv.remove( doc, fix );
-
-				} else {
-					dataPriv.access( doc, fix, attaches );
-				}
-			}
-		};
-	} );
-}
-var location = window.location;
-
-var nonce = { guid: Date.now() };
-
-var rquery = ( /\?/ );
-
-
-
-// Cross-browser xml parsing
-jQuery.parseXML = function( data ) {
-	var xml, parserErrorElem;
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-
-	// Support: IE 9 - 11 only
-	// IE throws on parseFromString with invalid input.
-	try {
-		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
-	} catch ( e ) {}
-
-	parserErrorElem = xml && xml.getElementsByTagName( "parsererror" )[ 0 ];
-	if ( !xml || parserErrorElem ) {
-		jQuery.error( "Invalid XML: " + (
-			parserErrorElem ?
-				jQuery.map( parserErrorElem.childNodes, function( el ) {
-					return el.textContent;
-				} ).join( "\n" ) :
-				data
-		) );
-	}
-	return xml;
-};
-
-
 var
 	rbracket = /\[\]$/,
 	rCRLF = /\r?\n/g,
@@ -10755,7 +10560,9 @@ jQuery.fn.extend( {
 	},
 
 	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+		return this
+			.on( "mouseenter", fnOver )
+			.on( "mouseleave", fnOut || fnOver );
 	}
 } );
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.min.js
new file mode 100644
index 00000000000..7f37b5d9912
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}function fe(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}ce.fn=ce.prototype={jquery:t,constructor:ce,length:0,toArray:function(){return ae.call(this)},get:function(e){return null==e?ae.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=ce.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return ce.each(this,e)},map:function(n){return this.pushStack(ce.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(ae.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(ce.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(ce.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:s,sort:oe.sort,splice:oe.splice},ce.extend=ce.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||v(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(ce.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||ce.isPlainObject(n)?n:{},i=!1,a[t]=ce.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},ce.extend({expando:"jQuery"+(t+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==i.call(e))&&(!(t=r(e))||"function"==typeof(n=ue.call(t,"constructor")&&t.constructor)&&o.call(n)===a)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){m(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(c(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},text:function(e){var t,n="",r=0,i=e.nodeType;if(!i)while(t=e[r++])n+=ce.text(t);return 1===i||11===i?e.textContent:9===i?e.documentElement.textContent:3===i||4===i?e.nodeValue:n},makeArray:function(e,t){var n=t||[];return null!=e&&(c(Object(e))?ce.merge(n,"string"==typeof e?[e]:e):s.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:se.call(t,e,n)},isXMLDoc:function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!l.test(t||n&&n.nodeName||"HTML")},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(c(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:le}),"function"==typeof Symbol&&(ce.fn[Symbol.iterator]=oe[Symbol.iterator]),ce.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var pe=oe.pop,de=oe.sort,he=oe.splice,ge="[\\x20\\t\\r\\n\\f]",ve=new RegExp("^"+ge+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ge+"+$","g");ce.contains=function(e,t){var n=t&&t.parentNode;return e===n||!(!n||1!==n.nodeType||!(e.contains?e.contains(n):e.compareDocumentPosition&&16&e.compareDocumentPosition(n)))};var f=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;function p(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e}ce.escapeSelector=function(e){return(e+"").replace(f,p)};var ye=C,me=s;!function(){var e,b,w,o,a,T,r,C,d,i,k=me,S=ce.expando,E=0,n=0,s=W(),c=W(),u=W(),h=W(),l=function(e,t){return e===t&&(a=!0),0},f="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",t="(?:\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",p="\\["+ge+"*("+t+")(?:"+ge+"*([*^$|!~]?=)"+ge+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+t+"))|)"+ge+"*\\]",g=":("+t+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+p+")*)|.*)\\)|)",v=new RegExp(ge+"+","g"),y=new RegExp("^"+ge+"*,"+ge+"*"),m=new RegExp("^"+ge+"*([>+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="<a id='"+S+"' href='' disabled='disabled'></a><select id='"+S+"-\r\\' disabled='disabled'><option selected=''></option></select>",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0<I(t,T,null,[e]).length},I.contains=function(e,t){return(e.ownerDocument||e)!=T&&V(e),ce.contains(e,t)},I.attr=function(e,t){(e.ownerDocument||e)!=T&&V(e);var n=b.attrHandle[t.toLowerCase()],r=n&&ue.call(b.attrHandle,t.toLowerCase())?n(e,t,!C):void 0;return void 0!==r?r:e.getAttribute(t)},I.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},ce.uniqueSort=function(e){var t,n=[],r=0,i=0;if(a=!le.sortStable,o=!le.sortStable&&ae.call(e,0),de.call(e,l),a){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)he.call(e,n[r],1)}return o=null,e},ce.fn.uniqueSort=function(){return this.pushStack(ce.uniqueSort(ae.apply(this)))},(b=ce.expr={cacheLength:50,createPseudo:F,match:D,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(v," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(d,e,t,h,g){var v="nth"!==d.slice(0,3),y="last"!==d.slice(-4),m="of-type"===e;return 1===h&&0===g?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u=v!==y?"nextSibling":"previousSibling",l=e.parentNode,c=m&&e.nodeName.toLowerCase(),f=!n&&!m,p=!1;if(l){if(v){while(u){o=e;while(o=o[u])if(m?fe(o,c):1===o.nodeType)return!1;s=u="only"===d&&!s&&"nextSibling"}return!0}if(s=[y?l.firstChild:l.lastChild],y&&f){p=(a=(r=(i=l[S]||(l[S]={}))[d]||[])[0]===E&&r[1])&&r[2],o=a&&l.childNodes[a];while(o=++a&&o&&o[u]||(p=a=0)||s.pop())if(1===o.nodeType&&++p&&o===e){i[d]=[E,a,p];break}}else if(f&&(p=a=(r=(i=e[S]||(e[S]={}))[d]||[])[0]===E&&r[1]),!1===p)while(o=++a&&o&&o[u]||(p=a=0)||s.pop())if((m?fe(o,c):1===o.nodeType)&&++p&&(f&&((i=o[S]||(o[S]={}))[d]=[E,p]),o===e))break;return(p-=g)===h||p%h==0&&0<=p/h}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||I.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?F(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=se.call(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:F(function(e){var r=[],i=[],s=ne(e.replace(ve,"$1"));return s[S]?F(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:F(function(t){return function(e){return 0<I(t,e).length}}),contains:F(function(t){return t=t.replace(O,P),function(e){return-1<(e.textContent||ce.text(e)).indexOf(t)}}),lang:F(function(n){return A.test(n||"")||I.error("unsupported lang: "+n),n=n.replace(O,P).toLowerCase(),function(e){var t;do{if(t=C?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=ie.location&&ie.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===r},focus:function(e){return e===function(){try{return T.activeElement}catch(e){}}()&&T.hasFocus()&&!!(e.type||e.href||~e.tabIndex)},enabled:z(!1),disabled:z(!0),checked:function(e){return fe(e,"input")&&!!e.checked||fe(e,"option")&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return q.test(e.nodeName)},input:function(e){return N.test(e.nodeName)},button:function(e){return fe(e,"input")&&"button"===e.type||fe(e,"button")},text:function(e){var t;return fe(e,"input")&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:X(function(){return[0]}),last:X(function(e,t){return[t-1]}),eq:X(function(e,t,n){return[n<0?n+t:n]}),even:X(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:X(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:X(function(e,t,n){var r;for(r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:X(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=B(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=_(e);function G(){}function Y(e,t){var n,r,i,o,a,s,u,l=c[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=y.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=m.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(ve," ")}),a=a.slice(n.length)),b.filter)!(r=D[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?I.error(e):c(e,s).slice(0)}function Q(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function J(a,e,t){var s=e.dir,u=e.next,l=u||s,c=t&&"parentNode"===l,f=n++;return e.first?function(e,t,n){while(e=e[s])if(1===e.nodeType||c)return a(e,t,n);return!1}:function(e,t,n){var r,i,o=[E,f];if(n){while(e=e[s])if((1===e.nodeType||c)&&a(e,t,n))return!0}else while(e=e[s])if(1===e.nodeType||c)if(i=e[S]||(e[S]={}),u&&fe(e,u))e=e[s]||e;else{if((r=i[l])&&r[0]===E&&r[1]===f)return o[2]=r[2];if((i[l]=o)[2]=a(e,t,n))return!0}return!1}}function K(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Z(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function ee(d,h,g,v,y,e){return v&&!v[S]&&(v=ee(v)),y&&!y[S]&&(y=ee(y,e)),F(function(e,t,n,r){var i,o,a,s,u=[],l=[],c=t.length,f=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)I(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),p=!d||!e&&h?f:Z(f,u,d,n,r);if(g?g(p,s=y||(e?d:c||v)?[]:t,n,r):s=p,v){i=Z(s,l),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(s[l[o]]=!(p[l[o]]=a))}if(e){if(y||d){if(y){i=[],o=s.length;while(o--)(a=s[o])&&i.push(p[o]=a);y(null,s=[],i,r)}o=s.length;while(o--)(a=s[o])&&-1<(i=y?se.call(e,a):u[o])&&(e[i]=!(t[i]=a))}}else s=Z(s===t?s.splice(c,s.length):s),y?y(null,t,s,r):k.apply(t,s)})}function te(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=J(function(e){return e===i},a,!0),l=J(function(e){return-1<se.call(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!=w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[J(K(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return ee(1<s&&K(c),1<s&&Q(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(ve,"$1"),t,s<n&&te(e.slice(s,n)),n<r&&te(e=e.slice(n)),n<r&&Q(e))}c.push(t)}return K(c)}function ne(e,t){var n,v,y,m,x,r,i=[],o=[],a=u[e+" "];if(!a){t||(t=Y(e)),n=t.length;while(n--)(a=te(t[n]))[S]?i.push(a):o.push(a);(a=u(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=E+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==T||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==T||(V(o),n=!C);while(s=v[a++])if(s(o,t||T,n)){k.call(r,o);break}i&&(E=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=pe.call(r));f=Z(f)}k.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&ce.uniqueSort(r)}return i&&(E=h,w=p),c},m?F(r):r))).selector=e}return a}function re(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&Y(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&C&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(O,P),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=D.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(O,P),H.test(o[0].type)&&U(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&Q(o)))return k.apply(n,r),n;break}}}return(l||ne(e,c))(r,t,!C,n,!t||H.test(e)&&U(t.parentNode)||t),n}G.prototype=b.filters=b.pseudos,b.setFilters=new G,le.sortStable=S.split("").sort(l).join("")===S,V(),le.sortDetached=$(function(e){return 1&e.compareDocumentPosition(T.createElement("fieldset"))}),ce.find=I,ce.expr[":"]=ce.expr.pseudos,ce.unique=ce.uniqueSort,I.compile=ne,I.select=re,I.setDocument=V,I.tokenize=Y,I.escape=ce.escapeSelector,I.getText=ce.text,I.isXML=ce.isXMLDoc,I.selectors=ce.expr,I.support=ce.support,I.uniqueSort=ce.uniqueSort}();var d=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&ce(e).is(n))break;r.push(e)}return r},h=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},b=ce.expr.match.needsContext,w=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1<se.call(n,e)!==r}):ce.filter(n,e,r)}ce.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?ce.find.matchesSelector(r,e)?[r]:[]:ce.find.matches(e,ce.grep(t,function(e){return 1===e.nodeType}))},ce.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(ce(e).filter(function(){for(t=0;t<r;t++)if(ce.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)ce.find(e,i[t],n);return 1<r?ce.uniqueSort(n):n},filter:function(e){return this.pushStack(T(this,e||[],!1))},not:function(e){return this.pushStack(T(this,e||[],!0))},is:function(e){return!!T(this,"string"==typeof e&&b.test(e)?ce(e):e||[],!1).length}});var k,S=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(ce.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&ce(e);if(!b.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&ce.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?ce.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?se.call(ce(e),this[0]):se.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(ce.uniqueSort(ce.merge(this.get(),ce(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),ce.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return d(e,"parentNode")},parentsUntil:function(e,t,n){return d(e,"parentNode",n)},next:function(e){return A(e,"nextSibling")},prev:function(e){return A(e,"previousSibling")},nextAll:function(e){return d(e,"nextSibling")},prevAll:function(e){return d(e,"previousSibling")},nextUntil:function(e,t,n){return d(e,"nextSibling",n)},prevUntil:function(e,t,n){return d(e,"previousSibling",n)},siblings:function(e){return h((e.parentNode||{}).firstChild,e)},children:function(e){return h(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(fe(e,"template")&&(e=e.content||e),ce.merge([],e.childNodes))}},function(r,i){ce.fn[r]=function(e,t){var n=ce.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=ce.filter(t,n)),1<this.length&&(j[r]||ce.uniqueSort(n),E.test(r)&&n.reverse()),this.pushStack(n)}});var D=/[^\x20\t\r\n\f]+/g;function N(e){return e}function q(e){throw e}function L(e,t,n,r){var i;try{e&&v(i=e.promise)?i.call(e).done(t).fail(n):e&&v(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}ce.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},ce.each(e.match(D)||[],function(e,t){n[t]=!0}),n):ce.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){ce.each(e,function(e,t){v(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==x(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return ce.each(arguments,function(e,t){var n;while(-1<(n=ce.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<ce.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},ce.extend({Deferred:function(e){var o=[["notify","progress",ce.Callbacks("memory"),ce.Callbacks("memory"),2],["resolve","done",ce.Callbacks("once memory"),ce.Callbacks("once memory"),0,"resolved"],["reject","fail",ce.Callbacks("once memory"),ce.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return ce.Deferred(function(r){ce.each(o,function(e,t){var n=v(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&v(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,v(t)?s?t.call(e,l(u,o,N,s),l(u,o,q,s)):(u++,t.call(e,l(u,o,N,s),l(u,o,q,s),l(u,o,N,o.notifyWith))):(a!==N&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){ce.Deferred.exceptionHook&&ce.Deferred.exceptionHook(e,t.error),u<=i+1&&(a!==q&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(ce.Deferred.getErrorHook?t.error=ce.Deferred.getErrorHook():ce.Deferred.getStackHook&&(t.error=ce.Deferred.getStackHook()),ie.setTimeout(t))}}return ce.Deferred(function(e){o[0][3].add(l(0,e,v(r)?r:N,e.notifyWith)),o[1][3].add(l(0,e,v(t)?t:N)),o[2][3].add(l(0,e,v(n)?n:q))}).promise()},promise:function(e){return null!=e?ce.extend(e,a):a}},s={};return ce.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=ae.call(arguments),o=ce.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?ae.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(L(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||v(i[t]&&i[t].then)))return o.then();while(t--)L(i[t],a(t),o.reject);return o.promise()}});var H=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;ce.Deferred.exceptionHook=function(e,t){ie.console&&ie.console.warn&&e&&H.test(e.name)&&ie.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},ce.readyException=function(e){ie.setTimeout(function(){throw e})};var O=ce.Deferred();function P(){C.removeEventListener("DOMContentLoaded",P),ie.removeEventListener("load",P),ce.ready()}ce.fn.ready=function(e){return O.then(e)["catch"](function(e){ce.readyException(e)}),this},ce.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--ce.readyWait:ce.isReady)||(ce.isReady=!0)!==e&&0<--ce.readyWait||O.resolveWith(C,[ce])}}),ce.ready.then=O.then,"complete"===C.readyState||"loading"!==C.readyState&&!C.documentElement.doScroll?ie.setTimeout(ce.ready):(C.addEventListener("DOMContentLoaded",P),ie.addEventListener("load",P));var M=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n))for(s in i=!0,n)M(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,v(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(ce(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},R=/^-ms-/,I=/-([a-z])/g;function W(e,t){return t.toUpperCase()}function F(e){return e.replace(R,"ms-").replace(I,W)}var $=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function B(){this.expando=ce.expando+B.uid++}B.uid=1,B.prototype={cache:function(e){var t=e[this.expando];return t||(t={},$(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[F(t)]=n;else for(r in t)i[F(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][F(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(F):(t=F(t))in r?[t]:t.match(D)||[]).length;while(n--)delete r[t[n]]}(void 0===t||ce.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!ce.isEmptyObject(t)}};var _=new B,z=new B,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,U=/[A-Z]/g;function V(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(U,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:X.test(i)?JSON.parse(i):i)}catch(e){}z.set(e,t,n)}else n=void 0;return n}ce.extend({hasData:function(e){return z.hasData(e)||_.hasData(e)},data:function(e,t,n){return z.access(e,t,n)},removeData:function(e,t){z.remove(e,t)},_data:function(e,t,n){return _.access(e,t,n)},_removeData:function(e,t){_.remove(e,t)}}),ce.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=z.get(o),1===o.nodeType&&!_.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=F(r.slice(5)),V(o,r,i[r]));_.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){z.set(this,n)}):M(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=z.get(o,n))?t:void 0!==(t=V(o,n))?t:void 0;this.each(function(){z.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){z.remove(this,e)})}}),ce.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=_.get(e,t),n&&(!r||Array.isArray(n)?r=_.access(e,t,ce.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=ce.queue(e,t),r=n.length,i=n.shift(),o=ce._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){ce.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return _.get(e,n)||_.access(e,n,{empty:ce.Callbacks("once memory").add(function(){_.remove(e,[t+"queue",n])})})}}),ce.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?ce.queue(this[0],t):void 0===n?this:this.each(function(){var e=ce.queue(this,t,n);ce._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&ce.dequeue(this,t)})},dequeue:function(e){return this.each(function(){ce.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=ce.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=_.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var G=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Y=new RegExp("^(?:([+-])=|)("+G+")([a-z%]*)$","i"),Q=["Top","Right","Bottom","Left"],J=C.documentElement,K=function(e){return ce.contains(e.ownerDocument,e)},Z={composed:!0};J.getRootNode&&(K=function(e){return ce.contains(e.ownerDocument,e)||e.getRootNode(Z)===e.ownerDocument});var ee=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&K(e)&&"none"===ce.css(e,"display")};function te(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return ce.css(e,t,"")},u=s(),l=n&&n[3]||(ce.cssNumber[t]?"":"px"),c=e.nodeType&&(ce.cssNumber[t]||"px"!==l&&+u)&&Y.exec(ce.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)ce.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,ce.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ne={};function re(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=_.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ee(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ne[s])||(o=a.body.appendChild(a.createElement(s)),u=ce.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ne[s]=u)))):"none"!==n&&(l[c]="none",_.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}ce.fn.extend({show:function(){return re(this,!0)},hide:function(){return re(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ee(this)?ce(this).show():ce(this).hide()})}});var xe,be,we=/^(?:checkbox|radio)$/i,Te=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="<textarea>x</textarea>",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="<option></option>",le.option=!!xe.lastChild;var ke={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n<r;n++)_.set(e[n],"globalEval",!t||_.get(t[n],"globalEval"))}ke.tbody=ke.tfoot=ke.colgroup=ke.caption=ke.thead,ke.th=ke.td,le.option||(ke.optgroup=ke.option=[1,"<select multiple='multiple'>","</select>"]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===x(o))ce.merge(p,o.nodeType?[o]:o);else if(je.test(o)){a=a||f.appendChild(t.createElement("div")),s=(Te.exec(o)||["",""])[1].toLowerCase(),u=ke[s]||ke._default,a.innerHTML=u[1]+ce.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;ce.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<ce.inArray(o,r))i&&i.push(o);else if(l=K(o),a=Se(f.appendChild(o),"script"),l&&Ee(a),n){c=0;while(o=a[c++])Ce.test(o.type||"")&&n.push(o)}return f}var De=/^([^.]*)(?:\.(.+)|)/;function Ne(){return!0}function qe(){return!1}function Le(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Le(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=qe;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return ce().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=ce.guid++)),e.each(function(){ce.event.add(this,t,i,r,n)})}function He(e,r,t){t?(_.set(e,r,!1),ce.event.add(e,r,{namespace:!1,handler:function(e){var t,n=_.get(this,r);if(1&e.isTrigger&&this[r]){if(n)(ce.event.special[r]||{}).delegateType&&e.stopPropagation();else if(n=ae.call(arguments),_.set(this,r,n),this[r](),t=_.get(this,r),_.set(this,r,!1),n!==t)return e.stopImmediatePropagation(),e.preventDefault(),t}else n&&(_.set(this,r,ce.event.trigger(n[0],n.slice(1),this)),e.stopPropagation(),e.isImmediatePropagationStopped=Ne)}})):void 0===_.get(e,r)&&ce.event.add(e,r,Ne)}ce.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=_.get(t);if($(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&ce.find.matchesSelector(J,i),n.guid||(n.guid=ce.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof ce&&ce.event.triggered!==e.type?ce.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(D)||[""]).length;while(l--)d=g=(s=De.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=ce.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=ce.event.special[d]||{},c=ce.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&ce.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),ce.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=_.hasData(e)&&_.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(D)||[""]).length;while(l--)if(d=g=(s=De.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=ce.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||ce.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)ce.event.remove(e,d+t[l],n,r,!0);ce.isEmptyObject(u)&&_.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=ce.event.fix(e),l=(_.get(this,"events")||Object.create(null))[u.type]||[],c=ce.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=ce.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((ce.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<ce(i,this).index(l):ce.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(ce.Event.prototype,t,{enumerable:!0,configurable:!0,get:v(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[ce.expando]?e:new ce.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return we.test(t.type)&&t.click&&fe(t,"input")&&He(t,"click",!0),!1},trigger:function(e){var t=this||e;return we.test(t.type)&&t.click&&fe(t,"input")&&He(t,"click"),!0},_default:function(e){var t=e.target;return we.test(t.type)&&t.click&&fe(t,"input")&&_.get(t,"click")||fe(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},ce.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},ce.Event=function(e,t){if(!(this instanceof ce.Event))return new ce.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ne:qe,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&ce.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[ce.expando]=!0},ce.Event.prototype={constructor:ce.Event,isDefaultPrevented:qe,isPropagationStopped:qe,isImmediatePropagationStopped:qe,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ne,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ne,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ne,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},ce.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},ce.event.addProp),ce.each({focus:"focusin",blur:"focusout"},function(r,i){function o(e){if(C.documentMode){var t=_.get(this,"handle"),n=ce.event.fix(e);n.type="focusin"===e.type?"focus":"blur",n.isSimulated=!0,t(e),n.target===n.currentTarget&&t(n)}else ce.event.simulate(i,e.target,ce.event.fix(e))}ce.event.special[r]={setup:function(){var e;if(He(this,r,!0),!C.documentMode)return!1;(e=_.get(this,i))||this.addEventListener(i,o),_.set(this,i,(e||0)+1)},trigger:function(){return He(this,r),!0},teardown:function(){var e;if(!C.documentMode)return!1;(e=_.get(this,i)-1)?_.set(this,i,e):(this.removeEventListener(i,o),_.remove(this,i))},_default:function(e){return _.get(e.target,r)},delegateType:i},ce.event.special[i]={setup:function(){var e=this.ownerDocument||this.document||this,t=C.documentMode?this:e,n=_.get(t,i);n||(C.documentMode?this.addEventListener(i,o):e.addEventListener(r,o,!0)),_.set(t,i,(n||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=C.documentMode?this:e,n=_.get(t,i)-1;n?_.set(t,i,n):(C.documentMode?this.removeEventListener(i,o):e.removeEventListener(r,o,!0),_.remove(t,i))}}}),ce.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){ce.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||ce.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),ce.fn.extend({on:function(e,t,n,r){return Le(this,e,t,n,r)},one:function(e,t,n,r){return Le(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,ce(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=qe),this.each(function(){ce.event.remove(this,e,n,t)})}});var Oe=/<script|<style|<link/i,Pe=/checked\s*(?:[^=]|=\s*.checked.)/i,Me=/^\s*<!\[CDATA\[|\]\]>\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)ce.event.add(t,i,s[i][n]);z.hasData(e)&&(o=z.access(e),a=ce.extend({},o),z.set(t,a))}}function $e(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=v(d);if(h||1<f&&"string"==typeof d&&!le.checkClone&&Pe.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),$e(t,r,i,o)});if(f&&(t=(e=Ae(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=ce.map(Se(e,"script"),Ie)).length;c<f;c++)u=e,c!==p&&(u=ce.clone(u,!0,!0),s&&ce.merge(a,Se(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,ce.map(a,We),c=0;c<s;c++)u=a[c],Ce.test(u.type||"")&&!_.access(u,"globalEval")&&ce.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?ce._evalUrl&&!u.noModule&&ce._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):m(u.textContent.replace(Me,""),u,l))}return n}function Be(e,t,n){for(var r,i=t?ce.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||ce.cleanData(Se(r)),r.parentNode&&(n&&K(r)&&Ee(Se(r,"script")),r.parentNode.removeChild(r));return e}ce.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=K(e);if(!(le.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||ce.isXMLDoc(e)))for(a=Se(c),r=0,i=(o=Se(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&we.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||Se(e),a=a||Se(c),r=0,i=o.length;r<i;r++)Fe(o[r],a[r]);else Fe(e,c);return 0<(a=Se(c,"script")).length&&Ee(a,!f&&Se(e,"script")),c},cleanData:function(e){for(var t,n,r,i=ce.event.special,o=0;void 0!==(n=e[o]);o++)if($(n)){if(t=n[_.expando]){if(t.events)for(r in t.events)i[r]?ce.event.remove(n,r):ce.removeEvent(n,r,t.handle);n[_.expando]=void 0}n[z.expando]&&(n[z.expando]=void 0)}}}),ce.fn.extend({detach:function(e){return Be(this,e,!0)},remove:function(e){return Be(this,e)},text:function(e){return M(this,function(e){return void 0===e?ce.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return $e(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Re(this,e).appendChild(e)})},prepend:function(){return $e(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Re(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return $e(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return $e(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(ce.cleanData(Se(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return ce.clone(this,e,t)})},html:function(e){return M(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Oe.test(e)&&!ke[(Te.exec(e)||["",""])[1].toLowerCase()]){e=ce.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(ce.cleanData(Se(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return $e(this,arguments,function(e){var t=this.parentNode;ce.inArray(this,n)<0&&(ce.cleanData(Se(this)),t&&t.replaceChild(e,this))},n)}}),ce.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){ce.fn[e]=function(e){for(var t,n=[],r=ce(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),ce(r[o])[a](t),s.apply(n,t.get());return this.pushStack(n)}});var _e=new RegExp("^("+G+")(?!px)[a-z%]+$","i"),ze=/^--/,Xe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=ie),t.getComputedStyle(e)},Ue=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ve=new RegExp(Q.join("|"),"i");function Ge(e,t,n){var r,i,o,a,s=ze.test(t),u=e.style;return(n=n||Xe(e))&&(a=n.getPropertyValue(t)||n[t],s&&a&&(a=a.replace(ve,"$1")||void 0),""!==a||K(e)||(a=ce.style(e,t)),!le.pixelBoxStyles()&&_e.test(a)&&Ve.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=n.width,u.width=r,u.minWidth=i,u.maxWidth=o)),void 0!==a?a+"":a}function Ye(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",J.appendChild(u).appendChild(l);var e=ie.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),J.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=C.createElement("div"),l=C.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",le.clearCloneStyle="content-box"===l.style.backgroundClip,ce.extend(le,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=C.createElement("table"),t=C.createElement("tr"),n=C.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="box-sizing:content-box;border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",J.appendChild(e).appendChild(t).appendChild(n),r=ie.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,J.removeChild(e)),a}}))}();var Qe=["Webkit","Moz","ms"],Je=C.createElement("div").style,Ke={};function Ze(e){var t=ce.cssProps[e]||Ke[e];return t||(e in Je?e:Ke[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Qe.length;while(n--)if((e=Qe[n]+t)in Je)return e}(e)||e)}var et=/^(none|table(?!-c[ea]).+)/,tt={position:"absolute",visibility:"hidden",display:"block"},nt={letterSpacing:"0",fontWeight:"400"};function rt(e,t,n){var r=Y.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function it(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0,l=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(l+=ce.css(e,n+Q[a],!0,i)),r?("content"===n&&(u-=ce.css(e,"padding"+Q[a],!0,i)),"margin"!==n&&(u-=ce.css(e,"border"+Q[a]+"Width",!0,i))):(u+=ce.css(e,"padding"+Q[a],!0,i),"padding"!==n?u+=ce.css(e,"border"+Q[a]+"Width",!0,i):s+=ce.css(e,"border"+Q[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u+l}function ot(e,t,n){var r=Xe(e),i=(!le.boxSizingReliable()||n)&&"border-box"===ce.css(e,"boxSizing",!1,r),o=i,a=Ge(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(_e.test(a)){if(!n)return a;a="auto"}return(!le.boxSizingReliable()&&i||!le.reliableTrDimensions()&&fe(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===ce.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===ce.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+it(e,t,n||(i?"border":"content"),o,r,a)+"px"}function at(e,t,n,r,i){return new at.prototype.init(e,t,n,r,i)}ce.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Ge(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,aspectRatio:!0,borderImageSlice:!0,columnCount:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,scale:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeMiterlimit:!0,strokeOpacity:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=F(t),u=ze.test(t),l=e.style;if(u||(t=Ze(s)),a=ce.cssHooks[t]||ce.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=Y.exec(n))&&i[1]&&(n=te(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(ce.cssNumber[s]?"":"px")),le.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=F(t);return ze.test(t)||(t=Ze(s)),(a=ce.cssHooks[t]||ce.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Ge(e,t,r)),"normal"===i&&t in nt&&(i=nt[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),ce.each(["height","width"],function(e,u){ce.cssHooks[u]={get:function(e,t,n){if(t)return!et.test(ce.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?ot(e,u,n):Ue(e,tt,function(){return ot(e,u,n)})},set:function(e,t,n){var r,i=Xe(e),o=!le.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===ce.css(e,"boxSizing",!1,i),s=n?it(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-it(e,u,"border",!1,i)-.5)),s&&(r=Y.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=ce.css(e,u)),rt(0,t,s)}}}),ce.cssHooks.marginLeft=Ye(le.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Ge(e,"marginLeft"))||e.getBoundingClientRect().left-Ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),ce.each({margin:"",padding:"",border:"Width"},function(i,o){ce.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+Q[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(ce.cssHooks[i+o].set=rt)}),ce.fn.extend({css:function(e,t){return M(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Xe(e),i=t.length;a<i;a++)o[t[a]]=ce.css(e,t[a],!1,r);return o}return void 0!==n?ce.style(e,t,n):ce.css(e,t)},e,t,1<arguments.length)}}),((ce.Tween=at).prototype={constructor:at,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||ce.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(ce.cssNumber[n]?"":"px")},cur:function(){var e=at.propHooks[this.prop];return e&&e.get?e.get(this):at.propHooks._default.get(this)},run:function(e){var t,n=at.propHooks[this.prop];return this.options.duration?this.pos=t=ce.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):at.propHooks._default.set(this),this}}).init.prototype=at.prototype,(at.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=ce.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){ce.fx.step[e.prop]?ce.fx.step[e.prop](e):1!==e.elem.nodeType||!ce.cssHooks[e.prop]&&null==e.elem.style[Ze(e.prop)]?e.elem[e.prop]=e.now:ce.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=at.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},ce.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},ce.fx=at.prototype.init,ce.fx.step={};var st,ut,lt,ct,ft=/^(?:toggle|show|hide)$/,pt=/queueHooks$/;function dt(){ut&&(!1===C.hidden&&ie.requestAnimationFrame?ie.requestAnimationFrame(dt):ie.setTimeout(dt,ce.fx.interval),ce.fx.tick())}function ht(){return ie.setTimeout(function(){st=void 0}),st=Date.now()}function gt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=Q[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function vt(e,t,n){for(var r,i=(yt.tweeners[t]||[]).concat(yt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function yt(o,e,t){var n,a,r=0,i=yt.prefilters.length,s=ce.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=st||ht(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:ce.extend({},e),opts:ce.extend(!0,{specialEasing:{},easing:ce.easing._default},t),originalProperties:e,originalOptions:t,startTime:st||ht(),duration:t.duration,tweens:[],createTween:function(e,t){var n=ce.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=F(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=ce.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=yt.prefilters[r].call(l,o,c,l.opts))return v(n.stop)&&(ce._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return ce.map(c,vt,l),v(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),ce.fx.timer(ce.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}ce.Animation=ce.extend(yt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return te(n.elem,e,Y.exec(t),n),n}]},tweener:function(e,t){v(e)?(t=e,e=["*"]):e=e.match(D);for(var n,r=0,i=e.length;r<i;r++)n=e[r],yt.tweeners[n]=yt.tweeners[n]||[],yt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ee(e),v=_.get(e,"fxshow");for(r in n.queue||(null==(a=ce._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,ce.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ft.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||ce.style(e,r)}if((u=!ce.isEmptyObject(t))||!ce.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=_.get(e,"display")),"none"===(c=ce.css(e,"display"))&&(l?c=l:(re([e],!0),l=e.style.display||l,c=ce.css(e,"display"),re([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===ce.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=_.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&re([e],!0),p.done(function(){for(r in g||re([e]),_.remove(e,"fxshow"),d)ce.style(e,r,d[r])})),u=vt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?yt.prefilters.unshift(e):yt.prefilters.push(e)}}),ce.speed=function(e,t,n){var r=e&&"object"==typeof e?ce.extend({},e):{complete:n||!n&&t||v(e)&&e,duration:e,easing:n&&t||t&&!v(t)&&t};return ce.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in ce.fx.speeds?r.duration=ce.fx.speeds[r.duration]:r.duration=ce.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){v(r.old)&&r.old.call(this),r.queue&&ce.dequeue(this,r.queue)},r},ce.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ee).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=ce.isEmptyObject(t),o=ce.speed(e,n,r),a=function(){var e=yt(this,ce.extend({},t),o);(i||_.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=ce.timers,r=_.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&pt.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||ce.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=_.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=ce.timers,o=n?n.length:0;for(t.finish=!0,ce.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),ce.each(["toggle","show","hide"],function(e,r){var i=ce.fn[r];ce.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(gt(r,!0),e,t,n)}}),ce.each({slideDown:gt("show"),slideUp:gt("hide"),slideToggle:gt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){ce.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),ce.timers=[],ce.fx.tick=function(){var e,t=0,n=ce.timers;for(st=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||ce.fx.stop(),st=void 0},ce.fx.timer=function(e){ce.timers.push(e),ce.fx.start()},ce.fx.interval=13,ce.fx.start=function(){ut||(ut=!0,dt())},ce.fx.stop=function(){ut=null},ce.fx.speeds={slow:600,fast:200,_default:400},ce.fn.delay=function(r,e){return r=ce.fx&&ce.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=ie.setTimeout(e,r);t.stop=function(){ie.clearTimeout(n)}})},lt=C.createElement("input"),ct=C.createElement("select").appendChild(C.createElement("option")),lt.type="checkbox",le.checkOn=""!==lt.value,le.optSelected=ct.selected,(lt=C.createElement("input")).value="t",lt.type="radio",le.radioValue="t"===lt.value;var mt,xt=ce.expr.attrHandle;ce.fn.extend({attr:function(e,t){return M(this,ce.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){ce.removeAttr(this,e)})}}),ce.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?ce.prop(e,t,n):(1===o&&ce.isXMLDoc(e)||(i=ce.attrHooks[t.toLowerCase()]||(ce.expr.match.bool.test(t)?mt:void 0)),void 0!==n?null===n?void ce.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=ce.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!le.radioValue&&"radio"===t&&fe(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(D);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),mt={set:function(e,t,n){return!1===t?ce.removeAttr(e,n):e.setAttribute(n,n),n}},ce.each(ce.expr.match.bool.source.match(/\w+/g),function(e,t){var a=xt[t]||ce.find.attr;xt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=xt[o],xt[o]=r,r=null!=a(e,t,n)?o:null,xt[o]=i),r}});var bt=/^(?:input|select|textarea|button)$/i,wt=/^(?:a|area)$/i;function Tt(e){return(e.match(D)||[]).join(" ")}function Ct(e){return e.getAttribute&&e.getAttribute("class")||""}function kt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(D)||[]}ce.fn.extend({prop:function(e,t){return M(this,ce.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[ce.propFix[e]||e]})}}),ce.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&ce.isXMLDoc(e)||(t=ce.propFix[t]||t,i=ce.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=ce.find.attr(e,"tabindex");return t?parseInt(t,10):bt.test(e.nodeName)||wt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),le.optSelected||(ce.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),ce.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){ce.propFix[this.toLowerCase()]=this}),ce.fn.extend({addClass:function(t){var e,n,r,i,o,a;return v(t)?this.each(function(e){ce(this).addClass(t.call(this,e,Ct(this)))}):(e=kt(t)).length?this.each(function(){if(r=Ct(this),n=1===this.nodeType&&" "+Tt(r)+" "){for(o=0;o<e.length;o++)i=e[o],n.indexOf(" "+i+" ")<0&&(n+=i+" ");a=Tt(n),r!==a&&this.setAttribute("class",a)}}):this},removeClass:function(t){var e,n,r,i,o,a;return v(t)?this.each(function(e){ce(this).removeClass(t.call(this,e,Ct(this)))}):arguments.length?(e=kt(t)).length?this.each(function(){if(r=Ct(this),n=1===this.nodeType&&" "+Tt(r)+" "){for(o=0;o<e.length;o++){i=e[o];while(-1<n.indexOf(" "+i+" "))n=n.replace(" "+i+" "," ")}a=Tt(n),r!==a&&this.setAttribute("class",a)}}):this:this.attr("class","")},toggleClass:function(t,n){var e,r,i,o,a=typeof t,s="string"===a||Array.isArray(t);return v(t)?this.each(function(e){ce(this).toggleClass(t.call(this,e,Ct(this),n),n)}):"boolean"==typeof n&&s?n?this.addClass(t):this.removeClass(t):(e=kt(t),this.each(function(){if(s)for(o=ce(this),i=0;i<e.length;i++)r=e[i],o.hasClass(r)?o.removeClass(r):o.addClass(r);else void 0!==t&&"boolean"!==a||((r=Ct(this))&&_.set(this,"__className__",r),this.setAttribute&&this.setAttribute("class",r||!1===t?"":_.get(this,"__className__")||""))}))},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+Tt(Ct(n))+" ").indexOf(t))return!0;return!1}});var St=/\r/g;ce.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=v(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,ce(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=ce.map(t,function(e){return null==e?"":e+""})),(r=ce.valHooks[this.type]||ce.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=ce.valHooks[t.type]||ce.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(St,""):null==e?"":e:void 0}}),ce.extend({valHooks:{option:{get:function(e){var t=ce.find.attr(e,"value");return null!=t?t:Tt(ce.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!fe(n.parentNode,"optgroup"))){if(t=ce(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=ce.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<ce.inArray(ce.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),ce.each(["radio","checkbox"],function(){ce.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<ce.inArray(ce(e).val(),t)}},le.checkOn||(ce.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Et=ie.location,jt={guid:Date.now()},At=/\?/;ce.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new ie.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||ce.error("Invalid XML: "+(n?ce.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Dt=/^(?:focusinfocus|focusoutblur)$/,Nt=function(e){e.stopPropagation()};ce.extend(ce.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||C],d=ue.call(e,"type")?e.type:e,h=ue.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||C,3!==n.nodeType&&8!==n.nodeType&&!Dt.test(d+ce.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[ce.expando]?e:new ce.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:ce.makeArray(t,[e]),c=ce.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!y(n)){for(s=c.delegateType||d,Dt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||C)&&p.push(a.defaultView||a.parentWindow||ie)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(_.get(o,"events")||Object.create(null))[e.type]&&_.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&$(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!$(n)||u&&v(n[d])&&!y(n)&&((a=n[u])&&(n[u]=null),ce.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Nt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Nt),ce.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=ce.extend(new ce.Event,n,{type:e,isSimulated:!0});ce.event.trigger(r,null,t)}}),ce.fn.extend({trigger:function(e,t){return this.each(function(){ce.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return ce.event.trigger(e,t,n,!0)}});var qt=/\[\]$/,Lt=/\r?\n/g,Ht=/^(?:submit|button|image|reset|file)$/i,Ot=/^(?:input|select|textarea|keygen)/i;function Pt(n,e,r,i){var t;if(Array.isArray(e))ce.each(e,function(e,t){r||qt.test(n)?i(n,t):Pt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==x(e))i(n,e);else for(t in e)Pt(n+"["+t+"]",e[t],r,i)}ce.param=function(e,t){var n,r=[],i=function(e,t){var n=v(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!ce.isPlainObject(e))ce.each(e,function(){i(this.name,this.value)});else for(n in e)Pt(n,e[n],t,i);return r.join("&")},ce.fn.extend({serialize:function(){return ce.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=ce.prop(this,"elements");return e?ce.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!ce(this).is(":disabled")&&Ot.test(this.nodeName)&&!Ht.test(e)&&(this.checked||!we.test(e))}).map(function(e,t){var n=ce(this).val();return null==n?null:Array.isArray(n)?ce.map(n,function(e){return{name:t.name,value:e.replace(Lt,"\r\n")}}):{name:t.name,value:n.replace(Lt,"\r\n")}}).get()}});var Mt=/%20/g,Rt=/#.*$/,It=/([?&])_=[^&]*/,Wt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ft=/^(?:GET|HEAD)$/,$t=/^\/\//,Bt={},_t={},zt="*/".concat("*"),Xt=C.createElement("a");function Ut(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(D)||[];if(v(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Vt(t,i,o,a){var s={},u=t===_t;function l(e){var r;return s[e]=!0,ce.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Gt(e,t){var n,r,i=ce.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&ce.extend(!0,e,r),e}Xt.href=Et.href,ce.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":ce.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Gt(Gt(e,ce.ajaxSettings),t):Gt(ce.ajaxSettings,e)},ajaxPrefilter:Ut(Bt),ajaxTransport:Ut(_t),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=ce.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?ce(y):ce.event,x=ce.Deferred(),b=ce.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Wt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace($t,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(D)||[""],null==v.crossDomain){r=C.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Xt.protocol+"//"+Xt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=ce.param(v.data,v.traditional)),Vt(Bt,v,t,T),h)return T;for(i in(g=ce.event&&v.global)&&0==ce.active++&&ce.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ft.test(v.type),f=v.url.replace(Rt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Mt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(At.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(It,"$1"),o=(At.test(f)?"&":"?")+"_="+jt.guid+++o),v.url=f+o),v.ifModified&&(ce.lastModified[f]&&T.setRequestHeader("If-Modified-Since",ce.lastModified[f]),ce.etag[f]&&T.setRequestHeader("If-None-Match",ce.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+zt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Vt(_t,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=ie.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&ie.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<ce.inArray("script",v.dataTypes)&&ce.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(ce.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(ce.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--ce.active||ce.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return ce.get(e,t,n,"json")},getScript:function(e,t){return ce.get(e,void 0,t,"script")}}),ce.each(["get","post"],function(e,i){ce[i]=function(e,t,n,r){return v(t)&&(r=r||n,n=t,t=void 0),ce.ajax(ce.extend({url:e,type:i,dataType:r,data:t,success:n},ce.isPlainObject(e)&&e))}}),ce.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),ce._evalUrl=function(e,t,n){return ce.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){ce.globalEval(e,t,n)}})},ce.fn.extend({wrapAll:function(e){var t;return this[0]&&(v(e)&&(e=e.call(this[0])),t=ce(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return v(n)?this.each(function(e){ce(this).wrapInner(n.call(this,e))}):this.each(function(){var e=ce(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=v(t);return this.each(function(e){ce(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){ce(this).replaceWith(this.childNodes)}),this}}),ce.expr.pseudos.hidden=function(e){return!ce.expr.pseudos.visible(e)},ce.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},ce.ajaxSettings.xhr=function(){try{return new ie.XMLHttpRequest}catch(e){}};var Yt={0:200,1223:204},Qt=ce.ajaxSettings.xhr();le.cors=!!Qt&&"withCredentials"in Qt,le.ajax=Qt=!!Qt,ce.ajaxTransport(function(i){var o,a;if(le.cors||Qt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Yt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&ie.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),ce.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),ce.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return ce.globalEval(e),e}}}),ce.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),ce.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=ce("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=Tt(e.slice(s)),e=e.slice(0,s)),v(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&ce.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?ce("<div>").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var en=/^[\s\uFEFF\xA0]+|([^\s\uFEFF\xA0])[\s\uFEFF\xA0]+$/g;ce.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),v(e))return r=ae.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(ae.call(arguments)))}).guid=e.guid=e.guid||ce.guid++,i},ce.holdReady=function(e){e?ce.readyWait++:ce.ready(!0)},ce.isArray=Array.isArray,ce.parseJSON=JSON.parse,ce.nodeName=fe,ce.isFunction=v,ce.isWindow=y,ce.camelCase=F,ce.type=x,ce.now=Date.now,ce.isNumeric=function(e){var t=ce.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},ce.trim=function(e){return null==e?"":(e+"").replace(en,"$1")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return ce});var tn=ie.jQuery,nn=ie.$;return ce.noConflict=function(e){return ie.$===ce&&(ie.$=nn),e&&ie.jQuery===ce&&(ie.jQuery=tn),ce},"undefined"==typeof e&&(ie.jQuery=ie.$=ce),ce});
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
index 2f7a994097b..5ae2d159072 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
@@ -113,7 +113,7 @@ public class DocPaths {
     public static final DocPath JQUERY_DIR = DocPath.create("jquery");
 
     /** The name of the default jQuery javascript file. */
-    public static final DocPath JQUERY_JS = DocPath.create("jquery-3.6.1.min.js");
+    public static final DocPath JQUERY_JS = DocPath.create("jquery-3.7.1.min.js");
 
     /** The name of the default jQuery UI stylesheet file. */
     public static final DocPath JQUERY_UI_CSS = DocPath.create("jquery-ui.min.css");
diff --git a/src/jdk.javadoc/share/legal/jquery.md b/src/jdk.javadoc/share/legal/jquery.md
index d468b3183a7..a763ec6f187 100644
--- a/src/jdk.javadoc/share/legal/jquery.md
+++ b/src/jdk.javadoc/share/legal/jquery.md
@@ -1,8 +1,8 @@
-## jQuery v3.6.1
+## jQuery v3.7.1
 
 ### jQuery License
 ```
-jQuery v 3.6.1
+jQuery v 3.7.1
 Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -23,50 +23,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-******************************************
-
-The jQuery JavaScript Library v3.6.1 also includes Sizzle.js
-
-Sizzle.js includes the following license:
-
-Copyright JS Foundation and other contributors, https://js.foundation/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/sizzle
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.
-
-*********************
-
 ```
diff --git a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
index a7f1ad91ced..292d8245982 100644
--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
@@ -421,7 +421,7 @@ public class TestSearch extends JavadocTester {
                     <link rel="stylesheet" type="text/css" href="resource-files/jquery-ui.min.css" title="Style">
                     """,
                 """
-                    <script type="text/javascript" src="script-files/jquery-3.6.1.min.js"></script>
+                    <script type="text/javascript" src="script-files/jquery-3.7.1.min.js"></script>
                     """,
                 """
                     <script type="text/javascript" src="script-files/jquery-ui.min.js"></script>""",
@@ -672,7 +672,7 @@ public class TestSearch extends JavadocTester {
     void checkJqueryAndImageFiles(boolean expectedOutput) {
         checkFiles(expectedOutput,
                 "script-files/search.js",
-                "script-files/jquery-3.6.1.min.js",
+                "script-files/jquery-3.7.1.min.js",
                 "script-files/jquery-ui.min.js",
                 "resource-files/jquery-ui.min.css",
                 "resource-files/x.png",
diff --git a/test/langtools/jdk/javadoc/doclet/testSearchScript/javadoc-search.js b/test/langtools/jdk/javadoc/doclet/testSearchScript/javadoc-search.js
index 668ca9f68ff..b3874d82236 100644
--- a/test/langtools/jdk/javadoc/doclet/testSearchScript/javadoc-search.js
+++ b/test/langtools/jdk/javadoc/doclet/testSearchScript/javadoc-search.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ function loadIndexFiles(docsPath) {
     tryLoad(docsPath, "type-search-index.js");
     tryLoad(docsPath, "member-search-index.js");
     tryLoad(docsPath, "tag-search-index.js");
-    load(docsPath + "/search.js");
+    load(docsPath + "/script-files/search.js");
 }
 
 function tryLoad(docsPath, file) {
@@ -63,6 +63,12 @@ var $ = function(f) {
         f();
     } else {
         return {
+            attr: function() {
+                return this;
+            },
+            css: function() {
+                return this;
+            },
             val: function() {
                 return this;
             },
diff --git a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
index eb6a980f7a8..cbb63bfd129 100644
--- a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
+++ b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
@@ -235,7 +235,7 @@ class APITest {
             "resource-files/fonts/DejaVuLGCSerif-Italic.woff2",
             "resource-files/fonts/DejaVuLGCSerif.woff",
             "resource-files/fonts/DejaVuLGCSerif.woff2",
-            "script-files/jquery-3.6.1.min.js",
+            "script-files/jquery-3.7.1.min.js",
             "script-files/jquery-ui.min.js",
             "script-files/script.js",
             "script-files/search.js",

From 8990864a53fa04f44ecf8bff65a6dc9cdd67cb1c Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Fri, 19 Apr 2024 10:05:24 +0000
Subject: [PATCH 108/486] 8330156: RISC-V: Range check auipc + signed 12 imm
 instruction

Reviewed-by: fyang, mli, tonyp
---
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp |  2 +-
 src/hotspot/cpu/riscv/macroAssembler_riscv.hpp | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 4704fbcaf75..26eacc3ec6f 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -721,7 +721,7 @@ void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Reg
 
 void MacroAssembler::la(Register Rd, const address addr) {
   int64_t offset = addr - pc();
-  if (is_simm32(offset)) {
+  if (is_valid_32bit_offset(offset)) {
     auipc(Rd, (int32_t)offset + 0x800);  //0x800, Note:the 11th sign bit
     addi(Rd, Rd, ((int64_t)offset << 52) >> 52);
   } else {
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 75c0f9ba305..508b23df128 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -678,6 +678,14 @@ private:
   int pop_v(unsigned int bitset, Register stack);
 #endif // COMPILER2
 
+  // The signed 20-bit upper imm can materialize at most negative 0xF...F80000000, two G.
+  // The following signed 12-bit imm can at max subtract 0x800, two K, from that previously loaded two G.
+  bool is_valid_32bit_offset(int64_t x) {
+    constexpr int64_t twoG = (2 * G);
+    constexpr int64_t twoK = (2 * K);
+    return x < (twoG - twoK) && x >= (-twoG - twoK);
+  }
+
 public:
   void push_reg(Register Rs);
   void pop_reg(Register Rd);
@@ -833,7 +841,7 @@ public:
   void NAME(Register Rd, address dest) {                                                           \
     assert_cond(dest != nullptr);                                                                  \
     int64_t distance = dest - pc();                                                                \
-    if (is_simm32(distance)) {                                                                     \
+    if (is_valid_32bit_offset(distance)) {                                                         \
       auipc(Rd, (int32_t)distance + 0x800);                                                        \
       Assembler::NAME(Rd, Rd, ((int32_t)distance << 20) >> 20);                                    \
     } else {                                                                                       \
@@ -890,7 +898,7 @@ public:
   void NAME(FloatRegister Rd, address dest, Register temp = t0) {                                  \
     assert_cond(dest != nullptr);                                                                  \
     int64_t distance = dest - pc();                                                                \
-    if (is_simm32(distance)) {                                                                     \
+    if (is_valid_32bit_offset(distance)) {                                                         \
       auipc(temp, (int32_t)distance + 0x800);                                                      \
       Assembler::NAME(Rd, temp, ((int32_t)distance << 20) >> 20);                                  \
     } else {                                                                                       \
@@ -951,7 +959,7 @@ public:
     assert_cond(dest != nullptr);                                                                  \
     assert_different_registers(Rs, temp);                                                          \
     int64_t distance = dest - pc();                                                                \
-    if (is_simm32(distance)) {                                                                     \
+    if (is_valid_32bit_offset(distance)) {                                                         \
       auipc(temp, (int32_t)distance + 0x800);                                                      \
       Assembler::NAME(Rs, temp, ((int32_t)distance << 20) >> 20);                                  \
     } else {                                                                                       \
@@ -996,7 +1004,7 @@ public:
   void NAME(FloatRegister Rs, address dest, Register temp = t0) {                                  \
     assert_cond(dest != nullptr);                                                                  \
     int64_t distance = dest - pc();                                                                \
-    if (is_simm32(distance)) {                                                                     \
+    if (is_valid_32bit_offset(distance)) {                                                         \
       auipc(temp, (int32_t)distance + 0x800);                                                      \
       Assembler::NAME(Rs, temp, ((int32_t)distance << 20) >> 20);                                  \
     } else {                                                                                       \

From 9f2a4fad1715ccbc339d2476bbdc7a52e9a13380 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Fri, 19 Apr 2024 10:07:25 +0000
Subject: [PATCH 109/486] 8330572: jdk.internal.net.http.HttpConnection calls
 an expensive checkOpen() when returning a HTTP/1.1 connection to the pool

Reviewed-by: dfuchs, djelinski
---
 .../share/classes/jdk/internal/net/http/HttpConnection.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
index ffff6751865..8fbf27ddc46 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -409,7 +409,7 @@ abstract class HttpConnection implements Closeable {
                 .map((s) -> !s.equalsIgnoreCase("close"))
                 .orElse(true);
 
-        if (keepAlive && checkOpen()) {
+        if (keepAlive && isOpen()) {
             Log.logTrace("Returning connection to the pool: {0}", this);
             pool.returnToPool(this);
         } else {

From 85261bcebc1903d9f05523bfb9c1b25d7f1fd8b6 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 19 Apr 2024 10:08:57 +0000
Subject: [PATCH 110/486] 8330266: RISC-V: Restore frm to RoundingMode::rne
 after JNI

Reviewed-by: fyang, rehn
---
 src/hotspot/cpu/riscv/downcallLinker_riscv.cpp      |  3 +++
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp      | 13 +++++++++++++
 src/hotspot/cpu/riscv/macroAssembler_riscv.hpp      |  3 +++
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp       |  3 +++
 .../riscv/templateInterpreterGenerator_riscv.cpp    |  3 +++
 5 files changed, 25 insertions(+)

diff --git a/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp b/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
index 9c4ea56d0c8..26845986a81 100644
--- a/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
+++ b/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
@@ -278,6 +278,9 @@ void DowncallLinker::StubGenerator::generate() {
   Label L_reguard;
   Label L_after_reguard;
   if (_needs_transition) {
+    // Restore cpu control state after JNI call
+    __ restore_cpu_control_state_after_jni(t0);
+
     __ block_comment("{ thread native2java");
     __ mv(t0, _thread_in_native_trans);
     __ sw(t0, Address(xthread, JavaThread::thread_state_offset()));
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 26eacc3ec6f..1b5a3cf571f 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -1167,6 +1167,19 @@ void MacroAssembler::fsflagsi(Register Rd, unsigned imm) {
 
 #undef INSN
 
+void MacroAssembler::restore_cpu_control_state_after_jni(Register tmp) {
+  if (RestoreMXCSROnJNICalls) {
+    Label skip_fsrmi;
+    frrm(tmp);
+    // Set FRM to the state we need. We do want Round to Nearest.
+    // We don't want non-IEEE rounding modes.
+    guarantee(RoundingMode::rne == 0, "must be");
+    beqz(tmp, skip_fsrmi);        // Only reset FRM if it's wrong
+    fsrmi(RoundingMode::rne);
+    bind(skip_fsrmi);
+  }
+}
+
 void MacroAssembler::push_reg(Register Rs)
 {
   addi(esp, esp, 0 - wordSize);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 508b23df128..1abf1560707 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -581,6 +581,9 @@ class MacroAssembler: public Assembler {
   void fsflagsi(Register Rd, unsigned imm);
   void fsflagsi(unsigned imm);
 
+  // Restore cpu control state after JNI call
+  void restore_cpu_control_state_after_jni(Register tmp);
+
   // Control transfer pseudo instructions
   void beqz(Register Rs, const address dest);
   void bnez(Register Rs, const address dest);
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 4f84ae256de..9e6c8ce2e5e 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1748,6 +1748,9 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   intptr_t return_pc = (intptr_t) __ pc();
   oop_maps->add_gc_map(return_pc - start, map);
 
+  // Verify or restore cpu control state after JNI call
+  __ restore_cpu_control_state_after_jni(t0);
+
   // Unpack native results.
   if (ret_type != T_OBJECT && ret_type != T_ARRAY) {
     __ cast_primitive_type(ret_type, x10);
diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index 860a7afb5e3..07aad47173c 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -1157,6 +1157,9 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ get_method(xmethod);
   // result potentially in x10 or f10
 
+  // Restore cpu control state after JNI call
+  __ restore_cpu_control_state_after_jni(t0);
+
   // make room for the pushes we're about to do
   __ sub(t0, esp, 4 * wordSize);
   __ andi(sp, t0, -16);

From eb60822a45ecd076484e707b2dd1049ed9d8079b Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 19 Apr 2024 10:10:00 +0000
Subject: [PATCH 111/486] 8310072: JComboBox/DisabledComboBoxFontTestAuto:
 Enabled and disabled ComboBox does not match in these LAFs: GTK+

Reviewed-by: dnguyen, jdv, tr, serb
---
 .../DisabledComboBoxFontTestAuto.java         | 82 ++++++++-----------
 1 file changed, 34 insertions(+), 48 deletions(-)

diff --git a/test/jdk/javax/swing/JComboBox/DisabledComboBoxFontTestAuto.java b/test/jdk/javax/swing/JComboBox/DisabledComboBoxFontTestAuto.java
index 49b1dbc016a..50d3708fa5a 100644
--- a/test/jdk/javax/swing/JComboBox/DisabledComboBoxFontTestAuto.java
+++ b/test/jdk/javax/swing/JComboBox/DisabledComboBoxFontTestAuto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,13 +21,6 @@
  * questions.
  */
 
-/*
- * @test
- * @bug 7093691
- * @summary Tests if JComboBox has correct font color when disabled/enabled
- * @run main/othervm -Dsun.java2d.uiScale=1 DisabledComboBoxFontTestAuto
- */
-
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
@@ -44,20 +37,29 @@ import javax.swing.UnsupportedLookAndFeelException;
 
 import static java.awt.image.BufferedImage.TYPE_INT_ARGB;
 
+/*
+ * @test
+ * @bug 7093691 8310072
+ * @summary Tests if JComboBox has correct font color when disabled/enabled
+ * @key headful
+ * @run main/othervm -Dsun.java2d.uiScale=1 DisabledComboBoxFontTestAuto
+ */
+
 public class DisabledComboBoxFontTestAuto {
     private static JComboBox combo, combo2;
     private static BufferedImage enabledImage, disabledImage, enabledImage2, disabledImage2;
-    private static Path testDir;
     private static String lafName;
     private static StringBuffer failingLafs;
     private static int COMBO_HEIGHT, COMBO_WIDTH, COMBO2_HEIGHT, COMBO2_WIDTH;
 
     private static void createCombo() {
         combo = new JComboBox();
-        combo.addItem("Simple JComboBox");
+        combo.addItem("\u2588".repeat(5));
+        combo.setFont(combo.getFont().deriveFont(50.0f));
         combo.setRenderer(new DefaultListCellRenderer());
         combo2 = new JComboBox();
-        combo2.addItem("Simple JComboBox");
+        combo2.addItem("\u2588".repeat(5));
+        combo2.setFont(combo2.getFont().deriveFont(50.0f));
         COMBO_WIDTH = (int) combo.getPreferredSize().getWidth();
         COMBO_HEIGHT = (int) combo.getPreferredSize().getHeight();
         COMBO2_WIDTH = (int) combo2.getPreferredSize().getWidth();
@@ -90,53 +92,38 @@ public class DisabledComboBoxFontTestAuto {
     }
 
     private static void testMethod() throws IOException {
-        ImageIO.write(enabledImage, "png", new File(testDir
-                + "/" + lafName + "Enabled.png"));
-        ImageIO.write(disabledImage, "png", new File(testDir
-                + "/" + lafName + "Disabled.png"));
-        ImageIO.write(enabledImage2, "png", new File(testDir
-                + "/" + lafName + "EnabledDLCR.png"));
-        ImageIO.write(disabledImage2, "png", new File(testDir
-                + "/" + lafName + "DisabledDLCR.png"));
-
-        boolean isIdentical = true;
         Color eColor1, eColor2, dColor1, dColor2;
+        Path testDir = Path.of(System.getProperty("test.classes", "."));
 
         // Use center line to compare RGB values
-        int y = 10;
+        int y = enabledImage.getHeight() / 2;
         for (int x = (enabledImage.getWidth() / 2) - 20;
              x < (enabledImage.getWidth() / 2) + 20; x++) {
-            // Nimbus has a pixel offset in coordinates since Nimbus is 2px
-            // smaller in width than other L&F's
-            if (lafName.equals("Nimbus")) {
-                eColor1 = new Color(enabledImage.getRGB(x + 1, y));
-                eColor2 = new Color(enabledImage2.getRGB(x, y));
-                dColor1 = new Color(disabledImage.getRGB(x + 1, y));
-                dColor2 = new Color(disabledImage2.getRGB(x, y));
-            } else {
-                eColor1 = new Color(enabledImage.getRGB(x, y));
-                eColor2 = new Color(enabledImage2.getRGB(x, y));
-                dColor1 = new Color(disabledImage.getRGB(x, y));
-                dColor2 = new Color(disabledImage2.getRGB(x, y));
-            }
-            if ((!isColorMatching(eColor1, eColor2)) || (!isColorMatching(dColor1, dColor2))) {
-                isIdentical = false;
-                break;
-            }
-        }
+            eColor1 = new Color(enabledImage.getRGB(x, y));
+            eColor2 = new Color(enabledImage2.getRGB(x, y));
+            dColor1 = new Color(disabledImage.getRGB(x, y));
+            dColor2 = new Color(disabledImage2.getRGB(x, y));
 
-        if (isIdentical) {
-            System.out.println("PASSED");
-        } else {
-            failingLafs.append(lafName + ", ");
+            if ((!isColorMatching(eColor1, eColor2)) || (!isColorMatching(dColor1, dColor2))) {
+                failingLafs.append(lafName + ", ");
+                ImageIO.write(enabledImage, "png", new File(testDir
+                        + "/" + lafName + "Enabled.png"));
+                ImageIO.write(disabledImage, "png", new File(testDir
+                        + "/" + lafName + "Disabled.png"));
+                ImageIO.write(enabledImage2, "png", new File(testDir
+                        + "/" + lafName + "EnabledDLCR.png"));
+                ImageIO.write(disabledImage2, "png", new File(testDir
+                        + "/" + lafName + "DisabledDLCR.png"));
+                return;
+            }
         }
+        System.out.println("Test Passed: " + lafName);
     }
 
     private static boolean isColorMatching(Color c1, Color c2) {
         if ((c1.getRed() != c2.getRed())
-                || (c1.getBlue() != c2.getBlue())
-                || (c1.getGreen() != c2.getGreen())) {
-
+            || (c1.getBlue() != c2.getBlue())
+            || (c1.getGreen() != c2.getGreen())) {
             System.out.println(lafName + " Enabled RGB failure: "
                     + c1.getRed() + ", "
                     + c1.getBlue() + ", "
@@ -163,7 +150,6 @@ public class DisabledComboBoxFontTestAuto {
     public static void main(String[] args) throws Exception {
         lafName = "null";
         failingLafs = new StringBuffer();
-        testDir = Path.of(System.getProperty("test.classes", "."));
         for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
             // Change Motif LAF name to avoid using slash in saved image file path
             lafName = laf.getName().equals("CDE/Motif") ? "Motif" : laf.getName();

From 177092b952c2135c6f6872c6b64d1e210452d35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Fri, 19 Apr 2024 10:13:40 +0000
Subject: [PATCH 112/486] 8330569: Rename Nix to Posix in platform-dependent
 attachListener code

Reviewed-by: mdoerr, stuefe, coleenp
---
 ...tener_nix.cpp => attachListener_posix.cpp} | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)
 rename src/hotspot/os/posix/{attachListener_nix.cpp => attachListener_posix.cpp} (91%)

diff --git a/src/hotspot/os/posix/attachListener_nix.cpp b/src/hotspot/os/posix/attachListener_posix.cpp
similarity index 91%
rename from src/hotspot/os/posix/attachListener_nix.cpp
rename to src/hotspot/os/posix/attachListener_posix.cpp
index a1a5ab81b4c..bdd97afd47e 100644
--- a/src/hotspot/os/posix/attachListener_nix.cpp
+++ b/src/hotspot/os/posix/attachListener_posix.cpp
@@ -63,9 +63,9 @@
 //    of the client matches this process.
 
 // forward reference
-class NixAttachOperation;
+class PosixAttachOperation;
 
-class NixAttachListener: AllStatic {
+class PosixAttachListener: AllStatic {
  private:
   // the path to which we bind the UNIX domain socket
   static char _path[UNIX_PATH_MAX];
@@ -77,7 +77,7 @@ class NixAttachListener: AllStatic {
   static bool _atexit_registered;
 
   // reads a request from the given connected socket
-  static NixAttachOperation* read_request(int s);
+  static PosixAttachOperation* read_request(int s);
 
  public:
   enum {
@@ -110,10 +110,10 @@ class NixAttachListener: AllStatic {
   // write the given buffer to a socket
   static int write_fully(int s, char* buf, size_t len);
 
-  static NixAttachOperation* dequeue();
+  static PosixAttachOperation* dequeue();
 };
 
-class NixAttachOperation: public AttachOperation {
+class PosixAttachOperation: public AttachOperation {
  private:
   // the connection to the client
   int _socket;
@@ -124,16 +124,16 @@ class NixAttachOperation: public AttachOperation {
   void set_socket(int s)                                { _socket = s; }
   int socket() const                                    { return _socket; }
 
-  NixAttachOperation(char* name) : AttachOperation(name) {
+  PosixAttachOperation(char* name) : AttachOperation(name) {
     set_socket(-1);
   }
 };
 
 // statics
-char NixAttachListener::_path[UNIX_PATH_MAX];
-bool NixAttachListener::_has_path;
-volatile int NixAttachListener::_listener = -1;
-bool NixAttachListener::_atexit_registered = false;
+char PosixAttachListener::_path[UNIX_PATH_MAX];
+bool PosixAttachListener::_has_path;
+volatile int PosixAttachListener::_listener = -1;
+bool PosixAttachListener::_atexit_registered = false;
 
 // Supporting class to help split a buffer into individual components
 class ArgumentIterator : public StackObj {
@@ -168,22 +168,22 @@ class ArgumentIterator : public StackObj {
 // bound too.
 extern "C" {
   static void listener_cleanup() {
-    int s = NixAttachListener::listener();
+    int s = PosixAttachListener::listener();
     if (s != -1) {
-      NixAttachListener::set_listener(-1);
+      PosixAttachListener::set_listener(-1);
       ::shutdown(s, SHUT_RDWR);
       ::close(s);
     }
-    if (NixAttachListener::has_path()) {
-      ::unlink(NixAttachListener::path());
-      NixAttachListener::set_path(nullptr);
+    if (PosixAttachListener::has_path()) {
+      ::unlink(PosixAttachListener::path());
+      PosixAttachListener::set_path(nullptr);
     }
   }
 }
 
 // Initialization - create a listener socket and bind it to a file
 
-int NixAttachListener::init() {
+int PosixAttachListener::init() {
   char path[UNIX_PATH_MAX];          // socket file
   char initial_path[UNIX_PATH_MAX];  // socket file during setup
   int listener;                      // listener socket (file descriptor)
@@ -255,7 +255,7 @@ int NixAttachListener::init() {
 // after the peer credentials have been checked and in the worst case it just
 // means that the attach listener thread is blocked.
 //
-NixAttachOperation* NixAttachListener::read_request(int s) {
+PosixAttachOperation* PosixAttachListener::read_request(int s) {
   char ver_str[8];
   os::snprintf_checked(ver_str, sizeof(ver_str), "%d", ATTACH_PROTOCOL_VER);
 
@@ -327,7 +327,7 @@ NixAttachOperation* NixAttachListener::read_request(int s) {
     return nullptr;
   }
 
-  NixAttachOperation* op = new NixAttachOperation(name);
+  PosixAttachOperation* op = new PosixAttachOperation(name);
 
   for (int i=0; i<AttachOperation::arg_count_max; i++) {
     char* arg = args.next();
@@ -351,7 +351,7 @@ NixAttachOperation* NixAttachListener::read_request(int s) {
 // In the Linux and BSD implementations, there is only a single operation and
 // clients cannot queue commands (except at the socket level).
 //
-NixAttachOperation* NixAttachListener::dequeue() {
+PosixAttachOperation* PosixAttachListener::dequeue() {
   for (;;) {
     int s;
 
@@ -400,7 +400,7 @@ NixAttachOperation* NixAttachListener::dequeue() {
 #endif
 
     // peer credential look okay so we read the request
-    NixAttachOperation* op = read_request(s);
+    PosixAttachOperation* op = read_request(s);
     if (op == nullptr) {
       ::close(s);
       continue;
@@ -411,7 +411,7 @@ NixAttachOperation* NixAttachListener::dequeue() {
 }
 
 // write the given buffer to the socket
-int NixAttachListener::write_fully(int s, char* buf, size_t len) {
+int PosixAttachListener::write_fully(int s, char* buf, size_t len) {
   do {
     ssize_t n = ::write(s, buf, len);
     if (n == -1) {
@@ -433,18 +433,18 @@ int NixAttachListener::write_fully(int s, char* buf, size_t len) {
 // if there are operations that involves a very big reply then it the
 // socket could be made non-blocking and a timeout could be used.
 
-void NixAttachOperation::complete(jint result, bufferedStream* st) {
+void PosixAttachOperation::complete(jint result, bufferedStream* st) {
   JavaThread* thread = JavaThread::current();
   ThreadBlockInVM tbivm(thread);
 
   // write operation result
   char msg[32];
   os::snprintf_checked(msg, sizeof(msg), "%d\n", result);
-  int rc = NixAttachListener::write_fully(this->socket(), msg, strlen(msg));
+  int rc = PosixAttachListener::write_fully(this->socket(), msg, strlen(msg));
 
   // write any result data
   if (rc == 0) {
-    NixAttachListener::write_fully(this->socket(), (char*) st->base(), st->size());
+    PosixAttachListener::write_fully(this->socket(), (char*) st->base(), st->size());
     ::shutdown(this->socket(), 2);
   }
 
@@ -461,7 +461,7 @@ AttachOperation* AttachListener::dequeue() {
   JavaThread* thread = JavaThread::current();
   ThreadBlockInVM tbivm(thread);
 
-  AttachOperation* op = NixAttachListener::dequeue();
+  AttachOperation* op = PosixAttachListener::dequeue();
 
   return op;
 }
@@ -493,7 +493,7 @@ int AttachListener::pd_init() {
   JavaThread* thread = JavaThread::current();
   ThreadBlockInVM tbivm(thread);
 
-  int ret_code = NixAttachListener::init();
+  int ret_code = PosixAttachListener::init();
 
   return ret_code;
 }
@@ -501,10 +501,10 @@ int AttachListener::pd_init() {
 bool AttachListener::check_socket_file() {
   int ret;
   struct stat st;
-  ret = stat(NixAttachListener::path(), &st);
+  ret = stat(PosixAttachListener::path(), &st);
   if (ret == -1) { // need to restart attach listener.
     log_debug(attach)("Socket file %s does not exist - Restart Attach Listener",
-                      NixAttachListener::path());
+                      PosixAttachListener::path());
 
     listener_cleanup();
 

From 650ca65a4f838a1095e43acac649fde48eceaee7 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 19 Apr 2024 14:50:39 +0000
Subject: [PATCH 113/486] 8329330: NoClassDefFoundError: Could not initialize
 class jdk.jfr.internal.MirrorEvents

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/internal/instrument/JDKEvents.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
index 10ab2094d5b..a6c65641cd3 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
@@ -44,8 +44,6 @@ import jdk.jfr.events.FileForceEvent;
 import jdk.jfr.events.FileReadEvent;
 import jdk.jfr.events.FileWriteEvent;
 import jdk.jfr.events.InitialSecurityPropertyEvent;
-import jdk.jfr.events.SocketReadEvent;
-import jdk.jfr.events.SocketWriteEvent;
 
 import jdk.jfr.internal.JVM;
 import jdk.jfr.internal.LogLevel;
@@ -62,8 +60,6 @@ public final class JDKEvents {
         FileForceEvent.class,
         FileReadEvent.class,
         FileWriteEvent.class,
-        SocketReadEvent.class,
-        SocketWriteEvent.class,
         ActiveSettingEvent.class,
         ActiveRecordingEvent.class,
         // jdk.internal.event.* classes need their mirror

From 3c1d1d93d7b1de229753ed697f008bd5639ac957 Mon Sep 17 00:00:00 2001
From: Dan Heidinga <heidinga@openjdk.org>
Date: Fri, 19 Apr 2024 15:03:18 +0000
Subject: [PATCH 114/486] 8320522: Remove code related to
 `RegisterFinalizersAtInit`

Reviewed-by: coleenp, ayang, kbarrett
---
 src/hotspot/cpu/aarch64/templateTable_aarch64.cpp     |  2 +-
 src/hotspot/cpu/arm/templateTable_arm.cpp             |  4 ++--
 src/hotspot/cpu/ppc/templateTable_ppc_64.cpp          |  2 +-
 src/hotspot/cpu/riscv/templateTable_riscv.cpp         |  2 +-
 src/hotspot/cpu/x86/templateTable_x86.cpp             |  3 +--
 src/hotspot/share/c1/c1_GraphBuilder.cpp              |  3 +--
 src/hotspot/share/classfile/classFileParser.cpp       |  3 +--
 src/hotspot/share/interpreter/abstractInterpreter.cpp |  4 ++--
 src/hotspot/share/interpreter/rewriter.cpp            |  2 +-
 src/hotspot/share/oops/instanceKlass.cpp              | 10 +---------
 src/hotspot/share/oops/instanceKlass.hpp              |  1 -
 src/hotspot/share/opto/parse1.cpp                     |  3 +--
 src/hotspot/share/runtime/globals.hpp                 |  4 ----
 13 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index 1a567049a46..eaaefb55f36 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -3611,7 +3611,7 @@ void TemplateTable::_new() {
   __ ldrw(r3,
           Address(r4,
                   Klass::layout_helper_offset()));
-  // test to see if it has a finalizer or is malformed in some way
+  // test to see if it is malformed in some way
   __ tbnz(r3, exact_log2(Klass::_lh_instance_slow_path_bit), slow_case);
 
   // Allocate the instance:
diff --git a/src/hotspot/cpu/arm/templateTable_arm.cpp b/src/hotspot/cpu/arm/templateTable_arm.cpp
index 55a0120e7c7..e657c659588 100644
--- a/src/hotspot/cpu/arm/templateTable_arm.cpp
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp
@@ -3971,7 +3971,7 @@ void TemplateTable::_new() {
   __ b(slow_case, ne);
   __ load_resolved_klass_at_offset(Rcpool, Rindex, Rklass);
 
-  // make sure klass is initialized & doesn't have finalizer
+  // make sure klass is initialized
   // make sure klass is fully initialized
   __ ldrb(Rtemp, Address(Rklass, InstanceKlass::init_state_offset()));
   __ cmp(Rtemp, InstanceKlass::fully_initialized);
@@ -3980,7 +3980,7 @@ void TemplateTable::_new() {
   // get instance_size in InstanceKlass (scaled to a count of bytes)
   __ ldr_u32(Rsize, Address(Rklass, Klass::layout_helper_offset()));
 
-  // test to see if it has a finalizer or is malformed in some way
+  // test to see if it is malformed in some way
   // Klass::_lh_instance_slow_path_bit is really a bit mask, not bit number
   __ tbnz(Rsize, exact_log2(Klass::_lh_instance_slow_path_bit), slow_case);
 
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 86353aefb36..d9b76a5b664 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -3809,7 +3809,7 @@ void TemplateTable::_new() {
 
     __ lwz(Rinstance_size, in_bytes(Klass::layout_helper_offset()), RinstanceKlass);
 
-    // Make sure klass does not have has_finalizer, or is abstract, or interface or java/lang/Class.
+    // Make sure klass is not abstract, or interface or java/lang/Class.
     __ andi_(R0, Rinstance_size, Klass::_lh_instance_slow_path_bit); // slow path bit equals 0?
     __ bne(CCR0, Lslow_case);
 
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
index 58f57f32b2f..6240e4b4b50 100644
--- a/src/hotspot/cpu/riscv/templateTable_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -3554,7 +3554,7 @@ void TemplateTable::_new() {
 
   // get instance_size in InstanceKlass (scaled to a count of bytes)
   __ lwu(x13, Address(x14, Klass::layout_helper_offset()));
-  // test to see if it has a finalizer or is malformed in some way
+  // test to see if is malformed in some way
   __ test_bit(t0, x13, exact_log2(Klass::_lh_instance_slow_path_bit));
   __ bnez(t0, slow_case);
 
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index f53a7872451..664cd86d486 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -4057,10 +4057,9 @@ void TemplateTable::_new() {
   __ jcc(Assembler::notEqual, slow_case);
 #endif
 
-  // make sure klass doesn't have finalizer
   // get instance_size in InstanceKlass (scaled to a count of bytes)
   __ movl(rdx, Address(rcx, Klass::layout_helper_offset()));
-  // test to see if it has a finalizer or is malformed in some way
+  // test to see if it is malformed in some way
   __ testl(rdx, Klass::_lh_instance_slow_path_bit);
   __ jcc(Assembler::notZero, slow_case);
 
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp
index 396c83c6ab9..a361f3da9c2 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp
@@ -1556,8 +1556,7 @@ void GraphBuilder::call_register_finalizer() {
 
 
 void GraphBuilder::method_return(Value x, bool ignore_return) {
-  if (RegisterFinalizersAtInit &&
-      method()->intrinsic_id() == vmIntrinsics::_Object_init) {
+  if (method()->intrinsic_id() == vmIntrinsics::_Object_init) {
     call_register_finalizer();
   }
 
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index fa7ca41e0c5..734b425cb45 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -4188,8 +4188,7 @@ void ClassFileParser::set_precomputed_flags(InstanceKlass* ik) {
   // If it cannot be fast-path allocated, set a bit in the layout helper.
   // See documentation of InstanceKlass::can_be_fastpath_allocated().
   assert(ik->size_helper() > 0, "layout_helper is initialized");
-  if ((!RegisterFinalizersAtInit && ik->has_finalizer())
-      || ik->is_abstract() || ik->is_interface()
+  if (ik->is_abstract() || ik->is_interface()
       || (ik->name() == vmSymbols::java_lang_Class() && ik->class_loader() == nullptr)
       || ik->size_helper() >= FastAllocateSizeLimit) {
     // Forbid fast-path allocation.
diff --git a/src/hotspot/share/interpreter/abstractInterpreter.cpp b/src/hotspot/share/interpreter/abstractInterpreter.cpp
index ff039a89455..0b67ea4a8f9 100644
--- a/src/hotspot/share/interpreter/abstractInterpreter.cpp
+++ b/src/hotspot/share/interpreter/abstractInterpreter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -149,7 +149,7 @@ AbstractInterpreter::MethodKind AbstractInterpreter::method_kind(const methodHan
       case vmIntrinsics::_dsqrt_strict:      return java_lang_math_sqrt_strict;
       case vmIntrinsics::_Reference_get:     return java_lang_ref_reference_get;
       case vmIntrinsics::_Object_init:
-        if (RegisterFinalizersAtInit && m->code_size() == 1) {
+        if (m->code_size() == 1) {
           // We need to execute the special return bytecode to check for
           // finalizer registration so create a normal frame.
           return zerolocals;
diff --git a/src/hotspot/share/interpreter/rewriter.cpp b/src/hotspot/share/interpreter/rewriter.cpp
index ea9b9cff952..07ea1e2e204 100644
--- a/src/hotspot/share/interpreter/rewriter.cpp
+++ b/src/hotspot/share/interpreter/rewriter.cpp
@@ -531,7 +531,7 @@ void Rewriter::rewrite_bytecodes(TRAPS) {
   // determine index maps for Method* rewriting
   compute_index_maps();
 
-  if (RegisterFinalizersAtInit && _klass->name() == vmSymbols::java_lang_Object()) {
+  if (_klass->name() == vmSymbols::java_lang_Object()) {
     bool did_rewrite = false;
     int i = _methods->length();
     while (i-- > 0) {
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 43bec86d8e5..0b5c9759310 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -1509,16 +1509,8 @@ instanceOop InstanceKlass::register_finalizer(instanceOop i, TRAPS) {
 }
 
 instanceOop InstanceKlass::allocate_instance(TRAPS) {
-  bool has_finalizer_flag = has_finalizer(); // Query before possible GC
   size_t size = size_helper();  // Query before forming handle.
-
-  instanceOop i;
-
-  i = (instanceOop)Universe::heap()->obj_allocate(this, size, CHECK_NULL);
-  if (has_finalizer_flag && !RegisterFinalizersAtInit) {
-    i = register_finalizer(i, CHECK_NULL);
-  }
-  return i;
+  return (instanceOop)Universe::heap()->obj_allocate(this, size, CHECK_NULL);
 }
 
 instanceOop InstanceKlass::allocate_instance(oop java_class, TRAPS) {
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index b5f598030ef..a77227198f6 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -959,7 +959,6 @@ public:
   // This bit is initialized in classFileParser.cpp.
   // It is false under any of the following conditions:
   //  - the class is abstract (including any interface)
-  //  - the class has a finalizer (if !RegisterFinalizersAtInit)
   //  - the class size is larger than FastAllocateSizeLimit
   //  - the class is java/lang/Class, which cannot be allocated directly
   bool can_be_fastpath_allocated() const {
diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp
index 97cc025b45b..5f868474422 100644
--- a/src/hotspot/share/opto/parse1.cpp
+++ b/src/hotspot/share/opto/parse1.cpp
@@ -2239,8 +2239,7 @@ void Parse::rtm_deopt() {
 //------------------------------return_current---------------------------------
 // Append current _map to _exit_return
 void Parse::return_current(Node* value) {
-  if (RegisterFinalizersAtInit &&
-      method()->intrinsic_id() == vmIntrinsics::_Object_init) {
+  if (method()->intrinsic_id() == vmIntrinsics::_Object_init) {
     call_register_finalizer();
   }
 
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index d62403a29d5..693e5660c24 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -671,10 +671,6 @@ const int ObjectAlignmentInBytes = 8;
   product(bool, PrintWarnings, true,                                        \
           "Print JVM warnings to output stream")                            \
                                                                             \
-  product(bool, RegisterFinalizersAtInit, true,                             \
-          "(Deprecated) Register finalizable objects at end of "            \
-          "Object.<init> or after allocation")                              \
-                                                                            \
   develop(bool, RegisterReferences, true,                                   \
           "Tell whether the VM should register soft/weak/final/phantom "    \
           "references")                                                     \

From 8da175d094c02e7655188a60e6364104433429de Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Fri, 19 Apr 2024 16:06:55 +0000
Subject: [PATCH 115/486] 8330008: [s390x] Test bit "in-memory" in case of
 DiagnoseSyncOnValueBasedClasses

Reviewed-by: lucy, mdoerr
---
 src/hotspot/cpu/s390/macroAssembler_s390.cpp | 6 ++----
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp  | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index fd04a66a843..224153f0e84 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -3207,10 +3207,8 @@ void MacroAssembler::compiler_fast_lock_object(Register oop, Register box, Regis
 
   if (DiagnoseSyncOnValueBasedClasses != 0) {
     load_klass(temp, oop);
-    z_l(temp, Address(temp, Klass::access_flags_offset()));
-    assert((JVM_ACC_IS_VALUE_BASED_CLASS & 0xFFFF) == 0, "or change following instruction");
-    z_nilh(temp, JVM_ACC_IS_VALUE_BASED_CLASS >> 16);
-    z_brne(done);
+    testbit(Address(temp, Klass::access_flags_offset()), exact_log2(JVM_ACC_IS_VALUE_BASED_CLASS));
+    z_btrue(done);
   }
 
   // Handle existing monitor.
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 11e1e617d8e..87cf9cb600c 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1712,8 +1712,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
 
     // Try fastpath for locking.
     // Fast_lock kills r_temp_1, r_temp_2.
-    // in case of DiagnoseSyncOnValueBasedClasses content for Z_R1_scratch
-    // will be destroyed, So avoid using Z_R1 as temp here.
     __ compiler_fast_lock_object(r_oop, r_box, r_tmp1, r_tmp2);
     __ z_bre(done);
 

From b704e91241b0f84d866f50a8f2c6af240087cb29 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Fri, 19 Apr 2024 16:11:17 +0000
Subject: [PATCH 116/486] 8329433: Reduce nmethod header size

Reviewed-by: dlong, iveresov
---
 src/hotspot/share/code/codeBlob.cpp           |  76 ++----
 src/hotspot/share/code/codeBlob.hpp           |  80 +++---
 src/hotspot/share/code/debugInfoRec.cpp       |   7 +-
 src/hotspot/share/code/dependencies.cpp       |   6 +-
 src/hotspot/share/code/nmethod.cpp            | 229 +++++++++---------
 src/hotspot/share/code/nmethod.hpp            | 186 +++++++-------
 src/hotspot/share/compiler/compileBroker.cpp  |   2 +-
 .../share/compiler/compilerDefinitions.hpp    |   4 +-
 .../share/gc/shared/classUnloadingContext.cpp |   4 +-
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |   2 +-
 src/hotspot/share/memory/heap.hpp             |  12 +-
 src/hotspot/share/runtime/frame.cpp           |   5 +-
 src/hotspot/share/runtime/vmStructs.cpp       |  20 +-
 .../sun/jvm/hotspot/code/CodeBlob.java        |  12 +-
 .../classes/sun/jvm/hotspot/code/NMethod.java |  76 +++---
 15 files changed, 335 insertions(+), 386 deletions(-)

diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 83418742988..81c4d001078 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -73,74 +73,48 @@ unsigned int CodeBlob::allocation_size(CodeBuffer* cb, int header_size) {
   return size;
 }
 
-#ifdef ASSERT
-void CodeBlob::verify_parameters() {
-  assert(is_aligned(_size,            oopSize), "unaligned size");
-  assert(is_aligned(_header_size,     oopSize), "unaligned size");
-  assert(is_aligned(_relocation_size, oopSize), "unaligned size");
-  assert(_data_offset <= size(), "codeBlob is too small");
-  assert(code_end() == content_end(), "must be the same - see code_end()");
-#ifdef COMPILER1
-  // probably wrong for tiered
-  assert(frame_size() >= -1, "must use frame size or -1 for runtime stubs");
-#endif // COMPILER1
-}
-#endif
-
-CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, int header_size, int relocation_size,
-                   int content_offset, int code_offset, int frame_complete_offset, int data_offset,
-                   int frame_size, ImmutableOopMapSet* oop_maps, bool caller_must_gc_arguments) :
-  _oop_maps(oop_maps),
-  _name(name),
-  _size(size),
-  _header_size(header_size),
-  _relocation_size(relocation_size),
-  _content_offset(content_offset),
-  _code_offset(code_offset),
-  _frame_complete_offset(frame_complete_offset),
-  _data_offset(data_offset),
-  _frame_size(frame_size),
-  S390_ONLY(_ctable_offset(0) COMMA)
-  _kind(kind),
-  _caller_must_gc_arguments(caller_must_gc_arguments)
-{
-  DEBUG_ONLY( verify_parameters(); )
-}
-
-CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size, int header_size,
-                   int frame_complete_offset, int frame_size, OopMapSet* oop_maps, bool caller_must_gc_arguments) :
+CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size, uint16_t header_size,
+                   int16_t frame_complete_offset, int frame_size, OopMapSet* oop_maps, bool caller_must_gc_arguments) :
   _oop_maps(nullptr), // will be set by set_oop_maps() call
   _name(name),
   _size(size),
-  _header_size(header_size),
   _relocation_size(align_up(cb->total_relocation_size(), oopSize)),
-  _content_offset(CodeBlob::align_code_offset(_header_size + _relocation_size)),
+  _content_offset(CodeBlob::align_code_offset(header_size + _relocation_size)),
   _code_offset(_content_offset + cb->total_offset_of(cb->insts())),
-  _frame_complete_offset(frame_complete_offset),
   _data_offset(_content_offset + align_up(cb->total_content_size(), oopSize)),
   _frame_size(frame_size),
   S390_ONLY(_ctable_offset(0) COMMA)
+  _header_size(header_size),
+  _frame_complete_offset(frame_complete_offset),
   _kind(kind),
   _caller_must_gc_arguments(caller_must_gc_arguments)
 {
-  DEBUG_ONLY( verify_parameters(); )
+  assert(is_aligned(_size,            oopSize), "unaligned size");
+  assert(is_aligned(header_size,      oopSize), "unaligned size");
+  assert(is_aligned(_relocation_size, oopSize), "unaligned size");
+  assert(_data_offset <= _size, "codeBlob is too small: %d > %d", _data_offset, _size);
+  assert(code_end() == content_end(), "must be the same - see code_end()");
+#ifdef COMPILER1
+  // probably wrong for tiered
+  assert(_frame_size >= -1, "must use frame size or -1 for runtime stubs");
+#endif // COMPILER1
 
   set_oop_maps(oop_maps);
 }
 
 // Simple CodeBlob used for simple BufferBlob.
-CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, int header_size) :
+CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t header_size) :
   _oop_maps(nullptr),
   _name(name),
   _size(size),
-  _header_size(header_size),
   _relocation_size(0),
   _content_offset(CodeBlob::align_code_offset(header_size)),
   _code_offset(_content_offset),
-  _frame_complete_offset(CodeOffsets::frame_never_safe),
   _data_offset(size),
   _frame_size(0),
   S390_ONLY(_ctable_offset(0) COMMA)
+  _header_size(header_size),
+  _frame_complete_offset(CodeOffsets::frame_never_safe),
   _kind(kind),
   _caller_must_gc_arguments(false)
 {
@@ -148,7 +122,7 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, int header_siz
   assert(is_aligned(header_size,     oopSize), "unaligned size");
 }
 
-void CodeBlob::purge(bool free_code_cache_data, bool unregister_nmethod) {
+void CodeBlob::purge() {
   if (_oop_maps != nullptr) {
     delete _oop_maps;
     _oop_maps = nullptr;
@@ -185,8 +159,8 @@ RuntimeBlob::RuntimeBlob(
   CodeBlobKind kind,
   CodeBuffer* cb,
   int         size,
-  int         header_size,
-  int         frame_complete,
+  uint16_t    header_size,
+  int16_t     frame_complete,
   int         frame_size,
   OopMapSet*  oop_maps,
   bool        caller_must_gc_arguments)
@@ -198,7 +172,7 @@ RuntimeBlob::RuntimeBlob(
 void RuntimeBlob::free(RuntimeBlob* blob) {
   assert(blob != nullptr, "caller must check for nullptr");
   ThreadInVMfromUnknown __tiv;  // get to VM state in case we block on CodeCache_lock
-  blob->purge(true /* free_code_cache_data */, true /* unregister_nmethod */);
+  blob->purge();
   {
     MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
     CodeCache::free(blob);
@@ -408,7 +382,7 @@ RuntimeStub::RuntimeStub(
   const char* name,
   CodeBuffer* cb,
   int         size,
-  int         frame_complete,
+  int16_t     frame_complete,
   int         frame_size,
   OopMapSet*  oop_maps,
   bool        caller_must_gc_arguments
@@ -420,7 +394,7 @@ RuntimeStub::RuntimeStub(
 
 RuntimeStub* RuntimeStub::new_runtime_stub(const char* stub_name,
                                            CodeBuffer* cb,
-                                           int frame_complete,
+                                           int16_t frame_complete,
                                            int frame_size,
                                            OopMapSet* oop_maps,
                                            bool caller_must_gc_arguments,
@@ -668,10 +642,6 @@ void UpcallStub::free(UpcallStub* blob) {
   RuntimeBlob::free(blob);
 }
 
-void UpcallStub::preserve_callee_argument_oops(frame fr, const RegisterMap* reg_map, OopClosure* f) {
-  ShouldNotReachHere(); // caller should never have to gc arguments
-}
-
 //----------------------------------------------------------------------------------------------------
 // Verification and printing
 
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index 134d60e5cb5..26ae5f7df59 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -90,8 +90,8 @@ enum class CodeBlobKind : u1 {
   Number_Of_Kinds
 };
 
-class UpcallStub; // for as_upcall_stub()
-class RuntimeStub; // for as_runtime_stub()
+class UpcallStub;      // for as_upcall_stub()
+class RuntimeStub;     // for as_runtime_stub()
 class JavaFrameAnchor; // for UpcallStub::jfa_for_frame
 
 class CodeBlob {
@@ -101,43 +101,39 @@ class CodeBlob {
 
 protected:
   // order fields from large to small to minimize padding between fields
-  ImmutableOopMapSet* _oop_maps;                 // OopMap for this CodeBlob
+  ImmutableOopMapSet* _oop_maps;   // OopMap for this CodeBlob
   const char*         _name;
 
-  int        _size;                              // total size of CodeBlob in bytes
-  int        _header_size;                       // size of header (depends on subclass)
-  int        _relocation_size;                   // size of relocation
-  int        _content_offset;                    // offset to where content region begins (this includes consts, insts, stubs)
-  int        _code_offset;                       // offset to where instructions region begins (this includes insts, stubs)
-  int        _frame_complete_offset;             // instruction offsets in [0.._frame_complete_offset) have
-                                                 // not finished setting up their frame. Beware of pc's in
-                                                 // that range. There is a similar range(s) on returns
-                                                 // which we don't detect.
-  int        _data_offset;                       // offset to where data region begins
-  int        _frame_size;                        // size of stack frame in words (NOT slots. On x64 these are 64bit words)
+  int      _size;                  // total size of CodeBlob in bytes
+  int      _relocation_size;       // size of relocation (could be bigger than 64Kb)
+  int      _content_offset;        // offset to where content region begins (this includes consts, insts, stubs)
+  int      _code_offset;           // offset to where instructions region begins (this includes insts, stubs)
 
-  S390_ONLY(int       _ctable_offset;)
+  int      _data_offset;           // offset to where data region begins
+  int      _frame_size;            // size of stack frame in words (NOT slots. On x64 these are 64bit words)
 
-  CodeBlobKind        _kind;                     // Kind of this code blob
+  S390_ONLY(int _ctable_offset;)
 
-  bool                _caller_must_gc_arguments;
+  uint16_t _header_size;           // size of header (depends on subclass)
+  int16_t  _frame_complete_offset; // instruction offsets in [0.._frame_complete_offset) have
+                                   // not finished setting up their frame. Beware of pc's in
+                                   // that range. There is a similar range(s) on returns
+                                   // which we don't detect.
+
+  CodeBlobKind _kind;              // Kind of this code blob
+
+  bool _caller_must_gc_arguments;
 
 #ifndef PRODUCT
   AsmRemarks _asm_remarks;
   DbgStrings _dbg_strings;
-#endif // not PRODUCT
+#endif
 
-  DEBUG_ONLY( void verify_parameters() );
-
-  CodeBlob(const char* name, CodeBlobKind kind, int size, int header_size, int relocation_size,
-           int content_offset, int code_offset, int data_offset, int frame_complete_offset,
-           int frame_size, ImmutableOopMapSet* oop_maps, bool caller_must_gc_arguments);
-
-  CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size, int header_size,
-           int frame_complete_offset, int frame_size, OopMapSet* oop_maps, bool caller_must_gc_arguments);
+  CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size, uint16_t header_size,
+           int16_t frame_complete_offset, int frame_size, OopMapSet* oop_maps, bool caller_must_gc_arguments);
 
   // Simple CodeBlob used for simple BufferBlob.
-  CodeBlob(const char* name, CodeBlobKind kind, int size, int header_size);
+  CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t header_size);
 
   void operator delete(void* p) { }
 
@@ -152,7 +148,7 @@ public:
   static unsigned int align_code_offset(int offset);
 
   // Deletion
-  virtual void purge(bool free_code_cache_data, bool unregister_nmethod);
+  void purge();
 
   // Typing
   bool is_nmethod() const                     { return _kind == CodeBlobKind::Nmethod; }
@@ -225,7 +221,6 @@ public:
 
   const ImmutableOopMap* oop_map_for_slot(int slot, address return_address) const;
   const ImmutableOopMap* oop_map_for_return_address(address return_address) const;
-  virtual void preserve_callee_argument_oops(frame fr, const RegisterMap* reg_map, OopClosure* f) = 0;
 
   // Frame support. Sizes are in word units.
   int  frame_size() const                        { return _frame_size; }
@@ -273,7 +268,7 @@ class RuntimeBlob : public CodeBlob {
 
   // Creation
   // a) simple CodeBlob
-  RuntimeBlob(const char* name, CodeBlobKind kind, int size, int header_size)
+  RuntimeBlob(const char* name, CodeBlobKind kind, int size, uint16_t header_size)
     : CodeBlob(name, kind, size, header_size)
   {}
 
@@ -285,8 +280,8 @@ class RuntimeBlob : public CodeBlob {
     CodeBlobKind kind,
     CodeBuffer* cb,
     int         size,
-    int         header_size,
-    int         frame_complete,
+    uint16_t    header_size,
+    int16_t     frame_complete,
     int         frame_size,
     OopMapSet*  oop_maps,
     bool        caller_must_gc_arguments = false
@@ -324,10 +319,9 @@ class BufferBlob: public RuntimeBlob {
 
   static void free(BufferBlob* buf);
 
-  // GC/Verification support
-  void preserve_callee_argument_oops(frame fr, const RegisterMap* reg_map, OopClosure* f) override { /* nothing to do */ }
-
+  // Verification support
   void verify() override;
+
   void print_on(outputStream* st) const override;
   void print_value_on(outputStream* st) const override;
 };
@@ -381,7 +375,7 @@ class RuntimeStub: public RuntimeBlob {
     const char* name,
     CodeBuffer* cb,
     int         size,
-    int         frame_complete,
+    int16_t     frame_complete,
     int         frame_size,
     OopMapSet*  oop_maps,
     bool        caller_must_gc_arguments
@@ -394,7 +388,7 @@ class RuntimeStub: public RuntimeBlob {
   static RuntimeStub* new_runtime_stub(
     const char* stub_name,
     CodeBuffer* cb,
-    int         frame_complete,
+    int16_t     frame_complete,
     int         frame_size,
     OopMapSet*  oop_maps,
     bool        caller_must_gc_arguments,
@@ -405,10 +399,9 @@ class RuntimeStub: public RuntimeBlob {
 
   address entry_point() const                    { return code_begin(); }
 
-  // GC/Verification support
-  void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) override { /* nothing to do */ }
-
+  // Verification support
   void verify() override;
+
   void print_on(outputStream* st) const override;
   void print_value_on(outputStream* st) const override;
 };
@@ -429,7 +422,7 @@ class SingletonBlob: public RuntimeBlob {
      CodeBlobKind kind,
      CodeBuffer*  cb,
      int          size,
-     int          header_size,
+     uint16_t     header_size,
      int          frame_size,
      OopMapSet*   oop_maps
    )
@@ -438,9 +431,9 @@ class SingletonBlob: public RuntimeBlob {
 
   address entry_point()                          { return code_begin(); }
 
-  // GC/Verification support
-  void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) override { /* nothing to do */ }
+  // Verification support
   void verify() override; // does nothing
+
   void print_on(outputStream* st) const override;
   void print_value_on(outputStream* st) const override;
 };
@@ -632,7 +625,6 @@ class UpcallStub: public RuntimeBlob {
 
   // GC/Verification support
   void oops_do(OopClosure* f, const frame& frame);
-  void preserve_callee_argument_oops(frame fr, const RegisterMap* reg_map, OopClosure* f) override;
   void verify() override;
 
   // Misc.
diff --git a/src/hotspot/share/code/debugInfoRec.cpp b/src/hotspot/share/code/debugInfoRec.cpp
index 85be80dbf0b..71da21f1e99 100644
--- a/src/hotspot/share/code/debugInfoRec.cpp
+++ b/src/hotspot/share/code/debugInfoRec.cpp
@@ -244,14 +244,11 @@ static
 struct dir_stats_struct {
   int chunks_queried;
   int chunks_shared;
-  int chunks_reshared;
   int chunks_elided;
 
   void print() {
-    tty->print_cr("Debug Data Chunks: %d, shared %d+%d, non-SP's elided %d",
-                  chunks_queried,
-                  chunks_shared, chunks_reshared,
-                  chunks_elided);
+    tty->print_cr("Debug Data Chunks: %d, shared %d, non-SP's elided %d",
+                  chunks_queried, chunks_shared, chunks_elided);
   }
 } dir_stats;
 #endif //PRODUCT
diff --git a/src/hotspot/share/code/dependencies.cpp b/src/hotspot/share/code/dependencies.cpp
index 93a2bf22ba5..26e53ed9027 100644
--- a/src/hotspot/share/code/dependencies.cpp
+++ b/src/hotspot/share/code/dependencies.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -388,9 +388,7 @@ void Dependencies::copy_to(nmethod* nm) {
   address beg = nm->dependencies_begin();
   address end = nm->dependencies_end();
   guarantee(end - beg >= (ptrdiff_t) size_in_bytes(), "bad sizing");
-  Copy::disjoint_words((HeapWord*) content_bytes(),
-                       (HeapWord*) beg,
-                       size_in_bytes() / sizeof(HeapWord));
+  (void)memcpy(beg, content_bytes(), size_in_bytes());
   assert(size_in_bytes() % sizeof(HeapWord) == 0, "copy by words");
 }
 
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index dd330714e67..4b72c32c9cb 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -137,9 +137,6 @@ struct java_nmethod_stats_struct {
   uint oops_size;
   uint metadata_size;
 
-  uint size_gt_32k;
-  int size_max;
-
   void note_nmethod(nmethod* nm) {
     nmethod_count += 1;
     total_size          += nm->size();
@@ -158,9 +155,6 @@ struct java_nmethod_stats_struct {
     speculations_size   += nm->speculations_size();
     jvmci_data_size     += nm->jvmci_data_size();
 #endif
-    int short_pos_max = ((1<<15) - 1);
-    if (nm->size() > short_pos_max) size_gt_32k++;
-    if (nm->size() > size_max) size_max = nm->size();
   }
   void print_nmethod_stats(const char* name) {
     if (nmethod_count == 0)  return;
@@ -183,8 +177,6 @@ struct java_nmethod_stats_struct {
     if (speculations_size != 0)   tty->print_cr(" speculations   = %u (%f%%)", speculations_size, (speculations_size * 100.0f)/total_size);
     if (jvmci_data_size != 0)     tty->print_cr(" JVMCI data     = %u (%f%%)", jvmci_data_size, (jvmci_data_size * 100.0f)/total_size);
 #endif
-    if (size_gt_32k != 0)         tty->print_cr(" size > 32k     = %u", size_gt_32k);
-    if (size_max != 0)            tty->print_cr(" max size       = %d", size_max);
   }
 };
 
@@ -1004,27 +996,6 @@ const char* nmethod::compiler_name() const {
   return compilertype2name(_compiler_type);
 }
 
-// Fill in default values for various flag fields
-void nmethod::init_defaults() {
-  // avoid uninitialized fields, even for short time periods
-  _exception_cache            = nullptr;
-
-  _has_unsafe_access          = 0;
-  _has_method_handle_invokes  = 0;
-  _has_wide_vectors           = 0;
-  _has_monitors               = 0;
-
-  _state                      = not_installed;
-  _has_flushed_dependencies   = 0;
-  _load_reported              = false; // jvmti state
-
-  _oops_do_mark_link          = nullptr;
-  _osr_link                   = nullptr;
-#if INCLUDE_RTM_OPT
-  _rtm_state                  = NoRTM;
-#endif
-}
-
 #ifdef ASSERT
 class CheckForOopsClosure : public OopClosure {
   bool _found_oop = false;
@@ -1199,6 +1170,53 @@ nmethod* nmethod::new_nmethod(const methodHandle& method,
   return nm;
 }
 
+// Fill in default values for various fields
+void nmethod::init_defaults(CodeBuffer *code_buffer, CodeOffsets* offsets) {
+  // avoid uninitialized fields, even for short time periods
+  _exception_cache            = nullptr;
+  _gc_data                    = nullptr;
+  _oops_do_mark_link          = nullptr;
+  _compiled_ic_data           = nullptr;
+
+#if INCLUDE_RTM_OPT
+  _rtm_state                  = NoRTM;
+#endif
+  _is_unloading_state         = 0;
+  _state                      = not_installed;
+
+  _has_unsafe_access          = 0;
+  _has_method_handle_invokes  = 0;
+  _has_wide_vectors           = 0;
+  _has_monitors               = 0;
+  _has_flushed_dependencies   = 0;
+  _is_unlinked                = 0;
+  _load_reported              = 0; // jvmti state
+
+  _deoptimization_status      = not_marked;
+
+  // SECT_CONSTS is first in code buffer so the offset should be 0.
+  int consts_offset = code_buffer->total_offset_of(code_buffer->consts());
+  assert(consts_offset == 0, "const_offset: %d", consts_offset);
+
+  _entry_offset          = checked_cast<uint16_t>(offsets->value(CodeOffsets::Entry));
+  _verified_entry_offset = checked_cast<uint16_t>(offsets->value(CodeOffsets::Verified_Entry));
+  _stub_offset           = content_offset() + code_buffer->total_offset_of(code_buffer->stubs());
+
+  _skipped_instructions_size = checked_cast<uint16_t>(code_buffer->total_skipped_instructions_size());
+}
+
+// Post initialization
+void nmethod::post_init() {
+  clear_unloading_state();
+
+  finalize_relocations();
+
+  Universe::heap()->register_nmethod(this);
+  debug_only(Universe::heap()->verify_nmethod(this));
+
+  CodeCache::commit(this);
+}
+
 // For native wrappers
 nmethod::nmethod(
   Method* method,
@@ -1214,69 +1232,58 @@ nmethod::nmethod(
   : CodeBlob("native nmethod", CodeBlobKind::Nmethod, code_buffer, nmethod_size, sizeof(nmethod),
              offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false),
   _deoptimization_generation(0),
+  _gc_epoch(CodeCache::gc_epoch()),
   _method(method),
-  _gc_data(nullptr),
-  _compiled_ic_data(nullptr),
-  _is_unlinked(false),
   _native_receiver_sp_offset(basic_lock_owner_sp_offset),
-  _native_basic_lock_sp_offset(basic_lock_sp_offset),
-  _is_unloading_state(0),
-  _deoptimization_status(not_marked)
+  _native_basic_lock_sp_offset(basic_lock_sp_offset)
 {
   {
     debug_only(NoSafepointVerifier nsv;)
     assert_locked_or_safepoint(CodeCache_lock);
 
-    init_defaults();
-    _comp_level              = CompLevel_none;
+    init_defaults(code_buffer, offsets);
+
+    _osr_entry_point         = nullptr;
     _entry_bci               = InvocationEntryBci;
-    _num_stack_arg_slots     = _method->constMethod()->num_stack_arg_slots();
-    // We have no exception handler or deopt handler make the
-    // values something that will never match a pc like the nmethod vtable entry
-    _exception_offset        = 0;
+    _compile_id              = compile_id;
+    _comp_level              = CompLevel_none;
+    _compiler_type           = type;
     _orig_pc_offset          = 0;
+    _num_stack_arg_slots     = _method->constMethod()->num_stack_arg_slots();
+
+    if (offsets->value(CodeOffsets::Exceptions) != -1) {
+      // Continuation enter intrinsic
+      _exception_offset      = code_offset() + offsets->value(CodeOffsets::Exceptions);
+    } else {
+      _exception_offset      = 0;
+    }
+    // Native wrappers do not have deopt handlers. Make the values
+    // something that will never match a pc like the nmethod vtable entry
     _deopt_handler_offset    = 0;
     _deopt_mh_handler_offset = 0;
-    _gc_epoch                = CodeCache::gc_epoch();
+    _unwind_handler_offset   = 0;
 
-    _consts_offset           = content_offset()      + code_buffer->total_offset_of(code_buffer->consts());
-    _stub_offset             = content_offset()      + code_buffer->total_offset_of(code_buffer->stubs());
-    _oops_offset             = data_offset();
-    _metadata_offset         = _oops_offset          + align_up(code_buffer->total_oop_size(), oopSize);
-    _scopes_data_offset      = _metadata_offset      + align_up(code_buffer->total_metadata_size(), wordSize);
-    _scopes_pcs_offset       = _scopes_data_offset;
-    _dependencies_offset     = _scopes_pcs_offset;
-    _handler_table_offset    = _dependencies_offset;
+    _metadata_offset         = checked_cast<uint16_t>(align_up(code_buffer->total_oop_size(), oopSize));
+    _dependencies_offset     = checked_cast<uint16_t>(_metadata_offset + align_up(code_buffer->total_metadata_size(), wordSize));
+    _scopes_pcs_offset       = _dependencies_offset;
+    _scopes_data_offset      = _scopes_pcs_offset;
+    _handler_table_offset    = _scopes_data_offset;
     _nul_chk_table_offset    = _handler_table_offset;
-    _skipped_instructions_size = code_buffer->total_skipped_instructions_size();
 #if INCLUDE_JVMCI
     _speculations_offset     = _nul_chk_table_offset;
     _jvmci_data_offset       = _speculations_offset;
-    _nmethod_end_offset      = _jvmci_data_offset;
+    DEBUG_ONLY( int data_end_offset = _jvmci_data_offset; )
 #else
-    _nmethod_end_offset      = _nul_chk_table_offset;
+    DEBUG_ONLY( int data_end_offset = _nul_chk_table_offset; )
 #endif
-    _compile_id              = compile_id;
-    _compiler_type           = type;
-    _entry_point             = code_begin()          + offsets->value(CodeOffsets::Entry);
-    _verified_entry_point    = code_begin()          + offsets->value(CodeOffsets::Verified_Entry);
-    _osr_entry_point         = nullptr;
-    _exception_cache         = nullptr;
-    _pc_desc_container.reset_to(nullptr);
+    assert((data_offset() + data_end_offset) <= nmethod_size, "wrong nmethod's size: %d < %d", nmethod_size, (data_offset() + data_end_offset));
 
-    _exception_offset        = code_offset()         + offsets->value(CodeOffsets::Exceptions);
+    _pc_desc_container.reset_to(nullptr);
 
     code_buffer->copy_code_and_locs_to(this);
     code_buffer->copy_values_to(this);
 
-    clear_unloading_state();
-
-    finalize_relocations();
-
-    Universe::heap()->register_nmethod(this);
-    debug_only(Universe::heap()->verify_nmethod(this));
-
-    CodeCache::commit(this);
+    post_init();
   }
 
   if (PrintNativeNMethods || PrintDebugInfo || PrintRelocations || PrintDependencies) {
@@ -1334,6 +1341,7 @@ void* nmethod::operator new(size_t size, int nmethod_size, bool allow_NonNMethod
   return CodeCache::allocate(nmethod_size, CodeBlobType::NonNMethod);
 }
 
+// For normal JIT compiled code
 nmethod::nmethod(
   Method* method,
   CompilerType type,
@@ -1360,34 +1368,27 @@ nmethod::nmethod(
   : CodeBlob("nmethod", CodeBlobKind::Nmethod, code_buffer, nmethod_size, sizeof(nmethod),
              offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false),
   _deoptimization_generation(0),
+  _gc_epoch(CodeCache::gc_epoch()),
   _method(method),
-  _gc_data(nullptr),
-  _compiled_ic_data(nullptr),
-  _is_unlinked(false),
-  _native_receiver_sp_offset(in_ByteSize(-1)),
-  _native_basic_lock_sp_offset(in_ByteSize(-1)),
-  _is_unloading_state(0),
-  _deoptimization_status(not_marked)
+  _osr_link(nullptr)
 {
   assert(debug_info->oop_recorder() == code_buffer->oop_recorder(), "shared OR");
   {
     debug_only(NoSafepointVerifier nsv;)
     assert_locked_or_safepoint(CodeCache_lock);
 
-    init_defaults();
-    _entry_bci               = entry_bci;
-    _num_stack_arg_slots     = entry_bci != InvocationEntryBci ? 0 : _method->constMethod()->num_stack_arg_slots();
-    _compile_id              = compile_id;
-    _compiler_type           = type;
-    _comp_level              = comp_level;
-    _orig_pc_offset          = orig_pc_offset;
-    _gc_epoch                = CodeCache::gc_epoch();
+    init_defaults(code_buffer, offsets);
 
-    // Section offsets
-    _consts_offset  = content_offset() + code_buffer->total_offset_of(code_buffer->consts());
-    _stub_offset    = content_offset() + code_buffer->total_offset_of(code_buffer->stubs());
-    set_ctable_begin(header_begin() + _consts_offset);
-    _skipped_instructions_size = code_buffer->total_skipped_instructions_size();
+    _osr_entry_point = code_begin() + offsets->value(CodeOffsets::OSR_Entry);
+    _entry_bci       = entry_bci;
+    _compile_id      = compile_id;
+    _comp_level      = comp_level;
+    _compiler_type   = type;
+    _orig_pc_offset  = orig_pc_offset;
+
+    _num_stack_arg_slots = entry_bci != InvocationEntryBci ? 0 : _method->constMethod()->num_stack_arg_slots();
+
+    set_ctable_begin(header_begin() + content_offset());
 
 #if INCLUDE_JVMCI
     if (compiler->is_jvmci()) {
@@ -1427,28 +1428,23 @@ nmethod::nmethod(
     } else {
       _unwind_handler_offset = -1;
     }
-
-    _oops_offset             = data_offset();
-    _metadata_offset         = _oops_offset          + align_up(code_buffer->total_oop_size(), oopSize);
-    _scopes_data_offset      = _metadata_offset      + align_up(code_buffer->total_metadata_size(), wordSize);
-
-    _scopes_pcs_offset       = _scopes_data_offset   + align_up(debug_info->data_size       (), oopSize);
-    _dependencies_offset     = _scopes_pcs_offset    + adjust_pcs_size(debug_info->pcs_size());
-    _handler_table_offset    = _dependencies_offset  + align_up((int)dependencies->size_in_bytes(), oopSize);
-    _nul_chk_table_offset    = _handler_table_offset + align_up(handler_table->size_in_bytes(), oopSize);
+    _metadata_offset      = checked_cast<uint16_t>(align_up(code_buffer->total_oop_size(), oopSize));
+    _dependencies_offset  = checked_cast<uint16_t>(_metadata_offset     + align_up(code_buffer->total_metadata_size(), wordSize));
+    _scopes_pcs_offset    = checked_cast<uint16_t>(_dependencies_offset + align_up((int)dependencies->size_in_bytes(), oopSize));
+    _scopes_data_offset   = _scopes_pcs_offset    + adjust_pcs_size(debug_info->pcs_size());
+    _handler_table_offset = _scopes_data_offset   + align_up(debug_info->data_size       (), oopSize);
+    _nul_chk_table_offset = _handler_table_offset + align_up(handler_table->size_in_bytes(), oopSize);
 #if INCLUDE_JVMCI
-    _speculations_offset     = _nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize);
-    _jvmci_data_offset       = _speculations_offset  + align_up(speculations_len, oopSize);
-    int jvmci_data_size      = compiler->is_jvmci() ? jvmci_data->size() : 0;
-    _nmethod_end_offset      = _jvmci_data_offset    + align_up(jvmci_data_size, oopSize);
+    _speculations_offset  = _nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize);
+    _jvmci_data_offset    = _speculations_offset  + align_up(speculations_len, oopSize);
+    int jvmci_data_size   = compiler->is_jvmci() ? jvmci_data->size() : 0;
+    DEBUG_ONLY( int data_end_offset = _jvmci_data_offset    + align_up(jvmci_data_size, oopSize); )
 #else
-    _nmethod_end_offset      = _nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize);
+    DEBUG_ONLY( int data_end_offset = _nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize); )
 #endif
-    _entry_point             = code_begin()          + offsets->value(CodeOffsets::Entry);
-    _verified_entry_point    = code_begin()          + offsets->value(CodeOffsets::Verified_Entry);
-    _osr_entry_point         = code_begin()          + offsets->value(CodeOffsets::OSR_Entry);
-    _exception_cache         = nullptr;
+    assert((data_offset() + data_end_offset) <= nmethod_size, "wrong nmethod's size: %d < %d", nmethod_size, (data_offset() + data_end_offset));
 
+    // after _scopes_pcs_offset is set
     _pc_desc_container.reset_to(scopes_pcs_begin());
 
     code_buffer->copy_code_and_locs_to(this);
@@ -1456,7 +1452,6 @@ nmethod::nmethod(
     code_buffer->copy_values_to(this);
     debug_info->copy_to(this);
     dependencies->copy_to(this);
-    clear_unloading_state();
 
 #if INCLUDE_JVMCI
     if (compiler->is_jvmci()) {
@@ -1465,13 +1460,6 @@ nmethod::nmethod(
     }
 #endif
 
-    finalize_relocations();
-
-    Universe::heap()->register_nmethod(this);
-    debug_only(Universe::heap()->verify_nmethod(this));
-
-    CodeCache::commit(this);
-
     // Copy contents of ExceptionHandlerTable to nmethod
     handler_table->copy_to(this);
     nul_chk_table->copy_to(this);
@@ -1483,10 +1471,12 @@ nmethod::nmethod(
     }
 #endif
 
+    post_init();
+
     // we use the information of entry points to find out if a method is
     // static or non static
     assert(compiler->is_c2() || compiler->is_jvmci() ||
-           _method->is_static() == (entry_point() == _verified_entry_point),
+           _method->is_static() == (entry_point() == verified_entry_point()),
            " entry points must be same for static methods and vice versa");
   }
 }
@@ -1999,7 +1989,7 @@ bool nmethod::make_not_entrant() {
 
 // For concurrent GCs, there must be a handshake between unlink and flush
 void nmethod::unlink() {
-  if (_is_unlinked) {
+  if (is_unlinked()) {
     // Already unlinked.
     return;
   }
@@ -2033,8 +2023,7 @@ void nmethod::unlink() {
   ClassUnloadingContext::context()->register_unlinked_nmethod(this);
 }
 
-void nmethod::purge(bool free_code_cache_data, bool unregister_nmethod) {
-  assert(!free_code_cache_data, "must only call not freeing code cache data");
+void nmethod::purge(bool unregister_nmethod) {
 
   MutexLocker ml(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 
@@ -2062,7 +2051,7 @@ void nmethod::purge(bool free_code_cache_data, bool unregister_nmethod) {
   }
   CodeCache::unregister_old_nmethod(this);
 
-  CodeBlob::purge(free_code_cache_data, unregister_nmethod);
+  CodeBlob::purge();
 }
 
 oop nmethod::oop_at(int index) const {
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 9fd87020309..b22edaec5ac 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -188,8 +188,23 @@ class nmethod : public CodeBlob {
 
   Method*   _method;
 
-  // To support simple linked-list chaining of nmethods:
-  nmethod*  _osr_link;         // from InstanceKlass::osr_nmethods_head
+  // To reduce header size union fields which usages do not overlap.
+  union {
+    // To support simple linked-list chaining of nmethods:
+    nmethod*  _osr_link; // from InstanceKlass::osr_nmethods_head
+    struct {
+      // These are used for compiled synchronized native methods to
+      // locate the owner and stack slot for the BasicLock. They are
+      // needed because there is no debug information for compiled native
+      // wrappers and the oop maps are insufficient to allow
+      // frame::retrieve_receiver() to work. Currently they are expected
+      // to be byte offsets from the Java stack pointer for maximum code
+      // sharing between platforms. JVMTI's GetLocalInstance() uses these
+      // offsets to find the receiver for non-static native wrapper frames.
+      ByteSize _native_receiver_sp_offset;
+      ByteSize _native_basic_lock_sp_offset;
+    };
+  };
 
   PcDescContainer _pc_desc_container;
   ExceptionCache* volatile _exception_cache;
@@ -200,18 +215,20 @@ class nmethod : public CodeBlob {
   static nmethod*    volatile _oops_do_mark_nmethods;
   oops_do_mark_link* volatile _oops_do_mark_link;
 
-  // offsets for entry points
-  address _entry_point;                      // entry point with class check
-  address _verified_entry_point;             // entry point without class check
-  address _osr_entry_point;                  // entry point for on stack replacement
-
   CompiledICData* _compiled_ic_data;
 
-  // Shared fields for all nmethod's
-  int _entry_bci;      // != InvocationEntryBci if this nmethod is an on-stack replacement method
+  // offsets for entry points
+  address  _osr_entry_point;       // entry point for on stack replacement
+  uint16_t _entry_offset;          // entry point with class check
+  uint16_t _verified_entry_offset; // entry point without class check
+  int      _entry_bci;             // != InvocationEntryBci if this nmethod is an on-stack replacement method
 
-  // Offsets for different nmethod parts
-  int  _exception_offset;
+  // _consts_offset == _content_offset because SECT_CONSTS is first in code buffer
+
+  int _stub_offset;
+
+  // Offsets for different stubs section parts
+  int _exception_offset;
   // All deoptee's will resume execution at this location described by
   // this offset.
   int _deopt_handler_offset;
@@ -221,33 +238,29 @@ class nmethod : public CodeBlob {
   // Offset of the unwind handler if it exists
   int _unwind_handler_offset;
 
-  int _consts_offset;
-  int _stub_offset;
-  int _oops_offset;                       // offset to where embedded oop table begins (inside data)
-  int _metadata_offset;                   // embedded meta data table
-  int _scopes_data_offset;
-  int _scopes_pcs_offset;
-  int _dependencies_offset;
-  int _handler_table_offset;
-  int _nul_chk_table_offset;
+  uint16_t _skipped_instructions_size;
+
+  // _oops_offset == _data_offset,  offset where embedded oop table begins (inside data)
+  uint16_t _metadata_offset; // embedded meta data table
+  uint16_t _dependencies_offset;
+  uint16_t _scopes_pcs_offset;
+  int      _scopes_data_offset;
+  int      _handler_table_offset;
+  int      _nul_chk_table_offset;
 #if INCLUDE_JVMCI
-  int _speculations_offset;
-  int _jvmci_data_offset;
+  int      _speculations_offset;
+  int      _jvmci_data_offset;
 #endif
-  int _nmethod_end_offset;
-  int _skipped_instructions_size;
 
   // location in frame (offset for sp) that deopt can store the original
   // pc during a deopt.
   int _orig_pc_offset;
 
-  int _compile_id;                        // which compilation made this nmethod
+  int          _compile_id;            // which compilation made this nmethod
+  CompLevel    _comp_level;            // compilation level (s1)
+  CompilerType _compiler_type;         // which compiler made this nmethod (u1)
 
-  int _num_stack_arg_slots;               // Number of arguments passed on the stack
-
-  CompilerType _compiler_type;            // which compiler made this nmethod (u1)
-
-  bool _is_unlinked;
+  uint16_t     _num_stack_arg_slots;   // Number of arguments passed on the stack
 
 #if INCLUDE_RTM_OPT
   // RTM state at compile time. Used during deoptimization to decide
@@ -255,25 +268,9 @@ class nmethod : public CodeBlob {
   RTMState _rtm_state;
 #endif
 
-  // These are used for compiled synchronized native methods to
-  // locate the owner and stack slot for the BasicLock. They are
-  // needed because there is no debug information for compiled native
-  // wrappers and the oop maps are insufficient to allow
-  // frame::retrieve_receiver() to work. Currently they are expected
-  // to be byte offsets from the Java stack pointer for maximum code
-  // sharing between platforms. JVMTI's GetLocalInstance() uses these
-  // offsets to find the receiver for non-static native wrapper frames.
-  ByteSize _native_receiver_sp_offset;
-  ByteSize _native_basic_lock_sp_offset;
-
-  CompLevel _comp_level;               // compilation level (s1)
-
   // Local state used to keep track of whether unloading is happening or not
   volatile uint8_t _is_unloading_state;
 
-  // used by jvmti to track if an event has been posted for this nmethod.
-  bool _load_reported;
-
   // Protected by NMethodState_lock
   volatile signed char _state;         // {not_installed, in_use, not_entrant}
 
@@ -282,7 +279,9 @@ class nmethod : public CodeBlob {
           _has_method_handle_invokes:1,// Has this method MethodHandle invokes?
           _has_wide_vectors:1,         // Preserve wide vectors at safepoints
           _has_monitors:1,             // Fastpath monitor detection for continuations
-          _has_flushed_dependencies:1; // Used for maintenance of dependencies (under CodeCache_lock)
+          _has_flushed_dependencies:1, // Used for maintenance of dependencies (under CodeCache_lock)
+          _is_unlinked:1,              // mark during class unloading
+          _load_reported:1;            // used by jvmti to track if an event has been posted for this nmethod
 
   enum DeoptimizationStatus : u1 {
     not_marked,
@@ -297,6 +296,12 @@ class nmethod : public CodeBlob {
     return Atomic::load(&_deoptimization_status);
   }
 
+  // Initialize fields to their default values
+  void init_defaults(CodeBuffer *code_buffer, CodeOffsets* offsets);
+
+  // Post initialization
+  void post_init();
+
   // For native wrappers
   nmethod(Method* method,
           CompilerType type,
@@ -309,7 +314,7 @@ class nmethod : public CodeBlob {
           ByteSize basic_lock_sp_offset,       /* synchronized natives only */
           OopMapSet* oop_maps);
 
-  // Creation support
+  // For normal JIT compiled code
   nmethod(Method* method,
           CompilerType type,
           int nmethod_size,
@@ -353,9 +358,6 @@ class nmethod : public CodeBlob {
   // Inform external interfaces that a compiled method has been unloaded
   void post_compiled_method_unload();
 
-  // Initialize fields to their default values
-  void init_defaults();
-
   PcDesc* find_pc_desc(address pc, bool approximate) {
     return _pc_desc_container.find_pc_desc(pc, approximate, PcDescSearch(code_begin(), scopes_pcs_begin(), scopes_pcs_end()));
   }
@@ -523,40 +525,41 @@ public:
   const char*  compiler_name       () const;
 
   // boundaries for different parts
-  address consts_begin          () const { return           header_begin() + _consts_offset           ; }
-  address consts_end            () const { return           header_begin() +  code_offset()           ; }
-  address insts_begin           () const { return           header_begin() +  code_offset()           ; }
+  address consts_begin          () const { return           content_begin(); }
+  address consts_end            () const { return           code_begin()   ; }
+  address insts_begin           () const { return           code_begin()   ; }
   address insts_end             () const { return           header_begin() + _stub_offset             ; }
   address stub_begin            () const { return           header_begin() + _stub_offset             ; }
-  address stub_end              () const { return           header_begin() + _oops_offset             ; }
+  address stub_end              () const { return           data_begin()   ; }
   address exception_begin       () const { return           header_begin() + _exception_offset        ; }
   address deopt_handler_begin   () const { return           header_begin() + _deopt_handler_offset    ; }
   address deopt_mh_handler_begin() const { return           header_begin() + _deopt_mh_handler_offset ; }
   address unwind_handler_begin  () const { return _unwind_handler_offset != -1 ? (header_begin() + _unwind_handler_offset) : nullptr; }
-  oop*    oops_begin            () const { return (oop*)   (header_begin() + _oops_offset)            ; }
-  oop*    oops_end              () const { return (oop*)   (header_begin() + _metadata_offset)        ; }
 
-  Metadata** metadata_begin     () const { return (Metadata**) (header_begin() + _metadata_offset)    ; }
-  Metadata** metadata_end       () const { return (Metadata**) (header_begin() + _scopes_data_offset) ; }
+  oop*    oops_begin            () const { return (oop*)    data_begin(); }
+  oop*    oops_end              () const { return (oop*)   (data_begin() + _metadata_offset)          ; }
 
-  address scopes_data_begin     () const { return           header_begin() + _scopes_data_offset      ; }
-  address scopes_data_end       () const { return           header_begin() + _scopes_pcs_offset       ; }
-  PcDesc* scopes_pcs_begin      () const { return (PcDesc*)(header_begin() + _scopes_pcs_offset)      ; }
-  PcDesc* scopes_pcs_end        () const { return (PcDesc*)(header_begin() + _dependencies_offset)    ; }
-  address dependencies_begin    () const { return           header_begin() + _dependencies_offset     ; }
-  address dependencies_end      () const { return           header_begin() + _handler_table_offset    ; }
-  address handler_table_begin   () const { return           header_begin() + _handler_table_offset    ; }
-  address handler_table_end     () const { return           header_begin() + _nul_chk_table_offset    ; }
-  address nul_chk_table_begin   () const { return           header_begin() + _nul_chk_table_offset    ; }
+  Metadata** metadata_begin     () const { return (Metadata**) (data_begin() + _metadata_offset)      ; }
+  Metadata** metadata_end       () const { return (Metadata**) (data_begin() + _dependencies_offset)  ; }
+
+  address dependencies_begin    () const { return           data_begin() + _dependencies_offset       ; }
+  address dependencies_end      () const { return           data_begin() + _scopes_pcs_offset         ; }
+  PcDesc* scopes_pcs_begin      () const { return (PcDesc*)(data_begin() + _scopes_pcs_offset)        ; }
+  PcDesc* scopes_pcs_end        () const { return (PcDesc*)(data_begin() + _scopes_data_offset)       ; }
+  address scopes_data_begin     () const { return           data_begin() + _scopes_data_offset        ; }
+  address scopes_data_end       () const { return           data_begin() + _handler_table_offset      ; }
+  address handler_table_begin   () const { return           data_begin() + _handler_table_offset      ; }
+  address handler_table_end     () const { return           data_begin() + _nul_chk_table_offset      ; }
+  address nul_chk_table_begin   () const { return           data_begin() + _nul_chk_table_offset      ; }
 
 #if INCLUDE_JVMCI
-  address nul_chk_table_end     () const { return           header_begin() + _speculations_offset     ; }
-  address speculations_begin    () const { return           header_begin() + _speculations_offset     ; }
-  address speculations_end      () const { return           header_begin() + _jvmci_data_offset       ; }
-  address jvmci_data_begin      () const { return           header_begin() + _jvmci_data_offset       ; }
-  address jvmci_data_end        () const { return           header_begin() + _nmethod_end_offset      ; }
+  address nul_chk_table_end     () const { return           data_begin() + _speculations_offset       ; }
+  address speculations_begin    () const { return           data_begin() + _speculations_offset       ; }
+  address speculations_end      () const { return           data_begin() + _jvmci_data_offset         ; }
+  address jvmci_data_begin      () const { return           data_begin() + _jvmci_data_offset         ; }
+  address jvmci_data_end        () const { return           data_end(); }
 #else
-  address nul_chk_table_end     () const { return           header_begin() + _nmethod_end_offset      ; }
+  address nul_chk_table_end     () const { return           data_end(); }
 #endif
 
   // Sizes
@@ -596,8 +599,8 @@ public:
   bool nul_chk_table_contains  (address addr) const { return nul_chk_table_begin() <= addr && addr < nul_chk_table_end(); }
 
   // entry points
-  address entry_point() const          { return _entry_point;          } // normal entry point
-  address verified_entry_point() const { return _verified_entry_point; } // if klass is correct
+  address entry_point() const          { return code_begin() + _entry_offset;          } // normal entry point
+  address verified_entry_point() const { return code_begin() + _verified_entry_offset; } // if klass is correct
 
   enum : signed char { not_installed = -1, // in construction, only the owner doing the construction is
                                            // allowed to advance state
@@ -617,9 +620,6 @@ public:
   bool is_unloading();
   void do_unloading(bool unloading_occurred);
 
-  bool is_unlinked() const             { return _is_unlinked; }
-  void set_is_unlinked()               { assert(!_is_unlinked, "already unlinked"); _is_unlinked = true; }
-
 #if INCLUDE_RTM_OPT
   // rtm state accessing and manipulating
   RTMState  rtm_state() const          { return _rtm_state; }
@@ -679,6 +679,12 @@ public:
     _has_flushed_dependencies = z;
   }
 
+  bool  is_unlinked() const                       { return _is_unlinked; }
+  void  set_is_unlinked()                         {
+     assert(!_is_unlinked, "already unlinked");
+      _is_unlinked = true;
+  }
+
   int   comp_level() const                        { return _comp_level; }
 
   // Support for oops in scopes and relocs:
@@ -723,7 +729,6 @@ protected:
   // Note: _exception_cache may be read and cleaned concurrently.
   ExceptionCache* exception_cache() const         { return _exception_cache; }
   ExceptionCache* exception_cache_acquire() const;
-  void set_exception_cache(ExceptionCache *ec)    { _exception_cache = ec; }
 
 public:
   address handler_for_exception_and_pc(Handle exception, address pc);
@@ -752,7 +757,7 @@ public:
     return (addr >= code_begin() && addr < verified_entry_point());
   }
 
-  void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) override;
+  void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f);
 
   // implicit exceptions support
   address continuation_for_implicit_div0_exception(address pc) { return continuation_for_implicit_exception(pc, true); }
@@ -788,11 +793,11 @@ public:
   void unlink_from_method();
 
   // On-stack replacement support
-  int   osr_entry_bci() const                     { assert(is_osr_method(), "wrong kind of nmethod"); return _entry_bci; }
-  address  osr_entry() const                      { assert(is_osr_method(), "wrong kind of nmethod"); return _osr_entry_point; }
-  void  invalidate_osr_method();
-  nmethod* osr_link() const                       { return _osr_link; }
-  void     set_osr_link(nmethod *n)               { _osr_link = n; }
+  int      osr_entry_bci()    const { assert(is_osr_method(), "wrong kind of nmethod"); return _entry_bci; }
+  address  osr_entry()        const { assert(is_osr_method(), "wrong kind of nmethod"); return _osr_entry_point; }
+  nmethod* osr_link()         const { return _osr_link; }
+  void     set_osr_link(nmethod *n) { _osr_link = n; }
+  void     invalidate_osr_method();
 
   int num_stack_arg_slots(bool rounded = true) const {
     return rounded ? align_up(_num_stack_arg_slots, 2) : _num_stack_arg_slots;
@@ -805,7 +810,7 @@ public:
   void unlink();
 
   // Deallocate this nmethod - called by the GC
-  void purge(bool free_code_cache_data, bool unregister_nmethod) override;
+  void purge(bool unregister_nmethod);
 
   // See comment at definition of _last_seen_on_stack
   void mark_as_maybe_on_stack();
@@ -970,16 +975,17 @@ public:
 
   // JVMTI's GetLocalInstance() support
   ByteSize native_receiver_sp_offset() {
+    assert(is_native_method(), "sanity");
     return _native_receiver_sp_offset;
   }
   ByteSize native_basic_lock_sp_offset() {
+    assert(is_native_method(), "sanity");
     return _native_basic_lock_sp_offset;
   }
 
   // support for code generation
-  static ByteSize verified_entry_point_offset() { return byte_offset_of(nmethod, _verified_entry_point); }
-  static ByteSize osr_entry_point_offset()      { return byte_offset_of(nmethod, _osr_entry_point); }
-  static ByteSize state_offset()                { return byte_offset_of(nmethod, _state); }
+  static ByteSize osr_entry_point_offset() { return byte_offset_of(nmethod, _osr_entry_point); }
+  static ByteSize state_offset()           { return byte_offset_of(nmethod, _state); }
 
   void metadata_do(MetadataClosure* f);
 
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index a41718d5831..61d5f9bd576 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -1793,7 +1793,7 @@ bool CompileBroker::init_compiler_runtime() {
 void CompileBroker::free_buffer_blob_if_allocated(CompilerThread* thread) {
   BufferBlob* blob = thread->get_buffer_blob();
   if (blob != nullptr) {
-    blob->purge(true /* free_code_cache_data */, true /* unregister_nmethod */);
+    blob->purge();
     MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
     CodeCache::free(blob);
   }
diff --git a/src/hotspot/share/compiler/compilerDefinitions.hpp b/src/hotspot/share/compiler/compilerDefinitions.hpp
index 6321e3e0738..9b69501a598 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.hpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -100,7 +100,7 @@ inline bool is_compile(int comp_level) {
 
 
 // States of Restricted Transactional Memory usage.
-enum RTMState {
+enum RTMState: u1 {
   NoRTM      = 0x2, // Don't use RTM
   UseRTM     = 0x1, // Use RTM
   ProfileRTM = 0x0  // Use RTM with abort ratio calculation
diff --git a/src/hotspot/share/gc/shared/classUnloadingContext.cpp b/src/hotspot/share/gc/shared/classUnloadingContext.cpp
index bd5fb2ff3d7..fdf84d69b6a 100644
--- a/src/hotspot/share/gc/shared/classUnloadingContext.cpp
+++ b/src/hotspot/share/gc/shared/classUnloadingContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -116,7 +116,7 @@ void ClassUnloadingContext::purge_nmethods() {
     NMethodSet* set = _unlinked_nmethods[i];
     for (nmethod* nm : *set) {
       freed_memory += nm->size();
-      nm->purge(false /* free_code_cache_data */, _unregister_nmethods_during_purge);
+      nm->purge(_unregister_nmethods_during_purge);
     }
   }
 
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 2a67a6791b4..a57d1f7e673 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -294,7 +294,7 @@
   nonstatic_field(MethodData,                  _backedge_mask,                                int)                                   \
   nonstatic_field(MethodData,                  _jvmci_ir_size,                                int)                                   \
                                                                                                                                      \
-  nonstatic_field(nmethod,                     _verified_entry_point,                         address)                               \
+  nonstatic_field(nmethod,                     _verified_entry_offset,                        u2)                                    \
   nonstatic_field(nmethod,                     _comp_level,                                   CompLevel)                             \
                                                                                                                                      \
   nonstatic_field(ObjArrayKlass,               _element_klass,                                Klass*)                                \
diff --git a/src/hotspot/share/memory/heap.hpp b/src/hotspot/share/memory/heap.hpp
index 27ae8ec0c78..a7b9b95050d 100644
--- a/src/hotspot/share/memory/heap.hpp
+++ b/src/hotspot/share/memory/heap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -38,8 +38,8 @@ class HeapBlock {
 
  public:
   struct Header {
-    size_t  _length;                             // the length in segments
-    bool    _used;                               // Used bit
+    uint32_t  _length;                           // the length in segments
+    bool      _used;                             // Used bit
   };
 
  protected:
@@ -51,9 +51,11 @@ class HeapBlock {
 
  public:
   // Initialization
-  void initialize(size_t length)                 { _header._length = length; set_used(); }
+  void initialize(size_t length)                 { set_length(length); set_used(); }
   // Merging/splitting
-  void set_length(size_t length)                 { _header._length = length; }
+  void set_length(size_t length)                 {
+    _header._length = checked_cast<uint32_t>(length);
+  }
 
   // Accessors
   void* allocated_space() const                  { return (void*)(this + 1); }
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index c0c6431418c..275f095af37 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -975,8 +975,9 @@ void frame::oops_nmethod_do(OopClosure* f, NMethodClosure* cf, DerivedOopClosure
 
     // Preserve potential arguments for a callee. We handle this by dispatching
     // on the codeblob. For c2i, we do
-    if (reg_map->include_argument_oops()) {
-      _cb->preserve_callee_argument_oops(*this, reg_map, f);
+    if (reg_map->include_argument_oops() && _cb->is_nmethod()) {
+      // Only nmethod preserves outgoing arguments at call.
+      _cb->as_nmethod()->preserve_callee_argument_oops(*this, reg_map, f);
     }
   }
   // In cases where perm gen is collected, GC will want to mark
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 3935a9dcca8..8d86fb6ceb4 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -507,7 +507,7 @@
   nonstatic_field(CodeHeap,                    _segmap,                                       VirtualSpace)                          \
   nonstatic_field(CodeHeap,                    _log2_segment_size,                            int)                                   \
   nonstatic_field(HeapBlock,                   _header,                                       HeapBlock::Header)                     \
-  nonstatic_field(HeapBlock::Header,           _length,                                       size_t)                                \
+  nonstatic_field(HeapBlock::Header,           _length,                                       uint32_t)                              \
   nonstatic_field(HeapBlock::Header,           _used,                                         bool)                                  \
                                                                                                                                      \
   /**********************************/                                                                                               \
@@ -550,11 +550,11 @@
                                                                                                                                      \
   nonstatic_field(CodeBlob,                    _name,                                         const char*)                           \
   nonstatic_field(CodeBlob,                    _size,                                         int)                                   \
-  nonstatic_field(CodeBlob,                    _header_size,                                  int)                                   \
+  nonstatic_field(CodeBlob,                    _header_size,                                  u2)                                    \
   nonstatic_field(CodeBlob,                    _relocation_size,                              int)                                   \
   nonstatic_field(CodeBlob,                    _content_offset,                               int)                                   \
   nonstatic_field(CodeBlob,                    _code_offset,                                  int)                                   \
-  nonstatic_field(CodeBlob,                    _frame_complete_offset,                        int)                                   \
+  nonstatic_field(CodeBlob,                    _frame_complete_offset,                        int16_t)                               \
   nonstatic_field(CodeBlob,                    _data_offset,                                  int)                                   \
   nonstatic_field(CodeBlob,                    _frame_size,                                   int)                                   \
   nonstatic_field(CodeBlob,                    _oop_maps,                                     ImmutableOopMapSet*)                   \
@@ -575,17 +575,14 @@
   nonstatic_field(nmethod,                     _deopt_mh_handler_offset,                      int)                                   \
   nonstatic_field(nmethod,                     _orig_pc_offset,                               int)                                   \
   nonstatic_field(nmethod,                     _stub_offset,                                  int)                                   \
-  nonstatic_field(nmethod,                     _consts_offset,                                int)                                   \
-  nonstatic_field(nmethod,                     _oops_offset,                                  int)                                   \
-  nonstatic_field(nmethod,                     _metadata_offset,                              int)                                   \
+  nonstatic_field(nmethod,                     _metadata_offset,                              u2)                                    \
+  nonstatic_field(nmethod,                     _scopes_pcs_offset,                            u2)                                    \
   nonstatic_field(nmethod,                     _scopes_data_offset,                           int)                                   \
-  nonstatic_field(nmethod,                     _scopes_pcs_offset,                            int)                                   \
-  nonstatic_field(nmethod,                     _dependencies_offset,                          int)                                   \
+  nonstatic_field(nmethod,                     _dependencies_offset,                          u2)                                    \
   nonstatic_field(nmethod,                     _handler_table_offset,                         int)                                   \
   nonstatic_field(nmethod,                     _nul_chk_table_offset,                         int)                                   \
-  nonstatic_field(nmethod,                     _nmethod_end_offset,                           int)                                   \
-  nonstatic_field(nmethod,                     _entry_point,                                  address)                               \
-  nonstatic_field(nmethod,                     _verified_entry_point,                         address)                               \
+  nonstatic_field(nmethod,                     _entry_offset,                                 u2)                                    \
+  nonstatic_field(nmethod,                     _verified_entry_offset,                        u2)                                    \
   nonstatic_field(nmethod,                     _osr_entry_point,                              address)                               \
   nonstatic_field(nmethod,                     _compile_id,                                   int)                                   \
   nonstatic_field(nmethod,                     _comp_level,                                   CompLevel)                             \
@@ -1131,6 +1128,7 @@
   declare_integer_type(ssize_t)                                           \
   declare_integer_type(intx)                                              \
   declare_integer_type(intptr_t)                                          \
+  declare_integer_type(int16_t)                                           \
   declare_integer_type(int64_t)                                           \
   declare_unsigned_integer_type(uintx)                                    \
   declare_unsigned_integer_type(uintptr_t)                                \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
index f546a8cea53..81a075ad50c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
@@ -25,10 +25,12 @@ package sun.jvm.hotspot.code;
 import sun.jvm.hotspot.compiler.ImmutableOopMap;
 import sun.jvm.hotspot.compiler.ImmutableOopMapSet;
 import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.oops.CIntField;
 import sun.jvm.hotspot.runtime.VM;
 import sun.jvm.hotspot.runtime.VMObject;
 import sun.jvm.hotspot.types.AddressField;
 import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.JShortField;
 import sun.jvm.hotspot.types.Type;
 import sun.jvm.hotspot.types.TypeDataBase;
 import sun.jvm.hotspot.utilities.Assert;
@@ -41,11 +43,11 @@ import sun.jvm.hotspot.utilities.Observer;
 public class CodeBlob extends VMObject {
   private static AddressField nameField;
   private static CIntegerField sizeField;
-  private static CIntegerField headerSizeField;
   private static CIntegerField relocationSizeField;
+  private static CIntField     headerSizeField;
   private static CIntegerField contentOffsetField;
   private static CIntegerField codeOffsetField;
-  private static CIntegerField frameCompleteOffsetField;
+  private static CIntField     frameCompleteOffsetField;
   private static CIntegerField dataOffsetField;
   private static CIntegerField frameSizeField;
   private static AddressField  oopMapsField;
@@ -61,11 +63,11 @@ public class CodeBlob extends VMObject {
 
     nameField                = type.getAddressField("_name");
     sizeField                = type.getCIntegerField("_size");
-    headerSizeField          = type.getCIntegerField("_header_size");
     relocationSizeField      = type.getCIntegerField("_relocation_size");
+    headerSizeField          = new CIntField(type.getCIntegerField("_header_size"), 0);
     contentOffsetField       = type.getCIntegerField("_content_offset");
     codeOffsetField          = type.getCIntegerField("_code_offset");
-    frameCompleteOffsetField = type.getCIntegerField("_frame_complete_offset");
+    frameCompleteOffsetField = new CIntField(type.getCIntegerField("_frame_complete_offset"), 0);
     dataOffsetField          = type.getCIntegerField("_data_offset");
     frameSizeField           = type.getCIntegerField("_frame_size");
     oopMapsField             = type.getAddressField("_oop_maps");
@@ -103,7 +105,7 @@ public class CodeBlob extends VMObject {
   // Offsets
   public int getContentOffset()   { return (int) contentOffsetField.getValue(addr); }
 
-  public int getCodeOffset()      { return (int) codeOffsetField   .getValue(addr); }
+  public int getCodeOffset()      { return (int) codeOffsetField.getValue(addr); }
 
   public long getFrameCompleteOffset() { return frameCompleteOffsetField.getValue(addr); }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
index c1f16c7957e..edcf85ce0c7 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -49,26 +49,24 @@ public class NMethod extends CodeBlob {
   private static CIntegerField deoptMhHandlerOffsetField;
   private static CIntegerField origPCOffsetField;
   private static CIntegerField stubOffsetField;
-  private static CIntegerField oopsOffsetField;
-  private static CIntegerField metadataOffsetField;
+  private static CIntField     metadataOffsetField;
+  private static CIntField     dependenciesOffsetField;
+  private static CIntField     scopesPCsOffsetField;
   private static CIntegerField scopesDataOffsetField;
-  private static CIntegerField scopesPCsOffsetField;
-  private static CIntegerField dependenciesOffsetField;
   private static CIntegerField handlerTableOffsetField;
   private static CIntegerField nulChkTableOffsetField;
-  private static CIntegerField nmethodEndOffsetField;
 
   /** Offsets for entry points */
   /** Entry point with class check */
-  private static AddressField  entryPointField;
+  private static CIntField  entryOffsetField;
   /** Entry point without class check */
-  private static AddressField  verifiedEntryPointField;
+  private static CIntField  verifiedEntryOffsetField;
   /** Entry point for on stack replacement */
   private static AddressField  osrEntryPointField;
 
   // FIXME: add access to flags (how?)
 
-  private static CIntegerField compLevelField;
+  private static CIntField compLevelField;
 
   static {
     VM.registerVMInitializedObserver(new Observer() {
@@ -90,18 +88,16 @@ public class NMethod extends CodeBlob {
     deoptMhHandlerOffsetField   = type.getCIntegerField("_deopt_mh_handler_offset");
     origPCOffsetField           = type.getCIntegerField("_orig_pc_offset");
     stubOffsetField             = type.getCIntegerField("_stub_offset");
-    oopsOffsetField             = type.getCIntegerField("_oops_offset");
-    metadataOffsetField         = type.getCIntegerField("_metadata_offset");
+    metadataOffsetField         = new CIntField(type.getCIntegerField("_metadata_offset"), 0);
+    dependenciesOffsetField     = new CIntField(type.getCIntegerField("_dependencies_offset"), 0);
+    scopesPCsOffsetField        = new CIntField(type.getCIntegerField("_scopes_pcs_offset"), 0);
     scopesDataOffsetField       = type.getCIntegerField("_scopes_data_offset");
-    scopesPCsOffsetField        = type.getCIntegerField("_scopes_pcs_offset");
-    dependenciesOffsetField     = type.getCIntegerField("_dependencies_offset");
     handlerTableOffsetField     = type.getCIntegerField("_handler_table_offset");
     nulChkTableOffsetField      = type.getCIntegerField("_nul_chk_table_offset");
-    nmethodEndOffsetField       = type.getCIntegerField("_nmethod_end_offset");
-    entryPointField             = type.getAddressField("_entry_point");
-    verifiedEntryPointField     = type.getAddressField("_verified_entry_point");
+    entryOffsetField            = new CIntField(type.getCIntegerField("_entry_offset"), 0);
+    verifiedEntryOffsetField    = new CIntField(type.getCIntegerField("_verified_entry_offset"), 0);
     osrEntryPointField          = type.getAddressField("_osr_entry_point");
-    compLevelField              = type.getCIntegerField("_comp_level");
+    compLevelField              = new CIntField(type.getCIntegerField("_comp_level"), 0);
     pcDescSize = db.lookupType("PcDesc").getSize();
   }
 
@@ -126,28 +122,28 @@ public class NMethod extends CodeBlob {
 
   /** Boundaries for different parts */
   public Address constantsBegin()       { return contentBegin();                                     }
-  public Address constantsEnd()         { return getEntryPoint();                                    }
+  public Address constantsEnd()         { return codeBegin();                                        }
   public Address instsBegin()           { return codeBegin();                                        }
   public Address instsEnd()             { return headerBegin().addOffsetTo(getStubOffset());         }
   public Address exceptionBegin()       { return headerBegin().addOffsetTo(getExceptionOffset());    }
   public Address deoptHandlerBegin()    { return headerBegin().addOffsetTo(getDeoptHandlerOffset());   }
   public Address deoptMhHandlerBegin()  { return headerBegin().addOffsetTo(getDeoptMhHandlerOffset()); }
   public Address stubBegin()            { return headerBegin().addOffsetTo(getStubOffset());         }
-  public Address stubEnd()              { return headerBegin().addOffsetTo(getOopsOffset());         }
-  public Address oopsBegin()            { return headerBegin().addOffsetTo(getOopsOffset());         }
-  public Address oopsEnd()              { return headerBegin().addOffsetTo(getMetadataOffset());     }
-  public Address metadataBegin()        { return headerBegin().addOffsetTo(getMetadataOffset());     }
-  public Address metadataEnd()          { return headerBegin().addOffsetTo(getScopesDataOffset());   }
-  public Address scopesDataBegin()      { return headerBegin().addOffsetTo(getScopesDataOffset());   }
-  public Address scopesDataEnd()        { return headerBegin().addOffsetTo(getScopesPCsOffset());    }
-  public Address scopesPCsBegin()       { return headerBegin().addOffsetTo(getScopesPCsOffset());    }
-  public Address scopesPCsEnd()         { return headerBegin().addOffsetTo(getDependenciesOffset()); }
-  public Address dependenciesBegin()    { return headerBegin().addOffsetTo(getDependenciesOffset()); }
-  public Address dependenciesEnd()      { return headerBegin().addOffsetTo(getHandlerTableOffset()); }
-  public Address handlerTableBegin()    { return headerBegin().addOffsetTo(getHandlerTableOffset()); }
-  public Address handlerTableEnd()      { return headerBegin().addOffsetTo(getNulChkTableOffset());  }
-  public Address nulChkTableBegin()     { return headerBegin().addOffsetTo(getNulChkTableOffset());  }
-  public Address nulChkTableEnd()       { return headerBegin().addOffsetTo(getNMethodEndOffset());   }
+  public Address stubEnd()              { return dataBegin();                                        }
+  public Address oopsBegin()            { return dataBegin();                                        }
+  public Address oopsEnd()              { return dataBegin().addOffsetTo(getMetadataOffset());       }
+  public Address metadataBegin()        { return dataBegin().addOffsetTo(getMetadataOffset());       }
+  public Address metadataEnd()          { return dataBegin().addOffsetTo(getDependenciesOffset());   }
+  public Address dependenciesBegin()    { return dataBegin().addOffsetTo(getDependenciesOffset());   }
+  public Address dependenciesEnd()      { return dataBegin().addOffsetTo(getScopesDataOffset());     }
+  public Address scopesDataBegin()      { return dataBegin().addOffsetTo(getScopesDataOffset());     }
+  public Address scopesDataEnd()        { return dataBegin().addOffsetTo(getScopesPCsOffset());      }
+  public Address scopesPCsBegin()       { return dataBegin().addOffsetTo(getScopesPCsOffset());      }
+  public Address scopesPCsEnd()         { return dataBegin().addOffsetTo(getHandlerTableOffset());   }
+  public Address handlerTableBegin()    { return dataBegin().addOffsetTo(getHandlerTableOffset());   }
+  public Address handlerTableEnd()      { return dataBegin().addOffsetTo(getNulChkTableOffset());    }
+  public Address nulChkTableBegin()     { return dataBegin().addOffsetTo(getNulChkTableOffset());    }
+  public Address nulChkTableEnd()       { return dataEnd();                                          }
 
   public int constantsSize()            { return (int) constantsEnd()   .minus(constantsBegin());    }
   public int instsSize()                { return (int) instsEnd()       .minus(instsBegin());        }
@@ -187,8 +183,8 @@ public class NMethod extends CodeBlob {
   public int getMetadataLength() { return (int) (metadataSize() / VM.getVM().getOopSize()); }
 
   /** Entry points */
-  public Address getEntryPoint()         { return entryPointField.getValue(addr);         }
-  public Address getVerifiedEntryPoint() { return verifiedEntryPointField.getValue(addr); }
+  public Address getEntryPoint()         { return codeBegin().addOffsetTo(getEntryPointOffset());         }
+  public Address getVerifiedEntryPoint() { return codeBegin().addOffsetTo(getVerifiedEntryPointOffset()); }
 
   /** Support for oops in scopes and relocs. Note: index 0 is reserved for null. */
   public OopHandle getOopAt(int index) {
@@ -432,11 +428,11 @@ public class NMethod extends CodeBlob {
   // FIXME: add isPatchableAt()
 
   /** Support for code generation. Only here for proof-of-concept. */
-  public static int getEntryPointOffset()            { return (int) entryPointField.getOffset();            }
-  public static int getVerifiedEntryPointOffset()    { return (int) verifiedEntryPointField.getOffset();    }
-  public static int getOSREntryPointOffset()         { return (int) osrEntryPointField.getOffset();         }
-  public static int getEntryBCIOffset()              { return (int) entryBCIField.getOffset();              }
-  public static int getMethodOffset()                { return (int) methodField.getOffset();                }
+  public int getEntryPointOffset()            { return (int) entryOffsetField.getValue(addr);        }
+  public int getVerifiedEntryPointOffset()    { return (int) verifiedEntryOffsetField.getValue(addr);}
+  public static int getOSREntryPointOffset()  { return (int) osrEntryPointField.getOffset();         }
+  public static int getEntryBCIOffset()       { return (int) entryBCIField.getOffset();              }
+  public static int getMethodOffset()         { return (int) methodField.getOffset();                }
 
   public void print() {
     printOn(System.out);
@@ -517,13 +513,11 @@ public class NMethod extends CodeBlob {
   private int getDeoptHandlerOffset()   { return (int) deoptHandlerOffsetField  .getValue(addr); }
   private int getDeoptMhHandlerOffset() { return (int) deoptMhHandlerOffsetField.getValue(addr); }
   private int getStubOffset()         { return (int) stubOffsetField        .getValue(addr); }
-  private int getOopsOffset()         { return (int) oopsOffsetField        .getValue(addr); }
   private int getMetadataOffset()     { return (int) metadataOffsetField    .getValue(addr); }
   private int getScopesDataOffset()   { return (int) scopesDataOffsetField  .getValue(addr); }
   private int getScopesPCsOffset()    { return (int) scopesPCsOffsetField   .getValue(addr); }
   private int getDependenciesOffset() { return (int) dependenciesOffsetField.getValue(addr); }
   private int getHandlerTableOffset() { return (int) handlerTableOffsetField.getValue(addr); }
   private int getNulChkTableOffset()  { return (int) nulChkTableOffsetField .getValue(addr); }
-  private int getNMethodEndOffset()   { return (int) nmethodEndOffsetField  .getValue(addr); }
   private int getCompLevel()          { return (int) compLevelField         .getValue(addr); }
 }

From c1dd82b4d2393b2095cfd2365a806b74e9adf92e Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Fri, 19 Apr 2024 19:00:17 +0000
Subject: [PATCH 117/486] 8329644: Discuss expected visitor evolution patterns
 in javax.lang.model.util

Reviewed-by: prappo, jlahoda, jjg
---
 ...AbstractAnnotationValueVisitorPreview.java |   2 +
 .../util/AbstractElementVisitorPreview.java   |   2 +
 .../util/AbstractTypeVisitorPreview.java      |   2 +
 .../model/util/ElementKindVisitorPreview.java |   2 +
 .../model/util/ElementScannerPreview.java     |   2 +
 .../SimpleAnnotationValueVisitorPreview.java  |   2 +
 .../util/SimpleElementVisitorPreview.java     |   2 +
 .../model/util/SimpleTypeVisitorPreview.java  |   2 +
 .../model/util/TypeKindVisitorPreview.java    |   2 +
 .../javax/lang/model/util/package-info.java   | 272 +++++++++++++++++-
 10 files changed, 289 insertions(+), 1 deletion(-)

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
index 0e504e192bd..63381039b11 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
@@ -40,6 +40,8 @@ import javax.annotation.processing.ProcessingEnvironment;
  * @param <R> the return type of this visitor's methods
  * @param <P> the type of the additional parameter to this visitor's methods.
  *
+* @see <a href="package-summary.html#expectedEvolution">
+* <strong>Expected visitor evolution</strong></a>
  * @see <a href="AbstractAnnotationValueVisitor6.html#note_for_subclasses">
  * <strong>Compatibility note for subclasses</strong></a>
  * @see AbstractAnnotationValueVisitor6
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
index eb361654394..f5a64c8c532 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
@@ -45,6 +45,8 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
+ * @see <a href="package-summary.html#expectedEvolution">
+ * <strong>Expected visitor evolution</strong></a>
  * @see <a href="AbstractElementVisitor6.html#note_for_subclasses">
  * <strong>Compatibility note for subclasses</strong></a>
  * @see AbstractElementVisitor6
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
index 5da08ee004e..9f4561fe9df 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
@@ -43,6 +43,8 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
+ * @see <a href="package-summary.html#expectedEvolution">
+ * <strong>Expected visitor evolution</strong></a>
  * @see <a href="AbstractTypeVisitor6.html#note_for_subclasses">
  * <strong>Compatibility note for subclasses</strong></a>
  * @see AbstractTypeVisitor6
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
index 01c70ea11d5..519a8a31bcb 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
@@ -57,6 +57,8 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
+ * @see <a href="package-summary.html#expectedEvolution">
+ * <strong>Expected visitor evolution</strong></a>
  * @see <a href="ElementKindVisitor6.html#note_for_subclasses">
  * <strong>Compatibility note for subclasses</strong></a>
  * @see ElementKindVisitor6
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
index 511141a5093..03aca5f5388 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
@@ -74,6 +74,8 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
+ * @see <a href="package-summary.html#expectedEvolution">
+ * <strong>Expected visitor evolution</strong></a>
  * @see <a href="ElementScanner6.html#note_for_subclasses"><strong>Compatibility note for subclasses</strong></a>
  * @see ElementScanner6
  * @see ElementScanner7
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
index a16a82a79fb..ec8c0169ac9 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
@@ -48,6 +48,8 @@ import static javax.lang.model.SourceVersion.*;
  * @param <R> the return type of this visitor's methods
  * @param <P> the type of the additional parameter to this visitor's methods.
  *
+ * @see <a href="package-summary.html#expectedEvolution">
+ * <strong>Expected visitor evolution</strong></a>
  * @see <a href="SimpleAnnotationValueVisitor6.html#note_for_subclasses">
  * <strong>Compatibility note for subclasses</strong></a>
  * @see SimpleAnnotationValueVisitor6
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
index 02c2d78daed..01fbc76e931 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
@@ -53,6 +53,8 @@ import static javax.lang.model.SourceVersion.*;
  * @param <P> the type of the additional parameter to this visitor's methods.  Use {@code Void}
  *              for visitors that do not need an additional parameter.
  *
+ * @see <a href="package-summary.html#expectedEvolution">
+ * <strong>Expected visitor evolution</strong></a>
  * @see <a href="SimpleElementVisitor6.html#note_for_subclasses">
  * <strong>Compatibility note for subclasses</strong></a>
  * @see SimpleElementVisitor6
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
index bac2e2a87a1..3048e291542 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
@@ -52,6 +52,8 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
+ * @see <a href="package-summary.html#expectedEvolution">
+ * <strong>Expected visitor evolution</strong></a>
  * @see <a href="SimpleTypeVisitor6.html#note_for_subclasses">
  * <strong>Compatibility note for subclasses</strong></a>
  * @see SimpleTypeVisitor6
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
index b1458706091..88256379ea7 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
@@ -56,6 +56,8 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
+ * @see <a href="package-summary.html#expectedEvolution">
+ * <strong>Expected visitor evolution</strong></a>
  * @see <a href="TypeKindVisitor6.html#note_for_subclasses">
  * <strong>Compatibility note for subclasses</strong></a>
  * @see TypeKindVisitor6
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/package-info.java b/src/java.compiler/share/classes/javax/lang/model/util/package-info.java
index b906cdbf342..0293856457c 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/package-info.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,276 @@
  * <p> Unless otherwise specified, methods in this package will throw
  * a {@code NullPointerException} if given a {@code null} argument.
  *
+ * @apiNote
+ *
+ * <h2 id=expectedEvolution>Expected visitor evolution</h2>
+ *
+ * As the Java programming language evolves, the visitor interfaces of
+ * the language model also evolve as do the concrete visitors in this
+ * package. A <a href="https://openjdk.org/jeps/12">preview language
+ * feature</a> in JDK <i>N</i> may have API elements added in the set
+ * of visitors for the preview language level. Such new elements are
+ * marked as reflective preview API. Any existing methods whose
+ * specification is updated to support the preview feature are
+ * <em>not</em> marked as preview.
+ *
+ * <p>The remainder of this note will show two examples of the API
+ * changes in the model and visitors that can be added to support a
+ * language feature. The examples will use additions to the elements
+ * portion of the language model, but the updates to visitors for
+ * types or annotation values would be analogous.
+ *
+ * Two distinct cases are:
+ * <ul>
+ *
+ * <li>the preview language construct has a corresponding new modeling
+ * interface and a concomitant new kind constant, such as a new {@link
+ * javax.lang.model.element.ElementKind} constant
+ *
+ * <li>the preview language construct only triggers the introduction
+ * of a new kind <em>without</em> a new modeling interface
+ *
+ * </ul>
+ *
+ * If a preview language feature is withdrawn rather than evolving to
+ * a permanent platform feature, the API elements associated with the
+ * feature are expected to be removed. The examples below outline the
+ * API changes expected when a preview feature becomes a permanent
+ * feature.
+ *
+ * <h3 id=topLevelLangConstruct>Adding visitor support for a
+ * top-level language construct</h3>
+ *
+ * Consider a new language feature, preview feature 1, in JDK <i>N</i>. This
+ * feature has a top-level element interface to model it:
+ *
+ * <pre>
+ * package javax.lang.model.element;
+ * /**
+ *  * Represents a preview feature 1.
+ *  *
+ *  * &commat;since N
+ *  *&sol;
+ *  public interface PreviewFeature1Element extends Element {
+ *  // Methods to retrieve information specific to the preview feature...
+ *  }
+ * </pre>
+ * A new element kind would also be introduced to model such a feature:
+ *
+ * <pre>
+ *  //  Sample diff of ElementKind.java
+ *  +    /**
+ *  +     * A preview feature 1.
+ *  +     * &commat;since N
+ *  +     *&sol;
+ *  +     PREVIEW_FEATURE_1,
+ * </pre>
+ *
+ * A {@code default} method is added to {@code ElementVisitor} to accommodate the new construct:
+ * <pre>
+ * //  Sample diff for ElementVisitor.java
+ *  +    /**
+ *  +     * Visits a preview feature 1.
+ *  +     *
+ *  +     * &commat;implSpec The default implementation visits a {&commat;code
+ *  +     * PreviewFeature1Element} by calling {&commat;code visitUnknown(e, p)}.
+ *  +     *
+ *  +     * &commat;param e  the element to visit
+ *  +     * &commat;param p  a visitor-specified parameter
+ *  +     * &commat;return a visitor-specified result
+ *  +     * &commat;since N
+ *  +     *&sol;
+ *  +    default R visitPreviewFeature1(PreviewFeature1Element e, P p) {
+ *  +        return visitUnknown(e, p);
+ *  +    }
+ * </pre>
+ *
+ * Given the {@code default} method on the visitor interface, the
+ * preview visitor classes need to override this method and take an
+ * action appropriate for the visitor's semantics:
+ *
+ * <pre>
+ * //  Sample diff for AbstractElementVisitorPreview.java
+ * //  Re-abstract visitPreviewFeature1.
+ *  +    /**
+ *  +     * {&commat;inheritDoc ElementVisitor}
+ *  +     *
+ *  +     * &commat;implSpec Visits a {&commat;code PreviewFeature1Element} in a manner
+ *  +     * defined by a subclass.
+ *  +     *
+ *  +     * &commat;param e {&commat;inheritDoc ElementVisitor}
+ *  +     * &commat;param p {&commat;inheritDoc ElementVisitor}
+ *  +     * &commat;return a visitor-specified result
+ *  +     * &commat;since N
+ *  +     *&sol;
+ *  +    @Override
+ *  +    public abstract R visitPreviewFeature1(PreviewFeature1Element e, P p);
+ *
+ * //  Sample diff for ElementKindVisitorPreview.java
+ * //  Take the default action for a preview feature 1.
+ *  +
+ *  +    /**
+ *  +     * {&commat;inheritDoc ElementVisitor}
+ *  +     *
+ *  +     * &commat;implSpec This implementation calls {&commat;code defaultAction}.
+ *  +     *
+ *  +     * &commat;param e {&commat;inheritDoc ElementVisitor}
+ *  +     * &commat;param p {&commat;inheritDoc ElementVisitor}
+ *  +     * &commat;return  the result of {&commat;code defaultAction}
+ *  +     * &commat;since N
+ *  +     *&sol;
+ *  +    @Override
+ *  +    public R visitPreviewFeature1(PreviewFeature1Element e, P p) {
+ *  +        return defaultAction(e, p);
+ *  +    }
+ *
+ * //  Sample diff for ElementScannerPreview.java
+ * //  Scan the enclosed elements of a preview feature 1.
+ *  +
+ *  +    /**
+ *  +     * {&commat;inheritDoc ElementVisitor}
+ *  +     *
+ *  +     * &commat;implSpec This implementation scans the enclosed elements.
+ *  +     *
+ *  +     * &commat;param e {&commat;inheritDoc ElementVisitor}
+ *  +     * &commat;param p {&commat;inheritDoc ElementVisitor}
+ *  +     * &commat;return  {&commat;inheritDoc ElementScanner6}
+ *  +     * &commat;since N
+ *  +     *&sol;
+ *  +    @Override
+ *  +    public R visitPreviewFeature1(PreviewFeature1Element e, P p) {
+ *  +        return scan(e.getEnclosedElements(), p);
+ *  +    }
+ *
+ * //  Sample diff for SimpleElementVisitorPreview.java
+ * //  Take the default action for a preview feature 1.
+ *  +    /**
+ *  +     * {&commat;inheritDoc ElementVisitor}
+ *  +     *
+ *  +     * &commat;implSpec Visits a {&commat;code PreviewFeature1Element} by calling
+ *  +     * {@code defaultAction}.
+ *  +     *
+ *  +     * &commat;param e {&commat;inheritDoc ElementVisitor}
+ *  +     * &commat;param p {&commat;inheritDoc ElementVisitor}
+ *  +     * &commat;return  {&commat;inheritDoc ElementVisitor}
+ *  +     * &commat;since N
+ *  +     *&sol;
+ *  +    @Override
+ *  +    public R visitPreviewFeature1(PreviewFeature1Element e, P p) {
+ *  +        return defaultAction(e, p);
+ *  +    }
+ * </pre>
+ *
+ * When preview feature 1 exits preview in JDK (<i>N+k</i>), a set of
+ * visitors for language level (<i>N+k</i>) would be added. The
+ * methods operating over the feature would be moved from the preview
+ * visitors to the new language level (<i>N+k</i>) visitors. Each
+ * preview visitor would then have its direct superclass changed to
+ * the new corresponding (<i>N+k</i>) visitor.
+ *
+ * <h3 id=newKindLangConstruct>Adding visitor support for a language
+ * construct that is a new kind of an existing construct</h3>
+ *
+ * Consider a new language feature, preview feature 2, in JDK
+ * <i>N</i>. This feature has a new element kind <em>without</em> a
+ * new top-level element interface needed to model it. Concretely,
+ * assume a preview feature 2 is a new kind of variable; the changes
+ * would be analogous if the feature were a new kind of executable
+ * instead or new kind of another existing top-level construct. In
+ * that case, the API changes are more limited:
+ *
+ * <pre>
+ *  //  Sample diff for ElementKind.java
+ *  +    /**
+ *  +     * A preview feature 2.
+ *  +     * &commat;since N
+ *  +     *&sol;
+ *  +     PREVIEW_FEATURE_2,
+ *  ...
+ *  // Update existing methods as needed
+ *       public boolean isVariable() {
+ *           return switch(this) {
+ *           case ENUM_CONSTANT, FIELD, PARAMETER,
+ *                LOCAL_VARIABLE, EXCEPTION_PARAMETER, RESOURCE_VARIABLE,
+ *  -             BINDING_VARIABLE -> true;
+ *  +             BINDING_VARIABLE, PREVIEW_FEATURE_2 -> true;
+ *           default -> false;
+ *           };
+ *       }
+ * </pre>
+ *
+ * The kind visitors need support for the new variety of element:
+ * <pre>
+ * // Update visitVariable in ElementKindVisitor6:
+ *        ...
+ *        * &commat;implSpec This implementation dispatches to the visit method for
+ *        * the specific {&commat;linkplain ElementKind kind} of variable, {&commat;code
+ *        * ENUM_CONSTANT}, {&commat;code EXCEPTION_PARAMETER}, {&commat;code FIELD},
+ *  -     * {&commat;code LOCAL_VARIABLE}, {&commat;code PARAMETER}, or {&commat;code RESOURCE_VARIABLE}.
+ *  +     * {&commat;code LOCAL_VARIABLE}, {&commat;code PARAMETER}, {&commat;code RESOURCE_VARIABLE},
+ *  +     * or {&commat;code PREVIEW_FEATURE_2}.
+ *        *
+ *        * &commat;param e {&commat;inheritDoc ElementVisitor}
+ *        * &commat;param p {&commat;inheritDoc ElementVisitor}
+ *        * &commat;return  the result of the kind-specific visit method
+ *        *&sol;
+ *        &commat;Override
+ *        public R visitVariable(VariableElement e, P p) {
+ *        ...
+ *           case BINDING_VARIABLE:
+ *               return visitVariableAsBindingVariable(e, p);
+ *
+ *  +        case PREVIEW_FEATURE_2:
+ *  +            return visitVariableAsPreviewFeature2(e, p);
+ *  +
+ *           default:
+ *               throw new AssertionError("Bad kind " + k + " for VariableElement" + e);
+ *        ...
+ *  +    /**
+ *  +     * Visits a {&commat;code PREVIEW_FEATURE_2} variable element.
+ *  +     *
+ *  +     * &commat;implSpec This implementation calls {&commat;code visitUnknown}.
+ *  +     *
+ *  +     * &commat;param e the element to visit
+ *  +     * &commat;param p a visitor-specified parameter
+ *  +     * &commat;return  the result of {&commat;code visitUnknown}
+ *  +     *
+ *  +     * &commat;since N
+ *  +     *&sol;
+ *  +    public R visitVariableAsPreviewFeature2(VariableElement e, P p) {
+ *  +        return visitUnknown(e, p);
+ *  +    }
+ * </pre>
+ *
+ * The preview element kind visitor in turn overrides {@code
+ * visitVariableAsPreviewFeature2}:
+ * <pre>
+ * // Sample diff for ElementKindVisitorPreview:
+ *  +    /**
+ *  +     * {&commat;inheritDoc ElementKindVisitor6}
+ *  +     *
+ *  +     * &commat;implSpec This implementation calls {&commat;code defaultAction}.
+ *  +     *
+ *  +     * &commat;param e {&commat;inheritDoc ElementKindVisitor6}
+ *  +     * &commat;param p {&commat;inheritDoc ElementKindVisitor6}
+ *  +     * &commat;return  the result of {&commat;code defaultAction}
+ *  +     *
+ *  +     * &commat;since N
+ *  +     *&sol;
+ *  +    @Override
+ *  +    public R visitVariableAsPreviewFeature2(VariableElement e, P p) {
+ *  +        return defaultAction(e, p);
+ *  +    }
+ * </pre>
+ *
+ * As in the case where a new interface is introduced, when preview
+ * feature 2 exits preview in JDK (<i>N+k</i>), a set of visitors for
+ * language level (<i>N+k</i>) would be added. The methods operating
+ * over the new feature in the kind visitors would be moved from the
+ * preview visitors to new language level (<i>N+k</i>) visitors. Each
+ * preview visitor would then have its direct superclass changed to
+ * the new corresponding (<i>N+k</i>) visitor.
+ *
  * @since 1.6
  *
  * @see <a href="https://jcp.org/en/jsr/detail?id=269">

From df04358223e8ae24009187d9c5a7e12701f4191f Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Fri, 19 Apr 2024 19:02:46 +0000
Subject: [PATCH 118/486] 8330179: Clean up non-standard use of /** comments in
 `jdk.compiler`

Reviewed-by: darcy
---
 .../com/sun/tools/javac/code/ClassFinder.java |  6 +++---
 .../com/sun/tools/javac/code/Flags.java       |  4 ++--
 .../com/sun/tools/javac/code/Source.java      |  4 ++--
 .../com/sun/tools/javac/code/Type.java        |  2 +-
 .../com/sun/tools/javac/comp/Annotate.java    |  4 ++--
 .../com/sun/tools/javac/comp/Flow.java        | 14 ++++++-------
 .../sun/tools/javac/comp/LambdaToMethod.java  |  2 +-
 .../com/sun/tools/javac/comp/Lower.java       | 20 +++++++++----------
 .../com/sun/tools/javac/comp/TransTypes.java  |  4 ++--
 .../com/sun/tools/javac/jvm/ClassFile.java    |  2 +-
 .../com/sun/tools/javac/jvm/ClassReader.java  | 16 +++++++--------
 .../com/sun/tools/javac/jvm/ClassWriter.java  | 14 ++++++-------
 .../classes/com/sun/tools/javac/jvm/Code.java |  6 +++---
 .../com/sun/tools/javac/tree/Pretty.java      |  2 +-
 .../classes/com/sun/tools/javac/util/Log.java |  2 +-
 15 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
index 770adbebc2e..95f8f847923 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
@@ -226,7 +226,7 @@ public class ClassFinder {
     }
 
 
-/************************************************************************
+/* **********************************************************************
  * Temporary ct.sym replacement
  *
  * The following code is a temporary substitute for the ct.sym mechanism
@@ -278,7 +278,7 @@ public class ClassFinder {
 
     private Map<PackageSymbol, Long> supplementaryFlags;
 
-/************************************************************************
+/* **********************************************************************
  * Loading Classes
  ***********************************************************************/
 
@@ -455,7 +455,7 @@ public class ClassFinder {
         return c;
     }
 
-/************************************************************************
+/* **********************************************************************
  * Loading Packages
  ***********************************************************************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
index 429465c1910..346aab18a60 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
@@ -110,7 +110,7 @@ public class Flags {
     public static final int ACC_VARARGS  = 0x0080;
     public static final int ACC_MODULE   = 0x8000;
 
-    /*****************************************
+    /* ***************************************
      * Internal compiler flags (no bits in the lower 16).
      *****************************************/
 
@@ -278,7 +278,7 @@ public class Flags {
      */
     public static final long THROWS = 1L<<47;
 
-    /**
+    /*
      * Currently available: Bit 48.
      */
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index 80f60aa7209..479e6891d8f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -47,10 +47,10 @@ import static com.sun.tools.javac.main.Option.*;
  *  deletion without notice.</b>
  */
 public enum Source {
-    /** 1.0 had no inner classes, and so could not pass the JCK. */
+    /* 1.0 had no inner classes, and so could not pass the JCK. */
     // public static final Source JDK1_0 =              new Source("1.0");
 
-    /** 1.1 did not have strictfp, and so could not pass the JCK. */
+    /* 1.1 did not have strictfp, and so could not pass the JCK. */
     // public static final Source JDK1_1 =              new Source("1.1");
 
     /** 1.2 introduced strictfp. */
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
index 1715dfa1451..5acb4c384eb 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
@@ -600,7 +600,7 @@ public abstract class Type extends AnnoConstruct implements TypeMirror, PoolCons
     public Type              getUpperBound()     { return null; }
     public Type              getLowerBound()     { return null; }
 
-    /** Navigation methods, these will work for classes, type variables,
+    /* Navigation methods, these will work for classes, type variables,
      *  foralls, but will return null for arrays and methods.
      */
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
index 366e16f1da3..71c9d59cb27 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -1015,7 +1015,7 @@ public class Annotate {
         return validRepeated;
     }
 
-    /********************
+    /* ******************
      * Type annotations *
      ********************/
 
@@ -1168,7 +1168,7 @@ public class Annotate {
         }
     }
 
-    /*********************
+    /* *******************
      * Completer support *
      *********************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
index c103ee342af..eda2772fb75 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -526,7 +526,7 @@ public class Flow {
             alive = Liveness.DEAD;
         }
 
-    /*************************************************************************
+    /* ***********************************************************************
      * Visitor methods for statements and definitions
      *************************************************************************/
 
@@ -1330,7 +1330,7 @@ public class Flow {
             // Do nothing for modules
         }
 
-    /**************************************************************************
+    /* ************************************************************************
      * main method
      *************************************************************************/
 
@@ -1446,7 +1446,7 @@ public class Flow {
             }
         }
 
-    /*************************************************************************
+    /* ***********************************************************************
      * Visitor methods for statements and definitions
      *************************************************************************/
 
@@ -1914,7 +1914,7 @@ public class Flow {
             // Do nothing for modules
         }
 
-    /**************************************************************************
+    /* ************************************************************************
      * main method
      *************************************************************************/
 
@@ -3223,7 +3223,7 @@ public class Flow {
             // Do nothing for modules
         }
 
-    /**************************************************************************
+    /* ************************************************************************
      * main method
      *************************************************************************/
 
@@ -3342,7 +3342,7 @@ public class Flow {
             log.error(pos, Errors.CantRefNonEffectivelyFinalVar(sym, diags.fragment(subKey)));
         }
 
-    /*************************************************************************
+    /* ***********************************************************************
      * Visitor methods for statements and definitions
      *************************************************************************/
 
@@ -3461,7 +3461,7 @@ public class Flow {
             // Do nothing for modules
         }
 
-    /**************************************************************************
+    /* ************************************************************************
      * main method
      *************************************************************************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 9d7bd1f068e..5b70a376f2a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -796,7 +796,7 @@ public class LambdaToMethod extends TreeTranslator {
             stmts = new ListBuffer<>();
             kInfo.deserializeCases.put(implMethodName, stmts);
         }
-        /****
+        /* **
         System.err.printf("+++++++++++++++++\n");
         System.err.printf("*functionalInterfaceClass: '%s'\n", functionalInterfaceClass);
         System.err.printf("*functionalInterfaceMethodName: '%s'\n", functionalInterfaceMethodName);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index f1c897a917e..66de5203d57 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -153,7 +153,7 @@ public class Lower extends TreeTranslator {
      */
     EndPosTable endPosTable;
 
-/**************************************************************************
+/* ************************************************************************
  * Global mappings
  *************************************************************************/
 
@@ -647,7 +647,7 @@ public class Lower extends TreeTranslator {
     }
 
 
-/**************************************************************************
+/* ************************************************************************
  * Tree building blocks
  *************************************************************************/
 
@@ -784,7 +784,7 @@ public class Lower extends TreeTranslator {
         return cdef;
     }
 
-/**************************************************************************
+/* ************************************************************************
  * Symbol manipulation utilities
  *************************************************************************/
 
@@ -938,7 +938,7 @@ public class Lower extends TreeTranslator {
         }
     }
 
-/**************************************************************************
+/* ************************************************************************
  * Access methods
  *************************************************************************/
 
@@ -1513,7 +1513,7 @@ public class Lower extends TreeTranslator {
         return md;
     }
 
-/**************************************************************************
+/* ************************************************************************
  * Free variables proxies and this$n
  *************************************************************************/
 
@@ -1950,7 +1950,7 @@ public class Lower extends TreeTranslator {
                     make.Ident(rhs)).setType(lhs.erasure(types)));
     }
 
-/**************************************************************************
+/* ************************************************************************
  * Code for .class
  *************************************************************************/
 
@@ -2009,7 +2009,7 @@ public class Lower extends TreeTranslator {
         }
     }
 
-/**************************************************************************
+/* ************************************************************************
  * Code for enabling/disabling assertions.
  *************************************************************************/
 
@@ -2078,7 +2078,7 @@ public class Lower extends TreeTranslator {
     }
 
 
-/**************************************************************************
+/* ************************************************************************
  * Building blocks for let expressions
  *************************************************************************/
 
@@ -2172,7 +2172,7 @@ public class Lower extends TreeTranslator {
         return res;
     }
 
-/**************************************************************************
+/* ************************************************************************
  * Translation methods
  *************************************************************************/
 
@@ -4440,7 +4440,7 @@ public class Lower extends TreeTranslator {
         super.visitTry(tree);
     }
 
-/**************************************************************************
+/* ************************************************************************
  * main method
  *************************************************************************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
index fd3b507b038..d1ea1651041 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
@@ -897,7 +897,7 @@ public class TransTypes extends TreeTranslator {
         result = tree;
     }
 
-/**************************************************************************
+/* ************************************************************************
  * utility methods
  *************************************************************************/
 
@@ -905,7 +905,7 @@ public class TransTypes extends TreeTranslator {
         return types.erasure(t);
     }
 
-/**************************************************************************
+/* ************************************************************************
  * main method
  *************************************************************************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
index 8455935c748..b3492d6a0e5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
@@ -143,7 +143,7 @@ public class ClassFile {
     }
 
 
-/************************************************************************
+/* **********************************************************************
  * String Translation Routines
  ***********************************************************************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 47c7d9c7d45..e0cebce611d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -308,7 +308,7 @@ public class ClassReader {
             c.members_field.enter(sym);
     }
 
-/************************************************************************
+/* **********************************************************************
  * Error Diagnoses
  ***********************************************************************/
 
@@ -338,7 +338,7 @@ public class ClassReader {
             dcfh);
     }
 
-/************************************************************************
+/* **********************************************************************
  * Buffer Access
  ***********************************************************************/
 
@@ -378,7 +378,7 @@ public class ClassReader {
         return res;
     }
 
-/************************************************************************
+/* **********************************************************************
  * Constant Pool Access
  ***********************************************************************/
 
@@ -437,7 +437,7 @@ public class ClassReader {
         return set;
     }
 
-/************************************************************************
+/* **********************************************************************
  * Reading Types
  ***********************************************************************/
 
@@ -791,7 +791,7 @@ public class ClassReader {
         }
     }
 
-/************************************************************************
+/* **********************************************************************
  * Reading Attributes
  ***********************************************************************/
 
@@ -1462,7 +1462,7 @@ public class ClassReader {
         return null;
     }
 
-/************************************************************************
+/* **********************************************************************
  * Reading Java-language annotations
  ***********************************************************************/
 
@@ -2579,7 +2579,7 @@ public class ClassReader {
         }
     }
 
-/************************************************************************
+/* **********************************************************************
  * Reading Symbols
  ***********************************************************************/
 
@@ -3122,7 +3122,7 @@ public class ClassReader {
      */
     public boolean filling = false;
 
-/************************************************************************
+/* **********************************************************************
  * Adjusting flags
  ***********************************************************************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index 625d3fb890b..dfa92efae74 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -196,7 +196,7 @@ public class ClassWriter extends ClassFile {
         extraAttributeHooks = extraAttributeHooks.prepend(addExtraAttributes);
     }
 
-/******************************************************************
+/* ****************************************************************
  * Diagnostics: dump generated class names and modifiers
  ******************************************************************/
 
@@ -237,7 +237,7 @@ public class ClassWriter extends ClassFile {
             "SUPER", "VOLATILE", "TRANSIENT", "NATIVE", "INTERFACE",
             "ABSTRACT", "STRICTFP"};
 
-/******************************************************************
+/* ****************************************************************
  * Output routines
  ******************************************************************/
 
@@ -259,7 +259,7 @@ public class ClassWriter extends ClassFile {
         buf.elems[adr+3] = (byte)((x      ) & 0xFF);
     }
 
-/******************************************************************
+/* ****************************************************************
  * Writing the Constant Pool
  ******************************************************************/
 
@@ -277,7 +277,7 @@ public class ClassWriter extends ClassFile {
         }
     }
 
-/******************************************************************
+/* ****************************************************************
  * Writing Attributes
  ******************************************************************/
 
@@ -480,7 +480,7 @@ public class ClassWriter extends ClassFile {
         return attrCount;
     }
 
-/**********************************************************************
+/* ********************************************************************
  * Writing Java-language annotations (aka metadata, attributes)
  **********************************************************************/
 
@@ -741,7 +741,7 @@ public class ClassWriter extends ClassFile {
         }
     }
 
-/**********************************************************************
+/* ********************************************************************
  * Writing module attributes
  **********************************************************************/
 
@@ -823,7 +823,7 @@ public class ClassWriter extends ClassFile {
         return 1;
     }
 
-/**********************************************************************
+/* ********************************************************************
  * Writing Objects
  **********************************************************************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
index b86bdc19be4..703e1cb0c9c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
@@ -1219,7 +1219,7 @@ public class Code {
         return !alive || state.stacksize == letExprStackPos;
     }
 
-/**************************************************************************
+/* ************************************************************************
  * Stack map generation
  *************************************************************************/
 
@@ -1394,7 +1394,7 @@ public class Code {
     }
 
 
-/**************************************************************************
+/* ************************************************************************
  * Operations having to do with jumps
  *************************************************************************/
 
@@ -2238,7 +2238,7 @@ public class Code {
         for (int i = nextreg; i < prevNextReg; i++) endScope(i);
     }
 
-/**************************************************************************
+/* ************************************************************************
  * static tables
  *************************************************************************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
index c63706639b3..9cc0f6e3b6d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
@@ -417,7 +417,7 @@ public class Pretty extends JCTree.Visitor {
         return v.result;
     }
 
-    /**************************************************************************
+    /* ************************************************************************
      * Visitor methods
      *************************************************************************/
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
index b4260b84e1d..1491c65180c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
@@ -819,7 +819,7 @@ public class Log extends AbstractLog {
         // backdoor hook for testing, should transition to use -XDrawDiagnostics
         private static boolean useRawMessages = false;
 
-/***************************************************************************
+/* *************************************************************************
  * raw error messages without internationalization; used for experimentation
  * and quick prototyping
  ***************************************************************************/

From f6feeb03bbe9024b609ae6a4795255128581d53c Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Fri, 19 Apr 2024 20:32:18 +0000
Subject: [PATCH 119/486] 8330703: Improve link syntax in javax.lang.model.util

Reviewed-by: jjg
---
 .../model/util/AbstractAnnotationValueVisitorPreview.java | 8 ++++----
 .../lang/model/util/AbstractElementVisitorPreview.java    | 8 ++++----
 .../javax/lang/model/util/AbstractTypeVisitorPreview.java | 8 ++++----
 .../javax/lang/model/util/ElementKindVisitorPreview.java  | 8 ++++----
 .../javax/lang/model/util/ElementScannerPreview.java      | 7 ++++---
 .../model/util/SimpleAnnotationValueVisitorPreview.java   | 8 ++++----
 .../lang/model/util/SimpleElementVisitorPreview.java      | 8 ++++----
 .../javax/lang/model/util/SimpleTypeVisitorPreview.java   | 8 ++++----
 .../javax/lang/model/util/TypeKindVisitorPreview.java     | 8 ++++----
 9 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
index 63381039b11..f56d671778f 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
@@ -40,10 +40,10 @@ import javax.annotation.processing.ProcessingEnvironment;
  * @param <R> the return type of this visitor's methods
  * @param <P> the type of the additional parameter to this visitor's methods.
  *
-* @see <a href="package-summary.html#expectedEvolution">
-* <strong>Expected visitor evolution</strong></a>
- * @see <a href="AbstractAnnotationValueVisitor6.html#note_for_subclasses">
- * <strong>Compatibility note for subclasses</strong></a>
+ * @see javax.lang.model.util##expectedEvolution
+ * <strong>Expected visitor evolution</strong>
+ * @see AbstractAnnotationValueVisitor6##note_for_subclasses
+ * <strong>Compatibility note for subclasses</strong>
  * @see AbstractAnnotationValueVisitor6
  * @see AbstractAnnotationValueVisitor7
  * @see AbstractAnnotationValueVisitor8
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
index f5a64c8c532..e574a5b148a 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
@@ -45,10 +45,10 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
- * @see <a href="package-summary.html#expectedEvolution">
- * <strong>Expected visitor evolution</strong></a>
- * @see <a href="AbstractElementVisitor6.html#note_for_subclasses">
- * <strong>Compatibility note for subclasses</strong></a>
+ * @see javax.lang.model.util##expectedEvolution
+ * <strong>Expected visitor evolution</strong>
+ * @see AbstractAnnotationValueVisitor6##note_for_subclasses
+ * <strong>Compatibility note for subclasses</strong>
  * @see AbstractElementVisitor6
  * @see AbstractElementVisitor7
  * @see AbstractElementVisitor8
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
index 9f4561fe9df..230e9d8ead5 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
@@ -43,10 +43,10 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
- * @see <a href="package-summary.html#expectedEvolution">
- * <strong>Expected visitor evolution</strong></a>
- * @see <a href="AbstractTypeVisitor6.html#note_for_subclasses">
- * <strong>Compatibility note for subclasses</strong></a>
+ * @see javax.lang.model.util##expectedEvolution
+ * <strong>Expected visitor evolution</strong>
+ * @see AbstractAnnotationValueVisitor6##note_for_subclasses
+ * <strong>Compatibility note for subclasses</strong>
  * @see AbstractTypeVisitor6
  * @see AbstractTypeVisitor7
  * @see AbstractTypeVisitor8
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
index 519a8a31bcb..8a59d91b886 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
@@ -57,10 +57,10 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
- * @see <a href="package-summary.html#expectedEvolution">
- * <strong>Expected visitor evolution</strong></a>
- * @see <a href="ElementKindVisitor6.html#note_for_subclasses">
- * <strong>Compatibility note for subclasses</strong></a>
+ * @see javax.lang.model.util##expectedEvolution
+ * <strong>Expected visitor evolution</strong>
+ * @see AbstractAnnotationValueVisitor6##note_for_subclasses
+ * <strong>Compatibility note for subclasses</strong>
  * @see ElementKindVisitor6
  * @see ElementKindVisitor7
  * @see ElementKindVisitor8
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
index 03aca5f5388..2935958e4b4 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
@@ -74,9 +74,10 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
- * @see <a href="package-summary.html#expectedEvolution">
- * <strong>Expected visitor evolution</strong></a>
- * @see <a href="ElementScanner6.html#note_for_subclasses"><strong>Compatibility note for subclasses</strong></a>
+ * @see javax.lang.model.util##expectedEvolution
+ * <strong>Expected visitor evolution</strong>
+ * @see AbstractAnnotationValueVisitor6##note_for_subclasses
+ * <strong>Compatibility note for subclasses</strong>
  * @see ElementScanner6
  * @see ElementScanner7
  * @see ElementScanner8
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
index ec8c0169ac9..8ff12cb61bb 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
@@ -48,10 +48,10 @@ import static javax.lang.model.SourceVersion.*;
  * @param <R> the return type of this visitor's methods
  * @param <P> the type of the additional parameter to this visitor's methods.
  *
- * @see <a href="package-summary.html#expectedEvolution">
- * <strong>Expected visitor evolution</strong></a>
- * @see <a href="SimpleAnnotationValueVisitor6.html#note_for_subclasses">
- * <strong>Compatibility note for subclasses</strong></a>
+ * @see javax.lang.model.util##expectedEvolution
+ * <strong>Expected visitor evolution</strong>
+ * @see AbstractAnnotationValueVisitor6##note_for_subclasses
+ * <strong>Compatibility note for subclasses</strong>
  * @see SimpleAnnotationValueVisitor6
  * @see SimpleAnnotationValueVisitor7
  * @see SimpleAnnotationValueVisitor8
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
index 01fbc76e931..b891f65d693 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
@@ -53,10 +53,10 @@ import static javax.lang.model.SourceVersion.*;
  * @param <P> the type of the additional parameter to this visitor's methods.  Use {@code Void}
  *              for visitors that do not need an additional parameter.
  *
- * @see <a href="package-summary.html#expectedEvolution">
- * <strong>Expected visitor evolution</strong></a>
- * @see <a href="SimpleElementVisitor6.html#note_for_subclasses">
- * <strong>Compatibility note for subclasses</strong></a>
+ * @see javax.lang.model.util##expectedEvolution
+ * <strong>Expected visitor evolution</strong>
+ * @see AbstractAnnotationValueVisitor6##note_for_subclasses
+ * <strong>Compatibility note for subclasses</strong>
  * @see SimpleElementVisitor6
  * @see SimpleElementVisitor7
  * @see SimpleElementVisitor8
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
index 3048e291542..0c7fd39dbf8 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
@@ -52,10 +52,10 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
- * @see <a href="package-summary.html#expectedEvolution">
- * <strong>Expected visitor evolution</strong></a>
- * @see <a href="SimpleTypeVisitor6.html#note_for_subclasses">
- * <strong>Compatibility note for subclasses</strong></a>
+ * @see javax.lang.model.util##expectedEvolution
+ * <strong>Expected visitor evolution</strong>
+ * @see AbstractAnnotationValueVisitor6##note_for_subclasses
+ * <strong>Compatibility note for subclasses</strong>
  * @see SimpleTypeVisitor6
  * @see SimpleTypeVisitor7
  * @see SimpleTypeVisitor8
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
index 88256379ea7..9868dbe4134 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
@@ -56,10 +56,10 @@ import static javax.lang.model.SourceVersion.*;
  *            methods.  Use {@code Void} for visitors that do not need an
  *            additional parameter.
  *
- * @see <a href="package-summary.html#expectedEvolution">
- * <strong>Expected visitor evolution</strong></a>
- * @see <a href="TypeKindVisitor6.html#note_for_subclasses">
- * <strong>Compatibility note for subclasses</strong></a>
+ * @see javax.lang.model.util##expectedEvolution
+ * <strong>Expected visitor evolution</strong>
+ * @see AbstractAnnotationValueVisitor6##note_for_subclasses
+ * <strong>Compatibility note for subclasses</strong>
  * @see TypeKindVisitor6
  * @see TypeKindVisitor7
  * @see TypeKindVisitor8

From 6d5699617ff0985104a8bb5f2c9eb8887cb0961e Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Sat, 20 Apr 2024 03:52:17 +0000
Subject: [PATCH 120/486] 8330540: Rename the enum type CompileCommand to
 CompileCommandEnum

Reviewed-by: kvn, dlong
---
 src/hotspot/share/c1/c1_LIRGenerator.cpp      |   5 +-
 src/hotspot/share/ci/ciMethod.cpp             |   5 +-
 src/hotspot/share/ci/ciMethod.hpp             |   8 +-
 src/hotspot/share/code/nmethod.cpp            |   7 +-
 .../share/compiler/compilationPolicy.cpp      |   4 +-
 src/hotspot/share/compiler/compileBroker.cpp  |   2 +-
 .../share/compiler/compilerDirectives.cpp     |  10 +-
 .../share/compiler/compilerDirectives.hpp     |   1 -
 src/hotspot/share/compiler/compilerOracle.cpp | 166 +++++++++---------
 src/hotspot/share/compiler/compilerOracle.hpp |  18 +-
 src/hotspot/share/compiler/methodMatcher.cpp  |   2 +-
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp |   1 +
 src/hotspot/share/oops/methodCounters.cpp     |   6 +-
 src/hotspot/share/oops/methodCounters.hpp     |   3 +-
 src/hotspot/share/oops/methodData.cpp         |   6 +-
 src/hotspot/share/opto/compile.cpp            |   5 +-
 src/hotspot/share/opto/compile.hpp            |   4 +-
 src/hotspot/share/prims/whitebox.cpp          |   5 +-
 src/hotspot/share/utilities/vmEnums.hpp       |   3 +-
 19 files changed, 134 insertions(+), 127 deletions(-)

diff --git a/src/hotspot/share/c1/c1_LIRGenerator.cpp b/src/hotspot/share/c1/c1_LIRGenerator.cpp
index 1cb350f1e39..cd084135658 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp
@@ -35,6 +35,7 @@
 #include "ci/ciObjArray.hpp"
 #include "ci/ciUtilities.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
+#include "compiler/compilerOracle.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/c1/barrierSetC1.hpp"
 #include "oops/klass.inline.hpp"
@@ -3216,7 +3217,7 @@ void LIRGenerator::do_ProfileInvoke(ProfileInvoke* x) {
     // Notify the runtime very infrequently only to take care of counter overflows
     int freq_log = Tier23InlineeNotifyFreqLog;
     double scale;
-    if (_method->has_option_value(CompileCommand::CompileThresholdScaling, scale)) {
+    if (_method->has_option_value(CompileCommandEnum::CompileThresholdScaling, scale)) {
       freq_log = CompilerConfig::scaled_freq_log(freq_log, scale);
     }
     increment_event_counter_impl(info, x->inlinee(), LIR_OprFact::intConst(InvocationCounter::count_increment), right_n_bits(freq_log), InvocationEntryBci, false, true);
@@ -3257,7 +3258,7 @@ void LIRGenerator::increment_event_counter(CodeEmitInfo* info, LIR_Opr step, int
   }
   // Increment the appropriate invocation/backedge counter and notify the runtime.
   double scale;
-  if (_method->has_option_value(CompileCommand::CompileThresholdScaling, scale)) {
+  if (_method->has_option_value(CompileCommandEnum::CompileThresholdScaling, scale)) {
     freq_log = CompilerConfig::scaled_freq_log(freq_log, scale);
   }
   increment_event_counter_impl(info, info->scope()->method(), step, right_n_bits(freq_log), bci, backedge, true);
diff --git a/src/hotspot/share/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp
index 0b41a257a4b..aac2a553cda 100644
--- a/src/hotspot/share/ci/ciMethod.cpp
+++ b/src/hotspot/share/ci/ciMethod.cpp
@@ -36,6 +36,7 @@
 #include "ci/ciUtilities.inline.hpp"
 #include "compiler/abstractCompiler.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
+#include "compiler/compilerOracle.hpp"
 #include "compiler/methodLiveness.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
@@ -1062,7 +1063,7 @@ MethodCounters* ciMethod::ensure_method_counters() {
 // ------------------------------------------------------------------
 // ciMethod::has_option
 //
-bool ciMethod::has_option(enum CompileCommand option) {
+bool ciMethod::has_option(CompileCommandEnum option) {
   check_is_loaded();
   VM_ENTRY_MARK;
   methodHandle mh(THREAD, get_Method());
@@ -1072,7 +1073,7 @@ bool ciMethod::has_option(enum CompileCommand option) {
 // ------------------------------------------------------------------
 // ciMethod::has_option_value
 //
-bool ciMethod::has_option_value(enum CompileCommand option, double& value) {
+bool ciMethod::has_option_value(CompileCommandEnum option, double& value) {
   check_is_loaded();
   VM_ENTRY_MARK;
   methodHandle mh(THREAD, get_Method());
diff --git a/src/hotspot/share/ci/ciMethod.hpp b/src/hotspot/share/ci/ciMethod.hpp
index 0c171d0cf0b..a7c18b09f13 100644
--- a/src/hotspot/share/ci/ciMethod.hpp
+++ b/src/hotspot/share/ci/ciMethod.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,10 @@
 #include "ci/ciSignature.hpp"
 #include "classfile/vmIntrinsics.hpp"
 #include "compiler/methodLiveness.hpp"
-#include "compiler/compilerOracle.hpp"
 #include "oops/method.hpp"
 #include "runtime/handles.hpp"
 #include "utilities/bitMap.hpp"
+#include "utilities/vmEnums.hpp"
 
 class ciMethodBlocks;
 class MethodLiveness;
@@ -303,8 +303,8 @@ class ciMethod : public ciMetadata {
   // Find the proper vtable index to invoke this method.
   int resolve_vtable_index(ciKlass* caller, ciKlass* receiver);
 
-  bool has_option(enum CompileCommand option);
-  bool has_option_value(enum CompileCommand option, double& value);
+  bool has_option(CompileCommandEnum option);
+  bool has_option_value(CompileCommandEnum option, double& value);
   bool can_be_compiled();
   bool can_be_parsed() const { return _can_be_parsed; }
   bool has_compiled_code();
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 4b72c32c9cb..ee57e11f932 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -36,6 +36,7 @@
 #include "compiler/compileLog.hpp"
 #include "compiler/compileTask.hpp"
 #include "compiler/compilerDirectives.hpp"
+#include "compiler/compilerOracle.hpp"
 #include "compiler/directivesParser.hpp"
 #include "compiler/disassembler.hpp"
 #include "compiler/oopMap.inline.hpp"
@@ -1605,15 +1606,15 @@ void nmethod::print_nmethod(bool printmethod) {
 #if defined(SUPPORT_DATA_STRUCTS)
   if (AbstractDisassembler::show_structs()) {
     methodHandle mh(Thread::current(), _method);
-    if (printmethod || PrintDebugInfo || CompilerOracle::has_option(mh, CompileCommand::PrintDebugInfo)) {
+    if (printmethod || PrintDebugInfo || CompilerOracle::has_option(mh, CompileCommandEnum::PrintDebugInfo)) {
       print_scopes();
       tty->print_cr("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ");
     }
-    if (printmethod || PrintRelocations || CompilerOracle::has_option(mh, CompileCommand::PrintRelocations)) {
+    if (printmethod || PrintRelocations || CompilerOracle::has_option(mh, CompileCommandEnum::PrintRelocations)) {
       print_relocations();
       tty->print_cr("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ");
     }
-    if (printmethod || PrintDependencies || CompilerOracle::has_option(mh, CompileCommand::PrintDependencies)) {
+    if (printmethod || PrintDependencies || CompilerOracle::has_option(mh, CompileCommandEnum::PrintDependencies)) {
       print_dependencies_on(tty);
       tty->print_cr("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ");
     }
diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp
index 4fcd9b5bde4..0e6d8f6a6c9 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -229,7 +229,7 @@ class LoopPredicate : AllStatic {
 public:
   static bool apply_scaled(const methodHandle& method, CompLevel cur_level, int i, int b, double scale) {
     double threshold_scaling;
-    if (CompilerOracle::has_option_value(method, CompileCommand::CompileThresholdScaling, threshold_scaling)) {
+    if (CompilerOracle::has_option_value(method, CompileCommandEnum::CompileThresholdScaling, threshold_scaling)) {
       scale *= threshold_scaling;
     }
     switch(cur_level) {
@@ -267,7 +267,7 @@ class CallPredicate : AllStatic {
 public:
   static bool apply_scaled(const methodHandle& method, CompLevel cur_level, int i, int b, double scale) {
     double threshold_scaling;
-    if (CompilerOracle::has_option_value(method, CompileCommand::CompileThresholdScaling, threshold_scaling)) {
+    if (CompilerOracle::has_option_value(method, CompileCommandEnum::CompileThresholdScaling, threshold_scaling)) {
       scale *= threshold_scaling;
     }
     switch(cur_level) {
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index 61d5f9bd576..82f0996bc60 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -1549,7 +1549,7 @@ bool CompileBroker::compilation_is_prohibited(const methodHandle& method, int os
 
   // The method may be explicitly excluded by the user.
   double scale;
-  if (excluded || (CompilerOracle::has_option_value(method, CompileCommand::CompileThresholdScaling, scale) && scale == 0)) {
+  if (excluded || (CompilerOracle::has_option_value(method, CompileCommandEnum::CompileThresholdScaling, scale) && scale == 0)) {
     bool quietly = CompilerOracle::be_quiet();
     if (PrintCompilation && !quietly) {
       // This does not happen quietly...
diff --git a/src/hotspot/share/compiler/compilerDirectives.cpp b/src/hotspot/share/compiler/compilerDirectives.cpp
index 74a1076cc49..f5ccd9e69e9 100644
--- a/src/hotspot/share/compiler/compilerDirectives.cpp
+++ b/src/hotspot/share/compiler/compilerDirectives.cpp
@@ -426,7 +426,7 @@ DirectiveSet* DirectiveSet::compilecommand_compatibility_init(const methodHandle
     }
 
     // inline and dontinline (including exclude) are implemented in the directiveset accessors
-#define init_default_cc(name, type, dvalue, cc_flag) { type v; if (!_modified[name##Index] && CompileCommand::cc_flag != CompileCommand::Unknown && CompilerOracle::has_option_value(method, CompileCommand::cc_flag, v) && v != this->name##Option) { set.cloned()->name##Option = v; } }
+#define init_default_cc(name, type, dvalue, cc_flag) { type v; if (!_modified[name##Index] && CompileCommandEnum::cc_flag != CompileCommandEnum::Unknown && CompilerOracle::has_option_value(method, CompileCommandEnum::cc_flag, v) && v != this->name##Option) { set.cloned()->name##Option = v; } }
     compilerdirectives_common_flags(init_default_cc)
     compilerdirectives_c2_flags(init_default_cc)
     compilerdirectives_c1_flags(init_default_cc)
@@ -438,7 +438,7 @@ DirectiveSet* DirectiveSet::compilecommand_compatibility_init(const methodHandle
     if (!_modified[TraceAutoVectorizationIndex]) {
       // Parse ccstr and create mask
       ccstrlist option;
-      if (CompilerOracle::has_option_value(method, CompileCommand::TraceAutoVectorization, option)) {
+      if (CompilerOracle::has_option_value(method, CompileCommandEnum::TraceAutoVectorization, option)) {
         TraceAutoVectorizationTagValidator validator(option, false);
         if (validator.is_valid()) {
           set.cloned()->set_trace_auto_vectorization_tags(validator.tags());
@@ -448,7 +448,7 @@ DirectiveSet* DirectiveSet::compilecommand_compatibility_init(const methodHandle
     if (!_modified[PrintIdealPhaseIndex]) {
       // Parse ccstr and create set
       ccstrlist option;
-      if (CompilerOracle::has_option_value(method, CompileCommand::PrintIdealPhase, option)) {
+      if (CompilerOracle::has_option_value(method, CompileCommandEnum::PrintIdealPhase, option)) {
         PhaseNameValidator validator(option);
         if (validator.is_valid()) {
           assert(!validator.phase_name_set().is_empty(), "Phase name set must be non-empty");
@@ -464,7 +464,7 @@ DirectiveSet* DirectiveSet::compilecommand_compatibility_init(const methodHandle
     bool need_reset = true; // if Control/DisableIntrinsic redefined, only need to reset control_words once
 
     if (!_modified[ControlIntrinsicIndex] &&
-        CompilerOracle::has_option_value(method, CompileCommand::ControlIntrinsic, option_value)) {
+        CompilerOracle::has_option_value(method, CompileCommandEnum::ControlIntrinsic, option_value)) {
       ControlIntrinsicIter iter(option_value);
 
       if (need_reset) {
@@ -484,7 +484,7 @@ DirectiveSet* DirectiveSet::compilecommand_compatibility_init(const methodHandle
 
 
     if (!_modified[DisableIntrinsicIndex] &&
-        CompilerOracle::has_option_value(method, CompileCommand::DisableIntrinsic, option_value)) {
+        CompilerOracle::has_option_value(method, CompileCommandEnum::DisableIntrinsic, option_value)) {
       ControlIntrinsicIter iter(option_value, true/*disable_all*/);
 
       if (need_reset) {
diff --git a/src/hotspot/share/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp
index 6cd831c8d72..0b1090406b9 100644
--- a/src/hotspot/share/compiler/compilerDirectives.hpp
+++ b/src/hotspot/share/compiler/compilerDirectives.hpp
@@ -30,7 +30,6 @@
 #include "ci/ciMethod.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "compiler/methodMatcher.hpp"
-#include "compiler/compilerOracle.hpp"
 #include "opto/phasetype.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/exceptions.hpp"
diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index a8eee10fac5..ea09e3ebb7f 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -58,7 +58,7 @@ static enum OptionType option_types[] = {
 #undef enum_of_options
 };
 
-static enum OptionType option2type(enum CompileCommand option) {
+static enum OptionType option2type(CompileCommandEnum option) {
   return option_types[static_cast<int>(option)];
 }
 
@@ -68,7 +68,7 @@ static const char* option_names[] = {
 #undef enum_of_options
 };
 
-static const char* option2name(enum CompileCommand option) {
+static const char* option2name(CompileCommandEnum option) {
   return option_names[static_cast<int>(option)];
 }
 
@@ -106,28 +106,28 @@ static bool any_set = false;
 static bool print_final_memstat_report = false;
 
 // A filter for quick lookup if an option is set
-static bool option_filter[static_cast<int>(CompileCommand::Unknown) + 1] = { 0 };
+static bool option_filter[static_cast<int>(CompileCommandEnum::Unknown) + 1] = { 0 };
 
-static void command_set_in_filter(enum CompileCommand option) {
-  assert(option != CompileCommand::Unknown, "sanity");
+static void command_set_in_filter(CompileCommandEnum option) {
+  assert(option != CompileCommandEnum::Unknown, "sanity");
   assert(option2type(option) != OptionType::Unknown, "sanity");
 
-  if ((option != CompileCommand::DontInline) &&
-      (option != CompileCommand::Inline) &&
-      (option != CompileCommand::Log)) {
+  if ((option != CompileCommandEnum::DontInline) &&
+      (option != CompileCommandEnum::Inline) &&
+      (option != CompileCommandEnum::Log)) {
     any_set = true;
   }
   option_filter[static_cast<int>(option)] = true;
 }
 
-static bool has_command(enum CompileCommand option) {
+static bool has_command(CompileCommandEnum option) {
   return option_filter[static_cast<int>(option)];
 }
 
 class TypedMethodOptionMatcher : public MethodMatcher {
  private:
   TypedMethodOptionMatcher* _next;
-  enum CompileCommand _option;
+  CompileCommandEnum _option;
  public:
 
   union {
@@ -140,15 +140,15 @@ class TypedMethodOptionMatcher : public MethodMatcher {
 
   TypedMethodOptionMatcher() : MethodMatcher(),
     _next(nullptr),
-    _option(CompileCommand::Unknown) {
+    _option(CompileCommandEnum::Unknown) {
       memset(&_u, 0, sizeof(_u));
   }
 
   ~TypedMethodOptionMatcher();
   static TypedMethodOptionMatcher* parse_method_pattern(char*& line, char* errorbuf, const int buf_size);
-  TypedMethodOptionMatcher* match(const methodHandle &method, enum CompileCommand option);
+  TypedMethodOptionMatcher* match(const methodHandle &method, CompileCommandEnum option);
 
-  void init(enum CompileCommand option, TypedMethodOptionMatcher* next) {
+  void init(CompileCommandEnum option, TypedMethodOptionMatcher* next) {
     _next = next;
     _option = option;
   }
@@ -161,7 +161,7 @@ class TypedMethodOptionMatcher : public MethodMatcher {
 
   void set_next(TypedMethodOptionMatcher* next) {_next = next; }
   TypedMethodOptionMatcher* next() { return _next; }
-  enum CompileCommand option() { return _option; }
+  CompileCommandEnum option() { return _option; }
   template<typename T> T value();
   template<typename T> void set_value(T value);
   void print();
@@ -286,7 +286,7 @@ TypedMethodOptionMatcher* TypedMethodOptionMatcher::parse_method_pattern(char*&
   return tom;
 }
 
-TypedMethodOptionMatcher* TypedMethodOptionMatcher::match(const methodHandle& method, enum CompileCommand option) {
+TypedMethodOptionMatcher* TypedMethodOptionMatcher::match(const methodHandle& method, CompileCommandEnum option) {
   TypedMethodOptionMatcher* current = this;
   while (current != nullptr) {
     if (current->_option == option) {
@@ -301,16 +301,16 @@ TypedMethodOptionMatcher* TypedMethodOptionMatcher::match(const methodHandle& me
 
 template<typename T>
 static void register_command(TypedMethodOptionMatcher* matcher,
-                             enum CompileCommand option,
+                             CompileCommandEnum option,
                              T value) {
   assert(matcher != option_list, "No circular lists please");
-  if (option == CompileCommand::Log && !LogCompilation) {
+  if (option == CompileCommandEnum::Log && !LogCompilation) {
     tty->print_cr("Warning:  +LogCompilation must be enabled in order for individual methods to be logged with ");
     tty->print_cr("          CompileCommand=log,<method pattern>");
   }
   assert(CompilerOracle::option_matches_type(option, value), "Value must match option type");
 
-  if (option == CompileCommand::Blackhole && !UnlockExperimentalVMOptions) {
+  if (option == CompileCommandEnum::Blackhole && !UnlockExperimentalVMOptions) {
     warning("Blackhole compile option is experimental and must be enabled via -XX:+UnlockExperimentalVMOptions");
     // Delete matcher as we don't keep it
     delete matcher;
@@ -333,7 +333,7 @@ static void register_command(TypedMethodOptionMatcher* matcher,
 }
 
 template<typename T>
-bool CompilerOracle::has_option_value(const methodHandle& method, enum CompileCommand option, T& value) {
+bool CompilerOracle::has_option_value(const methodHandle& method, CompileCommandEnum option, T& value) {
   assert(option_matches_type(option, value), "Value must match option type");
   if (!has_command(option)) {
     return false;
@@ -348,22 +348,22 @@ bool CompilerOracle::has_option_value(const methodHandle& method, enum CompileCo
   return false;
 }
 
-static bool resolve_inlining_predicate(enum CompileCommand option, const methodHandle& method) {
-  assert(option == CompileCommand::Inline || option == CompileCommand::DontInline, "Sanity");
+static bool resolve_inlining_predicate(CompileCommandEnum option, const methodHandle& method) {
+  assert(option == CompileCommandEnum::Inline || option == CompileCommandEnum::DontInline, "Sanity");
   bool v1 = false;
   bool v2 = false;
-  bool has_inline = CompilerOracle::has_option_value(method, CompileCommand::Inline, v1);
-  bool has_dnotinline = CompilerOracle::has_option_value(method, CompileCommand::DontInline, v2);
+  bool has_inline = CompilerOracle::has_option_value(method, CompileCommandEnum::Inline, v1);
+  bool has_dnotinline = CompilerOracle::has_option_value(method, CompileCommandEnum::DontInline, v2);
   if (has_inline && has_dnotinline) {
     if (v1 && v2) {
       // Conflict options detected
       // Find the last one for that method and return the predicate accordingly
       // option_list lists options in reverse order. So the first option we find is the last which was specified.
-      enum CompileCommand last_one = CompileCommand::Unknown;
+      CompileCommandEnum last_one = CompileCommandEnum::Unknown;
       TypedMethodOptionMatcher* current = option_list;
       while (current != nullptr) {
         last_one = current->option();
-        if (last_one == CompileCommand::Inline || last_one == CompileCommand::DontInline) {
+        if (last_one == CompileCommandEnum::Inline || last_one == CompileCommandEnum::DontInline) {
           if (current->matches(method)) {
             return last_one == option;
           }
@@ -374,10 +374,10 @@ static bool resolve_inlining_predicate(enum CompileCommand option, const methodH
       return false;
     } else {
       // No conflicts
-      return option == CompileCommand::Inline ? v1 : v2;
+      return option == CompileCommandEnum::Inline ? v1 : v2;
     }
   } else {
-    if (option == CompileCommand::Inline) {
+    if (option == CompileCommandEnum::Inline) {
       return has_inline ? v1 : false;
     } else {
       return has_dnotinline ? v2 : false;
@@ -385,9 +385,9 @@ static bool resolve_inlining_predicate(enum CompileCommand option, const methodH
   }
 }
 
-static bool check_predicate(enum CompileCommand option, const methodHandle& method) {
+static bool check_predicate(CompileCommandEnum option, const methodHandle& method) {
   // Special handling for Inline and DontInline since conflict options may be specified
-  if (option == CompileCommand::Inline || option == CompileCommand::DontInline) {
+  if (option == CompileCommandEnum::Inline || option == CompileCommandEnum::DontInline) {
     return resolve_inlining_predicate(option, method);
   }
 
@@ -403,14 +403,14 @@ bool CompilerOracle::has_any_command_set() {
 }
 
 // Explicit instantiation for all OptionTypes supported.
-template bool CompilerOracle::has_option_value<intx>(const methodHandle& method, enum CompileCommand option, intx& value);
-template bool CompilerOracle::has_option_value<uintx>(const methodHandle& method, enum CompileCommand option, uintx& value);
-template bool CompilerOracle::has_option_value<bool>(const methodHandle& method, enum CompileCommand option, bool& value);
-template bool CompilerOracle::has_option_value<ccstr>(const methodHandle& method, enum CompileCommand option, ccstr& value);
-template bool CompilerOracle::has_option_value<double>(const methodHandle& method, enum CompileCommand option, double& value);
+template bool CompilerOracle::has_option_value<intx>(const methodHandle& method, CompileCommandEnum option, intx& value);
+template bool CompilerOracle::has_option_value<uintx>(const methodHandle& method, CompileCommandEnum option, uintx& value);
+template bool CompilerOracle::has_option_value<bool>(const methodHandle& method, CompileCommandEnum option, bool& value);
+template bool CompilerOracle::has_option_value<ccstr>(const methodHandle& method, CompileCommandEnum option, ccstr& value);
+template bool CompilerOracle::has_option_value<double>(const methodHandle& method, CompileCommandEnum option, double& value);
 
 template<typename T>
-bool CompilerOracle::option_matches_type(enum CompileCommand option, T& value) {
+bool CompilerOracle::option_matches_type(CompileCommandEnum option, T& value) {
   enum OptionType option_type = option2type(option);
   if (option_type == OptionType::Unknown) {
     return false; // Can't query options with type Unknown.
@@ -421,47 +421,47 @@ bool CompilerOracle::option_matches_type(enum CompileCommand option, T& value) {
   return (get_type_for<T>() == option_type);
 }
 
-template bool CompilerOracle::option_matches_type<intx>(enum CompileCommand option, intx& value);
-template bool CompilerOracle::option_matches_type<uintx>(enum CompileCommand option, uintx& value);
-template bool CompilerOracle::option_matches_type<bool>(enum CompileCommand option, bool& value);
-template bool CompilerOracle::option_matches_type<ccstr>(enum CompileCommand option, ccstr& value);
-template bool CompilerOracle::option_matches_type<double>(enum CompileCommand option, double& value);
+template bool CompilerOracle::option_matches_type<intx>(CompileCommandEnum option, intx& value);
+template bool CompilerOracle::option_matches_type<uintx>(CompileCommandEnum option, uintx& value);
+template bool CompilerOracle::option_matches_type<bool>(CompileCommandEnum option, bool& value);
+template bool CompilerOracle::option_matches_type<ccstr>(CompileCommandEnum option, ccstr& value);
+template bool CompilerOracle::option_matches_type<double>(CompileCommandEnum option, double& value);
 
-bool CompilerOracle::has_option(const methodHandle& method, enum CompileCommand option) {
+bool CompilerOracle::has_option(const methodHandle& method, CompileCommandEnum option) {
   bool value = false;
   has_option_value(method, option, value);
   return value;
 }
 
 bool CompilerOracle::should_exclude(const methodHandle& method) {
-  if (check_predicate(CompileCommand::Exclude, method)) {
+  if (check_predicate(CompileCommandEnum::Exclude, method)) {
     return true;
   }
-  if (has_command(CompileCommand::CompileOnly)) {
-    return !check_predicate(CompileCommand::CompileOnly, method);
+  if (has_command(CompileCommandEnum::CompileOnly)) {
+    return !check_predicate(CompileCommandEnum::CompileOnly, method);
   }
   return false;
 }
 
 bool CompilerOracle::should_inline(const methodHandle& method) {
-  return (check_predicate(CompileCommand::Inline, method));
+  return (check_predicate(CompileCommandEnum::Inline, method));
 }
 
 bool CompilerOracle::should_not_inline(const methodHandle& method) {
-  return check_predicate(CompileCommand::DontInline, method) || check_predicate(CompileCommand::Exclude, method);
+  return check_predicate(CompileCommandEnum::DontInline, method) || check_predicate(CompileCommandEnum::Exclude, method);
 }
 
 bool CompilerOracle::should_print(const methodHandle& method) {
-  return check_predicate(CompileCommand::Print, method);
+  return check_predicate(CompileCommandEnum::Print, method);
 }
 
 bool CompilerOracle::should_print_methods() {
-  return has_command(CompileCommand::Print);
+  return has_command(CompileCommandEnum::Print);
 }
 
 // Tells whether there are any methods to collect memory statistics for
 bool CompilerOracle::should_collect_memstat() {
-  return has_command(CompileCommand::MemStat) || has_command(CompileCommand::MemLimit);
+  return has_command(CompileCommandEnum::MemStat) || has_command(CompileCommandEnum::MemLimit);
 }
 
 bool CompilerOracle::should_print_final_memstat_report() {
@@ -470,18 +470,18 @@ bool CompilerOracle::should_print_final_memstat_report() {
 
 bool CompilerOracle::should_log(const methodHandle& method) {
   if (!LogCompilation) return false;
-  if (!has_command(CompileCommand::Log)) {
+  if (!has_command(CompileCommandEnum::Log)) {
     return true;  // by default, log all
   }
-  return (check_predicate(CompileCommand::Log, method));
+  return (check_predicate(CompileCommandEnum::Log, method));
 }
 
 bool CompilerOracle::should_break_at(const methodHandle& method) {
-  return check_predicate(CompileCommand::Break, method);
+  return check_predicate(CompileCommandEnum::Break, method);
 }
 
 void CompilerOracle::tag_blackhole_if_possible(const methodHandle& method) {
-  if (!check_predicate(CompileCommand::Blackhole, method)) {
+  if (!check_predicate(CompileCommandEnum::Blackhole, method)) {
     return;
   }
   guarantee(UnlockExperimentalVMOptions, "Checked during initial parsing");
@@ -511,8 +511,8 @@ void CompilerOracle::tag_blackhole_if_possible(const methodHandle& method) {
   method->set_intrinsic_id(vmIntrinsics::_blackhole);
 }
 
-static enum CompileCommand match_option_name(const char* line, int* bytes_read, char* errorbuf, int bufsize) {
-  assert(ARRAY_SIZE(option_names) == static_cast<int>(CompileCommand::Count), "option_names size mismatch");
+static CompileCommandEnum match_option_name(const char* line, int* bytes_read, char* errorbuf, int bufsize) {
+  assert(ARRAY_SIZE(option_names) == static_cast<int>(CompileCommandEnum::Count), "option_names size mismatch");
 
   *bytes_read = 0;
   char option_buf[256];
@@ -520,22 +520,22 @@ static enum CompileCommand match_option_name(const char* line, int* bytes_read,
   if (matches > 0 && strcasecmp(option_buf, "unknown") != 0) {
     for (uint i = 0; i < ARRAY_SIZE(option_names); i++) {
       if (strcasecmp(option_buf, option_names[i]) == 0) {
-        return static_cast<enum CompileCommand>(i);
+        return static_cast<CompileCommandEnum>(i);
       }
     }
   }
   jio_snprintf(errorbuf, bufsize, "Unrecognized option '%s'", option_buf);
-  return CompileCommand::Unknown;
+  return CompileCommandEnum::Unknown;
 }
 
 // match exactly and don't mess with errorbuf
-enum CompileCommand CompilerOracle::parse_option_name(const char* line) {
+CompileCommandEnum CompilerOracle::parse_option_name(const char* line) {
   for (uint i = 0; i < ARRAY_SIZE(option_names); i++) {
     if (strcasecmp(line, option_names[i]) == 0) {
-      return static_cast<enum CompileCommand>(i);
+      return static_cast<CompileCommandEnum>(i);
     }
   }
-  return CompileCommand::Unknown;
+  return CompileCommandEnum::Unknown;
 }
 
 enum OptionType CompilerOracle::parse_option_type(const char* type_str) {
@@ -555,7 +555,7 @@ static void print_tip() { // CMH Update info
   tty->cr();
 }
 
-static void print_option(enum CompileCommand option, const char* name, enum OptionType type) {
+static void print_option(CompileCommandEnum option, const char* name, enum OptionType type) {
   if (type != OptionType::Unknown) {
     tty->print_cr("    %s (%s)", name, optiontype2name(type));
   }
@@ -564,7 +564,7 @@ static void print_option(enum CompileCommand option, const char* name, enum Opti
 static void print_commands() {
   tty->cr();
   tty->print_cr("All available options:");
-#define enum_of_options(option, name, ctype) print_option(CompileCommand::option, name, OptionType::ctype);
+#define enum_of_options(option, name, ctype) print_option(CompileCommandEnum::option, name, OptionType::ctype);
   COMPILECOMMAND_OPTIONS(enum_of_options)
 #undef enum_of_options
   tty->cr();
@@ -699,7 +699,7 @@ static bool parseMemStat(const char* line, uintx& value, int& bytes_read, char*
 }
 
 static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
-        TypedMethodOptionMatcher* matcher, enum CompileCommand option, char* errorbuf, const int buf_size) {
+        TypedMethodOptionMatcher* matcher, CompileCommandEnum option, char* errorbuf, const int buf_size) {
   int bytes_read = 0;
   const char* ccname = option2name(option);
   const char* type_str = optiontype2name(type);
@@ -708,7 +708,7 @@ static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
   if (type == OptionType::Intx) {
     intx value;
     bool success = false;
-    if (option == CompileCommand::MemLimit) {
+    if (option == CompileCommandEnum::MemLimit) {
       // Special parsing for MemLimit
       success = parseMemLimit(line, value, bytes_read, errorbuf, buf_size);
     } else {
@@ -726,7 +726,7 @@ static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
   } else if (type == OptionType::Uintx) {
     uintx value;
     bool success = false;
-    if (option == CompileCommand::MemStat) {
+    if (option == CompileCommandEnum::MemStat) {
       // Special parsing for MemStat
       success = parseMemStat(line, value, bytes_read, errorbuf, buf_size);
     } else {
@@ -769,27 +769,27 @@ static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
         end_value = next_value-1;
       }
 
-      if (option == CompileCommand::ControlIntrinsic || option == CompileCommand::DisableIntrinsic) {
-        ControlIntrinsicValidator validator(value, (option == CompileCommand::DisableIntrinsic));
+      if (option == CompileCommandEnum::ControlIntrinsic || option == CompileCommandEnum::DisableIntrinsic) {
+        ControlIntrinsicValidator validator(value, (option == CompileCommandEnum::DisableIntrinsic));
 
         if (!validator.is_valid()) {
           jio_snprintf(errorbuf, buf_size, "Unrecognized intrinsic detected in %s: %s", option2name(option), validator.what());
         }
       }
 #if !defined(PRODUCT) && defined(COMPILER2)
-      else if (option == CompileCommand::TraceAutoVectorization) {
+      else if (option == CompileCommandEnum::TraceAutoVectorization) {
         TraceAutoVectorizationTagValidator validator(value, true);
 
         if (!validator.is_valid()) {
           jio_snprintf(errorbuf, buf_size, "Unrecognized tag name in %s: %s", option2name(option), validator.what());
         }
-      } else if (option == CompileCommand::PrintIdealPhase) {
+      } else if (option == CompileCommandEnum::PrintIdealPhase) {
         PhaseNameValidator validator(value);
 
         if (!validator.is_valid()) {
           jio_snprintf(errorbuf, buf_size, "Unrecognized phase name in %s: %s", option2name(option), validator.what());
         }
-      } else if (option == CompileCommand::TestOptionList) {
+      } else if (option == CompileCommandEnum::TestOptionList) {
         // all values are ok
       }
 #endif
@@ -862,8 +862,8 @@ static void scan_option_and_value(enum OptionType type, char* line, int& total_b
     total_bytes_read += bytes_read;
     int bytes_read2 = 0;
     total_bytes_read += skip_whitespace(line);
-    enum CompileCommand option = match_option_name(option_buf, &bytes_read2, errorbuf, buf_size);
-    if (option == CompileCommand::Unknown) {
+    CompileCommandEnum option = match_option_name(option_buf, &bytes_read2, errorbuf, buf_size);
+    if (option == CompileCommandEnum::Unknown) {
       assert(*errorbuf != '\0', "error must have been set");
       return;
     }
@@ -914,26 +914,26 @@ bool CompilerOracle::parse_from_line(char* line) {
   int bytes_read;
   char error_buf[1024] = {0};
 
-  enum CompileCommand option = match_option_name(line, &bytes_read, error_buf, sizeof(error_buf));
+  CompileCommandEnum option = match_option_name(line, &bytes_read, error_buf, sizeof(error_buf));
   line += bytes_read;
   ResourceMark rm;
 
-  if (option == CompileCommand::Unknown) {
+  if (option == CompileCommandEnum::Unknown) {
     print_parse_error(error_buf, original.get());
     return false;
   }
 
-  if (option == CompileCommand::Quiet) {
+  if (option == CompileCommandEnum::Quiet) {
     _quiet = true;
     return true;
   }
 
-  if (option == CompileCommand::Help) {
+  if (option == CompileCommandEnum::Help) {
     usage();
     return true;
   }
 
-  if (option == CompileCommand::Option) {
+  if (option == CompileCommandEnum::Option) {
     // Look for trailing options.
     //
     // Two types of trailing options are
@@ -975,8 +975,8 @@ bool CompilerOracle::parse_from_line(char* line) {
       } else {
         // Type (1) option - option_type contains the option name -> bool value = true is implied
         int bytes_read;
-        enum CompileCommand option = match_option_name(option_type, &bytes_read, error_buf, sizeof(error_buf));
-        if (option == CompileCommand::Unknown) {
+        CompileCommandEnum option = match_option_name(option_type, &bytes_read, error_buf, sizeof(error_buf));
+        if (option == CompileCommandEnum::Unknown) {
           print_parse_error(error_buf, original.get());
           return false;
         }
@@ -1013,7 +1013,7 @@ bool CompilerOracle::parse_from_line(char* line) {
         // if this is a bool option this implies true
         register_command(matcher, option, true);
         return true;
-      } else if (option == CompileCommand::MemStat) {
+      } else if (option == CompileCommandEnum::MemStat) {
         // MemStat default action is to collect data but to not print
         register_command(matcher, option, (uintx)MemStatAction::collect);
         return true;
@@ -1125,7 +1125,7 @@ bool compilerOracle_init() {
               default_cc_file, default_cc_file);
     }
   }
-  if (has_command(CompileCommand::Print)) {
+  if (has_command(CompileCommandEnum::Print)) {
     if (PrintAssembly) {
       warning("CompileCommand and/or %s file contains 'print' commands, but PrintAssembly is also enabled", default_cc_file);
     }
@@ -1149,7 +1149,7 @@ bool CompilerOracle::parse_compile_only(char* line) {
     if (method_pattern != nullptr) {
       TypedMethodOptionMatcher* matcher = TypedMethodOptionMatcher::parse_method_pattern(method_pattern, error_buf, sizeof(error_buf));
       if (matcher != nullptr) {
-        register_command(matcher, CompileCommand::CompileOnly, true);
+        register_command(matcher, CompileCommandEnum::CompileOnly, true);
         continue;
       }
     }
@@ -1164,7 +1164,7 @@ bool CompilerOracle::parse_compile_only(char* line) {
   return true;
 }
 
-enum CompileCommand CompilerOracle::string_to_option(const char* name) {
+CompileCommandEnum CompilerOracle::string_to_option(const char* name) {
   int bytes_read = 0;
   char errorbuf[1024] = {0};
   return match_option_name(name, &bytes_read, errorbuf, sizeof(errorbuf));
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index 192e292d35a..43a30b30fac 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.hpp
@@ -101,7 +101,7 @@ NOT_PRODUCT(option(TestOptionDouble, "TestOptionDouble", Double)) \
   option(Option, "option", Unknown) \
   option(Unknown, "unknown", Unknown)
 
-enum class CompileCommand {
+enum class CompileCommandEnum : int {
   #define enum_of_options(option, name, ctype) option,
     COMPILECOMMAND_OPTIONS(enum_of_options)
   #undef enum_of_options
@@ -123,7 +123,7 @@ class CompilerOracle : AllStatic {
  private:
   static bool _quiet;
   static void print_parse_error(char* error_msg, char* original_line);
-  static void print_command(enum CompileCommand option, const char* name, enum OptionType type);
+  static void print_command(CompileCommandEnum option, const char* name, enum OptionType type);
 
  public:
   // True if the command file has been specified or is implicit
@@ -165,16 +165,16 @@ class CompilerOracle : AllStatic {
   static void tag_blackhole_if_possible(const methodHandle& method);
 
   // A wrapper for checking bool options
-  static bool has_option(const methodHandle& method, enum CompileCommand option);
+  static bool has_option(const methodHandle& method, CompileCommandEnum option);
 
   // Check if method has option and value set. If yes, overwrite value and return true,
   // otherwise leave value unchanged and return false.
   template<typename T>
-  static bool has_option_value(const methodHandle& method, enum CompileCommand option, T& value);
+  static bool has_option_value(const methodHandle& method, CompileCommandEnum option, T& value);
 
   // This check is currently only needed by whitebox API
   template<typename T>
-  static bool option_matches_type(enum CompileCommand option, T& value);
+  static bool option_matches_type(CompileCommandEnum option, T& value);
 
   // Reads from string instead of file
   static bool parse_from_string(const char* option_string, bool (*parser)(char*));
@@ -185,12 +185,12 @@ class CompilerOracle : AllStatic {
   static bool has_any_command_set();
 
   // convert a string to a proper compilecommand option - used from whitebox.
-  // returns CompileCommand::Unknown on names not matching an option.
-  static enum CompileCommand string_to_option(const char* name);
+  // returns CompileCommandEnum::Unknown on names not matching an option.
+  static CompileCommandEnum string_to_option(const char* name);
 
   // convert a string to a proper compilecommand option
-  // returns CompileCommand::Unknown if name is not an option.
-  static enum CompileCommand parse_option_name(const char* name);
+  // returns CompileCommandEnum::Unknown if name is not an option.
+  static CompileCommandEnum parse_option_name(const char* name);
 
   // convert a string to a proper option type
   // returns OptionType::Unknown on strings not matching an option type.
diff --git a/src/hotspot/share/compiler/methodMatcher.cpp b/src/hotspot/share/compiler/methodMatcher.cpp
index de2e4e82bba..1a0ade2fadb 100644
--- a/src/hotspot/share/compiler/methodMatcher.cpp
+++ b/src/hotspot/share/compiler/methodMatcher.cpp
@@ -286,7 +286,7 @@ void MethodMatcher::parse_method_pattern(char*& line, const char*& error_msg, Me
     // In very rare case, the method name happens to be same as option type/name, so look ahead to make sure
     // it doesn't show up again.
     if ((OptionType::Unknown != CompilerOracle::parse_option_type(method_name) ||
-        CompileCommand::Unknown != CompilerOracle::parse_option_name(method_name)) &&
+        CompileCommandEnum::Unknown != CompilerOracle::parse_option_name(method_name)) &&
         *(line + bytes_read) != '\0' &&
         strstr(line + bytes_read, method_name) == nullptr) {
       error_msg = "Did not specify any method name";
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 99d5f9ae588..0d9c92cad51 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -31,6 +31,7 @@
 #include "code/scopeDesc.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compilerEvent.hpp"
+#include "compiler/compilerOracle.hpp"
 #include "compiler/disassembler.hpp"
 #include "compiler/oopMap.hpp"
 #include "interpreter/bytecodeStream.hpp"
diff --git a/src/hotspot/share/oops/methodCounters.cpp b/src/hotspot/share/oops/methodCounters.cpp
index e9237b18e60..00096c5012c 100644
--- a/src/hotspot/share/oops/methodCounters.cpp
+++ b/src/hotspot/share/oops/methodCounters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,10 @@
  * questions.
  *
  */
+
 #include "precompiled.hpp"
 #include "compiler/compiler_globals.hpp"
+#include "compiler/compilerOracle.hpp"
 #include "oops/method.hpp"
 #include "oops/methodCounters.hpp"
 #include "runtime/handles.inline.hpp"
@@ -40,7 +42,7 @@ MethodCounters::MethodCounters(const methodHandle& mh) :
 
   // Set per-method thresholds.
   double scale = 1.0;
-  CompilerOracle::has_option_value(mh, CompileCommand::CompileThresholdScaling, scale);
+  CompilerOracle::has_option_value(mh, CompileCommandEnum::CompileThresholdScaling, scale);
 
   _invoke_mask = right_n_bits(CompilerConfig::scaled_freq_log(Tier0InvokeNotifyFreqLog, scale)) << InvocationCounter::count_shift;
   _backedge_mask = right_n_bits(CompilerConfig::scaled_freq_log(Tier0BackedgeNotifyFreqLog, scale)) << InvocationCounter::count_shift;
diff --git a/src/hotspot/share/oops/methodCounters.hpp b/src/hotspot/share/oops/methodCounters.hpp
index d1b2207961f..80cfb159b50 100644
--- a/src/hotspot/share/oops/methodCounters.hpp
+++ b/src/hotspot/share/oops/methodCounters.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 
 #include "oops/metadata.hpp"
 #include "compiler/compilerDefinitions.hpp"
-#include "compiler/compilerOracle.hpp"
 #include "interpreter/invocationCounter.hpp"
 #include "utilities/align.hpp"
 
diff --git a/src/hotspot/share/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp
index 008de899bdb..08dfc1fe95a 100644
--- a/src/hotspot/share/oops/methodData.cpp
+++ b/src/hotspot/share/oops/methodData.cpp
@@ -1319,7 +1319,7 @@ void MethodData::init() {
   // Set per-method invoke- and backedge mask.
   double scale = 1.0;
   methodHandle mh(Thread::current(), _method);
-  CompilerOracle::has_option_value(mh, CompileCommand::CompileThresholdScaling, scale);
+  CompilerOracle::has_option_value(mh, CompileCommandEnum::CompileThresholdScaling, scale);
   _invoke_mask = (int)right_n_bits(CompilerConfig::scaled_freq_log(Tier0InvokeNotifyFreqLog, scale)) << InvocationCounter::count_shift;
   _backedge_mask = (int)right_n_bits(CompilerConfig::scaled_freq_log(Tier0BackedgeNotifyFreqLog, scale)) << InvocationCounter::count_shift;
 
@@ -1336,8 +1336,8 @@ void MethodData::init() {
 #if INCLUDE_RTM_OPT
   _rtm_state = NoRTM; // No RTM lock eliding by default
   if (UseRTMLocking &&
-      !CompilerOracle::has_option(mh, CompileCommand::NoRTMLockEliding)) {
-    if (CompilerOracle::has_option(mh, CompileCommand::UseRTMLockEliding) || !UseRTMDeopt) {
+      !CompilerOracle::has_option(mh, CompileCommandEnum::NoRTMLockEliding)) {
+    if (CompilerOracle::has_option(mh, CompileCommandEnum::UseRTMLockEliding) || !UseRTMDeopt) {
       // Generate RTM lock eliding code without abort ratio calculation code.
       _rtm_state = UseRTM;
     } else if (UseRTMDeopt) {
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index d8881689678..e6a522e3610 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -33,6 +33,7 @@
 #include "compiler/compilationMemoryStatistic.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compileLog.hpp"
+#include "compiler/compilerOracle.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "compiler/disassembler.hpp"
 #include "compiler/oopMap.hpp"
@@ -1082,10 +1083,10 @@ void Compile::Init(bool aliasing) {
 #if INCLUDE_RTM_OPT
   if (UseRTMLocking && has_method() && (method()->method_data_or_null() != nullptr)) {
     int rtm_state = method()->method_data()->rtm_state();
-    if (method_has_option(CompileCommand::NoRTMLockEliding) || ((rtm_state & NoRTM) != 0)) {
+    if (method_has_option(CompileCommandEnum::NoRTMLockEliding) || ((rtm_state & NoRTM) != 0)) {
       // Don't generate RTM lock eliding code.
       set_rtm_state(NoRTM);
-    } else if (method_has_option(CompileCommand::UseRTMLockEliding) || ((rtm_state & UseRTM) != 0) || !UseRTMDeopt) {
+    } else if (method_has_option(CompileCommandEnum::UseRTMLockEliding) || ((rtm_state & UseRTM) != 0) || !UseRTMDeopt) {
       // Generate RTM lock eliding code without abort ratio calculation code.
       set_rtm_state(UseRTM);
     } else if (UseRTMDeopt) {
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 0b60a674b49..8f49c161672 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -29,7 +29,6 @@
 #include "ci/compilerInterface.hpp"
 #include "code/debugInfoRec.hpp"
 #include "compiler/compiler_globals.hpp"
-#include "compiler/compilerOracle.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compilerEvent.hpp"
 #include "compiler/cHeapStringHolder.hpp"
@@ -46,6 +45,7 @@
 #include "runtime/timerTrace.hpp"
 #include "runtime/vmThread.hpp"
 #include "utilities/ticks.hpp"
+#include "utilities/vmEnums.hpp"
 
 class AbstractLockNode;
 class AddPNode;
@@ -678,7 +678,7 @@ private:
   void          set_has_monitors(bool v)         { _has_monitors = v; }
 
   // check the CompilerOracle for special behaviours for this compile
-  bool          method_has_option(enum CompileCommand option) {
+  bool          method_has_option(CompileCommandEnum option) {
     return method() != nullptr && method()->has_option(option);
   }
 
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 9ad77658072..f8dc972d068 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -41,6 +41,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
 #include "compiler/compilationPolicy.hpp"
+#include "compiler/compilerOracle.hpp"
 #include "compiler/directivesParser.hpp"
 #include "compiler/methodMatcher.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
@@ -1988,9 +1989,9 @@ static bool GetMethodOption(JavaThread* thread, JNIEnv* env, jobject method, jst
   ThreadToNativeFromVM ttnfv(thread);
   const char* flag_name = env->GetStringUTFChars(name, nullptr);
   CHECK_JNI_EXCEPTION_(env, false);
-  enum CompileCommand option = CompilerOracle::string_to_option(flag_name);
+  CompileCommandEnum option = CompilerOracle::string_to_option(flag_name);
   env->ReleaseStringUTFChars(name, flag_name);
-  if (option == CompileCommand::Unknown) {
+  if (option == CompileCommandEnum::Unknown) {
     return false;
   }
   if (!CompilerOracle::option_matches_type(option, *value)) {
diff --git a/src/hotspot/share/utilities/vmEnums.hpp b/src/hotspot/share/utilities/vmEnums.hpp
index e3d298f24bc..79d540762dd 100644
--- a/src/hotspot/share/utilities/vmEnums.hpp
+++ b/src/hotspot/share/utilities/vmEnums.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 // you don't use their members directly. This way you don't need to include the
 // complex header files that have the full definitions of these enums.
 
+enum class CompileCommandEnum : int;
 enum class JavaThreadStatus : int;
 enum class JVMFlagOrigin : int;
 enum JVMFlagsEnum : int;

From 185e711bfe4c4d013b56e867f85cfb4177b3a2cf Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Sun, 21 Apr 2024 23:21:17 +0000
Subject: [PATCH 121/486] 8318650: Optimized subword gather for x86 targets.

Reviewed-by: sviswanathan, epeter, psandoz
---
 src/hotspot/cpu/aarch64/aarch64_vector.ad     |   8 +-
 src/hotspot/cpu/aarch64/matcher_aarch64.hpp   |   5 +
 src/hotspot/cpu/arm/matcher_arm.hpp           |   5 +
 src/hotspot/cpu/ppc/matcher_ppc.hpp           |   5 +
 src/hotspot/cpu/riscv/matcher_riscv.hpp       |   5 +
 src/hotspot/cpu/riscv/riscv_v.ad              |   5 +
 src/hotspot/cpu/s390/matcher_s390.hpp         |   5 +
 src/hotspot/cpu/x86/assembler_x86.cpp         |   6 +-
 src/hotspot/cpu/x86/assembler_x86.hpp         |   1 +
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 124 ++++++
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp |  12 +
 src/hotspot/cpu/x86/matcher_x86.hpp           |  13 +
 src/hotspot/cpu/x86/x86.ad                    | 260 ++++++++++++-
 src/hotspot/share/opto/loopTransform.cpp      |   2 +
 src/hotspot/share/opto/matcher.cpp            |  15 +
 src/hotspot/share/opto/vectorIntrinsics.cpp   |  38 +-
 src/hotspot/share/opto/vectornode.hpp         |  29 +-
 .../jdk/incubator/vector/Byte128Vector.java   |   6 +
 .../jdk/incubator/vector/Byte256Vector.java   |   6 +
 .../jdk/incubator/vector/Byte512Vector.java   |   6 +
 .../jdk/incubator/vector/Byte64Vector.java    |   6 +
 .../jdk/incubator/vector/ByteMaxVector.java   |   6 +
 .../jdk/incubator/vector/ByteVector.java      |  82 +++-
 .../jdk/incubator/vector/Short128Vector.java  |   6 +
 .../jdk/incubator/vector/Short256Vector.java  |   6 +
 .../jdk/incubator/vector/Short512Vector.java  |   6 +
 .../jdk/incubator/vector/Short64Vector.java   |   6 +
 .../jdk/incubator/vector/ShortMaxVector.java  |   6 +
 .../jdk/incubator/vector/ShortVector.java     |  82 +++-
 .../incubator/vector/X-Vector.java.template   |  85 ++++-
 .../vector/X-VectorBits.java.template         |   2 -
 .../vector/GatherOperationsBenchmark.java     | 357 ++++++++++++++++++
 32 files changed, 1157 insertions(+), 49 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/jdk/incubator/vector/GatherOperationsBenchmark.java

diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index 467d6ec2250..4e8eb47ee5f 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -169,9 +169,7 @@ source %{
       case Op_VectorMaskGen:
       case Op_LoadVectorMasked:
       case Op_StoreVectorMasked:
-      case Op_LoadVectorGather:
       case Op_StoreVectorScatter:
-      case Op_LoadVectorGatherMasked:
       case Op_StoreVectorScatterMasked:
       case Op_PopulateIndex:
       case Op_CompressM:
@@ -180,6 +178,12 @@ source %{
           return false;
         }
         break;
+      case Op_LoadVectorGather:
+      case Op_LoadVectorGatherMasked:
+        if (UseSVE == 0 || is_subword_type(bt)) {
+          return false;
+        }
+        break;
       case Op_MulAddVS2VI:
         if (length_in_bytes != 16) {
           return false;
diff --git a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
index 08bff22d7d0..4d28e5ade66 100644
--- a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
@@ -133,6 +133,11 @@
     return true;
   }
 
+  // Does target support predicated operation emulation.
+  static bool supports_vector_predicate_op_emulation(int vopc, int vlen, BasicType bt) {
+    return false;
+  }
+
   // Does the CPU supports vector variable rotate instructions?
   static constexpr bool supports_vector_variable_rotates(void) {
     return false;
diff --git a/src/hotspot/cpu/arm/matcher_arm.hpp b/src/hotspot/cpu/arm/matcher_arm.hpp
index eb26cbcbd7a..716a997a72b 100644
--- a/src/hotspot/cpu/arm/matcher_arm.hpp
+++ b/src/hotspot/cpu/arm/matcher_arm.hpp
@@ -126,6 +126,11 @@
     return VM_Version::has_simd();
   }
 
+  // Does target support predicated operation emulation.
+  static bool supports_vector_predicate_op_emulation(int vopc, int vlen, BasicType bt) {
+    return false;
+  }
+
   // Does the CPU supports vector variable rotate instructions?
   static constexpr bool supports_vector_variable_rotates(void) {
     return false; // not supported
diff --git a/src/hotspot/cpu/ppc/matcher_ppc.hpp b/src/hotspot/cpu/ppc/matcher_ppc.hpp
index b195ba4eeb2..0ee4245f274 100644
--- a/src/hotspot/cpu/ppc/matcher_ppc.hpp
+++ b/src/hotspot/cpu/ppc/matcher_ppc.hpp
@@ -133,6 +133,11 @@
     return false;
   }
 
+  // Does target support predicated operation emulation.
+  static bool supports_vector_predicate_op_emulation(int vopc, int vlen, BasicType bt) {
+    return false;
+  }
+
   // Does the CPU supports vector variable rotate instructions?
   static constexpr bool supports_vector_variable_rotates(void) {
     return false;
diff --git a/src/hotspot/cpu/riscv/matcher_riscv.hpp b/src/hotspot/cpu/riscv/matcher_riscv.hpp
index 08914d4d834..32665f5922c 100644
--- a/src/hotspot/cpu/riscv/matcher_riscv.hpp
+++ b/src/hotspot/cpu/riscv/matcher_riscv.hpp
@@ -132,6 +132,11 @@
     return false;
   }
 
+  // Does target support predicated operation emulation.
+  static bool supports_vector_predicate_op_emulation(int vopc, int vlen, BasicType bt) {
+    return false;
+  }
+
   // Does the CPU supports vector variable rotate instructions?
   static constexpr bool supports_vector_variable_rotates(void) {
     return false;
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 86309ec9128..01a367a46ea 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -73,6 +73,11 @@ source %{
           return false;
         }
         break;
+      case Op_LoadVectorGatherMasked:
+        if (is_subword_type(bt)) {
+          return false;
+        }
+        break;
       case Op_VectorCastHF2F:
       case Op_VectorCastF2HF:
         return UseZvfh;
diff --git a/src/hotspot/cpu/s390/matcher_s390.hpp b/src/hotspot/cpu/s390/matcher_s390.hpp
index 450ea35a6cb..6c6cae3c58f 100644
--- a/src/hotspot/cpu/s390/matcher_s390.hpp
+++ b/src/hotspot/cpu/s390/matcher_s390.hpp
@@ -124,6 +124,11 @@
     return false;
   }
 
+  // Does target support predicated operation emulation.
+  static bool supports_vector_predicate_op_emulation(int vopc, int vlen, BasicType bt) {
+    return false;
+  }
+
   // Does the CPU supports vector variable rotate instructions?
   static constexpr bool supports_vector_variable_rotates(void) {
     return false;
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index dd3f9c64e20..6ed04ad5211 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -13652,9 +13652,13 @@ void Assembler::notq(Register dst) {
   emit_int16((unsigned char)0xF7, (0xD0 | encode));
 }
 
+void Assembler::btq(Register dst, Register src) {
+  int encode = prefixq_and_encode(src->encoding(), dst->encoding());
+  emit_int24(0x0F, (unsigned char)0xA3, (encode | 0xC0));
+}
+
 void Assembler::btq(Register src, int imm8) {
   assert(isByte(imm8), "not a byte");
-  InstructionMark im(this);
   int encode = prefixq_and_encode(src->encoding());
   emit_int16(0x0f, 0xba);
   emit_int8(0xe0|encode);
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 656b2a97c70..64e8cf99bfc 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1736,6 +1736,7 @@ private:
   void btrq(Address dst, int imm8);
   void btq(Register src, int imm8);
 #endif
+  void btq(Register dst, Register src);
 
   void orw(Register dst, Register src);
 
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index c79753618c0..d0eb103d81b 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -1796,6 +1796,130 @@ void C2_MacroAssembler::vinsert(BasicType typ, XMMRegister dst, XMMRegister src,
   }
 }
 
+#ifdef _LP64
+void C2_MacroAssembler::vgather8b_masked_offset(BasicType elem_bt,
+                                                XMMRegister dst, Register base,
+                                                Register idx_base,
+                                                Register offset, Register mask,
+                                                Register mask_idx, Register rtmp,
+                                                int vlen_enc) {
+  vpxor(dst, dst, dst, vlen_enc);
+  if (elem_bt == T_SHORT) {
+    for (int i = 0; i < 4; i++) {
+      // dst[i] = mask[i] ? src[offset + idx_base[i]] : 0
+      Label skip_load;
+      btq(mask, mask_idx);
+      jccb(Assembler::carryClear, skip_load);
+      movl(rtmp, Address(idx_base, i * 4));
+      if (offset != noreg) {
+        addl(rtmp, offset);
+      }
+      pinsrw(dst, Address(base, rtmp, Address::times_2), i);
+      bind(skip_load);
+      incq(mask_idx);
+    }
+  } else {
+    assert(elem_bt == T_BYTE, "");
+    for (int i = 0; i < 8; i++) {
+      // dst[i] = mask[i] ? src[offset + idx_base[i]] : 0
+      Label skip_load;
+      btq(mask, mask_idx);
+      jccb(Assembler::carryClear, skip_load);
+      movl(rtmp, Address(idx_base, i * 4));
+      if (offset != noreg) {
+        addl(rtmp, offset);
+      }
+      pinsrb(dst, Address(base, rtmp), i);
+      bind(skip_load);
+      incq(mask_idx);
+    }
+  }
+}
+#endif // _LP64
+
+void C2_MacroAssembler::vgather8b_offset(BasicType elem_bt, XMMRegister dst,
+                                         Register base, Register idx_base,
+                                         Register offset, Register rtmp,
+                                         int vlen_enc) {
+  vpxor(dst, dst, dst, vlen_enc);
+  if (elem_bt == T_SHORT) {
+    for (int i = 0; i < 4; i++) {
+      // dst[i] = src[offset + idx_base[i]]
+      movl(rtmp, Address(idx_base, i * 4));
+      if (offset != noreg) {
+        addl(rtmp, offset);
+      }
+      pinsrw(dst, Address(base, rtmp, Address::times_2), i);
+    }
+  } else {
+    assert(elem_bt == T_BYTE, "");
+    for (int i = 0; i < 8; i++) {
+      // dst[i] = src[offset + idx_base[i]]
+      movl(rtmp, Address(idx_base, i * 4));
+      if (offset != noreg) {
+        addl(rtmp, offset);
+      }
+      pinsrb(dst, Address(base, rtmp), i);
+    }
+  }
+}
+
+/*
+ * Gather using hybrid algorithm, first partially unroll scalar loop
+ * to accumulate values from gather indices into a quad-word(64bit) slice.
+ * A slice may hold 8 bytes or 4 short values. This is followed by a vector
+ * permutation to place the slice into appropriate vector lane
+ * locations in destination vector. Following pseudo code describes the
+ * algorithm in detail:
+ *
+ * DST_VEC = ZERO_VEC
+ * PERM_INDEX = {0, 1, 2, 3, 4, 5, 6, 7, 8..}
+ * TWO_VEC    = {2, 2, 2, 2, 2, 2, 2, 2, 2..}
+ * FOREACH_ITER:
+ *     TMP_VEC_64 = PICK_SUB_WORDS_FROM_GATHER_INDICES
+ *     TEMP_PERM_VEC = PERMUTE TMP_VEC_64 PERM_INDEX
+ *     DST_VEC = DST_VEC OR TEMP_PERM_VEC
+ *     PERM_INDEX = PERM_INDEX - TWO_VEC
+ *
+ * With each iteration, doubleword permute indices (0,1) corresponding
+ * to gathered quadword gets right shifted by two lane positions.
+ *
+ */
+void C2_MacroAssembler::vgather_subword(BasicType elem_ty, XMMRegister dst,
+                                        Register base, Register idx_base,
+                                        Register offset, Register mask,
+                                        XMMRegister xtmp1, XMMRegister xtmp2,
+                                        XMMRegister temp_dst, Register rtmp,
+                                        Register mask_idx, Register length,
+                                        int vector_len, int vlen_enc) {
+  Label GATHER8_LOOP;
+  assert(is_subword_type(elem_ty), "");
+  movl(length, vector_len);
+  vpxor(xtmp1, xtmp1, xtmp1, vlen_enc); // xtmp1 = {0, ...}
+  vpxor(dst, dst, dst, vlen_enc); // dst = {0, ...}
+  vallones(xtmp2, vlen_enc);
+  vpsubd(xtmp2, xtmp1, xtmp2, vlen_enc);
+  vpslld(xtmp2, xtmp2, 1, vlen_enc); // xtmp2 = {2, 2, ...}
+  load_iota_indices(xtmp1, vector_len * type2aelembytes(elem_ty), T_INT); // xtmp1 = {0, 1, 2, ...}
+
+  bind(GATHER8_LOOP);
+    // TMP_VEC_64(temp_dst) = PICK_SUB_WORDS_FROM_GATHER_INDICES
+    if (mask == noreg) {
+      vgather8b_offset(elem_ty, temp_dst, base, idx_base, offset, rtmp, vlen_enc);
+    } else {
+      LP64_ONLY(vgather8b_masked_offset(elem_ty, temp_dst, base, idx_base, offset, mask, mask_idx, rtmp, vlen_enc));
+    }
+    // TEMP_PERM_VEC(temp_dst) = PERMUTE TMP_VEC_64(temp_dst) PERM_INDEX(xtmp1)
+    vpermd(temp_dst, xtmp1, temp_dst, vlen_enc == Assembler::AVX_512bit ? vlen_enc : Assembler::AVX_256bit);
+    // PERM_INDEX(xtmp1) = PERM_INDEX(xtmp1) - TWO_VEC(xtmp2)
+    vpsubd(xtmp1, xtmp1, xtmp2, vlen_enc);
+    // DST_VEC = DST_VEC OR TEMP_PERM_VEC
+    vpor(dst, dst, temp_dst, vlen_enc);
+    addptr(idx_base,  32 >> (type2aelembytes(elem_ty) - 1));
+    subl(length, 8 >> (type2aelembytes(elem_ty) - 1));
+    jcc(Assembler::notEqual, GATHER8_LOOP);
+}
+
 void C2_MacroAssembler::vgather(BasicType typ, XMMRegister dst, Register base, XMMRegister idx, XMMRegister mask, int vector_len) {
   switch(typ) {
     case T_INT:
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index 26f7fb44aa9..8c22990892b 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -500,4 +500,16 @@ public:
   void vector_rearrange_int_float(BasicType bt, XMMRegister dst, XMMRegister shuffle,
                                   XMMRegister src, int vlen_enc);
 
+
+  void vgather_subword(BasicType elem_ty, XMMRegister dst,  Register base, Register idx_base, Register offset,
+                       Register mask, XMMRegister xtmp1, XMMRegister xtmp2, XMMRegister xtmp3, Register rtmp,
+                       Register midx, Register length, int vector_len, int vlen_enc);
+
+#ifdef _LP64
+  void vgather8b_masked_offset(BasicType elem_bt, XMMRegister dst, Register base, Register idx_base,
+                               Register offset, Register mask, Register midx, Register rtmp, int vlen_enc);
+#endif
+  void vgather8b_offset(BasicType elem_bt, XMMRegister dst, Register base, Register idx_base,
+                              Register offset, Register rtmp, int vlen_enc);
+
 #endif // CPU_X86_C2_MACROASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/matcher_x86.hpp b/src/hotspot/cpu/x86/matcher_x86.hpp
index de844c4be9f..192e959451f 100644
--- a/src/hotspot/cpu/x86/matcher_x86.hpp
+++ b/src/hotspot/cpu/x86/matcher_x86.hpp
@@ -154,6 +154,16 @@
     return (UseAVX >= 2);
   }
 
+  // Does target support predicated operation emulation.
+  static bool supports_vector_predicate_op_emulation(int vopc, int vlen, BasicType bt) {
+    switch(vopc) {
+      case Op_LoadVectorGatherMasked:
+        return is_subword_type(bt) && VM_Version::supports_avx2();
+      default:
+        return false;
+    }
+  }
+
   // Does the CPU supports vector variable rotate instructions?
   static constexpr bool supports_vector_variable_rotates(void) {
     return true;
@@ -214,6 +224,9 @@
         return 7;
       case Op_MulVL:
         return VM_Version::supports_avx512vldq() ? 0 : 6;
+      case Op_LoadVectorGather:
+      case Op_LoadVectorGatherMasked:
+        return is_subword_type(ety) ? 50 : 0;
       case Op_VectorCastF2X: // fall through
       case Op_VectorCastD2X:
         return is_floating_point_type(ety) ? 0 : (is_subword_type(ety) ? 35 : 30);
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 0b262bb9c37..7bbae30c832 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -1569,6 +1569,7 @@ bool Matcher::match_rule_supported(int opcode) {
       }
       break;
     case Op_LoadVectorGather:
+    case Op_LoadVectorGatherMasked:
       if (UseAVX < 2) {
         return false;
       }
@@ -1906,6 +1907,17 @@ bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
       }
       break;
     case Op_LoadVectorGatherMasked:
+      if (!is_subword_type(bt) && size_in_bits < 512 && !VM_Version::supports_avx512vl()) {
+        return false;
+      }
+      if (is_subword_type(bt) &&
+         (!is_LP64                                                ||
+         (size_in_bits > 256 && !VM_Version::supports_avx512bw()) ||
+         (size_in_bits < 64)                                      ||
+         (bt == T_SHORT && !VM_Version::supports_bmi2()))) {
+        return false;
+      }
+      break;
     case Op_StoreVectorScatterMasked:
     case Op_StoreVectorScatter:
       if (is_subword_type(bt)) {
@@ -1915,7 +1927,10 @@ bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
       }
       // fallthrough
     case Op_LoadVectorGather:
-      if (size_in_bits == 64 ) {
+      if (!is_subword_type(bt) && size_in_bits == 64) {
+        return false;
+      }
+      if (is_subword_type(bt) && size_in_bits < 64) {
         return false;
       }
       break;
@@ -4024,10 +4039,11 @@ instruct storeV(memory mem, vec src) %{
 
 // ---------------------------------------- Gather ------------------------------------
 
-// Gather INT, LONG, FLOAT, DOUBLE
+// Gather BYTE, SHORT, INT, LONG, FLOAT, DOUBLE
 
 instruct gather(legVec dst, memory mem, legVec idx, rRegP tmp, legVec mask) %{
-  predicate(!VM_Version::supports_avx512vl() && Matcher::vector_length_in_bytes(n) <= 32);
+  predicate(!VM_Version::supports_avx512vl() && !is_subword_type(Matcher::vector_element_basic_type(n)) &&
+            Matcher::vector_length_in_bytes(n) <= 32);
   match(Set dst (LoadVectorGather mem idx));
   effect(TEMP dst, TEMP tmp, TEMP mask);
   format %{ "load_vector_gather $dst, $mem, $idx\t! using $tmp and $mask as TEMP" %}
@@ -4044,7 +4060,8 @@ instruct gather(legVec dst, memory mem, legVec idx, rRegP tmp, legVec mask) %{
 
 
 instruct evgather(vec dst, memory mem, vec idx, rRegP tmp, kReg ktmp) %{
-  predicate(VM_Version::supports_avx512vl() || Matcher::vector_length_in_bytes(n) == 64);
+  predicate((VM_Version::supports_avx512vl() || Matcher::vector_length_in_bytes(n) == 64) &&
+            !is_subword_type(Matcher::vector_element_basic_type(n)));
   match(Set dst (LoadVectorGather mem idx));
   effect(TEMP dst, TEMP tmp, TEMP ktmp);
   format %{ "load_vector_gather $dst, $mem, $idx\t! using $tmp and ktmp as TEMP" %}
@@ -4059,7 +4076,8 @@ instruct evgather(vec dst, memory mem, vec idx, rRegP tmp, kReg ktmp) %{
 %}
 
 instruct evgather_masked(vec dst, memory mem, vec idx, kReg mask, kReg ktmp, rRegP tmp) %{
-  predicate(VM_Version::supports_avx512vl() || Matcher::vector_length_in_bytes(n) == 64);
+  predicate((VM_Version::supports_avx512vl() || Matcher::vector_length_in_bytes(n) == 64) &&
+            !is_subword_type(Matcher::vector_element_basic_type(n)));
   match(Set dst (LoadVectorGatherMasked mem (Binary idx mask)));
   effect(TEMP_DEF dst, TEMP tmp, TEMP ktmp);
   format %{ "load_vector_gather_masked $dst, $mem, $idx, $mask\t! using $tmp and ktmp as TEMP" %}
@@ -4077,6 +4095,238 @@ instruct evgather_masked(vec dst, memory mem, vec idx, kReg mask, kReg ktmp, rRe
   %}
   ins_pipe( pipe_slow );
 %}
+
+instruct vgather_subwordLE8B(vec dst, memory mem, rRegP idx_base, immI_0 offset, rRegP tmp, rRegI rtmp) %{
+  predicate(is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) <= 8);
+  match(Set dst (LoadVectorGather mem (Binary idx_base offset)));
+  effect(TEMP tmp, TEMP rtmp);
+  format %{ "vector_gatherLE8 $dst, $mem, $idx_base\t! using $tmp and $rtmp as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ vgather8b_offset(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base$$Register, noreg, $rtmp$$Register, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vgather_subwordGT8B(vec dst, memory mem, rRegP idx_base, immI_0 offset, rRegP tmp, rRegP idx_base_temp,
+                             vec xtmp1, vec xtmp2, vec xtmp3, rRegI rtmp, rRegI length, rFlagsReg cr) %{
+  predicate(is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) > 8);
+  match(Set dst (LoadVectorGather mem (Binary idx_base offset)));
+  effect(TEMP_DEF dst, TEMP tmp, TEMP idx_base_temp, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP rtmp, TEMP length, KILL cr);
+  format %{ "vector_gatherGT8 $dst, $mem, $idx_base\t! using $tmp, $idx_base_temp, $xtmp1, $xtmp2, $xtmp3, $rtmp and $length as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    int vector_len = Matcher::vector_length(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ movptr($idx_base_temp$$Register, $idx_base$$Register);
+    __ vgather_subword(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base_temp$$Register, noreg, noreg, $xtmp1$$XMMRegister,
+                       $xtmp2$$XMMRegister, $xtmp3$$XMMRegister, $rtmp$$Register, noreg, $length$$Register, vector_len, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vgather_subwordLE8B_off(vec dst, memory mem, rRegP idx_base, rRegI offset, rRegP tmp, rRegI rtmp, rFlagsReg cr) %{
+  predicate(is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) <= 8);
+  match(Set dst (LoadVectorGather mem (Binary idx_base offset)));
+  effect(TEMP tmp, TEMP rtmp, KILL cr);
+  format %{ "vector_gatherLE8_off $dst, $mem, $idx_base, $offset\t! using $tmp and $rtmp as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ vgather8b_offset(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base$$Register, $offset$$Register, $rtmp$$Register, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+
+instruct vgather_subwordGT8B_off(vec dst, memory mem, rRegP idx_base, rRegI offset, rRegP tmp, rRegP idx_base_temp,
+                                 vec xtmp1, vec xtmp2, vec xtmp3, rRegI rtmp, rRegI length, rFlagsReg cr) %{
+  predicate(is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) > 8);
+  match(Set dst (LoadVectorGather mem (Binary idx_base offset)));
+  effect(TEMP_DEF dst, TEMP tmp, TEMP idx_base_temp, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP rtmp, TEMP length, KILL cr);
+  format %{ "vector_gatherGT8_off $dst, $mem, $idx_base, $offset\t! using $tmp, $idx_base_temp, $xtmp1, $xtmp2, $xtmp3, $rtmp and $length as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    int vector_len = Matcher::vector_length(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ movptr($idx_base_temp$$Register, $idx_base$$Register);
+    __ vgather_subword(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base_temp$$Register, $offset$$Register, noreg, $xtmp1$$XMMRegister,
+                       $xtmp2$$XMMRegister, $xtmp3$$XMMRegister, $rtmp$$Register, noreg, $length$$Register, vector_len, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+
+#ifdef _LP64
+instruct vgather_masked_subwordLE8B_avx3(vec dst, memory mem, rRegP idx_base, immI_0 offset, kReg mask, rRegL mask_idx, rRegP tmp, rRegI rtmp, rRegL rtmp2, rFlagsReg cr) %{
+  predicate(VM_Version::supports_avx512bw() && is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) <= 8);
+  match(Set dst (LoadVectorGatherMasked mem (Binary idx_base (Binary mask offset))));
+  effect(TEMP mask_idx, TEMP tmp, TEMP rtmp, TEMP rtmp2, KILL cr);
+  format %{ "vector_masked_gatherLE8 $dst, $mem, $idx_base, $mask\t! using $mask_idx, $tmp, $rtmp and $rtmp2 as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ xorq($mask_idx$$Register, $mask_idx$$Register);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ kmovql($rtmp2$$Register, $mask$$KRegister);
+    __ vgather8b_masked_offset(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base$$Register, noreg, $rtmp2$$Register, $mask_idx$$Register, $rtmp$$Register, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vgather_masked_subwordGT8B_avx3(vec dst, memory mem, rRegP idx_base, immI_0 offset, kReg mask, rRegP tmp, rRegP idx_base_temp,
+                                         vec xtmp1, vec xtmp2, vec xtmp3, rRegI rtmp, rRegL rtmp2, rRegL mask_idx, rRegI length, rFlagsReg cr) %{
+  predicate(VM_Version::supports_avx512bw() && is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) > 8);
+  match(Set dst (LoadVectorGatherMasked mem (Binary idx_base (Binary mask offset))));
+  effect(TEMP_DEF dst, TEMP tmp, TEMP idx_base_temp, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP rtmp, TEMP rtmp2, TEMP mask_idx, TEMP length, KILL cr);
+  format %{ "vector_gatherGT8_masked $dst, $mem, $idx_base, $mask\t! using $tmp, $idx_base_temp, $xtmp1, $xtmp2, $xtmp3, $rtmp, $rtmp2, $mask_idx and $length as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    int vector_len = Matcher::vector_length(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ xorq($mask_idx$$Register, $mask_idx$$Register);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ movptr($idx_base_temp$$Register, $idx_base$$Register);
+    __ kmovql($rtmp2$$Register, $mask$$KRegister);
+    __ vgather_subword(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base_temp$$Register, noreg, $rtmp2$$Register, $xtmp1$$XMMRegister,
+                       $xtmp2$$XMMRegister, $xtmp3$$XMMRegister, $rtmp$$Register, $mask_idx$$Register, $length$$Register, vector_len, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vgather_masked_subwordLE8B_off_avx3(vec dst, memory mem, rRegP idx_base, rRegI offset, kReg mask, rRegL mask_idx, rRegP tmp, rRegI rtmp, rRegL rtmp2, rFlagsReg cr) %{
+  predicate(VM_Version::supports_avx512bw() && is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) <= 8);
+  match(Set dst (LoadVectorGatherMasked mem (Binary idx_base (Binary mask offset))));
+  effect(TEMP mask_idx, TEMP tmp, TEMP rtmp, TEMP rtmp2, KILL cr);
+  format %{ "vector_masked_gatherLE8_off $dst, $mem, $idx_base, $offset, $mask\t! using $mask_idx, $tmp, $rtmp and $rtmp2 as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ xorq($mask_idx$$Register, $mask_idx$$Register);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ kmovql($rtmp2$$Register, $mask$$KRegister);
+    __ vgather8b_masked_offset(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base$$Register, $offset$$Register,
+                                $rtmp2$$Register, $mask_idx$$Register, $rtmp$$Register, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vgather_masked_subwordGT8B_off_avx3(vec dst, memory mem, rRegP idx_base, rRegI offset, kReg mask, rRegP tmp, rRegP idx_base_temp,
+                                             vec xtmp1, vec xtmp2, vec xtmp3, rRegI rtmp, rRegL rtmp2, rRegL mask_idx, rRegI length, rFlagsReg cr) %{
+  predicate(VM_Version::supports_avx512bw() && is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) > 8);
+  match(Set dst (LoadVectorGatherMasked mem (Binary idx_base (Binary mask offset))));
+  effect(TEMP_DEF dst, TEMP tmp, TEMP idx_base_temp, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP rtmp, TEMP rtmp2, TEMP mask_idx, TEMP length, KILL cr);
+  format %{ "vector_gatherGT8_masked_off $dst, $mem, $idx_base, $offset, $mask\t! using $tmp, $idx_base_temp, $xtmp1, $xtmp2, $xtmp3, $rtmp, $rtmp2, $mask_idx and $length as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    int vector_len = Matcher::vector_length(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ xorq($mask_idx$$Register, $mask_idx$$Register);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ movptr($idx_base_temp$$Register, $idx_base$$Register);
+    __ kmovql($rtmp2$$Register, $mask$$KRegister);
+    __ vgather_subword(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base_temp$$Register, $offset$$Register, $rtmp2$$Register, $xtmp1$$XMMRegister,
+                       $xtmp2$$XMMRegister, $xtmp3$$XMMRegister, $rtmp$$Register, $mask_idx$$Register, $length$$Register, vector_len, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vgather_masked_subwordLE8B_avx2(vec dst, memory mem, rRegP idx_base, immI_0 offset, vec mask, rRegI mask_idx, rRegP tmp, rRegI rtmp, rRegI rtmp2, rFlagsReg cr) %{
+  predicate(!VM_Version::supports_avx512vlbw() && is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) <= 8);
+  match(Set dst (LoadVectorGatherMasked mem (Binary idx_base (Binary mask offset))));
+  effect(TEMP mask_idx, TEMP tmp, TEMP rtmp, TEMP rtmp2, KILL cr);
+  format %{ "vector_masked_gatherLE8 $dst, $mem, $idx_base, $mask\t! using $mask_idx, $tmp, $rtmp and $rtmp2 as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ vpmovmskb($rtmp2$$Register, $mask$$XMMRegister, vlen_enc);
+    if (elem_bt == T_SHORT) {
+      __ movl($mask_idx$$Register, 0x55555555);
+      __ pextl($rtmp2$$Register, $rtmp2$$Register, $mask_idx$$Register);
+    }
+    __ xorl($mask_idx$$Register, $mask_idx$$Register);
+    __ vgather8b_masked_offset(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base$$Register, noreg, $rtmp2$$Register, $mask_idx$$Register, $rtmp$$Register, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vgather_masked_subwordGT8B_avx2(vec dst, memory mem, rRegP idx_base, immI_0 offset, vec mask, rRegP tmp, rRegP idx_base_temp,
+                                         vec xtmp1, vec xtmp2, vec xtmp3, rRegI rtmp, rRegI rtmp2, rRegI mask_idx, rRegI length, rFlagsReg cr) %{
+  predicate(!VM_Version::supports_avx512vlbw() && is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) > 8);
+  match(Set dst (LoadVectorGatherMasked mem (Binary idx_base (Binary mask offset))));
+  effect(TEMP_DEF dst, TEMP tmp, TEMP idx_base_temp, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP rtmp, TEMP rtmp2, TEMP mask_idx, TEMP length, KILL cr);
+  format %{ "vector_gatherGT8_masked $dst, $mem, $idx_base, $mask\t! using $tmp, $idx_base_temp, $xtmp1, $xtmp2, $xtmp3, $rtmp, $rtmp2, $mask_idx and $length as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    int vector_len = Matcher::vector_length(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ movptr($idx_base_temp$$Register, $idx_base$$Register);
+    __ vpmovmskb($rtmp2$$Register, $mask$$XMMRegister, vlen_enc);
+    if (elem_bt == T_SHORT) {
+      __ movl($mask_idx$$Register, 0x55555555);
+      __ pextl($rtmp2$$Register, $rtmp2$$Register, $mask_idx$$Register);
+    }
+    __ xorl($mask_idx$$Register, $mask_idx$$Register);
+    __ vgather_subword(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base_temp$$Register, noreg, $rtmp2$$Register, $xtmp1$$XMMRegister,
+                       $xtmp2$$XMMRegister, $xtmp3$$XMMRegister, $rtmp$$Register, $mask_idx$$Register, $length$$Register, vector_len, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vgather_masked_subwordLE8B_off_avx2(vec dst, memory mem, rRegP idx_base, rRegI offset, vec mask, rRegI mask_idx, rRegP tmp, rRegI rtmp, rRegI rtmp2, rFlagsReg cr) %{
+  predicate(!VM_Version::supports_avx512vlbw() && is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) <= 8);
+  match(Set dst (LoadVectorGatherMasked mem (Binary idx_base (Binary mask offset))));
+  effect(TEMP mask_idx, TEMP tmp, TEMP rtmp, TEMP rtmp2, KILL cr);
+  format %{ "vector_masked_gatherLE8_off $dst, $mem, $idx_base, $offset, $mask\t! using $mask_idx, $tmp, $rtmp and $rtmp2 as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ vpmovmskb($rtmp2$$Register, $mask$$XMMRegister, vlen_enc);
+    if (elem_bt == T_SHORT) {
+      __ movl($mask_idx$$Register, 0x55555555);
+      __ pextl($rtmp2$$Register, $rtmp2$$Register, $mask_idx$$Register);
+    }
+    __ xorl($mask_idx$$Register, $mask_idx$$Register);
+    __ vgather8b_masked_offset(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base$$Register, $offset$$Register,
+                                $rtmp2$$Register, $mask_idx$$Register, $rtmp$$Register, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vgather_masked_subwordGT8B_off_avx2(vec dst, memory mem, rRegP idx_base, rRegI offset, vec mask, rRegP tmp, rRegP idx_base_temp,
+                                             vec xtmp1, vec xtmp2, vec xtmp3, rRegI rtmp, rRegI rtmp2, rRegI mask_idx, rRegI length, rFlagsReg cr) %{
+  predicate(!VM_Version::supports_avx512vlbw() && is_subword_type(Matcher::vector_element_basic_type(n)) && Matcher::vector_length_in_bytes(n) > 8);
+  match(Set dst (LoadVectorGatherMasked mem (Binary idx_base (Binary mask offset))));
+  effect(TEMP_DEF dst, TEMP tmp, TEMP idx_base_temp, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP rtmp, TEMP rtmp2, TEMP mask_idx, TEMP length, KILL cr);
+  format %{ "vector_gatherGT8_masked_off $dst, $mem, $idx_base, $offset, $mask\t! using $tmp, $idx_base_temp, $xtmp1, $xtmp2, $xtmp3, $rtmp, $rtmp2, $mask_idx and $length as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    int vector_len = Matcher::vector_length(this);
+    BasicType elem_bt = Matcher::vector_element_basic_type(this);
+    __ xorl($mask_idx$$Register, $mask_idx$$Register);
+    __ lea($tmp$$Register, $mem$$Address);
+    __ movptr($idx_base_temp$$Register, $idx_base$$Register);
+    __ vpmovmskb($rtmp2$$Register, $mask$$XMMRegister, vlen_enc);
+    if (elem_bt == T_SHORT) {
+      __ movl($mask_idx$$Register, 0x55555555);
+      __ pextl($rtmp2$$Register, $rtmp2$$Register, $mask_idx$$Register);
+    }
+    __ xorl($mask_idx$$Register, $mask_idx$$Register);
+    __ vgather_subword(elem_bt, $dst$$XMMRegister, $tmp$$Register, $idx_base_temp$$Register, $offset$$Register, $rtmp2$$Register, $xtmp1$$XMMRegister,
+                       $xtmp2$$XMMRegister, $xtmp3$$XMMRegister, $rtmp$$Register, $mask_idx$$Register, $length$$Register, vector_len, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+#endif
+
 // ====================Scatter=======================================
 
 // Scatter INT, LONG, FLOAT, DOUBLE
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index d49117beb87..516036d839b 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1050,6 +1050,8 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) {
       } break;
       case Op_CountTrailingZerosV:
       case Op_CountLeadingZerosV:
+      case Op_LoadVectorGather:
+      case Op_LoadVectorGatherMasked:
       case Op_ReverseV:
       case Op_RoundVF:
       case Op_RoundVD:
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index d14dce77208..74e2ba603ac 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -2474,7 +2474,22 @@ void Matcher::find_shared_post_visit(Node* n, uint opcode) {
       n->del_req(3);
       break;
     }
+    case Op_LoadVectorGather:
+      if (is_subword_type(n->bottom_type()->is_vect()->element_basic_type())) {
+        Node* pair = new BinaryNode(n->in(MemNode::ValueIn), n->in(MemNode::ValueIn+1));
+        n->set_req(MemNode::ValueIn, pair);
+        n->del_req(MemNode::ValueIn+1);
+      }
+      break;
     case Op_LoadVectorGatherMasked:
+      if (is_subword_type(n->bottom_type()->is_vect()->element_basic_type())) {
+        Node* pair2 = new BinaryNode(n->in(MemNode::ValueIn + 1), n->in(MemNode::ValueIn + 2));
+        Node* pair1 = new BinaryNode(n->in(MemNode::ValueIn), pair2);
+        n->set_req(MemNode::ValueIn, pair1);
+        n->del_req(MemNode::ValueIn+2);
+        n->del_req(MemNode::ValueIn+1);
+        break;
+      } // fall-through
     case Op_StoreVectorScatter: {
       Node* pair = new BinaryNode(n->in(MemNode::ValueIn), n->in(MemNode::ValueIn+1));
       n->set_req(MemNode::ValueIn, pair);
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 5249d8d67af..cee221c8b75 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -302,6 +302,7 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
         is_supported = Matcher::match_rule_supported_vector_masked(sopc, num_elem, type);
       }
     }
+    is_supported |= Matcher::supports_vector_predicate_op_emulation(sopc, num_elem, type);
 
     if (!is_supported) {
     #ifndef PRODUCT
@@ -1500,8 +1501,8 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
     }
 
     // Check whether the predicated gather/scatter node is supported by architecture.
-    if (!arch_supports_vector(is_scatter ? Op_StoreVectorScatterMasked : Op_LoadVectorGatherMasked, num_elem, elem_bt,
-                              (VectorMaskUseType) (VecMaskUseLoad | VecMaskUsePred))) {
+    VectorMaskUseType mask = (VectorMaskUseType) (VecMaskUseLoad | VecMaskUsePred);
+    if (!arch_supports_vector(is_scatter ? Op_StoreVectorScatterMasked : Op_LoadVectorGatherMasked, num_elem, elem_bt, mask)) {
       if (C->print_intrinsics()) {
         tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s is_masked_op=1",
                       is_scatter, is_scatter ? "scatterMasked" : "gatherMasked",
@@ -1522,7 +1523,8 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
   }
 
   // Check that the vector holding indices is supported by architecture
-  if (!arch_supports_vector(Op_LoadVector, num_elem, T_INT, VecMaskNotUsed)) {
+  // For sub-word gathers expander receive index array.
+  if (!is_subword_type(elem_bt) && !arch_supports_vector(Op_LoadVector, num_elem, T_INT, VecMaskNotUsed)) {
       if (C->print_intrinsics()) {
         tty->print_cr("  ** not supported: arity=%d op=%s/loadindex vlen=%d etype=int is_masked_op=%d",
                       is_scatter, is_scatter ? "scatter" : "gather",
@@ -1564,12 +1566,15 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
     return false;
   }
 
+  Node* index_vect = nullptr;
   const TypeInstPtr* vbox_idx_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_idx_klass);
-  Node* index_vect = unbox_vector(argument(8), vbox_idx_type, T_INT, num_elem);
-  if (index_vect == nullptr) {
-    set_map(old_map);
-    set_sp(old_sp);
-    return false;
+  if (!is_subword_type(elem_bt)) {
+    index_vect = unbox_vector(argument(8), vbox_idx_type, T_INT, num_elem);
+    if (index_vect == nullptr) {
+      set_map(old_map);
+      set_sp(old_sp);
+      return false;
+    }
   }
 
   Node* mask = nullptr;
@@ -1608,10 +1613,23 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
     set_memory(vstore, addr_type);
   } else {
     Node* vload = nullptr;
+    Node* index    = argument(11);
+    Node* indexMap = argument(12);
+    Node* indexM   = argument(13);
     if (mask != nullptr) {
-      vload = gvn().transform(new LoadVectorGatherMaskedNode(control(), memory(addr), addr, addr_type, vector_type, index_vect, mask));
+      if (is_subword_type(elem_bt)) {
+        Node* index_arr_base = array_element_address(indexMap, indexM, T_INT);
+        vload = gvn().transform(new LoadVectorGatherMaskedNode(control(), memory(addr), addr, addr_type, vector_type, index_arr_base, mask, index));
+      } else {
+        vload = gvn().transform(new LoadVectorGatherMaskedNode(control(), memory(addr), addr, addr_type, vector_type, index_vect, mask));
+      }
     } else {
-      vload = gvn().transform(new LoadVectorGatherNode(control(), memory(addr), addr, addr_type, vector_type, index_vect));
+      if (is_subword_type(elem_bt)) {
+        Node* index_arr_base = array_element_address(indexMap, indexM, T_INT);
+        vload = gvn().transform(new LoadVectorGatherNode(control(), memory(addr), addr, addr_type, vector_type, index_arr_base, index));
+      } else {
+        vload = gvn().transform(new LoadVectorGatherNode(control(), memory(addr), addr, addr_type, vector_type, index_vect));
+      }
     }
     Node* box = box_vector(vload, vbox_type, elem_bt, num_elem);
     set_result(box);
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index ae37202cd25..ff31d2a51b8 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -890,16 +890,26 @@ class LoadVectorNode : public LoadNode {
 // Load Vector from memory via index map
 class LoadVectorGatherNode : public LoadVectorNode {
  public:
-  LoadVectorGatherNode(Node* c, Node* mem, Node* adr, const TypePtr* at, const TypeVect* vt, Node* indices)
+  LoadVectorGatherNode(Node* c, Node* mem, Node* adr, const TypePtr* at, const TypeVect* vt, Node* indices, Node* offset = nullptr)
     : LoadVectorNode(c, mem, adr, at, vt) {
     init_class_id(Class_LoadVectorGather);
-    assert(indices->bottom_type()->is_vect(), "indices must be in vector");
     add_req(indices);
-    assert(req() == MemNode::ValueIn + 1, "match_edge expects that last input is in MemNode::ValueIn");
+    DEBUG_ONLY(bool is_subword = is_subword_type(vt->element_basic_type()));
+    assert(is_subword || indices->bottom_type()->is_vect(), "indices must be in vector");
+    assert(is_subword || !offset, "");
+    assert(req() == MemNode::ValueIn + 1, "match_edge expects that index input is in MemNode::ValueIn");
+    if (offset) {
+      add_req(offset);
+    }
   }
 
   virtual int Opcode() const;
-  virtual uint match_edge(uint idx) const { return idx == MemNode::Address || idx == MemNode::ValueIn; }
+  virtual uint match_edge(uint idx) const {
+     return idx == MemNode::Address ||
+            idx == MemNode::ValueIn ||
+            ((is_subword_type(vect_type()->element_basic_type())) &&
+              idx == MemNode::ValueIn + 1);
+  }
 };
 
 //------------------------------StoreVectorNode--------------------------------
@@ -1003,20 +1013,23 @@ class LoadVectorMaskedNode : public LoadVectorNode {
 // Load Vector from memory via index map under the influence of a predicate register(mask).
 class LoadVectorGatherMaskedNode : public LoadVectorNode {
  public:
-  LoadVectorGatherMaskedNode(Node* c, Node* mem, Node* adr, const TypePtr* at, const TypeVect* vt, Node* indices, Node* mask)
+  LoadVectorGatherMaskedNode(Node* c, Node* mem, Node* adr, const TypePtr* at, const TypeVect* vt, Node* indices, Node* mask, Node* offset = nullptr)
     : LoadVectorNode(c, mem, adr, at, vt) {
     init_class_id(Class_LoadVectorGatherMasked);
-    assert(indices->bottom_type()->is_vect(), "indices must be in vector");
-    assert(mask->bottom_type()->isa_vectmask(), "sanity");
     add_req(indices);
     add_req(mask);
     assert(req() == MemNode::ValueIn + 2, "match_edge expects that last input is in MemNode::ValueIn+1");
+    if (is_subword_type(vt->element_basic_type())) {
+      add_req(offset);
+    }
   }
 
   virtual int Opcode() const;
   virtual uint match_edge(uint idx) const { return idx == MemNode::Address ||
                                                    idx == MemNode::ValueIn ||
-                                                   idx == MemNode::ValueIn + 1; }
+                                                   idx == MemNode::ValueIn + 1 ||
+                                                   (is_subword_type(vect_type()->is_vect()->element_basic_type()) &&
+                                                   idx == MemNode::ValueIn + 2); }
 };
 
 //------------------------------StoreVectorScatterMaskedNode--------------------------------
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
index af60895899f..a889d10fb43 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
@@ -893,6 +893,12 @@ final class Byte128Vector extends ByteVector {
         return super.fromArray0Template(Byte128Mask.class, a, offset, (Byte128Mask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
+        return super.fromArray0Template(Byte128Mask.class, a, offset, indexMap, mapOffset, (Byte128Mask) m);
+    }
 
 
     @ForceInline
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
index 1dcbbd26907..7f07c32ab13 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
@@ -925,6 +925,12 @@ final class Byte256Vector extends ByteVector {
         return super.fromArray0Template(Byte256Mask.class, a, offset, (Byte256Mask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
+        return super.fromArray0Template(Byte256Mask.class, a, offset, indexMap, mapOffset, (Byte256Mask) m);
+    }
 
 
     @ForceInline
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
index 9e99a1916a7..20bf261999a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
@@ -989,6 +989,12 @@ final class Byte512Vector extends ByteVector {
         return super.fromArray0Template(Byte512Mask.class, a, offset, (Byte512Mask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
+        return super.fromArray0Template(Byte512Mask.class, a, offset, indexMap, mapOffset, (Byte512Mask) m);
+    }
 
 
     @ForceInline
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
index 85276b2eb19..2756128b469 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
@@ -877,6 +877,12 @@ final class Byte64Vector extends ByteVector {
         return super.fromArray0Template(Byte64Mask.class, a, offset, (Byte64Mask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
+        return super.fromArray0Template(Byte64Mask.class, a, offset, indexMap, mapOffset, (Byte64Mask) m);
+    }
 
 
     @ForceInline
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
index ff035f13294..c2f5e6f85a9 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
@@ -863,6 +863,12 @@ final class ByteMaxVector extends ByteVector {
         return super.fromArray0Template(ByteMaxMask.class, a, offset, (ByteMaxMask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
+        return super.fromArray0Template(ByteMaxMask.class, a, offset, indexMap, mapOffset, (ByteMaxMask) m);
+    }
 
 
     @ForceInline
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
index 4fc8626754a..8fae8d71b04 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
@@ -3049,7 +3049,35 @@ public abstract class ByteVector extends AbstractVector<Byte> {
                                    byte[] a, int offset,
                                    int[] indexMap, int mapOffset) {
         ByteSpecies vsp = (ByteSpecies) species;
-        return vsp.vOp(n -> a[offset + indexMap[mapOffset + n]]);
+        IntVector.IntSpecies isp = IntVector.species(vsp.indexShape());
+        Objects.requireNonNull(a);
+        Objects.requireNonNull(indexMap);
+        Class<? extends ByteVector> vectorType = vsp.vectorType();
+
+
+        // Constant folding should sweep out following conditonal logic.
+        VectorSpecies<Integer> lsp;
+        if (isp.length() > IntVector.SPECIES_PREFERRED.length()) {
+            lsp = IntVector.SPECIES_PREFERRED;
+        } else {
+            lsp = isp;
+        }
+
+        // Check indices are within array bounds.
+        for (int i = 0; i < vsp.length(); i += lsp.length()) {
+            IntVector vix = IntVector
+                .fromArray(lsp, indexMap, mapOffset + i)
+                .add(offset);
+            VectorIntrinsics.checkIndex(vix, a.length);
+        }
+
+        return VectorSupport.loadWithMap(
+            vectorType, null, byte.class, vsp.laneCount(),
+            lsp.vectorType(),
+            a, ARRAY_BASE, null, null,
+            a, offset, indexMap, mapOffset, vsp,
+            (c, idx, iMap, idy, s, vm) ->
+            s.vOp(n -> c[idx + iMap[idy+n]]));
     }
 
     /**
@@ -3094,8 +3122,13 @@ public abstract class ByteVector extends AbstractVector<Byte> {
                                    byte[] a, int offset,
                                    int[] indexMap, int mapOffset,
                                    VectorMask<Byte> m) {
-        ByteSpecies vsp = (ByteSpecies) species;
-        return vsp.vOp(m, n -> a[offset + indexMap[mapOffset + n]]);
+        if (m.allTrue()) {
+            return fromArray(species, a, offset, indexMap, mapOffset);
+        }
+        else {
+            ByteSpecies vsp = (ByteSpecies) species;
+            return vsp.dummyVector().fromArray0(a, offset, indexMap, mapOffset, m);
+        }
     }
 
 
@@ -3760,6 +3793,49 @@ public abstract class ByteVector extends AbstractVector<Byte> {
                                         (arr_, off_, i) -> arr_[off_ + i]));
     }
 
+    /*package-private*/
+    abstract
+    ByteVector fromArray0(byte[] a, int offset,
+                                    int[] indexMap, int mapOffset,
+                                    VectorMask<Byte> m);
+    @ForceInline
+    final
+    <M extends VectorMask<Byte>>
+    ByteVector fromArray0Template(Class<M> maskClass, byte[] a, int offset,
+                                            int[] indexMap, int mapOffset, M m) {
+        ByteSpecies vsp = vspecies();
+        IntVector.IntSpecies isp = IntVector.species(vsp.indexShape());
+        Objects.requireNonNull(a);
+        Objects.requireNonNull(indexMap);
+        m.check(vsp);
+        Class<? extends ByteVector> vectorType = vsp.vectorType();
+
+
+        // Constant folding should sweep out following conditonal logic.
+        VectorSpecies<Integer> lsp;
+        if (isp.length() > IntVector.SPECIES_PREFERRED.length()) {
+            lsp = IntVector.SPECIES_PREFERRED;
+        } else {
+            lsp = isp;
+        }
+
+        // Check indices are within array bounds.
+        // FIXME: Check index under mask controlling.
+        for (int i = 0; i < vsp.length(); i += lsp.length()) {
+            IntVector vix = IntVector
+                .fromArray(lsp, indexMap, mapOffset + i)
+                .add(offset);
+            VectorIntrinsics.checkIndex(vix, a.length);
+        }
+
+        return VectorSupport.loadWithMap(
+            vectorType, maskClass, byte.class, vsp.laneCount(),
+            lsp.vectorType(),
+            a, ARRAY_BASE, null, m,
+            a, offset, indexMap, mapOffset, vsp,
+            (c, idx, iMap, idy, s, vm) ->
+            s.vOp(vm, n -> c[idx + iMap[idy+n]]));
+    }
 
 
     /*package-private*/
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
index 8ae0638e4f3..3930826aa09 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
@@ -877,6 +877,12 @@ final class Short128Vector extends ShortVector {
         return super.fromArray0Template(Short128Mask.class, a, offset, (Short128Mask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
+        return super.fromArray0Template(Short128Mask.class, a, offset, indexMap, mapOffset, (Short128Mask) m);
+    }
 
     @ForceInline
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
index cd9d8ceb887..e39e89f6137 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
@@ -893,6 +893,12 @@ final class Short256Vector extends ShortVector {
         return super.fromArray0Template(Short256Mask.class, a, offset, (Short256Mask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
+        return super.fromArray0Template(Short256Mask.class, a, offset, indexMap, mapOffset, (Short256Mask) m);
+    }
 
     @ForceInline
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
index 2a959a8181c..1caea78f748 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
@@ -925,6 +925,12 @@ final class Short512Vector extends ShortVector {
         return super.fromArray0Template(Short512Mask.class, a, offset, (Short512Mask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
+        return super.fromArray0Template(Short512Mask.class, a, offset, indexMap, mapOffset, (Short512Mask) m);
+    }
 
     @ForceInline
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
index 6090e9cf0d1..640be746f15 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
@@ -869,6 +869,12 @@ final class Short64Vector extends ShortVector {
         return super.fromArray0Template(Short64Mask.class, a, offset, (Short64Mask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
+        return super.fromArray0Template(Short64Mask.class, a, offset, indexMap, mapOffset, (Short64Mask) m);
+    }
 
     @ForceInline
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
index d451cd4443f..96683ac53c4 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
@@ -863,6 +863,12 @@ final class ShortMaxVector extends ShortVector {
         return super.fromArray0Template(ShortMaxMask.class, a, offset, (ShortMaxMask) m, offsetInRange);  // specialize
     }
 
+    @ForceInline
+    @Override
+    final
+    ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
+        return super.fromArray0Template(ShortMaxMask.class, a, offset, indexMap, mapOffset, (ShortMaxMask) m);
+    }
 
     @ForceInline
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
index 84f542f07ff..ba21e8a9e95 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
@@ -3050,7 +3050,35 @@ public abstract class ShortVector extends AbstractVector<Short> {
                                    short[] a, int offset,
                                    int[] indexMap, int mapOffset) {
         ShortSpecies vsp = (ShortSpecies) species;
-        return vsp.vOp(n -> a[offset + indexMap[mapOffset + n]]);
+        IntVector.IntSpecies isp = IntVector.species(vsp.indexShape());
+        Objects.requireNonNull(a);
+        Objects.requireNonNull(indexMap);
+        Class<? extends ShortVector> vectorType = vsp.vectorType();
+
+
+        // Constant folding should sweep out following conditonal logic.
+        VectorSpecies<Integer> lsp;
+        if (isp.length() > IntVector.SPECIES_PREFERRED.length()) {
+            lsp = IntVector.SPECIES_PREFERRED;
+        } else {
+            lsp = isp;
+        }
+
+        // Check indices are within array bounds.
+        for (int i = 0; i < vsp.length(); i += lsp.length()) {
+            IntVector vix = IntVector
+                .fromArray(lsp, indexMap, mapOffset + i)
+                .add(offset);
+            VectorIntrinsics.checkIndex(vix, a.length);
+        }
+
+        return VectorSupport.loadWithMap(
+            vectorType, null, short.class, vsp.laneCount(),
+            lsp.vectorType(),
+            a, ARRAY_BASE, null, null,
+            a, offset, indexMap, mapOffset, vsp,
+            (c, idx, iMap, idy, s, vm) ->
+            s.vOp(n -> c[idx + iMap[idy+n]]));
     }
 
     /**
@@ -3095,8 +3123,13 @@ public abstract class ShortVector extends AbstractVector<Short> {
                                    short[] a, int offset,
                                    int[] indexMap, int mapOffset,
                                    VectorMask<Short> m) {
-        ShortSpecies vsp = (ShortSpecies) species;
-        return vsp.vOp(m, n -> a[offset + indexMap[mapOffset + n]]);
+        if (m.allTrue()) {
+            return fromArray(species, a, offset, indexMap, mapOffset);
+        }
+        else {
+            ShortSpecies vsp = (ShortSpecies) species;
+            return vsp.dummyVector().fromArray0(a, offset, indexMap, mapOffset, m);
+        }
     }
 
     /**
@@ -3746,6 +3779,49 @@ public abstract class ShortVector extends AbstractVector<Short> {
                                         (arr_, off_, i) -> arr_[off_ + i]));
     }
 
+    /*package-private*/
+    abstract
+    ShortVector fromArray0(short[] a, int offset,
+                                    int[] indexMap, int mapOffset,
+                                    VectorMask<Short> m);
+    @ForceInline
+    final
+    <M extends VectorMask<Short>>
+    ShortVector fromArray0Template(Class<M> maskClass, short[] a, int offset,
+                                            int[] indexMap, int mapOffset, M m) {
+        ShortSpecies vsp = vspecies();
+        IntVector.IntSpecies isp = IntVector.species(vsp.indexShape());
+        Objects.requireNonNull(a);
+        Objects.requireNonNull(indexMap);
+        m.check(vsp);
+        Class<? extends ShortVector> vectorType = vsp.vectorType();
+
+
+        // Constant folding should sweep out following conditonal logic.
+        VectorSpecies<Integer> lsp;
+        if (isp.length() > IntVector.SPECIES_PREFERRED.length()) {
+            lsp = IntVector.SPECIES_PREFERRED;
+        } else {
+            lsp = isp;
+        }
+
+        // Check indices are within array bounds.
+        // FIXME: Check index under mask controlling.
+        for (int i = 0; i < vsp.length(); i += lsp.length()) {
+            IntVector vix = IntVector
+                .fromArray(lsp, indexMap, mapOffset + i)
+                .add(offset);
+            VectorIntrinsics.checkIndex(vix, a.length);
+        }
+
+        return VectorSupport.loadWithMap(
+            vectorType, maskClass, short.class, vsp.laneCount(),
+            lsp.vectorType(),
+            a, ARRAY_BASE, null, m,
+            a, offset, indexMap, mapOffset, vsp,
+            (c, idx, iMap, idy, s, vm) ->
+            s.vOp(vm, n -> c[idx + iMap[idy+n]]));
+    }
 
     /*package-private*/
     abstract
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
index ad878268404..d7562bae475 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
@@ -3622,7 +3622,35 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
                                    $type$[] a, int offset,
                                    int[] indexMap, int mapOffset) {
         $Type$Species vsp = ($Type$Species) species;
-        return vsp.vOp(n -> a[offset + indexMap[mapOffset + n]]);
+        IntVector.IntSpecies isp = IntVector.species(vsp.indexShape());
+        Objects.requireNonNull(a);
+        Objects.requireNonNull(indexMap);
+        Class<? extends $abstractvectortype$> vectorType = vsp.vectorType();
+
+
+        // Constant folding should sweep out following conditonal logic.
+        VectorSpecies<Integer> lsp;
+        if (isp.length() > IntVector.SPECIES_PREFERRED.length()) {
+            lsp = IntVector.SPECIES_PREFERRED;
+        } else {
+            lsp = isp;
+        }
+
+        // Check indices are within array bounds.
+        for (int i = 0; i < vsp.length(); i += lsp.length()) {
+            IntVector vix = IntVector
+                .fromArray(lsp, indexMap, mapOffset + i)
+                .add(offset);
+            VectorIntrinsics.checkIndex(vix, a.length);
+        }
+
+        return VectorSupport.loadWithMap(
+            vectorType, null, $type$.class, vsp.laneCount(),
+            lsp.vectorType(),
+            a, ARRAY_BASE, null, null,
+            a, offset, indexMap, mapOffset, vsp,
+            (c, idx, iMap, idy, s, vm) ->
+            s.vOp(n -> c[idx + iMap[idy+n]]));
     }
 #else[byteOrShort]
     @ForceInline
@@ -3714,17 +3742,6 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
      *         where the mask is set
      * @see $abstractvectortype$#toIntArray()
      */
-#if[byteOrShort]
-    @ForceInline
-    public static
-    $abstractvectortype$ fromArray(VectorSpecies<$Boxtype$> species,
-                                   $type$[] a, int offset,
-                                   int[] indexMap, int mapOffset,
-                                   VectorMask<$Boxtype$> m) {
-        $Type$Species vsp = ($Type$Species) species;
-        return vsp.vOp(m, n -> a[offset + indexMap[mapOffset + n]]);
-    }
-#else[byteOrShort]
     @ForceInline
     public static
     $abstractvectortype$ fromArray(VectorSpecies<$Boxtype$> species,
@@ -3739,7 +3756,6 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             return vsp.dummyVector().fromArray0(a, offset, indexMap, mapOffset, m);
         }
     }
-#end[byteOrShort]
 
 #if[short]
     /**
@@ -4793,12 +4809,51 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
                                         (arr_, off_, i) -> arr_[off_ + i]));
     }
 
-#if[!byteOrShort]
     /*package-private*/
     abstract
     $abstractvectortype$ fromArray0($type$[] a, int offset,
                                     int[] indexMap, int mapOffset,
                                     VectorMask<$Boxtype$> m);
+#if[byteOrShort]
+    @ForceInline
+    final
+    <M extends VectorMask<$Boxtype$>>
+    $abstractvectortype$ fromArray0Template(Class<M> maskClass, $type$[] a, int offset,
+                                            int[] indexMap, int mapOffset, M m) {
+        $Type$Species vsp = vspecies();
+        IntVector.IntSpecies isp = IntVector.species(vsp.indexShape());
+        Objects.requireNonNull(a);
+        Objects.requireNonNull(indexMap);
+        m.check(vsp);
+        Class<? extends $abstractvectortype$> vectorType = vsp.vectorType();
+
+
+        // Constant folding should sweep out following conditonal logic.
+        VectorSpecies<Integer> lsp;
+        if (isp.length() > IntVector.SPECIES_PREFERRED.length()) {
+            lsp = IntVector.SPECIES_PREFERRED;
+        } else {
+            lsp = isp;
+        }
+
+        // Check indices are within array bounds.
+        // FIXME: Check index under mask controlling.
+        for (int i = 0; i < vsp.length(); i += lsp.length()) {
+            IntVector vix = IntVector
+                .fromArray(lsp, indexMap, mapOffset + i)
+                .add(offset);
+            VectorIntrinsics.checkIndex(vix, a.length);
+        }
+
+        return VectorSupport.loadWithMap(
+            vectorType, maskClass, $type$.class, vsp.laneCount(),
+            lsp.vectorType(),
+            a, ARRAY_BASE, null, m,
+            a, offset, indexMap, mapOffset, vsp,
+            (c, idx, iMap, idy, s, vm) ->
+            s.vOp(vm, n -> c[idx + iMap[idy+n]]));
+    }
+#else[byteOrShort]
     @ForceInline
     final
     <M extends VectorMask<$Boxtype$>>
@@ -4852,7 +4907,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             (c, idx, iMap, idy, s, vm) ->
             s.vOp(vm, n -> c[idx + iMap[idy+n]]));
     }
-#end[!byteOrShort]
+#end[byteOrShort]
 
 #if[short]
     /*package-private*/
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
index f2b36066fa7..cebdc7594d6 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
@@ -1151,14 +1151,12 @@ final class $vectortype$ extends $abstractvectortype$ {
         return super.fromArray0Template($masktype$.class, a, offset, ($masktype$) m, offsetInRange);  // specialize
     }
 
-#if[!byteOrShort]
     @ForceInline
     @Override
     final
     $abstractvectortype$ fromArray0($type$[] a, int offset, int[] indexMap, int mapOffset, VectorMask<$Boxtype$> m) {
         return super.fromArray0Template($masktype$.class, a, offset, indexMap, mapOffset, ($masktype$) m);
     }
-#end[!byteOrShort]
 
 #if[short]
     @ForceInline
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/GatherOperationsBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/GatherOperationsBenchmark.java
new file mode 100644
index 00000000000..7a7578fcf84
--- /dev/null
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/GatherOperationsBenchmark.java
@@ -0,0 +1,357 @@
+/*
+ *  Copyright (c) 2023, 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.
+ *
+ */
+
+package org.openjdk.bench.jdk.incubator.vector;
+
+import jdk.incubator.vector.*;
+import java.util.Random;
+import java.util.stream.IntStream;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.*;
+
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@State(Scope.Thread)
+@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+public class GatherOperationsBenchmark {
+    @Param({"64", "256", "1024", "4096"})
+    int SIZE;
+    byte  [] barr;
+    byte  [] bres;
+    short [] sarr;
+    short [] sres;
+    int   [] index;
+
+    static final VectorSpecies<Short> S64 = ShortVector.SPECIES_64;
+    static final VectorSpecies<Short> S128 = ShortVector.SPECIES_128;
+    static final VectorSpecies<Short> S256 = ShortVector.SPECIES_256;
+    static final VectorSpecies<Short> S512 = ShortVector.SPECIES_512;
+    static final VectorSpecies<Byte> B64 = ByteVector.SPECIES_64;
+    static final VectorSpecies<Byte> B128 = ByteVector.SPECIES_128;
+    static final VectorSpecies<Byte> B256 = ByteVector.SPECIES_256;
+    static final VectorSpecies<Byte> B512 = ByteVector.SPECIES_512;
+
+    @Setup(Level.Trial)
+    public void BmSetup() {
+        Random r = new Random(1245);
+        index = new int[SIZE];
+        barr = new byte[SIZE];
+        bres = new byte[SIZE];
+        sarr = new short[SIZE];
+        sres = new short[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+           barr[i] = (byte)i;
+           sarr[i] = (short)i;
+           index[i] = r.nextInt(SIZE-1);
+        }
+    }
+
+
+
+    @Benchmark
+    public void microByteGather64() {
+        for (int i = 0; i < SIZE; i += B64.length()) {
+            ByteVector.fromArray(B64, barr, 0, index, i)
+                            .intoArray(bres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microByteGather64_NZ_OFF() {
+        for (int i = 0; i < SIZE; i += B64.length()) {
+            ByteVector.fromArray(B64, barr, 1, index, i)
+                            .intoArray(bres, i);
+        }
+    }
+
+    @Benchmark
+    public void microByteGather64_MASK() {
+        VectorMask<Byte> VMASK = VectorMask.fromLong(B64, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += B64.length()) {
+            ByteVector.fromArray(B64, barr, 0, index, i, VMASK)
+                            .intoArray(bres, i);
+        }
+    }
+
+    @Benchmark
+    public void microByteGather64_MASK_NZ_OFF() {
+        VectorMask<Byte> VMASK = VectorMask.fromLong(B64, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += B64.length()) {
+            ByteVector.fromArray(B64, barr, 1, index, i, VMASK)
+                            .intoArray(bres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microByteGather128() {
+        for (int i = 0; i < SIZE; i += B128.length()) {
+            ByteVector.fromArray(B128, barr, 0, index, i)
+                            .intoArray(bres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microByteGather128_NZ_OFF() {
+        for (int i = 0; i < SIZE; i += B128.length()) {
+            ByteVector.fromArray(B128, barr, 1, index, i)
+                            .intoArray(bres, i);
+        }
+    }
+
+    @Benchmark
+    public void microByteGather128_MASK() {
+        VectorMask<Byte> VMASK = VectorMask.fromLong(B128, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += B128.length()) {
+            ByteVector.fromArray(B128, barr, 0, index, i, VMASK)
+                            .intoArray(bres, i);
+        }
+    }
+
+    @Benchmark
+    public void microByteGather128_MASK_NZ_OFF() {
+        VectorMask<Byte> VMASK = VectorMask.fromLong(B128, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += B128.length()) {
+            ByteVector.fromArray(B128, barr, 1, index, i, VMASK)
+                            .intoArray(bres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microByteGather256() {
+        for (int i = 0; i < SIZE; i += B256.length()) {
+            ByteVector.fromArray(B256, barr, 0, index, i)
+                            .intoArray(bres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microByteGather256_NZ_OFF() {
+        for (int i = 0; i < SIZE; i += B256.length()) {
+            ByteVector.fromArray(B256, barr, 1, index, i)
+                            .intoArray(bres, i);
+        }
+    }
+
+    @Benchmark
+    public void microByteGather256_MASK() {
+        VectorMask<Byte> VMASK = VectorMask.fromLong(B256, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += B256.length()) {
+            ByteVector.fromArray(B256, barr, 0, index, i, VMASK)
+                            .intoArray(bres, i);
+        }
+    }
+
+    @Benchmark
+    public void microByteGather256_MASK_NZ_OFF() {
+        VectorMask<Byte> VMASK = VectorMask.fromLong(B256, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += B256.length()) {
+            ByteVector.fromArray(B256, barr, 1, index, i, VMASK)
+                            .intoArray(bres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microByteGather512() {
+        for (int i = 0; i < SIZE; i += B512.length()) {
+            ByteVector.fromArray(B512, barr, 0, index, i)
+                            .intoArray(bres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microByteGather512_NZ_OFF() {
+        for (int i = 0; i < SIZE; i += B512.length()) {
+            ByteVector.fromArray(B512, barr, 1, index, i)
+                            .intoArray(bres, i);
+        }
+    }
+
+    @Benchmark
+    public void microByteGather512_MASK() {
+        VectorMask<Byte> VMASK = VectorMask.fromLong(B512, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += B512.length()) {
+            ByteVector.fromArray(B512, barr, 0, index, i, VMASK)
+                            .intoArray(bres, i);
+        }
+    }
+
+    @Benchmark
+    public void microByteGather512_MASK_NZ_OFF() {
+        VectorMask<Byte> VMASK = VectorMask.fromLong(B512, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += B512.length()) {
+            ByteVector.fromArray(B512, barr, 1, index, i, VMASK)
+                            .intoArray(bres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microShortGather64() {
+        for (int i = 0; i < SIZE; i += S64.length()) {
+            ShortVector.fromArray(S64, sarr, 0, index, i)
+                            .intoArray(sres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microShortGather64_NZ_OFF() {
+        for (int i = 0; i < SIZE; i += S64.length()) {
+            ShortVector.fromArray(S64, sarr, 1, index, i)
+                            .intoArray(sres, i);
+        }
+    }
+
+    @Benchmark
+    public void microShortGather64_MASK() {
+        VectorMask<Short> VMASK = VectorMask.fromLong(S64, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += S64.length()) {
+            ShortVector.fromArray(S64, sarr, 0, index, i, VMASK)
+                            .intoArray(sres, i);
+        }
+    }
+
+    @Benchmark
+    public void microShortGather64_MASK_NZ_OFF() {
+        VectorMask<Short> VMASK = VectorMask.fromLong(S64, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += S64.length()) {
+            ShortVector.fromArray(S64, sarr, 1, index, i, VMASK)
+                            .intoArray(sres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microShortGather128() {
+        for (int i = 0; i < SIZE; i += S128.length()) {
+            ShortVector.fromArray(S128, sarr, 0, index, i)
+                            .intoArray(sres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microShortGather128_NZ_OFF() {
+        for (int i = 0; i < SIZE; i += S128.length()) {
+            ShortVector.fromArray(S128, sarr, 1, index, i)
+                            .intoArray(sres, i);
+        }
+    }
+
+    @Benchmark
+    public void microShortGather128_MASK() {
+        VectorMask<Short> VMASK = VectorMask.fromLong(S128, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += S128.length()) {
+            ShortVector.fromArray(S128, sarr, 0, index, i, VMASK)
+                            .intoArray(sres, i);
+        }
+    }
+
+    @Benchmark
+    public void microShortGather128_MASK_NZ_OFF() {
+        VectorMask<Short> VMASK = VectorMask.fromLong(S128, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += S128.length()) {
+            ShortVector.fromArray(S128, sarr, 1, index, i, VMASK)
+                            .intoArray(sres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microShortGather256() {
+        for (int i = 0; i < SIZE; i += S256.length()) {
+            ShortVector.fromArray(S256, sarr, 0, index, i)
+                            .intoArray(sres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microShortGather256_NZ_OFF() {
+        for (int i = 0; i < SIZE; i += S256.length()) {
+            ShortVector.fromArray(S256, sarr, 1, index, i)
+                            .intoArray(sres, i);
+        }
+    }
+
+    @Benchmark
+    public void microShortGather256_MASK() {
+        VectorMask<Short> VMASK = VectorMask.fromLong(S256, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += S256.length()) {
+            ShortVector.fromArray(S256, sarr, 0, index, i, VMASK)
+                            .intoArray(sres, i);
+        }
+    }
+
+    @Benchmark
+    public void microShortGather256_MASK_NZ_OFF() {
+        VectorMask<Short> VMASK = VectorMask.fromLong(S256, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += S256.length()) {
+            ShortVector.fromArray(S256, sarr, 1, index, i, VMASK)
+                            .intoArray(sres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microShortGather512() {
+        for (int i = 0; i < SIZE; i += S512.length()) {
+            ShortVector.fromArray(S512, sarr, 0, index, i)
+                            .intoArray(sres, i);
+        }
+    }
+
+
+    @Benchmark
+    public void microShortGather512_NZ_OFF() {
+        for (int i = 0; i < SIZE; i += S512.length()) {
+            ShortVector.fromArray(S512, sarr, 1, index, i)
+                            .intoArray(sres, i);
+        }
+    }
+
+    @Benchmark
+    public void microShortGather512_MASK() {
+        VectorMask<Short> VMASK = VectorMask.fromLong(S512, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += S512.length()) {
+            ShortVector.fromArray(S512, sarr, 0, index, i, VMASK)
+                            .intoArray(sres, i);
+        }
+    }
+
+    @Benchmark
+    public void microShortGather512_MASK_NZ_OFF() {
+        VectorMask<Short> VMASK = VectorMask.fromLong(S512, 0x5555555555555555L);
+        for (int i = 0; i < SIZE; i += S512.length()) {
+            ShortVector.fromArray(S512, sarr, 1, index, i, VMASK)
+                            .intoArray(sres, i);
+        }
+    }
+}

From bd67ac69a234cd1096e534c7d4a45d88715884b4 Mon Sep 17 00:00:00 2001
From: Scott Gibbons <sgibbons@openjdk.org>
Date: Sun, 21 Apr 2024 23:24:46 +0000
Subject: [PATCH 122/486] 8329331: Intrinsify Unsafe::setMemory

Reviewed-by: sviswanathan, jbhateja, kvn
---
 .../cpu/aarch64/stubGenerator_aarch64.cpp     |   2 +-
 src/hotspot/cpu/arm/stubGenerator_arm.cpp     |   4 +-
 src/hotspot/cpu/ppc/stubGenerator_ppc.cpp     |   4 +-
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp |   4 +-
 src/hotspot/cpu/x86/assembler_x86.cpp         |   1 +
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    |  36 +--
 src/hotspot/cpu/x86/stubGenerator_x86_32.cpp  |   4 +-
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |   2 +-
 src/hotspot/cpu/x86/stubGenerator_x86_64.hpp  |   8 +
 .../x86/stubGenerator_x86_64_arraycopy.cpp    | 206 +++++++++++++++++-
 src/hotspot/cpu/zero/stubGenerator_zero.cpp   |   5 +-
 src/hotspot/os/windows/os_windows.cpp         |   6 +-
 src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp     |   6 +-
 .../os_cpu/bsd_aarch64/os_bsd_aarch64.cpp     |   6 +-
 src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp     |  12 +-
 .../os_cpu/linux_aarch64/os_linux_aarch64.cpp |   6 +-
 src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp |  19 +-
 src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp |   6 +-
 .../os_cpu/linux_riscv/os_linux_riscv.cpp     |   6 +-
 src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp |  12 +-
 src/hotspot/share/classfile/vmIntrinsics.cpp  |   5 +-
 src/hotspot/share/classfile/vmIntrinsics.hpp  |   3 +
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |   1 +
 src/hotspot/share/opto/c2compiler.cpp         |   3 +
 src/hotspot/share/opto/library_call.cpp       |  52 +++++
 src/hotspot/share/opto/library_call.hpp       |   3 +-
 src/hotspot/share/opto/runtime.cpp            |  23 ++
 src/hotspot/share/opto/runtime.hpp            |   4 +-
 src/hotspot/share/prims/unsafe.cpp            |   7 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |   3 +-
 src/hotspot/share/runtime/sharedRuntime.hpp   |   2 +
 src/hotspot/share/runtime/stubRoutines.cpp    |   2 +
 src/hotspot/share/runtime/stubRoutines.hpp    |   7 +
 src/hotspot/share/utilities/copy.cpp          |  25 ++-
 .../classes/jdk/internal/misc/Unsafe.java     |   1 +
 .../lang/foreign/MemorySegmentZeroUnsafe.java |  93 ++++++++
 36 files changed, 502 insertions(+), 87 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentZeroUnsafe.java

diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index ece7f8a347a..4dc674d28c5 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -8379,7 +8379,7 @@ class StubGenerator: public StubCodeGenerator {
 
     // Initialize table for copy memory (arraycopy) check.
     if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(8);
+      UnsafeCopyMemory::create_table(8 + 4); // 8 for copyMemory; 4 for setMemory
     }
 
     if (UseCRC32Intrinsics) {
diff --git a/src/hotspot/cpu/arm/stubGenerator_arm.cpp b/src/hotspot/cpu/arm/stubGenerator_arm.cpp
index 7f9645f749a..9d526c7ebdc 100644
--- a/src/hotspot/cpu/arm/stubGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/stubGenerator_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
@@ -3135,7 +3135,7 @@ class StubGenerator: public StubCodeGenerator {
     StubRoutines::_throw_StackOverflowError_entry  = generate_throw_exception("StackOverflowError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError));
 
     if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(32);
+      UnsafeCopyMemory::create_table(32 + 4); // 32 for copyMemory; 4 for setMemory
     }
 
     // integer division used both by interpreter and compiler
diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 094757ad3e1..4a9e5476dce 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -4746,7 +4746,7 @@ class StubGenerator: public StubCodeGenerator {
     StubRoutines::_catch_exception_entry            = generate_catch_exception();
 
     if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(8);
+      UnsafeCopyMemory::create_table(8 + 4); // 8 for copyMemory; 4 for setMemory
     }
 
     // Build this early so it's available for the interpreter.
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 7ee17438b28..8ac8263b308 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -5501,7 +5501,7 @@ static const int64_t right_3_bits = right_n_bits(3);
     StubRoutines::_forward_exception_entry = generate_forward_exception();
 
     if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(8);
+      UnsafeCopyMemory::create_table(8 + 4); // 8 for copyMemory; 4 for setMemory
     }
 
     StubRoutines::_call_stub_entry =
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 6ed04ad5211..e4885fa946d 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -934,6 +934,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
     case 0x6F: // movdq
     case 0x7F: // movdq
     case 0xAE: // ldmxcsr, stmxcsr, fxrstor, fxsave, clflush
+    case 0xD6: // movq
     case 0xFE: // paddd
       debug_only(has_disp32 = true);
       break;
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 3d427fd0cde..6c8ca583b10 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -6299,7 +6299,7 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
     orl(value, rtmp);
   }
 
-  cmpl(count, 2<<shift); // Short arrays (< 8 bytes) fill by element
+  cmpptr(count, 2<<shift); // Short arrays (< 8 bytes) fill by element
   jcc(Assembler::below, L_fill_4_bytes); // use unsigned cmp
   if (!UseUnalignedLoadStores && !aligned && (t == T_BYTE || t == T_SHORT)) {
     Label L_skip_align2;
@@ -6319,13 +6319,13 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
     jccb(Assembler::zero, L_skip_align2);
     movw(Address(to, 0), value);
     addptr(to, 2);
-    subl(count, 1<<(shift-1));
+    subptr(count, 1<<(shift-1));
     BIND(L_skip_align2);
   }
   if (UseSSE < 2) {
     Label L_fill_32_bytes_loop, L_check_fill_8_bytes, L_fill_8_bytes_loop, L_fill_8_bytes;
     // Fill 32-byte chunks
-    subl(count, 8 << shift);
+    subptr(count, 8 << shift);
     jcc(Assembler::less, L_check_fill_8_bytes);
     align(16);
 
@@ -6336,10 +6336,10 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
     }
 
     addptr(to, 32);
-    subl(count, 8 << shift);
+    subptr(count, 8 << shift);
     jcc(Assembler::greaterEqual, L_fill_32_bytes_loop);
     BIND(L_check_fill_8_bytes);
-    addl(count, 8 << shift);
+    addptr(count, 8 << shift);
     jccb(Assembler::zero, L_exit);
     jmpb(L_fill_8_bytes);
 
@@ -6351,7 +6351,7 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
     movl(Address(to, 4), value);
     addptr(to, 8);
     BIND(L_fill_8_bytes);
-    subl(count, 1 << (shift + 1));
+    subptr(count, 1 << (shift + 1));
     jcc(Assembler::greaterEqual, L_fill_8_bytes_loop);
     // fall through to fill 4 bytes
   } else {
@@ -6362,7 +6362,7 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
       jccb(Assembler::zero, L_fill_32_bytes);
       movl(Address(to, 0), value);
       addptr(to, 4);
-      subl(count, 1<<shift);
+      subptr(count, 1<<shift);
     }
     BIND(L_fill_32_bytes);
     {
@@ -6376,19 +6376,19 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
           Label L_fill_64_bytes_loop_avx3, L_check_fill_64_bytes_avx2;
 
           // If number of bytes to fill < VM_Version::avx3_threshold(), perform fill using AVX2
-          cmpl(count, VM_Version::avx3_threshold());
+          cmpptr(count, VM_Version::avx3_threshold());
           jccb(Assembler::below, L_check_fill_64_bytes_avx2);
 
           vpbroadcastd(xtmp, xtmp, Assembler::AVX_512bit);
 
-          subl(count, 16 << shift);
+          subptr(count, 16 << shift);
           jccb(Assembler::less, L_check_fill_32_bytes);
           align(16);
 
           BIND(L_fill_64_bytes_loop_avx3);
           evmovdqul(Address(to, 0), xtmp, Assembler::AVX_512bit);
           addptr(to, 64);
-          subl(count, 16 << shift);
+          subptr(count, 16 << shift);
           jcc(Assembler::greaterEqual, L_fill_64_bytes_loop_avx3);
           jmpb(L_check_fill_32_bytes);
 
@@ -6398,7 +6398,7 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
         Label L_fill_64_bytes_loop;
         vpbroadcastd(xtmp, xtmp, Assembler::AVX_256bit);
 
-        subl(count, 16 << shift);
+        subptr(count, 16 << shift);
         jcc(Assembler::less, L_check_fill_32_bytes);
         align(16);
 
@@ -6406,15 +6406,15 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
         vmovdqu(Address(to, 0), xtmp);
         vmovdqu(Address(to, 32), xtmp);
         addptr(to, 64);
-        subl(count, 16 << shift);
+        subptr(count, 16 << shift);
         jcc(Assembler::greaterEqual, L_fill_64_bytes_loop);
 
         BIND(L_check_fill_32_bytes);
-        addl(count, 8 << shift);
+        addptr(count, 8 << shift);
         jccb(Assembler::less, L_check_fill_8_bytes);
         vmovdqu(Address(to, 0), xtmp);
         addptr(to, 32);
-        subl(count, 8 << shift);
+        subptr(count, 8 << shift);
 
         BIND(L_check_fill_8_bytes);
         // clean upper bits of YMM registers
@@ -6424,7 +6424,7 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
         // Fill 32-byte chunks
         pshufd(xtmp, xtmp, 0);
 
-        subl(count, 8 << shift);
+        subptr(count, 8 << shift);
         jcc(Assembler::less, L_check_fill_8_bytes);
         align(16);
 
@@ -6441,12 +6441,12 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
         }
 
         addptr(to, 32);
-        subl(count, 8 << shift);
+        subptr(count, 8 << shift);
         jcc(Assembler::greaterEqual, L_fill_32_bytes_loop);
 
         BIND(L_check_fill_8_bytes);
       }
-      addl(count, 8 << shift);
+      addptr(count, 8 << shift);
       jccb(Assembler::zero, L_exit);
       jmpb(L_fill_8_bytes);
 
@@ -6457,7 +6457,7 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
       movq(Address(to, 0), xtmp);
       addptr(to, 8);
       BIND(L_fill_8_bytes);
-      subl(count, 1 << (shift + 1));
+      subptr(count, 1 << (shift + 1));
       jcc(Assembler::greaterEqual, L_fill_8_bytes_loop);
     }
   }
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
index e6305ded696..13b036a70aa 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -4122,7 +4122,7 @@ class StubGenerator: public StubCodeGenerator {
 
     // Initialize table for copy memory (arraycopy) check.
     if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(16);
+      UnsafeCopyMemory::create_table(16 + 4); // 16 for copyMemory; 4 for setMemory
     }
 
     StubRoutines::x86::_verify_mxcsr_entry         = generate_verify_mxcsr();
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index fecefcea0ee..1a66ba6a55b 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -4058,7 +4058,7 @@ void StubGenerator::generate_initial_stubs() {
 
   // Initialize table for unsafe copy memeory check.
   if (UnsafeCopyMemory::_table == nullptr) {
-    UnsafeCopyMemory::create_table(16);
+    UnsafeCopyMemory::create_table(16 + 4); // 16 for copyMemory; 4 for setMemory
   }
 
   // entry points that exist in all platforms Note: This is code
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
index e573ea98c14..725932b9e03 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
@@ -268,6 +268,14 @@ class StubGenerator: public StubCodeGenerator {
                                address byte_copy_entry, address short_copy_entry,
                                address int_copy_entry, address long_copy_entry);
 
+  // Generate 'unsafe' set memory stub
+  // Though just as safe as the other stubs, it takes an unscaled
+  // size_t argument instead of an element count.
+  //
+  // Examines the alignment of the operands and dispatches
+  // to an int, short, or byte copy loop.
+  address generate_unsafe_setmemory(const char *name, address byte_copy_entry);
+
   // Perform range checks on the proposed arraycopy.
   // Kills temp, but nothing else.
   // Also, clean the sign bits of src_pos and dst_pos.
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
index 8e77b9cc6c7..27406792f60 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -152,6 +152,8 @@ void StubGenerator::generate_arraycopy_stubs() {
   StubRoutines::_arrayof_jshort_fill = generate_fill(T_SHORT, true, "arrayof_jshort_fill");
   StubRoutines::_arrayof_jint_fill = generate_fill(T_INT, true, "arrayof_jint_fill");
 
+  StubRoutines::_unsafe_setmemory = generate_unsafe_setmemory("unsafe_setmemory", StubRoutines::_jbyte_fill);
+
   // We don't generate specialized code for HeapWord-aligned source
   // arrays, so just use the code we've already generated
   StubRoutines::_arrayof_jbyte_disjoint_arraycopy  = StubRoutines::_jbyte_disjoint_arraycopy;
@@ -1620,7 +1622,11 @@ address StubGenerator::generate_fill(BasicType t, bool aligned, const char *name
 
   __ enter(); // required for proper stackwalking of RuntimeStub frame
 
-  __ generate_fill(t, aligned, to, value, r11, rax, xmm0);
+  {
+    // Add set memory mark to protect against unsafe accesses faulting
+    UnsafeCopyMemoryMark usmm(this, ((t == T_BYTE) && !aligned), true);
+    __ generate_fill(t, aligned, to, value, r11, rax, xmm0);
+  }
 
   __ vzeroupper();
   __ leave(); // required for proper stackwalking of RuntimeStub frame
@@ -2477,6 +2483,202 @@ address StubGenerator::generate_unsafe_copy(const char *name,
 }
 
 
+// Static enum for helper
+enum USM_TYPE {USM_SHORT, USM_DWORD, USM_QUADWORD};
+// Helper for generate_unsafe_setmemory
+//
+// Atomically fill an array of memory using 2-, 4-, or 8-byte chunks
+static void do_setmemory_atomic_loop(USM_TYPE type, Register dest,
+                                     Register size, Register wide_value,
+                                     Register tmp, Label& L_exit,
+                                     MacroAssembler *_masm) {
+  Label L_Loop, L_Tail, L_TailLoop;
+
+  int shiftval = 0;
+  int incr = 0;
+
+  switch (type) {
+    case USM_SHORT:
+      shiftval = 1;
+      incr = 16;
+      break;
+    case USM_DWORD:
+      shiftval = 2;
+      incr = 32;
+      break;
+    case USM_QUADWORD:
+      shiftval = 3;
+      incr = 64;
+      break;
+  }
+
+  // At this point, we know the lower bits of size are zero
+  __ shrq(size, shiftval);
+  // size now has number of X-byte chunks (2, 4 or 8)
+
+  // Number of (8*X)-byte chunks into tmp
+  __ movq(tmp, size);
+  __ shrq(tmp, 3);
+  __ jccb(Assembler::zero, L_Tail);
+
+  __ BIND(L_Loop);
+
+  // Unroll 8 stores
+  for (int i = 0; i < 8; i++) {
+    switch (type) {
+      case USM_SHORT:
+        __ movw(Address(dest, (2 * i)), wide_value);
+        break;
+      case USM_DWORD:
+        __ movl(Address(dest, (4 * i)), wide_value);
+        break;
+      case USM_QUADWORD:
+        __ movq(Address(dest, (8 * i)), wide_value);
+        break;
+    }
+  }
+  __ addq(dest, incr);
+  __ decrementq(tmp);
+  __ jccb(Assembler::notZero, L_Loop);
+
+  __ BIND(L_Tail);
+
+  // Find number of remaining X-byte chunks
+  __ andq(size, 0x7);
+
+  // If zero, then we're done
+  __ jccb(Assembler::zero, L_exit);
+
+  __ BIND(L_TailLoop);
+
+    switch (type) {
+      case USM_SHORT:
+        __ movw(Address(dest, 0), wide_value);
+        break;
+      case USM_DWORD:
+        __ movl(Address(dest, 0), wide_value);
+        break;
+      case USM_QUADWORD:
+        __ movq(Address(dest, 0), wide_value);
+        break;
+    }
+  __ addq(dest, incr >> 3);
+  __ decrementq(size);
+  __ jccb(Assembler::notZero, L_TailLoop);
+}
+
+//  Generate 'unsafe' set memory stub
+//  Though just as safe as the other stubs, it takes an unscaled
+//  size_t (# bytes) argument instead of an element count.
+//
+//  Input:
+//    c_rarg0   - destination array address
+//    c_rarg1   - byte count (size_t)
+//    c_rarg2   - byte value
+//
+// Examines the alignment of the operands and dispatches
+// to an int, short, or byte fill loop.
+//
+address StubGenerator::generate_unsafe_setmemory(const char *name,
+                                                 address unsafe_byte_fill) {
+  __ align(CodeEntryAlignment);
+  StubCodeMark mark(this, "StubRoutines", name);
+  address start = __ pc();
+  __ enter();   // required for proper stackwalking of RuntimeStub frame
+
+  assert(unsafe_byte_fill != nullptr, "Invalid call");
+
+  // bump this on entry, not on exit:
+  INC_COUNTER_NP(SharedRuntime::_unsafe_set_memory_ctr, rscratch1);
+
+  {
+    Label L_exit, L_fillQuadwords, L_fillDwords, L_fillBytes;
+
+    const Register dest = c_rarg0;
+    const Register size = c_rarg1;
+    const Register byteVal = c_rarg2;
+    const Register wide_value = rax;
+    const Register rScratch1 = r10;
+
+    assert_different_registers(dest, size, byteVal, wide_value, rScratch1);
+
+    //     fill_to_memory_atomic(unsigned char*, unsigned long, unsigned char)
+
+    __ testq(size, size);
+    __ jcc(Assembler::zero, L_exit);
+
+    // Propagate byte to full Register
+    __ movzbl(rScratch1, byteVal);
+    __ mov64(wide_value, 0x0101010101010101ULL);
+    __ imulq(wide_value, rScratch1);
+
+    // Check for pointer & size alignment
+    __ movq(rScratch1, dest);
+    __ orq(rScratch1, size);
+
+    __ testb(rScratch1, 7);
+    __ jcc(Assembler::equal, L_fillQuadwords);
+
+    __ testb(rScratch1, 3);
+    __ jcc(Assembler::equal, L_fillDwords);
+
+    __ testb(rScratch1, 1);
+    __ jcc(Assembler::notEqual, L_fillBytes);
+
+    // Fill words
+    {
+      Label L_wordsTail, L_wordsLoop, L_wordsTailLoop;
+      UnsafeCopyMemoryMark usmm(this, true, true);
+
+      // At this point, we know the lower bit of size is zero and a
+      // multiple of 2
+      do_setmemory_atomic_loop(USM_SHORT, dest, size, wide_value, rScratch1,
+                               L_exit, _masm);
+    }
+    __ jmpb(L_exit);
+
+    __ BIND(L_fillQuadwords);
+
+    // Fill QUADWORDs
+    {
+      Label L_qwordLoop, L_qwordsTail, L_qwordsTailLoop;
+      UnsafeCopyMemoryMark usmm(this, true, true);
+
+      // At this point, we know the lower 3 bits of size are zero and a
+      // multiple of 8
+      do_setmemory_atomic_loop(USM_QUADWORD, dest, size, wide_value, rScratch1,
+                               L_exit, _masm);
+    }
+    __ BIND(L_exit);
+
+    __ leave();   // required for proper stackwalking of RuntimeStub frame
+    __ ret(0);
+
+    __ BIND(L_fillDwords);
+
+    // Fill DWORDs
+    {
+      Label L_dwordLoop, L_dwordsTail, L_dwordsTailLoop;
+      UnsafeCopyMemoryMark usmm(this, true, true);
+
+      // At this point, we know the lower 2 bits of size are zero and a
+      // multiple of 4
+      do_setmemory_atomic_loop(USM_DWORD, dest, size, wide_value, rScratch1,
+                               L_exit, _masm);
+    }
+    __ jmpb(L_exit);
+
+    __ BIND(L_fillBytes);
+    // Set up for tail call to previously generated byte fill routine
+    // Parameter order is (ptr, byteVal, size)
+    __ xchgq(c_rarg1, c_rarg2);
+    __ leave();    // Clear effect of enter()
+    __ jump(RuntimeAddress(unsafe_byte_fill));
+  }
+
+  return start;
+}
+
 // Perform range checks on the proposed arraycopy.
 // Kills temp, but nothing else.
 // Also, clean the sign bits of src_pos and dst_pos.
diff --git a/src/hotspot/cpu/zero/stubGenerator_zero.cpp b/src/hotspot/cpu/zero/stubGenerator_zero.cpp
index c2d6e82622c..5c7772021ea 100644
--- a/src/hotspot/cpu/zero/stubGenerator_zero.cpp
+++ b/src/hotspot/cpu/zero/stubGenerator_zero.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010, 2015 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -148,6 +148,9 @@ class StubGenerator: public StubCodeGenerator {
     // Shared code tests for "null" to discover the stub is not generated.
     StubRoutines::_unsafe_arraycopy          = nullptr;
 
+    // Shared code tests for "null" to discover the stub is not generated.
+    StubRoutines::_unsafe_setmemory          = nullptr;
+
     // We don't generate specialized code for HeapWord-aligned source
     // arrays, so just use the code we've already generated
     StubRoutines::_arrayof_jbyte_disjoint_arraycopy =
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index ddc1b1c335d..37f40ebe596 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -2795,11 +2795,11 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
         nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
       }
 
-      bool is_unsafe_arraycopy = (in_native || in_java) && UnsafeCopyMemory::contains_pc(pc);
-      if (((in_vm || in_native || is_unsafe_arraycopy) && thread->doing_unsafe_access()) ||
+      bool is_unsafe_memory_access = (in_native || in_java) && UnsafeCopyMemory::contains_pc(pc);
+      if (((in_vm || in_native || is_unsafe_memory_access) && thread->doing_unsafe_access()) ||
           (nm != nullptr && nm->has_unsafe_access())) {
         address next_pc =  Assembler::locate_next_instruction(pc);
-        if (is_unsafe_arraycopy) {
+        if (is_unsafe_memory_access) {
           next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
         }
         return Handle_Exception(exceptionInfo, SharedRuntime::handle_unsafe_access(thread, next_pc));
diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
index 8711c9a89b3..a3101c02285 100644
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
@@ -340,10 +340,10 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // underlying file has been truncated. Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = cb ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_arraycopy = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
-        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_arraycopy) {
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = pc + 4;
-          if (is_unsafe_arraycopy) {
+          if (is_unsafe_memory_access) {
             next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
           }
           next_pc = SharedRuntime::handle_unsafe_access(thread, next_pc);
diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
index 3dfe9e30f79..436c68f5a30 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
@@ -257,10 +257,10 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_arraycopy = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
-        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_arraycopy) {
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = pc + NativeCall::instruction_size;
-          if (is_unsafe_arraycopy) {
+          if (is_unsafe_memory_access) {
             next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
index 593f6494540..35ee2de2aa2 100644
--- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
+++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
@@ -441,19 +441,17 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_arraycopy = thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc);
-        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_arraycopy) {
+        bool is_unsafe_memory_access = thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc);
+        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = Assembler::locate_next_instruction(pc);
-          if (is_unsafe_arraycopy) {
+          if (is_unsafe_memory_access) {
             next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
         }
-      }
-      else
-
+      } else
 #ifdef AMD64
-      if (sig == SIGFPE  &&
+      if (sig == SIGFPE &&
           (info->si_code == FPE_INTDIV || info->si_code == FPE_FLTDIV
            // Workaround for macOS ARM incorrectly reporting FPE_FLTINV for "div by 0"
            // instead of the expected FPE_FLTDIV when running x86_64 binary under Rosetta emulation
diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
index e1c9dc8a13a..fc6cbe5faf0 100644
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
@@ -240,10 +240,10 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_arraycopy = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
-        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_arraycopy) {
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = pc + NativeCall::instruction_size;
-          if (is_unsafe_arraycopy) {
+          if (is_unsafe_memory_access) {
             next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
index 6f9ac548ce1..5b5364e1117 100644
--- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
+++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
@@ -324,17 +324,22 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        if ((nm != nullptr && nm->has_unsafe_access()) || (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc))) {
+        if ((nm != nullptr && nm->has_unsafe_access()) ||
+            (thread->doing_unsafe_access() &&
+             UnsafeCopyMemory::contains_pc(pc))) {
           unsafe_access = true;
         }
       } else if (sig == SIGSEGV &&
                  MacroAssembler::uses_implicit_null_check(info->si_addr)) {
-          // Determination of interpreter/vtable stub/compiled code null exception
-          CodeBlob* cb = CodeCache::find_blob(pc);
-          if (cb != nullptr) {
-            stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
-          }
-      } else if (sig == SIGILL && *(int *)pc == NativeInstruction::not_entrant_illegal_instruction) {
+        // Determination of interpreter/vtable stub/compiled code null exception
+        CodeBlob* cb = CodeCache::find_blob(pc);
+        if (cb != nullptr) {
+          stub = SharedRuntime::continuation_for_implicit_exception(
+              thread, pc, SharedRuntime::IMPLICIT_NULL);
+        }
+      } else if (sig == SIGILL &&
+                 *(int*)pc ==
+                     NativeInstruction::not_entrant_illegal_instruction) {
         // Not entrant
         stub = SharedRuntime::get_handle_wrong_method_stub();
       }
diff --git a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
index 90640a6f06a..89197df4493 100644
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
@@ -355,10 +355,10 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // underlying file has been truncated. Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_arraycopy = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
-        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_arraycopy) {
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = pc + 4;
-          if (is_unsafe_arraycopy) {
+          if (is_unsafe_memory_access) {
             next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
           }
           next_pc = SharedRuntime::handle_unsafe_access(thread, next_pc);
diff --git a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
index 079c3b42a9c..ec880236793 100644
--- a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
@@ -230,10 +230,10 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_arraycopy = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
-        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_arraycopy) {
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = Assembler::locate_next_instruction(pc);
-          if (is_unsafe_arraycopy) {
+          if (is_unsafe_memory_access) {
             next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index b37a8d1f3a6..9815ff2c6ce 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -260,19 +260,17 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_arraycopy = thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc);
-        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_arraycopy) {
+        bool is_unsafe_memory_access = thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc);
+        if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = Assembler::locate_next_instruction(pc);
-          if (is_unsafe_arraycopy) {
+          if (is_unsafe_memory_access) {
             next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
         }
-      }
-      else
-
+      } else
 #ifdef AMD64
-      if (sig == SIGFPE  &&
+      if (sig == SIGFPE &&
           (info->si_code == FPE_INTDIV || info->si_code == FPE_FLTDIV)) {
         stub =
           SharedRuntime::
diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp
index 6e72b4cbac3..8d4f57165e1 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.cpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -506,6 +506,9 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
   case vmIntrinsics::_copyMemory:
     if (!InlineArrayCopy || !InlineUnsafeOps) return true;
     break;
+  case vmIntrinsics::_setMemory:
+    if (!InlineUnsafeOps) return true;
+    break;
 #ifdef COMPILER2
   case vmIntrinsics::_clone:
   case vmIntrinsics::_copyOf:
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 6104fb5683b..a0db1a65d3a 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -620,6 +620,9 @@ class methodHandle;
   do_intrinsic(_copyMemory,               jdk_internal_misc_Unsafe,     copyMemory_name, copyMemory_signature,         F_RN)     \
    do_name(     copyMemory_name,                                        "copyMemory0")                                           \
    do_signature(copyMemory_signature,                                   "(Ljava/lang/Object;JLjava/lang/Object;JJ)V")            \
+  do_intrinsic(_setMemory,                jdk_internal_misc_Unsafe,     setMemory_name,  setMemory_signature,          F_RN)     \
+   do_name(     setMemory_name,                                         "setMemory0")                                            \
+   do_signature(setMemory_signature,                                    "(Ljava/lang/Object;JJB)V")                              \
   do_intrinsic(_loadFence,                jdk_internal_misc_Unsafe,     loadFence_name, loadFence_signature,           F_R)      \
    do_name(     loadFence_name,                                         "loadFence")                                             \
    do_alias(    loadFence_signature,                                    void_method_signature)                                   \
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index a57d1f7e673..cadbba27f6e 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -342,6 +342,7 @@
   static_field(StubRoutines,                _generic_arraycopy,                               address)                               \
   static_field(StubRoutines,                _array_sort,                                      address)                               \
   static_field(StubRoutines,                _array_partition,                                 address)                               \
+  static_field(StubRoutines,                _unsafe_setmemory,                                address)                               \
                                                                                                                                      \
   static_field(StubRoutines,                _aescrypt_encryptBlock,                           address)                               \
   static_field(StubRoutines,                _aescrypt_decryptBlock,                           address)                               \
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index 25dfee91a91..dc15e82dff8 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -257,6 +257,9 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_copyMemory:
     if (StubRoutines::unsafe_arraycopy() == nullptr) return false;
     break;
+  case vmIntrinsics::_setMemory:
+    if (StubRoutines::unsafe_setmemory() == nullptr) return false;
+    break;
   case vmIntrinsics::_electronicCodeBook_encryptAESCrypt:
     if (StubRoutines::electronicCodeBook_encryptAESCrypt() == nullptr) return false;
     break;
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 88a395feb64..b018fcf5097 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -507,6 +507,7 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_writebackPostSync0:       return inline_unsafe_writebackSync0(false);
   case vmIntrinsics::_allocateInstance:         return inline_unsafe_allocate();
   case vmIntrinsics::_copyMemory:               return inline_unsafe_copyMemory();
+  case vmIntrinsics::_setMemory:                return inline_unsafe_setMemory();
   case vmIntrinsics::_getLength:                return inline_native_getLength();
   case vmIntrinsics::_copyOf:                   return inline_array_copyOf(false);
   case vmIntrinsics::_copyOfRange:              return inline_array_copyOf(true);
@@ -4948,6 +4949,57 @@ bool LibraryCallKit::inline_unsafe_copyMemory() {
   return true;
 }
 
+// unsafe_setmemory(void *base, ulong offset, size_t length, char fill_value);
+// Fill 'length' bytes starting from 'base[offset]' with 'fill_value'
+bool LibraryCallKit::inline_unsafe_setMemory() {
+  if (callee()->is_static())  return false;  // caller must have the capability!
+  null_check_receiver();  // null-check receiver
+  if (stopped())  return true;
+
+  C->set_has_unsafe_access(true);  // Mark eventual nmethod as "unsafe".
+
+  Node* dst_base =         argument(1);  // type: oop
+  Node* dst_off  = ConvL2X(argument(2)); // type: long
+  Node* size     = ConvL2X(argument(4)); // type: long
+  Node* byte     =         argument(6);  // type: byte
+
+  assert(Unsafe_field_offset_to_byte_offset(11) == 11,
+         "fieldOffset must be byte-scaled");
+
+  Node* dst_addr = make_unsafe_address(dst_base, dst_off);
+
+  Node* thread = _gvn.transform(new ThreadLocalNode());
+  Node* doing_unsafe_access_addr = basic_plus_adr(top(), thread, in_bytes(JavaThread::doing_unsafe_access_offset()));
+  BasicType doing_unsafe_access_bt = T_BYTE;
+  assert((sizeof(bool) * CHAR_BIT) == 8, "not implemented");
+
+  // update volatile field
+  store_to_memory(control(), doing_unsafe_access_addr, intcon(1), doing_unsafe_access_bt, Compile::AliasIdxRaw, MemNode::unordered);
+
+  int flags = RC_LEAF | RC_NO_FP;
+
+  const TypePtr* dst_type = TypePtr::BOTTOM;
+
+  // Adjust memory effects of the runtime call based on input values.
+  if (!has_wide_mem(_gvn, dst_addr, dst_base)) {
+    dst_type = _gvn.type(dst_addr)->is_ptr(); // narrow out memory
+
+    flags |= RC_NARROW_MEM; // narrow in memory
+  }
+
+  // Call it.  Note that the length argument is not scaled.
+  make_runtime_call(flags,
+                    OptoRuntime::make_setmemory_Type(),
+                    StubRoutines::unsafe_setmemory(),
+                    "unsafe_setmemory",
+                    dst_type,
+                    dst_addr, size XTOP, byte);
+
+  store_to_memory(control(), doing_unsafe_access_addr, intcon(0), doing_unsafe_access_bt, Compile::AliasIdxRaw, MemNode::unordered);
+
+  return true;
+}
+
 #undef XTOP
 
 //------------------------clone_coping-----------------------------------
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index 47f9d7d4713..cb4f34a0db6 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -231,6 +231,7 @@ class LibraryCallKit : public GraphKit {
   bool inline_unsafe_writeback0();
   bool inline_unsafe_writebackSync0(bool is_pre);
   bool inline_unsafe_copyMemory();
+  bool inline_unsafe_setMemory();
 
   bool inline_native_currentCarrierThread();
   bool inline_native_currentThread();
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 605c95316e2..2c021504785 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -771,6 +771,29 @@ const TypeFunc* OptoRuntime::void_void_Type() {
  }
 
 
+// Takes as parameters:
+// void *dest
+// long size
+// uchar byte
+const TypeFunc* OptoRuntime::make_setmemory_Type() {
+  // create input type (domain)
+  int argcnt = NOT_LP64(3) LP64_ONLY(4);
+  const Type** fields = TypeTuple::fields(argcnt);
+  int argp = TypeFunc::Parms;
+  fields[argp++] = TypePtr::NOTNULL;        // dest
+  fields[argp++] = TypeX_X;                 // size
+  LP64_ONLY(fields[argp++] = Type::HALF);   // size
+  fields[argp++] = TypeInt::UBYTE;          // bytevalue
+  assert(argp == TypeFunc::Parms+argcnt, "correct decoding");
+  const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
+
+  // no result type needed
+  fields = TypeTuple::fields(1);
+  fields[TypeFunc::Parms+0] = nullptr; // void
+  const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
+  return TypeFunc::make(domain, range);
+}
+
 // arraycopy stub variations:
 enum ArrayCopyType {
   ac_fast,                      // void(ptr, ptr, size_t)
diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp
index b85542423e8..30656044cbb 100644
--- a/src/hotspot/share/opto/runtime.hpp
+++ b/src/hotspot/share/opto/runtime.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -266,6 +266,8 @@ private:
   static const TypeFunc* generic_arraycopy_Type();
   static const TypeFunc* slow_arraycopy_Type();   // the full routine
 
+  static const TypeFunc* make_setmemory_Type();
+
   static const TypeFunc* array_fill_Type();
 
   static const TypeFunc* array_sort_Type();
diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp
index dcc47f0f64e..88672fe16b9 100644
--- a/src/hotspot/share/prims/unsafe.cpp
+++ b/src/hotspot/share/prims/unsafe.cpp
@@ -393,7 +393,12 @@ UNSAFE_ENTRY_SCOPED(void, Unsafe_SetMemory0(JNIEnv *env, jobject unsafe, jobject
 
   {
     GuardUnsafeAccess guard(thread);
-    Copy::fill_to_memory_atomic(p, sz, value);
+    if (StubRoutines::unsafe_setmemory() != nullptr) {
+      MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, thread));
+      StubRoutines::UnsafeSetMemory_stub()(p, sz, value);
+    } else {
+      Copy::fill_to_memory_atomic(p, sz, value);
+    }
   }
 } UNSAFE_END
 
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 299f1900906..802ef22ed62 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -176,6 +176,7 @@ uint SharedRuntime::_generic_array_copy_ctr=0;
 uint SharedRuntime::_slow_array_copy_ctr=0;
 uint SharedRuntime::_find_handler_ctr=0;
 uint SharedRuntime::_rethrow_ctr=0;
+uint SharedRuntime::_unsafe_set_memory_ctr=0;
 
 int     SharedRuntime::_ICmiss_index                    = 0;
 int     SharedRuntime::_ICmiss_count[SharedRuntime::maxICmiss_count];
@@ -541,7 +542,6 @@ address SharedRuntime::raw_exception_handler_for_return_address(JavaThread* curr
     tty->print_cr("b) other problem");
   }
 #endif // PRODUCT
-
   ShouldNotReachHere();
   return nullptr;
 }
@@ -1983,6 +1983,7 @@ void SharedRuntime::print_statistics() {
   if (_slow_array_copy_ctr) tty->print_cr("%5u slow array copies", _slow_array_copy_ctr);
   if (_find_handler_ctr) tty->print_cr("%5u find exception handler", _find_handler_ctr);
   if (_rethrow_ctr) tty->print_cr("%5u rethrow handler", _rethrow_ctr);
+  if (_unsafe_set_memory_ctr) tty->print_cr("%5u unsafe set memorys", _unsafe_set_memory_ctr);
 
   AdapterHandlerLibrary::print_statistics();
 
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index 93182a10126..46a20465656 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -546,6 +546,8 @@ class SharedRuntime: AllStatic {
   static uint _generic_array_copy_ctr;     // Slow-path includes type decoding
   static uint _slow_array_copy_ctr;        // Slow-path failed out to a method call
 
+  static uint _unsafe_set_memory_ctr;      // Slow-path includes alignment checks
+
   static uint _new_instance_ctr;           // 'new' object requires GC
   static uint _new_array_ctr;              // 'new' array requires GC
   static uint _multi2_ctr, _multi3_ctr, _multi4_ctr, _multi5_ctr;
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index 4e5cd7f0389..550f289bf3c 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -110,6 +110,8 @@ address StubRoutines::_checkcast_arraycopy_uninit        = nullptr;
 address StubRoutines::_unsafe_arraycopy                  = nullptr;
 address StubRoutines::_generic_arraycopy                 = nullptr;
 
+address StubRoutines::_unsafe_setmemory                  = nullptr;
+
 address StubRoutines::_jbyte_fill;
 address StubRoutines::_jshort_fill;
 address StubRoutines::_jint_fill;
diff --git a/src/hotspot/share/runtime/stubRoutines.hpp b/src/hotspot/share/runtime/stubRoutines.hpp
index d7adf320131..4cb031799e4 100644
--- a/src/hotspot/share/runtime/stubRoutines.hpp
+++ b/src/hotspot/share/runtime/stubRoutines.hpp
@@ -193,6 +193,8 @@ class StubRoutines: AllStatic {
   static address _unsafe_arraycopy;
   static address _generic_arraycopy;
 
+  static address _unsafe_setmemory;
+
   static address _jbyte_fill;
   static address _jshort_fill;
   static address _jint_fill;
@@ -384,6 +386,11 @@ class StubRoutines: AllStatic {
   typedef void (*UnsafeArrayCopyStub)(const void* src, void* dst, size_t count);
   static UnsafeArrayCopyStub UnsafeArrayCopy_stub()         { return CAST_TO_FN_PTR(UnsafeArrayCopyStub,  _unsafe_arraycopy); }
 
+  static address unsafe_setmemory()     { return _unsafe_setmemory; }
+
+  typedef void (*UnsafeSetMemoryStub)(const void* src, size_t count, char byte);
+  static UnsafeSetMemoryStub UnsafeSetMemory_stub()         { return CAST_TO_FN_PTR(UnsafeSetMemoryStub,  _unsafe_setmemory); }
+
   static address generic_arraycopy()   { return _generic_arraycopy; }
   static address select_arraysort_function() { return _array_sort; }
   static address select_array_partition_function() { return _array_partition; }
diff --git a/src/hotspot/share/utilities/copy.cpp b/src/hotspot/share/utilities/copy.cpp
index ed779796943..2eda39fae54 100644
--- a/src/hotspot/share/utilities/copy.cpp
+++ b/src/hotspot/share/utilities/copy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -211,42 +211,43 @@ void Copy::conjoint_swap(const void* src, void* dst, size_t byte_count, size_t e
 
 // Fill bytes; larger units are filled atomically if everything is aligned.
 void Copy::fill_to_memory_atomic(void* to, size_t size, jubyte value) {
-  address dst = (address) to;
-  uintptr_t bits = (uintptr_t) to | (uintptr_t) size;
+  address dst = (address)to;
+  uintptr_t bits = (uintptr_t)to | (uintptr_t)size;
   if (bits % sizeof(jlong) == 0) {
-    jlong fill = (julong)( (jubyte)value ); // zero-extend
+    jlong fill = (julong)((jubyte)value);  // zero-extend
     if (fill != 0) {
       fill += fill << 8;
       fill += fill << 16;
       fill += fill << 32;
     }
-    //Copy::fill_to_jlongs_atomic((jlong*) dst, size / sizeof(jlong));
+    // Copy::fill_to_jlongs_atomic((jlong*) dst, size / sizeof(jlong));
     for (uintptr_t off = 0; off < size; off += sizeof(jlong)) {
       *(jlong*)(dst + off) = fill;
     }
   } else if (bits % sizeof(jint) == 0) {
-    jint fill = (juint)( (jubyte)value ); // zero-extend
+    jint fill = (juint)((jubyte)value);  // zero-extend
     if (fill != 0) {
       fill += fill << 8;
       fill += fill << 16;
     }
-    //Copy::fill_to_jints_atomic((jint*) dst, size / sizeof(jint));
+    // Copy::fill_to_jints_atomic((jint*) dst, size / sizeof(jint));
     for (uintptr_t off = 0; off < size; off += sizeof(jint)) {
       *(jint*)(dst + off) = fill;
     }
   } else if (bits % sizeof(jshort) == 0) {
-    jshort fill = (jushort)( (jubyte)value ); // zero-extend
+    jshort fill = (jushort)((jubyte)value);  // zero-extend
     fill += (jshort)(fill << 8);
-    //Copy::fill_to_jshorts_atomic((jshort*) dst, size / sizeof(jshort));
+    // Copy::fill_to_jshorts_atomic((jshort*) dst, size / sizeof(jshort));
     for (uintptr_t off = 0; off < size; off += sizeof(jshort)) {
       *(jshort*)(dst + off) = fill;
     }
   } else {
     // Not aligned, so no need to be atomic.
 #ifdef MUSL_LIBC
-    // This code is used by Unsafe and may hit the next page after truncation of mapped memory.
-    // Therefore, we use volatile to prevent compilers from replacing the loop by memset which
-    // may not trigger SIGBUS as needed (observed on Alpine Linux x86_64)
+    // This code is used by Unsafe and may hit the next page after truncation
+    // of mapped memory. Therefore, we use volatile to prevent compilers from
+    // replacing the loop by memset which may not trigger SIGBUS as needed
+    // (observed on Alpine Linux x86_64)
     jbyte fill = value;
     for (uintptr_t off = 0; off < size; off += sizeof(jbyte)) {
       *(volatile jbyte*)(dst + off) = fill;
diff --git a/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
index eab07313da2..9c81c053e57 100644
--- a/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
+++ b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
@@ -3824,6 +3824,7 @@ public final class Unsafe {
     private native long allocateMemory0(long bytes);
     private native long reallocateMemory0(long address, long bytes);
     private native void freeMemory0(long address);
+    @IntrinsicCandidate
     private native void setMemory0(Object o, long offset, long bytes, byte value);
     @IntrinsicCandidate
     private native void copyMemory0(Object srcBase, long srcOffset, Object destBase, long destOffset, long bytes);
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentZeroUnsafe.java b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentZeroUnsafe.java
new file mode 100644
index 00000000000..ba705e2ecd4
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentZeroUnsafe.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+ package org.openjdk.bench.java.lang.foreign;
+
+import sun.misc.Unsafe;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Setup;
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@State(org.openjdk.jmh.annotations.Scope.Thread)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(value = 3, jvmArgsAppend = {"--enable-native-access=ALL-UNNAMED"})
+public class MemorySegmentZeroUnsafe {
+
+    static final Unsafe UNSAFE = Utils.unsafe;
+    long src;
+
+    @Param({"1", "2", "3", "4", "5", "6", "7", "8", "15", "16", "63", "64", "255", "256"})
+    public int size;
+
+    @Param({"true", "false"})
+    public boolean aligned;
+
+    private MemorySegment segment;
+    private long address;
+
+    @Setup
+    public void setup() throws Throwable {
+        Arena arena = Arena.global();
+        long alignment = 1;
+        // this complex logic is to ensure that if in the future we decide to batch writes with different
+        // batches based on alignment, we would spot it here
+        if (size == 2 || size == 3) {
+            alignment = 2;
+        } else if (size >= 4 && size <= 7) {
+            alignment = 4;
+        } else {
+            alignment = 8;
+        }
+        if (aligned) {
+            segment = arena.allocate(size, alignment);
+        } else {
+            // forcibly misaligned in both address AND size, given that would be the worst case
+            segment = arena.allocate(size + 1, alignment).asSlice(1);
+        }
+        address = segment.address();
+    }
+
+    @Benchmark
+    public void panama() {
+        segment.fill((byte) 0);
+    }
+
+    @Benchmark
+    public void unsafe() {
+        UNSAFE.setMemory(address, size, (byte) 0);
+    }
+}

From 20546c1ea064daa8e2faa71142904ea2c62b3311 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 22 Apr 2024 06:07:07 +0000
Subject: [PATCH 123/486] 8330004: Refactor cloning down code in Split If for
 Template Assertion Predicates

Reviewed-by: epeter, kvn
---
 src/hotspot/share/opto/loopTransform.cpp      |  56 ++-------
 src/hotspot/share/opto/loopnode.hpp           |  11 +-
 src/hotspot/share/opto/node.hpp               |  16 +++
 src/hotspot/share/opto/predicates.cpp         |  24 +++-
 src/hotspot/share/opto/predicates.hpp         |  73 +++++++++--
 src/hotspot/share/opto/split_if.cpp           |  41 +++---
 .../assertion/TestSplitIfCloningDown.java     | 117 ++++++++++++++++++
 7 files changed, 255 insertions(+), 83 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/predicates/assertion/TestSplitIfCloningDown.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 516036d839b..24861cf2725 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1430,40 +1430,6 @@ void PhaseIdealLoop::copy_assertion_predicates_to_main_loop_helper(const Predica
   }
 }
 
-// Is 'n' a node that can be found on the input chain of a Template Assertion Predicate bool (i.e. between a Template
-// Assertion Predicate If node and the OpaqueLoop* nodes)?
-static bool is_part_of_template_assertion_predicate_bool(Node* n) {
-  int op = n->Opcode();
-  return (n->is_Bool() ||
-          n->is_Cmp() ||
-          op == Op_AndL ||
-          op == Op_OrL ||
-          op == Op_RShiftL ||
-          op == Op_LShiftL ||
-          op == Op_LShiftI ||
-          op == Op_AddL ||
-          op == Op_AddI ||
-          op == Op_MulL ||
-          op == Op_MulI ||
-          op == Op_SubL ||
-          op == Op_SubI ||
-          op == Op_ConvI2L ||
-          op == Op_CastII);
-}
-
-bool PhaseIdealLoop::subgraph_has_opaque(Node* n) {
-  if (n->Opcode() == Op_OpaqueLoopInit || n->Opcode() == Op_OpaqueLoopStride) {
-    return true;
-  }
-  if (!is_part_of_template_assertion_predicate_bool(n)) {
-    return false;
-  }
-  uint init;
-  uint stride;
-  count_opaque_loop_nodes(n, init, stride);
-  return init != 0 || stride != 0;
-}
-
 bool PhaseIdealLoop::assertion_predicate_has_loop_opaque_node(IfNode* iff) {
   uint init;
   uint stride;
@@ -1507,19 +1473,19 @@ void PhaseIdealLoop::count_opaque_loop_nodes(Node* n, uint& init, uint& stride)
   wq.push(n);
   for (uint i = 0; i < wq.size(); i++) {
     Node* n = wq.at(i);
-    if (is_part_of_template_assertion_predicate_bool(n)) {
-      for (uint j = 1; j < n->req(); j++) {
-        Node* m = n->in(j);
-        if (m != nullptr) {
-          wq.push(m);
+    if (TemplateAssertionPredicateExpressionNode::is_maybe_in_expression(n)) {
+      if (n->is_OpaqueLoopInit()) {
+        init++;
+      } else if (n->is_OpaqueLoopStride()) {
+        stride++;
+      } else {
+        for (uint j = 1; j < n->req(); j++) {
+          Node* m = n->in(j);
+          if (m != nullptr) {
+            wq.push(m);
+          }
         }
       }
-      continue;
-    }
-    if (n->Opcode() == Op_OpaqueLoopInit) {
-      init++;
-    } else if (n->Opcode() == Op_OpaqueLoopStride) {
-      stride++;
     }
   }
 }
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 658da04f209..75276aae36d 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -951,7 +951,6 @@ private:
                                                  Node* uncommon_proj, Node* control, IdealLoopTree* outer_loop,
                                                  Node* input_proj);
   static void count_opaque_loop_nodes(Node* n, uint& init, uint& stride);
-  static bool subgraph_has_opaque(Node* n);
   static bool assertion_predicate_has_loop_opaque_node(IfNode* iff);
   static void get_assertion_predicates(Node* predicate, Unique_Node_List& list, bool get_opaque = false);
   void update_main_loop_assertion_predicates(Node* ctrl, CountedLoopNode* loop_head, Node* init, int stride_con);
@@ -1759,14 +1758,12 @@ public:
 
   void finish_clone_loop(Node_List* split_if_set, Node_List* split_bool_set, Node_List* split_cex_set);
 
-  bool clone_cmp_down(Node* n, const Node* blk1, const Node* blk2);
-
-  void clone_loadklass_nodes_at_cmp_index(const Node* n, Node* cmp, int i);
-
-  bool clone_cmp_loadklass_down(Node* n, const Node* blk1, const Node* blk2);
-
   bool at_relevant_ctrl(Node* n, const Node* blk1, const Node* blk2);
 
+  bool clone_cmp_loadklass_down(Node* n, const Node* blk1, const Node* blk2);
+  void clone_loadklass_nodes_at_cmp_index(const Node* n, Node* cmp, int i);
+  bool clone_cmp_down(Node* n, const Node* blk1, const Node* blk2);
+  void clone_template_assertion_predicate_expression_down(Node* node);
 
   Node* similar_subtype_check(const Node* x, Node* r_in);
 
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 19b9a11d9ce..bb58c2ff8ce 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1708,6 +1708,22 @@ public:
     if( !_in_worklist.test_set(b->_idx) )
       Node_List::push(b);
   }
+  void push_non_cfg_inputs_of(const Node* node) {
+    for (uint i = 1; i < node->req(); i++) {
+      Node* input = node->in(i);
+      if (input != nullptr && !input->is_CFG()) {
+        push(input);
+      }
+    }
+  }
+
+  void push_outputs_of(const Node* node) {
+    for (DUIterator_Fast imax, i = node->fast_outs(imax); i < imax; i++) {
+      Node* output = node->fast_out(i);
+      push(output);
+    }
+  }
+
   Node *pop() {
     if( _clock_index >= size() ) _clock_index = 0;
     Node *b = at(_clock_index);
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 997a05dc1f2..7f873e1fb6f 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -323,7 +323,7 @@ Opaque4Node* TemplateAssertionPredicateExpression::clone(const TransformStrategy
   auto is_opaque_loop_node = [](const Node* node) {
     return node->is_Opaque1();
   };
-  DataNodesOnPathsToTargets data_nodes_on_path_to_targets(TemplateAssertionPredicateExpression::maybe_contains,
+  DataNodesOnPathsToTargets data_nodes_on_path_to_targets(TemplateAssertionPredicateExpressionNode::is_maybe_in_expression,
                                                           is_opaque_loop_node);
   const Unique_Node_List& collected_nodes = data_nodes_on_path_to_targets.collect(_opaque4_node);
   DataNodeGraph data_node_graph(collected_nodes, phase);
@@ -332,3 +332,25 @@ Opaque4Node* TemplateAssertionPredicateExpression::clone(const TransformStrategy
   Node* opaque4_clone = *orig_to_new.get(_opaque4_node);
   return opaque4_clone->as_Opaque4();
 }
+
+// Check if this node belongs a Template Assertion Predicate Expression (including OpaqueLoop* nodes).
+bool TemplateAssertionPredicateExpressionNode::is_in_expression(Node* node) {
+  if (is_maybe_in_expression(node)) {
+    ResourceMark rm;
+    Unique_Node_List list;
+    list.push(node);
+    for (uint i = 0; i < list.size(); i++) {
+      Node* next = list.at(i);
+      if (next->is_OpaqueLoopInit() || next->is_OpaqueLoopStride()) {
+        return true;
+      } else if (is_maybe_in_expression(next)) {
+        list.push_non_cfg_inputs_of(next);
+      }
+    }
+  }
+  return false;
+}
+
+bool TemplateAssertionPredicateExpressionNode::is_template_assertion_predicate(Node* node) {
+  return node->is_If() && node->in(1)->is_Opaque4();
+}
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index a794e31ac3b..670ca58cc47 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -283,14 +283,41 @@ class TemplateAssertionPredicateExpression : public StackObj {
   Opaque4Node* clone(const TransformStrategyForOpaqueLoopNodes& transform_strategy, Node* new_ctrl, PhaseIdealLoop* phase);
 
  public:
-  // Is 'n' a node that could be part of a Template Assertion Predicate Expression (i.e. could be found on the input
-  // chain of a Template Assertion Predicate Opaque4Node up to and including the OpaqueLoop* nodes)?
-  static bool maybe_contains(const Node* n) {
-    const int opcode = n->Opcode();
-    return (opcode == Op_OpaqueLoopInit ||
-            opcode == Op_OpaqueLoopStride ||
-            n->is_Bool() ||
-            n->is_Cmp() ||
+  Opaque4Node* clone(Node* new_ctrl, PhaseIdealLoop* phase);
+  Opaque4Node* clone_and_replace_init(Node* new_init, Node* new_ctrl,PhaseIdealLoop* phase);
+  Opaque4Node* clone_and_replace_init_and_stride(Node* new_init, Node* new_stride, Node* new_ctrl, PhaseIdealLoop* phase);
+};
+
+// Class to represent a node being part of a Template Assertion Predicate Expression.
+//
+// The expression itself can belong to no, one, or two Template Assertion Predicates:
+// - None: This node is already dead (i.e. we replaced the Bool condition of the Template Assertion Predicate).
+// - Two: A OpaqueLoopInitNode could be part of two Template Assertion Predicates.
+// - One: In all other cases.
+class TemplateAssertionPredicateExpressionNode : public StackObj {
+  Node* const _node;
+
+ public:
+  explicit TemplateAssertionPredicateExpressionNode(Node* node) : _node(node) {
+    assert(is_in_expression(node), "must be valid");
+  }
+  NONCOPYABLE(TemplateAssertionPredicateExpressionNode);
+
+ private:
+  static bool is_template_assertion_predicate(Node* node);
+
+ public:
+  // Check whether the provided node is part of a Template Assertion Predicate Expression or not.
+  static bool is_in_expression(Node* node);
+
+  // Check if the opcode of node could be found in a Template Assertion Predicate Expression.
+  // This also provides a fast check whether a node is unrelated.
+  static bool is_maybe_in_expression(const Node* node) {
+    const int opcode = node->Opcode();
+    return (node->is_OpaqueLoopInit() ||
+            node->is_OpaqueLoopStride() ||
+            node->is_Bool() ||
+            node->is_Cmp() ||
             opcode == Op_AndL ||
             opcode == Op_OrL ||
             opcode == Op_RShiftL ||
@@ -306,9 +333,33 @@ class TemplateAssertionPredicateExpression : public StackObj {
             opcode == Op_CastII);
   }
 
-  Opaque4Node* clone(Node* new_ctrl, PhaseIdealLoop* phase);
-  Opaque4Node* clone_and_replace_init(Node* new_init, Node* new_ctrl,PhaseIdealLoop* phase);
-  Opaque4Node* clone_and_replace_init_and_stride(Node* new_init, Node* new_stride, Node* new_ctrl, PhaseIdealLoop* phase);
+  // Apply the given function to all Template Assertion Predicates (if any) to which this Template Assertion Predicate
+  // Expression Node belongs to.
+  template <class Callback>
+  void for_each_template_assertion_predicate(Callback callback) {
+    ResourceMark rm;
+    Unique_Node_List list;
+    list.push(_node);
+    DEBUG_ONLY(int template_counter = 0;)
+    for (uint i = 0; i < list.size(); i++) {
+      Node* next = list.at(i);
+      if (is_template_assertion_predicate(next)) {
+        callback(next->as_If());
+        DEBUG_ONLY(template_counter++;)
+      } else {
+        assert(!next->is_CFG(), "no CFG expected in Template Assertion Predicate Expression");
+        list.push_outputs_of(next);
+      }
+    }
+
+    // Each node inside a Template Assertion Predicate Expression is in between a Template Assertion Predicate and
+    // its OpaqueLoop* nodes (or an OpaqueLoop* node itself). The OpaqueLoop* nodes do not common up. Therefore, each
+    // Template Assertion Predicate Expression node belongs to a single expression - except for OpaqueLoopInitNodes.
+    // An OpaqueLoopInitNode is shared between the init and last value Template Assertion Predicate at creation.
+    // Later, when cloning the expressions, they are no longer shared.
+    assert(template_counter <= 2, "a node cannot be part of more than two templates");
+    assert(template_counter <= 1 || _node->is_OpaqueLoopInit(), "only OpaqueLoopInit nodes can be part of two templates");
+  }
 };
 
 // This class represents a Predicate Block (i.e. either a Loop Predicate Block, a Profiled Loop Predicate Block,
diff --git a/src/hotspot/share/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp
index 0b7faffda00..70369a2c9c4 100644
--- a/src/hotspot/share/opto/split_if.cpp
+++ b/src/hotspot/share/opto/split_if.cpp
@@ -95,25 +95,7 @@ bool PhaseIdealLoop::split_up( Node *n, Node *blk1, Node *blk2 ) {
     return true;
   }
 
-  if (subgraph_has_opaque(n)) {
-    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(assertion_predicate_has_loop_opaque_node(m->as_If()), "opaque node not reachable from if?");
-        TemplateAssertionPredicateExpression template_assertion_predicate_expression(m->in(1)->as_Opaque4());
-        Opaque4Node* cloned_opaque4_node = template_assertion_predicate_expression.clone(m->in(0), this);
-        _igvn.replace_input_of(m, 1, cloned_opaque4_node);
-      } 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);
-        }
-      }
-    }
-  }
+  clone_template_assertion_predicate_expression_down(n);
 
   if (n->Opcode() == Op_OpaqueZeroTripGuard) {
     // If this Opaque1 is part of the zero trip guard for a loop:
@@ -427,6 +409,27 @@ bool PhaseIdealLoop::clone_cmp_down(Node* n, const Node* blk1, const Node* blk2)
   return false;
 }
 
+// 'n' could be a node belonging to a Template Assertion Predicate Expression (i.e. any node between a Template
+// Assertion Predicate and its OpaqueLoop* nodes (included)). We cannot simply split this node up since this would
+// create a phi node inside the Template Assertion Predicate Expression - making it unrecognizable as such. Therefore,
+// we completely clone the entire Template Assertion Predicate Expression "down". This ensures that we have an
+// untouched copy that is still recognized by the Template Assertion Predicate matching code.
+void PhaseIdealLoop::clone_template_assertion_predicate_expression_down(Node* node) {
+  if (!TemplateAssertionPredicateExpressionNode::is_in_expression(node)) {
+    return;
+  }
+
+  TemplateAssertionPredicateExpressionNode template_assertion_predicate_expression_node(node);
+  auto clone_expression = [&](IfNode* template_assertion_predicate) {
+    Opaque4Node* opaque4_node = template_assertion_predicate->in(1)->as_Opaque4();
+    TemplateAssertionPredicateExpression template_assertion_predicate_expression(opaque4_node);
+    Node* new_ctrl = template_assertion_predicate->in(0);
+    Opaque4Node* cloned_opaque4_node = template_assertion_predicate_expression.clone(new_ctrl, this);
+    igvn().replace_input_of(template_assertion_predicate, 1, cloned_opaque4_node);
+  };
+  template_assertion_predicate_expression_node.for_each_template_assertion_predicate(clone_expression);
+}
+
 //------------------------------register_new_node------------------------------
 void PhaseIdealLoop::register_new_node( Node *n, Node *blk ) {
   assert(!n->is_CFG(), "must be data node");
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestSplitIfCloningDown.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestSplitIfCloningDown.java
new file mode 100644
index 00000000000..2e7a887a7ad
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestSplitIfCloningDown.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2024, 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 8330004
+ * @summary Sanity test to exercise code to clone a Template Assertion Predicate down in Split If.
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:LoopMaxUnroll=0
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestSplitIfCloningDown::*
+ *                   compiler.predicates.assertion.TestSplitIfCloningDown
+ */
+
+/*
+ * @test id=no-flags
+ * @bug 8330004
+ * @summary Sanity test to exercise code to clone a Template Assertion Predicate down in Split If.
+ * @run main compiler.predicates.assertion.TestSplitIfCloningDown
+ */
+
+package compiler.predicates.assertion;
+
+public class TestSplitIfCloningDown {
+    static int[] iArr = new int[100];
+    static boolean flag;
+    static int iFld;
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 10000; i++) {
+            testPhiIntoNonOpaqueLoopExpressionNode();
+            testPhiIntoOpaqueLoopExpressionNode();
+        }
+    }
+
+
+    static void testPhiIntoNonOpaqueLoopExpressionNode() {
+        int zero = 34;
+        int limit = 2;
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+        }
+
+
+        for (int t = 0; t < 100; t++) { // Use outer loop such that OpaqueLoop* will get an earlier ctrl.
+            iArr = new int[1000];
+
+            // Replaced by CMove which is an input into Template Assertion Predicate Expression which
+            // is not an OpaqueLoop* node. Split If will create a phi and tries to split a Template
+            // Assertion Predicate Expression node -> Need to clone template down.
+            int a;
+            if (flag) {
+                a = 4;
+            } else {
+                a = 3;
+            }
+
+            for (int i = 0; i < 100; i++) {
+                iArr[i+a] = 34; // Hoisted with Hoisted Check Predicate and Template Assertion Predicate
+                if (i * zero < iFld) { // Unswitched after Split If to check further template cloning.
+                    return;
+                }
+            }
+        }
+    }
+
+    // Same as test above but this time the phi inputs into an OpaqueLoop* node and not a node in between.
+    static void testPhiIntoOpaqueLoopExpressionNode() {
+        int zero = 34;
+        int limit = 2;
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+        }
+
+        iArr = new int[1000];
+
+        // Replaced by CMove which is an input into Template Assertion Predicate Expression which
+        // is not an OpaqueLoop* node. Split If will create a phi and tries to split a Template
+        // Assertion Predicate Expression node -> Need to clone template down.
+        int a;
+        if (flag) {
+            a = 4;
+        } else {
+            a = 3;
+        }
+
+        for (int i = 0; i < 100; i++) {
+            iArr[i+a] = 34; // Hoisted with Hoisted Check Predicate and Template Assertion Predicate
+            if (i * zero < iFld) { // Unswitched after Split If to check further template cloning.
+                return;
+            }
+        }
+    }
+}
+

From 5394f57f002c066021d811382a336253ae9f2014 Mon Sep 17 00:00:00 2001
From: Evgeny Nikitin <enikitin@openjdk.org>
Date: Mon, 22 Apr 2024 07:41:06 +0000
Subject: [PATCH 124/486] 8330621: Make 5 compiler tests use
 ProcessTools.executeProcess

Reviewed-by: chagedorn, stefank, thartmann
---
 test/hotspot/jtreg/compiler/c2/Test7068051.java           | 8 ++++----
 .../jtreg/compiler/c2/unloaded/TestInlineUnloaded.java    | 7 ++++---
 .../jtreg/compiler/jsr292/NonInlinedCall/Agent.java       | 6 +++---
 .../profiling/spectrapredefineclass/Launcher.java         | 8 ++++----
 .../spectrapredefineclass_classloaders/Launcher.java      | 8 ++++----
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/Test7068051.java b/test/hotspot/jtreg/compiler/c2/Test7068051.java
index 6e8b9361084..f9cb813aa75 100644
--- a/test/hotspot/jtreg/compiler/c2/Test7068051.java
+++ b/test/hotspot/jtreg/compiler/c2/Test7068051.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ package compiler.c2;
 
 import jdk.test.lib.JDKToolLauncher;
 import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -133,11 +134,10 @@ public class Test7068051 {
         for (String p : params) {
             jar.addToolArg(p);
         }
-        ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
         try {
-            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            OutputAnalyzer output = ProcessTools.executeProcess(jar.getCommand());
             output.shouldHaveExitValue(0);
-        } catch (IOException ex) {
+        } catch (Exception ex) {
             throw new AssertionError("TESTBUG: jar failed.", ex);
         }
     }
diff --git a/test/hotspot/jtreg/compiler/c2/unloaded/TestInlineUnloaded.java b/test/hotspot/jtreg/compiler/c2/unloaded/TestInlineUnloaded.java
index a77f79c7dfb..d33676bd7f6 100644
--- a/test/hotspot/jtreg/compiler/c2/unloaded/TestInlineUnloaded.java
+++ b/test/hotspot/jtreg/compiler/c2/unloaded/TestInlineUnloaded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -56,6 +56,7 @@ package compiler.c2.unloaded;
 
 import jdk.test.lib.JDKToolFinder;
 import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 import java.io.IOException;
 import java.net.URL;
@@ -179,7 +180,7 @@ public class TestInlineUnloaded {
         }
     }
 
-    static void run(String testCaseName, Consumer<OutputAnalyzer> processor) throws IOException {
+    static void run(String testCaseName, Consumer<OutputAnalyzer> processor) throws Exception {
         ProcessBuilder pb = new ProcessBuilder();
 
         pb.command(JDKToolFinder.getJDKTool("java"),
@@ -192,7 +193,7 @@ public class TestInlineUnloaded {
 
         System.out.println("Command line: [" + pb.command() + "]");
 
-        OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
+        OutputAnalyzer analyzer = ProcessTools.executeProcess(pb);
 
         analyzer.shouldHaveExitValue(0);
 
diff --git a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/Agent.java b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/Agent.java
index 32f29dff973..76b66f9bc1e 100644
--- a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/Agent.java
+++ b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/Agent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ package compiler.jsr292.NonInlinedCall;
 
 import jdk.test.lib.JDKToolLauncher;
 import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 import java.io.File;
 import java.io.PrintStream;
@@ -51,8 +52,7 @@ public class Agent {
 
         System.out.println("Running jar " + Arrays.toString(jar.getCommand()));
 
-        ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
-        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        OutputAnalyzer output = ProcessTools.executeProcess(jar.getCommand());
         output.shouldHaveExitValue(0);
     }
 }
diff --git a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java
index 85d5f2b96d5..1a8ed4c7893 100644
--- a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java
+++ b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -41,6 +41,7 @@ package compiler.profiling.spectrapredefineclass;
 
 import jdk.test.lib.JDKToolLauncher;
 import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 import java.io.File;
 import java.io.IOException;
@@ -60,11 +61,10 @@ public class Launcher {
                 .addToolArg(Agent.AGENT_JAR)
                 .addToolArg(Agent.class.getName().replace('.', File.separatorChar) + ".class");
 
-        ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
         try {
-            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            OutputAnalyzer output = ProcessTools.executeProcess(jar.getCommand());
             output.shouldHaveExitValue(0);
-        } catch (IOException ex) {
+        } catch (Exception ex) {
             throw new Error("TESTBUG: jar failed.", ex);
         }
     }
diff --git a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java
index 2489e62bdb1..08765e911c0 100644
--- a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java
+++ b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -44,6 +44,7 @@ package compiler.profiling.spectrapredefineclass_classloaders;
 
 import jdk.test.lib.JDKToolLauncher;
 import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 import java.io.File;
 import java.io.IOException;
@@ -63,11 +64,10 @@ public class Launcher {
                 .addToolArg(Agent.AGENT_JAR)
                 .addToolArg(Agent.class.getName().replace('.', File.separatorChar) + ".class");
 
-        ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
         try {
-            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            OutputAnalyzer output = ProcessTools.executeProcess(jar.getCommand());
             output.shouldHaveExitValue(0);
-        } catch (IOException ex) {
+        } catch (Exception ex) {
             throw new Error("TESTBUG: jar failed.", ex);
         }
     }

From 5313dcc8f9c5bf54a2a44a1d68a690f13f15882a Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Mon, 22 Apr 2024 08:14:53 +0000
Subject: [PATCH 125/486] 8330733: Generational ZGC: Remove
 ZBarrier::verify_old_object_live_slow_path

Reviewed-by: stefank, tschatzl
---
 src/hotspot/share/gc/z/zBarrier.cpp | 12 ------------
 src/hotspot/share/gc/z/zBarrier.hpp |  2 --
 2 files changed, 14 deletions(-)

diff --git a/src/hotspot/share/gc/z/zBarrier.cpp b/src/hotspot/share/gc/z/zBarrier.cpp
index 6e1d3ee0093..c4b6e0f8239 100644
--- a/src/hotspot/share/gc/z/zBarrier.cpp
+++ b/src/hotspot/share/gc/z/zBarrier.cpp
@@ -141,18 +141,6 @@ zaddress ZBarrier::blocking_load_barrier_on_phantom_slow_path(volatile zpointer*
   return addr;
 }
 
-//
-// Clean barrier
-//
-
-zaddress ZBarrier::verify_old_object_live_slow_path(zaddress addr) {
-  // Verify that the object was indeed alive
-  assert(ZHeap::heap()->is_young(addr) || ZHeap::heap()->is_object_live(addr), "Should be live");
-
-  return addr;
-}
-
-//
 // Mark barrier
 //
 
diff --git a/src/hotspot/share/gc/z/zBarrier.hpp b/src/hotspot/share/gc/z/zBarrier.hpp
index 14ad0a655f7..4a271c1469f 100644
--- a/src/hotspot/share/gc/z/zBarrier.hpp
+++ b/src/hotspot/share/gc/z/zBarrier.hpp
@@ -108,8 +108,6 @@ private:
   static zaddress blocking_load_barrier_on_weak_slow_path(volatile zpointer* p, zaddress addr);
   static zaddress blocking_load_barrier_on_phantom_slow_path(volatile zpointer* p, zaddress addr);
 
-  static zaddress verify_old_object_live_slow_path(zaddress addr);
-
   static zaddress mark_slow_path(zaddress addr);
   static zaddress mark_young_slow_path(zaddress addr);
   static zaddress mark_from_young_slow_path(zaddress addr);

From 3d62bbf4f2ea1b37d59c8307225239a88d9e66c0 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Mon, 22 Apr 2024 08:54:29 +0000
Subject: [PATCH 126/486] 8330681: Explicit hashCode and equals for
 java.lang.runtime.SwitchBootstraps$TypePairs

Reviewed-by: jlahoda, mchung
---
 .../java/lang/runtime/SwitchBootstraps.java   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
index b7c9cb48812..f91a9ad4de3 100644
--- a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
+++ b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
@@ -82,8 +82,6 @@ public class SwitchBootstraps {
     private static final MethodTypeDesc TYPES_SWITCH_DESCRIPTOR =
             MethodTypeDesc.ofDescriptor("(Ljava/lang/Object;ILjava/util/function/BiPredicate;Ljava/util/List;)I");
 
-    private static final Map<TypePairs, String> typePairToName;
-
     static {
         try {
             NULL_CHECK = LOOKUP.findStatic(Objects.class, "isNull",
@@ -99,7 +97,6 @@ public class SwitchBootstraps {
         catch (ReflectiveOperationException e) {
             throw new ExceptionInInitializerError(e);
         }
-        typePairToName = TypePairs.initialize();
     }
 
     /**
@@ -507,7 +504,7 @@ public class SwitchBootstraps {
                             }
 
                             TypePairs typePair = TypePairs.of(Wrapper.asPrimitiveType(selectorType), classLabel);
-                            String methodName = typePairToName.get(typePair);
+                            String methodName = TypePairs.typePairToName.get(typePair);
                             cb.invokestatic(ExactConversionsSupport.class.describeConstable().orElseThrow(),
                                     methodName,
                                     MethodTypeDesc.of(ConstantDescs.CD_boolean, typePair.from.describeConstable().orElseThrow()));
@@ -684,6 +681,9 @@ public class SwitchBootstraps {
 
     // TypePairs should be in sync with the corresponding record in Lower
     record TypePairs(Class<?> from, Class<?> to) {
+
+        private static final Map<TypePairs, String> typePairToName = initialize();
+
         public static TypePairs of(Class<?> from,  Class<?> to) {
             if (from == byte.class || from == short.class || from == char.class) {
                 from = int.class;
@@ -691,6 +691,17 @@ public class SwitchBootstraps {
             return new TypePairs(from, to);
         }
 
+        public int hashCode() {
+            return 31 * from.hashCode() + to.hashCode();
+        }
+
+        public boolean equals(Object other) {
+            if (other instanceof TypePairs otherPair) {
+                return otherPair.from == from && otherPair.to == to;
+            }
+            return false;
+        }
+
         public static Map<TypePairs, String> initialize() {
             Map<TypePairs, String> typePairToName = new HashMap<>();
             typePairToName.put(new TypePairs(byte.class,   char.class),   "isIntToCharExact");      // redirected

From 35b30c81e0153a12881e622b861ee38c8166ef72 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Mon, 22 Apr 2024 08:55:46 +0000
Subject: [PATCH 127/486] 8330595: Invoke ObjectMethods::bootstrap method
 exactly

Reviewed-by: mchung
---
 .../lang/invoke/BootstrapMethodInvoker.java    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java b/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java
index c9734a07fa0..11e9b720421 100644
--- a/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java
+++ b/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, 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
@@ -145,6 +145,9 @@ final class BootstrapMethodInvoker {
                 } else if (isLambdaMetafactoryAltMetafactoryBSM(bsmType)) {
                     maybeReBoxElements(argv);
                     result = (CallSite)bootstrapMethod.invokeExact(caller, name, (MethodType)type, argv);
+                } else if (isObjectMethodsBootstrapBSM(bsmType)) {
+                    MethodHandle[] mhs = Arrays.copyOfRange(argv, 2, argv.length, MethodHandle[].class);
+                    result = bootstrapMethod.invokeExact(caller, name, (TypeDescriptor)type, (Class<?>)argv[0], (String)argv[1], mhs);
                 } else {
                     maybeReBoxElements(argv);
                     if (type instanceof Class<?> c) {
@@ -189,7 +192,6 @@ final class BootstrapMethodInvoker {
         }
     }
 
-
     /**
      * If resultType is a reference type, do Class::cast on the result through
      * an identity function of that type, as-type converted to return
@@ -247,6 +249,9 @@ final class BootstrapMethodInvoker {
     private static final MethodType LMF_ALT_MT = MethodType.methodType(CallSite.class,
             Lookup.class, String.class, MethodType.class, Object[].class);
 
+    private static final MethodType OBJECT_METHODS_MT = MethodType.methodType(Object.class,
+            Lookup.class, String.class, TypeDescriptor.class, Class.class, String.class, MethodHandle[].class);
+
     private static final MethodType LMF_CONDY_MT = MethodType.methodType(Object.class,
             Lookup.class, String.class, Class.class, MethodType.class, MethodHandle.class, MethodType.class);
 
@@ -289,6 +294,15 @@ final class BootstrapMethodInvoker {
         return bsmType == LMF_ALT_MT;
     }
 
+    /**
+     * @return true iff the BSM method type exactly matches
+     *         {@link java.lang.runtime.ObjectMethods#bootstrap(
+     *          MethodHandles.Lookup,String,TypeDescriptor,Class,String,MethodHandle[])}
+     */
+    private static boolean isObjectMethodsBootstrapBSM(MethodType bsmType) {
+        return bsmType == OBJECT_METHODS_MT;
+    }
+
     /** The JVM produces java.lang.Integer values to box
      *  CONSTANT_Integer boxes but does not intern them.
      *  Let's intern them.  This is slightly wrong for

From 70acade9f1bd0c7bba25abad0f0d8199715d66d0 Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Mon, 22 Apr 2024 08:58:38 +0000
Subject: [PATCH 128/486] 8330339: G1: Move some public methods to private in
 G1BlockOffsetTable APIs

Reviewed-by: ayang, iwalulya
---
 .../share/gc/g1/g1BlockOffsetTable.cpp        | 24 +++++++++++++++++++
 .../share/gc/g1/g1BlockOffsetTable.hpp        | 18 +++++++-------
 .../share/gc/g1/g1BlockOffsetTable.inline.hpp | 24 -------------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
index ac546faafd9..bc14730594d 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
@@ -43,6 +43,30 @@ G1BlockOffsetTable::G1BlockOffsetTable(MemRegion heap, G1RegionToSpaceMapper* st
                      p2i(bot_reserved.start()), bot_reserved.byte_size(), p2i(bot_reserved.end()));
 }
 
+void G1BlockOffsetTable::set_offset_array_raw(uint8_t* addr, uint8_t offset) {
+  Atomic::store(addr, offset);
+}
+
+void G1BlockOffsetTable::set_offset_array(uint8_t* addr, uint8_t offset) {
+  check_address(addr, "Block offset table address out of range");
+  set_offset_array_raw(addr, offset);
+}
+
+void G1BlockOffsetTable::set_offset_array(uint8_t* addr, HeapWord* high, HeapWord* low) {
+  check_address(addr, "Block offset table address out of range");
+  assert(high >= low, "addresses out of order");
+  size_t offset = pointer_delta(high, low);
+  check_offset(offset, "offset too large");
+  set_offset_array(addr, (uint8_t)offset);
+}
+
+void G1BlockOffsetTable::set_offset_array(uint8_t* left, uint8_t* right, uint8_t offset) {
+  check_address(right, "Right block offset table address out of range");
+  assert(left <= right, "indexes out of order");
+  size_t num_cards = right - left + 1;
+  memset_with_concurrent_readers(left, offset, num_cards);
+}
+
 #ifdef ASSERT
 void G1BlockOffsetTable::check_address(uint8_t* addr, const char* msg) const {
   uint8_t* start_addr = const_cast<uint8_t*>(_offset_base + (uintptr_t(_reserved.start()) >> CardTable::card_shift()));
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
index 6a359a2cc9e..a0e6129f1a0 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
@@ -63,6 +63,12 @@ private:
 
   inline void set_offset_array(uint8_t* left, uint8_t* right, uint8_t offset);
 
+  // Mapping from address to object start array entry
+  inline uint8_t* entry_for_addr(const void* const p) const;
+
+  // Mapping from object start array entry to address of first word
+  inline HeapWord* addr_for_entry(const uint8_t* const p) const;
+
   void check_address(uint8_t* addr, const char* msg) const NOT_DEBUG_RETURN;
 
   // Sets the entries corresponding to the cards starting at "start" and ending
@@ -74,6 +80,9 @@ private:
 
   void check_all_cards(uint8_t* left_card, uint8_t* right_card) const NOT_DEBUG_RETURN;
 
+  void verify_offset(uint8_t* card_index, uint8_t upper) const NOT_DEBUG_RETURN;
+  void verify_for_block(HeapWord* blk_start, HeapWord* blk_end) const NOT_DEBUG_RETURN;
+
   static HeapWord* align_up_by_card_size(HeapWord* const addr) {
     return align_up(addr, CardTable::card_size());
   }
@@ -96,12 +105,6 @@ public:
   // in the heap parameter.
   G1BlockOffsetTable(MemRegion heap, G1RegionToSpaceMapper* storage);
 
-  // Mapping from address to object start array entry
-  uint8_t* entry_for_addr(const void* const p) const;
-
-  // Mapping from object start array entry to address of first word
-  HeapWord* addr_for_entry(const uint8_t* const p) const;
-
   static bool is_crossing_card_boundary(HeapWord* const obj_start,
                                         HeapWord* const obj_end) {
     HeapWord* cur_card_boundary = align_up_by_card_size(obj_start);
@@ -109,9 +112,6 @@ public:
     return obj_end > cur_card_boundary;
   }
 
-  void verify_offset(uint8_t* card_index, uint8_t upper) const NOT_DEBUG_RETURN;
-  void verify_for_block(HeapWord* blk_start, HeapWord* blk_end) const NOT_DEBUG_RETURN;
-
   // Returns the address of the start of the block reaching into the card containing
   // "addr".
   inline HeapWord* block_start_reaching_into_card(const void* addr) const;
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
index ba2348e38b2..b875f2f5c6d 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
@@ -54,30 +54,6 @@ uint8_t G1BlockOffsetTable::offset_array(uint8_t* addr) const {
   return Atomic::load(addr);
 }
 
-void G1BlockOffsetTable::set_offset_array_raw(uint8_t* addr, uint8_t offset) {
-  Atomic::store(addr, offset);
-}
-
-void G1BlockOffsetTable::set_offset_array(uint8_t* addr, uint8_t offset) {
-  check_address(addr, "Block offset table address out of range");
-  set_offset_array_raw(addr, offset);
-}
-
-void G1BlockOffsetTable::set_offset_array(uint8_t* addr, HeapWord* high, HeapWord* low) {
-  check_address(addr, "Block offset table address out of range");
-  assert(high >= low, "addresses out of order");
-  size_t offset = pointer_delta(high, low);
-  check_offset(offset, "offset too large");
-  set_offset_array(addr, (uint8_t)offset);
-}
-
-void G1BlockOffsetTable::set_offset_array(uint8_t* left, uint8_t* right, uint8_t offset) {
-  check_address(right, "Right block offset table address out of range");
-  assert(left <= right, "indexes out of order");
-  size_t num_cards = right - left + 1;
-  memset_with_concurrent_readers(left, offset, num_cards);
-}
-
 inline uint8_t* G1BlockOffsetTable::entry_for_addr(const void* const p) const {
   assert(_reserved.contains(p),
          "out of bounds access to block offset table");

From c4f5c5140a85818152c6e17414a36deabe491f7b Mon Sep 17 00:00:00 2001
From: Jonas Norlinder <jonas@norlinder.nu>
Date: Mon, 22 Apr 2024 09:00:24 +0000
Subject: [PATCH 129/486] 8330576: ZYoungCompactionLimit should have range
 check

Reviewed-by: eosterlund, stefank
---
 src/hotspot/share/gc/z/z_globals.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/gc/z/z_globals.hpp b/src/hotspot/share/gc/z/z_globals.hpp
index d606c4ca14e..c3e4bde73e4 100644
--- a/src/hotspot/share/gc/z/z_globals.hpp
+++ b/src/hotspot/share/gc/z/z_globals.hpp
@@ -36,6 +36,7 @@
                                                                             \
   product(double, ZYoungCompactionLimit, 25.0,                              \
           "Maximum allowed garbage in young pages")                         \
+          range(0, 100)                                                     \
                                                                             \
   product(double, ZCollectionIntervalMinor, -1,                             \
           "Force Minor GC at a fixed time interval (in seconds)")           \

From f889797e1fa6bc3824d97912643a33696d367af3 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 22 Apr 2024 10:05:32 +0000
Subject: [PATCH 130/486] 8330463: Rename invalidate() to write_region() in
 ModRefBarrierSet

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/g1/g1BarrierSet.cpp               |  2 +-
 src/hotspot/share/gc/g1/g1BarrierSet.hpp               |  6 ++----
 src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp        | 10 +++-------
 src/hotspot/share/gc/shared/cardTableBarrierSet.cpp    |  4 ++--
 src/hotspot/share/gc/shared/cardTableBarrierSet.hpp    |  4 ++--
 src/hotspot/share/gc/shared/modRefBarrierSet.hpp       |  2 +-
 .../share/gc/shared/modRefBarrierSet.inline.hpp        |  2 +-
 7 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
index 448f2f5fccf..8b87fc3d78a 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
@@ -102,7 +102,7 @@ void G1BarrierSet::write_ref_field_post_slow(volatile CardValue* byte) {
   }
 }
 
-void G1BarrierSet::invalidate(JavaThread* thread, MemRegion mr) {
+void G1BarrierSet::write_region(JavaThread* thread, MemRegion mr) {
   if (mr.is_empty()) {
     return;
   }
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index f641fabf7c3..c2f5b9dc068 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -48,8 +48,6 @@ class G1BarrierSet: public CardTableBarrierSet {
     return barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
   }
 
-  void invalidate(JavaThread* thread, MemRegion mr);
-
  public:
   G1BarrierSet(G1CardTable* table);
   ~G1BarrierSet() { }
@@ -73,8 +71,8 @@ class G1BarrierSet: public CardTableBarrierSet {
   template <DecoratorSet decorators, typename T>
   void write_ref_field_pre(T* field);
 
-  inline void invalidate(MemRegion mr);
-  inline void write_region(JavaThread* thread, MemRegion mr);
+  inline void write_region(MemRegion mr);
+  void write_region(JavaThread* thread, MemRegion mr);
 
   inline void write_ref_array_work(MemRegion mr);
 
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
index e5b477ad156..19901a76ae8 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
@@ -68,16 +68,12 @@ inline void G1BarrierSet::write_ref_field_pre(T* field) {
   enqueue(field);
 }
 
-inline void G1BarrierSet::invalidate(MemRegion mr) {
-  invalidate(JavaThread::current(), mr);
-}
-
-inline void G1BarrierSet::write_region(JavaThread* thread, MemRegion mr) {
-  invalidate(thread, mr);
+inline void G1BarrierSet::write_region(MemRegion mr) {
+  write_region(JavaThread::current(), mr);
 }
 
 inline void G1BarrierSet::write_ref_array_work(MemRegion mr) {
-  invalidate(mr);
+  write_region(mr);
 }
 
 template <DecoratorSet decorators, typename T>
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
index 1aab76d5ab5..d7a84b1ca56 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
@@ -84,7 +84,7 @@ void CardTableBarrierSet::write_ref_array_work(MemRegion mr) {
   _card_table->dirty_MemRegion(mr);
 }
 
-void CardTableBarrierSet::invalidate(MemRegion mr) {
+void CardTableBarrierSet::write_region(MemRegion mr) {
   _card_table->dirty_MemRegion(mr);
 }
 
@@ -141,7 +141,7 @@ void CardTableBarrierSet::on_slowpath_allocation_exit(JavaThread* thread, oop ne
       thread->set_deferred_card_mark(mr);
     } else {
       // Do the card mark
-      invalidate(mr);
+      write_region(mr);
     }
   }
 #endif // COMPILER2_OR_JVMCI
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
index c650e2a1fd9..b52cfef9a59 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
@@ -67,7 +67,7 @@ public:
   void initialize();
 
   void write_region(JavaThread* thread, MemRegion mr) {
-    invalidate(mr);
+    write_region(mr);
   }
 
   void write_ref_array_work(MemRegion mr);
@@ -80,7 +80,7 @@ public:
   template <DecoratorSet decorators, typename T>
   void write_ref_field_post(T* field);
 
-  virtual void invalidate(MemRegion mr);
+  virtual void write_region(MemRegion mr);
 
   // ReduceInitialCardMarks
   void initialize_deferred_card_mark_barriers();
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
index b490524feed..8355e8fc50f 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
@@ -52,7 +52,7 @@ public:
   inline void write_ref_field_post(T *addr) {}
 
   // Causes all refs in "mr" to be assumed to be modified (by this JavaThread).
-  virtual void invalidate(MemRegion mr) = 0;
+  virtual void write_region(MemRegion mr) = 0;
   // Causes all refs in "mr" to be assumed to be modified by the given JavaThread.
   virtual void write_region(JavaThread* thread, MemRegion mr) = 0;
 
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
index e17ed4f6bdb..45422167ead 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
@@ -138,7 +138,7 @@ inline void ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT>::
 clone_in_heap(oop src, oop dst, size_t size) {
   Raw::clone(src, dst, size);
   BarrierSetT *bs = barrier_set_cast<BarrierSetT>(barrier_set());
-  bs->invalidate(MemRegion((HeapWord*)(void*)dst, size));
+  bs->write_region(MemRegion((HeapWord*)(void*)dst, size));
 }
 
 #endif // SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP

From 3e185c70feef3febf75c58a5d4d394a4b772105f Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 22 Apr 2024 10:08:52 +0000
Subject: [PATCH 131/486] 8330154: Serial: Remove
 TenuredSpace::update_for_block

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/serial/serialFullGC.cpp             | 7 ++++++-
 src/hotspot/share/gc/serial/tenuredGeneration.cpp        | 2 +-
 src/hotspot/share/gc/serial/tenuredGeneration.hpp        | 1 +
 src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp | 4 ++++
 src/hotspot/share/gc/shared/space.hpp                    | 2 --
 src/hotspot/share/gc/shared/space.inline.hpp             | 3 ---
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index e9e4ad4046f..296874abcd0 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -39,6 +39,7 @@
 #include "gc/serial/serialGcRefProcProxyTask.hpp"
 #include "gc/serial/serialHeap.hpp"
 #include "gc/serial/serialStringDedup.hpp"
+#include "gc/serial/tenuredGeneration.inline.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/continuationGCSupport.inline.hpp"
@@ -171,6 +172,9 @@ class Compacter {
 
   uint _index;
 
+  // Used for BOT update
+  TenuredGeneration* _old_gen;
+
   HeapWord* get_compaction_top(uint index) const {
     return _spaces[index]._compaction_top;
   }
@@ -196,7 +200,7 @@ class Compacter {
         _spaces[_index]._compaction_top += words;
         if (_index == 0) {
           // old-gen requires BOT update
-          static_cast<TenuredSpace*>(_spaces[0]._space)->update_for_block(result, result + words);
+          _old_gen->update_for_block(result, result + words);
         }
         return result;
       }
@@ -280,6 +284,7 @@ public:
       _num_spaces = 3;
     }
     _index = 0;
+    _old_gen = heap->old_gen();
   }
 
   void phase2_calculate_new_addr() {
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index ddbb7b8403b..a86450249a7 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -499,7 +499,7 @@ void TenuredGeneration::complete_loaded_archive_space(MemRegion archive_space) {
   HeapWord* start = archive_space.start();
   while (start < archive_space.end()) {
     size_t word_size = cast_to_oop(start)->size();;
-    space->update_for_block(start, start + word_size);
+    _bts->update_for_block(start, start + word_size);
     start += word_size;
   }
 }
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 04d5d612074..dce6609a19b 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -134,6 +134,7 @@ public:
   void object_iterate(ObjectClosure* blk);
 
   void complete_loaded_archive_space(MemRegion archive_space);
+  inline void update_for_block(HeapWord* start, HeapWord* end);
 
   virtual inline HeapWord* allocate(size_t word_size, bool is_tlab);
   virtual inline HeapWord* par_allocate(size_t word_size, bool is_tlab);
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
index d03c97fc508..62bd523d2d9 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
@@ -45,6 +45,10 @@ inline bool TenuredGeneration::is_in(const void* p) const {
   return space()->is_in(p);
 }
 
+inline void TenuredGeneration::update_for_block(HeapWord* start, HeapWord* end) {
+  _bts->update_for_block(start, end);
+}
+
 HeapWord* TenuredGeneration::allocate(size_t word_size,
                                                  bool is_tlab) {
   assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 36b96a96325..3b30a557f3c 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -179,8 +179,6 @@ class TenuredSpace: public ContiguousSpace {
   // Add offset table update.
   inline HeapWord* allocate(size_t word_size) override;
   inline HeapWord* par_allocate(size_t word_size) override;
-
-  inline void update_for_block(HeapWord* start, HeapWord* end);
 };
 #endif //INCLUDE_SERIALGC
 
diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
index 741263e668a..fa88be9aa51 100644
--- a/src/hotspot/share/gc/shared/space.inline.hpp
+++ b/src/hotspot/share/gc/shared/space.inline.hpp
@@ -51,9 +51,6 @@ inline HeapWord* TenuredSpace::par_allocate(size_t size) {
   return res;
 }
 
-inline void TenuredSpace::update_for_block(HeapWord* start, HeapWord* end) {
-  _offsets->update_for_block(start, end);
-}
 #endif // INCLUDE_SERIALGC
 
 #endif // SHARE_GC_SHARED_SPACE_INLINE_HPP

From ee7b2e9b3bd2b4607476ae03bb6c9f7e49a43d0e Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 22 Apr 2024 11:25:53 +0000
Subject: [PATCH 132/486] 8330051: Small ObjectMonitor spinning code cleanups

Reviewed-by: dcubed, eosterlund, fbredberg
---
 src/hotspot/share/runtime/objectMonitor.cpp | 173 +++++++++++---------
 src/hotspot/share/runtime/objectMonitor.hpp |  10 +-
 2 files changed, 106 insertions(+), 77 deletions(-)

diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index b1fe22444ae..d281acdf006 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -108,19 +108,6 @@
 
 #endif // ndef DTRACE_ENABLED
 
-// Tunables ...
-// The knob* variables are effectively final.  Once set they should
-// never be modified hence.  Consider using __read_mostly with GCC.
-
-int ObjectMonitor::Knob_SpinLimit    = 5000;    // derived by an external tool -
-
-static int Knob_Bonus               = 100;     // spin success bonus
-static int Knob_BonusB              = 100;     // spin success bonus
-static int Knob_Penalty             = 200;     // spin failure penalty
-static int Knob_Poverty             = 1000;
-static int Knob_FixedSpin           = 0;
-static int Knob_PreSpin             = 10;      // 20-100 likely better
-
 DEBUG_ONLY(static volatile bool InitDone = false;)
 
 OopStorage* ObjectMonitor::_oop_storage = nullptr;
@@ -406,7 +393,7 @@ bool ObjectMonitor::enter(JavaThread* current) {
   // transitions.  The following spin is strictly optional ...
   // Note that if we acquire the monitor from an initial spin
   // we forgo posting JVMTI events and firing DTRACE probes.
-  if (TrySpin(current) > 0) {
+  if (TrySpin(current)) {
     assert(owner_raw() == current, "must be current: owner=" INTPTR_FORMAT, p2i(owner_raw()));
     assert(_recursions == 0, "must be 0: recursions=" INTX_FORMAT, _recursions);
     assert(object()->mark() == markWord::encode(this),
@@ -535,18 +522,18 @@ bool ObjectMonitor::enter(JavaThread* current) {
 // Caveat: TryLock() is not necessarily serializing if it returns failure.
 // Callers must compensate as needed.
 
-int ObjectMonitor::TryLock(JavaThread* current) {
+ObjectMonitor::TryLockResult ObjectMonitor::TryLock(JavaThread* current) {
   void* own = owner_raw();
-  if (own != nullptr) return 0;
+  if (own != nullptr) return TryLockResult::HasOwner;
   if (try_set_owner_from(nullptr, current) == nullptr) {
     assert(_recursions == 0, "invariant");
-    return 1;
+    return TryLockResult::Success;
   }
   // The lock had been free momentarily, but we lost the race to the lock.
   // Interference -- the CAS failed.
   // We can either return -1 or retry.
   // Retry doesn't make as much sense because the lock was just acquired.
-  return -1;
+  return TryLockResult::Interference;
 }
 
 // Deflate the specified ObjectMonitor if not in-use. Returns true if it
@@ -723,7 +710,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   assert(current->thread_state() == _thread_blocked, "invariant");
 
   // Try the lock - TATAS
-  if (TryLock (current) > 0) {
+  if (TryLock(current) == TryLockResult::Success) {
     assert(_succ != current, "invariant");
     assert(owner_raw() == current, "invariant");
     assert(_Responsible != current, "invariant");
@@ -757,7 +744,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   // to the owner.  This has subtle but beneficial affinity
   // effects.
 
-  if (TrySpin(current) > 0) {
+  if (TrySpin(current)) {
     assert(owner_raw() == current, "invariant");
     assert(_succ != current, "invariant");
     assert(_Responsible != current, "invariant");
@@ -794,7 +781,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
 
     // Interference - the CAS failed because _cxq changed.  Just retry.
     // As an optional optimization we retry the lock.
-    if (TryLock (current) > 0) {
+    if (TryLock(current) == TryLockResult::Success) {
       assert(_succ != current, "invariant");
       assert(owner_raw() == current, "invariant");
       assert(_Responsible != current, "invariant");
@@ -847,7 +834,9 @@ void ObjectMonitor::EnterI(JavaThread* current) {
 
   for (;;) {
 
-    if (TryLock(current) > 0) break;
+    if (TryLock(current) == TryLockResult::Success) {
+      break;
+    }
     assert(owner_raw() != current, "invariant");
 
     // park self
@@ -862,7 +851,9 @@ void ObjectMonitor::EnterI(JavaThread* current) {
       current->_ParkEvent->park();
     }
 
-    if (TryLock(current) > 0) break;
+    if (TryLock(current) == TryLockResult::Success) {
+      break;
+    }
 
     if (try_set_owner_from(DEFLATER_MARKER, current) == DEFLATER_MARKER) {
       // Cancelled the in-progress async deflation by changing owner from
@@ -895,7 +886,9 @@ void ObjectMonitor::EnterI(JavaThread* current) {
     // We can defer clearing _succ until after the spin completes
     // TrySpin() must tolerate being called with _succ == current.
     // Try yet another round of adaptive spinning.
-    if (TrySpin(current) > 0) break;
+    if (TrySpin(current)) {
+      break;
+    }
 
     // We can find that we were unpark()ed and redesignated _succ while
     // we were spinning.  That's harmless.  If we iterate and call park(),
@@ -994,8 +987,9 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
     guarantee(v == ObjectWaiter::TS_ENTER || v == ObjectWaiter::TS_CXQ, "invariant");
     assert(owner_raw() != current, "invariant");
 
-    if (TryLock(current) > 0) break;
-    if (TrySpin(current) > 0) break;
+    if (TrySpin(current)) {
+        break;
+    }
 
     {
       OSThreadContendState osts(current->osthread());
@@ -1012,7 +1006,9 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
     // Try again, but just so we distinguish between futile wakeups and
     // successful wakeups.  The following test isn't algorithmically
     // necessary, but it helps us maintain sensible statistics.
-    if (TryLock(current) > 0) break;
+    if (TryLock(current) == TryLockResult::Success) {
+      break;
+    }
 
     // The lock is still contested.
     // Keep a tally of the # of futile wakeups.
@@ -1854,32 +1850,65 @@ void ObjectMonitor::notifyAll(TRAPS) {
 // hysteresis control to damp the transition rate between spinning and
 // not spinning.
 
-// Spinning: Fixed frequency (100%), vary duration
-int ObjectMonitor::TrySpin(JavaThread* current) {
-  // Dumb, brutal spin.  Good for comparative measurements against adaptive spinning.
-  int ctr = Knob_FixedSpin;
-  if (ctr != 0) {
-    while (--ctr >= 0) {
-      if (TryLock(current) > 0) return 1;
-      SpinPause();
-    }
-    return 0;
-  }
+int ObjectMonitor::Knob_SpinLimit    = 5000;   // derived by an external tool
 
-  for (ctr = Knob_PreSpin + 1; --ctr >= 0;) {
-    if (TryLock(current) > 0) {
-      // Increase _SpinDuration ...
-      // Note that we don't clamp SpinDuration precisely at SpinLimit.
-      // Raising _SpurDuration to the poverty line is key.
-      int x = _SpinDuration;
-      if (x < Knob_SpinLimit) {
-        if (x < Knob_Poverty) x = Knob_Poverty;
-        _SpinDuration = x + Knob_BonusB;
+static int Knob_Bonus               = 100;     // spin success bonus
+static int Knob_Penalty             = 200;     // spin failure penalty
+static int Knob_Poverty             = 1000;
+static int Knob_FixedSpin           = 0;
+static int Knob_PreSpin             = 10;      // 20-100 likely better, but it's not better in my testing.
+
+inline static int adjust_up(int spin_duration) {
+  int x = spin_duration;
+  if (x < ObjectMonitor::Knob_SpinLimit) {
+    if (x < Knob_Poverty) {
+      x = Knob_Poverty;
+    }
+    return x + Knob_Bonus;
+  } else {
+    return spin_duration;
+  }
+}
+
+inline static int adjust_down(int spin_duration) {
+  // TODO: Use an AIMD-like policy to adjust _SpinDuration.
+  // AIMD is globally stable.
+  int x = spin_duration;
+  if (x > 0) {
+    // Consider an AIMD scheme like: x -= (x >> 3) + 100
+    // This is globally sample and tends to damp the response.
+    x -= Knob_Penalty;
+    if (x < 0) { x = 0; }
+    return x;
+  } else {
+    return spin_duration;
+  }
+}
+
+bool ObjectMonitor::short_fixed_spin(JavaThread* current, int spin_count, bool adapt) {
+  for (int ctr = 0; ctr < spin_count; ctr++) {
+    TryLockResult status = TryLock(current);
+    if (status == TryLockResult::Success) {
+      if (adapt) {
+        _SpinDuration = adjust_up(_SpinDuration);
       }
-      return 1;
+      return true;
+    } else if (status == TryLockResult::Interference) {
+      break;
     }
     SpinPause();
   }
+  return false;
+}
+
+// Spinning: Fixed frequency (100%), vary duration
+bool ObjectMonitor::TrySpin(JavaThread* current) {
+
+  // Dumb, brutal spin.  Good for comparative measurements against adaptive spinning.
+  int knob_fixed_spin = Knob_FixedSpin;  // 0 (don't spin: default), 2000 good test
+  if (knob_fixed_spin > 0) {
+    return short_fixed_spin(current, knob_fixed_spin, false);
+  }
 
   // Admission control - verify preconditions for spinning
   //
@@ -1887,6 +1916,12 @@ int ObjectMonitor::TrySpin(JavaThread* current) {
   // becoming an absorbing state.  Put another way, we spin briefly to
   // sample, just in case the system load, parallelism, contention, or lock
   // modality changed.
+
+  int knob_pre_spin = Knob_PreSpin; // 10 (default), 100, 1000 or 2000
+  if (short_fixed_spin(current, knob_pre_spin, true)) {
+    return true;
+  }
+
   //
   // Consider the following alternative:
   // Periodically set _SpinDuration = _SpinLimit and try a long/full
@@ -1895,8 +1930,8 @@ int ObjectMonitor::TrySpin(JavaThread* current) {
   // This takes us into the realm of 1-out-of-N spinning, where we
   // hold the duration constant but vary the frequency.
 
-  ctr = _SpinDuration;
-  if (ctr <= 0) return 0;
+  int ctr = _SpinDuration;
+  if (ctr <= 0) return false;
 
   // We're good to spin ... spin ingress.
   // CONSIDER: use Prefetch::write() to avoid RTS->RTO upgrades
@@ -1928,7 +1963,7 @@ int ObjectMonitor::TrySpin(JavaThread* current) {
       // might update the poll values and we could be in a thread_blocked
       // state here which is not allowed so just check the poll.
       if (SafepointMechanism::local_poll_armed(current)) {
-        goto Abort;           // abrupt spin egress
+        break;
       }
       SpinPause();
     }
@@ -1960,26 +1995,21 @@ int ObjectMonitor::TrySpin(JavaThread* current) {
         // If we acquired the lock early in the spin cycle it
         // makes sense to increase _SpinDuration proportionally.
         // Note that we don't clamp SpinDuration precisely at SpinLimit.
-        int x = _SpinDuration;
-        if (x < Knob_SpinLimit) {
-          if (x < Knob_Poverty) x = Knob_Poverty;
-          _SpinDuration = x + Knob_Bonus;
-        }
-        return 1;
+        _SpinDuration = adjust_up(_SpinDuration);
+        return true;
       }
 
       // The CAS failed ... we can take any of the following actions:
       // * penalize: ctr -= CASPenalty
-      // * exit spin with prejudice -- goto Abort;
+      // * exit spin with prejudice -- abort without adapting spinner
       // * exit spin without prejudice.
       // * Since CAS is high-latency, retry again immediately.
-      prv = ox;
-      goto Abort;
+      break;
     }
 
     // Did lock ownership change hands ?
     if (ox != prv && prv != nullptr) {
-      goto Abort;
+      break;
     }
     prv = ox;
 
@@ -1989,20 +2019,10 @@ int ObjectMonitor::TrySpin(JavaThread* current) {
   }
 
   // Spin failed with prejudice -- reduce _SpinDuration.
-  // TODO: Use an AIMD-like policy to adjust _SpinDuration.
-  // AIMD is globally stable.
-  {
-    int x = _SpinDuration;
-    if (x > 0) {
-      // Consider an AIMD scheme like: x -= (x >> 3) + 100
-      // This is globally sample and tends to damp the response.
-      x -= Knob_Penalty;
-      if (x < 0) x = 0;
-      _SpinDuration = x;
-    }
+  if (ctr < 0) {
+    _SpinDuration = adjust_down(_SpinDuration);
   }
 
- Abort:
   if (_succ == current) {
     _succ = nullptr;
     // Invariant: after setting succ=null a contending thread
@@ -2010,9 +2030,12 @@ int ObjectMonitor::TrySpin(JavaThread* current) {
     // in the normal usage of TrySpin(), but it's safest
     // to make TrySpin() as foolproof as possible.
     OrderAccess::fence();
-    if (TryLock(current) > 0) return 1;
+    if (TryLock(current) == TryLockResult::Success) {
+      return true;
+    }
   }
-  return 0;
+
+  return false;
 }
 
 
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index 6c0d5213605..fdc482a3555 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -353,8 +353,14 @@ private:
   void      EnterI(JavaThread* current);
   void      ReenterI(JavaThread* current, ObjectWaiter* current_node);
   void      UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* current_node);
-  int       TryLock(JavaThread* current);
-  int       TrySpin(JavaThread* current);
+
+
+  enum class TryLockResult { Interference = -1, HasOwner = 0, Success = 1 };
+
+  TryLockResult  TryLock(JavaThread* current);
+
+  bool      TrySpin(JavaThread* current);
+  bool      short_fixed_spin(JavaThread* current, int spin_count, bool adapt);
   void      ExitEpilog(JavaThread* current, ObjectWaiter* Wakee);
 
   // Deflation support

From 936a47d7d68c7305993f68db844dc76006b674b1 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 22 Apr 2024 11:40:22 +0000
Subject: [PATCH 133/486] 8330607: Deprecate -XX:+UseEmptySlotsInSupers

Reviewed-by: shade, dcubed
---
 src/hotspot/share/runtime/arguments.cpp                        | 1 +
 src/hotspot/share/runtime/globals.hpp                          | 3 ++-
 .../hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 9ff8b878692..2ea044a97df 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -502,6 +502,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "UseSharedSpaces",              JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "RegisterFinalizersAtInit",     JDK_Version::jdk(22), JDK_Version::jdk(23), JDK_Version::jdk(24) },
   { "PreserveAllAnnotations",       JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
+  { "UseEmptySlotsInSupers",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
 #if defined(X86)
   { "UseRTMLocking",                JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseRTMDeopt",                  JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 693e5660c24..9087cb9b4a3 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1958,7 +1958,8 @@ const int ObjectAlignmentInBytes = 8;
           "Use platform unstable time where supported for timestamps only") \
                                                                             \
   product(bool, UseEmptySlotsInSupers, true,                                \
-                "Allow allocating fields in empty slots of super-classes")  \
+          "(Deprecated) Allow allocating fields in empty slots of "         \
+          "super-classes")                                                  \
                                                                             \
   product(bool, DeoptimizeNMethodBarriersALot, false, DIAGNOSTIC,           \
                 "Make nmethod barriers deoptimise a lot.")                  \
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
index 0f93ee0f43a..7dc49a05186 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
@@ -58,6 +58,7 @@ public class VMDeprecatedOptions {
             // deprecated non-alias flags:
             {"PreserveAllAnnotations", "true"},
             {"AllowRedefinitionToAddDeleteMethods", "true"},
+            {"UseEmptySlotsInSupers", "true"},
 
             // deprecated alias flags (see also aliased_jvm_flags):
             {"CreateMinidumpOnCrash", "false"}

From 3e65d90b4ddb52878ebdc2150790c0333b9c0920 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 22 Apr 2024 13:32:02 +0000
Subject: [PATCH 134/486] 8330820: Remove remnants of operator_new.cpp in build
 system

Reviewed-by: tbell
---
 make/hotspot/lib/CompileGtest.gmk | 3 +--
 make/hotspot/lib/CompileJvm.gmk   | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index b59ed049cbc..696adb0c95f 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -89,8 +89,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
     EXCLUDES := $(JVM_EXCLUDES), \
     EXCLUDE_FILES := gtestLauncher.cpp, \
     EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
-    EXTRA_OBJECT_FILES := $(filter-out %/operator_new$(OBJ_SUFFIX), \
-        $(BUILD_LIBJVM_ALL_OBJS)), \
+    EXTRA_OBJECT_FILES := $(BUILD_LIBJVM_ALL_OBJS), \
     DEFAULT_CFLAGS := false, \
     CFLAGS := $(JVM_CFLAGS) \
         -I$(GTEST_FRAMEWORK_SRC)/googletest/include \
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index 47f987092f9..c2ff0064025 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -137,13 +137,6 @@ JVM_STRIPFLAGS ?= $(STRIPFLAGS)
 # This source set is reused so save in cache.
 $(call FillFindCache, $(JVM_SRC_DIRS))
 
-# The global operator new functions defined in operator_new.cpp are intended
-# to detect and prevent the VM code from calling them. See more details in
-# operator_new.cpp. Exclude operator_new.o when statically linking the VM
-# code with JDK natives, as the JDK natives might need to call the global
-# operator new.
-LIBJVM_STATIC_EXCLUDE_OBJS := operator_new.o
-
 ifeq ($(call isTargetOs, windows), true)
   ifeq ($(STATIC_LIBS), true)
     WIN_EXPORT_FILE := $(JVM_OUTPUTDIR)/static-win-exports.def
@@ -217,7 +210,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     RC_FILEDESC := $(HOTSPOT_VM_DISTRO) $(OPENJDK_TARGET_CPU_BITS)-Bit $(JVM_VARIANT) VM, \
     PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
     PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
-    STATIC_LIB_EXCLUDE_OBJS := $(LIBJVM_STATIC_EXCLUDE_OBJS), \
 ))
 
 ifeq ($(call isTargetOs, windows), true)

From 7e421ce9d089ce3e36336fca0f603bcbfbbda6c5 Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Mon, 22 Apr 2024 15:03:09 +0000
Subject: [PATCH 135/486] 8330585: Refactor/rename forwardee handling

Reviewed-by: stefank, ayang
---
 src/hotspot/share/gc/g1/g1OopClosures.inline.hpp      |  4 ++--
 src/hotspot/share/gc/g1/g1ParScanThreadState.cpp      |  4 ++--
 .../share/gc/parallel/psPromotionManager.inline.hpp   |  4 ++--
 src/hotspot/share/gc/shared/preservedMarks.inline.hpp |  2 +-
 src/hotspot/share/oops/markWord.hpp                   | 11 +++++++++--
 src/hotspot/share/oops/oop.inline.hpp                 |  7 ++-----
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
index 9eebfbd6a86..50b3ab203d7 100644
--- a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
@@ -227,8 +227,8 @@ void G1ParCopyClosure<barrier, should_mark>::do_oop_work(T* p) {
   if (state.is_in_cset()) {
     oop forwardee;
     markWord m = obj->mark();
-    if (m.is_marked()) {
-      forwardee = cast_to_oop(m.decode_pointer());
+    if (m.is_forwarded()) {
+      forwardee = m.forwardee();
     } else {
       forwardee = _par_scan_state->copy_to_survivor_space(state, obj, m);
     }
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index 81169f89a07..c495889faad 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -211,8 +211,8 @@ void G1ParScanThreadState::do_oop_evac(T* p) {
   }
 
   markWord m = obj->mark();
-  if (m.is_marked()) {
-    obj = cast_to_oop(m.decode_pointer());
+  if (m.is_forwarded()) {
+    obj = m.forwardee();
   } else {
     obj = do_copy_to_survivor_space(region_attr, obj, m);
   }
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index 730d31893d5..eb27e9776ed 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -145,7 +145,7 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) {
   // in o. There may be multiple threads racing on it, and it may be forwarded
   // at any time.
   markWord m = o->mark();
-  if (!m.is_marked()) {
+  if (!m.is_forwarded()) {
     return copy_unmarked_to_survivor_space<promote_immediately>(o, m);
   } else {
     // Ensure any loads from the forwardee follow all changes that precede
@@ -153,7 +153,7 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) {
     // other thread.
     OrderAccess::acquire();
     // Return the already installed forwardee.
-    return cast_to_oop(m.decode_pointer());
+    return m.forwardee();
   }
 }
 
diff --git a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp
index aa181b408ae..fc732fee534 100644
--- a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp
+++ b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp
@@ -43,7 +43,7 @@ inline void PreservedMarks::push_if_necessary(oop obj, markWord m) {
 }
 
 inline void PreservedMarks::push_always(oop obj, markWord m) {
-  assert(!m.is_marked(), "precondition");
+  assert(!m.is_forwarded(), "precondition");
   PreservedMark elem(obj, m);
   _stack.push(elem);
 }
diff --git a/src/hotspot/share/oops/markWord.hpp b/src/hotspot/share/oops/markWord.hpp
index ba89f947dcf..12d6ee73acf 100644
--- a/src/hotspot/share/oops/markWord.hpp
+++ b/src/hotspot/share/oops/markWord.hpp
@@ -143,6 +143,9 @@ class markWord {
   bool is_marked()   const {
     return (mask_bits(value(), lock_mask_in_place) == marked_value);
   }
+  bool is_forwarded()   const {
+    return (mask_bits(value(), lock_mask_in_place) == marked_value);
+  }
   bool is_neutral()  const {  // Not locked, or marked - a "clean" neutral state
     return (mask_bits(value(), lock_mask_in_place) == unlocked_value);
   }
@@ -225,7 +228,7 @@ class markWord {
   }
 
   // used to encode pointers during GC
-  markWord clear_lock_bits() { return markWord(value() & ~lock_mask_in_place); }
+  markWord clear_lock_bits() const { return markWord(value() & ~lock_mask_in_place); }
 
   // age operations
   markWord set_marked()   { return markWord((value() & ~lock_mask_in_place) | marked_value); }
@@ -259,7 +262,11 @@ class markWord {
   inline static markWord encode_pointer_as_mark(void* p) { return from_pointer(p).set_marked(); }
 
   // Recover address of oop from encoded form used in mark
-  inline void* decode_pointer() { return (void*)clear_lock_bits().value(); }
+  inline void* decode_pointer() const { return (void*)clear_lock_bits().value(); }
+
+  inline oop forwardee() const {
+    return cast_to_oop(decode_pointer());
+  }
 };
 
 // Support atomic operations.
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index bd00847869d..b7dbc7b2224 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -262,9 +262,7 @@ bool oopDesc::is_gc_marked() const {
 
 // Used by scavengers
 bool oopDesc::is_forwarded() const {
-  // The extra heap check is needed since the obj might be locked, in which case the
-  // mark would point to a stack location and have the sentinel bit cleared
-  return mark().is_marked();
+  return mark().is_forwarded();
 }
 
 // Used by scavengers
@@ -289,8 +287,7 @@ oop oopDesc::forward_to_atomic(oop p, markWord compare, atomic_memory_order orde
 // The forwardee is used when copying during scavenge and mark-sweep.
 // It does need to clear the low two locking- and GC-related bits.
 oop oopDesc::forwardee() const {
-  assert(is_forwarded(), "only decode when actually forwarded");
-  return cast_to_oop(mark().decode_pointer());
+  return mark().forwardee();
 }
 
 // The following method needs to be MT safe.

From 20be5e095f85d92215df68bb6eeb621b4ed249a1 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 22 Apr 2024 15:53:14 +0000
Subject: [PATCH 136/486] 8314846: Do not store Klass::_secondary_super_cache
 in CDS archive

Reviewed-by: stuefe, aph
---
 src/hotspot/share/oops/klass.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 5b1919a5c4c..23a6770251a 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -726,7 +726,6 @@ void Klass::metaspace_pointers_do(MetaspaceClosure* it) {
   }
 
   it->push(&_name);
-  it->push(&_secondary_super_cache);
   it->push(&_secondary_supers);
   for (int i = 0; i < _primary_super_limit; i++) {
     it->push(&_primary_supers[i]);
@@ -757,6 +756,11 @@ void Klass::remove_unshareable_info() {
     log_trace(cds, unshareable)("remove: %s", external_name());
   }
 
+  // _secondary_super_cache may be updated by an is_subtype_of() call
+  // while ArchiveBuilder is copying metaspace objects. Let's reset it to
+  // null and let it be repopulated at runtime.
+  set_secondary_super_cache(nullptr);
+
   set_subklass(nullptr);
   set_next_sibling(nullptr);
   set_next_link(nullptr);

From 0b9350e8b619bc556f36652cde6f73211be5b85b Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Mon, 22 Apr 2024 16:31:32 +0000
Subject: [PATCH 137/486] 8322992: Javac fails with StackOverflowError when
 compiling deeply nested synchronized blocks

Reviewed-by: jlahoda
---
 .../classes/com/sun/tools/javac/jvm/Gen.java  |   45 +-
 .../patterns/SOEDeeplyNestedBlocksTest.java   | 1187 +++++++++++++++++
 2 files changed, 1214 insertions(+), 18 deletions(-)
 create mode 100644 test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
index 8a546cd3f42..37846b8b966 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -1074,29 +1074,38 @@ public class Gen extends JCTree.Visitor {
     }
 
     public void visitBlock(JCBlock tree) {
+        /* this method is heavily invoked, as expected, for deeply nested blocks, if blocks doesn't happen to have
+         * patterns there will be an unnecessary tax on memory consumption every time this method is executed, for this
+         * reason we have created helper methods and here at a higher level we just discriminate depending on the
+         * presence, or not, of patterns in a given block
+         */
         if (tree.patternMatchingCatch != null) {
-            Set<JCMethodInvocation> prevInvocationsWithPatternMatchingCatch = invocationsWithPatternMatchingCatch;
-            ListBuffer<int[]> prevRanges = patternMatchingInvocationRanges;
-            State startState = code.state.dup();
-            try {
-                invocationsWithPatternMatchingCatch = tree.patternMatchingCatch.calls2Handle();
-                patternMatchingInvocationRanges = new ListBuffer<>();
-                doVisitBlock(tree);
-            } finally {
-                Chain skipCatch = code.branch(goto_);
-                JCCatch handler = tree.patternMatchingCatch.handler();
-                code.entryPoint(startState, handler.param.sym.type);
-                genPatternMatchingCatch(handler, env, patternMatchingInvocationRanges.toList());
-                code.resolve(skipCatch);
-                invocationsWithPatternMatchingCatch = prevInvocationsWithPatternMatchingCatch;
-                patternMatchingInvocationRanges = prevRanges;
-            }
+            visitBlockWithPatterns(tree);
         } else {
-            doVisitBlock(tree);
+            internalVisitBlock(tree);
         }
     }
 
-    private void doVisitBlock(JCBlock tree) {
+    private void visitBlockWithPatterns(JCBlock tree) {
+        Set<JCMethodInvocation> prevInvocationsWithPatternMatchingCatch = invocationsWithPatternMatchingCatch;
+        ListBuffer<int[]> prevRanges = patternMatchingInvocationRanges;
+        State startState = code.state.dup();
+        try {
+            invocationsWithPatternMatchingCatch = tree.patternMatchingCatch.calls2Handle();
+            patternMatchingInvocationRanges = new ListBuffer<>();
+            internalVisitBlock(tree);
+        } finally {
+            Chain skipCatch = code.branch(goto_);
+            JCCatch handler = tree.patternMatchingCatch.handler();
+            code.entryPoint(startState, handler.param.sym.type);
+            genPatternMatchingCatch(handler, env, patternMatchingInvocationRanges.toList());
+            code.resolve(skipCatch);
+            invocationsWithPatternMatchingCatch = prevInvocationsWithPatternMatchingCatch;
+            patternMatchingInvocationRanges = prevRanges;
+        }
+    }
+
+    private void internalVisitBlock(JCBlock tree) {
         int limit = code.nextreg;
         Env<GenContext> localEnv = env.dup(tree, new GenContext());
         genStats(tree.stats, localEnv);
diff --git a/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java b/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
new file mode 100644
index 00000000000..e521f062748
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
@@ -0,0 +1,1187 @@
+/*
+ * Copyright (c) 2024, 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 8322992
+ * @summary Javac fails with StackOverflowError when compiling deeply nested synchronized blocks
+ * @compile SOEDeeplyNestedBlocksTest.java
+ */
+
+public class SOEDeeplyNestedBlocksTest {
+
+    public static void test() {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        synchronized (SOEDeeplyNestedBlocksTest.class) {
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+        }
+    }
+}

From 83c74d7307e258441abb171552e953f1c6d9b98a Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Mon, 22 Apr 2024 20:36:43 +0000
Subject: [PATCH 138/486] 8329717: Missing `@since` tags in elements in
 DocumentationTool and Taglet

Reviewed-by: prappo
---
 .../share/classes/javax/tools/DocumentationTool.java          | 4 +++-
 src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/java.compiler/share/classes/javax/tools/DocumentationTool.java b/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
index 4fc5e8db505..91850b1edf7 100644
--- a/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
+++ b/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -188,6 +188,8 @@ public interface DocumentationTool extends Tool, OptionChecker {
 
         /**
          * Location to search for snippets.
+         *
+         * @since 18
          */
         SNIPPET_PATH;
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java
index b8b9132f6cd..1ad67a89fef 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -96,6 +96,8 @@ public interface Taglet {
      * @return true if this taglet supports block tags
      * @implSpec This implementation returns the inverse
      * result to {@code isInlineTag}.
+     *
+     * @since 15
      */
     default boolean isBlockTag() {
         return !isInlineTag();

From 1d52234e199c7a38c059c0aa88aea2910f749d48 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Mon, 22 Apr 2024 21:52:22 +0000
Subject: [PATCH 139/486] 8330704: Clean up non-standard use of /** comments in
 some langtools tests

Reviewed-by: iris
---
 test/langtools/jdk/javadoc/tool/EnablePreviewOption.java      | 4 ++--
 test/langtools/jdk/javadoc/tool/ReleaseOption.java            | 4 ++--
 test/langtools/jdk/javadoc/tool/T4696488.java                 | 4 ++--
 test/langtools/jdk/javadoc/tool/T4994049/T4994049.java        | 4 ++--
 test/langtools/jdk/javadoc/tool/T6551367.java                 | 4 ++--
 test/langtools/jdk/javadoc/tool/TestScriptInComment.java      | 4 ++--
 test/langtools/jdk/javadoc/tool/modules/CommandLineFiles.java | 4 ++--
 test/langtools/jdk/javadoc/tool/modules/FilterOptions.java    | 4 ++--
 test/langtools/jdk/javadoc/tool/modules/PackageOptions.java   | 4 ++--
 test/langtools/jdk/javadoc/tool/modules/PatchModules.java     | 4 ++--
 test/langtools/jdk/javadoc/tool/modules/ReleaseOptions.java   | 4 ++--
 test/langtools/jdk/javadoc/tool/nonConstExprs/Test.java       | 4 ++--
 test/langtools/jdk/javadoc/tool/parser/7091528/T7091528.java  | 4 ++--
 test/langtools/jdk/jshell/HighlightUITest.java                | 4 ++--
 test/langtools/jdk/jshell/HistoryUITest.java                  | 4 ++--
 test/langtools/jdk/jshell/IndentUITest.java                   | 4 ++--
 test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java     | 4 ++--
 .../langtools/jdk/jshell/ToolMultilineSnippetHistoryTest.java | 4 ++--
 test/langtools/jdk/jshell/ToolShiftTabTest.java               | 4 ++--
 test/langtools/jdk/jshell/ToolTabCommandTest.java             | 4 ++--
 test/langtools/jdk/jshell/ToolTabSnippetTest.java             | 4 ++--
 test/langtools/jdk/jshell/UndefinedClassTest.java             | 4 ++--
 22 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/test/langtools/jdk/javadoc/tool/EnablePreviewOption.java b/test/langtools/jdk/javadoc/tool/EnablePreviewOption.java
index 971a2dd546f..5b01f507723 100644
--- a/test/langtools/jdk/javadoc/tool/EnablePreviewOption.java
+++ b/test/langtools/jdk/javadoc/tool/EnablePreviewOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8199196
  * @summary Test --enable-preview option in javadoc
diff --git a/test/langtools/jdk/javadoc/tool/ReleaseOption.java b/test/langtools/jdk/javadoc/tool/ReleaseOption.java
index dfee8726f30..5a7955099ca 100644
--- a/test/langtools/jdk/javadoc/tool/ReleaseOption.java
+++ b/test/langtools/jdk/javadoc/tool/ReleaseOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ import jdk.javadoc.internal.tool.Main.Result;
 
 import static jdk.javadoc.internal.tool.Main.Result.*;
 
-/**
+/*
  * @test
  * @bug 8086737
  * @summary Test --release option in javadoc
diff --git a/test/langtools/jdk/javadoc/tool/T4696488.java b/test/langtools/jdk/javadoc/tool/T4696488.java
index b48c7fac93d..715f738f53b 100644
--- a/test/langtools/jdk/javadoc/tool/T4696488.java
+++ b/test/langtools/jdk/javadoc/tool/T4696488.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug     4696488
  * @summary javadoc doesn't handle UNC paths for destination directory
diff --git a/test/langtools/jdk/javadoc/tool/T4994049/T4994049.java b/test/langtools/jdk/javadoc/tool/T4994049/T4994049.java
index 47fb2aa179e..247db2732cc 100644
--- a/test/langtools/jdk/javadoc/tool/T4994049/T4994049.java
+++ b/test/langtools/jdk/javadoc/tool/T4994049/T4994049.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug     4994049
  * @summary Unit test for SourcePosition.column with respect to tab expansion
diff --git a/test/langtools/jdk/javadoc/tool/T6551367.java b/test/langtools/jdk/javadoc/tool/T6551367.java
index 875c91a1cf1..815b0b121e4 100644
--- a/test/langtools/jdk/javadoc/tool/T6551367.java
+++ b/test/langtools/jdk/javadoc/tool/T6551367.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug     6551367
  * @summary javadoc throws ClassCastException when an link tag tries to reference constructor.
diff --git a/test/langtools/jdk/javadoc/tool/TestScriptInComment.java b/test/langtools/jdk/javadoc/tool/TestScriptInComment.java
index 3eaa47a36d5..638e4c18059 100644
--- a/test/langtools/jdk/javadoc/tool/TestScriptInComment.java
+++ b/test/langtools/jdk/javadoc/tool/TestScriptInComment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8138725 8226765
  * @summary test --allow-script-in-comments
diff --git a/test/langtools/jdk/javadoc/tool/modules/CommandLineFiles.java b/test/langtools/jdk/javadoc/tool/modules/CommandLineFiles.java
index 006a6489f8d..229d729bf40 100644
--- a/test/langtools/jdk/javadoc/tool/modules/CommandLineFiles.java
+++ b/test/langtools/jdk/javadoc/tool/modules/CommandLineFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8176539
  * @summary Test use case when all java files are listed
diff --git a/test/langtools/jdk/javadoc/tool/modules/FilterOptions.java b/test/langtools/jdk/javadoc/tool/modules/FilterOptions.java
index 8fd9b26cc12..e510ea83bc4 100644
--- a/test/langtools/jdk/javadoc/tool/modules/FilterOptions.java
+++ b/test/langtools/jdk/javadoc/tool/modules/FilterOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8159305 8167383
  * @summary Tests elements filtering options
diff --git a/test/langtools/jdk/javadoc/tool/modules/PackageOptions.java b/test/langtools/jdk/javadoc/tool/modules/PackageOptions.java
index b6e16dc592d..2c6624ca19a 100644
--- a/test/langtools/jdk/javadoc/tool/modules/PackageOptions.java
+++ b/test/langtools/jdk/javadoc/tool/modules/PackageOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8159305
  * @summary Test modules with packages and subpackages filtering
diff --git a/test/langtools/jdk/javadoc/tool/modules/PatchModules.java b/test/langtools/jdk/javadoc/tool/modules/PatchModules.java
index 10101a33ec6..ec9e6b3b894 100644
--- a/test/langtools/jdk/javadoc/tool/modules/PatchModules.java
+++ b/test/langtools/jdk/javadoc/tool/modules/PatchModules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8175346
  * @summary Test patch module options
diff --git a/test/langtools/jdk/javadoc/tool/modules/ReleaseOptions.java b/test/langtools/jdk/javadoc/tool/modules/ReleaseOptions.java
index 2e0d4778401..ce86d073e33 100644
--- a/test/langtools/jdk/javadoc/tool/modules/ReleaseOptions.java
+++ b/test/langtools/jdk/javadoc/tool/modules/ReleaseOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8175346 8175277
  * @summary Test release option interactions
diff --git a/test/langtools/jdk/javadoc/tool/nonConstExprs/Test.java b/test/langtools/jdk/javadoc/tool/nonConstExprs/Test.java
index 889945b236d..cba4792f166 100644
--- a/test/langtools/jdk/javadoc/tool/nonConstExprs/Test.java
+++ b/test/langtools/jdk/javadoc/tool/nonConstExprs/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug     8010310
  * @summary Error processing sources with -private
diff --git a/test/langtools/jdk/javadoc/tool/parser/7091528/T7091528.java b/test/langtools/jdk/javadoc/tool/parser/7091528/T7091528.java
index 39a726e3261..598b1b63c02 100644
--- a/test/langtools/jdk/javadoc/tool/parser/7091528/T7091528.java
+++ b/test/langtools/jdk/javadoc/tool/parser/7091528/T7091528.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug     7091528 8029145 8037484
  * @summary ensures javadoc parses unique source files and ignores all class files
diff --git a/test/langtools/jdk/jshell/HighlightUITest.java b/test/langtools/jdk/jshell/HighlightUITest.java
index ede22e8f010..954cb33117a 100644
--- a/test/langtools/jdk/jshell/HighlightUITest.java
+++ b/test/langtools/jdk/jshell/HighlightUITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8274148
  * @summary Check the UI behavior of snippet highligting
diff --git a/test/langtools/jdk/jshell/HistoryUITest.java b/test/langtools/jdk/jshell/HistoryUITest.java
index 42e242fe1e6..3083fe46688 100644
--- a/test/langtools/jdk/jshell/HistoryUITest.java
+++ b/test/langtools/jdk/jshell/HistoryUITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8178077 8232856
  * @summary Check the UI behavior of editing history.
diff --git a/test/langtools/jdk/jshell/IndentUITest.java b/test/langtools/jdk/jshell/IndentUITest.java
index 6858277a179..d7534b3e6b9 100644
--- a/test/langtools/jdk/jshell/IndentUITest.java
+++ b/test/langtools/jdk/jshell/IndentUITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8241950 8247932
  * @summary Check the UI behavior of indentation
diff --git a/test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java b/test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java
index 409965e2e68..8ec8ded1741 100644
--- a/test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java
+++ b/test/langtools/jdk/jshell/PasteAndMeasurementsUITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8182297 8242919 8267459
  * @summary Verify that pasting multi-line snippets works properly.
diff --git a/test/langtools/jdk/jshell/ToolMultilineSnippetHistoryTest.java b/test/langtools/jdk/jshell/ToolMultilineSnippetHistoryTest.java
index 8a7b46fc1c7..1850f6c3639 100644
--- a/test/langtools/jdk/jshell/ToolMultilineSnippetHistoryTest.java
+++ b/test/langtools/jdk/jshell/ToolMultilineSnippetHistoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8182489
  * @summary test history with multiline snippets
diff --git a/test/langtools/jdk/jshell/ToolShiftTabTest.java b/test/langtools/jdk/jshell/ToolShiftTabTest.java
index 4c36d79c16a..87f616678cb 100644
--- a/test/langtools/jdk/jshell/ToolShiftTabTest.java
+++ b/test/langtools/jdk/jshell/ToolShiftTabTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8166334 8188894
  * @summary test shift-tab shortcuts "fixes"
diff --git a/test/langtools/jdk/jshell/ToolTabCommandTest.java b/test/langtools/jdk/jshell/ToolTabCommandTest.java
index 9a429bb7253..f2f3111c4fa 100644
--- a/test/langtools/jdk/jshell/ToolTabCommandTest.java
+++ b/test/langtools/jdk/jshell/ToolTabCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8177076 8185840 8178109 8192863
  * @modules
diff --git a/test/langtools/jdk/jshell/ToolTabSnippetTest.java b/test/langtools/jdk/jshell/ToolTabSnippetTest.java
index 86338938c2c..252d57f4a6f 100644
--- a/test/langtools/jdk/jshell/ToolTabSnippetTest.java
+++ b/test/langtools/jdk/jshell/ToolTabSnippetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8177076 8185426 8189595 8188072 8221759 8255273
  * @modules
diff --git a/test/langtools/jdk/jshell/UndefinedClassTest.java b/test/langtools/jdk/jshell/UndefinedClassTest.java
index 5c509252bd6..eb0cf3699cf 100644
--- a/test/langtools/jdk/jshell/UndefinedClassTest.java
+++ b/test/langtools/jdk/jshell/UndefinedClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8292755
  * @summary InternalError seen while throwing undefined exception

From 58ad399d196bf2dd701df451004b7815b0820675 Mon Sep 17 00:00:00 2001
From: Scott Gibbons <sgibbons@openjdk.org>
Date: Mon, 22 Apr 2024 22:54:19 +0000
Subject: [PATCH 140/486] 8330821: Rename UnsafeCopyMemory

Reviewed-by: kvn, sviswanathan
---
 .../cpu/aarch64/stubGenerator_aarch64.cpp     | 12 +--
 src/hotspot/cpu/arm/stubGenerator_arm.cpp     | 34 ++++-----
 src/hotspot/cpu/ppc/stubGenerator_ppc.cpp     | 40 +++++-----
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 12 +--
 src/hotspot/cpu/x86/stubGenerator_x86_32.cpp  | 20 ++---
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |  4 +-
 .../x86/stubGenerator_x86_64_arraycopy.cpp    | 76 +++++++++----------
 src/hotspot/os/windows/os_windows.cpp         |  4 +-
 src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp     |  8 +-
 .../os_cpu/bsd_aarch64/os_bsd_aarch64.cpp     |  8 +-
 src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp     |  8 +-
 .../os_cpu/linux_aarch64/os_linux_aarch64.cpp |  8 +-
 src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp |  6 +-
 src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp |  8 +-
 .../os_cpu/linux_riscv/os_linux_riscv.cpp     |  8 +-
 src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp |  8 +-
 src/hotspot/share/runtime/stubRoutines.cpp    | 34 ++++-----
 src/hotspot/share/runtime/stubRoutines.hpp    | 20 ++---
 18 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 4dc674d28c5..29b95fdb2dd 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -1519,9 +1519,9 @@ class StubGenerator: public StubCodeGenerator {
       __ push(RegSet::of(d, count), sp);
     }
     {
-      // UnsafeCopyMemory page error: continue after ucm
+      // UnsafeMemoryAccess page error: continue after unsafe access
       bool add_entry = !is_oop && (!aligned || sizeof(jlong) == size);
-      UnsafeCopyMemoryMark ucmm(this, add_entry, true);
+      UnsafeMemoryAccessMark umam(this, add_entry, true);
       copy_memory(decorators, is_oop ? T_OBJECT : T_BYTE, aligned, s, d, count, size);
     }
 
@@ -1590,9 +1590,9 @@ class StubGenerator: public StubCodeGenerator {
       __ push(RegSet::of(d, count), sp);
     }
     {
-      // UnsafeCopyMemory page error: continue after ucm
+      // UnsafeMemoryAccess page error: continue after unsafe access
       bool add_entry = !is_oop && (!aligned || sizeof(jlong) == size);
-      UnsafeCopyMemoryMark ucmm(this, add_entry, true);
+      UnsafeMemoryAccessMark umam(this, add_entry, true);
       copy_memory(decorators, is_oop ? T_OBJECT : T_BYTE, aligned, s, d, count, -size);
     }
     if (is_oop) {
@@ -8378,8 +8378,8 @@ class StubGenerator: public StubCodeGenerator {
                                                 SharedRuntime::throw_delayed_StackOverflowError));
 
     // Initialize table for copy memory (arraycopy) check.
-    if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(8 + 4); // 8 for copyMemory; 4 for setMemory
+    if (UnsafeMemoryAccess::_table == nullptr) {
+      UnsafeMemoryAccess::create_table(8 + 4); // 8 for copyMemory; 4 for setMemory
     }
 
     if (UseCRC32Intrinsics) {
diff --git a/src/hotspot/cpu/arm/stubGenerator_arm.cpp b/src/hotspot/cpu/arm/stubGenerator_arm.cpp
index 9d526c7ebdc..0d66a2fbb0a 100644
--- a/src/hotspot/cpu/arm/stubGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/stubGenerator_arm.cpp
@@ -956,8 +956,8 @@ class StubGenerator: public StubCodeGenerator {
     Label L_skip_pld;
 
     {
-      // UnsafeCopyMemory page error: continue after ucm
-      UnsafeCopyMemoryMark ucmm(this, unsafe_copy, true);
+      // UnsafeMemoryAccess page error: continue after unsafe access
+      UnsafeMemoryAccessMark umam(this, unsafe_copy, true);
       // predecrease to exit when there is less than count_per_loop
       __ sub_32(count, count, count_per_loop);
 
@@ -1105,8 +1105,8 @@ class StubGenerator: public StubCodeGenerator {
     __ push(RegisterSet(R4,R10));
 
     {
-      // UnsafeCopyMemory page error: continue after ucm
-      UnsafeCopyMemoryMark ucmm(this, unsafe_copy, true);
+      // UnsafeMemoryAccess page error: continue after unsafe access
+      UnsafeMemoryAccessMark umam(this, unsafe_copy, true);
       __ sub_32(count, count, count_per_loop);
 
       const bool prefetch_before = pld_offset < 0;
@@ -1761,8 +1761,8 @@ class StubGenerator: public StubCodeGenerator {
     assert_different_registers(from, to, count, tmp);
 
     {
-      // UnsafeCopyMemory page error: continue after ucm
-      UnsafeCopyMemoryMark ucmm(this, unsafe_copy, true);
+      // UnsafeMemoryAccess page error: continue after unsafe access
+      UnsafeMemoryAccessMark umam(this, unsafe_copy, true);
       __ align(OptoLoopAlignment);
       Label L_small_loop;
       __ BIND(L_small_loop);
@@ -1900,8 +1900,8 @@ class StubGenerator: public StubCodeGenerator {
     __ push(RegisterSet(R4,R10));
 
     {
-      // UnsafeCopyMemory page error: continue after ucm
-      UnsafeCopyMemoryMark ucmm(this, unsafe_copy, true);
+      // UnsafeMemoryAccess page error: continue after unsafe access
+      UnsafeMemoryAccessMark umam(this, unsafe_copy, true);
       load_one(Rval, from, wordSize, forward);
 
       switch (bytes_per_count) {
@@ -2058,8 +2058,8 @@ class StubGenerator: public StubCodeGenerator {
 
     int count_required_to_align = 0;
     {
-      // UnsafeCopyMemoryMark page error: continue at UnsafeCopyMemory common_error_exit
-      UnsafeCopyMemoryMark ucmm(this, !aligned, false);
+      // UnsafeMemoryAccessMark page error: continue at UnsafeMemoryAccess common_error_exit
+      UnsafeMemoryAccessMark umam(this, !aligned, false);
       count_required_to_align = from_is_aligned ? 0 : align_src(from, to, count, tmp1, bytes_per_count, forward);
       assert (small_copy_limit >= count_required_to_align, "alignment could exhaust count");
     }
@@ -2092,9 +2092,9 @@ class StubGenerator: public StubCodeGenerator {
 
     int min_copy;
     if (forward) {
-      min_copy = generate_forward_aligned_copy_loop(from, to, count, bytes_per_count, !aligned /*add UnsafeCopyMemory entry*/);
+      min_copy = generate_forward_aligned_copy_loop(from, to, count, bytes_per_count, !aligned /*add UnsafeMemoryAccess entry*/);
     } else {
-      min_copy = generate_backward_aligned_copy_loop(from, to, count, bytes_per_count, !aligned /*add UnsafeCopyMemory entry*/);
+      min_copy = generate_backward_aligned_copy_loop(from, to, count, bytes_per_count, !aligned /*add UnsafeMemoryAccess entry*/);
     }
     assert(small_copy_limit >= count_required_to_align + min_copy, "first loop might exhaust count");
 
@@ -2105,7 +2105,7 @@ class StubGenerator: public StubCodeGenerator {
     __ ret();
 
     {
-      copy_small_array(from, to, count, tmp1, tmp2, bytes_per_count, forward, L_small_array /* entry */, !aligned /*add UnsafeCopyMemory entry*/);
+      copy_small_array(from, to, count, tmp1, tmp2, bytes_per_count, forward, L_small_array /* entry */, !aligned /*add UnsafeMemoryAccess entry*/);
 
       if (status) {
         __ mov(R0, 0); // OK
@@ -2116,7 +2116,7 @@ class StubGenerator: public StubCodeGenerator {
 
     if (! to_is_aligned) {
       __ BIND(L_unaligned_dst);
-      int min_copy_shifted = align_dst_and_generate_shifted_copy_loop(from, to, count, bytes_per_count, forward, !aligned /*add UnsafeCopyMemory entry*/);
+      int min_copy_shifted = align_dst_and_generate_shifted_copy_loop(from, to, count, bytes_per_count, forward, !aligned /*add UnsafeMemoryAccess entry*/);
       assert (small_copy_limit >= count_required_to_align + min_copy_shifted, "first loop might exhaust count");
 
       if (status) {
@@ -2862,7 +2862,7 @@ class StubGenerator: public StubCodeGenerator {
 #endif
 
     address ucm_common_error_exit       =  generate_unsafecopy_common_error_exit();
-    UnsafeCopyMemory::set_common_exit_stub_pc(ucm_common_error_exit);
+    UnsafeMemoryAccess::set_common_exit_stub_pc(ucm_common_error_exit);
 
     // these need always status in case they are called from generic_arraycopy
     StubRoutines::_jbyte_disjoint_arraycopy  = generate_primitive_copy(false, "jbyte_disjoint_arraycopy",  true, 1, true);
@@ -3134,8 +3134,8 @@ class StubGenerator: public StubCodeGenerator {
     // stub for throwing stack overflow error used both by interpreter and compiler
     StubRoutines::_throw_StackOverflowError_entry  = generate_throw_exception("StackOverflowError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError));
 
-    if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(32 + 4); // 32 for copyMemory; 4 for setMemory
+    if (UnsafeMemoryAccess::_table == nullptr) {
+      UnsafeMemoryAccess::create_table(32 + 4); // 32 for copyMemory; 4 for setMemory
     }
 
     // integer division used both by interpreter and compiler
diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 4a9e5476dce..63502c00b23 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -961,7 +961,7 @@ class StubGenerator: public StubCodeGenerator {
     // need to copy backwards
   }
 
-  // This is common errorexit stub for UnsafeCopyMemory.
+  // This is common errorexit stub for UnsafeMemoryAccess.
   address generate_unsafecopy_common_error_exit() {
     address start_pc = __ pc();
     Register tmp1 = R6_ARG4;
@@ -1013,8 +1013,8 @@ class StubGenerator: public StubCodeGenerator {
 
     Label l_1, l_2, l_3, l_4, l_5, l_6, l_7, l_8, l_9, l_10;
     {
-      // UnsafeCopyMemory page error: continue at UnsafeCopyMemory common_error_exit
-      UnsafeCopyMemoryMark ucmm(this, !aligned, false);
+      // UnsafeMemoryAccess page error: continue at UnsafeMemoryAccess common_error_exit
+      UnsafeMemoryAccessMark umam(this, !aligned, false);
 
       // Don't try anything fancy if arrays don't have many elements.
       __ li(tmp3, 0);
@@ -1195,8 +1195,8 @@ class StubGenerator: public StubCodeGenerator {
     // that we don't have to optimize it.
     Label l_1, l_2;
     {
-      // UnsafeCopyMemory page error: continue at UnsafeCopyMemory common_error_exit
-      UnsafeCopyMemoryMark ucmm(this, !aligned, false);
+      // UnsafeMemoryAccess page error: continue at UnsafeMemoryAccess common_error_exit
+      UnsafeMemoryAccessMark umam(this, !aligned, false);
       __ b(l_2);
       __ bind(l_1);
       __ stbx(tmp1, R4_ARG2, R5_ARG3);
@@ -1282,8 +1282,8 @@ class StubGenerator: public StubCodeGenerator {
 
     Label l_1, l_2, l_3, l_4, l_5, l_6, l_7, l_8, l_9;
     {
-      // UnsafeCopyMemory page error: continue at UnsafeCopyMemory common_error_exit
-      UnsafeCopyMemoryMark ucmm(this, !aligned, false);
+      // UnsafeMemoryAccess page error: continue at UnsafeMemoryAccess common_error_exit
+      UnsafeMemoryAccessMark umam(this, !aligned, false);
       // don't try anything fancy if arrays don't have many elements
       __ li(tmp3, 0);
       __ cmpwi(CCR0, R5_ARG3, 9);
@@ -1466,8 +1466,8 @@ class StubGenerator: public StubCodeGenerator {
 
     Label l_1, l_2;
     {
-      // UnsafeCopyMemory page error: continue at UnsafeCopyMemory common_error_exit
-      UnsafeCopyMemoryMark ucmm(this, !aligned, false);
+      // UnsafeMemoryAccess page error: continue at UnsafeMemoryAccess common_error_exit
+      UnsafeMemoryAccessMark umam(this, !aligned, false);
       __ sldi(tmp1, R5_ARG3, 1);
       __ b(l_2);
       __ bind(l_1);
@@ -1625,8 +1625,8 @@ class StubGenerator: public StubCodeGenerator {
     address start = __ function_entry();
     assert_positive_int(R5_ARG3);
     {
-      // UnsafeCopyMemory page error: continue at UnsafeCopyMemory common_error_exit
-      UnsafeCopyMemoryMark ucmm(this, !aligned, false);
+      // UnsafeMemoryAccess page error: continue at UnsafeMemoryAccess common_error_exit
+      UnsafeMemoryAccessMark umam(this, !aligned, false);
       generate_disjoint_int_copy_core(aligned);
     }
     __ li(R3_RET, 0); // return 0
@@ -1777,8 +1777,8 @@ class StubGenerator: public StubCodeGenerator {
 
     array_overlap_test(nooverlap_target, 2);
     {
-      // UnsafeCopyMemory page error: continue at UnsafeCopyMemory common_error_exit
-      UnsafeCopyMemoryMark ucmm(this, !aligned, false);
+      // UnsafeMemoryAccess page error: continue at UnsafeMemoryAccess common_error_exit
+      UnsafeMemoryAccessMark umam(this, !aligned, false);
       generate_conjoint_int_copy_core(aligned);
     }
 
@@ -1903,8 +1903,8 @@ class StubGenerator: public StubCodeGenerator {
     address start = __ function_entry();
     assert_positive_int(R5_ARG3);
     {
-      // UnsafeCopyMemory page error: continue at UnsafeCopyMemory common_error_exit
-      UnsafeCopyMemoryMark ucmm(this, !aligned, false);
+      // UnsafeMemoryAccess page error: continue at UnsafeMemoryAccess common_error_exit
+      UnsafeMemoryAccessMark umam(this, !aligned, false);
       generate_disjoint_long_copy_core(aligned);
     }
     __ li(R3_RET, 0); // return 0
@@ -2034,8 +2034,8 @@ class StubGenerator: public StubCodeGenerator {
 
     array_overlap_test(nooverlap_target, 3);
     {
-      // UnsafeCopyMemory page error: continue at UnsafeCopyMemory common_error_exit
-      UnsafeCopyMemoryMark ucmm(this, !aligned, false);
+      // UnsafeMemoryAccess page error: continue at UnsafeMemoryAccess common_error_exit
+      UnsafeMemoryAccessMark umam(this, !aligned, false);
       generate_conjoint_long_copy_core(aligned);
     }
     __ li(R3_RET, 0); // return 0
@@ -3129,7 +3129,7 @@ class StubGenerator: public StubCodeGenerator {
     // the conjoint stubs use them.
 
     address ucm_common_error_exit       =  generate_unsafecopy_common_error_exit();
-    UnsafeCopyMemory::set_common_exit_stub_pc(ucm_common_error_exit);
+    UnsafeMemoryAccess::set_common_exit_stub_pc(ucm_common_error_exit);
 
     // non-aligned disjoint versions
     StubRoutines::_jbyte_disjoint_arraycopy       = generate_disjoint_byte_copy(false, "jbyte_disjoint_arraycopy");
@@ -4745,8 +4745,8 @@ class StubGenerator: public StubCodeGenerator {
     StubRoutines::_call_stub_entry                  = generate_call_stub(StubRoutines::_call_stub_return_address);
     StubRoutines::_catch_exception_entry            = generate_catch_exception();
 
-    if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(8 + 4); // 8 for copyMemory; 4 for setMemory
+    if (UnsafeMemoryAccess::_table == nullptr) {
+      UnsafeMemoryAccess::create_table(8 + 4); // 8 for copyMemory; 4 for setMemory
     }
 
     // Build this early so it's available for the interpreter.
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 8ac8263b308..a4a92047eae 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -1136,9 +1136,9 @@ class StubGenerator: public StubCodeGenerator {
     }
 
     {
-      // UnsafeCopyMemory page error: continue after ucm
+      // UnsafeMemoryAccess page error: continue after unsafe access
       bool add_entry = !is_oop && (!aligned || sizeof(jlong) == size);
-      UnsafeCopyMemoryMark ucmm(this, add_entry, true);
+      UnsafeMemoryAccessMark umam(this, add_entry, true);
       copy_memory(decorators, is_oop ? T_OBJECT : T_BYTE, aligned, s, d, count, size);
     }
 
@@ -1212,9 +1212,9 @@ class StubGenerator: public StubCodeGenerator {
     }
 
     {
-      // UnsafeCopyMemory page error: continue after ucm
+      // UnsafeMemoryAccess page error: continue after unsafe access
       bool add_entry = !is_oop && (!aligned || sizeof(jlong) == size);
-      UnsafeCopyMemoryMark ucmm(this, add_entry, true);
+      UnsafeMemoryAccessMark umam(this, add_entry, true);
       copy_memory(decorators, is_oop ? T_OBJECT : T_BYTE, aligned, s, d, count, -size);
     }
 
@@ -5500,8 +5500,8 @@ static const int64_t right_3_bits = right_n_bits(3);
 
     StubRoutines::_forward_exception_entry = generate_forward_exception();
 
-    if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(8 + 4); // 8 for copyMemory; 4 for setMemory
+    if (UnsafeMemoryAccess::_table == nullptr) {
+      UnsafeMemoryAccess::create_table(8 + 4); // 8 for copyMemory; 4 for setMemory
     }
 
     StubRoutines::_call_stub_entry =
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
index 13b036a70aa..d8067a39177 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
@@ -1131,8 +1131,8 @@ class StubGenerator: public StubCodeGenerator {
     bs->arraycopy_prologue(_masm, decorators, t, from, to, count);
     {
       bool add_entry = (t != T_OBJECT && (!aligned || t == T_INT));
-      // UnsafeCopyMemory page error: continue after ucm
-      UnsafeCopyMemoryMark ucmm(this, add_entry, true);
+      // UnsafeMemoryAccess page error: continue after unsafe access
+      UnsafeMemoryAccessMark umam(this, add_entry, true);
       __ subptr(to, from); // to --> to_from
       __ cmpl(count, 2<<shift); // Short arrays (< 8 bytes) copy by element
       __ jcc(Assembler::below, L_copy_4_bytes); // use unsigned cmp
@@ -1321,8 +1321,8 @@ class StubGenerator: public StubCodeGenerator {
 
     {
       bool add_entry = (t != T_OBJECT && (!aligned || t == T_INT));
-      // UnsafeCopyMemory page error: continue after ucm
-      UnsafeCopyMemoryMark ucmm(this, add_entry, true);
+      // UnsafeMemoryAccess page error: continue after unsafe access
+      UnsafeMemoryAccessMark umam(this, add_entry, true);
       // copy from high to low
       __ cmpl(count, 2<<shift); // Short arrays (< 8 bytes) copy by element
       __ jcc(Assembler::below, L_copy_4_bytes); // use unsigned cmp
@@ -1450,8 +1450,8 @@ class StubGenerator: public StubCodeGenerator {
     BLOCK_COMMENT("Entry:");
 
     {
-      // UnsafeCopyMemory page error: continue after ucm
-      UnsafeCopyMemoryMark ucmm(this, true, true);
+      // UnsafeMemoryAccess page error: continue after unsafe access
+      UnsafeMemoryAccessMark umam(this, true, true);
       __ subptr(to, from); // to --> to_from
       if (UseXMMForArrayCopy) {
         xmm_copy_forward(from, to_from, count);
@@ -1505,8 +1505,8 @@ class StubGenerator: public StubCodeGenerator {
     __ jump_cc(Assembler::aboveEqual, nooverlap);
 
     {
-      // UnsafeCopyMemory page error: continue after ucm
-      UnsafeCopyMemoryMark ucmm(this, true, true);
+      // UnsafeMemoryAccess page error: continue after unsafe access
+      UnsafeMemoryAccessMark umam(this, true, true);
 
       __ jmpb(L_copy_8_bytes);
 
@@ -4121,8 +4121,8 @@ class StubGenerator: public StubCodeGenerator {
     create_control_words();
 
     // Initialize table for copy memory (arraycopy) check.
-    if (UnsafeCopyMemory::_table == nullptr) {
-      UnsafeCopyMemory::create_table(16 + 4); // 16 for copyMemory; 4 for setMemory
+    if (UnsafeMemoryAccess::_table == nullptr) {
+      UnsafeMemoryAccess::create_table(16 + 4); // 16 for copyMemory; 4 for setMemory
     }
 
     StubRoutines::x86::_verify_mxcsr_entry         = generate_verify_mxcsr();
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 1a66ba6a55b..63226a560f4 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -4057,8 +4057,8 @@ void StubGenerator::generate_initial_stubs() {
   create_control_words();
 
   // Initialize table for unsafe copy memeory check.
-  if (UnsafeCopyMemory::_table == nullptr) {
-    UnsafeCopyMemory::create_table(16 + 4); // 16 for copyMemory; 4 for setMemory
+  if (UnsafeMemoryAccess::_table == nullptr) {
+    UnsafeMemoryAccess::create_table(16 + 4); // 16 for copyMemory; 4 for setMemory
   }
 
   // entry points that exist in all platforms Note: This is code
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
index 27406792f60..d8f7a6b272b 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
@@ -560,8 +560,8 @@ address StubGenerator::generate_disjoint_copy_avx3_masked(address* entry, const
     int loop_size[]        = { 192,     96,       48,      24};
     int threshold[]        = { 4096,    2048,     1024,    512};
 
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, true);
     // 'from', 'to' and 'count' are now valid
 
     // temp1 holds remaining count and temp4 holds running count used to compute
@@ -730,7 +730,7 @@ address StubGenerator::generate_disjoint_copy_avx3_masked(address* entry, const
 
   if (MaxVectorSize == 64) {
     __ BIND(L_copy_large);
-      UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, false, ucme_exit_pc);
+      UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, false, ucme_exit_pc);
       arraycopy_avx3_large(to, from, temp1, temp2, temp3, temp4, count, xmm1, xmm2, xmm3, xmm4, shift);
     __ jmp(L_finish);
   }
@@ -859,8 +859,8 @@ address StubGenerator::generate_conjoint_copy_avx3_masked(address* entry, const
     int loop_size[]   = { 192,     96,       48,      24};
     int threshold[]   = { 4096,    2048,     1024,    512};
 
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, true);
     // 'from', 'to' and 'count' are now valid
 
     // temp1 holds remaining count.
@@ -1318,8 +1318,8 @@ address StubGenerator::generate_disjoint_byte_copy(bool aligned, address* entry,
                     // r9 and r10 may be used to save non-volatile registers
 
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !aligned, true);
     // 'from', 'to' and 'count' are now valid
     __ movptr(byte_count, count);
     __ shrptr(count, 3); // count => qword_count
@@ -1374,7 +1374,7 @@ __ BIND(L_exit);
   __ ret(0);
 
   {
-    UnsafeCopyMemoryMark ucmm(this, !aligned, false, ucme_exit_pc);
+    UnsafeMemoryAccessMark umam(this, !aligned, false, ucme_exit_pc);
     // Copy in multi-bytes chunks
     copy_bytes_forward(end_from, end_to, qword_count, rax, r10, L_copy_bytes, L_copy_8_bytes, decorators, T_BYTE);
     __ jmp(L_copy_4_bytes);
@@ -1432,8 +1432,8 @@ address StubGenerator::generate_conjoint_byte_copy(bool aligned, address nooverl
                     // r9 and r10 may be used to save non-volatile registers
 
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !aligned, true);
     // 'from', 'to' and 'count' are now valid
     __ movptr(byte_count, count);
     __ shrptr(count, 3);   // count => qword_count
@@ -1477,8 +1477,8 @@ address StubGenerator::generate_conjoint_byte_copy(bool aligned, address nooverl
   __ ret(0);
 
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !aligned, true);
     // Copy in multi-bytes chunks
     copy_bytes_backward(from, to, qword_count, rax, r10, L_copy_bytes, L_copy_8_bytes, decorators, T_BYTE);
   }
@@ -1549,8 +1549,8 @@ address StubGenerator::generate_disjoint_short_copy(bool aligned, address *entry
                     // r9 and r10 may be used to save non-volatile registers
 
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !aligned, true);
     // 'from', 'to' and 'count' are now valid
     __ movptr(word_count, count);
     __ shrptr(count, 2); // count => qword_count
@@ -1598,7 +1598,7 @@ __ BIND(L_exit);
   __ ret(0);
 
   {
-    UnsafeCopyMemoryMark ucmm(this, !aligned, false, ucme_exit_pc);
+    UnsafeMemoryAccessMark umam(this, !aligned, false, ucme_exit_pc);
     // Copy in multi-bytes chunks
     copy_bytes_forward(end_from, end_to, qword_count, rax, r10, L_copy_bytes, L_copy_8_bytes, decorators, T_SHORT);
     __ jmp(L_copy_4_bytes);
@@ -1624,7 +1624,7 @@ address StubGenerator::generate_fill(BasicType t, bool aligned, const char *name
 
   {
     // Add set memory mark to protect against unsafe accesses faulting
-    UnsafeCopyMemoryMark usmm(this, ((t == T_BYTE) && !aligned), true);
+    UnsafeMemoryAccessMark umam(this, ((t == T_BYTE) && !aligned), true);
     __ generate_fill(t, aligned, to, value, r11, rax, xmm0);
   }
 
@@ -1685,8 +1685,8 @@ address StubGenerator::generate_conjoint_short_copy(bool aligned, address noover
                     // r9 and r10 may be used to save non-volatile registers
 
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !aligned, true);
     // 'from', 'to' and 'count' are now valid
     __ movptr(word_count, count);
     __ shrptr(count, 2); // count => qword_count
@@ -1722,8 +1722,8 @@ address StubGenerator::generate_conjoint_short_copy(bool aligned, address noover
   __ ret(0);
 
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !aligned, true);
     // Copy in multi-bytes chunks
     copy_bytes_backward(from, to, qword_count, rax, r10, L_copy_bytes, L_copy_8_bytes, decorators, T_SHORT);
   }
@@ -1806,8 +1806,8 @@ address StubGenerator::generate_disjoint_int_oop_copy(bool aligned, bool is_oop,
   bs->arraycopy_prologue(_masm, decorators, type, from, to, count);
 
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, true);
     // 'from', 'to' and 'count' are now valid
     __ movptr(dword_count, count);
     __ shrptr(count, 1); // count => qword_count
@@ -1843,7 +1843,7 @@ __ BIND(L_exit);
   __ ret(0);
 
   {
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, false, ucme_exit_pc);
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, false, ucme_exit_pc);
     // Copy in multi-bytes chunks
     copy_bytes_forward(end_from, end_to, qword_count, rax, r10, L_copy_bytes, L_copy_8_bytes, decorators, is_oop ? T_OBJECT : T_INT);
     __ jmp(L_copy_4_bytes);
@@ -1916,8 +1916,8 @@ address StubGenerator::generate_conjoint_int_oop_copy(bool aligned, bool is_oop,
 
   assert_clean_int(count, rax); // Make sure 'count' is clean int.
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, true);
     // 'from', 'to' and 'count' are now valid
     __ movptr(dword_count, count);
     __ shrptr(count, 1); // count => qword_count
@@ -1949,8 +1949,8 @@ address StubGenerator::generate_conjoint_int_oop_copy(bool aligned, bool is_oop,
   __ ret(0);
 
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, true);
     // Copy in multi-bytes chunks
     copy_bytes_backward(from, to, qword_count, rax, r10, L_copy_bytes, L_copy_8_bytes, decorators, is_oop ? T_OBJECT : T_INT);
   }
@@ -2031,8 +2031,8 @@ address StubGenerator::generate_disjoint_long_oop_copy(bool aligned, bool is_oop
   BasicType type = is_oop ? T_OBJECT : T_LONG;
   bs->arraycopy_prologue(_masm, decorators, type, from, to, qword_count);
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, true);
 
     // Copy from low to high addresses.  Use 'to' as scratch.
     __ lea(end_from, Address(from, qword_count, Address::times_8, -8));
@@ -2063,8 +2063,8 @@ address StubGenerator::generate_disjoint_long_oop_copy(bool aligned, bool is_oop
   }
 
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, true);
     // Copy in multi-bytes chunks
     copy_bytes_forward(end_from, end_to, qword_count, rax, r10, L_copy_bytes, L_copy_8_bytes, decorators, is_oop ? T_OBJECT : T_LONG);
   }
@@ -2140,8 +2140,8 @@ address StubGenerator::generate_conjoint_long_oop_copy(bool aligned, bool is_oop
   BasicType type = is_oop ? T_OBJECT : T_LONG;
   bs->arraycopy_prologue(_masm, decorators, type, from, to, qword_count);
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, true);
 
     __ jmp(L_copy_bytes);
 
@@ -2167,8 +2167,8 @@ address StubGenerator::generate_conjoint_long_oop_copy(bool aligned, bool is_oop
     __ ret(0);
   }
   {
-    // UnsafeCopyMemory page error: continue after ucm
-    UnsafeCopyMemoryMark ucmm(this, !is_oop && !aligned, true);
+    // UnsafeMemoryAccess page error: continue after unsafe access
+    UnsafeMemoryAccessMark umam(this, !is_oop && !aligned, true);
 
     // Copy in multi-bytes chunks
     copy_bytes_backward(from, to, qword_count, rax, r10, L_copy_bytes, L_copy_8_bytes, decorators, is_oop ? T_OBJECT : T_LONG);
@@ -2628,7 +2628,7 @@ address StubGenerator::generate_unsafe_setmemory(const char *name,
     // Fill words
     {
       Label L_wordsTail, L_wordsLoop, L_wordsTailLoop;
-      UnsafeCopyMemoryMark usmm(this, true, true);
+      UnsafeMemoryAccessMark umam(this, true, true);
 
       // At this point, we know the lower bit of size is zero and a
       // multiple of 2
@@ -2642,7 +2642,7 @@ address StubGenerator::generate_unsafe_setmemory(const char *name,
     // Fill QUADWORDs
     {
       Label L_qwordLoop, L_qwordsTail, L_qwordsTailLoop;
-      UnsafeCopyMemoryMark usmm(this, true, true);
+      UnsafeMemoryAccessMark umam(this, true, true);
 
       // At this point, we know the lower 3 bits of size are zero and a
       // multiple of 8
@@ -2659,7 +2659,7 @@ address StubGenerator::generate_unsafe_setmemory(const char *name,
     // Fill DWORDs
     {
       Label L_dwordLoop, L_dwordsTail, L_dwordsTailLoop;
-      UnsafeCopyMemoryMark usmm(this, true, true);
+      UnsafeMemoryAccessMark umam(this, true, true);
 
       // At this point, we know the lower 2 bits of size are zero and a
       // multiple of 4
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 37f40ebe596..ccd7a8f10ce 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -2795,12 +2795,12 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
         nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
       }
 
-      bool is_unsafe_memory_access = (in_native || in_java) && UnsafeCopyMemory::contains_pc(pc);
+      bool is_unsafe_memory_access = (in_native || in_java) && UnsafeMemoryAccess::contains_pc(pc);
       if (((in_vm || in_native || is_unsafe_memory_access) && thread->doing_unsafe_access()) ||
           (nm != nullptr && nm->has_unsafe_access())) {
         address next_pc =  Assembler::locate_next_instruction(pc);
         if (is_unsafe_memory_access) {
-          next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+          next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
         }
         return Handle_Exception(exceptionInfo, SharedRuntime::handle_unsafe_access(thread, next_pc));
       }
diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
index a3101c02285..b45d38650c0 100644
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
@@ -340,11 +340,11 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // underlying file has been truncated. Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = cb ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeMemoryAccess::contains_pc(pc));
         if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = pc + 4;
           if (is_unsafe_memory_access) {
-            next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+            next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
           }
           next_pc = SharedRuntime::handle_unsafe_access(thread, next_pc);
           os::Posix::ucontext_set_pc(uc, next_pc);
@@ -368,8 +368,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                 thread->thread_state() == _thread_in_native) &&
                sig == SIGBUS && thread->doing_unsafe_access()) {
         address next_pc = pc + 4;
-        if (UnsafeCopyMemory::contains_pc(pc)) {
-          next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+        if (UnsafeMemoryAccess::contains_pc(pc)) {
+          next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
         }
         next_pc = SharedRuntime::handle_unsafe_access(thread, next_pc);
         os::Posix::ucontext_set_pc(uc, next_pc);
diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
index 436c68f5a30..ba14cb2ac12 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
@@ -257,11 +257,11 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeMemoryAccess::contains_pc(pc));
         if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = pc + NativeCall::instruction_size;
           if (is_unsafe_memory_access) {
-            next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+            next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
         }
@@ -299,8 +299,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
                thread->doing_unsafe_access()) {
       address next_pc = pc + NativeCall::instruction_size;
-      if (UnsafeCopyMemory::contains_pc(pc)) {
-        next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+      if (UnsafeMemoryAccess::contains_pc(pc)) {
+        next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
       }
       stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
     }
diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
index 35ee2de2aa2..4e7316e0661 100644
--- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
+++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
@@ -441,11 +441,11 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_memory_access = thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc);
+        bool is_unsafe_memory_access = thread->doing_unsafe_access() && UnsafeMemoryAccess::contains_pc(pc);
         if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = Assembler::locate_next_instruction(pc);
           if (is_unsafe_memory_access) {
-            next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+            next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
         }
@@ -521,8 +521,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
                thread->doing_unsafe_access()) {
         address next_pc = Assembler::locate_next_instruction(pc);
-        if (UnsafeCopyMemory::contains_pc(pc)) {
-          next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+        if (UnsafeMemoryAccess::contains_pc(pc)) {
+          next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
         }
         stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
     }
diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
index fc6cbe5faf0..9f44fe3aa25 100644
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
@@ -240,11 +240,11 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeMemoryAccess::contains_pc(pc));
         if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = pc + NativeCall::instruction_size;
           if (is_unsafe_memory_access) {
-            next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+            next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
         }
@@ -286,8 +286,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
                thread->doing_unsafe_access()) {
       address next_pc = pc + NativeCall::instruction_size;
-      if (UnsafeCopyMemory::contains_pc(pc)) {
-        next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+      if (UnsafeMemoryAccess::contains_pc(pc)) {
+        next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
       }
       stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
     }
diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
index 5b5364e1117..807fa765897 100644
--- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
+++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
@@ -326,7 +326,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
         if ((nm != nullptr && nm->has_unsafe_access()) ||
             (thread->doing_unsafe_access() &&
-             UnsafeCopyMemory::contains_pc(pc))) {
+             UnsafeMemoryAccess::contains_pc(pc))) {
           unsafe_access = true;
         }
       } else if (sig == SIGSEGV &&
@@ -364,8 +364,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
     // any other suitable exception reason,
     // so assume it is an unsafe access.
     address next_pc = pc + Assembler::InstructionSize;
-    if (UnsafeCopyMemory::contains_pc(pc)) {
-      next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+    if (UnsafeMemoryAccess::contains_pc(pc)) {
+      next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
     }
 #ifdef __thumb__
     if (uc->uc_mcontext.arm_cpsr & PSR_T_BIT) {
diff --git a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
index 89197df4493..1857097bd52 100644
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
@@ -355,11 +355,11 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // underlying file has been truncated. Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeMemoryAccess::contains_pc(pc));
         if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = pc + 4;
           if (is_unsafe_memory_access) {
-            next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+            next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
           }
           next_pc = SharedRuntime::handle_unsafe_access(thread, next_pc);
           os::Posix::ucontext_set_pc(uc, next_pc);
@@ -379,8 +379,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                 thread->thread_state() == _thread_in_native) &&
                sig == SIGBUS && thread->doing_unsafe_access()) {
         address next_pc = pc + 4;
-        if (UnsafeCopyMemory::contains_pc(pc)) {
-          next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+        if (UnsafeMemoryAccess::contains_pc(pc)) {
+          next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
         }
         next_pc = SharedRuntime::handle_unsafe_access(thread, next_pc);
         os::Posix::ucontext_set_pc(uc, next_pc);
diff --git a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
index ec880236793..fcb0e170af1 100644
--- a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
@@ -230,11 +230,11 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        bool is_unsafe_memory_access = (thread->doing_unsafe_access() && UnsafeMemoryAccess::contains_pc(pc));
         if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = Assembler::locate_next_instruction(pc);
           if (is_unsafe_memory_access) {
-            next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+            next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
         }
@@ -272,8 +272,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                 sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
                 thread->doing_unsafe_access()) {
       address next_pc = Assembler::locate_next_instruction(pc);
-      if (UnsafeCopyMemory::contains_pc(pc)) {
-        next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+      if (UnsafeMemoryAccess::contains_pc(pc)) {
+        next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
       }
       stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
     }
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index 9815ff2c6ce..6cdb2a5e3f6 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -260,11 +260,11 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob(pc);
         nmethod* nm = (cb != nullptr) ? cb->as_nmethod_or_null() : nullptr;
-        bool is_unsafe_memory_access = thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc);
+        bool is_unsafe_memory_access = thread->doing_unsafe_access() && UnsafeMemoryAccess::contains_pc(pc);
         if ((nm != nullptr && nm->has_unsafe_access()) || is_unsafe_memory_access) {
           address next_pc = Assembler::locate_next_instruction(pc);
           if (is_unsafe_memory_access) {
-            next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+            next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
           }
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
         }
@@ -315,8 +315,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                (sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
                thread->doing_unsafe_access())) {
         address next_pc = Assembler::locate_next_instruction(pc);
-        if (UnsafeCopyMemory::contains_pc(pc)) {
-          next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+        if (UnsafeMemoryAccess::contains_pc(pc)) {
+          next_pc = UnsafeMemoryAccess::page_error_continue_pc(pc);
         }
         stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
     }
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index 550f289bf3c..f52255f504d 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -41,10 +41,10 @@
 #include "opto/runtime.hpp"
 #endif
 
-UnsafeCopyMemory* UnsafeCopyMemory::_table                      = nullptr;
-int UnsafeCopyMemory::_table_length                             = 0;
-int UnsafeCopyMemory::_table_max_length                         = 0;
-address UnsafeCopyMemory::_common_exit_stub_pc                  = nullptr;
+UnsafeMemoryAccess* UnsafeMemoryAccess::_table                  = nullptr;
+int UnsafeMemoryAccess::_table_length                           = 0;
+int UnsafeMemoryAccess::_table_max_length                       = 0;
+address UnsafeMemoryAccess::_common_exit_stub_pc                = nullptr;
 
 // Implementation of StubRoutines - for a description
 // of how to extend it, see the header file.
@@ -206,14 +206,14 @@ address StubRoutines::_lookup_secondary_supers_table_stubs[Klass::SECONDARY_SUPE
 
 extern void StubGenerator_generate(CodeBuffer* code, StubCodeGenerator::StubsKind kind); // only interface to generators
 
-void UnsafeCopyMemory::create_table(int max_size) {
-  UnsafeCopyMemory::_table = new UnsafeCopyMemory[max_size];
-  UnsafeCopyMemory::_table_max_length = max_size;
+void UnsafeMemoryAccess::create_table(int max_size) {
+  UnsafeMemoryAccess::_table = new UnsafeMemoryAccess[max_size];
+  UnsafeMemoryAccess::_table_max_length = max_size;
 }
 
-bool UnsafeCopyMemory::contains_pc(address pc) {
-  for (int i = 0; i < UnsafeCopyMemory::_table_length; i++) {
-    UnsafeCopyMemory* entry = &UnsafeCopyMemory::_table[i];
+bool UnsafeMemoryAccess::contains_pc(address pc) {
+  for (int i = 0; i < UnsafeMemoryAccess::_table_length; i++) {
+    UnsafeMemoryAccess* entry = &UnsafeMemoryAccess::_table[i];
     if (pc >= entry->start_pc() && pc < entry->end_pc()) {
       return true;
     }
@@ -221,9 +221,9 @@ bool UnsafeCopyMemory::contains_pc(address pc) {
   return false;
 }
 
-address UnsafeCopyMemory::page_error_continue_pc(address pc) {
-  for (int i = 0; i < UnsafeCopyMemory::_table_length; i++) {
-    UnsafeCopyMemory* entry = &UnsafeCopyMemory::_table[i];
+address UnsafeMemoryAccess::page_error_continue_pc(address pc) {
+  for (int i = 0; i < UnsafeMemoryAccess::_table_length; i++) {
+    UnsafeMemoryAccess* entry = &UnsafeMemoryAccess::_table[i];
     if (pc >= entry->start_pc() && pc < entry->end_pc()) {
       return entry->error_exit_pc();
     }
@@ -523,20 +523,20 @@ StubRoutines::select_arraycopy_function(BasicType t, bool aligned, bool disjoint
 #undef RETURN_STUB_PARM
 }
 
-UnsafeCopyMemoryMark::UnsafeCopyMemoryMark(StubCodeGenerator* cgen, bool add_entry, bool continue_at_scope_end, address error_exit_pc) {
+UnsafeMemoryAccessMark::UnsafeMemoryAccessMark(StubCodeGenerator* cgen, bool add_entry, bool continue_at_scope_end, address error_exit_pc) {
   _cgen = cgen;
   _ucm_entry = nullptr;
   if (add_entry) {
     address err_exit_pc = nullptr;
     if (!continue_at_scope_end) {
-      err_exit_pc = error_exit_pc != nullptr ? error_exit_pc : UnsafeCopyMemory::common_exit_stub_pc();
+      err_exit_pc = error_exit_pc != nullptr ? error_exit_pc : UnsafeMemoryAccess::common_exit_stub_pc();
     }
     assert(err_exit_pc != nullptr || continue_at_scope_end, "error exit not set");
-    _ucm_entry = UnsafeCopyMemory::add_to_table(_cgen->assembler()->pc(), nullptr, err_exit_pc);
+    _ucm_entry = UnsafeMemoryAccess::add_to_table(_cgen->assembler()->pc(), nullptr, err_exit_pc);
   }
 }
 
-UnsafeCopyMemoryMark::~UnsafeCopyMemoryMark() {
+UnsafeMemoryAccessMark::~UnsafeMemoryAccessMark() {
   if (_ucm_entry != nullptr) {
     _ucm_entry->set_end_pc(_cgen->assembler()->pc());
     if (_ucm_entry->error_exit_pc() == nullptr) {
diff --git a/src/hotspot/share/runtime/stubRoutines.hpp b/src/hotspot/share/runtime/stubRoutines.hpp
index 4cb031799e4..fe32c9613c8 100644
--- a/src/hotspot/share/runtime/stubRoutines.hpp
+++ b/src/hotspot/share/runtime/stubRoutines.hpp
@@ -76,17 +76,17 @@
 // 4. implement the corresponding generator function in the platform-dependent
 //    stubGenerator_<arch>.cpp file and call the function in generate_all() of that file
 
-class UnsafeCopyMemory : public CHeapObj<mtCode> {
+class UnsafeMemoryAccess : public CHeapObj<mtCode> {
  private:
   address _start_pc;
   address _end_pc;
   address _error_exit_pc;
  public:
   static address           _common_exit_stub_pc;
-  static UnsafeCopyMemory* _table;
+  static UnsafeMemoryAccess* _table;
   static int               _table_length;
   static int               _table_max_length;
-  UnsafeCopyMemory() : _start_pc(nullptr), _end_pc(nullptr), _error_exit_pc(nullptr) {}
+  UnsafeMemoryAccess() : _start_pc(nullptr), _end_pc(nullptr), _error_exit_pc(nullptr) {}
   void    set_start_pc(address pc)      { _start_pc = pc; }
   void    set_end_pc(address pc)        { _end_pc = pc; }
   void    set_error_exit_pc(address pc) { _error_exit_pc = pc; }
@@ -97,9 +97,9 @@ class UnsafeCopyMemory : public CHeapObj<mtCode> {
   static void    set_common_exit_stub_pc(address pc) { _common_exit_stub_pc = pc; }
   static address common_exit_stub_pc()               { return _common_exit_stub_pc; }
 
-  static UnsafeCopyMemory* add_to_table(address start_pc, address end_pc, address error_exit_pc) {
-    guarantee(_table_length < _table_max_length, "Incorrect UnsafeCopyMemory::_table_max_length");
-    UnsafeCopyMemory* entry = &_table[_table_length];
+  static UnsafeMemoryAccess* add_to_table(address start_pc, address end_pc, address error_exit_pc) {
+    guarantee(_table_length < _table_max_length, "Incorrect UnsafeMemoryAccess::_table_max_length");
+    UnsafeMemoryAccess* entry = &_table[_table_length];
     entry->set_start_pc(start_pc);
     entry->set_end_pc(end_pc);
     entry->set_error_exit_pc(error_exit_pc);
@@ -113,13 +113,13 @@ class UnsafeCopyMemory : public CHeapObj<mtCode> {
   static void    create_table(int max_size);
 };
 
-class UnsafeCopyMemoryMark : public StackObj {
+class UnsafeMemoryAccessMark : public StackObj {
  private:
-  UnsafeCopyMemory*  _ucm_entry;
+  UnsafeMemoryAccess*  _ucm_entry;
   StubCodeGenerator* _cgen;
  public:
-  UnsafeCopyMemoryMark(StubCodeGenerator* cgen, bool add_entry, bool continue_at_scope_end, address error_exit_pc = nullptr);
-  ~UnsafeCopyMemoryMark();
+  UnsafeMemoryAccessMark(StubCodeGenerator* cgen, bool add_entry, bool continue_at_scope_end, address error_exit_pc = nullptr);
+  ~UnsafeMemoryAccessMark();
 };
 
 class StubRoutines: AllStatic {

From 57ebd045eae8ef1bdb5ec96d5eb11d252e08e6bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Tue, 23 Apr 2024 04:18:23 +0000
Subject: [PATCH 141/486] 8330153: C2: dump barrier information for all Mach
 nodes

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/machnode.cpp           | 11 +--
 .../compiler/lib/ir_framework/IRNode.java     |  6 ++
 .../examples/GCBarrierIRExample.java          | 75 +++++++++++++++++++
 3 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/GCBarrierIRExample.java

diff --git a/src/hotspot/share/opto/machnode.cpp b/src/hotspot/share/opto/machnode.cpp
index b2c0028b1a3..57361313f85 100644
--- a/src/hotspot/share/opto/machnode.cpp
+++ b/src/hotspot/share/opto/machnode.cpp
@@ -548,6 +548,11 @@ void MachNode::dump_spec(outputStream *st) const {
     if( C->alias_type(t)->is_volatile() )
       st->print(" Volatile!");
   }
+  if (barrier_data() != 0) {
+    st->print(" barrier(");
+    BarrierSet::barrier_set()->barrier_set_c2()->dump_barrier_data(this, st);
+    st->print(") ");
+  }
 }
 
 //------------------------------dump_format------------------------------------
@@ -560,16 +565,12 @@ void MachNode::dump_format(PhaseRegAlloc *ra, outputStream *st) const {
 //=============================================================================
 #ifndef PRODUCT
 void MachTypeNode::dump_spec(outputStream *st) const {
+  MachNode::dump_spec(st);
   if (_bottom_type != nullptr) {
     _bottom_type->dump_on(st);
   } else {
     st->print(" null");
   }
-  if (barrier_data() != 0) {
-    st->print(" barrier(");
-    BarrierSet::barrier_set()->barrier_set_c2()->dump_barrier_data(this, st);
-    st->print(")");
-  }
 }
 #endif
 
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index b9a6bcccf12..366b17786ad 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -2076,6 +2076,12 @@ public class IRNode {
         machOnly(Z_STORE_P_WITH_BARRIER_FLAG, regex);
     }
 
+    public static final String Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG = COMPOSITE_PREFIX + "Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG" + POSTFIX;
+    static {
+        String regex = START + "zCompareAndSwapP" + MID + "barrier\\(\\s*" + IS_REPLACED + "\\s*\\)" + END;
+        machOnly(Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, regex);
+    }
+
     public static final String Z_GET_AND_SET_P_WITH_BARRIER_FLAG = COMPOSITE_PREFIX + "Z_GET_AND_SET_P_WITH_BARRIER_FLAG" + POSTFIX;
     static {
         String regex = START + "(zXChgP)|(zGetAndSetP\\S*)" + MID + "barrier\\(\\s*" + IS_REPLACED + "\\s*\\)" + END;
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/GCBarrierIRExample.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/GCBarrierIRExample.java
new file mode 100644
index 00000000000..5d714c513f1
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/GCBarrierIRExample.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package ir_framework.examples;
+
+import compiler.lib.ir_framework.*;
+import java.lang.invoke.VarHandle;
+import java.lang.invoke.MethodHandles;
+
+/**
+ * @test
+ * @bug 8330153
+ * @summary Example test that illustrates the use of the IR test framework for
+ *          verification of late-expanded GC barriers.
+ * @library /test/lib /
+ * @run driver ir_framework.examples.GCBarrierIRExample
+ */
+
+public class GCBarrierIRExample {
+
+    static class Outer {
+        Object f;
+    }
+
+    static final VarHandle fVarHandle;
+    static {
+        MethodHandles.Lookup l = MethodHandles.lookup();
+        try {
+            fVarHandle = l.findVarHandle(Outer.class, "f", Object.class);
+        } catch (Exception e) {
+            throw new Error(e);
+        }
+    }
+    static Outer o = new Outer();
+    static Object oldVal = new Object();
+    static Object newVal = new Object();
+
+    public static void main(String[] args) {
+        // These rules apply only to collectors that expand barriers at code
+        // emission, such as ZGC. Because the collector selection flags are not
+        // whitelisted (see IR framework's README.md file), the user (as opposed
+        // to jtreg) needs to set these flags here.
+        TestFramework.runWithFlags("-XX:+UseZGC", "-XX:+ZGenerational");
+    }
+
+    @Test
+    // IR rules can be used to verify collector-specific barrier info (in this
+    // case, that a ZGC barrier corresponds to a strong OOP reference). Barrier
+    // info can only be verified after matching, e.g. at the FINAL_CODE phase.
+    @IR(counts = {IRNode.Z_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, "strong", "1"},
+        phase  = CompilePhase.FINAL_CODE)
+    static boolean testBarrierOfCompareAndSwap() {
+        return fVarHandle.compareAndSet(o, oldVal, newVal);
+    }
+}

From 550a1386222462cca10f79a66453d2f08431dfdf Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Tue, 23 Apr 2024 05:54:50 +0000
Subject: [PATCH 142/486] 8306928: Duplicate variable assignement in
 jdk.internal.net.http.AuthenticationFilter#getCredentials

Reviewed-by: clanger, jpai
---
 .../classes/jdk/internal/net/http/AuthenticationFilter.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java b/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java
index 6e6182a1fb2..81acd83c423 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -89,7 +89,6 @@ class AuthenticationFilter implements HeaderFilter {
         InetSocketAddress proxyAddress;
         if (proxy && (proxyAddress = req.proxy()) != null) {
             // request sent to server through proxy
-            proxyAddress = req.proxy();
             host = proxyAddress.getHostString();
             port = proxyAddress.getPort();
             protocol = "http"; // we don't support https connection to proxy

From 574ba1400e015bf579190828fbdf0618eed48bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Tue, 23 Apr 2024 06:52:58 +0000
Subject: [PATCH 143/486] 8330862: GCBarrierIRExample fails when a different GC
 is selected via the command line

Reviewed-by: thartmann, dholmes, stefank
---
 .../ir_framework/examples/GCBarrierIRExample.java                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/GCBarrierIRExample.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/GCBarrierIRExample.java
index 5d714c513f1..e0287fc39fe 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/GCBarrierIRExample.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/examples/GCBarrierIRExample.java
@@ -33,6 +33,7 @@ import java.lang.invoke.MethodHandles;
  * @summary Example test that illustrates the use of the IR test framework for
  *          verification of late-expanded GC barriers.
  * @library /test/lib /
+ * @requires vm.gc.ZGenerational
  * @run driver ir_framework.examples.GCBarrierIRExample
  */
 

From 896107705615a3b9363b7a0a3e6703b20fedef70 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Tue, 23 Apr 2024 07:18:52 +0000
Subject: [PATCH 144/486] 8309259: Reduce calls to MethodHandles.lookup() in
 jdk.internal.net.http.Stream

Reviewed-by: pminborg, jpai
---
 .../share/classes/jdk/internal/net/http/Stream.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
index c4a7abe2816..1bb520a6fb1 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -1724,9 +1724,10 @@ class Stream<T> extends ExchangeImpl<T> {
     private static final VarHandle DEREGISTERED;
     static {
         try {
-            STREAM_STATE = MethodHandles.lookup()
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
+            STREAM_STATE = lookup
                     .findVarHandle(Stream.class, "streamState", int.class);
-            DEREGISTERED = MethodHandles.lookup()
+            DEREGISTERED = lookup
                     .findVarHandle(Stream.class, "deRegistered", boolean.class);
         } catch (Exception x) {
             throw new ExceptionInInitializerError(x);

From daa5a4bd124d539daa3c67a3e29dcd0eee20c44d Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Tue, 23 Apr 2024 08:00:07 +0000
Subject: [PATCH 145/486] 8330802: Desugar switch in Locale::createLocale

Reviewed-by: alanb, liach, rriggs, naoto, mchung
---
 src/java.base/share/classes/java/util/Locale.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index bcdf32d6f8b..0f8474ec12d 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -995,11 +995,11 @@ public final class Locale implements Cloneable, Serializable {
 
     private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE = ReferencedKeyMap.create(true, ConcurrentHashMap::new);
     private static Locale createLocale(Object key) {
-        return switch (key) {
-            case BaseLocale base -> new Locale(base, null);
-            case LocaleKey lk -> new Locale(lk.base, lk.exts);
-            default -> throw new InternalError("should not happen");
-        };
+        if (key instanceof BaseLocale base) {
+            return new Locale(base, null);
+        }
+        LocaleKey lk = (LocaleKey)key;
+        return new Locale(lk.base, lk.exts);
     }
 
     private static final class LocaleKey {

From 281f9bdeb9d6870346b12e6c62a58f7984b1b133 Mon Sep 17 00:00:00 2001
From: Feilong Jiang <fjiang@openjdk.org>
Date: Tue, 23 Apr 2024 08:00:18 +0000
Subject: [PATCH 146/486] 8330735: RISC-V: No need to move sp to tmp register
 in set_last_Java_frame

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp | 16 ++++++----------
 src/hotspot/cpu/riscv/macroAssembler_riscv.hpp |  2 +-
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp  |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 1b5a3cf571f..1cd7ac98b34 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -228,20 +228,16 @@ void MacroAssembler::check_and_handle_popframe(Register java_thread) {}
 // has to be reset to 0. This is required to allow proper stack traversal.
 void MacroAssembler::set_last_Java_frame(Register last_java_sp,
                                          Register last_java_fp,
-                                         Register last_java_pc,
-                                         Register tmp) {
+                                         Register last_java_pc) {
 
   if (last_java_pc->is_valid()) {
-      sd(last_java_pc, Address(xthread,
-                               JavaThread::frame_anchor_offset() +
-                               JavaFrameAnchor::last_Java_pc_offset()));
+    sd(last_java_pc, Address(xthread,
+                             JavaThread::frame_anchor_offset() +
+                             JavaFrameAnchor::last_Java_pc_offset()));
   }
 
   // determine last_java_sp register
-  if (last_java_sp == sp) {
-    mv(tmp, sp);
-    last_java_sp = tmp;
-  } else if (!last_java_sp->is_valid()) {
+  if (!last_java_sp->is_valid()) {
     last_java_sp = esp;
   }
 
@@ -262,7 +258,7 @@ void MacroAssembler::set_last_Java_frame(Register last_java_sp,
   la(tmp, last_java_pc);
   sd(tmp, Address(xthread, JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
 
-  set_last_Java_frame(last_java_sp, last_java_fp, noreg, tmp);
+  set_last_Java_frame(last_java_sp, last_java_fp, noreg);
 }
 
 void MacroAssembler::set_last_Java_frame(Register last_java_sp,
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 1abf1560707..a46f3d5779e 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -146,7 +146,7 @@ class MacroAssembler: public Assembler {
   // last Java Frame (fills frame anchor)
   void set_last_Java_frame(Register last_java_sp, Register last_java_fp, address last_java_pc, Register tmp);
   void set_last_Java_frame(Register last_java_sp, Register last_java_fp, Label &last_java_pc, Register tmp);
-  void set_last_Java_frame(Register last_java_sp, Register last_java_fp, Register last_java_pc, Register tmp);
+  void set_last_Java_frame(Register last_java_sp, Register last_java_fp, Register last_java_pc);
 
   // thread in the default location (xthread)
   void reset_last_Java_frame(bool clear_fp);
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index a4a92047eae..9712f8c326c 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -2434,7 +2434,7 @@ class StubGenerator: public StubCodeGenerator {
       __ membar(__ LoadLoad);
     }
 
-    __ set_last_Java_frame(sp, fp, ra, t0);
+    __ set_last_Java_frame(sp, fp, ra);
 
     __ enter();
     __ add(t1, sp, wordSize);

From 1a6da3d5f0ac57e173340a117a9368c190a34e8b Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 23 Apr 2024 11:05:23 +0000
Subject: [PATCH 147/486] 8330822: Remove
 ModRefBarrierSet::write_ref_array_work

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/g1/g1BarrierSet.hpp                | 2 --
 src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp         | 4 ----
 src/hotspot/share/gc/shared/cardTableBarrierSet.cpp     | 4 ----
 src/hotspot/share/gc/shared/cardTableBarrierSet.hpp     | 2 --
 src/hotspot/share/gc/shared/modRefBarrierSet.hpp        | 3 ---
 src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp | 2 +-
 6 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index c2f5b9dc068..6984fcc4953 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -74,8 +74,6 @@ class G1BarrierSet: public CardTableBarrierSet {
   inline void write_region(MemRegion mr);
   void write_region(JavaThread* thread, MemRegion mr);
 
-  inline void write_ref_array_work(MemRegion mr);
-
   template <DecoratorSet decorators, typename T>
   void write_ref_field_post(T* field);
   void write_ref_field_post_slow(volatile CardValue* byte);
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
index 19901a76ae8..2fcbd5a1731 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
@@ -72,10 +72,6 @@ inline void G1BarrierSet::write_region(MemRegion mr) {
   write_region(JavaThread::current(), mr);
 }
 
-inline void G1BarrierSet::write_ref_array_work(MemRegion mr) {
-  write_region(mr);
-}
-
 template <DecoratorSet decorators, typename T>
 inline void G1BarrierSet::write_ref_field_post(T* field) {
   volatile CardValue* byte = _card_table->byte_for(field);
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
index d7a84b1ca56..1d4c4775b33 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
@@ -80,10 +80,6 @@ CardTableBarrierSet::~CardTableBarrierSet() {
   delete _card_table;
 }
 
-void CardTableBarrierSet::write_ref_array_work(MemRegion mr) {
-  _card_table->dirty_MemRegion(mr);
-}
-
 void CardTableBarrierSet::write_region(MemRegion mr) {
   _card_table->dirty_MemRegion(mr);
 }
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
index b52cfef9a59..f21b99d3c8d 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
@@ -70,8 +70,6 @@ public:
     write_region(mr);
   }
 
-  void write_ref_array_work(MemRegion mr);
-
  public:
   // Record a reference update. Note that these versions are precise!
   // The scanning code has to handle the fact that the write barrier may be
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
index 8355e8fc50f..fb66c2fa011 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
@@ -68,9 +68,6 @@ public:
   // at the address "start", which may not necessarily be HeapWord-aligned
   inline void write_ref_array(HeapWord* start, size_t count);
 
- protected:
-  virtual void write_ref_array_work(MemRegion mr) = 0;
-
  public:
   // The ModRef abstraction introduces pre and post barriers
   template <DecoratorSet decorators, typename BarrierSetT>
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
index 45422167ead..fab8ba57669 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
@@ -54,7 +54,7 @@ void ModRefBarrierSet::write_ref_array(HeapWord* start, size_t count) {
   // If compressed oops were not being used, these should already be aligned
   assert(UseCompressedOops || (aligned_start == start && aligned_end == end),
          "Expected heap word alignment of start and end");
-  write_ref_array_work(MemRegion(aligned_start, aligned_end));
+  write_region(MemRegion(aligned_start, aligned_end));
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>

From d9d926d6699b7b2e1fcce206cbe03e1de661c2ac Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 23 Apr 2024 11:05:35 +0000
Subject: [PATCH 148/486] 8330145: Serial: Refactor
 SerialHeap::scan_evacuated_objs

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/serial/cardTableRS.cpp   |  5 +--
 src/hotspot/share/gc/serial/cardTableRS.hpp   |  2 +-
 .../share/gc/serial/defNewGeneration.cpp      | 23 +---------
 .../share/gc/serial/defNewGeneration.hpp      | 15 -------
 .../gc/serial/defNewGeneration.inline.hpp     | 43 -------------------
 src/hotspot/share/gc/serial/generation.hpp    | 26 -----------
 src/hotspot/share/gc/serial/serialFullGC.cpp  |  4 --
 src/hotspot/share/gc/serial/serialHeap.cpp    | 33 ++++++++++----
 src/hotspot/share/gc/serial/serialHeap.hpp    |  7 +--
 .../share/gc/serial/serialHeap.inline.hpp     |  1 -
 .../share/gc/serial/tenuredGeneration.cpp     | 12 +-----
 .../share/gc/serial/tenuredGeneration.hpp     | 11 +----
 .../gc/serial/tenuredGeneration.inline.hpp    |  6 ---
 13 files changed, 34 insertions(+), 154 deletions(-)
 delete mode 100644 src/hotspot/share/gc/serial/defNewGeneration.inline.hpp

diff --git a/src/hotspot/share/gc/serial/cardTableRS.cpp b/src/hotspot/share/gc/serial/cardTableRS.cpp
index 71492a8468d..2ed384f124f 100644
--- a/src/hotspot/share/gc/serial/cardTableRS.cpp
+++ b/src/hotspot/share/gc/serial/cardTableRS.cpp
@@ -31,12 +31,11 @@
 #include "memory/iterator.inline.hpp"
 #include "utilities/align.hpp"
 
-void CardTableRS::scan_old_to_young_refs(TenuredGeneration* tg, HeapWord* saved_mark_word) {
+void CardTableRS::scan_old_to_young_refs(TenuredGeneration* tg, HeapWord* saved_top) {
   const MemRegion ur    = tg->used_region();
-  const MemRegion urasm = MemRegion(tg->space()->bottom(), saved_mark_word);
+  const MemRegion urasm = MemRegion(tg->space()->bottom(), saved_top);
 
   assert(ur.contains(urasm),
-         "Did you forget to call save_marks()? "
          "[" PTR_FORMAT ", " PTR_FORMAT ") is not contained in "
          "[" PTR_FORMAT ", " PTR_FORMAT ")",
          p2i(urasm.start()), p2i(urasm.end()), p2i(ur.start()), p2i(ur.end()));
diff --git a/src/hotspot/share/gc/serial/cardTableRS.hpp b/src/hotspot/share/gc/serial/cardTableRS.hpp
index c12cd906482..ee4ac31bf5f 100644
--- a/src/hotspot/share/gc/serial/cardTableRS.hpp
+++ b/src/hotspot/share/gc/serial/cardTableRS.hpp
@@ -60,7 +60,7 @@ class CardTableRS : public CardTable {
 public:
   CardTableRS(MemRegion whole_heap);
 
-  void scan_old_to_young_refs(TenuredGeneration* tg, HeapWord* saved_mark_word);
+  void scan_old_to_young_refs(TenuredGeneration* tg, HeapWord* saved_top);
 
   void inline_write_ref_field_gc(void* field) {
     CardValue* byte = byte_for(field);
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 008ea957b9e..b0641c7d69f 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -24,7 +24,6 @@
 
 #include "precompiled.hpp"
 #include "gc/serial/cardTableRS.hpp"
-#include "gc/serial/defNewGeneration.inline.hpp"
 #include "gc/serial/serialGcRefProcProxyTask.hpp"
 #include "gc/serial/serialHeap.inline.hpp"
 #include "gc/serial/serialStringDedup.inline.hpp"
@@ -678,9 +677,6 @@ void DefNewGeneration::collect(bool   full,
   // The preserved marks should be empty at the start of the GC.
   _preserved_marks_set.init(1);
 
-  assert(heap->no_allocs_since_save_marks(),
-         "save marks have not been newly set.");
-
   YoungGenScanClosure young_gen_cl(this);
   OldGenScanClosure   old_gen_cl(this);
 
@@ -688,9 +684,6 @@ void DefNewGeneration::collect(bool   full,
                                                   &young_gen_cl,
                                                   &old_gen_cl);
 
-  assert(heap->no_allocs_since_save_marks(),
-         "save marks have not been newly set.");
-
   {
     StrongRootsScope srs(0);
     RootScanClosure root_cl{this};
@@ -700,13 +693,14 @@ void DefNewGeneration::collect(bool   full,
                                   NMethodToOopClosure::FixRelocations,
                                   false /* keepalive_nmethods */);
 
+    HeapWord* saved_top_in_old_gen = _old_gen->space()->top();
     heap->process_roots(SerialHeap::SO_ScavengeCodeCache,
                         &root_cl,
                         &cld_cl,
                         &cld_cl,
                         &code_cl);
 
-    _old_gen->scan_old_to_young_refs();
+    _old_gen->scan_old_to_young_refs(saved_top_in_old_gen);
   }
 
   // "evacuate followers".
@@ -723,16 +717,12 @@ void DefNewGeneration::collect(bool   full,
     _gc_tracer->report_tenuring_threshold(tenuring_threshold());
     pt.print_all_references();
   }
-  assert(heap->no_allocs_since_save_marks(), "save marks have not been newly set.");
 
   {
     AdjustWeakRootClosure cl{this};
     WeakProcessor::weak_oops_do(&is_alive, &cl);
   }
 
-  // Verify that the usage of keep_alive didn't copy any objects.
-  assert(heap->no_allocs_since_save_marks(), "save marks have not been newly set.");
-
   _string_dedup_requests.flush();
 
   if (!_promotion_failed) {
@@ -892,15 +882,6 @@ void DefNewGeneration::drain_promo_failure_scan_stack() {
   }
 }
 
-void DefNewGeneration::save_marks() {
-  set_saved_mark_word();
-}
-
-
-bool DefNewGeneration::no_allocs_since_save_marks() {
-  return saved_mark_at_top();
-}
-
 void DefNewGeneration::contribute_scratch(void*& scratch, size_t& num_words) {
   if (_promotion_failed) {
     return;
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index bdcb34b6389..0418d6e459f 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -171,10 +171,6 @@ class DefNewGeneration: public Generation {
   ContiguousSpace* from() const           { return _from_space; }
   ContiguousSpace* to()   const           { return _to_space;   }
 
-  HeapWord* saved_mark_word()   const    { return _saved_mark_word; }
-  void set_saved_mark_word()             { _saved_mark_word = to()->top(); }
-  bool saved_mark_at_top()               { return _saved_mark_word == _to_space->top(); }
-
   // Space enquiries
   size_t capacity() const;
   size_t used() const;
@@ -243,17 +239,6 @@ class DefNewGeneration: public Generation {
   // Save the tops for eden, from, and to
   void record_spaces_top();
 
-  // Accessing marks
-  void save_marks();
-
-  bool no_allocs_since_save_marks();
-
-  // Need to declare the full complement of closures, whether we'll
-  // override them or not, or get message from the compiler:
-  //   oop_since_save_marks_iterate_nv hides virtual function...
-  template <typename OopClosureType>
-  void oop_since_save_marks_iterate(OopClosureType* cl);
-
   // For Old collection (part of running Full GC), the DefNewGeneration can
   // contribute the free part of "to-space" as the scratch space.
   void contribute_scratch(void*& scratch, size_t& num_words);
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp b/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp
deleted file mode 100644
index 3b129ade499..00000000000
--- a/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2001, 2024, 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.
- *
- */
-
-#ifndef SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
-#define SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
-
-#include "gc/serial/defNewGeneration.hpp"
-
-#include "gc/serial/cardTableRS.hpp"
-#include "gc/shared/space.inline.hpp"
-#include "oops/access.inline.hpp"
-#include "utilities/devirtualizer.inline.hpp"
-
-// Methods of protected closure types
-
-template <typename OopClosureType>
-void DefNewGeneration::oop_since_save_marks_iterate(OopClosureType* cl) {
-  Generation::oop_since_save_marks_iterate_impl(cl, to(), _saved_mark_word);
-  set_saved_mark_word();
-}
-
-#endif // SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp
index 800abc2e3c4..70978f35879 100644
--- a/src/hotspot/share/gc/serial/generation.hpp
+++ b/src/hotspot/share/gc/serial/generation.hpp
@@ -200,32 +200,6 @@ public:
   void set_gc_manager(GCMemoryManager* gc_manager) {
     _gc_manager = gc_manager;
   }
-
-  // Apply "blk->do_oop" to the addresses of all reference fields in objects
-  // starting with the _saved_mark_word, which was noted during a generation's
-  // save_marks and is required to denote the head of an object.
-  // Fields in objects allocated by applications of the closure
-  // *are* included in the iteration.
-  // Updates saved_mark_word to point to just after the last object iterated over.
-  template <typename OopClosureType>
-  void oop_since_save_marks_iterate_impl(OopClosureType* blk, ContiguousSpace* space, HeapWord* saved_mark_word);
 };
 
-template <typename OopClosureType>
-void Generation::oop_since_save_marks_iterate_impl(OopClosureType* blk, ContiguousSpace* space, HeapWord* saved_mark_word) {
-  HeapWord* t;
-  HeapWord* p = saved_mark_word;
-  assert(p != nullptr, "expected saved mark");
-
-  const intx interval = PrefetchScanIntervalInBytes;
-  do {
-    t = space->top();
-    while (p < t) {
-      Prefetch::write(p, interval);
-      oop m = cast_to_oop(p);
-      p += m->oop_iterate_size(blk);
-    }
-  } while (t < space->top());
-}
-
 #endif // SHARE_GC_SERIAL_GENERATION_HPP
diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index 296874abcd0..88284fd63c0 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -748,10 +748,6 @@ void SerialFullGC::invoke_at_safepoint(bool clear_all_softrefs) {
 
   restore_marks();
 
-  // Set saved marks for allocation profiler (and other things? -- dld)
-  // (Should this be in general part?)
-  gch->save_marks();
-
   deallocate_stacks();
 
   SerialFullGC::_string_dedup_requests->flush();
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 84d941fbdb7..44fedd3f940 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -30,7 +30,6 @@
 #include "code/codeCache.hpp"
 #include "compiler/oopMap.hpp"
 #include "gc/serial/cardTableRS.hpp"
-#include "gc/serial/defNewGeneration.inline.hpp"
 #include "gc/serial/serialFullGC.hpp"
 #include "gc/serial/serialHeap.inline.hpp"
 #include "gc/serial/serialMemoryPools.hpp"
@@ -757,17 +756,33 @@ void SerialHeap::process_roots(ScanningOption so,
   }
 }
 
-bool SerialHeap::no_allocs_since_save_marks() {
-  return _young_gen->no_allocs_since_save_marks() &&
-         _old_gen->no_allocs_since_save_marks();
+template <typename OopClosureType>
+static void oop_iterate_from(OopClosureType* blk, ContiguousSpace* space, HeapWord** from) {
+  assert(*from != nullptr, "precondition");
+  HeapWord* t;
+  HeapWord* p = *from;
+
+  const intx interval = PrefetchScanIntervalInBytes;
+  do {
+    t = space->top();
+    while (p < t) {
+      Prefetch::write(p, interval);
+      p += cast_to_oop(p)->oop_iterate_size(blk);
+    }
+  } while (t < space->top());
+
+  *from = space->top();
 }
 
 void SerialHeap::scan_evacuated_objs(YoungGenScanClosure* young_cl,
                                      OldGenScanClosure* old_cl) {
+  ContiguousSpace* to_space = young_gen()->to();
   do {
-    young_gen()->oop_since_save_marks_iterate(young_cl);
-    old_gen()->oop_since_save_marks_iterate(old_cl);
-  } while (!no_allocs_since_save_marks());
+    oop_iterate_from(young_cl, to_space, &_young_gen_saved_top);
+    oop_iterate_from(old_cl, old_gen()->space(), &_old_gen_saved_top);
+    // Recheck to-space only, because postcondition of oop_iterate_from is no
+    // unscanned objs
+  } while (_young_gen_saved_top != to_space->top());
   guarantee(young_gen()->promo_failure_scan_is_complete(), "Failed to finish scan");
 }
 
@@ -934,8 +949,8 @@ bool SerialHeap::is_maximal_no_gc() const {
 }
 
 void SerialHeap::save_marks() {
-  _young_gen->save_marks();
-  _old_gen->save_marks();
+  _young_gen_saved_top = _young_gen->to()->top();
+  _old_gen_saved_top = _old_gen->space()->top();
 }
 
 void SerialHeap::verify(VerifyOption option /* ignored */) {
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index d13b8706c22..4a88412ced6 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -85,7 +85,8 @@ public:
 private:
   DefNewGeneration* _young_gen;
   TenuredGeneration* _old_gen;
-
+  HeapWord* _young_gen_saved_top;
+  HeapWord* _old_gen_saved_top;
 private:
   // The singleton CardTable Remembered Set.
   CardTableRS* _rem_set;
@@ -279,10 +280,6 @@ public:
   // in other generations, it should call this method.
   void save_marks();
 
-  // Returns "true" iff no allocations have occurred since the last
-  // call to "save_marks".
-  bool no_allocs_since_save_marks();
-
   // Returns true if an incremental collection is likely to fail.
   // We optionally consult the young gen, if asked to do so;
   // otherwise we base our answer on whether the previous incremental
diff --git a/src/hotspot/share/gc/serial/serialHeap.inline.hpp b/src/hotspot/share/gc/serial/serialHeap.inline.hpp
index 750c0e9c311..3279f24881e 100644
--- a/src/hotspot/share/gc/serial/serialHeap.inline.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.inline.hpp
@@ -27,7 +27,6 @@
 
 #include "gc/serial/serialHeap.hpp"
 
-#include "gc/serial/defNewGeneration.inline.hpp"
 #include "gc/serial/tenuredGeneration.inline.hpp"
 
 class ScavengeHelper {
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index a86450249a7..3e9dde0942d 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -280,8 +280,8 @@ HeapWord* TenuredGeneration::block_start(const void* addr) const {
   }
 }
 
-void TenuredGeneration::scan_old_to_young_refs() {
-  _rs->scan_old_to_young_refs(this, saved_mark_word());
+void TenuredGeneration::scan_old_to_young_refs(HeapWord* saved_top_in_old_gen) {
+  _rs->scan_old_to_young_refs(this, saved_top_in_old_gen);
 }
 
 TenuredGeneration::TenuredGeneration(ReservedSpace rs,
@@ -504,14 +504,6 @@ void TenuredGeneration::complete_loaded_archive_space(MemRegion archive_space) {
   }
 }
 
-void TenuredGeneration::save_marks() {
-  set_saved_mark_word();
-}
-
-bool TenuredGeneration::no_allocs_since_save_marks() {
-  return saved_mark_at_top();
-}
-
 void TenuredGeneration::gc_epilogue() {
   // update the generation and space performance counters
   update_counters();
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index dce6609a19b..bb34ad8d2c2 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -90,8 +90,6 @@ public:
 
   TenuredSpace* space() const { return _the_space; }
   HeapWord* saved_mark_word() const { return _saved_mark_word; }
-  void set_saved_mark_word() { _saved_mark_word = _the_space->top(); }
-  bool saved_mark_at_top() { return _saved_mark_word == space()->top(); }
 
   // Grow generation with specified size (returns false if unable to grow)
   bool grow_by(size_t bytes);
@@ -114,7 +112,7 @@ public:
 
   HeapWord* block_start(const void* addr) const;
 
-  void scan_old_to_young_refs();
+  void scan_old_to_young_refs(HeapWord* saved_top_in_old_gen);
 
   bool is_in(const void* p) const;
 
@@ -139,13 +137,6 @@ public:
   virtual inline HeapWord* allocate(size_t word_size, bool is_tlab);
   virtual inline HeapWord* par_allocate(size_t word_size, bool is_tlab);
 
-  template <typename OopClosureType>
-  void oop_since_save_marks_iterate(OopClosureType* cl);
-
-  void save_marks();
-
-  bool no_allocs_since_save_marks();
-
   virtual void collect(bool full,
                        bool clear_all_soft_refs,
                        size_t size,
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
index 62bd523d2d9..253a72d3c28 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
@@ -61,10 +61,4 @@ HeapWord* TenuredGeneration::par_allocate(size_t word_size,
   return _the_space->par_allocate(word_size);
 }
 
-template <typename OopClosureType>
-void TenuredGeneration::oop_since_save_marks_iterate(OopClosureType* blk) {
-  Generation::oop_since_save_marks_iterate_impl(blk, _the_space, _saved_mark_word);
-  set_saved_mark_word();
-}
-
 #endif // SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP

From 3bd6982ec3dd48970450cc0da9c25d755924f449 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Tue, 23 Apr 2024 11:07:58 +0000
Subject: [PATCH 149/486] 8326150: Typo in the documentation for jdk.jshell

Reviewed-by: jlahoda
---
 src/jdk.jshell/share/classes/module-info.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.jshell/share/classes/module-info.java b/src/jdk.jshell/share/classes/module-info.java
index fa44d2996f1..9266fd0fed5 100644
--- a/src/jdk.jshell/share/classes/module-info.java
+++ b/src/jdk.jshell/share/classes/module-info.java
@@ -35,7 +35,7 @@ import jdk.internal.javac.ParticipatesInPreview;
  * and programmatically launching the existing Java shell tool.
  * <p>
  *     The {@link jdk.jshell} is the package for creating 'snippet' evaluating tools.
- *     Generally, this is only package that would be needed for creating tools.
+ *     Generally, this is the only package that would be needed for creating tools.
  * </p>
  * <p>
  *     The {@link jdk.jshell.spi} package specifies a Service Provider Interface (SPI)

From fcb4a8ba26fe1de596331b0a2f89c5c7c24e7f9e Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Tue, 23 Apr 2024 11:31:11 +0000
Subject: [PATCH 150/486] 8330578: The VM creates instance of abstract class
 VirtualMachineError

Reviewed-by: iklam, dlong, jwaters, dholmes
---
 src/hotspot/share/cds/heapShared.cpp             |  2 +-
 src/hotspot/share/classfile/systemDictionary.cpp |  4 ++--
 src/hotspot/share/classfile/verifier.cpp         |  4 ++--
 src/hotspot/share/memory/universe.cpp            | 16 ++++++++--------
 src/hotspot/share/memory/universe.hpp            |  4 ++--
 src/hotspot/share/oops/instanceKlass.cpp         |  1 +
 src/hotspot/share/oops/method.cpp                |  2 +-
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index a9dd5de9f4a..202042e622e 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -1395,7 +1395,7 @@ void HeapShared::check_default_subgraph_classes() {
               name == vmSymbols::java_lang_String() ||
               name == vmSymbols::java_lang_ArithmeticException() ||
               name == vmSymbols::java_lang_NullPointerException() ||
-              name == vmSymbols::java_lang_VirtualMachineError() ||
+              name == vmSymbols::java_lang_InternalError() ||
               name == vmSymbols::object_array_signature() ||
               name == vmSymbols::byte_array_signature() ||
               name == vmSymbols::char_array_signature(),
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 71ede3d9e00..3a6c372cc50 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -2009,9 +2009,9 @@ Method* SystemDictionary::find_method_handle_intrinsic(vmIntrinsicID iid,
     }
   }
 
-  // Throw VirtualMachineError or the pending exception in the JavaThread
+  // Throw OOM or the pending exception in the JavaThread
   if (throw_error && !HAS_PENDING_EXCEPTION) {
-    THROW_MSG_NULL(vmSymbols::java_lang_VirtualMachineError(),
+    THROW_MSG_NULL(vmSymbols::java_lang_OutOfMemoryError(),
                    "Out of space in CodeCache for method handle intrinsic");
   }
   return nullptr;
diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index 743bd9d06ba..a66fbf645f5 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -255,7 +255,7 @@ bool Verifier::verify(InstanceKlass* klass, bool should_verify_class, TRAPS) {
         // or one of it's superclasses, we're in trouble and are going
         // to infinitely recurse when we try to initialize the exception.
         // So bail out here by throwing the preallocated VM error.
-        THROW_OOP_(Universe::virtual_machine_error_instance(), false);
+        THROW_OOP_(Universe::internal_error_instance(), false);
       }
       kls = kls->super();
     }
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 237eac5017c..e640482aa04 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -229,7 +229,7 @@ public:
 
 static BuiltinException _null_ptr_exception;
 static BuiltinException _arithmetic_exception;
-static BuiltinException _virtual_machine_error;
+static BuiltinException _internal_error;
 
 objArrayOop Universe::the_empty_class_array ()  {
   return (objArrayOop)_the_empty_class_array.resolve();
@@ -246,7 +246,7 @@ oop Universe::the_min_jint_string()               { return _the_min_jint_string.
 
 oop Universe::null_ptr_exception_instance()       { return _null_ptr_exception.instance(); }
 oop Universe::arithmetic_exception_instance()     { return _arithmetic_exception.instance(); }
-oop Universe::virtual_machine_error_instance()    { return _virtual_machine_error.instance(); }
+oop Universe::internal_error_instance()           { return _internal_error.instance(); }
 
 oop Universe::the_null_sentinel()                 { return _the_null_sentinel.resolve(); }
 
@@ -302,7 +302,7 @@ void Universe::set_archived_basic_type_mirror_index(BasicType t, int index) {
 void Universe::archive_exception_instances() {
   _null_ptr_exception.store_in_cds();
   _arithmetic_exception.store_in_cds();
-  _virtual_machine_error.store_in_cds();
+  _internal_error.store_in_cds();
 }
 
 void Universe::load_archived_object_instances() {
@@ -318,7 +318,7 @@ void Universe::load_archived_object_instances() {
 
     _null_ptr_exception.load_from_cds();
     _arithmetic_exception.load_from_cds();
-    _virtual_machine_error.load_from_cds();
+    _internal_error.load_from_cds();
   }
 }
 #endif
@@ -334,7 +334,7 @@ void Universe::serialize(SerializeClosure* f) {
   }
   _null_ptr_exception.serialize(f);
   _arithmetic_exception.serialize(f);
-  _virtual_machine_error.serialize(f);
+  _internal_error.serialize(f);
 #endif
 
   f->do_ptr(&_fillerArrayKlass);
@@ -1092,13 +1092,13 @@ bool universe_post_init() {
   _arithmetic_exception.init_if_empty(vmSymbols::java_lang_ArithmeticException(), CHECK_false);
 
   // Virtual Machine Error for when we get into a situation we can't resolve
-  Klass* k = vmClasses::VirtualMachineError_klass();
+  Klass* k = vmClasses::InternalError_klass();
   bool linked = InstanceKlass::cast(k)->link_class_or_fail(CHECK_false);
   if (!linked) {
-     tty->print_cr("Unable to link/verify VirtualMachineError class");
+     tty->print_cr("Unable to link/verify InternalError class");
      return false; // initialization failed
   }
-  _virtual_machine_error.init_if_empty(vmSymbols::java_lang_VirtualMachineError(), CHECK_false);
+  _internal_error.init_if_empty(vmSymbols::java_lang_InternalError(), CHECK_false);
 
   Handle msg = java_lang_String::create_from_str("/ by zero", CHECK_false);
   java_lang_Throwable::set_message(Universe::arithmetic_exception_instance(), msg());
diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
index 09e00bb24a0..19acbdc09b2 100644
--- a/src/hotspot/share/memory/universe.hpp
+++ b/src/hotspot/share/memory/universe.hpp
@@ -229,8 +229,8 @@ class Universe: AllStatic {
 
   static oop          null_ptr_exception_instance();
   static oop          arithmetic_exception_instance();
-  static oop          virtual_machine_error_instance();
-  static oop          vm_exception()                  { return virtual_machine_error_instance(); }
+  static oop          internal_error_instance();
+  static oop          vm_exception()                  { return internal_error_instance(); }
 
   static Array<Klass*>* the_array_interfaces_array()  { return _the_array_interfaces_array; }
   static uintx        the_array_interfaces_bitmap()   { return _the_array_interfaces_bitmap; }
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 0b5c9759310..0069f336e88 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -1509,6 +1509,7 @@ instanceOop InstanceKlass::register_finalizer(instanceOop i, TRAPS) {
 }
 
 instanceOop InstanceKlass::allocate_instance(TRAPS) {
+  assert(!is_abstract() && !is_interface(), "Should not create this object");
   size_t size = size_helper();  // Query before forming handle.
   return (instanceOop)Universe::heap()->obj_allocate(this, size, CHECK_NULL);
 }
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index d2e25feef40..f5c35abb683 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -1276,7 +1276,7 @@ address Method::make_adapters(const methodHandle& mh, TRAPS) {
       // Java exception object.
       vm_exit_during_initialization("Out of space in CodeCache for adapters");
     } else {
-      THROW_MSG_NULL(vmSymbols::java_lang_VirtualMachineError(), "Out of space in CodeCache for adapters");
+      THROW_MSG_NULL(vmSymbols::java_lang_OutOfMemoryError(), "Out of space in CodeCache for adapters");
     }
   }
 

From a92ad03946d296510c8c2ac18278608e8032b3f3 Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik <jbachorik@openjdk.org>
Date: Tue, 23 Apr 2024 12:14:57 +0000
Subject: [PATCH 151/486] 8329995: Restricted access to `/proc` can cause JFR
 initialization to crash

Reviewed-by: dholmes, egahlin
---
 src/hotspot/os/linux/os_perf_linux.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/os/linux/os_perf_linux.cpp b/src/hotspot/os/linux/os_perf_linux.cpp
index cca41a12ee1..87abbebe25f 100644
--- a/src/hotspot/os/linux/os_perf_linux.cpp
+++ b/src/hotspot/os/linux/os_perf_linux.cpp
@@ -847,7 +847,7 @@ SystemProcessInterface::SystemProcesses::ProcessIterator::ProcessIterator() {
 bool SystemProcessInterface::SystemProcesses::ProcessIterator::initialize() {
   _dir = os::opendir("/proc");
   _entry = nullptr;
-  _valid = true;
+  _valid = _dir != nullptr; // May be null if /proc is not accessible.
   next_process();
 
   return true;

From 6158da5e9569f4260bd6d968c940c9979583118a Mon Sep 17 00:00:00 2001
From: Oli Gillespie <ogillespie@openjdk.org>
Date: Tue, 23 Apr 2024 12:37:36 +0000
Subject: [PATCH 152/486] 8330108: Increase CipherInputStream buffer size

Reviewed-by: ascarpino, shade
---
 .../share/classes/javax/crypto/CipherInputStream.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/javax/crypto/CipherInputStream.java b/src/java.base/share/classes/javax/crypto/CipherInputStream.java
index d9b8c989b54..546bdf0808d 100644
--- a/src/java.base/share/classes/javax/crypto/CipherInputStream.java
+++ b/src/java.base/share/classes/javax/crypto/CipherInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -84,8 +84,8 @@ public class CipherInputStream extends FilterInputStream {
 
     /* the buffer holding data that have been read in from the
        underlying stream, but have not been processed by the cipher
-       engine. the size 512 bytes is somewhat randomly chosen */
-    private final byte[] ibuffer = new byte[512];
+       engine. */
+    private final byte[] ibuffer = new byte[8192];
 
     // having reached the end of the underlying input stream
     private boolean done = false;

From 3d5eeac3a38ece4a23ea6da2dfe5939d64e81cea Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Tue, 23 Apr 2024 12:57:24 +0000
Subject: [PATCH 153/486] 8289770: Remove Windows version macro from
 ShellFolder2.cpp

Reviewed-by: jwaters, tr, serb
---
 .../native/libawt/windows/ShellFolder2.cpp    | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp b/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
index b3f13a5bf82..335281ad5d7 100644
--- a/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,17 +119,6 @@ static jstring lsSize;
 static jstring lsType;
 static jstring lsDate;
 
-// Some macros from awt.h, because it is not included in release
-#ifndef IS_WIN2000
-#define IS_WIN2000 (LOBYTE(LOWORD(::GetVersion())) >= 5)
-#endif
-#ifndef IS_WINXP
-#define IS_WINXP ((IS_WIN2000 && HIBYTE(LOWORD(::GetVersion())) >= 1) || LOBYTE(LOWORD(::GetVersion())) > 5)
-#endif
-#ifndef IS_WINVISTA
-#define IS_WINVISTA (!(::GetVersion() & 0x80000000) && LOBYTE(LOWORD(::GetVersion())) >= 6)
-#endif
-
 
 extern "C" {
 
@@ -1090,12 +1079,10 @@ JNIEXPORT jintArray JNICALL Java_sun_awt_shell_Win32ShellFolder2_getIconBits
                 // XP supports alpha in some icons, and depending on device.
                 // This should take precedence over the icon mask bits.
                 BOOL hasAlpha = FALSE;
-                if (IS_WINXP) {
-                    for (int i = 0; i < nBits; i++) {
-                        if ((colorBits[i] & 0xff000000) != 0) {
-                            hasAlpha = TRUE;
-                            break;
-                        }
+                for (int i = 0; i < nBits; i++) {
+                    if ((colorBits[i] & 0xff000000) != 0) {
+                        hasAlpha = TRUE;
+                        break;
                     }
                 }
                 if (!hasAlpha) {

From 2ea89268a1af501fef4c1505a487e9ef5d5bda87 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 23 Apr 2024 15:01:09 +0000
Subject: [PATCH 154/486] 8330961: Remove redundant public specifier in
 ModRefBarrierSet

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/shared/modRefBarrierSet.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
index fb66c2fa011..395ebbc3d18 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
@@ -68,7 +68,6 @@ public:
   // at the address "start", which may not necessarily be HeapWord-aligned
   inline void write_ref_array(HeapWord* start, size_t count);
 
- public:
   // The ModRef abstraction introduces pre and post barriers
   template <DecoratorSet decorators, typename BarrierSetT>
   class AccessBarrier: public BarrierSet::AccessBarrier<decorators, BarrierSetT> {

From 383fe6eaab423a1218c9915362f691472e3773e7 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Tue, 23 Apr 2024 15:02:27 +0000
Subject: [PATCH 155/486] 8330388: Remove invokedynamic cache index encoding

Reviewed-by: cjplummer, dlong, coleenp
---
 .../cpu/aarch64/interp_masm_aarch64.cpp       |  5 --
 src/hotspot/cpu/arm/interp_masm_arm.cpp       |  5 --
 src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp    |  2 -
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp   |  7 ---
 src/hotspot/cpu/s390/interp_masm_s390.cpp     |  6 --
 src/hotspot/cpu/x86/interp_masm_x86.cpp       |  5 --
 src/hotspot/share/c1/c1_Runtime1.cpp          |  3 +-
 src/hotspot/share/cds/classListParser.cpp     |  2 +-
 src/hotspot/share/ci/ciEnv.cpp                | 13 ++--
 src/hotspot/share/ci/ciReplay.cpp             |  1 -
 src/hotspot/share/ci/ciStreams.cpp            |  7 +--
 .../share/classfile/resolutionErrors.hpp      |  3 +-
 .../share/interpreter/abstractInterpreter.cpp |  5 +-
 .../share/interpreter/bootstrapInfo.cpp       |  2 +-
 .../share/interpreter/bootstrapInfo.hpp       |  1 -
 src/hotspot/share/interpreter/bytecode.cpp    |  2 +-
 .../share/interpreter/bytecodeTracer.cpp      |  3 +-
 .../share/interpreter/interpreterRuntime.cpp  |  2 +-
 .../share/interpreter/linkResolver.cpp        |  5 +-
 src/hotspot/share/interpreter/rewriter.cpp    |  5 +-
 .../interpreter/zero/bytecodeInterpreter.cpp  |  2 +-
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp | 23 +++-----
 src/hotspot/share/jvmci/jvmciRuntime.cpp      |  5 +-
 src/hotspot/share/oops/constantPool.cpp       | 23 +++-----
 src/hotspot/share/oops/constantPool.hpp       | 14 +----
 .../share/oops/constantPool.inline.hpp        |  2 +-
 src/hotspot/share/oops/cpCache.cpp            |  6 +-
 .../prims/jvmtiClassFileReconstituter.cpp     |  2 +-
 src/hotspot/share/prims/methodComparator.cpp  |  7 +--
 src/hotspot/share/prims/whitebox.cpp          |  6 --
 .../interpreter/BytecodeWithCPIndex.java      | 11 +---
 .../sun/jvm/hotspot/oops/ConstantPool.java    | 12 ----
 .../hotspot/tools/jcore/ByteCodeRewriter.java | 16 +++--
 .../jdk/vm/ci/hotspot/CompilerToVM.java       | 20 +++----
 .../vm/ci/hotspot/HotSpotConstantPool.java    | 59 ++++---------------
 .../jdk/vm/ci/hotspot/CompilerToVMHelper.java |  4 +-
 .../compilerToVM/ConstantPoolTestsHelper.java |  2 +-
 37 files changed, 88 insertions(+), 210 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index b5625b7fc61..da38f1d12e7 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -190,11 +190,6 @@ void InterpreterMacroAssembler::get_cache_index_at_bcp(Register index,
   } else if (index_size == sizeof(u4)) {
     // assert(EnableInvokeDynamic, "giant index used only for JSR 292");
     ldrw(index, Address(rbcp, bcp_offset));
-    // Check if the secondary index definition is still ~x, otherwise
-    // we have to change the following assembler code to calculate the
-    // plain index.
-    assert(ConstantPool::decode_invokedynamic_index(~123) == 123, "else change next line");
-    eonw(index, index, zr);  // convert to plain index
   } else if (index_size == sizeof(u1)) {
     load_unsigned_byte(index, Address(rbcp, bcp_offset));
   } else {
diff --git a/src/hotspot/cpu/arm/interp_masm_arm.cpp b/src/hotspot/cpu/arm/interp_masm_arm.cpp
index 635acd781f9..ba161e360be 100644
--- a/src/hotspot/cpu/arm/interp_masm_arm.cpp
+++ b/src/hotspot/cpu/arm/interp_masm_arm.cpp
@@ -211,11 +211,6 @@ void InterpreterMacroAssembler::get_index_at_bcp(Register index, int bcp_offset,
     orr(index, tmp_reg, AsmOperand(index, lsl, BitsPerByte));
     ldrb(tmp_reg, Address(Rbcp, bcp_offset));
     orr(index, tmp_reg, AsmOperand(index, lsl, BitsPerByte));
-    // Check if the secondary index definition is still ~x, otherwise
-    // we have to change the following assembler code to calculate the
-    // plain index.
-    assert(ConstantPool::decode_invokedynamic_index(~123) == 123, "else change next line");
-    mvn_32(index, index);  // convert to plain index
   } else if (index_size == sizeof(u1)) {
     ldrb(index, Address(Rbcp, bcp_offset));
   } else {
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index 94ef1b3c9d2..cdb8a742dcd 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -444,8 +444,6 @@ void InterpreterMacroAssembler::get_cache_index_at_bcp(Register Rdst, int bcp_of
     } else {
       lwa(Rdst, bcp_offset, R14_bcp);
     }
-    assert(ConstantPool::decode_invokedynamic_index(~123) == 123, "else change next line");
-    nand(Rdst, Rdst, Rdst); // convert to plain index
   } else if (index_size == sizeof(u1)) {
     lbz(Rdst, bcp_offset, R14_bcp);
   } else {
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index 497918e6c05..a770482b121 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -216,13 +216,6 @@ void InterpreterMacroAssembler::get_cache_index_at_bcp(Register index,
     }
   } else if (index_size == sizeof(u4)) {
     load_int_misaligned(index, Address(xbcp, bcp_offset), tmp, false);
-
-    // Check if the secondary index definition is still ~x, otherwise
-    // we have to change the following assembler code to calculate the
-    // plain index.
-    assert(ConstantPool::decode_invokedynamic_index(~123) == 123, "else change next line");
-    xori(index, index, -1);
-    sign_extend(index, index, 32);
   } else if (index_size == sizeof(u1)) {
     load_unsigned_byte(index, Address(xbcp, bcp_offset));
   } else {
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index 9ee38c619f0..bc7996c270f 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -324,12 +324,6 @@ void InterpreterMacroAssembler::get_cache_index_at_bcp(Register index, int bcp_o
   } else if (index_size == sizeof(u4)) {
 
     load_sized_value(index, param, 4, false);
-
-    // Check if the secondary index definition is still ~x, otherwise
-    // we have to change the following assembler code to calculate the
-    // plain index.
-    assert(ConstantPool::decode_invokedynamic_index(~123) == 123, "else change next line");
-    not_(index);  // Convert to plain index.
   } else if (index_size == sizeof(u1)) {
     z_llgc(index, param);
   } else {
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index 33570f3155b..4329b0b6411 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -463,11 +463,6 @@ void InterpreterMacroAssembler::get_cache_index_at_bcp(Register index,
     load_unsigned_short(index, Address(_bcp_register, bcp_offset));
   } else if (index_size == sizeof(u4)) {
     movl(index, Address(_bcp_register, bcp_offset));
-    // Check if the secondary index definition is still ~x, otherwise
-    // we have to change the following assembler code to calculate the
-    // plain index.
-    assert(ConstantPool::decode_invokedynamic_index(~123) == 123, "else change next line");
-    notl(index);  // convert to plain index
   } else if (index_size == sizeof(u1)) {
     load_unsigned_byte(index, Address(_bcp_register, bcp_offset));
   } else {
diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index ffebe389644..31ae3f6bee0 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -1059,8 +1059,7 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* current, Runtime1::StubID stub_
         break;
       }
       case Bytecodes::_invokedynamic: {
-        int indy_index = pool->decode_invokedynamic_index(index);
-        appendix = Handle(current, pool->cache()->set_dynamic_call(info, indy_index));
+        appendix = Handle(current, pool->cache()->set_dynamic_call(info, index));
         break;
       }
       default: fatal("unexpected bytecode for load_appendix_patching_id");
diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index e2099620a77..b17da725deb 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -591,7 +591,7 @@ void ClassListParser::resolve_indy_impl(Symbol* class_name_symbol, TRAPS) {
           LinkResolver::resolve_invoke(info,
                                        recv,
                                        pool,
-                                       ConstantPool::encode_invokedynamic_index(indy_index),
+                                       indy_index,
                                        Bytecodes::_invokedynamic, CHECK);
           break;
         }
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index 40abaa06df2..5861ac3ac33 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -869,10 +869,8 @@ ciMethod* ciEnv::get_method_by_index_impl(const constantPoolHandle& cpool,
     // Jump through a patchable call site, which is initially a deopt routine.
     // Patch the call site to the nmethod entry point of the static compiled lambda form.
     // As with other two-component call sites, both values must be independently verified.
-    int indy_index = cpool->decode_invokedynamic_index(index);
-    assert (indy_index >= 0, "should be");
-    assert(indy_index < cpool->cache()->resolved_indy_entries_length(), "impossible");
-    Method* adapter = cpool->resolved_indy_entry_at(indy_index)->method();
+    assert(index < cpool->cache()->resolved_indy_entries_length(), "impossible");
+    Method* adapter = cpool->resolved_indy_entry_at(index)->method();
     // Resolved if the adapter is non null.
     if (adapter != nullptr) {
       return get_method(adapter);
@@ -1499,21 +1497,20 @@ void ciEnv::record_call_site_method(Thread* thread, Method* adapter) {
 
 // Process an invokedynamic call site and record any dynamic locations.
 void ciEnv::process_invokedynamic(const constantPoolHandle &cp, int indy_index, JavaThread* thread) {
-  int index = cp->decode_invokedynamic_index(indy_index);
-  ResolvedIndyEntry* indy_info = cp->resolved_indy_entry_at(index);
+  ResolvedIndyEntry* indy_info = cp->resolved_indy_entry_at(indy_index);
   if (indy_info->method() != nullptr) {
     // process the adapter
     Method* adapter = indy_info->method();
     record_call_site_method(thread, adapter);
     // process the appendix
-    oop appendix = cp->resolved_reference_from_indy(index);
+    oop appendix = cp->resolved_reference_from_indy(indy_index);
     {
       RecordLocation fp(this, "<appendix>");
       record_call_site_obj(thread, appendix);
     }
     // process the BSM
     int pool_index = indy_info->constant_pool_index();
-    BootstrapInfo bootstrap_specifier(cp, pool_index, index);
+    BootstrapInfo bootstrap_specifier(cp, pool_index, indy_index);
     oop bsm = cp->resolve_possibly_cached_constant_at(bootstrap_specifier.bsm_index(), thread);
     {
       RecordLocation fp(this, "<bsm>");
diff --git a/src/hotspot/share/ci/ciReplay.cpp b/src/hotspot/share/ci/ciReplay.cpp
index 6edbadcec4f..5fa30f86411 100644
--- a/src/hotspot/share/ci/ciReplay.cpp
+++ b/src/hotspot/share/ci/ciReplay.cpp
@@ -416,7 +416,6 @@ class CompileReplay : public StackObj {
       int pool_index = 0;
 
       if (bytecode.is_invokedynamic()) {
-        index = cp->decode_invokedynamic_index(index);
         cp->cache()->set_dynamic_call(callInfo, index);
 
         appendix = cp->resolved_reference_from_indy(index);
diff --git a/src/hotspot/share/ci/ciStreams.cpp b/src/hotspot/share/ci/ciStreams.cpp
index 47c1ee76bf3..8220910d74c 100644
--- a/src/hotspot/share/ci/ciStreams.cpp
+++ b/src/hotspot/share/ci/ciStreams.cpp
@@ -470,7 +470,7 @@ ciMethod* ciBytecodeStream::get_method(bool& will_link, ciSignature* *declared_s
 bool ciBytecodeStream::has_appendix() {
   VM_ENTRY_MARK;
   constantPoolHandle cpool(THREAD, _method->get_Method()->constants());
-  return ConstantPool::has_appendix_at_if_loaded(cpool, get_method_index());
+  return ConstantPool::has_appendix_at_if_loaded(cpool, get_method_index(), cur_bc());
 }
 
 // ------------------------------------------------------------------
@@ -481,7 +481,7 @@ bool ciBytecodeStream::has_appendix() {
 ciObject* ciBytecodeStream::get_appendix() {
   VM_ENTRY_MARK;
   constantPoolHandle cpool(THREAD, _method->get_Method()->constants());
-  oop appendix_oop = ConstantPool::appendix_at_if_loaded(cpool, get_method_index());
+  oop appendix_oop = ConstantPool::appendix_at_if_loaded(cpool, get_method_index(), cur_bc());
   return CURRENT_ENV->get_object(appendix_oop);
 }
 
@@ -493,7 +493,7 @@ ciObject* ciBytecodeStream::get_appendix() {
 bool ciBytecodeStream::has_local_signature() {
   GUARDED_VM_ENTRY(
     constantPoolHandle cpool(Thread::current(), _method->get_Method()->constants());
-    return ConstantPool::has_local_signature_at_if_loaded(cpool, get_method_index());
+    return ConstantPool::has_local_signature_at_if_loaded(cpool, get_method_index(), cur_bc());
   )
 }
 
@@ -543,4 +543,3 @@ int ciBytecodeStream::get_method_signature_index(const constantPoolHandle& cpool
     return cpool->signature_ref_index_at(name_and_type_index);
   )
 }
-
diff --git a/src/hotspot/share/classfile/resolutionErrors.hpp b/src/hotspot/share/classfile/resolutionErrors.hpp
index ad6d793c6c0..7eff7816b2e 100644
--- a/src/hotspot/share/classfile/resolutionErrors.hpp
+++ b/src/hotspot/share/classfile/resolutionErrors.hpp
@@ -58,9 +58,8 @@ public:
   static const int CPCACHE_INDEX_MANGLE_VALUE = 1000000;
 
   // This function is used to encode an invokedynamic index to differentiate it from a
-  // constant pool index.  It assumes it is being called with a index that is less than 0
+  // constant pool index.
   static int encode_indy_index(int index) {
-    assert(index < 0, "Unexpected non-negative cpCache index");
     return index + CPCACHE_INDEX_MANGLE_VALUE;
   }
 };
diff --git a/src/hotspot/share/interpreter/abstractInterpreter.cpp b/src/hotspot/share/interpreter/abstractInterpreter.cpp
index 0b67ea4a8f9..2fad5ba39ef 100644
--- a/src/hotspot/share/interpreter/abstractInterpreter.cpp
+++ b/src/hotspot/share/interpreter/abstractInterpreter.cpp
@@ -261,7 +261,7 @@ bool AbstractInterpreter::is_not_reached(const methodHandle& method, int bci) {
     switch (code) {
       case Bytecodes::_invokedynamic: {
         assert(invoke_bc.has_index_u4(code), "sanity");
-        int method_index = cpool->decode_invokedynamic_index(invoke_bc.get_index_u4(code));
+        int method_index = invoke_bc.get_index_u4(code);
         return cpool->resolved_indy_entry_at(method_index)->is_resolved();
       }
       case Bytecodes::_invokevirtual:   // fall-through
@@ -394,8 +394,7 @@ address AbstractInterpreter::deopt_continue_after_entry(Method* method, address
       // (NOT needed for the old calling convention)
       if (!is_top_frame) {
         int index = Bytes::get_native_u4(bcp+1);
-        int indy_index = method->constants()->decode_invokedynamic_index(index);
-        method->constants()->resolved_indy_entry_at(indy_index)->set_num_parameters(callee_parameters);
+        method->constants()->resolved_indy_entry_at(index)->set_num_parameters(callee_parameters);
       }
       break;
     }
diff --git a/src/hotspot/share/interpreter/bootstrapInfo.cpp b/src/hotspot/share/interpreter/bootstrapInfo.cpp
index 7efbbeb284e..e3efe2a7504 100644
--- a/src/hotspot/share/interpreter/bootstrapInfo.cpp
+++ b/src/hotspot/share/interpreter/bootstrapInfo.cpp
@@ -74,7 +74,7 @@ bool BootstrapInfo::resolve_previously_linked_invokedynamic(CallInfo& result, TR
     Exceptions::wrap_dynamic_exception(/* is_indy */ true, CHECK_false);
     return true;
   } else if (indy_entry->resolution_failed()) {
-    int encoded_index = ResolutionErrorTable::encode_indy_index(ConstantPool::encode_invokedynamic_index(_indy_index));
+    int encoded_index = ResolutionErrorTable::encode_indy_index(_indy_index);
     ConstantPool::throw_resolution_error(_pool, encoded_index, CHECK_false); // Doesn't necessarily need to be resolved yet
     return true;
   } else {
diff --git a/src/hotspot/share/interpreter/bootstrapInfo.hpp b/src/hotspot/share/interpreter/bootstrapInfo.hpp
index d73d4389329..d480e69f368 100644
--- a/src/hotspot/share/interpreter/bootstrapInfo.hpp
+++ b/src/hotspot/share/interpreter/bootstrapInfo.hpp
@@ -76,7 +76,6 @@ class BootstrapInfo : public StackObj {
   // derived accessors
   InstanceKlass* caller() const         { return _pool->pool_holder(); }
   oop caller_mirror() const             { return caller()->java_mirror(); }
-  int decode_indy_index() const         { return ConstantPool::decode_invokedynamic_index(_indy_index); }
   int bsms_attr_index() const           { return _pool->bootstrap_methods_attribute_index(_bss_index); }
   int bsm_index() const                 { return _pool->bootstrap_method_ref_index_at(_bss_index); }
   //int argc() is eagerly cached in _argc
diff --git a/src/hotspot/share/interpreter/bytecode.cpp b/src/hotspot/share/interpreter/bytecode.cpp
index fdaf022c69f..de45e8ae3db 100644
--- a/src/hotspot/share/interpreter/bytecode.cpp
+++ b/src/hotspot/share/interpreter/bytecode.cpp
@@ -179,7 +179,7 @@ int Bytecode_member_ref::pool_index() const {
 ResolvedIndyEntry* Bytecode_member_ref::resolved_indy_entry() const {
   int index = this->index();
   assert(invoke_code() == Bytecodes::_invokedynamic, "should not call this");
-  return cpcache()->resolved_indy_entry_at(ConstantPool::decode_invokedynamic_index(index));
+  return cpcache()->resolved_indy_entry_at(index);
 }
 
 ResolvedMethodEntry* Bytecode_member_ref::resolved_method_entry() const {
diff --git a/src/hotspot/share/interpreter/bytecodeTracer.cpp b/src/hotspot/share/interpreter/bytecodeTracer.cpp
index 624f2b621c1..b7617c38602 100644
--- a/src/hotspot/share/interpreter/bytecodeTracer.cpp
+++ b/src/hotspot/share/interpreter/bytecodeTracer.cpp
@@ -555,8 +555,7 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
         int indy_index;
         int cp_index;
         if (is_linked()) {
-          int i = get_native_index_u4();
-          indy_index = ConstantPool::decode_invokedynamic_index(i);
+          indy_index = get_native_index_u4();
           cp_index = constants()->resolved_indy_entry_at(indy_index)->constant_pool_index();
         } else {
           indy_index = -1;
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index 5f8dcbbf2ad..7d12797007b 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -959,7 +959,7 @@ void InterpreterRuntime::resolve_invokedynamic(JavaThread* current) {
                                  index, bytecode, CHECK);
   } // end JvmtiHideSingleStepping
 
-  pool->cache()->set_dynamic_call(info, pool->decode_invokedynamic_index(index));
+  pool->cache()->set_dynamic_call(info, index);
 }
 
 // This function is the interface to the assembly code. It returns the resolved
diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
index 7b5b62ac075..9b80550130f 100644
--- a/src/hotspot/share/interpreter/linkResolver.cpp
+++ b/src/hotspot/share/interpreter/linkResolver.cpp
@@ -1779,11 +1779,10 @@ void LinkResolver::resolve_handle_call(CallInfo& result,
 }
 
 void LinkResolver::resolve_invokedynamic(CallInfo& result, const constantPoolHandle& pool, int indy_index, TRAPS) {
-  int index = pool->decode_invokedynamic_index(indy_index);
-  int pool_index = pool->resolved_indy_entry_at(index)->constant_pool_index();
+  int pool_index = pool->resolved_indy_entry_at(indy_index)->constant_pool_index();
 
   // Resolve the bootstrap specifier (BSM + optional arguments).
-  BootstrapInfo bootstrap_specifier(pool, pool_index, index);
+  BootstrapInfo bootstrap_specifier(pool, pool_index, indy_index);
 
   // Check if CallSite has been bound already or failed already, and short circuit:
   {
diff --git a/src/hotspot/share/interpreter/rewriter.cpp b/src/hotspot/share/interpreter/rewriter.cpp
index 07ea1e2e204..6266ffcd227 100644
--- a/src/hotspot/share/interpreter/rewriter.cpp
+++ b/src/hotspot/share/interpreter/rewriter.cpp
@@ -305,15 +305,14 @@ void Rewriter::rewrite_invokedynamic(address bcp, int offset, bool reverse) {
     // must have a five-byte instruction format.  (Of course, other JVM
     // implementations can use the bytes for other purposes.)
     // Note: We use native_u4 format exclusively for 4-byte indexes.
-    Bytes::put_native_u4(p, ConstantPool::encode_invokedynamic_index(_invokedynamic_index));
+    Bytes::put_native_u4(p, (u2)_invokedynamic_index);
     _invokedynamic_index++;
 
     // Collect invokedynamic information before creating ResolvedInvokeDynamicInfo array
     _initialized_indy_entries.push(ResolvedIndyEntry((u2)resolved_index, (u2)cp_index));
   } else {
     // Should do nothing since we are not patching this bytecode
-    int cache_index = ConstantPool::decode_invokedynamic_index(
-                        Bytes::get_native_u4(p));
+    int cache_index = Bytes::get_native_u4(p);
     int cp_index = _initialized_indy_entries.at(cache_index).constant_pool_index();
     assert(_pool->tag_at(cp_index).is_invoke_dynamic(), "wrong index");
     // zero out 4 bytes
diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
index f8b194da7b7..abebfc998fd 100644
--- a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
+++ b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
@@ -2247,7 +2247,7 @@ run:
       }
 
       CASE(_invokedynamic): {
-        u4 index = cp->constant_pool()->decode_invokedynamic_index(Bytes::get_native_u4(pc+1)); // index is originally negative
+        u4 index = Bytes::get_native_u4(pc+1);
         ResolvedIndyEntry* indy_info = cp->resolved_indy_entry_at(index);
         if (!indy_info->is_resolved()) {
           CALL_VM(InterpreterRuntime::resolve_from_cache(THREAD, (Bytecodes::Code)opcode),
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 0d9c92cad51..fb06abe9174 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -910,9 +910,9 @@ C2V_VMENTRY_NULL(jobject, lookupKlassInPool, (JNIEnv* env, jobject, ARGUMENT_PAI
   return JVMCIENV->get_jobject(result);
 C2V_END
 
-C2V_VMENTRY_NULL(jobject, lookupAppendixInPool, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint which))
+C2V_VMENTRY_NULL(jobject, lookupAppendixInPool, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint which, jint opcode))
   constantPoolHandle cp(THREAD, UNPACK_PAIR(ConstantPool, cp));
-  oop appendix_oop = ConstantPool::appendix_at_if_loaded(cp, which);
+  oop appendix_oop = ConstantPool::appendix_at_if_loaded(cp, which, Bytecodes::Code(opcode));
   return JVMCIENV->get_jobject(JVMCIENV->get_object_constant(appendix_oop));
 C2V_END
 
@@ -1629,16 +1629,11 @@ C2V_VMENTRY_NULL(jobject, iterateFrames, (JNIEnv* env, jobject compilerToVM, job
   return nullptr;
 C2V_END
 
-C2V_VMENTRY_0(int, decodeIndyIndexToCPIndex, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint encoded_indy_index, jboolean resolve))
-  if (!ConstantPool::is_invokedynamic_index(encoded_indy_index)) {
-    JVMCI_THROW_MSG_0(IllegalStateException, err_msg("not an encoded indy index %d", encoded_indy_index));
-  }
-
+C2V_VMENTRY_0(int, decodeIndyIndexToCPIndex, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint indy_index, jboolean resolve))
   constantPoolHandle cp(THREAD, UNPACK_PAIR(ConstantPool, cp));
   CallInfo callInfo;
-  int indy_index = cp->decode_invokedynamic_index(encoded_indy_index);
   if (resolve) {
-    LinkResolver::resolve_invoke(callInfo, Handle(), cp, encoded_indy_index, Bytecodes::_invokedynamic, CHECK_0);
+    LinkResolver::resolve_invoke(callInfo, Handle(), cp, indy_index, Bytecodes::_invokedynamic, CHECK_0);
     cp->cache()->set_dynamic_call(callInfo, indy_index);
   }
   return cp->resolved_indy_entry_at(indy_index)->constant_pool_index();
@@ -1671,7 +1666,7 @@ C2V_VMENTRY(void, resolveInvokeHandleInPool, (JNIEnv* env, jobject, ARGUMENT_PAI
   }
 C2V_END
 
-C2V_VMENTRY_0(jint, isResolvedInvokeHandleInPool, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint index))
+C2V_VMENTRY_0(jint, isResolvedInvokeHandleInPool, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint index, jint opcode))
   constantPoolHandle cp(THREAD, UNPACK_PAIR(ConstantPool, cp));
   ResolvedMethodEntry* entry = cp->cache()->resolved_method_entry_at(index);
   if (entry->is_resolved(Bytecodes::_invokehandle)) {
@@ -1705,8 +1700,8 @@ C2V_VMENTRY_0(jint, isResolvedInvokeHandleInPool, (JNIEnv* env, jobject, ARGUMEN
 
     return Bytecodes::_invokevirtual;
   }
-  if (cp->is_invokedynamic_index(index)) {
-    if (cp->resolved_indy_entry_at(cp->decode_invokedynamic_index(index))->is_resolved()) {
+  if ((Bytecodes::Code)opcode == Bytecodes::_invokedynamic) {
+    if (cp->resolved_indy_entry_at(index)->is_resolved()) {
       return Bytecodes::_invokedynamic;
     }
   }
@@ -3228,7 +3223,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "lookupSignatureInPool",                        CC "(" HS_CONSTANT_POOL2 "II)" STRING,                                                FN_PTR(lookupSignatureInPool)},
   {CC "lookupKlassRefIndexInPool",                    CC "(" HS_CONSTANT_POOL2 "II)I",                                                      FN_PTR(lookupKlassRefIndexInPool)},
   {CC "lookupKlassInPool",                            CC "(" HS_CONSTANT_POOL2 "I)Ljava/lang/Object;",                                      FN_PTR(lookupKlassInPool)},
-  {CC "lookupAppendixInPool",                         CC "(" HS_CONSTANT_POOL2 "I)" OBJECTCONSTANT,                                         FN_PTR(lookupAppendixInPool)},
+  {CC "lookupAppendixInPool",                         CC "(" HS_CONSTANT_POOL2 "II)" OBJECTCONSTANT,                                        FN_PTR(lookupAppendixInPool)},
   {CC "lookupMethodInPool",                           CC "(" HS_CONSTANT_POOL2 "IB" HS_METHOD2 ")" HS_METHOD,                               FN_PTR(lookupMethodInPool)},
   {CC "lookupConstantInPool",                         CC "(" HS_CONSTANT_POOL2 "IZ)" JAVACONSTANT,                                          FN_PTR(lookupConstantInPool)},
   {CC "resolveBootstrapMethod",                       CC "(" HS_CONSTANT_POOL2 "I)[" OBJECT,                                                FN_PTR(resolveBootstrapMethod)},
@@ -3240,7 +3235,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "decodeMethodIndexToCPIndex",                   CC "(" HS_CONSTANT_POOL2 "I)I",                                                       FN_PTR(decodeMethodIndexToCPIndex)},
   {CC "decodeIndyIndexToCPIndex",                     CC "(" HS_CONSTANT_POOL2 "IZ)I",                                                      FN_PTR(decodeIndyIndexToCPIndex)},
   {CC "resolveInvokeHandleInPool",                    CC "(" HS_CONSTANT_POOL2 "I)V",                                                       FN_PTR(resolveInvokeHandleInPool)},
-  {CC "isResolvedInvokeHandleInPool",                 CC "(" HS_CONSTANT_POOL2 "I)I",                                                       FN_PTR(isResolvedInvokeHandleInPool)},
+  {CC "isResolvedInvokeHandleInPool",                 CC "(" HS_CONSTANT_POOL2 "II)I",                                                      FN_PTR(isResolvedInvokeHandleInPool)},
   {CC "resolveMethod",                                CC "(" HS_KLASS2 HS_METHOD2 HS_KLASS2 ")" HS_METHOD,                                  FN_PTR(resolveMethod)},
   {CC "getSignaturePolymorphicHolders",               CC "()[" STRING,                                                                      FN_PTR(getSignaturePolymorphicHolders)},
   {CC "getVtableIndexForInterfaceMethod",             CC "(" HS_KLASS2 HS_METHOD2 ")I",                                                     FN_PTR(getVtableIndexForInterfaceMethod)},
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 6bab80ddae6..2e588373cdf 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -1856,9 +1856,8 @@ Method* JVMCIRuntime::get_method_by_index_impl(const constantPoolHandle& cpool,
                                                int index, Bytecodes::Code bc,
                                                InstanceKlass* accessor) {
   if (bc == Bytecodes::_invokedynamic) {
-    int indy_index = cpool->decode_invokedynamic_index(index);
-    if (cpool->resolved_indy_entry_at(indy_index)->is_resolved()) {
-      return cpool->resolved_indy_entry_at(indy_index)->method();
+    if (cpool->resolved_indy_entry_at(index)->is_resolved()) {
+      return cpool->resolved_indy_entry_at(index)->method();
     }
 
     return nullptr;
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 9d521e032ff..b540ec6c160 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -652,32 +652,29 @@ Method* ConstantPool::method_at_if_loaded(const constantPoolHandle& cpool,
 }
 
 
-bool ConstantPool::has_appendix_at_if_loaded(const constantPoolHandle& cpool, int which) {
+bool ConstantPool::has_appendix_at_if_loaded(const constantPoolHandle& cpool, int which, Bytecodes::Code code) {
   if (cpool->cache() == nullptr)  return false;  // nothing to load yet
-  if (is_invokedynamic_index(which)) {
-    int indy_index = decode_invokedynamic_index(which);
-    return cpool->resolved_indy_entry_at(indy_index)->has_appendix();
+  if (code == Bytecodes::_invokedynamic) {
+    return cpool->resolved_indy_entry_at(which)->has_appendix();
   } else {
     return cpool->resolved_method_entry_at(which)->has_appendix();
   }
 }
 
-oop ConstantPool::appendix_at_if_loaded(const constantPoolHandle& cpool, int which) {
+oop ConstantPool::appendix_at_if_loaded(const constantPoolHandle& cpool, int which, Bytecodes::Code code) {
   if (cpool->cache() == nullptr)  return nullptr;  // nothing to load yet
-  if (is_invokedynamic_index(which)) {
-    int indy_index = decode_invokedynamic_index(which);
-    return cpool->resolved_reference_from_indy(indy_index);
+  if (code == Bytecodes::_invokedynamic) {
+    return cpool->resolved_reference_from_indy(which);
   } else {
     return cpool->cache()->appendix_if_resolved(which);
   }
 }
 
 
-bool ConstantPool::has_local_signature_at_if_loaded(const constantPoolHandle& cpool, int which) {
+bool ConstantPool::has_local_signature_at_if_loaded(const constantPoolHandle& cpool, int which, Bytecodes::Code code) {
   if (cpool->cache() == nullptr)  return false;  // nothing to load yet
-  if (is_invokedynamic_index(which)) {
-    int indy_index = decode_invokedynamic_index(which);
-    return cpool->resolved_indy_entry_at(indy_index)->has_local_signature();
+  if (code == Bytecodes::_invokedynamic) {
+    return cpool->resolved_indy_entry_at(which)->has_local_signature();
   } else {
     return cpool->resolved_method_entry_at(which)->has_local_signature();
   }
@@ -739,8 +736,6 @@ u2 ConstantPool::uncached_klass_ref_index_at(int cp_index) {
 }
 
 u2 ConstantPool::klass_ref_index_at(int index, Bytecodes::Code code) {
-  guarantee(!ConstantPool::is_invokedynamic_index(index),
-            "an invokedynamic instruction does not have a klass");
   assert(code != Bytecodes::_invokedynamic,
             "an invokedynamic instruction does not have a klass");
   return uncached_klass_ref_index_at(to_cp_index(index, code));
diff --git a/src/hotspot/share/oops/constantPool.hpp b/src/hotspot/share/oops/constantPool.hpp
index eec628b1e5b..e48229749f3 100644
--- a/src/hotspot/share/oops/constantPool.hpp
+++ b/src/hotspot/share/oops/constantPool.hpp
@@ -248,14 +248,6 @@ class ConstantPool : public Metadata {
   void allocate_resolved_klasses(ClassLoaderData* loader_data, int num_klasses, TRAPS);
   void initialize_unresolved_klasses(ClassLoaderData* loader_data, TRAPS);
 
-  // Invokedynamic indexes.
-  // They must look completely different from normal indexes.
-  // The main reason is that byte swapping is sometimes done on normal indexes.
-  // Finally, it is helpful for debugging to tell the two apart.
-  static bool is_invokedynamic_index(int i) { return (i < 0); }
-  static int  decode_invokedynamic_index(int i) { assert(is_invokedynamic_index(i),  ""); return ~i; }
-  static int  encode_invokedynamic_index(int i) { assert(!is_invokedynamic_index(i), ""); return ~i; }
-
   // Given the per-instruction index of an indy instruction, report the
   // main constant pool entry for its bootstrap specifier.
   // From there, uncached_name/signature_ref_at will get the name/type.
@@ -761,9 +753,9 @@ class ConstantPool : public Metadata {
 
   // Used by compiler to prevent classloading.
   static Method*          method_at_if_loaded      (const constantPoolHandle& this_cp, int which);
-  static bool       has_appendix_at_if_loaded      (const constantPoolHandle& this_cp, int which);
-  static oop            appendix_at_if_loaded      (const constantPoolHandle& this_cp, int which);
-  static bool has_local_signature_at_if_loaded     (const constantPoolHandle& this_cp, int which);
+  static bool       has_appendix_at_if_loaded      (const constantPoolHandle& this_cp, int which, Bytecodes::Code code);
+  static oop            appendix_at_if_loaded      (const constantPoolHandle& this_cp, int which, Bytecodes::Code code);
+  static bool has_local_signature_at_if_loaded     (const constantPoolHandle& this_cp, int which, Bytecodes::Code code);
   static Klass*            klass_at_if_loaded      (const constantPoolHandle& this_cp, int which);
 
   // Routines currently used for annotations (only called by jvm.cpp) but which might be used in the
diff --git a/src/hotspot/share/oops/constantPool.inline.hpp b/src/hotspot/share/oops/constantPool.inline.hpp
index 6700e6678e6..e216f33c896 100644
--- a/src/hotspot/share/oops/constantPool.inline.hpp
+++ b/src/hotspot/share/oops/constantPool.inline.hpp
@@ -69,7 +69,7 @@ inline oop ConstantPool::appendix_if_resolved(int method_index) const {
 }
 
 inline u2 ConstantPool::invokedynamic_bootstrap_ref_index_at(int indy_index) const {
-  return cache()->resolved_indy_entry_at(decode_invokedynamic_index(indy_index))->constant_pool_index();
+  return cache()->resolved_indy_entry_at(indy_index)->constant_pool_index();
 }
 
 inline ResolvedIndyEntry* ConstantPool::resolved_indy_entry_at(int index) {
diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
index ccab0a04a0b..03dbce19f2e 100644
--- a/src/hotspot/share/oops/cpCache.cpp
+++ b/src/hotspot/share/oops/cpCache.cpp
@@ -570,8 +570,7 @@ bool ConstantPoolCache::save_and_throw_indy_exc(
   Symbol* error = PENDING_EXCEPTION->klass()->name();
   const char* message = java_lang_Throwable::message_as_utf8(PENDING_EXCEPTION);
 
-  int encoded_index = ResolutionErrorTable::encode_indy_index(
-                          ConstantPool::encode_invokedynamic_index(index));
+  int encoded_index = ResolutionErrorTable::encode_indy_index(index);
   SystemDictionary::add_resolution_error(cpool, encoded_index, error, message);
   resolved_indy_entry_at(index)->set_resolution_failed();
   return true;
@@ -590,8 +589,7 @@ oop ConstantPoolCache::set_dynamic_call(const CallInfo &call_info, int index) {
     // Before we got here, another thread got a LinkageError exception during
     // resolution.  Ignore our success and throw their exception.
     guarantee(index >= 0, "Invalid indy index");
-    int encoded_index = ResolutionErrorTable::encode_indy_index(
-                          ConstantPool::encode_invokedynamic_index(index));
+    int encoded_index = ResolutionErrorTable::encode_indy_index(index);
     JavaThread* THREAD = JavaThread::current(); // For exception macros.
     constantPoolHandle cp(THREAD, constant_pool());
     ConstantPool::throw_resolution_error(cp, encoded_index, THREAD);
diff --git a/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp b/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
index 08e25c793a6..8d7ffdf4835 100644
--- a/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
+++ b/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
@@ -1066,7 +1066,7 @@ void JvmtiClassFileReconstituter::copy_bytecodes(const methodHandle& mh,
         int pool_index;
         if (is_invokedynamic) {
           cpci = Bytes::get_native_u4(bcp+1);
-          pool_index = mh->constants()->resolved_indy_entry_at(mh->constants()->decode_invokedynamic_index(cpci))->constant_pool_index();
+          pool_index = mh->constants()->resolved_indy_entry_at(cpci)->constant_pool_index();
         } else {
           // cache cannot be pre-fetched since some classes won't have it yet
           pool_index = mh->constants()->resolved_method_entry_at(cpci)->constant_pool_index();
diff --git a/src/hotspot/share/prims/methodComparator.cpp b/src/hotspot/share/prims/methodComparator.cpp
index c681ec42a01..ac4b59a6d9a 100644
--- a/src/hotspot/share/prims/methodComparator.cpp
+++ b/src/hotspot/share/prims/methodComparator.cpp
@@ -120,9 +120,6 @@ bool MethodComparator::args_same(Bytecodes::Code const c_old,  Bytecodes::Code c
     int index_old = s_old->get_index_u4();
     int index_new = s_new->get_index_u4();
 
-    int indy_index_old = old_cp->decode_invokedynamic_index(index_old);
-    int indy_index_new = new_cp->decode_invokedynamic_index(index_new);
-
     // Check if the names of classes, field/method names and signatures at these indexes
     // are the same. Indices which are really into constantpool cache (rather than constant
     // pool itself) are accepted by the constantpool query routines below.
@@ -131,8 +128,8 @@ bool MethodComparator::args_same(Bytecodes::Code const c_old,  Bytecodes::Code c
         (old_cp->signature_ref_at(index_old, c_old) != new_cp->signature_ref_at(index_new, c_old)))
       return false;
 
-    int cpi_old = old_cp->cache()->resolved_indy_entry_at(indy_index_old)->constant_pool_index();
-    int cpi_new = new_cp->cache()->resolved_indy_entry_at(indy_index_new)->constant_pool_index();
+    int cpi_old = old_cp->cache()->resolved_indy_entry_at(index_old)->constant_pool_index();
+    int cpi_new = new_cp->cache()->resolved_indy_entry_at(index_new)->constant_pool_index();
     if ((old_cp->uncached_name_ref_at(cpi_old) != new_cp->uncached_name_ref_at(cpi_new)) ||
         (old_cp->uncached_signature_ref_at(cpi_old) != new_cp->uncached_signature_ref_at(cpi_new)))
       return false;
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index f8dc972d068..54fb62180bf 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1884,10 +1884,6 @@ WB_ENTRY(jobjectArray, WB_GetResolvedReferences(JNIEnv* env, jobject wb, jclass
   return (jobjectArray)JNIHandles::make_local(THREAD, resolved_refs);
 WB_END
 
-WB_ENTRY(jint, WB_ConstantPoolEncodeIndyIndex(JNIEnv* env, jobject wb, jint index))
-  return ConstantPool::encode_invokedynamic_index(index);
-WB_END
-
 WB_ENTRY(jint, WB_getFieldEntriesLength(JNIEnv* env, jobject wb, jclass klass))
   InstanceKlass* ik = InstanceKlass::cast(java_lang_Class::as_Klass(JNIHandles::resolve(klass)));
   ConstantPool* cp = ik->constants();
@@ -2845,8 +2841,6 @@ static JNINativeMethod methods[] = {
   {CC"forceClassLoaderStatsSafepoint", CC"()V",       (void*)&WB_ForceClassLoaderStatsSafepoint },
   {CC"getConstantPool0",   CC"(Ljava/lang/Class;)J",  (void*)&WB_GetConstantPool    },
   {CC"getResolvedReferences0", CC"(Ljava/lang/Class;)[Ljava/lang/Object;", (void*)&WB_GetResolvedReferences},
-  {CC"encodeConstantPoolIndyIndex0",
-      CC"(I)I",                      (void*)&WB_ConstantPoolEncodeIndyIndex},
   {CC"getFieldEntriesLength0", CC"(Ljava/lang/Class;)I",  (void*)&WB_getFieldEntriesLength},
   {CC"getFieldCPIndex0",    CC"(Ljava/lang/Class;I)I", (void*)&WB_getFieldCPIndex},
   {CC"getMethodEntriesLength0", CC"(Ljava/lang/Class;)I",  (void*)&WB_getMethodEntriesLength},
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java
index ba37332c851..3647a951b8d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java
@@ -24,8 +24,8 @@
 
 package sun.jvm.hotspot.interpreter;
 
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.ConstantPoolCache;
+import sun.jvm.hotspot.oops.Method;
 
 // any bytecode with constant pool index
 
@@ -37,12 +37,7 @@ public abstract class BytecodeWithCPIndex extends Bytecode {
   // the constant pool index for this bytecode
   public int index() {
     if (code() == Bytecodes._invokedynamic) {
-      int index = getIndexU4();
-      if (ConstantPool.isInvokedynamicIndex(index)) {
-        return ConstantPool.decodeInvokedynamicIndex(index);
-      } else {
-        return index;
-      }
+      return getIndexU4();
     } else {
       return getIndexU2(code(), false);
     }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
index 70ccc01533e..8c25f54d92c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
@@ -306,18 +306,6 @@ public class ConstantPool extends Metadata implements ClassConstants {
     return getSymbolAt(signatureIndex);
   }
 
-  public static boolean isInvokedynamicIndex(int i) { return (i < 0); }
-
-  public static int  decodeInvokedynamicIndex(int i) { Assert.that(isInvokedynamicIndex(i),  ""); return ~i; }
-
-  // The invokedynamic points at a CP cache entry.  This entry points back
-  // at the original CP entry (CONSTANT_InvokeDynamic) and also (via f2) at an entry
-  // in the resolved_references array (which provides the appendix argument).
-  public int invokedynamicCPCacheIndex(int index) {
-    Assert.that(isInvokedynamicIndex(index), "should be a invokedynamic index");
-    return decodeInvokedynamicIndex(index);
-  }
-
   public int uncachedGetNameAndTypeRefIndexAt(int cp_index) {
     if (getTagAt(cp_index).isInvokeDynamic() || getTagAt(cp_index).isDynamicConstant()) {
       int poolIndex = invokeDynamicNameAndTypeRefIndexAt(cp_index);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
index 60d2a3edafe..2ed2106c02d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java
@@ -24,13 +24,17 @@
 
 package sun.jvm.hotspot.tools.jcore;
 
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.interpreter.*;
-import sun.jvm.hotspot.utilities.*;
-import sun.jvm.hotspot.runtime.*;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
+import sun.jvm.hotspot.interpreter.Bytecodes;
+import sun.jvm.hotspot.oops.ConstantPool;
+import sun.jvm.hotspot.oops.ConstantPoolCache;
+import sun.jvm.hotspot.oops.Method;
+import sun.jvm.hotspot.runtime.Bytes;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.utilities.Assert;
+
 public class ByteCodeRewriter
 {
     private Method method;
@@ -133,8 +137,8 @@ public class ByteCodeRewriter
                 }
 
                 case Bytecodes._invokedynamic: {
-                    int cpci = method.getNativeIntArg(bci + 1);
-                    cpoolIndex = (short) cpCache.getIndyEntryAt(~cpci).getConstantPoolIndex();
+                    int indy_index = method.getNativeIntArg(bci + 1);
+                    cpoolIndex = (short) cpCache.getIndyEntryAt(indy_index).getConstantPoolIndex();
                     writeShort(code, bci + 1, cpoolIndex);
                     writeShort(code, bci + 3, (short)0);  // clear out trailing bytes
                     break;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
index e9fea0ce6ca..14646fd0275 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -23,9 +23,6 @@
 
 package jdk.vm.ci.hotspot;
 
-import static jdk.vm.ci.common.InitTimer.timer;
-import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
-
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 
@@ -35,8 +32,10 @@ import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.code.InvalidInstalledCodeException;
 import jdk.vm.ci.code.stack.InspectedFrameVisitor;
 import jdk.vm.ci.common.InitTimer;
+import static jdk.vm.ci.common.InitTimer.timer;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
+import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
@@ -429,11 +428,10 @@ final class CompilerToVM {
                     long callerMethodPointer);
 
     /**
-     * Converts the encoded indy index operand of an invokedynamic instruction
+     * Converts the indy index operand of an invokedynamic instruction
      * to an index directly into {@code constantPool}.
      *
      * @param resolve if {@true}, then resolve the entry (which may call a bootstrap method)
-     * @throws IllegalArgumentException if {@code encoded_indy_index} is not an encoded indy index
      * @return {@code JVM_CONSTANT_InvokeDynamic} constant pool entry index for the invokedynamic
      */
     int decodeIndyIndexToCPIndex(HotSpotConstantPool constantPool, int encoded_indy_index, boolean resolve) {
@@ -535,11 +533,11 @@ final class CompilerToVM {
      * opcode of the instruction for which the resolution was performed ({@code invokedynamic} or
      * {@code invokevirtual}), or {@code -1} otherwise.
      */
-    int isResolvedInvokeHandleInPool(HotSpotConstantPool constantPool, int cpi) {
-        return isResolvedInvokeHandleInPool(constantPool, constantPool.getConstantPoolPointer(), cpi);
+    int isResolvedInvokeHandleInPool(HotSpotConstantPool constantPool, int cpi, int opcode) {
+        return isResolvedInvokeHandleInPool(constantPool, constantPool.getConstantPoolPointer(), cpi, opcode);
     }
 
-    private native int isResolvedInvokeHandleInPool(HotSpotConstantPool constantPool, long constantPoolPointer, int cpi);
+    private native int isResolvedInvokeHandleInPool(HotSpotConstantPool constantPool, long constantPoolPointer, int cpi, int opcode);
 
     /**
      * Gets the list of type names (in the format of {@link JavaType#getName()}) denoting the
@@ -596,11 +594,11 @@ final class CompilerToVM {
      *              Otherwise, it's treated as a constant pool cache index
      *              for INVOKE{VIRTUAL,SPECIAL,STATIC,INTERFACE}.
      */
-    HotSpotObjectConstantImpl lookupAppendixInPool(HotSpotConstantPool constantPool, int which) {
-        return lookupAppendixInPool(constantPool, constantPool.getConstantPoolPointer(), which);
+    HotSpotObjectConstantImpl lookupAppendixInPool(HotSpotConstantPool constantPool, int which, int opcode) {
+        return lookupAppendixInPool(constantPool, constantPool.getConstantPoolPointer(), which, opcode);
     }
 
-    private native HotSpotObjectConstantImpl lookupAppendixInPool(HotSpotConstantPool constantPool, long constantPoolPointer, int which);
+    private native HotSpotObjectConstantImpl lookupAppendixInPool(HotSpotConstantPool constantPool, long constantPoolPointer, int which, int opcode);
 
     /**
      * Installs the result of a compilation into the code cache.
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
index 1065d45a4fc..f4f8736a2fe 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
@@ -22,19 +22,16 @@
  */
 package jdk.vm.ci.hotspot;
 
-import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
-import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
-import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
-import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
-
 import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.common.NativeImageReinitialize;
+import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
+import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
+import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
+import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaField;
@@ -259,13 +256,6 @@ public final class HotSpotConstantPool implements ConstantPool, MetaspaceHandleO
         return holder;
     }
 
-    /**
-     * See {@code ConstantPool::is_invokedynamic_index}.
-     */
-    private static boolean isInvokedynamicIndex(int index) {
-        return index < 0;
-    }
-
     /**
      * Gets the raw {@code ConstantPool*} value for the this constant pool.
      */
@@ -708,15 +698,7 @@ public final class HotSpotConstantPool implements ConstantPool, MetaspaceHandleO
         if (!Bytecodes.isInvoke(opcode)) {
             throw new IllegalArgumentException("expected an invoke bytecode for " + rawIndex + ", got " + opcode);
         }
-
-        if (opcode == Bytecodes.INVOKEDYNAMIC) {
-          if (!isInvokedynamicIndex(rawIndex)) {
-              throw new IllegalArgumentException("expected a raw index for INVOKEDYNAMIC but got " + rawIndex);
-          }
-          return compilerToVM().lookupAppendixInPool(this, rawIndex);
-        } else {
-          return compilerToVM().lookupAppendixInPool(this, rawIndex);
-        }
+        return compilerToVM().lookupAppendixInPool(this, rawIndex, opcode);
     }
 
     /**
@@ -735,26 +717,17 @@ public final class HotSpotConstantPool implements ConstantPool, MetaspaceHandleO
 
     @Override
     public JavaMethod lookupMethod(int rawIndex, int opcode, ResolvedJavaMethod caller) {
-        int which; // interpretation depends on opcode
-        if (opcode == Bytecodes.INVOKEDYNAMIC) {
-            if (!isInvokedynamicIndex(rawIndex)) {
-                throw new IllegalArgumentException("expected a raw index for INVOKEDYNAMIC but got " + rawIndex);
-            }
-            which = rawIndex;
-        } else {
-            which = rawIndex;
-        }
-        final HotSpotResolvedJavaMethod method = compilerToVM().lookupMethodInPool(this, which, (byte) opcode, (HotSpotResolvedJavaMethodImpl) caller);
+        final HotSpotResolvedJavaMethod method = compilerToVM().lookupMethodInPool(this, rawIndex, (byte) opcode, (HotSpotResolvedJavaMethodImpl) caller);
         if (method != null) {
             return method;
         } else {
             // Get the method's name and signature.
-            String name = compilerToVM().lookupNameInPool(this, which, opcode);
-            HotSpotSignature signature = new HotSpotSignature(runtime(), compilerToVM().lookupSignatureInPool(this, which, opcode));
+            String name = compilerToVM().lookupNameInPool(this, rawIndex, opcode);
+            HotSpotSignature signature = new HotSpotSignature(runtime(), compilerToVM().lookupSignatureInPool(this, rawIndex, opcode));
             if (opcode == Bytecodes.INVOKEDYNAMIC) {
                 return new UnresolvedJavaMethod(name, signature, runtime().getMethodHandleClass());
             } else {
-                final int klassIndex = getKlassRefIndexAt(which, opcode);
+                final int klassIndex = getKlassRefIndexAt(rawIndex, opcode);
                 final Object type = compilerToVM().lookupKlassInPool(this, klassIndex);
                 return new UnresolvedJavaMethod(name, signature, getJavaType(type));
             }
@@ -853,14 +826,10 @@ public final class HotSpotConstantPool implements ConstantPool, MetaspaceHandleO
      * @return constant pool index
      */
     private int indyIndexConstantPoolIndex(int rawIndex, int opcode) {
-        if (isInvokedynamicIndex(rawIndex)) {
-            if (opcode != Bytecodes.INVOKEDYNAMIC) {
-                throw new IllegalArgumentException("expected INVOKEDYNAMIC at " + rawIndex + ", got " + opcode);
-            }
-            return compilerToVM().decodeIndyIndexToCPIndex(this, rawIndex, false);
-        } else {
-          throw new IllegalArgumentException("expected a raw index for INVOKEDYNAMIC but got " + rawIndex);
+        if (opcode != Bytecodes.INVOKEDYNAMIC) {
+            throw new IllegalArgumentException("expected INVOKEDYNAMIC at " + rawIndex + ", got " + opcode);
         }
+        return compilerToVM().decodeIndyIndexToCPIndex(this, rawIndex, false);
     }
 
     @Override
@@ -884,10 +853,6 @@ public final class HotSpotConstantPool implements ConstantPool, MetaspaceHandleO
                 cpi = rawIndex;
                 break;
             case Bytecodes.INVOKEDYNAMIC: {
-                // invokedynamic indices are different from constant pool cache indices
-                if (!isInvokedynamicIndex(rawIndex)) {
-                    throw new IllegalArgumentException("must use invokedynamic index but got " + rawIndex);
-                }
                 cpi = compilerToVM().decodeIndyIndexToCPIndex(this, rawIndex, true);
                 break;
             }
diff --git a/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java b/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
index 7310f37f8ab..6e1a8221a73 100644
--- a/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
+++ b/test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
@@ -144,8 +144,8 @@ public class CompilerToVMHelper {
     }
 
     public static Object lookupAppendixInPool(
-            ConstantPool constantPool, int cpi) {
-        return CTVM.lookupAppendixInPool((HotSpotConstantPool) constantPool, cpi);
+            ConstantPool constantPool, int cpi, int opcode) {
+        return CTVM.lookupAppendixInPool((HotSpotConstantPool) constantPool, cpi, opcode);
     }
 
     public static int installCode(TargetDescription target,
diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java
index bbbdf79fdaf..2a222c0a0ec 100644
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java
@@ -80,7 +80,7 @@ public class ConstantPoolTestsHelper {
             if (constantPoolSS.getTagAt(cpi).equals(Tag.INVOKEDYNAMIC)) {
                 for (int indy_index = 0; indy_index < WB.getIndyInfoLength(this.klass); indy_index++) {
                     if (WB.getIndyCPIndex(this.klass, indy_index) == cpi) {
-                        return ~indy_index;
+                        return indy_index;
                     }
                 }
             }

From b6518a5db08959a5d1a22ccff9c1795ce7f9bf85 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Tue, 23 Apr 2024 15:07:55 +0000
Subject: [PATCH 156/486] 8329417: Remove objects with no pointers from
 relocation bitmap

Reviewed-by: ccheung, iklam
---
 src/hotspot/share/cds/archiveBuilder.cpp  | 22 ++++++++++++++++++++++
 src/hotspot/share/cds/archiveBuilder.hpp  | 13 +++++++++++--
 src/hotspot/share/cds/filemap.cpp         | 17 +++++++++++------
 src/hotspot/share/cds/filemap.hpp         | 12 +++++++++---
 src/hotspot/share/cds/metaspaceShared.cpp |  1 +
 5 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 0eee36eec21..51399f03434 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -77,6 +77,7 @@ ArchiveBuilder::SourceObjList::~SourceObjList() {
 
 void ArchiveBuilder::SourceObjList::append(SourceObjInfo* src_info) {
   // Save this source object for copying
+  src_info->set_id(_objs->length());
   _objs->append(src_info);
 
   // Prepare for marking the pointers in this source object
@@ -94,6 +95,7 @@ void ArchiveBuilder::SourceObjList::append(SourceObjInfo* src_info) {
 void ArchiveBuilder::SourceObjList::remember_embedded_pointer(SourceObjInfo* src_info, MetaspaceClosure::Ref* ref) {
   // src_obj contains a pointer. Remember the location of this pointer in _ptrmap,
   // so that we can copy/relocate it later.
+  src_info->set_has_embedded_pointer();
   address src_obj = src_info->source_addr();
   address* field_addr = ref->addr();
   assert(src_info->ptrmap_start() < _total_bytes, "sanity");
@@ -589,6 +591,26 @@ char* ArchiveBuilder::ro_strdup(const char* s) {
   return archived_str;
 }
 
+// The objects that have embedded pointers will sink
+// towards the end of the list. This ensures we have a maximum
+// number of leading zero bits in the relocation bitmap.
+int ArchiveBuilder::compare_src_objs(SourceObjInfo** a, SourceObjInfo** b) {
+  if ((*a)->has_embedded_pointer() && !(*b)->has_embedded_pointer()) {
+    return 1;
+  } else if (!(*a)->has_embedded_pointer() && (*b)->has_embedded_pointer()) {
+    return -1;
+  } else {
+    // This is necessary to keep the sorting order stable. Otherwise the
+    // archive's contents may not be deterministic.
+    return (*a)->id() - (*b)->id();
+  }
+}
+
+void ArchiveBuilder::sort_metadata_objs() {
+  _rw_src_objs.objs()->sort(compare_src_objs);
+  _ro_src_objs.objs()->sort(compare_src_objs);
+}
+
 void ArchiveBuilder::dump_rw_metadata() {
   ResourceMark rm;
   log_info(cds)("Allocating RW objects ... ");
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index e6ac2e7ac4e..dab369265b0 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -126,15 +126,18 @@ private:
     uintx _ptrmap_start;     // The bit-offset of the start of this object (inclusive)
     uintx _ptrmap_end;       // The bit-offset of the end   of this object (exclusive)
     bool _read_only;
+    bool _has_embedded_pointer;
     FollowMode _follow_mode;
     int _size_in_bytes;
+    int _id; // Each object has a unique serial ID, starting from zero. The ID is assigned
+             // when the object is added into _source_objs.
     MetaspaceObj::Type _msotype;
     address _source_addr;    // The source object to be copied.
     address _buffered_addr;  // The copy of this object insider the buffer.
   public:
     SourceObjInfo(MetaspaceClosure::Ref* ref, bool read_only, FollowMode follow_mode) :
-      _ptrmap_start(0), _ptrmap_end(0), _read_only(read_only), _follow_mode(follow_mode),
-      _size_in_bytes(ref->size() * BytesPerWord), _msotype(ref->msotype()),
+      _ptrmap_start(0), _ptrmap_end(0), _read_only(read_only), _has_embedded_pointer(false), _follow_mode(follow_mode),
+      _size_in_bytes(ref->size() * BytesPerWord), _id(0), _msotype(ref->msotype()),
       _source_addr(ref->obj()) {
       if (follow_mode == point_to_it) {
         _buffered_addr = ref->obj();
@@ -164,7 +167,11 @@ private:
     uintx ptrmap_start()  const    { return _ptrmap_start; } // inclusive
     uintx ptrmap_end()    const    { return _ptrmap_end;   } // exclusive
     bool read_only()      const    { return _read_only;    }
+    bool has_embedded_pointer() const { return _has_embedded_pointer; }
+    void set_has_embedded_pointer()   { _has_embedded_pointer = true; }
     int size_in_bytes()   const    { return _size_in_bytes; }
+    int id()              const    { return _id; }
+    void set_id(int i)             { _id = i; }
     address source_addr() const    { return _source_addr; }
     address buffered_addr() const  {
       if (_follow_mode != set_to_null) {
@@ -384,6 +391,8 @@ public:
 
   char* ro_strdup(const char* s);
 
+  static int compare_src_objs(SourceObjInfo** a, SourceObjInfo** b);
+  void sort_metadata_objs();
   void dump_rw_metadata();
   void dump_ro_metadata();
   void relocate_metaspaceobj_embedded_pointers();
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 707a1de6fd1..2182865ebaa 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -293,6 +293,8 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- heap_roots_offset:              " SIZE_FORMAT, _heap_roots_offset);
   st->print_cr("- _heap_oopmap_start_pos:         " SIZE_FORMAT, _heap_oopmap_start_pos);
   st->print_cr("- _heap_ptrmap_start_pos:         " SIZE_FORMAT, _heap_ptrmap_start_pos);
+  st->print_cr("- _rw_ptrmap_start_pos:           " SIZE_FORMAT, _rw_ptrmap_start_pos);
+  st->print_cr("- _ro_ptrmap_start_pos:           " SIZE_FORMAT, _ro_ptrmap_start_pos);
   st->print_cr("- allow_archiving_with_java_agent:%d", _allow_archiving_with_java_agent);
   st->print_cr("- use_optimized_module_handling:  %d", _use_optimized_module_handling);
   st->print_cr("- has_full_module_graph           %d", _has_full_module_graph);
@@ -1580,7 +1582,7 @@ static size_t write_bitmap(const CHeapBitMap* map, char* output, size_t offset)
 // lots of leading zeros.
 size_t FileMapInfo::remove_bitmap_leading_zeros(CHeapBitMap* map) {
   size_t old_zeros = map->find_first_set_bit(0);
-  size_t old_size = map->size_in_bytes();
+  size_t old_size = map->size();
 
   // Slice and resize bitmap
   map->truncate(old_zeros, map->size());
@@ -1589,13 +1591,16 @@ size_t FileMapInfo::remove_bitmap_leading_zeros(CHeapBitMap* map) {
     size_t new_zeros = map->find_first_set_bit(0);
     assert(new_zeros == 0, "Should have removed leading zeros");
   )
-
-  assert(map->size_in_bytes() < old_size, "Map size should have decreased");
+  assert(map->size() <= old_size, "sanity");
   return old_zeros;
 }
 
-char* FileMapInfo::write_bitmap_region(const CHeapBitMap* rw_ptrmap, const CHeapBitMap* ro_ptrmap, ArchiveHeapInfo* heap_info,
+char* FileMapInfo::write_bitmap_region(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap, ArchiveHeapInfo* heap_info,
                                        size_t &size_in_bytes) {
+  size_t removed_rw_zeros = remove_bitmap_leading_zeros(rw_ptrmap);
+  size_t removed_ro_zeros = remove_bitmap_leading_zeros(ro_ptrmap);
+  header()->set_rw_ptrmap_start_pos(removed_rw_zeros);
+  header()->set_ro_ptrmap_start_pos(removed_ro_zeros);
   size_in_bytes = rw_ptrmap->size_in_bytes() + ro_ptrmap->size_in_bytes();
 
   if (heap_info->is_used()) {
@@ -1942,9 +1947,9 @@ bool FileMapInfo::relocate_pointers_in_core_regions(intx addr_delta) {
     address valid_new_base = (address)header()->mapped_base_address();
     address valid_new_end  = (address)mapped_end();
 
-    SharedDataRelocator rw_patcher((address*)rw_patch_base, (address*)rw_patch_end, valid_old_base, valid_old_end,
+    SharedDataRelocator rw_patcher((address*)rw_patch_base + header()->rw_ptrmap_start_pos(), (address*)rw_patch_end, valid_old_base, valid_old_end,
                                 valid_new_base, valid_new_end, addr_delta);
-    SharedDataRelocator ro_patcher((address*)ro_patch_base, (address*)ro_patch_end, valid_old_base, valid_old_end,
+    SharedDataRelocator ro_patcher((address*)ro_patch_base + header()->ro_ptrmap_start_pos(), (address*)ro_patch_end, valid_old_base, valid_old_end,
                                 valid_new_base, valid_new_end, addr_delta);
     rw_ptrmap.iterate(&rw_patcher);
     ro_ptrmap.iterate(&ro_patcher);
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index a7f1c23d00a..54881b8d237 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -229,6 +229,8 @@ private:
                                         // of the archived heap objects, in bytes.
   size_t _heap_oopmap_start_pos;        // The first bit in the oopmap corresponds to this position in the heap.
   size_t _heap_ptrmap_start_pos;        // The first bit in the ptrmap corresponds to this position in the heap.
+  size_t _rw_ptrmap_start_pos;          // The first bit in the ptrmap corresponds to this position in the rw region
+  size_t _ro_ptrmap_start_pos;          // The first bit in the ptrmap corresponds to this position in the ro region
   char* from_mapped_offset(size_t offset) const {
     return mapped_base_address() + offset;
   }
@@ -269,8 +271,10 @@ public:
   bool compressed_oops()                   const { return _compressed_oops; }
   bool compressed_class_pointers()         const { return _compressed_class_ptrs; }
   size_t heap_roots_offset()               const { return _heap_roots_offset; }
-  size_t heap_oopmap_start_pos()           const { return _heap_oopmap_start_pos;}
-  size_t heap_ptrmap_start_pos()           const { return _heap_ptrmap_start_pos;}
+  size_t heap_oopmap_start_pos()           const { return _heap_oopmap_start_pos; }
+  size_t heap_ptrmap_start_pos()           const { return _heap_ptrmap_start_pos; }
+  size_t rw_ptrmap_start_pos()             const { return _rw_ptrmap_start_pos; }
+  size_t ro_ptrmap_start_pos()             const { return _ro_ptrmap_start_pos; }
   // FIXME: These should really return int
   jshort max_used_path_index()             const { return _max_used_path_index; }
   jshort app_module_paths_start_index()    const { return _app_module_paths_start_index; }
@@ -284,6 +288,8 @@ public:
   void set_heap_roots_offset(size_t n)           { _heap_roots_offset = n; }
   void set_heap_oopmap_start_pos(size_t n)       { _heap_oopmap_start_pos = n; }
   void set_heap_ptrmap_start_pos(size_t n)       { _heap_ptrmap_start_pos = n; }
+  void set_rw_ptrmap_start_pos(size_t n)         { _rw_ptrmap_start_pos = n; }
+  void set_ro_ptrmap_start_pos(size_t n)         { _ro_ptrmap_start_pos = n; }
   void copy_base_archive_name(const char* name);
 
   void set_shared_path_table(SharedPathTable table) {
@@ -440,7 +446,7 @@ public:
   void  write_region(int region, char* base, size_t size,
                      bool read_only, bool allow_exec);
   size_t remove_bitmap_leading_zeros(CHeapBitMap* map);
-  char* write_bitmap_region(const CHeapBitMap* rw_ptrmap, const CHeapBitMap* ro_ptrmap, ArchiveHeapInfo* heap_info,
+  char* write_bitmap_region(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap, ArchiveHeapInfo* heap_info,
                             size_t &size_in_bytes);
   size_t write_heap_region(ArchiveHeapInfo* heap_info);
   void  write_bytes(const void* buffer, size_t count);
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index b13ef2101a9..c7d14f83d03 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -513,6 +513,7 @@ void VM_PopulateDumpSharedSpace::doit() {
 
   char* cloned_vtables = CppVtables::dumptime_init(&builder);
 
+  builder.sort_metadata_objs();
   builder.dump_rw_metadata();
   builder.dump_ro_metadata();
   builder.relocate_metaspaceobj_embedded_pointers();

From b07e1531b375b9d8117e218355e70272e27e1225 Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Tue, 23 Apr 2024 15:22:17 +0000
Subject: [PATCH 157/486] 8330362: G1: Inline offset array element accessor in
 G1BlockOffsetTable

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp | 9 ++-------
 src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
index bc14730594d..ff66c2af409 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
@@ -43,17 +43,12 @@ G1BlockOffsetTable::G1BlockOffsetTable(MemRegion heap, G1RegionToSpaceMapper* st
                      p2i(bot_reserved.start()), bot_reserved.byte_size(), p2i(bot_reserved.end()));
 }
 
-void G1BlockOffsetTable::set_offset_array_raw(uint8_t* addr, uint8_t offset) {
+void G1BlockOffsetTable::set_offset_array(uint8_t* addr, uint8_t offset) {
+  check_address(addr, "Block offset table address out of range");
   Atomic::store(addr, offset);
 }
 
-void G1BlockOffsetTable::set_offset_array(uint8_t* addr, uint8_t offset) {
-  check_address(addr, "Block offset table address out of range");
-  set_offset_array_raw(addr, offset);
-}
-
 void G1BlockOffsetTable::set_offset_array(uint8_t* addr, HeapWord* high, HeapWord* low) {
-  check_address(addr, "Block offset table address out of range");
   assert(high >= low, "addresses out of order");
   size_t offset = pointer_delta(high, low);
   check_offset(offset, "offset too large");
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
index a0e6129f1a0..4b254c7e42a 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
@@ -56,7 +56,6 @@ private:
   // For performance these have to devolve to array accesses in product builds.
   inline uint8_t offset_array(uint8_t* addr) const;
 
-  inline void set_offset_array_raw(uint8_t* addr, uint8_t offset);
   inline void set_offset_array(uint8_t* addr, uint8_t offset);
 
   inline void set_offset_array(uint8_t* addr, HeapWord* high, HeapWord* low);

From 412e306d81209c05f55aee7663f7abb80286e361 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 23 Apr 2024 16:10:13 +0000
Subject: [PATCH 158/486] 8329593: Drop adjustments to target parallelism when
 virtual threads do I/O on files opened for buffered I/O

Reviewed-by: bpb, jpai
---
 .../classes/sun/nio/ch/EPollSelectorImpl.java |   6 +-
 .../sun/nio/ch/KQueueSelectorImpl.java        |   6 +-
 .../sun/nio/fs/BsdNativeDispatcher.java       |  29 +-
 .../share/classes/java/io/FileDescriptor.java |   6 +-
 .../classes/java/io/FileInputStream.java      |  63 +---
 .../classes/java/io/FileOutputStream.java     |  35 +--
 .../classes/java/io/RandomAccessFile.java     |  65 ++---
 .../share/classes/java/lang/Object.java       |  17 +-
 .../share/classes/java/lang/Process.java      |  72 ++++-
 .../share/classes/java/lang/System.java       |  84 +++++-
 .../classes/java/lang/VirtualThread.java      |   5 +
 .../share/classes/java/net/InetAddress.java   |   8 +-
 .../classes/java/nio/MappedMemoryUtils.java   |   6 +-
 .../classes/jdk/internal/misc/Blocker.java    |  63 +---
 .../jdk/internal/misc/CarrierThread.java      |  79 +++--
 .../classes/sun/nio/ch/FileChannelImpl.java   | 120 +++-----
 .../unix/classes/java/io/UnixFileSystem.java  | 110 +------
 .../unix/classes/java/lang/ProcessImpl.java   |   4 +-
 .../classes/sun/nio/ch/PollSelectorImpl.java  |   6 +-
 .../sun/nio/fs/UnixChannelFactory.java        |   6 +-
 .../classes/sun/nio/fs/UnixFileSystem.java    |   7 -
 .../sun/nio/fs/UnixNativeDispatcher.java      | 273 +++---------------
 .../classes/java/io/WinNTFileSystem.java      |  94 +-----
 .../classes/java/lang/ProcessImpl.java        |  12 +-
 .../sun/nio/ch/WEPollSelectorImpl.java        |   6 +-
 .../sun/nio/fs/WindowsChannelFactory.java     |   6 +-
 .../sun/nio/fs/WindowsNativeDispatcher.java   | 126 ++------
 .../java.base/java/lang/Object.java           |  17 +-
 28 files changed, 461 insertions(+), 870 deletions(-)

diff --git a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
index e13fe4c93f3..cb55932fd7e 100644
--- a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
+++ b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -116,11 +116,11 @@ class EPollSelectorImpl extends SelectorImpl {
 
             do {
                 long startTime = timedPoll ? System.nanoTime() : 0;
-                long comp = Blocker.begin(blocking);
+                boolean attempted = Blocker.begin(blocking);
                 try {
                     numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, to);
                 } finally {
-                    Blocker.end(comp);
+                    Blocker.end(attempted);
                 }
                 if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
                     // timed poll interrupted so need to adjust timeout
diff --git a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
index 714be1cb5d9..6c84984f515 100644
--- a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
+++ b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -120,11 +120,11 @@ class KQueueSelectorImpl extends SelectorImpl {
 
             do {
                 long startTime = timedPoll ? System.nanoTime() : 0;
-                long comp = Blocker.begin(blocking);
+                boolean attempted = Blocker.begin(blocking);
                 try {
                     numEntries = KQueue.poll(kqfd, pollArrayAddress, MAX_KEVENTS, to);
                 } finally {
-                    Blocker.end(comp);
+                    Blocker.end(attempted);
                 }
                 if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
                     // timed poll interrupted so need to adjust timeout
diff --git a/src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java b/src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java
index 5a7de593c63..798fed3bd12 100644
--- a/src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java
+++ b/src/java.base/macosx/classes/sun/nio/fs/BsdNativeDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package sun.nio.fs;
 
-import jdk.internal.misc.Blocker;
-
 /**
  * Bsd specific system calls.
  */
@@ -69,13 +67,7 @@ class BsdNativeDispatcher extends UnixNativeDispatcher {
     {
         try (NativeBuffer srcBuffer = copyToNativeBuffer(src);
             NativeBuffer dstBuffer = copyToNativeBuffer(dst)) {
-            long comp = Blocker.begin();
-            try {
-                return clonefile0(srcBuffer.address(), dstBuffer.address(),
-                                  flags);
-            } finally {
-                Blocker.end(comp);
-            }
+            return clonefile0(srcBuffer.address(), dstBuffer.address(), flags);
         }
     }
     private static native int clonefile0(long srcAddress, long dstAddress,
@@ -90,13 +82,8 @@ class BsdNativeDispatcher extends UnixNativeDispatcher {
         throws UnixException
     {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                setattrlist0(buffer.address(), commonattr, modTime, accTime,
-                             createTime, options);
-            } finally {
-                Blocker.end(comp);
-            }
+            setattrlist0(buffer.address(), commonattr, modTime, accTime,
+                         createTime, options);
         }
     }
     private static native void setattrlist0(long pathAddress, int commonattr,
@@ -112,13 +99,7 @@ class BsdNativeDispatcher extends UnixNativeDispatcher {
                              long accTime, long createTime, long options)
         throws UnixException
     {
-        long comp = Blocker.begin();
-        try {
-            fsetattrlist0(fd, commonattr, modTime, accTime,
-                          createTime, options);
-        } finally {
-            Blocker.end(comp);
-        }
+        fsetattrlist0(fd, commonattr, modTime, accTime, createTime, options);
     }
     private static native void fsetattrlist0(int fd, int commonattr,
                                              long modTime, long accTime,
diff --git a/src/java.base/share/classes/java/io/FileDescriptor.java b/src/java.base/share/classes/java/io/FileDescriptor.java
index c7e638a1675..bdab57c0996 100644
--- a/src/java.base/share/classes/java/io/FileDescriptor.java
+++ b/src/java.base/share/classes/java/io/FileDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -207,11 +207,11 @@ public final class FileDescriptor {
      * @since     1.1
      */
     public void sync() throws SyncFailedException {
-        long comp = Blocker.begin();
+        boolean attempted = Blocker.begin();
         try {
             sync0();
         } finally {
-            Blocker.end(comp);
+            Blocker.end(attempted);
         }
     }
 
diff --git a/src/java.base/share/classes/java/io/FileInputStream.java b/src/java.base/share/classes/java/io/FileInputStream.java
index 1a41048b578..1ed2eb05d37 100644
--- a/src/java.base/share/classes/java/io/FileInputStream.java
+++ b/src/java.base/share/classes/java/io/FileInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@ package java.io;
 
 import java.nio.channels.FileChannel;
 import java.util.Arrays;
-import jdk.internal.misc.Blocker;
 import jdk.internal.util.ArraysSupport;
 import sun.nio.ch.FileChannelImpl;
 
@@ -210,12 +209,7 @@ public class FileInputStream extends InputStream
      * @param name the name of the file
      */
     private void open(String name) throws FileNotFoundException {
-        long comp = Blocker.begin();
-        try {
-            open0(name);
-        } finally {
-            Blocker.end(comp);
-        }
+        open0(name);
     }
 
     /**
@@ -228,12 +222,7 @@ public class FileInputStream extends InputStream
      */
     @Override
     public int read() throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return read0();
-        } finally {
-            Blocker.end(comp);
-        }
+        return read0();
     }
 
     private native int read0() throws IOException;
@@ -260,12 +249,7 @@ public class FileInputStream extends InputStream
      */
     @Override
     public int read(byte[] b) throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return readBytes(b, 0, b.length);
-        } finally {
-            Blocker.end(comp);
-        }
+        return readBytes(b, 0, b.length);
     }
 
     /**
@@ -284,12 +268,7 @@ public class FileInputStream extends InputStream
      */
     @Override
     public int read(byte[] b, int off, int len) throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return readBytes(b, off, len);
-        } finally {
-            Blocker.end(comp);
-        }
+        return readBytes(b, off, len);
     }
 
     @Override
@@ -396,22 +375,12 @@ public class FileInputStream extends InputStream
     }
 
     private long length() throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return length0();
-        } finally {
-            Blocker.end(comp);
-        }
+        return length0();
     }
     private native long length0() throws IOException;
 
     private long position() throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return position0();
-        } finally {
-            Blocker.end(comp);
-        }
+        return position0();
     }
     private native long position0() throws IOException;
 
@@ -441,12 +410,7 @@ public class FileInputStream extends InputStream
      */
     @Override
     public long skip(long n) throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return skip0(n);
-        } finally {
-            Blocker.end(comp);
-        }
+        return skip0(n);
     }
 
     private native long skip0(long n) throws IOException;
@@ -470,12 +434,7 @@ public class FileInputStream extends InputStream
      */
     @Override
     public int available() throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return available0();
-        } finally {
-            Blocker.end(comp);
-        }
+        return available0();
     }
 
     private native int available0() throws IOException;
@@ -566,8 +525,8 @@ public class FileInputStream extends InputStream
             synchronized (this) {
                 fc = this.channel;
                 if (fc == null) {
-                    this.channel = fc = FileChannelImpl.open(fd, path, true,
-                        false, false, this);
+                    fc = FileChannelImpl.open(fd, path, true, false, false, false, this);
+                    this.channel = fc;
                     if (closed) {
                         try {
                             // possible race with close(), benign since
diff --git a/src/java.base/share/classes/java/io/FileOutputStream.java b/src/java.base/share/classes/java/io/FileOutputStream.java
index c939ab543c4..2b017080a11 100644
--- a/src/java.base/share/classes/java/io/FileOutputStream.java
+++ b/src/java.base/share/classes/java/io/FileOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package java.io;
 import java.nio.channels.FileChannel;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.access.JavaIOFileDescriptorAccess;
-import jdk.internal.misc.Blocker;
 import sun.nio.ch.FileChannelImpl;
 
 
@@ -286,12 +285,7 @@ public class FileOutputStream extends OutputStream
      * @param append whether the file is to be opened in append mode
      */
     private void open(String name, boolean append) throws FileNotFoundException {
-        long comp = Blocker.begin();
-        try {
-            open0(name, append);
-        } finally {
-            Blocker.end(comp);
-        }
+        open0(name, append);
     }
 
     /**
@@ -313,12 +307,7 @@ public class FileOutputStream extends OutputStream
     @Override
     public void write(int b) throws IOException {
         boolean append = FD_ACCESS.getAppend(fd);
-        long comp = Blocker.begin();
-        try {
-            write(b, append);
-        } finally {
-            Blocker.end(comp);
-        }
+        write(b, append);
     }
 
     /**
@@ -343,12 +332,7 @@ public class FileOutputStream extends OutputStream
     @Override
     public void write(byte[] b) throws IOException {
         boolean append = FD_ACCESS.getAppend(fd);
-        long comp = Blocker.begin();
-        try {
-            writeBytes(b, 0, b.length, append);
-        } finally {
-            Blocker.end(comp);
-        }
+        writeBytes(b, 0, b.length, append);
     }
 
     /**
@@ -364,12 +348,7 @@ public class FileOutputStream extends OutputStream
     @Override
     public void write(byte[] b, int off, int len) throws IOException {
         boolean append = FD_ACCESS.getAppend(fd);
-        long comp = Blocker.begin();
-        try {
-            writeBytes(b, off, len, append);
-        } finally {
-            Blocker.end(comp);
-        }
+        writeBytes(b, off, len, append);
     }
 
     /**
@@ -460,8 +439,8 @@ public class FileOutputStream extends OutputStream
             synchronized (this) {
                 fc = this.channel;
                 if (fc == null) {
-                    this.channel = fc = FileChannelImpl.open(fd, path, false,
-                        true, false, this);
+                    fc = FileChannelImpl.open(fd, path, false, true, false, false, this);
+                    this.channel = fc;
                     if (closed) {
                         try {
                             // possible race with close(), benign since
diff --git a/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java
index 5a1c87eb1f7..ee7b90ea71a 100644
--- a/src/java.base/share/classes/java/io/RandomAccessFile.java
+++ b/src/java.base/share/classes/java/io/RandomAccessFile.java
@@ -71,6 +71,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
     private final FileDescriptor fd;
 
     private final boolean rw;
+    private final boolean sync;  // O_SYNC or O_DSYNC
 
     /**
      * The path of the referenced file
@@ -229,21 +230,25 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
         int imode = -1;
 
         boolean rw = false;
+        boolean sync = false;
         if (mode.equals("r"))
             imode = O_RDONLY;
         else if (mode.startsWith("rw")) {
             imode = O_RDWR;
             rw = true;
             if (mode.length() > 2) {
-                if (mode.equals("rws"))
+                if (mode.equals("rws")) {
                     imode |= O_SYNC;
-                else if (mode.equals("rwd"))
+                    sync = true;
+                } else if (mode.equals("rwd")) {
                     imode |= O_DSYNC;
-                else
+                    sync = true;
+                } else
                     imode = -1;
             }
         }
         this.rw = rw;
+        this.sync = sync;
 
         if (openAndDelete)
             imode |= O_TEMPORARY;
@@ -308,8 +313,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
             synchronized (this) {
                 fc = this.channel;
                 if (fc == null) {
-                    this.channel = fc = FileChannelImpl.open(fd, path, true,
-                        rw, false, this);
+                    fc = FileChannelImpl.open(fd, path, true, rw, sync, false, this);
+                    this.channel = fc;
                     if (closed) {
                         try {
                             fc.close();
@@ -350,12 +355,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
      *             defined above
      */
     private void open(String name, int mode) throws FileNotFoundException {
-        long comp = Blocker.begin();
-        try {
-            open0(name, mode);
-        } finally {
-            Blocker.end(comp);
-        }
+        open0(name, mode);
     }
 
     // 'Read' primitives
@@ -376,12 +376,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
      *                          end-of-file has been reached.
      */
     public int read() throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return read0();
-        } finally {
-            Blocker.end(comp);
-        }
+        return read0();
     }
 
     private native int read0() throws IOException;
@@ -394,12 +389,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
      * @throws    IOException If an I/O error has occurred.
      */
     private int readBytes(byte[] b, int off, int len) throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return readBytes0(b, off, len);
-        } finally {
-            Blocker.end(comp);
-        }
+        return readBytes0(b, off, len);
     }
 
     private native int readBytes0(byte[] b, int off, int len) throws IOException;
@@ -547,11 +537,11 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
      * @throws     IOException  if an I/O error occurs.
      */
     public void write(int b) throws IOException {
-        long comp = Blocker.begin();
+        boolean attempted = Blocker.begin(sync);
         try {
             write0(b);
         } finally {
-            Blocker.end(comp);
+            Blocker.end(attempted);
         }
     }
 
@@ -566,11 +556,11 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
      * @throws    IOException If an I/O error has occurred.
      */
     private void writeBytes(byte[] b, int off, int len) throws IOException {
-        long comp = Blocker.begin();
+        boolean attempted = Blocker.begin(sync);
         try {
             writeBytes0(b, off, len);
         } finally {
-            Blocker.end(comp);
+            Blocker.end(attempted);
         }
     }
 
@@ -630,12 +620,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
         if (pos < 0) {
             throw new IOException("Negative seek offset");
         }
-        long comp = Blocker.begin();
-        try {
-            seek0(pos);
-        } finally {
-            Blocker.end(comp);
-        }
+        seek0(pos);
     }
 
     private native void seek0(long pos) throws IOException;
@@ -647,12 +632,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
      * @throws     IOException  if an I/O error occurs.
      */
     public long length() throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return length0();
-        } finally {
-            Blocker.end(comp);
-        }
+        return length0();
     }
 
     private native long length0() throws IOException;
@@ -684,12 +664,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
      * @since      1.2
      */
     public void setLength(long newLength) throws IOException {
-        long comp = Blocker.begin();
-        try {
-            setLength0(newLength);
-        } finally {
-            Blocker.end(comp);
-        }
+        setLength0(newLength);
     }
 
     private native void setLength0(long newLength) throws IOException;
diff --git a/src/java.base/share/classes/java/lang/Object.java b/src/java.base/share/classes/java/lang/Object.java
index b7c8d99d009..b8bfdc3e3f9 100644
--- a/src/java.base/share/classes/java/lang/Object.java
+++ b/src/java.base/share/classes/java/lang/Object.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2024, 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
@@ -370,16 +370,21 @@ public class Object {
      * @see    #wait(long, int)
      */
     public final void wait(long timeoutMillis) throws InterruptedException {
-        long comp = Blocker.begin();
+        if (!Thread.currentThread().isVirtual()) {
+            wait0(timeoutMillis);
+            return;
+        }
+
+        // virtual thread waiting
+        boolean attempted = Blocker.begin();
         try {
             wait0(timeoutMillis);
         } catch (InterruptedException e) {
-            Thread thread = Thread.currentThread();
-            if (thread.isVirtual())
-                thread.getAndClearInterrupt();
+            // virtual thread's interrupt status needs to be cleared
+            Thread.currentThread().getAndClearInterrupt();
             throw e;
         } finally {
-            Blocker.end(comp);
+            Blocker.end(attempted);
         }
     }
 
diff --git a/src/java.base/share/classes/java/lang/Process.java b/src/java.base/share/classes/java/lang/Process.java
index 5b926e35729..f9762ffbcdb 100644
--- a/src/java.base/share/classes/java/lang/Process.java
+++ b/src/java.base/share/classes/java/lang/Process.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package java.lang;
 
+import jdk.internal.misc.Blocker;
 import jdk.internal.util.StaticProperty;
 
 import java.io.*;
@@ -839,6 +840,75 @@ public abstract class Process {
 
             return n - remaining;
         }
+
+        @Override
+        public int read() throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                return super.read();
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+
+        @Override
+        public int read(byte[] b) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                return super.read(b);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                return super.read(b, off, len);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+    }
+
+    /**
+     * An output stream for a subprocess pipe.
+     */
+    static class PipeOutputStream extends FileOutputStream {
+        PipeOutputStream(FileDescriptor fd) {
+            super(fd);
+        }
+
+        @Override
+        public void write(int b) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                super.write(b);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+
+        @Override
+        public void write(byte[] b) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                super.write(b);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                super.write(b, off, len);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 3c80e82b138..ae1c65b9f93 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -71,6 +71,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
 
 import jdk.internal.logger.LoggerFinderLoader.TemporaryLoggerFinder;
+import jdk.internal.misc.Blocker;
 import jdk.internal.misc.CarrierThreadLocal;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.util.StaticProperty;
@@ -2190,9 +2191,9 @@ public final class System {
 
         lineSeparator = props.getProperty("line.separator");
 
-        FileInputStream fdIn = new FileInputStream(FileDescriptor.in);
-        FileOutputStream fdOut = new FileOutputStream(FileDescriptor.out);
-        FileOutputStream fdErr = new FileOutputStream(FileDescriptor.err);
+        FileInputStream fdIn = new In(FileDescriptor.in);
+        FileOutputStream fdOut = new Out(FileDescriptor.out);
+        FileOutputStream fdErr = new Out(FileDescriptor.err);
         initialIn = new BufferedInputStream(fdIn);
         setIn0(initialIn);
         // stdout/err.encoding are set when the VM is associated with the terminal,
@@ -2217,6 +2218,83 @@ public final class System {
         VM.initLevel(1);
     }
 
+    /**
+     * System.in.
+     */
+    private static class In extends FileInputStream {
+        In(FileDescriptor fd) {
+            super(fd);
+        }
+
+        @Override
+        public int read() throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                return super.read();
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+
+        @Override
+        public int read(byte[] b) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                return super.read(b);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                return super.read(b, off, len);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+    }
+
+    /**
+     * System.out/System.err wrap this output stream.
+     */
+    private static class Out extends FileOutputStream {
+        Out(FileDescriptor fd) {
+            super(fd);
+        }
+
+        public void write(int b) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                super.write(b);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+
+        @Override
+        public void write(byte[] b) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                super.write(b);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) throws IOException {
+            boolean attempted = Blocker.begin();
+            try {
+                super.write(b, off, len);
+            } finally {
+                Blocker.end(attempted);
+            }
+        }
+    }
+
     // @see #initPhase2()
     static ModuleLayer bootLayer;
 
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index 76ff6501ecb..cf2fed3bf5d 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -460,6 +460,11 @@ final class VirtualThread extends BaseVirtualThread {
     private void afterYield() {
         assert carrierThread == null;
 
+        // re-adjust parallelism if the virtual thread yielded when compensating
+        if (currentThread() instanceof CarrierThread ct) {
+            ct.endBlocking();
+        }
+
         int s = state();
 
         // LockSupport.park/parkNanos
diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java
index 225061ff5d6..534553a99f3 100644
--- a/src/java.base/share/classes/java/net/InetAddress.java
+++ b/src/java.base/share/classes/java/net/InetAddress.java
@@ -1216,11 +1216,11 @@ public sealed class InetAddress implements Serializable permits Inet4Address, In
             Objects.requireNonNull(policy);
             validate(host);
             InetAddress[] addrs;
-            long comp = Blocker.begin();
+            boolean attempted = Blocker.begin();
             try {
                 addrs = impl.lookupAllHostAddr(host, policy);
             } finally {
-                Blocker.end(comp);
+                Blocker.end(attempted);
             }
             return Arrays.stream(addrs);
         }
@@ -1230,11 +1230,11 @@ public sealed class InetAddress implements Serializable permits Inet4Address, In
             if (addr.length != Inet4Address.INADDRSZ && addr.length != Inet6Address.INADDRSZ) {
                 throw new IllegalArgumentException("Invalid address length");
             }
-            long comp = Blocker.begin();
+            boolean attempted = Blocker.begin();
             try {
                 return impl.getHostByAddr(addr);
             } finally {
-                Blocker.end(comp);
+                Blocker.end(attempted);
             }
         }
     }
diff --git a/src/java.base/share/classes/java/nio/MappedMemoryUtils.java b/src/java.base/share/classes/java/nio/MappedMemoryUtils.java
index 5113d2730c2..cf6f953d8b2 100644
--- a/src/java.base/share/classes/java/nio/MappedMemoryUtils.java
+++ b/src/java.base/share/classes/java/nio/MappedMemoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -98,13 +98,13 @@ import jdk.internal.misc.Unsafe;
             long offset = mappingOffset(address, index);
             long mappingAddress = mappingAddress(address, offset, index);
             long mappingLength = mappingLength(offset, length);
-            long comp = Blocker.begin();
+            boolean attempted = Blocker.begin();
             try {
                 force0(fd, mappingAddress, mappingLength);
             } catch (IOException cause) {
                 throw new UncheckedIOException(cause);
             } finally {
-                Blocker.end(comp);
+                Blocker.end(attempted);
             }
         }
     }
diff --git a/src/java.base/share/classes/jdk/internal/misc/Blocker.java b/src/java.base/share/classes/jdk/internal/misc/Blocker.java
index e427d9520d5..d41ae73709f 100644
--- a/src/java.base/share/classes/jdk/internal/misc/Blocker.java
+++ b/src/java.base/share/classes/jdk/internal/misc/Blocker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,18 @@
 
 package jdk.internal.misc;
 
-import java.util.concurrent.ForkJoinPool;
 import jdk.internal.access.JavaLangAccess;
-import jdk.internal.access.JavaUtilConcurrentFJPAccess;
 import jdk.internal.access.SharedSecrets;
 
 /**
  * Defines static methods to mark the beginning and end of a possibly blocking
  * operation. The methods are intended to be used with try-finally as follows:
  * {@snippet lang=java :
- *     long comp = Blocker.begin();
+ *     boolean attempted = Blocker.begin();
  *     try {
  *         // blocking operation
  *     } finally {
- *         Blocker.end(comp);
+ *         Blocker.end(attempted);
  *     }
  * }
  * If invoked from a virtual thread and the underlying carrier thread is a
@@ -62,64 +60,35 @@ public class Blocker {
     }
 
     /**
-     * Marks the beginning of a possibly blocking operation.
-     * @return the return value from the attempt to compensate or -1 if not attempted
+     * Marks the beginning of a blocking operation.
+     * @return true if tryCompensate attempted
      */
-    public static long begin() {
+    public static boolean begin() {
         if (VM.isBooted()
-                && currentCarrierThread() instanceof CarrierThread ct && !ct.inBlocking()) {
-            ct.beginBlocking();
-            boolean completed = false;
-            try {
-                long comp = ForkJoinPools.beginCompensatedBlock(ct.getPool());
-                assert currentCarrierThread() == ct;
-                completed = true;
-                return comp;
-            } finally {
-                if (!completed) {
-                    ct.endBlocking();
-                }
-            }
+                && Thread.currentThread().isVirtual()
+                && currentCarrierThread() instanceof CarrierThread ct) {
+            return ct.beginBlocking();
         }
-        return -1;
+        return false;
     }
 
     /**
      * Marks the beginning of a possibly blocking operation.
      * @param blocking true if the operation may block, otherwise false
-     * @return the return value from the attempt to compensate, -1 if not attempted
-     * or blocking is false
+     * @return true if tryCompensate attempted
      */
-    public static long begin(boolean blocking) {
-        return (blocking) ? begin() : -1;
+    public static boolean begin(boolean blocking) {
+        return (blocking) ? begin() : false;
     }
 
     /**
      * Marks the end of an operation that may have blocked.
-     * @param compensateReturn the value returned by the begin method
+     * @param attempted if tryCompensate attempted
      */
-    public static void end(long compensateReturn) {
-        if (compensateReturn >= 0) {
-            assert currentCarrierThread() instanceof CarrierThread ct && ct.inBlocking();
+    public static void end(boolean attempted) {
+        if (attempted) {
             CarrierThread ct = (CarrierThread) currentCarrierThread();
-            ForkJoinPools.endCompensatedBlock(ct.getPool(), compensateReturn);
             ct.endBlocking();
         }
     }
-
-    /**
-     * Defines static methods to invoke non-public ForkJoinPool methods via the
-     * shared secret support.
-     */
-    private static class ForkJoinPools {
-        private static final JavaUtilConcurrentFJPAccess FJP_ACCESS =
-                SharedSecrets.getJavaUtilConcurrentFJPAccess();
-        static long beginCompensatedBlock(ForkJoinPool pool) {
-            return FJP_ACCESS.beginCompensatedBlock(pool);
-        }
-        static void endCompensatedBlock(ForkJoinPool pool, long post) {
-            FJP_ACCESS.endCompensatedBlock(pool, post);
-        }
-    }
-
 }
diff --git a/src/java.base/share/classes/jdk/internal/misc/CarrierThread.java b/src/java.base/share/classes/jdk/internal/misc/CarrierThread.java
index e4276d4904e..d20b402fe92 100644
--- a/src/java.base/share/classes/jdk/internal/misc/CarrierThread.java
+++ b/src/java.base/share/classes/jdk/internal/misc/CarrierThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,9 @@ import java.security.ProtectionDomain;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinWorkerThread;
 import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.JavaUtilConcurrentFJPAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.vm.Continuation;
 
 /**
  * A ForkJoinWorkerThread that can be used as a carrier thread.
@@ -49,7 +51,14 @@ public class CarrierThread extends ForkJoinWorkerThread {
     private static final long INHERITABLETHREADLOCALS;
     private static final long INHERITEDACCESSCONTROLCONTEXT;
 
-    private boolean blocking;    // true if in blocking op
+    // compensating state
+    private static final int NOT_COMPENSATING = 0;
+    private static final int COMPENSATE_IN_PROGRESS = 1;
+    private static final int COMPENSATING = 2;
+    private int compensating;
+
+    // FJP value to adjust release counts
+    private long compensateValue;
 
     @SuppressWarnings("this-escape")
     public CarrierThread(ForkJoinPool pool) {
@@ -60,27 +69,44 @@ public class CarrierThread extends ForkJoinWorkerThread {
     }
 
     /**
-     * For use by {@link Blocker} to test if the thread is in a blocking operation.
+     * Mark the start of a blocking operation.
      */
-    boolean inBlocking() {
-        //assert JLA.currentCarrierThread() == this;
-        return blocking;
+    public boolean beginBlocking() {
+        assert Thread.currentThread().isVirtual() && JLA.currentCarrierThread() == this;
+        assert compensating == NOT_COMPENSATING || compensating == COMPENSATING;
+
+        if (compensating == NOT_COMPENSATING) {
+            // don't preempt when attempting to compensate
+            Continuation.pin();
+            try {
+                compensating = COMPENSATE_IN_PROGRESS;
+
+                // Uses FJP.tryCompensate to start or re-activate a spare thread
+                compensateValue = ForkJoinPools.beginCompensatedBlock(getPool());
+                compensating = COMPENSATING;
+                return true;
+            } catch (Throwable e) {
+                // exception starting spare thread
+                compensating = NOT_COMPENSATING;
+                throw e;
+            } finally {
+                Continuation.unpin();
+            }
+        } else {
+            return false;
+        }
     }
 
     /**
-     * For use by {@link Blocker} to mark the start of a blocking operation.
+     * Mark the end of a blocking operation.
      */
-    void beginBlocking() {
-        //assert JLA.currentCarrierThread() == this && !blocking;
-        blocking = true;
-    }
-
-    /**
-     * For use by {@link Blocker} to mark the end of a blocking operation.
-     */
-    void endBlocking() {
-        //assert JLA.currentCarrierThread() == this && blocking;
-        blocking = false;
+    public void endBlocking() {
+        assert Thread.currentThread() == this || JLA.currentCarrierThread() == this;
+        if (compensating == COMPENSATING) {
+            ForkJoinPools.endCompensatedBlock(getPool(), compensateValue);
+            compensating = NOT_COMPENSATING;
+            compensateValue = 0;
+        }
     }
 
     @Override
@@ -95,7 +121,7 @@ public class CarrierThread extends ForkJoinWorkerThread {
      * The thread group for the carrier threads.
      */
     @SuppressWarnings("removal")
-    private static final ThreadGroup carrierThreadGroup() {
+    private static ThreadGroup carrierThreadGroup() {
         return AccessController.doPrivileged(new PrivilegedAction<ThreadGroup>() {
             public ThreadGroup run() {
                 ThreadGroup group = JLA.currentCarrierThread().getThreadGroup();
@@ -117,6 +143,21 @@ public class CarrierThread extends ForkJoinWorkerThread {
         });
     }
 
+    /**
+     * Defines static methods to invoke non-public ForkJoinPool methods via the
+     * shared secret support.
+     */
+    private static class ForkJoinPools {
+        private static final JavaUtilConcurrentFJPAccess FJP_ACCESS =
+                SharedSecrets.getJavaUtilConcurrentFJPAccess();
+        static long beginCompensatedBlock(ForkJoinPool pool) {
+            return FJP_ACCESS.beginCompensatedBlock(pool);
+        }
+        static void endCompensatedBlock(ForkJoinPool pool, long post) {
+            FJP_ACCESS.endCompensatedBlock(pool, post);
+        }
+    }
+
     static {
         CONTEXTCLASSLOADER = U.objectFieldOffset(Thread.class,
                 "contextClassLoader");
diff --git a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
index 636230d8f38..ab386bb14a5 100644
--- a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
@@ -78,6 +78,7 @@ public class FileChannelImpl
     // File access mode (immutable)
     private final boolean writable;
     private final boolean readable;
+    private final boolean sync;  // O_SYNC or O_DSYNC
 
     // Required to prevent finalization of creating stream (immutable)
     private final Closeable parent;
@@ -122,12 +123,14 @@ public class FileChannelImpl
     }
 
     private FileChannelImpl(FileDescriptor fd, String path, boolean readable,
-                            boolean writable, boolean direct, Closeable parent)
+                            boolean writable, boolean sync, boolean direct,
+                            Closeable parent)
     {
         this.fd = fd;
         this.path = path;
         this.readable = readable;
         this.writable = writable;
+        this.sync = sync;
         this.direct = direct;
         this.parent = parent;
         if (direct) {
@@ -150,9 +153,9 @@ public class FileChannelImpl
     // and RandomAccessFile::getChannel
     public static FileChannel open(FileDescriptor fd, String path,
                                    boolean readable, boolean writable,
-                                   boolean direct, Closeable parent)
+                                   boolean sync, boolean direct, Closeable parent)
     {
-        return new FileChannelImpl(fd, path, readable, writable, direct, parent);
+        return new FileChannelImpl(fd, path, readable, writable, sync, direct, parent);
     }
 
     private void ensureOpen() throws IOException {
@@ -230,11 +233,11 @@ public class FileChannelImpl
                 if (!isOpen())
                     return 0;
                 do {
-                    long comp = Blocker.begin();
+                    boolean attempted = Blocker.begin(direct);
                     try {
                         n = IOUtil.read(fd, dst, -1, direct, alignment, nd);
                     } finally {
-                        Blocker.end(comp);
+                        Blocker.end(attempted);
                     }
                 } while ((n == IOStatus.INTERRUPTED) && isOpen());
                 return IOStatus.normalize(n);
@@ -265,11 +268,11 @@ public class FileChannelImpl
                 if (!isOpen())
                     return 0;
                 do {
-                    long comp = Blocker.begin();
+                    boolean attempted = Blocker.begin(direct);
                     try {
                         n = IOUtil.read(fd, dsts, offset, length, direct, alignment, nd);
                     } finally {
-                        Blocker.end(comp);
+                        Blocker.end(attempted);
                     }
 
                 } while ((n == IOStatus.INTERRUPTED) && isOpen());
@@ -298,11 +301,11 @@ public class FileChannelImpl
                 if (!isOpen())
                     return 0;
                 do {
-                    long comp = Blocker.begin();
+                    boolean attempted = Blocker.begin(sync || direct);
                     try {
                         n = IOUtil.write(fd, src, -1, direct, alignment, nd);
                     } finally {
-                        Blocker.end(comp);
+                        Blocker.end(attempted);
                     }
 
                 } while ((n == IOStatus.INTERRUPTED) && isOpen());
@@ -334,11 +337,11 @@ public class FileChannelImpl
                 if (!isOpen())
                     return 0;
                 do {
-                    long comp = Blocker.begin();
+                    boolean attempted = Blocker.begin(sync || direct);
                     try {
                         n = IOUtil.write(fd, srcs, offset, length, direct, alignment, nd);
                     } finally {
-                        Blocker.end(comp);
+                        Blocker.end(attempted);
                     }
                 } while ((n == IOStatus.INTERRUPTED) && isOpen());
                 return IOStatus.normalize(n);
@@ -365,13 +368,8 @@ public class FileChannelImpl
                     return 0;
                 boolean append = fdAccess.getAppend(fd);
                 do {
-                    long comp = Blocker.begin();
-                    try {
-                        // in append-mode then position is advanced to end before writing
-                        p = (append) ? nd.size(fd) : nd.seek(fd, -1);
-                    } finally {
-                        Blocker.end(comp);
-                    }
+                    // in append-mode then position is advanced to end before writing
+                    p = (append) ? nd.size(fd) : nd.seek(fd, -1);
                 } while ((p == IOStatus.INTERRUPTED) && isOpen());
                 return IOStatus.normalize(p);
             } finally {
@@ -396,12 +394,7 @@ public class FileChannelImpl
                 if (!isOpen())
                     return null;
                 do {
-                    long comp = Blocker.begin();
-                    try {
-                        p = nd.seek(fd, newPosition);
-                    } finally {
-                        Blocker.end(comp);
-                    }
+                    p = nd.seek(fd, newPosition);
                 } while ((p == IOStatus.INTERRUPTED) && isOpen());
                 return this;
             } finally {
@@ -424,12 +417,7 @@ public class FileChannelImpl
                 if (!isOpen())
                     return -1;
                 do {
-                    long comp = Blocker.begin();
-                    try {
-                        s = nd.size(fd);
-                    } finally {
-                        Blocker.end(comp);
-                    }
+                    s = nd.size(fd);
                 } while ((s == IOStatus.INTERRUPTED) && isOpen());
                 return IOStatus.normalize(s);
             } finally {
@@ -461,24 +449,14 @@ public class FileChannelImpl
                 // get current size
                 long size;
                 do {
-                    long comp = Blocker.begin();
-                    try {
-                        size = nd.size(fd);
-                    } finally {
-                        Blocker.end(comp);
-                    }
+                    size = nd.size(fd);
                 } while ((size == IOStatus.INTERRUPTED) && isOpen());
                 if (!isOpen())
                     return null;
 
                 // get current position
                 do {
-                    long comp = Blocker.begin();
-                    try {
-                        p = nd.seek(fd, -1);
-                    } finally {
-                        Blocker.end(comp);
-                    }
+                    p = nd.seek(fd, -1);
                 } while ((p == IOStatus.INTERRUPTED) && isOpen());
                 if (!isOpen())
                     return null;
@@ -487,12 +465,7 @@ public class FileChannelImpl
                 // truncate file if given size is less than the current size
                 if (newSize < size) {
                     do {
-                        long comp = Blocker.begin();
-                        try {
-                            rv = nd.truncate(fd, newSize);
-                        } finally {
-                            Blocker.end(comp);
-                        }
+                        rv = nd.truncate(fd, newSize);
                     } while ((rv == IOStatus.INTERRUPTED) && isOpen());
                     if (!isOpen())
                         return null;
@@ -502,12 +475,7 @@ public class FileChannelImpl
                 if (p > newSize)
                     p = newSize;
                 do {
-                    long comp = Blocker.begin();
-                    try {
-                        rp = nd.seek(fd, p);
-                    } finally {
-                        Blocker.end(comp);
-                    }
+                    rp = nd.seek(fd, p);
                 } while ((rp == IOStatus.INTERRUPTED) && isOpen());
                 return this;
             } finally {
@@ -529,11 +497,11 @@ public class FileChannelImpl
             if (!isOpen())
                 return;
             do {
-                long comp = Blocker.begin();
+                boolean attempted = Blocker.begin();
                 try {
                     rv = nd.force(fd, metaData);
                 } finally {
-                    Blocker.end(comp);
+                    Blocker.end(attempted);
                 }
             } while ((rv == IOStatus.INTERRUPTED) && isOpen());
         } finally {
@@ -624,12 +592,7 @@ public class FileChannelImpl
         long n;
         boolean append = fdAccess.getAppend(targetFD);
         do {
-            long comp = Blocker.begin();
-            try {
-                n = nd.transferTo(fd, position, count, targetFD, append);
-            } finally {
-                Blocker.end(comp);
-            }
+            n = nd.transferTo(fd, position, count, targetFD, append);
         } while ((n == IOStatus.INTERRUPTED) && isOpen());
         return n;
     }
@@ -895,12 +858,7 @@ public class FileChannelImpl
         long n;
         boolean append = fdAccess.getAppend(fd);
         do {
-            long comp = Blocker.begin();
-            try {
-                n = nd.transferFrom(srcFD, fd, position, count, append);
-            } finally {
-                Blocker.end(comp);
-            }
+            n = nd.transferFrom(srcFD, fd, position, count, append);
         } while ((n == IOStatus.INTERRUPTED) && isOpen());
         return n;
     }
@@ -1088,11 +1046,11 @@ public class FileChannelImpl
             if (!isOpen())
                 return -1;
             do {
-                long comp = Blocker.begin();
+                boolean attempted = Blocker.begin(direct);
                 try {
                     n = IOUtil.read(fd, dst, position, direct, alignment, nd);
                 } finally {
-                    Blocker.end(comp);
+                    Blocker.end(attempted);
                 }
             } while ((n == IOStatus.INTERRUPTED) && isOpen());
             return IOStatus.normalize(n);
@@ -1133,11 +1091,11 @@ public class FileChannelImpl
             if (!isOpen())
                 return -1;
             do {
-                long comp = Blocker.begin();
+                boolean attempted = Blocker.begin(sync || direct);
                 try {
                     n = IOUtil.write(fd, src, position, direct, alignment, nd);
                 } finally {
-                    Blocker.end(comp);
+                    Blocker.end(attempted);
                 }
             } while ((n == IOStatus.INTERRUPTED) && isOpen());
             return IOStatus.normalize(n);
@@ -1362,12 +1320,7 @@ public class FileChannelImpl
             synchronized (positionLock) {
                 long filesize;
                 do {
-                    long comp = Blocker.begin();
-                    try {
-                        filesize = nd.size(fd);
-                    } finally {
-                        Blocker.end(comp);
-                    }
+                    filesize = nd.size(fd);
                 } while ((filesize == IOStatus.INTERRUPTED) && isOpen());
                 if (!isOpen())
                     return null;
@@ -1379,12 +1332,7 @@ public class FileChannelImpl
                     }
                     int rv;
                     do {
-                        long comp = Blocker.begin();
-                        try {
-                            rv = nd.truncate(fd, position + size);
-                        } finally {
-                            Blocker.end(comp);
-                        }
+                        rv = nd.truncate(fd, position + size);
                     } while ((rv == IOStatus.INTERRUPTED) && isOpen());
                     if (!isOpen())
                         return null;
@@ -1575,11 +1523,11 @@ public class FileChannelImpl
                 return null;
             int n;
             do {
-                long comp = Blocker.begin();
+                boolean attempted = Blocker.begin();
                 try {
                     n = nd.lock(fd, true, position, size, shared);
                 } finally {
-                    Blocker.end(comp);
+                    Blocker.end(attempted);
                 }
             } while ((n == FileDispatcher.INTERRUPTED) && isOpen());
             if (isOpen()) {
diff --git a/src/java.base/unix/classes/java/io/UnixFileSystem.java b/src/java.base/unix/classes/java/io/UnixFileSystem.java
index 682e9a69b56..18afb729c01 100644
--- a/src/java.base/unix/classes/java/io/UnixFileSystem.java
+++ b/src/java.base/unix/classes/java/io/UnixFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package java.io;
 
 import java.util.Properties;
-import jdk.internal.misc.Blocker;
 import jdk.internal.util.StaticProperty;
 import sun.security.action.GetPropertyAction;
 
@@ -161,12 +160,7 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public String canonicalize(String path) throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return canonicalize0(path);
-        } finally {
-            Blocker.end(comp);
-        }
+        return canonicalize0(path);
     }
     private native String canonicalize0(String path) throws IOException;
 
@@ -176,25 +170,13 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public int getBooleanAttributes(File f) {
-        int rv;
-        long comp = Blocker.begin();
-        try {
-            rv = getBooleanAttributes0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        int rv = getBooleanAttributes0(f);
         return rv | isHidden(f);
     }
 
     @Override
     public boolean hasBooleanAttributes(File f, int attributes) {
-        int rv;
-        long comp = Blocker.begin();
-        try {
-            rv = getBooleanAttributes0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        int rv = getBooleanAttributes0(f);
         if ((attributes & BA_HIDDEN) != 0) {
             rv |= isHidden(f);
         }
@@ -207,45 +189,25 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public boolean checkAccess(File f, int access) {
-        long comp = Blocker.begin();
-        try {
-            return checkAccess0(f, access);
-        } finally {
-            Blocker.end(comp);
-        }
+        return checkAccess0(f, access);
     }
     private native boolean checkAccess0(File f, int access);
 
     @Override
     public long getLastModifiedTime(File f) {
-        long comp = Blocker.begin();
-        try {
-            return getLastModifiedTime0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return getLastModifiedTime0(f);
     }
     private native long getLastModifiedTime0(File f);
 
     @Override
     public long getLength(File f) {
-        long comp = Blocker.begin();
-        try {
-            return getLength0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return getLength0(f);
     }
     private native long getLength0(File f);
 
     @Override
     public boolean setPermission(File f, int access, boolean enable, boolean owneronly) {
-        long comp = Blocker.begin();
-        try {
-            return setPermission0(f, access, enable, owneronly);
-        } finally {
-            Blocker.end(comp);
-        }
+        return setPermission0(f, access, enable, owneronly);
     }
     private native boolean setPermission0(File f, int access, boolean enable, boolean owneronly);
 
@@ -253,78 +215,43 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public boolean createFileExclusively(String path) throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return createFileExclusively0(path);
-        } finally {
-            Blocker.end(comp);
-        }
+        return createFileExclusively0(path);
     }
     private native boolean createFileExclusively0(String path) throws IOException;
 
     @Override
     public boolean delete(File f) {
-        long comp = Blocker.begin();
-        try {
-            return delete0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return delete0(f);
     }
     private native boolean delete0(File f);
 
     @Override
     public String[] list(File f) {
-        long comp = Blocker.begin();
-        try {
-            return list0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return list0(f);
     }
     private native String[] list0(File f);
 
     @Override
     public boolean createDirectory(File f) {
-        long comp = Blocker.begin();
-        try {
-            return createDirectory0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return createDirectory0(f);
     }
     private native boolean createDirectory0(File f);
 
     @Override
     public boolean rename(File f1, File f2) {
-        long comp = Blocker.begin();
-        try {
-            return rename0(f1, f2);
-        } finally {
-            Blocker.end(comp);
-        }
+        return rename0(f1, f2);
     }
     private native boolean rename0(File f1, File f2);
 
     @Override
     public boolean setLastModifiedTime(File f, long time) {
-        long comp = Blocker.begin();
-        try {
-            return setLastModifiedTime0(f, time);
-        } finally {
-            Blocker.end(comp);
-        }
+        return setLastModifiedTime0(f, time);
     }
     private native boolean setLastModifiedTime0(File f, long time);
 
     @Override
     public boolean setReadOnly(File f) {
-        long comp = Blocker.begin();
-        try {
-            return setReadOnly0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return setReadOnly0(f);
     }
     private native boolean setReadOnly0(File f);
 
@@ -348,12 +275,7 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public long getSpace(File f, int t) {
-        long comp = Blocker.begin();
-        try {
-            return getSpace0(f, t);
-        } finally {
-            Blocker.end(comp);
-        }
+        return getSpace0(f, t);
     }
     private native long getSpace0(File f, int t);
 
diff --git a/src/java.base/unix/classes/java/lang/ProcessImpl.java b/src/java.base/unix/classes/java/lang/ProcessImpl.java
index 3b302b23cd3..da4874b0181 100644
--- a/src/java.base/unix/classes/java/lang/ProcessImpl.java
+++ b/src/java.base/unix/classes/java/lang/ProcessImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -626,7 +626,7 @@ final class ProcessImpl extends Process {
      */
     private static class ProcessPipeOutputStream extends BufferedOutputStream {
         ProcessPipeOutputStream(int fd) {
-            super(new FileOutputStream(newFileDescriptor(fd)));
+            super(new PipeOutputStream(newFileDescriptor(fd)));
         }
 
         /** Called by the process reaper thread when the process exits. */
diff --git a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
index 513c871e0e4..a3bff8d1e65 100644
--- a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -111,11 +111,11 @@ class PollSelectorImpl extends SelectorImpl {
             int numPolled;
             do {
                 long startTime = timedPoll ? System.nanoTime() : 0;
-                long comp = Blocker.begin();
+                boolean attempted = Blocker.begin(blocking);
                 try {
                     numPolled = poll(pollArray.address(), pollArraySize, to);
                 } finally {
-                    Blocker.end(comp);
+                    Blocker.end(attempted);
                 }
                 if (numPolled == IOStatus.INTERRUPTED && timedPoll) {
                     // timed poll interrupted so need to adjust timeout
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java b/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
index eed7bc4c575..475b61036a2 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
@@ -131,8 +131,8 @@ class UnixChannelFactory {
             throw new IllegalArgumentException("APPEND + TRUNCATE_EXISTING not allowed");
 
         FileDescriptor fdObj = open(dfd, path, pathForPermissionCheck, flags, mode);
-        return FileChannelImpl.open(fdObj, path.toString(), flags.read,
-                flags.write, flags.direct, null);
+        return FileChannelImpl.open(fdObj, path.toString(), flags.read, flags.write,
+                (flags.sync || flags.dsync), flags.direct, null);
     }
 
     /**
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
index a9e10a94be3..2b9ab775ed8 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
@@ -52,7 +52,6 @@ import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
-import jdk.internal.misc.Blocker;
 import sun.nio.ch.DirectBuffer;
 import sun.nio.ch.IOStatus;
 import sun.security.action.GetPropertyAction;
@@ -682,7 +681,6 @@ abstract class UnixFileSystem
                 // Some forms of direct copy do not work on zero size files
                 if (!directCopyNotSupported && attrs.size() > 0) {
                     // copy bytes to target using platform function
-                    long comp = Blocker.begin();
                     try {
                         int res = directCopy(fo, fi, addressToPollForCancel);
                         if (res == 0) {
@@ -692,8 +690,6 @@ abstract class UnixFileSystem
                         }
                     } catch (UnixException x) {
                         x.rethrowAsIOException(source, target);
-                    } finally {
-                        Blocker.end(comp);
                     }
                 }
 
@@ -703,14 +699,11 @@ abstract class UnixFileSystem
                     ByteBuffer buf =
                         sun.nio.ch.Util.getTemporaryDirectBuffer(bufferSize);
                     try {
-                        long comp = Blocker.begin();
                         try {
                             bufferedCopy(fo, fi, ((DirectBuffer)buf).address(),
                                           bufferSize, addressToPollForCancel);
                         } catch (UnixException x) {
                             x.rethrowAsIOException(source, target);
-                        } finally {
-                            Blocker.end(comp);
                         }
                     } finally {
                         sun.nio.ch.Util.releaseTemporaryDirectBuffer(buf);
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
index 2404f883c9c..a069a9a04ba 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package sun.nio.fs;
 
 import java.util.function.Function;
-import jdk.internal.misc.Blocker;
 
 /**
  * Unix system and library calls.
@@ -67,12 +66,7 @@ class UnixNativeDispatcher {
      */
     static int open(UnixPath path, int flags, int mode) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return open0(buffer.address(), flags, mode);
-            } finally {
-                Blocker.end(comp);
-            }
+            return open0(buffer.address(), flags, mode);
         }
     }
     private static native int open0(long pathAddress, int flags, int mode)
@@ -83,12 +77,7 @@ class UnixNativeDispatcher {
      */
     static int openat(int dfd, byte[] path, int flags, int mode) throws UnixException {
         try (NativeBuffer buffer = NativeBuffers.asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return openat0(dfd, buffer.address(), flags, mode);
-            } finally {
-                Blocker.end(comp);
-            }
+            return openat0(dfd, buffer.address(), flags, mode);
         }
     }
     private static native int openat0(int dfd, long pathAddress, int flags, int mode)
@@ -138,12 +127,7 @@ class UnixNativeDispatcher {
     static void link(UnixPath existing, UnixPath newfile) throws UnixException {
         try (NativeBuffer existingBuffer = copyToNativeBuffer(existing);
              NativeBuffer newBuffer = copyToNativeBuffer(newfile)) {
-            long comp = Blocker.begin();
-            try {
-                link0(existingBuffer.address(), newBuffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            link0(existingBuffer.address(), newBuffer.address());
         }
     }
     private static native void link0(long existingAddress, long newAddress)
@@ -154,12 +138,7 @@ class UnixNativeDispatcher {
      */
     static void unlink(UnixPath path) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                unlink0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            unlink0(buffer.address());
         }
     }
     private static native void unlink0(long pathAddress) throws UnixException;
@@ -169,12 +148,7 @@ class UnixNativeDispatcher {
      */
     static void unlinkat(int dfd, byte[] path, int flag) throws UnixException {
         try (NativeBuffer buffer = NativeBuffers.asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                unlinkat0(dfd, buffer.address(), flag);
-            } finally {
-                Blocker.end(comp);
-            }
+            unlinkat0(dfd, buffer.address(), flag);
         }
     }
     private static native void unlinkat0(int dfd, long pathAddress, int flag)
@@ -185,12 +159,7 @@ class UnixNativeDispatcher {
      */
     static void mknod(UnixPath path, int mode, long dev) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                mknod0(buffer.address(), mode, dev);
-            } finally {
-                Blocker.end(comp);
-            }
+            mknod0(buffer.address(), mode, dev);
         }
     }
     private static native void mknod0(long pathAddress, int mode, long dev)
@@ -202,12 +171,7 @@ class UnixNativeDispatcher {
     static void rename(UnixPath from, UnixPath to) throws UnixException {
         try (NativeBuffer fromBuffer = copyToNativeBuffer(from);
              NativeBuffer toBuffer = copyToNativeBuffer(to)) {
-            long comp = Blocker.begin();
-            try {
-                rename0(fromBuffer.address(), toBuffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            rename0(fromBuffer.address(), toBuffer.address());
         }
     }
     private static native void rename0(long fromAddress, long toAddress)
@@ -219,12 +183,7 @@ class UnixNativeDispatcher {
     static void renameat(int fromfd, byte[] from, int tofd, byte[] to) throws UnixException {
         try (NativeBuffer fromBuffer = NativeBuffers.asNativeBuffer(from);
              NativeBuffer toBuffer = NativeBuffers.asNativeBuffer(to)) {
-            long comp = Blocker.begin();
-            try {
-                renameat0(fromfd, fromBuffer.address(), tofd, toBuffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            renameat0(fromfd, fromBuffer.address(), tofd, toBuffer.address());
         }
     }
     private static native void renameat0(int fromfd, long fromAddress, int tofd, long toAddress)
@@ -235,12 +194,7 @@ class UnixNativeDispatcher {
      */
     static void mkdir(UnixPath path, int mode) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                mkdir0(buffer.address(), mode);
-            } finally {
-                Blocker.end(comp);
-            }
+            mkdir0(buffer.address(), mode);
         }
     }
     private static native void mkdir0(long pathAddress, int mode) throws UnixException;
@@ -250,12 +204,7 @@ class UnixNativeDispatcher {
      */
     static void rmdir(UnixPath path) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                rmdir0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            rmdir0(buffer.address());
         }
     }
     private static native void rmdir0(long pathAddress) throws UnixException;
@@ -267,12 +216,7 @@ class UnixNativeDispatcher {
      */
     static byte[] readlink(UnixPath path) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return readlink0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            return readlink0(buffer.address());
         }
     }
     private static native byte[] readlink0(long pathAddress) throws UnixException;
@@ -284,12 +228,7 @@ class UnixNativeDispatcher {
      */
     static byte[] realpath(UnixPath path) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return realpath0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            return realpath0(buffer.address());
         }
     }
     private static native byte[] realpath0(long pathAddress) throws UnixException;
@@ -300,12 +239,7 @@ class UnixNativeDispatcher {
     static void symlink(byte[] name1, UnixPath name2) throws UnixException {
         try (NativeBuffer targetBuffer = NativeBuffers.asNativeBuffer(name1);
              NativeBuffer linkBuffer = copyToNativeBuffer(name2)) {
-            long comp = Blocker.begin();
-            try {
-                symlink0(targetBuffer.address(), linkBuffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            symlink0(targetBuffer.address(), linkBuffer.address());
         }
     }
     private static native void symlink0(long name1, long name2)
@@ -316,26 +250,16 @@ class UnixNativeDispatcher {
      */
     static void stat(UnixPath path, UnixFileAttributes attrs) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                int errno = stat0(buffer.address(), attrs);
-                if (errno != 0) {
-                    throw new UnixException(errno);
-                }
-            } finally {
-                Blocker.end(comp);
+            int errno = stat0(buffer.address(), attrs);
+            if (errno != 0) {
+                throw new UnixException(errno);
             }
         }
     }
 
     static int stat2(UnixPath path, UnixFileAttributes attrs) {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return stat0(buffer.address(), attrs);
-            } finally {
-                Blocker.end(comp);
-            }
+            return stat0(buffer.address(), attrs);
         }
     }
 
@@ -346,12 +270,7 @@ class UnixNativeDispatcher {
      */
     static void lstat(UnixPath path, UnixFileAttributes attrs) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                lstat0(buffer.address(), attrs);
-            } finally {
-                Blocker.end(comp);
-            }
+            lstat0(buffer.address(), attrs);
         }
     }
     private static native void lstat0(long pathAddress, UnixFileAttributes attrs)
@@ -361,12 +280,7 @@ class UnixNativeDispatcher {
      * fstat(int filedes, struct stat* buf)
      */
     static void fstat(int fd, UnixFileAttributes attrs) throws UnixException {
-        long comp = Blocker.begin();
-        try {
-            fstat0(fd, attrs);
-        } finally {
-            Blocker.end(comp);
-        }
+        fstat0(fd, attrs);
     }
     private static native void fstat0(int fd, UnixFileAttributes attrs)
         throws UnixException;
@@ -378,12 +292,7 @@ class UnixNativeDispatcher {
         throws UnixException
     {
         try (NativeBuffer buffer = NativeBuffers.asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                fstatat0(dfd, buffer.address(), flag, attrs);
-            } finally {
-                Blocker.end(comp);
-            }
+            fstatat0(dfd, buffer.address(), flag, attrs);
         }
     }
     private static native void fstatat0(int dfd, long pathAddress, int flag,
@@ -394,12 +303,7 @@ class UnixNativeDispatcher {
      */
     static void chown(UnixPath path, int uid, int gid) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                chown0(buffer.address(), uid, gid);
-            } finally {
-                Blocker.end(comp);
-            }
+            chown0(buffer.address(), uid, gid);
         }
     }
     private static native void chown0(long pathAddress, int uid, int gid)
@@ -410,12 +314,7 @@ class UnixNativeDispatcher {
      */
     static void lchown(UnixPath path, int uid, int gid) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                lchown0(buffer.address(), uid, gid);
-            } finally {
-                Blocker.end(comp);
-            }
+            lchown0(buffer.address(), uid, gid);
         }
     }
     private static native void lchown0(long pathAddress, int uid, int gid)
@@ -425,12 +324,7 @@ class UnixNativeDispatcher {
      * fchown(int filedes, uid_t owner, gid_t group)
      */
     static void fchown(int fd, int uid, int gid) throws UnixException {
-        long comp = Blocker.begin();
-        try {
-            fchown0(fd, uid, gid);
-        } finally {
-            Blocker.end(comp);
-        }
+        fchown0(fd, uid, gid);
     }
     static native void fchown0(int fd, int uid, int gid) throws UnixException;
 
@@ -439,12 +333,7 @@ class UnixNativeDispatcher {
      */
     static void chmod(UnixPath path, int mode) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                chmod0(buffer.address(), mode);
-            } finally {
-                Blocker.end(comp);
-            }
+            chmod0(buffer.address(), mode);
         }
     }
     private static native void chmod0(long pathAddress, int mode)
@@ -454,12 +343,7 @@ class UnixNativeDispatcher {
      * fchmod(int fildes, mode_t mode)
      */
     static void fchmod(int fd, int mode) throws UnixException {
-        long comp = Blocker.begin();
-        try {
-            fchmod0(fd, mode);
-        } finally {
-            Blocker.end(comp);
-        }
+        fchmod0(fd, mode);
     }
     private static native void fchmod0(int fd, int mode) throws UnixException;
 
@@ -470,12 +354,7 @@ class UnixNativeDispatcher {
         throws UnixException
     {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                utimes0(buffer.address(), times0, times1);
-            } finally {
-                Blocker.end(comp);
-            }
+            utimes0(buffer.address(), times0, times1);
         }
     }
     private static native void utimes0(long pathAddress, long times0, long times1)
@@ -485,12 +364,7 @@ class UnixNativeDispatcher {
      * futimes(int fildes, const struct timeval times[2])
      */
     static void futimes(int fd, long times0, long times1) throws UnixException {
-        long comp = Blocker.begin();
-        try {
-            futimes0(fd, times0, times1);
-        } finally {
-            Blocker.end(comp);
-        }
+        futimes0(fd, times0, times1);
     }
     private static native void futimes0(int fd, long times0, long times1)
         throws UnixException;
@@ -499,12 +373,7 @@ class UnixNativeDispatcher {
      * futimens(int fildes, const struct timespec times[2])
      */
     static void futimens(int fd, long times0, long times1) throws UnixException {
-        long comp = Blocker.begin();
-        try {
-            futimens0(fd, times0, times1);
-        } finally {
-            Blocker.end(comp);
-        }
+        futimens0(fd, times0, times1);
     }
     private static native void futimens0(int fd, long times0, long times1)
         throws UnixException;
@@ -516,12 +385,7 @@ class UnixNativeDispatcher {
         throws UnixException
     {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                lutimes0(buffer.address(), times0, times1);
-            } finally {
-                Blocker.end(comp);
-            }
+            lutimes0(buffer.address(), times0, times1);
         }
     }
     private static native void lutimes0(long pathAddress, long times0, long times1)
@@ -532,12 +396,7 @@ class UnixNativeDispatcher {
      */
     static long opendir(UnixPath path) throws UnixException {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return opendir0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            return opendir0(buffer.address());
         }
     }
     private static native long opendir0(long pathAddress) throws UnixException;
@@ -559,12 +418,7 @@ class UnixNativeDispatcher {
      * @return  dirent->d_name
      */
     static byte[] readdir(long dir) throws UnixException {
-        long comp = Blocker.begin();
-        try {
-            return readdir0(dir);
-        } finally {
-            Blocker.end(comp);
-        }
+        return readdir0(dir);
     }
     static native byte[] readdir0(long dir) throws UnixException;
 
@@ -572,12 +426,7 @@ class UnixNativeDispatcher {
      * size_t read(int fildes, void* buf, size_t nbyte)
      */
     static int read(int fildes, long buf, int nbyte) throws UnixException {
-        long comp = Blocker.begin();
-        try {
-            return read0(fildes, buf, nbyte);
-        } finally {
-            Blocker.end(comp);
-        }
+        return read0(fildes, buf, nbyte);
     }
     private static native int read0(int fildes, long buf, int nbyte) throws UnixException;
 
@@ -585,12 +434,7 @@ class UnixNativeDispatcher {
      * size_t writeint fildes, void* buf, size_t nbyte)
      */
     static int write(int fildes, long buf, int nbyte) throws UnixException {
-        long comp = Blocker.begin();
-        try {
-            return write0(fildes, buf, nbyte);
-        } finally {
-            Blocker.end(comp);
-        }
+        return write0(fildes, buf, nbyte);
     }
     private static native int write0(int fildes, long buf, int nbyte) throws UnixException;
 
@@ -599,12 +443,7 @@ class UnixNativeDispatcher {
      */
     static int access(UnixPath path, int amode) {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return access0(buffer.address(), amode);
-            } finally {
-                Blocker.end(comp);
-            }
+            return access0(buffer.address(), amode);
         }
     }
     private static native int access0(long pathAddress, int amode);
@@ -630,12 +469,7 @@ class UnixNativeDispatcher {
      */
     static int getpwnam(String name) throws UnixException {
         try (NativeBuffer buffer = NativeBuffers.asNativeBuffer(Util.toBytes(name))) {
-            long comp = Blocker.begin();
-            try {
-                return getpwnam0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            return getpwnam0(buffer.address());
         }
     }
     private static native int getpwnam0(long nameAddress) throws UnixException;
@@ -647,12 +481,7 @@ class UnixNativeDispatcher {
      */
     static int getgrnam(String name) throws UnixException {
         try (NativeBuffer buffer = NativeBuffers.asNativeBuffer(Util.toBytes(name))) {
-            long comp = Blocker.begin();
-            try {
-                return getgrnam0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            return getgrnam0(buffer.address());
         }
     }
     private static native int getgrnam0(long nameAddress) throws UnixException;
@@ -664,12 +493,7 @@ class UnixNativeDispatcher {
         throws UnixException
     {
         try (NativeBuffer buffer = copyToNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                statvfs0(buffer.address(), attrs);
-            } finally {
-                Blocker.end(comp);
-            }
+            statvfs0(buffer.address(), attrs);
         }
     }
     private static native void statvfs0(long pathAddress, UnixFileStoreAttributes attrs)
@@ -687,12 +511,7 @@ class UnixNativeDispatcher {
         throws UnixException
     {
         try (NativeBuffer buffer = NativeBuffers.asNativeBuffer(name)) {
-            long comp = Blocker.begin();
-            try {
-                return fgetxattr0(filedes, buffer.address(), valueAddress, valueLen);
-            } finally {
-                Blocker.end(comp);
-            }
+            return fgetxattr0(filedes, buffer.address(), valueAddress, valueLen);
         }
     }
 
@@ -706,12 +525,7 @@ class UnixNativeDispatcher {
         throws UnixException
     {
         try (NativeBuffer buffer = NativeBuffers.asNativeBuffer(name)) {
-            long comp = Blocker.begin();
-            try {
-                fsetxattr0(filedes, buffer.address(), valueAddress, valueLen);
-            } finally {
-                Blocker.end(comp);
-            }
+            fsetxattr0(filedes, buffer.address(), valueAddress, valueLen);
         }
     }
 
@@ -723,12 +537,7 @@ class UnixNativeDispatcher {
      */
     static void fremovexattr(int filedes, byte[] name) throws UnixException {
         try (NativeBuffer buffer = NativeBuffers.asNativeBuffer(name)) {
-            long comp = Blocker.begin();
-            try {
-                fremovexattr0(filedes, buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            fremovexattr0(filedes, buffer.address());
         }
     }
 
diff --git a/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
index e700d44cfae..cf58d980bbe 100644
--- a/src/java.base/windows/classes/java/io/WinNTFileSystem.java
+++ b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@ import java.nio.file.Path;
 import java.util.BitSet;
 import java.util.Locale;
 import java.util.Properties;
-import jdk.internal.misc.Blocker;
 import sun.security.action.GetPropertyAction;
 
 /**
@@ -491,12 +490,7 @@ final class WinNTFileSystem extends FileSystem {
                 return path;
             return "" + ((char) (c-32)) + ':' + '\\';
         }
-        long comp = Blocker.begin();
-        try {
-            return canonicalize0(path);
-        } finally {
-            Blocker.end(comp);
-        }
+        return canonicalize0(path);
     }
 
     private native String canonicalize0(String path)
@@ -507,56 +501,31 @@ final class WinNTFileSystem extends FileSystem {
 
     @Override
     public int getBooleanAttributes(File f) {
-        long comp = Blocker.begin();
-        try {
-            return getBooleanAttributes0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return getBooleanAttributes0(f);
     }
     private native int getBooleanAttributes0(File f);
 
     @Override
     public boolean checkAccess(File f, int access) {
-        long comp = Blocker.begin();
-        try {
-            return checkAccess0(f, access);
-        } finally {
-            Blocker.end(comp);
-        }
+        return checkAccess0(f, access);
     }
     private native boolean checkAccess0(File f, int access);
 
     @Override
     public long getLastModifiedTime(File f) {
-        long comp = Blocker.begin();
-        try {
-            return getLastModifiedTime0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return getLastModifiedTime0(f);
     }
     private native long getLastModifiedTime0(File f);
 
     @Override
     public long getLength(File f) {
-        long comp = Blocker.begin();
-        try {
-            return getLength0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return getLength0(f);
     }
     private native long getLength0(File f);
 
     @Override
     public boolean setPermission(File f, int access, boolean enable, boolean owneronly) {
-        long comp = Blocker.begin();
-        try {
-            return setPermission0(f, access, enable, owneronly);
-        } finally {
-            Blocker.end(comp);
-        }
+        return setPermission0(f, access, enable, owneronly);
     }
     private native boolean setPermission0(File f, int access, boolean enable, boolean owneronly);
 
@@ -564,78 +533,43 @@ final class WinNTFileSystem extends FileSystem {
 
     @Override
     public boolean createFileExclusively(String path) throws IOException {
-        long comp = Blocker.begin();
-        try {
-            return createFileExclusively0(path);
-        } finally {
-            Blocker.end(comp);
-        }
+        return createFileExclusively0(path);
     }
     private native boolean createFileExclusively0(String path) throws IOException;
 
     @Override
     public String[] list(File f) {
-        long comp = Blocker.begin();
-        try {
-            return list0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return list0(f);
     }
     private native String[] list0(File f);
 
     @Override
     public boolean createDirectory(File f) {
-        long comp = Blocker.begin();
-        try {
-            return createDirectory0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return createDirectory0(f);
     }
     private native boolean createDirectory0(File f);
 
     @Override
     public boolean setLastModifiedTime(File f, long time) {
-        long comp = Blocker.begin();
-        try {
-            return setLastModifiedTime0(f, time);
-        } finally {
-            Blocker.end(comp);
-        }
+        return setLastModifiedTime0(f, time);
     }
     private native boolean setLastModifiedTime0(File f, long time);
 
     @Override
     public boolean setReadOnly(File f) {
-        long comp = Blocker.begin();
-        try {
-            return setReadOnly0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return setReadOnly0(f);
     }
     private native boolean setReadOnly0(File f);
 
     @Override
     public boolean delete(File f) {
-        long comp = Blocker.begin();
-        try {
-            return delete0(f);
-        } finally {
-            Blocker.end(comp);
-        }
+        return delete0(f);
     }
     private native boolean delete0(File f);
 
     @Override
     public boolean rename(File f1, File f2) {
-        long comp = Blocker.begin();
-        try {
-            return rename0(f1, f2);
-        } finally {
-            Blocker.end(comp);
-        }
+        return rename0(f1, f2);
     }
     private native boolean rename0(File f1, File f2);
 
diff --git a/src/java.base/windows/classes/java/lang/ProcessImpl.java b/src/java.base/windows/classes/java/lang/ProcessImpl.java
index a01d1db6ddc..d6fb51c4494 100644
--- a/src/java.base/windows/classes/java/lang/ProcessImpl.java
+++ b/src/java.base/windows/classes/java/lang/ProcessImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, 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
@@ -515,7 +515,7 @@ final class ProcessImpl extends Process {
                 fdAccess.setHandle(stdin_fd, stdHandles[0]);
                 fdAccess.registerCleanup(stdin_fd);
                 stdin_stream = new BufferedOutputStream(
-                    new FileOutputStream(stdin_fd));
+                    new PipeOutputStream(stdin_fd));
             }
 
             if (stdHandles[1] == -1L || forceNullOutputStream)
@@ -564,11 +564,11 @@ final class ProcessImpl extends Process {
     private static native int getExitCodeProcess(long handle);
 
     public int waitFor() throws InterruptedException {
-        long comp = Blocker.begin();
+        boolean attempted = Blocker.begin();
         try {
             waitForInterruptibly(handle);
         } finally {
-            Blocker.end(comp);
+            Blocker.end(attempted);
         }
         if (Thread.interrupted())
             throw new InterruptedException();
@@ -593,11 +593,11 @@ final class ProcessImpl extends Process {
                 // if wraps around then wait a long while
                 msTimeout = Integer.MAX_VALUE;
             }
-            long comp = Blocker.begin();
+            boolean attempted = Blocker.begin();
             try {
                 waitForTimeoutInterruptibly(handle, msTimeout);
             } finally {
-                Blocker.end(comp);
+                Blocker.end(attempted);
             }
             if (Thread.interrupted())
                 throw new InterruptedException();
diff --git a/src/java.base/windows/classes/sun/nio/ch/WEPollSelectorImpl.java b/src/java.base/windows/classes/sun/nio/ch/WEPollSelectorImpl.java
index 2b39a7ed4a9..bbcfab9bbf1 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WEPollSelectorImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WEPollSelectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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,11 +109,11 @@ class WEPollSelectorImpl extends SelectorImpl {
         processDeregisterQueue();
         try {
             begin(blocking);
-            long comp = Blocker.begin(blocking);
+            boolean attempted = Blocker.begin(blocking);
             try {
                 numEntries = WEPoll.wait(eph, pollArrayAddress, NUM_EPOLLEVENTS, to);
             } finally {
-                Blocker.end(comp);
+                Blocker.end(attempted);
             }
         } finally {
             end(blocking);
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java b/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
index 56f09d34ab8..3a14221d62a 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
@@ -166,8 +166,8 @@ class WindowsChannelFactory {
             throw new IllegalArgumentException("APPEND + TRUNCATE_EXISTING not allowed");
 
         FileDescriptor fdObj = open(pathForWindows, pathToCheck, flags, pSecurityDescriptor);
-        return FileChannelImpl.open(fdObj, pathForWindows, flags.read,
-                flags.write, flags.direct, null);
+        return FileChannelImpl.open(fdObj, pathForWindows, flags.read, flags.write,
+                (flags.sync || flags.dsync), flags.direct, null);
     }
 
     /**
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java b/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
index 34d748f4150..8e351b7e0ef 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package sun.nio.fs;
 
-import jdk.internal.misc.Blocker;
 import jdk.internal.misc.Unsafe;
 
 import static sun.nio.fs.WindowsConstants.*;
@@ -68,17 +67,12 @@ class WindowsNativeDispatcher {
         throws WindowsException
     {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return CreateFile0(buffer.address(),
-                                   dwDesiredAccess,
-                                   dwShareMode,
-                                   lpSecurityAttributes,
-                                   dwCreationDisposition,
-                                   dwFlagsAndAttributes);
-            } finally {
-                Blocker.end(comp);
-            }
+            return CreateFile0(buffer.address(),
+                               dwDesiredAccess,
+                               dwShareMode,
+                               lpSecurityAttributes,
+                               dwCreationDisposition,
+                               dwFlagsAndAttributes);
         }
     }
     static long CreateFile(String path,
@@ -113,12 +107,7 @@ class WindowsNativeDispatcher {
      */
     static void DeleteFile(String path) throws WindowsException {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                DeleteFile0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            DeleteFile0(buffer.address());
         }
     }
     private static native void DeleteFile0(long lpFileName)
@@ -132,12 +121,7 @@ class WindowsNativeDispatcher {
      */
     static void CreateDirectory(String path, long lpSecurityAttributes) throws WindowsException {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                CreateDirectory0(buffer.address(), lpSecurityAttributes);
-            } finally {
-                Blocker.end(comp);
-            }
+            CreateDirectory0(buffer.address(), lpSecurityAttributes);
         }
     }
     private static native void CreateDirectory0(long lpFileName, long lpSecurityAttributes)
@@ -150,12 +134,7 @@ class WindowsNativeDispatcher {
      */
     static void RemoveDirectory(String path) throws WindowsException {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                RemoveDirectory0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            RemoveDirectory0(buffer.address());
         }
     }
     private static native void RemoveDirectory0(long lpFileName)
@@ -200,12 +179,7 @@ class WindowsNativeDispatcher {
     static FirstFile FindFirstFile(String path) throws WindowsException {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
             FirstFile data = new FirstFile();
-            long comp = Blocker.begin();
-            try {
-                FindFirstFile0(buffer.address(), data);
-            } finally {
-                Blocker.end(comp);
-            }
+            FindFirstFile0(buffer.address(), data);
             return data;
         }
     }
@@ -230,12 +204,7 @@ class WindowsNativeDispatcher {
      */
     static long FindFirstFile(String path, long address) throws WindowsException {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return FindFirstFile1(buffer.address(), address);
-            } finally {
-                Blocker.end(comp);
-            }
+            return FindFirstFile1(buffer.address(), address);
         }
     }
     private static native long FindFirstFile1(long lpFileName, long address)
@@ -250,12 +219,7 @@ class WindowsNativeDispatcher {
      * @return  lpFindFileData->cFileName or null
      */
     static String FindNextFile(long handle, long address) throws WindowsException {
-        long comp = Blocker.begin();
-        try {
-            return FindNextFile0(handle, address);
-        } finally {
-            Blocker.end(comp);
-        }
+        return FindNextFile0(handle, address);
     }
     private static native String FindNextFile0(long handle, long address)
         throws WindowsException;
@@ -271,12 +235,7 @@ class WindowsNativeDispatcher {
     static FirstStream FindFirstStream(String path) throws WindowsException {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
             FirstStream data = new FirstStream();
-            long comp = Blocker.begin();
-            try {
-                FindFirstStream0(buffer.address(), data);
-            } finally {
-                Blocker.end(comp);
-            }
+            FindFirstStream0(buffer.address(), data);
             if (data.handle() == WindowsConstants.INVALID_HANDLE_VALUE)
                 return null;
             return data;
@@ -300,12 +259,7 @@ class WindowsNativeDispatcher {
      * )
      */
     static String FindNextStream(long handle) throws WindowsException {
-        long comp = Blocker.begin();
-        try {
-            return FindNextStream0(handle);
-        } finally {
-            Blocker.end(comp);
-        }
+        return FindNextStream0(handle);
     }
     private static native String FindNextStream0(long handle) throws WindowsException;
 
@@ -325,12 +279,7 @@ class WindowsNativeDispatcher {
     static void GetFileInformationByHandle(long handle, long address)
         throws WindowsException
     {
-        long comp = Blocker.begin();
-        try {
-            GetFileInformationByHandle0(handle, address);
-        } finally {
-            Blocker.end(comp);
-        }
+        GetFileInformationByHandle0(handle, address);
     }
     private static native void GetFileInformationByHandle0(long handle, long address)
         throws WindowsException;
@@ -351,13 +300,7 @@ class WindowsNativeDispatcher {
     {
         try (NativeBuffer sourceBuffer = asNativeBuffer(source);
              NativeBuffer targetBuffer = asNativeBuffer(target)) {
-            long comp = Blocker.begin();
-            try {
-                CopyFileEx0(sourceBuffer.address(), targetBuffer.address(), flags,
-                        addressToPollForCancel);
-            } finally {
-                Blocker.end(comp);
-            }
+            CopyFileEx0(sourceBuffer.address(), targetBuffer.address(), flags, addressToPollForCancel);
         }
     }
     private static native void CopyFileEx0(long existingAddress, long newAddress,
@@ -375,12 +318,7 @@ class WindowsNativeDispatcher {
     {
         try (NativeBuffer sourceBuffer = asNativeBuffer(source);
              NativeBuffer targetBuffer = asNativeBuffer(target)) {
-            long comp = Blocker.begin();
-            try {
-                MoveFileEx0(sourceBuffer.address(), targetBuffer.address(), flags);
-            } finally {
-                Blocker.end(comp);
-            }
+            MoveFileEx0(sourceBuffer.address(), targetBuffer.address(), flags);
         }
     }
     private static native void MoveFileEx0(long existingAddress, long newAddress,
@@ -393,12 +331,7 @@ class WindowsNativeDispatcher {
      */
     static int GetFileAttributes(String path) throws WindowsException {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                return GetFileAttributes0(buffer.address());
-            } finally {
-                Blocker.end(comp);
-            }
+            return GetFileAttributes0(buffer.address());
         }
     }
     private static native int GetFileAttributes0(long lpFileName)
@@ -413,12 +346,7 @@ class WindowsNativeDispatcher {
         throws WindowsException
     {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                SetFileAttributes0(buffer.address(), dwFileAttributes);
-            } finally {
-                Blocker.end(comp);
-            }
+            SetFileAttributes0(buffer.address(), dwFileAttributes);
         }
     }
     private static native void SetFileAttributes0(long lpFileName,
@@ -433,12 +361,7 @@ class WindowsNativeDispatcher {
      */
     static void GetFileAttributesEx(String path, long address) throws WindowsException {
         try (NativeBuffer buffer = asNativeBuffer(path)) {
-            long comp = Blocker.begin();
-            try {
-                GetFileAttributesEx0(buffer.address(), address);
-            } finally {
-                Blocker.end(comp);
-            }
+            GetFileAttributesEx0(buffer.address(), address);
         }
     }
     private static native void GetFileAttributesEx0(long lpFileName, long address)
@@ -455,12 +378,7 @@ class WindowsNativeDispatcher {
     static void SetFileTime(long handle, long createTime, long lastAccessTime, long lastWriteTime)
         throws WindowsException
     {
-        long comp = Blocker.begin();
-        try {
-            SetFileTime0(handle, createTime, lastAccessTime, lastWriteTime);
-        } finally {
-            Blocker.end(comp);
-        }
+        SetFileTime0(handle, createTime, lastAccessTime, lastWriteTime);
     }
     private static native void SetFileTime0(long handle,
                                             long createTime,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java
index df2239bcb5e..7593b460c2e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -368,16 +368,21 @@ public class Object {
      * @see        java.lang.Object#notifyAll()
      */
     public final void wait(long timeoutMillis) throws InterruptedException {
-        long comp = Blocker.begin();
+        if (!Thread.currentThread().isVirtual()) {
+            wait0(timeoutMillis);
+            return;
+        }
+
+        // virtual thread waiting
+        boolean attempted = Blocker.begin();
         try {
             wait0(timeoutMillis);
         } catch (InterruptedException e) {
-            Thread thread = Thread.currentThread();
-            if (thread.isVirtual())
-                thread.getAndClearInterrupt();
+            // virtual thread's interrupt status needs to be cleared
+            Thread.currentThread().getAndClearInterrupt();
             throw e;
         } finally {
-            Blocker.end(comp);
+            Blocker.end(attempted);
         }
     }
 

From b4cea701c9cab15007c485088dd5b8d7025d83ef Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Tue, 23 Apr 2024 16:32:20 +0000
Subject: [PATCH 159/486] 8330693: Generational ZGC: Simplify
 ZAddress::finalizable_good and ZAddress::mark_good

Reviewed-by: stefank, eosterlund
---
 src/hotspot/share/gc/z/zAddress.inline.hpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/z/zAddress.inline.hpp b/src/hotspot/share/gc/z/zAddress.inline.hpp
index 7f3a52e3594..4adbf50bc86 100644
--- a/src/hotspot/share/gc/z/zAddress.inline.hpp
+++ b/src/hotspot/share/gc/z/zAddress.inline.hpp
@@ -600,9 +600,7 @@ inline zpointer ZAddress::finalizable_good(zaddress addr, zpointer prev) {
     return color_null();
   }
 
-  const uintptr_t non_mark_bits_mask = ZPointerMarkMetadataMask ^ ZPointerAllMetadataMask;
-  const uintptr_t non_mark_prev_bits = untype(prev) & non_mark_bits_mask;
-  return color(addr, ZPointerLoadGoodMask | ZPointerMarkedYoung | ZPointerFinalizable | non_mark_prev_bits | ZPointerRememberedMask);
+  return color(addr, ZPointerLoadGoodMask | ZPointerMarkedYoung | ZPointerFinalizable | ZPointerRememberedMask);
 }
 
 inline zpointer ZAddress::mark_good(zaddress addr, zpointer prev) {
@@ -610,9 +608,7 @@ inline zpointer ZAddress::mark_good(zaddress addr, zpointer prev) {
     return color_null();
   }
 
-  const uintptr_t non_mark_bits_mask = ZPointerMarkMetadataMask ^ ZPointerAllMetadataMask;
-  const uintptr_t non_mark_prev_bits = untype(prev) & non_mark_bits_mask;
-  return color(addr, ZPointerLoadGoodMask | ZPointerMarkedYoung | ZPointerMarkedOld | non_mark_prev_bits | ZPointerRememberedMask);
+  return color(addr, ZPointerLoadGoodMask | ZPointerMarkedYoung | ZPointerMarkedOld | ZPointerRememberedMask);
 }
 
 inline zpointer ZAddress::mark_old_good(zaddress addr, zpointer prev) {

From 7157eea10130e5411ab8db4273dc37f6789cdcf6 Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Tue, 23 Apr 2024 18:01:55 +0000
Subject: [PATCH 160/486] 8327290: Remove unused notproduct option
 TraceInvocationCounterOverflow

Reviewed-by: coleenp
---
 src/hotspot/share/runtime/globals.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 9087cb9b4a3..59eb306739a 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -867,9 +867,6 @@ const int ObjectAlignmentInBytes = 8;
   develop(bool, TraceBytecodes, false,                                      \
           "Trace bytecode execution")                                       \
                                                                             \
-  develop(bool, TraceInvocationCounterOverflow, false,                      \
-          "Trace method invocation counter overflow")                       \
-                                                                            \
   develop(bool, VerifyDependencies, trueInDebug,                            \
           "Exercise and verify the compilation dependency mechanism")       \
                                                                             \

From 88a5dcead21f50e367f8ad77197e6ffdb98cbb20 Mon Sep 17 00:00:00 2001
From: Aleksei Voitylov <avoitylov@openjdk.org>
Date: Tue, 23 Apr 2024 18:12:10 +0000
Subject: [PATCH 161/486] 8330805: ARM32 build is broken after JDK-8139457

Reviewed-by: shade
---
 src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
index d9d042bb2e4..f1267587ce4 100644
--- a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
@@ -153,10 +153,9 @@ void C1_MacroAssembler::allocate_object(Register obj, Register tmp1, Register tm
 
 void C1_MacroAssembler::allocate_array(Register obj, Register len,
                                        Register tmp1, Register tmp2, Register tmp3,
-                                       int header_size, int element_size,
+                                       int header_size_in_bytes, int element_size,
                                        Register klass, Label& slow_case) {
   assert_different_registers(obj, len, tmp1, tmp2, tmp3, klass, Rtemp);
-  const int header_size_in_bytes = header_size * BytesPerWord;
   const int scale_shift = exact_log2(element_size);
   const Register obj_size = Rtemp; // Rtemp should be free at c1 LIR level
 

From 9cc163a999eb8e9597d45b095b642c25071043bd Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Tue, 23 Apr 2024 18:43:36 +0000
Subject: [PATCH 162/486] 8330178: Clean up non-standard use of /** comments in
 `java.base`

Reviewed-by: darcy, iris, dfuchs, aivanov, naoto
---
 .../classes/apple/security/AppleProvider.java |  2 +-
 .../classes/java/net/DefaultInterface.java    | 10 ++++-----
 .../com/sun/crypto/provider/SunJCE.java       |  2 +-
 .../share/classes/java/io/FilePermission.java |  4 +---
 .../java/io/ObjectStreamConstants.java        |  2 +-
 .../classes/java/lang/invoke/LambdaForm.java  |  6 ++---
 .../share/classes/java/math/BigInteger.java   |  2 +-
 .../classes/java/math/MutableBigInteger.java  |  8 +++----
 .../classes/java/net/HttpURLConnection.java   |  2 +-
 .../classes/java/util/regex/Pattern.java      | 12 +++++-----
 .../internal/access/JavaAWTFontAccess.java    |  4 ++--
 .../jdk/internal/icu/lang/UCharacter.java     |  2 +-
 .../jdk/internal/icu/text/BidiBase.java       | 20 ++++++++---------
 .../classes/jdk/internal/icu/text/UTF16.java  |  2 +-
 .../jdk/internal/platform/Metrics.java        | 12 +++++-----
 .../sun/net/www/content/text/plain.java       |  8 +++----
 .../www/protocol/file/FileURLConnection.java  | 11 +++++-----
 .../AbstractDelegateHttpsURLConnection.java   |  4 ++--
 .../classes/sun/nio/ch/Interruptible.java     |  4 ++--
 .../sun/security/pkcs/ParsingException.java   |  9 ++++----
 .../sun/security/provider/SeedGenerator.java  | 22 +++++++++----------
 .../sun/security/util/ByteArrayTagOrder.java  |  7 +++---
 .../classes/sun/security/util/IOUtils.java    |  7 +++---
 23 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/src/java.base/macosx/classes/apple/security/AppleProvider.java b/src/java.base/macosx/classes/apple/security/AppleProvider.java
index 87efda6ebb1..3f584be336b 100644
--- a/src/java.base/macosx/classes/apple/security/AppleProvider.java
+++ b/src/java.base/macosx/classes/apple/security/AppleProvider.java
@@ -28,7 +28,7 @@ package apple.security;
 import java.security.*;
 import static sun.security.util.SecurityConstants.PROVIDER_VER;
 
-/**
+/*
  * The Apple Security Provider.
  */
 
diff --git a/src/java.base/macosx/classes/java/net/DefaultInterface.java b/src/java.base/macosx/classes/java/net/DefaultInterface.java
index 1901fcb156a..b46de34a7cc 100644
--- a/src/java.base/macosx/classes/java/net/DefaultInterface.java
+++ b/src/java.base/macosx/classes/java/net/DefaultInterface.java
@@ -25,6 +25,11 @@
 
 package java.net;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Enumeration;
+import java.io.IOException;
+
 /**
  * Choose a network interface to be the default for
  * outgoing IPv6 traffic that does not specify a scope_id (and which needs one).
@@ -37,11 +42,6 @@ package java.net;
  * that returns null.
  */
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Enumeration;
-import java.io.IOException;
-
 class DefaultInterface {
 
     private static final NetworkInterface defaultInterface =
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
index 7914eb8ba0b..9bb1fa7ff82 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
@@ -34,7 +34,7 @@ import java.util.List;
 import static sun.security.util.SecurityConstants.PROVIDER_VER;
 import static sun.security.util.SecurityProviderConstants.*;
 
-/**
+/*
  * The "SunJCE" Cryptographic Service Provider.
  *
  * @author Jan Luehe
diff --git a/src/java.base/share/classes/java/io/FilePermission.java b/src/java.base/share/classes/java/io/FilePermission.java
index 7c07c608171..808c4293143 100644
--- a/src/java.base/share/classes/java/io/FilePermission.java
+++ b/src/java.base/share/classes/java/io/FilePermission.java
@@ -1231,12 +1231,10 @@ final class FilePermissionCollection extends PermissionCollection
         new ObjectStreamField("permissions", Vector.class),
     };
 
-    /**
-     * @serialData "permissions" field (a Vector containing the FilePermissions).
-     */
     /**
      * Writes the contents of the perms field out as a Vector for
      * serialization compatibility with earlier releases.
+     * @serialData "permissions" field (a Vector containing the FilePermissions).
      *
      * @param  out the {@code ObjectOutputStream} to which data is written
      * @throws IOException if an I/O error occurs
diff --git a/src/java.base/share/classes/java/io/ObjectStreamConstants.java b/src/java.base/share/classes/java/io/ObjectStreamConstants.java
index d8ebbd23e73..4f06ba7f89e 100644
--- a/src/java.base/share/classes/java/io/ObjectStreamConstants.java
+++ b/src/java.base/share/classes/java/io/ObjectStreamConstants.java
@@ -139,7 +139,7 @@ public interface ObjectStreamConstants {
     static final int baseWireHandle = 0x7e0000;
 
 
-    /******************************************************/
+    /* ****************************************************/
     /* Bit masks for ObjectStreamClass flag.*/
 
     /**
diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
index 8b75d7510fe..823f527b6c4 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
@@ -571,7 +571,7 @@ class LambdaForm {
         return true;
     }
 
-    /** Invoke this form on the given arguments. */
+    // /** Invoke this form on the given arguments. */
     // final Object invoke(Object... args) throws Throwable {
     //     // NYI: fit this into the fast path?
     //     return interpretWithArguments(args);
@@ -923,9 +923,9 @@ class LambdaForm {
         return invocationCounter == -1;
     }
 
+    /** Interpretively invoke this form on the given arguments. */
     @Hidden
     @DontInline
-    /** Interpretively invoke this form on the given arguments. */
     Object interpretWithArguments(Object... argumentValues) throws Throwable {
         if (TRACE_INTERPRETER)
             return interpretWithArgumentsTracing(argumentValues);
@@ -940,9 +940,9 @@ class LambdaForm {
         return rv;
     }
 
+    /** Evaluate a single Name within this form, applying its function to its arguments. */
     @Hidden
     @DontInline
-    /** Evaluate a single Name within this form, applying its function to its arguments. */
     Object interpretName(Name name, Object[] values) throws Throwable {
         if (TRACE_INTERPRETER)
             traceInterpreter("| interpretName", name.debugString(), (Object[]) null);
diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java
index 8d12c6de0a7..a972faafb45 100644
--- a/src/java.base/share/classes/java/math/BigInteger.java
+++ b/src/java.base/share/classes/java/math/BigInteger.java
@@ -4843,7 +4843,7 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
         0x40000000, 0x4cfa3cc1, 0x5c13d840, 0x6d91b519, 0x39aa400
     };
 
-    /**
+    /*
      * These routines provide access to the two's complement representation
      * of BigIntegers.
      */
diff --git a/src/java.base/share/classes/java/math/MutableBigInteger.java b/src/java.base/share/classes/java/math/MutableBigInteger.java
index 76e48d00cf1..eca42ee25b1 100644
--- a/src/java.base/share/classes/java/math/MutableBigInteger.java
+++ b/src/java.base/share/classes/java/math/MutableBigInteger.java
@@ -25,6 +25,10 @@
 
 package java.math;
 
+import static java.math.BigDecimal.INFLATED;
+import static java.math.BigInteger.LONG_MASK;
+import java.util.Arrays;
+
 /**
  * A class used to represent multiprecision integers that makes efficient
  * use of allocated space by allowing a number to occupy only part of
@@ -42,10 +46,6 @@ package java.math;
  * @since   1.3
  */
 
-import static java.math.BigDecimal.INFLATED;
-import static java.math.BigInteger.LONG_MASK;
-import java.util.Arrays;
-
 class MutableBigInteger {
     /**
      * Holds the magnitude of this MutableBigInteger in big endian order.
diff --git a/src/java.base/share/classes/java/net/HttpURLConnection.java b/src/java.base/share/classes/java/net/HttpURLConnection.java
index b501fa25e45..b405fb10a16 100644
--- a/src/java.base/share/classes/java/net/HttpURLConnection.java
+++ b/src/java.base/share/classes/java/net/HttpURLConnection.java
@@ -675,7 +675,7 @@ public abstract class HttpURLConnection extends URLConnection {
         return null;
     }
 
-    /**
+    /*
      * The response codes for HTTP, as of version 1.1.
      */
 
diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index 1c2fd151b8d..62ef125fdee 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -2225,7 +2225,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
                Character.isSurrogate((char)ch);
     }
 
-    /**
+    /*
      *  The following methods handle the main parsing. They are sorted
      *  according to their precedence order, the lowest one first.
      */
@@ -2282,10 +2282,10 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         }
     }
 
-    @SuppressWarnings("fallthrough")
     /**
      * Parsing of sequences between alternations.
      */
+    @SuppressWarnings("fallthrough")
     private Node sequence(Node end) {
         Node head = null;
         Node tail = null;
@@ -2409,10 +2409,10 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         return head;
     }
 
-    @SuppressWarnings("fallthrough")
     /**
      * Parse and add a new Single or Slice.
      */
+    @SuppressWarnings("fallthrough")
     private Node atom() {
         int first = 0;
         int prev = -1;
@@ -3322,10 +3322,10 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         return head;
     }
 
-    @SuppressWarnings("fallthrough")
     /**
      * Parses inlined match flags and set them appropriately.
      */
+    @SuppressWarnings("fallthrough")
     private void addFlag() {
         int ch = peek();
         for (;;) {
@@ -3364,11 +3364,11 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         }
     }
 
-    @SuppressWarnings("fallthrough")
     /**
      * Parses the second part of inlined match flags and turns off
      * flags appropriately.
      */
+    @SuppressWarnings("fallthrough")
     private void subFlag() {
         int ch = peek();
         for (;;) {
@@ -3708,7 +3708,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
         return hasSupplementary ? new SliceS(tmp) : new Slice(tmp);
     }
 
-    /**
+    /*
      * The following classes are the building components of the object
      * tree that represents a compiled regular expression. The object tree
      * is made of individual elements that handle constructs in the Pattern.
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java
index 6a5102b5088..139f02450b8 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaAWTFontAccess.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
+package jdk.internal.access;
+
 /**
  * SharedSecrets interface used for the access from java.text.Bidi
  */
 
-package jdk.internal.access;
-
 public interface JavaAWTFontAccess {
 
     // java.awt.font.TextAttribute constants
diff --git a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java
index 1fa93390215..cd87db30d7f 100644
--- a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java
+++ b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-/**
+/*
 *******************************************************************************
 * Copyright (C) 1996-2014, International Business Machines Corporation and
 * others. All Rights Reserved.
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java b/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
index cdfdef9fbf9..bfeb0b7e621 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
@@ -2409,9 +2409,9 @@ public class BidiBase {
         return directionFromFlags();
     }
 
-    /*********************************************************************/
+    /* *******************************************************************/
     /* The Properties state machine table                                */
-    /*********************************************************************/
+    /* *******************************************************************/
     /*                                                                   */
     /* All table cells are 8 bits:                                       */
     /*      bits 0..4:  next state                                       */
@@ -2422,9 +2422,9 @@ public class BidiBase {
     /* Cells may also be of format "_(x,y)" where x represents an action */
     /* to perform and y represents the next state.                       */
     /*                                                                   */
-    /*********************************************************************/
+    /* *******************************************************************/
     /* Definitions and type for properties state tables                  */
-    /*********************************************************************/
+    /* *******************************************************************/
     private static final int IMPTABPROPS_COLUMNS = 16;
     private static final int IMPTABPROPS_RES = IMPTABPROPS_COLUMNS - 1;
     private static short GetStateProps(short cell) {
@@ -2447,7 +2447,7 @@ public class BidiBase {
     private static final short _S  = 5;
     private static final short _B  = 6; /* reduced dirProp */
 
-    /*********************************************************************/
+    /* *******************************************************************/
     /*                                                                   */
     /*      PROPERTIES  STATE  TABLE                                     */
     /*                                                                   */
@@ -2510,9 +2510,9 @@ public class BidiBase {
 /*23 ENR+ET      */ {  32+1,  32+2,    21,  32+5,  32+7, 32+15, 32+17,  32+7,    23,  32+7,    23,    23,  32+3,    18,    21,   _AN }
     };
 
-    /*********************************************************************/
+    /* *******************************************************************/
     /* The levels state machine tables                                   */
-    /*********************************************************************/
+    /* *******************************************************************/
     /*                                                                   */
     /* All table cells are 8 bits:                                       */
     /*      bits 0..3:  next state                                       */
@@ -2525,9 +2525,9 @@ public class BidiBase {
     /*                                                                   */
     /* This format limits each table to 16 states each and to 15 actions.*/
     /*                                                                   */
-    /*********************************************************************/
+    /* *******************************************************************/
     /* Definitions and type for levels state tables                      */
-    /*********************************************************************/
+    /* *******************************************************************/
     private static final int IMPTABLEVELS_COLUMNS = _B + 2;
     private static final int IMPTABLEVELS_RES = IMPTABLEVELS_COLUMNS - 1;
     private static short GetState(byte cell) { return (short)(cell & 0x0f); }
@@ -2544,7 +2544,7 @@ public class BidiBase {
         }
     }
 
-    /*********************************************************************/
+    /* *******************************************************************/
     /*                                                                   */
     /*      LEVELS  STATE  TABLES                                        */
     /*                                                                   */
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java b/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java
index 4205487a966..e84e1d4c0d4 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/**
+/*
  *******************************************************************************
  * Copyright (C) 1996-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
diff --git a/src/java.base/share/classes/jdk/internal/platform/Metrics.java b/src/java.base/share/classes/jdk/internal/platform/Metrics.java
index c45e3e52257..50523d137ef 100644
--- a/src/java.base/share/classes/jdk/internal/platform/Metrics.java
+++ b/src/java.base/share/classes/jdk/internal/platform/Metrics.java
@@ -72,7 +72,7 @@ public interface Metrics {
     public String getProvider();
 
 
-    /*****************************************************************
+    /* ***************************************************************
      * CPU Accounting Subsystem
      ****************************************************************/
 
@@ -123,7 +123,7 @@ public interface Metrics {
      */
     public long getCpuSystemUsage();
 
-    /*****************************************************************
+    /* ***************************************************************
      * CPU Scheduling Metrics
      ****************************************************************/
 
@@ -215,7 +215,7 @@ public interface Metrics {
      */
     public long getEffectiveCpuCount();
 
-    /*****************************************************************
+    /* ***************************************************************
      * CPU Sets
      ****************************************************************/
 
@@ -271,7 +271,7 @@ public interface Metrics {
      */
     public int[] getEffectiveCpuSetMems();
 
-    /*****************************************************************
+    /* ***************************************************************
      * Memory Subsystem
      ****************************************************************/
 
@@ -352,7 +352,7 @@ public interface Metrics {
      */
     public long getMemorySoftLimit();
 
-    /*****************************************************************
+    /* ***************************************************************
      * pids subsystem
      ****************************************************************/
 
@@ -373,7 +373,7 @@ public interface Metrics {
      */
     public long getPidsCurrent();
 
-    /*****************************************************************
+    /* ***************************************************************
      * BlKIO Subsystem
      ****************************************************************/
 
diff --git a/src/java.base/share/classes/sun/net/www/content/text/plain.java b/src/java.base/share/classes/sun/net/www/content/text/plain.java
index 32836559756..33a9032b2bc 100644
--- a/src/java.base/share/classes/sun/net/www/content/text/plain.java
+++ b/src/java.base/share/classes/sun/net/www/content/text/plain.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-/**
- * Plain text file handler.
- * @author  Steven B. Byrne
- */
 package sun.net.www.content.text;
 import java.net.*;
 import java.io.InputStream;
 import java.io.IOException;
 
+/**
+ * Plain text file handler.
+ * @author  Steven B. Byrne
+ */
 public class plain extends ContentHandler {
     /**
      * Returns a PlainTextInputStream object from which data
diff --git a/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
index a27a6137a37..16fb1d2ea6c 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
@@ -23,12 +23,6 @@
  * questions.
  */
 
-/**
- * Open an file input stream given a URL.
- * @author      James Gosling
- * @author      Steven B. Byrne
- */
-
 package sun.net.www.protocol.file;
 
 import java.net.URL;
@@ -40,6 +34,11 @@ import sun.net.www.*;
 import java.util.*;
 import java.text.SimpleDateFormat;
 
+/**
+ * Open a file input stream given a URL.
+ * @author      James Gosling
+ * @author      Steven B. Byrne
+ */
 public class FileURLConnection extends URLConnection {
 
     private static final String CONTENT_LENGTH = "content-length";
diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
index ff54e474b8e..39d05b6e0e4 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -65,7 +65,7 @@ public abstract class AbstractDelegateHttpsURLConnection extends
 
     protected abstract javax.net.ssl.HostnameVerifier getHostnameVerifier();
 
-    /**
+    /*
      * No user application is able to call these routines, as no one
      * should ever get access to an instance of
      * DelegateHttpsURLConnection (sun.* or com.*)
diff --git a/src/java.base/share/classes/sun/nio/ch/Interruptible.java b/src/java.base/share/classes/sun/nio/ch/Interruptible.java
index 5785ba52e24..b5d9a7d2b3f 100644
--- a/src/java.base/share/classes/sun/nio/ch/Interruptible.java
+++ b/src/java.base/share/classes/sun/nio/ch/Interruptible.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
+package sun.nio.ch;
+
 /**
  * An object that interrupts a thread blocked in an I/O operation.
  */
 
-package sun.nio.ch;
-
 public interface Interruptible {
 
     /**
diff --git a/src/java.base/share/classes/sun/security/pkcs/ParsingException.java b/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
index d0f5999013d..ea7571491a0 100644
--- a/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
+++ b/src/java.base/share/classes/sun/security/pkcs/ParsingException.java
@@ -23,16 +23,15 @@
  * questions.
  */
 
+package sun.security.pkcs;
+
+import java.io.IOException;
+
 /**
  * Generic PKCS Parsing exception.
  *
  * @author Benjamin Renaud
  */
-
-package sun.security.pkcs;
-
-import java.io.IOException;
-
 public class ParsingException extends IOException {
 
     @java.io.Serial
diff --git a/src/java.base/share/classes/sun/security/provider/SeedGenerator.java b/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
index 94ffc26ab3f..b4c9355bccf 100644
--- a/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
+++ b/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
@@ -25,6 +25,17 @@
 
 package sun.security.provider;
 
+import java.security.*;
+import java.io.*;
+import java.util.Properties;
+import java.util.Enumeration;
+import java.net.*;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Random;
+import sun.security.util.Debug;
+
 /**
  * This class generates seeds for the SHA1PRNG cryptographically strong
  * random number generator.
@@ -66,17 +77,6 @@ package sun.security.provider;
  * @author Gadi Guy
  */
 
-import java.security.*;
-import java.io.*;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.net.*;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Random;
-import sun.security.util.Debug;
-
 abstract class SeedGenerator {
 
     // Static instance is created at link time
diff --git a/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java b/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
index dd5fae526ac..65f20ac816c 100644
--- a/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
+++ b/src/java.base/share/classes/sun/security/util/ByteArrayTagOrder.java
@@ -23,6 +23,9 @@
  * questions.
  */
 
+package sun.security.util;
+
+import java.util.Comparator;
 
 /**
  * ByteArrayTagOrder: a class for comparing two DER encodings by the
@@ -31,10 +34,6 @@
  * @author D. N. Hoover
  */
 
-package sun.security.util;
-
-import java.util.Comparator;
-
 public class ByteArrayTagOrder implements Comparator<byte[]> {
 
     /**
diff --git a/src/java.base/share/classes/sun/security/util/IOUtils.java b/src/java.base/share/classes/sun/security/util/IOUtils.java
index 4837e2b70a0..a103f36eb2c 100644
--- a/src/java.base/share/classes/sun/security/util/IOUtils.java
+++ b/src/java.base/share/classes/sun/security/util/IOUtils.java
@@ -23,16 +23,15 @@
  * questions.
  */
 
-/**
- * IOUtils: A collection of IO-related public static methods.
- */
-
 package sun.security.util;
 
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 
+/**
+ * IOUtils: A collection of IO-related public static methods.
+ */
 public class IOUtils {
 
     /**

From 09b88098ff544fec1a4e94bfbbdc21b6c8433abb Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Tue, 23 Apr 2024 19:06:41 +0000
Subject: [PATCH 163/486] 8327289: Remove unused PrintMethodFlushingStatistics
 option

Reviewed-by: coleenp
---
 src/hotspot/share/runtime/globals.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 59eb306739a..a5c717ff01d 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -978,9 +978,6 @@ const int ObjectAlignmentInBytes = 8;
   develop(bool, TraceMethodReplacement, false,                              \
           "Print when methods are replaced do to recompilation")            \
                                                                             \
-  product(bool, PrintMethodFlushingStatistics, false, DIAGNOSTIC,           \
-          "print statistics about method flushing")                         \
-                                                                            \
   product(intx, MinPassesBeforeFlush, 10, DIAGNOSTIC,                       \
           "Minimum number of sweeper passes before an nmethod "             \
           "can be flushed")                                                 \

From 2555166247230497453503318ccbf4dd4f047193 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 23 Apr 2024 20:37:25 +0000
Subject: [PATCH 164/486] 8329113: Deprecate -XX:+UseNotificationThread

Reviewed-by: dcubed, dholmes, coleenp
---
 src/hotspot/share/runtime/arguments.cpp                         | 1 +
 src/hotspot/share/runtime/globals.hpp                           | 2 +-
 test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 2ea044a97df..1091e4fab25 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -502,6 +502,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "UseSharedSpaces",              JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "RegisterFinalizersAtInit",     JDK_Version::jdk(22), JDK_Version::jdk(23), JDK_Version::jdk(24) },
   { "PreserveAllAnnotations",       JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
+  { "UseNotificationThread",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseEmptySlotsInSupers",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
 #if defined(X86)
   { "UseRTMLocking",                JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index a5c717ff01d..1d23e4164c4 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -952,7 +952,7 @@ const int ObjectAlignmentInBytes = 8;
              "Enable Thread SMR Statistics")                                \
                                                                             \
   product(bool, UseNotificationThread, true,                                \
-          "Use Notification Thread")                                        \
+          "(Deprecated) Use Notification Thread")                           \
                                                                             \
   product(bool, Inline, true,                                               \
           "Enable inlining")                                                \
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
index 7dc49a05186..50751a62bdf 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
@@ -56,6 +56,7 @@ public class VMDeprecatedOptions {
         ArrayList<String[]> deprecated = new ArrayList(
           Arrays.asList(new String[][] {
             // deprecated non-alias flags:
+            {"UseNotificationThread", "true"},
             {"PreserveAllAnnotations", "true"},
             {"AllowRedefinitionToAddDeleteMethods", "true"},
             {"UseEmptySlotsInSupers", "true"},

From f60798a30e9a3e0b666fed5384b6ac92a8a283dd Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Tue, 23 Apr 2024 21:10:46 +0000
Subject: [PATCH 165/486] 8329222: java.text.NumberFormat (and subclasses) spec
 updates

Reviewed-by: naoto
---
 .../java/text/CompactNumberFormat.java        | 214 +++++----
 .../classes/java/text/DecimalFormat.java      | 417 +++++++++---------
 .../share/classes/java/text/NumberFormat.java | 181 ++++----
 3 files changed, 421 insertions(+), 391 deletions(-)

diff --git a/src/java.base/share/classes/java/text/CompactNumberFormat.java b/src/java.base/share/classes/java/text/CompactNumberFormat.java
index a477d9c2fd8..115a21ee662 100644
--- a/src/java.base/share/classes/java/text/CompactNumberFormat.java
+++ b/src/java.base/share/classes/java/text/CompactNumberFormat.java
@@ -47,80 +47,113 @@ import java.util.stream.Collectors;
 /**
  * <p>
  * {@code CompactNumberFormat} is a concrete subclass of {@code NumberFormat}
- * that formats a decimal number in its compact form.
- *
- * The compact number formatting is designed for the environment where the space
- * is limited, and the formatted string can be displayed in that limited space.
- * It is defined by LDML's specification for
+ * that formats a decimal number in a localized compact form.
+ * Compact number formatting is designed for an environment with limited space.
+ * For example, displaying the formatted number {@code 7M} instead of {@code
+ * 7,000,000.00} in the {@link java.util.Locale#US US locale}. The {@code
+ * CompactNumberFormat} class is defined by LDML's specification for
  * <a href = "http://unicode.org/reports/tr35/tr35-numbers.html#Compact_Number_Formats">
- * Compact Number Formats</a>. A compact number formatting refers
- * to the representation of a number in a shorter form, based on the patterns
- * provided for a given locale.
+ * Compact Number Formats</a>.
  *
- * <p>
- * For example:
- * <br>In the {@link java.util.Locale#US US locale}, {@code 1000} can be formatted
- * as {@code "1K"}, and {@code 1000000} as {@code "1M"}, depending upon the
- * {@linkplain ##compact_number_style style} used.
- * <br>In the {@code "hi_IN"} locale, {@code 1000} can be formatted as
- * "1 \u0939\u091C\u093C\u093E\u0930", and {@code 50000000} as "5 \u0915.",
- * depending upon the {@linkplain ##compact_number_style style} used.
- *
- * <p>
- * To obtain a {@code CompactNumberFormat} for a locale, use one
- * of the factory methods given by {@code NumberFormat} for compact number
- * formatting. For example,
- * {@link NumberFormat#getCompactNumberInstance(Locale, Style)}.
- *
- * <blockquote>{@snippet lang=java :
- * NumberFormat fmt = NumberFormat.getCompactNumberInstance(
- *                             Locale.forLanguageTag("hi-IN"), NumberFormat.Style.SHORT);
- * String result = fmt.format(1000);
- * }</blockquote>
+ * <h2>Getting a CompactNumberFormat</h2>
+ * To get a compact number format, use one of the ways listed below.
+ * <ul>
+ * <li> Use the factory method {@link NumberFormat#getCompactNumberInstance()}
+ * to obtain a format for the default locale with
+ * {@link NumberFormat.Style#SHORT SHORT} style.
+ * <li> Use the factory methood {@link NumberFormat#getCompactNumberInstance(Locale, Style)}
+ * to obtain a format for a different locale
+ * and to control the {@linkplain ##compact_number_style Style}.
+ * <li> Use one of the {@code CompactNumberFormat} constructors, for example, {@link
+ * CompactNumberFormat#CompactNumberFormat(String, DecimalFormatSymbols, String[])
+ * CompactNumberFormat(decimalPattern, symbols, compactPatterns)}, to obtain a
+ * {@code CompactNumberFormat} with further customization.
+ * </ul>
+ * <p>If a standard compact format for a given locale and {@link
+ * ##compact_number_style style} is desired, it is recommended to use one of the
+ * NumberFormat factory methods listed above. To use an instance method
+ * defined by {@code CompactNumberFormat}, the {@code NumberFormat} returned by
+ * these factory methods should be type checked before converted to {@code CompactNumberFormat}.
+ * If the installed locale-sensitive service implementation does not support
+ * the given {@code Locale}, the parent locale chain will be looked up, and
+ * a {@code Locale} used that is supported.
  *
  * <h2><a id="compact_number_style">Style</a></h2>
- * <p>
- * A number can be formatted in the compact forms with two different
- * styles, {@link NumberFormat.Style#SHORT SHORT}
- * and {@link NumberFormat.Style#LONG LONG}. Use
- * {@link NumberFormat#getCompactNumberInstance(Locale, Style)} for formatting and
- * parsing a number in {@link NumberFormat.Style#SHORT SHORT} or
- * {@link NumberFormat.Style#LONG LONG} compact form,
- * where the given {@code Style} parameter requests the desired
- * format. A {@link NumberFormat.Style#SHORT SHORT} style
- * compact number instance in the {@link java.util.Locale#US US locale} formats
- * {@code 10000} as {@code "10K"}. However, a
- * {@link NumberFormat.Style#LONG LONG} style instance in same locale
- * formats {@code 10000} as {@code "10 thousand"}.
+ * When using {@link NumberFormat#getCompactNumberInstance(Locale, Style)}, a
+ * compact form can be retrieved with either a {@link NumberFormat.Style#SHORT
+ * SHORT} or {@link NumberFormat.Style#LONG LONG} style.
+ * For example, a {@link NumberFormat.Style#SHORT SHORT} style compact number instance in
+ * the {@link java.util.Locale#US US locale} formats {@code 10000} as {@code
+ * "10K"}. However, a {@link NumberFormat.Style#LONG LONG} style instance in
+ * the same locale formats {@code 10000} as {@code "10 thousand"}.
+ *
+ * <h2>Using CompactNumberFormat</h2>
+ * The following is an example of formatting and parsing in a localized manner,
+ *
+ * {@snippet lang=java :
+ * NumberFormat compactFormat = NumberFormat.getCompactNumberInstance(Locale.US, NumberFormat.Style.SHORT);
+ * compactFormat.format(1000); // returns "1K"
+ * compactFormat.parse("1K"); // returns 1000
+ * }
+ *
+ * <h2 id="formatting">Formatting</h2>
+ * The default formatting behavior returns a formatted string with no fractional
+ * digits, however users can use the {@link #setMinimumFractionDigits(int)}
+ * method to include the fractional part.
+ * The number {@code 1000.0} or {@code 1000} is formatted as {@code "1K"}
+ * not {@code "1.00K"} (in the {@link java.util.Locale#US US locale}). For this
+ * reason, the patterns provided for formatting contain only the minimum
+ * integer digits, prefix and/or suffix, but no fractional part.
+ * For example, patterns used are {@code {"", "", "", 0K, 00K, ...}}. If the pattern
+ * selected for formatting a number is {@code "0"} (special pattern),
+ * either explicit or defaulted, then the general number formatting provided by
+ * {@link java.text.DecimalFormat DecimalFormat}
+ * for the specified locale is used.
+ *
+ * <h3>Rounding</h3>
+ * {@code CompactNumberFormat} provides rounding modes defined in
+ * {@link java.math.RoundingMode} for formatting.  By default, it uses
+ * {@link java.math.RoundingMode#HALF_EVEN RoundingMode.HALF_EVEN}.
+ *
+ * <h2>Parsing</h2>
+ * The default parsing behavior does not allow a grouping separator until
+ * grouping used is set to {@code true} by using
+ * {@link #setGroupingUsed(boolean)}. The parsing of the fractional part
+ * depends on the {@link #isParseIntegerOnly()}. For example, if the
+ * parse integer only is set to true, then the fractional part is skipped.
  *
  * <h2><a id="compact_number_patterns">Compact Number Patterns</a></h2>
  * <p>
- * The compact number patterns are represented in a series of patterns where each
- * pattern is used to format a range of numbers. An example of
- * {@link NumberFormat.Style#SHORT SHORT} styled compact number patterns
+ * The {@code compactPatterns} in {@link
+ * CompactNumberFormat#CompactNumberFormat(String, DecimalFormatSymbols, String[])
+ * CompactNumberFormat(decimalPattern, symbols, compactPatterns)} are represented
+ * as a series of strings, where each string is a {@link ##compact_number_syntax
+ * pattern} that is used to format a range of numbers.
+ *
+ * <p> An example of the {@link NumberFormat.Style#SHORT SHORT} styled compact number patterns
  * for the {@link java.util.Locale#US US locale} is {@code {"", "", "", "0K",
  * "00K", "000K", "0M", "00M", "000M", "0B", "00B", "000B", "0T", "00T", "000T"}},
  * ranging from {@code 10}<sup>{@code 0}</sup> to {@code 10}<sup>{@code 14}</sup>.
  * There can be any number of patterns and they are
  * strictly index based starting from the range {@code 10}<sup>{@code 0}</sup>.
- * For example, in the above patterns, pattern at index 3
- * ({@code "0K"}) is used for formatting {@code number >= 1000 and number < 10000},
- * pattern at index 4 ({@code "00K"}) is used for formatting
- * {@code number >= 10000 and number < 100000} and so on. In most of the locales,
- * patterns with the range
+ * For example, in the above patterns, the pattern at index 3
+ * ({@code "0K"}) is used for formatting a number in the range: {@code 1000 <= number < 10000},
+ * index 4 ({@code "00K"}) for formatting a number the range: {@code 10000 <=
+ * number < 100000}, and so forth.
+ * <p>In most locales, patterns with the range
  * {@code 10}<sup>{@code 0}</sup>-{@code 10}<sup>{@code 2}</sup> are empty
  * strings, which implicitly means a special pattern {@code "0"}.
  * A special pattern {@code "0"} is used for any range which does not contain
  * a compact pattern. This special pattern can appear explicitly for any specific
  * range, or considered as a default pattern for an empty string.
  *
- * <p>
+ * <h3>Negative Subpatterns</h3>
  * A compact pattern contains a positive and negative subpattern
- * separated by a subpattern boundary character {@code ';' (U+003B)},
+ * separated by a subpattern boundary character {@code ';'},
  * for example, {@code "0K;-0K"}. Each subpattern has a prefix,
  * minimum integer digits, and suffix. The negative subpattern
  * is optional, if absent, then the positive subpattern prefixed with the
- * minus sign ({@code '-' U+002D HYPHEN-MINUS}) is used as the negative
+ * minus sign {@code '-' (U+002D HYPHEN-MINUS)} is used as the negative
  * subpattern. That is, {@code "0K"} alone is equivalent to {@code "0K;-0K"}.
  * If there is an explicit negative subpattern, it serves only to specify
  * the negative prefix and suffix. The number of minimum integer digits,
@@ -128,31 +161,35 @@ import java.util.stream.Collectors;
  * That means that {@code "0K;-00K"} produces precisely the same behavior
  * as {@code "0K;-0K"}.
  *
- * <p>
+ * <h4>Escaping Special Characters</h4>
  * Many characters in a compact pattern are taken literally, they are matched
  * during parsing and output unchanged during formatting.
  * {@linkplain DecimalFormat##special_pattern_character Special characters},
  * on the other hand, stand for other characters, strings, or classes of
- * characters. They must be quoted, using single quote {@code ' (U+0027)}
+ * characters. These characters must be quoted using single quotes {@code ' (U+0027)}
  * unless noted otherwise, if they are to appear in the prefix or suffix
  * as literals. For example, 0\u0915'.'.
  *
  * <h3>Plurals</h3>
+ * <p> {@code CompactNumberFormat} support patterns for both singular and plural
+ * compact forms. For the plural form, the {@code Pattern} should consist
+ * of {@code PluralPattern}(s) separated by a space ' ' (U+0020) that are enumerated
+ * within a pair of curly brackets '{' (U+007B) and '}' (U+007D).
+ * In this format, each {@code PluralPattern} consists of its {@code count},
+ * followed by a single colon {@code ':' (U+003A)} and a {@code SimplePattern}.
+ * As a space is reserved for separating subsequent {@code PluralPattern}s, it must
+ * be quoted to be used literally in either the {@code prefix} or {@code suffix}.
  * <p>
- * In case some localization requires compact number patterns to be different for
- * plurals, each singular and plural pattern can be enumerated within a pair of
- * curly brackets <code>'{' (U+007B)</code> and <code>'}' (U+007D)</code>, separated
- * by a space {@code ' ' (U+0020)}. If this format is used, each pattern needs to be
- * prepended by its {@code count}, followed by a single colon {@code ':' (U+003A)}.
- * If the pattern includes spaces literally, they must be quoted.
+ * For example, while the pattern representing millions ({@code 10}<sup>{@code 6}
+ * </sup>) in the US locale can be specified as the SimplePattern: {@code "0 Million"}, for the
+ * German locale it can be specified as the PluralPattern:
+ * {@code "{one:0' 'Million other:0' 'Millionen}"}.
+ *
  * <p>
- * For example, the compact number pattern representing millions in German locale can be
- * specified as {@code "{one:0' 'Million other:0' 'Millionen}"}. The {@code count}
- * follows LDML's
+ * <a id="compact_number_syntax">A compact pattern has the following syntax, with {@code count}</a>
+ * following LDML's
  * <a href="https://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules">
- * Language Plural Rules</a>.
- * <p>
- * A compact pattern has the following syntax:
+ * Language Plural Rules</a>:
  * <blockquote><pre>
  * <i>Pattern:</i>
  *         <i>SimplePattern</i>
@@ -179,37 +216,12 @@ import java.util.stream.Collectors;
  *      0 <i>MinimumInteger</i>
  * </pre></blockquote>
  *
- * <h2>Formatting</h2>
- * The default formatting behavior returns a formatted string with no fractional
- * digits, however users can use the {@link #setMinimumFractionDigits(int)}
- * method to include the fractional part.
- * The number {@code 1000.0} or {@code 1000} is formatted as {@code "1K"}
- * not {@code "1.00K"} (in the {@link java.util.Locale#US US locale}). For this
- * reason, the patterns provided for formatting contain only the minimum
- * integer digits, prefix and/or suffix, but no fractional part.
- * For example, patterns used are {@code {"", "", "", 0K, 00K, ...}}. If the pattern
- * selected for formatting a number is {@code "0"} (special pattern),
- * either explicit or defaulted, then the general number formatting provided by
- * {@link java.text.DecimalFormat DecimalFormat}
- * for the specified locale is used.
- *
- * <h2>Parsing</h2>
- * The default parsing behavior does not allow a grouping separator until
- * grouping used is set to {@code true} by using
- * {@link #setGroupingUsed(boolean)}. The parsing of the fractional part
- * depends on the {@link #isParseIntegerOnly()}. For example, if the
- * parse integer only is set to true, then the fractional part is skipped.
- *
- * <h2>Rounding</h2>
- * {@code CompactNumberFormat} provides rounding modes defined in
- * {@link java.math.RoundingMode} for formatting.  By default, it uses
- * {@link java.math.RoundingMode#HALF_EVEN RoundingMode.HALF_EVEN}.
- *
  * @spec https://www.unicode.org/reports/tr35
  *      Unicode Locale Data Markup Language (LDML)
  * @see NumberFormat.Style
  * @see NumberFormat
  * @see DecimalFormat
+ * @see Locale
  * @since 12
  */
 public final class CompactNumberFormat extends NumberFormat {
@@ -389,10 +401,19 @@ public final class CompactNumberFormat extends NumberFormat {
      * To obtain the instance of {@code CompactNumberFormat} with the standard
      * compact patterns for a {@code Locale} and {@code Style},
      * it is recommended to use the factory methods given by
-     * {@code NumberFormat} for compact number formatting. For example,
-     * {@link NumberFormat#getCompactNumberInstance(Locale, Style)}.
+     * {@code NumberFormat} for compact number formatting.
      *
-     * @param decimalPattern a decimal pattern for general number formatting
+     * <p>Below is an example of using the constructor,
+     *
+     * {@snippet lang=java :
+     * String[] compactPatterns = {"", "", "", "a lot"};
+     * NumberFormat fmt = new CompactNumberFormat("00", DecimalFormatSymbols.getInstance(Locale.US), compactPatterns);
+     * fmt.format(1); // returns "01"
+     * fmt.format(1000); // returns "a lot"
+     * }
+     *
+     * @param decimalPattern a {@linkplain DecimalFormat##patterns decimal pattern}
+     *                       for general number formatting
      * @param symbols the set of symbols to be used
      * @param compactPatterns an array of
      *        {@linkplain ##compact_number_patterns compact number patterns}
@@ -419,7 +440,8 @@ public final class CompactNumberFormat extends NumberFormat {
      * {@code NumberFormat} for compact number formatting. For example,
      * {@link NumberFormat#getCompactNumberInstance(Locale, Style)}.
      *
-     * @param decimalPattern a decimal pattern for general number formatting
+     * @param decimalPattern a {@linkplain DecimalFormat##patterns decimal pattern}
+     *                      for general number formatting
      * @param symbols the set of symbols to be used
      * @param compactPatterns an array of
      *        {@linkplain ##compact_number_patterns compact number patterns}
diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index 752c3924855..2fc64d8e63e 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -56,45 +56,104 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
 
 /**
  * {@code DecimalFormat} is a concrete subclass of
- * {@code NumberFormat} that formats decimal numbers. It has a variety of
- * features designed to make it possible to parse and format numbers in any
- * locale, including support for Western, Arabic, and Indic digits.  It also
- * supports different kinds of numbers, including integers (123), fixed-point
+ * {@code NumberFormat} that formats decimal numbers in a localized manner.
+ * It has a variety of features designed to make it possible to parse and format
+ * numbers in any locale, including support for Western, Arabic, and Indic digits.
+ * It also supports different kinds of numbers, including integers (123), fixed-point
  * numbers (123.4), scientific notation (1.23E4), percentages (12%), and
- * currency amounts ($123).  All of these can be localized.
+ * currency amounts ($123).
  *
- * <p>To obtain a {@code NumberFormat} for a specific locale, including the
- * default locale, call one of {@code NumberFormat}'s factory methods, such
- * as {@code getInstance()}.  In general, do not call the
- * {@code DecimalFormat} constructors directly, since the
- * {@code NumberFormat} factory methods may return subclasses other than
- * {@code DecimalFormat}. If you need to customize the format object, do
- * something like this:
+ * <h2>Getting a DecimalFormat</h2>
  *
- * <blockquote>{@snippet lang=java :
- * NumberFormat numFormat = NumberFormat.getInstance(loc);
- * if (numFormat instanceof DecimalFormat decFormat) {
- *     decFormat.setDecimalSeparatorAlwaysShown(true);
+ * To obtain a standard decimal format for a specific locale, including the default locale,
+ * it is recommended to call one of the {@code NumberFormat}
+ * {@link NumberFormat##factory_methods factory methods}, such as {@link NumberFormat#getInstance()}.
+ * These factory methods may not always return a {@code DecimalFormat}
+ * depending on the locale-service provider implementation
+ * installed. Thus, to use an instance method defined by {@code DecimalFormat},
+ * the {@code NumberFormat} returned by the factory method should be
+ * type checked before converted to {@code DecimalFormat}. If the installed locale-sensitive
+ * service implementation does not support the given {@code Locale}, the parent
+ * locale chain will be looked up, and a {@code Locale} used that is supported.
+ *
+ * <p>If the factory methods are not desired, use one of the constructors such
+ * as {@link #DecimalFormat(String) DecimalFormat(String pattern)}. See the {@link
+ * ##patterns Pattern} section for more information on the {@code pattern} parameter.
+ *
+ * <h2>Using DecimalFormat</h2>
+ * The following is an example of formatting and parsing,
+ * {@snippet lang=java :
+ * NumberFormat nFmt = NumberFormat.getCurrencyInstance(Locale.US);
+ * if (nFmt instanceof DecimalFormat dFmt) {
+ *     // pattern match to DecimalFormat to use setPositiveSuffix(String)
+ *     dFmt.setPositiveSuffix(" dollars");
+ *     dFmt.format(100000); // returns "$100,000.00 dollars"
+ *     dFmt.parse("$100,000.00 dollars"); // returns 100000
+ * }
  * }
- * }</blockquote>
  *
- * <p>A {@code DecimalFormat} comprises a <em>pattern</em> and a set of
- * <em>symbols</em>.  The pattern may be set directly using
- * {@code applyPattern()}, or indirectly using the API methods.  The
- * symbols are stored in a {@code DecimalFormatSymbols} object.  When using
- * the {@code NumberFormat} factory methods, the pattern and symbols are
- * read from localized {@code ResourceBundle}s.
  *
- * <h2 id="patterns">Patterns</h2>
+ * <h2 id="formatting">Formatting and Parsing</h2>
+ * <h3 id="rounding">Rounding</h3>
  *
- * Note: For any given {@code DecimalFormat} pattern, if the pattern is not
- * in scientific notation, the maximum number of integer digits will not be
- * derived from the pattern, and instead set to {@link Integer#MAX_VALUE}.
- * Otherwise, if the pattern is in scientific notation, the maximum number of
- * integer digits will be derived from the pattern. This derivation is detailed
- * in the {@link ##scientific_notation Scientific Notation} section. This behavior
- * is the typical end-user desire; {@link #setMaximumIntegerDigits(int)} can be
- * used to manually adjust the maximum integer digits.
+ * When formatting, {@code DecimalFormat} can adjust its rounding using {@link
+ * #setRoundingMode(RoundingMode)}. By default, it uses
+ * {@link java.math.RoundingMode#HALF_EVEN RoundingMode.HALF_EVEN}.
+ *
+ * <h3>Digits</h3>
+ *
+ * When formatting, {@code DecimalFormat} uses the ten consecutive
+ * characters starting with the localized zero digit defined in the
+ * {@code DecimalFormatSymbols} object as digits.
+ * <p>When parsing, these digits as well as all Unicode decimal digits, as
+ * defined by {@link Character#digit Character.digit}, are recognized.
+ *
+ * <h3 id="digit_limits"> Integer and Fraction Digit Limits </h3>
+ * @implSpec
+ * When formatting a {@code Number} other than {@code BigInteger} and
+ * {@code BigDecimal}, {@code 309} is used as the upper limit for integer digits,
+ * and {@code 340} as the upper limit for fraction digits. This occurs, even if
+ * one of the {@code DecimalFormat} getter methods, for example, {@link #getMinimumFractionDigits()}
+ * returns a numerically greater value.
+ *
+ * <h3>Special Values</h3>
+ * <ul>
+ * <li><p><b>Not a Number</b> ({@code NaN}) is formatted as a string,
+ * which is typically given as "NaN". This string is determined by {@link
+ * DecimalFormatSymbols#getNaN()}. This is the only value for which the prefixes
+ * and suffixes are not attached.
+ *
+ * <li><p><b>Infinity</b> is formatted as a string, which is typically given as
+ * "&#8734;" ({@code U+221E}), with the positive or negative prefixes and suffixes
+ * attached. This string is determined by {@link DecimalFormatSymbols#getInfinity()}.
+ *
+ * <li><p><b>Negative zero</b> ({@code "-0"}) parses to
+ * <ul>
+ * <li>{@code BigDecimal(0)} if {@code isParseBigDecimal()} is
+ * true
+ * <li>{@code Long(0)} if {@code isParseBigDecimal()} is false
+ *     and {@code isParseIntegerOnly()} is true
+ * <li>{@code Double(-0.0)} if both {@code isParseBigDecimal()}
+ * and {@code isParseIntegerOnly()} are false
+ * </ul>
+ * </ul>
+ *
+ * <h2><a id="synchronization">Synchronization</a></h2>
+ *
+ * <p>
+ * Decimal formats are generally not synchronized.
+ * It is recommended to create separate format instances for each thread.
+ * If multiple threads access a format concurrently, it must be synchronized
+ * externally.
+ *
+ * <h2 id="patterns">DecimalFormat Pattern</h2>
+ *
+ * A {@code DecimalFormat} comprises a <em>pattern</em> and a set of
+ * <em>symbols</em>. The pattern may be set directly using {@code applyPattern()},
+ * or indirectly using the various API methods. The symbols are stored in a {@code
+ * DecimalFormatSymbols} object. When using the {@code NumberFormat} factory
+ * methods, the pattern and symbols are created from the locale-sensitive service
+ * implementation installed.
  *
  * <p> {@code DecimalFormat} patterns have the following syntax:
  * <blockquote><pre>
@@ -135,11 +194,115 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  *         0 <i>MinimumExponent<sub>opt</sub></i>
  * </pre></blockquote>
  *
- * <p>A {@code DecimalFormat} pattern contains a positive and negative
+ * <h3><a id="special_pattern_character">Special Pattern Characters</a></h3>
+ *
+ * <p>The special characters in the table below are interpreted syntactically when
+ * used in the DecimalFormat pattern.
+ * They must be quoted, unless noted otherwise, if they are to appear in the
+ * prefix or suffix as literals.
+ *
+ * <p> The characters in the {@code Symbol} column are used in non-localized
+ * patterns. The corresponding characters in the {@code Localized Symbol} column are used
+ * in localized patterns, with the characters in {@code Symbol} losing their
+ * syntactical meaning. Two exceptions are the currency sign ({@code U+00A4}) and
+ * quote ({@code U+0027}), which are not localized.
+ * <p>
+ * Non-localized patterns should be used when calling {@link #applyPattern(String)}.
+ * Localized patterns should be used when calling {@link #applyLocalizedPattern(String)}.
+ *
+ * <blockquote>
+ * <table class="striped">
+ * <caption style="display:none">Chart showing symbol, location, localized, and meaning.</caption>
+ * <thead>
+ *     <tr>
+ *          <th scope="col" style="text-align:left">Symbol
+ *          <th scope="col" style="text-align:left">Localized Symbol
+ *          <th scope="col" style="text-align:left">Location
+ *          <th scope="col" style="text-align:left;width:50%">Meaning
+ * </thead>
+ * <tbody>
+ *     <tr>
+ *          <th scope="row">{@code 0}
+ *          <td>{@link DecimalFormatSymbols#getZeroDigit()}
+ *          <td>Number
+ *          <td>Digit
+ *     <tr>
+ *          <th scope="row">{@code #}
+ *          <td>{@link DecimalFormatSymbols#getDigit()}
+ *          <td>Number
+ *          <td>Digit, zero shows as absent
+ *     <tr>
+ *          <th scope="row">{@code .}
+ *          <td>{@link DecimalFormatSymbols#getDecimalSeparator()}
+ *          <td>Number
+ *          <td>Decimal separator or monetary decimal separator
+ *     <tr>
+ *          <th scope="row">{@code - (U+002D)}
+ *          <td>{@link DecimalFormatSymbols#getMinusSign()}
+ *          <td>Number
+ *          <td>Minus sign
+ *     <tr>
+ *          <th scope="row">{@code ,}
+ *          <td>{@link DecimalFormatSymbols#getGroupingSeparator()}
+ *          <td>Number
+ *          <td>Grouping separator or monetary grouping separator
+ *     <tr>
+ *          <th scope="row">{@code E}
+ *          <td>{@link DecimalFormatSymbols#getExponentSeparator()}
+ *          <td>Number
+ *          <td>Separates mantissa and exponent in scientific notation. This value
+ *              is case sensistive. <em>Need not be quoted in prefix or suffix.</em>
+ *     <tr>
+ *          <th scope="row">{@code ;}
+ *          <td>{@link DecimalFormatSymbols#getPatternSeparator()}
+ *          <td>Subpattern boundary
+ *          <td>Separates positive and negative subpatterns
+ *     <tr>
+ *          <th scope="row">{@code %}
+ *          <td>{@link DecimalFormatSymbols#getPercent()}
+ *          <td>Prefix or suffix
+ *          <td>Multiply by 100 and show as percentage
+ *     <tr>
+ *          <th scope="row">&permil; ({@code U+2030})
+ *          <td>{@link DecimalFormatSymbols#getPerMill()}
+ *          <td>Prefix or suffix
+ *          <td>Multiply by 1000 and show as per mille value
+ *     <tr>
+ *          <th scope="row">&#164; ({@code U+00A4})
+ *          <td> n/a (not localized)
+ *          <td>Prefix or suffix
+ *          <td>Currency sign, replaced by currency symbol.  If
+ *              doubled, replaced by international currency symbol.
+ *              If present in a pattern, the monetary decimal/grouping separators
+ *              are used instead of the decimal/grouping separators.
+ *     <tr>
+ *          <th scope="row">{@code ' (U+0027)}
+ *          <td> n/a (not localized)
+ *          <td>Prefix or suffix
+ *          <td>Used to quote special characters in a prefix or suffix,
+ *              for example, {@code "'#'#"} formats 123 to
+ *              {@code "#123"}.  To create a single quote
+ *              itself, use two in a row: {@code "# o''clock"}.
+ * </tbody>
+ * </table>
+ * </blockquote>
+ *
+ * <h3>Maximum Digits Derivation</h3>
+ * For any given {@code DecimalFormat} pattern, if the pattern is not
+ * in scientific notation, the maximum number of integer digits will not be
+ * derived from the pattern, and instead set to {@link Integer#MAX_VALUE}.
+ * Otherwise, if the pattern is in scientific notation, the maximum number of
+ * integer digits will be derived from the pattern. This derivation is detailed
+ * in the {@link ##scientific_notation Scientific Notation} section. {@link
+ * #setMaximumIntegerDigits(int)} can be used to manually adjust the maximum
+ * integer digits.
+ *
+ * <h3>Negative Subpatterns</h3>
+ * A {@code DecimalFormat} pattern contains a positive and negative
  * subpattern, for example, {@code "#,##0.00;(#,##0.00)"}.  Each
  * subpattern has a prefix, numeric part, and suffix. The negative subpattern
  * is optional; if absent, then the positive subpattern prefixed with the
- * minus sign ({@code '-' U+002D HYPHEN-MINUS}) is used as the
+ * minus sign {@code '-' (U+002D HYPHEN-MINUS)} is used as the
  * negative subpattern. That is, {@code "0.00"} alone is equivalent to
  * {@code "0.00;-0.00"}.  If there is an explicit negative subpattern, it
  * serves only to specify the negative prefix and suffix; the number of digits,
@@ -158,105 +321,15 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  * specified.)  Another example is that the decimal separator and grouping
  * separator should be distinct characters, or parsing will be impossible.
  *
+ * <h3>Grouping Separator</h3>
  * <p>The grouping separator is commonly used for thousands, but in some
- * countries it separates ten-thousands. The grouping size is a constant number
+ * locales it separates ten-thousands. The grouping size is a constant number
  * of digits between the grouping characters, such as 3 for 100,000,000 or 4 for
- * 1,0000,0000.  If you supply a pattern with multiple grouping characters, the
+ * 1,0000,0000. If you supply a pattern with multiple grouping characters, the
  * interval between the last one and the end of the integer is the one that is
- * used. So {@code "#,##,###,####"} == {@code "######,####"} ==
+ * used. For example, {@code "#,##,###,####"} == {@code "######,####"} ==
  * {@code "##,####,####"}.
  *
- * <h3><a id="special_pattern_character">Special Pattern Characters</a></h3>
- *
- * <p>Many characters in a pattern are taken literally; they are matched during
- * parsing and output unchanged during formatting.  Special characters, on the
- * other hand, stand for other characters, strings, or classes of characters.
- * They must be quoted, unless noted otherwise, if they are to appear in the
- * prefix or suffix as literals.
- *
- * <p>The characters listed here are used in non-localized patterns.  Localized
- * patterns use the corresponding characters taken from this formatter's
- * {@code DecimalFormatSymbols} object instead, and these characters lose
- * their special status.  Two exceptions are the currency sign and quote, which
- * are not localized.
- *
- * <blockquote>
- * <table class="striped">
- * <caption style="display:none">Chart showing symbol, location, localized, and meaning.</caption>
- * <thead>
- *     <tr>
- *          <th scope="col" style="text-align:left">Symbol
- *          <th scope="col" style="text-align:left">Location
- *          <th scope="col" style="text-align:left">Localized?
- *          <th scope="col" style="text-align:left">Meaning
- * </thead>
- * <tbody>
- *     <tr style="vertical-align:top">
- *          <th scope="row">{@code 0}
- *          <td>Number
- *          <td>Yes
- *          <td>Digit
- *     <tr style="vertical-align: top">
- *          <th scope="row">{@code #}
- *          <td>Number
- *          <td>Yes
- *          <td>Digit, zero shows as absent
- *     <tr style="vertical-align:top">
- *          <th scope="row">{@code .}
- *          <td>Number
- *          <td>Yes
- *          <td>Decimal separator or monetary decimal separator
- *     <tr style="vertical-align: top">
- *          <th scope="row">{@code -}
- *          <td>Number
- *          <td>Yes
- *          <td>Minus sign
- *     <tr style="vertical-align:top">
- *          <th scope="row">{@code ,}
- *          <td>Number
- *          <td>Yes
- *          <td>Grouping separator or monetary grouping separator
- *     <tr style="vertical-align: top">
- *          <th scope="row">{@code E}
- *          <td>Number
- *          <td>Yes
- *          <td>Separates mantissa and exponent in scientific notation.
- *              <em>Need not be quoted in prefix or suffix.</em>
- *     <tr style="vertical-align:top">
- *          <th scope="row">{@code ;}
- *          <td>Subpattern boundary
- *          <td>Yes
- *          <td>Separates positive and negative subpatterns
- *     <tr style="vertical-align: top">
- *          <th scope="row">{@code %}
- *          <td>Prefix or suffix
- *          <td>Yes
- *          <td>Multiply by 100 and show as percentage
- *     <tr style="vertical-align:top">
- *          <th scope="row">{@code U+2030}
- *          <td>Prefix or suffix
- *          <td>Yes
- *          <td>Multiply by 1000 and show as per mille value
- *     <tr style="vertical-align: top">
- *          <th scope="row">&#164; ({@code U+00A4})
- *          <td>Prefix or suffix
- *          <td>No
- *          <td>Currency sign, replaced by currency symbol.  If
- *              doubled, replaced by international currency symbol.
- *              If present in a pattern, the monetary decimal/grouping separators
- *              are used instead of the decimal/grouping separators.
- *     <tr style="vertical-align:top">
- *          <th scope="row">{@code '}
- *          <td>Prefix or suffix
- *          <td>No
- *          <td>Used to quote special characters in a prefix or suffix,
- *              for example, {@code "'#'#"} formats 123 to
- *              {@code "#123"}.  To create a single quote
- *              itself, use two in a row: {@code "# o''clock"}.
- * </tbody>
- * </table>
- * </blockquote>
- *
  * <h3 id="scientific_notation">Scientific Notation</h3>
  *
  * <p>Numbers in scientific notation are expressed as the product of a mantissa
@@ -339,95 +412,13 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  * <li>Exponential patterns may not contain grouping separators.
  * </ul>
  *
- * <h3>Rounding</h3>
- *
- * {@code DecimalFormat} provides rounding modes defined in
- * {@link java.math.RoundingMode} for formatting.  By default, it uses
- * {@link java.math.RoundingMode#HALF_EVEN RoundingMode.HALF_EVEN}.
- *
- * <h3>Digits</h3>
- *
- * For formatting, {@code DecimalFormat} uses the ten consecutive
- * characters starting with the localized zero digit defined in the
- * {@code DecimalFormatSymbols} object as digits. For parsing, these
- * digits as well as all Unicode decimal digits, as defined by
- * {@link Character#digit Character.digit}, are recognized.
- *
- * <h3 id="digit_limits"> Integer and Fraction Digit Limits </h3>
- *
- * @implSpec
- * When formatting a {@code Number} other than {@code BigInteger} and
- * {@code BigDecimal}, {@code 309} is used as the upper limit for integer digits,
- * and {@code 340} as the upper limit for fraction digits. This occurs, even if
- * one of the {@code DecimalFormat} getter methods, for example, {@link #getMinimumFractionDigits()}
- * returns a numerically greater value.
- *
- * <h4>Special Values</h4>
- *
- * <p>Not a Number({@code NaN}) is formatted as a string, which typically has a
- * single character {@code U+FFFD}.  This string is determined by the
- * {@code DecimalFormatSymbols} object.  This is the only value for which
- * the prefixes and suffixes are not used.
- *
- * <p>Infinity is formatted as a string, which typically has a single character
- * {@code U+221E}, with the positive or negative prefixes and suffixes
- * applied.  The infinity string is determined by the
- * {@code DecimalFormatSymbols} object.
- *
- * <p>Negative zero ({@code "-0"}) parses to
- * <ul>
- * <li>{@code BigDecimal(0)} if {@code isParseBigDecimal()} is
- * true,
- * <li>{@code Long(0)} if {@code isParseBigDecimal()} is false
- *     and {@code isParseIntegerOnly()} is true,
- * <li>{@code Double(-0.0)} if both {@code isParseBigDecimal()}
- * and {@code isParseIntegerOnly()} are false.
- * </ul>
- *
- * <h3><a id="synchronization">Synchronization</a></h3>
- *
- * <p>
- * Decimal formats are generally not synchronized.
- * It is recommended to create separate format instances for each thread.
- * If multiple threads access a format concurrently, it must be synchronized
- * externally.
- *
- * <h3>Example</h3>
- *
- * <blockquote>{@snippet lang=java :
- * // Print out a number using the localized number, integer, currency,
- * // and percent format for each locale
- * Locale[] locales = NumberFormat.getAvailableLocales();
- * double myNumber = -1234.56;
- * NumberFormat form;
- * for (int j = 0; j < 4; ++j) {
- *     System.out.println("FORMAT");
- *     for (Locale locale : locales) {
- *         if (locale.getCountry().length() == 0) {
- *             continue; // Skip language-only locales
- *         }
- *         System.out.print(locale.getDisplayName());
- *         form = switch (j) {
- *             case 0 -> NumberFormat.getInstance(locale);
- *             case 1 -> NumberFormat.getIntegerInstance(locale);
- *             case 2 -> NumberFormat.getCurrencyInstance(locale);
- *             default -> NumberFormat.getPercentInstance(locale);
- *         };
- *         if (form instanceof DecimalFormat decForm) {
- *             System.out.print(": " + decForm.toPattern());
- *         }
- *         System.out.print(" -> " + form.format(myNumber));
- *         try {
- *             System.out.println(" -> " + form.parse(form.format(myNumber)));
- *         } catch (ParseException e) {}
- *     }
- * }
- * }</blockquote>
- *
+ * @spec         https://www.unicode.org/reports/tr35
+ *               Unicode Locale Data Markup Language (LDML)
  * @see          <a href="http://docs.oracle.com/javase/tutorial/i18n/format/decimalFormat.html">Java Tutorial</a>
  * @see          NumberFormat
  * @see          DecimalFormatSymbols
  * @see          ParsePosition
+ * @see          Locale
  * @author       Mark Davis
  * @author       Alan Liu
  * @since 1.1
diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java
index bd36ad6dc25..0409efc2da0 100644
--- a/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/src/java.base/share/classes/java/text/NumberFormat.java
@@ -59,102 +59,110 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
 /**
  * {@code NumberFormat} is the abstract base class for all number
  * formats. This class provides the interface for formatting and parsing
- * numbers. {@code NumberFormat} also provides methods for determining
- * which locales have number formats, and what their names are.
+ * numbers in a localized manner. This enables code that can be completely
+ * independent of the locale conventions for decimal points, thousands-separators,
+ * the particular decimal digits used, or whether the number format is even
+ * decimal. For example, this class could be used within an application to
+ * produce a number in a currency format according to the conventions of the desired
+ * locale.
  *
- * <p>
- * {@code NumberFormat} helps you to format and parse numbers for any locale.
- * Your code can be completely independent of the locale conventions for
- * decimal points, thousands-separators, or even the particular decimal
- * digits used, or whether the number format is even decimal.
+ * <h2 id="factory_methods">Getting a NumberFormat</h2>
+ * To get a {@code NumberFormat} for the default Locale, use one of the static
+ * factory methods that return a concrete subclass of {@code NumberFormat}.
+ * The following formats all provide an example of formatting the {@code Number}
+ * "2000.50" with the {@link java.util.Locale#US US} locale as the default locale.
+ * <ul>
+ * <li> Use {@link #getInstance()} or {@link #getNumberInstance()} to get
+ * a decimal format. For example, {@code "2,000.5"}.
+ * <li> Use {@link #getIntegerInstance()} to get an integer number format.
+ * For example, {@code "2,000"}.
+ * <li> Use {@link #getCurrencyInstance} to get a currency number format.
+ * For example, {@code "$2,000.50"}.
+ * <li> Use {@link #getCompactNumberInstance} to get a compact number format.
+ * For example, {@code "2K"}.
+ * <li> Use {@link #getPercentInstance} to get a format for displaying percentages.
+ * For example, {@code "200,050%"}.
+ * </ul>
  *
- * <p>
- * To format a number for the current Locale, use one of the factory
- * class methods:
- * <blockquote>
- * {@snippet lang=java :
- * myString = NumberFormat.getInstance().format(myNumber);
- * }
- * </blockquote>
- * If you are formatting multiple numbers, it is
- * more efficient to get the format and use it multiple times so that
- * the system doesn't have to fetch the information about the local
- * language and country conventions multiple times.
- * <blockquote>
- * {@snippet lang=java :
- * NumberFormat nf = NumberFormat.getInstance();
- * for (var myNumber : numbers) {
- *     output.println(nf.format(myNumber) + "; ");
- * }
- * }
- * </blockquote>
- * To format a number for a different Locale, specify it in the
- * call to {@code getInstance}.
- * <blockquote>
- * {@snippet lang=java :
- * NumberFormat nf = NumberFormat.getInstance(Locale.FRENCH);
- * }
- * </blockquote>
+ * Alternatively, if a {@code NumberFormat} for a different locale is required, use
+ * one of the overloaded factory methods that take {@code Locale} as a parameter,
+ * for example, {@link #getIntegerInstance(Locale)}. If the installed locale-sensitive
+ * service implementation does not support the given {@code Locale}, the parent
+ * locale chain will be looked up, and a {@code Locale} used that is supported.
  *
- * <p>If the locale contains "nu" (numbers) and/or "rg" (region override)
+ * <h3>Locale Extensions</h3>
+ * Formatting behavior can be changed when using a locale that contains any of the following
  * <a href="../util/Locale.html#def_locale_extension">Unicode extensions</a>,
- * the decimal digits, and/or the country used for formatting are overridden.
+ * <ul>
+ * <li> "nu"
+ * (<a href="https://unicode.org/reports/tr35/#UnicodeNumberSystemIdentifier">
+ * Numbering System</a>) - Overrides the decimal digits used
+ * <li> "rg"
+ * (<a href="https://unicode.org/reports/tr35/#RegionOverride">
+ * Region Override</a>) - Overrides the country used
+ * <li> "cf"
+ * (<a href="https://www.unicode.org/reports/tr35/tr35.html#UnicodeCurrencyFormatIdentifier">
+ * Currency Format style</a>) - Overrides the Currency Format style used
+ * </ul>
+ * <p>
  * If both "nu" and "rg" are specified, the decimal digits from the "nu"
  * extension supersedes the implicit one from the "rg" extension.
+ * Although <a href="../util/Locale.html#def_locale_extension">Unicode extensions</a>
+ * defines various keys and values, actual locale-sensitive service implementations
+ * in a Java Runtime Environment might not support any particular Unicode locale
+ * attributes or key/type pairs.
+ * <p>Below is an example of a "US" locale currency format with accounting style,
+ * <blockquote>{@code NumberFormat.getCurrencyInstance(Locale.forLanguageTag("en-US-u-cf-account"));}</blockquote>
+ * With this style, a negative value is formatted enclosed in parentheses, instead
+ * of being prepended with a minus sign.
  *
- * <p>You can also use a {@code NumberFormat} to parse numbers:
- * <blockquote>
+ * <h2>Using NumberFormat</h2>
+ * The following is an example of formatting and parsing in a localized fashion,
  * {@snippet lang=java :
- * myNumber = nf.parse(myString);
+ * NumberFormat currencyFormat = NumberFormat.getCurrencyInstance(Locale.US);
+ * currencyFormat.format(100000); // returns "$100,000.00"
+ * currencyFormat.parse("$100,000.00"); // returns 100000
  * }
- * </blockquote>
- * Use {@code getInstance} or {@code getNumberInstance} to get the
- * normal number format. Use {@code getIntegerInstance} to get an
- * integer number format. Use {@code getCurrencyInstance} to get the
- * currency number format. Use {@code getCompactNumberInstance} to get the
- * compact number format to format a number in shorter form. For example,
- * {@code 2000} can be formatted as {@code "2K"} in
- * {@link java.util.Locale#US US locale}. Use {@code getPercentInstance}
- * to get a format for displaying percentages. With this format, a fraction
- * like 0.53 is displayed as 53%.
+ *
+ * <h2>Customizing NumberFormat</h2>
+ * {@code NumberFormat} provides API to customize formatting and parsing behavior,
+ * <ul>
+ * <li> {@link #setParseIntegerOnly(boolean)}; when {@code true}, will only return the
+ * integer portion of the number parsed from the String.
+ * <li> {@link #setMinimumFractionDigits(int)}; Use to adjust the expected digits when
+ * formatting. Use any of the other minimum/maximum or fraction/integer setter methods
+ * in the same manner.
+ * <li> {@link #setGroupingUsed(boolean)}; when {@code true}, formatted numbers will be displayed
+ * with grouping separators. Additionally, when {@code false}, parsing will not expect
+ * grouping separators in the parsed String.
+ * <li> {@link #setStrict(boolean)}; when {@code true}, parsing will be done strictly.
+ * The behavior of strict parsing should be referred to in the implementing
+ * {@code NumberFormat} subclass.
+ * </ul>
  *
  * <p>
- * You can also control the display of numbers with such methods as
- * {@code setMinimumFractionDigits}.
- * If you want even more control over the format or parsing,
- * or want to give your users more control,
- * you can try casting the {@code NumberFormat} you get from the factory methods
- * to a {@code DecimalFormat} or {@code CompactNumberFormat} depending on
- * the factory method used. This will work for the vast majority of locales;
- * just remember to put it in a {@code try} block in case you encounter
- * an unusual one.
+ * To provide more control over formatting or parsing behavior, type checking can
+ * be done to safely convert to an implementing subclass of {@code NumberFormat}; this
+ * provides additional methods defined by the subclass.
+ * For example,
+ * {@snippet lang=java :
+ * NumberFormat nFmt = NumberFormat.getInstance(Locale.US);
+ * if (nFmt instanceof DecimalFormat dFmt) {
+ *     dFmt.setDecimalSeparatorAlwaysShown(true);
+ *     dFmt.format(100); // returns "100."
+ * }
+ * }
+ * The {@code NumberFormat} subclass returned by the factory methods is dependent
+ * on the locale-service provider implementation installed, and may not always
+ * be {@link DecimalFormat} or {@link CompactNumberFormat}.
  *
  * <p>
- * NumberFormat and DecimalFormat are designed such that some controls
- * work for formatting and others work for parsing.  The following is
- * the detailed description for each these control methods,
- * <p>
- * setParseIntegerOnly : only affects parsing, e.g.
- * if true,  "3456.78" &rarr; 3456 (and leaves the parse position just after index 6)
- * if false, "3456.78" &rarr; 3456.78 (and leaves the parse position just after index 8)
- * This is independent of formatting.  If you want to not show a decimal point
- * where there might be no digits after the decimal point, use
- * setDecimalSeparatorAlwaysShown.
- * <p>
- * setDecimalSeparatorAlwaysShown : only affects formatting, and only where
- * there might be no digits after the decimal point, such as with a pattern
- * like "#,##0.##", e.g.,
- * if true,  3456.00 &rarr; "3,456."
- * if false, 3456.00 &rarr; "3456"
- * This is independent of parsing.  If you want parsing to stop at the decimal
- * point, use setParseIntegerOnly.
- * <p>
  * You can also use forms of the {@code parse} and {@code format}
  * methods with {@code ParsePosition} and {@code FieldPosition} to
  * allow you to:
  * <ul>
- * <li> progressively parse through pieces of a string
- * <li> align the decimal point and other areas
+ * <li> Progressively parse through pieces of a string
+ * <li> Align the decimal point and other areas
  * </ul>
  * For example, you can align numbers in two ways:
  * <ol>
@@ -197,15 +205,20 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
  * If multiple threads access a format concurrently, it must be synchronized
  * externally.
  *
- * @implSpec The {@link #format(double, StringBuffer, FieldPosition)},
+ * @implSpec
+ * Null Parameter Handling
+ * <ul>
+ * <li> The {@link #format(double, StringBuffer, FieldPosition)},
  * {@link #format(long, StringBuffer, FieldPosition)} and
  * {@link #parse(String, ParsePosition)} methods may throw
  * {@code NullPointerException}, if any of their parameter is {@code null}.
  * The subclass may provide its own implementation and specification about
  * {@code NullPointerException}.
+ * </ul>
  *
- * <p>
- * The default implementation provides rounding modes defined
+ * Default RoundingMode
+ * <ul>
+ * <li> The default implementation provides rounding modes defined
  * in {@link java.math.RoundingMode} for formatting numbers. It
  * uses the {@linkplain java.math.RoundingMode#HALF_EVEN
  * round half-even algorithm}. To change the rounding mode use
@@ -214,10 +227,14 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
  * configured to round floating point numbers using half-even
  * rounding (see {@link java.math.RoundingMode#HALF_EVEN
  * RoundingMode.HALF_EVEN}) for formatting.
+ * </ul>
  *
+ * @spec         https://www.unicode.org/reports/tr35
+ *               Unicode Locale Data Markup Language (LDML)
  * @see          DecimalFormat
  * @see          ChoiceFormat
  * @see          CompactNumberFormat
+ * @see          Locale
  * @author       Mark Davis
  * @author       Helena Shih
  * @since 1.1

From 7a895552c8eb9ae19f8d6eb8c35a0393445305fa Mon Sep 17 00:00:00 2001
From: Scott Gibbons <sgibbons@openjdk.org>
Date: Tue, 23 Apr 2024 23:35:59 +0000
Subject: [PATCH 166/486] 8330844: Add aliases for conditional jumps and
 additional instruction forms for x86

Reviewed-by: kvn, epeter, sviswanathan
---
 src/hotspot/cpu/x86/assembler_x86.cpp      | 71 ++++++++++++++++++++++
 src/hotspot/cpu/x86/assembler_x86.hpp      |  9 +++
 src/hotspot/cpu/x86/macroAssembler_x86.cpp | 10 +++
 src/hotspot/cpu/x86/macroAssembler_x86.hpp | 70 +++++++++++++++++++++
 4 files changed, 160 insertions(+)

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index e4885fa946d..f5a6cb845ad 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -1758,6 +1758,22 @@ void Assembler::cmovl(Condition cc, Register dst, Address src) {
   emit_operand(dst, src, 0);
 }
 
+void Assembler::cmpb(Address dst, Register reg) {
+  assert(reg->has_byte_register(), "must have byte register");
+  InstructionMark im(this);
+  prefix(dst, reg, true);
+  emit_int8((unsigned char)0x38);
+  emit_operand(reg, dst, 0);
+}
+
+void Assembler::cmpb(Register reg, Address dst) {
+  assert(reg->has_byte_register(), "must have byte register");
+  InstructionMark im(this);
+  prefix(dst, reg, true);
+  emit_int8((unsigned char)0x3a);
+  emit_operand(reg, dst, 0);
+}
+
 void Assembler::cmpb(Address dst, int imm8) {
   InstructionMark im(this);
   prefix(dst);
@@ -1789,6 +1805,13 @@ void Assembler::cmpl(Register dst, Address src) {
   emit_operand(dst, src, 0);
 }
 
+void Assembler::cmpl(Address dst,  Register reg) {
+  InstructionMark im(this);
+  prefix(dst, reg);
+  emit_int8(0x39);
+  emit_operand(reg, dst, 0);
+}
+
 void Assembler::cmpl_imm32(Address dst, int32_t imm32) {
   InstructionMark im(this);
   prefix(dst);
@@ -1804,6 +1827,14 @@ void Assembler::cmpw(Address dst, int imm16) {
   emit_int16(imm16);
 }
 
+void Assembler::cmpw(Address dst, Register reg) {
+  InstructionMark im(this);
+  emit_int8(0x66);
+  prefix(dst, reg);
+  emit_int8((unsigned char)0x39);
+  emit_operand(reg, dst, 0);
+}
+
 // The 32-bit cmpxchg compares the value at adr with the contents of rax,
 // and stores reg into adr if so; otherwise, the value at adr is loaded into rax,.
 // The ZF is set if the compared values were equal, and cleared otherwise.
@@ -4425,6 +4456,16 @@ void Assembler::vpcmpeqb(XMMRegister dst, XMMRegister nds, XMMRegister src, int
   emit_int16(0x74, (0xC0 | encode));
 }
 
+void Assembler::vpcmpeqb(XMMRegister dst, XMMRegister src1, Address src2, int vector_len) {
+  assert(vector_len == AVX_128bit ? VM_Version::supports_avx() : VM_Version::supports_avx2(), "");
+  assert(vector_len <= AVX_256bit, "evex encoding is different - has k register as dest");
+  InstructionMark im(this);
+  InstructionAttr attributes(vector_len, /* rex_w */ false, /* legacy_mode */ true, /* no_mask_reg */ true, /* uses_vl */ false);
+  vex_prefix(src2, src1->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int8(0x74);
+  emit_operand(dst, src2, 0);
+}
+
 // In this context, kdst is written the mask used to process the equal components
 void Assembler::evpcmpeqb(KRegister kdst, XMMRegister nds, XMMRegister src, int vector_len) {
   assert(VM_Version::supports_avx512bw(), "");
@@ -4531,6 +4572,17 @@ void Assembler::vpcmpeqw(XMMRegister dst, XMMRegister nds, XMMRegister src, int
   emit_int16(0x75, (0xC0 | encode));
 }
 
+// In this context, the dst vector contains the components that are equal, non equal components are zeroed in dst
+void Assembler::vpcmpeqw(XMMRegister dst, XMMRegister nds, Address src, int vector_len) {
+  assert(vector_len == AVX_128bit ? VM_Version::supports_avx() : VM_Version::supports_avx2(), "");
+  assert(vector_len <= AVX_256bit, "evex encoding is different - has k register as dest");
+  InstructionMark im(this);
+  InstructionAttr attributes(vector_len, /* rex_w */ false, /* legacy_mode */ true, /* no_mask_reg */ true, /* uses_vl */ false);
+  vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int8(0x75);
+  emit_operand(dst, src, 0);
+}
+
 // In this context, kdst is written the mask used to process the equal components
 void Assembler::evpcmpeqw(KRegister kdst, XMMRegister nds, XMMRegister src, int vector_len) {
   assert(VM_Version::supports_avx512bw(), "");
@@ -7648,6 +7700,14 @@ void Assembler::vpminsb(XMMRegister dst, XMMRegister nds, XMMRegister src, int v
   emit_int16(0x38, (0xC0 | encode));
 }
 
+void Assembler::vpminub(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) {
+  assert(vector_len == AVX_128bit ? VM_Version::supports_avx() :
+        (vector_len == AVX_256bit ? VM_Version::supports_avx2() : VM_Version::supports_avx512bw()), "");
+  InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
+  int encode = vex_prefix_and_encode(dst->encoding(), nds->encoding(), src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int16(0xDA, (0xC0 | encode));
+}
+
 void Assembler::pminsw(XMMRegister dst, XMMRegister src) {
   assert(VM_Version::supports_sse2(), "");
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
@@ -12273,6 +12333,13 @@ void Assembler::bzhiq(Register dst, Register src1, Register src2) {
   emit_int16((unsigned char)0xF5, (0xC0 | encode));
 }
 
+void Assembler::bzhil(Register dst, Register src1, Register src2) {
+  assert(VM_Version::supports_bmi2(), "bit manipulation instructions not supported");
+  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ true, /* no_mask_reg */ true, /* uses_vl */ false);
+  int encode = vex_prefix_and_encode(dst->encoding(), src2->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_38, &attributes);
+  emit_int16((unsigned char)0xF5, (0xC0 | encode));
+}
+
 void Assembler::pextl(Register dst, Register src1, Register src2) {
   assert(VM_Version::supports_bmi2(), "bit manipulation instructions not supported");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ true, /* no_mask_reg */ true, /* uses_vl */ false);
@@ -13167,6 +13234,10 @@ void Assembler::cdqq() {
   emit_int16(REX_W, (unsigned char)0x99);
 }
 
+void Assembler::cdqe() {
+  emit_int16(REX_W, (unsigned char)0x98);
+}
+
 void Assembler::clflush(Address adr) {
   assert(VM_Version::supports_clflush(), "should do");
   prefix(adr);
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 64e8cf99bfc..a8747a4308a 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1094,6 +1094,7 @@ private:
   void cdql();
 
   void cdqq();
+  void cdqe();
 
   void cld();
 
@@ -1109,12 +1110,15 @@ private:
 
 
   void cmpb(Address dst, int imm8);
+  void cmpb(Address dst, Register reg);
+  void cmpb(Register reg, Address dst);
 
   void cmpl(Address dst, int32_t imm32);
   void cmpl(Register dst, int32_t imm32);
   void cmpl(Register dst, Register src);
   void cmpl(Register dst, Address src);
   void cmpl_imm32(Address dst, int32_t imm32);
+  void cmpl(Address dst,  Register reg);
 
   void cmpq(Address dst, int32_t imm32);
   void cmpq(Address dst, Register src);
@@ -1123,6 +1127,7 @@ private:
   void cmpq(Register dst, Address src);
 
   void cmpw(Address dst, int imm16);
+  void cmpw(Address dst, Register reg);
 
   void cmpxchg8 (Address adr);
 
@@ -1802,6 +1807,7 @@ private:
   void vpcmpCCbwd(XMMRegister dst, XMMRegister nds, XMMRegister src, int cond_encoding, int vector_len);
 
   void vpcmpeqb(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len);
+  void vpcmpeqb(XMMRegister dst, XMMRegister src1, Address src2, int vector_len);
   void evpcmpeqb(KRegister kdst, XMMRegister nds, XMMRegister src, int vector_len);
   void evpcmpeqb(KRegister kdst, XMMRegister nds, Address src, int vector_len);
   void evpcmpeqb(KRegister kdst, KRegister mask, XMMRegister nds, Address src, int vector_len);
@@ -1816,6 +1822,7 @@ private:
   void evpcmpuq(KRegister kdst, XMMRegister nds, XMMRegister src, ComparisonPredicate vcc, int vector_len);
 
   void pcmpeqw(XMMRegister dst, XMMRegister src);
+  void vpcmpeqw(XMMRegister dst, XMMRegister nds, Address src, int vector_len);
   void vpcmpeqw(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len);
   void evpcmpeqw(KRegister kdst, XMMRegister nds, XMMRegister src, int vector_len);
   void evpcmpeqw(KRegister kdst, XMMRegister nds, Address src, int vector_len);
@@ -2306,6 +2313,7 @@ private:
   void shrxq(Register dst, Address src1, Register src2);
 
   void bzhiq(Register dst, Register src1, Register src2);
+  void bzhil(Register dst, Register src1, Register src2);
 
   void pextl(Register dst, Register src1, Register src2);
   void pdepl(Register dst, Register src1, Register src2);
@@ -2581,6 +2589,7 @@ private:
   // Minimum of packed integers
   void pminsb(XMMRegister dst, XMMRegister src);
   void vpminsb(XMMRegister dst, XMMRegister src1, XMMRegister src2, int vector_len);
+  void vpminub(XMMRegister dst, XMMRegister src1, XMMRegister src2, int vector_len);
   void pminsw(XMMRegister dst, XMMRegister src);
   void vpminsw(XMMRegister dst, XMMRegister src1, XMMRegister src2, int vector_len);
   void pminsd(XMMRegister dst, XMMRegister src);
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 6c8ca583b10..d20f34e27b8 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -3570,11 +3570,21 @@ void MacroAssembler::vpcmpeqb(XMMRegister dst, XMMRegister nds, XMMRegister src,
   Assembler::vpcmpeqb(dst, nds, src, vector_len);
 }
 
+void MacroAssembler::vpcmpeqb(XMMRegister dst, XMMRegister src1, Address src2, int vector_len) {
+  assert(((dst->encoding() < 16 && src1->encoding() < 16) || VM_Version::supports_avx512vlbw()),"XMM register should be 0-15");
+  Assembler::vpcmpeqb(dst, src1, src2, vector_len);
+}
+
 void MacroAssembler::vpcmpeqw(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) {
   assert(((dst->encoding() < 16 && src->encoding() < 16 && nds->encoding() < 16) || VM_Version::supports_avx512vlbw()),"XMM register should be 0-15");
   Assembler::vpcmpeqw(dst, nds, src, vector_len);
 }
 
+void MacroAssembler::vpcmpeqw(XMMRegister dst, XMMRegister nds, Address src, int vector_len) {
+  assert(((dst->encoding() < 16 && nds->encoding() < 16) || VM_Version::supports_avx512vlbw()),"XMM register should be 0-15");
+  Assembler::vpcmpeqw(dst, nds, src, vector_len);
+}
+
 void MacroAssembler::evpcmpeqd(KRegister kdst, KRegister mask, XMMRegister nds, AddressLiteral src, int vector_len, Register rscratch) {
   assert(rscratch != noreg || always_reachable(src), "missing");
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 738ce8a55c3..e045572a5cd 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -955,6 +955,74 @@ public:
   // contained in the location described by entry (not the address of entry)
   void jump(ArrayAddress entry, Register rscratch);
 
+  // Adding more natural conditional jump instructions
+  void ALWAYSINLINE jo(Label& L, bool maybe_short = true) { jcc(Assembler::overflow, L, maybe_short); }
+  void ALWAYSINLINE jno(Label& L, bool maybe_short = true) { jcc(Assembler::noOverflow, L, maybe_short); }
+  void ALWAYSINLINE js(Label& L, bool maybe_short = true) { jcc(Assembler::negative, L, maybe_short); }
+  void ALWAYSINLINE jns(Label& L, bool maybe_short = true) { jcc(Assembler::positive, L, maybe_short); }
+  void ALWAYSINLINE je(Label& L, bool maybe_short = true) { jcc(Assembler::equal, L, maybe_short); }
+  void ALWAYSINLINE jz(Label& L, bool maybe_short = true) { jcc(Assembler::zero, L, maybe_short); }
+  void ALWAYSINLINE jne(Label& L, bool maybe_short = true) { jcc(Assembler::notEqual, L, maybe_short); }
+  void ALWAYSINLINE jnz(Label& L, bool maybe_short = true) { jcc(Assembler::notZero, L, maybe_short); }
+  void ALWAYSINLINE jb(Label& L, bool maybe_short = true) { jcc(Assembler::below, L, maybe_short); }
+  void ALWAYSINLINE jnae(Label& L, bool maybe_short = true) { jcc(Assembler::below, L, maybe_short); }
+  void ALWAYSINLINE jc(Label& L, bool maybe_short = true) { jcc(Assembler::carrySet, L, maybe_short); }
+  void ALWAYSINLINE jnb(Label& L, bool maybe_short = true) { jcc(Assembler::aboveEqual, L, maybe_short); }
+  void ALWAYSINLINE jae(Label& L, bool maybe_short = true) { jcc(Assembler::aboveEqual, L, maybe_short); }
+  void ALWAYSINLINE jnc(Label& L, bool maybe_short = true) { jcc(Assembler::carryClear, L, maybe_short); }
+  void ALWAYSINLINE jbe(Label& L, bool maybe_short = true) { jcc(Assembler::belowEqual, L, maybe_short); }
+  void ALWAYSINLINE jna(Label& L, bool maybe_short = true) { jcc(Assembler::belowEqual, L, maybe_short); }
+  void ALWAYSINLINE ja(Label& L, bool maybe_short = true) { jcc(Assembler::above, L, maybe_short); }
+  void ALWAYSINLINE jnbe(Label& L, bool maybe_short = true) { jcc(Assembler::above, L, maybe_short); }
+  void ALWAYSINLINE jl(Label& L, bool maybe_short = true) { jcc(Assembler::less, L, maybe_short); }
+  void ALWAYSINLINE jnge(Label& L, bool maybe_short = true) { jcc(Assembler::less, L, maybe_short); }
+  void ALWAYSINLINE jge(Label& L, bool maybe_short = true) { jcc(Assembler::greaterEqual, L, maybe_short); }
+  void ALWAYSINLINE jnl(Label& L, bool maybe_short = true) { jcc(Assembler::greaterEqual, L, maybe_short); }
+  void ALWAYSINLINE jle(Label& L, bool maybe_short = true) { jcc(Assembler::lessEqual, L, maybe_short); }
+  void ALWAYSINLINE jng(Label& L, bool maybe_short = true) { jcc(Assembler::lessEqual, L, maybe_short); }
+  void ALWAYSINLINE jg(Label& L, bool maybe_short = true) { jcc(Assembler::greater, L, maybe_short); }
+  void ALWAYSINLINE jnle(Label& L, bool maybe_short = true) { jcc(Assembler::greater, L, maybe_short); }
+  void ALWAYSINLINE jp(Label& L, bool maybe_short = true) { jcc(Assembler::parity, L, maybe_short); }
+  void ALWAYSINLINE jpe(Label& L, bool maybe_short = true) { jcc(Assembler::parity, L, maybe_short); }
+  void ALWAYSINLINE jnp(Label& L, bool maybe_short = true) { jcc(Assembler::noParity, L, maybe_short); }
+  void ALWAYSINLINE jpo(Label& L, bool maybe_short = true) { jcc(Assembler::noParity, L, maybe_short); }
+  // * No condition for this *  void ALWAYSINLINE jcxz(Label& L, bool maybe_short = true) { jcc(Assembler::cxz, L, maybe_short); }
+  // * No condition for this *  void ALWAYSINLINE jecxz(Label& L, bool maybe_short = true) { jcc(Assembler::cxz, L, maybe_short); }
+
+  // Short versions of the above
+  void ALWAYSINLINE jo_b(Label& L) { jccb(Assembler::overflow, L); }
+  void ALWAYSINLINE jno_b(Label& L) { jccb(Assembler::noOverflow, L); }
+  void ALWAYSINLINE js_b(Label& L) { jccb(Assembler::negative, L); }
+  void ALWAYSINLINE jns_b(Label& L) { jccb(Assembler::positive, L); }
+  void ALWAYSINLINE je_b(Label& L) { jccb(Assembler::equal, L); }
+  void ALWAYSINLINE jz_b(Label& L) { jccb(Assembler::zero, L); }
+  void ALWAYSINLINE jne_b(Label& L) { jccb(Assembler::notEqual, L); }
+  void ALWAYSINLINE jnz_b(Label& L) { jccb(Assembler::notZero, L); }
+  void ALWAYSINLINE jb_b(Label& L) { jccb(Assembler::below, L); }
+  void ALWAYSINLINE jnae_b(Label& L) { jccb(Assembler::below, L); }
+  void ALWAYSINLINE jc_b(Label& L) { jccb(Assembler::carrySet, L); }
+  void ALWAYSINLINE jnb_b(Label& L) { jccb(Assembler::aboveEqual, L); }
+  void ALWAYSINLINE jae_b(Label& L) { jccb(Assembler::aboveEqual, L); }
+  void ALWAYSINLINE jnc_b(Label& L) { jccb(Assembler::carryClear, L); }
+  void ALWAYSINLINE jbe_b(Label& L) { jccb(Assembler::belowEqual, L); }
+  void ALWAYSINLINE jna_b(Label& L) { jccb(Assembler::belowEqual, L); }
+  void ALWAYSINLINE ja_b(Label& L) { jccb(Assembler::above, L); }
+  void ALWAYSINLINE jnbe_b(Label& L) { jccb(Assembler::above, L); }
+  void ALWAYSINLINE jl_b(Label& L) { jccb(Assembler::less, L); }
+  void ALWAYSINLINE jnge_b(Label& L) { jccb(Assembler::less, L); }
+  void ALWAYSINLINE jge_b(Label& L) { jccb(Assembler::greaterEqual, L); }
+  void ALWAYSINLINE jnl_b(Label& L) { jccb(Assembler::greaterEqual, L); }
+  void ALWAYSINLINE jle_b(Label& L) { jccb(Assembler::lessEqual, L); }
+  void ALWAYSINLINE jng_b(Label& L) { jccb(Assembler::lessEqual, L); }
+  void ALWAYSINLINE jg_b(Label& L) { jccb(Assembler::greater, L); }
+  void ALWAYSINLINE jnle_b(Label& L) { jccb(Assembler::greater, L); }
+  void ALWAYSINLINE jp_b(Label& L) { jccb(Assembler::parity, L); }
+  void ALWAYSINLINE jpe_b(Label& L) { jccb(Assembler::parity, L); }
+  void ALWAYSINLINE jnp_b(Label& L) { jccb(Assembler::noParity, L); }
+  void ALWAYSINLINE jpo_b(Label& L) { jccb(Assembler::noParity, L); }
+  // * No condition for this *  void ALWAYSINLINE jcxz_b(Label& L) { jccb(Assembler::cxz, L); }
+  // * No condition for this *  void ALWAYSINLINE jecxz_b(Label& L) { jccb(Assembler::cxz, L); }
+
   // Floating
 
   void push_f(XMMRegister r);
@@ -1389,7 +1457,9 @@ public:
   void vpbroadcastq(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch = noreg);
 
   void vpcmpeqb(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len);
+  void vpcmpeqb(XMMRegister dst, XMMRegister src1, Address src2, int vector_len);
 
+  void vpcmpeqw(XMMRegister dst, XMMRegister nds, Address src, int vector_len);
   void vpcmpeqw(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len);
   void evpcmpeqd(KRegister kdst, KRegister mask, XMMRegister nds, AddressLiteral src, int vector_len, Register rscratch = noreg);
 

From 80b381e91bb649e440321a440ce641a54f89dfb4 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Wed, 24 Apr 2024 02:19:03 +0000
Subject: [PATCH 167/486] 8329555: Crash in intrinsifying heap-based
 MemorySegment Vector store/loads

Reviewed-by: sviswanathan, kvn
---
 src/hotspot/share/opto/vectorIntrinsics.cpp   | 14 +++-
 .../TestBiMorphicMismatchedMemSegment.java    | 67 +++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorapi/TestBiMorphicMismatchedMemSegment.java

diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index cee221c8b75..139dd62dc28 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -1037,8 +1037,20 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
 
   const bool needs_cpu_membar = is_mixed_access || is_mismatched_access;
 
-  bool mismatched_ms = from_ms->get_con() && !is_mask && arr_type != nullptr && arr_type->elem()->array_element_basic_type() != elem_bt;
+  // For non-masked mismatched memory segment vector read/write accesses, intrinsification can continue
+  // with unknown backing storage type and compiler can skip inserting explicit reinterpretation IR after
+  // loading from or before storing to backing storage which is mandatory for semantic correctness of
+  // big-endian memory layout.
+  bool mismatched_ms = LITTLE_ENDIAN_ONLY(false)
+      BIG_ENDIAN_ONLY(from_ms->get_con() && !is_mask && arr_type != nullptr &&
+                      arr_type->elem()->array_element_basic_type() != elem_bt);
   BasicType mem_elem_bt = mismatched_ms ? arr_type->elem()->array_element_basic_type() : elem_bt;
+  if (!is_java_primitive(mem_elem_bt)) {
+    if (C->print_intrinsics()) {
+      tty->print_cr("  ** non-primitive array element type");
+    }
+    return false;
+  }
   int mem_num_elem = mismatched_ms ? (num_elem * type2aelembytes(elem_bt)) / type2aelembytes(mem_elem_bt) : num_elem;
   if (arr_type != nullptr && !is_mask && !elem_consistent_with_arr(elem_bt, arr_type, mismatched_ms)) {
     if (C->print_intrinsics()) {
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestBiMorphicMismatchedMemSegment.java b/test/hotspot/jtreg/compiler/vectorapi/TestBiMorphicMismatchedMemSegment.java
new file mode 100644
index 00000000000..efe1d377454
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestBiMorphicMismatchedMemSegment.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package compiler.vectorapi;
+
+/*
+ * @test
+ * @bug 8329555
+ * @modules jdk.incubator.vector
+ *
+ * @run main/othervm -Xbatch -XX:+TieredCompilation compiler.vectorapi.TestBiMorphicMismatchedMemSegment
+ */
+
+
+import jdk.incubator.vector.ByteVector;
+
+import java.lang.foreign.MemorySegment;
+import java.nio.ByteOrder;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.IntStream;
+
+public class TestBiMorphicMismatchedMemSegment {
+    public static void main(String[] args) {
+        AtomicLong aLong = new AtomicLong();
+
+        IntStream.range(0, 10000).forEach(j -> {
+            byte[] bytes = new byte[64];
+            ThreadLocalRandom.current().nextBytes(bytes);
+            var byteSegment = MemorySegment.ofArray(bytes);
+            var byteFragment = ByteVector.SPECIES_PREFERRED.fromMemorySegment(byteSegment, 0, ByteOrder.LITTLE_ENDIAN);
+            float[] floats = new float[128];
+            byte[] targetBytes = new byte[512];
+            var floatSegment = MemorySegment.ofArray(floats);
+            var targetByteSegment = MemorySegment.ofArray(targetBytes);
+            byteFragment.intoMemorySegment(floatSegment, ThreadLocalRandom.current().nextInt(0, 448), ByteOrder.LITTLE_ENDIAN);
+            byteFragment.intoMemorySegment(targetByteSegment, ThreadLocalRandom.current().nextInt(0, 448), ByteOrder.LITTLE_ENDIAN);
+            var l = 0;
+            for (int i = 0; i < floats.length; i++) {
+                l += (int) floats[i];
+            }
+            aLong.addAndGet(l);
+        });
+
+        System.out.println(aLong.get());
+    }
+}

From 438e64310dc186d05de758103df1ea5504dcf33e Mon Sep 17 00:00:00 2001
From: Jasmine Karthikeyan <jkarthikeyan@openjdk.org>
Date: Wed, 24 Apr 2024 05:22:51 +0000
Subject: [PATCH 168/486] 8329531: compiler/c2/irTests/TestIfMinMax.java fails
 with IRViolationException: There were one or multiple IR rule failures.

Reviewed-by: epeter, dfenacci
---
 .../compiler/c2/irTests/TestIfMinMax.java     | 69 +++++++++++++------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
index 80dda306d3b..f59328fc64a 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
@@ -30,6 +30,7 @@ import jdk.test.lib.Utils;
 
 /*
  * @test
+ * @key randomness
  * @bug 8324655
  * @summary Test that if expressions are properly folded into min/max nodes
  * @requires os.arch != "riscv64"
@@ -144,9 +145,21 @@ public class TestIfMinMax {
         int[] a = new int[512];
         int[] b = new int[512];
 
-        for (int i = 0; i < 512; i++) {
+        // Fill from 1 to 50
+        for (int i = 0; i < 50; i++) {
+            a[i] = i + 1;
+            b[i] = 1;
+        }
+
+        // Fill from -1 to -50
+        for (int i = 50; i < 100; i++) {
+            a[i] = -(i - 49);
+            b[i] = 1;
+        }
+
+        for (int i = 100; i < 512; i++) {
             a[i] = RANDOM.nextInt();
-            b[i] = RANDOM.nextInt();
+            b[i] = 1;
         }
 
         return new Object[] { a, b };
@@ -157,9 +170,21 @@ public class TestIfMinMax {
         long[] a = new long[512];
         long[] b = new long[512];
 
-        for (int i = 0; i < 512; i++) {
+        // Fill from 1 to 50
+        for (int i = 0; i < 50; i++) {
+            a[i] = i + 1;
+            b[i] = 1;
+        }
+
+        // Fill from -1 to -50
+        for (int i = 50; i < 100; i++) {
+            a[i] = -(i - 49);
+            b[i] = 1;
+        }
+
+        for (int i = 100; i < 512; i++) {
             a[i] = RANDOM.nextLong();
-            b[i] = RANDOM.nextLong();
+            b[i] = 1;
         }
 
         return new Object[] { a, b };
@@ -173,22 +198,23 @@ public class TestIfMinMax {
     public Object[] testMaxIntReduction(int[] a, int[] b) {
         int r = 0;
         for (int i = 0; i < a.length; i++) {
-            int aI = a[i] * 2;
+            int aI = a[i] * b[i];
 
             r = aI > r ? aI : r;
         }
 
-        return new Object[] { a, r };
+        return new Object[] { a, b, r };
     }
 
     @Check(test = "testMaxIntReduction")
     public void checkTestMaxIntReduction(Object[] vals) {
         int[] a = (int[]) vals[0];
-        int testRet = (int) vals[1];
+        int[] b = (int[]) vals[1];
+        int testRet = (int) vals[2];
 
         int r = 0;
         for (int i = 0; i < a.length; i++) {
-            int aI = a[i] * 2;
+            int aI = a[i] * b[i];
 
             r = aI > r ? aI : r;
         }
@@ -207,22 +233,23 @@ public class TestIfMinMax {
         int r = 0;
 
         for (int i = 0; i < a.length; i++) {
-            int aI = a[i] * 2;
+            int aI = a[i] * b[i];
 
             r = aI < r ? aI : r;
         }
 
-        return new Object[] { a, r };
+        return new Object[] { a, b, r };
     }
 
     @Check(test = "testMinIntReduction")
     public void checkTestMinIntReduction(Object[] vals) {
         int[] a = (int[]) vals[0];
-        int testRet = (int) vals[1];
+        int[] b = (int[]) vals[1];
+        int testRet = (int) vals[2];
 
         int r = 0;
         for (int i = 0; i < a.length; i++) {
-            int aI = a[i] * 2;
+            int aI = a[i] * b[i];
 
             r = aI < r ? aI : r;
         }
@@ -241,22 +268,23 @@ public class TestIfMinMax {
         long r = 0;
 
         for (int i = 0; i < a.length; i++) {
-            long aI = a[i] * 2;
+            long aI = a[i] * b[i];
 
             r = aI > r ? aI : r;
         }
 
-        return new Object[] { a, r };
+        return new Object[] { a, b, r };
     }
 
     @Check(test = "testMaxLongReduction")
     public void checkTestMaxLongReduction(Object[] vals) {
         long[] a = (long[]) vals[0];
-        long testRet = (long) vals[1];
+        long[] b = (long[]) vals[1];
+        long testRet = (long) vals[2];
 
         long r = 0;
         for (int i = 0; i < a.length; i++) {
-            long aI = a[i] * 2;
+            long aI = a[i] * b[i];
 
             r = aI > r ? aI : r;
         }
@@ -275,22 +303,23 @@ public class TestIfMinMax {
         long r = 0;
 
         for (int i = 0; i < a.length; i++) {
-            long aI = a[i] * 2;
+            long aI = a[i] * b[i];
 
             r = aI < r ? aI : r;
         }
 
-        return new Object[] { a, r };
+        return new Object[] { a, b, r };
     }
 
     @Check(test = "testMinLongReduction")
     public void checkTestMinLongReduction(Object[] vals) {
         long[] a = (long[]) vals[0];
-        long testRet = (long) vals[1];
+        long[] b = (long[]) vals[1];
+        long testRet = (long) vals[2];
 
         long r = 0;
         for (int i = 0; i < a.length; i++) {
-            long aI = a[i] * 2;
+            long aI = a[i] * b[i];
 
             r = aI < r ? aI : r;
         }

From 5c3838605d48d7f2db981c5e821c08d84856c53c Mon Sep 17 00:00:00 2001
From: Joshua Zhu <jzhu@openjdk.org>
Date: Wed, 24 Apr 2024 05:44:39 +0000
Subject: [PATCH 169/486] 8326541: [AArch64] ZGC C2 load barrier stub should
 consider the length of live registers when spilling registers

Reviewed-by: eosterlund, rcastanedalo
---
 src/hotspot/cpu/aarch64/aarch64.ad            |   8 +-
 .../gc/z/zBarrierSetAssembler_aarch64.cpp     | 170 +++++++-
 .../gc/z/zBarrierSetAssembler_aarch64.hpp     |   5 +-
 .../cpu/aarch64/macroAssembler_aarch64.cpp    | 186 +++++++--
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |  18 +-
 src/hotspot/cpu/aarch64/vmreg_aarch64.hpp     |   4 +-
 ...tRegistersPushPopAtZGCLoadBarrierStub.java | 380 ++++++++++++++++++
 7 files changed, 704 insertions(+), 67 deletions(-)
 create mode 100644 test/hotspot/jtreg/gc/z/TestRegistersPushPopAtZGCLoadBarrierStub.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index a310eae5eb9..402cdb8a30c 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1126,6 +1126,10 @@ extern RegMask _NO_SPECIAL_REG32_mask;
 extern RegMask _NO_SPECIAL_REG_mask;
 extern RegMask _NO_SPECIAL_PTR_REG_mask;
 
+// Figure out which register class each belongs in: rc_int, rc_float or
+// rc_stack.
+enum RC { rc_bad, rc_int, rc_float, rc_predicate, rc_stack };
+
 class CallStubImpl {
 
   //--------------------------------------------------------------
@@ -1900,10 +1904,6 @@ const Pipeline * MachEpilogNode::pipeline() const {
 
 //=============================================================================
 
-// Figure out which register class each belongs in: rc_int, rc_float or
-// rc_stack.
-enum RC { rc_bad, rc_int, rc_float, rc_predicate, rc_stack };
-
 static enum RC rc_class(OptoReg::Name reg) {
 
   if (reg == OptoReg::Bad) {
diff --git a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
index ebaf1829972..b8f4a2f2439 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -1081,6 +1081,35 @@ void ZBarrierSetAssembler::generate_c1_store_barrier_runtime_stub(StubAssembler*
 
 #ifdef COMPILER2
 
+OptoReg::Name ZBarrierSetAssembler::encode_float_vector_register_size(const Node* node, OptoReg::Name opto_reg) {
+  switch (node->ideal_reg()) {
+    case Op_RegF:
+      // No need to refine. The original encoding is already fine to distinguish.
+      assert(opto_reg % 4 == 0, "Float register should only occupy a single slot");
+      break;
+    // Use different encoding values of the same fp/vector register to help distinguish different sizes.
+    // Such as V16. The OptoReg::name and its corresponding slot value are
+    // "V16": 64, "V16_H": 65, "V16_J": 66, "V16_K": 67.
+    case Op_RegD:
+    case Op_VecD:
+      opto_reg &= ~3;
+      opto_reg |= 1;
+      break;
+    case Op_VecX:
+      opto_reg &= ~3;
+      opto_reg |= 2;
+      break;
+    case Op_VecA:
+      opto_reg &= ~3;
+      opto_reg |= 3;
+      break;
+    default:
+      assert(false, "unexpected ideal register");
+      ShouldNotReachHere();
+  }
+  return opto_reg;
+}
+
 OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
   if (!OptoReg::is_reg(opto_reg)) {
     return OptoReg::Bad;
@@ -1088,7 +1117,7 @@ OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::N
 
   const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
   if (vm_reg->is_FloatRegister()) {
-    return opto_reg & ~1;
+    opto_reg = encode_float_vector_register_size(node, opto_reg);
   }
 
   return opto_reg;
@@ -1099,28 +1128,82 @@ OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::N
 
 class ZSaveLiveRegisters {
 private:
+  struct RegisterData {
+    VMReg _reg;
+    int   _slots; // slots occupied once pushed into stack
+
+    // Used by GrowableArray::find()
+    bool operator == (const RegisterData& other) {
+      return _reg == other._reg;
+    }
+  };
+
   MacroAssembler* const _masm;
   RegSet                _gp_regs;
   FloatRegSet           _fp_regs;
+  FloatRegSet           _neon_regs;
+  FloatRegSet           _sve_regs;
   PRegSet               _p_regs;
 
 public:
   void initialize(ZBarrierStubC2* stub) {
-    // Record registers that needs to be saved/restored
+    int index = -1;
+    GrowableArray<RegisterData> registers;
+    VMReg prev_vm_reg = VMRegImpl::Bad();
+
     RegMaskIterator rmi(stub->live());
     while (rmi.has_next()) {
-      const OptoReg::Name opto_reg = rmi.next();
-      if (OptoReg::is_reg(opto_reg)) {
-        const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
-        if (vm_reg->is_Register()) {
-          _gp_regs += RegSet::of(vm_reg->as_Register());
-        } else if (vm_reg->is_FloatRegister()) {
-          _fp_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
-        } else if (vm_reg->is_PRegister()) {
-          _p_regs += PRegSet::of(vm_reg->as_PRegister());
+      OptoReg::Name opto_reg = rmi.next();
+      VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+
+      if (vm_reg->is_Register()) {
+        // GPR may have one or two slots in regmask
+        // Determine whether the current vm_reg is the same physical register as the previous one
+        if (is_same_register(vm_reg, prev_vm_reg)) {
+          registers.at(index)._slots++;
         } else {
-          fatal("Unknown register type");
+          RegisterData reg_data = { vm_reg, 1 };
+          index = registers.append(reg_data);
         }
+      } else if (vm_reg->is_FloatRegister()) {
+        // We have size encoding in OptoReg of stub->live()
+        // After encoding, float/neon/sve register has only one slot in regmask
+        // Decode it to get the actual size
+        VMReg vm_reg_base = vm_reg->as_FloatRegister()->as_VMReg();
+        int slots = decode_float_vector_register_size(opto_reg);
+        RegisterData reg_data = { vm_reg_base, slots };
+        index = registers.append(reg_data);
+      } else if (vm_reg->is_PRegister()) {
+        // PRegister has only one slot in regmask
+        RegisterData reg_data = { vm_reg, 1 };
+        index = registers.append(reg_data);
+      } else {
+        assert(false, "Unknown register type");
+        ShouldNotReachHere();
+      }
+      prev_vm_reg = vm_reg;
+    }
+
+    // Record registers that needs to be saved/restored
+    for (GrowableArrayIterator<RegisterData> it = registers.begin(); it != registers.end(); ++it) {
+      RegisterData reg_data = *it;
+      VMReg vm_reg = reg_data._reg;
+      int slots = reg_data._slots;
+      if (vm_reg->is_Register()) {
+        assert(slots == 1 || slots == 2, "Unexpected register save size");
+        _gp_regs += RegSet::of(vm_reg->as_Register());
+      } else if (vm_reg->is_FloatRegister()) {
+        if (slots == 1 || slots == 2) {
+          _fp_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
+        } else if (slots == 4) {
+          _neon_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
+        } else {
+          assert(slots == Matcher::scalable_vector_reg_size(T_FLOAT), "Unexpected register save size");
+          _sve_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
+        }
+      } else {
+        assert(vm_reg->is_PRegister() && slots == 1, "Unknown register type");
+        _p_regs += PRegSet::of(vm_reg->as_PRegister());
       }
     }
 
@@ -1130,12 +1213,65 @@ public:
     } else {
       _gp_regs -= RegSet::range(r19, r30) + RegSet::of(r8, r9);
     }
+
+    // Remove C-ABI SOE fp registers
+    _fp_regs -= FloatRegSet::range(v8, v15);
+  }
+
+  static enum RC rc_class(VMReg reg) {
+    if (reg->is_reg()) {
+      if (reg->is_Register()) {
+        return rc_int;
+      } else if (reg->is_FloatRegister()) {
+        return rc_float;
+      } else if (reg->is_PRegister()) {
+        return rc_predicate;
+      }
+    }
+    if (reg->is_stack()) {
+      return rc_stack;
+    }
+    return rc_bad;
+  }
+
+  static bool is_same_register(VMReg reg1, VMReg reg2) {
+    if (reg1 == reg2) {
+      return true;
+    }
+    if (rc_class(reg1) == rc_class(reg2)) {
+      if (reg1->is_Register()) {
+        return reg1->as_Register() == reg2->as_Register();
+      } else if (reg1->is_FloatRegister()) {
+        return reg1->as_FloatRegister() == reg2->as_FloatRegister();
+      } else if (reg1->is_PRegister()) {
+        return reg1->as_PRegister() == reg2->as_PRegister();
+      }
+    }
+    return false;
+  }
+
+  static int decode_float_vector_register_size(OptoReg::Name opto_reg) {
+    switch (opto_reg & 3) {
+      case 0:
+        return 1;
+      case 1:
+        return 2;
+      case 2:
+        return 4;
+      case 3:
+        return Matcher::scalable_vector_reg_size(T_FLOAT);
+      default:
+        ShouldNotReachHere();
+        return 0;
+    }
   }
 
   ZSaveLiveRegisters(MacroAssembler* masm, ZBarrierStubC2* stub)
     : _masm(masm),
       _gp_regs(),
       _fp_regs(),
+      _neon_regs(),
+      _sve_regs(),
       _p_regs() {
 
     // Figure out what registers to save/restore
@@ -1143,14 +1279,18 @@ public:
 
     // Save registers
     __ push(_gp_regs, sp);
-    __ push_fp(_fp_regs, sp);
+    __ push_fp(_fp_regs, sp, MacroAssembler::PushPopFp);
+    __ push_fp(_neon_regs, sp, MacroAssembler::PushPopNeon);
+    __ push_fp(_sve_regs, sp, MacroAssembler::PushPopSVE);
     __ push_p(_p_regs, sp);
   }
 
   ~ZSaveLiveRegisters() {
     // Restore registers
     __ pop_p(_p_regs, sp);
-    __ pop_fp(_fp_regs, sp);
+    __ pop_fp(_sve_regs, sp, MacroAssembler::PushPopSVE);
+    __ pop_fp(_neon_regs, sp, MacroAssembler::PushPopNeon);
+    __ pop_fp(_fp_regs, sp, MacroAssembler::PushPopFp);
 
     // External runtime call may clobber ptrue reg
     __ reinitialize_ptrue();
diff --git a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
index 82334b34ade..705dcc61a62 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -187,6 +187,9 @@ public:
 #endif // COMPILER1
 
 #ifdef COMPILER2
+  OptoReg::Name encode_float_vector_register_size(const Node* node,
+                                                  OptoReg::Name opto_reg);
+
   OptoReg::Name refine_register(const Node* node,
                                 OptoReg::Name opto_reg);
 
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index fd6db98c7b7..8eb2000359c 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -2641,7 +2641,7 @@ int MacroAssembler::pop(unsigned int bitset, Register stack) {
 
 // Push lots of registers in the bit set supplied.  Don't push sp.
 // Return the number of dwords pushed
-int MacroAssembler::push_fp(unsigned int bitset, Register stack) {
+int MacroAssembler::push_fp(unsigned int bitset, Register stack, FpPushPopMode mode) {
   int words_pushed = 0;
   bool use_sve = false;
   int sve_vector_size_in_bytes = 0;
@@ -2664,8 +2664,29 @@ int MacroAssembler::push_fp(unsigned int bitset, Register stack) {
     return 0;
   }
 
-  // SVE
-  if (use_sve && sve_vector_size_in_bytes > 16) {
+  if (mode == PushPopFull) {
+    if (use_sve && sve_vector_size_in_bytes > 16) {
+      mode = PushPopSVE;
+    } else {
+      mode = PushPopNeon;
+    }
+  }
+
+#ifndef PRODUCT
+  {
+    char buffer[48];
+    if (mode == PushPopSVE) {
+      snprintf(buffer, sizeof(buffer), "push_fp: %d SVE registers", count);
+    } else if (mode == PushPopNeon) {
+      snprintf(buffer, sizeof(buffer), "push_fp: %d Neon registers", count);
+    } else {
+      snprintf(buffer, sizeof(buffer), "push_fp: %d fp registers", count);
+    }
+    block_comment(buffer);
+  }
+#endif
+
+  if (mode == PushPopSVE) {
     sub(stack, stack, sve_vector_size_in_bytes * count);
     for (int i = 0; i < count; i++) {
       sve_str(as_FloatRegister(regs[i]), Address(stack, i));
@@ -2673,35 +2694,67 @@ int MacroAssembler::push_fp(unsigned int bitset, Register stack) {
     return count * sve_vector_size_in_bytes / 8;
   }
 
-  // NEON
-  if (count == 1) {
-    strq(as_FloatRegister(regs[0]), Address(pre(stack, -wordSize * 2)));
-    return 2;
-  }
+  if (mode == PushPopNeon) {
+    if (count == 1) {
+      strq(as_FloatRegister(regs[0]), Address(pre(stack, -wordSize * 2)));
+      return 2;
+    }
 
-  bool odd = (count & 1) == 1;
-  int push_slots = count + (odd ? 1 : 0);
+    bool odd = (count & 1) == 1;
+    int push_slots = count + (odd ? 1 : 0);
 
-  // Always pushing full 128 bit registers.
-  stpq(as_FloatRegister(regs[0]), as_FloatRegister(regs[1]), Address(pre(stack, -push_slots * wordSize * 2)));
-  words_pushed += 2;
-
-  for (int i = 2; i + 1 < count; i += 2) {
-    stpq(as_FloatRegister(regs[i]), as_FloatRegister(regs[i+1]), Address(stack, i * wordSize * 2));
+    // Always pushing full 128 bit registers.
+    stpq(as_FloatRegister(regs[0]), as_FloatRegister(regs[1]), Address(pre(stack, -push_slots * wordSize * 2)));
     words_pushed += 2;
+
+    for (int i = 2; i + 1 < count; i += 2) {
+      stpq(as_FloatRegister(regs[i]), as_FloatRegister(regs[i+1]), Address(stack, i * wordSize * 2));
+      words_pushed += 2;
+    }
+
+    if (odd) {
+      strq(as_FloatRegister(regs[count - 1]), Address(stack, (count - 1) * wordSize * 2));
+      words_pushed++;
+    }
+
+    assert(words_pushed == count, "oops, pushed(%d) != count(%d)", words_pushed, count);
+    return count * 2;
   }
 
-  if (odd) {
-    strq(as_FloatRegister(regs[count - 1]), Address(stack, (count - 1) * wordSize * 2));
-    words_pushed++;
+  if (mode == PushPopFp) {
+    bool odd = (count & 1) == 1;
+    int push_slots = count + (odd ? 1 : 0);
+
+    if (count == 1) {
+      // Stack pointer must be 16 bytes aligned
+      strd(as_FloatRegister(regs[0]), Address(pre(stack, -push_slots * wordSize)));
+      return 1;
+    }
+
+    stpd(as_FloatRegister(regs[0]), as_FloatRegister(regs[1]), Address(pre(stack, -push_slots * wordSize)));
+    words_pushed += 2;
+
+    for (int i = 2; i + 1 < count; i += 2) {
+      stpd(as_FloatRegister(regs[i]), as_FloatRegister(regs[i+1]), Address(stack, i * wordSize));
+      words_pushed += 2;
+    }
+
+    if (odd) {
+      // Stack pointer must be 16 bytes aligned
+      strd(as_FloatRegister(regs[count - 1]), Address(stack, (count - 1) * wordSize));
+      words_pushed++;
+    }
+
+    assert(words_pushed == count, "oops, pushed != count");
+
+    return count;
   }
 
-  assert(words_pushed == count, "oops, pushed(%d) != count(%d)", words_pushed, count);
-  return count * 2;
+  return 0;
 }
 
 // Return the number of dwords popped
-int MacroAssembler::pop_fp(unsigned int bitset, Register stack) {
+int MacroAssembler::pop_fp(unsigned int bitset, Register stack, FpPushPopMode mode) {
   int words_pushed = 0;
   bool use_sve = false;
   int sve_vector_size_in_bytes = 0;
@@ -2723,8 +2776,29 @@ int MacroAssembler::pop_fp(unsigned int bitset, Register stack) {
     return 0;
   }
 
-  // SVE
-  if (use_sve && sve_vector_size_in_bytes > 16) {
+  if (mode == PushPopFull) {
+    if (use_sve && sve_vector_size_in_bytes > 16) {
+      mode = PushPopSVE;
+    } else {
+      mode = PushPopNeon;
+    }
+  }
+
+#ifndef PRODUCT
+  {
+    char buffer[48];
+    if (mode == PushPopSVE) {
+      snprintf(buffer, sizeof(buffer), "pop_fp: %d SVE registers", count);
+    } else if (mode == PushPopNeon) {
+      snprintf(buffer, sizeof(buffer), "pop_fp: %d Neon registers", count);
+    } else {
+      snprintf(buffer, sizeof(buffer), "pop_fp: %d fp registers", count);
+    }
+    block_comment(buffer);
+  }
+#endif
+
+  if (mode == PushPopSVE) {
     for (int i = count - 1; i >= 0; i--) {
       sve_ldr(as_FloatRegister(regs[i]), Address(stack, i));
     }
@@ -2732,31 +2806,61 @@ int MacroAssembler::pop_fp(unsigned int bitset, Register stack) {
     return count * sve_vector_size_in_bytes / 8;
   }
 
-  // NEON
-  if (count == 1) {
-    ldrq(as_FloatRegister(regs[0]), Address(post(stack, wordSize * 2)));
-    return 2;
-  }
+  if (mode == PushPopNeon) {
+    if (count == 1) {
+      ldrq(as_FloatRegister(regs[0]), Address(post(stack, wordSize * 2)));
+      return 2;
+    }
 
-  bool odd = (count & 1) == 1;
-  int push_slots = count + (odd ? 1 : 0);
+    bool odd = (count & 1) == 1;
+    int push_slots = count + (odd ? 1 : 0);
 
-  if (odd) {
-    ldrq(as_FloatRegister(regs[count - 1]), Address(stack, (count - 1) * wordSize * 2));
-    words_pushed++;
-  }
+    if (odd) {
+      ldrq(as_FloatRegister(regs[count - 1]), Address(stack, (count - 1) * wordSize * 2));
+      words_pushed++;
+    }
 
-  for (int i = 2; i + 1 < count; i += 2) {
-    ldpq(as_FloatRegister(regs[i]), as_FloatRegister(regs[i+1]), Address(stack, i * wordSize * 2));
+    for (int i = 2; i + 1 < count; i += 2) {
+      ldpq(as_FloatRegister(regs[i]), as_FloatRegister(regs[i+1]), Address(stack, i * wordSize * 2));
+      words_pushed += 2;
+    }
+
+    ldpq(as_FloatRegister(regs[0]), as_FloatRegister(regs[1]), Address(post(stack, push_slots * wordSize * 2)));
     words_pushed += 2;
+
+    assert(words_pushed == count, "oops, pushed(%d) != count(%d)", words_pushed, count);
+
+    return count * 2;
   }
 
-  ldpq(as_FloatRegister(regs[0]), as_FloatRegister(regs[1]), Address(post(stack, push_slots * wordSize * 2)));
-  words_pushed += 2;
+  if (mode == PushPopFp) {
+    bool odd = (count & 1) == 1;
+    int push_slots = count + (odd ? 1 : 0);
 
-  assert(words_pushed == count, "oops, pushed(%d) != count(%d)", words_pushed, count);
+    if (count == 1) {
+      ldrd(as_FloatRegister(regs[0]), Address(post(stack, push_slots * wordSize)));
+      return 1;
+    }
 
-  return count * 2;
+    if (odd) {
+      ldrd(as_FloatRegister(regs[count - 1]), Address(stack, (count - 1) * wordSize));
+      words_pushed++;
+    }
+
+    for (int i = 2; i + 1 < count; i += 2) {
+      ldpd(as_FloatRegister(regs[i]), as_FloatRegister(regs[i+1]), Address(stack, i * wordSize));
+      words_pushed += 2;
+    }
+
+    ldpd(as_FloatRegister(regs[0]), as_FloatRegister(regs[1]), Address(post(stack, push_slots * wordSize)));
+    words_pushed += 2;
+
+    assert(words_pushed == count, "oops, pushed != count");
+
+    return count;
+  }
+
+  return 0;
 }
 
 // Return the number of dwords pushed
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index c8f1ff81af0..67fd7236842 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -444,6 +444,15 @@ class MacroAssembler: public Assembler {
 
   // macro assembly operations needed for aarch64
 
+public:
+
+  enum FpPushPopMode {
+    PushPopFull,
+    PushPopSVE,
+    PushPopNeon,
+    PushPopFp
+  };
+
   // first two private routines for loading 32 bit or 64 bit constants
 private:
 
@@ -453,8 +462,8 @@ private:
   int push(unsigned int bitset, Register stack);
   int pop(unsigned int bitset, Register stack);
 
-  int push_fp(unsigned int bitset, Register stack);
-  int pop_fp(unsigned int bitset, Register stack);
+  int push_fp(unsigned int bitset, Register stack, FpPushPopMode mode);
+  int pop_fp(unsigned int bitset, Register stack, FpPushPopMode mode);
 
   int push_p(unsigned int bitset, Register stack);
   int pop_p(unsigned int bitset, Register stack);
@@ -462,11 +471,12 @@ private:
   void mov(Register dst, Address a);
 
 public:
+
   void push(RegSet regs, Register stack) { if (regs.bits()) push(regs.bits(), stack); }
   void pop(RegSet regs, Register stack) { if (regs.bits()) pop(regs.bits(), stack); }
 
-  void push_fp(FloatRegSet regs, Register stack) { if (regs.bits()) push_fp(regs.bits(), stack); }
-  void pop_fp(FloatRegSet regs, Register stack) { if (regs.bits()) pop_fp(regs.bits(), stack); }
+  void push_fp(FloatRegSet regs, Register stack, FpPushPopMode mode = PushPopFull) { if (regs.bits()) push_fp(regs.bits(), stack, mode); }
+  void pop_fp(FloatRegSet regs, Register stack, FpPushPopMode mode = PushPopFull) { if (regs.bits()) pop_fp(regs.bits(), stack, mode); }
 
   static RegSet call_clobbered_gp_registers();
 
diff --git a/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp b/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp
index bf93372d9cd..793acd71505 100644
--- a/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -45,7 +45,7 @@ inline Register as_Register() {
 }
 
 inline FloatRegister as_FloatRegister() {
-  assert( is_FloatRegister() && is_even(value()), "must be" );
+  assert( is_FloatRegister(), "must be" );
   // Yuk
   return ::as_FloatRegister((value() - ConcreteRegisterImpl::max_gpr) /
                             FloatRegister::max_slots_per_register);
diff --git a/test/hotspot/jtreg/gc/z/TestRegistersPushPopAtZGCLoadBarrierStub.java b/test/hotspot/jtreg/gc/z/TestRegistersPushPopAtZGCLoadBarrierStub.java
new file mode 100644
index 00000000000..71aa634c761
--- /dev/null
+++ b/test/hotspot/jtreg/gc/z/TestRegistersPushPopAtZGCLoadBarrierStub.java
@@ -0,0 +1,380 @@
+/*
+ * Copyright (c) 2024, Alibaba Group Holding Limited. 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.
+ */
+
+package gc.z;
+
+/**
+ * @test TestRegistersPushPopAtZGCLoadBarrierStub
+ * @bug 8326541
+ * @summary Test to verify that registers are saved and restored correctly based on
+            the actual register usage length on aarch64 when entering load barrier stub.
+ * @library /test/lib /
+ * @modules jdk.incubator.vector
+ *
+ * @requires vm.gc.ZGenerational & vm.debug
+ * @requires os.arch=="aarch64"
+ *
+ * @run driver gc.z.TestRegistersPushPopAtZGCLoadBarrierStub
+ */
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import jdk.incubator.vector.FloatVector;
+import jdk.incubator.vector.Vector;
+import jdk.incubator.vector.VectorShape;
+import jdk.incubator.vector.VectorSpecies;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+class Inner {}
+
+class InnerFloat extends Inner {
+    float data;
+    public InnerFloat(float f) {
+        data = f;
+    }
+}
+
+class InnerDouble extends Inner {
+    double data;
+    public InnerDouble(double f) {
+        data = f;
+    }
+}
+
+class Outer {
+    volatile Inner field;
+    public Outer(Inner i) {
+        field = i;
+    }
+}
+
+public class TestRegistersPushPopAtZGCLoadBarrierStub {
+
+    class Launcher {
+        private final static int NUM = 1024;
+        private final static int ITERATIONS = 20_000;
+        private final static RandomGenerator RANDOM = RandomGeneratorFactory.getDefault().create(0);
+        private final static Map<String, Runnable> TESTS;
+
+        private static float[] f_array;
+        private static Outer f_outer;
+        private static Outer d_outer;
+
+        static {
+            f_array = new float[NUM];
+            for (int i = 0; i < NUM; i++) {
+                f_array[i] = RANDOM.nextFloat();
+            }
+
+            InnerFloat f_inner = new InnerFloat(RANDOM.nextFloat());
+            InnerDouble d_inner = new InnerDouble(RANDOM.nextDouble());
+            f_outer = new Outer(f_inner);
+            d_outer = new Outer(d_inner);
+
+            TESTS = new LinkedHashMap<>();
+            TESTS.put("test_one_float_push_pop_at_load_barrier", Launcher::test_one_float);
+            TESTS.put("test_two_floats_push_pop_at_load_barrier", Launcher::test_two_floats);
+            TESTS.put("test_three_floats_push_pop_at_load_barrier", Launcher::test_three_floats);
+            TESTS.put("test_one_double_push_pop_at_load_barrier", Launcher::test_one_double);
+            TESTS.put("test_two_doubles_push_pop_at_load_barrier", Launcher::test_two_doubles);
+            TESTS.put("test_three_doubles_push_pop_at_load_barrier", Launcher::test_three_doubles);
+            TESTS.put("test_one_vector_128_push_pop_at_load_barrier", Launcher::test_one_vector_128);
+            TESTS.put("test_two_vectors_128_push_pop_at_load_barrier", Launcher::test_two_vectors_128);
+            TESTS.put("test_three_vectors_128_push_pop_at_load_barrier", Launcher::test_three_vectors_128);
+            TESTS.put("test_vector_max_push_pop_at_load_barrier", Launcher::test_vector_max);
+            TESTS.put("test_float_and_vector_push_pop_at_load_barrier", Launcher::test_float_and_vector);
+        }
+
+        static float test_one_float_push_pop_at_load_barrier(Outer outer, float f) {
+            Inner inner = outer.field;
+            return f + ((InnerFloat)inner).data;
+        }
+
+        static float test_two_floats_push_pop_at_load_barrier(Outer outer, float f1, float f2) {
+            Inner inner = outer.field;
+            return f1 + f2 + ((InnerFloat)inner).data;
+        }
+
+        static float test_three_floats_push_pop_at_load_barrier(Outer outer, float f1, float f2, float f3) {
+            Inner inner = outer.field;
+            return f1 + f2 + f3 + ((InnerFloat)inner).data;
+        }
+
+        static double test_one_double_push_pop_at_load_barrier(Outer outer, double d) {
+            Inner inner = outer.field;
+            return d + ((InnerDouble)inner).data;
+        }
+
+        static double test_two_doubles_push_pop_at_load_barrier(Outer outer, double d1, double d2) {
+            Inner inner = outer.field;
+            return d1 + d2 + ((InnerDouble)inner).data;
+        }
+
+        static double test_three_doubles_push_pop_at_load_barrier(Outer outer, double d1, double d2, double d3) {
+            Inner inner = outer.field;
+            return d1 + d2 + d3 + ((InnerDouble)inner).data;
+        }
+
+        static void test_one_vector_128_push_pop_at_load_barrier(float[] b, Outer outer) {
+            VectorSpecies<Float> float_species = FloatVector.SPECIES_128;
+
+            FloatVector av = FloatVector.zero(float_species);
+            for (int i = 0; i < b.length; i += float_species.length()) {
+                Inner inner = outer.field;
+                FloatVector bv = FloatVector.fromArray(float_species, b, i);
+                float value = ((InnerFloat)inner).data;
+                av = av.add(bv).add(value);
+            }
+        }
+
+        static void test_two_vectors_128_push_pop_at_load_barrier(float[] b, Outer outer) {
+            VectorSpecies<Float> float_species = FloatVector.SPECIES_128;
+
+            FloatVector av1 = FloatVector.zero(float_species);
+            FloatVector av2 = FloatVector.zero(float_species);
+            for (int i = 0; i < b.length; i += float_species.length()) {
+                Inner inner = outer.field;
+                FloatVector bv = FloatVector.fromArray(float_species, b, i);
+                float value = ((InnerFloat)inner).data;
+                av1 = av1.add(bv).add(value);
+                av2 = av2.add(av1);
+            }
+        }
+
+        static void test_three_vectors_128_push_pop_at_load_barrier(float[] b, Outer outer) {
+            VectorSpecies<Float> float_species = FloatVector.SPECIES_128;
+
+            FloatVector av1 = FloatVector.zero(float_species);
+            FloatVector av2 = FloatVector.zero(float_species);
+            FloatVector av3 = FloatVector.zero(float_species);
+            for (int i = 0; i < b.length; i += float_species.length()) {
+                Inner inner = outer.field;
+                FloatVector bv = FloatVector.fromArray(float_species, b, i);
+                float value = ((InnerFloat)inner).data;
+                av1 = av1.add(bv).add(value);
+                av2 = av2.add(av1);
+                av3 = av3.add(av2);
+            }
+        }
+
+        static void test_vector_max_push_pop_at_load_barrier(float[] b, Outer outer) {
+            VectorSpecies<Float> float_species = FloatVector.SPECIES_MAX;
+
+            FloatVector av = FloatVector.zero(float_species);
+            for (int i = 0; i < b.length; i += float_species.length()) {
+                Inner inner = outer.field;
+                FloatVector bv = FloatVector.fromArray(float_species, b, i);
+                float value = ((InnerFloat)inner).data;
+                av = av.add(bv).add(value);
+            }
+        }
+
+        static void test_float_and_vector_push_pop_at_load_barrier(float[] b, Outer outer, float f) {
+            VectorSpecies<Float> float_species = FloatVector.SPECIES_MAX;
+
+            FloatVector av = FloatVector.zero(float_species);
+            for (int i = 0; i < b.length; i += float_species.length()) {
+                Inner inner = outer.field;
+                FloatVector bv = FloatVector.fromArray(float_species, b, i);
+                float value = ((InnerFloat)inner).data + f;
+                av = av.add(bv).add(value);
+            }
+        }
+
+        static void test_one_float() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_one_float_push_pop_at_load_barrier(f_outer, RANDOM.nextFloat());
+            }
+        }
+
+        static void test_two_floats() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_two_floats_push_pop_at_load_barrier(f_outer, RANDOM.nextFloat(), RANDOM.nextFloat());
+            }
+        }
+
+        static void test_three_floats() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_three_floats_push_pop_at_load_barrier(f_outer, RANDOM.nextFloat(), RANDOM.nextFloat(), RANDOM.nextFloat());
+            }
+        }
+
+        static void test_one_double() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_one_double_push_pop_at_load_barrier(d_outer, RANDOM.nextDouble());
+            }
+        }
+
+        static void test_two_doubles() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_two_doubles_push_pop_at_load_barrier(d_outer, RANDOM.nextDouble(), RANDOM.nextDouble());
+            }
+        }
+
+        static void test_three_doubles() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_three_doubles_push_pop_at_load_barrier(d_outer, RANDOM.nextDouble(), RANDOM.nextDouble(), RANDOM.nextDouble());
+            }
+        }
+
+        static void test_one_vector_128() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_one_vector_128_push_pop_at_load_barrier(f_array, f_outer);
+            }
+        }
+
+        static void test_two_vectors_128() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_two_vectors_128_push_pop_at_load_barrier(f_array, f_outer);
+            }
+        }
+
+        static void test_three_vectors_128() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_three_vectors_128_push_pop_at_load_barrier(f_array, f_outer);
+            }
+        }
+
+        static void test_vector_max() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_vector_max_push_pop_at_load_barrier(f_array, f_outer);
+            }
+        }
+
+        static void test_float_and_vector() {
+            for (int i = 0; i < ITERATIONS; i++) {
+                test_float_and_vector_push_pop_at_load_barrier(f_array, f_outer, RANDOM.nextFloat());
+            }
+        }
+
+        public static void main(String args[]) {
+            Runnable r = TESTS.get(args[0]);
+            r.run();
+        }
+    }
+
+    static boolean containOnlyOneOccuranceOfKeyword(String text, String keyword) {
+        int firstIndex = text.indexOf(keyword);
+        int lastIndex = text.lastIndexOf(keyword);
+        return firstIndex != -1 && firstIndex == lastIndex;
+    }
+
+    // Check that registers are pushed and poped with correct register type and number
+    static void checkPushPopRegNumberAndType(String stdout, String keyword, String expected_freg_type,
+                                             int expected_number_of_fregs) throws Exception {
+        String expected = keyword + expected_number_of_fregs + " " + expected_freg_type + " registers";
+
+        String regex = keyword + "(\\d+) " + expected_freg_type + " registers";
+        Pattern p = Pattern.compile(regex);
+        Matcher m = p.matcher(stdout);
+
+        if (m.find()) {
+            String found = m.group();
+            Asserts.assertEquals(found, expected, "found '" + found + "' but should print '" + expected + "'");
+        } else {
+            throw new RuntimeException("'" + regex + "' is not found in stdout");
+        }
+
+        if (m.find()) {
+            throw new RuntimeException("Stdout is expected to contain only one occurance of '" + regex +
+                                       "'. Found another occurance: '" + m.group() + "'");
+        }
+    }
+
+    static String launchJavaTestProcess(String test_name) throws Exception {
+        ArrayList<String> command = new ArrayList<String>();
+        command.add("-Xbatch");
+        command.add("-XX:LoopUnrollLimit=0");
+        command.add("-XX:-UseOnStackReplacement");
+        command.add("-XX:-TieredCompilation");
+        command.add("-XX:+UseZGC");
+        command.add("-XX:+ZGenerational");
+        command.add("--add-modules=jdk.incubator.vector");
+        command.add("-XX:CompileCommand=print," +  Launcher.class.getName() + "::" + test_name);
+        command.add(Launcher.class.getName());
+        command.add(test_name);
+
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(command);
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldHaveExitValue(0);
+        return output.getStdout();
+    }
+
+    static void run_test(String test_name, String expected_freg_type, int expected_number_of_fregs,
+                         String expected_vector_reg_type, int expected_number_of_vector_regs) throws Exception {
+        String stdout = launchJavaTestProcess(test_name);
+
+        String keyword = "push_fp: ";
+        checkPushPopRegNumberAndType(stdout, keyword, expected_freg_type, expected_number_of_fregs);
+        checkPushPopRegNumberAndType(stdout, keyword, expected_vector_reg_type, expected_number_of_vector_regs);
+
+        keyword = "pop_fp: ";
+        checkPushPopRegNumberAndType(stdout, keyword, expected_freg_type, expected_number_of_fregs);
+        checkPushPopRegNumberAndType(stdout, keyword, expected_vector_reg_type, expected_number_of_vector_regs);
+    }
+
+    static void run_test(String test_name, String expected_freg_type, int expected_number_of_fregs) throws Exception {
+        String stdout = launchJavaTestProcess(test_name);
+
+        String keyword = "push_fp: ";
+        if (!containOnlyOneOccuranceOfKeyword(stdout, keyword)) {
+            throw new RuntimeException("Stdout is expected to contain only one occurance of keyword: " + "'" + keyword + "'");
+        }
+        checkPushPopRegNumberAndType(stdout, keyword, expected_freg_type, expected_number_of_fregs);
+
+        keyword = "pop_fp: ";
+        if (!containOnlyOneOccuranceOfKeyword(stdout, keyword)) {
+            throw new RuntimeException("Stdout is expected to contain only one occurance of keyword: " + "'" + keyword + "'");
+        }
+        checkPushPopRegNumberAndType(stdout, keyword, expected_freg_type, expected_number_of_fregs);
+    }
+
+    public static void main(String[] args) throws Exception {
+        String vector_max_reg_type;
+        if (VectorShape.S_Max_BIT.vectorBitSize() > 128) {
+            vector_max_reg_type = "SVE";
+        } else {
+            vector_max_reg_type = "Neon";
+        }
+        run_test("test_one_float_push_pop_at_load_barrier", "fp", 1);
+        run_test("test_two_floats_push_pop_at_load_barrier", "fp", 2);
+        run_test("test_three_floats_push_pop_at_load_barrier", "fp", 3);
+        run_test("test_one_double_push_pop_at_load_barrier", "fp", 1);
+        run_test("test_two_doubles_push_pop_at_load_barrier", "fp", 2);
+        run_test("test_three_doubles_push_pop_at_load_barrier", "fp", 3);
+        run_test("test_one_vector_128_push_pop_at_load_barrier", "Neon", 1);
+        run_test("test_two_vectors_128_push_pop_at_load_barrier", "Neon", 2);
+        run_test("test_three_vectors_128_push_pop_at_load_barrier", "Neon", 3);
+        run_test("test_vector_max_push_pop_at_load_barrier", vector_max_reg_type, 1);
+        run_test("test_float_and_vector_push_pop_at_load_barrier", "fp", 1, vector_max_reg_type, 1);
+    }
+}
+

From 3ccb64c0216c72008578b904d0e7e5bba5e11134 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Wed, 24 Apr 2024 06:44:14 +0000
Subject: [PATCH 170/486] 8318446: C2: optimize stores into primitive arrays by
 combining values into larger store

Reviewed-by: kvn, thartmann
---
 make/test/BuildMicrobenchmark.gmk             |    1 +
 src/hotspot/share/opto/addnode.cpp            |    4 +-
 src/hotspot/share/opto/addnode.hpp            |    2 +-
 src/hotspot/share/opto/c2_globals.hpp         |    6 +
 src/hotspot/share/opto/compile.cpp            |    1 +
 src/hotspot/share/opto/memnode.cpp            |  689 +++++++++
 src/hotspot/share/opto/phaseX.cpp             |   10 +-
 .../jtreg/compiler/c2/TestMergeStores.java    | 1247 +++++++++++++++++
 .../bench/vm/compiler/MergeStores.java        |  696 +++++++++
 9 files changed, 2652 insertions(+), 4 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestMergeStores.java
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/MergeStores.java

diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index bb1e6111baa..3d6ec9950d7 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -103,6 +103,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
         --add-exports java.base/jdk.internal.event=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.util=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \
diff --git a/src/hotspot/share/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp
index 928e51191d6..f0e55d6ed48 100644
--- a/src/hotspot/share/opto/addnode.cpp
+++ b/src/hotspot/share/opto/addnode.cpp
@@ -724,9 +724,9 @@ Node* AddPNode::Ideal_base_and_offset(Node* ptr, PhaseValues* phase,
 //------------------------------unpack_offsets----------------------------------
 // Collect the AddP offset values into the elements array, giving up
 // if there are more than length.
-int AddPNode::unpack_offsets(Node* elements[], int length) {
+int AddPNode::unpack_offsets(Node* elements[], int length) const {
   int count = 0;
-  Node* addr = this;
+  Node const* addr = this;
   Node* base = addr->in(AddPNode::Base);
   while (addr->is_AddP()) {
     if (addr->in(AddPNode::Base) != base) {
diff --git a/src/hotspot/share/opto/addnode.hpp b/src/hotspot/share/opto/addnode.hpp
index a6ef58b98ce..19043b5e40f 100644
--- a/src/hotspot/share/opto/addnode.hpp
+++ b/src/hotspot/share/opto/addnode.hpp
@@ -181,7 +181,7 @@ public:
 
   // Collect the AddP offset values into the elements array, giving up
   // if there are more than length.
-  int unpack_offsets(Node* elements[], int length);
+  int unpack_offsets(Node* elements[], int length) const;
 
   // Do not match base-ptr edge
   virtual uint match_edge(uint idx) const;
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 62489f426c6..785b76849c1 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -353,6 +353,12 @@
   develop(bool, TraceNewVectors, false,                                     \
           "Trace creation of Vector nodes")                                 \
                                                                             \
+  product(bool, MergeStores, true, DIAGNOSTIC,                              \
+          "Optimize stores by combining values into larger store")          \
+                                                                            \
+  develop(bool, TraceMergeStores, false,                                    \
+          "Trace creation of merged stores")                                \
+                                                                            \
   product_pd(bool, OptoBundling,                                            \
           "Generate nops to fill i-cache lines")                            \
                                                                             \
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index e6a522e3610..30663673977 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -931,6 +931,7 @@ Compile::Compile( ciEnv* ci_env,
     _directive(directive),
     _log(ci_env->log()),
     _first_failure_details(nullptr),
+    _for_post_loop_igvn(comp_arena(), 8, 0, nullptr),
     _congraph(nullptr),
     NOT_PRODUCT(_igv_printer(nullptr) COMMA)
     _unique(0),
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index f7fdc167cb8..8347321fe90 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -2697,6 +2697,683 @@ uint StoreNode::hash() const {
   return NO_HASH;
 }
 
+// Class to parse array pointers, and determine if they are adjacent. We parse the form:
+//
+//   pointer =   base
+//             + constant_offset
+//             + LShiftL( ConvI2L(int_offset + int_con), int_offset_shift)
+//             + sum(other_offsets)
+//
+//
+// Note: we accumulate all constant offsets into constant_offset, even the int constant behind
+//       the "LShiftL(ConvI2L(...))" pattern. We convert "ConvI2L(int_offset + int_con)" to
+//       "ConvI2L(int_offset) + int_con", which is only safe if we can assume that either all
+//       compared addresses have an overflow for "int_offset + int_con" or none.
+//       For loads and stores on arrays, we know that if one overflows and the other not, then
+//       the two addresses lay almost max_int indices apart, but the maximal array size is
+//       only about half of that. Therefore, the RangeCheck on at least one of them must have
+//       failed.
+//
+//   constant_offset += LShiftL( ConvI2L(int_con), int_offset_shift)
+//
+//   pointer =   base
+//             + constant_offset
+//             + LShiftL( ConvI2L(int_offset), int_offset_shift)
+//             + sum(other_offsets)
+//
+class ArrayPointer {
+private:
+  const bool _is_valid;          // The parsing succeeded
+  const Node* _pointer;          // The final pointer to the position in the array
+  const Node* _base;             // Base address of the array
+  const jlong _constant_offset;  // Sum of collected constant offsets
+  const Node* _int_offset;       // (optional) Offset behind LShiftL and ConvI2L
+  const jint  _int_offset_shift; // (optional) Shift value for int_offset
+  const GrowableArray<Node*>* _other_offsets; // List of other AddP offsets
+
+  ArrayPointer(const bool is_valid,
+               const Node* pointer,
+               const Node* base,
+               const jlong constant_offset,
+               const Node* int_offset,
+               const jint int_offset_shift,
+               const GrowableArray<Node*>* other_offsets) :
+      _is_valid(is_valid),
+      _pointer(pointer),
+      _base(base),
+      _constant_offset(constant_offset),
+      _int_offset(int_offset),
+      _int_offset_shift(int_offset_shift),
+      _other_offsets(other_offsets)
+  {
+    assert(_pointer != nullptr, "must always have pointer");
+    assert(is_valid == (_base != nullptr), "have base exactly if valid");
+    assert(is_valid == (_other_offsets != nullptr), "have other_offsets exactly if valid");
+  }
+
+  static ArrayPointer make_invalid(const Node* pointer) {
+    return ArrayPointer(false, pointer, nullptr, 0, nullptr, 0, nullptr);
+  }
+
+  static bool parse_int_offset(Node* offset, Node*& int_offset, jint& int_offset_shift) {
+    // offset = LShiftL( ConvI2L(int_offset), int_offset_shift)
+    if (offset->Opcode() == Op_LShiftL &&
+        offset->in(1)->Opcode() == Op_ConvI2L &&
+        offset->in(2)->Opcode() == Op_ConI) {
+      int_offset = offset->in(1)->in(1); // LShiftL -> ConvI2L -> int_offset
+      int_offset_shift = offset->in(2)->get_int(); // LShiftL -> int_offset_shift
+      return true;
+    }
+
+    // offset = ConvI2L(int_offset) = LShiftL( ConvI2L(int_offset), 0)
+    if (offset->Opcode() == Op_ConvI2L) {
+      int_offset = offset->in(1);
+      int_offset_shift = 0;
+      return true;
+    }
+
+    // parse failed
+    return false;
+  }
+
+public:
+  // Parse the structure above the pointer
+  static ArrayPointer make(PhaseGVN* phase, const Node* pointer) {
+    assert(phase->type(pointer)->isa_aryptr() != nullptr, "must be array pointer");
+    if (!pointer->is_AddP()) { return ArrayPointer::make_invalid(pointer); }
+
+    const Node* base = pointer->in(AddPNode::Base);
+    if (base == nullptr) { return ArrayPointer::make_invalid(pointer); }
+
+    const int search_depth = 5;
+    Node* offsets[search_depth];
+    int count = pointer->as_AddP()->unpack_offsets(offsets, search_depth);
+
+    // We expect at least a constant each
+    if (count <= 0) { return ArrayPointer::make_invalid(pointer); }
+
+    // We extract the form:
+    //
+    //   pointer =   base
+    //             + constant_offset
+    //             + LShiftL( ConvI2L(int_offset + int_con), int_offset_shift)
+    //             + sum(other_offsets)
+    //
+    jlong constant_offset = 0;
+    Node* int_offset = nullptr;
+    jint int_offset_shift = 0;
+    GrowableArray<Node*>* other_offsets = new GrowableArray<Node*>(count);
+
+    for (int i = 0; i < count; i++) {
+      Node* offset = offsets[i];
+      if (offset->Opcode() == Op_ConI) {
+        // Constant int offset
+        constant_offset += offset->get_int();
+      } else if (offset->Opcode() == Op_ConL) {
+        // Constant long offset
+        constant_offset += offset->get_long();
+      } else if(int_offset == nullptr && parse_int_offset(offset, int_offset, int_offset_shift)) {
+        // LShiftL( ConvI2L(int_offset), int_offset_shift)
+        int_offset = int_offset->uncast();
+        if (int_offset->Opcode() == Op_AddI && int_offset->in(2)->Opcode() == Op_ConI) {
+          // LShiftL( ConvI2L(int_offset + int_con), int_offset_shift)
+          constant_offset += ((jlong)int_offset->in(2)->get_int()) << int_offset_shift;
+          int_offset = int_offset->in(1);
+        }
+      } else {
+        // All others
+        other_offsets->append(offset);
+      }
+    }
+
+    return ArrayPointer(true, pointer, base, constant_offset, int_offset, int_offset_shift, other_offsets);
+  }
+
+  bool is_adjacent_to_and_before(const ArrayPointer& other, const jlong data_size) const {
+    if (!_is_valid || !other._is_valid) { return false; }
+
+    // Offset adjacent?
+    if (this->_constant_offset + data_size != other._constant_offset) { return false; }
+
+    // All other components identical?
+    if (this->_base != other._base ||
+        this->_int_offset != other._int_offset ||
+        this->_int_offset_shift != other._int_offset_shift ||
+        this->_other_offsets->length() != other._other_offsets->length()) {
+      return false;
+    }
+
+    for (int i = 0; i < this->_other_offsets->length(); i++) {
+      Node* o1 = this->_other_offsets->at(i);
+      Node* o2 = other._other_offsets->at(i);
+      if (o1 != o2) { return false; }
+    }
+
+    return true;
+  }
+
+#ifndef PRODUCT
+  void dump() {
+    if (!_is_valid) {
+      tty->print("ArrayPointer[%d %s, invalid]", _pointer->_idx, _pointer->Name());
+      return;
+    }
+    tty->print("ArrayPointer[%d %s, base[%d %s] + %lld",
+               _pointer->_idx, _pointer->Name(),
+               _base->_idx, _base->Name(),
+               (long long)_constant_offset);
+    if (_int_offset != 0) {
+      tty->print(" + I2L[%d %s] << %d",
+                 _int_offset->_idx, _int_offset->Name(), _int_offset_shift);
+    }
+    for (int i = 0; i < _other_offsets->length(); i++) {
+      Node* n = _other_offsets->at(i);
+      tty->print(" + [%d %s]", n->_idx, n->Name());
+    }
+    tty->print_cr("]");
+  }
+#endif
+};
+
+// Link together multiple stores (B/S/C/I) into a longer one.
+//
+// Example: _store = StoreB[i+3]
+//
+//   RangeCheck[i+0]           RangeCheck[i+0]
+//   StoreB[i+0]
+//   RangeCheck[i+1]           RangeCheck[i+1]
+//   StoreB[i+1]         -->   pass:             fail:
+//   StoreB[i+2]               StoreI[i+0]       StoreB[i+0]
+//   StoreB[i+3]
+//
+// The 4 StoreB are merged into a single StoreI node. We have to be careful with RangeCheck[i+1]: before
+// the optimization, if this RangeCheck[i+1] fails, then we execute only StoreB[i+0], and then trap. After
+// the optimization, the new StoreI[i+0] is on the passing path of RangeCheck[i+1], and StoreB[i+0] on the
+// failing path.
+//
+// Note: For normal array stores, every store at first has a RangeCheck. But they can be removed with:
+//       - RCE (RangeCheck Elimination): the RangeChecks in the loop are hoisted out and before the loop,
+//                                       and possibly no RangeChecks remain between the stores.
+//       - RangeCheck smearing: the earlier RangeChecks are adjusted such that they cover later RangeChecks,
+//                              and those later RangeChecks can be removed. Example:
+//
+//                              RangeCheck[i+0]                         RangeCheck[i+0] <- before first store
+//                              StoreB[i+0]                             StoreB[i+0]     <- first store
+//                              RangeCheck[i+1]     --> smeared -->     RangeCheck[i+3] <- only RC between first and last store
+//                              StoreB[i+0]                             StoreB[i+1]     <- second store
+//                              RangeCheck[i+2]     --> removed
+//                              StoreB[i+0]                             StoreB[i+2]
+//                              RangeCheck[i+3]     --> removed
+//                              StoreB[i+0]                             StoreB[i+3]     <- last store
+//
+//                              Thus, it is a common pattern that between the first and last store in a chain
+//                              of adjacent stores there remains exactly one RangeCheck, located between the
+//                              first and the second store (e.g. RangeCheck[i+3]).
+//
+class MergePrimitiveArrayStores : public StackObj {
+private:
+  PhaseGVN* _phase;
+  StoreNode* _store;
+
+public:
+  MergePrimitiveArrayStores(PhaseGVN* phase, StoreNode* store) : _phase(phase), _store(store) {}
+
+  StoreNode* run();
+
+private:
+  bool is_compatible_store(const StoreNode* other_store) const;
+  bool is_adjacent_pair(const StoreNode* use_store, const StoreNode* def_store) const;
+  bool is_adjacent_input_pair(const Node* n1, const Node* n2, const int memory_size) const;
+  static bool is_con_RShift(const Node* n, Node const*& base_out, jint& shift_out);
+  enum CFGStatus { SuccessNoRangeCheck, SuccessWithRangeCheck, Failure };
+  static CFGStatus cfg_status_for_pair(const StoreNode* use_store, const StoreNode* def_store);
+
+  class Status {
+  private:
+    StoreNode* _found_store;
+    bool       _found_range_check;
+
+    Status(StoreNode* found_store, bool found_range_check)
+      : _found_store(found_store), _found_range_check(found_range_check) {}
+
+  public:
+    StoreNode* found_store() const { return _found_store; }
+    bool found_range_check() const { return _found_range_check; }
+    static Status make_failure() { return Status(nullptr, false); }
+
+    static Status make(StoreNode* found_store, const CFGStatus cfg_status) {
+      if (cfg_status == CFGStatus::Failure) {
+        return Status::make_failure();
+      }
+      return Status(found_store, cfg_status == CFGStatus::SuccessWithRangeCheck);
+    }
+  };
+
+  Status find_adjacent_use_store(const StoreNode* def_store) const;
+  Status find_adjacent_def_store(const StoreNode* use_store) const;
+  Status find_use_store(const StoreNode* def_store) const;
+  Status find_def_store(const StoreNode* use_store) const;
+  Status find_use_store_unidirectional(const StoreNode* def_store) const;
+  Status find_def_store_unidirectional(const StoreNode* use_store) const;
+
+  void collect_merge_list(Node_List& merge_list) const;
+  Node* make_merged_input_value(const Node_List& merge_list);
+  StoreNode* make_merged_store(const Node_List& merge_list, Node* merged_input_value);
+
+  DEBUG_ONLY( void trace(const Node_List& merge_list, const Node* merged_input_value, const StoreNode* merged_store) const; )
+};
+
+StoreNode* MergePrimitiveArrayStores::run() {
+  // Check for B/S/C/I
+  int opc = _store->Opcode();
+  if (opc != Op_StoreB && opc != Op_StoreC && opc != Op_StoreI) {
+    return nullptr;
+  }
+
+  // Only merge stores on arrays, and the stores must have the same size as the elements.
+  const TypeAryPtr* aryptr_t = _store->adr_type()->isa_aryptr();
+  if (aryptr_t == nullptr ||
+      type2aelembytes(aryptr_t->elem()->array_element_basic_type()) != _store->memory_size()) {
+    return nullptr;
+  }
+
+  // The _store must be the "last" store in a chain. If we find a use we could merge with
+  // then that use or a store further down is the "last" store.
+  Status status_use = find_adjacent_use_store(_store);
+  if (status_use.found_store() != nullptr) {
+    return nullptr;
+  }
+
+  // Check if we can merge with at least one def, so that we have at least 2 stores to merge.
+  Status status_def = find_adjacent_def_store(_store);
+  if (status_def.found_store() == nullptr) {
+    return nullptr;
+  }
+
+  ResourceMark rm;
+  Node_List merge_list;
+  collect_merge_list(merge_list);
+
+  Node* merged_input_value = make_merged_input_value(merge_list);
+  if (merged_input_value == nullptr) { return nullptr; }
+
+  StoreNode* merged_store = make_merged_store(merge_list, merged_input_value);
+
+  DEBUG_ONLY( if(TraceMergeStores) { trace(merge_list, merged_input_value, merged_store); } )
+
+  return merged_store;
+}
+
+// Check compatibility between _store and other_store.
+bool MergePrimitiveArrayStores::is_compatible_store(const StoreNode* other_store) const {
+  int opc = _store->Opcode();
+  assert(opc == Op_StoreB || opc == Op_StoreC || opc == Op_StoreI, "precondition");
+  assert(_store->adr_type()->isa_aryptr() != nullptr, "must be array store");
+
+  if (other_store == nullptr ||
+      _store->Opcode() != other_store->Opcode() ||
+      other_store->adr_type()->isa_aryptr() == nullptr) {
+    return false;
+  }
+
+  // Check that the size of the stores, and the array elements are all the same.
+  const TypeAryPtr* aryptr_t1 = _store->adr_type()->is_aryptr();
+  const TypeAryPtr* aryptr_t2 = other_store->adr_type()->is_aryptr();
+  int size1 = type2aelembytes(aryptr_t1->elem()->array_element_basic_type());
+  int size2 = type2aelembytes(aryptr_t2->elem()->array_element_basic_type());
+  if (size1 != size2 ||
+      size1 != _store->memory_size() ||
+      _store->memory_size() != other_store->memory_size()) {
+    return false;
+  }
+  return true;
+}
+
+bool MergePrimitiveArrayStores::is_adjacent_pair(const StoreNode* use_store, const StoreNode* def_store) const {
+  if (!is_adjacent_input_pair(def_store->in(MemNode::ValueIn),
+                              use_store->in(MemNode::ValueIn),
+                              def_store->memory_size())) {
+    return false;
+  }
+
+  ResourceMark rm;
+  ArrayPointer array_pointer_use = ArrayPointer::make(_phase, use_store->in(MemNode::Address));
+  ArrayPointer array_pointer_def = ArrayPointer::make(_phase, def_store->in(MemNode::Address));
+  if (!array_pointer_def.is_adjacent_to_and_before(array_pointer_use, use_store->memory_size())) {
+    return false;
+  }
+
+  return true;
+}
+
+bool MergePrimitiveArrayStores::is_adjacent_input_pair(const Node* n1, const Node* n2, const int memory_size) const {
+  // Pattern: [n1 = ConI, n2 = ConI]
+  if (n1->Opcode() == Op_ConI) {
+    return n2->Opcode() == Op_ConI;
+  }
+
+  // Pattern: [n1 = base >> shift, n2 = base >> (shift + memory_size)]
+  Node const* base_n2;
+  jint shift_n2;
+  if (!is_con_RShift(n2, base_n2, shift_n2)) {
+    return false;
+  }
+  if (n1->Opcode() == Op_ConvL2I) {
+    // look through
+    n1 = n1->in(1);
+  }
+  Node const* base_n1;
+  jint shift_n1;
+  if (n1 == base_n2) {
+    // n1 = base = base >> 0
+    base_n1 = n1;
+    shift_n1 = 0;
+  } else if (!is_con_RShift(n1, base_n1, shift_n1)) {
+    return false;
+  }
+  int bits_per_store = memory_size * 8;
+  if (base_n1 != base_n2 ||
+      shift_n1 + bits_per_store != shift_n2 ||
+      shift_n1 % bits_per_store != 0) {
+    return false;
+  }
+
+  // both load from same value with correct shift
+  return true;
+}
+
+// Detect pattern: n = base_out >> shift_out
+bool MergePrimitiveArrayStores::is_con_RShift(const Node* n, Node const*& base_out, jint& shift_out) {
+  assert(n != nullptr, "precondition");
+
+  int opc = n->Opcode();
+  if (opc == Op_ConvL2I) {
+    n = n->in(1);
+    opc = n->Opcode();
+  }
+
+  if ((opc == Op_RShiftI ||
+       opc == Op_RShiftL ||
+       opc == Op_URShiftI ||
+       opc == Op_URShiftL) &&
+      n->in(2)->is_ConI()) {
+    base_out = n->in(1);
+    shift_out = n->in(2)->get_int();
+    assert(shift_out >= 0, "must be positive");
+    return true;
+  }
+  return false;
+}
+
+// Check if there is nothing between the two stores, except optionally a RangeCheck leading to an uncommon trap.
+MergePrimitiveArrayStores::CFGStatus MergePrimitiveArrayStores::cfg_status_for_pair(const StoreNode* use_store, const StoreNode* def_store) {
+  assert(use_store->in(MemNode::Memory) == def_store, "use-def relationship");
+
+  Node* ctrl_use = use_store->in(MemNode::Control);
+  Node* ctrl_def = def_store->in(MemNode::Control);
+  if (ctrl_use == nullptr || ctrl_def == nullptr) {
+    return CFGStatus::Failure;
+  }
+
+  if (ctrl_use == ctrl_def) {
+    // Same ctrl -> no RangeCheck in between.
+    // Check: use_store must be the only use of def_store.
+    if (def_store->outcnt() > 1) {
+      return CFGStatus::Failure;
+    }
+    return CFGStatus::SuccessNoRangeCheck;
+  }
+
+  // Different ctrl -> could have RangeCheck in between.
+  // Check: 1. def_store only has these uses: use_store and MergeMem for uncommon trap, and
+  //        2. ctrl separated by RangeCheck.
+  if (def_store->outcnt() != 2) {
+    return CFGStatus::Failure; // Cannot have exactly these uses: use_store and MergeMem for uncommon trap.
+  }
+  int use_store_out_idx = def_store->raw_out(0) == use_store ? 0 : 1;
+  Node* merge_mem = def_store->raw_out(1 - use_store_out_idx)->isa_MergeMem();
+  if (merge_mem == nullptr ||
+      merge_mem->outcnt() != 1) {
+    return CFGStatus::Failure; // Does not have MergeMem for uncommon trap.
+  }
+  if (!ctrl_use->is_IfProj() ||
+      !ctrl_use->in(0)->is_RangeCheck() ||
+      ctrl_use->in(0)->outcnt() != 2) {
+    return CFGStatus::Failure; // Not RangeCheck.
+  }
+  ProjNode* other_proj = ctrl_use->as_IfProj()->other_if_proj();
+  Node* trap = other_proj->is_uncommon_trap_proj(Deoptimization::Reason_range_check);
+  if (trap != merge_mem->unique_out() ||
+      ctrl_use->in(0)->in(0) != ctrl_def) {
+    return CFGStatus::Failure; // Not RangeCheck with merge_mem leading to uncommon trap.
+  }
+
+  return CFGStatus::SuccessWithRangeCheck;
+}
+
+MergePrimitiveArrayStores::Status MergePrimitiveArrayStores::find_adjacent_use_store(const StoreNode* def_store) const {
+  Status status_use = find_use_store(def_store);
+  StoreNode* use_store = status_use.found_store();
+  if (use_store != nullptr && !is_adjacent_pair(use_store, def_store)) {
+    return Status::make_failure();
+  }
+  return status_use;
+}
+
+MergePrimitiveArrayStores::Status MergePrimitiveArrayStores::find_adjacent_def_store(const StoreNode* use_store) const {
+  Status status_def = find_def_store(use_store);
+  StoreNode* def_store = status_def.found_store();
+  if (def_store != nullptr && !is_adjacent_pair(use_store, def_store)) {
+    return Status::make_failure();
+  }
+  return status_def;
+}
+
+MergePrimitiveArrayStores::Status MergePrimitiveArrayStores::find_use_store(const StoreNode* def_store) const {
+  Status status_use = find_use_store_unidirectional(def_store);
+
+#ifdef ASSERT
+  StoreNode* use_store = status_use.found_store();
+  if (use_store != nullptr) {
+    Status status_def = find_def_store_unidirectional(use_store);
+    assert(status_def.found_store() == def_store &&
+           status_def.found_range_check() == status_use.found_range_check(),
+           "find_use_store and find_def_store must be symmetric");
+  }
+#endif
+
+  return status_use;
+}
+
+MergePrimitiveArrayStores::Status MergePrimitiveArrayStores::find_def_store(const StoreNode* use_store) const {
+  Status status_def = find_def_store_unidirectional(use_store);
+
+#ifdef ASSERT
+  StoreNode* def_store = status_def.found_store();
+  if (def_store != nullptr) {
+    Status status_use = find_use_store_unidirectional(def_store);
+    assert(status_use.found_store() == use_store &&
+           status_use.found_range_check() == status_def.found_range_check(),
+           "find_use_store and find_def_store must be symmetric");
+  }
+#endif
+
+  return status_def;
+}
+
+MergePrimitiveArrayStores::Status MergePrimitiveArrayStores::find_use_store_unidirectional(const StoreNode* def_store) const {
+  assert(is_compatible_store(def_store), "precondition: must be compatible with _store");
+
+  for (DUIterator_Fast imax, i = def_store->fast_outs(imax); i < imax; i++) {
+    StoreNode* use_store = def_store->fast_out(i)->isa_Store();
+    if (is_compatible_store(use_store)) {
+      return Status::make(use_store, cfg_status_for_pair(use_store, def_store));
+    }
+  }
+
+  return Status::make_failure();
+}
+
+MergePrimitiveArrayStores::Status MergePrimitiveArrayStores::find_def_store_unidirectional(const StoreNode* use_store) const {
+  assert(is_compatible_store(use_store), "precondition: must be compatible with _store");
+
+  StoreNode* def_store = use_store->in(MemNode::Memory)->isa_Store();
+  if (!is_compatible_store(def_store)) {
+    return Status::make_failure();
+  }
+
+  return Status::make(def_store, cfg_status_for_pair(use_store, def_store));
+}
+
+void MergePrimitiveArrayStores::collect_merge_list(Node_List& merge_list) const {
+  // The merged store can be at most 8 bytes.
+  const uint merge_list_max_size = 8 / _store->memory_size();
+  assert(merge_list_max_size >= 2 &&
+         merge_list_max_size <= 8 &&
+         is_power_of_2(merge_list_max_size),
+         "must be 2, 4 or 8");
+
+  // Traverse up the chain of adjacent def stores.
+  StoreNode* current = _store;
+  merge_list.push(current);
+  while (current != nullptr && merge_list.size() < merge_list_max_size) {
+    Status status = find_adjacent_def_store(current);
+    current = status.found_store();
+    if (current != nullptr) {
+      merge_list.push(current);
+
+      // We can have at most one RangeCheck.
+      if (status.found_range_check()) {
+        break;
+      }
+    }
+  }
+
+  // Truncate the merge_list to a power of 2.
+  const uint pow2size = round_down_power_of_2(merge_list.size());
+  assert(pow2size >= 2, "must be merging at least 2 stores");
+  while (merge_list.size() > pow2size) { merge_list.pop(); }
+}
+
+// Merge the input values of the smaller stores to a single larger input value.
+Node* MergePrimitiveArrayStores::make_merged_input_value(const Node_List& merge_list) {
+  int new_memory_size = _store->memory_size() * merge_list.size();
+  Node* first = merge_list.at(merge_list.size()-1);
+  Node* merged_input_value = nullptr;
+  if (_store->in(MemNode::ValueIn)->Opcode() == Op_ConI) {
+    // Pattern: [ConI, ConI, ...] -> new constant
+    jlong con = 0;
+    jlong bits_per_store = _store->memory_size() * 8;
+    jlong mask = (((jlong)1) << bits_per_store) - 1;
+    for (uint i = 0; i < merge_list.size(); i++) {
+      jlong con_i = merge_list.at(i)->in(MemNode::ValueIn)->get_int();
+      con = con << bits_per_store;
+      con = con | (mask & con_i);
+    }
+    merged_input_value = _phase->longcon(con);
+  } else {
+    // Pattern: [base >> 24, base >> 16, base >> 8, base] -> base
+    //             |                                  |
+    //           _store                             first
+    //
+    merged_input_value = first->in(MemNode::ValueIn);
+    Node const* base_last;
+    jint shift_last;
+    bool is_true = is_con_RShift(_store->in(MemNode::ValueIn), base_last, shift_last);
+    assert(is_true, "must detect con RShift");
+    if (merged_input_value != base_last && merged_input_value->Opcode() == Op_ConvL2I) {
+      // look through
+      merged_input_value = merged_input_value->in(1);
+    }
+    if (merged_input_value != base_last) {
+      // merged_input_value is not the base
+      return nullptr;
+    }
+  }
+
+  if (_phase->type(merged_input_value)->isa_long() != nullptr && new_memory_size <= 4) {
+    // Example:
+    //
+    //   long base = ...;
+    //   a[0] = (byte)(base >> 0);
+    //   a[1] = (byte)(base >> 8);
+    //
+    merged_input_value = _phase->transform(new ConvL2INode(merged_input_value));
+  }
+
+  assert((_phase->type(merged_input_value)->isa_int() != nullptr && new_memory_size <= 4) ||
+         (_phase->type(merged_input_value)->isa_long() != nullptr && new_memory_size == 8),
+         "merged_input_value is either int or long, and new_memory_size is small enough");
+
+  return merged_input_value;
+}
+
+//                                                                                                          //
+// first_ctrl    first_mem   first_adr                first_ctrl    first_mem         first_adr             //
+//  |                |           |                     |                |                 |                 //
+//  |                |           |                     |                +---------------+ |                 //
+//  |                |           |                     |                |               | |                 //
+//  |                | +---------+                     |                | +---------------+                 //
+//  |                | |                               |                | |             | |                 //
+//  +--------------+ | |  v1                           +------------------------------+ | |  v1             //
+//  |              | | |  |                            |                | |           | | |  |              //
+// RangeCheck     first_store                         RangeCheck        | |          first_store            //
+//  |                |  |                              |                | |                |                //
+// last_ctrl         |  +----> unc_trap               last_ctrl         | |                +----> unc_trap  //
+//  |                |                       ===>      |                | |                                 //
+//  +--------------+ | a2 v2                           |                | |                                 //
+//  |              | | |  |                            |                | |                                 //
+//  |             second_store                         |                | |                                 //
+//  |                |                                 |                | | [v1 v2   ...   vn]              //
+// ...              ...                                |                | |         |                       //
+//  |                |                                 |                | |         v                       //
+//  +--------------+ | an vn                           +--------------+ | | merged_input_value              //
+//                 | | |  |                                           | | |  |                              //
+//                last_store (= _store)                              merged_store                           //
+//                                                                                                          //
+StoreNode* MergePrimitiveArrayStores::make_merged_store(const Node_List& merge_list, Node* merged_input_value) {
+  Node* first_store = merge_list.at(merge_list.size()-1);
+  Node* last_ctrl   = _store->in(MemNode::Control); // after (optional) RangeCheck
+  Node* first_mem   = first_store->in(MemNode::Memory);
+  Node* first_adr   = first_store->in(MemNode::Address);
+
+  const TypePtr* new_adr_type = _store->adr_type();
+
+  int new_memory_size = _store->memory_size() * merge_list.size();
+  BasicType bt = T_ILLEGAL;
+  switch (new_memory_size) {
+    case 2: bt = T_SHORT; break;
+    case 4: bt = T_INT;   break;
+    case 8: bt = T_LONG;  break;
+  }
+
+  StoreNode* merged_store = StoreNode::make(*_phase, last_ctrl, first_mem, first_adr,
+                                            new_adr_type, merged_input_value, bt, MemNode::unordered);
+
+  // Marking the store mismatched is sufficient to prevent reordering, since array stores
+  // are all on the same slice. Hence, we need no barriers.
+  merged_store->set_mismatched_access();
+
+  // Constants above may now also be be packed -> put candidate on worklist
+  _phase->is_IterGVN()->_worklist.push(first_mem);
+
+  return merged_store;
+}
+
+#ifdef ASSERT
+void MergePrimitiveArrayStores::trace(const Node_List& merge_list, const Node* merged_input_value, const StoreNode* merged_store) const {
+  stringStream ss;
+  ss.print_cr("[TraceMergeStores]: Replace");
+  for (int i = (int)merge_list.size() - 1; i >= 0; i--) {
+    merge_list.at(i)->dump("\n", false, &ss);
+  }
+  ss.print_cr("[TraceMergeStores]: with");
+  merged_input_value->dump("\n", false, &ss);
+  merged_store->dump("\n", false, &ss);
+  tty->print("%s", ss.as_string());
+}
+#endif
+
 //------------------------------Ideal------------------------------------------
 // Change back-to-back Store(, p, x) -> Store(m, p, y) to Store(m, p, x).
 // When a store immediately follows a relevant allocation/initialization,
@@ -2782,6 +3459,18 @@ Node *StoreNode::Ideal(PhaseGVN *phase, bool can_reshape) {
     }
   }
 
+#ifdef VM_LITTLE_ENDIAN
+  if (MergeStores && UseUnalignedAccesses) {
+    if (phase->C->post_loop_opts_phase()) {
+      MergePrimitiveArrayStores merge(phase, this);
+      Node* progress = merge.run();
+      if (progress != nullptr) { return progress; }
+    } else {
+      phase->C->record_for_post_loop_opts_igvn(this);
+    }
+  }
+#endif
+
   return nullptr;                  // No further progress
 }
 
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index c791146f757..1a1e4e04e16 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -2273,7 +2273,15 @@ void PhasePeephole::print_statistics() {
 //------------------------------set_req_X--------------------------------------
 void Node::set_req_X( uint i, Node *n, PhaseIterGVN *igvn ) {
   assert( is_not_dead(n), "can not use dead node");
-  assert( igvn->hash_find(this) != this, "Need to remove from hash before changing edges" );
+#ifdef ASSERT
+  if (igvn->hash_find(this) == this) {
+    tty->print_cr("Need to remove from hash before changing edges");
+    this->dump(1);
+    tty->print_cr("Set at i = %d", i);
+    n->dump();
+    assert(false, "Need to remove from hash before changing edges");
+  }
+#endif
   Node *old = in(i);
   set_req(i, n);
 
diff --git a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
new file mode 100644
index 00000000000..0af46b56a56
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
@@ -0,0 +1,1247 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package compiler.c2;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Utils;
+import jdk.internal.misc.Unsafe;
+import java.lang.reflect.Array;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Random;
+
+/*
+ * @test
+ * @bug 8318446
+ * @summary Test merging of consecutive stores
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run main compiler.c2.TestMergeStores aligned
+ */
+
+/*
+ * @test
+ * @bug 8318446
+ * @summary Test merging of consecutive stores
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run main compiler.c2.TestMergeStores unaligned
+ */
+
+public class TestMergeStores {
+    static int RANGE = 1000;
+    private static final Unsafe UNSAFE = Unsafe.getUnsafe();
+    private static final Random RANDOM = Utils.getRandomInstance();
+
+    // Inputs
+    byte[] aB = new byte[RANGE];
+    byte[] bB = new byte[RANGE];
+    short[] aS = new short[RANGE];
+    short[] bS = new short[RANGE];
+    int[] aI = new int[RANGE];
+    int[] bI = new int[RANGE];
+    long[] aL = new long[RANGE];
+    long[] bL = new long[RANGE];
+
+    int offset1;
+    int offset2;
+    byte vB1;
+    byte vB2;
+    short vS1;
+    short vS2;
+    int vI1;
+    int vI2;
+    long vL1;
+    long vL2;
+
+    interface TestFunction {
+        Object[] run(boolean isWarmUp, int rnd);
+    }
+
+    Map<String, Map<String, TestFunction>> testGroups = new HashMap<String, Map<String, TestFunction>>();
+
+    public static void main(String[] args) {
+        TestFramework framework = new TestFramework(TestMergeStores.class);
+        framework.addFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED");
+
+        switch (args[0]) {
+            case "aligned"     -> { framework.addFlags("-XX:-UseUnalignedAccesses"); }
+            case "unaligned"   -> { framework.addFlags("-XX:+UseUnalignedAccesses"); }
+            default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
+        }
+        framework.start();
+    }
+
+    public TestMergeStores() {
+        testGroups.put("test1", new HashMap<String,TestFunction>());
+        testGroups.get("test1").put("test1R", (_,_) -> { return test1R(aB.clone()); });
+        testGroups.get("test1").put("test1a", (_,_) -> { return test1a(aB.clone()); });
+        testGroups.get("test1").put("test1b", (_,_) -> { return test1b(aB.clone()); });
+        testGroups.get("test1").put("test1c", (_,_) -> { return test1c(aB.clone()); });
+        testGroups.get("test1").put("test1d", (_,_) -> { return test1d(aB.clone()); });
+        testGroups.get("test1").put("test1e", (_,_) -> { return test1e(aB.clone()); });
+        testGroups.get("test1").put("test1f", (_,_) -> { return test1f(aB.clone()); });
+        testGroups.get("test1").put("test1g", (_,_) -> { return test1g(aB.clone()); });
+        testGroups.get("test1").put("test1h", (_,_) -> { return test1h(aB.clone()); });
+        testGroups.get("test1").put("test1i", (_,_) -> { return test1i(aB.clone()); });
+
+        testGroups.put("test2", new HashMap<String,TestFunction>());
+        testGroups.get("test2").put("test2R", (_,_) -> { return test2R(aB.clone(), offset1, vL1); });
+        testGroups.get("test2").put("test2a", (_,_) -> { return test2a(aB.clone(), offset1, vL1); });
+        testGroups.get("test2").put("test2b", (_,_) -> { return test2b(aB.clone(), offset1, vL1); });
+        testGroups.get("test2").put("test2c", (_,_) -> { return test2c(aB.clone(), offset1, vL1); });
+        testGroups.get("test2").put("test2d", (_,_) -> { return test2d(aB.clone(), offset1, vL1); });
+        testGroups.get("test2").put("test2e", (_,_) -> { return test2d(aB.clone(), offset1, vL1); });
+
+        testGroups.put("test3", new HashMap<String,TestFunction>());
+        testGroups.get("test3").put("test3R", (_,_) -> { return test3R(aB.clone(), offset1, vL1); });
+        testGroups.get("test3").put("test3a", (_,_) -> { return test3a(aB.clone(), offset1, vL1); });
+
+        testGroups.put("test4", new HashMap<String,TestFunction>());
+        testGroups.get("test4").put("test4R", (_,_) -> { return test4R(aB.clone(), offset1, vL1, vI1, vS1, vB1); });
+        testGroups.get("test4").put("test4a", (_,_) -> { return test4a(aB.clone(), offset1, vL1, vI1, vS1, vB1); });
+
+        testGroups.put("test5", new HashMap<String,TestFunction>());
+        testGroups.get("test5").put("test5R", (_,_) -> { return test5R(aB.clone(), offset1); });
+        testGroups.get("test5").put("test5a", (_,_) -> { return test5a(aB.clone(), offset1); });
+
+        testGroups.put("test6", new HashMap<String,TestFunction>());
+        testGroups.get("test6").put("test6R", (_,_) -> { return test6R(aB.clone(), bB.clone(), offset1, offset2); });
+        testGroups.get("test6").put("test6a", (_,_) -> { return test6a(aB.clone(), bB.clone(), offset1, offset2); });
+
+        testGroups.put("test7", new HashMap<String,TestFunction>());
+        testGroups.get("test7").put("test7R", (_,_) -> { return test7R(aB.clone(), offset1, vI1); });
+        testGroups.get("test7").put("test7a", (_,_) -> { return test7a(aB.clone(), offset1, vI1); });
+
+        testGroups.put("test100", new HashMap<String,TestFunction>());
+        testGroups.get("test100").put("test100R", (_,_) -> { return test100R(aS.clone(), offset1); });
+        testGroups.get("test100").put("test100a", (_,_) -> { return test100a(aS.clone(), offset1); });
+
+        testGroups.put("test101", new HashMap<String,TestFunction>());
+        testGroups.get("test101").put("test101R", (_,_) -> { return test101R(aS.clone(), offset1); });
+        testGroups.get("test101").put("test101a", (_,_) -> { return test101a(aS.clone(), offset1); });
+
+        testGroups.put("test102", new HashMap<String,TestFunction>());
+        testGroups.get("test102").put("test102R", (_,_) -> { return test102R(aS.clone(), offset1, vL1, vI1, vS1); });
+        testGroups.get("test102").put("test102a", (_,_) -> { return test102a(aS.clone(), offset1, vL1, vI1, vS1); });
+
+        testGroups.put("test200", new HashMap<String,TestFunction>());
+        testGroups.get("test200").put("test200R", (_,_) -> { return test200R(aI.clone(), offset1); });
+        testGroups.get("test200").put("test200a", (_,_) -> { return test200a(aI.clone(), offset1); });
+
+        testGroups.put("test201", new HashMap<String,TestFunction>());
+        testGroups.get("test201").put("test201R", (_,_) -> { return test201R(aI.clone(), offset1); });
+        testGroups.get("test201").put("test201a", (_,_) -> { return test201a(aI.clone(), offset1); });
+
+        testGroups.put("test202", new HashMap<String,TestFunction>());
+        testGroups.get("test202").put("test202R", (_,_) -> { return test202R(aI.clone(), offset1, vL1, vI1); });
+        testGroups.get("test202").put("test202a", (_,_) -> { return test202a(aI.clone(), offset1, vL1, vI1); });
+
+        testGroups.put("test300", new HashMap<String,TestFunction>());
+        testGroups.get("test300").put("test300R", (_,_) -> { return test300R(aI.clone()); });
+        testGroups.get("test300").put("test300a", (_,_) -> { return test300a(aI.clone()); });
+
+        testGroups.put("test400", new HashMap<String,TestFunction>());
+        testGroups.get("test400").put("test400R", (_,_) -> { return test400R(aI.clone()); });
+        testGroups.get("test400").put("test400a", (_,_) -> { return test400a(aI.clone()); });
+
+        testGroups.put("test500", new HashMap<String,TestFunction>());
+        testGroups.get("test500").put("test500R", (_,_) -> { return test500R(aB.clone(), offset1, vL1); });
+        testGroups.get("test500").put("test500a", (_,_) -> { return test500a(aB.clone(), offset1, vL1); });
+
+        testGroups.put("test501", new HashMap<String,TestFunction>());
+        testGroups.get("test501").put("test500R", (_,i) -> { return test500R(aB.clone(), RANGE - 20 + (i % 30), vL1); });
+        testGroups.get("test501").put("test501a", (_,i) -> { return test501a(aB.clone(), RANGE - 20 + (i % 30), vL1); });
+        //                                                                               +-------------------+
+        // Create offsets that are sometimes going to pass all RangeChecks, and sometimes one, and sometimes none.
+        // Consequence: all RangeChecks stay in the final compilation.
+
+        testGroups.put("test502", new HashMap<String,TestFunction>());
+        testGroups.get("test502").put("test500R", (w,i) -> { return test500R(aB.clone(), w ? offset1 : RANGE - 20 + (i % 30), vL1); });
+        testGroups.get("test502").put("test502a", (w,i) -> { return test502a(aB.clone(), w ? offset1 : RANGE - 20 + (i % 30), vL1); });
+        //                                                                                   +-----+   +-------------------+
+        // First use something in range, and after warmup randomize going outside the range.
+        // Consequence: all RangeChecks stay in the final compilation.
+    }
+
+    @Warmup(100)
+    @Run(test = {"test1a",
+                 "test1b",
+                 "test1c",
+                 "test1d",
+                 "test1e",
+                 "test1f",
+                 "test1g",
+                 "test1h",
+                 "test1i",
+                 "test2a",
+                 "test2b",
+                 "test2c",
+                 "test2d",
+                 "test2e",
+                 "test3a",
+                 "test4a",
+                 "test5a",
+                 "test6a",
+                 "test7a",
+                 "test100a",
+                 "test101a",
+                 "test102a",
+                 "test200a",
+                 "test201a",
+                 "test202a",
+                 "test300a",
+                 "test400a",
+                 "test500a",
+                 "test501a",
+                 "test502a"})
+    public void runTests(RunInfo info) {
+        // Repeat many times, so that we also have multiple iterations for post-warmup to potentially recompile
+        int iters = info.isWarmUp() ? 1_000 : 50_000;
+        for (int iter = 0; iter < iters; iter++) {
+            // Write random values to inputs
+            set_random(aB);
+            set_random(bB);
+            set_random(aS);
+            set_random(bS);
+            set_random(aI);
+            set_random(bI);
+            set_random(aL);
+            set_random(bL);
+
+            offset1 = Math.abs(RANDOM.nextInt()) % 100;
+            offset2 = Math.abs(RANDOM.nextInt()) % 100;
+            vB1 = (byte)RANDOM.nextInt();
+            vB2 = (byte)RANDOM.nextInt();
+            vS1 = (short)RANDOM.nextInt();
+            vS2 = (short)RANDOM.nextInt();
+            vI1 = RANDOM.nextInt();
+            vI2 = RANDOM.nextInt();
+            vL1 = RANDOM.nextLong();
+            vL2 = RANDOM.nextLong();
+
+            // Run all tests
+            for (Map.Entry<String, Map<String,TestFunction>> group_entry : testGroups.entrySet()) {
+                String group_name = group_entry.getKey();
+                Map<String, TestFunction> group = group_entry.getValue();
+                Object[] gold = null;
+                String gold_name = "NONE";
+                for (Map.Entry<String,TestFunction> entry : group.entrySet()) {
+                    String name = entry.getKey();
+                    TestFunction test = entry.getValue();
+                    Object[] result = test.run(info.isWarmUp(), iter);
+                    if (gold == null) {
+                        gold = result;
+                        gold_name = name;
+                    } else {
+                        verify("group " + group_name + ", gold " + gold_name + ", test " + name, gold, result);
+                    }
+                }
+            }
+        }
+    }
+
+    static void verify(String name, Object[] gold, Object[] result) {
+        if (gold.length != result.length) {
+            throw new RuntimeException("verify " + name + ": not the same number of outputs: gold.length = " +
+                                       gold.length + ", result.length = " + result.length);
+        }
+        for (int i = 0; i < gold.length; i++) {
+            Object g = gold[i];
+            Object r = result[i];
+            if (g.getClass() != r.getClass() || !g.getClass().isArray() || !r.getClass().isArray()) {
+                throw new RuntimeException("verify " + name + ": must both be array of same type:" +
+                                           " gold[" + i + "].getClass() = " + g.getClass().getSimpleName() +
+                                           " result[" + i + "].getClass() = " + r.getClass().getSimpleName());
+            }
+            if (g == r) {
+                throw new RuntimeException("verify " + name + ": should be two separate arrays (with identical content):" +
+                                           " gold[" + i + "] == result[" + i + "]");
+            }
+            if (Array.getLength(g) != Array.getLength(r)) {
+                    throw new RuntimeException("verify " + name + ": arrays must have same length:" +
+                                           " gold[" + i + "].length = " + Array.getLength(g) +
+                                           " result[" + i + "].length = " + Array.getLength(r));
+            }
+            Class c = g.getClass().getComponentType();
+            if (c == byte.class) {
+                verifyB(name, i, (byte[])g, (byte[])r);
+            } else if (c == short.class) {
+                verifyS(name, i, (short[])g, (short[])r);
+            } else if (c == int.class) {
+                verifyI(name, i, (int[])g, (int[])r);
+            } else if (c == long.class) {
+                verifyL(name, i, (long[])g, (long[])r);
+            } else {
+                throw new RuntimeException("verify " + name + ": array type not supported for verify:" +
+                                       " gold[" + i + "].getClass() = " + g.getClass().getSimpleName() +
+                                       " result[" + i + "].getClass() = " + r.getClass().getSimpleName());
+            }
+        }
+    }
+
+    static void verifyB(String name, int i, byte[] g, byte[] r) {
+        for (int j = 0; j < g.length; j++) {
+            if (g[j] != r[j]) {
+                throw new RuntimeException("verify " + name + ": arrays must have same content:" +
+                                           " gold[" + i + "][" + j + "] = " + g[j] +
+                                           " = " + String.format("%02X", g[j] & 0xFF) +
+                                           " result[" + i + "][" + j + "] = " + r[j] +
+                                           " = " + String.format("%02X", r[j] & 0xFF));
+            }
+        }
+    }
+
+    static void verifyS(String name, int i, short[] g, short[] r) {
+        for (int j = 0; j < g.length; j++) {
+            if (g[j] != r[j]) {
+                throw new RuntimeException("verify " + name + ": arrays must have same content:" +
+                                           " gold[" + i + "][" + j + "] = " + g[j] +
+                                           " result[" + i + "][" + j + "] = " + r[j]);
+            }
+        }
+    }
+
+    static void verifyI(String name, int i, int[] g, int[] r) {
+        for (int j = 0; j < g.length; j++) {
+            if (g[j] != r[j]) {
+                throw new RuntimeException("verify " + name + ": arrays must have same content:" +
+                                           " gold[" + i + "][" + j + "] = " + g[j] +
+                                           " result[" + i + "][" + j + "] = " + r[j]);
+            }
+        }
+    }
+
+    static void verifyL(String name, int i, long[] g, long[] r) {
+        for (int j = 0; j < g.length; j++) {
+            if (g[j] != r[j]) {
+                throw new RuntimeException("verify " + name + ": arrays must have same content:" +
+                                           " gold[" + i + "][" + j + "] = " + g[j] +
+                                           " result[" + i + "][" + j + "] = " + r[j]);
+            }
+        }
+    }
+
+    static void set_random(byte[] a) {
+        for (int i = 0; i < a.length; i++) {
+            a[i] = (byte)RANDOM.nextInt();
+        }
+    }
+
+    static void set_random(short[] a) {
+        for (int i = 0; i < a.length; i++) {
+            a[i] = (short)RANDOM.nextInt();
+        }
+    }
+
+    static void set_random(int[] a) {
+        for (int i = 0; i < a.length; i++) {
+            a[i] = RANDOM.nextInt();
+        }
+    }
+
+    static void set_random(long[] a) {
+        for (int i = 0; i < a.length; i++) {
+            a[i] = RANDOM.nextLong();
+        }
+    }
+
+    // -------------------------------------------
+    // -------     Little-Endian API    ----------
+    // -------------------------------------------
+    // Note: I had to add @ForceInline because otherwise it would sometimes
+    //       not inline nested method calls.
+
+    // Store a short LE into an array using store bytes in an array
+    @ForceInline
+    static void storeShortLE(byte[] bytes, int offset, short value) {
+        storeBytes(bytes, offset, (byte)(value >> 0),
+                                  (byte)(value >> 8));
+    }
+
+    // Store an int LE into an array using store bytes in an array
+    @ForceInline
+    static void storeIntLE(byte[] bytes, int offset, int value) {
+        storeBytes(bytes, offset, (byte)(value >> 0 ),
+                                  (byte)(value >> 8 ),
+                                  (byte)(value >> 16),
+                                  (byte)(value >> 24));
+    }
+
+    // Store an int LE into an array using store bytes in an array
+    @ForceInline
+    static void storeLongLE(byte[] bytes, int offset, long value) {
+        storeBytes(bytes, offset, (byte)(value >> 0 ),
+                                  (byte)(value >> 8 ),
+                                  (byte)(value >> 16),
+                                  (byte)(value >> 24),
+                                  (byte)(value >> 32),
+                                  (byte)(value >> 40),
+                                  (byte)(value >> 48),
+                                  (byte)(value >> 56));
+    }
+
+    // Store 2 bytes into an array
+    @ForceInline
+    static void storeBytes(byte[] bytes, int offset, byte b0, byte b1) {
+        bytes[offset + 0] = b0;
+        bytes[offset + 1] = b1;
+    }
+
+    // Store 4 bytes into an array
+    @ForceInline
+    static void storeBytes(byte[] bytes, int offset, byte b0, byte b1, byte b2, byte b3) {
+        bytes[offset + 0] = b0;
+        bytes[offset + 1] = b1;
+        bytes[offset + 2] = b2;
+        bytes[offset + 3] = b3;
+    }
+
+    // Store 8 bytes into an array
+    @ForceInline
+    static void storeBytes(byte[] bytes, int offset, byte b0, byte b1, byte b2, byte b3,
+                                                     byte b4, byte b5, byte b6, byte b7) {
+        bytes[offset + 0] = b0;
+        bytes[offset + 1] = b1;
+        bytes[offset + 2] = b2;
+        bytes[offset + 3] = b3;
+        bytes[offset + 4] = b4;
+        bytes[offset + 5] = b5;
+        bytes[offset + 6] = b6;
+        bytes[offset + 7] = b7;
+    }
+
+    @DontCompile
+    static Object[] test1R(byte[] a) {
+        a[0] = (byte)0xbe;
+        a[1] = (byte)0xba;
+        a[2] = (byte)0xad;
+        a[3] = (byte)0xba;
+        a[4] = (byte)0xef;
+        a[5] = (byte)0xbe;
+        a[6] = (byte)0xad;
+        a[7] = (byte)0xde;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test1a(byte[] a) {
+        a[0] = (byte)0xbe;
+        a[1] = (byte)0xba;
+        a[2] = (byte)0xad;
+        a[3] = (byte)0xba;
+        a[4] = (byte)0xef;
+        a[5] = (byte)0xbe;
+        a[6] = (byte)0xad;
+        a[7] = (byte)0xde;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test1b(byte[] a) {
+        // Add custom null check, to ensure the unsafe access always recognizes its type as an array store
+        if (a == null) {return null;}
+        UNSAFE.putLongUnaligned(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET, 0xdeadbeefbaadbabeL);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test1c(byte[] a) {
+        storeLongLE(a, 0, 0xdeadbeefbaadbabeL);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test1d(byte[] a) {
+        storeIntLE(a, 0, 0xbaadbabe);
+        storeIntLE(a, 4, 0xdeadbeef);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test1e(byte[] a) {
+        storeShortLE(a, 0, (short)0xbabe);
+        storeShortLE(a, 2, (short)0xbaad);
+        storeShortLE(a, 4, (short)0xbeef);
+        storeShortLE(a, 6, (short)0xdead);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test1f(byte[] a) {
+        UNSAFE.putByte(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 0, (byte)0xbe);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 1, (byte)0xba);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 2, (byte)0xad);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 3, (byte)0xba);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 4, (byte)0xef);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 5, (byte)0xbe);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 6, (byte)0xad);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 7, (byte)0xde);
+        return new Object[]{ a };
+    }
+
+    @Test
+    // Do not optimize these, just to be sure we do not mess with store ordering.
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test1g(byte[] a) {
+        UNSAFE.putByteRelease(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 0, (byte)0xbe);
+        UNSAFE.putByteRelease(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 1, (byte)0xba);
+        UNSAFE.putByteRelease(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 2, (byte)0xad);
+        UNSAFE.putByteRelease(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 3, (byte)0xba);
+        UNSAFE.putByteRelease(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 4, (byte)0xef);
+        UNSAFE.putByteRelease(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 5, (byte)0xbe);
+        UNSAFE.putByteRelease(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 6, (byte)0xad);
+        UNSAFE.putByteRelease(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 7, (byte)0xde);
+        return new Object[]{ a };
+    }
+
+    @Test
+    // Do not optimize these, just to be sure we do not mess with store ordering.
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test1h(byte[] a) {
+        UNSAFE.putByteVolatile(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 0, (byte)0xbe);
+        UNSAFE.putByteVolatile(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 1, (byte)0xba);
+        UNSAFE.putByteVolatile(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 2, (byte)0xad);
+        UNSAFE.putByteVolatile(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 3, (byte)0xba);
+        UNSAFE.putByteVolatile(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 4, (byte)0xef);
+        UNSAFE.putByteVolatile(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 5, (byte)0xbe);
+        UNSAFE.putByteVolatile(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 6, (byte)0xad);
+        UNSAFE.putByteVolatile(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 7, (byte)0xde);
+        return new Object[]{ a };
+    }
+
+    @Test
+    // Do not optimize these, just to be sure we do not mess with store ordering.
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test1i(byte[] a) {
+        UNSAFE.putByteOpaque(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 0, (byte)0xbe);
+        UNSAFE.putByteOpaque(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 1, (byte)0xba);
+        UNSAFE.putByteOpaque(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 2, (byte)0xad);
+        UNSAFE.putByteOpaque(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 3, (byte)0xba);
+        UNSAFE.putByteOpaque(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 4, (byte)0xef);
+        UNSAFE.putByteOpaque(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 5, (byte)0xbe);
+        UNSAFE.putByteOpaque(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 6, (byte)0xad);
+        UNSAFE.putByteOpaque(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + 7, (byte)0xde);
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test2R(byte[] a, int offset, long v) {
+        a[offset + 0] = (byte)(v >> 0);
+        a[offset + 1] = (byte)(v >> 8);
+        a[offset + 2] = (byte)(v >> 16);
+        a[offset + 3] = (byte)(v >> 24);
+        a[offset + 4] = (byte)(v >> 32);
+        a[offset + 5] = (byte)(v >> 40);
+        a[offset + 6] = (byte)(v >> 48);
+        a[offset + 7] = (byte)(v >> 56);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test2a(byte[] a, int offset, long v) {
+        a[offset + 0] = (byte)(v >> 0);
+        a[offset + 1] = (byte)(v >> 8);
+        a[offset + 2] = (byte)(v >> 16);
+        a[offset + 3] = (byte)(v >> 24);
+        a[offset + 4] = (byte)(v >> 32);
+        a[offset + 5] = (byte)(v >> 40);
+        a[offset + 6] = (byte)(v >> 48);
+        a[offset + 7] = (byte)(v >> 56);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test2b(byte[] a, int offset, long v) {
+        // Add custom null check, to ensure the unsafe access always recognizes its type as an array store
+        if (a == null) {return null;}
+        UNSAFE.putLongUnaligned(a, UNSAFE.ARRAY_BYTE_BASE_OFFSET + offset, v);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test2c(byte[] a, int offset, long v) {
+        storeLongLE(a, offset, v);
+        return new Object[]{ a };
+    }
+
+    @Test
+    // No optimization, casting long -> int -> byte does not work
+    static Object[] test2d(byte[] a, int offset, long v) {
+        storeIntLE(a, offset + 0, (int)(v >> 0));
+        storeIntLE(a, offset + 4, (int)(v >> 32));
+        return new Object[]{ a };
+    }
+
+    @Test
+    // No optimization, casting long -> short -> byte does not work
+    static Object[] test2e(byte[] a, int offset, long v) {
+        storeShortLE(a, offset + 0, (short)(v >> 0));
+        storeShortLE(a, offset + 2, (short)(v >> 16));
+        storeShortLE(a, offset + 4, (short)(v >> 32));
+        storeShortLE(a, offset + 6, (short)(v >> 48));
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test3R(byte[] a, int offset, long v) {
+        a[offset + 0] = (byte)(v >> 0);
+        a[offset + 1] = (byte)(v >> 8);
+        a[offset + 2] = (byte)(v >> 16);
+        a[offset + 3] = (byte)(v >> 24);
+        a[offset + 4] = (byte)(v >> 0);
+        a[offset + 5] = (byte)(v >> 8);
+        a[offset + 6] = (byte)(v >> 16);
+        a[offset + 7] = (byte)(v >> 24);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test3a(byte[] a, int offset, long v) {
+        a[offset + 0] = (byte)(v >> 0);
+        a[offset + 1] = (byte)(v >> 8);
+        a[offset + 2] = (byte)(v >> 16);
+        a[offset + 3] = (byte)(v >> 24);
+        a[offset + 4] = (byte)(v >> 0);
+        a[offset + 5] = (byte)(v >> 8);
+        a[offset + 6] = (byte)(v >> 16);
+        a[offset + 7] = (byte)(v >> 24);
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test4R(byte[] a, int offset, long v1, int v2, short v3, byte v4) {
+        a[offset +  0] = (byte)0x00;
+        a[offset +  1] = (byte)0xFF;
+        a[offset +  2] = v4;
+        a[offset +  3] = (byte)0x42;
+        a[offset +  4] = (byte)(v1 >> 0);
+        a[offset +  5] = (byte)(v1 >> 8);
+        a[offset +  6] = (byte)0xAB;
+        a[offset +  7] = (byte)0xCD;
+        a[offset +  8] = (byte)0xEF;
+        a[offset +  9] = (byte)0x01;
+        a[offset + 10] = (byte)(v2 >> 0);
+        a[offset + 11] = (byte)(v2 >> 8);
+        a[offset + 12] = (byte)(v2 >> 16);
+        a[offset + 13] = (byte)(v2 >> 24);
+        a[offset + 14] = (byte)(v3 >> 0);
+        a[offset + 15] = (byte)(v3 >> 8);
+        a[offset + 16] = (byte)0xEF;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "4", // 3 (+ 1 for uncommon trap)
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "3",
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test4a(byte[] a, int offset, long v1, int v2, short v3, byte v4) {
+        a[offset +  0] = (byte)0x00; // individual load expected to go into state of RC
+        a[offset +  1] = (byte)0xFF;
+        a[offset +  2] = v4;
+        a[offset +  3] = (byte)0x42;
+        a[offset +  4] = (byte)(v1 >> 0);
+        a[offset +  5] = (byte)(v1 >> 8);
+        a[offset +  6] = (byte)0xAB;
+        a[offset +  7] = (byte)0xCD;
+        a[offset +  8] = (byte)0xEF;
+        a[offset +  9] = (byte)0x01;
+        a[offset + 10] = (byte)(v2 >> 0);
+        a[offset + 11] = (byte)(v2 >> 8);
+        a[offset + 12] = (byte)(v2 >> 16);
+        a[offset + 13] = (byte)(v2 >> 24);
+        a[offset + 14] = (byte)(v3 >> 0);
+        a[offset + 15] = (byte)(v3 >> 8);
+        a[offset + 16] = (byte)0xEF;
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test5R(byte[] a, int offset) {
+        a[offset +  0] = (byte)0x01;
+        a[offset +  1] = (byte)0x02;
+        a[offset +  2] = (byte)0x03;
+        a[offset +  3] = (byte)0x04;
+        a[offset +  4] = (byte)0x11;
+        a[offset +  5] = (byte)0x22;
+        a[offset +  6] = (byte)0x33;
+        a[offset +  7] = (byte)0x44;
+        a[offset +  8] = (byte)0x55;
+        a[offset +  9] = (byte)0x66;
+        a[offset + 10] = (byte)0x77;
+        a[offset + 11] = (byte)0xAA;
+        a[offset + 12] = (byte)0xBB;
+        a[offset + 13] = (byte)0xCC;
+        a[offset + 14] = (byte)0xDD;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test5a(byte[] a, int offset) {
+        a[offset +  0] = (byte)0x01;
+        a[offset +  1] = (byte)0x02;
+        a[offset +  2] = (byte)0x03;
+        a[offset +  3] = (byte)0x04;
+        a[offset +  4] = (byte)0x11;
+        a[offset +  5] = (byte)0x22;
+        a[offset +  6] = (byte)0x33;
+        a[offset +  7] = (byte)0x44;
+        a[offset +  8] = (byte)0x55;
+        a[offset +  9] = (byte)0x66;
+        a[offset + 10] = (byte)0x77;
+        a[offset + 11] = (byte)0xAA;
+        a[offset + 12] = (byte)0xBB;
+        a[offset + 13] = (byte)0xCC;
+        a[offset + 14] = (byte)0xDD;
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test6R(byte[] a, byte[] b, int offset1, int offset2) {
+        a[offset1 +  1] = (byte)0x02;
+        a[offset1 +  3] = (byte)0x04;
+        b[offset1 +  4] = (byte)0x11;
+        a[offset1 +  5] = (byte)0x22;
+        a[offset2 +  6] = (byte)0x33;
+        a[offset1 +  7] = (byte)0x44;
+        b[offset1 +  8] = (byte)0x55;
+        b[offset1 + 10] = (byte)0x66;
+        return new Object[]{ a, b };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"})
+    static Object[] test6a(byte[] a, byte[] b, int offset1, int offset2) {
+        a[offset1 +  1] = (byte)0x02;
+        a[offset1 +  3] = (byte)0x04;
+        b[offset1 +  4] = (byte)0x11;
+        a[offset1 +  5] = (byte)0x22;
+        a[offset2 +  6] = (byte)0x33;
+        a[offset1 +  7] = (byte)0x44;
+        b[offset1 +  8] = (byte)0x55;
+        b[offset1 + 10] = (byte)0x66;
+        return new Object[]{ a, b };
+    }
+
+    @DontCompile
+    static Object[] test7R(byte[] a, int offset1, int v1) {
+        a[offset1 +  1] = (byte)(v1 >> 8);
+        a[offset1 +  2] = (byte)(v1 >> 16);
+        a[offset1 +  3] = (byte)(v1 >> 24);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "3",
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"})
+    static Object[] test7a(byte[] a, int offset1, int v1) {
+        a[offset1 +  1] = (byte)(v1 >> 8);
+        a[offset1 +  2] = (byte)(v1 >> 16);
+        a[offset1 +  3] = (byte)(v1 >> 24);
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test100R(short[] a, int offset) {
+        a[offset +  0] = (short)0x0100;
+        a[offset +  1] = (short)0x0200;
+        a[offset +  2] = (short)0x0311;
+        a[offset +  3] = (short)0x0400;
+        a[offset +  4] = (short)0x1100;
+        a[offset +  5] = (short)0x2233;
+        a[offset +  6] = (short)0x3300;
+        a[offset +  7] = (short)0x4400;
+        a[offset +  8] = (short)0x5599;
+        a[offset +  9] = (short)0x6600;
+        a[offset + 10] = (short)0x7700;
+        a[offset + 11] = (short)0xAACC;
+        a[offset + 12] = (short)0xBB00;
+        a[offset + 13] = (short)0xCC00;
+        a[offset + 14] = (short)0xDDFF;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_C_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.STORE_I_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.STORE_L_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "3"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test100a(short[] a, int offset) {
+        a[offset +  0] = (short)0x0100; // stays unchanged -> both used for RC and Return path
+        a[offset +  1] = (short)0x0200; //    I
+        a[offset +  2] = (short)0x0311; //    I
+        a[offset +  3] = (short)0x0400; //   L
+        a[offset +  4] = (short)0x1100; //   L
+        a[offset +  5] = (short)0x2233; //   L
+        a[offset +  6] = (short)0x3300; //   L
+        a[offset +  7] = (short)0x4400; //  L
+        a[offset +  8] = (short)0x5599; //  L
+        a[offset +  9] = (short)0x6600; //  L
+        a[offset + 10] = (short)0x7700; //  L
+        a[offset + 11] = (short)0xAACC; // L
+        a[offset + 12] = (short)0xBB00; // L
+        a[offset + 13] = (short)0xCC00; // L
+        a[offset + 14] = (short)0xDDFF; // L
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test101R(short[] a, int offset) {
+        a[offset +  0] = (short)0x0100;
+        a[offset +  1] = (short)0x0200;
+        a[offset +  2] = (short)0x0311;
+        a[offset +  3] = (short)0x0400;
+        a[offset +  4] = (short)0x1100;
+        a[offset +  5] = (short)0x2233;
+        a[offset +  6] = (short)0x3300;
+        a[offset +  7] = (short)0x4400;
+        a[offset +  8] = (short)0x5599;
+        a[offset +  9] = (short)0x6600;
+        a[offset + 10] = (short)0x7700;
+        a[offset + 11] = (short)0xAACC;
+        a[offset + 12] = (short)0xBB00;
+        a[offset + 13] = (short)0xCC00;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_C_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1", // only for RC
+                  IRNode.STORE_I_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.STORE_L_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "3"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test101a(short[] a, int offset) {
+        a[offset +  0] = (short)0x0100; //    I plus kept unchanged for RC
+        a[offset +  1] = (short)0x0200; //    I
+        a[offset +  2] = (short)0x0311; //   L
+        a[offset +  3] = (short)0x0400; //   L
+        a[offset +  4] = (short)0x1100; //   L
+        a[offset +  5] = (short)0x2233; //   L
+        a[offset +  6] = (short)0x3300; //  L
+        a[offset +  7] = (short)0x4400; //  L
+        a[offset +  8] = (short)0x5599; //  L
+        a[offset +  9] = (short)0x6600; //  L
+        a[offset + 10] = (short)0x7700; // L
+        a[offset + 11] = (short)0xAACC; // L
+        a[offset + 12] = (short)0xBB00; // L
+        a[offset + 13] = (short)0xCC00; // L
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test102R(short[] a, int offset, long v1, int v2, short v3) {
+        a[offset +  0] = (short)0x0000;
+        a[offset +  1] = (short)0xFFFF;
+        a[offset +  2] = v3;
+        a[offset +  3] = (short)0x4242;
+        a[offset +  4] = (short)(v1 >>  0);
+        a[offset +  5] = (short)(v1 >> 16);
+        a[offset +  6] = (short)0xAB11;
+        a[offset +  7] = (short)0xCD36;
+        a[offset +  8] = (short)0xEF89;
+        a[offset +  9] = (short)0x0156;
+        a[offset + 10] = (short)(v1 >> 0);
+        a[offset + 11] = (short)(v1 >> 16);
+        a[offset + 12] = (short)(v1 >> 32);
+        a[offset + 13] = (short)(v1 >> 48);
+        a[offset + 14] = (short)(v2 >> 0);
+        a[offset + 15] = (short)(v2 >> 16);
+        a[offset + 16] = (short)0xEFEF;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_C_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "4", // 3 (+1 that goes into RC)
+                  IRNode.STORE_I_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "3",
+                  IRNode.STORE_L_OF_CLASS, "short\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test102a(short[] a, int offset, long v1, int v2, short v3) {
+        a[offset +  0] = (short)0x0000; // store goes into RC
+        a[offset +  1] = (short)0xFFFF;
+        a[offset +  2] = v3;
+        a[offset +  3] = (short)0x4242;
+        a[offset +  4] = (short)(v1 >>  0);
+        a[offset +  5] = (short)(v1 >> 16);
+        a[offset +  6] = (short)0xAB11;
+        a[offset +  7] = (short)0xCD36;
+        a[offset +  8] = (short)0xEF89;
+        a[offset +  9] = (short)0x0156;
+        a[offset + 10] = (short)(v1 >> 0);
+        a[offset + 11] = (short)(v1 >> 16);
+        a[offset + 12] = (short)(v1 >> 32);
+        a[offset + 13] = (short)(v1 >> 48);
+        a[offset + 14] = (short)(v2 >> 0);
+        a[offset + 15] = (short)(v2 >> 16);
+        a[offset + 16] = (short)0xEFEF;
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test200R(int[] a, int offset) {
+        a[offset +  0] = 0x01001236;
+        a[offset +  1] = 0x02001284;
+        a[offset +  2] = 0x03111235;
+        a[offset +  3] = 0x04001294;
+        a[offset +  4] = 0x11001234;
+        a[offset +  5] = 0x22331332;
+        a[offset +  6] = 0x33001234;
+        a[offset +  7] = 0x44001432;
+        a[offset +  8] = 0x55991234;
+        a[offset +  9] = 0x66001233;
+        a[offset + 10] = 0x77001434;
+        a[offset + 11] = 0xAACC1234;
+        a[offset + 12] = 0xBB001434;
+        a[offset + 13] = 0xCC001236;
+        a[offset + 14] = 0xDDFF1534;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_C_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.STORE_L_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "7"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test200a(int[] a, int offset) {
+        a[offset +  0] = 0x01001236; // stays unchanged -> both used for RC and Return path
+        a[offset +  1] = 0x02001284; //       L
+        a[offset +  2] = 0x03111235; //       L
+        a[offset +  3] = 0x04001294; //      L
+        a[offset +  4] = 0x11001234; //      L
+        a[offset +  5] = 0x22331332; //     L
+        a[offset +  6] = 0x33001234; //     L
+        a[offset +  7] = 0x44001432; //    L
+        a[offset +  8] = 0x55991234; //    L
+        a[offset +  9] = 0x66001233; //   L
+        a[offset + 10] = 0x77001434; //   L
+        a[offset + 11] = 0xAACC1234; //  L
+        a[offset + 12] = 0xBB001434; //  L
+        a[offset + 13] = 0xCC001236; // L
+        a[offset + 14] = 0xDDFF1534; // L
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test201R(int[] a, int offset) {
+        a[offset +  0] = 0x01001236;
+        a[offset +  1] = 0x02001284;
+        a[offset +  2] = 0x03111235;
+        a[offset +  3] = 0x04001294;
+        a[offset +  4] = 0x11001234;
+        a[offset +  5] = 0x22331332;
+        a[offset +  6] = 0x33001234;
+        a[offset +  7] = 0x44001432;
+        a[offset +  8] = 0x55991234;
+        a[offset +  9] = 0x66001233;
+        a[offset + 10] = 0x77001434;
+        a[offset + 11] = 0xAACC1234;
+        a[offset + 12] = 0xBB001434;
+        a[offset + 13] = 0xCC001236;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_C_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1", // only for RC
+                  IRNode.STORE_L_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "7"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test201a(int[] a, int offset) {
+        a[offset +  0] = 0x01001236; //       L and also kept unchanged for RC
+        a[offset +  1] = 0x02001284; //       L
+        a[offset +  2] = 0x03111235; //      L
+        a[offset +  3] = 0x04001294; //      L
+        a[offset +  4] = 0x11001234; //     L
+        a[offset +  5] = 0x22331332; //     L
+        a[offset +  6] = 0x33001234; //    L
+        a[offset +  7] = 0x44001432; //    L
+        a[offset +  8] = 0x55991234; //   L
+        a[offset +  9] = 0x66001233; //   L
+        a[offset + 10] = 0x77001434; //  L
+        a[offset + 11] = 0xAACC1234; //  L
+        a[offset + 12] = 0xBB001434; // L
+        a[offset + 13] = 0xCC001236; // L
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test202R(int[] a, int offset, long v1, int v2) {
+        a[offset +  0] = 0x00000000;
+        a[offset +  1] = 0xFFFFFFFF;
+        a[offset +  2] = v2;
+        a[offset +  3] = 0x42424242;
+        a[offset +  4] = (int)(v1 >>  0);
+        a[offset +  5] = (int)(v1 >> 32);
+        a[offset +  6] = 0xAB110129;
+        a[offset +  7] = 0xCD360183;
+        a[offset +  8] = 0xEF890173;
+        a[offset +  9] = 0x01560124;
+        a[offset + 10] = (int)(v1 >> 0);
+        a[offset + 11] = (int)(v1 >> 32);
+        a[offset + 12] = (int)(v1 >> 0);
+        a[offset + 13] = (int)(v1 >> 32);
+        a[offset + 14] = v2;
+        a[offset + 15] = v2;
+        a[offset + 16] = 0xEFEFEFEF;
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_C_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "6", // 5 (+1 that goes into RC)
+                  IRNode.STORE_L_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "6"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test202a(int[] a, int offset, long v1, int v2) {
+        a[offset +  0] = 0x00000000; // merged with store below, but also kept unchanged for RC
+        a[offset +  1] = 0xFFFFFFFF;
+        a[offset +  2] = v2;
+        a[offset +  3] = 0x42424242;
+        a[offset +  4] = (int)(v1 >>  0);
+        a[offset +  5] = (int)(v1 >> 32);
+        a[offset +  6] = 0xAB110129;
+        a[offset +  7] = 0xCD360183;
+        a[offset +  8] = 0xEF890173;
+        a[offset +  9] = 0x01560124;
+        a[offset + 10] = (int)(v1 >> 0);
+        a[offset + 11] = (int)(v1 >> 32);
+        a[offset + 12] = (int)(v1 >> 0);
+        a[offset + 13] = (int)(v1 >> 32);
+        a[offset + 14] = v2;
+        a[offset + 15] = v2;
+        a[offset + 16] = 0xEFEFEFEF;
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    static Object[] test300R(int[] a) {
+        a[2] = 42;
+        a[3] = 42;
+        a[4] = 42;
+        a[5] = 42;
+        int x = a[3]; // dependent load
+        return new Object[]{ a, new int[]{ x } };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_L_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2"},
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test300a(int[] a) {
+        a[2] = 42;
+        a[3] = 42;
+        a[4] = 42;
+        a[5] = 42;
+        int x = a[3]; // dependent load
+        return new Object[]{ a, new int[]{ x } };
+    }
+
+    @DontCompile
+    static Object[] test400R(int[] a) {
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 0, (byte)0xbe);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 1, (byte)0xba);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 2, (byte)0xad);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 3, (byte)0xba);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 4, (byte)0xef);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 5, (byte)0xbe);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 6, (byte)0xad);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 7, (byte)0xde);
+        return new Object[]{ a };
+    }
+
+    @Test
+    // We must be careful with mismatched accesses on arrays:
+    // An int-array can have about 2x max_int size, and hence if we address bytes in it, we can have int-overflows.
+    // We might consider addresses (x + 0) and (x + 1) as adjacent, even if x = max_int, and therefore the second
+    // address overflows and is not adjacent at all.
+    // Therefore, we should only consider stores that have the same size as the element type of the array.
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8", // no merging
+                  IRNode.STORE_C_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_L_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"})
+    static Object[] test400a(int[] a) {
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 0, (byte)0xbe);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 1, (byte)0xba);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 2, (byte)0xad);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 3, (byte)0xba);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 4, (byte)0xef);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 5, (byte)0xbe);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 6, (byte)0xad);
+        UNSAFE.putByte(a, UNSAFE.ARRAY_INT_BASE_OFFSET + 7, (byte)0xde);
+        return new Object[]{ a };
+    }
+
+    @DontCompile
+    // The 500-series has all the same code, but is executed with different inputs:
+    // 500a: never violate a RangeCheck -> expect will always merge stores
+    // 501a: randomly violate RangeCheck, also during warmup -> never merge stores
+    // 502a: during warmup never violate RangeCheck -> compile once with merged stores
+    //       but then after warmup violate RangeCheck -> recompile without merged stores
+    static Object[] test500R(byte[] a, int offset, long v) {
+        int idx = 0;
+        try {
+            a[offset + 0] = (byte)(v >> 0);
+            idx = 1;
+            a[offset + 1] = (byte)(v >> 8);
+            idx = 2;
+            a[offset + 2] = (byte)(v >> 16);
+            idx = 3;
+            a[offset + 3] = (byte)(v >> 24);
+            idx = 4;
+            a[offset + 4] = (byte)(v >> 32);
+            idx = 5;
+            a[offset + 5] = (byte)(v >> 40);
+            idx = 6;
+            a[offset + 6] = (byte)(v >> 48);
+            idx = 7;
+            a[offset + 7] = (byte)(v >> 56);
+            idx = 8;
+        } catch (ArrayIndexOutOfBoundsException _) {}
+        return new Object[]{ a, new int[]{ idx } };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1", // for RangeCheck trap
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"}, // expect merged
+        applyIf = {"UseUnalignedAccesses", "true"})
+    static Object[] test500a(byte[] a, int offset, long v) {
+        int idx = 0;
+        try {
+            a[offset + 0] = (byte)(v >> 0);
+            idx = 1;
+            a[offset + 1] = (byte)(v >> 8);
+            idx = 2;
+            a[offset + 2] = (byte)(v >> 16);
+            idx = 3;
+            a[offset + 3] = (byte)(v >> 24);
+            idx = 4;
+            a[offset + 4] = (byte)(v >> 32);
+            idx = 5;
+            a[offset + 5] = (byte)(v >> 40);
+            idx = 6;
+            a[offset + 6] = (byte)(v >> 48);
+            idx = 7;
+            a[offset + 7] = (byte)(v >> 56);
+            idx = 8;
+        } catch (ArrayIndexOutOfBoundsException _) {}
+        return new Object[]{ a, new int[]{ idx } };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8", // No optimization because of too many RangeChecks
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"})
+    static Object[] test501a(byte[] a, int offset, long v) {
+        int idx = 0;
+        try {
+            a[offset + 0] = (byte)(v >> 0);
+            idx = 1;
+            a[offset + 1] = (byte)(v >> 8);
+            idx = 2;
+            a[offset + 2] = (byte)(v >> 16);
+            idx = 3;
+            a[offset + 3] = (byte)(v >> 24);
+            idx = 4;
+            a[offset + 4] = (byte)(v >> 32);
+            idx = 5;
+            a[offset + 5] = (byte)(v >> 40);
+            idx = 6;
+            a[offset + 6] = (byte)(v >> 48);
+            idx = 7;
+            a[offset + 7] = (byte)(v >> 56);
+            idx = 8;
+        } catch (ArrayIndexOutOfBoundsException _) {}
+        return new Object[]{ a, new int[]{ idx } };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8", // No optimization because of too many RangeChecks
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"})
+    static Object[] test502a(byte[] a, int offset, long v) {
+        int idx = 0;
+        try {
+            a[offset + 0] = (byte)(v >> 0);
+            idx = 1;
+            a[offset + 1] = (byte)(v >> 8);
+            idx = 2;
+            a[offset + 2] = (byte)(v >> 16);
+            idx = 3;
+            a[offset + 3] = (byte)(v >> 24);
+            idx = 4;
+            a[offset + 4] = (byte)(v >> 32);
+            idx = 5;
+            a[offset + 5] = (byte)(v >> 40);
+            idx = 6;
+            a[offset + 6] = (byte)(v >> 48);
+            idx = 7;
+            a[offset + 7] = (byte)(v >> 56);
+            idx = 8;
+        } catch (ArrayIndexOutOfBoundsException _) {}
+        return new Object[]{ a, new int[]{ idx } };
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java b/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java
new file mode 100644
index 00000000000..e1f0d5eaedc
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java
@@ -0,0 +1,696 @@
+/*
+ * Copyright (c) 2024, 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 org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+
+import jdk.internal.misc.Unsafe;
+import jdk.internal.util.ByteArrayLittleEndian;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 3, time = 3)
+@Measurement(iterations = 3, time = 3)
+@Fork(value = 3, jvmArgsAppend = {
+        "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
+        "--add-exports", "java.base/jdk.internal.util=ALL-UNNAMED"})
+@State(Scope.Benchmark)
+public class MergeStores {
+
+    public static final int RANGE = 100;
+
+    static Unsafe UNSAFE = Unsafe.getUnsafe();
+
+    @Param("1")
+    public static short vS;
+
+    @Param("1")
+    public static int vI;
+
+    @Param("1")
+    public static long vL;
+
+    public static int offset = 5;
+    public static byte[]  aB = new byte[RANGE];
+    public static short[] aS = new short[RANGE];
+    public static int[]   aI = new int[RANGE];
+
+    // -------------------------------------------
+    // -------     Little-Endian API    ----------
+    // -------------------------------------------
+
+    // Store a short LE into an array using store bytes in an array
+    static void storeShortLE(byte[] bytes, int offset, short value) {
+        storeBytes(bytes, offset, (byte)(value >> 0),
+                                  (byte)(value >> 8));
+    }
+
+    // Store an int LE into an array using store bytes in an array
+    static void storeIntLE(byte[] bytes, int offset, int value) {
+        storeBytes(bytes, offset, (byte)(value >> 0 ),
+                                  (byte)(value >> 8 ),
+                                  (byte)(value >> 16),
+                                  (byte)(value >> 24));
+    }
+
+    // Store an int LE into an array using store bytes in an array
+    static void storeLongLE(byte[] bytes, int offset, long value) {
+        storeBytes(bytes, offset, (byte)(value >> 0 ),
+                                  (byte)(value >> 8 ),
+                                  (byte)(value >> 16),
+                                  (byte)(value >> 24),
+                                  (byte)(value >> 32),
+                                  (byte)(value >> 40),
+                                  (byte)(value >> 48),
+                                  (byte)(value >> 56));
+    }
+
+    // Store 2 bytes into an array
+    static void storeBytes(byte[] bytes, int offset, byte b0, byte b1) {
+        bytes[offset + 0] = b0;
+        bytes[offset + 1] = b1;
+    }
+
+    // Store 4 bytes into an array
+    static void storeBytes(byte[] bytes, int offset, byte b0, byte b1, byte b2, byte b3) {
+        bytes[offset + 0] = b0;
+        bytes[offset + 1] = b1;
+        bytes[offset + 2] = b2;
+        bytes[offset + 3] = b3;
+    }
+
+    // Store 8 bytes into an array
+    static void storeBytes(byte[] bytes, int offset, byte b0, byte b1, byte b2, byte b3,
+                                                     byte b4, byte b5, byte b6, byte b7) {
+        bytes[offset + 0] = b0;
+        bytes[offset + 1] = b1;
+        bytes[offset + 2] = b2;
+        bytes[offset + 3] = b3;
+        bytes[offset + 4] = b4;
+        bytes[offset + 5] = b5;
+        bytes[offset + 6] = b6;
+        bytes[offset + 7] = b7;
+    }
+
+    // -------------------------------- BENCHMARKS --------------------------------
+
+    @Benchmark
+    public void baseline() {
+    }
+
+    @Benchmark
+    public byte[] baseline_allocate() {
+        byte[] aB = new byte[RANGE];
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_adr0_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[0] = (byte)0x01;
+        aB[1] = (byte)0x02;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_adr1_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[1] = (byte)0x01;
+        aB[2] = (byte)0x02;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_offs_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[offset + 0] = (byte)0x01;
+        aB[offset + 1] = (byte)0x02;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_offs_allocate_unsafe() {
+        byte[] aB = new byte[RANGE];
+        UNSAFE.putShortUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, (short)0x0201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_offs_allocate_bale() {
+        byte[] aB = new byte[RANGE];
+        ByteArrayLittleEndian.setShort(aB, offset, (short)0x0201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_offs_allocate_leapi() {
+        byte[] aB = new byte[RANGE];
+        storeShortLE(aB, offset, (short)0x0201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_offs_nonalloc_direct() {
+        aB[offset + 0] = (byte)0x01;
+        aB[offset + 1] = (byte)0x02;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_offs_nonalloc_unsafe() {
+        UNSAFE.putShortUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, (short)0x0201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_offs_nonalloc_bale() {
+        ByteArrayLittleEndian.setShort(aB, offset, (short)0x0201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_con_offs_nonalloc_leapi() {
+        storeShortLE(aB, offset, (short)0x0201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_S_offs_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[offset + 0] = (byte)(vS >> 0 );
+        aB[offset + 1] = (byte)(vS >> 8 );
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_S_offs_allocate_unsafe() {
+        byte[] aB = new byte[RANGE];
+        UNSAFE.putShortUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, vS);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_S_offs_allocate_bale() {
+        byte[] aB = new byte[RANGE];
+        ByteArrayLittleEndian.setShort(aB, offset, vS);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_S_offs_allocate_leapi() {
+        byte[] aB = new byte[RANGE];
+        storeShortLE(aB, offset, vS);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_S_offs_nonalloc_direct() {
+        aB[offset + 0] = (byte)(vS >> 0 );
+        aB[offset + 1] = (byte)(vS >> 8 );
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_S_offs_nonalloc_unsafe() {
+        UNSAFE.putShortUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, vS);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_S_offs_nonalloc_bale() {
+        ByteArrayLittleEndian.setShort(aB, offset, vS);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B2_S_offs_nonalloc_leapi() {
+        storeShortLE(aB, offset, vS);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_adr0_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[0] = (byte)0x01;
+        aB[1] = (byte)0x02;
+        aB[2] = (byte)0x03;
+        aB[3] = (byte)0x04;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_adr1_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[1] = (byte)0x01;
+        aB[2] = (byte)0x02;
+        aB[3] = (byte)0x03;
+        aB[4] = (byte)0x04;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_offs_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[offset + 0] = (byte)0x01;
+        aB[offset + 1] = (byte)0x02;
+        aB[offset + 2] = (byte)0x03;
+        aB[offset + 3] = (byte)0x04;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_offs_allocate_unsafe() {
+        byte[] aB = new byte[RANGE];
+        UNSAFE.putIntUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, 0x04030201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_offs_allocate_bale() {
+        byte[] aB = new byte[RANGE];
+        ByteArrayLittleEndian.setInt(aB, offset, 0x04030201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_offs_allocate_leapi() {
+        byte[] aB = new byte[RANGE];
+        storeIntLE(aB, offset, 0x04030201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_offs_nonalloc_direct() {
+        aB[offset + 0] = (byte)0x01;
+        aB[offset + 1] = (byte)0x02;
+        aB[offset + 2] = (byte)0x03;
+        aB[offset + 3] = (byte)0x04;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_offs_nonalloc_unsafe() {
+        UNSAFE.putIntUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, 0x04030201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_offs_nonalloc_bale() {
+        ByteArrayLittleEndian.setInt(aB, offset, 0x04030201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_con_offs_nonalloc_leapi() {
+        storeIntLE(aB, offset, 0x04030201);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_I_offs_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[offset + 0] = (byte)(vI >> 0 );
+        aB[offset + 1] = (byte)(vI >> 8 );
+        aB[offset + 2] = (byte)(vI >> 16);
+        aB[offset + 3] = (byte)(vI >> 24);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_I_offs_allocate_unsafe() {
+        byte[] aB = new byte[RANGE];
+        UNSAFE.putIntUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_I_offs_allocate_bale() {
+        byte[] aB = new byte[RANGE];
+        ByteArrayLittleEndian.setInt(aB, offset, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_I_offs_allocate_leapi() {
+        byte[] aB = new byte[RANGE];
+        storeIntLE(aB, offset, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_I_offs_nonalloc_direct() {
+        aB[offset + 0] = (byte)(vI >> 0 );
+        aB[offset + 1] = (byte)(vI >> 8 );
+        aB[offset + 2] = (byte)(vI >> 16);
+        aB[offset + 3] = (byte)(vI >> 24);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_I_offs_nonalloc_unsafe() {
+        UNSAFE.putIntUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_I_offs_nonalloc_bale() {
+        ByteArrayLittleEndian.setInt(aB, offset, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B4_I_offs_nonalloc_leapi() {
+        storeIntLE(aB, offset, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_adr0_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[0] = (byte)0x01;
+        aB[1] = (byte)0x02;
+        aB[2] = (byte)0x03;
+        aB[3] = (byte)0x04;
+        aB[4] = (byte)0x05;
+        aB[5] = (byte)0x06;
+        aB[6] = (byte)0x07;
+        aB[7] = (byte)0x08;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_adr1_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[1] = (byte)0x01;
+        aB[2] = (byte)0x02;
+        aB[3] = (byte)0x03;
+        aB[4] = (byte)0x04;
+        aB[5] = (byte)0x05;
+        aB[6] = (byte)0x06;
+        aB[7] = (byte)0x07;
+        aB[8] = (byte)0x08;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_offs_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[offset + 0] = (byte)0x01;
+        aB[offset + 1] = (byte)0x02;
+        aB[offset + 2] = (byte)0x03;
+        aB[offset + 3] = (byte)0x04;
+        aB[offset + 4] = (byte)0x05;
+        aB[offset + 5] = (byte)0x06;
+        aB[offset + 6] = (byte)0x07;
+        aB[offset + 7] = (byte)0x08;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_offs_allocate_unsafe() {
+        byte[] aB = new byte[RANGE];
+        UNSAFE.putLongUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, 0x0807060504030201L);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_offs_allocate_bale() {
+        byte[] aB = new byte[RANGE];
+        ByteArrayLittleEndian.setLong(aB, offset, 0x0807060504030201L);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_offs_allocate_leapi() {
+        byte[] aB = new byte[RANGE];
+        storeLongLE(aB, offset, 0x0807060504030201L);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_offs_nonalloc_direct() {
+        aB[offset + 0] = (byte)0x01;
+        aB[offset + 1] = (byte)0x02;
+        aB[offset + 2] = (byte)0x03;
+        aB[offset + 3] = (byte)0x04;
+        aB[offset + 4] = (byte)0x05;
+        aB[offset + 5] = (byte)0x06;
+        aB[offset + 6] = (byte)0x07;
+        aB[offset + 7] = (byte)0x08;
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_offs_nonalloc_unsafe() {
+        UNSAFE.putLongUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, 0x0807060504030201L);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_offs_nonalloc_bale() {
+        ByteArrayLittleEndian.setLong(aB, offset, 0x0807060504030201L);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_con_offs_nonalloc_leapi() {
+        storeLongLE(aB, offset, 0x0807060504030201L);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_L_offs_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[offset + 0] = (byte)(vL >> 0 );
+        aB[offset + 1] = (byte)(vL >> 8 );
+        aB[offset + 2] = (byte)(vL >> 16);
+        aB[offset + 3] = (byte)(vL >> 24);
+        aB[offset + 4] = (byte)(vL >> 32);
+        aB[offset + 5] = (byte)(vL >> 40);
+        aB[offset + 6] = (byte)(vL >> 48);
+        aB[offset + 7] = (byte)(vL >> 56);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_L_offs_allocate_unsafe() {
+        byte[] aB = new byte[RANGE];
+        UNSAFE.putLongUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, vL);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_L_offs_allocate_bale() {
+        byte[] aB = new byte[RANGE];
+        ByteArrayLittleEndian.setLong(aB, offset, vL);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_L_offs_allocate_leapi() {
+        byte[] aB = new byte[RANGE];
+        storeLongLE(aB, offset, vL);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_L_offs_nonalloc_direct() {
+        aB[offset + 0] = (byte)(vL >> 0 );
+        aB[offset + 1] = (byte)(vL >> 8 );
+        aB[offset + 2] = (byte)(vL >> 16);
+        aB[offset + 3] = (byte)(vL >> 24);
+        aB[offset + 4] = (byte)(vL >> 32);
+        aB[offset + 5] = (byte)(vL >> 40);
+        aB[offset + 6] = (byte)(vL >> 48);
+        aB[offset + 7] = (byte)(vL >> 56);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_L_offs_nonalloc_unsafe() {
+        UNSAFE.putLongUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset, vL);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_L_offs_nonalloc_bale() {
+        ByteArrayLittleEndian.setLong(aB, offset, vL);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_L_offs_nonalloc_leapi() {
+        storeLongLE(aB, offset, vL);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_I2_offs_allocate_direct() {
+        byte[] aB = new byte[RANGE];
+        aB[offset + 0] = (byte)(vI >> 0 );
+        aB[offset + 1] = (byte)(vI >> 8 );
+        aB[offset + 2] = (byte)(vI >> 16);
+        aB[offset + 3] = (byte)(vI >> 24);
+        aB[offset + 4] = (byte)(vI >> 0 );
+        aB[offset + 5] = (byte)(vI >> 8 );
+        aB[offset + 6] = (byte)(vI >> 16);
+        aB[offset + 7] = (byte)(vI >> 24);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_I2_offs_allocate_unsafe() {
+        byte[] aB = new byte[RANGE];
+        UNSAFE.putLongUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset + 0, vI);
+        UNSAFE.putLongUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset + 4, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_I2_offs_allocate_bale() {
+        byte[] aB = new byte[RANGE];
+        ByteArrayLittleEndian.setInt(aB, offset + 0, vI);
+        ByteArrayLittleEndian.setInt(aB, offset + 4, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_I2_offs_allocate_leapi() {
+        byte[] aB = new byte[RANGE];
+        storeIntLE(aB, offset + 0, vI);
+        storeIntLE(aB, offset + 4, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_I2_offs_nonalloc_direct() {
+        aB[offset + 0] = (byte)(vI >> 0 );
+        aB[offset + 1] = (byte)(vI >> 8 );
+        aB[offset + 2] = (byte)(vI >> 16);
+        aB[offset + 3] = (byte)(vI >> 24);
+        aB[offset + 4] = (byte)(vI >> 0 );
+        aB[offset + 5] = (byte)(vI >> 8 );
+        aB[offset + 6] = (byte)(vI >> 16);
+        aB[offset + 7] = (byte)(vI >> 24);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_I2_offs_nonalloc_unsafe() {
+        UNSAFE.putLongUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset + 0, vI);
+        UNSAFE.putLongUnaligned(aB, Unsafe.ARRAY_BYTE_BASE_OFFSET + offset + 4, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_I2_offs_nonalloc_bale() {
+        ByteArrayLittleEndian.setInt(aB, offset + 0, vI);
+        ByteArrayLittleEndian.setInt(aB, offset + 4, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public byte[] store_B8_I2_offs_nonalloc_leapi() {
+        storeIntLE(aB, offset + 0, vI);
+        storeIntLE(aB, offset + 4, vI);
+        return aB;
+    }
+
+    @Benchmark
+    public short[] store_S2_con_offs_allocate_direct() {
+        short[] aS = new short[RANGE];
+        aS[offset + 0] = (short)0x0102;
+        aS[offset + 1] = (short)0x0304;
+        return aS;
+    }
+
+    @Benchmark
+    public short[] store_S2_con_offs_nonalloc_direct() {
+        aS[offset + 0] = (short)0x0102;
+        aS[offset + 1] = (short)0x0304;
+        return aS;
+    }
+
+    @Benchmark
+    public short[] store_S4_con_offs_allocate_direct() {
+        short[] aS = new short[RANGE];
+        aS[offset + 0] = (short)0x0102;
+        aS[offset + 1] = (short)0x0304;
+        aS[offset + 2] = (short)0x0506;
+        aS[offset + 3] = (short)0x0708;
+        return aS;
+    }
+
+    @Benchmark
+    public short[] store_S4_con_offs_nonalloc_direct() {
+        aS[offset + 0] = (short)0x0102;
+        aS[offset + 1] = (short)0x0304;
+        aS[offset + 2] = (short)0x0506;
+        aS[offset + 3] = (short)0x0708;
+        return aS;
+    }
+
+    @Benchmark
+    public int[] store_I2_con_offs_allocate_direct() {
+        int[] aI = new int[RANGE];
+        aI[offset + 0] = 0x01020304;
+        aI[offset + 1] = 0x05060708;
+        return aI;
+    }
+
+    @Benchmark
+    public int[] store_I2_con_offs_nonalloc_direct() {
+        aI[offset + 0] = 0x01020304;
+        aI[offset + 1] = 0x05060708;
+        return aI;
+    }
+
+    @Benchmark
+    public int[] store_I2_zero_offs_allocate_direct() {
+        int[] aI = new int[RANGE];
+        aI[offset + 0] = 0;
+        aI[offset + 1] = 0;
+        return aI;
+    }
+
+    @Benchmark
+    public int[] store_I2_zero_offs_nonalloc_direct() {
+        aI[offset + 0] = 0;
+        aI[offset + 1] = 0;
+        return aI;
+    }
+}

From 165ba87e5732c382b3e97315e959dd5e32cf2984 Mon Sep 17 00:00:00 2001
From: Tobias Holenstein <tholenstein@openjdk.org>
Date: Wed, 24 Apr 2024 07:24:39 +0000
Subject: [PATCH 171/486] 8330587: IGV: remove ControlFlowTopComponent

Reviewed-by: chagedorn, rcastanedalo
---
 .../IdealGraphVisualizer/ControlFlow/pom.xml  | 135 --------
 .../controlflow/BlockConnectionWidget.java    | 124 -------
 .../hotspot/igv/controlflow/BlockWidget.java  | 148 ---------
 .../igv/controlflow/ControlFlowAction.java    |  46 ---
 .../igv/controlflow/ControlFlowScene.java     | 311 ------------------
 .../controlflow/ControlFlowTopComponent.form  |  28 --
 .../controlflow/ControlFlowTopComponent.java  | 150 ---------
 .../controlflow/DoubleClickSelectAction.java  |  66 ----
 .../controlflow/HierarchicalGraphLayout.java  | 170 ----------
 .../ControlFlow/src/main/nbm/manifest.mf      |   6 -
 .../hotspot/igv/controlflow/Bundle.properties |   4 -
 .../ControlFlowTopComponentSettings.xml       |   8 -
 .../ControlFlowTopComponentWstcref.xml        |   7 -
 .../com/sun/hotspot/igv/controlflow/layer.xml |  27 --
 .../IdealGraphVisualizer/application/pom.xml  |   5 -
 src/utils/IdealGraphVisualizer/pom.xml        |   1 -
 16 files changed, 1236 deletions(-)
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/pom.xml
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockWidget.java
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowAction.java
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowScene.java
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/nbm/manifest.mf
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/Bundle.properties
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml
 delete mode 100644 src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/layer.xml

diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/pom.xml b/src/utils/IdealGraphVisualizer/ControlFlow/pom.xml
deleted file mode 100644
index f44f08bec1f..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/pom.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>IdealGraphVisualizer-parent</artifactId>
-        <groupId>com.sun.hotspot.igv</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>ControlFlow</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>nbm</packaging>
-    <name>ControlFlow</name>
-    <properties>
-        <maven.compiler.release>17</maven.compiler.release>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.sun.hotspot.igv</groupId>
-            <artifactId>Data</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.hotspot.igv</groupId>
-            <artifactId>Util</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.hotspot.igv</groupId>
-            <artifactId>Layout</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.hotspot.igv</groupId>
-            <artifactId>HierarchicalLayout</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-api-visual</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.java.dev.swing-layout</groupId>
-            <artifactId>swing-layout</artifactId>
-            <version>${swinglayouts.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util-lookup</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util-ui</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-windows</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>nbm-maven-plugin</artifactId>
-                <version>${nbmmvnplugin.version}</version>
-                <extensions>true</extensions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${mvncompilerplugin.version}</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${mvnjarplugin.version}</version>
-                <configuration>
-                    <!-- to have the jar plugin pickup the nbm generated manifest -->
-                    <archive>
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java
deleted file mode 100644
index 4cf38780f97..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2008, 2022, 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.
- *
- */
-package com.sun.hotspot.igv.controlflow;
-
-import com.sun.hotspot.igv.data.InputBlockEdge;
-import com.sun.hotspot.igv.layout.Cluster;
-import com.sun.hotspot.igv.layout.Link;
-import com.sun.hotspot.igv.layout.Port;
-import java.awt.BasicStroke;
-import java.awt.Point;
-import java.awt.Stroke;
-import java.util.ArrayList;
-import java.util.List;
-import org.netbeans.api.visual.widget.ConnectionWidget;
-
-/**
- *
- * @author Thomas Wuerthinger
- */
-public class BlockConnectionWidget extends ConnectionWidget implements Link {
-
-    private static final Stroke NORMAL_STROKE = new BasicStroke(1.0f);
-    private static final Stroke BOLD_STROKE = new BasicStroke(2.5f);
-    private static final Stroke DASHED_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f, new float[]{5, 5}, 0);
-    private static final Stroke BOLD_DASHED_STROKE = new BasicStroke(2.5f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f, new float[]{5, 5}, 0);
-
-    private final BlockWidget from;
-    private final BlockWidget to;
-    private final Port inputSlot;
-    private final Port outputSlot;
-    private List<Point> points;
-    private boolean isDashed = false;
-    private boolean isBold = false;
-
-    public BlockConnectionWidget(ControlFlowScene scene, InputBlockEdge edge) {
-        super(scene);
-
-        this.from = (BlockWidget) scene.findWidget(edge.getFrom());
-        this.to = (BlockWidget) scene.findWidget(edge.getTo());
-        inputSlot = to.getInputSlot();
-        outputSlot = from.getOutputSlot();
-        points = new ArrayList<>();
-    }
-
-    public Port getTo() {
-        return inputSlot;
-    }
-
-    public Port getFrom() {
-        return outputSlot;
-    }
-
-    public Cluster getFromCluster() {
-        return null;
-    }
-
-    public Cluster getToCluster() {
-        return null;
-    }
-
-    public void setBold(boolean bold) {
-        this.isBold = bold;
-        updateStroke();
-    }
-
-    public void setDashed(boolean dashed) {
-        this.isDashed = dashed;
-        updateStroke();
-    }
-
-    private void updateStroke() {
-        Stroke stroke = NORMAL_STROKE;
-        if (isBold) {
-            if (isDashed) {
-                stroke = BOLD_DASHED_STROKE;
-            } else {
-                stroke = BOLD_STROKE;
-            }
-        } else if (isDashed) {
-            stroke = DASHED_STROKE;
-        }
-        setStroke(stroke);
-    }
-
-    public void setControlPoints(List<Point> p) {
-        this.points = p;
-    }
-
-    @Override
-    public List<Point> getControlPoints() {
-        return points;
-    }
-
-    @Override
-    public String toString() {
-        return "Connection[ " + from.toString() + " - " + to.toString() + "]";
-    }
-
-    @Override
-    public boolean isVIP() {
-        return isBold;
-    }
-}
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockWidget.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockWidget.java
deleted file mode 100644
index 5c4a51463f0..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockWidget.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-package com.sun.hotspot.igv.controlflow;
-
-import com.sun.hotspot.igv.data.InputBlock;
-import com.sun.hotspot.igv.layout.Cluster;
-import com.sun.hotspot.igv.layout.Port;
-import com.sun.hotspot.igv.layout.Vertex;
-import java.awt.*;
-import org.netbeans.api.visual.border.BorderFactory;
-import org.netbeans.api.visual.model.ObjectState;
-import org.netbeans.api.visual.widget.LabelWidget;
-
-/**
- *
- * @author Thomas Wuerthinger
- */
-public class BlockWidget extends LabelWidget implements Vertex {
-
-    public static final Dimension MIN_SIZE = new Dimension(20, 20);
-    private final InputBlock block;
-    private final Port inputSlot;
-    private final Port outputSlot;
-    private Cluster cluster;
-    private static final Font font = new Font(Font.SANS_SERIF, Font.PLAIN, 12);
-    private static final Font boldFont = font.deriveFont(Font.BOLD);
-    public static final Color NORMAL_FOREGROUND_COLOR = Color.BLACK;
-    public static final Color HOVER_FOREGROUND_COLOR = Color.BLUE;
-
-    /** Creates a new instance of BlockWidget */
-    public BlockWidget(ControlFlowScene scene, InputBlock block) {
-        super(scene);
-        this.block = block;
-        this.setLabel(block.getName());
-        this.setForeground(NORMAL_FOREGROUND_COLOR);
-        this.setBorder(BorderFactory.createLineBorder(1, NORMAL_FOREGROUND_COLOR));
-        this.setMinimumSize(MIN_SIZE);
-
-        this.setFont(font);
-        this.setAlignment(Alignment.CENTER);
-
-        final BlockWidget widget = this;
-        inputSlot = new Port() {
-            public Point getRelativePosition() {
-                return new Point((int) (getSize().getWidth() / 2), (int) (getSize().getHeight() / 2));
-            }
-            public Vertex getVertex() {
-                return widget;
-            }
-        };
-        outputSlot = new Port() {
-            public Point getRelativePosition() {
-                return new Point((int) (getSize().getWidth() / 2), (int) (getSize().getHeight() / 2));
-            }
-            public Vertex getVertex() {
-                return widget;
-            }
-        };
-    }
-
-    public Port getInputSlot() {
-        return inputSlot;
-    }
-
-    public Port getOutputSlot() {
-        return outputSlot;
-    }
-
-    public InputBlock getBlock() {
-        return block;
-    }
-
-    public Dimension getSize() {
-        Rectangle bounds = getBounds();
-        if (bounds != null) {
-            return bounds.getSize();
-        } else {
-            return MIN_SIZE;
-        }
-    }
-
-    public void setPosition(Point p) {
-        this.setPreferredLocation(p);
-    }
-
-    @Override
-    public String toString() {
-        return block.getName();
-    }
-
-    public Point getPosition() {
-        return this.getPreferredLocation();
-    }
-
-    public Cluster getCluster() {
-        return cluster;
-    }
-
-    public boolean isRoot() {
-        return false;
-    }
-
-    public int compareTo(Vertex o) {
-        return toString().compareTo(o.toString());
-    }
-
-    @Override
-    protected void notifyStateChanged(ObjectState previousState, ObjectState state) {
-        super.notifyStateChanged(previousState, state);
-
-        if (previousState.isHovered() != state.isHovered()) {
-            if (state.isHovered()) {
-                this.setBorder(BorderFactory.createLineBorder(1, HOVER_FOREGROUND_COLOR));
-            } else {
-                this.setBorder(BorderFactory.createLineBorder(1, NORMAL_FOREGROUND_COLOR));
-            }
-        }
-
-        if (previousState.isSelected() != state.isSelected()) {
-            if (state.isSelected()) {
-                this.setFont(boldFont);
-            } else {
-                this.setFont(font);
-            }
-        }
-    }
-}
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowAction.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowAction.java
deleted file mode 100644
index 43b8fae8f58..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-package com.sun.hotspot.igv.controlflow;
-
-import java.awt.event.ActionEvent;
-import javax.swing.AbstractAction;
-import org.openide.util.NbBundle;
-import org.openide.windows.TopComponent;
-
-/**
- *
- * @author Thomas Wuerthinger
- */
-public class ControlFlowAction extends AbstractAction {
-
-    public ControlFlowAction() {
-        super(NbBundle.getMessage(ControlFlowAction.class, "CTL_ControlFlowAction"));
-    }
-
-    public void actionPerformed(ActionEvent evt) {
-        TopComponent win = ControlFlowTopComponent.findInstance();
-        win.open();
-        win.requestActive();
-    }
-}
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowScene.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowScene.java
deleted file mode 100644
index d5da6ce2d44..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowScene.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-package com.sun.hotspot.igv.controlflow;
-
-import com.sun.hotspot.igv.data.InputBlock;
-import com.sun.hotspot.igv.data.InputBlockEdge;
-import com.sun.hotspot.igv.data.InputGraph;
-import com.sun.hotspot.igv.data.InputNode;
-import com.sun.hotspot.igv.data.services.InputGraphProvider;
-import com.sun.hotspot.igv.util.LookupHistory;
-import java.awt.Color;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-import javax.swing.BorderFactory;
-import org.netbeans.api.visual.action.*;
-import org.netbeans.api.visual.anchor.AnchorFactory;
-import org.netbeans.api.visual.anchor.AnchorShape;
-import org.netbeans.api.visual.graph.GraphScene;
-import org.netbeans.api.visual.graph.layout.GraphLayout;
-import org.netbeans.api.visual.layout.LayoutFactory;
-import org.netbeans.api.visual.layout.SceneLayout;
-import org.netbeans.api.visual.router.RouterFactory;
-import org.netbeans.api.visual.widget.ConnectionWidget;
-import org.netbeans.api.visual.widget.LayerWidget;
-import org.netbeans.api.visual.widget.Widget;
-
-/**
- *
- * @author Thomas Wuerthinger
- */
-public class ControlFlowScene extends GraphScene<InputBlock, InputBlockEdge> implements SelectProvider, MoveProvider, RectangularSelectDecorator, RectangularSelectProvider {
-
-    private final HashSet<BlockWidget> selection;
-    private InputGraph oldGraph;
-    private final LayerWidget edgeLayer;
-    private final LayerWidget mainLayer;
-    private final WidgetAction hoverAction = createWidgetHoverAction();
-    private final WidgetAction selectAction = new DoubleClickSelectAction(this);
-    private final WidgetAction moveAction = ActionFactory.createMoveAction(null, this);
-
-    public ControlFlowScene() {
-        selection = new HashSet<>();
-
-        getInputBindings().setZoomActionModifiers(0);
-        setLayout(LayoutFactory.createAbsoluteLayout());
-
-        mainLayer = new LayerWidget(this);
-        addChild(mainLayer);
-
-        edgeLayer = new LayerWidget(this);
-        addChild(edgeLayer);
-
-        LayerWidget selectLayer = new LayerWidget(this);
-        addChild(selectLayer);
-
-        getActions().addAction(hoverAction);
-        getActions().addAction(selectAction);
-        getActions().addAction(ActionFactory.createRectangularSelectAction(this, selectLayer, this));
-        getActions().addAction(ActionFactory.createMouseCenteredZoomAction(1.1));
-    }
-
-    public void setGraph(InputGraph g) {
-        if (g == oldGraph) {
-            return;
-        }
-        oldGraph = g;
-
-        ArrayList<InputBlock> blocks = new ArrayList<>(getNodes());
-        for (InputBlock b : blocks) {
-            removeNode(b);
-        }
-
-        ArrayList<InputBlockEdge> edges = new ArrayList<>(getEdges());
-        for (InputBlockEdge e : edges) {
-            removeEdge(e);
-        }
-
-        edgeLayer.removeChildren();
-        mainLayer.removeChildren();
-
-        for (InputBlock b : g.getBlocks()) {
-            addNode(b);
-        }
-
-        for (InputBlockEdge e : g.getBlockEdges()) {
-            addEdge(e);
-            assert g.getBlocks().contains(e.getFrom());
-            assert g.getBlocks().contains(e.getTo());
-            setEdgeSource(e, e.getFrom());
-            setEdgeTarget(e, e.getTo());
-        }
-
-        GraphLayout<InputBlock, InputBlockEdge> layout = new HierarchicalGraphLayout<>();
-        SceneLayout sceneLayout = LayoutFactory.createSceneGraphLayout(this, layout);
-        sceneLayout.invokeLayout();
-
-        validate();
-    }
-
-    private void clearSelection() {
-        for (BlockWidget w : selection) {
-            w.setState(w.getState().deriveSelected(false));
-        }
-        selection.clear();
-        selectionChanged();
-    }
-
-    private void selectionChanged() {
-        InputGraphProvider p = LookupHistory.getLast(InputGraphProvider.class);
-        if (p != null) {
-            Set<InputNode> inputNodes = new HashSet<>();
-            for (BlockWidget w : selection) {
-                inputNodes.addAll(w.getBlock().getNodes());
-            }
-            p.clearSelectedNodes();
-            p.addSelectedNodes(inputNodes, true);
-            p.centerSelectedNodes();
-        }
-    }
-
-    private void addToSelection(BlockWidget widget) {
-        widget.setState(widget.getState().deriveSelected(true));
-        selection.add(widget);
-        selectionChanged();
-    }
-
-    private void removeFromSelection(BlockWidget widget) {
-        widget.setState(widget.getState().deriveSelected(false));
-        selection.remove(widget);
-        selectionChanged();
-    }
-
-    @Override
-    public boolean isAimingAllowed(Widget widget, Point point, boolean b) {
-        return false;
-    }
-
-    @Override
-    public boolean isSelectionAllowed(Widget widget, Point point, boolean b) {
-        return true;
-    }
-
-    @Override
-    public void select(Widget widget, Point point, boolean change) {
-        if (widget == this) {
-            clearSelection();
-        } else {
-
-            assert widget instanceof BlockWidget;
-            BlockWidget bw = (BlockWidget) widget;
-            if (change) {
-                if (selection.contains(bw)) {
-                    removeFromSelection(bw);
-                } else {
-                    addToSelection(bw);
-                }
-            } else {
-                if (!selection.contains(bw)) {
-                    clearSelection();
-                    addToSelection(bw);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void movementStarted(Widget widget) {}
-
-    @Override
-
-    public void movementFinished(Widget widget) {}
-
-    @Override
-    public Point getOriginalLocation(Widget widget) {
-        return widget.getPreferredLocation();
-    }
-
-    @Override
-    public void setNewLocation(Widget widget, Point location) {
-        assert widget instanceof BlockWidget;
-        if (selection.contains((BlockWidget) widget)) {
-            // move entire selection
-            Point originalLocation = getOriginalLocation(widget);
-            int xOffset = location.x - originalLocation.x;
-            int yOffset = location.y - originalLocation.y;
-            for (Widget w : selection) {
-                Point p = new Point(w.getPreferredLocation());
-                p.translate(xOffset, yOffset);
-                w.setPreferredLocation(p);
-            }
-        } else {
-            widget.setPreferredLocation(location);
-        }
-    }
-
-    @Override
-    public Widget createSelectionWidget() {
-        Widget widget = new Widget(this);
-        widget.setOpaque(false);
-        widget.setBorder(BorderFactory.createLineBorder(Color.black, 2));
-        widget.setForeground(Color.red);
-        return widget;
-    }
-
-    @Override
-    public void performSelection(Rectangle rectangle) {
-
-        if (rectangle.width < 0) {
-            rectangle.x += rectangle.width;
-            rectangle.width *= -1;
-        }
-
-        if (rectangle.height < 0) {
-            rectangle.y += rectangle.height;
-            rectangle.height *= -1;
-        }
-
-        boolean changed = false;
-        for (InputBlock b : getNodes()) {
-            BlockWidget w = (BlockWidget) findWidget(b);
-            Rectangle r = new Rectangle(w.getBounds());
-            r.setLocation(w.getLocation());
-            if (r.intersects(rectangle)) {
-                if (!selection.contains(w)) {
-                    changed = true;
-                    selection.add(w);
-                    w.setState(w.getState().deriveSelected(true));
-                }
-            } else {
-                if (selection.contains(w)) {
-                    changed = true;
-                    selection.remove(w);
-                    w.setState(w.getState().deriveSelected(false));
-                }
-            }
-        }
-
-        if (changed) {
-            selectionChanged();
-        }
-
-    }
-
-    @Override
-    protected Widget attachNodeWidget(InputBlock node) {
-        BlockWidget w = new BlockWidget(this, node);
-        mainLayer.addChild(w);
-        w.getActions().addAction(hoverAction);
-        w.getActions().addAction(selectAction);
-        w.getActions().addAction(moveAction);
-        return w;
-    }
-
-    @Override
-    protected Widget attachEdgeWidget(InputBlockEdge edge) {
-        BlockConnectionWidget w = new BlockConnectionWidget(this, edge);
-        switch (edge.getState()) {
-            case NEW:
-                w.setBold(true);
-                break;
-            case DELETED:
-                w.setDashed(true);
-                break;
-        }
-        w.setRouter(RouterFactory.createDirectRouter());
-        w.setTargetAnchorShape(AnchorShape.TRIANGLE_FILLED);
-        edgeLayer.addChild(w);
-        return w;
-    }
-
-    @Override
-    protected void attachEdgeSourceAnchor(InputBlockEdge edge, InputBlock oldSourceNode, InputBlock sourceNode) {
-        Widget w = findWidget(edge);
-        assert w instanceof ConnectionWidget;
-        ConnectionWidget cw = (ConnectionWidget) w;
-        cw.setSourceAnchor(AnchorFactory.createRectangularAnchor(findWidget(sourceNode)));
-
-    }
-
-    @Override
-    protected void attachEdgeTargetAnchor(InputBlockEdge edge, InputBlock oldTargetNode, InputBlock targetNode) {
-        Widget w = findWidget(edge);
-        assert w instanceof ConnectionWidget;
-        ConnectionWidget cw = (ConnectionWidget) w;
-        cw.setTargetAnchor(AnchorFactory.createRectangularAnchor(findWidget(targetNode)));
-    }
-}
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form
deleted file mode 100644
index 7061b53f324..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <EmptySpace min="0" pref="400" max="32767" attributes="0"/>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <EmptySpace min="0" pref="300" max="32767" attributes="0"/>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-</Form>
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java
deleted file mode 100644
index f4c5b98a841..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2008, 2022, 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.
- *
- */
-package com.sun.hotspot.igv.controlflow;
-
-import com.sun.hotspot.igv.data.ChangedListener;
-import com.sun.hotspot.igv.data.InputGraph;
-import com.sun.hotspot.igv.data.services.InputGraphProvider;
-import com.sun.hotspot.igv.util.LookupHistory;
-import java.awt.BorderLayout;
-import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
-import org.openide.ErrorManager;
-import org.openide.util.NbBundle;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-
-/**
- *
- * @author Thomas Wuerthinger
- */
-final class ControlFlowTopComponent extends TopComponent implements ChangedListener<InputGraphProvider> {
-
-    private static ControlFlowTopComponent instance;
-    private static final String PREFERRED_ID = "ControlFlowTopComponent";
-    private final ControlFlowScene scene;
-
-    private ControlFlowTopComponent() {
-        initComponents();
-        setName(NbBundle.getMessage(ControlFlowTopComponent.class, "CTL_ControlFlowTopComponent"));
-        setToolTipText(NbBundle.getMessage(ControlFlowTopComponent.class, "HINT_ControlFlowTopComponent"));
-
-        scene = new ControlFlowScene();
-        setLayout(new BorderLayout());
-        associateLookup(scene.getLookup());
-
-        JScrollPane panel = new JScrollPane(scene.createView());
-        add(panel, BorderLayout.CENTER);
-    }
-
-    /**
-     * Gets default instance. Do not use directly: reserved for *.settings files only,
-     * i.e. deserialization routines; otherwise you could get a non-deserialized instance.
-     * To obtain the singleton instance, use {@link #findInstance()}.
-     */
-    public static synchronized ControlFlowTopComponent getDefault() {
-        if (instance == null) {
-            instance = new ControlFlowTopComponent();
-        }
-        return instance;
-    }
-
-    /**
-     * Obtain the ControlFlowTopComponent instance. Never call {@link #getDefault} directly!
-     */
-    public static synchronized ControlFlowTopComponent findInstance() {
-        TopComponent win = WindowManager.getDefault().findTopComponent(PREFERRED_ID);
-        if (win == null) {
-            ErrorManager.getDefault().log(ErrorManager.WARNING, "Cannot find ControlFlow component. It will not be located properly in the window system.");
-            return getDefault();
-        }
-        if (win instanceof ControlFlowTopComponent) {
-            return (ControlFlowTopComponent) win;
-        }
-        ErrorManager.getDefault().log(ErrorManager.WARNING, "There seem to be multiple components with the '" + PREFERRED_ID + "' ID. That is a potential source of errors and unexpected behavior.");
-        return getDefault();
-    }
-
-    @Override
-    public int getPersistenceType() {
-        return TopComponent.PERSISTENCE_ALWAYS;
-    }
-
-    @Override
-    public void componentOpened() {
-        LookupHistory.addListener(InputGraphProvider.class, this);
-    }
-
-    @Override
-    public void componentClosed() {
-        LookupHistory.removeListener(InputGraphProvider.class, this);
-    }
-
-    @Override
-    public void changed(InputGraphProvider lastProvider) {
-        SwingUtilities.invokeLater(() -> {
-            if (lastProvider != null) {
-                InputGraph graph = lastProvider.getGraph();
-                if (graph != null) {
-                    scene.setGraph(graph);
-                    return;
-                }
-            }
-            scene.setGraph(new InputGraph(""));
-        });
-    }
-
-    @Override
-    protected String preferredID() {
-        return PREFERRED_ID;
-    }
-
-    @Override
-    public void requestActive() {
-        super.requestActive();
-        scene.getView().requestFocus();
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-                layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                        .add(0, 400, Short.MAX_VALUE)
-        );
-        layout.setVerticalGroup(
-                layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                        .add(0, 300, Short.MAX_VALUE)
-        );
-    }// </editor-fold>//GEN-END:initComponents
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    // End of variables declaration//GEN-END:variables
-}
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java
deleted file mode 100644
index f70ba33df7d..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * 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.
- *
- */
-package com.sun.hotspot.igv.controlflow;
-
-import java.awt.Point;
-import java.awt.event.MouseEvent;
-import org.netbeans.api.visual.action.SelectProvider;
-import org.netbeans.api.visual.action.WidgetAction;
-import org.netbeans.api.visual.widget.Widget;
-import org.openide.util.Utilities;
-
-/**
- * Selection action that acts on double-click only. Does not support aiming.
- *
- * @author Peter Hofer
- */
-public class DoubleClickSelectAction extends WidgetAction.LockedAdapter {
-
-    private final SelectProvider provider;
-
-    public DoubleClickSelectAction(SelectProvider provider) {
-        this.provider = provider;
-    }
-
-    protected int getModifierMask () {
-        return Utilities.isMac() ? MouseEvent.META_DOWN_MASK : MouseEvent.CTRL_DOWN_MASK;
-    }
-
-    protected boolean isLocked() {
-        return false;
-    }
-
-    @Override
-    public State mousePressed(Widget widget, WidgetMouseEvent event) {
-        if (event.getClickCount() >= 2 && (event.getButton() == MouseEvent.BUTTON1 || event.getButton() == MouseEvent.BUTTON2)) {
-            boolean invert = (event.getModifiersEx() & getModifierMask()) != 0;
-            Point point = event.getPoint();
-            if (provider.isSelectionAllowed(widget, point, invert)) {
-                provider.select(widget, point, invert);
-                return State.CHAIN_ONLY;
-            }
-        }
-        return State.REJECTED;
-    }
-}
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java
deleted file mode 100644
index ca83df7ae29..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2008, 2022, 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.
- *
- */
-package com.sun.hotspot.igv.controlflow;
-
-import com.sun.hotspot.igv.hierarchicallayout.HierarchicalLayoutManager;
-import com.sun.hotspot.igv.layout.*;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.util.*;
-import org.netbeans.api.visual.graph.layout.GraphLayout;
-import org.netbeans.api.visual.graph.layout.UniversalGraph;
-import org.netbeans.api.visual.widget.Widget;
-
-/**
- *
- * @author Thomas Wuerthinger
- */
-public class HierarchicalGraphLayout<N, E> extends GraphLayout<N, E> {
-
-    public HierarchicalGraphLayout() {}
-
-    private class LinkWrapper implements Link {
-
-        private final VertexWrapper from;
-        private final VertexWrapper to;
-
-        public LinkWrapper(VertexWrapper from, VertexWrapper to) {
-            this.from = from;
-            this.to = to;
-        }
-
-        public Port getFrom() {
-            return from.getSlot();
-        }
-
-        public Port getTo() {
-            return to.getSlot();
-        }
-
-        public Cluster getFromCluster() {
-            return null;
-        }
-
-        public Cluster getToCluster() {
-            return null;
-        }
-
-        public List<Point> getControlPoints() {
-            return new ArrayList<>();
-        }
-
-        public void setControlPoints(List<Point> list) {
-        // Do nothing for now
-        }
-
-        public boolean isVIP() {
-            return false;
-        }
-    }
-
-    private class VertexWrapper implements Vertex {
-
-        private final N node;
-        private final UniversalGraph<N, E> graph;
-        private final Port slot;
-        private Point position;
-
-        public VertexWrapper(N node, UniversalGraph<N, E> graph) {
-            this.node = node;
-            this.graph = graph;
-            final VertexWrapper vertex = this;
-            this.slot = new Port() {
-
-                public Vertex getVertex() {
-                    return vertex;
-                }
-
-                public Point getRelativePosition() {
-                    return new Point((int) (vertex.getSize().getWidth() / 2), (int) (vertex.getSize().getHeight() / 2));
-                }
-            };
-
-            Widget w = graph.getScene().findWidget(node);
-            this.position = w.getPreferredLocation();
-        }
-
-        public Cluster getCluster() {
-            return null;
-        }
-
-        public Dimension getSize() {
-            Widget w = graph.getScene().findWidget(node);
-            assert w.getBounds() != null;
-            return w.getBounds().getSize();
-        }
-
-        public Point getPosition() {
-            return position;
-        }
-
-        public void setPosition(Point p) {
-            HierarchicalGraphLayout.this.setResolvedNodeLocation(graph, node, p);
-            position = p;
-        }
-
-        public boolean isRoot() {
-            return false;
-        }
-
-        public int compareTo(Vertex o) {
-            @SuppressWarnings("unchecked")
-            VertexWrapper vw = (VertexWrapper) o;
-            return node.toString().compareTo(vw.node.toString());
-        }
-
-        public Port getSlot() {
-            return slot;
-        }
-    }
-
-    protected void performGraphLayout(UniversalGraph<N, E> graph) {
-
-        Set<LinkWrapper> links = new LinkedHashSet<>();
-        Set<VertexWrapper> vertices = new LinkedHashSet<>();
-        Map<N, VertexWrapper> vertexMap = new HashMap<>();
-
-        for (N node : graph.getNodes()) {
-            VertexWrapper v = new VertexWrapper(node, graph);
-            vertexMap.put(node, v);
-            vertices.add(v);
-        }
-
-        for (E edge : graph.getEdges()) {
-            N source = graph.getEdgeSource(edge);
-            N target = graph.getEdgeTarget(edge);
-            LinkWrapper l = new LinkWrapper(vertexMap.get(source), vertexMap.get(target));
-            links.add(l);
-        }
-
-        HierarchicalLayoutManager m = new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.NONE);
-
-        LayoutGraph layoutGraph = new LayoutGraph(links, vertices);
-        m.doLayout(layoutGraph);
-    }
-
-    protected void performNodesLayout(UniversalGraph<N, E> graph, Collection<N> nodes) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/nbm/manifest.mf b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/nbm/manifest.mf
deleted file mode 100644
index c745f8a82b4..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/nbm/manifest.mf
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: com.sun.hotspot.igv.controlflow
-OpenIDE-Module-Layer: com/sun/hotspot/igv/controlflow/layer.xml
-OpenIDE-Module-Localizing-Bundle: com/sun/hotspot/igv/controlflow/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
-
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/Bundle.properties b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/Bundle.properties
deleted file mode 100644
index 587299c05df..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/Bundle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-CTL_ControlFlowAction=Control Flow
-CTL_ControlFlowTopComponent=Control Flow
-HINT_ControlFlowTopComponent=Shows the blocks of the current graph.
-OpenIDE-Module-Name=ControlFlow
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml
deleted file mode 100644
index 5ffb8213fbc..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "https://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
-<settings version="1.0">
-    <module name="com.sun.hotspot.igv.controlflow" spec="1.0"/>
-    <instanceof class="org.openide.windows.TopComponent"/>
-    <instanceof class="com.sun.hotspot.igv.controlflow.ControlFlowTopComponent"/>
-    <instance class="com.sun.hotspot.igv.controlflow.ControlFlowTopComponent" method="getDefault"/>
-</settings>
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml
deleted file mode 100644
index 66bc3093c7e..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tc-ref PUBLIC "-//NetBeans//DTD Top Component in Mode Properties 2.0//EN" "https://www.netbeans.org/dtds/tc-ref2_0.dtd">
-<tc-ref version="2.0" >
-    <module name="com.sun.hotspot.igv.controlflow" spec="1.0"/>
-    <tc-id id="ControlFlowTopComponent"/>
-    <state opened="true"/>
-</tc-ref>
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/layer.xml b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/layer.xml
deleted file mode 100644
index 5e79cc22ee7..00000000000
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/resources/com/sun/hotspot/igv/controlflow/layer.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "https://www.netbeans.org/dtds/filesystem-1_1.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="Window">
-            <file name="com-sun-hotspot-igv-controlflow-ControlFlowAction.instance"/>
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="Window">
-            <file name="ControlFlowAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Window/com-sun-hotspot-igv-controlflow-ControlFlowAction.instance"/>
-                <attr name="position" intvalue="2"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="ControlFlowTopComponent.settings" url="ControlFlowTopComponentSettings.xml"/>
-        </folder>
-        <folder name="Modes">
-            <folder name="customRightTopMode">
-                <file name="ControlFlowTopComponent.wstcref" url="ControlFlowTopComponentWstcref.xml"/>
-            </folder>
-        </folder>
-    </folder>
-</filesystem>
diff --git a/src/utils/IdealGraphVisualizer/application/pom.xml b/src/utils/IdealGraphVisualizer/application/pom.xml
index 0fc3ae119f0..25902816808 100644
--- a/src/utils/IdealGraphVisualizer/application/pom.xml
+++ b/src/utils/IdealGraphVisualizer/application/pom.xml
@@ -115,11 +115,6 @@
             <artifactId>HierarchicalLayout</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ControlFlow</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>Filter</artifactId>
diff --git a/src/utils/IdealGraphVisualizer/pom.xml b/src/utils/IdealGraphVisualizer/pom.xml
index 4e4da82e109..7f9bd67af42 100644
--- a/src/utils/IdealGraphVisualizer/pom.xml
+++ b/src/utils/IdealGraphVisualizer/pom.xml
@@ -102,7 +102,6 @@
         <module>SelectionCoordinator</module>
         <module>Graph</module>
         <module>HierarchicalLayout</module>
-        <module>ControlFlow</module>
         <module>Filter</module>
         <module>Bytecodes</module>
         <module>ServerCompiler</module>

From c439c8c73cf07966e3517ecbaf14d79dcbaeabb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@openjdk.org>
Date: Wed, 24 Apr 2024 08:20:49 +0000
Subject: [PATCH 172/486] 8323429: Missing C2 optimization for FP min/max when
 both inputs are same

Reviewed-by: roland, chagedorn
---
 src/hotspot/share/opto/addnode.cpp            |   8 +
 src/hotspot/share/opto/addnode.hpp            |   1 +
 .../intrinsics/math/TestMinMaxOpt.java        | 158 ++++++++++++++++++
 .../compiler/lib/ir_framework/IRNode.java     |  22 ++-
 .../runner/BasicDoubleOpTest.java             |   2 +-
 5 files changed, 189 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxOpt.java

diff --git a/src/hotspot/share/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp
index f0e55d6ed48..9a7d93dc469 100644
--- a/src/hotspot/share/opto/addnode.cpp
+++ b/src/hotspot/share/opto/addnode.cpp
@@ -1424,6 +1424,14 @@ Node* MinLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   return nullptr;
 }
 
+Node* MaxNode::Identity(PhaseGVN* phase) {
+  if (in(1) == in(2)) {
+      return in(1);
+  }
+
+  return AddNode::Identity(phase);
+}
+
 //------------------------------add_ring---------------------------------------
 const Type* MinFNode::add_ring(const Type* t0, const Type* t1 ) const {
   const TypeF* r0 = t0->isa_float_constant();
diff --git a/src/hotspot/share/opto/addnode.hpp b/src/hotspot/share/opto/addnode.hpp
index 19043b5e40f..fd044d6eead 100644
--- a/src/hotspot/share/opto/addnode.hpp
+++ b/src/hotspot/share/opto/addnode.hpp
@@ -269,6 +269,7 @@ public:
   virtual int max_opcode() const = 0;
   virtual int min_opcode() const = 0;
   Node* IdealI(PhaseGVN* phase, bool can_reshape);
+  virtual Node* Identity(PhaseGVN* phase);
 
   static Node* unsigned_max(Node* a, Node* b, const Type* t, PhaseGVN& gvn) {
     return build_min_max(a, b, true, true, t, gvn);
diff --git a/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxOpt.java b/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxOpt.java
new file mode 100644
index 00000000000..22b5e3e12ab
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxOpt.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2024, 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 8323429
+ * @summary Test min and max optimizations
+ * @library /test/lib /
+ * @run driver compiler.intrinsics.math.TestMinMaxOpt
+ */
+
+package compiler.intrinsics.math;
+
+import compiler.lib.ir_framework.Argument;
+import compiler.lib.ir_framework.Arguments;
+import compiler.lib.ir_framework.Check;
+import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.IRNode;
+import compiler.lib.ir_framework.Test;
+import compiler.lib.ir_framework.TestFramework;
+
+public class TestMinMaxOpt {
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @Arguments(values = {Argument.NUMBER_42})
+    @IR(failOn = {IRNode.MIN_I})
+    private static int testIntMin(int v) {
+        return Math.min(v, v);
+    }
+
+    @Check(test = "testIntMin")
+    public static void checkTestIntMin(int result) {
+        if (result != 42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = {Argument.NUMBER_42})
+    @IR(failOn = {IRNode.MAX_I})
+    private static int testIntMax(int v) {
+        return Math.max(v, v);
+    }
+
+    @Check(test = "testIntMax")
+    public static void checkTestIntMax(int result) {
+        if (result != 42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = {Argument.NUMBER_42})
+    @IR(failOn = {IRNode.MIN_L})
+    private static long testLongMin(long v) {
+        return Math.min(v, v);
+    }
+
+    @Check(test = "testLongMin")
+    public static void checkTestLongMin(long result) {
+        if (result != 42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = {Argument.NUMBER_42})
+    @IR(failOn = {IRNode.MAX_L})
+    private static long testLongMax(long v) {
+        return Math.max(v, v);
+    }
+
+    @Check(test = "testLongMax")
+    public static void checkTestLongMax(long result) {
+        if (result != 42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = {Argument.NUMBER_42})
+    @IR(failOn = {IRNode.MIN_F})
+    private static float testFloatMin(float v) {
+        return Math.min(v, v);
+    }
+
+    @Check(test = "testFloatMin")
+    public static void checkTestFloatMin(float result) {
+        if (result != 42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = {Argument.NUMBER_42})
+    @IR(failOn = {IRNode.MAX_F})
+    private static float testFloatMax(float v) {
+        return Math.max(v, v);
+    }
+
+    @Check(test = "testFloatMax")
+    public static void checkTestFloatMax(float result) {
+        if (result != 42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = {Argument.NUMBER_42})
+    @IR(failOn = {IRNode.MIN_D})
+    private static double testDoubleMin(double v) {
+        return Math.min(v, v);
+    }
+
+    @Check(test = "testDoubleMin")
+    public static void checkTestDoubleMin(double result) {
+        if (result != 42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = {Argument.NUMBER_42})
+    @IR(failOn = {IRNode.MAX_D})
+    private static double testDoubleMax(double v) {
+        return Math.max(v, v);
+    }
+
+    @Check(test = "testDoubleMax")
+    public static void checkTestDoubleMax(double result) {
+        if (result != 42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 366b17786ad..96698540019 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -819,7 +819,12 @@ public class IRNode {
 
     public static final String MAX = PREFIX + "MAX" + POSTFIX;
     static {
-        beforeMatchingNameRegex(MAX, "Max(I|L)");
+        beforeMatchingNameRegex(MAX, "Max(I|L|F|D)");
+    }
+
+    public static final String MAX_D = PREFIX + "MAX_D" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MAX_D, "MaxD");
     }
 
     public static final String MAX_D_REDUCTION_REG = PREFIX + "MAX_D_REDUCTION_REG" + POSTFIX;
@@ -832,6 +837,11 @@ public class IRNode {
         machOnlyNameRegex(MAX_D_REG, "maxD_reg");
     }
 
+    public static final String MAX_F = PREFIX + "MAX_F" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MAX_F, "MaxF");
+    }
+
     public static final String MAX_F_REDUCTION_REG = PREFIX + "MAX_F_REDUCTION_REG" + POSTFIX;
     static {
         machOnlyNameRegex(MAX_F_REDUCTION_REG, "maxF_reduction_reg");
@@ -887,6 +897,11 @@ public class IRNode {
         beforeMatchingNameRegex(MIN, "Min(I|L)");
     }
 
+    public static final String MIN_D = PREFIX + "MIN_D" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MIN_D, "MinD");
+    }
+
     public static final String MIN_D_REDUCTION_REG = PREFIX + "MIN_D_REDUCTION_REG" + POSTFIX;
     static {
         machOnlyNameRegex(MIN_D_REDUCTION_REG, "minD_reduction_reg");
@@ -897,6 +912,11 @@ public class IRNode {
         machOnlyNameRegex(MIN_D_REG, "minD_reg");
     }
 
+    public static final String MIN_F = PREFIX + "MIN_F" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MIN_F, "MinF");
+    }
+
     public static final String MIN_F_REDUCTION_REG = PREFIX + "MIN_F_REDUCTION_REG" + POSTFIX;
     static {
         machOnlyNameRegex(MIN_F_REDUCTION_REG, "minF_reduction_reg");
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
index a3fcdbaa9b0..c1bef52a8b1 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
@@ -240,7 +240,7 @@ public class BasicDoubleOpTest extends VectorizationTestRunner {
 
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
-        counts = {IRNode.MAX_VD, ">0"})
+        counts = {IRNode.MAX_VD, "0"})
     public double[] vectorMax_8322090() {
         double[] res = new double[SIZE];
         for (int i = 0; i < SIZE; i++) {

From e681e9b4d78c57d031e08e11dfa6250d1f52f5f5 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Wed, 24 Apr 2024 08:45:32 +0000
Subject: [PATCH 173/486] 8330819: C2 SuperWord: bad dominance after pre-loop
 limit adjustment with base that has CastLL after pre-loop

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/vectorization.cpp      |   5 +-
 .../TestMemorySegmentMainLoopAlignment.java   | 114 ++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentMainLoopAlignment.java

diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
index 7197b3a58a5..9e6bc7e5939 100644
--- a/src/hotspot/share/opto/vectorization.cpp
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -461,7 +461,10 @@ VPointer::VPointer(const MemNode* mem, const VLoop& vloop,
       break; // stop looking at addp's
     }
   }
-  if (is_loop_member(adr)) {
+  if (!invariant(adr)) {
+    // The address must be invariant for the current loop. But if we are in a main-loop,
+    // it must also be invariant of the pre-loop, otherwise we cannot use this address
+    // for the pre-loop limit adjustment required for main-loop alignment.
     assert(!valid(), "adr is loop variant");
     return;
   }
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentMainLoopAlignment.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentMainLoopAlignment.java
new file mode 100644
index 00000000000..ade91c680fc
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentMainLoopAlignment.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2024, 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 8330819
+ * @summary Case where VPointer finds an "adr" CastX2P, which contains a CastLL,
+ *          that has a ctrl after the pre-loop. This value cannot be used in the
+ *          pre-loop limit for main-loop adjustment.
+ * @modules java.base/jdk.internal.misc
+ * @modules java.base/jdk.internal.util
+ * @run main/othervm -Xbatch compiler.loopopts.superword.TestMemorySegmentMainLoopAlignment
+ */
+
+package compiler.loopopts.superword;
+
+import java.lang.foreign.*;
+import jdk.internal.misc.Unsafe;
+import jdk.internal.util.Preconditions;
+
+public class TestMemorySegmentMainLoopAlignment {
+    static final ValueLayout.OfInt ELEMENT_LAYOUT = ValueLayout.JAVA_INT.withByteAlignment(1);
+    static final Unsafe UNSAFE = Unsafe.getUnsafe();
+    static long RANGE = 6400;
+
+    // Type definition for the lambda
+    interface MSOp {
+        int apply(MemorySegment memory, long offset, int i);
+    }
+
+    // Type definition for the lambda
+    interface MemoryUnsafeOp {
+        int apply(long base, long offset, int i);
+    }
+
+    public static void main(String[] args) {
+        // Allocate some raw memory:
+        MemorySegment ms = Arena.ofAuto().allocate(6400, Integer.SIZE);
+        for (int i = 0; i < 10_000; i++) {
+            test1(ms, 0, TestMemorySegmentMainLoopAlignment::memorySegmentGet);
+        }
+        // Allocate some raw memory:
+        long base = UNSAFE.allocateMemory(6400);
+        for (int i = 0; i < 10_000; i++) {
+            test2(base, 0, TestMemorySegmentMainLoopAlignment::memoryUnsafeGet);
+        }
+    }
+
+    // Somehow, it is necessary to pass this as a lambda
+    // the checkIndex inside the "get" method produces the CastLL, which eventually pins the index
+    // between the pre and main loop.
+    static int memorySegmentGet(MemorySegment ms, long o, int i) {
+        return ms.get(ELEMENT_LAYOUT, o + i * 4L);
+    }
+
+    static int test1(MemorySegment a, long offset, MSOp f) {
+        // Constant size array size allows a known range for the array access/loop iv i.
+        int size = 16;
+        int[] res = new int[size];
+        int sum = 0;
+        for (int i = 0; i < size; i++) {
+            // With inlining, this eventually becomes:
+            // sum += LoadI(MemorySegment / unsafe) + LoadI(array)
+            // and we attempt vectorization.
+            sum += f.apply(a, offset, i) + res[i];
+        }
+        return sum;
+    }
+
+    // Somehow, it is necessary to pass this as a lambda
+    static int memoryUnsafeGet(long base, long o, int i) {
+        long index = o + i * 4L;
+        // checkIndex -> CastLL: index >= 0.
+        // Together with the info about i (known range for phi), this CastLL floats up to
+        // the offset. Then we get adr = CastX2P(base + CastLL(offset)), where the CastLL
+        // is pinned between the pre and main loop.
+        Preconditions.checkIndex(index, RANGE, null);
+        return UNSAFE.getInt(base + index);
+    }
+
+    static int test2(long base, long offset, MemoryUnsafeOp f) {
+        // Constant size array size allows a known range for the array access/loop iv i.
+        int size = 16;
+        int[] res = new int[size];
+        int sum = 0;
+        for (int i = 0; i < size; i++) {
+            // With inlining, this eventually becomes:
+            // sum += LoadI(unsafe) + LoadI(array)
+            // and we attempt vectorization.
+            sum += f.apply(base, offset, i) + res[i];
+        }
+        return sum;
+    }
+}

From 174d62652c69e811cf44ab64db575b13a848a728 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Wed, 24 Apr 2024 09:02:02 +0000
Subject: [PATCH 174/486] 8328741:
 serviceability/jvmti/ObjectMonitorUsage/ObjectMonitorUsage.java failed with
 unexpected owner

Reviewed-by: lmesnik, cjplummer
---
 .../ObjectMonitorUsage.java                   | 18 ++--
 .../libObjectMonitorUsage.cpp                 | 84 ++-----------------
 .../SuspendResumeAll/libSuspendResumeAll.cpp  |  6 +-
 test/lib/jdk/test/lib/jvmti/jvmti_common.hpp  | 20 ++++-
 4 files changed, 34 insertions(+), 94 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/jvmti/ObjectMonitorUsage/ObjectMonitorUsage.java b/test/hotspot/jtreg/serviceability/jvmti/ObjectMonitorUsage/ObjectMonitorUsage.java
index 891306a0c11..bc9a0c5cabc 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/ObjectMonitorUsage/ObjectMonitorUsage.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/ObjectMonitorUsage/ObjectMonitorUsage.java
@@ -53,9 +53,9 @@ public class ObjectMonitorUsage {
     static Object lockCheck = new Object();
 
     native static int getRes();
-    native static int waitsToEnter();
-    native static int waitsToBeNotified();
     native static int setTestedMonitor(Object monitor);
+    native static void ensureBlockedOnEnter(Thread thread);
+    native static void ensureWaitingToBeNotified(Thread thread);
     native static void check(Object obj, Thread owner,
                              int entryCount, int waiterCount, int notifyWaiterCount);
 
@@ -87,10 +87,9 @@ public class ObjectMonitorUsage {
         Thread[] threads = new Thread[NUMBER_OF_WAITING_THREADS];
         for (int i = 0; i < NUMBER_OF_WAITING_THREADS; i++) {
             // the WaitingTask has to wait to be notified in lockCheck.wait()
-            threads[i] = startTask(i, new WaitingTask(), isVirtual, "Waiting");
-        }
-        while (waitsToBeNotified() < NUMBER_OF_WAITING_THREADS) {
-            sleep(1);
+            Thread thread = startTask(i, new WaitingTask(), isVirtual, "Waiting");
+            ensureWaitingToBeNotified(thread);
+            threads[i] = thread;
         }
         return threads;
     }
@@ -99,10 +98,9 @@ public class ObjectMonitorUsage {
         Thread[] threads = new Thread[NUMBER_OF_ENTERING_THREADS];
         for (int i = 0; i < NUMBER_OF_ENTERING_THREADS; i++) {
             // the EnteringTask has to be blocked at the lockCheck enter
-            threads[i] = startTask(i, new EnteringTask(), isVirtual, "Entering");
-        }
-        while (waitsToEnter() < NUMBER_OF_ENTERING_THREADS) {
-            sleep(1);
+            Thread thread = startTask(i, new EnteringTask(), isVirtual, "Entering");
+            ensureBlockedOnEnter(thread);
+            threads[i] = thread;
         }
         return threads;
     }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/ObjectMonitorUsage/libObjectMonitorUsage.cpp b/test/hotspot/jtreg/serviceability/jvmti/ObjectMonitorUsage/libObjectMonitorUsage.cpp
index 015f64452e8..8575ae454a9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/ObjectMonitorUsage/libObjectMonitorUsage.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/ObjectMonitorUsage/libObjectMonitorUsage.cpp
@@ -32,11 +32,8 @@ extern "C" {
 #define STATUS_FAILED 2
 
 static jvmtiEnv *jvmti = nullptr;
-static jrawMonitorID event_lock = nullptr;
 static jint result = PASSED;
 static int check_idx = 0;
-static int waits_to_enter = 0;
-static int waits_to_be_notified = 0;
 static jobject tested_monitor = nullptr;
 
 static bool is_tested_monitor(JNIEnv *jni, jobject monitor) {
@@ -53,47 +50,10 @@ static void log_event(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
   deallocate(jvmti, jni, (void*)tname);
 }
 
-JNIEXPORT void JNICALL
-MonitorContendedEnter(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread, jobject monitor) {
-  RawMonitorLocker rml(jvmti, jni, event_lock);
-  if (is_tested_monitor(jni, monitor)) {
-    waits_to_enter++;
-    log_event(jvmti, jni, thread, "MonitorContendedEnter", waits_to_enter);
-  }
-}
-
-JNIEXPORT void JNICALL
-MonitorContendedEntered(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread, jobject monitor) {
-  RawMonitorLocker rml(jvmti, jni, event_lock);
-  if (is_tested_monitor(jni, monitor)) {
-    waits_to_enter--;
-    log_event(jvmti, jni, thread, "MonitorContendedEntered", waits_to_enter);
-  }
-}
-
-JNIEXPORT void JNICALL
-MonitorWait(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread, jobject monitor, jlong timeout) {
-  RawMonitorLocker rml(jvmti, jni, event_lock);
-  if (is_tested_monitor(jni, monitor)) {
-    waits_to_be_notified++;
-    log_event(jvmti, jni, thread, "MonitorWait", waits_to_be_notified);
-  }
-}
-
-JNIEXPORT void JNICALL
-MonitorWaited(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread, jobject monitor, jboolean timed_out) {
-  RawMonitorLocker rml(jvmti, jni, event_lock);
-  if (is_tested_monitor(jni, monitor)) {
-    waits_to_be_notified--;
-    log_event(jvmti, jni, thread, "MonitorWaited", waits_to_be_notified);
-  }
-}
-
 jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
   jint res;
   jvmtiError err;
   jvmtiCapabilities caps;
-  jvmtiEventCallbacks callbacks;
 
   res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
   if (res != JNI_OK || jvmti == nullptr) {
@@ -116,17 +76,6 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     LOG("Warning: Monitor events are not implemented\n");
     return JNI_ERR;
   }
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.MonitorContendedEnter   = &MonitorContendedEnter;
-  callbacks.MonitorContendedEntered = &MonitorContendedEntered;
-  callbacks.MonitorWait = &MonitorWait;
-  callbacks.MonitorWaited = &MonitorWaited;
-
-  err = jvmti->SetEventCallbacks(&callbacks, sizeof(jvmtiEventCallbacks));
-  check_jvmti_error(err, "Agent_Initialize: error in JVMTI SetEventCallbacks");
-
-  event_lock = create_raw_monitor(jvmti, "Events Monitor");
-
   return JNI_OK;
 }
 
@@ -216,41 +165,20 @@ Java_ObjectMonitorUsage_check(JNIEnv *jni, jclass cls, jobject obj, jthread owne
 
 JNIEXPORT void JNICALL
 Java_ObjectMonitorUsage_setTestedMonitor(JNIEnv *jni, jclass cls, jobject monitor) {
-  jvmtiError err;
-  jvmtiEventMode event_mode = (monitor != nullptr) ? JVMTI_ENABLE : JVMTI_DISABLE;
-
-  RawMonitorLocker rml(jvmti, jni, event_lock);
-
   if (tested_monitor != nullptr) {
     jni->DeleteGlobalRef(tested_monitor);
   }
   tested_monitor = (monitor != nullptr) ? jni->NewGlobalRef(monitor) : nullptr;
-  waits_to_enter = 0;
-  waits_to_be_notified = 0;
-
-  err = jvmti->SetEventNotificationMode(event_mode, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, nullptr);
-  check_jvmti_status(jni, err, "setTestedMonitor: error in JVMTI SetEventNotificationMode #1");
-
-  err = jvmti->SetEventNotificationMode(event_mode, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, nullptr);
-  check_jvmti_status(jni, err, "setTestedMonitor: error in JVMTI SetEventNotificationMode #2");
-
-  err = jvmti->SetEventNotificationMode(event_mode, JVMTI_EVENT_MONITOR_WAIT, nullptr);
-  check_jvmti_status(jni, err, "setTestedMonitor: error in JVMTI SetEventNotificationMode #3");
-
-  err = jvmti->SetEventNotificationMode(event_mode, JVMTI_EVENT_MONITOR_WAITED, nullptr);
-  check_jvmti_status(jni, err, "setTestedMonitor: error in JVMTI SetEventNotificationMode #4");
 }
 
-JNIEXPORT jint JNICALL
-Java_ObjectMonitorUsage_waitsToEnter(JNIEnv *jni, jclass cls) {
-  RawMonitorLocker rml(jvmti, jni, event_lock);
-  return waits_to_enter;
+JNIEXPORT void JNICALL
+Java_ObjectMonitorUsage_ensureBlockedOnEnter(JNIEnv *jni, jclass cls, jthread thread) {
+  wait_for_state(jvmti, jni, thread, JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER);
 }
 
-JNIEXPORT jint JNICALL
-Java_ObjectMonitorUsage_waitsToBeNotified(JNIEnv *jni, jclass cls) {
-  RawMonitorLocker rml(jvmti, jni, event_lock);
-  return waits_to_be_notified;
+JNIEXPORT void JNICALL
+Java_ObjectMonitorUsage_ensureWaitingToBeNotified(JNIEnv *jni, jclass cls, jthread thread) {
+  wait_for_state(jvmti, jni, thread, JVMTI_THREAD_STATE_WAITING_INDEFINITELY);
 }
 
 JNIEXPORT jint JNICALL
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp
index e53484b575b..bea9a9c19a9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp
@@ -216,11 +216,7 @@ test_vthread_resume_all(JNIEnv* jni, const jthread* thread_list, int suspend_mas
   check_jvmti_status(jni, err, "test_vthread_resume_all: error in JVMTI ResumeAllVirtualThreads");
 
   // wait a second to give the breakpoints a chance to be hit.
-#ifdef WINDOWS
-  Sleep(1000);
-#else
-  sleep(1);
-#endif
+  sleep_sec(1);
 
   for (int idx = 0; idx < EXCLUDE_CNT; idx++) {
     // Disable Breakpoint events on excluded thread
diff --git a/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp b/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
index 9fdd4cf4cb8..693baf98d1f 100644
--- a/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
+++ b/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
@@ -56,7 +56,7 @@
 
 #define COMPLAIN LOG
 
-
+void sleep_ms(int millis);
 const char* TranslateState(jint flags);
 const char* TranslateError(jvmtiError err);
 
@@ -380,6 +380,24 @@ find_method(jvmtiEnv *jvmti, JNIEnv *jni, jclass klass, const char* mname) {
   return method;
 }
 
+// Wait for target thread to reach the required JVMTI thread state.
+// The state jint bitmask is returned by the JVMTI GetThreadState.
+// Some examples are:
+// - JVMTI_THREAD_STATE_WAITING
+// - JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER
+// - JVMTI_THREAD_STATE_SLEEPING
+static void
+wait_for_state(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread, jint exp_state) {
+  while (true) {
+    // Allow a bitmask to designate expected thread state. E.g., if two bits are expected
+    // than check they both are present in the state mask returned by JVMTI GetThreadState.
+    if ((get_thread_state(jvmti, jni, thread) & exp_state) == exp_state) {
+      break;
+    }
+    sleep_ms(100);
+  }
+}
+
 #define MAX_FRAME_COUNT_PRINT_STACK_TRACE 200
 
 static void

From 7bb59dc8da0c61c5da5c3aab5d56a6e4880001ce Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 24 Apr 2024 09:44:26 +0000
Subject: [PATCH 175/486] 8330670: Obsolete ScavengeBeforeFullGC

Reviewed-by: stefank, tschatzl
---
 src/hotspot/share/gc/parallel/psParallelCompact.cpp    |  4 ----
 src/hotspot/share/gc/serial/serialHeap.cpp             |  2 +-
 src/hotspot/share/gc/shared/gcArguments.cpp            |  4 ----
 src/hotspot/share/gc/shared/gc_globals.hpp             |  3 ---
 src/hotspot/share/gc/z/zDriver.cpp                     |  3 +--
 src/hotspot/share/runtime/arguments.cpp                | 10 +---------
 .../gc/gctests/WeakReference/weak006/weak006.java      |  2 +-
 7 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 30b73ad3e56..8ac16e059b1 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -1273,10 +1273,6 @@ bool PSParallelCompact::invoke(bool maximum_heap_compaction) {
 
   IsGCActiveMark mark;
 
-  if (ScavengeBeforeFullGC) {
-    PSScavenge::invoke_no_policy();
-  }
-
   const bool clear_all_soft_refs =
     heap->soft_ref_policy()->should_clear_all_soft_refs();
 
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 44fedd3f940..efcc5307e9f 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -498,7 +498,7 @@ void SerialHeap::do_collection(bool full,
   IsGCActiveMark active_gc_mark;
 
   bool complete = full && (max_generation == OldGen);
-  bool old_collects_young = complete && !ScavengeBeforeFullGC;
+  bool old_collects_young = complete;
   bool do_young_collection = !old_collects_young && _young_gen->should_collect(full, size, is_tlab);
 
   const PreGenGCValues pre_gc_values = get_pre_gc_values();
diff --git a/src/hotspot/share/gc/shared/gcArguments.cpp b/src/hotspot/share/gc/shared/gcArguments.cpp
index e9ab856a274..9736c0f7fdc 100644
--- a/src/hotspot/share/gc/shared/gcArguments.cpp
+++ b/src/hotspot/share/gc/shared/gcArguments.cpp
@@ -40,10 +40,6 @@ void GCArguments::initialize() {
     MarkSweepAlwaysCompactCount = 1;  // Move objects every gc.
   }
 
-  if (!UseParallelGC && FLAG_IS_DEFAULT(ScavengeBeforeFullGC)) {
-    FLAG_SET_DEFAULT(ScavengeBeforeFullGC, false);
-  }
-
   if (GCTimeLimit == 100) {
     // Turn off gc-overhead-limit-exceeded checks
     FLAG_SET_DEFAULT(UseGCOverheadLimit, false);
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index a3a1b03dfb9..af735a865dc 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -154,9 +154,6 @@
           "Never tenure objects in eden, may tenure on overflow "           \
           "(ParallelGC only)")                                              \
                                                                             \
-  product(bool, ScavengeBeforeFullGC, true,                                 \
-          "Scavenge youngest generation before each full GC.")              \
-                                                                            \
   product(bool, ExplicitGCInvokesConcurrent, false,                         \
           "A System.gc() request invokes a concurrent collection; "         \
           "(effective only when using concurrent collectors)")              \
diff --git a/src/hotspot/share/gc/z/zDriver.cpp b/src/hotspot/share/gc/z/zDriver.cpp
index f0da73a7f6c..3836f330142 100644
--- a/src/hotspot/share/gc/z/zDriver.cpp
+++ b/src/hotspot/share/gc/z/zDriver.cpp
@@ -310,8 +310,7 @@ static bool should_preclean_young(GCCause::Cause cause) {
   // catch that above and perform young gen pre-cleaning.
   assert(!should_clear_soft_references(cause), "Clearing soft references without pre-cleaning young gen");
 
-  // Preclean young if implied by configuration
-  return ScavengeBeforeFullGC;
+  return false;
 }
 
 ZDriverMajor::ZDriverMajor()
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 1091e4fab25..802ddee756f 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -541,6 +541,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "ParallelOldDeadWoodLimiterMean",   JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) },
   { "ParallelOldDeadWoodLimiterStdDev", JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) },
   { "UseNeon",                      JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) },
+  { "ScavengeBeforeFullGC",         JDK_Version::undefined(), JDK_Version::jdk(23), JDK_Version::jdk(24) },
 #ifdef ASSERT
   { "DummyObsoleteTestFlag",        JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() },
 #endif
@@ -1715,11 +1716,6 @@ jint Arguments::set_aggressive_heap_flags() {
     return JNI_EINVAL;
   }
 
-  // This appears to improve mutator locality
-  if (FLAG_SET_CMDLINE(ScavengeBeforeFullGC, false) != JVMFlag::SUCCESS) {
-    return JNI_EINVAL;
-  }
-
   return JNI_OK;
 }
 
@@ -2735,10 +2731,6 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
       if (FLAG_SET_CMDLINE(FullGCALot, true) != JVMFlag::SUCCESS) {
         return JNI_EINVAL;
       }
-      // disable scavenge before parallel mark-compact
-      if (FLAG_SET_CMDLINE(ScavengeBeforeFullGC, false) != JVMFlag::SUCCESS) {
-        return JNI_EINVAL;
-      }
 #endif
 #if !INCLUDE_MANAGEMENT
     } else if (match_option(option, "-XX:+ManagementServer")) {
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java
index 7c0a2e30607..82fda0a3bd3 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak006/weak006.java
@@ -32,7 +32,7 @@
  *          /test/lib
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+IgnoreUnrecognizedVMOptions -XX:-ScavengeBeforeFullGC gc.gctests.WeakReference.weak006.weak006 -t 1
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+IgnoreUnrecognizedVMOptions gc.gctests.WeakReference.weak006.weak006 -t 1
  */
 
 package gc.gctests.WeakReference.weak006;

From 2bb5cf5f33337b2cc40aca3bdd36400dc4af5723 Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Wed, 24 Apr 2024 11:41:21 +0000
Subject: [PATCH 176/486] 8330155: Serial: Remove TenuredSpace

Reviewed-by: ayang, cjplummer, tschatzl
---
 .../share/gc/g1/g1CollectionSetChooser.cpp    |  4 +-
 src/hotspot/share/gc/serial/cardTableRS.cpp   |  2 +-
 src/hotspot/share/gc/serial/cardTableRS.hpp   |  1 -
 .../share/gc/serial/defNewGeneration.cpp      |  2 +-
 src/hotspot/share/gc/serial/generation.cpp    |  4 +-
 src/hotspot/share/gc/serial/generation.hpp    |  2 +-
 src/hotspot/share/gc/serial/serialFullGC.cpp  |  2 +-
 .../share/gc/serial/serialHeap.inline.hpp     |  1 +
 .../share/gc/serial/tenuredGeneration.cpp     |  5 +-
 .../share/gc/serial/tenuredGeneration.hpp     |  4 +-
 .../gc/serial/tenuredGeneration.inline.hpp    | 18 ++++--
 .../share/gc/serial/vmStructs_serial.hpp      |  5 +-
 src/hotspot/share/gc/shared/cardTable.cpp     |  2 +-
 .../share/gc/shared/cardTableBarrierSet.cpp   |  2 +-
 src/hotspot/share/gc/shared/space.cpp         | 10 ----
 src/hotspot/share/gc/shared/space.hpp         | 21 -------
 src/hotspot/share/gc/shared/space.inline.hpp  | 56 -------------------
 .../share/gc/shared/spaceDecorator.cpp        |  4 +-
 .../gc/shenandoah/shenandoahHeapRegion.cpp    |  4 +-
 .../jvm/hotspot/gc/shared/TenuredSpace.java   | 35 ------------
 .../jtreg/serviceability/sa/ClhsdbField.java  |  2 +-
 21 files changed, 35 insertions(+), 151 deletions(-)
 delete mode 100644 src/hotspot/share/gc/shared/space.inline.hpp
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java

diff --git a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
index ca7f2b37398..92a342ec757 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 #include "gc/g1/g1CollectionSetCandidates.hpp"
 #include "gc/g1/g1CollectionSetChooser.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/quickSort.hpp"
 
diff --git a/src/hotspot/share/gc/serial/cardTableRS.cpp b/src/hotspot/share/gc/serial/cardTableRS.cpp
index 2ed384f124f..1c1781e280e 100644
--- a/src/hotspot/share/gc/serial/cardTableRS.cpp
+++ b/src/hotspot/share/gc/serial/cardTableRS.cpp
@@ -27,7 +27,7 @@
 #include "gc/serial/cardTableRS.hpp"
 #include "gc/serial/generation.hpp"
 #include "gc/serial/serialHeap.inline.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "memory/iterator.inline.hpp"
 #include "utilities/align.hpp"
 
diff --git a/src/hotspot/share/gc/serial/cardTableRS.hpp b/src/hotspot/share/gc/serial/cardTableRS.hpp
index ee4ac31bf5f..b4231dbc4c7 100644
--- a/src/hotspot/share/gc/serial/cardTableRS.hpp
+++ b/src/hotspot/share/gc/serial/cardTableRS.hpp
@@ -31,7 +31,6 @@
 
 class OldGenScanClosure;
 class TenuredGeneration;
-class TenuredSpace;
 
 // This RemSet uses a card table both as shared data structure
 // for a mod ref barrier set and for the rem set information.
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index b0641c7d69f..43c8be36148 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -42,7 +42,7 @@
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "gc/shared/spaceDecorator.inline.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/weakProcessor.hpp"
diff --git a/src/hotspot/share/gc/serial/generation.cpp b/src/hotspot/share/gc/serial/generation.cpp
index c1c195aaf38..da5a54367f0 100644
--- a/src/hotspot/share/gc/serial/generation.cpp
+++ b/src/hotspot/share/gc/serial/generation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 #include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "gc/shared/spaceDecorator.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp
index 70978f35879..c1a88a64b2a 100644
--- a/src/hotspot/share/gc/serial/generation.hpp
+++ b/src/hotspot/share/gc/serial/generation.hpp
@@ -27,7 +27,7 @@
 
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/referenceProcessor.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index 88284fd63c0..514a6e6ab74 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -52,7 +52,7 @@
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/weakProcessor.hpp"
 #include "memory/iterator.inline.hpp"
diff --git a/src/hotspot/share/gc/serial/serialHeap.inline.hpp b/src/hotspot/share/gc/serial/serialHeap.inline.hpp
index 3279f24881e..d43f95cddcf 100644
--- a/src/hotspot/share/gc/serial/serialHeap.inline.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.inline.hpp
@@ -28,6 +28,7 @@
 #include "gc/serial/serialHeap.hpp"
 
 #include "gc/serial/tenuredGeneration.inline.hpp"
+#include "oops/oop.inline.hpp"
 
 class ScavengeHelper {
   DefNewGeneration* _young_gen;
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index 3e9dde0942d..35dc84773aa 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -33,6 +33,7 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/space.hpp"
+#include "gc/shared/spaceDecorator.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
@@ -316,7 +317,8 @@ TenuredGeneration::TenuredGeneration(ReservedSpace rs,
   _used_at_prologue = 0;
   HeapWord* bottom = (HeapWord*) _virtual_space.low();
   HeapWord* end    = (HeapWord*) _virtual_space.high();
-  _the_space  = new TenuredSpace(_bts, MemRegion(bottom, end));
+  _the_space  = new ContiguousSpace();
+  _the_space->initialize(MemRegion(bottom, end), SpaceDecorator::Clear, SpaceDecorator::Mangle);
   // If we don't shrink the heap in steps, '_shrink_factor' is always 100%.
   _shrink_factor = ShrinkHeapInSteps ? 0 : 100;
   _capacity_at_prologue = 0;
@@ -495,7 +497,6 @@ void TenuredGeneration::object_iterate(ObjectClosure* blk) {
 
 void TenuredGeneration::complete_loaded_archive_space(MemRegion archive_space) {
   // Create the BOT for the archive space.
-  TenuredSpace* space = _the_space;
   HeapWord* start = archive_space.start();
   while (start < archive_space.end()) {
     size_t word_size = cast_to_oop(start)->size();;
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index bb34ad8d2c2..cc83f129b68 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -65,7 +65,7 @@ class TenuredGeneration: public Generation {
 
   void assert_correct_size_change_locking();
 
-  TenuredSpace*       _the_space;       // Actual space holding objects
+  ContiguousSpace*    _the_space;       // Actual space holding objects
   HeapWord*           _saved_mark_word;
 
   GenerationCounters* _gen_counters;
@@ -88,7 +88,7 @@ class TenuredGeneration: public Generation {
 public:
   void compute_new_size();
 
-  TenuredSpace* space() const { return _the_space; }
+  ContiguousSpace* space() const { return _the_space; }
   HeapWord* saved_mark_word() const { return _saved_mark_word; }
 
   // Grow generation with specified size (returns false if unable to grow)
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
index 253a72d3c28..955f7b395dd 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
@@ -27,7 +27,7 @@
 
 #include "gc/serial/tenuredGeneration.hpp"
 
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 
 inline size_t TenuredGeneration::capacity() const {
   return space()->capacity();
@@ -50,15 +50,23 @@ inline void TenuredGeneration::update_for_block(HeapWord* start, HeapWord* end)
 }
 
 HeapWord* TenuredGeneration::allocate(size_t word_size,
-                                                 bool is_tlab) {
+                                      bool is_tlab) {
   assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
-  return _the_space->allocate(word_size);
+  HeapWord* res = _the_space->allocate(word_size);
+  if (res != nullptr) {
+    _bts->update_for_block(res, res + word_size);
+  }
+  return res;
 }
 
 HeapWord* TenuredGeneration::par_allocate(size_t word_size,
-                                                     bool is_tlab) {
+                                          bool is_tlab) {
   assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
-  return _the_space->par_allocate(word_size);
+  HeapWord* res = _the_space->par_allocate(word_size);
+  if (res != nullptr) {
+    _bts->update_for_block(res, res + word_size);
+  }
+  return res;
 }
 
 #endif // SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
diff --git a/src/hotspot/share/gc/serial/vmStructs_serial.hpp b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
index d1e29a42632..e5ce220195c 100644
--- a/src/hotspot/share/gc/serial/vmStructs_serial.hpp
+++ b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
@@ -47,7 +47,7 @@
   nonstatic_field(TenuredGeneration,                 _capacity_at_prologue,  size_t)                        \
   nonstatic_field(TenuredGeneration,                 _used_at_prologue,      size_t)                        \
   nonstatic_field(TenuredGeneration,                 _min_heap_delta_bytes,  size_t)                        \
-  nonstatic_field(TenuredGeneration,                 _the_space,             TenuredSpace*)                 \
+  nonstatic_field(TenuredGeneration,                 _the_space,             ContiguousSpace*)              \
                                                                                                             \
   nonstatic_field(DefNewGeneration,                  _old_gen,               TenuredGeneration*)            \
   nonstatic_field(DefNewGeneration,                  _tenuring_threshold,    uint)                          \
@@ -60,8 +60,6 @@
   nonstatic_field(SerialBlockOffsetTable,            _vs,                    VirtualSpace)                  \
   nonstatic_field(SerialBlockOffsetTable,            _offset_base,           u_char*)                       \
                                                                                                             \
-  nonstatic_field(TenuredSpace,                      _offsets,               SerialBlockOffsetTable*)       \
-                                                                                                            \
   nonstatic_field(SerialHeap,                        _young_gen,             DefNewGeneration*)             \
   nonstatic_field(SerialHeap,                        _old_gen,               TenuredGeneration*)            \
 
@@ -72,7 +70,6 @@
   declare_toplevel_type(Generation::StatRecord)                               \
   declare_type(SerialHeap,                   CollectedHeap)                   \
   declare_type(TenuredGeneration,            Generation)                      \
-  declare_type(TenuredSpace,                 ContiguousSpace)                 \
                                                                               \
   declare_type(DefNewGeneration,             Generation)                      \
   declare_type(CardTableRS, CardTable)                                        \
diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp
index 1095defaf9f..95f7058f4e4 100644
--- a/src/hotspot/share/gc/shared/cardTable.cpp
+++ b/src/hotspot/share/gc/shared/cardTable.cpp
@@ -27,7 +27,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gc_globals.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "logging/log.hpp"
 #include "memory/virtualspace.hpp"
 #include "nmt/memTracker.hpp"
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
index 1d4c4775b33..1277cd99293 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
@@ -28,7 +28,7 @@
 #include "gc/shared/cardTableBarrierSet.inline.hpp"
 #include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "logging/log.hpp"
 #include "memory/virtualspace.hpp"
 #include "nmt/memTracker.hpp"
diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
index e1ef2e984e2..43e4a03ca11 100644
--- a/src/hotspot/share/gc/shared/space.cpp
+++ b/src/hotspot/share/gc/shared/space.cpp
@@ -27,7 +27,6 @@
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/space.hpp"
-#include "gc/shared/space.inline.hpp"
 #include "gc/shared/spaceDecorator.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/universe.hpp"
@@ -168,12 +167,3 @@ HeapWord* ContiguousSpace::allocate(size_t size) {
 HeapWord* ContiguousSpace::par_allocate(size_t size) {
   return par_allocate_impl(size);
 }
-
-#if INCLUDE_SERIALGC
-TenuredSpace::TenuredSpace(SerialBlockOffsetTable* offsets,
-                           MemRegion mr) :
-  _offsets(offsets)
-{
-  initialize(mr, SpaceDecorator::Clear, SpaceDecorator::Mangle);
-}
-#endif // INCLUDE_SERIALGC
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 3b30a557f3c..23715ccd9dc 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -161,25 +161,4 @@ public:
   void verify() const;
 };
 
-#if INCLUDE_SERIALGC
-
-// Class TenuredSpace is used by TenuredGeneration; it supports an efficient
-// "block_start" operation via a SerialBlockOffsetTable.
-
-class TenuredSpace: public ContiguousSpace {
-  friend class VMStructs;
- protected:
-  SerialBlockOffsetTable* _offsets;
-
- public:
-  // Constructor
-  TenuredSpace(SerialBlockOffsetTable* offsets,
-               MemRegion mr);
-
-  // Add offset table update.
-  inline HeapWord* allocate(size_t word_size) override;
-  inline HeapWord* par_allocate(size_t word_size) override;
-};
-#endif //INCLUDE_SERIALGC
-
 #endif // SHARE_GC_SHARED_SPACE_HPP
diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
deleted file mode 100644
index fa88be9aa51..00000000000
--- a/src/hotspot/share/gc/shared/space.inline.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2000, 2024, 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.
- *
- */
-
-#ifndef SHARE_GC_SHARED_SPACE_INLINE_HPP
-#define SHARE_GC_SHARED_SPACE_INLINE_HPP
-
-#include "gc/shared/space.hpp"
-
-#include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/spaceDecorator.hpp"
-#include "oops/oop.inline.hpp"
-#include "oops/oopsHierarchy.hpp"
-#include "runtime/prefetch.inline.hpp"
-#include "runtime/safepoint.hpp"
-
-#if INCLUDE_SERIALGC
-inline HeapWord* TenuredSpace::allocate(size_t size) {
-  HeapWord* res = ContiguousSpace::allocate(size);
-  if (res != nullptr) {
-    _offsets->update_for_block(res, res + size);
-  }
-  return res;
-}
-
-inline HeapWord* TenuredSpace::par_allocate(size_t size) {
-  HeapWord* res = ContiguousSpace::par_allocate(size);
-  if (res != nullptr) {
-    _offsets->update_for_block(res, res + size);
-  }
-  return res;
-}
-
-#endif // INCLUDE_SERIALGC
-
-#endif // SHARE_GC_SHARED_SPACE_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/spaceDecorator.cpp b/src/hotspot/share/gc/shared/spaceDecorator.cpp
index 0749108400b..69ffbf51561 100644
--- a/src/hotspot/share/gc/shared/spaceDecorator.cpp
+++ b/src/hotspot/share/gc/shared/spaceDecorator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/parallel/mutableSpace.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "gc/shared/spaceDecorator.inline.hpp"
 #include "logging/log.hpp"
 #include "utilities/copy.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index a46c7edc348..8a94b20670a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/shared/space.inline.hpp"
+#include "gc/shared/space.hpp"
 #include "gc/shared/tlab_globals.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java
deleted file mode 100644
index 02d855822da..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/TenuredSpace.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.gc.shared;
-
-import sun.jvm.hotspot.debugger.*;
-
-/** No additional functionality for now */
-
-public class TenuredSpace extends ContiguousSpace {
-  public TenuredSpace(Address addr) {
-    super(addr);
-  }
-}
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
index 884f521a02f..2ed557f8e94 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
@@ -56,7 +56,7 @@ public class ClhsdbField {
                 "field InstanceKlass _constants ConstantPool*",
                 "field Klass _name Symbol*",
                 "field JavaThread _osthread OSThread*",
-                "field TenuredGeneration _the_space TenuredSpace*",
+                "field TenuredGeneration _the_space ContiguousSpace*",
                 "field VirtualSpace _low_boundary char*",
                 "field MethodCounters _backedge_counter InvocationCounter",
                 "field nmethod _entry_bci int",

From 15190816f704f2e8681bc3e2d74832828a574106 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Wed, 24 Apr 2024 11:43:49 +0000
Subject: [PATCH 177/486] 8330303: Crash: assert(_target_jt == nullptr ||
 _target_jt->vthread() == target_h()) failed

Reviewed-by: pchilanomate, cjplummer, lmesnik
---
 src/hotspot/share/prims/jvmtiEnvBase.cpp        | 4 +++-
 src/hotspot/share/prims/jvmtiEnvBase.hpp        | 8 ++++++--
 src/hotspot/share/prims/jvmtiEnvThreadState.cpp | 3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index 778cc17ffe0..4ed01df0b3d 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -2076,7 +2076,9 @@ GetSingleStackTraceClosure::do_thread(Thread *target) {
 
 void
 GetSingleStackTraceClosure::do_vthread(Handle target_h) {
-  assert(_target_jt == nullptr || _target_jt->vthread() == target_h(), "sanity check");
+  // Use jvmti_vthread() instead of vthread() as target could have temporarily changed
+  // identity to carrier thread (see VirtualThread.switchToCarrierThread).
+  assert(_target_jt == nullptr || _target_jt->jvmti_vthread() == target_h(), "sanity check");
   doit();
 }
 
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.hpp b/src/hotspot/share/prims/jvmtiEnvBase.hpp
index 57fa059b2d8..00de17a8a6b 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.hpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.hpp
@@ -506,7 +506,9 @@ public:
   }
   void do_vthread(Handle target_h) {
     assert(_target_jt != nullptr, "sanity check");
-    assert(_target_jt->vthread() == target_h(), "sanity check");
+    // Use jvmti_vthread() instead of vthread() as target could have temporarily changed
+    // identity to carrier thread (see VirtualThread.switchToCarrierThread).
+    assert(_target_jt->jvmti_vthread() == target_h(), "sanity check");
     doit(_target_jt); // mounted virtual thread
   }
 };
@@ -526,7 +528,9 @@ public:
   }
   void do_vthread(Handle target_h) {
     assert(_target_jt != nullptr, "sanity check");
-    assert(_target_jt->vthread() == target_h(), "sanity check");
+    // Use jvmti_vthread() instead of vthread() as target could have temporarily changed
+    // identity to carrier thread (see VirtualThread.switchToCarrierThread).
+    assert(_target_jt->jvmti_vthread() == target_h(), "sanity check");
     doit(_target_jt); // mounted virtual thread
   }
 };
diff --git a/src/hotspot/share/prims/jvmtiEnvThreadState.cpp b/src/hotspot/share/prims/jvmtiEnvThreadState.cpp
index f61f9415bbc..b531961e7a5 100644
--- a/src/hotspot/share/prims/jvmtiEnvThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvThreadState.cpp
@@ -298,7 +298,8 @@ class GetCurrentLocationClosure : public JvmtiUnitedHandshakeClosure {
   }
   void do_vthread(Handle target_h) {
     assert(_target_jt == nullptr || !_target_jt->is_exiting(), "sanity check");
-    // use jvmti_vthread() as vthread() can be outdated
+    // Use jvmti_vthread() instead of vthread() as target could have temporarily changed
+    // identity to carrier thread (see VirtualThread.switchToCarrierThread).
     assert(_target_jt == nullptr || _target_jt->jvmti_vthread() == target_h(), "sanity check");
     ResourceMark rm;
     javaVFrame *jvf = JvmtiEnvBase::get_vthread_jvf(target_h());

From e923dfe4c51291099d9b7411e6c9f20be79b9a53 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Wed, 24 Apr 2024 11:56:44 +0000
Subject: [PATCH 178/486] 8314592: Add shortcut to SymbolLookup::find

Reviewed-by: jvernee, prr
---
 .../classes/java/lang/foreign/Linker.java     | 10 ++--
 .../java/lang/foreign/SymbolLookup.java       | 38 ++++++++++++-
 .../java/lang/foreign/package-info.java       |  4 +-
 .../lang/foreign/snippet-files/Snippets.java  | 18 +++---
 .../jdk/internal/foreign/SystemLookup.java    |  2 +-
 .../share/classes/sun/font/HBShaper.java      | 20 +++----
 .../compiler/TestLinkToNativeRBP.java         |  2 +-
 .../TestSymbolLookupFindOrThrow.java          | 56 +++++++++++++++++++
 .../bench/java/lang/foreign/AllocTest.java    |  2 +-
 .../bench/java/lang/foreign/CLayouts.java     |  6 +-
 .../java/lang/foreign/CallOverheadHelper.java | 24 ++++----
 .../java/lang/foreign/CriticalCalls.java      |  2 +-
 .../java/lang/foreign/PointerInvoke.java      |  8 +--
 .../bench/java/lang/foreign/QSort.java        |  4 +-
 .../bench/java/lang/foreign/StrLenTest.java   |  2 +-
 .../java/lang/foreign/ToCStringTest.java      |  2 +-
 .../bench/java/lang/foreign/Upcalls.java      |  2 +-
 .../foreign/points/support/PanamaPoint.java   |  4 +-
 .../xor/GetArrayForeignXorOpCriticalImpl.java |  2 +-
 .../foreign/xor/GetArrayForeignXorOpImpl.java |  2 +-
 .../xor/GetArrayForeignXorOpInitImpl.java     |  2 +-
 .../foreign/xor/GetArrayUnsafeXorOpImpl.java  |  2 +-
 22 files changed, 151 insertions(+), 63 deletions(-)
 create mode 100644 test/jdk/java/foreign/loaderLookup/TestSymbolLookupFindOrThrow.java

diff --git a/src/java.base/share/classes/java/lang/foreign/Linker.java b/src/java.base/share/classes/java/lang/foreign/Linker.java
index fb325ef1d44..545a83984f8 100644
--- a/src/java.base/share/classes/java/lang/foreign/Linker.java
+++ b/src/java.base/share/classes/java/lang/foreign/Linker.java
@@ -88,7 +88,7 @@ import java.util.stream.Stream;
  * {@snippet lang = java:
  * Linker linker = Linker.nativeLinker();
  * MethodHandle strlen = linker.downcallHandle(
- *     linker.defaultLookup().find("strlen").orElseThrow(),
+ *     linker.defaultLookup().findOrThrow("strlen"),
  *     FunctionDescriptor.of(JAVA_LONG, ADDRESS)
  * );
  * }
@@ -306,7 +306,7 @@ import java.util.stream.Stream;
  * {@snippet lang = java:
  * Linker linker = Linker.nativeLinker();
  * MethodHandle qsort = linker.downcallHandle(
- *     linker.defaultLookup().find("qsort").orElseThrow(),
+ *     linker.defaultLookup().findOrThrow("qsort"),
  *         FunctionDescriptor.ofVoid(ADDRESS, JAVA_LONG, JAVA_LONG, ADDRESS)
  * );
  * }
@@ -397,12 +397,12 @@ import java.util.stream.Stream;
  * Linker linker = Linker.nativeLinker();
  *
  * MethodHandle malloc = linker.downcallHandle(
- *     linker.defaultLookup().find("malloc").orElseThrow(),
+ *     linker.defaultLookup().findOrThrow("malloc"),
  *     FunctionDescriptor.of(ADDRESS, JAVA_LONG)
  * );
  *
  * MethodHandle free = linker.downcallHandle(
- *     linker.defaultLookup().find("free").orElseThrow(),
+ *     linker.defaultLookup().findOrThrow("free"),
  *     FunctionDescriptor.ofVoid(ADDRESS)
  * );
  * }
@@ -530,7 +530,7 @@ import java.util.stream.Stream;
  * {@snippet lang = java:
  * Linker linker = Linker.nativeLinker();
  * MethodHandle printf = linker.downcallHandle(
- *     linker.defaultLookup().find("printf").orElseThrow(),
+ *     linker.defaultLookup().findOrThrow("printf"),
  *         FunctionDescriptor.of(JAVA_INT, ADDRESS, JAVA_INT, JAVA_INT, JAVA_INT),
  *         Linker.Option.firstVariadicArg(1) // first int is variadic
  * );
diff --git a/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java b/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
index 9bfc7964322..3bc416b9c62 100644
--- a/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
+++ b/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
@@ -39,6 +39,7 @@ import jdk.internal.reflect.Reflection;
 import java.lang.invoke.MethodHandles;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiFunction;
@@ -79,7 +80,7 @@ import java.util.function.BiFunction;
  * {@snippet lang = java:
  * try (Arena arena = Arena.ofConfined()) {
  *     SymbolLookup libGL = SymbolLookup.libraryLookup("libGL.so", arena); // libGL.so loaded here
- *     MemorySegment glGetString = libGL.find("glGetString").orElseThrow();
+ *     MemorySegment glGetString = libGL.findOrThrow("glGetString");
  *     ...
  * } //  libGL.so unloaded here
  *}
@@ -93,7 +94,7 @@ import java.util.function.BiFunction;
  * System.loadLibrary("GL"); // libGL.so loaded here
  * ...
  * SymbolLookup libGL = SymbolLookup.loaderLookup();
- * MemorySegment glGetString = libGL.find("glGetString").orElseThrow();
+ * MemorySegment glGetString = libGL.findOrThrow("glGetString");
  * }
  *
  * This symbol lookup, which is known as a <em>loader lookup</em>, is dynamic with
@@ -130,7 +131,7 @@ import java.util.function.BiFunction;
  * {@snippet lang = java:
  * Linker nativeLinker = Linker.nativeLinker();
  * SymbolLookup stdlib = nativeLinker.defaultLookup();
- * MemorySegment malloc = stdlib.find("malloc").orElseThrow();
+ * MemorySegment malloc = stdlib.findOrThrow("malloc");
  *}
  *
  * @since 22
@@ -144,9 +145,40 @@ public interface SymbolLookup {
      * @param name the symbol name
      * @return a zero-length memory segment whose address indicates the address of
      *         the symbol, if found
+     * @see #findOrThrow(String)
      */
     Optional<MemorySegment> find(String name);
 
+    /**
+     * Returns the address of the symbol with the given name or throws an exception.
+     *<p>
+     * This is equivalent to the following code, but is more efficient:
+     * to:
+     * {@snippet lang= java :
+     *    String name = ...
+     *    MemorySegment address = lookup.find(name)
+     *        .orElseThrow(() -> new NoSuchElementException("Symbol not found: " + name));
+     * }
+     *
+     * @param name the symbol name
+     * @return a zero-length memory segment whose address indicates the address of
+     *         the symbol
+     * @throws NoSuchElementException if no symbol address can be found for the
+     *         given name
+     * @see #find(String)
+     *
+     * @since 23
+     */
+    default MemorySegment findOrThrow(String name) {
+        Objects.requireNonNull(name);
+        Optional<MemorySegment> address = find(name);
+        // Avoid lambda capturing
+        if (address.isPresent()) {
+            return address.get();
+        }
+        throw new NoSuchElementException("Symbol not found: " + name);
+    }
+
     /**
      * {@return a composed symbol lookup that returns the result of finding the symbol
      *          with this lookup if found, otherwise returns the result of finding
diff --git a/src/java.base/share/classes/java/lang/foreign/package-info.java b/src/java.base/share/classes/java/lang/foreign/package-info.java
index b2a6a5f4474..6594826e405 100644
--- a/src/java.base/share/classes/java/lang/foreign/package-info.java
+++ b/src/java.base/share/classes/java/lang/foreign/package-info.java
@@ -100,7 +100,7 @@
  * Linker linker = Linker.nativeLinker();
  * SymbolLookup stdlib = linker.defaultLookup();
  * MethodHandle strlen = linker.downcallHandle(
- *     stdlib.find("strlen").orElseThrow(),
+ *     stdlib.findOrThrow("strlen"),
  *     FunctionDescriptor.of(ValueLayout.JAVA_LONG, ValueLayout.ADDRESS)
  * );
  *
@@ -111,7 +111,7 @@
  *}
  *
  * Here, we obtain a {@linkplain java.lang.foreign.Linker#nativeLinker() native linker}
- * and we use it to {@linkplain java.lang.foreign.SymbolLookup#find(java.lang.String) look up}
+ * and we use it to {@linkplain java.lang.foreign.SymbolLookup#findOrThrow(java.lang.String) look up}
  * the {@code strlen} function in the standard C library; a <em>downcall method handle</em>
  * targeting said function is subsequently
  * {@linkplain java.lang.foreign.Linker#downcallHandle(FunctionDescriptor, Linker.Option...) obtained}.
diff --git a/src/java.base/share/classes/java/lang/foreign/snippet-files/Snippets.java b/src/java.base/share/classes/java/lang/foreign/snippet-files/Snippets.java
index 95b9cce7541..f305586ac61 100644
--- a/src/java.base/share/classes/java/lang/foreign/snippet-files/Snippets.java
+++ b/src/java.base/share/classes/java/lang/foreign/snippet-files/Snippets.java
@@ -163,7 +163,7 @@ class Snippets {
         void downcall() throws Throwable {
             Linker linker = Linker.nativeLinker();
             MethodHandle strlen = linker.downcallHandle(
-                    linker.defaultLookup().find("strlen").orElseThrow(),
+                    linker.defaultLookup().findOrThrow("strlen"),
                     FunctionDescriptor.of(JAVA_LONG, ADDRESS)
             );
 
@@ -177,7 +177,7 @@ class Snippets {
         void qsort() throws Throwable {
             Linker linker = Linker.nativeLinker();
             MethodHandle qsort = linker.downcallHandle(
-                    linker.defaultLookup().find("qsort").orElseThrow(),
+                    linker.defaultLookup().findOrThrow("qsort"),
                     FunctionDescriptor.ofVoid(ADDRESS, JAVA_LONG, JAVA_LONG, ADDRESS)
             );
 
@@ -208,12 +208,12 @@ class Snippets {
             Linker linker = Linker.nativeLinker();
 
             MethodHandle malloc = linker.downcallHandle(
-                    linker.defaultLookup().find("malloc").orElseThrow(),
+                    linker.defaultLookup().findOrThrow("malloc"),
                     FunctionDescriptor.of(ADDRESS, JAVA_LONG)
             );
 
             MethodHandle free = linker.downcallHandle(
-                    linker.defaultLookup().find("free").orElseThrow(),
+                    linker.defaultLookup().findOrThrow("free"),
                     FunctionDescriptor.ofVoid(ADDRESS)
             );
 
@@ -282,7 +282,7 @@ class Snippets {
 
             Linker linker = Linker.nativeLinker();
             MethodHandle printf = linker.downcallHandle(
-                    linker.defaultLookup().find("printf").orElseThrow(),
+                    linker.defaultLookup().findOrThrow("printf"),
                     FunctionDescriptor.of(JAVA_INT, ADDRESS, JAVA_INT, JAVA_INT, JAVA_INT),
                     Linker.Option.firstVariadicArg(1) // first int is variadic
             );
@@ -568,7 +568,7 @@ class Snippets {
             Linker linker = Linker.nativeLinker();
             SymbolLookup stdlib = linker.defaultLookup();
             MethodHandle strlen = linker.downcallHandle(
-                    stdlib.find("strlen").orElseThrow(),
+                    stdlib.findOrThrow("strlen"),
                     FunctionDescriptor.of(ValueLayout.JAVA_LONG, ValueLayout.ADDRESS)
             );
 
@@ -626,14 +626,14 @@ class Snippets {
         void header() {
             try (Arena arena = Arena.ofConfined()) {
                 SymbolLookup libGL = libraryLookup("libGL.so", arena); // libGL.so loaded here
-                MemorySegment glGetString = libGL.find("glGetString").orElseThrow();
+                MemorySegment glGetString = libGL.findOrThrow("glGetString");
                 // ...
             } //  libGL.so unloaded here
 
             System.loadLibrary("GL"); // libGL.so loaded here
             // ...
             SymbolLookup libGL = loaderLookup();
-            MemorySegment glGetString = libGL.find("glGetString").orElseThrow();
+            MemorySegment glGetString = libGL.findOrThrow("glGetString");
 
 
             Arena arena = Arena.ofAuto();
@@ -647,7 +647,7 @@ class Snippets {
 
             Linker nativeLinker = Linker.nativeLinker();
             SymbolLookup stdlib = nativeLinker.defaultLookup();
-            MemorySegment malloc = stdlib.find("malloc").orElseThrow();
+            MemorySegment malloc = stdlib.findOrThrow("malloc");
         }
 
     }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java b/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
index 758366bfcf1..98e02140af6 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
@@ -102,7 +102,7 @@ public final class SystemLookup implements SymbolLookup {
                     libLookup(libs -> libs.load(jdkLibraryPath("syslookup")));
 
             @SuppressWarnings("restricted")
-            MemorySegment funcs = fallbackLibLookup.find("funcs").orElseThrow()
+            MemorySegment funcs = fallbackLibLookup.findOrThrow("funcs")
                     .reinterpret(WindowsFallbackSymbols.LAYOUT.byteSize());
 
             Function<String, Optional<MemorySegment>> fallbackLookup = name -> Optional.ofNullable(WindowsFallbackSymbols.valueOfOrNull(name))
diff --git a/src/java.desktop/share/classes/sun/font/HBShaper.java b/src/java.desktop/share/classes/sun/font/HBShaper.java
index 90877623c2b..70e95cdc27b 100644
--- a/src/java.desktop/share/classes/sun/font/HBShaper.java
+++ b/src/java.desktop/share/classes/sun/font/HBShaper.java
@@ -168,22 +168,22 @@ public class HBShaper {
         SYM_LOOKUP = SymbolLookup.loaderLookup().or(LINKER.defaultLookup());
         FunctionDescriptor mallocDescriptor =
             FunctionDescriptor.of(ADDRESS, JAVA_LONG);
-        Optional<MemorySegment> malloc_symbol = SYM_LOOKUP.find("malloc");
+        MemorySegment malloc_symbol = SYM_LOOKUP.findOrThrow("malloc");
         @SuppressWarnings("restricted")
-        MethodHandle tmp1 = LINKER.downcallHandle(malloc_symbol.get(), mallocDescriptor);
+        MethodHandle tmp1 = LINKER.downcallHandle(malloc_symbol, mallocDescriptor);
         malloc_handle = tmp1;
 
         FunctionDescriptor createFaceDescriptor =
             FunctionDescriptor.of(ADDRESS, ADDRESS);
-        Optional<MemorySegment> create_face_symbol = SYM_LOOKUP.find("HBCreateFace");
+        MemorySegment create_face_symbol = SYM_LOOKUP.findOrThrow("HBCreateFace");
         @SuppressWarnings("restricted")
-        MethodHandle tmp2 = LINKER.downcallHandle(create_face_symbol.get(), createFaceDescriptor);
+        MethodHandle tmp2 = LINKER.downcallHandle(create_face_symbol, createFaceDescriptor);
         create_face_handle = tmp2;
 
         FunctionDescriptor disposeFaceDescriptor = FunctionDescriptor.ofVoid(ADDRESS);
-        Optional<MemorySegment> dispose_face_symbol = SYM_LOOKUP.find("HBDisposeFace");
+        MemorySegment dispose_face_symbol = SYM_LOOKUP.findOrThrow("HBDisposeFace");
         @SuppressWarnings("restricted")
-        MethodHandle tmp3 = LINKER.downcallHandle(dispose_face_symbol.get(), disposeFaceDescriptor);
+        MethodHandle tmp3 = LINKER.downcallHandle(dispose_face_symbol, disposeFaceDescriptor);
         dispose_face_handle = tmp3;
 
         FunctionDescriptor shapeDesc = FunctionDescriptor.ofVoid(
@@ -204,9 +204,9 @@ public class HBShaper {
             ADDRESS,     // ptr to harfbuzz font_funcs object.
             ADDRESS);    // store_results_fn
 
-        Optional<MemorySegment> shape_sym = SYM_LOOKUP.find("jdk_hb_shape");
+        MemorySegment shape_sym = SYM_LOOKUP.findOrThrow("jdk_hb_shape");
         @SuppressWarnings("restricted")
-        MethodHandle tmp4 = LINKER.downcallHandle(shape_sym.get(), shapeDesc);
+        MethodHandle tmp4 = LINKER.downcallHandle(shape_sym, shapeDesc);
         jdk_hb_shape_handle = tmp4;
 
         Arena garena = Arena.global(); // creating stubs that exist until VM exit.
@@ -260,10 +260,10 @@ public class HBShaper {
             ADDRESS,     // h_advance_fn upcall stub
             ADDRESS,     // v_advance_fn upcall stub
             ADDRESS);     // contour_pt_fn upcall stub
-        Optional<MemorySegment> create_font_funcs_symbol = SYM_LOOKUP.find("HBCreateFontFuncs");
+        MemorySegment create_font_funcs_symbol = SYM_LOOKUP.findOrThrow("HBCreateFontFuncs");
         @SuppressWarnings("restricted")
         MethodHandle create_font_funcs_handle =
-            LINKER.downcallHandle(create_font_funcs_symbol.get(), createFontFuncsDescriptor);
+            LINKER.downcallHandle(create_font_funcs_symbol, createFontFuncsDescriptor);
 
         MemorySegment s = null;
         try {
diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/TestLinkToNativeRBP.java b/test/hotspot/jtreg/gc/shenandoah/compiler/TestLinkToNativeRBP.java
index 8004d34f5ce..f799c0bac21 100644
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestLinkToNativeRBP.java
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestLinkToNativeRBP.java
@@ -49,7 +49,7 @@ public class TestLinkToNativeRBP {
 
     final static Linker abi = Linker.nativeLinker();
     static final SymbolLookup lookup = SymbolLookup.loaderLookup();
-    final static MethodHandle foo = abi.downcallHandle(lookup.find("foo").get(),
+    final static MethodHandle foo = abi.downcallHandle(lookup.findOrThrow("foo"),
             FunctionDescriptor.of(ValueLayout.JAVA_INT));
 
     static int foo() throws Throwable {
diff --git a/test/jdk/java/foreign/loaderLookup/TestSymbolLookupFindOrThrow.java b/test/jdk/java/foreign/loaderLookup/TestSymbolLookupFindOrThrow.java
new file mode 100644
index 00000000000..d0fdf43b999
--- /dev/null
+++ b/test/jdk/java/foreign/loaderLookup/TestSymbolLookupFindOrThrow.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2024, 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
+ * @run junit/othervm --enable-native-access=ALL-UNNAMED TestSymbolLookupFindOrThrow
+ */
+
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SymbolLookup;
+import java.util.NoSuchElementException;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.*;
+
+final class TestSymbolLookupFindOrThrow {
+
+    static {
+        System.loadLibrary("Foo");
+    }
+
+    @Test
+    void findOrThrow() {
+        MemorySegment symbol = SymbolLookup.loaderLookup().findOrThrow("foo");
+        Assertions.assertNotEquals(0, symbol.address());
+    }
+
+    @Test
+    void findOrThrowNotFound() {
+        assertThrows(NoSuchElementException.class, () ->
+                SymbolLookup.loaderLookup().findOrThrow("bar"));
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java
index b7e4bfd5f57..4ae2c0364dc 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java
@@ -88,7 +88,7 @@ public class AllocTest extends CLayouts {
 
         static final MethodHandle CALLOC = Linker.nativeLinker()
                 .downcallHandle(
-                        Linker.nativeLinker().defaultLookup().find("calloc").get(),
+                        Linker.nativeLinker().defaultLookup().findOrThrow("calloc"),
                         FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.JAVA_LONG, ValueLayout.JAVA_LONG));
 
         static MemorySegment calloc(long size) {
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/CLayouts.java b/test/micro/org/openjdk/bench/java/lang/foreign/CLayouts.java
index bfe5ce61b1c..4028b408559 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/CLayouts.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CLayouts.java
@@ -33,7 +33,7 @@ import java.lang.foreign.ValueLayout;
 import java.lang.invoke.MethodHandle;
 
 public class CLayouts {
-    private static Linker LINKER = Linker.nativeLinker();
+    private static final Linker LINKER = Linker.nativeLinker();
 
     // the constants below are useful aliases for C types. The type/carrier association is only valid for 64-bit platforms.
 
@@ -73,10 +73,10 @@ public class CLayouts {
             .withTargetLayout(MemoryLayout.sequenceLayout(Long.MAX_VALUE, C_CHAR));
 
     private static final MethodHandle FREE = LINKER.downcallHandle(
-            LINKER.defaultLookup().find("free").get(), FunctionDescriptor.ofVoid(C_POINTER));
+            LINKER.defaultLookup().findOrThrow("free"), FunctionDescriptor.ofVoid(C_POINTER));
 
     private static final MethodHandle MALLOC = LINKER.downcallHandle(
-            LINKER.defaultLookup().find("malloc").get(), FunctionDescriptor.of(C_POINTER, ValueLayout.JAVA_LONG));
+            LINKER.defaultLookup().findOrThrow("malloc"), FunctionDescriptor.of(C_POINTER, ValueLayout.JAVA_LONG));
 
     public static void freeMemory(MemorySegment address) {
         try {
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadHelper.java b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadHelper.java
index 290d40f1202..f0841989e76 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadHelper.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadHelper.java
@@ -109,7 +109,7 @@ public class CallOverheadHelper extends CLayouts {
         System.loadLibrary("CallOverhead");
         SymbolLookup loaderLibs = SymbolLookup.loaderLookup();
         {
-            func_addr = loaderLibs.find("func").orElseThrow();
+            func_addr = loaderLibs.findOrThrow("func");
             MethodType mt = MethodType.methodType(void.class);
             FunctionDescriptor fd = FunctionDescriptor.ofVoid();
             func_v = abi.downcallHandle(fd);
@@ -118,59 +118,59 @@ public class CallOverheadHelper extends CLayouts {
             func_critical = insertArguments(func_critical_v, 0, func_addr);
         }
         {
-            identity_addr = loaderLibs.find("identity").orElseThrow();
+            identity_addr = loaderLibs.findOrThrow("identity");
             FunctionDescriptor fd = FunctionDescriptor.of(C_INT, C_INT);
             identity_v = abi.downcallHandle(fd);
             identity_critical_v = abi.downcallHandle(fd, Linker.Option.critical(false));
             identity = insertArguments(identity_v, 0, identity_addr);
             identity_critical = insertArguments(identity_critical_v, 0, identity_addr);
         }
-        identity_struct_addr = loaderLibs.find("identity_struct").orElseThrow();
+        identity_struct_addr = loaderLibs.findOrThrow("identity_struct");
         identity_struct_v = abi.downcallHandle(
                 FunctionDescriptor.of(POINT_LAYOUT, POINT_LAYOUT));
         identity_struct = insertArguments(identity_struct_v, 0, identity_struct_addr);
 
-        identity_struct_3_addr = loaderLibs.find("identity_struct_3").orElseThrow();
+        identity_struct_3_addr = loaderLibs.findOrThrow("identity_struct_3");
         identity_struct_3_v = abi.downcallHandle(
                 FunctionDescriptor.of(POINT_LAYOUT, POINT_LAYOUT, POINT_LAYOUT, POINT_LAYOUT));
         identity_struct_3 = insertArguments(identity_struct_3_v, 0, identity_struct_3_addr);
 
-        identity_memory_address_addr = loaderLibs.find("identity_memory_address").orElseThrow();
+        identity_memory_address_addr = loaderLibs.findOrThrow("identity_memory_address");
         identity_memory_address_v = abi.downcallHandle(
                 FunctionDescriptor.of(C_POINTER, C_POINTER));
         identity_memory_address = insertArguments(identity_memory_address_v, 0, identity_memory_address_addr);
 
-        identity_memory_address_3_addr = loaderLibs.find("identity_memory_address_3").orElseThrow();
+        identity_memory_address_3_addr = loaderLibs.findOrThrow("identity_memory_address_3");
         identity_memory_address_3_v = abi.downcallHandle(
                 FunctionDescriptor.of(C_POINTER, C_POINTER, C_POINTER, C_POINTER));
         identity_memory_address_3 = insertArguments(identity_memory_address_3_v, 0, identity_memory_address_3_addr);
 
-        args1_addr = loaderLibs.find("args1").orElseThrow();
+        args1_addr = loaderLibs.findOrThrow("args1");
         args1_v = abi.downcallHandle(
                 FunctionDescriptor.ofVoid(C_LONG_LONG));
         args1 = insertArguments(args1_v, 0, args1_addr);
 
-        args2_addr = loaderLibs.find("args2").orElseThrow();
+        args2_addr = loaderLibs.findOrThrow("args2");
         args2_v = abi.downcallHandle(
                 FunctionDescriptor.ofVoid(C_LONG_LONG, C_DOUBLE));
         args2 = insertArguments(args2_v, 0, args2_addr);
 
-        args3_addr = loaderLibs.find("args3").orElseThrow();
+        args3_addr = loaderLibs.findOrThrow("args3");
         args3_v = abi.downcallHandle(
                 FunctionDescriptor.ofVoid(C_LONG_LONG, C_DOUBLE, C_LONG_LONG));
         args3 = insertArguments(args3_v, 0, args3_addr);
 
-        args4_addr = loaderLibs.find("args4").orElseThrow();
+        args4_addr = loaderLibs.findOrThrow("args4");
         args4_v = abi.downcallHandle(
                 FunctionDescriptor.ofVoid(C_LONG_LONG, C_DOUBLE, C_LONG_LONG, C_DOUBLE));
         args4 = insertArguments(args4_v, 0, args4_addr);
 
-        args5_addr = loaderLibs.find("args5").orElseThrow();
+        args5_addr = loaderLibs.findOrThrow("args5");
         args5_v = abi.downcallHandle(
                 FunctionDescriptor.ofVoid(C_LONG_LONG, C_DOUBLE, C_LONG_LONG, C_DOUBLE, C_LONG_LONG));
         args5 = insertArguments(args5_v, 0, args5_addr);
 
-        args10_addr = loaderLibs.find("args10").orElseThrow();
+        args10_addr = loaderLibs.findOrThrow("args10");
         args10_v = abi.downcallHandle(
                 FunctionDescriptor.ofVoid(C_LONG_LONG, C_DOUBLE, C_LONG_LONG, C_DOUBLE, C_LONG_LONG,
                                           C_DOUBLE, C_LONG_LONG, C_DOUBLE, C_LONG_LONG, C_DOUBLE));
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/CriticalCalls.java b/test/micro/org/openjdk/bench/java/lang/foreign/CriticalCalls.java
index de44b695775..0f384f81685 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/CriticalCalls.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CriticalCalls.java
@@ -61,7 +61,7 @@ public class CriticalCalls {
         System.loadLibrary("CriticalCalls");
         SymbolLookup lookup = SymbolLookup.loaderLookup();
 
-        MemorySegment sumIntsSym = lookup.find("sum_ints").get();
+        MemorySegment sumIntsSym = lookup.findOrThrow("sum_ints");
         FunctionDescriptor sumIntsDesc = FunctionDescriptor.of(JAVA_INT, ADDRESS, JAVA_INT);
 
         PINNED = Linker.nativeLinker().downcallHandle(
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/PointerInvoke.java b/test/micro/org/openjdk/bench/java/lang/foreign/PointerInvoke.java
index 47e6c0b1fd1..ab77ae630c1 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/PointerInvoke.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/PointerInvoke.java
@@ -58,13 +58,13 @@ public class PointerInvoke extends CLayouts {
     static {
         Linker abi = Linker.nativeLinker();
         SymbolLookup loaderLibs = SymbolLookup.loaderLookup();
-        F_LONG_LONG = abi.downcallHandle(loaderLibs.find("id_long_long").get(),
+        F_LONG_LONG = abi.downcallHandle(loaderLibs.findOrThrow("id_long_long"),
                 FunctionDescriptor.of(C_LONG_LONG, C_LONG_LONG));
-        F_PTR_LONG = abi.downcallHandle(loaderLibs.find("id_ptr_long").get(),
+        F_PTR_LONG = abi.downcallHandle(loaderLibs.findOrThrow("id_ptr_long"),
                 FunctionDescriptor.of(C_LONG_LONG, C_POINTER));
-        F_LONG_PTR = abi.downcallHandle(loaderLibs.find("id_long_ptr").get(),
+        F_LONG_PTR = abi.downcallHandle(loaderLibs.findOrThrow("id_long_ptr"),
                 FunctionDescriptor.of(C_POINTER, C_LONG_LONG));
-        F_PTR_PTR = abi.downcallHandle(loaderLibs.find("id_ptr_ptr").get(),
+        F_PTR_PTR = abi.downcallHandle(loaderLibs.findOrThrow("id_ptr_ptr"),
                 FunctionDescriptor.of(C_POINTER, C_POINTER));
     }
 
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/QSort.java b/test/micro/org/openjdk/bench/java/lang/foreign/QSort.java
index 2050b3b2fb2..76298ae0739 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/QSort.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/QSort.java
@@ -58,7 +58,7 @@ public class QSort extends CLayouts {
     static final int[] INPUT = { 5, 3, 2, 7, 8, 12, 1, 7 };
     static final MemorySegment INPUT_SEGMENT;
 
-    static MemorySegment qsort_addr = abi.defaultLookup().find("qsort").get();
+    static MemorySegment qsort_addr = abi.defaultLookup().findOrThrow("qsort");
 
     static {
         MemoryLayout layout = MemoryLayout.sequenceLayout(INPUT.length, JAVA_INT);
@@ -74,7 +74,7 @@ public class QSort extends CLayouts {
                     FunctionDescriptor.ofVoid(C_POINTER, C_LONG_LONG, C_LONG_LONG, C_POINTER)
             );
             System.loadLibrary("QSort");
-            native_compar = SymbolLookup.loaderLookup().find("compar").orElseThrow();
+            native_compar = SymbolLookup.loaderLookup().findOrThrow("compar");
             panama_upcall_compar = abi.upcallStub(
                     lookup().findStatic(QSort.class,
                             "panama_upcall_compar",
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
index 574268f1ffa..2ad723eadf3 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
@@ -69,7 +69,7 @@ public class StrLenTest extends CLayouts {
 
     static {
         Linker abi = Linker.nativeLinker();
-        STRLEN = abi.downcallHandle(abi.defaultLookup().find("strlen").get(),
+        STRLEN = abi.downcallHandle(abi.defaultLookup().findOrThrow("strlen"),
                 FunctionDescriptor.of(C_INT, C_POINTER));
     }
 
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java
index 051ad94758e..7ba9384958e 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java
@@ -66,7 +66,7 @@ public class ToCStringTest extends CLayouts {
 
     static {
         Linker abi = Linker.nativeLinker();
-        STRLEN = abi.downcallHandle(abi.defaultLookup().find("strlen").get(),
+        STRLEN = abi.downcallHandle(abi.defaultLookup().findOrThrow("strlen"),
                 FunctionDescriptor.of(C_INT, C_POINTER));
     }
 
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/Upcalls.java b/test/micro/org/openjdk/bench/java/lang/foreign/Upcalls.java
index 4f1c0d5b528..1b852e6ff9d 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/Upcalls.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/Upcalls.java
@@ -120,7 +120,7 @@ public class Upcalls extends CLayouts {
 
     static MethodHandle linkFunc(String name, FunctionDescriptor baseDesc) {
         return abi.downcallHandle(
-                SymbolLookup.loaderLookup().find(name).orElseThrow(),
+                SymbolLookup.loaderLookup().findOrThrow(name),
                 baseDesc.appendArgumentLayouts(C_POINTER)
         );
     }
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/points/support/PanamaPoint.java b/test/micro/org/openjdk/bench/java/lang/foreign/points/support/PanamaPoint.java
index fbcf3ba5528..dca63267dc7 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/points/support/PanamaPoint.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/points/support/PanamaPoint.java
@@ -48,11 +48,11 @@ public class PanamaPoint extends CLayouts implements AutoCloseable {
         System.loadLibrary("Point");
         SymbolLookup loaderLibs = SymbolLookup.loaderLookup();
         MH_distance = abi.downcallHandle(
-                loaderLibs.find("distance").get(),
+                loaderLibs.findOrThrow("distance"),
                 FunctionDescriptor.of(C_DOUBLE, LAYOUT, LAYOUT)
         );
         MH_distance_ptrs = abi.downcallHandle(
-                loaderLibs.find("distance_ptrs").get(),
+                loaderLibs.findOrThrow("distance_ptrs"),
                 FunctionDescriptor.of(C_DOUBLE, C_POINTER, C_POINTER)
         );
     }
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpCriticalImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpCriticalImpl.java
index 250ba1157d7..38d4c72a20a 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpCriticalImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpCriticalImpl.java
@@ -17,7 +17,7 @@ public class GetArrayForeignXorOpCriticalImpl implements XorOp {
         Linker linker;
         linker = Linker.nativeLinker();
         FunctionDescriptor xor_op_func = FunctionDescriptor.ofVoid(C_POINTER, C_POINTER, C_INT);
-        xor_op = linker.downcallHandle(SymbolLookup.loaderLookup().find("xor_op").orElseThrow(), xor_op_func, critical(true));
+        xor_op = linker.downcallHandle(SymbolLookup.loaderLookup().findOrThrow("xor_op"), xor_op_func, critical(true));
     }
 
     static final MethodHandle xor_op;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpImpl.java
index e033127de6a..d59203155cd 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpImpl.java
@@ -19,7 +19,7 @@ public class GetArrayForeignXorOpImpl implements XorOp {
         Linker linker;
         linker = Linker.nativeLinker();
         FunctionDescriptor xor_op_func = FunctionDescriptor.ofVoid(C_POINTER, C_POINTER, C_INT);
-        xor_op = linker.downcallHandle(SymbolLookup.loaderLookup().find("xor_op").orElseThrow(), xor_op_func, critical(false));
+        xor_op = linker.downcallHandle(SymbolLookup.loaderLookup().findOrThrow("xor_op"), xor_op_func, critical(false));
     }
 
     static final MethodHandle xor_op;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpInitImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpInitImpl.java
index 8a3df5d4f39..489255ad111 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpInitImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpInitImpl.java
@@ -20,7 +20,7 @@ public class GetArrayForeignXorOpInitImpl implements XorOp {
         Linker linker;
         linker = Linker.nativeLinker();
         FunctionDescriptor xor_op_func = FunctionDescriptor.ofVoid(C_POINTER, C_POINTER, C_INT);
-        xor_op = linker.downcallHandle(SymbolLookup.loaderLookup().find("xor_op").orElseThrow(), xor_op_func, critical(false));
+        xor_op = linker.downcallHandle(SymbolLookup.loaderLookup().findOrThrow("xor_op"), xor_op_func, critical(false));
     }
 
     static final MethodHandle xor_op;
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayUnsafeXorOpImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayUnsafeXorOpImpl.java
index 4175dd03121..ae6869c40d5 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayUnsafeXorOpImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayUnsafeXorOpImpl.java
@@ -25,7 +25,7 @@ public class GetArrayUnsafeXorOpImpl implements XorOp {
         Linker linker;
         linker = Linker.nativeLinker();
         FunctionDescriptor xor_op_func = FunctionDescriptor.ofVoid(C_POINTER, C_POINTER, C_INT);
-        xor_op = linker.downcallHandle(SymbolLookup.loaderLookup().find("xor_op").orElseThrow(), xor_op_func, critical(false));
+        xor_op = linker.downcallHandle(SymbolLookup.loaderLookup().findOrThrow("xor_op"), xor_op_func, critical(false));
     }
 
     static final MethodHandle xor_op;

From e311ba32a517a6389c683c3597d78f66fe52991e Mon Sep 17 00:00:00 2001
From: Stefan Johansson <sjohanss@openjdk.org>
Date: Wed, 24 Apr 2024 12:03:30 +0000
Subject: [PATCH 179/486] 8330626: ZGC: Windows address space placeholders not
 managed correctly

Reviewed-by: stefank, aboldtch
---
 .../windows/gc/z/zVirtualMemory_windows.cpp   |  61 +++++-
 src/hotspot/share/gc/z/zVirtualMemory.hpp     |   2 +
 .../gtest/gc/z/test_zMapper_windows.cpp       | 178 ++++++++++++++++++
 3 files changed, 232 insertions(+), 9 deletions(-)
 create mode 100644 test/hotspot/gtest/gc/z/test_zMapper_windows.cpp

diff --git a/src/hotspot/os/windows/gc/z/zVirtualMemory_windows.cpp b/src/hotspot/os/windows/gc/z/zVirtualMemory_windows.cpp
index c7c0d700d79..7448fd18e0b 100644
--- a/src/hotspot/os/windows/gc/z/zVirtualMemory_windows.cpp
+++ b/src/hotspot/os/windows/gc/z/zVirtualMemory_windows.cpp
@@ -40,6 +40,11 @@ public:
 };
 
 // Implements small pages (paged) support using placeholder reservation.
+//
+// When a memory area is free (kept by the virtual memory manager) a
+// single placeholder is covering that memory area. When memory is
+// allocated from the manager the placeholder is split into granule
+// sized placeholders to allow mapping operations on that granularity.
 class ZVirtualMemoryManagerSmallPages : public ZVirtualMemoryManagerImpl {
 private:
   class PlaceholderCallbacks : public AllStatic {
@@ -52,49 +57,87 @@ private:
       ZMapper::coalesce_placeholders(ZOffset::address_unsafe(start), size);
     }
 
-    static void split_into_placeholder_granules(zoffset start, size_t size) {
-      for (uintptr_t addr = untype(start); addr < untype(start) + size; addr += ZGranuleSize) {
-        split_placeholder(to_zoffset(addr), ZGranuleSize);
+    // Turn the single placeholder covering the memory area into granule
+    // sized placeholders.
+    static void split_into_granule_sized_placeholders(zoffset start, size_t size) {
+      assert(size >= ZGranuleSize, "Must be at least one granule");
+      assert(is_aligned(size, ZGranuleSize), "Must be granule aligned");
+
+      // Don't call split_placeholder on the last granule, since it is already
+      // a placeholder and the system call would therefore fail.
+      const size_t limit = size - ZGranuleSize;
+      for (size_t offset = 0; offset < limit; offset += ZGranuleSize) {
+        split_placeholder(start + offset, ZGranuleSize);
       }
     }
 
     static void coalesce_into_one_placeholder(zoffset start, size_t size) {
       assert(is_aligned(size, ZGranuleSize), "Must be granule aligned");
 
+      // Granule sized areas are already covered by a single placeholder
       if (size > ZGranuleSize) {
         coalesce_placeholders(start, size);
       }
     }
 
+    // Called when a memory area is returned to the memory manager but can't
+    // be merged with an already existing area. Make sure this area is covered
+    // by a single placeholder.
     static void create_callback(const ZMemory* area) {
       assert(is_aligned(area->size(), ZGranuleSize), "Must be granule aligned");
+
       coalesce_into_one_placeholder(area->start(), area->size());
     }
 
+    // Called when a complete memory area in the memory manager is allocated.
+    // Create granule sized placeholders for the entire area.
     static void destroy_callback(const ZMemory* area) {
       assert(is_aligned(area->size(), ZGranuleSize), "Must be granule aligned");
-      // Don't try split the last granule - VirtualFree will fail
-      split_into_placeholder_granules(area->start(), area->size() - ZGranuleSize);
+
+      split_into_granule_sized_placeholders(area->start(), area->size());
     }
 
+    // Called when a memory area is allocated at the front of an exising memory area.
+    // Turn the first part of the memory area into granule sized placeholders.
     static void shrink_from_front_callback(const ZMemory* area, size_t size) {
+      assert(area->size() > size, "Must be larger than what we try to split out");
       assert(is_aligned(size, ZGranuleSize), "Must be granule aligned");
-      split_into_placeholder_granules(area->start(), size);
+
+      // Split the area into two placeholders
+      split_placeholder(area->start(), size);
+
+      // Split the first part into granule sized placeholders
+      split_into_granule_sized_placeholders(area->start(), size);
     }
 
+    // Called when a memory area is allocated at the end of an existing memory area.
+    // Turn the second part of the memory area into granule sized placeholders.
     static void shrink_from_back_callback(const ZMemory* area, size_t size) {
+      assert(area->size() > size, "Must be larger than what we try to split out");
       assert(is_aligned(size, ZGranuleSize), "Must be granule aligned");
-      // Don't try split the last granule - VirtualFree will fail
-      split_into_placeholder_granules(to_zoffset(untype(area->end()) - size), size - ZGranuleSize);
+
+      // Split the area into two placeholders
+      const zoffset start = to_zoffset(area->end() - size);
+      split_placeholder(start, size);
+
+      // Split the second part into granule sized placeholders
+      split_into_granule_sized_placeholders(start, size);
     }
 
+    // Called when freeing a memory area and it can be merged at the start of an
+    // existing area. Coalesce the underlying placeholders into one.
     static void grow_from_front_callback(const ZMemory* area, size_t size) {
       assert(is_aligned(area->size(), ZGranuleSize), "Must be granule aligned");
-      coalesce_into_one_placeholder(to_zoffset(untype(area->start()) - size), area->size() + size);
+
+      const zoffset start = area->start() - size;
+      coalesce_into_one_placeholder(start, area->size() + size);
     }
 
+    // Called when freeing a memory area and it can be merged at the end of an
+    // existing area. Coalesce the underlying placeholders into one.
     static void grow_from_back_callback(const ZMemory* area, size_t size) {
       assert(is_aligned(area->size(), ZGranuleSize), "Must be granule aligned");
+
       coalesce_into_one_placeholder(area->start(), area->size() + size);
     }
 
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.hpp b/src/hotspot/share/gc/z/zVirtualMemory.hpp
index faf7cdc6216..9b5e1e1bfad 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.hpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.hpp
@@ -47,6 +47,8 @@ public:
 };
 
 class ZVirtualMemoryManager {
+  friend class ZMapperTest;
+
 private:
   static size_t calculate_min_range(size_t size);
 
diff --git a/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp b/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
new file mode 100644
index 00000000000..2c93fa2bba7
--- /dev/null
+++ b/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+#include "precompiled.hpp"
+
+#ifdef _WINDOWS
+
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zList.inline.hpp"
+#include "gc/z/zMemory.inline.hpp"
+#include "gc/z/zSyscall_windows.hpp"
+#include "gc/z/zVirtualMemory.hpp"
+#include "runtime/os.hpp"
+#include "unittest.hpp"
+
+using namespace testing;
+
+#define EXPECT_ALLOC_OK(offset) EXPECT_NE(offset, zoffset(UINTPTR_MAX))
+
+class ZMapperTest : public Test {
+private:
+  static constexpr size_t ZMapperTestReservationSize = 32 * M;
+
+  static bool            _initialized;
+  static ZMemoryManager* _va;
+
+  ZVirtualMemoryManager* _vmm;
+
+public:
+  bool reserve_for_test() {
+    // Initialize platform specific parts before reserving address space
+    _vmm->pd_initialize_before_reserve();
+
+    // Reserve address space
+    if (!_vmm->pd_reserve(ZOffset::address_unsafe(zoffset(0)), ZMapperTestReservationSize)) {
+      return false;
+    }
+
+    // Make the address range free before setting up callbacks below
+    _va->free(zoffset(0), ZMapperTestReservationSize);
+
+    // Initialize platform specific parts after reserving address space
+    _vmm->pd_initialize_after_reserve();
+
+    return true;
+  }
+
+  virtual void SetUp() {
+    ZSyscall::initialize();
+    ZGlobalsPointers::initialize();
+
+    // Fake a ZVirtualMemoryManager
+    _vmm = (ZVirtualMemoryManager*)os::malloc(sizeof(ZVirtualMemoryManager), mtTest);
+
+    // Construct its internal ZMemoryManager
+    _va = new (&_vmm->_manager) ZMemoryManager();
+
+    // Reserve address space for the test
+    if (!reserve_for_test()) {
+      // Failed to reserve address space
+      GTEST_SKIP();
+      return;
+    }
+
+    _initialized = true;
+  }
+
+  virtual void TearDown() {
+    if (_initialized) {
+      _vmm->pd_unreserve(ZOffset::address_unsafe(zoffset(0)), 0);
+    }
+    os::free(_vmm);
+  }
+
+  static void test_alloc_low_address() {
+    // Verify that we get placeholder for first granule
+    zoffset bottom = _va->alloc_low_address(ZGranuleSize);
+    EXPECT_ALLOC_OK(bottom);
+
+    _va->free(bottom, ZGranuleSize);
+
+    // Alloc something larger than a granule and free it
+    bottom = _va->alloc_low_address(ZGranuleSize * 3);
+    EXPECT_ALLOC_OK(bottom);
+
+    _va->free(bottom, ZGranuleSize * 3);
+
+    // Free with more memory allocated
+    bottom = _va->alloc_low_address(ZGranuleSize);
+    EXPECT_ALLOC_OK(bottom);
+
+    zoffset next = _va->alloc_low_address(ZGranuleSize);
+    EXPECT_ALLOC_OK(next);
+
+    _va->free(bottom, ZGranuleSize);
+    _va->free(next, ZGranuleSize);
+  }
+
+  static void test_alloc_high_address() {
+    // Verify that we get placeholder for last granule
+    zoffset high = _va->alloc_high_address(ZGranuleSize);
+    EXPECT_ALLOC_OK(high);
+
+    zoffset prev = _va->alloc_high_address(ZGranuleSize);
+    EXPECT_ALLOC_OK(prev);
+
+    _va->free(high, ZGranuleSize);
+    _va->free(prev, ZGranuleSize);
+
+    // Alloc something larger than a granule and return it
+    high = _va->alloc_high_address(ZGranuleSize * 2);
+    EXPECT_ALLOC_OK(high);
+
+    _va->free(high, ZGranuleSize * 2);
+  }
+
+  static void test_alloc_whole_area() {
+    // Alloc the whole reservation
+    zoffset bottom = _va->alloc_low_address(ZMapperTestReservationSize);
+    EXPECT_ALLOC_OK(bottom);
+
+    // Free two chunks and then allocate them again
+    _va->free(bottom, ZGranuleSize * 4);
+    _va->free(bottom + ZGranuleSize * 6, ZGranuleSize * 6);
+
+    zoffset offset = _va->alloc_low_address(ZGranuleSize * 4);
+    EXPECT_ALLOC_OK(offset);
+
+    offset = _va->alloc_low_address(ZGranuleSize * 6);
+    EXPECT_ALLOC_OK(offset);
+
+    // Now free it all, and verify it can be re-allocated
+    _va->free(bottom, ZMapperTestReservationSize);
+
+    bottom = _va->alloc_low_address(ZMapperTestReservationSize);
+    EXPECT_ALLOC_OK(bottom);
+
+    _va->free(bottom, ZMapperTestReservationSize);
+  }
+};
+
+bool ZMapperTest::_initialized   = false;
+ZMemoryManager* ZMapperTest::_va = nullptr;
+
+TEST_VM_F(ZMapperTest, test_alloc_low_address) {
+  test_alloc_low_address();
+}
+
+TEST_VM_F(ZMapperTest, test_alloc_high_address) {
+  test_alloc_high_address();
+}
+
+TEST_VM_F(ZMapperTest, test_alloc_whole_area) {
+  test_alloc_whole_area();
+}
+
+#endif // _WINDOWS

From 45ed97f15b96071e5d6b6d21e8f0129eda5aa447 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 24 Apr 2024 12:55:34 +0000
Subject: [PATCH 180/486] 8330464: hserr generic events - add entry for the
 before_exit calls

Reviewed-by: rrich, lucy
---
 src/hotspot/share/runtime/java.cpp    | 3 +++
 src/hotspot/share/runtime/threads.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index de3d12c3883..d78e35c4e68 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -78,6 +78,7 @@
 #include "runtime/vm_version.hpp"
 #include "sanitizers/leak.hpp"
 #include "utilities/dtrace.hpp"
+#include "utilities/events.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
@@ -366,6 +367,8 @@ void before_exit(JavaThread* thread, bool halt) {
   #define BEFORE_EXIT_DONE    2
   static jint volatile _before_exit_status = BEFORE_EXIT_NOT_RUN;
 
+  Events::log(thread, "Before exit entered");
+
   // Note: don't use a Mutex to guard the entire before_exit(), as
   // JVMTI post_thread_end_event and post_vm_death_event will run native code.
   // A CAS or OSMutex would work just fine but then we need to manipulate
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index e3bb67bfee5..b92e5a90c55 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -833,10 +833,10 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
 
 // Threads::destroy_vm() is normally called from jni_DestroyJavaVM() when
 // the program falls off the end of main(). Another VM exit path is through
-// vm_exit() when the program calls System.exit() to return a value or when
-// there is a serious error in VM. The two shutdown paths are not exactly
-// the same, but they share Shutdown.shutdown() at Java level and before_exit()
-// and VM_Exit op at VM level.
+// vm_exit(), when the program calls System.exit() to return a value, or when
+// there is a serious error in VM.
+// These two separate shutdown paths are not exactly the same, but they share
+// Shutdown.shutdown() at Java level and before_exit() and VM_Exit op at VM level.
 //
 // Shutdown sequence:
 //   + Shutdown native memory tracking if it is on

From 74b11ccf143b335c0e3f21e9fe5dc024742b1bc4 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 24 Apr 2024 13:34:35 +0000
Subject: [PATCH 181/486] 8331004: Serial: Remove unused GenClosure

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/serial/serialHeap.hpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index 4a88412ced6..12a4261feec 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -236,15 +236,6 @@ public:
 
   void print_heap_change(const PreGenGCValues& pre_gc_values) const;
 
-  // The functions below are helper functions that a subclass of
-  // "CollectedHeap" can use in the implementation of its virtual
-  // functions.
-
-  class GenClosure : public StackObj {
-   public:
-    virtual void do_generation(Generation* gen) = 0;
-  };
-
   // Return "true" if all generations have reached the
   // maximal committed limit that they can reach, without a garbage
   // collection.

From f1d0e715b67e2ca47b525069d8153abbb33f75b9 Mon Sep 17 00:00:00 2001
From: Gerard Ziemski <gziemski@openjdk.org>
Date: Wed, 24 Apr 2024 14:27:10 +0000
Subject: [PATCH 182/486] 8324577: [REDO] - [IMPROVE] OPEN_MAX is no longer the
 max limit on macOS >= 10.6 for RLIMIT_NOFILE

Reviewed-by: dcubed, dholmes
---
 src/hotspot/os/bsd/os_bsd.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 4b849c5bad4..ca4a77d2b4a 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -2140,16 +2140,25 @@ jint os::init_2(void) {
     if (status != 0) {
       log_info(os)("os::init_2 getrlimit failed: %s", os::strerror(errno));
     } else {
-      nbr_files.rlim_cur = nbr_files.rlim_max;
+      rlim_t rlim_original = nbr_files.rlim_cur;
 
-#ifdef __APPLE__
-      // Darwin returns RLIM_INFINITY for rlim_max, but fails with EINVAL if
-      // you attempt to use RLIM_INFINITY. As per setrlimit(2), OPEN_MAX must
-      // be used instead
-      nbr_files.rlim_cur = MIN(OPEN_MAX, nbr_files.rlim_cur);
-#endif
+      // On macOS according to setrlimit(2), OPEN_MAX must be used instead
+      // of RLIM_INFINITY, but testing on macOS >= 10.6, reveals that
+      // we can, in fact, use even RLIM_INFINITY, so try the max value
+      // that the system claims can be used first, same as other BSD OSes.
+      // However, some terminals (ksh) will internally use "int" type
+      // to store this value and since RLIM_INFINITY overflows an "int"
+      // we might end up with a negative value, so cap the system limit max
+      // at INT_MAX instead, just in case, for everyone.
+      nbr_files.rlim_cur = MIN(INT_MAX, nbr_files.rlim_max);
 
       status = setrlimit(RLIMIT_NOFILE, &nbr_files);
+      if (status != 0) {
+        // If that fails then try lowering the limit to either OPEN_MAX
+        // (which is safe) or the original limit, whichever was greater.
+        nbr_files.rlim_cur = MAX(OPEN_MAX, rlim_original);
+        status = setrlimit(RLIMIT_NOFILE, &nbr_files);
+      }
       if (status != 0) {
         log_info(os)("os::init_2 setrlimit failed: %s", os::strerror(errno));
       }

From 1d06170758bd76a0ea32e5bb7d4a017e829ae710 Mon Sep 17 00:00:00 2001
From: Joshua Cao <joshcao@amazon.com>
Date: Wed, 24 Apr 2024 17:06:45 +0000
Subject: [PATCH 183/486] 8300148: Consider using a StoreStore barrier instead
 of Release barrier on ctor exit

Reviewed-by: shade, kvn, dlong
---
 src/hotspot/share/opto/c2_globals.hpp         |   4 +
 src/hotspot/share/opto/escape.cpp             |   4 +-
 src/hotspot/share/opto/macro.cpp              |   5 +-
 src/hotspot/share/opto/memnode.cpp            |   2 +-
 src/hotspot/share/opto/parse1.cpp             |   3 +-
 src/hotspot/share/opto/stringopts.cpp         |   2 +-
 .../c2/irTests/ConstructorBarriers.java       | 311 ++++++++++++++++++
 .../compiler/lib/ir_framework/IRNode.java     |  15 +
 .../vm/compiler/ConstructorBarriers.java      | 269 +++++++++++++++
 9 files changed, 610 insertions(+), 5 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/irTests/ConstructorBarriers.java
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/ConstructorBarriers.java

diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 785b76849c1..baf2256005e 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -797,6 +797,10 @@
                                                                             \
   product(bool, InlineSecondarySupersTest, true, DIAGNOSTIC,                \
           "Inline the secondary supers hash lookup.")                       \
+                                                                            \
+  product(bool, UseStoreStoreForCtor, true, DIAGNOSTIC,                     \
+          "Use StoreStore barrier instead of Release barrier at the end "   \
+          "of constructors")                                                \
 
 // end of C2_FLAGS
 
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 2fb5e6b13b3..55d54d44545 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -199,7 +199,9 @@ bool ConnectionGraph::compute_escape() {
         // Collect all MemBarStoreStore nodes so that depending on the
         // escape status of the associated Allocate node some of them
         // may be eliminated.
-        storestore_worklist.append(n->as_MemBarStoreStore());
+        if (!UseStoreStoreForCtor || n->req() > MemBarNode::Precedent) {
+          storestore_worklist.append(n->as_MemBarStoreStore());
+        }
         break;
       case Op_MemBarRelease:
         if (n->req() > MemBarNode::Precedent) {
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 23928b554e4..d4ecadf0cfc 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -633,7 +633,10 @@ bool PhaseMacroExpand::can_eliminate_allocation(PhaseIterGVN* igvn, AllocateNode
         } else if (!reduce_merge_precheck) {
           safepoints->append_if_missing(sfpt);
         }
-      } else if (reduce_merge_precheck && (use->is_Phi() || use->is_EncodeP() || use->Opcode() == Op_MemBarRelease)) {
+      } else if (reduce_merge_precheck &&
+                 (use->is_Phi() || use->is_EncodeP() ||
+                  use->Opcode() == Op_MemBarRelease ||
+                  (UseStoreStoreForCtor && use->Opcode() == Op_MemBarStoreStore))) {
         // Nothing to do
       } else if (use->Opcode() != Op_CastP2X) { // CastP2X is used by card mark
         if (use->is_Phi()) {
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 8347321fe90..dea4640b9d1 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -4125,7 +4125,7 @@ Node *MemBarNode::Ideal(PhaseGVN *phase, bool can_reshape) {
           eliminate = true;
         }
       }
-    } else if (opc == Op_MemBarRelease) {
+    } else if (opc == Op_MemBarRelease || (UseStoreStoreForCtor && opc == Op_MemBarStoreStore)) {
       // Final field stores.
       Node* alloc = AllocateNode::Ideal_allocation(in(MemBarNode::Precedent));
       if ((alloc != nullptr) && alloc->is_Allocate() &&
diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp
index 5f868474422..80cb6721fce 100644
--- a/src/hotspot/share/opto/parse1.cpp
+++ b/src/hotspot/share/opto/parse1.cpp
@@ -1016,7 +1016,8 @@ void Parse::do_exits() {
        (wrote_final() ||
          (AlwaysSafeConstructors && wrote_fields()) ||
          (support_IRIW_for_not_multiple_copy_atomic_cpu && wrote_volatile()))) {
-    _exits.insert_mem_bar(Op_MemBarRelease, alloc_with_final());
+    _exits.insert_mem_bar(UseStoreStoreForCtor ? Op_MemBarStoreStore : Op_MemBarRelease,
+                          alloc_with_final());
 
     // If Memory barrier is created for final fields write
     // and allocation node does not escape the initialize method,
diff --git a/src/hotspot/share/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp
index fca532bd9a5..2e227be765c 100644
--- a/src/hotspot/share/opto/stringopts.cpp
+++ b/src/hotspot/share/opto/stringopts.cpp
@@ -2010,7 +2010,7 @@ void PhaseStringOpts::replace_string_concat(StringConcat* sc) {
     // of the initialization is committed to memory before any code publishes
     // a reference to the newly constructed object (see Parse::do_exits()).
     assert(AllocateNode::Ideal_allocation(result) != nullptr, "should be newly allocated");
-    kit.insert_mem_bar(Op_MemBarRelease, result);
+    kit.insert_mem_bar(UseStoreStoreForCtor ? Op_MemBarStoreStore : Op_MemBarRelease, result);
   } else {
     result = C->top();
   }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ConstructorBarriers.java b/test/hotspot/jtreg/compiler/c2/irTests/ConstructorBarriers.java
new file mode 100644
index 00000000000..7252427ffcd
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ConstructorBarriers.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8300148
+ * @summary Test barriers emitted in constructors
+ * @library /test/lib /
+ * @requires os.arch=="aarch64" | os.arch=="riscv64" | os.arch=="x86_64" | os.arch=="amd64"
+ * @run main compiler.c2.irTests.ConstructorBarriers
+ */
+public class ConstructorBarriers {
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    // Checks the barrier coalescing/optimization around field initializations.
+    // Uses long fields to avoid store merging.
+
+    public static class PlainPlain {
+        long f1;
+        long f2;
+        public PlainPlain(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class FinalPlain {
+        final long f1;
+        long f2;
+        public FinalPlain(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class PlainFinal {
+        long f1;
+        final long f2;
+        public PlainFinal(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class FinalFinal {
+        final long f1;
+        final long f2;
+        public FinalFinal(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class PlainVolatile {
+        long f1;
+        volatile long f2;
+        public PlainVolatile(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class VolatilePlain {
+        volatile long f1;
+        long f2;
+        public VolatilePlain(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class FinalVolatile {
+        final long f1;
+        volatile long f2;
+        public FinalVolatile(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class VolatileFinal {
+        volatile long f1;
+        final long f2;
+        public VolatileFinal(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class VolatileVolatile {
+        volatile long f1;
+        volatile long f2;
+        public VolatileVolatile(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    long l = 42;
+
+    @DontInline
+    public void consume(Object o) {}
+
+    @Test
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "1"})
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    public long escaping_plainPlain() {
+        PlainPlain c = new PlainPlain(l);
+        consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "1"})
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    public long escaping_plainFinal() {
+        PlainFinal c = new PlainFinal(l);
+        consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "1"})
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    public long escaping_finalPlain() {
+        FinalPlain c = new FinalPlain(l);
+        consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "1"})
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    public long escaping_finalFinal() {
+        FinalFinal c = new FinalFinal(l);
+        consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MEMBAR_RELEASE, "1"})
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "1"})
+    @IR(counts = {IRNode.MEMBAR_VOLATILE, "1"})
+    public long escaping_plainVolatile() {
+        PlainVolatile c = new PlainVolatile(l);
+        consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MEMBAR_RELEASE, "1"})
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "1"})
+    @IR(counts = {IRNode.MEMBAR_VOLATILE, "1"})
+    public long escaping_volatilePlain() {
+        VolatilePlain c = new VolatilePlain(l);
+        consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MEMBAR_RELEASE, "2"})
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "1"})
+    @IR(counts = {IRNode.MEMBAR_VOLATILE, "2"})
+    public long escaping_volatileVolatile() {
+        VolatileVolatile c = new VolatileVolatile(l);
+        consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MEMBAR_RELEASE, "1"})
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "1"})
+    @IR(counts = {IRNode.MEMBAR_VOLATILE, "1"})
+    public long escaping_finalVolatile() {
+        FinalVolatile c = new FinalVolatile(l);
+        consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MEMBAR_RELEASE, "1"})
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "1"})
+    @IR(counts = {IRNode.MEMBAR_VOLATILE, "1"})
+    public long escaping_volatileFinal() {
+        VolatileFinal c = new VolatileFinal(l);
+        consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MEMBAR)
+    public long non_escaping_plainPlain() {
+        PlainPlain c = new PlainPlain(l);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MEMBAR)
+    public long non_escaping_plainFinal() {
+        PlainFinal c = new PlainFinal(l);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MEMBAR)
+    public long non_escaping_finalPlain() {
+        FinalPlain c = new FinalPlain(l);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MEMBAR)
+    public long non_escaping_finalFinal() {
+        FinalFinal c = new FinalFinal(l);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_STORESTORE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    @IR(counts = {IRNode.MEMBAR_ACQUIRE, "1"})
+    public long non_escaping_plainVolatile() {
+        PlainVolatile c = new PlainVolatile(l);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_STORESTORE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    @IR(counts = {IRNode.MEMBAR_ACQUIRE, "1"})
+    public long non_escaping_volatilePlain() {
+        VolatilePlain c = new VolatilePlain(l);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_STORESTORE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    @IR(counts = {IRNode.MEMBAR_ACQUIRE, "2"})
+    public long non_escaping_volatileVolatile() {
+        VolatileVolatile c = new VolatileVolatile(l);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_STORESTORE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    @IR(counts = {IRNode.MEMBAR_ACQUIRE, "1"})
+    public long non_escaping_finalVolatile() {
+        FinalVolatile c = new FinalVolatile(l);
+        return c.f1 + c.f2;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_STORESTORE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    @IR(counts = {IRNode.MEMBAR_ACQUIRE, "1"})
+    public long non_escaping_volatileFinal() {
+        VolatileFinal c = new VolatileFinal(l);
+        return c.f1 + c.f2;
+    }
+
+    @Setup
+    Object[] stringBuilderSetup() {
+        return new Object[] { "foo", "bar", "baz" };
+    }
+
+    @Test
+    @Arguments(setup = "stringBuilderSetup")
+    @IR(failOn = IRNode.MEMBAR_RELEASE)
+    @IR(failOn = IRNode.MEMBAR_VOLATILE)
+    @IR(counts = {IRNode.MEMBAR_STORESTORE, "3"})
+    public String stringBuilder(String s1, String s2, String s3) {
+        return new StringBuilder().append(s1).append(s2).append(s3).toString();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 96698540019..449252b6bad 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -887,11 +887,26 @@ public class IRNode {
         beforeMatchingNameRegex(MEMBAR, "MemBar");
     }
 
+    public static final String MEMBAR_ACQUIRE = PREFIX + "MEMBAR_ACQUIRE" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MEMBAR_ACQUIRE, "MemBarAcquire");
+    }
+
+    public static final String MEMBAR_RELEASE = PREFIX + "MEMBAR_RELEASE" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MEMBAR_RELEASE, "MemBarRelease");
+    }
+
     public static final String MEMBAR_STORESTORE = PREFIX + "MEMBAR_STORESTORE" + POSTFIX;
     static {
         beforeMatchingNameRegex(MEMBAR_STORESTORE, "MemBarStoreStore");
     }
 
+    public static final String MEMBAR_VOLATILE = PREFIX + "MEMBAR_VOLATILE" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(MEMBAR_VOLATILE, "MemBarVolatile");
+    }
+
     public static final String MIN = PREFIX + "MIN" + POSTFIX;
     static {
         beforeMatchingNameRegex(MIN, "Min(I|L)");
diff --git a/test/micro/org/openjdk/bench/vm/compiler/ConstructorBarriers.java b/test/micro/org/openjdk/bench/vm/compiler/ConstructorBarriers.java
new file mode 100644
index 00000000000..7adbbe0e1a7
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/ConstructorBarriers.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.CompilerControl;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 3, jvmArgsAppend = {"-Xms512m", "-Xmx512m", "-XX:+AlwaysPreTouch", "-XX:+UseParallelGC"})
+public class ConstructorBarriers {
+
+    // Checks the barrier coalescing/optimization around field initializations.
+    // Uses long fields to avoid store merging.
+
+    public static class PlainPlain {
+        long f1;
+        long f2;
+        public PlainPlain(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class FinalPlain {
+        final long f1;
+        long f2;
+        public FinalPlain(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class PlainFinal {
+        long f1;
+        final long f2;
+        public PlainFinal(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class FinalFinal {
+        final long f1;
+        final long f2;
+        public FinalFinal(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class PlainVolatile {
+        long f1;
+        volatile long f2;
+        public PlainVolatile(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class VolatilePlain {
+        volatile long f1;
+        long f2;
+        public VolatilePlain(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class FinalVolatile {
+        final long f1;
+        volatile long f2;
+        public FinalVolatile(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class VolatileFinal {
+        volatile long f1;
+        final long f2;
+        public VolatileFinal(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    private static class VolatileVolatile {
+        volatile long f1;
+        volatile long f2;
+        public VolatileVolatile(long i) {
+            f1 = i;
+            f2 = i;
+        }
+    }
+
+    long l = 42;
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long escaping_plainPlain(Blackhole bh) {
+        PlainPlain c = new PlainPlain(l);
+        bh.consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long escaping_plainFinal(Blackhole bh) {
+        PlainFinal c = new PlainFinal(l);
+        bh.consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long escaping_finalPlain(Blackhole bh) {
+        FinalPlain c = new FinalPlain(l);
+        bh.consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long escaping_finalFinal(Blackhole bh) {
+        FinalFinal c = new FinalFinal(l);
+        bh.consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long escaping_plainVolatile(Blackhole bh) {
+        PlainVolatile c = new PlainVolatile(l);
+        bh.consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long escaping_volatilePlain(Blackhole bh) {
+        VolatilePlain c = new VolatilePlain(l);
+        bh.consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long escaping_volatileVolatile(Blackhole bh) {
+        VolatileVolatile c = new VolatileVolatile(l);
+        bh.consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long escaping_finalVolatile(Blackhole bh) {
+        FinalVolatile c = new FinalVolatile(l);
+        bh.consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long escaping_volatileFinal(Blackhole bh) {
+        VolatileFinal c = new VolatileFinal(l);
+        bh.consume(c);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long non_escaping_plainPlain() {
+        PlainPlain c = new PlainPlain(l);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long non_escaping_plainFinal() {
+        PlainFinal c = new PlainFinal(l);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long non_escaping_finalPlain() {
+        FinalPlain c = new FinalPlain(l);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long non_escaping_finalFinal() {
+        FinalFinal c = new FinalFinal(l);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long non_escaping_plainVolatile() {
+        PlainVolatile c = new PlainVolatile(l);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long non_escaping_volatilePlain() {
+        VolatilePlain c = new VolatilePlain(l);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long non_escaping_volatileVolatile() {
+        VolatileVolatile c = new VolatileVolatile(l);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long non_escaping_finalVolatile() {
+        FinalVolatile c = new FinalVolatile(l);
+        return c.f1 + c.f2;
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public long non_escaping_volatileFinal() {
+        VolatileFinal c = new VolatileFinal(l);
+        return c.f1 + c.f2;
+    }
+
+}
+

From 25871af36b1397bdc3715ab0edc589f0483ea0b1 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 24 Apr 2024 17:54:10 +0000
Subject: [PATCH 184/486] 8328896: Fontmetrics for large Fonts has zero width

Reviewed-by: tr, serb
---
 .../macosx/classes/sun/font/CStrike.java      |   2 +-
 .../native/libawt_lwawt/font/CGGlyphImages.m  |  18 ++-
 .../classes/sun/font/FileFontStrike.java      |  16 +++
 .../native/libfontmanager/freetypeScaler.c    |  14 +++
 .../awt/FontMetrics/ExtremeFontSizeTest.java  | 118 ++++++++++++++++++
 5 files changed, 166 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java

diff --git a/src/java.desktop/macosx/classes/sun/font/CStrike.java b/src/java.desktop/macosx/classes/sun/font/CStrike.java
index eb049c3d449..b0131711ca5 100644
--- a/src/java.desktop/macosx/classes/sun/font/CStrike.java
+++ b/src/java.desktop/macosx/classes/sun/font/CStrike.java
@@ -199,7 +199,7 @@ public final class CStrike extends PhysicalStrike {
         getGlyphImageBounds(glyphCode, pt.x, pt.y, floatRect);
 
         if (floatRect.width == 0 && floatRect.height == 0) {
-            result.setRect(0, 0, -1, -1);
+            result.setRect(0, 0, 0, 0);
             return;
         }
 
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
index f6e8fe6af55..ecdd6e4cdf8 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
@@ -1020,4 +1020,20 @@ CGGlyphImages_GetGlyphMetrics(const CTFontRef font,
             CTFontGetAdvancesForGlyphs(font, kCTFontDefaultOrientation, glyphs, advances, count);
         }
     }
-}
\ No newline at end of file
+    int MAX_SIZE = 1 << 30;
+    if (bboxes) {
+        for (int i = 0; i < count; i++) {
+           if (bboxes[i].origin.x > (double)MAX_SIZE) bboxes[i].origin.x = 0;
+           if (bboxes[i].origin.y > (double)MAX_SIZE) bboxes[i].origin.y = 0;
+           if (bboxes[i].size.width > (double)MAX_SIZE) bboxes[i].size.width = 0;
+           if (bboxes[i].size.height > (double)MAX_SIZE) bboxes[i].size.height = 0;
+        }
+    }
+    if (advances) {
+        for (int i = 0; i < count; i++) {
+           if (advances[i].width > (double)MAX_SIZE) advances[i].width = 0;
+           if (advances[i].height > (double)MAX_SIZE) advances[i].height = 0;
+        }
+    }
+}
+
diff --git a/src/java.desktop/share/classes/sun/font/FileFontStrike.java b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
index ea2a1608f2d..bf98b8ca578 100644
--- a/src/java.desktop/share/classes/sun/font/FileFontStrike.java
+++ b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
@@ -37,6 +37,7 @@ import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.concurrent.ConcurrentHashMap;
 import static sun.awt.SunHints.*;
+import sun.java2d.pipe.OutlineTextRenderer;
 
 
 public class FileFontStrike extends PhysicalStrike {
@@ -107,6 +108,7 @@ public class FileFontStrike extends PhysicalStrike {
     boolean useNatives;
     NativeStrike[] nativeStrikes;
 
+    static final int MAX_IMAGE_SIZE = OutlineTextRenderer.THRESHHOLD;
     /* Used only for communication to native layer */
     private int intPtSize;
 
@@ -697,6 +699,20 @@ public class FileFontStrike extends PhysicalStrike {
     void getGlyphImageBounds(int glyphCode, Point2D.Float pt,
                              Rectangle result) {
 
+        if (intPtSize > MAX_IMAGE_SIZE) {
+            Rectangle.Float obds = getGlyphOutlineBounds(glyphCode);
+            if (obds.isEmpty()) {
+                Rectangle bds = getGlyphOutline(glyphCode, pt.x, pt.y).getBounds();
+                result.setBounds(bds);
+            } else {
+                result.x = (int)Math.floor(pt.x + obds.getX() + 0.5f);
+                result.y = (int)Math.floor(pt.y + obds.getY() + 0.5f);
+                result.width = (int)Math.floor(obds.getWidth() + 0.5f);
+                result.height = (int)Math.floor(obds.getHeight() + 0.5f);
+            }
+            return;
+        }
+
         long ptr = getGlyphImagePtr(glyphCode);
         float topLeftX, topLeftY;
 
diff --git a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
index 21ac280f0fb..f9ebacad66b 100644
--- a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
+++ b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
@@ -504,6 +504,8 @@ static double euclidianDistance(double a, double b) {
     return sqrt(a*a+b*b);
 }
 
+#define TOO_LARGE(a, b) (abs((int)(a / b)) > 32766)
+
 JNIEXPORT jlong JNICALL
 Java_sun_font_FreetypeFontScaler_createScalerContextNative(
         JNIEnv *env, jobject scaler, jlong pScaler, jdoubleArray matrix,
@@ -515,6 +517,7 @@ Java_sun_font_FreetypeFontScaler_createScalerContextNative(
              (FTScalerInfo*) jlong_to_ptr(pScaler);
 
     if (context == NULL) {
+        free(context);
         invalidateJavaScaler(env, scaler, NULL);
         return (jlong) 0;
     }
@@ -524,7 +527,18 @@ Java_sun_font_FreetypeFontScaler_createScalerContextNative(
         //text can not be smaller than 1 point
         ptsz = 1.0;
     }
+    if (ptsz > 16384) {
+        ptsz = 16384;    // far enough from 32767
+        fm = TEXT_FM_ON; // avoids calculations which might overflow
+    }
     context->ptsz = (int)(ptsz * 64);
+    if (TOO_LARGE(dmat[0], ptsz) || TOO_LARGE(dmat[1], ptsz) ||
+        TOO_LARGE(dmat[2], ptsz) || TOO_LARGE(dmat[3], ptsz))
+    {
+        free(context);
+        return (jlong)0;
+    }
+
     context->transform.xx =  FloatToFTFixed((float)(dmat[0]/ptsz));
     context->transform.yx = -FloatToFTFixed((float)(dmat[1]/ptsz));
     context->transform.xy = -FloatToFTFixed((float)(dmat[2]/ptsz));
diff --git a/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java b/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java
new file mode 100644
index 00000000000..caa365a3f21
--- /dev/null
+++ b/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+
+/*
+ * @test
+ * @bug 8328896
+ * @summary test that using very large font sizes used don't break later uses
+ */
+
+public class ExtremeFontSizeTest {
+
+    static BufferedImage bi = new BufferedImage(1,1,1);
+    static Graphics2D g2d = bi.createGraphics();
+    static String testString = "M";
+    static Font font = new Font("SansSerif", Font.PLAIN, 12);
+    static int fontSize = 0;
+    static boolean failed = false;
+    static int[] fontSizes = { 10, 12, 1000, 2000, 20000, 100000, 8 };
+    static double[] scales = { 1.0, 900.0};
+    static boolean[] fms = { false, true };
+
+    public static void main(String[] args) {
+
+        /* run tests validating bounds etc are non-zero
+         * then run with extreme scales for which zero is allowed - but not required
+         * then run the first tests again to be sure they are still reasonable.
+        */
+        runTests();
+        test(5_000_000, 10_000, false, testString, false);
+        test(5_000_000, 10_000, true, testString, false);
+        test(0, 0.00000001, false, testString, false);
+        runTests();
+
+        if (failed) {
+            throw new RuntimeException("Test failed. Check stdout log.");
+        }
+    }
+
+    static void runTests() {
+        for (int fontSize : fontSizes) {
+            for (double scale : scales) {
+                for (boolean fm : fms) {
+                    test(fontSize, scale, fm, testString, true);
+                }
+            }
+        }
+    }
+
+    static void test(int size, double scale, boolean fm, String str, boolean checkAll) {
+
+        AffineTransform at = AffineTransform.getScaleInstance(scale, scale);
+        FontRenderContext frc = new FontRenderContext(at, false, fm);
+        font = font.deriveFont((float)size);
+        g2d.setTransform(at);
+        g2d.setFont(font);
+        FontMetrics metrics = g2d.getFontMetrics();
+        int height = metrics.getHeight();
+        double width = font.getStringBounds(str, frc).getWidth();
+
+        GlyphVector gv = font.createGlyphVector(frc, str.toCharArray());
+        Rectangle pixelBounds = gv.getPixelBounds(frc, 0, 0);
+        Rectangle2D visualBounds = gv.getVisualBounds();
+
+        System.out.println("Test parameters: size="+size+" scale="+scale+" fm="+fm+" str="+str);
+        System.out.println("font height="+metrics.getHeight());
+        System.out.println("string bounds width="+width);
+        System.out.println("GlyphVector Pixel Bounds="+ pixelBounds);
+        System.out.println("GlyphVector Visual Bounds="+ visualBounds);
+
+
+        if (height < 0 || width < 0 || pixelBounds.getWidth() < 0 || visualBounds.getWidth() < 0) {
+            failed = true;
+            System.out.println(" *** Unexpected negative size reported  *** ");
+         }
+         if (!checkAll) {
+            System.out.println();
+            return;
+        }
+
+        if (height == 0 || width == 0 || (pixelBounds.isEmpty()) || visualBounds.isEmpty() ) {
+            failed = true;
+            System.out.println("Pixel bounds empty="+pixelBounds.isEmpty());
+            System.out.println("Visual bounds empty="+visualBounds.isEmpty());
+            System.out.println(" *** RESULTS NOT AS EXPECTED  *** ");
+        }
+        System.out.println();
+    }
+}

From 7b2560b4904d80629d3f4f25c65d9b96eee9bdb6 Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Wed, 24 Apr 2024 18:56:47 +0000
Subject: [PATCH 185/486] 8330849: Add test to verify memory usage with
 recursive locking

Reviewed-by: lmesnik, shade
---
 .../locking/TestRecursiveMonitorChurn.java    | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 test/hotspot/jtreg/runtime/locking/TestRecursiveMonitorChurn.java

diff --git a/test/hotspot/jtreg/runtime/locking/TestRecursiveMonitorChurn.java b/test/hotspot/jtreg/runtime/locking/TestRecursiveMonitorChurn.java
new file mode 100644
index 00000000000..47cb5613171
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/locking/TestRecursiveMonitorChurn.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/*
+ * @test
+ * @summary Tests that recursive locking doesn't cause excessive native memory usage
+ * @library /test/lib
+ * @run driver TestRecursiveMonitorChurn
+ */
+public class TestRecursiveMonitorChurn {
+    static class Monitor {
+        public static volatile int i, j;
+        synchronized void doSomething() {
+            i++;
+            doSomethingElse();
+        }
+        synchronized void doSomethingElse() {
+            j++;
+        }
+    }
+
+    public static volatile Monitor monitor;
+    public static void main(String[] args) throws IOException {
+        if (args.length == 1 && args[0].equals("test")) {
+            // The actual test, in a forked JVM.
+            for (int i = 0; i < 100000; i++) {
+                monitor = new Monitor();
+                monitor.doSomething();
+            }
+            System.out.println("i + j = " + (Monitor.i + Monitor.j));
+        } else {
+            ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+                    "-XX:+UnlockDiagnosticVMOptions",
+                    "-Xmx100M", "-XX:AsyncDeflationInterval=0", "-XX:GuaranteedAsyncDeflationInterval=0",
+                    "-XX:NativeMemoryTracking=summary", "-XX:+PrintNMTStatistics",
+                    "TestRecursiveMonitorChurn",
+                    "test");
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            output.reportDiagnosticSummary();
+
+            output.shouldHaveExitValue(0);
+
+            // We want to see, in the final NMT printout, a committed object monitor size that is reasonably low.
+            // Like this:
+            // -           Object Monitors (reserved=208, committed=208)
+            //                             (malloc=208 #1) (at peak)
+            //
+            // Without recursive locking support, this would look more like this:
+            // -           Object Monitors (reserved=20800624, committed=20800624)
+            //                             (malloc=20800624 #100003) (at peak)
+
+            Pattern pat = Pattern.compile("- *Object Monitors.*reserved=(\\d+), committed=(\\d+).*");
+            for (String line : output.asLines()) {
+                Matcher m = pat.matcher(line);
+                if (m.matches()) {
+                    long reserved = Long.parseLong(m.group(1));
+                    long committed = Long.parseLong(m.group(2));
+                    System.out.println(">>>>> " + line + ": " + reserved + " - " + committed);
+                    if (committed > 1000) {
+                        throw new RuntimeException("Allocated too many monitors");
+                    }
+                    return;
+                }
+            }
+            throw new RuntimeException("Did not find expected NMT output");
+        }
+    }
+}

From ea3909acd117cab97c6c0b496f98f9a4a3a22be4 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Wed, 24 Apr 2024 19:06:46 +0000
Subject: [PATCH 186/486] 8331054: C2 MergeStores: assert failed: unexpected
 basic type after JDK-8318446 and JDK-8329555

Reviewed-by: thartmann, kvn
---
 src/hotspot/share/opto/memnode.cpp            | 17 ++++--
 .../jtreg/compiler/c2/TestMergeStores.java    | 58 ++++++++++++++++++-
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index dea4640b9d1..4eae4a49dbb 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -2972,8 +2972,12 @@ StoreNode* MergePrimitiveArrayStores::run() {
 
   // Only merge stores on arrays, and the stores must have the same size as the elements.
   const TypeAryPtr* aryptr_t = _store->adr_type()->isa_aryptr();
-  if (aryptr_t == nullptr ||
-      type2aelembytes(aryptr_t->elem()->array_element_basic_type()) != _store->memory_size()) {
+  if (aryptr_t == nullptr) {
+    return nullptr;
+  }
+  BasicType bt = aryptr_t->elem()->array_element_basic_type();
+  if (!is_java_primitive(bt) ||
+      type2aelembytes(bt) != _store->memory_size()) {
     return nullptr;
   }
 
@@ -3019,8 +3023,13 @@ bool MergePrimitiveArrayStores::is_compatible_store(const StoreNode* other_store
   // Check that the size of the stores, and the array elements are all the same.
   const TypeAryPtr* aryptr_t1 = _store->adr_type()->is_aryptr();
   const TypeAryPtr* aryptr_t2 = other_store->adr_type()->is_aryptr();
-  int size1 = type2aelembytes(aryptr_t1->elem()->array_element_basic_type());
-  int size2 = type2aelembytes(aryptr_t2->elem()->array_element_basic_type());
+  BasicType aryptr_bt1 = aryptr_t1->elem()->array_element_basic_type();
+  BasicType aryptr_bt2 = aryptr_t2->elem()->array_element_basic_type();
+  if (!is_java_primitive(aryptr_bt1) || !is_java_primitive(aryptr_bt2)) {
+    return false;
+  }
+  int size1 = type2aelembytes(aryptr_bt1);
+  int size2 = type2aelembytes(aryptr_bt2);
   if (size1 != size2 ||
       size1 != _store->memory_size() ||
       _store->memory_size() != other_store->memory_size()) {
diff --git a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
index 0af46b56a56..2f662a1ed26 100644
--- a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
+++ b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
@@ -33,7 +33,7 @@ import java.util.Random;
 
 /*
  * @test
- * @bug 8318446
+ * @bug 8318446 8331054
  * @summary Test merging of consecutive stores
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
@@ -42,7 +42,7 @@ import java.util.Random;
 
 /*
  * @test
- * @bug 8318446
+ * @bug 8318446 8331054
  * @summary Test merging of consecutive stores
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
@@ -183,6 +183,10 @@ public class TestMergeStores {
         //                                                                                   +-----+   +-------------------+
         // First use something in range, and after warmup randomize going outside the range.
         // Consequence: all RangeChecks stay in the final compilation.
+
+        testGroups.put("test600", new HashMap<String,TestFunction>());
+        testGroups.get("test600").put("test600R", (_,i) -> { return test600R(aB.clone(), aI.clone(), i); });
+        testGroups.get("test600").put("test600a", (_,i) -> { return test600a(aB.clone(), aI.clone(), i); });
     }
 
     @Warmup(100)
@@ -215,7 +219,8 @@ public class TestMergeStores {
                  "test400a",
                  "test500a",
                  "test501a",
-                 "test502a"})
+                 "test502a",
+                 "test600a"})
     public void runTests(RunInfo info) {
         // Repeat many times, so that we also have multiple iterations for post-warmup to potentially recompile
         int iters = info.isWarmUp() ? 1_000 : 50_000;
@@ -1244,4 +1249,51 @@ public class TestMergeStores {
         } catch (ArrayIndexOutOfBoundsException _) {}
         return new Object[]{ a, new int[]{ idx } };
     }
+
+    @DontCompile
+    static Object[] test600R(byte[] aB, int[] aI, int i) {
+        Object a = null;
+        long base = 0;
+        if (i % 2 == 0) {
+            a = aB;
+            base = UNSAFE.ARRAY_BYTE_BASE_OFFSET;
+        } else {
+            a = aI;
+            base = UNSAFE.ARRAY_INT_BASE_OFFSET;
+        }
+        UNSAFE.putByte(a, base + 0, (byte)0xbe);
+        UNSAFE.putByte(a, base + 1, (byte)0xba);
+        UNSAFE.putByte(a, base + 2, (byte)0xad);
+        UNSAFE.putByte(a, base + 3, (byte)0xba);
+        UNSAFE.putByte(a, base + 4, (byte)0xef);
+        UNSAFE.putByte(a, base + 5, (byte)0xbe);
+        UNSAFE.putByte(a, base + 6, (byte)0xad);
+        UNSAFE.putByte(a, base + 7, (byte)0xde);
+        return new Object[]{ aB, aI };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "bottom\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8"}) // note: bottom type
+    static Object[] test600a(byte[] aB, int[] aI, int i) {
+        Object a = null;
+        long base = 0;
+        if (i % 2 == 0) {
+            a = aB;
+            base = UNSAFE.ARRAY_BYTE_BASE_OFFSET;
+        } else {
+            a = aI;
+            base = UNSAFE.ARRAY_INT_BASE_OFFSET;
+        }
+        // array a is an aryptr, but its element type is unknown, i.e. bottom.
+        UNSAFE.putByte(a, base + 0, (byte)0xbe);
+        UNSAFE.putByte(a, base + 1, (byte)0xba);
+        UNSAFE.putByte(a, base + 2, (byte)0xad);
+        UNSAFE.putByte(a, base + 3, (byte)0xba);
+        UNSAFE.putByte(a, base + 4, (byte)0xef);
+        UNSAFE.putByte(a, base + 5, (byte)0xbe);
+        UNSAFE.putByte(a, base + 6, (byte)0xad);
+        UNSAFE.putByte(a, base + 7, (byte)0xde);
+        return new Object[]{ aB, aI };
+    }
+
 }

From 0014e0e6b90502ed284a57ce2d1ff48843cbc0fa Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 24 Apr 2024 19:56:20 +0000
Subject: [PATCH 187/486] 8331061: Serial: Missed BOT update in
 TenuredGeneration::expand_and_allocate

Reviewed-by: tschatzl, gli
---
 src/hotspot/share/gc/serial/tenuredGeneration.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index 35dc84773aa..e7cf16ea9af 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -480,7 +480,7 @@ HeapWord*
 TenuredGeneration::expand_and_allocate(size_t word_size, bool is_tlab) {
   assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
   expand(word_size*HeapWordSize, _min_heap_delta_bytes);
-  return _the_space->allocate(word_size);
+  return allocate(word_size, is_tlab);
 }
 
 size_t TenuredGeneration::contiguous_available() const {

From 8a8d9288980513db459f7d6b36554b65844951ca Mon Sep 17 00:00:00 2001
From: Martin Balao <mbalao@openjdk.org>
Date: Wed, 24 Apr 2024 20:23:25 +0000
Subject: [PATCH 188/486] 8330611: AES-CTR vector intrinsic may read out of
 bounds (x86_64, AVX-512)

Co-authored-by: Francisco Ferrari Bihurriet <fferrari@openjdk.org>
Co-authored-by: Martin Balao <mbalao@openjdk.org>
Reviewed-by: aph, sviswanathan
---
 src/hotspot/cpu/x86/assembler_x86.cpp          |  8 ++++++++
 src/hotspot/cpu/x86/assembler_x86.hpp          |  1 +
 .../cpu/x86/stubGenerator_x86_64_aes.cpp       | 18 +++++++++++++-----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index f5a6cb845ad..bcf4d5ea13b 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -6650,6 +6650,14 @@ void Assembler::xorw(Register dst, Register src) {
   emit_arith(0x33, 0xC0, dst, src);
 }
 
+void Assembler::xorw(Register dst, Address src) {
+  InstructionMark im(this);
+  emit_int8(0x66);
+  prefix(src, dst);
+  emit_int8(0x33);
+  emit_operand(dst, src, 0);
+}
+
 // AVX 3-operands scalar float-point arithmetic instructions
 
 void Assembler::vaddsd(XMMRegister dst, XMMRegister nds, Address src) {
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index a8747a4308a..097bc9de62a 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -2262,6 +2262,7 @@ private:
   void xorb(Address dst, Register src);
   void xorb(Register dst, Address src);
   void xorw(Register dst, Register src);
+  void xorw(Register dst, Address src);
 
   void xorq(Register dst, Address src);
   void xorq(Address dst, int32_t imm32);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
index 1a256d0913d..9744169498c 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp
@@ -2181,6 +2181,7 @@ void StubGenerator::aesctr_encrypt(Register src_addr, Register dest_addr, Regist
 
   const Register rounds = rax;
   const Register pos = r12;
+  const Register tail = r15;
 
   Label PRELOOP_START, EXIT_PRELOOP, REMAINDER, REMAINDER_16, LOOP, END, EXIT, END_LOOP,
   AES192, AES256, AES192_REMAINDER16, REMAINDER16_END_LOOP, AES256_REMAINDER16,
@@ -2615,29 +2616,36 @@ void StubGenerator::aesctr_encrypt(Register src_addr, Register dest_addr, Regist
   // Save encrypted counter value in xmm0 for next invocation, before XOR operation
   __ movdqu(Address(saved_encCounter_start, 0), xmm0);
   // XOR encryted block cipher in xmm0 with PT to produce CT
-  __ evpxorq(xmm0, xmm0, Address(src_addr, pos, Address::times_1, 0), Assembler::AVX_128bit);
   // extract up to 15 bytes of CT from xmm0 as specified by length register
   __ testptr(len_reg, 8);
   __ jcc(Assembler::zero, EXTRACT_TAIL_4BYTES);
-  __ pextrq(Address(dest_addr, pos), xmm0, 0);
+  __ pextrq(tail, xmm0, 0);
+  __ xorq(tail, Address(src_addr, pos, Address::times_1, 0));
+  __ movq(Address(dest_addr, pos), tail);
   __ psrldq(xmm0, 8);
   __ addl(pos, 8);
   __ bind(EXTRACT_TAIL_4BYTES);
   __ testptr(len_reg, 4);
   __ jcc(Assembler::zero, EXTRACT_TAIL_2BYTES);
-  __ pextrd(Address(dest_addr, pos), xmm0, 0);
+  __ pextrd(tail, xmm0, 0);
+  __ xorl(tail, Address(src_addr, pos, Address::times_1, 0));
+  __ movl(Address(dest_addr, pos), tail);
   __ psrldq(xmm0, 4);
   __ addq(pos, 4);
   __ bind(EXTRACT_TAIL_2BYTES);
   __ testptr(len_reg, 2);
   __ jcc(Assembler::zero, EXTRACT_TAIL_1BYTE);
-  __ pextrw(Address(dest_addr, pos), xmm0, 0);
+  __ pextrw(tail, xmm0, 0);
+  __ xorw(tail, Address(src_addr, pos, Address::times_1, 0));
+  __ movw(Address(dest_addr, pos), tail);
   __ psrldq(xmm0, 2);
   __ addl(pos, 2);
   __ bind(EXTRACT_TAIL_1BYTE);
   __ testptr(len_reg, 1);
   __ jcc(Assembler::zero, END);
-  __ pextrb(Address(dest_addr, pos), xmm0, 0);
+  __ pextrb(tail, xmm0, 0);
+  __ xorb(tail, Address(src_addr, pos, Address::times_1, 0));
+  __ movb(Address(dest_addr, pos), tail);
   __ addl(pos, 1);
 
   __ bind(END);

From a44ac026c599df629305588e09fbbcff9be2a5c0 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Wed, 24 Apr 2024 20:42:50 +0000
Subject: [PATCH 189/486] 8330853: Add missing checks for
 ConnectionGraph::can_reduce_cmp() call

Reviewed-by: iveresov, dlong, cslucas
---
 src/hotspot/share/opto/escape.cpp | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 55d54d44545..c82eaad50e1 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -492,11 +492,11 @@ bool ConnectionGraph::can_reduce_phi_check_inputs(PhiNode* ophi) const {
 // I require the 'other' input to be a constant so that I can move the Cmp
 // around safely.
 bool ConnectionGraph::can_reduce_cmp(Node* n, Node* cmp) const {
+  assert(cmp->Opcode() == Op_CmpP || cmp->Opcode() == Op_CmpN, "not expected node: %s", cmp->Name());
   Node* left = cmp->in(1);
   Node* right = cmp->in(2);
 
-  return (cmp->Opcode() == Op_CmpP || cmp->Opcode() == Op_CmpN) &&
-         (left == n || right == n) &&
+  return (left == n || right == n) &&
          (left->is_Con() || right->is_Con()) &&
          cmp->outcnt() == 1;
 }
@@ -559,8 +559,12 @@ bool ConnectionGraph::can_reduce_check_users(Node* n, uint nesting) const {
     } else if (use->is_CastPP()) {
       const Type* cast_t = _igvn->type(use);
       if (cast_t == nullptr || cast_t->make_ptr()->isa_instptr() == nullptr) {
-        NOT_PRODUCT(use->dump();)
-        NOT_PRODUCT(if (TraceReduceAllocationMerges) tty->print_cr("Can NOT reduce Phi %d on invocation %d. CastPP is not to an instance.", n->_idx, _invocation);)
+#ifndef PRODUCT
+        if (TraceReduceAllocationMerges) {
+          tty->print_cr("Can NOT reduce Phi %d on invocation %d. CastPP is not to an instance.", n->_idx, _invocation);
+          use->dump();
+        }
+#endif
         return false;
       }
 
@@ -570,11 +574,18 @@ bool ConnectionGraph::can_reduce_check_users(Node* n, uint nesting) const {
         // CmpP/N used by the If controlling the cast.
         if (use->in(0)->is_IfTrue() || use->in(0)->is_IfFalse()) {
           Node* iff = use->in(0)->in(0);
-          Node* iff_cmp = iff->in(1)->in(1); // if->bool->cmp
-          if (!can_reduce_cmp(n, iff_cmp)) {
-            NOT_PRODUCT(if (TraceReduceAllocationMerges) tty->print_cr("Can NOT reduce Phi %d on invocation %d. CastPP %d doesn't have simple control.", n->_idx, _invocation, use->_idx);)
-            NOT_PRODUCT(n->dump(5);)
-            return false;
+          if (iff->Opcode() == Op_If && iff->in(1)->is_Bool() && iff->in(1)->in(1)->is_Cmp()) {
+            Node* iff_cmp = iff->in(1)->in(1);
+            int opc = iff_cmp->Opcode();
+            if ((opc == Op_CmpP || opc == Op_CmpN) && !can_reduce_cmp(n, iff_cmp)) {
+#ifndef PRODUCT
+              if (TraceReduceAllocationMerges) {
+                tty->print_cr("Can NOT reduce Phi %d on invocation %d. CastPP %d doesn't have simple control.", n->_idx, _invocation, use->_idx);
+                n->dump(5);
+              }
+#endif
+              return false;
+            }
           }
         }
       }

From e6118ce784342e1f1996f1569cf636a6b435145d Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Wed, 24 Apr 2024 20:45:23 +0000
Subject: [PATCH 190/486] 8331018: Clean up non-standard use of /** comments in
 `jdk.jshell`

Reviewed-by: iris, darcy, jlahoda
---
 src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java | 2 +-
 src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java  | 2 +-
 src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java      | 2 +-
 .../share/classes/jdk/jshell/MaskCommentsAndModifiers.java      | 2 +-
 src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java      | 2 +-
 src/jdk.jshell/share/classes/jdk/jshell/Snippet.java            | 2 +-
 src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java
index 1e6cc0f4534..df21f178989 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java
@@ -65,7 +65,7 @@ public abstract class DeclarationSnippet extends PersistentSnippet {
         this.bodyReferences = bodyReferences;
     }
 
-    /**** internal access ****/
+    //*** internal access ****
 
     /**
      * @return the corralled guts
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java
index 887e8dc9a34..064bcbaf556 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java
@@ -65,7 +65,7 @@ public class ExpressionSnippet extends Snippet {
         return key().typeName();
     }
 
-    /**** internal access ****/
+    //**** internal access ****
 
     @Override
     ExpressionKey key() {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java
index ea30984b640..188b34ab183 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java
@@ -96,7 +96,7 @@ public class ImportSnippet extends PersistentSnippet {
         return isStatic;
     }
 
-    /**** internal access ****/
+    //**** internal access ****
 
     @Override
     ImportKey key() {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java b/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java
index 8d5198758fb..5a6c1688dc0 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java
@@ -107,7 +107,7 @@ class MaskCommentsAndModifiers {
         return openToken;
     }
 
-    /****** private implementation methods ******/
+    //****** private implementation methods ******
 
     /**
      * Read the next character
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java
index c231fbe672d..3642ed3fc06 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java
@@ -85,7 +85,7 @@ public class MethodSnippet extends DeclarationSnippet {
         return sb.toString();
     }
 
-    /**** internal access ****/
+    //**** internal access ****
 
     @Override
     MethodKey key() {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
index 70e556e40f2..2b4d817a588 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
@@ -593,7 +593,7 @@ public abstract class Snippet {
         setSequenceNumber(0);
     }
 
-    /**** public access ****/
+    //**** public access ****
 
     /**
      * The unique identifier for the snippet. No two active snippets will have
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java b/src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java
index 0e71784ec08..fb6378b24f9 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java
@@ -50,7 +50,7 @@ public class TypeDeclSnippet extends DeclarationSnippet {
                 declareReferences, bodyReferences, syntheticDiags);
     }
 
-    /**** internal access ****/
+    //**** internal access ****
 
     @Override
     TypeDeclKey key() {

From 21480a7ae8dce67cf3a844d8caafb0b96c37ac0e Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Thu, 25 Apr 2024 04:31:55 +0000
Subject: [PATCH 191/486] 8322135: Printing JTable in Windows L&F throws
 InternalError: HTHEME is null

Reviewed-by: abhiscxk, honkar, aivanov
---
 .../classes/sun/awt/windows/ThemeReader.java  | 19 ++++++++++++++-----
 .../swing/JTable/JTableScrollPrintTest.java   |  2 +-
 .../javax/swing/JTable/PrintAllPagesTest.java |  4 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java b/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java
index 61972bf4ed5..7c0d8c1ea4d 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, 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
@@ -100,21 +100,30 @@ public final class ThemeReader {
         return xpStyleEnabled;
     }
 
-    private static Long openThemeImpl(String widget, int dpi) {
-       Long theme;
+    private static long openThemeImpl(String widget, int dpi) {
+       long theme;
        int i = widget.indexOf("::");
        if (i > 0) {
            // We're using the syntax "subAppName::controlName" here, as used by msstyles.
            // See documentation for SetWindowTheme on MSDN.
            setWindowTheme(widget.substring(0, i));
-           theme = openTheme(widget.substring(i + 2), dpi);
+           theme = getOpenThemeValue(widget.substring(i + 2), dpi);
            setWindowTheme(null);
        } else {
-           theme = openTheme(widget, dpi);
+           theme = getOpenThemeValue(widget, dpi);
        }
        return theme;
     }
 
+    private static long getOpenThemeValue(String widget, int dpi) {
+        long theme;
+        theme = openTheme(widget, dpi);
+        if (theme == 0) {
+            theme = openTheme(widget, defaultDPI);
+        }
+        return theme;
+    }
+
     // this should be called only with writeLock held
     private static Long getThemeImpl(String widget, int dpi) {
        return dpiAwareWidgetToTheme.computeIfAbsent(dpi, key -> new HashMap<>())
diff --git a/test/jdk/javax/swing/JTable/JTableScrollPrintTest.java b/test/jdk/javax/swing/JTable/JTableScrollPrintTest.java
index 5621b359346..a2bd03081a9 100644
--- a/test/jdk/javax/swing/JTable/JTableScrollPrintTest.java
+++ b/test/jdk/javax/swing/JTable/JTableScrollPrintTest.java
@@ -41,7 +41,7 @@ import javax.swing.table.DefaultTableModel;
 /*
  * @test
  * @key headful
- * @bug 8210807 8322140
+ * @bug 8210807 8322140 8322135
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame
  * @summary Test to check if JTable can be printed when JScrollPane added to it.
diff --git a/test/jdk/javax/swing/JTable/PrintAllPagesTest.java b/test/jdk/javax/swing/JTable/PrintAllPagesTest.java
index 263415f641b..284fbe57097 100644
--- a/test/jdk/javax/swing/JTable/PrintAllPagesTest.java
+++ b/test/jdk/javax/swing/JTable/PrintAllPagesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 8257810
+ * @bug 8257810 8322135
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame
  * @summary  Verifies if all pages are printed if scrollRectToVisible is set.

From d43654e5733a4ad535e95d908de528ef29285e92 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Thu, 25 Apr 2024 06:49:45 +0000
Subject: [PATCH 192/486] 8331030: langtools/tools/javac/tree tests fail with
 SOE with fastdebug and -Xcomp

Reviewed-by: jjg, vromero
---
 .../patterns/SOEDeeplyNestedBlocksTest.java   | 1183 +----------------
 1 file changed, 28 insertions(+), 1155 deletions(-)

diff --git a/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java b/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
index e521f062748..4e738cce028 100644
--- a/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
+++ b/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
@@ -23,1165 +23,38 @@
 
 /**
  * @test
- * @bug 8322992
+ * @bug 8322992 8331030
  * @summary Javac fails with StackOverflowError when compiling deeply nested synchronized blocks
- * @compile SOEDeeplyNestedBlocksTest.java
+ * @run main SOEDeeplyNestedBlocksTest
  */
 
+import java.net.*;
+import java.util.*;
+import javax.tools.*;
+
 public class SOEDeeplyNestedBlocksTest {
 
-    public static void test() {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        synchronized (SOEDeeplyNestedBlocksTest.class) {
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
-        }
+    static final int NESTING_DEPTH = 1000;
+
+    public static void main(String... args) {
+        var lines = new ArrayList<String>();
+        lines.add("class Test {");
+        lines.add("  static { ");
+        for (int i = 0; i < NESTING_DEPTH; i++) lines.add("    synchronized (Test.class) {");
+        for (int i = 0; i < NESTING_DEPTH; i++) lines.add("    }");
+        lines.add("  }");
+        lines.add("}");
+
+        var source = SimpleJavaFileObject.forSource(URI.create("mem://Test.java"), String.join("\n", lines));
+        var compiler = ToolProvider.getSystemJavaCompiler();
+        var task = compiler.getTask(null, null, noErrors, null, null, List.of(source));
+        task.call();
     }
+
+    static DiagnosticListener<? super JavaFileObject> noErrors = d -> {
+        System.out.println(d);
+        if (d.getKind() == Diagnostic.Kind.ERROR) {
+            throw new AssertionError(d.getMessage(null));
+        }
+    };
 }

From e818ab60a0c1dac277b8b15301cdfb7d439ed26c Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Thu, 25 Apr 2024 06:53:36 +0000
Subject: [PATCH 193/486] 8330815: Use pattern matching for instanceof in
 KeepAliveCache

Reviewed-by: jpai, djelinski
---
 .../share/classes/sun/net/www/http/KeepAliveCache.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java b/src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java
index 6c601793c49..153de588938 100644
--- a/src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java
+++ b/src/java.base/share/classes/sun/net/www/http/KeepAliveCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
@@ -389,9 +389,9 @@ class KeepAliveKey {
      */
     @Override
     public boolean equals(Object obj) {
-        if ((obj instanceof KeepAliveKey) == false)
+        if (!(obj instanceof KeepAliveKey kae))
             return false;
-        KeepAliveKey kae = (KeepAliveKey)obj;
+
         return host.equals(kae.host)
             && (port == kae.port)
             && protocol.equals(kae.protocol)
@@ -405,7 +405,7 @@ class KeepAliveKey {
     @Override
     public int hashCode() {
         String str = protocol+host+port;
-        return this.obj == null? str.hashCode() :
+        return this.obj == null ? str.hashCode() :
             str.hashCode() + this.obj.hashCode();
     }
 }

From ccc0d0f7b194a9941e2cadba1c389aa0834c52e4 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 25 Apr 2024 07:04:39 +0000
Subject: [PATCH 194/486] 8325373: Improve StackCounter error reporting for bad
 switch cases

Reviewed-by: psandoz
---
 .../internal/classfile/impl/StackCounter.java | 30 ++++++++----
 .../classfile/impl/StackMapGenerator.java     | 33 +------------
 .../jdk/internal/classfile/impl/Util.java     | 46 ++++++++++++++++++-
 3 files changed, 67 insertions(+), 42 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
index 688af262c70..0b52d4e1ea5 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
@@ -37,6 +37,8 @@ import java.util.List;
 import java.util.Queue;
 
 import static java.lang.classfile.ClassFile.*;
+import java.lang.constant.ClassDesc;
+import java.util.stream.Collectors;
 
 public final class StackCounter {
 
@@ -45,6 +47,7 @@ public final class StackCounter {
     static StackCounter of(DirectCodeBuilder dcb, BufWriterImpl buf) {
         return new StackCounter(
                 dcb,
+                buf.thisClass().asSymbol(),
                 dcb.methodInfo.methodName().stringValue(),
                 dcb.methodInfo.methodTypeSymbol(),
                 (dcb.methodInfo.methodFlags() & ACC_STATIC) != 0,
@@ -56,8 +59,11 @@ public final class StackCounter {
     private int stack, maxStack, maxLocals, rets;
 
     private final RawBytecodeHelper bcs;
+    private final ClassDesc thisClass;
     private final String methodName;
     private final MethodTypeDesc methodDesc;
+    private final boolean isStatic;
+    private final ByteBuffer bytecode;
     private final SplitConstantPool cp;
     private final Queue<Target> targets;
     private final BitSet visited;
@@ -91,14 +97,18 @@ public final class StackCounter {
     }
 
     public StackCounter(LabelContext labelContext,
+                     ClassDesc thisClass,
                      String methodName,
                      MethodTypeDesc methodDesc,
                      boolean isStatic,
                      ByteBuffer bytecode,
                      SplitConstantPool cp,
                      List<AbstractPseudoInstruction.ExceptionCatchImpl> handlers) {
+        this.thisClass = thisClass;
         this.methodName = methodName;
         this.methodDesc = methodDesc;
+        this.isStatic = isStatic;
+        this.bytecode = bytecode;
         this.cp = cp;
         targets = new ArrayDeque<>();
         maxStack = stack = rets = 0;
@@ -247,24 +257,24 @@ public final class StackCounter {
                             int low = bcs.getInt(alignedBci + 4);
                             int high = bcs.getInt(alignedBci + 2 * 4);
                             if (low > high) {
-                                error("low must be less than or equal to high in tableswitch");
+                                throw error("low must be less than or equal to high in tableswitch");
                             }
                             keys = high - low + 1;
                             if (keys < 0) {
-                                error("too many keys in tableswitch");
+                                throw error("too many keys in tableswitch");
                             }
                             delta = 1;
                         } else {
                             keys = bcs.getInt(alignedBci + 4);
                             if (keys < 0) {
-                                error("number of keys in lookupswitch less than 0");
+                                throw error("number of keys in lookupswitch less than 0");
                             }
                             delta = 2;
                             for (int i = 0; i < (keys - 1); i++) {
                                 int this_key = bcs.getInt(alignedBci + (2 + 2 * i) * 4);
                                 int next_key = bcs.getInt(alignedBci + (2 + 2 * i + 2) * 4);
                                 if (this_key >= next_key) {
-                                    error("Bad lookupswitch instruction");
+                                    throw error("Bad lookupswitch instruction");
                                 }
                             }
                         }
@@ -326,7 +336,7 @@ public final class StackCounter {
                         next();
                     }
                     default ->
-                        error(String.format("Bad instruction: %02x", opcode));
+                        throw error(String.format("Bad instruction: %02x", opcode));
                 }
             }
         }
@@ -360,15 +370,17 @@ public final class StackCounter {
             case TAG_CONSTANTDYNAMIC ->
                 addStackSlot(((ConstantDynamicEntry)cp.entryByIndex(index)).typeKind().slotSize());
             default ->
-                error("CP entry #%d %s is not loadable constant".formatted(index, cp.entryByIndex(index).tag()));
+                throw error("CP entry #%d %s is not loadable constant".formatted(index, cp.entryByIndex(index).tag()));
         }
     }
 
-    private void error(String msg) {
-        throw new IllegalArgumentException("%s at bytecode offset %d of method %s(%s)".formatted(
+    private IllegalArgumentException error(String msg) {
+        var sb = new StringBuilder("%s at bytecode offset %d of method %s(%s)".formatted(
                 msg,
                 bcs.bci,
                 methodName,
-                methodDesc.displayDescriptor()));
+                methodDesc.parameterList().stream().map(ClassDesc::displayName).collect(Collectors.joining(","))));
+        Util.dumpMethod(cp, thisClass, methodName, methodDesc, isStatic ? ACC_STATIC : 0, bytecode, sb::append);
+        return new IllegalArgumentException(sb.toString());
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
index 9d4f898e5cd..81e6f341a13 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
@@ -48,8 +48,6 @@ import java.lang.classfile.BufWriter;
 import java.lang.classfile.Label;
 import java.lang.classfile.attribute.StackMapTableAttribute;
 import java.lang.classfile.Attributes;
-import java.lang.classfile.components.ClassPrinter;
-import java.lang.classfile.attribute.CodeAttribute;
 
 /**
  * StackMapGenerator is responsible for stack map frames generation.
@@ -836,36 +834,7 @@ public final class StackMapGenerator {
                 offset,
                 methodName,
                 methodDesc.parameterList().stream().map(ClassDesc::displayName).collect(Collectors.joining(","))));
-        //try to attach debug info about corrupted bytecode to the message
-        try {
-            var cc = ClassFile.of();
-            var clm = cc.parse(cc.build(cp.classEntry(thisType.sym()), cp, clb ->
-                    clb.withMethod(methodName, methodDesc, isStatic ? ACC_STATIC : 0, mb ->
-                            ((DirectMethodBuilder)mb).writeAttribute(new UnboundAttribute.AdHocAttribute<CodeAttribute>(Attributes.CODE) {
-                                @Override
-                                public void writeBody(BufWriter b) {
-                                    b.writeU2(-1);//max stack
-                                    b.writeU2(-1);//max locals
-                                    b.writeInt(bytecode.limit());
-                                    b.writeBytes(bytecode.array(), 0, bytecode.limit());
-                                    b.writeU2(0);//exception handlers
-                                    b.writeU2(0);//attributes
-                                }
-                    }))));
-            ClassPrinter.toYaml(clm.methods().get(0).code().get(), ClassPrinter.Verbosity.TRACE_ALL, sb::append);
-        } catch (Error | Exception suppresed) {
-            //fallback to bytecode hex dump
-            bytecode.rewind();
-            while (bytecode.position() < bytecode.limit()) {
-                sb.append("%n%04x:".formatted(bytecode.position()));
-                for (int i = 0; i < 16 && bytecode.position() < bytecode.limit(); i++) {
-                    sb.append(" %02x".formatted(bytecode.get()));
-                }
-            }
-            var err = new IllegalArgumentException(sb.toString());
-            err.addSuppressed(suppresed);
-            return err;
-        }
+        Util.dumpMethod(cp, thisType.sym(), methodName, methodDesc, isStatic ? ACC_STATIC : 0, bytecode, sb::append);
         return new IllegalArgumentException(sb.toString());
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
index 11e3328e775..7bff7e6f06d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -33,6 +33,8 @@ import java.util.function.Function;
 
 import java.lang.classfile.Attribute;
 import java.lang.classfile.AttributeMapper;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.Opcode;
 import java.lang.classfile.constantpool.ClassEntry;
@@ -43,6 +45,11 @@ import java.lang.reflect.AccessFlag;
 import jdk.internal.access.SharedSecrets;
 
 import static java.lang.classfile.ClassFile.ACC_STATIC;
+import java.lang.classfile.attribute.CodeAttribute;
+import java.lang.classfile.components.ClassPrinter;
+import java.lang.classfile.constantpool.ConstantPoolBuilder;
+import java.nio.ByteBuffer;
+import java.util.function.Consumer;
 
 /**
  * Helper to create and manipulate type descriptors, where type descriptors are
@@ -193,4 +200,41 @@ public class Util {
         char ch = desc.descriptorString().charAt(0);
         return ch == 'D' || ch == 'J';
     }
+
+    public static void dumpMethod(SplitConstantPool cp,
+                                  ClassDesc cls,
+                                  String methodName,
+                                  MethodTypeDesc methodDesc,
+                                  int acc,
+                                  ByteBuffer bytecode,
+                                  Consumer<String> dump) {
+
+        // try to dump debug info about corrupted bytecode
+        try {
+            var cc = ClassFile.of();
+            var clm = cc.parse(cc.build(cp.classEntry(cls), cp, clb ->
+                    clb.withMethod(methodName, methodDesc, acc, mb ->
+                            ((DirectMethodBuilder)mb).writeAttribute(new UnboundAttribute.AdHocAttribute<CodeAttribute>(Attributes.CODE) {
+                                @Override
+                                public void writeBody(BufWriter b) {
+                                    b.writeU2(-1);//max stack
+                                    b.writeU2(-1);//max locals
+                                    b.writeInt(bytecode.limit());
+                                    b.writeBytes(bytecode.array(), 0, bytecode.limit());
+                                    b.writeU2(0);//exception handlers
+                                    b.writeU2(0);//attributes
+                                }
+                    }))));
+            ClassPrinter.toYaml(clm.methods().get(0).code().get(), ClassPrinter.Verbosity.TRACE_ALL, dump);
+        } catch (Error | Exception _) {
+            // fallback to bytecode hex dump
+            bytecode.rewind();
+            while (bytecode.position() < bytecode.limit()) {
+                dump.accept("%n%04x:".formatted(bytecode.position()));
+                for (int i = 0; i < 16 && bytecode.position() < bytecode.limit(); i++) {
+                    dump.accept(" %02x".formatted(bytecode.get()));
+                }
+            }
+        }
+    }
 }

From d32f10921985031505718ec29fb97a36f9ba24c0 Mon Sep 17 00:00:00 2001
From: Joshua Cao <joshcao@amazon.com>
Date: Thu, 25 Apr 2024 07:11:12 +0000
Subject: [PATCH 195/486] 8329797: Shenandoah: Default case invoked for: "MaxL"
 (bad AD file)

Reviewed-by: shade, thartmann
---
 src/hotspot/share/opto/compile.cpp            |  2 +
 src/hotspot/share/opto/compile.hpp            |  4 ++
 src/hotspot/share/opto/macro.cpp              |  2 +
 src/hotspot/share/opto/movenode.cpp           |  5 +--
 .../compiler/c2/irTests/TestIfMinMax.java     | 40 ++++++++++++++++++-
 5 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 30663673977..d5ed95187a8 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -624,6 +624,7 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci,
                   _stub_entry_point(nullptr),
                   _max_node_limit(MaxNodeLimit),
                   _post_loop_opts_phase(false),
+                  _allow_macro_nodes(true),
                   _inlining_progress(false),
                   _inlining_incrementally(false),
                   _do_cleanup(false),
@@ -915,6 +916,7 @@ Compile::Compile( ciEnv* ci_env,
     _stub_entry_point(nullptr),
     _max_node_limit(MaxNodeLimit),
     _post_loop_opts_phase(false),
+    _allow_macro_nodes(true),
     _inlining_progress(false),
     _inlining_incrementally(false),
     _has_reserved_stack_access(false),
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 8f49c161672..df93b388daa 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -318,6 +318,7 @@ class Compile : public Phase {
   uintx                 _max_node_limit;        // Max unique node count during a single compilation.
 
   bool                  _post_loop_opts_phase;  // Loop opts are finished.
+  bool                  _allow_macro_nodes;     // True if we allow creation of macro nodes.
 
   int                   _major_progress;        // Count of something big happening
   bool                  _inlining_progress;     // progress doing incremental inlining?
@@ -787,6 +788,9 @@ private:
   void   set_post_loop_opts_phase() { _post_loop_opts_phase = true;  }
   void reset_post_loop_opts_phase() { _post_loop_opts_phase = false; }
 
+  bool       allow_macro_nodes() { return _allow_macro_nodes;  }
+  void reset_allow_macro_nodes() { _allow_macro_nodes = false;  }
+
   void record_for_post_loop_opts_igvn(Node* n);
   void remove_from_post_loop_opts_igvn(Node* n);
   void process_for_post_loop_opts_igvn(PhaseIterGVN& igvn);
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index d4ecadf0cfc..1f6473616dc 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -2448,6 +2448,8 @@ void PhaseMacroExpand::eliminate_macro_nodes() {
 //------------------------------expand_macro_nodes----------------------
 //  Returns true if a failure occurred.
 bool PhaseMacroExpand::expand_macro_nodes() {
+  // Do not allow new macro nodes once we started to expand
+  C->reset_allow_macro_nodes();
   if (StressMacroExpansion) {
     C->shuffle_macro_nodes();
   }
diff --git a/src/hotspot/share/opto/movenode.cpp b/src/hotspot/share/opto/movenode.cpp
index 58feb3ec9ce..eb0a914b994 100644
--- a/src/hotspot/share/opto/movenode.cpp
+++ b/src/hotspot/share/opto/movenode.cpp
@@ -200,9 +200,8 @@ CMoveNode *CMoveNode::make(Node *c, Node *bol, Node *left, Node *right, const Ty
 
 // Try to identify min/max patterns in CMoves
 Node* CMoveNode::Ideal_minmax(PhaseGVN* phase, CMoveNode* cmove) {
-  // If we're post loop opts then don't attempt to match the min/max pattern, as this node might have been a
-  // MinL or MaxL that was already expanded during macro expansion.
-  if (phase->C->post_loop_opts_phase()) {
+  // Only create MinL/MaxL if we are allowed to create macro nodes.
+  if (!phase->C->allow_macro_nodes()) {
     return nullptr;
   }
 
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
index f59328fc64a..de0b41e73ea 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
@@ -30,12 +30,12 @@ import jdk.test.lib.Utils;
 
 /*
  * @test
+ * @bug 8324655 8329797
  * @key randomness
- * @bug 8324655
  * @summary Test that if expressions are properly folded into min/max nodes
  * @requires os.arch != "riscv64"
  * @library /test/lib /
- * @run main compiler.c2.irTests.TestIfMinMax
+ * @run driver compiler.c2.irTests.TestIfMinMax
  */
 public class TestIfMinMax {
     private static final Random RANDOM = Utils.getRandomInstance();
@@ -140,6 +140,42 @@ public class TestIfMinMax {
         return a <= b ? b : a;
     }
 
+    public class Dummy {
+        long l;
+        public Dummy(long l) { this.l = l; }
+    }
+
+    @Setup
+    Object[] setupDummyArray() {
+        Dummy[] arr = new Dummy[512];
+        for (int i = 0; i < 512; i++) {
+            arr[i] = new Dummy(RANDOM.nextLong());
+        }
+        return new Object[] { arr };
+    }
+
+    @Test
+    @Arguments(setup = "setupDummyArray")
+    @IR(failOn = { IRNode.MAX_L })
+    public long testMaxLAndBarrierInLoop(Dummy[] arr) {
+        long result = 0;
+        for (int i = 0; i < arr.length; ++i) {
+            result += Math.max(arr[i].l, 1);
+        }
+        return result;
+    }
+
+    @Test
+    @Arguments(setup = "setupDummyArray")
+    @IR(failOn = { IRNode.MIN_L })
+    public long testMinLAndBarrierInLoop(Dummy[] arr) {
+        long result = 0;
+        for (int i = 0; i < arr.length; ++i) {
+            result += Math.min(arr[i].l, 1);
+        }
+        return result;
+    }
+
     @Setup
     static Object[] setupIntArrays() {
         int[] a = new int[512];

From ef745a6c6e4068e786a70fc5574d272140c01e0f Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 25 Apr 2024 08:09:52 +0000
Subject: [PATCH 196/486] 8331097: Tests build is broken after pr/18914

Reviewed-by: alanb
---
 .../org/openjdk/bench/jdk/classfile/CodeAttributeTools.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java b/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java
index 1a9d989c546..d2defd6c5ef 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/CodeAttributeTools.java
@@ -122,6 +122,7 @@ public class CodeAttributeTools {
     public void benchmarkStackCounter(Blackhole bh) {
         for (var d : data) bh.consume(new StackCounter(
                 d.labelContext(),
+                d.thisClass(),
                 d.methodName(),
                 d.methodDesc(),
                 d.isStatic(),

From 87e864bf21d71daae4e001ec4edbb4ef1f60c36d Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 25 Apr 2024 08:11:56 +0000
Subject: [PATCH 197/486] 8328703: Illegal accesses in
 Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0

Reviewed-by: asotona, shade
---
 .../linux/native/lible/CLibrary.cpp              | 16 ++++++++--------
 .../macosx/native/lible/CLibrary.cpp             | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/jdk.internal.le/linux/native/lible/CLibrary.cpp b/src/jdk.internal.le/linux/native/lible/CLibrary.cpp
index 7815fe0cd2e..3215e1f5013 100644
--- a/src/jdk.internal.le/linux/native/lible/CLibrary.cpp
+++ b/src/jdk.internal.le/linux/native/lible/CLibrary.cpp
@@ -150,20 +150,20 @@ JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibr
   (JNIEnv *env, jobject, jint fd, jint cmd, jobject data) {
     winsize ws;
 
-    ws.ws_row = env->GetIntField(data, ws_row);
-    ws.ws_col = env->GetIntField(data, ws_col);
-    ws.ws_xpixel = env->GetIntField(data, ws_xpixel);
-    ws.ws_ypixel = env->GetIntField(data, ws_ypixel);
+    ws.ws_row = env->GetShortField(data, ws_row);
+    ws.ws_col = env->GetShortField(data, ws_col);
+    ws.ws_xpixel = env->GetShortField(data, ws_xpixel);
+    ws.ws_ypixel = env->GetShortField(data, ws_ypixel);
 
     if (ioctl(fd, cmd, &ws) != 0) {
         throw_errno(env);
         return ;
     }
 
-    env->SetIntField(data, ws_row, ws.ws_row);
-    env->SetIntField(data, ws_col, ws.ws_col);
-    env->SetIntField(data, ws_xpixel, ws.ws_xpixel);
-    env->SetIntField(data, ws_ypixel, ws.ws_ypixel);
+    env->SetShortField(data, ws_row, ws.ws_row);
+    env->SetShortField(data, ws_col, ws.ws_col);
+    env->SetShortField(data, ws_xpixel, ws.ws_xpixel);
+    env->SetShortField(data, ws_ypixel, ws.ws_ypixel);
 }
 
 /*
diff --git a/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp b/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp
index 760e090f5e8..3bc481f4afa 100644
--- a/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp
+++ b/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp
@@ -154,20 +154,20 @@ JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibrar
   (JNIEnv *env, jobject, jint fd, jlong cmd, jobject data) {
     winsize ws;
 
-    ws.ws_row = env->GetIntField(data, ws_row);
-    ws.ws_col = env->GetIntField(data, ws_col);
-    ws.ws_xpixel = env->GetIntField(data, ws_xpixel);
-    ws.ws_ypixel = env->GetIntField(data, ws_ypixel);
+    ws.ws_row = env->GetShortField(data, ws_row);
+    ws.ws_col = env->GetShortField(data, ws_col);
+    ws.ws_xpixel = env->GetShortField(data, ws_xpixel);
+    ws.ws_ypixel = env->GetShortField(data, ws_ypixel);
 
     if (ioctl(fd, cmd, &ws) != 0) {
         throw_errno(env);
         return ;
     }
 
-    env->SetIntField(data, ws_row, ws.ws_row);
-    env->SetIntField(data, ws_col, ws.ws_col);
-    env->SetIntField(data, ws_xpixel, ws.ws_xpixel);
-    env->SetIntField(data, ws_ypixel, ws.ws_ypixel);
+    env->SetShortField(data, ws_row, ws.ws_row);
+    env->SetShortField(data, ws_col, ws.ws_col);
+    env->SetShortField(data, ws_xpixel, ws.ws_xpixel);
+    env->SetShortField(data, ws_ypixel, ws.ws_ypixel);
 }
 
 /*

From b1b953c427b9562f050760ab3c2d0ae09aeec3e5 Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Thu, 25 Apr 2024 08:56:18 +0000
Subject: [PATCH 198/486] 8330972: Serial: Inline
 Generation::max_contiguous_available

Reviewed-by: ayang
---
 src/hotspot/share/gc/serial/generation.cpp        | 10 ----------
 src/hotspot/share/gc/serial/generation.hpp        |  2 --
 src/hotspot/share/gc/serial/tenuredGeneration.cpp |  2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/hotspot/share/gc/serial/generation.cpp b/src/hotspot/share/gc/serial/generation.cpp
index da5a54367f0..02edd8ae0a1 100644
--- a/src/hotspot/share/gc/serial/generation.cpp
+++ b/src/hotspot/share/gc/serial/generation.cpp
@@ -81,13 +81,3 @@ void Generation::print_summary_info_on(outputStream* st) {
                sr->invocations,
                sr->invocations > 0 ? time / sr->invocations : 0.0);
 }
-
-size_t Generation::max_contiguous_available() const {
-  // The largest number of contiguous free words in this or any higher generation.
-  size_t avail = contiguous_available();
-  size_t old_avail = 0;
-  if (SerialHeap::heap()->is_young_gen(this)) {
-    old_avail = SerialHeap::heap()->old_gen()->contiguous_available();
-  }
-  return MAX2(avail, old_avail);
-}
diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp
index c1a88a64b2a..50531705dd3 100644
--- a/src/hotspot/share/gc/serial/generation.hpp
+++ b/src/hotspot/share/gc/serial/generation.hpp
@@ -99,8 +99,6 @@ class Generation: public CHeapObj<mtGC> {
   // The largest number of contiguous free bytes in the generation,
   // including expansion  (Assumes called at a safepoint.)
   virtual size_t contiguous_available() const = 0;
-  // The largest number of contiguous free bytes in this or any higher generation.
-  virtual size_t max_contiguous_available() const;
 
   MemRegion reserved() const { return _reserved; }
 
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index e7cf16ea9af..8a851fba642 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -418,7 +418,7 @@ void TenuredGeneration::update_counters() {
 }
 
 bool TenuredGeneration::promotion_attempt_is_safe(size_t max_promotion_in_bytes) const {
-  size_t available = max_contiguous_available();
+  size_t available = contiguous_available();
   size_t av_promo  = (size_t)_avg_promoted->padded_average();
   bool   res = (available >= av_promo) || (available >= max_promotion_in_bytes);
 

From c9f8d0eff706d9ac59179afbb821367da09c9aae Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 25 Apr 2024 09:49:10 +0000
Subject: [PATCH 199/486] 8331050: Serial: Remove unused _saved_mark_word in
 DefNewGeneration and TenuredGeneration

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/serial/defNewGeneration.hpp  | 3 ---
 src/hotspot/share/gc/serial/tenuredGeneration.hpp | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index 0418d6e459f..2feb92505e6 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -139,9 +139,6 @@ class DefNewGeneration: public Generation {
   ContiguousSpace* _from_space;
   ContiguousSpace* _to_space;
 
-  // Saved mark word, for to-space
-  HeapWord* _saved_mark_word;
-
   STWGCTimer* _gc_timer;
 
   DefNewTracer* _gc_tracer;
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index cc83f129b68..965208e20ee 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -66,7 +66,6 @@ class TenuredGeneration: public Generation {
   void assert_correct_size_change_locking();
 
   ContiguousSpace*    _the_space;       // Actual space holding objects
-  HeapWord*           _saved_mark_word;
 
   GenerationCounters* _gen_counters;
   CSpaceCounters*     _space_counters;
@@ -89,7 +88,6 @@ public:
   void compute_new_size();
 
   ContiguousSpace* space() const { return _the_space; }
-  HeapWord* saved_mark_word() const { return _saved_mark_word; }
 
   // Grow generation with specified size (returns false if unable to grow)
   bool grow_by(size_t bytes);

From 8031dabf8344108a1c225311f2f270764fb2bc00 Mon Sep 17 00:00:00 2001
From: Stefan Johansson <sjohanss@openjdk.org>
Date: Thu, 25 Apr 2024 10:43:07 +0000
Subject: [PATCH 200/486] 8331094: ZGC: GTest fails due to incompatible Windows
 version

Reviewed-by: aboldtch, tschatzl
---
 test/hotspot/gtest/gc/z/test_zMapper_windows.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp b/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
index 2c93fa2bba7..744ea1f9c26 100644
--- a/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
+++ b/test/hotspot/gtest/gc/z/test_zMapper_windows.cpp
@@ -67,6 +67,12 @@ public:
   }
 
   virtual void SetUp() {
+    // Only run test on supported Windows versions
+    if (!ZSyscall::is_supported()) {
+      GTEST_SKIP() << "Requires Windows version 1803 or later";
+      return;
+    }
+
     ZSyscall::initialize();
     ZGlobalsPointers::initialize();
 
@@ -78,8 +84,7 @@ public:
 
     // Reserve address space for the test
     if (!reserve_for_test()) {
-      // Failed to reserve address space
-      GTEST_SKIP();
+      GTEST_SKIP() << "Failed to reserve address space";
       return;
     }
 
@@ -87,6 +92,11 @@ public:
   }
 
   virtual void TearDown() {
+    if (!ZSyscall::is_supported()) {
+      // Test skipped, nothing to cleanup
+      return;
+    }
+
     if (_initialized) {
       _vmm->pd_unreserve(ZOffset::address_unsafe(zoffset(0)), 0);
     }

From c9442014e561f8e1cb43a0e9f18a9a5ae2a7a2da Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 25 Apr 2024 12:02:31 +0000
Subject: [PATCH 201/486] 8331031: unify os::dont_yield and os::naked_yield
 across Posix platforms

Reviewed-by: coleenp, mdoerr
---
 src/hotspot/os/aix/os_aix.cpp     |  9 ---------
 src/hotspot/os/bsd/os_bsd.cpp     |  9 ---------
 src/hotspot/os/linux/os_linux.cpp | 19 -------------------
 src/hotspot/os/posix/os_posix.cpp |  8 ++++++++
 4 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 71a9aa576ea..1925357e1b4 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -2059,15 +2059,6 @@ size_t os::vm_min_address() {
   return _vm_min_address_default;
 }
 
-// Used to convert frequent JVM_Yield() to nops
-bool os::dont_yield() {
-  return DontYieldALot;
-}
-
-void os::naked_yield() {
-  sched_yield();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // thread priority support
 
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index ca4a77d2b4a..17b52bc1efa 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1936,15 +1936,6 @@ size_t os::vm_min_address() {
 #endif
 }
 
-// Used to convert frequent JVM_Yield() to nops
-bool os::dont_yield() {
-  return DontYieldALot;
-}
-
-void os::naked_yield() {
-  sched_yield();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // thread priority support
 
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 24e80accfde..3180dddfe50 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -4310,25 +4310,6 @@ size_t os::vm_min_address() {
   return value;
 }
 
-// Used to convert frequent JVM_Yield() to nops
-bool os::dont_yield() {
-  return DontYieldALot;
-}
-
-// Linux CFS scheduler (since 2.6.23) does not guarantee sched_yield(2) will
-// actually give up the CPU. Since skip buddy (v2.6.28):
-//
-// * Sets the yielding task as skip buddy for current CPU's run queue.
-// * Picks next from run queue, if empty, picks a skip buddy (can be the yielding task).
-// * Clears skip buddies for this run queue (yielding task no longer a skip buddy).
-//
-// An alternative is calling os::naked_short_nanosleep with a small number to avoid
-// getting re-scheduled immediately.
-//
-void os::naked_yield() {
-  sched_yield();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // thread priority support
 
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index 76a6080305b..a18a633002c 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -854,6 +854,14 @@ void os::_exit(int num) {
   ALLOW_C_FUNCTION(::_exit, ::_exit(num);)
 }
 
+bool os::dont_yield() {
+  return DontYieldALot;
+}
+
+void os::naked_yield() {
+  sched_yield();
+}
+
 // Builds a platform dependent Agent_OnLoad_<lib_name> function name
 // which is used to find statically linked in agents.
 // Parameters:

From b9927aa3a4c77812bfc53b14a6695ec436737661 Mon Sep 17 00:00:00 2001
From: Jasmine Karthikeyan <jkarthikeyan@openjdk.org>
Date: Thu, 25 Apr 2024 13:13:25 +0000
Subject: [PATCH 202/486] 8329194: Cleanup Type::cmp definition and usage

Reviewed-by: dfenacci, chagedorn, qamai
---
 src/hotspot/cpu/x86/x86.ad                  |  2 +-
 src/hotspot/share/opto/cfgnode.cpp          |  6 +++---
 src/hotspot/share/opto/memnode.cpp          |  2 +-
 src/hotspot/share/opto/node.cpp             |  2 +-
 src/hotspot/share/opto/type.cpp             | 22 +++++++++++++--------
 src/hotspot/share/opto/type.hpp             | 14 ++++++-------
 src/hotspot/share/opto/vectorIntrinsics.cpp |  4 ++--
 src/hotspot/share/opto/vectornode.cpp       |  8 ++++----
 src/hotspot/share/opto/vectornode.hpp       |  4 ++--
 9 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 7bbae30c832..8c9bbfc3592 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -10249,7 +10249,7 @@ instruct mask_opers_evex(kReg dst, kReg src1, kReg src2, kReg kscratch) %{
   ins_encode %{
     const MachNode* mask1 = static_cast<const MachNode*>(this->in(this->operand_index($src1)));
     const MachNode* mask2 = static_cast<const MachNode*>(this->in(this->operand_index($src2)));
-    assert(0 == Type::cmp(mask1->bottom_type(), mask2->bottom_type()), "");
+    assert(Type::equals(mask1->bottom_type(), mask2->bottom_type()), "Mask types must be equal");
     uint masklen = Matcher::vector_length(this);
     masklen = (masklen < 16 && !VM_Version::supports_avx512dq()) ? 16 : masklen;
     __ masked_op(this->ideal_Opcode(), masklen, $dst$$KRegister, $src1$$KRegister, $src2$$KRegister);
diff --git a/src/hotspot/share/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp
index 5362a7b0751..3e451fc789e 100644
--- a/src/hotspot/share/opto/cfgnode.cpp
+++ b/src/hotspot/share/opto/cfgnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -2724,10 +2724,10 @@ Node* PhiNode::merge_through_phi(Node* root_phi, PhaseIterGVN* igvn) {
           cached_vbox = vbox;
         } else if (vbox->vec_type() != cached_vbox->vec_type()) {
           // TODO: vector type mismatch can be handled with additional reinterpret casts
-          assert(Type::cmp(vbox->vec_type(), cached_vbox->vec_type()) != 0, "inconsistent");
+          assert(!Type::equals(vbox->vec_type(), cached_vbox->vec_type()), "inconsistent");
           return nullptr; // not optimizable: vector type mismatch
         } else if (vbox->box_type() != cached_vbox->box_type()) {
-          assert(Type::cmp(vbox->box_type(), cached_vbox->box_type()) != 0, "inconsistent");
+          assert(!Type::equals(vbox->box_type(), cached_vbox->box_type()), "inconsistent");
           return nullptr; // not optimizable: box type mismatch
         }
       } else {
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 4eae4a49dbb..a13a53f9b19 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -856,7 +856,7 @@ bool LoadNode::can_remove_control() const {
 uint LoadNode::size_of() const { return sizeof(*this); }
 bool LoadNode::cmp(const Node &n) const {
   LoadNode& load = (LoadNode &)n;
-  return !Type::cmp(_type, load._type) &&
+  return Type::equals(_type, load._type) &&
          _control_dependency == load._control_dependency &&
          _mo == load._mo;
 }
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index cb3b519ba5d..fa85344d0da 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -3011,7 +3011,7 @@ uint TypeNode::hash() const {
   return Node::hash() + _type->hash();
 }
 bool TypeNode::cmp(const Node& n) const {
-  return !Type::cmp(_type, ((TypeNode&)n)._type);
+  return Type::equals(_type, n.as_Type()->_type);
 }
 const Type* TypeNode::bottom_type() const { return _type; }
 const Type* TypeNode::Value(PhaseGVN* phase) const { return _type; }
diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index 7fecf0b4d35..70b2c705cd3 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -399,11 +399,13 @@ const Type *Type::make( enum TYPES t ) {
 }
 
 //------------------------------cmp--------------------------------------------
-int Type::cmp( const Type *const t1, const Type *const t2 ) {
-  if( t1->_base != t2->_base )
-    return 1;                   // Missed badly
+bool Type::equals(const Type* t1, const Type* t2) {
+  if (t1->_base != t2->_base) {
+    return false; // Missed badly
+  }
+
   assert(t1 != t2 || t1->eq(t2), "eq must be reflexive");
-  return !t1->eq(t2);           // Return ZERO if equal
+  return t1->eq(t2);
 }
 
 const Type* Type::maybe_remove_speculative(bool include_speculative) const {
@@ -433,9 +435,13 @@ void Type::Initialize_shared(Compile* current) {
   Arena* shared_type_arena = new (mtCompiler)Arena(mtCompiler);
 
   current->set_type_arena(shared_type_arena);
-  _shared_type_dict =
-    new (shared_type_arena) Dict( (CmpKey)Type::cmp, (Hash)Type::uhash,
-                                  shared_type_arena, 128 );
+
+  // Map the boolean result of Type::equals into a comparator result that CmpKey expects.
+  CmpKey type_cmp = [](const void* t1, const void* t2) -> int32_t {
+    return Type::equals((Type*) t1, (Type*) t2) ? 0 : 1;
+  };
+
+  _shared_type_dict = new (shared_type_arena) Dict(type_cmp, (Hash) Type::uhash, shared_type_arena, 128);
   current->set_type_dict(_shared_type_dict);
 
   // Make shared pre-built types.
@@ -744,7 +750,7 @@ const Type *Type::hashcons(void) {
   // Since we just discovered a new Type, compute its dual right now.
   assert( !_dual, "" );         // No dual yet
   _dual = xdual();              // Compute the dual
-  if (cmp(this, _dual) == 0) {  // Handle self-symmetric
+  if (equals(this, _dual)) {    // Handle self-symmetric
     if (_dual != this) {
       delete _dual;
       _dual = this;
diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp
index de9b52b4cc4..1b11ed95367 100644
--- a/src/hotspot/share/opto/type.hpp
+++ b/src/hotspot/share/opto/type.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -157,7 +157,7 @@ private:
   static const TypeInfo _type_info[];
 
   static int uhash( const Type *const t );
-  // Structural equality check.  Assumes that cmp() has already compared
+  // Structural equality check.  Assumes that equals() has already compared
   // the _base types and thus knows it can cast 't' appropriately.
   virtual bool eq( const Type *t ) const;
 
@@ -216,15 +216,15 @@ public:
   // Create a new hash-consd type
   static const Type *make(enum TYPES);
   // Test for equivalence of types
-  static int cmp( const Type *const t1, const Type *const t2 );
+  static bool equals(const Type* t1, const Type* t2);
   // Test for higher or equal in lattice
   // Variant that drops the speculative part of the types
-  bool higher_equal(const Type *t) const {
-    return !cmp(meet(t),t->remove_speculative());
+  bool higher_equal(const Type* t) const {
+    return equals(meet(t), t->remove_speculative());
   }
   // Variant that keeps the speculative part of the types
-  bool higher_equal_speculative(const Type *t) const {
-    return !cmp(meet_speculative(t),t);
+  bool higher_equal_speculative(const Type* t) const {
+    return equals(meet_speculative(t), t);
   }
 
   // MEET operation; lower in lattice.
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 139dd62dc28..2039e9c27be 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -2629,7 +2629,7 @@ bool LibraryCallKit::inline_vector_convert() {
         op = gvn().transform(VectorCastNode::make(cast_vopc, op, elem_bt_to, num_elem_to));
       }
     }
-  } else if (Type::cmp(src_type, dst_type) != 0) {
+  } else if (!Type::equals(src_type, dst_type)) {
     assert(!is_cast, "must be reinterpret");
     op = gvn().transform(new VectorReinterpretNode(op, src_type, dst_type));
   }
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index bef4a2a1095..5489a13b871 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -1668,7 +1668,7 @@ Node* VectorReinterpretNode::Identity(PhaseGVN *phase) {
     // "VectorReinterpret (VectorReinterpret node) ==> node" if:
     //   1) Types of 'node' and 'this' are identical
     //   2) Truncations are not introduced by the first VectorReinterpret
-    if (Type::cmp(bottom_type(), n->in(1)->bottom_type()) == 0 &&
+    if (Type::equals(bottom_type(), n->in(1)->bottom_type()) &&
         length_in_bytes() <= n->bottom_type()->is_vect()->length_in_bytes()) {
       return n->in(1);
     }
@@ -1685,7 +1685,7 @@ Node* VectorInsertNode::make(Node* vec, Node* new_val, int position, PhaseGVN& g
 Node* VectorUnboxNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   Node* n = obj()->uncast();
   if (EnableVectorReboxing && n->Opcode() == Op_VectorBox) {
-    if (Type::cmp(bottom_type(), n->in(VectorBoxNode::Value)->bottom_type()) == 0) {
+    if (Type::equals(bottom_type(), n->in(VectorBoxNode::Value)->bottom_type())) {
       // Handled by VectorUnboxNode::Identity()
     } else {
       VectorBoxNode* vbox = static_cast<VectorBoxNode*>(n);
@@ -1722,7 +1722,7 @@ Node* VectorUnboxNode::Ideal(PhaseGVN* phase, bool can_reshape) {
 Node* VectorUnboxNode::Identity(PhaseGVN* phase) {
   Node* n = obj()->uncast();
   if (EnableVectorReboxing && n->Opcode() == Op_VectorBox) {
-    if (Type::cmp(bottom_type(), n->in(VectorBoxNode::Value)->bottom_type()) == 0) {
+    if (Type::equals(bottom_type(), n->in(VectorBoxNode::Value)->bottom_type())) {
       return n->in(VectorBoxNode::Value); // VectorUnbox (VectorBox v) ==> v
     } else {
       // Handled by VectorUnboxNode::Ideal().
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index ff31d2a51b8..d35f623555d 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -1560,7 +1560,7 @@ class VectorReinterpretNode : public VectorNode {
   const TypeVect* src_type() { return _src_vt; }
   virtual uint hash() const { return VectorNode::hash() + _src_vt->hash(); }
   virtual bool cmp( const Node &n ) const {
-    return VectorNode::cmp(n) && !Type::cmp(_src_vt,((VectorReinterpretNode&)n)._src_vt);
+    return VectorNode::cmp(n) && Type::equals(_src_vt, ((VectorReinterpretNode&) n)._src_vt);
   }
   virtual Node* Identity(PhaseGVN* phase);
 
@@ -1696,7 +1696,7 @@ class VectorInsertNode : public VectorNode {
   VectorInsertNode(Node* vsrc, Node* new_val, ConINode* pos, const TypeVect* vt) : VectorNode(vsrc, new_val, (Node*)pos, vt) {
    assert(pos->get_int() >= 0, "positive constants");
    assert(pos->get_int() < (int)vt->length(), "index must be less than vector length");
-   assert(Type::cmp(vt, vsrc->bottom_type()) == 0, "input and output must be same type");
+   assert(Type::equals(vt, vsrc->bottom_type()), "input and output must be same type");
   }
   virtual int Opcode() const;
   uint pos() const { return in(3)->get_int(); }

From 4dfaa9b5bd4f9733e5a67d7c5b55eaa5ad4e27e4 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Thu, 25 Apr 2024 14:37:38 +0000
Subject: [PATCH 203/486] 8329805: Deprecate for removal
 ObjectOutputStream.PutField.write

Reviewed-by: naoto, iris
---
 src/java.base/share/classes/java/io/ObjectOutputStream.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/io/ObjectOutputStream.java b/src/java.base/share/classes/java/io/ObjectOutputStream.java
index dda9318f9bd..2dcf174cf53 100644
--- a/src/java.base/share/classes/java/io/ObjectOutputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectOutputStream.java
@@ -1027,7 +1027,7 @@ public class ObjectOutputStream
          *         calling the {@link java.io.ObjectOutputStream#writeFields()}
          *         method.
          */
-        @Deprecated
+        @Deprecated(forRemoval = true, since = "1.4")
         public abstract void write(ObjectOutput out) throws IOException;
     }
 

From 5af6b45eefd227e3e046ca22a404ae8a23174160 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 25 Apr 2024 15:23:48 +0000
Subject: [PATCH 204/486] 8330615: avoid signed integer overflows in zip_util.c
 readCen / hashN

Reviewed-by: lucy, mdoerr
---
 src/java.base/share/native/libzip/zip_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/native/libzip/zip_util.c b/src/java.base/share/native/libzip/zip_util.c
index a996b450ad4..8f2f19c66a2 100644
--- a/src/java.base/share/native/libzip/zip_util.c
+++ b/src/java.base/share/native/libzip/zip_util.c
@@ -437,7 +437,7 @@ hash(const char *s)
 static unsigned int
 hashN(const char *s, int length)
 {
-    int h = 0;
+    unsigned int h = 0;
     while (length-- > 0)
         h = 31*h + *s++;
     return h;

From ce9eac38191fa700afa3ac06b2b202576a11dd71 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 25 Apr 2024 15:54:13 +0000
Subject: [PATCH 205/486] 8331113: createJMHBundle.sh support configurable
 maven repo mirror

Reviewed-by: redestad, erikj
---
 make/devkit/createJMHBundle.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/make/devkit/createJMHBundle.sh b/make/devkit/createJMHBundle.sh
index c3c97947dab..b2b10769d15 100644
--- a/make/devkit/createJMHBundle.sh
+++ b/make/devkit/createJMHBundle.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 JMH_VERSION=1.37
 COMMONS_MATH3_VERSION=3.6.1
 JOPT_SIMPLE_VERSION=5.0.4
+MAVEN_MIRROR=${MAVEN_MIRROR:-https://repo.maven.apache.org/maven2}
 
 BUNDLE_NAME=jmh-$JMH_VERSION.tar.gz
 
@@ -41,7 +42,7 @@ cd $JAR_DIR
 rm -f *
 
 fetchJar() {
-  url="https://repo.maven.apache.org/maven2/$1/$2/$3/$2-$3.jar"
+  url="${MAVEN_MIRROR}/$1/$2/$3/$2-$3.jar"
   if command -v curl > /dev/null; then
       curl -O --fail $url
   elif command -v wget > /dev/null; then

From 1c238d43e81acf516297f26660059d0bab5b5b8a Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 25 Apr 2024 16:19:51 +0000
Subject: [PATCH 206/486] 8319990: Update CLDR to Version 45.0

Reviewed-by: joehw, jlu
---
 make/data/cldr/{LICENSE.txt => LICENSE}       |   6 +-
 make/data/cldr/README                         |   4 -
 make/data/cldr/README-common.md               |  10 +
 make/data/cldr/common/bcp47/collation.xml     |   2 +-
 make/data/cldr/common/bcp47/currency.xml      |   1 +
 make/data/cldr/common/dtd/ldml.dtd            |   6 +-
 make/data/cldr/common/dtd/ldml.xsd            |   8 +-
 make/data/cldr/common/dtd/ldmlBCP47.dtd       |   6 +-
 make/data/cldr/common/dtd/ldmlBCP47.xsd       |   8 +-
 make/data/cldr/common/dtd/ldmlICU.dtd         |   2 +-
 .../data/cldr/common/dtd/ldmlSupplemental.dtd |  47 ++++-
 .../data/cldr/common/dtd/ldmlSupplemental.xsd |  55 ++++-
 make/data/cldr/common/main/aa.xml             |   4 +-
 make/data/cldr/common/main/aa_DJ.xml          |   4 +-
 make/data/cldr/common/main/aa_ER.xml          |   4 +-
 make/data/cldr/common/main/aa_ET.xml          |   4 +-
 make/data/cldr/common/main/ab.xml             |  40 +---
 make/data/cldr/common/main/ab_GE.xml          |   4 +-
 make/data/cldr/common/main/af.xml             |  29 +--
 make/data/cldr/common/main/af_NA.xml          |   4 +-
 make/data/cldr/common/main/af_ZA.xml          |   4 +-
 make/data/cldr/common/main/agq.xml            |   4 +-
 make/data/cldr/common/main/agq_CM.xml         |   4 +-
 make/data/cldr/common/main/ak.xml             |   4 +-
 make/data/cldr/common/main/ak_GH.xml          |   4 +-
 make/data/cldr/common/main/am.xml             |  47 +----
 make/data/cldr/common/main/am_ET.xml          |   4 +-
 make/data/cldr/common/main/an.xml             |   4 +-
 make/data/cldr/common/main/an_ES.xml          |   4 +-
 make/data/cldr/common/main/ann.xml            |   4 +-
 make/data/cldr/common/main/ann_NG.xml         |   4 +-
 make/data/cldr/common/main/apc.xml            |   4 +-
 make/data/cldr/common/main/apc_SY.xml         |   4 +-
 make/data/cldr/common/main/ar.xml             |  47 +----
 make/data/cldr/common/main/ar_001.xml         |   4 +-
 make/data/cldr/common/main/ar_AE.xml          |   4 +-
 make/data/cldr/common/main/ar_BH.xml          |   4 +-
 make/data/cldr/common/main/ar_DJ.xml          |   4 +-
 make/data/cldr/common/main/ar_DZ.xml          |   4 +-
 make/data/cldr/common/main/ar_EG.xml          |   4 +-
 make/data/cldr/common/main/ar_EH.xml          |   4 +-
 make/data/cldr/common/main/ar_ER.xml          |   4 +-
 make/data/cldr/common/main/ar_IL.xml          |   4 +-
 make/data/cldr/common/main/ar_IQ.xml          |   4 +-
 make/data/cldr/common/main/ar_JO.xml          |   4 +-
 make/data/cldr/common/main/ar_KM.xml          |   4 +-
 make/data/cldr/common/main/ar_KW.xml          |   4 +-
 make/data/cldr/common/main/ar_LB.xml          |   4 +-
 make/data/cldr/common/main/ar_LY.xml          |   4 +-
 make/data/cldr/common/main/ar_MA.xml          |   4 +-
 make/data/cldr/common/main/ar_MR.xml          |   4 +-
 make/data/cldr/common/main/ar_OM.xml          |   4 +-
 make/data/cldr/common/main/ar_PS.xml          |   4 +-
 make/data/cldr/common/main/ar_QA.xml          |   4 +-
 make/data/cldr/common/main/ar_SA.xml          |   4 +-
 make/data/cldr/common/main/ar_SD.xml          |   4 +-
 make/data/cldr/common/main/ar_SO.xml          |   4 +-
 make/data/cldr/common/main/ar_SS.xml          |   4 +-
 make/data/cldr/common/main/ar_SY.xml          |   4 +-
 make/data/cldr/common/main/ar_TD.xml          |   4 +-
 make/data/cldr/common/main/ar_TN.xml          |   4 +-
 make/data/cldr/common/main/ar_YE.xml          |   4 +-
 make/data/cldr/common/main/arn.xml            |   4 +-
 make/data/cldr/common/main/arn_CL.xml         |   4 +-
 make/data/cldr/common/main/as.xml             |  43 +---
 make/data/cldr/common/main/as_IN.xml          |   4 +-
 make/data/cldr/common/main/asa.xml            |   4 +-
 make/data/cldr/common/main/asa_TZ.xml         |   4 +-
 make/data/cldr/common/main/ast.xml            |  23 +--
 make/data/cldr/common/main/ast_ES.xml         |   4 +-
 make/data/cldr/common/main/az.xml             |  46 +----
 make/data/cldr/common/main/az_Arab.xml        |   4 +-
 make/data/cldr/common/main/az_Arab_IQ.xml     |   4 +-
 make/data/cldr/common/main/az_Arab_IR.xml     |   4 +-
 make/data/cldr/common/main/az_Arab_TR.xml     |   4 +-
 make/data/cldr/common/main/az_Cyrl.xml        |   4 +-
 make/data/cldr/common/main/az_Cyrl_AZ.xml     |   4 +-
 make/data/cldr/common/main/az_Latn.xml        |   4 +-
 make/data/cldr/common/main/az_Latn_AZ.xml     |   4 +-
 make/data/cldr/common/main/ba.xml             |   4 +-
 make/data/cldr/common/main/ba_RU.xml          |   4 +-
 make/data/cldr/common/main/bal.xml            |  16 +-
 make/data/cldr/common/main/bal_Arab.xml       |   4 +-
 make/data/cldr/common/main/bal_Arab_PK.xml    |   4 +-
 make/data/cldr/common/main/bal_Latn.xml       |  16 +-
 make/data/cldr/common/main/bal_Latn_PK.xml    |   4 +-
 make/data/cldr/common/main/bas.xml            |   4 +-
 make/data/cldr/common/main/bas_CM.xml         |   4 +-
 make/data/cldr/common/main/be.xml             |  46 +----
 make/data/cldr/common/main/be_BY.xml          |   4 +-
 make/data/cldr/common/main/be_TARASK.xml      |  20 +-
 make/data/cldr/common/main/bem.xml            |   4 +-
 make/data/cldr/common/main/bem_ZM.xml         |   4 +-
 make/data/cldr/common/main/bew.xml            |  25 +--
 make/data/cldr/common/main/bew_ID.xml         |   4 +-
 make/data/cldr/common/main/bez.xml            |   4 +-
 make/data/cldr/common/main/bez_TZ.xml         |   4 +-
 make/data/cldr/common/main/bg.xml             |  47 +----
 make/data/cldr/common/main/bg_BG.xml          |   4 +-
 make/data/cldr/common/main/bgc.xml            |   4 +-
 make/data/cldr/common/main/bgc_IN.xml         |   4 +-
 make/data/cldr/common/main/bgn.xml            |   4 +-
 make/data/cldr/common/main/bgn_AE.xml         |   4 +-
 make/data/cldr/common/main/bgn_AF.xml         |   4 +-
 make/data/cldr/common/main/bgn_IR.xml         |   4 +-
 make/data/cldr/common/main/bgn_OM.xml         |   4 +-
 make/data/cldr/common/main/bgn_PK.xml         |   4 +-
 make/data/cldr/common/main/bho.xml            |   4 +-
 make/data/cldr/common/main/bho_IN.xml         |   4 +-
 make/data/cldr/common/main/blo.xml            |  40 +---
 make/data/cldr/common/main/blo_BJ.xml         |   4 +-
 make/data/cldr/common/main/blt.xml            |   4 +-
 make/data/cldr/common/main/blt_VN.xml         |   4 +-
 make/data/cldr/common/main/bm.xml             |   4 +-
 make/data/cldr/common/main/bm_ML.xml          |   4 +-
 make/data/cldr/common/main/bm_Nkoo.xml        |   4 +-
 make/data/cldr/common/main/bm_Nkoo_ML.xml     |   4 +-
 make/data/cldr/common/main/bn.xml             |  46 +----
 make/data/cldr/common/main/bn_BD.xml          |   4 +-
 make/data/cldr/common/main/bn_IN.xml          |   4 +-
 make/data/cldr/common/main/bo.xml             |   4 +-
 make/data/cldr/common/main/bo_CN.xml          |   4 +-
 make/data/cldr/common/main/bo_IN.xml          |   4 +-
 make/data/cldr/common/main/br.xml             |  17 +-
 make/data/cldr/common/main/br_FR.xml          |   4 +-
 make/data/cldr/common/main/brx.xml            |  43 +---
 make/data/cldr/common/main/brx_IN.xml         |   4 +-
 make/data/cldr/common/main/bs.xml             |  29 +--
 make/data/cldr/common/main/bs_Cyrl.xml        |  43 +---
 make/data/cldr/common/main/bs_Cyrl_BA.xml     |   4 +-
 make/data/cldr/common/main/bs_Latn.xml        |   4 +-
 make/data/cldr/common/main/bs_Latn_BA.xml     |   4 +-
 make/data/cldr/common/main/bss.xml            |   4 +-
 make/data/cldr/common/main/bss_CM.xml         |   4 +-
 make/data/cldr/common/main/byn.xml            |   4 +-
 make/data/cldr/common/main/byn_ER.xml         |   4 +-
 make/data/cldr/common/main/ca.xml             |  29 +--
 make/data/cldr/common/main/ca_AD.xml          |   4 +-
 make/data/cldr/common/main/ca_ES.xml          |   4 +-
 make/data/cldr/common/main/ca_ES_VALENCIA.xml |   4 +-
 make/data/cldr/common/main/ca_FR.xml          |   4 +-
 make/data/cldr/common/main/ca_IT.xml          |   4 +-
 make/data/cldr/common/main/cad.xml            |   4 +-
 make/data/cldr/common/main/cad_US.xml         |   4 +-
 make/data/cldr/common/main/cch.xml            |   4 +-
 make/data/cldr/common/main/cch_NG.xml         |   4 +-
 make/data/cldr/common/main/ccp.xml            |  47 +----
 make/data/cldr/common/main/ccp_BD.xml         |   4 +-
 make/data/cldr/common/main/ccp_IN.xml         |   4 +-
 make/data/cldr/common/main/ce.xml             |  46 +----
 make/data/cldr/common/main/ce_RU.xml          |   4 +-
 make/data/cldr/common/main/ceb.xml            |  16 +-
 make/data/cldr/common/main/ceb_PH.xml         |   4 +-
 make/data/cldr/common/main/cgg.xml            |   4 +-
 make/data/cldr/common/main/cgg_UG.xml         |   4 +-
 make/data/cldr/common/main/cho.xml            |   4 +-
 make/data/cldr/common/main/cho_US.xml         |   4 +-
 make/data/cldr/common/main/chr.xml            |  43 +---
 make/data/cldr/common/main/chr_US.xml         |   4 +-
 make/data/cldr/common/main/cic.xml            |   4 +-
 make/data/cldr/common/main/cic_US.xml         |   4 +-
 make/data/cldr/common/main/ckb.xml            |   4 +-
 make/data/cldr/common/main/ckb_IQ.xml         |   4 +-
 make/data/cldr/common/main/ckb_IR.xml         |   4 +-
 make/data/cldr/common/main/co.xml             |   4 +-
 make/data/cldr/common/main/co_FR.xml          |   4 +-
 make/data/cldr/common/main/cs.xml             |  29 +--
 make/data/cldr/common/main/cs_CZ.xml          |   4 +-
 make/data/cldr/common/main/csw.xml            |   4 +-
 make/data/cldr/common/main/csw_CA.xml         |   4 +-
 make/data/cldr/common/main/cu.xml             |  10 +-
 make/data/cldr/common/main/cu_RU.xml          |   4 +-
 make/data/cldr/common/main/cv.xml             |  40 +---
 make/data/cldr/common/main/cv_RU.xml          |   4 +-
 make/data/cldr/common/main/cy.xml             |  26 +--
 make/data/cldr/common/main/cy_GB.xml          |   4 +-
 make/data/cldr/common/main/da.xml             |  29 +--
 make/data/cldr/common/main/da_DK.xml          |   4 +-
 make/data/cldr/common/main/da_GL.xml          |   4 +-
 make/data/cldr/common/main/dav.xml            |   4 +-
 make/data/cldr/common/main/dav_KE.xml         |   4 +-
 make/data/cldr/common/main/de.xml             |  29 +--
 make/data/cldr/common/main/de_AT.xml          |   4 +-
 make/data/cldr/common/main/de_BE.xml          |   4 +-
 make/data/cldr/common/main/de_CH.xml          |   4 +-
 make/data/cldr/common/main/de_DE.xml          |   4 +-
 make/data/cldr/common/main/de_IT.xml          |   4 +-
 make/data/cldr/common/main/de_LI.xml          |   4 +-
 make/data/cldr/common/main/de_LU.xml          |   4 +-
 make/data/cldr/common/main/dje.xml            |   4 +-
 make/data/cldr/common/main/dje_NE.xml         |   4 +-
 make/data/cldr/common/main/doi.xml            |   4 +-
 make/data/cldr/common/main/doi_IN.xml         |   4 +-
 make/data/cldr/common/main/dsb.xml            |  22 +-
 make/data/cldr/common/main/dsb_DE.xml         |   4 +-
 make/data/cldr/common/main/dua.xml            |   4 +-
 make/data/cldr/common/main/dua_CM.xml         |   4 +-
 make/data/cldr/common/main/dv.xml             |   4 +-
 make/data/cldr/common/main/dv_MV.xml          |   4 +-
 make/data/cldr/common/main/dyo.xml            |   4 +-
 make/data/cldr/common/main/dyo_SN.xml         |   4 +-
 make/data/cldr/common/main/dz.xml             |  19 +-
 make/data/cldr/common/main/dz_BT.xml          |   4 +-
 make/data/cldr/common/main/ebu.xml            |   4 +-
 make/data/cldr/common/main/ebu_KE.xml         |   4 +-
 make/data/cldr/common/main/ee.xml             |  20 +-
 make/data/cldr/common/main/ee_GH.xml          |   4 +-
 make/data/cldr/common/main/ee_TG.xml          |   4 +-
 make/data/cldr/common/main/el.xml             |  47 +----
 make/data/cldr/common/main/el_CY.xml          |   4 +-
 make/data/cldr/common/main/el_GR.xml          |   4 +-
 make/data/cldr/common/main/el_POLYTON.xml     |   4 +-
 make/data/cldr/common/main/en.xml             |  34 ++-
 make/data/cldr/common/main/en_001.xml         |   8 +-
 make/data/cldr/common/main/en_150.xml         |   4 +-
 make/data/cldr/common/main/en_AE.xml          |   4 +-
 make/data/cldr/common/main/en_AG.xml          |   4 +-
 make/data/cldr/common/main/en_AI.xml          |   4 +-
 make/data/cldr/common/main/en_AS.xml          |   4 +-
 make/data/cldr/common/main/en_AT.xml          |   4 +-
 make/data/cldr/common/main/en_AU.xml          |   6 +-
 make/data/cldr/common/main/en_BB.xml          |   4 +-
 make/data/cldr/common/main/en_BE.xml          |   4 +-
 make/data/cldr/common/main/en_BI.xml          |   4 +-
 make/data/cldr/common/main/en_BM.xml          |   4 +-
 make/data/cldr/common/main/en_BS.xml          |   4 +-
 make/data/cldr/common/main/en_BW.xml          |   4 +-
 make/data/cldr/common/main/en_BZ.xml          |   4 +-
 make/data/cldr/common/main/en_CA.xml          |  14 +-
 make/data/cldr/common/main/en_CC.xml          |   4 +-
 make/data/cldr/common/main/en_CH.xml          |   4 +-
 make/data/cldr/common/main/en_CK.xml          |   4 +-
 make/data/cldr/common/main/en_CM.xml          |   4 +-
 make/data/cldr/common/main/en_CX.xml          |   4 +-
 make/data/cldr/common/main/en_CY.xml          |   4 +-
 make/data/cldr/common/main/en_DE.xml          |   4 +-
 make/data/cldr/common/main/en_DG.xml          |   4 +-
 make/data/cldr/common/main/en_DK.xml          |   4 +-
 make/data/cldr/common/main/en_DM.xml          |   4 +-
 make/data/cldr/common/main/en_Dsrt.xml        |   7 +-
 make/data/cldr/common/main/en_Dsrt_US.xml     |   4 +-
 make/data/cldr/common/main/en_ER.xml          |   4 +-
 make/data/cldr/common/main/en_FI.xml          |   4 +-
 make/data/cldr/common/main/en_FJ.xml          |   4 +-
 make/data/cldr/common/main/en_FK.xml          |   4 +-
 make/data/cldr/common/main/en_FM.xml          |   4 +-
 make/data/cldr/common/main/en_GB.xml          |  12 +-
 make/data/cldr/common/main/en_GD.xml          |   4 +-
 make/data/cldr/common/main/en_GG.xml          |   4 +-
 make/data/cldr/common/main/en_GH.xml          |   4 +-
 make/data/cldr/common/main/en_GI.xml          |   4 +-
 make/data/cldr/common/main/en_GM.xml          |   4 +-
 make/data/cldr/common/main/en_GU.xml          |   4 +-
 make/data/cldr/common/main/en_GY.xml          |   4 +-
 make/data/cldr/common/main/en_HK.xml          |   4 +-
 make/data/cldr/common/main/en_ID.xml          |   4 +-
 make/data/cldr/common/main/en_IE.xml          |   4 +-
 make/data/cldr/common/main/en_IL.xml          |   4 +-
 make/data/cldr/common/main/en_IM.xml          |   4 +-
 make/data/cldr/common/main/en_IN.xml          |  52 ++---
 make/data/cldr/common/main/en_IO.xml          |   4 +-
 make/data/cldr/common/main/en_JE.xml          |   4 +-
 make/data/cldr/common/main/en_JM.xml          |   4 +-
 make/data/cldr/common/main/en_KE.xml          |   4 +-
 make/data/cldr/common/main/en_KI.xml          |   4 +-
 make/data/cldr/common/main/en_KN.xml          |   4 +-
 make/data/cldr/common/main/en_KY.xml          |   4 +-
 make/data/cldr/common/main/en_LC.xml          |   4 +-
 make/data/cldr/common/main/en_LR.xml          |   4 +-
 make/data/cldr/common/main/en_LS.xml          |   4 +-
 make/data/cldr/common/main/en_MG.xml          |   4 +-
 make/data/cldr/common/main/en_MH.xml          |   4 +-
 make/data/cldr/common/main/en_MO.xml          |   4 +-
 make/data/cldr/common/main/en_MP.xml          |   4 +-
 make/data/cldr/common/main/en_MS.xml          |   4 +-
 make/data/cldr/common/main/en_MT.xml          |   4 +-
 make/data/cldr/common/main/en_MU.xml          |   4 +-
 make/data/cldr/common/main/en_MV.xml          |   4 +-
 make/data/cldr/common/main/en_MW.xml          |   4 +-
 make/data/cldr/common/main/en_MY.xml          |   4 +-
 make/data/cldr/common/main/en_NA.xml          |   4 +-
 make/data/cldr/common/main/en_NF.xml          |   4 +-
 make/data/cldr/common/main/en_NG.xml          |   4 +-
 make/data/cldr/common/main/en_NL.xml          |   4 +-
 make/data/cldr/common/main/en_NR.xml          |   4 +-
 make/data/cldr/common/main/en_NU.xml          |   4 +-
 make/data/cldr/common/main/en_NZ.xml          |   4 +-
 make/data/cldr/common/main/en_PG.xml          |   4 +-
 make/data/cldr/common/main/en_PH.xml          |   4 +-
 make/data/cldr/common/main/en_PK.xml          |   4 +-
 make/data/cldr/common/main/en_PN.xml          |   4 +-
 make/data/cldr/common/main/en_PR.xml          |   4 +-
 make/data/cldr/common/main/en_PW.xml          |   4 +-
 make/data/cldr/common/main/en_RW.xml          |   4 +-
 make/data/cldr/common/main/en_SB.xml          |   4 +-
 make/data/cldr/common/main/en_SC.xml          |   4 +-
 make/data/cldr/common/main/en_SD.xml          |   4 +-
 make/data/cldr/common/main/en_SE.xml          |   4 +-
 make/data/cldr/common/main/en_SG.xml          |   4 +-
 make/data/cldr/common/main/en_SH.xml          |   4 +-
 make/data/cldr/common/main/en_SI.xml          |   4 +-
 make/data/cldr/common/main/en_SL.xml          |   4 +-
 make/data/cldr/common/main/en_SS.xml          |   4 +-
 make/data/cldr/common/main/en_SX.xml          |   4 +-
 make/data/cldr/common/main/en_SZ.xml          |   4 +-
 make/data/cldr/common/main/en_Shaw.xml        |   4 +-
 make/data/cldr/common/main/en_Shaw_GB.xml     |   4 +-
 make/data/cldr/common/main/en_TC.xml          |   4 +-
 make/data/cldr/common/main/en_TK.xml          |   4 +-
 make/data/cldr/common/main/en_TO.xml          |   4 +-
 make/data/cldr/common/main/en_TT.xml          |   4 +-
 make/data/cldr/common/main/en_TV.xml          |   4 +-
 make/data/cldr/common/main/en_TZ.xml          |   4 +-
 make/data/cldr/common/main/en_UG.xml          |   4 +-
 make/data/cldr/common/main/en_UM.xml          |   4 +-
 make/data/cldr/common/main/en_US.xml          |   4 +-
 make/data/cldr/common/main/en_US_POSIX.xml    |   4 +-
 make/data/cldr/common/main/en_VC.xml          |   4 +-
 make/data/cldr/common/main/en_VG.xml          |   4 +-
 make/data/cldr/common/main/en_VI.xml          |   4 +-
 make/data/cldr/common/main/en_VU.xml          |   4 +-
 make/data/cldr/common/main/en_WS.xml          |   4 +-
 make/data/cldr/common/main/en_ZA.xml          |   4 +-
 make/data/cldr/common/main/en_ZM.xml          |   4 +-
 make/data/cldr/common/main/en_ZW.xml          |   4 +-
 make/data/cldr/common/main/eo.xml             |  22 +-
 make/data/cldr/common/main/eo_001.xml         |   4 +-
 make/data/cldr/common/main/es.xml             |  34 +--
 make/data/cldr/common/main/es_419.xml         |   9 +-
 make/data/cldr/common/main/es_AR.xml          |   4 +-
 make/data/cldr/common/main/es_BO.xml          |   4 +-
 make/data/cldr/common/main/es_BR.xml          |   4 +-
 make/data/cldr/common/main/es_BZ.xml          |   4 +-
 make/data/cldr/common/main/es_CL.xml          |   4 +-
 make/data/cldr/common/main/es_CO.xml          |   4 +-
 make/data/cldr/common/main/es_CR.xml          |   4 +-
 make/data/cldr/common/main/es_CU.xml          |   4 +-
 make/data/cldr/common/main/es_DO.xml          |   4 +-
 make/data/cldr/common/main/es_EA.xml          |   4 +-
 make/data/cldr/common/main/es_EC.xml          |   4 +-
 make/data/cldr/common/main/es_ES.xml          |   4 +-
 make/data/cldr/common/main/es_GQ.xml          |   4 +-
 make/data/cldr/common/main/es_GT.xml          |   4 +-
 make/data/cldr/common/main/es_HN.xml          |   4 +-
 make/data/cldr/common/main/es_IC.xml          |   4 +-
 make/data/cldr/common/main/es_MX.xml          |   9 +-
 make/data/cldr/common/main/es_NI.xml          |   4 +-
 make/data/cldr/common/main/es_PA.xml          |   4 +-
 make/data/cldr/common/main/es_PE.xml          |   4 +-
 make/data/cldr/common/main/es_PH.xml          |   4 +-
 make/data/cldr/common/main/es_PR.xml          |   4 +-
 make/data/cldr/common/main/es_PY.xml          |   4 +-
 make/data/cldr/common/main/es_SV.xml          |   4 +-
 make/data/cldr/common/main/es_US.xml          |   9 +-
 make/data/cldr/common/main/es_UY.xml          |   4 +-
 make/data/cldr/common/main/es_VE.xml          |   4 +-
 make/data/cldr/common/main/et.xml             |  29 +--
 make/data/cldr/common/main/et_EE.xml          |   4 +-
 make/data/cldr/common/main/eu.xml             |  29 +--
 make/data/cldr/common/main/eu_ES.xml          |   4 +-
 make/data/cldr/common/main/ewo.xml            |   4 +-
 make/data/cldr/common/main/ewo_CM.xml         |   4 +-
 make/data/cldr/common/main/fa.xml             |  47 +----
 make/data/cldr/common/main/fa_AF.xml          |   4 +-
 make/data/cldr/common/main/fa_IR.xml          |   4 +-
 make/data/cldr/common/main/ff.xml             |   4 +-
 make/data/cldr/common/main/ff_Adlm.xml        |  47 +----
 make/data/cldr/common/main/ff_Adlm_BF.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_CM.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_GH.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_GM.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_GN.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_GW.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_LR.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_MR.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_NE.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_NG.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_SL.xml     |   4 +-
 make/data/cldr/common/main/ff_Adlm_SN.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn.xml        |   4 +-
 make/data/cldr/common/main/ff_Latn_BF.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_CM.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_GH.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_GM.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_GN.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_GW.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_LR.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_MR.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_NE.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_NG.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_SL.xml     |   4 +-
 make/data/cldr/common/main/ff_Latn_SN.xml     |   4 +-
 make/data/cldr/common/main/fi.xml             |  29 +--
 make/data/cldr/common/main/fi_FI.xml          |   4 +-
 make/data/cldr/common/main/fil.xml            |  23 +--
 make/data/cldr/common/main/fil_PH.xml         |   4 +-
 make/data/cldr/common/main/fo.xml             |  25 +--
 make/data/cldr/common/main/fo_DK.xml          |   4 +-
 make/data/cldr/common/main/fo_FO.xml          |   4 +-
 make/data/cldr/common/main/fr.xml             |  43 +---
 make/data/cldr/common/main/fr_BE.xml          |   5 +-
 make/data/cldr/common/main/fr_BF.xml          |   4 +-
 make/data/cldr/common/main/fr_BI.xml          |   4 +-
 make/data/cldr/common/main/fr_BJ.xml          |   4 +-
 make/data/cldr/common/main/fr_BL.xml          |   4 +-
 make/data/cldr/common/main/fr_CA.xml          |  16 +-
 make/data/cldr/common/main/fr_CD.xml          |   4 +-
 make/data/cldr/common/main/fr_CF.xml          |   4 +-
 make/data/cldr/common/main/fr_CG.xml          |   4 +-
 make/data/cldr/common/main/fr_CH.xml          |   4 +-
 make/data/cldr/common/main/fr_CI.xml          |   4 +-
 make/data/cldr/common/main/fr_CM.xml          |   4 +-
 make/data/cldr/common/main/fr_DJ.xml          |   4 +-
 make/data/cldr/common/main/fr_DZ.xml          |   4 +-
 make/data/cldr/common/main/fr_FR.xml          |   4 +-
 make/data/cldr/common/main/fr_GA.xml          |   4 +-
 make/data/cldr/common/main/fr_GF.xml          |   4 +-
 make/data/cldr/common/main/fr_GN.xml          |   4 +-
 make/data/cldr/common/main/fr_GP.xml          |   4 +-
 make/data/cldr/common/main/fr_GQ.xml          |   4 +-
 make/data/cldr/common/main/fr_HT.xml          |   4 +-
 make/data/cldr/common/main/fr_KM.xml          |   4 +-
 make/data/cldr/common/main/fr_LU.xml          |   4 +-
 make/data/cldr/common/main/fr_MA.xml          |   4 +-
 make/data/cldr/common/main/fr_MC.xml          |   4 +-
 make/data/cldr/common/main/fr_MF.xml          |   4 +-
 make/data/cldr/common/main/fr_MG.xml          |   4 +-
 make/data/cldr/common/main/fr_ML.xml          |   4 +-
 make/data/cldr/common/main/fr_MQ.xml          |   4 +-
 make/data/cldr/common/main/fr_MR.xml          |   4 +-
 make/data/cldr/common/main/fr_MU.xml          |   4 +-
 make/data/cldr/common/main/fr_NC.xml          |   4 +-
 make/data/cldr/common/main/fr_NE.xml          |   4 +-
 make/data/cldr/common/main/fr_PF.xml          |   4 +-
 make/data/cldr/common/main/fr_PM.xml          |   4 +-
 make/data/cldr/common/main/fr_RE.xml          |   4 +-
 make/data/cldr/common/main/fr_RW.xml          |   4 +-
 make/data/cldr/common/main/fr_SC.xml          |   4 +-
 make/data/cldr/common/main/fr_SN.xml          |   4 +-
 make/data/cldr/common/main/fr_SY.xml          |   4 +-
 make/data/cldr/common/main/fr_TD.xml          |   4 +-
 make/data/cldr/common/main/fr_TG.xml          |   4 +-
 make/data/cldr/common/main/fr_TN.xml          |   4 +-
 make/data/cldr/common/main/fr_VU.xml          |   4 +-
 make/data/cldr/common/main/fr_WF.xml          |   4 +-
 make/data/cldr/common/main/fr_YT.xml          |   4 +-
 make/data/cldr/common/main/frr.xml            |  22 +-
 make/data/cldr/common/main/frr_DE.xml         |   4 +-
 make/data/cldr/common/main/fur.xml            |   4 +-
 make/data/cldr/common/main/fur_IT.xml         |   4 +-
 make/data/cldr/common/main/fy.xml             |  15 +-
 make/data/cldr/common/main/fy_NL.xml          |   4 +-
 make/data/cldr/common/main/ga.xml             |  23 +--
 make/data/cldr/common/main/ga_GB.xml          |   4 +-
 make/data/cldr/common/main/ga_IE.xml          |   4 +-
 make/data/cldr/common/main/gaa.xml            |  23 +--
 make/data/cldr/common/main/gaa_GH.xml         |   4 +-
 make/data/cldr/common/main/gd.xml             |  26 +--
 make/data/cldr/common/main/gd_GB.xml          |   4 +-
 make/data/cldr/common/main/gez.xml            |   4 +-
 make/data/cldr/common/main/gez_ER.xml         |   4 +-
 make/data/cldr/common/main/gez_ET.xml         |   4 +-
 make/data/cldr/common/main/gl.xml             |  29 +--
 make/data/cldr/common/main/gl_ES.xml          |   4 +-
 make/data/cldr/common/main/gn.xml             |   4 +-
 make/data/cldr/common/main/gn_PY.xml          |   4 +-
 make/data/cldr/common/main/gsw.xml            |  10 +-
 make/data/cldr/common/main/gsw_CH.xml         |   4 +-
 make/data/cldr/common/main/gsw_FR.xml         |   4 +-
 make/data/cldr/common/main/gsw_LI.xml         |   4 +-
 make/data/cldr/common/main/gu.xml             |  47 +----
 make/data/cldr/common/main/gu_IN.xml          |   4 +-
 make/data/cldr/common/main/guz.xml            |   4 +-
 make/data/cldr/common/main/guz_KE.xml         |   4 +-
 make/data/cldr/common/main/gv.xml             |   4 +-
 make/data/cldr/common/main/gv_IM.xml          |   4 +-
 make/data/cldr/common/main/ha.xml             |  16 +-
 make/data/cldr/common/main/ha_Arab.xml        |   4 +-
 make/data/cldr/common/main/ha_Arab_NG.xml     |   4 +-
 make/data/cldr/common/main/ha_Arab_SD.xml     |   4 +-
 make/data/cldr/common/main/ha_GH.xml          |   4 +-
 make/data/cldr/common/main/ha_NE.xml          |   4 +-
 make/data/cldr/common/main/ha_NG.xml          |   4 +-
 make/data/cldr/common/main/haw.xml            |   4 +-
 make/data/cldr/common/main/haw_US.xml         |   4 +-
 make/data/cldr/common/main/he.xml             |  47 +----
 make/data/cldr/common/main/he_IL.xml          |   4 +-
 make/data/cldr/common/main/hi.xml             |  47 +----
 make/data/cldr/common/main/hi_IN.xml          |   4 +-
 make/data/cldr/common/main/hi_Latn.xml        |  19 +-
 make/data/cldr/common/main/hi_Latn_IN.xml     |   4 +-
 make/data/cldr/common/main/hnj.xml            |   4 +-
 make/data/cldr/common/main/hnj_Hmnp.xml       |   4 +-
 make/data/cldr/common/main/hnj_Hmnp_US.xml    |   4 +-
 make/data/cldr/common/main/hr.xml             |  29 +--
 make/data/cldr/common/main/hr_BA.xml          |   4 +-
 make/data/cldr/common/main/hr_HR.xml          |   4 +-
 make/data/cldr/common/main/hsb.xml            |  22 +-
 make/data/cldr/common/main/hsb_DE.xml         |   4 +-
 make/data/cldr/common/main/hu.xml             |  29 +--
 make/data/cldr/common/main/hu_HU.xml          |   4 +-
 make/data/cldr/common/main/hy.xml             |  46 +----
 make/data/cldr/common/main/hy_AM.xml          |   4 +-
 make/data/cldr/common/main/ia.xml             |  16 +-
 make/data/cldr/common/main/ia_001.xml         |   4 +-
 make/data/cldr/common/main/id.xml             |  29 +--
 make/data/cldr/common/main/id_ID.xml          |   4 +-
 make/data/cldr/common/main/ie.xml             |  22 +-
 make/data/cldr/common/main/ie_EE.xml          |   4 +-
 make/data/cldr/common/main/ig.xml             |  16 +-
 make/data/cldr/common/main/ig_NG.xml          |   4 +-
 make/data/cldr/common/main/ii.xml             |   4 +-
 make/data/cldr/common/main/ii_CN.xml          |   4 +-
 make/data/cldr/common/main/io.xml             |   4 +-
 make/data/cldr/common/main/io_001.xml         |   4 +-
 make/data/cldr/common/main/is.xml             |  23 +--
 make/data/cldr/common/main/is_IS.xml          |   4 +-
 make/data/cldr/common/main/it.xml             |  50 ++---
 make/data/cldr/common/main/it_CH.xml          |   4 +-
 make/data/cldr/common/main/it_IT.xml          |   4 +-
 make/data/cldr/common/main/it_SM.xml          |   4 +-
 make/data/cldr/common/main/it_VA.xml          |   4 +-
 make/data/cldr/common/main/iu.xml             |   4 +-
 make/data/cldr/common/main/iu_CA.xml          |   4 +-
 make/data/cldr/common/main/iu_Latn.xml        |   4 +-
 make/data/cldr/common/main/iu_Latn_CA.xml     |   4 +-
 make/data/cldr/common/main/ja.xml             |  47 +----
 make/data/cldr/common/main/ja_JP.xml          |   4 +-
 make/data/cldr/common/main/jbo.xml            |   4 +-
 make/data/cldr/common/main/jbo_001.xml        |   4 +-
 make/data/cldr/common/main/jgo.xml            |   4 +-
 make/data/cldr/common/main/jgo_CM.xml         |   4 +-
 make/data/cldr/common/main/jmc.xml            |   4 +-
 make/data/cldr/common/main/jmc_TZ.xml         |   4 +-
 make/data/cldr/common/main/jv.xml             |  25 +--
 make/data/cldr/common/main/jv_ID.xml          |   4 +-
 make/data/cldr/common/main/ka.xml             |  46 +----
 make/data/cldr/common/main/ka_GE.xml          |   4 +-
 make/data/cldr/common/main/kab.xml            |  19 +-
 make/data/cldr/common/main/kab_DZ.xml         |   4 +-
 make/data/cldr/common/main/kaj.xml            |   4 +-
 make/data/cldr/common/main/kaj_NG.xml         |   4 +-
 make/data/cldr/common/main/kam.xml            |   4 +-
 make/data/cldr/common/main/kam_KE.xml         |   4 +-
 make/data/cldr/common/main/kcg.xml            |   4 +-
 make/data/cldr/common/main/kcg_NG.xml         |   4 +-
 make/data/cldr/common/main/kde.xml            |   4 +-
 make/data/cldr/common/main/kde_TZ.xml         |   4 +-
 make/data/cldr/common/main/kea.xml            |  11 +-
 make/data/cldr/common/main/kea_CV.xml         |   4 +-
 make/data/cldr/common/main/ken.xml            |   4 +-
 make/data/cldr/common/main/ken_CM.xml         |   4 +-
 make/data/cldr/common/main/kgp.xml            |  47 +----
 make/data/cldr/common/main/kgp_BR.xml         |   4 +-
 make/data/cldr/common/main/khq.xml            |   4 +-
 make/data/cldr/common/main/khq_ML.xml         |   4 +-
 make/data/cldr/common/main/ki.xml             |   4 +-
 make/data/cldr/common/main/ki_KE.xml          |   4 +-
 make/data/cldr/common/main/kk.xml             |  46 +----
 make/data/cldr/common/main/kk_KZ.xml          |   4 +-
 make/data/cldr/common/main/kkj.xml            |   4 +-
 make/data/cldr/common/main/kkj_CM.xml         |   4 +-
 make/data/cldr/common/main/kl.xml             |   4 +-
 make/data/cldr/common/main/kl_GL.xml          |   4 +-
 make/data/cldr/common/main/kln.xml            |   4 +-
 make/data/cldr/common/main/kln_KE.xml         |   4 +-
 make/data/cldr/common/main/km.xml             |  46 +----
 make/data/cldr/common/main/km_KH.xml          |   4 +-
 make/data/cldr/common/main/kn.xml             |  47 +----
 make/data/cldr/common/main/kn_IN.xml          |   4 +-
 make/data/cldr/common/main/ko.xml             |  47 +----
 make/data/cldr/common/main/ko_CN.xml          |   4 +-
 make/data/cldr/common/main/ko_KP.xml          |   4 +-
 make/data/cldr/common/main/ko_KR.xml          |   4 +-
 make/data/cldr/common/main/kok.xml            |  43 +---
 make/data/cldr/common/main/kok_IN.xml         |   4 +-
 make/data/cldr/common/main/kpe.xml            |   4 +-
 make/data/cldr/common/main/kpe_GN.xml         |   4 +-
 make/data/cldr/common/main/kpe_LR.xml         |   4 +-
 make/data/cldr/common/main/ks.xml             | 136 +++++-------
 make/data/cldr/common/main/ks_Arab.xml        |   4 +-
 make/data/cldr/common/main/ks_Arab_IN.xml     |   4 +-
 make/data/cldr/common/main/ks_Deva.xml        |   4 +-
 make/data/cldr/common/main/ks_Deva_IN.xml     |   4 +-
 make/data/cldr/common/main/ksb.xml            |   4 +-
 make/data/cldr/common/main/ksb_TZ.xml         |   4 +-
 make/data/cldr/common/main/ksf.xml            |   4 +-
 make/data/cldr/common/main/ksf_CM.xml         |   4 +-
 make/data/cldr/common/main/ksh.xml            |  10 +-
 make/data/cldr/common/main/ksh_DE.xml         |   4 +-
 make/data/cldr/common/main/ku.xml             |  49 +----
 make/data/cldr/common/main/ku_TR.xml          |   4 +-
 make/data/cldr/common/main/kw.xml             |   4 +-
 make/data/cldr/common/main/kw_GB.xml          |   4 +-
 make/data/cldr/common/main/kxv.xml            |  40 +---
 make/data/cldr/common/main/kxv_Deva.xml       |   4 +-
 make/data/cldr/common/main/kxv_Deva_IN.xml    |   4 +-
 make/data/cldr/common/main/kxv_Latn.xml       |   4 +-
 make/data/cldr/common/main/kxv_Latn_IN.xml    |   4 +-
 make/data/cldr/common/main/kxv_Orya.xml       |   4 +-
 make/data/cldr/common/main/kxv_Orya_IN.xml    |   4 +-
 make/data/cldr/common/main/kxv_Telu.xml       |   4 +-
 make/data/cldr/common/main/kxv_Telu_IN.xml    |   4 +-
 make/data/cldr/common/main/ky.xml             |  46 +----
 make/data/cldr/common/main/ky_KG.xml          |   4 +-
 make/data/cldr/common/main/la.xml             |   4 +-
 make/data/cldr/common/main/la_VA.xml          |   4 +-
 make/data/cldr/common/main/lag.xml            |   4 +-
 make/data/cldr/common/main/lag_TZ.xml         |   4 +-
 make/data/cldr/common/main/lb.xml             |  23 +--
 make/data/cldr/common/main/lb_LU.xml          |   4 +-
 make/data/cldr/common/main/lg.xml             |   4 +-
 make/data/cldr/common/main/lg_UG.xml          |   4 +-
 make/data/cldr/common/main/lij.xml            |  16 +-
 make/data/cldr/common/main/lij_IT.xml         |   4 +-
 make/data/cldr/common/main/lkt.xml            |   4 +-
 make/data/cldr/common/main/lkt_US.xml         |   4 +-
 make/data/cldr/common/main/lmo.xml            |   4 +-
 make/data/cldr/common/main/lmo_IT.xml         |   4 +-
 make/data/cldr/common/main/ln.xml             |   4 +-
 make/data/cldr/common/main/ln_AO.xml          |   4 +-
 make/data/cldr/common/main/ln_CD.xml          |   4 +-
 make/data/cldr/common/main/ln_CF.xml          |   4 +-
 make/data/cldr/common/main/ln_CG.xml          |   4 +-
 make/data/cldr/common/main/lo.xml             |  47 +----
 make/data/cldr/common/main/lo_LA.xml          |   4 +-
 make/data/cldr/common/main/lrc.xml            |   4 +-
 make/data/cldr/common/main/lrc_IQ.xml         |   4 +-
 make/data/cldr/common/main/lrc_IR.xml         |   4 +-
 make/data/cldr/common/main/lt.xml             |  47 +----
 make/data/cldr/common/main/lt_LT.xml          |   4 +-
 make/data/cldr/common/main/lu.xml             |   4 +-
 make/data/cldr/common/main/lu_CD.xml          |   4 +-
 make/data/cldr/common/main/luo.xml            |   4 +-
 make/data/cldr/common/main/luo_KE.xml         |   4 +-
 make/data/cldr/common/main/luy.xml            |   4 +-
 make/data/cldr/common/main/luy_KE.xml         |   4 +-
 make/data/cldr/common/main/lv.xml             |  51 +----
 make/data/cldr/common/main/lv_LV.xml          |   4 +-
 make/data/cldr/common/main/mai.xml            |  37 +---
 make/data/cldr/common/main/mai_IN.xml         |   4 +-
 make/data/cldr/common/main/mas.xml            |   4 +-
 make/data/cldr/common/main/mas_KE.xml         |   4 +-
 make/data/cldr/common/main/mas_TZ.xml         |   4 +-
 make/data/cldr/common/main/mdf.xml            |   4 +-
 make/data/cldr/common/main/mdf_RU.xml         |   4 +-
 make/data/cldr/common/main/mer.xml            |   4 +-
 make/data/cldr/common/main/mer_KE.xml         |   4 +-
 make/data/cldr/common/main/mfe.xml            |   4 +-
 make/data/cldr/common/main/mfe_MU.xml         |   4 +-
 make/data/cldr/common/main/mg.xml             |   4 +-
 make/data/cldr/common/main/mg_MG.xml          |   4 +-
 make/data/cldr/common/main/mgh.xml            |   4 +-
 make/data/cldr/common/main/mgh_MZ.xml         |   4 +-
 make/data/cldr/common/main/mgo.xml            |   4 +-
 make/data/cldr/common/main/mgo_CM.xml         |   4 +-
 make/data/cldr/common/main/mi.xml             |  19 +-
 make/data/cldr/common/main/mi_NZ.xml          |   4 +-
 make/data/cldr/common/main/mic.xml            |   4 +-
 make/data/cldr/common/main/mic_CA.xml         |   4 +-
 make/data/cldr/common/main/mk.xml             |  46 +----
 make/data/cldr/common/main/mk_MK.xml          |   4 +-
 make/data/cldr/common/main/ml.xml             |  46 +----
 make/data/cldr/common/main/ml_IN.xml          |   4 +-
 make/data/cldr/common/main/mn.xml             |  47 +----
 make/data/cldr/common/main/mn_MN.xml          |   4 +-
 make/data/cldr/common/main/mn_Mong.xml        |   4 +-
 make/data/cldr/common/main/mn_Mong_CN.xml     |   4 +-
 make/data/cldr/common/main/mn_Mong_MN.xml     |   4 +-
 make/data/cldr/common/main/mni.xml            |   4 +-
 make/data/cldr/common/main/mni_Beng.xml       |   4 +-
 make/data/cldr/common/main/mni_Beng_IN.xml    |   4 +-
 make/data/cldr/common/main/mni_Mtei.xml       |   4 +-
 make/data/cldr/common/main/mni_Mtei_IN.xml    |   4 +-
 make/data/cldr/common/main/moh.xml            |   4 +-
 make/data/cldr/common/main/moh_CA.xml         |   4 +-
 make/data/cldr/common/main/mr.xml             |  47 +----
 make/data/cldr/common/main/mr_IN.xml          |   4 +-
 make/data/cldr/common/main/ms.xml             |  26 +--
 make/data/cldr/common/main/ms_Arab.xml        |   4 +-
 make/data/cldr/common/main/ms_Arab_BN.xml     |   4 +-
 make/data/cldr/common/main/ms_Arab_MY.xml     |   4 +-
 make/data/cldr/common/main/ms_BN.xml          |   4 +-
 make/data/cldr/common/main/ms_ID.xml          |   4 +-
 make/data/cldr/common/main/ms_MY.xml          |   4 +-
 make/data/cldr/common/main/ms_SG.xml          |   4 +-
 make/data/cldr/common/main/mt.xml             |   7 +-
 make/data/cldr/common/main/mt_MT.xml          |   4 +-
 make/data/cldr/common/main/mua.xml            |   4 +-
 make/data/cldr/common/main/mua_CM.xml         |   4 +-
 make/data/cldr/common/main/mus.xml            |  14 +-
 make/data/cldr/common/main/mus_US.xml         |   4 +-
 make/data/cldr/common/main/my.xml             |  46 +----
 make/data/cldr/common/main/my_MM.xml          |   4 +-
 make/data/cldr/common/main/myv.xml            |  10 +-
 make/data/cldr/common/main/myv_RU.xml         |   4 +-
 make/data/cldr/common/main/mzn.xml            |   4 +-
 make/data/cldr/common/main/mzn_IR.xml         |   4 +-
 make/data/cldr/common/main/naq.xml            |   4 +-
 make/data/cldr/common/main/naq_NA.xml         |   4 +-
 make/data/cldr/common/main/nb.xml             |   4 +-
 make/data/cldr/common/main/nb_NO.xml          |   4 +-
 make/data/cldr/common/main/nb_SJ.xml          |   4 +-
 make/data/cldr/common/main/nd.xml             |   4 +-
 make/data/cldr/common/main/nd_ZW.xml          |   4 +-
 make/data/cldr/common/main/nds.xml            |  10 +-
 make/data/cldr/common/main/nds_DE.xml         |   4 +-
 make/data/cldr/common/main/nds_NL.xml         |   4 +-
 make/data/cldr/common/main/ne.xml             |  46 +----
 make/data/cldr/common/main/ne_IN.xml          |   4 +-
 make/data/cldr/common/main/ne_NP.xml          |   4 +-
 make/data/cldr/common/main/nl.xml             | 193 ++++++++----------
 make/data/cldr/common/main/nl_AW.xml          |   4 +-
 make/data/cldr/common/main/nl_BE.xml          |   4 +-
 make/data/cldr/common/main/nl_BQ.xml          |   4 +-
 make/data/cldr/common/main/nl_CW.xml          |   4 +-
 make/data/cldr/common/main/nl_NL.xml          |   4 +-
 make/data/cldr/common/main/nl_SR.xml          |   4 +-
 make/data/cldr/common/main/nl_SX.xml          |   4 +-
 make/data/cldr/common/main/nmg.xml            |   4 +-
 make/data/cldr/common/main/nmg_CM.xml         |   4 +-
 make/data/cldr/common/main/nn.xml             |  11 +-
 make/data/cldr/common/main/nn_NO.xml          |   4 +-
 make/data/cldr/common/main/nnh.xml            |   4 +-
 make/data/cldr/common/main/nnh_CM.xml         |   4 +-
 make/data/cldr/common/main/no.xml             |  29 +--
 make/data/cldr/common/main/nqo.xml            |   4 +-
 make/data/cldr/common/main/nqo_GN.xml         |   4 +-
 make/data/cldr/common/main/nr.xml             |   4 +-
 make/data/cldr/common/main/nr_ZA.xml          |   4 +-
 make/data/cldr/common/main/nso.xml            |   4 +-
 make/data/cldr/common/main/nso_ZA.xml         |   4 +-
 make/data/cldr/common/main/nus.xml            |   4 +-
 make/data/cldr/common/main/nus_SS.xml         |   4 +-
 make/data/cldr/common/main/nv.xml             |   4 +-
 make/data/cldr/common/main/nv_US.xml          |   4 +-
 make/data/cldr/common/main/ny.xml             |   4 +-
 make/data/cldr/common/main/ny_MW.xml          |   4 +-
 make/data/cldr/common/main/nyn.xml            |   4 +-
 make/data/cldr/common/main/nyn_UG.xml         |   4 +-
 make/data/cldr/common/main/oc.xml             |  16 +-
 make/data/cldr/common/main/oc_ES.xml          |  19 +-
 make/data/cldr/common/main/oc_FR.xml          |   4 +-
 make/data/cldr/common/main/om.xml             |   4 +-
 make/data/cldr/common/main/om_ET.xml          |   4 +-
 make/data/cldr/common/main/om_KE.xml          |   4 +-
 make/data/cldr/common/main/or.xml             |  43 +---
 make/data/cldr/common/main/or_IN.xml          |   4 +-
 make/data/cldr/common/main/os.xml             |   4 +-
 make/data/cldr/common/main/os_GE.xml          |   4 +-
 make/data/cldr/common/main/os_RU.xml          |   4 +-
 make/data/cldr/common/main/osa.xml            |   4 +-
 make/data/cldr/common/main/osa_US.xml         |   4 +-
 make/data/cldr/common/main/pa.xml             |  46 +----
 make/data/cldr/common/main/pa_Arab.xml        |   4 +-
 make/data/cldr/common/main/pa_Arab_PK.xml     |   4 +-
 make/data/cldr/common/main/pa_Guru.xml        |   4 +-
 make/data/cldr/common/main/pa_Guru_IN.xml     |   4 +-
 make/data/cldr/common/main/pap.xml            |   8 +-
 make/data/cldr/common/main/pap_AW.xml         |   4 +-
 make/data/cldr/common/main/pap_CW.xml         |   4 +-
 make/data/cldr/common/main/pcm.xml            |  43 +---
 make/data/cldr/common/main/pcm_NG.xml         |   4 +-
 make/data/cldr/common/main/pis.xml            |   4 +-
 make/data/cldr/common/main/pis_SB.xml         |   4 +-
 make/data/cldr/common/main/pl.xml             |  29 +--
 make/data/cldr/common/main/pl_PL.xml          |   4 +-
 make/data/cldr/common/main/prg.xml            |   4 +-
 make/data/cldr/common/main/prg_PL.xml         |   4 +-
 make/data/cldr/common/main/ps.xml             |  43 +---
 make/data/cldr/common/main/ps_AF.xml          |   4 +-
 make/data/cldr/common/main/ps_PK.xml          |   9 +-
 make/data/cldr/common/main/pt.xml             |  26 +--
 make/data/cldr/common/main/pt_AO.xml          |   4 +-
 make/data/cldr/common/main/pt_BR.xml          |   4 +-
 make/data/cldr/common/main/pt_CH.xml          |   4 +-
 make/data/cldr/common/main/pt_CV.xml          |   4 +-
 make/data/cldr/common/main/pt_GQ.xml          |   4 +-
 make/data/cldr/common/main/pt_GW.xml          |   4 +-
 make/data/cldr/common/main/pt_LU.xml          |   4 +-
 make/data/cldr/common/main/pt_MO.xml          |   4 +-
 make/data/cldr/common/main/pt_MZ.xml          |   4 +-
 make/data/cldr/common/main/pt_PT.xml          |  16 +-
 make/data/cldr/common/main/pt_ST.xml          |   4 +-
 make/data/cldr/common/main/pt_TL.xml          |   4 +-
 make/data/cldr/common/main/qu.xml             |  19 +-
 make/data/cldr/common/main/qu_BO.xml          |   4 +-
 make/data/cldr/common/main/qu_EC.xml          |   4 +-
 make/data/cldr/common/main/qu_PE.xml          |   4 +-
 make/data/cldr/common/main/quc.xml            |   4 +-
 make/data/cldr/common/main/quc_GT.xml         |   4 +-
 make/data/cldr/common/main/raj.xml            |   4 +-
 make/data/cldr/common/main/raj_IN.xml         |   4 +-
 make/data/cldr/common/main/rhg.xml            |   4 +-
 make/data/cldr/common/main/rhg_Rohg.xml       |   4 +-
 make/data/cldr/common/main/rhg_Rohg_BD.xml    |   4 +-
 make/data/cldr/common/main/rhg_Rohg_MM.xml    |   4 +-
 make/data/cldr/common/main/rif.xml            |  11 +-
 make/data/cldr/common/main/rif_MA.xml         |   4 +-
 make/data/cldr/common/main/rm.xml             |  10 +-
 make/data/cldr/common/main/rm_CH.xml          |   4 +-
 make/data/cldr/common/main/rn.xml             |   4 +-
 make/data/cldr/common/main/rn_BI.xml          |   4 +-
 make/data/cldr/common/main/ro.xml             |  29 +--
 make/data/cldr/common/main/ro_MD.xml          |   4 +-
 make/data/cldr/common/main/ro_RO.xml          |   4 +-
 make/data/cldr/common/main/rof.xml            |   4 +-
 make/data/cldr/common/main/rof_TZ.xml         |   4 +-
 make/data/cldr/common/main/root.xml           |  31 +--
 make/data/cldr/common/main/ru.xml             |  47 +----
 make/data/cldr/common/main/ru_BY.xml          |   4 +-
 make/data/cldr/common/main/ru_KG.xml          |   4 +-
 make/data/cldr/common/main/ru_KZ.xml          |   4 +-
 make/data/cldr/common/main/ru_MD.xml          |   4 +-
 make/data/cldr/common/main/ru_RU.xml          |   4 +-
 make/data/cldr/common/main/ru_UA.xml          |   4 +-
 make/data/cldr/common/main/rw.xml             |   4 +-
 make/data/cldr/common/main/rw_RW.xml          |   4 +-
 make/data/cldr/common/main/rwk.xml            |   4 +-
 make/data/cldr/common/main/rwk_TZ.xml         |   4 +-
 make/data/cldr/common/main/sa.xml             |   4 +-
 make/data/cldr/common/main/sa_IN.xml          |   4 +-
 make/data/cldr/common/main/sah.xml            |   4 +-
 make/data/cldr/common/main/sah_RU.xml         |   4 +-
 make/data/cldr/common/main/saq.xml            |   4 +-
 make/data/cldr/common/main/saq_KE.xml         |   4 +-
 make/data/cldr/common/main/sat.xml            |  26 +--
 make/data/cldr/common/main/sat_Deva.xml       |   4 +-
 make/data/cldr/common/main/sat_Deva_IN.xml    |   4 +-
 make/data/cldr/common/main/sat_Olck.xml       |   4 +-
 make/data/cldr/common/main/sat_Olck_IN.xml    |   4 +-
 make/data/cldr/common/main/sbp.xml            |   4 +-
 make/data/cldr/common/main/sbp_TZ.xml         |   4 +-
 make/data/cldr/common/main/sc.xml             |  20 +-
 make/data/cldr/common/main/sc_IT.xml          |   4 +-
 make/data/cldr/common/main/scn.xml            |   4 +-
 make/data/cldr/common/main/scn_IT.xml         |   4 +-
 make/data/cldr/common/main/sd.xml             |  43 +---
 make/data/cldr/common/main/sd_Arab.xml        |   4 +-
 make/data/cldr/common/main/sd_Arab_PK.xml     |   4 +-
 make/data/cldr/common/main/sd_Deva.xml        |   4 +-
 make/data/cldr/common/main/sd_Deva_IN.xml     |   4 +-
 make/data/cldr/common/main/sdh.xml            |   4 +-
 make/data/cldr/common/main/sdh_IQ.xml         |   4 +-
 make/data/cldr/common/main/sdh_IR.xml         |   4 +-
 make/data/cldr/common/main/se.xml             |   4 +-
 make/data/cldr/common/main/se_FI.xml          |  16 +-
 make/data/cldr/common/main/se_NO.xml          |   4 +-
 make/data/cldr/common/main/se_SE.xml          |   4 +-
 make/data/cldr/common/main/seh.xml            |   4 +-
 make/data/cldr/common/main/seh_MZ.xml         |   4 +-
 make/data/cldr/common/main/ses.xml            |   4 +-
 make/data/cldr/common/main/ses_ML.xml         |   4 +-
 make/data/cldr/common/main/sg.xml             |   4 +-
 make/data/cldr/common/main/sg_CF.xml          |   4 +-
 make/data/cldr/common/main/shi.xml            |   4 +-
 make/data/cldr/common/main/shi_Latn.xml       |   4 +-
 make/data/cldr/common/main/shi_Latn_MA.xml    |   4 +-
 make/data/cldr/common/main/shi_Tfng.xml       |   4 +-
 make/data/cldr/common/main/shi_Tfng_MA.xml    |   4 +-
 make/data/cldr/common/main/shn.xml            |   4 +-
 make/data/cldr/common/main/shn_MM.xml         |   4 +-
 make/data/cldr/common/main/shn_TH.xml         |   4 +-
 make/data/cldr/common/main/si.xml             |  46 +----
 make/data/cldr/common/main/si_LK.xml          |   4 +-
 make/data/cldr/common/main/sid.xml            |   4 +-
 make/data/cldr/common/main/sid_ET.xml         |   4 +-
 make/data/cldr/common/main/sk.xml             |  29 +--
 make/data/cldr/common/main/sk_SK.xml          |   4 +-
 make/data/cldr/common/main/skr.xml            |   4 +-
 make/data/cldr/common/main/skr_PK.xml         |   4 +-
 make/data/cldr/common/main/sl.xml             |  29 +--
 make/data/cldr/common/main/sl_SI.xml          |   4 +-
 make/data/cldr/common/main/sma.xml            |   4 +-
 make/data/cldr/common/main/sma_NO.xml         |   4 +-
 make/data/cldr/common/main/sma_SE.xml         |   4 +-
 make/data/cldr/common/main/smj.xml            |   4 +-
 make/data/cldr/common/main/smj_NO.xml         |   4 +-
 make/data/cldr/common/main/smj_SE.xml         |   4 +-
 make/data/cldr/common/main/smn.xml            |   4 +-
 make/data/cldr/common/main/smn_FI.xml         |   4 +-
 make/data/cldr/common/main/sms.xml            |   4 +-
 make/data/cldr/common/main/sms_FI.xml         |   4 +-
 make/data/cldr/common/main/sn.xml             |   4 +-
 make/data/cldr/common/main/sn_ZW.xml          |   4 +-
 make/data/cldr/common/main/so.xml             |  44 +---
 make/data/cldr/common/main/so_DJ.xml          |   4 +-
 make/data/cldr/common/main/so_ET.xml          |   4 +-
 make/data/cldr/common/main/so_KE.xml          |   4 +-
 make/data/cldr/common/main/so_SO.xml          |   4 +-
 make/data/cldr/common/main/sq.xml             |  38 +---
 make/data/cldr/common/main/sq_AL.xml          |   4 +-
 make/data/cldr/common/main/sq_MK.xml          |   4 +-
 make/data/cldr/common/main/sq_XK.xml          |   4 +-
 make/data/cldr/common/main/sr.xml             |  47 +----
 make/data/cldr/common/main/sr_Cyrl.xml        |   4 +-
 make/data/cldr/common/main/sr_Cyrl_BA.xml     |  17 +-
 make/data/cldr/common/main/sr_Cyrl_ME.xml     |   4 +-
 make/data/cldr/common/main/sr_Cyrl_RS.xml     |   4 +-
 make/data/cldr/common/main/sr_Cyrl_XK.xml     |   4 +-
 make/data/cldr/common/main/sr_Latn.xml        |  47 +----
 make/data/cldr/common/main/sr_Latn_BA.xml     |  17 +-
 make/data/cldr/common/main/sr_Latn_ME.xml     |   4 +-
 make/data/cldr/common/main/sr_Latn_RS.xml     |   4 +-
 make/data/cldr/common/main/sr_Latn_XK.xml     |   4 +-
 make/data/cldr/common/main/ss.xml             |   4 +-
 make/data/cldr/common/main/ss_SZ.xml          |   4 +-
 make/data/cldr/common/main/ss_ZA.xml          |   4 +-
 make/data/cldr/common/main/ssy.xml            |   4 +-
 make/data/cldr/common/main/ssy_ER.xml         |   4 +-
 make/data/cldr/common/main/st.xml             |   4 +-
 make/data/cldr/common/main/st_LS.xml          |   4 +-
 make/data/cldr/common/main/st_ZA.xml          |   4 +-
 make/data/cldr/common/main/su.xml             |   4 +-
 make/data/cldr/common/main/su_Latn.xml        |   4 +-
 make/data/cldr/common/main/su_Latn_ID.xml     |   4 +-
 make/data/cldr/common/main/sv.xml             |  32 +--
 make/data/cldr/common/main/sv_AX.xml          |   4 +-
 make/data/cldr/common/main/sv_FI.xml          |   4 +-
 make/data/cldr/common/main/sv_SE.xml          |   4 +-
 make/data/cldr/common/main/sw.xml             |  23 +--
 make/data/cldr/common/main/sw_CD.xml          |   4 +-
 make/data/cldr/common/main/sw_KE.xml          |  16 +-
 make/data/cldr/common/main/sw_TZ.xml          |   4 +-
 make/data/cldr/common/main/sw_UG.xml          |   4 +-
 make/data/cldr/common/main/syr.xml            |  42 +---
 make/data/cldr/common/main/syr_IQ.xml         |   4 +-
 make/data/cldr/common/main/syr_SY.xml         |   4 +-
 make/data/cldr/common/main/szl.xml            |  20 +-
 make/data/cldr/common/main/szl_PL.xml         |   4 +-
 make/data/cldr/common/main/ta.xml             | 133 ++++--------
 make/data/cldr/common/main/ta_IN.xml          |   4 +-
 make/data/cldr/common/main/ta_LK.xml          |   4 +-
 make/data/cldr/common/main/ta_MY.xml          |   4 +-
 make/data/cldr/common/main/ta_SG.xml          |   4 +-
 make/data/cldr/common/main/te.xml             |  47 +----
 make/data/cldr/common/main/te_IN.xml          |   4 +-
 make/data/cldr/common/main/teo.xml            |   4 +-
 make/data/cldr/common/main/teo_KE.xml         |   4 +-
 make/data/cldr/common/main/teo_UG.xml         |   4 +-
 make/data/cldr/common/main/tg.xml             |   4 +-
 make/data/cldr/common/main/tg_TJ.xml          |   4 +-
 make/data/cldr/common/main/th.xml             |  47 +----
 make/data/cldr/common/main/th_TH.xml          |   4 +-
 make/data/cldr/common/main/ti.xml             |  31 +--
 make/data/cldr/common/main/ti_ER.xml          |   4 +-
 make/data/cldr/common/main/ti_ET.xml          |   4 +-
 make/data/cldr/common/main/tig.xml            |   4 +-
 make/data/cldr/common/main/tig_ER.xml         |   4 +-
 make/data/cldr/common/main/tk.xml             |  43 +---
 make/data/cldr/common/main/tk_TM.xml          |   4 +-
 make/data/cldr/common/main/tn.xml             |   4 +-
 make/data/cldr/common/main/tn_BW.xml          |   4 +-
 make/data/cldr/common/main/tn_ZA.xml          |   4 +-
 make/data/cldr/common/main/to.xml             |  28 +--
 make/data/cldr/common/main/to_TO.xml          |   4 +-
 make/data/cldr/common/main/tok.xml            |   4 +-
 make/data/cldr/common/main/tok_001.xml        |   4 +-
 make/data/cldr/common/main/tpi.xml            |   4 +-
 make/data/cldr/common/main/tpi_PG.xml         |   4 +-
 make/data/cldr/common/main/tr.xml             |  29 +--
 make/data/cldr/common/main/tr_CY.xml          |   4 +-
 make/data/cldr/common/main/tr_TR.xml          |   4 +-
 make/data/cldr/common/main/trv.xml            |   4 +-
 make/data/cldr/common/main/trv_TW.xml         |   4 +-
 make/data/cldr/common/main/trw.xml            |  43 +---
 make/data/cldr/common/main/trw_PK.xml         |   4 +-
 make/data/cldr/common/main/ts.xml             |   4 +-
 make/data/cldr/common/main/ts_ZA.xml          |   4 +-
 make/data/cldr/common/main/tt.xml             |   4 +-
 make/data/cldr/common/main/tt_RU.xml          |   4 +-
 make/data/cldr/common/main/twq.xml            |   4 +-
 make/data/cldr/common/main/twq_NE.xml         |   4 +-
 make/data/cldr/common/main/tyv.xml            |   4 +-
 make/data/cldr/common/main/tyv_RU.xml         |   4 +-
 make/data/cldr/common/main/tzm.xml            |   4 +-
 make/data/cldr/common/main/tzm_MA.xml         |   4 +-
 make/data/cldr/common/main/ug.xml             |  16 +-
 make/data/cldr/common/main/ug_CN.xml          |   4 +-
 make/data/cldr/common/main/uk.xml             |  51 +----
 make/data/cldr/common/main/uk_UA.xml          |   4 +-
 make/data/cldr/common/main/ur.xml             |  47 +----
 make/data/cldr/common/main/ur_IN.xml          |   9 +-
 make/data/cldr/common/main/ur_PK.xml          |   4 +-
 make/data/cldr/common/main/uz.xml             |  43 +---
 make/data/cldr/common/main/uz_Arab.xml        |   4 +-
 make/data/cldr/common/main/uz_Arab_AF.xml     |   4 +-
 make/data/cldr/common/main/uz_Cyrl.xml        |   9 +-
 make/data/cldr/common/main/uz_Cyrl_UZ.xml     |   4 +-
 make/data/cldr/common/main/uz_Latn.xml        |   4 +-
 make/data/cldr/common/main/uz_Latn_UZ.xml     |   4 +-
 make/data/cldr/common/main/vai.xml            |   4 +-
 make/data/cldr/common/main/vai_Latn.xml       |   4 +-
 make/data/cldr/common/main/vai_Latn_LR.xml    |   4 +-
 make/data/cldr/common/main/vai_Vaii.xml       |   4 +-
 make/data/cldr/common/main/vai_Vaii_LR.xml    |   4 +-
 make/data/cldr/common/main/ve.xml             |   4 +-
 make/data/cldr/common/main/ve_ZA.xml          |   4 +-
 make/data/cldr/common/main/vec.xml            |  28 +--
 make/data/cldr/common/main/vec_IT.xml         |   4 +-
 make/data/cldr/common/main/vi.xml             | 116 +++++------
 make/data/cldr/common/main/vi_VN.xml          |   4 +-
 make/data/cldr/common/main/vmw.xml            |   4 +-
 make/data/cldr/common/main/vmw_MZ.xml         |   4 +-
 make/data/cldr/common/main/vo.xml             |   4 +-
 make/data/cldr/common/main/vo_001.xml         |   4 +-
 make/data/cldr/common/main/vun.xml            |   4 +-
 make/data/cldr/common/main/vun_TZ.xml         |   4 +-
 make/data/cldr/common/main/wa.xml             |   4 +-
 make/data/cldr/common/main/wa_BE.xml          |   4 +-
 make/data/cldr/common/main/wae.xml            |   4 +-
 make/data/cldr/common/main/wae_CH.xml         |   4 +-
 make/data/cldr/common/main/wal.xml            |   4 +-
 make/data/cldr/common/main/wal_ET.xml         |   4 +-
 make/data/cldr/common/main/wbp.xml            |   4 +-
 make/data/cldr/common/main/wbp_AU.xml         |   4 +-
 make/data/cldr/common/main/wo.xml             |   4 +-
 make/data/cldr/common/main/wo_SN.xml          |   4 +-
 make/data/cldr/common/main/xh.xml             |  19 +-
 make/data/cldr/common/main/xh_ZA.xml          |   4 +-
 make/data/cldr/common/main/xnr.xml            |  16 +-
 make/data/cldr/common/main/xnr_IN.xml         |   4 +-
 make/data/cldr/common/main/xog.xml            |   4 +-
 make/data/cldr/common/main/xog_UG.xml         |   4 +-
 make/data/cldr/common/main/yav.xml            |   4 +-
 make/data/cldr/common/main/yav_CM.xml         |   4 +-
 make/data/cldr/common/main/yi.xml             |   4 +-
 make/data/cldr/common/main/yi_UA.xml          |   4 +-
 make/data/cldr/common/main/yo.xml             |  31 +--
 make/data/cldr/common/main/yo_BJ.xml          |  11 +-
 make/data/cldr/common/main/yo_NG.xml          |   4 +-
 make/data/cldr/common/main/yrl.xml            |  47 +----
 make/data/cldr/common/main/yrl_BR.xml         |   4 +-
 make/data/cldr/common/main/yrl_CO.xml         |   4 +-
 make/data/cldr/common/main/yrl_VE.xml         |   4 +-
 make/data/cldr/common/main/yue.xml            |  47 +----
 make/data/cldr/common/main/yue_Hans.xml       |  47 +----
 make/data/cldr/common/main/yue_Hans_CN.xml    |   4 +-
 make/data/cldr/common/main/yue_Hant.xml       |   4 +-
 make/data/cldr/common/main/yue_Hant_HK.xml    |   4 +-
 make/data/cldr/common/main/za.xml             |   4 +-
 make/data/cldr/common/main/za_CN.xml          |   4 +-
 make/data/cldr/common/main/zgh.xml            |   4 +-
 make/data/cldr/common/main/zgh_MA.xml         |   4 +-
 make/data/cldr/common/main/zh.xml             |  47 +----
 make/data/cldr/common/main/zh_Hans.xml        |   4 +-
 make/data/cldr/common/main/zh_Hans_CN.xml     |   4 +-
 make/data/cldr/common/main/zh_Hans_HK.xml     |   4 +-
 make/data/cldr/common/main/zh_Hans_MO.xml     |   4 +-
 make/data/cldr/common/main/zh_Hans_SG.xml     |   4 +-
 make/data/cldr/common/main/zh_Hant.xml        |  47 +----
 make/data/cldr/common/main/zh_Hant_HK.xml     |  28 +--
 make/data/cldr/common/main/zh_Hant_MO.xml     |   4 +-
 make/data/cldr/common/main/zh_Hant_TW.xml     |   4 +-
 make/data/cldr/common/main/zu.xml             |  47 +----
 make/data/cldr/common/main/zu_ZA.xml          |   4 +-
 .../cldr/common/properties/coverageLevels.txt |   1 -
 .../common/supplemental/coverageLevels.xml    |   8 +-
 .../common/supplemental/languageGroup.xml     |  18 +-
 .../cldr/common/supplemental/languageInfo.xml |   1 -
 .../common/supplemental/likelySubtags.xml     |  33 ++-
 .../cldr/common/supplemental/metaZones.xml    |  61 ++----
 .../cldr/common/supplemental/ordinals.xml     |   2 +-
 .../cldr/common/supplemental/pluralRanges.xml |   2 +-
 .../data/cldr/common/supplemental/plurals.xml |   2 +-
 .../cldr/common/supplemental/subdivisions.xml |   2 +-
 .../common/supplemental/supplementalData.xml  |  26 +--
 .../supplemental/supplementalMetadata.xml     |  22 ++
 make/data/cldr/common/supplemental/units.xml  |  36 ++++
 .../cldr/common/supplemental/windowsZones.xml |  21 +-
 .../java/util/spi/LocaleServiceProvider.java  |   2 +
 src/java.base/share/legal/cldr.md             |  57 +++++-
 src/jdk.localedata/share/legal/cldr.md        |  57 +++++-
 .../TestCompactNumber.java                    |  14 +-
 .../TestParseBigDecimal.java                  |  10 +-
 1075 files changed, 2761 insertions(+), 7094 deletions(-)
 rename make/data/cldr/{LICENSE.txt => LICENSE} (95%)
 delete mode 100644 make/data/cldr/README
 create mode 100644 make/data/cldr/README-common.md

diff --git a/make/data/cldr/LICENSE.txt b/make/data/cldr/LICENSE
similarity index 95%
rename from make/data/cldr/LICENSE.txt
rename to make/data/cldr/LICENSE
index 4c6a432d713..99bd0beafbb 100644
--- a/make/data/cldr/LICENSE.txt
+++ b/make/data/cldr/LICENSE
@@ -1,8 +1,8 @@
-UNICODE LICENSE V3
+UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 2019-2023 Unicode, Inc.
+Copyright © 1991-2024 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
@@ -37,3 +37,5 @@ Except as contained in this notice, the name of a copyright holder shall
 not be used in advertising or otherwise to promote the sale, use or other
 dealings in these Data Files or Software without prior written
 authorization of the copyright holder.
+
+SPDX-License-Identifier: Unicode-3.0
diff --git a/make/data/cldr/README b/make/data/cldr/README
deleted file mode 100644
index 16cb6ba56c7..00000000000
--- a/make/data/cldr/README
+++ /dev/null
@@ -1,4 +0,0 @@
-CLDR - Unicode Common Locale Data Repository
-http://cldr.unicode.org
-
-CLDR version installed: 44
diff --git a/make/data/cldr/README-common.md b/make/data/cldr/README-common.md
new file mode 100644
index 00000000000..cadf839fb26
--- /dev/null
+++ b/make/data/cldr/README-common.md
@@ -0,0 +1,10 @@
+# CLDR Common Data
+
+This zipfile contains [CLDR](http://cldr.unicode.org) Common Data.
+
+## LICENSE
+
+See [LICENSE.txt](./LICENSE.txt)
+
+>Copyright © 2019-2022 Unicode, Inc. All rights reserved.
+>Distributed under the Terms of Use in https://www.unicode.org/copyright.html
\ No newline at end of file
diff --git a/make/data/cldr/common/bcp47/collation.xml b/make/data/cldr/common/bcp47/collation.xml
index afbfa0079fd..bb51229ede1 100644
--- a/make/data/cldr/common/bcp47/collation.xml
+++ b/make/data/cldr/common/bcp47/collation.xml
@@ -21,7 +21,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="phonebk" description="Phonebook style ordering (such as in German)" alias="phonebook"/>
             <type name="phonetic" description="Phonetic ordering (sorting based on pronunciation)"/>
             <type name="pinyin" description="Pinyin ordering for Latin and for CJK characters (used in Chinese)"/>
-            <type name="reformed" description="Reformed ordering (such as in Swedish)"/>
+            <type name="reformed" description="Reformed ordering (such as in Swedish)" deprecated="true"/>
             <type name="search" description="Special collation type for string search" since="1.9"/>
             <type name="searchjl" description="Special collation type for Korean initial consonant search" since="2.0.1"/>
             <type name="standard" description="Default ordering for each language"/>
diff --git a/make/data/cldr/common/bcp47/currency.xml b/make/data/cldr/common/bcp47/currency.xml
index f357a38dd2f..7b291fba785 100644
--- a/make/data/cldr/common/bcp47/currency.xml
+++ b/make/data/cldr/common/bcp47/currency.xml
@@ -291,6 +291,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="xbc" description="European Unit of Account (XBC)" since="1.9"/>
             <type name="xbd" description="European Unit of Account (XBD)" since="1.9"/>
             <type name="xcd" description="East Caribbean Dollar"/>
+            <type name="xcg" description="Caribbean Guilder"/>
             <type name="xdr" description="Special Drawing Rights" since="1.9"/>
             <type name="xeu" description="European Currency Unit" since="1.9"/>
             <type name="xfo" description="French Gold Franc" since="1.9"/>
diff --git a/make/data/cldr/common/dtd/ldml.dtd b/make/data/cldr/common/dtd/ldml.dtd
index 9b9b7b60cac..d968a6962d5 100644
--- a/make/data/cldr/common/dtd/ldml.dtd
+++ b/make/data/cldr/common/dtd/ldml.dtd
@@ -1,7 +1,7 @@
 <!--
-Copyright © 1991-2023 Unicode, Inc.
+Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
@@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "44" >
+<!ATTLIST version cldrVersion CDATA #FIXED "45" >
     <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
diff --git a/make/data/cldr/common/dtd/ldml.xsd b/make/data/cldr/common/dtd/ldml.xsd
index 56a64a730a8..92a0f548286 100644
--- a/make/data/cldr/common/dtd/ldml.xsd
+++ b/make/data/cldr/common/dtd/ldml.xsd
@@ -5,9 +5,9 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
 -->
 
 <!--
-  Copyright © 1991-2023 Unicode, Inc.
+  Copyright © 1991-2024 Unicode, Inc.
   For terms of use, see http://www.unicode.org/copyright.html
-  SPDX-License-Identifier: Unicode-DFS-2016
+  SPDX-License-Identifier: Unicode-3.0
   CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
   <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
@@ -128,10 +128,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="44" name="cldrVersion">
+      <xs:attribute default="45" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="44"/>
+            <xs:enumeration value="45"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
diff --git a/make/data/cldr/common/dtd/ldmlBCP47.dtd b/make/data/cldr/common/dtd/ldmlBCP47.dtd
index 14ddc68d72f..f608a6e8a60 100644
--- a/make/data/cldr/common/dtd/ldmlBCP47.dtd
+++ b/make/data/cldr/common/dtd/ldmlBCP47.dtd
@@ -1,7 +1,7 @@
 <!--
-Copyright © 1991-2023 Unicode, Inc.
+Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "44" >
+<!ATTLIST version cldrVersion CDATA #FIXED "45" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 
diff --git a/make/data/cldr/common/dtd/ldmlBCP47.xsd b/make/data/cldr/common/dtd/ldmlBCP47.xsd
index b38e4566df4..39d6cd2d2c6 100644
--- a/make/data/cldr/common/dtd/ldmlBCP47.xsd
+++ b/make/data/cldr/common/dtd/ldmlBCP47.xsd
@@ -5,9 +5,9 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
 -->
 
 <!--
-  Copyright © 1991-2023 Unicode, Inc.
+  Copyright © 1991-2024 Unicode, Inc.
   For terms of use, see http://www.unicode.org/copyright.html
-  SPDX-License-Identifier: Unicode-DFS-2016
+  SPDX-License-Identifier: Unicode-3.0
   CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
   <xs:element name="ldmlBCP47">
@@ -24,10 +24,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="44" name="cldrVersion">
+      <xs:attribute default="45" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="44"/>
+            <xs:enumeration value="45"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
diff --git a/make/data/cldr/common/dtd/ldmlICU.dtd b/make/data/cldr/common/dtd/ldmlICU.dtd
index e8abdedcbab..c6058c4c3b2 100644
--- a/make/data/cldr/common/dtd/ldmlICU.dtd
+++ b/make/data/cldr/common/dtd/ldmlICU.dtd
@@ -1,7 +1,7 @@
 <!--
 Copyright © 1991-2021 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
diff --git a/make/data/cldr/common/dtd/ldmlSupplemental.dtd b/make/data/cldr/common/dtd/ldmlSupplemental.dtd
index 7841782b878..864e696e030 100644
--- a/make/data/cldr/common/dtd/ldmlSupplemental.dtd
+++ b/make/data/cldr/common/dtd/ldmlSupplemental.dtd
@@ -1,21 +1,21 @@
 <!--
-Copyright © 1991-2023 Unicode, Inc.
+Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
-<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitIdComponents?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales*, personNamesDefaults?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
+<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitIdComponents?, unitPrefixes?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales*, personNamesDefaults?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
 
 <!ELEMENT version EMPTY >
     <!--@METADATA-->
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:any-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "44" >
+<!ATTLIST version cldrVersion CDATA #FIXED "45" >
     <!--@MATCH:version-->
     <!--@VALUE-->
-<!ATTLIST version unicodeVersion CDATA #FIXED "15.0.0" >
+<!ATTLIST version unicodeVersion CDATA #FIXED "15.1.0" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 
@@ -75,12 +75,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!-- use from and to instead. -->
     <!--@VALUE-->
     <!--@DEPRECATED-->
+<!ATTLIST currency iso4217 NMTOKEN #REQUIRED >
+    <!--@MATCH:validity/currency-->
 <!ATTLIST currency from NMTOKEN #IMPLIED >
     <!--@MATCH:time/yyyy-MM-dd-->
 <!ATTLIST currency to NMTOKEN #IMPLIED >
     <!--@MATCH:time/yyyy-MM-dd-->
-<!ATTLIST currency iso4217 NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/currency-->
+<!ATTLIST currency tz CDATA #IMPLIED >
+    <!--@MATCH:bcp47/tz-->
+    <!--@VALUE-->
+<!ATTLIST currency to-tz CDATA #IMPLIED >
+    <!--@MATCH:bcp47/tz-->
+    <!--@VALUE-->
 <!ATTLIST currency digits NMTOKEN #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST currency rounding NMTOKEN #IMPLIED >
@@ -388,6 +394,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:set/regex/[a-z]+[0-9]*-->
     <!--@VALUE-->
 
+<!ELEMENT unitPrefixes ( unitPrefix* ) >
+
+<!ELEMENT unitPrefix EMPTY >
+    <!-- <unitPrefix type='quecto' symbol='q' power10='-30'>
+		<unitPrefix type='kibi' symbol='Ki' power2='10'> -->
+<!ATTLIST unitPrefix type NMTOKEN #REQUIRED >
+    <!--@MATCH:regex/[A-Za-z]{3,6}-->
+<!ATTLIST unitPrefix symbol NMTOKEN #REQUIRED >
+    <!--@MATCH:regex/[a-zA-Zμ]{1,2}-->
+    <!--@VALUE-->
+<!ATTLIST unitPrefix power10 NMTOKEN #IMPLIED >
+    <!--@MATCH:regex/-?[0-9]{1,2}-->
+    <!--@VALUE-->
+<!ATTLIST unitPrefix power2 NMTOKEN #IMPLIED >
+    <!--@MATCH:regex/[0-9]0-->
+    <!--@VALUE-->
+
 <!ELEMENT unitConstants ( unitConstant* ) >
 
 <!ELEMENT unitConstant EMPTY >
@@ -432,6 +455,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST convertUnit offset CDATA #IMPLIED >
     <!--@MATCH:regex/[-+*/\._ 0-9a-zA-Z]+-->
     <!--@VALUE-->
+<!ATTLIST convertUnit special NMTOKEN #IMPLIED >
+    <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
+    <!--@VALUE-->
 <!ATTLIST convertUnit systems NMTOKENS #IMPLIED >
     <!--@MATCH:set/literal/si, si_acceptable, metric, metric_adjacent, ussystem, uksystem, jpsystem, astronomical, person_age, other, prefixable-->
     <!--@VALUE-->
@@ -912,12 +938,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!-- # Parent locales -->
 
 <!ELEMENT parentLocales ( parentLocale* ) >
-<!ATTLIST parentLocales component NMTOKEN #IMPLIED >
-    <!--@MATCH:literal/segmentations, collations-->
+<!ATTLIST parentLocales component NMTOKENS #IMPLIED >
+    <!--@MATCH:set/literal/segmentations, collations, plurals, grammaticalFeatures-->
 
 <!ELEMENT parentLocale EMPTY >
 <!ATTLIST parentLocale parent NMTOKEN #REQUIRED >
     <!--@MATCH:validity/locale-->
+<!ATTLIST parentLocale localeRules NMTOKENS #IMPLIED >
+    <!--@MATCH:set/literal/nonlikelyScript-->
+    <!--@VALUE-->
 <!ATTLIST parentLocale locales NMTOKENS #REQUIRED >
     <!--@MATCH:set/validity/locale-->
     <!--@VALUE-->
diff --git a/make/data/cldr/common/dtd/ldmlSupplemental.xsd b/make/data/cldr/common/dtd/ldmlSupplemental.xsd
index 7c07d2b1b9e..2aeeecf1084 100644
--- a/make/data/cldr/common/dtd/ldmlSupplemental.xsd
+++ b/make/data/cldr/common/dtd/ldmlSupplemental.xsd
@@ -5,9 +5,9 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
 -->
 
 <!--
-  Copyright © 1991-2023 Unicode, Inc.
+  Copyright © 1991-2024 Unicode, Inc.
   For terms of use, see http://www.unicode.org/copyright.html
-  SPDX-License-Identifier: Unicode-DFS-2016
+  SPDX-License-Identifier: Unicode-3.0
   CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
   <xs:element name="supplementalData">
@@ -28,6 +28,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
         <xs:element minOccurs="0" ref="timeData"/>
         <xs:element minOccurs="0" ref="measurementData"/>
         <xs:element minOccurs="0" ref="unitIdComponents"/>
+        <xs:element minOccurs="0" ref="unitPrefixes"/>
         <xs:element maxOccurs="unbounded" minOccurs="0" ref="unitConstants"/>
         <xs:element maxOccurs="unbounded" minOccurs="0" ref="unitQuantities"/>
         <xs:element maxOccurs="unbounded" minOccurs="0" ref="convertUnits"/>
@@ -63,17 +64,17 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="44" name="cldrVersion">
+      <xs:attribute default="45" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="44"/>
+            <xs:enumeration value="45"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
-      <xs:attribute default="15.0.0" name="unicodeVersion">
+      <xs:attribute default="15.1.0" name="unicodeVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="15.0.0"/>
+            <xs:enumeration value="15.1.0"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -209,9 +210,11 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
         <xs:element maxOccurs="unbounded" minOccurs="0" ref="alternate"/>
       </xs:sequence>
       <xs:attribute name="before" type="xs:NMTOKEN"/>
+      <xs:attribute name="iso4217" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="from" type="xs:NMTOKEN"/>
       <xs:attribute name="to" type="xs:NMTOKEN"/>
-      <xs:attribute name="iso4217" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="tz"/>
+      <xs:attribute name="to-tz"/>
       <xs:attribute name="digits" type="xs:NMTOKEN"/>
       <xs:attribute name="rounding" type="xs:NMTOKEN"/>
       <xs:attribute name="cashRounding" type="xs:NMTOKEN"/>
@@ -251,6 +254,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
+  
+  
+  
   <xs:element name="alternate">
     <xs:complexType>
       <xs:attribute name="iso4217" type="xs:NMTOKEN" use="required"/>
@@ -919,6 +926,32 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  <xs:element name="unitPrefixes">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="unitPrefix"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="unitPrefix">
+    <xs:complexType>
+      <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="symbol" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="power10" type="xs:NMTOKEN"/>
+      <xs:attribute name="power2" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <!--
+    <unitPrefix type='quecto' symbol='q' power10='-30'>
+    <unitPrefix type='kibi' symbol='Ki' power2='10'>
+  -->
+  
+  
+  
+  
+  
+  
+  
   <xs:element name="unitConstants">
     <xs:complexType>
       <xs:sequence>
@@ -976,6 +1009,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="baseUnit" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="factor"/>
       <xs:attribute name="offset"/>
+      <xs:attribute name="special" type="xs:NMTOKEN"/>
       <xs:attribute name="systems" type="xs:NMTOKENS"/>
       <xs:attribute name="description"/>
     </xs:complexType>
@@ -991,6 +1025,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
+  
   <xs:element name="unitPreferenceData">
     <xs:complexType>
       <xs:sequence>
@@ -2049,19 +2085,22 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:sequence>
         <xs:element maxOccurs="unbounded" minOccurs="0" ref="parentLocale"/>
       </xs:sequence>
-      <xs:attribute name="component" type="xs:NMTOKEN"/>
+      <xs:attribute name="component" type="xs:NMTOKENS"/>
     </xs:complexType>
   </xs:element>
   
   <xs:element name="parentLocale">
     <xs:complexType>
       <xs:attribute name="parent" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="localeRules" type="xs:NMTOKENS"/>
       <xs:attribute name="locales" type="xs:NMTOKENS" use="required"/>
     </xs:complexType>
   </xs:element>
   
   
   
+  
+  
   <xs:element name="personNamesDefaults">
     <xs:complexType>
       <xs:choice>
diff --git a/make/data/cldr/common/main/aa.xml b/make/data/cldr/common/main/aa.xml
index 9e4fba43ed0..bb823863fa4 100644
--- a/make/data/cldr/common/main/aa.xml
+++ b/make/data/cldr/common/main/aa.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/aa_DJ.xml b/make/data/cldr/common/main/aa_DJ.xml
index f8f3194a14f..e5e7af3d720 100644
--- a/make/data/cldr/common/main/aa_DJ.xml
+++ b/make/data/cldr/common/main/aa_DJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/aa_ER.xml b/make/data/cldr/common/main/aa_ER.xml
index ea1daef97dc..d1d87be1704 100644
--- a/make/data/cldr/common/main/aa_ER.xml
+++ b/make/data/cldr/common/main/aa_ER.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/aa_ET.xml b/make/data/cldr/common/main/aa_ET.xml
index 6ccfb6dad6b..3a8f936daf9 100644
--- a/make/data/cldr/common/main/aa_ET.xml
+++ b/make/data/cldr/common/main/aa_ET.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ab.xml b/make/data/cldr/common/main/ab.xml
index 748b80ce388..0a0bf6d526e 100644
--- a/make/data/cldr/common/main/ab.xml
+++ b/make/data/cldr/common/main/ab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Proper interpretation of these files requires synthesis of missing items, as per
@@ -1733,9 +1733,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity draft="unconfirmed">Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity draft="unconfirmed">Иеллоунаиф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity draft="unconfirmed">Едмонтон</exemplarCity>
 			</zone>
@@ -1754,30 +1751,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity draft="unconfirmed">Резолиут</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity draft="unconfirmed">Реини-Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity draft="unconfirmed">Ранкин-Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity draft="unconfirmed">Корал-Харбор</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity draft="unconfirmed">Тандер-Беи</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity draft="unconfirmed">Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity draft="unconfirmed">Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity draft="unconfirmed">Икалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity draft="unconfirmed">Пангниртанг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity draft="unconfirmed">Монктон</exemplarCity>
 			</zone>
@@ -2585,18 +2570,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity draft="unconfirmed">Дар-ес-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="unconfirmed">Ужҳород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity draft="unconfirmed">Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity draft="unconfirmed">Симферопол</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">Запороже</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity draft="unconfirmed">Кампала</exemplarCity>
 			</zone>
@@ -2612,9 +2591,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Nome">
 				<exemplarCity draft="unconfirmed">Ном</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity draft="unconfirmed">Џонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity draft="unconfirmed">Анкориџ</exemplarCity>
 			</zone>
@@ -3314,11 +3290,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="unconfirmed">Макао, аԥхынтәи аамҭа</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">Маккуори</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="unconfirmed">Магадан</generic>
@@ -3358,13 +3329,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="unconfirmed">Моусон</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">Аҩадамра-Ҭашәаратәи амексикатә аамҭа</generic>
-					<standard draft="unconfirmed">Аҩадамра-Ҭашәаратәи амексикатә астандартә аамҭа</standard>
-					<daylight draft="unconfirmed">Аҩадамра-Ҭашәаратәи амексикатә аԥхынтәи аамҭа</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">Аокеанҭынчтәи амексикатә аамҭа</generic>
diff --git a/make/data/cldr/common/main/ab_GE.xml b/make/data/cldr/common/main/ab_GE.xml
index 60180381674..25fd9298245 100644
--- a/make/data/cldr/common/main/ab_GE.xml
+++ b/make/data/cldr/common/main/ab_GE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Proper interpretation of these files requires synthesis of missing items, as per
diff --git a/make/data/cldr/common/main/af.xml b/make/data/cldr/common/main/af.xml
index 04667f25fb6..36c0414e442 100644
--- a/make/data/cldr/common/main/af.xml
+++ b/make/data/cldr/common/main/af.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -909,7 +909,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Foonboek-sorteervolgorde</type>
 			<type key="collation" type="phonetic">Fonetiese sorteerorde</type>
 			<type key="collation" type="pinyin">Pinyin-sorteervolgorde</type>
-			<type key="collation" type="reformed">Gereformeerde sorteervolgorde</type>
 			<type key="collation" type="search">Algemenedoel-soektog</type>
 			<type key="collation" type="searchjl">Soek volgens Hangul-beginkonsonant</type>
 			<type key="collation" type="standard">Standaard rangskikvolgorde</type>
@@ -2053,9 +2052,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0}-tyd</regionFormat>
 			<regionFormat type="daylight">{0}-dagligtyd</regionFormat>
 			<regionFormat type="standard">{0}-standaardtyd</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Gekoördineerde universele tyd</standard>
@@ -2076,9 +2072,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wene</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Baku">
 				<exemplarCity>Bakoe</exemplarCity>
 			</zone>
@@ -2097,12 +2090,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Cambridge_Bay">
 				<exemplarCity>Cambridgebaai</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Rainyrivier</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Thunderbaai</exemplarCity>
-			</zone>
 			<zone type="America/Goose_Bay">
 				<exemplarCity>Goosebaai</exemplarCity>
 			</zone>
@@ -2894,11 +2881,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Lord Howe-dagligtyd</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie-eiland-tyd</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan-tyd</generic>
@@ -2938,13 +2920,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawson-tyd</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Noordwes-Meksiko-tyd</generic>
-					<standard>Noordwes-Meksiko-standaardtyd</standard>
-					<daylight>Noordwes-Meksiko-dagligtyd</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksikaanse Pasifiese tyd</generic>
diff --git a/make/data/cldr/common/main/af_NA.xml b/make/data/cldr/common/main/af_NA.xml
index 8fcdfbca3ff..555c035b0b0 100644
--- a/make/data/cldr/common/main/af_NA.xml
+++ b/make/data/cldr/common/main/af_NA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/af_ZA.xml b/make/data/cldr/common/main/af_ZA.xml
index caa5bc3f19f..5d04978a1e8 100644
--- a/make/data/cldr/common/main/af_ZA.xml
+++ b/make/data/cldr/common/main/af_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/agq.xml b/make/data/cldr/common/main/agq.xml
index 29048780424..29ca92bb633 100644
--- a/make/data/cldr/common/main/agq.xml
+++ b/make/data/cldr/common/main/agq.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/agq_CM.xml b/make/data/cldr/common/main/agq_CM.xml
index 8bba291e7b3..4ed8914f419 100644
--- a/make/data/cldr/common/main/agq_CM.xml
+++ b/make/data/cldr/common/main/agq_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ak.xml b/make/data/cldr/common/main/ak.xml
index 57e67d88f2f..210bde48f91 100644
--- a/make/data/cldr/common/main/ak.xml
+++ b/make/data/cldr/common/main/ak.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ak_GH.xml b/make/data/cldr/common/main/ak_GH.xml
index d93cf2563fd..820e726a52c 100644
--- a/make/data/cldr/common/main/ak_GH.xml
+++ b/make/data/cldr/common/main/ak_GH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/am.xml b/make/data/cldr/common/main/am.xml
index c0f69016a30..d8ed339d21c 100644
--- a/make/data/cldr/common/main/am.xml
+++ b/make/data/cldr/common/main/am.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -985,7 +985,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">የስልክ ደብተር ድርድር ቅደም ተከተል</type>
 			<type key="collation" type="phonetic">የፎነቲክ ድርደራ ቅደም ተከተል</type>
 			<type key="collation" type="pinyin">ፒንይን የድርድር ቅደም ተከተል</type>
-			<type key="collation" type="reformed">ዳግም የተፈጠረ የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="search">ለጠቅላላ ጉዳይ ፍለጋ</type>
 			<type key="collation" type="searchjl">በሃንጉል የመጀመሪያ ተነባቢ ፈልግ</type>
 			<type key="collation" type="standard">መደበኛ</type>
@@ -1982,9 +1981,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} ጊዜ</regionFormat>
 			<regionFormat type="daylight">{0} የቀን ብርሃን ሰዓት</regionFormat>
 			<regionFormat type="standard">{0} መደበኛ ሰዓት</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>ሳንታ ኢዛቤል</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>የተቀነባበረ ሁለገብ ሰዓት</standard>
@@ -2107,9 +2103,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ሜልቦርን</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ከሪ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ሆባርት</exemplarCity>
 			</zone>
@@ -2263,9 +2256,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ክረስተን</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>የሎውናይፍ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ኤድመንተን</exemplarCity>
 			</zone>
@@ -2284,30 +2274,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ሪዞሊዩት</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ሬኒ ሪቨር</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ራንኪን ኢንሌት</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>አቲኮካን</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ተንደር ቤይ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ኒፒጎን</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ቶሮንቶ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ኢኳሊውት</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ፓንግኒርተንግ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ሞንክቶን</exemplarCity>
 			</zone>
@@ -3121,18 +3099,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ዳሬ ሰላም</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ኡዝጎሮድ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>ኪየቭ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ሲምፈሮፖል</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ዛፖሮዚይ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>ካምፓላ</exemplarCity>
 			</zone>
@@ -3151,9 +3123,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ሆኖሉሉ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ጆንስተን</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>አንኮራጅ</exemplarCity>
 			</zone>
@@ -3803,11 +3772,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>የሎርድ ሆዌ የቀን ሰዓት አቆጣጠር</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>የማከሪ ደሴት ሰዓት</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>የማጋዳን የሰዓት አቆጣጠር</generic>
@@ -3847,13 +3811,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>የማውሰን ሰዓት</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>ሰሜናዊ ምእራብ የሜክሲኮ ሰዓት አቆጣጠር</generic>
-					<standard>ሰሜናዊ ምእራብ የሜክሲኮ መደበኛ ሰዓት አቆጣጠር</standard>
-					<daylight>ሰሜናዊ ምእራብ የሜክሲኮ የቀን ሰዓት አቆጣጠር</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>የሜክሲኮ ፓሲፊክ ሰዓት አቆጣጠር</generic>
diff --git a/make/data/cldr/common/main/am_ET.xml b/make/data/cldr/common/main/am_ET.xml
index 053774606a2..c66f2029440 100644
--- a/make/data/cldr/common/main/am_ET.xml
+++ b/make/data/cldr/common/main/am_ET.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/an.xml b/make/data/cldr/common/main/an.xml
index 52a1d5be479..58d722c1821 100644
--- a/make/data/cldr/common/main/an.xml
+++ b/make/data/cldr/common/main/an.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/an_ES.xml b/make/data/cldr/common/main/an_ES.xml
index 03e10f9bda6..7e83c2651ea 100644
--- a/make/data/cldr/common/main/an_ES.xml
+++ b/make/data/cldr/common/main/an_ES.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ann.xml b/make/data/cldr/common/main/ann.xml
index 2be454cafbf..49486a7f08f 100644
--- a/make/data/cldr/common/main/ann.xml
+++ b/make/data/cldr/common/main/ann.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ann_NG.xml b/make/data/cldr/common/main/ann_NG.xml
index 30d805cf192..66709ee4860 100644
--- a/make/data/cldr/common/main/ann_NG.xml
+++ b/make/data/cldr/common/main/ann_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/apc.xml b/make/data/cldr/common/main/apc.xml
index 91484788d5a..1db7a71aa2d 100644
--- a/make/data/cldr/common/main/apc.xml
+++ b/make/data/cldr/common/main/apc.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
diff --git a/make/data/cldr/common/main/apc_SY.xml b/make/data/cldr/common/main/apc_SY.xml
index b6113b39be2..e249c49bf9a 100644
--- a/make/data/cldr/common/main/apc_SY.xml
+++ b/make/data/cldr/common/main/apc_SY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar.xml b/make/data/cldr/common/main/ar.xml
index 25dbef48553..9d980918278 100644
--- a/make/data/cldr/common/main/ar.xml
+++ b/make/data/cldr/common/main/ar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1114,7 +1114,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">الترتيب حسب دليل الهاتف</type>
 			<type key="collation" type="phonetic">الترتيب حسب اللفظ</type>
 			<type key="collation" type="pinyin">الترتيب حسب نظام بنيين الصيني</type>
-			<type key="collation" type="reformed">الترتيب المحسَّن</type>
 			<type key="collation" type="search">بحث لأغراض عامة</type>
 			<type key="collation" type="searchjl" draft="contributed">بحث باستخدام حرف الهانغول الساكن الأول</type>
 			<type key="collation" type="standard">ترتيب الفرز القياسي</type>
@@ -2817,9 +2816,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>توقيت {0}</regionFormat>
 			<regionFormat type="daylight">توقيت {0} الصيفي</regionFormat>
 			<regionFormat type="standard">توقيت {0} الرسمي</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>سانتا إيزابيل</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>التوقيت العالمي المنسق</standard>
@@ -2942,9 +2938,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ميلبورن</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>كوري</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>هوبارت</exemplarCity>
 			</zone>
@@ -3098,9 +3091,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>كريستون</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>يلونيف</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ايدمونتون</exemplarCity>
 			</zone>
@@ -3119,30 +3109,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ريزولوت</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>راني ريفر</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>رانكن انلت</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>كورال هاربر</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ثندر باي</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>نيبيجون</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>تورونتو</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>اكويلت</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>بانجينتينج</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>وينكتون</exemplarCity>
 			</zone>
@@ -3956,18 +3934,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>دار السلام</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>أوزجرود</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>كييف</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>سيمفروبول</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>زابوروزي</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>كامبالا</exemplarCity>
 			</zone>
@@ -3986,9 +3958,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>هونولولو</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>جونستون</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>أنشوراج</exemplarCity>
 			</zone>
@@ -4646,11 +4615,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>التوقيت الصيفي للورد هاو</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>توقيت ماكواري</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>توقيت ماغادان</generic>
@@ -4690,13 +4654,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>توقيت ماوسون</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>توقيت شمال غرب المكسيك</generic>
-					<standard>التوقيت الرسمي لشمال غرب المكسيك</standard>
-					<daylight>التوقيت الصيفي لشمال غرب المكسيك</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>توقيت المحيط الهادي للمكسيك</generic>
diff --git a/make/data/cldr/common/main/ar_001.xml b/make/data/cldr/common/main/ar_001.xml
index c388fbdd243..7ef8518fb50 100644
--- a/make/data/cldr/common/main/ar_001.xml
+++ b/make/data/cldr/common/main/ar_001.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_AE.xml b/make/data/cldr/common/main/ar_AE.xml
index 0c13c9f3469..16529b39227 100644
--- a/make/data/cldr/common/main/ar_AE.xml
+++ b/make/data/cldr/common/main/ar_AE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_BH.xml b/make/data/cldr/common/main/ar_BH.xml
index 4fbcabf7767..c105c640666 100644
--- a/make/data/cldr/common/main/ar_BH.xml
+++ b/make/data/cldr/common/main/ar_BH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_DJ.xml b/make/data/cldr/common/main/ar_DJ.xml
index 9b56d7ed107..434afd02fac 100644
--- a/make/data/cldr/common/main/ar_DJ.xml
+++ b/make/data/cldr/common/main/ar_DJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_DZ.xml b/make/data/cldr/common/main/ar_DZ.xml
index 41c22b3822e..75594030bb0 100644
--- a/make/data/cldr/common/main/ar_DZ.xml
+++ b/make/data/cldr/common/main/ar_DZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_EG.xml b/make/data/cldr/common/main/ar_EG.xml
index 2959ab81a78..d135bfe0085 100644
--- a/make/data/cldr/common/main/ar_EG.xml
+++ b/make/data/cldr/common/main/ar_EG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_EH.xml b/make/data/cldr/common/main/ar_EH.xml
index f52fba4d9e3..881bb4af655 100644
--- a/make/data/cldr/common/main/ar_EH.xml
+++ b/make/data/cldr/common/main/ar_EH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_ER.xml b/make/data/cldr/common/main/ar_ER.xml
index e1952f9336f..954a1c05d9b 100644
--- a/make/data/cldr/common/main/ar_ER.xml
+++ b/make/data/cldr/common/main/ar_ER.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_IL.xml b/make/data/cldr/common/main/ar_IL.xml
index 0e5f1f1561b..5fed505dbd6 100644
--- a/make/data/cldr/common/main/ar_IL.xml
+++ b/make/data/cldr/common/main/ar_IL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_IQ.xml b/make/data/cldr/common/main/ar_IQ.xml
index 0d2f1923a1f..0520aec07df 100644
--- a/make/data/cldr/common/main/ar_IQ.xml
+++ b/make/data/cldr/common/main/ar_IQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_JO.xml b/make/data/cldr/common/main/ar_JO.xml
index 76beed59cf6..59e71c756c8 100644
--- a/make/data/cldr/common/main/ar_JO.xml
+++ b/make/data/cldr/common/main/ar_JO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_KM.xml b/make/data/cldr/common/main/ar_KM.xml
index 543b940a627..ddb79577b6d 100644
--- a/make/data/cldr/common/main/ar_KM.xml
+++ b/make/data/cldr/common/main/ar_KM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_KW.xml b/make/data/cldr/common/main/ar_KW.xml
index b6614a87d18..845b88f9b7f 100644
--- a/make/data/cldr/common/main/ar_KW.xml
+++ b/make/data/cldr/common/main/ar_KW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_LB.xml b/make/data/cldr/common/main/ar_LB.xml
index ac3f61017fe..c048345b83f 100644
--- a/make/data/cldr/common/main/ar_LB.xml
+++ b/make/data/cldr/common/main/ar_LB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_LY.xml b/make/data/cldr/common/main/ar_LY.xml
index 1d8cd68a28b..cdae03aa3fb 100644
--- a/make/data/cldr/common/main/ar_LY.xml
+++ b/make/data/cldr/common/main/ar_LY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_MA.xml b/make/data/cldr/common/main/ar_MA.xml
index dc7b40ddcda..2db269ed2bf 100644
--- a/make/data/cldr/common/main/ar_MA.xml
+++ b/make/data/cldr/common/main/ar_MA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_MR.xml b/make/data/cldr/common/main/ar_MR.xml
index 3c5b1f2bf33..1d027ddd2b0 100644
--- a/make/data/cldr/common/main/ar_MR.xml
+++ b/make/data/cldr/common/main/ar_MR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_OM.xml b/make/data/cldr/common/main/ar_OM.xml
index 1471e968423..aba4c2d718d 100644
--- a/make/data/cldr/common/main/ar_OM.xml
+++ b/make/data/cldr/common/main/ar_OM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_PS.xml b/make/data/cldr/common/main/ar_PS.xml
index 3b42f22e1bd..8d815fa7aea 100644
--- a/make/data/cldr/common/main/ar_PS.xml
+++ b/make/data/cldr/common/main/ar_PS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_QA.xml b/make/data/cldr/common/main/ar_QA.xml
index 1c2c8febfa9..bf6acd6b0c4 100644
--- a/make/data/cldr/common/main/ar_QA.xml
+++ b/make/data/cldr/common/main/ar_QA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_SA.xml b/make/data/cldr/common/main/ar_SA.xml
index d93264e55b5..067dfa747a4 100644
--- a/make/data/cldr/common/main/ar_SA.xml
+++ b/make/data/cldr/common/main/ar_SA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_SD.xml b/make/data/cldr/common/main/ar_SD.xml
index e604376d98d..ca321a31d40 100644
--- a/make/data/cldr/common/main/ar_SD.xml
+++ b/make/data/cldr/common/main/ar_SD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_SO.xml b/make/data/cldr/common/main/ar_SO.xml
index 0c1a603dd71..f5ff04ffce6 100644
--- a/make/data/cldr/common/main/ar_SO.xml
+++ b/make/data/cldr/common/main/ar_SO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_SS.xml b/make/data/cldr/common/main/ar_SS.xml
index 2760e390bb4..a48c8164978 100644
--- a/make/data/cldr/common/main/ar_SS.xml
+++ b/make/data/cldr/common/main/ar_SS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_SY.xml b/make/data/cldr/common/main/ar_SY.xml
index 1cbd30b84d1..08c412f9ba0 100644
--- a/make/data/cldr/common/main/ar_SY.xml
+++ b/make/data/cldr/common/main/ar_SY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_TD.xml b/make/data/cldr/common/main/ar_TD.xml
index 97a3ea99b88..e3e3a7d22a4 100644
--- a/make/data/cldr/common/main/ar_TD.xml
+++ b/make/data/cldr/common/main/ar_TD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_TN.xml b/make/data/cldr/common/main/ar_TN.xml
index 853b0e52fec..d62cfba3157 100644
--- a/make/data/cldr/common/main/ar_TN.xml
+++ b/make/data/cldr/common/main/ar_TN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ar_YE.xml b/make/data/cldr/common/main/ar_YE.xml
index 8345af2df5b..453fd471a92 100644
--- a/make/data/cldr/common/main/ar_YE.xml
+++ b/make/data/cldr/common/main/ar_YE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/arn.xml b/make/data/cldr/common/main/arn.xml
index cbbc0837e2f..ad324bf5568 100644
--- a/make/data/cldr/common/main/arn.xml
+++ b/make/data/cldr/common/main/arn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/arn_CL.xml b/make/data/cldr/common/main/arn_CL.xml
index 105e0609de8..25b3f50ca37 100644
--- a/make/data/cldr/common/main/arn_CL.xml
+++ b/make/data/cldr/common/main/arn_CL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/as.xml b/make/data/cldr/common/main/as.xml
index 7b3ffc64abb..a86c2f45454 100644
--- a/make/data/cldr/common/main/as.xml
+++ b/make/data/cldr/common/main/as.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1910,9 +1910,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>মেলব’ৰ্ণ</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ক্যুৰি</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>হোবাৰ্ট</exemplarCity>
 			</zone>
@@ -2066,9 +2063,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ক্ৰেষ্টন</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>য়েল্লোনাইফ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>এডমণ্টন</exemplarCity>
 			</zone>
@@ -2087,30 +2081,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ৰিজ’লিউট</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ৰেইনী নদী</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ৰেংকিন ইনলেট</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>আটিকোকান</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>থাণ্ডাৰ উপসাগৰ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>নিপিগন</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ট’ৰ’ণ্টো</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ইকালুইট</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>পাংনিৰ্টুংগ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>মন্‌কটন</exemplarCity>
 			</zone>
@@ -2924,18 +2906,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ডাৰ এছ ছালাম</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>উজ্গোৰোড</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>কিভ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ছিম্ফেৰোপোল</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>জাপোৰোজাই</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>কাম্পালা</exemplarCity>
 			</zone>
@@ -2951,9 +2927,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Nome">
 				<exemplarCity>নোম</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>জনষ্টন</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>এংকোৰেজ</exemplarCity>
 			</zone>
@@ -3592,11 +3565,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>লৰ্ড হাওৰ ডেলাইট সময়</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>মেক্‌কুৱেৰী দ্বীপৰ সময়</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>মাগাদানৰ সময়</generic>
@@ -3636,13 +3604,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>মাউছনৰ সময়</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>উত্তৰ-পশ্চিম মেক্সিকোৰ সময়</generic>
-					<standard>উত্তৰ-পশ্চিম মেক্সিকোৰ মান সময়</standard>
-					<daylight>উত্তৰ-পশ্চিম মেক্সিকোৰ ডেলাইট সময়</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>মেক্সিকোৰ প্ৰশান্ত সময়</generic>
diff --git a/make/data/cldr/common/main/as_IN.xml b/make/data/cldr/common/main/as_IN.xml
index 2671ebdd61a..3c265965eef 100644
--- a/make/data/cldr/common/main/as_IN.xml
+++ b/make/data/cldr/common/main/as_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/asa.xml b/make/data/cldr/common/main/asa.xml
index f684a84d704..b7359144dc9 100644
--- a/make/data/cldr/common/main/asa.xml
+++ b/make/data/cldr/common/main/asa.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/asa_TZ.xml b/make/data/cldr/common/main/asa_TZ.xml
index c1434d96272..9b70fcded72 100644
--- a/make/data/cldr/common/main/asa_TZ.xml
+++ b/make/data/cldr/common/main/asa_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ast.xml b/make/data/cldr/common/main/ast.xml
index d7d254866b7..aa3a3d6f652 100644
--- a/make/data/cldr/common/main/ast.xml
+++ b/make/data/cldr/common/main/ast.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1208,7 +1208,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="gb2312han">orde de clasificación chinu simplificáu - GB2312</type>
 			<type key="collation" type="phonebook">orde de clasificación de llista telefónica</type>
 			<type key="collation" type="pinyin">orde de clasificación pinyin</type>
-			<type key="collation" type="reformed">orde de clasificación reformáu</type>
 			<type key="collation" type="search">gueta xeneral</type>
 			<type key="collation" type="searchjl">gueta por consonante Hangul d’aniciu</type>
 			<type key="collation" type="standard">orde de clasificación estándar</type>
@@ -3377,9 +3376,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat>Hora de {0}</regionFormat>
 			<regionFormat type="daylight">Hora braniega de {0}</regionFormat>
 			<regionFormat type="standard">Hora estándar de {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Hora coordinada universal</standard>
@@ -3406,9 +3402,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Adelaide">
 				<exemplarCity>Adelaida</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Baku">
 				<exemplarCity>Bakú</exemplarCity>
 			</zone>
@@ -4370,11 +4363,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Hora braniega de Macáu</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Hora de la Islla Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Hora de Magadán</generic>
@@ -4414,13 +4402,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Hora del noroeste de Méxicu</generic>
-					<standard>Hora estándar del noroeste de Méxicu</standard>
-					<daylight>Hora braniega del noroeste de Méxicu</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Hora del Pacíficu de Méxicu</generic>
diff --git a/make/data/cldr/common/main/ast_ES.xml b/make/data/cldr/common/main/ast_ES.xml
index 72d7634fed8..476f1892a4c 100644
--- a/make/data/cldr/common/main/ast_ES.xml
+++ b/make/data/cldr/common/main/ast_ES.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/az.xml b/make/data/cldr/common/main/az.xml
index 08cd6d60b21..2eb5a1769ef 100644
--- a/make/data/cldr/common/main/az.xml
+++ b/make/data/cldr/common/main/az.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2028,9 +2028,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} Vaxtı</regionFormat>
 			<regionFormat type="daylight">{0} Yay Vaxtı</regionFormat>
 			<regionFormat type="standard">{0} Standart Vaxtı</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa İzabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Koordinasiya edilmiş ümumdünya vaxtı</standard>
@@ -2117,9 +2114,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melburn</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kuriye</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Sidney</exemplarCity>
 			</zone>
@@ -2228,9 +2222,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Kreston</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Yellounayf</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Edmondton</exemplarCity>
 			</zone>
@@ -2249,24 +2240,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Rezolyut</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Reyni Çayı</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Rankin Girişi</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>İldırım Körfəzi</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipiqon</exemplarCity>
-			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>İqaluit</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Panqnirtanq</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Monkton</exemplarCity>
 			</zone>
@@ -2862,15 +2841,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar es Salam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ujqorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiyev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporojye</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Midvey</exemplarCity>
 			</zone>
@@ -2883,9 +2856,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Conston</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ankorac</exemplarCity>
 			</zone>
@@ -3488,11 +3458,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Lord Hau Yay vaxtı</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Makari Adası Vaxtı</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Maqadan Vaxtı</generic>
@@ -3532,13 +3497,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mouson Vaxtı</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Şimal-Qərbi Meksika Vaxtı</generic>
-					<standard>Şimal-Qərbi Meksika Standart Vaxtı</standard>
-					<daylight>Şimal-Qərbi Meksika Yay Vaxtı</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksika Sakit Okean Vaxtı</generic>
diff --git a/make/data/cldr/common/main/az_Arab.xml b/make/data/cldr/common/main/az_Arab.xml
index 6ed662dffdf..5c59e7e39ca 100644
--- a/make/data/cldr/common/main/az_Arab.xml
+++ b/make/data/cldr/common/main/az_Arab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/az_Arab_IQ.xml b/make/data/cldr/common/main/az_Arab_IQ.xml
index 27d806cf2a0..8445320375e 100644
--- a/make/data/cldr/common/main/az_Arab_IQ.xml
+++ b/make/data/cldr/common/main/az_Arab_IQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/az_Arab_IR.xml b/make/data/cldr/common/main/az_Arab_IR.xml
index cc9305ae009..7ffa77c8b7b 100644
--- a/make/data/cldr/common/main/az_Arab_IR.xml
+++ b/make/data/cldr/common/main/az_Arab_IR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/az_Arab_TR.xml b/make/data/cldr/common/main/az_Arab_TR.xml
index 45d76176e2d..f6fd51e08a8 100644
--- a/make/data/cldr/common/main/az_Arab_TR.xml
+++ b/make/data/cldr/common/main/az_Arab_TR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/az_Cyrl.xml b/make/data/cldr/common/main/az_Cyrl.xml
index 906f8e7d0f2..1cc1e2beb92 100644
--- a/make/data/cldr/common/main/az_Cyrl.xml
+++ b/make/data/cldr/common/main/az_Cyrl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/az_Cyrl_AZ.xml b/make/data/cldr/common/main/az_Cyrl_AZ.xml
index 0c23a7fc30c..0f167dc4f75 100644
--- a/make/data/cldr/common/main/az_Cyrl_AZ.xml
+++ b/make/data/cldr/common/main/az_Cyrl_AZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/az_Latn.xml b/make/data/cldr/common/main/az_Latn.xml
index 69a2891e01c..81c4777cdc4 100644
--- a/make/data/cldr/common/main/az_Latn.xml
+++ b/make/data/cldr/common/main/az_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/az_Latn_AZ.xml b/make/data/cldr/common/main/az_Latn_AZ.xml
index f23b99aa94c..ceaf9de3eff 100644
--- a/make/data/cldr/common/main/az_Latn_AZ.xml
+++ b/make/data/cldr/common/main/az_Latn_AZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ba.xml b/make/data/cldr/common/main/ba.xml
index 372127a9384..e4fd7353647 100644
--- a/make/data/cldr/common/main/ba.xml
+++ b/make/data/cldr/common/main/ba.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ba_RU.xml b/make/data/cldr/common/main/ba_RU.xml
index 177674d93cf..b835b6839f7 100644
--- a/make/data/cldr/common/main/ba_RU.xml
+++ b/make/data/cldr/common/main/ba_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bal.xml b/make/data/cldr/common/main/bal.xml
index a5cd9ad9dd1..4b1b1f16696 100644
--- a/make/data/cldr/common/main/bal.xml
+++ b/make/data/cldr/common/main/bal.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -426,11 +426,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="provisional">لۆرڈ هئو اُسترالیائے گرماگی ساهت</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="provisional">ماکواریئے گیشّتگێن ساهت</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="provisional">مَگَدَنئے ساهت</generic>
@@ -438,13 +433,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="provisional">مَگَدَنئے گرماگی ساهت</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="provisional">شمالی مِکسیکۆئے ساهت</generic>
-					<standard draft="provisional">شمالی مِکسیکۆئے گیشّتگێن ساهت</standard>
-					<daylight draft="provisional">شمالی مِکسیکۆئے گرماگی ساهت</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="provisional">آرامزِری مِکسیکۆئے ساهت</generic>
diff --git a/make/data/cldr/common/main/bal_Arab.xml b/make/data/cldr/common/main/bal_Arab.xml
index a6fb072f7ef..9872b379b45 100644
--- a/make/data/cldr/common/main/bal_Arab.xml
+++ b/make/data/cldr/common/main/bal_Arab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bal_Arab_PK.xml b/make/data/cldr/common/main/bal_Arab_PK.xml
index 0c75544898b..78d2338d90e 100644
--- a/make/data/cldr/common/main/bal_Arab_PK.xml
+++ b/make/data/cldr/common/main/bal_Arab_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bal_Latn.xml b/make/data/cldr/common/main/bal_Latn.xml
index 78bcb0e66a2..68f2f264bae 100644
--- a/make/data/cldr/common/main/bal_Latn.xml
+++ b/make/data/cldr/common/main/bal_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -419,11 +419,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="provisional">Ástréliáay, Ládhaway garmági wahd</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="provisional">Makwáriay anjári wahd</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="provisional">Mágadánay wahd</generic>
@@ -431,13 +426,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="provisional">Mágadánay garmági wahd</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="provisional">Shemálrónendi Meksikóay wahd</generic>
-					<standard draft="provisional">Górichánrónendi Meksikóay anjári wahd</standard>
-					<daylight draft="provisional">Shemálrónendi Meksikóay garmági wahd</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="provisional">Árámzeri Meksikóay wahd</generic>
diff --git a/make/data/cldr/common/main/bal_Latn_PK.xml b/make/data/cldr/common/main/bal_Latn_PK.xml
index 9bfffa1f977..4d8bb32b570 100644
--- a/make/data/cldr/common/main/bal_Latn_PK.xml
+++ b/make/data/cldr/common/main/bal_Latn_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bas.xml b/make/data/cldr/common/main/bas.xml
index 1e3a4fc4964..923b500ae36 100644
--- a/make/data/cldr/common/main/bas.xml
+++ b/make/data/cldr/common/main/bas.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bas_CM.xml b/make/data/cldr/common/main/bas_CM.xml
index 76905e9ea31..b3766fa7fe3 100644
--- a/make/data/cldr/common/main/bas_CM.xml
+++ b/make/data/cldr/common/main/bas_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/be.xml b/make/data/cldr/common/main/be.xml
index 200ac68cfe6..8c1ed8788d2 100644
--- a/make/data/cldr/common/main/be.xml
+++ b/make/data/cldr/common/main/be.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2170,9 +2170,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Час: {0}</regionFormat>
 			<regionFormat type="daylight">Летні час: {0}</regionFormat>
 			<regionFormat type="standard">Стандартны час: {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Санта-Ісабель</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Універсальны каардынаваны час</standard>
@@ -2295,9 +2292,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мельбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Керы</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -2451,9 +2445,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Крэстан</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Елаўнайф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Эдмантан</exemplarCity>
 			</zone>
@@ -2472,30 +2463,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Рэзальют</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рэйні-Рывер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ранкін-Інлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Атыкокан</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандэр-Бэй</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Ніпіган</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Таронта</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ікалуіт</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангніртанг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктан</exemplarCity>
 			</zone>
@@ -3309,18 +3288,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар-эс-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгарад</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Кіеў</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Сімферопаль</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запарожжа</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -3339,9 +3312,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Ганалулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Джонстан</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Анкарыдж</exemplarCity>
 			</zone>
@@ -3977,11 +3947,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Летні час Лорд-Хау</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Час вострава Макуоры</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магаданскі час</generic>
@@ -4021,13 +3986,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Час станцыі Моўсан</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Паўночна-заходні мексіканскі час</generic>
-					<standard>Паўночна-заходні мексіканскі стандартны час</standard>
-					<daylight>Паўночна-заходні мексіканскі летні час</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Мексіканскі ціхаакіянскі час</generic>
diff --git a/make/data/cldr/common/main/be_BY.xml b/make/data/cldr/common/main/be_BY.xml
index e8f9651f3f8..d17bb251e5a 100644
--- a/make/data/cldr/common/main/be_BY.xml
+++ b/make/data/cldr/common/main/be_BY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/be_TARASK.xml b/make/data/cldr/common/main/be_TARASK.xml
index 550857a75eb..e39083692d7 100644
--- a/make/data/cldr/common/main/be_TARASK.xml
+++ b/make/data/cldr/common/main/be_TARASK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1007,9 +1007,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat draft="provisional">час: {0}</regionFormat>
 			<regionFormat type="daylight" draft="provisional">летні час: {0}</regionFormat>
 			<regionFormat type="standard" draft="provisional">змоўчны час: {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity draft="provisional">Санта-Ісабэль</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard draft="provisional">унівэрсальны каардынаваны час</standard>
@@ -1045,9 +1042,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity draft="provisional">Мэльбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity draft="provisional">Кэры</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity draft="provisional">Сіднэй</exemplarCity>
 			</zone>
@@ -1108,9 +1102,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Winnipeg">
 				<exemplarCity draft="provisional">Вініпэг</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity draft="provisional">Рэйні-Рывэр</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity draft="provisional">Ранкін-Інлэт</exemplarCity>
 			</zone>
@@ -1810,13 +1801,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="provisional">Час станцыі Мосан</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="provisional">Паўночна-заходні Мэксыканскі час</generic>
-					<standard draft="provisional">Паўночна-заходні Мэксыканскі змоўчны час</standard>
-					<daylight draft="provisional">Паўночна-заходні Мэксыканскі летні час</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="provisional">Мэксыканскі ціхаакіянскі час</generic>
diff --git a/make/data/cldr/common/main/bem.xml b/make/data/cldr/common/main/bem.xml
index 9fe9bfc7e70..ba5dd7b75ac 100644
--- a/make/data/cldr/common/main/bem.xml
+++ b/make/data/cldr/common/main/bem.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bem_ZM.xml b/make/data/cldr/common/main/bem_ZM.xml
index a76f60b95ee..82360f3f853 100644
--- a/make/data/cldr/common/main/bem_ZM.xml
+++ b/make/data/cldr/common/main/bem_ZM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bew.xml b/make/data/cldr/common/main/bew.xml
index abad9435a21..30adaac310e 100644
--- a/make/data/cldr/common/main/bew.xml
+++ b/make/data/cldr/common/main/bew.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -3009,27 +3009,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity draft="unconfirmed">Darussalam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="unconfirmed">Usgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity draft="unconfirmed">Kiip</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity draft="unconfirmed">Akmesjid</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">Saporijiah</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity draft="unconfirmed">Midwé</exemplarCity>
 			</zone>
 			<zone type="Pacific/Wake">
 				<exemplarCity draft="unconfirmed">Wék</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity draft="unconfirmed">Jonsten</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity draft="unconfirmed">Angkorèt</exemplarCity>
 			</zone>
@@ -3652,11 +3643,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">Waktu Musim Pentèr Makao</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">Waktu Pulo Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="unconfirmed">Waktu Magadan</generic>
@@ -3696,13 +3682,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">Waktu Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">Waktu Mèksiko Lor-kulon</generic>
-					<standard draft="unconfirmed">Waktu Pakem Mèksiko Lor-kulon</standard>
-					<daylight draft="unconfirmed">Waktu Musim Pentèr Mèksiko Lor-kulon</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">Waktu Mèksiko Teduh</generic>
diff --git a/make/data/cldr/common/main/bew_ID.xml b/make/data/cldr/common/main/bew_ID.xml
index 14b6c21f07c..ce5a2c288b4 100644
--- a/make/data/cldr/common/main/bew_ID.xml
+++ b/make/data/cldr/common/main/bew_ID.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bez.xml b/make/data/cldr/common/main/bez.xml
index 8ed4b4ecf59..1ca290667bc 100644
--- a/make/data/cldr/common/main/bez.xml
+++ b/make/data/cldr/common/main/bez.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bez_TZ.xml b/make/data/cldr/common/main/bez_TZ.xml
index b9d80fc3684..d587ae72662 100644
--- a/make/data/cldr/common/main/bez_TZ.xml
+++ b/make/data/cldr/common/main/bez_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bg.xml b/make/data/cldr/common/main/bg.xml
index bb303d52d57..57e2140549b 100644
--- a/make/data/cldr/common/main/bg.xml
+++ b/make/data/cldr/common/main/bg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1102,7 +1102,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Азбучен ред</type>
 			<type key="collation" type="phonetic">Фонетичен ред на сортиране</type>
 			<type key="collation" type="pinyin">Сортиране Пинин</type>
-			<type key="collation" type="reformed">Следреформен ред на сортиране</type>
 			<type key="collation" type="search">търсене с общо предназначение</type>
 			<type key="collation" type="searchjl">Търсене по първоначални съгласни в хангул</type>
 			<type key="collation" type="standard">стандартен ред на сортиране</type>
@@ -2554,9 +2553,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<gmtZeroFormat>Гринуич</gmtZeroFormat>
 			<regionFormat type="daylight">{0} – лятно часово време</regionFormat>
 			<regionFormat type="standard">{0} – стандартно време</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Санта Исабел</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Координирано универсално време</standard>
@@ -2679,9 +2675,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мелбърн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Къри</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -2835,9 +2828,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Крестън</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Йелоунайф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Едмънтън</exemplarCity>
 			</zone>
@@ -2856,30 +2846,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Резолют</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейни Ривър</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ранкин Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Атикокан</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тъндър Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Иквалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртунг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -3693,18 +3671,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар ес Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферопол</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожие</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -3723,9 +3695,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Хонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Джонстън</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Анкъридж</exemplarCity>
 			</zone>
@@ -4375,11 +4344,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Лорд Хау – лятно часово време</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Маккуори</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магаданско време</generic>
@@ -4419,13 +4383,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Моусън</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Северозападно мексиканско време</generic>
-					<standard>Северозападно стандартно мексиканско време</standard>
-					<daylight>Северозападно лятно часово мексиканско време</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Мексиканско тихоокеанско време</generic>
diff --git a/make/data/cldr/common/main/bg_BG.xml b/make/data/cldr/common/main/bg_BG.xml
index ce7375c105a..2285ed3ee04 100644
--- a/make/data/cldr/common/main/bg_BG.xml
+++ b/make/data/cldr/common/main/bg_BG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bgc.xml b/make/data/cldr/common/main/bgc.xml
index 74cfb591f55..c34f081a1a8 100644
--- a/make/data/cldr/common/main/bgc.xml
+++ b/make/data/cldr/common/main/bgc.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bgc_IN.xml b/make/data/cldr/common/main/bgc_IN.xml
index 5cc169e31d1..5d19790f3e9 100644
--- a/make/data/cldr/common/main/bgc_IN.xml
+++ b/make/data/cldr/common/main/bgc_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bgn.xml b/make/data/cldr/common/main/bgn.xml
index fd2220ce03f..9d1daad06c6 100644
--- a/make/data/cldr/common/main/bgn.xml
+++ b/make/data/cldr/common/main/bgn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bgn_AE.xml b/make/data/cldr/common/main/bgn_AE.xml
index 773bfd72b56..b9cb9a052d4 100644
--- a/make/data/cldr/common/main/bgn_AE.xml
+++ b/make/data/cldr/common/main/bgn_AE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bgn_AF.xml b/make/data/cldr/common/main/bgn_AF.xml
index 53cc222ffaa..be65d4d117d 100644
--- a/make/data/cldr/common/main/bgn_AF.xml
+++ b/make/data/cldr/common/main/bgn_AF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bgn_IR.xml b/make/data/cldr/common/main/bgn_IR.xml
index e4eea64176d..83f9ac9da11 100644
--- a/make/data/cldr/common/main/bgn_IR.xml
+++ b/make/data/cldr/common/main/bgn_IR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bgn_OM.xml b/make/data/cldr/common/main/bgn_OM.xml
index 0155f7d6fb1..87fe449558c 100644
--- a/make/data/cldr/common/main/bgn_OM.xml
+++ b/make/data/cldr/common/main/bgn_OM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bgn_PK.xml b/make/data/cldr/common/main/bgn_PK.xml
index 456d8df2f1f..9b449ca80a5 100644
--- a/make/data/cldr/common/main/bgn_PK.xml
+++ b/make/data/cldr/common/main/bgn_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bho.xml b/make/data/cldr/common/main/bho.xml
index 03792404f48..a2fbfa63dfb 100644
--- a/make/data/cldr/common/main/bho.xml
+++ b/make/data/cldr/common/main/bho.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bho_IN.xml b/make/data/cldr/common/main/bho_IN.xml
index b57dc460653..650d36cc8e2 100644
--- a/make/data/cldr/common/main/bho_IN.xml
+++ b/make/data/cldr/common/main/bho_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/blo.xml b/make/data/cldr/common/main/blo.xml
index 868fc968dcf..f4f72e94d43 100644
--- a/make/data/cldr/common/main/blo.xml
+++ b/make/data/cldr/common/main/blo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1489,9 +1489,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>Krɛstɔn</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Yɛloonaɩf</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Ɛɖmɔntɔn</exemplarCity>
 			</zone>
@@ -1510,27 +1507,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>Rɛsoluut</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Rɛɩni Riifa</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Raŋkɩn Ɩnlɛɛtɩ</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Sanɖɛɛr Baɩ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipigɔn</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Torɔntoo</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikaluwiit</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Panyɩrtʊʊŋ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Mɔŋtɔn</exemplarCity>
 			</zone>
@@ -2323,15 +2308,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Ɖarɛsalaam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Usgɔrɔɖ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiyɛf</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Sapɔrɔsɩyɛ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kampalaa</exemplarCity>
 			</zone>
@@ -2344,9 +2323,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Adak">
 				<exemplarCity>Aɖak</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Jɔnstɔn</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Aŋkɔraajɩ</exemplarCity>
 			</zone>
@@ -2996,11 +2972,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>akawoo kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Makarii kaAtukǝltǝna kaakɔŋkɔŋɔ̀</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magaɖan kaakɔŋkɔŋɔ̀</generic>
@@ -3040,13 +3011,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mɔsɔn kaakɔŋkɔŋɔ̀</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Mɛsik gʊpɛnɛ na gɩteŋshilelaŋ kʊfɔɔ nɩ kaakɔŋkɔŋɔ̀</generic>
-					<standard>Mɛsik gʊpɛnɛ na gɩteŋshilelaŋ kʊfɔɔ nɩ kaakɔŋkɔŋɔ̀ ɖeiɖei</standard>
-					<daylight>Mɛsik gʊpɛnɛ na gɩteŋshilelaŋ kʊfɔɔ nɩ kaakɔŋkɔŋɔ̀ gafʊbaka</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mɛsik kapasifika kaakɔŋkɔŋɔ̀</generic>
diff --git a/make/data/cldr/common/main/blo_BJ.xml b/make/data/cldr/common/main/blo_BJ.xml
index dd6e8ba598e..6c98cd14af3 100644
--- a/make/data/cldr/common/main/blo_BJ.xml
+++ b/make/data/cldr/common/main/blo_BJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/blt.xml b/make/data/cldr/common/main/blt.xml
index bc085ab3822..d794eb40b47 100644
--- a/make/data/cldr/common/main/blt.xml
+++ b/make/data/cldr/common/main/blt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/blt_VN.xml b/make/data/cldr/common/main/blt_VN.xml
index 1746f69fb20..1b88b04e88c 100644
--- a/make/data/cldr/common/main/blt_VN.xml
+++ b/make/data/cldr/common/main/blt_VN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bm.xml b/make/data/cldr/common/main/bm.xml
index 116de1e5c4b..72c8c9915f8 100644
--- a/make/data/cldr/common/main/bm.xml
+++ b/make/data/cldr/common/main/bm.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bm_ML.xml b/make/data/cldr/common/main/bm_ML.xml
index 5536dc98f6d..0bea4c7f333 100644
--- a/make/data/cldr/common/main/bm_ML.xml
+++ b/make/data/cldr/common/main/bm_ML.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bm_Nkoo.xml b/make/data/cldr/common/main/bm_Nkoo.xml
index 1f4e1d5157b..2bc069dded5 100644
--- a/make/data/cldr/common/main/bm_Nkoo.xml
+++ b/make/data/cldr/common/main/bm_Nkoo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bm_Nkoo_ML.xml b/make/data/cldr/common/main/bm_Nkoo_ML.xml
index 3951e5f06a7..1154ba21bfb 100644
--- a/make/data/cldr/common/main/bm_Nkoo_ML.xml
+++ b/make/data/cldr/common/main/bm_Nkoo_ML.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bn.xml b/make/data/cldr/common/main/bn.xml
index 3d547b72ae7..8aaaeb16221 100644
--- a/make/data/cldr/common/main/bn.xml
+++ b/make/data/cldr/common/main/bn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2303,9 +2303,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} সময়</regionFormat>
 			<regionFormat type="daylight">{0} দিবালোক সময়</regionFormat>
 			<regionFormat type="standard">{0} মানক সময়</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>সান্তা ইসাবেল</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>স্থানাংকিত আন্তর্জাতিক সময়</standard>
@@ -2428,9 +2425,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>মেলবোর্ন</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>কিউরি</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>হোবার্ট</exemplarCity>
 			</zone>
@@ -2584,9 +2578,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ক্রিস্টান</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ইয়েলোনাইফ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>এডমন্টোন</exemplarCity>
 			</zone>
@@ -2605,30 +2596,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>রেসোলুট</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>রেইনি রিভার</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>র‍্যাঙ্কিন ইনলেট</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>আটিকোকান</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>থান্ডার বে</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>নিপিগোন</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>টোরন্টো</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ইকুয়ালুইট</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>প্যাঙ্গনির্টুং</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>মঙ্কটোন</exemplarCity>
 			</zone>
@@ -3442,18 +3421,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>দার এস সালাম</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>উঝগোরোড</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>কিয়েভ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>সিমফেরোপোল</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>জেপোরোজাইয়াই</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>কামপালা</exemplarCity>
 			</zone>
@@ -3472,9 +3445,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>হনোলুলু</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>জনস্টন</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>এনকোরেজ</exemplarCity>
 			</zone>
@@ -4172,11 +4142,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="provisional">মাকাও গ্রীষ্মকাল সময়</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>ম্যাককুরি দ্বীপ সময়</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>ম্যাগাডান সময়</generic>
@@ -4216,13 +4181,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>মসন সময়</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>উত্তরপশ্চিম মেক্সিকোর সময়</generic>
-					<standard>উত্তরপশ্চিম মেক্সিকোর মানক সময়</standard>
-					<daylight>উত্তরপশ্চিম মেক্সিকোর দিনের সময়</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>মেক্সিকান প্রশান্ত মহাসাগরীয় সময়</generic>
diff --git a/make/data/cldr/common/main/bn_BD.xml b/make/data/cldr/common/main/bn_BD.xml
index 38b11383565..8539fa31581 100644
--- a/make/data/cldr/common/main/bn_BD.xml
+++ b/make/data/cldr/common/main/bn_BD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bn_IN.xml b/make/data/cldr/common/main/bn_IN.xml
index ea2750e0af9..692ec6e7bc7 100644
--- a/make/data/cldr/common/main/bn_IN.xml
+++ b/make/data/cldr/common/main/bn_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bo.xml b/make/data/cldr/common/main/bo.xml
index 80cd0b7f928..cc6e160d830 100644
--- a/make/data/cldr/common/main/bo.xml
+++ b/make/data/cldr/common/main/bo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bo_CN.xml b/make/data/cldr/common/main/bo_CN.xml
index 8727c700111..468941b265b 100644
--- a/make/data/cldr/common/main/bo_CN.xml
+++ b/make/data/cldr/common/main/bo_CN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bo_IN.xml b/make/data/cldr/common/main/bo_IN.xml
index a2ed0e678d2..a9190c3a051 100644
--- a/make/data/cldr/common/main/bo_IN.xml
+++ b/make/data/cldr/common/main/bo_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/br.xml b/make/data/cldr/common/main/br.xml
index 39d71cd9f09..c299b613822 100644
--- a/make/data/cldr/common/main/br.xml
+++ b/make/data/cldr/common/main/br.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1155,7 +1155,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="gb2312han">urzh rummañ sinaek eeunaet - GB2312</type>
 			<type key="collation" type="phonebook">urzh rummañ al levr-pellgomz</type>
 			<type key="collation" type="pinyin">urzh rummañ pinyin</type>
-			<type key="collation" type="reformed">urzh rummañ adreizhet</type>
 			<type key="collation" type="search">enklask hollek</type>
 			<type key="collation" type="standard">urzh rummañ standart</type>
 			<type key="collation" type="stroke">urzh rummañ an tresoù</type>
@@ -3708,11 +3707,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>eur hañv Macau</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>eur Enez Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>eur Magadan</generic>
@@ -3752,13 +3746,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>eur Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>eur Gwalarn Mecʼhiko</generic>
-					<standard>eur cʼhoañv Gwalarn Mecʼhiko</standard>
-					<daylight>eur hañv Gwalarn Mecʼhiko</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>eur an Habask mecʼhikan</generic>
diff --git a/make/data/cldr/common/main/br_FR.xml b/make/data/cldr/common/main/br_FR.xml
index b3c069557cd..38985b58329 100644
--- a/make/data/cldr/common/main/br_FR.xml
+++ b/make/data/cldr/common/main/br_FR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/brx.xml b/make/data/cldr/common/main/brx.xml
index de79ea76c86..e9a622735d1 100644
--- a/make/data/cldr/common/main/brx.xml
+++ b/make/data/cldr/common/main/brx.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2078,9 +2078,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>मेलबौर्न</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>करी</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>हबार्ट</exemplarCity>
 			</zone>
@@ -2234,9 +2231,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>क्रेस्टन</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>येल्ल’नाईफ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>एडमन्टन</exemplarCity>
 			</zone>
@@ -2255,30 +2249,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>रेजल्युत</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>रैनी रिभार</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>रेनकिन इनलेट</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>आतिककान</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>थान्डार गाथोन</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>निपिग’न</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>टरन्ट’</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>इकालुईत</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>पांग्नीरटुं</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>मक्ट’न</exemplarCity>
 			</zone>
@@ -3089,18 +3071,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>दार एस सलाम</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ऊज्ह’र’ड</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>कीभ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>सिम्फेर’प’ल</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>झाप’र’झ्ये</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>काम्पाला</exemplarCity>
 			</zone>
@@ -3119,9 +3095,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>हनलुलु</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ज’नस्ट’न</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>एंकरेज</exemplarCity>
 			</zone>
@@ -3819,11 +3792,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>माकाऊ समर टाईम</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>माक्वारी द्वीप सम</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>मागादान सम</generic>
@@ -3863,13 +3831,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>मौसन सम</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>साहा-सोनाब मेक्सिक’ सम</generic>
-					<standard>साहा-सोनाब मेक्सिक’ थाखोआरि सम</standard>
-					<daylight>साहा-सोनाब मेक्सिक’ सानारि सम</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>मेक्सिक’नि पेसिफिक सम</generic>
diff --git a/make/data/cldr/common/main/brx_IN.xml b/make/data/cldr/common/main/brx_IN.xml
index 830883f22bc..1e20219d4e8 100644
--- a/make/data/cldr/common/main/brx_IN.xml
+++ b/make/data/cldr/common/main/brx_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bs.xml b/make/data/cldr/common/main/bs.xml
index 27bf53c54c2..5662ea08033 100644
--- a/make/data/cldr/common/main/bs.xml
+++ b/make/data/cldr/common/main/bs.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1269,7 +1269,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Sortiranje kao telefonski imenik</type>
 			<type key="collation" type="phonetic">Fonetsko sortiranje</type>
 			<type key="collation" type="pinyin">Pinjin sortiranje</type>
-			<type key="collation" type="reformed">Reformirano sortiranje</type>
 			<type key="collation" type="search">općenito pretraživanje</type>
 			<type key="collation" type="searchjl">Pretraživanje po početnom suglasniku hangula</type>
 			<type key="collation" type="standard">standardno sortiranje</type>
@@ -2848,9 +2847,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<gmtFormat>GMT {0}</gmtFormat>
 			<regionFormat type="daylight">{0}, ljetno vrijeme</regionFormat>
 			<regionFormat type="standard">{0}, standardno vrijeme</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Koordinirano svjetsko vrijeme</standard>
@@ -2883,9 +2879,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melburn</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Sidnej</exemplarCity>
 			</zone>
@@ -3215,18 +3208,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Taipei">
 				<exemplarCity>Tajpej</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kijev</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Simferopolj</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3834,11 +3821,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Makao letnje računanje vremena</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Vrijeme na Ostrvu Makvori</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadansko vrijeme</generic>
@@ -3878,13 +3860,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Vrijeme stanice Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Sjeverozapadno meksičko vrijeme</generic>
-					<standard>Sjeverozapadno meksičko standardno vrijeme</standard>
-					<daylight>Sjeverozapadno meksičko ljetno vrijeme</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksičko pacifičko vrijeme</generic>
diff --git a/make/data/cldr/common/main/bs_Cyrl.xml b/make/data/cldr/common/main/bs_Cyrl.xml
index c599fc852fd..a27f0b85fa2 100644
--- a/make/data/cldr/common/main/bs_Cyrl.xml
+++ b/make/data/cldr/common/main/bs_Cyrl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2650,9 +2650,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мелбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Курие</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -2806,9 +2803,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Јелоунајф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Едмонтон</exemplarCity>
 			</zone>
@@ -2827,30 +2821,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>Ресолут</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рејни Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ранкин Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Атикокан</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер Беј</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Иквалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртунг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -3658,18 +3640,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар-ес-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Кијев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферопољ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожје</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -3688,9 +3664,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Хонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Џонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Енкориџ</exemplarCity>
 			</zone>
@@ -4385,11 +4358,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Макао летње рачунање вемена</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Макверијско вријеме</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магадан вријеме</generic>
@@ -4429,13 +4397,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Мосон вријеме</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Сјеверномексичко вријеме</generic>
-					<standard>Сјеверномексичко стандардно вријеме</standard>
-					<daylight>Сјеверномексичко љетње рачунање времена</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Мексичко пацифичко вријеме</generic>
diff --git a/make/data/cldr/common/main/bs_Cyrl_BA.xml b/make/data/cldr/common/main/bs_Cyrl_BA.xml
index eb1ae35df4b..051a01c7e9c 100644
--- a/make/data/cldr/common/main/bs_Cyrl_BA.xml
+++ b/make/data/cldr/common/main/bs_Cyrl_BA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bs_Latn.xml b/make/data/cldr/common/main/bs_Latn.xml
index 96bb934703e..a48060f5de6 100644
--- a/make/data/cldr/common/main/bs_Latn.xml
+++ b/make/data/cldr/common/main/bs_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bs_Latn_BA.xml b/make/data/cldr/common/main/bs_Latn_BA.xml
index 459f3d269c0..eb8626bd891 100644
--- a/make/data/cldr/common/main/bs_Latn_BA.xml
+++ b/make/data/cldr/common/main/bs_Latn_BA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bss.xml b/make/data/cldr/common/main/bss.xml
index d908632183b..509605db1b4 100644
--- a/make/data/cldr/common/main/bss.xml
+++ b/make/data/cldr/common/main/bss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/bss_CM.xml b/make/data/cldr/common/main/bss_CM.xml
index be5edffb7d1..fa49ba19698 100644
--- a/make/data/cldr/common/main/bss_CM.xml
+++ b/make/data/cldr/common/main/bss_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/byn.xml b/make/data/cldr/common/main/byn.xml
index 35c3a7b783b..0eec9bde36e 100644
--- a/make/data/cldr/common/main/byn.xml
+++ b/make/data/cldr/common/main/byn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/byn_ER.xml b/make/data/cldr/common/main/byn_ER.xml
index 508caef4825..ff33c7038ab 100644
--- a/make/data/cldr/common/main/byn_ER.xml
+++ b/make/data/cldr/common/main/byn_ER.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ca.xml b/make/data/cldr/common/main/ca.xml
index 7e4253d90fd..cd7cc403042 100644
--- a/make/data/cldr/common/main/ca.xml
+++ b/make/data/cldr/common/main/ca.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1245,7 +1245,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">ordre de la guia telefònica</type>
 			<type key="collation" type="phonetic">ordre fonètic</type>
 			<type key="collation" type="pinyin">ordre pinyin</type>
-			<type key="collation" type="reformed">ordre reformat</type>
 			<type key="collation" type="search">cerca de propòsit general</type>
 			<type key="collation" type="searchjl" draft="contributed">cerca per consonant inicial del hangul</type>
 			<type key="collation" type="standard">ordre estàndard</type>
@@ -2575,9 +2574,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Hora de: {0}</regionFormat>
 			<regionFormat type="daylight">Hora d’estiu, {0}</regionFormat>
 			<regionFormat type="standard">Hora estàndard, {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Temps universal coordinat</standard>
@@ -2601,9 +2597,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Baku">
 				<exemplarCity>Bakú</exemplarCity>
 			</zone>
@@ -2934,18 +2927,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Ashgabat">
 				<exemplarCity>Aşgabat</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Újhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kíiv</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Simferòpol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporíjia</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3524,11 +3511,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Hora d’estiu de Macau</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Hora de Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Hora de Magadan</generic>
@@ -3568,13 +3550,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Hora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Hora del nord-oest de Mèxic</generic>
-					<standard>Hora estàndard del nord-oest de Mèxic</standard>
-					<daylight>Hora d’estiu del nord-oest de Mèxic</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Hora del Pacífic de Mèxic</generic>
diff --git a/make/data/cldr/common/main/ca_AD.xml b/make/data/cldr/common/main/ca_AD.xml
index 6c3b9be198e..f4e922404ef 100644
--- a/make/data/cldr/common/main/ca_AD.xml
+++ b/make/data/cldr/common/main/ca_AD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ca_ES.xml b/make/data/cldr/common/main/ca_ES.xml
index 296b05a0264..85b7785b1cc 100644
--- a/make/data/cldr/common/main/ca_ES.xml
+++ b/make/data/cldr/common/main/ca_ES.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ca_ES_VALENCIA.xml b/make/data/cldr/common/main/ca_ES_VALENCIA.xml
index d0fce06ed8e..9c0482f08ab 100644
--- a/make/data/cldr/common/main/ca_ES_VALENCIA.xml
+++ b/make/data/cldr/common/main/ca_ES_VALENCIA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ca_FR.xml b/make/data/cldr/common/main/ca_FR.xml
index 0ec859c10f3..5291f34d629 100644
--- a/make/data/cldr/common/main/ca_FR.xml
+++ b/make/data/cldr/common/main/ca_FR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ca_IT.xml b/make/data/cldr/common/main/ca_IT.xml
index 071a3ad5e54..4220b903733 100644
--- a/make/data/cldr/common/main/ca_IT.xml
+++ b/make/data/cldr/common/main/ca_IT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cad.xml b/make/data/cldr/common/main/cad.xml
index 66628cd5dd5..ff354198818 100644
--- a/make/data/cldr/common/main/cad.xml
+++ b/make/data/cldr/common/main/cad.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cad_US.xml b/make/data/cldr/common/main/cad_US.xml
index 1ca1eff9b5a..f3a8b989566 100644
--- a/make/data/cldr/common/main/cad_US.xml
+++ b/make/data/cldr/common/main/cad_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cch.xml b/make/data/cldr/common/main/cch.xml
index 03223204d2e..1dcd468a6fe 100644
--- a/make/data/cldr/common/main/cch.xml
+++ b/make/data/cldr/common/main/cch.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cch_NG.xml b/make/data/cldr/common/main/cch_NG.xml
index 9f11c337973..b703402cb08 100644
--- a/make/data/cldr/common/main/cch_NG.xml
+++ b/make/data/cldr/common/main/cch_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ccp.xml b/make/data/cldr/common/main/ccp.xml
index faae1ebd256..10a56431c72 100644
--- a/make/data/cldr/common/main/ccp.xml
+++ b/make/data/cldr/common/main/ccp.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1042,7 +1042,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="phonebook">𑄜𑄮𑄚𑄴𑄝𑄪𑄇𑄴 𑄥𑄎𑄚</type>
 			<type key="collation" type="phonetic">𑄢𑄳𑄦𑄧 𑄝𑄬𑄭𑄣𑄧𑄚</type>
 			<type key="collation" type="pinyin">𑄛𑄨𑄚𑄨𑄚𑄴 𑄥𑄎𑄚</type>
-			<type key="collation" type="reformed">𑄢𑄨𑄜𑄧𑄟𑄴𑄓𑄨 𑄝𑄬𑄭𑄣𑄧𑄚</type>
 			<type key="collation" type="search">𑄃𑄧𑄎𑄧𑄃𑄧𑄌𑄴-𑄅𑄪𑄘𑄨𑄌𑄴𑄥𑄳𑄠 𑄖𑄮𑄉𑄚</type>
 			<type key="collation" type="searchjl">𑄦𑄋𑄴𑄉𑄪𑄣𑄴 𑄛𑄧𑄖𑄴𑄗𑄧𑄟𑄴 𑄝𑄧𑄣𑄬𑄟𑄖𑄳𑄠𑄬 𑄦𑄧𑄢𑄧𑄇𑄴 𑄘𑄨𑄚𑄬𑄭 𑄖𑄮𑄉𑄚</type>
 			<type key="collation" type="standard">𑄉𑄧𑄟𑄴 𑄘𑄮𑄣𑄴 𑄝𑄬𑄭𑄣𑄧𑄚</type>
@@ -1932,9 +1931,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat>{0} 𑄃𑄧𑄇𑄴𑄖𑄧</regionFormat>
 			<regionFormat type="daylight">{0} 𑄘𑄨𑄝𑄪𑄌𑄴𑄎𑄳𑄠 𑄃𑄧𑄇𑄴𑄖𑄧𑄖𑄴</regionFormat>
 			<regionFormat type="standard">{0} 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧𑄖𑄴</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>𑄥𑄚𑄴𑄖 𑄃𑄨𑄥𑄝𑄬𑄣𑄴</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>𑄘𑄇𑄴𑄘𑄨𑄠 𑄛𑄨𑄖𑄴𑄗𑄨𑄟𑄨𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
@@ -2057,9 +2053,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>𑄟𑄬𑄣𑄴𑄝𑄢𑄴𑄚𑄴</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>𑄇𑄨𑄃𑄪𑄢𑄨</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>𑄦𑄮𑄝𑄢𑄴𑄑𑄴</exemplarCity>
 			</zone>
@@ -2213,9 +2206,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>𑄇𑄳𑄢𑄨𑄌𑄴𑄑𑄚𑄴</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>𑄃𑄨𑄠𑄬𑄣𑄮𑄚𑄭𑄜𑄴</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>𑄃𑄬𑄓𑄴𑄟𑄧𑄚𑄴𑄑𑄮𑄚𑄴</exemplarCity>
 			</zone>
@@ -2234,30 +2224,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>𑄢𑄬𑄥𑄮𑄣𑄪𑄑𑄴</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>𑄣𑄬𑄭𑄚𑄨 𑄢𑄨𑄞𑄢𑄴</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>𑄢𑄳𑄠𑄋𑄴𑄇𑄨𑄚𑄴 𑄃𑄨𑄚𑄴𑄣𑄬𑄑𑄴</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>𑄇𑄮𑄢𑄣𑄴 𑄦𑄢𑄴𑄝𑄢𑄴</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>𑄐𑄚𑄴𑄓𑄢𑄴 𑄝𑄬</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>𑄚𑄨𑄛𑄨𑄉𑄮𑄚𑄴</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>𑄑𑄮𑄢𑄧𑄚𑄴𑄑𑄮</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>𑄃𑄨𑄇𑄱𑄣𑄪𑄃𑄨𑄑𑄴</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>𑄛𑄳𑄠𑄋𑄴𑄉𑄧𑄚𑄨𑄢𑄴𑄑𑄪𑄁</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>𑄟𑄧𑄋𑄴𑄑𑄮𑄚𑄴</exemplarCity>
 			</zone>
@@ -3050,18 +3028,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>𑄘𑄢𑄴 𑄃𑄬𑄌𑄴 𑄥𑄣𑄟𑄴</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>𑄅𑄪𑄏𑄴𑄉𑄮𑄢𑄮𑄓𑄴</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>𑄇𑄨𑄠𑄬𑄞𑄴</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>𑄥𑄨𑄟𑄴𑄜𑄬𑄢𑄮𑄛𑄮𑄣𑄴</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>𑄎𑄬𑄛𑄮𑄢𑄮𑄎𑄭𑄠𑄭</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>𑄇𑄟𑄴𑄛𑄣</exemplarCity>
 			</zone>
@@ -3080,9 +3052,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>𑄦𑄧𑄚𑄮𑄣𑄪𑄣𑄪</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>𑄎𑄧𑄚𑄴𑄥𑄳𑄑𑄧𑄚𑄴</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>𑄃𑄬𑄚𑄴𑄇𑄮𑄢𑄬𑄌𑄴</exemplarCity>
 			</zone>
@@ -3773,11 +3742,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="provisional">𑄟𑄇𑄃𑄮 𑄉𑄧𑄢𑄧𑄟𑄴𑄇𑄣𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>𑄟𑄳𑄠𑄇𑄴𑄇𑄪𑄢𑄨 𑄉𑄭 𑄉𑄭 𑄞𑄬𑄘 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>𑄟𑄳𑄠𑄉𑄓𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</generic>
@@ -3817,13 +3781,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>𑄟𑄧𑄥𑄳𑄦𑄧𑄚𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>𑄃𑄪𑄖𑄴𑄖𑄮𑄢𑄴 𑄛𑄧𑄏𑄨𑄟𑄴 𑄟𑄬𑄇𑄴𑄥𑄨𑄇𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</generic>
-					<standard>𑄃𑄪𑄖𑄴𑄖𑄮𑄢𑄴 𑄛𑄧𑄏𑄨𑄟𑄴 𑄟𑄬𑄇𑄴𑄥𑄨𑄇𑄮𑄢𑄴 𑄟𑄚𑄧𑄇𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</standard>
-					<daylight>𑄃𑄪𑄖𑄴𑄖𑄮𑄢𑄴 𑄛𑄧𑄏𑄨𑄟𑄴 𑄟𑄬𑄇𑄴𑄥𑄨𑄇𑄮𑄢𑄴 𑄘𑄨𑄚𑄮𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>𑄟𑄬𑄇𑄴𑄥𑄨𑄇𑄚𑄴 𑄛𑄳𑄢𑄧𑄥𑄚𑄴𑄖𑄧 𑄟𑄧𑄦𑄥𑄉𑄧𑄢𑄧𑄢𑄴 𑄃𑄧𑄇𑄴𑄖𑄧</generic>
diff --git a/make/data/cldr/common/main/ccp_BD.xml b/make/data/cldr/common/main/ccp_BD.xml
index 6c8cde12e61..4fbec9f8503 100644
--- a/make/data/cldr/common/main/ccp_BD.xml
+++ b/make/data/cldr/common/main/ccp_BD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ccp_IN.xml b/make/data/cldr/common/main/ccp_IN.xml
index 6950d8f5c29..8d2ca5ea261 100644
--- a/make/data/cldr/common/main/ccp_IN.xml
+++ b/make/data/cldr/common/main/ccp_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ce.xml b/make/data/cldr/common/main/ce.xml
index 26e0494c036..6a0fcd64320 100644
--- a/make/data/cldr/common/main/ce.xml
+++ b/make/data/cldr/common/main/ce.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1250,9 +1250,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 		</fields>
 		<timeZoneNames>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Санта-Изабел</exemplarCity>
-			</zone>
 			<zone type="Etc/Unknown">
 				<exemplarCity>Йоьвзуш йоцу гӀала</exemplarCity>
 			</zone>
@@ -1370,9 +1367,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мельбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Керри</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -1526,9 +1520,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Йеллоунайф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Эдмонтон</exemplarCity>
 			</zone>
@@ -1547,30 +1538,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>Резолют</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейни-Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ранкин-Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Корал-Харбор</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Икалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртанг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -2375,18 +2354,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар-эс-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферополь</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожье</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -2405,9 +2378,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Гонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Джонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Анкоридж</exemplarCity>
 			</zone>
@@ -3043,11 +3013,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Лорд-Хау, аьхкенан хан</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Маккуори</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магадан</generic>
@@ -3087,13 +3052,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Моусон</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Къилбаседа Американ Мексикан хан</generic>
-					<standard>Къилбаседа Американ Мексикан стандартан хан</standard>
-					<daylight>Къилбаседа Американ Мексикан аьхкенан хан</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Тийна океанан Мексикан хан</generic>
diff --git a/make/data/cldr/common/main/ce_RU.xml b/make/data/cldr/common/main/ce_RU.xml
index 486fd760833..98ee73d5435 100644
--- a/make/data/cldr/common/main/ce_RU.xml
+++ b/make/data/cldr/common/main/ce_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ceb.xml b/make/data/cldr/common/main/ceb.xml
index 562381cbf94..814a72dfd44 100644
--- a/make/data/cldr/common/main/ceb.xml
+++ b/make/data/cldr/common/main/ceb.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 the U.S. and other countries. CLDR data files are interpreted according to
@@ -1527,11 +1527,6 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					<daylight>Oras sa Tag-init sa Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Oras sa Macquarie Island</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Oras sa Magadan</generic>
@@ -1571,13 +1566,6 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					<standard>Oras sa Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Oras sa Northwest Mexico</generic>
-					<standard>Tamdanang Oras sa Northwest Mexico</standard>
-					<daylight>Oras sa Tag-init sa Northwest Mexico</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Oras sa Mexican Pacific</generic>
diff --git a/make/data/cldr/common/main/ceb_PH.xml b/make/data/cldr/common/main/ceb_PH.xml
index dac5b5536bf..720bca662a3 100644
--- a/make/data/cldr/common/main/ceb_PH.xml
+++ b/make/data/cldr/common/main/ceb_PH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cgg.xml b/make/data/cldr/common/main/cgg.xml
index 17a257a2f97..ce3e6c1724e 100644
--- a/make/data/cldr/common/main/cgg.xml
+++ b/make/data/cldr/common/main/cgg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cgg_UG.xml b/make/data/cldr/common/main/cgg_UG.xml
index c2c29625833..be094e50917 100644
--- a/make/data/cldr/common/main/cgg_UG.xml
+++ b/make/data/cldr/common/main/cgg_UG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cho.xml b/make/data/cldr/common/main/cho.xml
index 4d3cb27ada6..b82979f63cd 100644
--- a/make/data/cldr/common/main/cho.xml
+++ b/make/data/cldr/common/main/cho.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cho_US.xml b/make/data/cldr/common/main/cho_US.xml
index 7d860d2bed7..545a93f54a1 100644
--- a/make/data/cldr/common/main/cho_US.xml
+++ b/make/data/cldr/common/main/cho_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/chr.xml b/make/data/cldr/common/main/chr.xml
index 61d4fbe9c43..36c2aaad4c1 100644
--- a/make/data/cldr/common/main/chr.xml
+++ b/make/data/cldr/common/main/chr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2149,9 +2149,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ᎺᎵᏉᏁ</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ᎫᎵ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ᎰᏆᏘ</exemplarCity>
 			</zone>
@@ -2305,9 +2302,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>ᏞᏍᏔᏂ</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ᏓᎶᏂᎨ ᎭᏰᏍᏗ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ᎡᏗᎹᏂᏔᏂ</exemplarCity>
 			</zone>
@@ -2326,30 +2320,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>ᎴᏐᎷᏘ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ᎠᎦᏍᎦ ᎤᏪᏴ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ᎴᏂᎩᏂ ᎢᏂᎴᏘ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ᎠᏘᎪᎦᏂ</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ᎠᏴᏓᏆᎶᏍᎦ ᎡᏉᏄᎸᏗ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ᏂᏈᎪᏂ</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ᏙᎳᎾᏙ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ᎢᏆᎷᏱᏘ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ᏆᏂᏂᏚᏂᎦ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ᎹᎾᏔᏂ</exemplarCity>
 			</zone>
@@ -3163,18 +3145,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Ꮣ ᎡᏏ ᏌᎳᎻ</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ᎤᏍᎪᎶᏗ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>ᎩᏫ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ᏏᎻᏪᎶᏉᎵ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ᏌᏉᎶᏌᏱ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>ᎧᎻᏆᎳ</exemplarCity>
 			</zone>
@@ -3198,9 +3174,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</short>
 				<exemplarCity>ᎭᏃᎷᎷ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ᏣᏂᏏᏂ</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ᎠᏂᎪᎴᏥ</exemplarCity>
 			</zone>
@@ -3871,11 +3844,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>ᎤᎬᏫᏳᎯ ᎭᏫ ᎪᎯ ᎢᎦ ᎠᏟᎢᎵᏒ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>ᎹᏇᎵ ᎤᎦᏚᏛᎢ ᎠᏟᎢᎵᏒ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>ᎹᎦᏓᏂ ᎠᏟᎢᎵᏒ</generic>
@@ -3915,13 +3883,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ᎹᏌᏂ ᎠᏟᎢᎵᏒ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>ᏧᏴᏢ ᏭᏕᎵᎬ ᎠᏂᏍᏆᏂ ᎠᏟᎢᎵᏒ</generic>
-					<standard>ᏧᏴᏢ ᏭᏕᎵᎬ ᎠᏂᏍᏆᏂ ᎠᏟᎶᏍᏗ ᎠᏟᎢᎵᏒ</standard>
-					<daylight>ᏧᏴᏢ ᏭᏕᎵᎬ ᎠᏂᏍᏆᏂ ᎪᎯ ᎢᎦ ᎠᏟᎢᎵᏒ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>ᎠᏂᏍᏆᏂ ᏭᏕᎵᎬ ᎠᏟᎢᎵᏒ</generic>
diff --git a/make/data/cldr/common/main/chr_US.xml b/make/data/cldr/common/main/chr_US.xml
index 753f7ad5e50..c4765608100 100644
--- a/make/data/cldr/common/main/chr_US.xml
+++ b/make/data/cldr/common/main/chr_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cic.xml b/make/data/cldr/common/main/cic.xml
index 3714110a8c3..19ef45c939e 100644
--- a/make/data/cldr/common/main/cic.xml
+++ b/make/data/cldr/common/main/cic.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cic_US.xml b/make/data/cldr/common/main/cic_US.xml
index 3eaf1b33792..06358d5e3a9 100644
--- a/make/data/cldr/common/main/cic_US.xml
+++ b/make/data/cldr/common/main/cic_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ckb.xml b/make/data/cldr/common/main/ckb.xml
index dc05102053f..e657cfdd359 100644
--- a/make/data/cldr/common/main/ckb.xml
+++ b/make/data/cldr/common/main/ckb.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ckb_IQ.xml b/make/data/cldr/common/main/ckb_IQ.xml
index 867fc0f702b..d5566668311 100644
--- a/make/data/cldr/common/main/ckb_IQ.xml
+++ b/make/data/cldr/common/main/ckb_IQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ckb_IR.xml b/make/data/cldr/common/main/ckb_IR.xml
index 3baaa3bafb0..82e50bf7ebe 100644
--- a/make/data/cldr/common/main/ckb_IR.xml
+++ b/make/data/cldr/common/main/ckb_IR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/co.xml b/make/data/cldr/common/main/co.xml
index d4d846700fa..c3dc3a138e3 100644
--- a/make/data/cldr/common/main/co.xml
+++ b/make/data/cldr/common/main/co.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/co_FR.xml b/make/data/cldr/common/main/co_FR.xml
index b70e6839dce..7ec66b708a1 100644
--- a/make/data/cldr/common/main/co_FR.xml
+++ b/make/data/cldr/common/main/co_FR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cs.xml b/make/data/cldr/common/main/cs.xml
index b9d607310da..2b12c2e7923 100644
--- a/make/data/cldr/common/main/cs.xml
+++ b/make/data/cldr/common/main/cs.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1220,7 +1220,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Řazení telefonního seznamu</type>
 			<type key="collation" type="phonetic">Fonetické řazení</type>
 			<type key="collation" type="pinyin">Řazení podle pchin-jinu</type>
-			<type key="collation" type="reformed">Reformované řazení</type>
 			<type key="collation" type="search">Obecné hledání</type>
 			<type key="collation" type="searchjl" draft="contributed">Vyhledávat podle počáteční souhlásky písma hangul</type>
 			<type key="collation" type="standard">Standardní řazení</type>
@@ -2839,9 +2838,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<hourFormat>+H:mm;-H:mm</hourFormat>
 			<regionFormat>časové pásmo {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>koordinovaný světový čas</standard>
@@ -2868,9 +2864,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Vídeň</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Dháka</exemplarCity>
 			</zone>
@@ -3278,15 +3271,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Taipei">
 				<exemplarCity>Tchaj-pej</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kyjev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Záporoží</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<short>
 					<generic draft="contributed">HST</generic>
@@ -3927,11 +3914,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Macajský letní čas</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>čas ostrova Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>magadanský čas</generic>
@@ -3971,13 +3953,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>čas Mawsonovy stanice</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>severozápadní mexický čas</generic>
-					<standard>severozápadní mexický standardní čas</standard>
-					<daylight>severozápadní mexický letní čas</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>mexický pacifický čas</generic>
diff --git a/make/data/cldr/common/main/cs_CZ.xml b/make/data/cldr/common/main/cs_CZ.xml
index 04e724eda84..24aaba7de65 100644
--- a/make/data/cldr/common/main/cs_CZ.xml
+++ b/make/data/cldr/common/main/cs_CZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/csw.xml b/make/data/cldr/common/main/csw.xml
index 0c69a7d45b3..aa49f5eb224 100644
--- a/make/data/cldr/common/main/csw.xml
+++ b/make/data/cldr/common/main/csw.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/csw_CA.xml b/make/data/cldr/common/main/csw_CA.xml
index 28baa8fd8e0..8b68feb93f8 100644
--- a/make/data/cldr/common/main/csw_CA.xml
+++ b/make/data/cldr/common/main/csw_CA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cu.xml b/make/data/cldr/common/main/cu.xml
index fec2d5afa47..bd6ba061339 100644
--- a/make/data/cldr/common/main/cu.xml
+++ b/make/data/cldr/common/main/cu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -492,18 +492,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Anadyr">
 				<exemplarCity draft="unconfirmed">а҆на́дырь</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="unconfirmed">ᲂу҆́жградъ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity draft="unconfirmed">кі́евъ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity draft="unconfirmed">сѷмферꙋ́поль</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">запра́жїе</exemplarCity>
-			</zone>
 			<metazone type="America_Central">
 				<long>
 					<generic draft="unconfirmed">среднеамерїка́нское вре́мѧ</generic>
diff --git a/make/data/cldr/common/main/cu_RU.xml b/make/data/cldr/common/main/cu_RU.xml
index 120c8710823..746300296e0 100644
--- a/make/data/cldr/common/main/cu_RU.xml
+++ b/make/data/cldr/common/main/cu_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cv.xml b/make/data/cldr/common/main/cv.xml
index b91b17d85b0..ef9e1f2245a 100644
--- a/make/data/cldr/common/main/cv.xml
+++ b/make/data/cldr/common/main/cv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1257,9 +1257,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Йеллоунайф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Эдмонтон</exemplarCity>
 			</zone>
@@ -1278,30 +1275,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>Резольют</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейни-Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ранкин-Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Корал-Харбор</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Икалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртанг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -2109,18 +2094,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар-эс-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферополь</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожье</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -2136,9 +2115,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Nome">
 				<exemplarCity>Ном</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Джонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Анкоридж</exemplarCity>
 			</zone>
@@ -2774,11 +2750,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Лорд-Хау ҫуллахи вӑхӑчӗ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Маккуори вӑхӑчӗ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магадан вӑхӑчӗ</generic>
@@ -2818,13 +2789,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Моусон вӑхӑчӗ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Ҫурҫӗр-анӑҫ Мексика вӑхӑчӗ</generic>
-					<standard>Ҫурҫӗр-анӑҫ Мексика стандартлӑ вӑхӑчӗ</standard>
-					<daylight>Ҫурҫӗр-анӑҫ Мексика ҫуллахи вӑхӑчӗ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Мексика Лӑпкӑ океан вӑхӑчӗ</generic>
diff --git a/make/data/cldr/common/main/cv_RU.xml b/make/data/cldr/common/main/cv_RU.xml
index 79e419ecd2e..042cde46b8a 100644
--- a/make/data/cldr/common/main/cv_RU.xml
+++ b/make/data/cldr/common/main/cv_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/cy.xml b/make/data/cldr/common/main/cy.xml
index 5cb956fede0..d9883189a70 100644
--- a/make/data/cldr/common/main/cy.xml
+++ b/make/data/cldr/common/main/cy.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1036,7 +1036,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="gb2312han">Trefn Symledig Tsieina - GB2312</type>
 			<type key="collation" type="phonebook">Trefn Llyfr Ffôn</type>
 			<type key="collation" type="pinyin">Trefn Pinyin</type>
-			<type key="collation" type="reformed">Trefn Diwygiedig</type>
 			<type key="collation" type="search">Chwilio at Ddibenion Cyffredinol</type>
 			<type key="collation" type="standard">Trefn Safonol</type>
 			<type key="collation" type="traditional">Trefn Traddodiadol</type>
@@ -2494,9 +2493,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Amser {0}</regionFormat>
 			<regionFormat type="daylight">Amser Haf {0}</regionFormat>
 			<regionFormat type="standard">Amser Safonol {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Amser Cyffredniol Cydlynol</standard>
@@ -2511,9 +2507,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Fienna</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Brwsel</exemplarCity>
 			</zone>
@@ -2631,9 +2624,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Istanbul">
 				<exemplarCity>Caergystennin</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
@@ -3185,11 +3175,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Amser Haf yr Arglwydd Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Amser Ynys Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Amser Magadan</generic>
@@ -3229,13 +3214,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Amser Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Amser Gogledd Orllewin Mecsico</generic>
-					<standard>Amser Safonol Gogledd Orllewin Mecsico</standard>
-					<daylight>Amser Haf Gogledd Orllewin Mecsico</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Amser Pasiffig Mecsico</generic>
diff --git a/make/data/cldr/common/main/cy_GB.xml b/make/data/cldr/common/main/cy_GB.xml
index 46d835c256e..688ce3f6aa7 100644
--- a/make/data/cldr/common/main/cy_GB.xml
+++ b/make/data/cldr/common/main/cy_GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/da.xml b/make/data/cldr/common/main/da.xml
index 80277259bd2..1bb32216e19 100644
--- a/make/data/cldr/common/main/da.xml
+++ b/make/data/cldr/common/main/da.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1194,7 +1194,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">sorteringsrækkefølge i telefonbøger</type>
 			<type key="collation" type="phonetic">fonetisk sorteringsrækkefølge</type>
 			<type key="collation" type="pinyin">pinyin-baseret sorteringsrækkefølge</type>
-			<type key="collation" type="reformed">ny sorteringsrækkefølge</type>
 			<type key="collation" type="search">generel søgning</type>
 			<type key="collation" type="searchjl" draft="contributed">sortér efter den første konsonant i hangul</type>
 			<type key="collation" type="standard">standardsorteringsrækkefølge</type>
@@ -2655,9 +2654,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0}-tid</regionFormat>
 			<regionFormat type="daylight">{0}-sommertid</regionFormat>
 			<regionFormat type="standard">{0}-normaltid</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Koordineret universaltid</standard>
@@ -2675,9 +2671,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Bruxelles</exemplarCity>
 			</zone>
@@ -2850,15 +2843,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Ashgabat">
 				<exemplarCity>Asjkhabad</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzjhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizjzja</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3451,11 +3438,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Macao-sommertid</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie-tid</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan-tid</generic>
@@ -3495,13 +3477,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawson-tid</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Nordvestmexicansk tid</generic>
-					<standard>Nordvestmexicansk normaltid</standard>
-					<daylight>Nordvestmexicansk sommertid</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexicansk Pacific-tid</generic>
diff --git a/make/data/cldr/common/main/da_DK.xml b/make/data/cldr/common/main/da_DK.xml
index 92a4f736c4c..8ea345b6577 100644
--- a/make/data/cldr/common/main/da_DK.xml
+++ b/make/data/cldr/common/main/da_DK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/da_GL.xml b/make/data/cldr/common/main/da_GL.xml
index e61cbdb9568..290f091331f 100644
--- a/make/data/cldr/common/main/da_GL.xml
+++ b/make/data/cldr/common/main/da_GL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dav.xml b/make/data/cldr/common/main/dav.xml
index d5be35b12fe..7cd6e77a1c7 100644
--- a/make/data/cldr/common/main/dav.xml
+++ b/make/data/cldr/common/main/dav.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dav_KE.xml b/make/data/cldr/common/main/dav_KE.xml
index 15c94ce0e94..b317e2e51e7 100644
--- a/make/data/cldr/common/main/dav_KE.xml
+++ b/make/data/cldr/common/main/dav_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/de.xml b/make/data/cldr/common/main/de.xml
index 5d7b3515abe..da9426b79f0 100644
--- a/make/data/cldr/common/main/de.xml
+++ b/make/data/cldr/common/main/de.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1265,7 +1265,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Telefonbuch-Sortierung</type>
 			<type key="collation" type="phonetic">Phonetische Sortierung</type>
 			<type key="collation" type="pinyin">Pinyin-Sortierung</type>
-			<type key="collation" type="reformed">Reformierte Sortierreihenfolge</type>
 			<type key="collation" type="search">Allgemeine Suche</type>
 			<type key="collation" type="searchjl" draft="contributed">Suche nach Anfangsbuchstaben des koreanischen Alphabets</type>
 			<type key="collation" type="standard">Standard-Sortierung</type>
@@ -2761,9 +2760,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} (Ortszeit)</regionFormat>
 			<regionFormat type="daylight">{0} (Sommerzeit)</regionFormat>
 			<regionFormat type="standard">{0} (Normalzeit)</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Koordinierte Weltzeit</standard>
@@ -2787,9 +2783,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Brüssel</exemplarCity>
 			</zone>
@@ -3076,15 +3069,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Daressalam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uschgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiew</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Saporischschja</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3682,11 +3669,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Macau-Sommerzeit</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarieinsel-Zeit</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan-Zeit</generic>
@@ -3726,13 +3708,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawson-Zeit</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Nordwestmexiko-Zeit</generic>
-					<standard>Nordwestmexiko-Normalzeit</standard>
-					<daylight>Nordwestmexiko-Sommerzeit</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexikanische Pazifikzeit</generic>
diff --git a/make/data/cldr/common/main/de_AT.xml b/make/data/cldr/common/main/de_AT.xml
index 462619703d2..2c96f6eeb98 100644
--- a/make/data/cldr/common/main/de_AT.xml
+++ b/make/data/cldr/common/main/de_AT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/de_BE.xml b/make/data/cldr/common/main/de_BE.xml
index b9f95deb36d..65168659e95 100644
--- a/make/data/cldr/common/main/de_BE.xml
+++ b/make/data/cldr/common/main/de_BE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/de_CH.xml b/make/data/cldr/common/main/de_CH.xml
index 7ab945a0a7b..db148685303 100644
--- a/make/data/cldr/common/main/de_CH.xml
+++ b/make/data/cldr/common/main/de_CH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/de_DE.xml b/make/data/cldr/common/main/de_DE.xml
index 6b538e156d2..215f3071fb5 100644
--- a/make/data/cldr/common/main/de_DE.xml
+++ b/make/data/cldr/common/main/de_DE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/de_IT.xml b/make/data/cldr/common/main/de_IT.xml
index 4c9900f4619..c02cf2d054a 100644
--- a/make/data/cldr/common/main/de_IT.xml
+++ b/make/data/cldr/common/main/de_IT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/de_LI.xml b/make/data/cldr/common/main/de_LI.xml
index a088c592f08..f9d02706ab8 100644
--- a/make/data/cldr/common/main/de_LI.xml
+++ b/make/data/cldr/common/main/de_LI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/de_LU.xml b/make/data/cldr/common/main/de_LU.xml
index d6b0047899b..3090319548c 100644
--- a/make/data/cldr/common/main/de_LU.xml
+++ b/make/data/cldr/common/main/de_LU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dje.xml b/make/data/cldr/common/main/dje.xml
index e65a81575f7..72c95576a9e 100644
--- a/make/data/cldr/common/main/dje.xml
+++ b/make/data/cldr/common/main/dje.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dje_NE.xml b/make/data/cldr/common/main/dje_NE.xml
index a348258a672..8cbabd42fdb 100644
--- a/make/data/cldr/common/main/dje_NE.xml
+++ b/make/data/cldr/common/main/dje_NE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/doi.xml b/make/data/cldr/common/main/doi.xml
index 58c92dd73a6..025c806eff5 100644
--- a/make/data/cldr/common/main/doi.xml
+++ b/make/data/cldr/common/main/doi.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/doi_IN.xml b/make/data/cldr/common/main/doi_IN.xml
index 5618f0f6ba2..941eaa5fda2 100644
--- a/make/data/cldr/common/main/doi_IN.xml
+++ b/make/data/cldr/common/main/doi_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dsb.xml b/make/data/cldr/common/main/dsb.xml
index a47e5c68f2b..e36b50c2e4d 100644
--- a/make/data/cldr/common/main/dsb.xml
+++ b/make/data/cldr/common/main/dsb.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2536,15 +2536,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Daressalam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiew</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Saporižja</exemplarCity>
-			</zone>
 			<zone type="Asia/Tashkent">
 				<exemplarCity>Taškent</exemplarCity>
 			</zone>
@@ -3075,11 +3069,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>lěśojski cas kupy Lord-Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>cas kupy Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadański cas</generic>
@@ -3119,13 +3108,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mawson cas</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Mexiski dłujkowjacorny cas</generic>
-					<standard>Mexiski dłujkowjacorny standardny cas</standard>
-					<daylight>Mexiski dłujkowjacorny lěśojski cas</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexiski pacifiski cas</generic>
diff --git a/make/data/cldr/common/main/dsb_DE.xml b/make/data/cldr/common/main/dsb_DE.xml
index f43aa71ad41..312a235443e 100644
--- a/make/data/cldr/common/main/dsb_DE.xml
+++ b/make/data/cldr/common/main/dsb_DE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dua.xml b/make/data/cldr/common/main/dua.xml
index 1377547fbe3..0162040d704 100644
--- a/make/data/cldr/common/main/dua.xml
+++ b/make/data/cldr/common/main/dua.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dua_CM.xml b/make/data/cldr/common/main/dua_CM.xml
index c69387b038d..83e862a0269 100644
--- a/make/data/cldr/common/main/dua_CM.xml
+++ b/make/data/cldr/common/main/dua_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dv.xml b/make/data/cldr/common/main/dv.xml
index 278e2f1b802..c169fd9eb73 100644
--- a/make/data/cldr/common/main/dv.xml
+++ b/make/data/cldr/common/main/dv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dv_MV.xml b/make/data/cldr/common/main/dv_MV.xml
index 7d07ed90b72..3518ac6f4b2 100644
--- a/make/data/cldr/common/main/dv_MV.xml
+++ b/make/data/cldr/common/main/dv_MV.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dyo.xml b/make/data/cldr/common/main/dyo.xml
index c52eaf64850..43cc0b41066 100644
--- a/make/data/cldr/common/main/dyo.xml
+++ b/make/data/cldr/common/main/dyo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dyo_SN.xml b/make/data/cldr/common/main/dyo_SN.xml
index 12d37238e29..28753759b12 100644
--- a/make/data/cldr/common/main/dyo_SN.xml
+++ b/make/data/cldr/common/main/dyo_SN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/dz.xml b/make/data/cldr/common/main/dz.xml
index 5a58b42de98..b22ebf6b4cd 100644
--- a/make/data/cldr/common/main/dz.xml
+++ b/make/data/cldr/common/main/dz.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1197,27 +1197,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>རི་སོ་ལིའུཊ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>རཱེ་ནི་རི་ཝར</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>རེན་ཀིན་ ཨིན་ལེཊ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ཨ་ཏི་ཀོ་ཀཱན</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ཐན་ཌར་ བའེ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ནི་པི་གཱོན</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ཊོ་རོན་ཊོ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>པེང་ནིར་ཏུང</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>མཱོངཀ་ཊོན</exemplarCity>
 			</zone>
@@ -1551,9 +1539,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Wake">
 				<exemplarCity draft="unconfirmed">ཝེཀ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity draft="unconfirmed">ཇཱོནསི་ཊོན</exemplarCity>
-			</zone>
 			<zone type="America/Yakutat">
 				<exemplarCity>ཡ་ཀུ་ཏཏ</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/dz_BT.xml b/make/data/cldr/common/main/dz_BT.xml
index 9c159da4d70..b75cafed863 100644
--- a/make/data/cldr/common/main/dz_BT.xml
+++ b/make/data/cldr/common/main/dz_BT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ebu.xml b/make/data/cldr/common/main/ebu.xml
index 30c61237f80..5bccad8ed18 100644
--- a/make/data/cldr/common/main/ebu.xml
+++ b/make/data/cldr/common/main/ebu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ebu_KE.xml b/make/data/cldr/common/main/ebu_KE.xml
index 2d28398e8be..1be6fdd248f 100644
--- a/make/data/cldr/common/main/ebu_KE.xml
+++ b/make/data/cldr/common/main/ebu_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ee.xml b/make/data/cldr/common/main/ee.xml
index 4bf0edbd2bc..81b7f9cab68 100644
--- a/make/data/cldr/common/main/ee.xml
+++ b/make/data/cldr/common/main/ee.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -736,7 +736,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="gb2312han">chinagbe yeye ƒe ɖoɖomɔ nu</type>
 			<type key="collation" type="phonebook">fonegbalẽ me ɖoɖomɔ nu</type>
 			<type key="collation" type="pinyin">pinyin ɖoɖomɔ nu</type>
-			<type key="collation" type="reformed">nugbugbɔtoɖo ƒe ɖoɖomɔ nu</type>
 			<type key="collation" type="search">nudidi hena zazã gbadza</type>
 			<type key="collation" type="searchjl" draft="unconfirmed">nudidi le hangul ƒe ɖoɖo gbãtɔ nu</type>
 			<type key="collation" type="stroke">stroke ɖoɖomɔ nu</type>
@@ -1892,9 +1891,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Etc/Unknown">
 				<exemplarCity>Du manya</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/London">
 				<long>
 					<daylight>British dzomeŋɔli gaƒoƒo me</daylight>
@@ -2493,11 +2489,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">Makau ŋkekeme gaƒoƒome</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie Island gaƒoƒo me</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan gaƒoƒo me</generic>
@@ -2537,13 +2528,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mawson gaƒoƒo me</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Northwest Mexico gaƒoƒo me</generic>
-					<standard>Northwest Mexico nutome gaƒoƒo me</standard>
-					<daylight>Northwest Mexico kele gaƒoƒo me</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexican Pacific gaƒoƒo me</generic>
diff --git a/make/data/cldr/common/main/ee_GH.xml b/make/data/cldr/common/main/ee_GH.xml
index 0bfd4e337d8..452647d5bd0 100644
--- a/make/data/cldr/common/main/ee_GH.xml
+++ b/make/data/cldr/common/main/ee_GH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ee_TG.xml b/make/data/cldr/common/main/ee_TG.xml
index 7ce3b1f73d7..4da0b5e63db 100644
--- a/make/data/cldr/common/main/ee_TG.xml
+++ b/make/data/cldr/common/main/ee_TG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/el.xml b/make/data/cldr/common/main/el.xml
index 4a521ac829c..9ad122deba5 100644
--- a/make/data/cldr/common/main/el.xml
+++ b/make/data/cldr/common/main/el.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1140,7 +1140,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Σειρά ταξινόμησης τηλεφωνικού καταλόγου</type>
 			<type key="collation" type="phonetic">Φωνητική σειρά ταξινόμησης</type>
 			<type key="collation" type="pinyin">Σειρά ταξινόμησης Πινγίν</type>
-			<type key="collation" type="reformed">Ανασχηματισμένη σειρά ταξινόμησης</type>
 			<type key="collation" type="search">Αναζήτηση γενικού τύπου</type>
 			<type key="collation" type="searchjl" draft="contributed">Αναζήτηση κατά αρχικό σύμφωνο Χανγκούλ</type>
 			<type key="collation" type="standard">Τυπική σειρά ταξινόμησης</type>
@@ -2577,9 +2576,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">Θερινή ώρα ({0})</regionFormat>
 			<regionFormat type="standard">Χειμερινή ώρα ({0})</regionFormat>
 			<fallbackFormat>[{1} ({0})]</fallbackFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Σάντα Ιζαμπέλ</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Συντονισμένη Παγκόσμια Ώρα</standard>
@@ -2702,9 +2698,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Μελβούρνη</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Κάρι</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Χόμπαρτ</exemplarCity>
 			</zone>
@@ -2858,9 +2851,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Κρέστον</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Γέλοουναϊφ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Έντμοντον</exemplarCity>
 			</zone>
@@ -2879,30 +2869,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Ρέζολουτ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Ρέινι Ρίβερ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ράνκιν Ίνλετ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Ατικόκαν</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Θάντερ Μπέι</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Νιπιγκόν</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Τορόντο</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ικαλούιτ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Πανγκνίρτουνγκ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Μόνκτον</exemplarCity>
 			</zone>
@@ -3713,18 +3691,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Νταρ ες Σαλάμ</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ούζχοροντ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Κίεβο</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Συμφερόπολη</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Ζαπορόζιε</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Καμπάλα</exemplarCity>
 			</zone>
@@ -3743,9 +3715,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Χονολουλού</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Τζόνστον</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Άνκορατζ</exemplarCity>
 			</zone>
@@ -4422,11 +4391,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Θερινή ώρα Μακάο</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Ώρα Νησιού Μακουάρι</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Ώρα Μαγκαντάν</generic>
@@ -4466,13 +4430,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ώρα Μόσον</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Ώρα Βορειοδυτικού Μεξικού</generic>
-					<standard>Χειμερινή ώρα Βορειοδυτικού Μεξικού</standard>
-					<daylight>Θερινή ώρα Βορειοδυτικού Μεξικού</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Ώρα Ειρηνικού Μεξικού</generic>
diff --git a/make/data/cldr/common/main/el_CY.xml b/make/data/cldr/common/main/el_CY.xml
index 42c1d3cd660..4684acf26e6 100644
--- a/make/data/cldr/common/main/el_CY.xml
+++ b/make/data/cldr/common/main/el_CY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/el_GR.xml b/make/data/cldr/common/main/el_GR.xml
index 63856dd3a15..486102f53d6 100644
--- a/make/data/cldr/common/main/el_GR.xml
+++ b/make/data/cldr/common/main/el_GR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/el_POLYTON.xml b/make/data/cldr/common/main/el_POLYTON.xml
index f1e4021e335..4ddfe8295c3 100644
--- a/make/data/cldr/common/main/el_POLYTON.xml
+++ b/make/data/cldr/common/main/el_POLYTON.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en.xml b/make/data/cldr/common/main/en.xml
index a2f2412d11a..3b65dba4424 100644
--- a/make/data/cldr/common/main/en.xml
+++ b/make/data/cldr/common/main/en.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 the U.S. and other countries. CLDR data files are interpreted according to
@@ -24,7 +24,7 @@ annotations.
 		<languages>
 			<language type="aa">Afar</language>
 			<language type="ab">Abkhazian</language>
-			<language type="ace">Achinese</language>
+			<language type="ace">Acehnese</language>
 			<language type="ach">Acoli</language>
 			<language type="ada">Adangme</language>
 			<language type="ady">Adyghe</language>
@@ -1375,7 +1375,6 @@ annotations.
 			<type key="collation" type="phonebook">Phonebook Sort Order</type>
 			<type key="collation" type="phonetic">Phonetic Sort Order</type>
 			<type key="collation" type="pinyin">Pinyin Sort Order</type>
-			<type key="collation" type="reformed">Reformed Sort Order</type>
 			<type key="collation" type="search">General-Purpose Search</type>
 			<type key="collation" type="searchjl">Search By Hangul Initial Consonant</type>
 			<type key="collation" type="standard">Standard Sort Order</type>
@@ -3919,9 +3918,6 @@ annotations.
 			<zone type="Asia/Qostanay">
 				<exemplarCity>Kostanay</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhhorod</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<short>
 					<generic>HST</generic>
@@ -4362,6 +4358,13 @@ annotations.
 					<standard>GMT</standard>
 				</short>
 			</metazone>
+			<metazone type="Greenland">
+				<long>
+					<generic>Greenland Time</generic>
+					<standard>Greenland Standard Time</standard>
+					<daylight>Greenland Summer Time</daylight>
+				</long>
+			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
 					<generic>East Greenland Time</generic>
@@ -4540,11 +4543,6 @@ annotations.
 					<daylight>Macao Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie Island Time</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan Time</generic>
@@ -4584,13 +4582,6 @@ annotations.
 					<standard>Mawson Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Northwest Mexico Time</generic>
-					<standard>Northwest Mexico Standard Time</standard>
-					<daylight>Northwest Mexico Daylight Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexican Pacific Time</generic>
@@ -6488,6 +6479,11 @@ annotations.
 				<displayName count="one">East Caribbean dollar</displayName>
 				<displayName count="other">East Caribbean dollars</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Caribbean guilder</displayName>
+				<displayName count="one">Caribbean guilder</displayName>
+				<displayName count="other">Caribbean guilders</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Special Drawing Rights</displayName>
 				<displayName count="one">special drawing rights</displayName>
diff --git a/make/data/cldr/common/main/en_001.xml b/make/data/cldr/common/main/en_001.xml
index 43d23d440dc..45f042ae31a 100644
--- a/make/data/cldr/common/main/en_001.xml
+++ b/make/data/cldr/common/main/en_001.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -288,6 +288,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="pm">pm</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">am</dayPeriod>
 							<dayPeriod type="pm">pm</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
@@ -777,9 +778,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 		</fields>
 		<timeZoneNames>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>St Barthélemy</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/en_150.xml b/make/data/cldr/common/main/en_150.xml
index 1025033dbc2..e4309125fdd 100644
--- a/make/data/cldr/common/main/en_150.xml
+++ b/make/data/cldr/common/main/en_150.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_AE.xml b/make/data/cldr/common/main/en_AE.xml
index c4c26388be8..a06ca32f9d7 100644
--- a/make/data/cldr/common/main/en_AE.xml
+++ b/make/data/cldr/common/main/en_AE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 UAE English locale, based on US English orthography, formats from en_001
diff --git a/make/data/cldr/common/main/en_AG.xml b/make/data/cldr/common/main/en_AG.xml
index b43d6fa8919..7baadb707fb 100644
--- a/make/data/cldr/common/main/en_AG.xml
+++ b/make/data/cldr/common/main/en_AG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_AI.xml b/make/data/cldr/common/main/en_AI.xml
index 44d2da10caa..570253439bb 100644
--- a/make/data/cldr/common/main/en_AI.xml
+++ b/make/data/cldr/common/main/en_AI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_AS.xml b/make/data/cldr/common/main/en_AS.xml
index e7fcacd23d7..da6ad816ab3 100644
--- a/make/data/cldr/common/main/en_AS.xml
+++ b/make/data/cldr/common/main/en_AS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_AT.xml b/make/data/cldr/common/main/en_AT.xml
index 552756c4412..f9ed67e12eb 100644
--- a/make/data/cldr/common/main/en_AT.xml
+++ b/make/data/cldr/common/main/en_AT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_AU.xml b/make/data/cldr/common/main/en_AU.xml
index a5ab40fba87..bc112f81d07 100644
--- a/make/data/cldr/common/main/en_AU.xml
+++ b/make/data/cldr/common/main/en_AU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -218,9 +218,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="noon">midday</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">am</dayPeriod>
 							<dayPeriod type="noon">midday</dayPeriod>
-							<dayPeriod type="pm">pm</dayPeriod>
 						</dayPeriodWidth>
 						<dayPeriodWidth type="wide">
 							<dayPeriod type="noon">midday</dayPeriod>
diff --git a/make/data/cldr/common/main/en_BB.xml b/make/data/cldr/common/main/en_BB.xml
index 8ecf506cbde..a42ddcee867 100644
--- a/make/data/cldr/common/main/en_BB.xml
+++ b/make/data/cldr/common/main/en_BB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_BE.xml b/make/data/cldr/common/main/en_BE.xml
index 200aea4694f..4f11b35c416 100644
--- a/make/data/cldr/common/main/en_BE.xml
+++ b/make/data/cldr/common/main/en_BE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_BI.xml b/make/data/cldr/common/main/en_BI.xml
index d32eb2e11f1..08c66ea876a 100644
--- a/make/data/cldr/common/main/en_BI.xml
+++ b/make/data/cldr/common/main/en_BI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_BM.xml b/make/data/cldr/common/main/en_BM.xml
index 4cd252a7a60..2751a7e6adb 100644
--- a/make/data/cldr/common/main/en_BM.xml
+++ b/make/data/cldr/common/main/en_BM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_BS.xml b/make/data/cldr/common/main/en_BS.xml
index b469a2612bc..606935e8738 100644
--- a/make/data/cldr/common/main/en_BS.xml
+++ b/make/data/cldr/common/main/en_BS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_BW.xml b/make/data/cldr/common/main/en_BW.xml
index 25b55e6c3d3..029a68bd483 100644
--- a/make/data/cldr/common/main/en_BW.xml
+++ b/make/data/cldr/common/main/en_BW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_BZ.xml b/make/data/cldr/common/main/en_BZ.xml
index d1a20602fea..bf6cd9c6cd1 100644
--- a/make/data/cldr/common/main/en_BZ.xml
+++ b/make/data/cldr/common/main/en_BZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_CA.xml b/make/data/cldr/common/main/en_CA.xml
index b2d5234f201..f5e62a7157c 100644
--- a/make/data/cldr/common/main/en_CA.xml
+++ b/make/data/cldr/common/main/en_CA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -413,7 +413,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="midnight">mid</dayPeriod>
-							<dayPeriod type="am">a.m.</dayPeriod>
+							<dayPeriod type="am">am</dayPeriod>
 							<dayPeriod type="pm">pm</dayPeriod>
 							<dayPeriod type="morning1">mor</dayPeriod>
 							<dayPeriod type="afternoon1">aft</dayPeriod>
@@ -1350,13 +1350,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>MVT</standard>
 				</short>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Northwest Mexico Time</generic>
-					<standard>Northwest Mexico Standard Time</standard>
-					<daylight>Northwest Mexico Daylight Saving Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexican Pacific Time</generic>
@@ -1529,7 +1522,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="USD">
 				<symbol>US$</symbol>
-				<symbol alt="narrow" draft="contributed">US$</symbol>
 			</currency>
 			<currency type="XXX">
 				<displayName>unknown currency</displayName>
diff --git a/make/data/cldr/common/main/en_CC.xml b/make/data/cldr/common/main/en_CC.xml
index 0418a03b451..d7c89cceb05 100644
--- a/make/data/cldr/common/main/en_CC.xml
+++ b/make/data/cldr/common/main/en_CC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_CH.xml b/make/data/cldr/common/main/en_CH.xml
index 8de22161bb1..eb4b4052e0a 100644
--- a/make/data/cldr/common/main/en_CH.xml
+++ b/make/data/cldr/common/main/en_CH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_CK.xml b/make/data/cldr/common/main/en_CK.xml
index 927f073e02b..6b90814a581 100644
--- a/make/data/cldr/common/main/en_CK.xml
+++ b/make/data/cldr/common/main/en_CK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_CM.xml b/make/data/cldr/common/main/en_CM.xml
index 6c317a5cf58..9e88b643c8e 100644
--- a/make/data/cldr/common/main/en_CM.xml
+++ b/make/data/cldr/common/main/en_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_CX.xml b/make/data/cldr/common/main/en_CX.xml
index 9fa1fa250ef..f74d58fae8d 100644
--- a/make/data/cldr/common/main/en_CX.xml
+++ b/make/data/cldr/common/main/en_CX.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_CY.xml b/make/data/cldr/common/main/en_CY.xml
index 68e24327a4b..246e69e27a7 100644
--- a/make/data/cldr/common/main/en_CY.xml
+++ b/make/data/cldr/common/main/en_CY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_DE.xml b/make/data/cldr/common/main/en_DE.xml
index a23fa9e950a..e0a78572fb7 100644
--- a/make/data/cldr/common/main/en_DE.xml
+++ b/make/data/cldr/common/main/en_DE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_DG.xml b/make/data/cldr/common/main/en_DG.xml
index 3450900d046..afedbcd68f1 100644
--- a/make/data/cldr/common/main/en_DG.xml
+++ b/make/data/cldr/common/main/en_DG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_DK.xml b/make/data/cldr/common/main/en_DK.xml
index b8bfa5dadc7..7cfe98003a3 100644
--- a/make/data/cldr/common/main/en_DK.xml
+++ b/make/data/cldr/common/main/en_DK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_DM.xml b/make/data/cldr/common/main/en_DM.xml
index 4ac17acab51..4865025f358 100644
--- a/make/data/cldr/common/main/en_DM.xml
+++ b/make/data/cldr/common/main/en_DM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_Dsrt.xml b/make/data/cldr/common/main/en_Dsrt.xml
index 3c720f8498e..4bbce7fe942 100644
--- a/make/data/cldr/common/main/en_Dsrt.xml
+++ b/make/data/cldr/common/main/en_Dsrt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -709,9 +709,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>𐐐𐐪𐑌𐐲𐑊𐐭𐑊𐐭</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>𐐖𐐪𐑌𐑅𐐻𐐲𐑌</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>𐐁𐑍𐐿𐐲𐑉𐐮𐐾</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/en_Dsrt_US.xml b/make/data/cldr/common/main/en_Dsrt_US.xml
index f5d45057f16..1f5f650afba 100644
--- a/make/data/cldr/common/main/en_Dsrt_US.xml
+++ b/make/data/cldr/common/main/en_Dsrt_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_ER.xml b/make/data/cldr/common/main/en_ER.xml
index 5f7dd967eb6..73eb1839023 100644
--- a/make/data/cldr/common/main/en_ER.xml
+++ b/make/data/cldr/common/main/en_ER.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_FI.xml b/make/data/cldr/common/main/en_FI.xml
index d1ea9bc084b..c5bd77f0004 100644
--- a/make/data/cldr/common/main/en_FI.xml
+++ b/make/data/cldr/common/main/en_FI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_FJ.xml b/make/data/cldr/common/main/en_FJ.xml
index 1b31f0bcef6..150d4c97926 100644
--- a/make/data/cldr/common/main/en_FJ.xml
+++ b/make/data/cldr/common/main/en_FJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_FK.xml b/make/data/cldr/common/main/en_FK.xml
index 95fdee069c6..0043263afab 100644
--- a/make/data/cldr/common/main/en_FK.xml
+++ b/make/data/cldr/common/main/en_FK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_FM.xml b/make/data/cldr/common/main/en_FM.xml
index f7563fc16eb..302122d86b9 100644
--- a/make/data/cldr/common/main/en_FM.xml
+++ b/make/data/cldr/common/main/en_FM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_GB.xml b/make/data/cldr/common/main/en_GB.xml
index c633f865fa8..80f1237b319 100644
--- a/make/data/cldr/common/main/en_GB.xml
+++ b/make/data/cldr/common/main/en_GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -96,14 +96,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="gregorian">
-				<dayPeriods>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">am</dayPeriod>
-							<dayPeriod type="pm">pm</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
diff --git a/make/data/cldr/common/main/en_GD.xml b/make/data/cldr/common/main/en_GD.xml
index c0b98e3aa57..ab54007ecca 100644
--- a/make/data/cldr/common/main/en_GD.xml
+++ b/make/data/cldr/common/main/en_GD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_GG.xml b/make/data/cldr/common/main/en_GG.xml
index 7ac45fdb4b5..f5f305f14d7 100644
--- a/make/data/cldr/common/main/en_GG.xml
+++ b/make/data/cldr/common/main/en_GG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_GH.xml b/make/data/cldr/common/main/en_GH.xml
index b59605c6760..360a5852f96 100644
--- a/make/data/cldr/common/main/en_GH.xml
+++ b/make/data/cldr/common/main/en_GH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_GI.xml b/make/data/cldr/common/main/en_GI.xml
index e93b1ad6da1..86ebcd6d140 100644
--- a/make/data/cldr/common/main/en_GI.xml
+++ b/make/data/cldr/common/main/en_GI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_GM.xml b/make/data/cldr/common/main/en_GM.xml
index ae5521a7a63..e56a540ba5b 100644
--- a/make/data/cldr/common/main/en_GM.xml
+++ b/make/data/cldr/common/main/en_GM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_GU.xml b/make/data/cldr/common/main/en_GU.xml
index dbd7ef0561d..2da80b51ca7 100644
--- a/make/data/cldr/common/main/en_GU.xml
+++ b/make/data/cldr/common/main/en_GU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_GY.xml b/make/data/cldr/common/main/en_GY.xml
index 9434494aaee..01cae4613e8 100644
--- a/make/data/cldr/common/main/en_GY.xml
+++ b/make/data/cldr/common/main/en_GY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_HK.xml b/make/data/cldr/common/main/en_HK.xml
index fa80af6f140..55efa60afe4 100644
--- a/make/data/cldr/common/main/en_HK.xml
+++ b/make/data/cldr/common/main/en_HK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_ID.xml b/make/data/cldr/common/main/en_ID.xml
index dd1ef0173c2..d8967d4d32e 100644
--- a/make/data/cldr/common/main/en_ID.xml
+++ b/make/data/cldr/common/main/en_ID.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_IE.xml b/make/data/cldr/common/main/en_IE.xml
index c44748d4fdd..4d0cb66f64f 100644
--- a/make/data/cldr/common/main/en_IE.xml
+++ b/make/data/cldr/common/main/en_IE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_IL.xml b/make/data/cldr/common/main/en_IL.xml
index dc7b6dd7270..64e6712abf6 100644
--- a/make/data/cldr/common/main/en_IL.xml
+++ b/make/data/cldr/common/main/en_IL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_IM.xml b/make/data/cldr/common/main/en_IM.xml
index 298dc2119c4..e0cebdc97d7 100644
--- a/make/data/cldr/common/main/en_IM.xml
+++ b/make/data/cldr/common/main/en_IM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_IN.xml b/make/data/cldr/common/main/en_IN.xml
index 8a3de0b3eea..e92b09a0f35 100644
--- a/make/data/cldr/common/main/en_IN.xml
+++ b/make/data/cldr/common/main/en_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -156,14 +156,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="gregorian">
-				<dayPeriods>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">am</dayPeriod>
-							<dayPeriod type="pm">pm</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -348,10 +340,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</decimalFormatLength>
 			<decimalFormatLength type="short">
 				<decimalFormat>
-					<pattern type="1000" count="one">0T</pattern>
-					<pattern type="1000" count="other">0T</pattern>
-					<pattern type="10000" count="one">00T</pattern>
-					<pattern type="10000" count="other">00T</pattern>
+					<pattern type="1000" count="one">0K</pattern>
+					<pattern type="1000" count="other">0K</pattern>
+					<pattern type="10000" count="one">00K</pattern>
+					<pattern type="10000" count="other">00K</pattern>
 					<pattern type="100000" count="one">0L</pattern>
 					<pattern type="100000" count="other">0L</pattern>
 					<pattern type="1000000" count="one">00L</pattern>
@@ -362,10 +354,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<pattern type="100000000" count="other">00Cr</pattern>
 					<pattern type="1000000000" count="one">000Cr</pattern>
 					<pattern type="1000000000" count="other">000Cr</pattern>
-					<pattern type="10000000000" count="one">0TCr</pattern>
-					<pattern type="10000000000" count="other">0TCr</pattern>
-					<pattern type="100000000000" count="one">00TCr</pattern>
-					<pattern type="100000000000" count="other">00TCr</pattern>
+					<pattern type="10000000000" count="one">0KCr</pattern>
+					<pattern type="10000000000" count="other">0KCr</pattern>
+					<pattern type="100000000000" count="one">00KCr</pattern>
+					<pattern type="100000000000" count="other">00KCr</pattern>
 					<pattern type="1000000000000" count="one">0LCr</pattern>
 					<pattern type="1000000000000" count="other">0LCr</pattern>
 					<pattern type="10000000000000" count="one">00LCr</pattern>
@@ -392,14 +384,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="1000" count="one">¤0T</pattern>
-					<pattern type="1000" count="one" alt="alphaNextToNumber">¤ 0T</pattern>
-					<pattern type="1000" count="other">¤0T</pattern>
-					<pattern type="1000" count="other" alt="alphaNextToNumber">¤ 0T</pattern>
-					<pattern type="10000" count="one">¤00T</pattern>
-					<pattern type="10000" count="one" alt="alphaNextToNumber">¤ 00T</pattern>
-					<pattern type="10000" count="other">¤00T</pattern>
-					<pattern type="10000" count="other" alt="alphaNextToNumber">¤ 00T</pattern>
 					<pattern type="100000" count="one">¤0L</pattern>
 					<pattern type="100000" count="one" alt="alphaNextToNumber">¤ 0L</pattern>
 					<pattern type="100000" count="other">¤0L</pattern>
@@ -420,14 +404,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<pattern type="1000000000" count="one" alt="alphaNextToNumber">¤ 000Cr</pattern>
 					<pattern type="1000000000" count="other">¤000Cr</pattern>
 					<pattern type="1000000000" count="other" alt="alphaNextToNumber">¤ 000Cr</pattern>
-					<pattern type="10000000000" count="one">¤0TCr</pattern>
-					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 0TCr</pattern>
-					<pattern type="10000000000" count="other">¤0TCr</pattern>
-					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 0TCr</pattern>
-					<pattern type="100000000000" count="one">¤00TCr</pattern>
-					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 00TCr</pattern>
-					<pattern type="100000000000" count="other">¤00TCr</pattern>
-					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 00TCr</pattern>
+					<pattern type="10000000000" count="one">¤0KCr</pattern>
+					<pattern type="10000000000" count="one" alt="alphaNextToNumber">¤ 0KCr</pattern>
+					<pattern type="10000000000" count="other">¤0KCr</pattern>
+					<pattern type="10000000000" count="other" alt="alphaNextToNumber">¤ 0KCr</pattern>
+					<pattern type="100000000000" count="one">¤00KCr</pattern>
+					<pattern type="100000000000" count="one" alt="alphaNextToNumber">¤ 00KCr</pattern>
+					<pattern type="100000000000" count="other">¤00KCr</pattern>
+					<pattern type="100000000000" count="other" alt="alphaNextToNumber">¤ 00KCr</pattern>
 					<pattern type="1000000000000" count="one">¤0LCr</pattern>
 					<pattern type="1000000000000" count="one" alt="alphaNextToNumber">¤ 0LCr</pattern>
 					<pattern type="1000000000000" count="other">¤0LCr</pattern>
diff --git a/make/data/cldr/common/main/en_IO.xml b/make/data/cldr/common/main/en_IO.xml
index 32bbc146b16..92a48e14017 100644
--- a/make/data/cldr/common/main/en_IO.xml
+++ b/make/data/cldr/common/main/en_IO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_JE.xml b/make/data/cldr/common/main/en_JE.xml
index 175301c5a9c..bb034325375 100644
--- a/make/data/cldr/common/main/en_JE.xml
+++ b/make/data/cldr/common/main/en_JE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_JM.xml b/make/data/cldr/common/main/en_JM.xml
index 7b7a8a906db..95d0f7ff446 100644
--- a/make/data/cldr/common/main/en_JM.xml
+++ b/make/data/cldr/common/main/en_JM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_KE.xml b/make/data/cldr/common/main/en_KE.xml
index 676869a71b1..1bf5307c0fa 100644
--- a/make/data/cldr/common/main/en_KE.xml
+++ b/make/data/cldr/common/main/en_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_KI.xml b/make/data/cldr/common/main/en_KI.xml
index 641b0c7b763..d0e791a7af9 100644
--- a/make/data/cldr/common/main/en_KI.xml
+++ b/make/data/cldr/common/main/en_KI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_KN.xml b/make/data/cldr/common/main/en_KN.xml
index 29f593b7cbc..e42abe1b6ca 100644
--- a/make/data/cldr/common/main/en_KN.xml
+++ b/make/data/cldr/common/main/en_KN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_KY.xml b/make/data/cldr/common/main/en_KY.xml
index c03f9e247ea..63702387fea 100644
--- a/make/data/cldr/common/main/en_KY.xml
+++ b/make/data/cldr/common/main/en_KY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_LC.xml b/make/data/cldr/common/main/en_LC.xml
index 8fd621102ee..e1f26e6c5f8 100644
--- a/make/data/cldr/common/main/en_LC.xml
+++ b/make/data/cldr/common/main/en_LC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_LR.xml b/make/data/cldr/common/main/en_LR.xml
index 4675a76a383..eb4bd35354e 100644
--- a/make/data/cldr/common/main/en_LR.xml
+++ b/make/data/cldr/common/main/en_LR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_LS.xml b/make/data/cldr/common/main/en_LS.xml
index 5f1b55ceb8d..1eae8537fa8 100644
--- a/make/data/cldr/common/main/en_LS.xml
+++ b/make/data/cldr/common/main/en_LS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MG.xml b/make/data/cldr/common/main/en_MG.xml
index db4d89f73ef..64b115b5eee 100644
--- a/make/data/cldr/common/main/en_MG.xml
+++ b/make/data/cldr/common/main/en_MG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MH.xml b/make/data/cldr/common/main/en_MH.xml
index 40f6bc0876e..6796e9192e0 100644
--- a/make/data/cldr/common/main/en_MH.xml
+++ b/make/data/cldr/common/main/en_MH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MO.xml b/make/data/cldr/common/main/en_MO.xml
index 2409398a4b0..d8d7f8b4c9a 100644
--- a/make/data/cldr/common/main/en_MO.xml
+++ b/make/data/cldr/common/main/en_MO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MP.xml b/make/data/cldr/common/main/en_MP.xml
index 0a5498907f7..7dc20583a0c 100644
--- a/make/data/cldr/common/main/en_MP.xml
+++ b/make/data/cldr/common/main/en_MP.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MS.xml b/make/data/cldr/common/main/en_MS.xml
index a51583748b7..8b050edc400 100644
--- a/make/data/cldr/common/main/en_MS.xml
+++ b/make/data/cldr/common/main/en_MS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MT.xml b/make/data/cldr/common/main/en_MT.xml
index 21e101d9b5d..c5a59d467ee 100644
--- a/make/data/cldr/common/main/en_MT.xml
+++ b/make/data/cldr/common/main/en_MT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MU.xml b/make/data/cldr/common/main/en_MU.xml
index ca5d10c48ee..415c9633f85 100644
--- a/make/data/cldr/common/main/en_MU.xml
+++ b/make/data/cldr/common/main/en_MU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MV.xml b/make/data/cldr/common/main/en_MV.xml
index c235cdf9290..ef0f012484e 100644
--- a/make/data/cldr/common/main/en_MV.xml
+++ b/make/data/cldr/common/main/en_MV.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MW.xml b/make/data/cldr/common/main/en_MW.xml
index 0106749d3a4..a082ea1e795 100644
--- a/make/data/cldr/common/main/en_MW.xml
+++ b/make/data/cldr/common/main/en_MW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_MY.xml b/make/data/cldr/common/main/en_MY.xml
index 260e4fabb8b..b781aba1310 100644
--- a/make/data/cldr/common/main/en_MY.xml
+++ b/make/data/cldr/common/main/en_MY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_NA.xml b/make/data/cldr/common/main/en_NA.xml
index 6c466db1778..a805dda6fe4 100644
--- a/make/data/cldr/common/main/en_NA.xml
+++ b/make/data/cldr/common/main/en_NA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_NF.xml b/make/data/cldr/common/main/en_NF.xml
index b8985e4780b..f0abbefd4a5 100644
--- a/make/data/cldr/common/main/en_NF.xml
+++ b/make/data/cldr/common/main/en_NF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_NG.xml b/make/data/cldr/common/main/en_NG.xml
index 1cdbe002048..cfee35b5967 100644
--- a/make/data/cldr/common/main/en_NG.xml
+++ b/make/data/cldr/common/main/en_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_NL.xml b/make/data/cldr/common/main/en_NL.xml
index 50e7cdf0e9f..ad11fd2356e 100644
--- a/make/data/cldr/common/main/en_NL.xml
+++ b/make/data/cldr/common/main/en_NL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_NR.xml b/make/data/cldr/common/main/en_NR.xml
index 759f3d4e049..461a309c8e6 100644
--- a/make/data/cldr/common/main/en_NR.xml
+++ b/make/data/cldr/common/main/en_NR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_NU.xml b/make/data/cldr/common/main/en_NU.xml
index 98e4b89097e..e1f57eb64b7 100644
--- a/make/data/cldr/common/main/en_NU.xml
+++ b/make/data/cldr/common/main/en_NU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_NZ.xml b/make/data/cldr/common/main/en_NZ.xml
index 7f81af30aa9..9fd2ea95156 100644
--- a/make/data/cldr/common/main/en_NZ.xml
+++ b/make/data/cldr/common/main/en_NZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_PG.xml b/make/data/cldr/common/main/en_PG.xml
index 97e223eac5c..0f630a113de 100644
--- a/make/data/cldr/common/main/en_PG.xml
+++ b/make/data/cldr/common/main/en_PG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_PH.xml b/make/data/cldr/common/main/en_PH.xml
index 26299daf2c6..5c556175331 100644
--- a/make/data/cldr/common/main/en_PH.xml
+++ b/make/data/cldr/common/main/en_PH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_PK.xml b/make/data/cldr/common/main/en_PK.xml
index ff0180fc0f8..3707a36e215 100644
--- a/make/data/cldr/common/main/en_PK.xml
+++ b/make/data/cldr/common/main/en_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_PN.xml b/make/data/cldr/common/main/en_PN.xml
index 2979154e92a..41dfaf5a2bc 100644
--- a/make/data/cldr/common/main/en_PN.xml
+++ b/make/data/cldr/common/main/en_PN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_PR.xml b/make/data/cldr/common/main/en_PR.xml
index c12e1a39ec6..c2a0b54bac2 100644
--- a/make/data/cldr/common/main/en_PR.xml
+++ b/make/data/cldr/common/main/en_PR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_PW.xml b/make/data/cldr/common/main/en_PW.xml
index 8edce18f4bf..0e6fc103956 100644
--- a/make/data/cldr/common/main/en_PW.xml
+++ b/make/data/cldr/common/main/en_PW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_RW.xml b/make/data/cldr/common/main/en_RW.xml
index 43c09b5c2cb..16cec039043 100644
--- a/make/data/cldr/common/main/en_RW.xml
+++ b/make/data/cldr/common/main/en_RW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SB.xml b/make/data/cldr/common/main/en_SB.xml
index 7f38a06f935..f7d8a49d231 100644
--- a/make/data/cldr/common/main/en_SB.xml
+++ b/make/data/cldr/common/main/en_SB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SC.xml b/make/data/cldr/common/main/en_SC.xml
index 3dfdfda7e60..80db50ef2ca 100644
--- a/make/data/cldr/common/main/en_SC.xml
+++ b/make/data/cldr/common/main/en_SC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SD.xml b/make/data/cldr/common/main/en_SD.xml
index 50bfa1cf5b7..9e937732564 100644
--- a/make/data/cldr/common/main/en_SD.xml
+++ b/make/data/cldr/common/main/en_SD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SE.xml b/make/data/cldr/common/main/en_SE.xml
index 7b05ba2e60e..2864cd90b2b 100644
--- a/make/data/cldr/common/main/en_SE.xml
+++ b/make/data/cldr/common/main/en_SE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SG.xml b/make/data/cldr/common/main/en_SG.xml
index ec7df565a7a..970adc78ac2 100644
--- a/make/data/cldr/common/main/en_SG.xml
+++ b/make/data/cldr/common/main/en_SG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SH.xml b/make/data/cldr/common/main/en_SH.xml
index e446a3d42da..70acafc3aaf 100644
--- a/make/data/cldr/common/main/en_SH.xml
+++ b/make/data/cldr/common/main/en_SH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SI.xml b/make/data/cldr/common/main/en_SI.xml
index 07e78e09328..3a1d997b448 100644
--- a/make/data/cldr/common/main/en_SI.xml
+++ b/make/data/cldr/common/main/en_SI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SL.xml b/make/data/cldr/common/main/en_SL.xml
index 3352baab3c4..f4a944bcf93 100644
--- a/make/data/cldr/common/main/en_SL.xml
+++ b/make/data/cldr/common/main/en_SL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SS.xml b/make/data/cldr/common/main/en_SS.xml
index 6aa773e99cf..c45a113af4b 100644
--- a/make/data/cldr/common/main/en_SS.xml
+++ b/make/data/cldr/common/main/en_SS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SX.xml b/make/data/cldr/common/main/en_SX.xml
index 414c9953914..c73851eb280 100644
--- a/make/data/cldr/common/main/en_SX.xml
+++ b/make/data/cldr/common/main/en_SX.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_SZ.xml b/make/data/cldr/common/main/en_SZ.xml
index c3cb2fbd804..085aa49bd18 100644
--- a/make/data/cldr/common/main/en_SZ.xml
+++ b/make/data/cldr/common/main/en_SZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_Shaw.xml b/make/data/cldr/common/main/en_Shaw.xml
index d5fc8c91d57..39f2e23af19 100644
--- a/make/data/cldr/common/main/en_Shaw.xml
+++ b/make/data/cldr/common/main/en_Shaw.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_Shaw_GB.xml b/make/data/cldr/common/main/en_Shaw_GB.xml
index f5d1e58a311..2766c6c6ce2 100644
--- a/make/data/cldr/common/main/en_Shaw_GB.xml
+++ b/make/data/cldr/common/main/en_Shaw_GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_TC.xml b/make/data/cldr/common/main/en_TC.xml
index 799d960c545..716b6c0dfa5 100644
--- a/make/data/cldr/common/main/en_TC.xml
+++ b/make/data/cldr/common/main/en_TC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_TK.xml b/make/data/cldr/common/main/en_TK.xml
index eea518c3b1e..2b4933cd43d 100644
--- a/make/data/cldr/common/main/en_TK.xml
+++ b/make/data/cldr/common/main/en_TK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_TO.xml b/make/data/cldr/common/main/en_TO.xml
index 46bf208ee24..3471fd370bc 100644
--- a/make/data/cldr/common/main/en_TO.xml
+++ b/make/data/cldr/common/main/en_TO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_TT.xml b/make/data/cldr/common/main/en_TT.xml
index a7997c035e8..f2cdc18acf0 100644
--- a/make/data/cldr/common/main/en_TT.xml
+++ b/make/data/cldr/common/main/en_TT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_TV.xml b/make/data/cldr/common/main/en_TV.xml
index 961d8bed22c..477b1b1edf8 100644
--- a/make/data/cldr/common/main/en_TV.xml
+++ b/make/data/cldr/common/main/en_TV.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_TZ.xml b/make/data/cldr/common/main/en_TZ.xml
index 10dfceecf00..1fb9d69f076 100644
--- a/make/data/cldr/common/main/en_TZ.xml
+++ b/make/data/cldr/common/main/en_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_UG.xml b/make/data/cldr/common/main/en_UG.xml
index 7c0b4340b8a..ffa4e478f08 100644
--- a/make/data/cldr/common/main/en_UG.xml
+++ b/make/data/cldr/common/main/en_UG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_UM.xml b/make/data/cldr/common/main/en_UM.xml
index be570e817df..90e040619f9 100644
--- a/make/data/cldr/common/main/en_UM.xml
+++ b/make/data/cldr/common/main/en_UM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_US.xml b/make/data/cldr/common/main/en_US.xml
index 9b090e68cd3..1098f0a192b 100644
--- a/make/data/cldr/common/main/en_US.xml
+++ b/make/data/cldr/common/main/en_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_US_POSIX.xml b/make/data/cldr/common/main/en_US_POSIX.xml
index 7b494c78f44..5a7864a4513 100644
--- a/make/data/cldr/common/main/en_US_POSIX.xml
+++ b/make/data/cldr/common/main/en_US_POSIX.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_VC.xml b/make/data/cldr/common/main/en_VC.xml
index e23f496b8af..5ced8633069 100644
--- a/make/data/cldr/common/main/en_VC.xml
+++ b/make/data/cldr/common/main/en_VC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_VG.xml b/make/data/cldr/common/main/en_VG.xml
index 10604d44a59..bff76dad8b9 100644
--- a/make/data/cldr/common/main/en_VG.xml
+++ b/make/data/cldr/common/main/en_VG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_VI.xml b/make/data/cldr/common/main/en_VI.xml
index 069b002404b..2d5800e3980 100644
--- a/make/data/cldr/common/main/en_VI.xml
+++ b/make/data/cldr/common/main/en_VI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_VU.xml b/make/data/cldr/common/main/en_VU.xml
index 7660e9cd47f..8d072e673b2 100644
--- a/make/data/cldr/common/main/en_VU.xml
+++ b/make/data/cldr/common/main/en_VU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_WS.xml b/make/data/cldr/common/main/en_WS.xml
index 8e2e243fd05..c0881e59da8 100644
--- a/make/data/cldr/common/main/en_WS.xml
+++ b/make/data/cldr/common/main/en_WS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_ZA.xml b/make/data/cldr/common/main/en_ZA.xml
index 20fce438ca2..7bc2afaeaba 100644
--- a/make/data/cldr/common/main/en_ZA.xml
+++ b/make/data/cldr/common/main/en_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_ZM.xml b/make/data/cldr/common/main/en_ZM.xml
index f784a772a7b..31d055396d6 100644
--- a/make/data/cldr/common/main/en_ZM.xml
+++ b/make/data/cldr/common/main/en_ZM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/en_ZW.xml b/make/data/cldr/common/main/en_ZW.xml
index 094ee09e5aa..415f5896a78 100644
--- a/make/data/cldr/common/main/en_ZW.xml
+++ b/make/data/cldr/common/main/en_ZW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/eo.xml b/make/data/cldr/common/main/eo.xml
index 11c4191eb7f..4373940cfca 100644
--- a/make/data/cldr/common/main/eo.xml
+++ b/make/data/cldr/common/main/eo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2690,18 +2690,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity draft="unconfirmed">Daresalamo</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="unconfirmed">Uĵhorodo</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity draft="unconfirmed">Kievo</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity draft="unconfirmed">Simferopolo</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">Zaporiĵo</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity draft="unconfirmed">Kampalo</exemplarCity>
 			</zone>
@@ -3231,11 +3225,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">Lord Howe (somera tempo)</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">makvor-insula tempo</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="unconfirmed">magadana tempo</generic>
@@ -3255,13 +3244,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">maŭricia somera tempo</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">nordokcidenta meksika tempo</generic>
-					<standard draft="unconfirmed">nordokcidenta meksika norma tempo</standard>
-					<daylight draft="unconfirmed">nordokcidenta meksika somera tempo</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">pacifika meksika tempo</generic>
diff --git a/make/data/cldr/common/main/eo_001.xml b/make/data/cldr/common/main/eo_001.xml
index 74f71a9d7da..3092db7a06a 100644
--- a/make/data/cldr/common/main/eo_001.xml
+++ b/make/data/cldr/common/main/eo_001.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es.xml b/make/data/cldr/common/main/es.xml
index 2da0419dcac..b868d6c957b 100644
--- a/make/data/cldr/common/main/es.xml
+++ b/make/data/cldr/common/main/es.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1137,7 +1137,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">orden de listín telefónico</type>
 			<type key="collation" type="phonetic">orden fonético</type>
 			<type key="collation" type="pinyin">orden pinyin</type>
-			<type key="collation" type="reformed">orden reformado</type>
 			<type key="collation" type="search">búsqueda de uso general</type>
 			<type key="collation" type="searchjl" draft="contributed">Buscar por consonante inicial de hangul</type>
 			<type key="collation" type="standard">orden estándar</type>
@@ -2650,9 +2649,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>hora de {0}</regionFormat>
 			<regionFormat type="daylight">horario de verano de {0}</regionFormat>
 			<regionFormat type="standard">horario estándar de {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>tiempo universal coordinado</standard>
@@ -2688,9 +2684,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Adelaide">
 				<exemplarCity>Adelaida</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Sídney</exemplarCity>
 			</zone>
@@ -3150,18 +3143,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar es-Salam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Úzhgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Simferópol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporiyia</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulú</exemplarCity>
 			</zone>
@@ -3783,11 +3770,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Hora de verano de Macao</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>hora de la isla Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>hora de Magadán</generic>
@@ -3827,13 +3809,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>hora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>hora del noroeste de México</generic>
-					<standard>hora estándar del noroeste de México</standard>
-					<daylight>hora de verano del noroeste de México</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>hora del Pacífico de México</generic>
@@ -5560,6 +5535,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">dólares del Caribe Oriental</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>florín caribeño</displayName>
+				<displayName count="one">florín caribeño</displayName>
+				<displayName count="other">florines caribeños</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>derechos especiales de giro</displayName>
 			</currency>
diff --git a/make/data/cldr/common/main/es_419.xml b/make/data/cldr/common/main/es_419.xml
index 8eaf6e1a854..76569c82bf9 100644
--- a/make/data/cldr/common/main/es_419.xml
+++ b/make/data/cldr/common/main/es_419.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -733,11 +733,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>hora de India</standard>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>hora de la Isla Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
 					<standard>hora de Islas Marshall</standard>
diff --git a/make/data/cldr/common/main/es_AR.xml b/make/data/cldr/common/main/es_AR.xml
index 5a1a6a91834..2f5905cb867 100644
--- a/make/data/cldr/common/main/es_AR.xml
+++ b/make/data/cldr/common/main/es_AR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_BO.xml b/make/data/cldr/common/main/es_BO.xml
index f807fb53906..b6090433440 100644
--- a/make/data/cldr/common/main/es_BO.xml
+++ b/make/data/cldr/common/main/es_BO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_BR.xml b/make/data/cldr/common/main/es_BR.xml
index 5bcd1e703fc..c98cd1291a4 100644
--- a/make/data/cldr/common/main/es_BR.xml
+++ b/make/data/cldr/common/main/es_BR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_BZ.xml b/make/data/cldr/common/main/es_BZ.xml
index 1ca6d551f1e..33864498795 100644
--- a/make/data/cldr/common/main/es_BZ.xml
+++ b/make/data/cldr/common/main/es_BZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_CL.xml b/make/data/cldr/common/main/es_CL.xml
index edfe0d580d0..f61c3a21a3d 100644
--- a/make/data/cldr/common/main/es_CL.xml
+++ b/make/data/cldr/common/main/es_CL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_CO.xml b/make/data/cldr/common/main/es_CO.xml
index 67783e7a7fc..431c17d8ca9 100644
--- a/make/data/cldr/common/main/es_CO.xml
+++ b/make/data/cldr/common/main/es_CO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_CR.xml b/make/data/cldr/common/main/es_CR.xml
index a4c7dbefc79..84375254780 100644
--- a/make/data/cldr/common/main/es_CR.xml
+++ b/make/data/cldr/common/main/es_CR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_CU.xml b/make/data/cldr/common/main/es_CU.xml
index b6688a39c12..13f190f8d8b 100644
--- a/make/data/cldr/common/main/es_CU.xml
+++ b/make/data/cldr/common/main/es_CU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_DO.xml b/make/data/cldr/common/main/es_DO.xml
index 56812b66e88..d5d68e617aa 100644
--- a/make/data/cldr/common/main/es_DO.xml
+++ b/make/data/cldr/common/main/es_DO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_EA.xml b/make/data/cldr/common/main/es_EA.xml
index dd6744aaa56..1de5b4a13c4 100644
--- a/make/data/cldr/common/main/es_EA.xml
+++ b/make/data/cldr/common/main/es_EA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_EC.xml b/make/data/cldr/common/main/es_EC.xml
index dabeb20239f..d2eb9494c2c 100644
--- a/make/data/cldr/common/main/es_EC.xml
+++ b/make/data/cldr/common/main/es_EC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_ES.xml b/make/data/cldr/common/main/es_ES.xml
index eb8bfa7e24a..0df424e4a51 100644
--- a/make/data/cldr/common/main/es_ES.xml
+++ b/make/data/cldr/common/main/es_ES.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_GQ.xml b/make/data/cldr/common/main/es_GQ.xml
index 1ddebd650aa..15c1dfd26ce 100644
--- a/make/data/cldr/common/main/es_GQ.xml
+++ b/make/data/cldr/common/main/es_GQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_GT.xml b/make/data/cldr/common/main/es_GT.xml
index 861f3c8b026..c24654ffe71 100644
--- a/make/data/cldr/common/main/es_GT.xml
+++ b/make/data/cldr/common/main/es_GT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_HN.xml b/make/data/cldr/common/main/es_HN.xml
index 35fdf1bde92..781e326acdd 100644
--- a/make/data/cldr/common/main/es_HN.xml
+++ b/make/data/cldr/common/main/es_HN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_IC.xml b/make/data/cldr/common/main/es_IC.xml
index ded49b4e780..2f9d5b339e0 100644
--- a/make/data/cldr/common/main/es_IC.xml
+++ b/make/data/cldr/common/main/es_IC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_MX.xml b/make/data/cldr/common/main/es_MX.xml
index b220b771097..6ff5d758521 100644
--- a/make/data/cldr/common/main/es_MX.xml
+++ b/make/data/cldr/common/main/es_MX.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -587,11 +587,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>hora de las Islas Gilbert</standard>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>hora de la isla Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Marshall_Islands">
 				<long>
 					<standard>hora de las Islas Marshall</standard>
diff --git a/make/data/cldr/common/main/es_NI.xml b/make/data/cldr/common/main/es_NI.xml
index 30e62addfaa..c232a99bbd3 100644
--- a/make/data/cldr/common/main/es_NI.xml
+++ b/make/data/cldr/common/main/es_NI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_PA.xml b/make/data/cldr/common/main/es_PA.xml
index cb5e8a1bce5..033d71b624a 100644
--- a/make/data/cldr/common/main/es_PA.xml
+++ b/make/data/cldr/common/main/es_PA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_PE.xml b/make/data/cldr/common/main/es_PE.xml
index 1be590a4ba3..36da049e783 100644
--- a/make/data/cldr/common/main/es_PE.xml
+++ b/make/data/cldr/common/main/es_PE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_PH.xml b/make/data/cldr/common/main/es_PH.xml
index 1d022d74fd5..5ad142f2182 100644
--- a/make/data/cldr/common/main/es_PH.xml
+++ b/make/data/cldr/common/main/es_PH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_PR.xml b/make/data/cldr/common/main/es_PR.xml
index 2db1ea0bd47..21eec4a4930 100644
--- a/make/data/cldr/common/main/es_PR.xml
+++ b/make/data/cldr/common/main/es_PR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_PY.xml b/make/data/cldr/common/main/es_PY.xml
index 74af58fe04b..14a760ceef0 100644
--- a/make/data/cldr/common/main/es_PY.xml
+++ b/make/data/cldr/common/main/es_PY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_SV.xml b/make/data/cldr/common/main/es_SV.xml
index 1dae8dd6824..f1f72ef262a 100644
--- a/make/data/cldr/common/main/es_SV.xml
+++ b/make/data/cldr/common/main/es_SV.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_US.xml b/make/data/cldr/common/main/es_US.xml
index 330f5434fc7..192cd37c949 100644
--- a/make/data/cldr/common/main/es_US.xml
+++ b/make/data/cldr/common/main/es_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -530,11 +530,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>hora del Océano Índico</standard>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>hora de la isla Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Marquesas">
 				<long>
 					<standard>hora de las islas Marquesas</standard>
diff --git a/make/data/cldr/common/main/es_UY.xml b/make/data/cldr/common/main/es_UY.xml
index df6ce01a60f..9413f6ad750 100644
--- a/make/data/cldr/common/main/es_UY.xml
+++ b/make/data/cldr/common/main/es_UY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/es_VE.xml b/make/data/cldr/common/main/es_VE.xml
index 3da59310136..790b39dc6ce 100644
--- a/make/data/cldr/common/main/es_VE.xml
+++ b/make/data/cldr/common/main/es_VE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/et.xml b/make/data/cldr/common/main/et.xml
index e0f3c46f7ca..d592b9a84ea 100644
--- a/make/data/cldr/common/main/et.xml
+++ b/make/data/cldr/common/main/et.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1291,7 +1291,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">telefoniraamatu sortimisjärjestus</type>
 			<type key="collation" type="phonetic">foneetiline sortimisjärjestus</type>
 			<type key="collation" type="pinyin">pinyin’i sortimisjärjestus</type>
-			<type key="collation" type="reformed">reformitud sortimisjärjestus</type>
 			<type key="collation" type="search">üldeesmärgiline otsing</type>
 			<type key="collation" type="searchjl">otsing korea alguskonsonandi järgi</type>
 			<type key="collation" type="standard">standardne järjestus</type>
@@ -2600,9 +2599,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<hourFormat>+HH:mm;−HH:mm</hourFormat>
 			<gmtFormat>GMT {0}</gmtFormat>
 			<regionFormat>({0})</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Koordineeritud maailmaaeg</standard>
@@ -2629,9 +2625,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viin</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Mariehamn">
 				<exemplarCity>Maarianhamina</exemplarCity>
 			</zone>
@@ -2945,15 +2938,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Istanbul">
 				<exemplarCity>İstanbul</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3548,11 +3535,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Macau suveaeg</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie saare aeg</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadani aeg</generic>
@@ -3592,13 +3574,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawsoni aeg</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Loode-Mehhiko aeg</generic>
-					<standard>Loode-Mehhiko standardaeg</standard>
-					<daylight>Loode-Mehhiko suveaeg</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mehhiko Vaikse ookeani aeg</generic>
diff --git a/make/data/cldr/common/main/et_EE.xml b/make/data/cldr/common/main/et_EE.xml
index 07ea7f3faec..3c364e59359 100644
--- a/make/data/cldr/common/main/et_EE.xml
+++ b/make/data/cldr/common/main/et_EE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/eu.xml b/make/data/cldr/common/main/eu.xml
index f32831ffc88..05a24b1cd26 100644
--- a/make/data/cldr/common/main/eu.xml
+++ b/make/data/cldr/common/main/eu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1137,7 +1137,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Telefonoen zerrenda</type>
 			<type key="collation" type="phonetic">Ordenatzeko irizpide fonetikoa</type>
 			<type key="collation" type="pinyin">Pinyin hurrenkera</type>
-			<type key="collation" type="reformed">Erreformaren araberako hurrenkera</type>
 			<type key="collation" type="search">Bilaketa orokorra</type>
 			<type key="collation" type="searchjl">Bilatu hangularen lehen kontsonantearen arabera</type>
 			<type key="collation" type="standard">Ordenatzeko irizpide estandarra</type>
@@ -2513,9 +2512,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} aldeko ordua</regionFormat>
 			<regionFormat type="daylight">{0} (udako ordua)</regionFormat>
 			<regionFormat type="standard">{0} aldeko ordu estandarra</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>ordu unibertsal koordinatua</standard>
@@ -2542,9 +2538,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Brusela</exemplarCity>
 			</zone>
@@ -2865,15 +2858,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Port_of_Spain">
 				<exemplarCity>Port-of-Spain</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizhia</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<short>
 					<generic>HST</generic>
@@ -3532,11 +3519,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Macaoko udako ordua</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie uharteko ordua</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadango ordua</generic>
@@ -3576,13 +3558,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawsoneko ordua</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Mexikoko ipar-ekialdeko ordua</generic>
-					<standard>Mexikoko ipar-ekialdeko ordu estandarra</standard>
-					<daylight>Mexikoko ipar-ekialdeko udako ordua</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexikoko Pazifikoko ordua</generic>
diff --git a/make/data/cldr/common/main/eu_ES.xml b/make/data/cldr/common/main/eu_ES.xml
index 4426f2ae2f0..3b4cea6aec2 100644
--- a/make/data/cldr/common/main/eu_ES.xml
+++ b/make/data/cldr/common/main/eu_ES.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ewo.xml b/make/data/cldr/common/main/ewo.xml
index 9d4eddd2827..b0aa0bd21bb 100644
--- a/make/data/cldr/common/main/ewo.xml
+++ b/make/data/cldr/common/main/ewo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ewo_CM.xml b/make/data/cldr/common/main/ewo_CM.xml
index ca40dbef826..c1ca412bec0 100644
--- a/make/data/cldr/common/main/ewo_CM.xml
+++ b/make/data/cldr/common/main/ewo_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fa.xml b/make/data/cldr/common/main/fa.xml
index 85f69c4d042..70b2b6af840 100644
--- a/make/data/cldr/common/main/fa.xml
+++ b/make/data/cldr/common/main/fa.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1120,7 +1120,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">ترتیب دفتر تلفن</type>
 			<type key="collation" type="phonetic">مرتب کردن بر اساس آوایی</type>
 			<type key="collation" type="pinyin">ترتیب پین‌یین</type>
-			<type key="collation" type="reformed">ترتیب اصلاح‌شده</type>
 			<type key="collation" type="search">جستجوی عمومی</type>
 			<type key="collation" type="searchjl">جستجو با صامت اول هانگول</type>
 			<type key="collation" type="standard">ترتیب استاندارد</type>
@@ -2582,9 +2581,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>وقت {0}</regionFormat>
 			<regionFormat type="daylight">وقت تابستانی {0}</regionFormat>
 			<regionFormat type="standard">وقت عادی {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>سانتا ایزابل</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>زمان هماهنگ جهانی</standard>
@@ -2707,9 +2703,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ملبورن</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>کوری</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>هوبارت</exemplarCity>
 			</zone>
@@ -2863,9 +2856,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>کرستون</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>یلونایف</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ادمونتون</exemplarCity>
 			</zone>
@@ -2884,30 +2874,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>رزولوت</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>رینی‌ریور</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>خلیجک رنکین</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>اتکوکان</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>تاندربی</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>نیپیگان</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>تورنتو</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ایکلوئت</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>پانگنیرتونگ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>مانکتون</exemplarCity>
 			</zone>
@@ -3721,18 +3699,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>دارالسلام</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>اوژگورود</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>کیف</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>سیمفروپل</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>زاپوروژیا</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>کامپالا</exemplarCity>
 			</zone>
@@ -3751,9 +3723,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>هونولولو</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>جانستون</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>انکوریج</exemplarCity>
 			</zone>
@@ -4427,11 +4396,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>وقت تابستانی ماکائو</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>وقت جزیرهٔ مکواری</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>وقت ماگادان</generic>
@@ -4471,13 +4435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>وقت ماوسون</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>وقت شمال غرب مکزیک</generic>
-					<standard>وقت عادی شمال غرب مکزیک</standard>
-					<daylight>وقت تابستانی شمال غرب مکزیک</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>وقت شرق مکزیک</generic>
diff --git a/make/data/cldr/common/main/fa_AF.xml b/make/data/cldr/common/main/fa_AF.xml
index af337f4842b..5dc2c6b07ab 100644
--- a/make/data/cldr/common/main/fa_AF.xml
+++ b/make/data/cldr/common/main/fa_AF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fa_IR.xml b/make/data/cldr/common/main/fa_IR.xml
index f1c736a2708..6bd954fe747 100644
--- a/make/data/cldr/common/main/fa_IR.xml
+++ b/make/data/cldr/common/main/fa_IR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff.xml b/make/data/cldr/common/main/ff.xml
index a5d227fc334..d49da7dd73a 100644
--- a/make/data/cldr/common/main/ff.xml
+++ b/make/data/cldr/common/main/ff.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm.xml b/make/data/cldr/common/main/ff_Adlm.xml
index afd050cd485..397938de91c 100644
--- a/make/data/cldr/common/main/ff_Adlm.xml
+++ b/make/data/cldr/common/main/ff_Adlm.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -710,7 +710,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BS">𞤄𞤢𞤸𞤢𞤥𞤢𞥄𞤧</territory>
 			<territory type="BT">𞤄𞤵𞥅𞤼𞤢𞥄𞤲</territory>
 			<territory type="BV">𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤄𞤵𞥅𞤾𞤫𞥅</territory>
-			<territory type="BW">‮𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</territory>
+			<territory type="BW">𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</territory>
 			<territory type="BY">𞤄𞤫𞤤𞤢𞤪𞤵𞥅𞤧</territory>
 			<territory type="BZ">𞤄𞤫𞤤𞤭𞥅𞥁</territory>
 			<territory type="CA">𞤑𞤢𞤲𞤢𞤣𞤢𞥄</territory>
@@ -3392,9 +3392,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>𞤃𞤫𞤤𞤦𞤵𞥅𞤪𞤲𞤵</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>𞤑𞤵𞥅𞤪𞤭𞥅</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>𞤖𞤵𞥅𞤦𞤢𞤪𞤼𞤵</exemplarCity>
 			</zone>
@@ -3548,9 +3545,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>𞤑𞤪𞤫𞤧𞤼𞤮𞤲</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>𞤒𞤫𞤤𞤮𞥅𞤲𞤢𞤴𞤬</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>𞤉𞤣𞤥𞤮𞤲𞤼𞤮𞤲</exemplarCity>
 			</zone>
@@ -3569,30 +3563,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>𞤈𞤭𞤧𞤮𞤤𞤵𞥅𞤼</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>𞤈𞤫𞤲𞤭𞥅-𞤈𞤭𞤾𞤮𞥅</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>𞤈𞤢𞤲𞤳𞤭𞤲 𞤋𞤲𞤤𞤫𞤼</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>𞤀𞤼𞤭𞤳𞤮𞥅𞤳𞤢𞤲</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>𞤚𞤵𞤲𞤣𞤮𞥅 𞤄𞤫𞥅</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>𞤐𞤭𞤨𞤭𞤺𞤮𞤲</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>𞤚𞤮𞤪𞤮𞤲𞤼𞤮𞥅</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>𞤋𞤳𞤢𞤤𞤵𞤱𞤭𞤼</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>𞤆𞤢𞤲𞤺</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>𞤃𞤮𞤲𞤳𞤼𞤮𞥅𞤲</exemplarCity>
 			</zone>
@@ -3789,7 +3771,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>𞤐𞤵𞥅𞤳</exemplarCity>
 			</zone>
 			<zone type="America/Scoresbysund">
-				<exemplarCity>‮𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼</exemplarCity>
+				<exemplarCity>𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
 				<exemplarCity>𞤁𞤢𞥄𞤲𞤥𞤢𞤪𞤳𞥃𞤢𞥄𞤾𞤲</exemplarCity>
@@ -4403,18 +4385,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>𞤁𞤢𞥄𞤪𞤫-𞤅𞤢𞤤𞤢𞥄𞤥𞤵</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>𞤓𞥅𞤶𞤢𞤪𞤵𞥅𞤣𞤵</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>𞤑𞤭𞤴𞤫𞥅𞤾</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>𞤅𞤭𞤥𞤬𞤫𞤪𞤨𞤮𞥅𞤤</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>𞤟𞤢𞤨𞤮𞤪𞤵𞥅𞥁</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>𞤑𞤢𞤥𞤨𞤢𞤤𞤢</exemplarCity>
 			</zone>
@@ -4437,9 +4413,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>𞤑𞤕𞤖</daylight>
 				</short>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>𞤔𞤮𞤲𞤧𞤼𞤮𞤲</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>𞤀𞤲𞤧𞤮𞤪𞤢𞥄𞤶𞤵</exemplarCity>
 			</zone>
@@ -5127,11 +5100,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤃𞤢𞤳𞤢𞤱𞤮𞥅</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤃𞤢𞤳𞤢𞥄𞤪𞤭</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤢𞤺𞤢𞤣𞤢𞤲</generic>
@@ -5171,13 +5139,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤃𞤢𞤱𞤧𞤮𞤲</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤐𞤢𞤲𞤮-𞤸𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅</generic>
-					<standard>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤖𞤢𞤱𞤪𞤵𞤲𞥋𞤣𞤫 𞤐𞤢𞤲𞤮-𞤸𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅</standard>
-					<daylight>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤕𞤫𞥅𞤯𞤵 𞤐𞤢𞤲𞤮-𞤸𞤭𞥅𞤪𞤲𞤢𞥄𞤲𞤺𞤫 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>𞤑𞤭𞤶𞤮𞥅𞤪𞤫 𞤁𞤫𞤰𞥆𞤮 𞤃𞤫𞤳𞤧𞤭𞤳𞤮𞥅</generic>
diff --git a/make/data/cldr/common/main/ff_Adlm_BF.xml b/make/data/cldr/common/main/ff_Adlm_BF.xml
index 3e9e0627b1e..90be5631993 100644
--- a/make/data/cldr/common/main/ff_Adlm_BF.xml
+++ b/make/data/cldr/common/main/ff_Adlm_BF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_CM.xml b/make/data/cldr/common/main/ff_Adlm_CM.xml
index 3fde1300b30..3761a7efe1d 100644
--- a/make/data/cldr/common/main/ff_Adlm_CM.xml
+++ b/make/data/cldr/common/main/ff_Adlm_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_GH.xml b/make/data/cldr/common/main/ff_Adlm_GH.xml
index 038a168fdd0..c3477d0486e 100644
--- a/make/data/cldr/common/main/ff_Adlm_GH.xml
+++ b/make/data/cldr/common/main/ff_Adlm_GH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_GM.xml b/make/data/cldr/common/main/ff_Adlm_GM.xml
index bcf7075379d..35fafdbe790 100644
--- a/make/data/cldr/common/main/ff_Adlm_GM.xml
+++ b/make/data/cldr/common/main/ff_Adlm_GM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_GN.xml b/make/data/cldr/common/main/ff_Adlm_GN.xml
index e3c897c0e99..d8c3db1a6ac 100644
--- a/make/data/cldr/common/main/ff_Adlm_GN.xml
+++ b/make/data/cldr/common/main/ff_Adlm_GN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_GW.xml b/make/data/cldr/common/main/ff_Adlm_GW.xml
index 91f2cd631fe..17ce40babac 100644
--- a/make/data/cldr/common/main/ff_Adlm_GW.xml
+++ b/make/data/cldr/common/main/ff_Adlm_GW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_LR.xml b/make/data/cldr/common/main/ff_Adlm_LR.xml
index 35e42c9f3d9..b6c231d0808 100644
--- a/make/data/cldr/common/main/ff_Adlm_LR.xml
+++ b/make/data/cldr/common/main/ff_Adlm_LR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_MR.xml b/make/data/cldr/common/main/ff_Adlm_MR.xml
index e3e8053e345..0887f910fe8 100644
--- a/make/data/cldr/common/main/ff_Adlm_MR.xml
+++ b/make/data/cldr/common/main/ff_Adlm_MR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_NE.xml b/make/data/cldr/common/main/ff_Adlm_NE.xml
index b87cd3b98ad..27ba7a82479 100644
--- a/make/data/cldr/common/main/ff_Adlm_NE.xml
+++ b/make/data/cldr/common/main/ff_Adlm_NE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_NG.xml b/make/data/cldr/common/main/ff_Adlm_NG.xml
index 2049af21619..2c41f8227de 100644
--- a/make/data/cldr/common/main/ff_Adlm_NG.xml
+++ b/make/data/cldr/common/main/ff_Adlm_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_SL.xml b/make/data/cldr/common/main/ff_Adlm_SL.xml
index 0e74f05fe3f..9f82db107c5 100644
--- a/make/data/cldr/common/main/ff_Adlm_SL.xml
+++ b/make/data/cldr/common/main/ff_Adlm_SL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Adlm_SN.xml b/make/data/cldr/common/main/ff_Adlm_SN.xml
index 685b6f6923c..c40e32bd727 100644
--- a/make/data/cldr/common/main/ff_Adlm_SN.xml
+++ b/make/data/cldr/common/main/ff_Adlm_SN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn.xml b/make/data/cldr/common/main/ff_Latn.xml
index d3c7025d8e5..935b75f4483 100644
--- a/make/data/cldr/common/main/ff_Latn.xml
+++ b/make/data/cldr/common/main/ff_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_BF.xml b/make/data/cldr/common/main/ff_Latn_BF.xml
index 6a7679a921a..e7e67942819 100644
--- a/make/data/cldr/common/main/ff_Latn_BF.xml
+++ b/make/data/cldr/common/main/ff_Latn_BF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_CM.xml b/make/data/cldr/common/main/ff_Latn_CM.xml
index e65cdd47bb1..58cb7f2cbbf 100644
--- a/make/data/cldr/common/main/ff_Latn_CM.xml
+++ b/make/data/cldr/common/main/ff_Latn_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_GH.xml b/make/data/cldr/common/main/ff_Latn_GH.xml
index d51d6a2845a..e41b64f1fd1 100644
--- a/make/data/cldr/common/main/ff_Latn_GH.xml
+++ b/make/data/cldr/common/main/ff_Latn_GH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_GM.xml b/make/data/cldr/common/main/ff_Latn_GM.xml
index 8e29e3085c2..201a089c5a9 100644
--- a/make/data/cldr/common/main/ff_Latn_GM.xml
+++ b/make/data/cldr/common/main/ff_Latn_GM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_GN.xml b/make/data/cldr/common/main/ff_Latn_GN.xml
index 05c35ae80e2..d24fcded069 100644
--- a/make/data/cldr/common/main/ff_Latn_GN.xml
+++ b/make/data/cldr/common/main/ff_Latn_GN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_GW.xml b/make/data/cldr/common/main/ff_Latn_GW.xml
index bd4cc979d2a..86129370658 100644
--- a/make/data/cldr/common/main/ff_Latn_GW.xml
+++ b/make/data/cldr/common/main/ff_Latn_GW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_LR.xml b/make/data/cldr/common/main/ff_Latn_LR.xml
index c4ae1b5cd00..54833258e68 100644
--- a/make/data/cldr/common/main/ff_Latn_LR.xml
+++ b/make/data/cldr/common/main/ff_Latn_LR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_MR.xml b/make/data/cldr/common/main/ff_Latn_MR.xml
index ed5cf9f5711..410874c3384 100644
--- a/make/data/cldr/common/main/ff_Latn_MR.xml
+++ b/make/data/cldr/common/main/ff_Latn_MR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_NE.xml b/make/data/cldr/common/main/ff_Latn_NE.xml
index dde07b1844e..36982866935 100644
--- a/make/data/cldr/common/main/ff_Latn_NE.xml
+++ b/make/data/cldr/common/main/ff_Latn_NE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_NG.xml b/make/data/cldr/common/main/ff_Latn_NG.xml
index d6c5f4bb5ce..5816f40592c 100644
--- a/make/data/cldr/common/main/ff_Latn_NG.xml
+++ b/make/data/cldr/common/main/ff_Latn_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_SL.xml b/make/data/cldr/common/main/ff_Latn_SL.xml
index c4589017208..0cbb05f7425 100644
--- a/make/data/cldr/common/main/ff_Latn_SL.xml
+++ b/make/data/cldr/common/main/ff_Latn_SL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ff_Latn_SN.xml b/make/data/cldr/common/main/ff_Latn_SN.xml
index 92d54286e83..af236d68ca2 100644
--- a/make/data/cldr/common/main/ff_Latn_SN.xml
+++ b/make/data/cldr/common/main/ff_Latn_SN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fi.xml b/make/data/cldr/common/main/fi.xml
index 6ad756f2dfe..137ee13e624 100644
--- a/make/data/cldr/common/main/fi.xml
+++ b/make/data/cldr/common/main/fi.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1386,7 +1386,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">puhelinluettelojärjestys</type>
 			<type key="collation" type="phonetic">äänteellinen järjestys</type>
 			<type key="collation" type="pinyin">pinyin-järjestys</type>
-			<type key="collation" type="reformed">uudistettu järjestys</type>
 			<type key="collation" type="search">yleishakujärjestys</type>
 			<type key="collation" type="searchjl">haku hangul-alkukonsonantin mukaan</type>
 			<type key="collation" type="standard">normaalijärjestys</type>
@@ -3178,9 +3177,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>aikavyöhyke: {0}</regionFormat>
 			<regionFormat type="daylight">{0} (kesäaika)</regionFormat>
 			<regionFormat type="standard">{0} (normaaliaika)</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>UTC-yleisaika</standard>
@@ -3204,9 +3200,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Antarctica/Macquarie">
 				<exemplarCity>Macquariensaari</exemplarCity>
 			</zone>
@@ -3531,15 +3524,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Ashgabat">
 				<exemplarCity>Ašgabat</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiova</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporižžja</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Midwaysaaret</exemplarCity>
 			</zone>
@@ -4140,11 +4127,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Macaon kesäaika</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquariensaaren aika</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadanin aika</generic>
@@ -4184,13 +4166,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawsonin aika</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Luoteis-Meksikon aika</generic>
-					<standard>Luoteis-Meksikon normaaliaika</standard>
-					<daylight>Luoteis-Meksikon kesäaika</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksikon Tyynenmeren aika</generic>
diff --git a/make/data/cldr/common/main/fi_FI.xml b/make/data/cldr/common/main/fi_FI.xml
index d430308582e..35fdb9512a9 100644
--- a/make/data/cldr/common/main/fi_FI.xml
+++ b/make/data/cldr/common/main/fi_FI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fil.xml b/make/data/cldr/common/main/fil.xml
index 7959c590d7b..3ab1ed46273 100644
--- a/make/data/cldr/common/main/fil.xml
+++ b/make/data/cldr/common/main/fil.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -915,7 +915,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Pagkakasunud-sunod ng Pag-uuri ng Phonebook</type>
 			<type key="collation" type="phonetic">Phonetic na Ayos ng Pag-uuri-uri</type>
 			<type key="collation" type="pinyin">Pagkakasunud-sunod ng Pag-uuri ng Pinyin</type>
-			<type key="collation" type="reformed">Pagkakasunud-sunod ng Pag-uuri ng Na-reform</type>
 			<type key="collation" type="search">Pangkalahatang Paghahanap</type>
 			<type key="collation" type="searchjl">Maghanap Ayon sa Unang Katinig ng Hangul</type>
 			<type key="collation" type="standard">Karaniwang Pagkakasunud-sunod ng Ayos</type>
@@ -2161,9 +2160,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Oras sa {0}</regionFormat>
 			<regionFormat type="daylight">Daylight Time ng {0}</regionFormat>
 			<regionFormat type="standard">Standard na Oras sa {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Coordinated Universal Time</standard>
@@ -2172,9 +2168,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Di-kilalang Lungsod</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>St. Barthélemy</exemplarCity>
 			</zone>
@@ -2756,11 +2749,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Daylight Time sa Lorde Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Oras sa Macquarie Island</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Oras sa Magadan</generic>
@@ -2800,13 +2788,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Oras sa Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Oras sa Hilagang-kanlurang Mexico</generic>
-					<standard>Standard na Oras sa Hilagang-kanlurang Mexico</standard>
-					<daylight>Daylight na Oras sa Hilagang-kanlurang Mexico</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Oras sa Pasipiko ng Mexico</generic>
diff --git a/make/data/cldr/common/main/fil_PH.xml b/make/data/cldr/common/main/fil_PH.xml
index 0e9eee04017..e9869e5802f 100644
--- a/make/data/cldr/common/main/fil_PH.xml
+++ b/make/data/cldr/common/main/fil_PH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fo.xml b/make/data/cldr/common/main/fo.xml
index 8d58f498685..ecb45b9a457 100644
--- a/make/data/cldr/common/main/fo.xml
+++ b/make/data/cldr/common/main/fo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2033,9 +2033,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat>{0} tíð</regionFormat>
 			<regionFormat type="daylight">{0} summartíð</regionFormat>
 			<regionFormat type="standard">{0} vanlig tíð</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Samskipað heimstíð</standard>
@@ -2047,9 +2044,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Bruxelles</exemplarCity>
 			</zone>
@@ -2186,9 +2180,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Sao_Tome">
 				<exemplarCity>São Tomé</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
@@ -2704,11 +2695,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Lord Howe summartíð</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquariesoyggj tíð</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan tíð</generic>
@@ -2748,13 +2734,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mawson tíð</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Northwest Mexico tíð</generic>
-					<standard>Northwest Mexico vanlig tíð</standard>
-					<daylight>Northwest Mexico summartíð</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexican Pacific tíð</generic>
diff --git a/make/data/cldr/common/main/fo_DK.xml b/make/data/cldr/common/main/fo_DK.xml
index 474d7251214..7a060794f54 100644
--- a/make/data/cldr/common/main/fo_DK.xml
+++ b/make/data/cldr/common/main/fo_DK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fo_FO.xml b/make/data/cldr/common/main/fo_FO.xml
index c44b292d792..0d8f10b4dba 100644
--- a/make/data/cldr/common/main/fo_FO.xml
+++ b/make/data/cldr/common/main/fo_FO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr.xml b/make/data/cldr/common/main/fr.xml
index 4563ac55fb6..d5ace55980e 100644
--- a/make/data/cldr/common/main/fr.xml
+++ b/make/data/cldr/common/main/fr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -428,7 +428,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ng">ndonga</language>
 			<language type="nia">niha</language>
 			<language type="niu">niuéen</language>
-			<language type="njo">Ao</language>
+			<language type="njo">ao</language>
 			<language type="nl">néerlandais</language>
 			<language type="nl_BE">flamand</language>
 			<language type="nmg">ngoumba</language>
@@ -1365,7 +1365,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">ordre de l’annuaire</type>
 			<type key="collation" type="phonetic">ordre de tri phonétique</type>
 			<type key="collation" type="pinyin">ordre pinyin</type>
-			<type key="collation" type="reformed">ordre réformé</type>
 			<type key="collation" type="search">recherche générique</type>
 			<type key="collation" type="searchjl" draft="contributed">rechercher par consonne initiale en hangeul</type>
 			<type key="collation" type="standard">ordre de tri standard</type>
@@ -3297,9 +3296,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>heure : {0}</regionFormat>
 			<regionFormat type="daylight">{0} (heure d’été)</regionFormat>
 			<regionFormat type="standard">{0} (heure standard)</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>temps universel coordonné</standard>
@@ -3350,9 +3346,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Adelaide">
 				<exemplarCity>Adélaïde</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Baku">
 				<exemplarCity>Bakou</exemplarCity>
 			</zone>
@@ -3697,15 +3690,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Port_of_Spain">
 				<exemplarCity>Port-d’Espagne</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Oujgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporojie</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<short>
 					<generic draft="unconfirmed">HT</generic>
@@ -4404,11 +4391,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="unconfirmed">heure d’été de Macao</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>heure de l’île Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>heure de Magadan</generic>
@@ -4448,18 +4430,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>heure de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>heure du Nord-Ouest du Mexique</generic>
-					<standard>heure normale du Nord-Ouest du Mexique</standard>
-					<daylight>heure d’été du Nord-Ouest du Mexique</daylight>
-				</long>
-				<short>
-					<generic draft="unconfirmed">HNOMX</generic>
-					<standard draft="unconfirmed">HNNOMX</standard>
-					<daylight draft="unconfirmed">HENOMX</daylight>
-				</short>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>heure du Pacifique mexicain</generic>
@@ -6378,6 +6348,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">dollars des Caraïbes orientales</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>florin caribéen</displayName>
+				<displayName count="one">florin caribéen</displayName>
+				<displayName count="other">florins caribéens</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>droit de tirage spécial</displayName>
 				<displayName count="one">droit de tirage spécial</displayName>
@@ -8027,7 +8002,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="energy-foodcalorie">
 				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0}  kcal</unitPattern>
+				<unitPattern count="other">{0} kcal</unitPattern>
 			</unit>
 			<unit type="energy-kilojoule">
 				<unitPattern count="one">{0} kJ</unitPattern>
diff --git a/make/data/cldr/common/main/fr_BE.xml b/make/data/cldr/common/main/fr_BE.xml
index 62764a0d18a..01effdbd41b 100644
--- a/make/data/cldr/common/main/fr_BE.xml
+++ b/make/data/cldr/common/main/fr_BE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -16,7 +16,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="frp" draft="contributed">franco-provençal</language>
 			<language type="goh" draft="contributed">ancien haut-allemand</language>
 			<language type="gu" draft="contributed">gujarati</language>
-			<language type="njo" draft="contributed">ao</language>
 		</languages>
 		<territories>
 			<territory type="GS" draft="contributed">Îles Géorgie du Sud et Sandwich du Sud</territory>
diff --git a/make/data/cldr/common/main/fr_BF.xml b/make/data/cldr/common/main/fr_BF.xml
index 04b86314676..147d05e30e0 100644
--- a/make/data/cldr/common/main/fr_BF.xml
+++ b/make/data/cldr/common/main/fr_BF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_BI.xml b/make/data/cldr/common/main/fr_BI.xml
index 171c8bfe69d..621d814c755 100644
--- a/make/data/cldr/common/main/fr_BI.xml
+++ b/make/data/cldr/common/main/fr_BI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_BJ.xml b/make/data/cldr/common/main/fr_BJ.xml
index 4a69b82e63f..10ab208c340 100644
--- a/make/data/cldr/common/main/fr_BJ.xml
+++ b/make/data/cldr/common/main/fr_BJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_BL.xml b/make/data/cldr/common/main/fr_BL.xml
index 1378fbf1afa..313cdfa6439 100644
--- a/make/data/cldr/common/main/fr_BL.xml
+++ b/make/data/cldr/common/main/fr_BL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_CA.xml b/make/data/cldr/common/main/fr_CA.xml
index fab1d94773f..f4a523c6939 100644
--- a/make/data/cldr/common/main/fr_CA.xml
+++ b/make/data/cldr/common/main/fr_CA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -152,7 +152,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="gb2312han">ordre de tri chinois simplifié - GB2312</type>
 			<type key="collation" type="phonebook">ordre de tri de l’annuaire</type>
 			<type key="collation" type="pinyin">ordre de tri pinyin</type>
-			<type key="collation" type="reformed">ordre de tri réformé</type>
 			<type key="collation" type="searchjl" draft="contributed">Rechercher par consonne initiale en hangeul</type>
 			<type key="collation" type="stroke">ordre de tri des traits</type>
 			<type key="collation" type="traditional">ordre de tri traditionnel</type>
@@ -1526,13 +1525,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>heure avancée de Maurice</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>heure du Nord-Ouest du Mexique</generic>
-					<standard>heure normale du Nord-Ouest du Mexique</standard>
-					<daylight>heure avancée du Nord-Ouest du Mexique</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>heure du Pacifique mexicain</generic>
@@ -2677,10 +2669,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} cal</unitPattern>
 				<unitPattern count="other">{0} cal</unitPattern>
 			</unit>
-			<unit type="energy-foodcalorie">
-				<unitPattern count="one">{0} kcal</unitPattern>
-				<unitPattern count="other">{0} kcal</unitPattern>
-			</unit>
 			<unit type="energy-kilojoule">
 				<unitPattern count="one">{0} kJ</unitPattern>
 				<unitPattern count="other">{0} kJ</unitPattern>
diff --git a/make/data/cldr/common/main/fr_CD.xml b/make/data/cldr/common/main/fr_CD.xml
index 85c1c16bb9d..2f522cc844f 100644
--- a/make/data/cldr/common/main/fr_CD.xml
+++ b/make/data/cldr/common/main/fr_CD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_CF.xml b/make/data/cldr/common/main/fr_CF.xml
index 63196bbe9fe..9cb186d2952 100644
--- a/make/data/cldr/common/main/fr_CF.xml
+++ b/make/data/cldr/common/main/fr_CF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_CG.xml b/make/data/cldr/common/main/fr_CG.xml
index 7a45a8376ae..e1a3b4a716a 100644
--- a/make/data/cldr/common/main/fr_CG.xml
+++ b/make/data/cldr/common/main/fr_CG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_CH.xml b/make/data/cldr/common/main/fr_CH.xml
index aec5ac678ae..5a168c97697 100644
--- a/make/data/cldr/common/main/fr_CH.xml
+++ b/make/data/cldr/common/main/fr_CH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_CI.xml b/make/data/cldr/common/main/fr_CI.xml
index 9ae53e7370e..90208c36bc6 100644
--- a/make/data/cldr/common/main/fr_CI.xml
+++ b/make/data/cldr/common/main/fr_CI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_CM.xml b/make/data/cldr/common/main/fr_CM.xml
index 6b087f5c2d1..6b436ac139c 100644
--- a/make/data/cldr/common/main/fr_CM.xml
+++ b/make/data/cldr/common/main/fr_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_DJ.xml b/make/data/cldr/common/main/fr_DJ.xml
index d746ae22152..1fc0c5046d9 100644
--- a/make/data/cldr/common/main/fr_DJ.xml
+++ b/make/data/cldr/common/main/fr_DJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_DZ.xml b/make/data/cldr/common/main/fr_DZ.xml
index 64d90983297..f807f785bee 100644
--- a/make/data/cldr/common/main/fr_DZ.xml
+++ b/make/data/cldr/common/main/fr_DZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_FR.xml b/make/data/cldr/common/main/fr_FR.xml
index b9ec553a9fc..aa2e0e5c0dd 100644
--- a/make/data/cldr/common/main/fr_FR.xml
+++ b/make/data/cldr/common/main/fr_FR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_GA.xml b/make/data/cldr/common/main/fr_GA.xml
index f8a10a73af3..71b364d15fa 100644
--- a/make/data/cldr/common/main/fr_GA.xml
+++ b/make/data/cldr/common/main/fr_GA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_GF.xml b/make/data/cldr/common/main/fr_GF.xml
index 0ac69d58128..5ede4983f33 100644
--- a/make/data/cldr/common/main/fr_GF.xml
+++ b/make/data/cldr/common/main/fr_GF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_GN.xml b/make/data/cldr/common/main/fr_GN.xml
index 4bedd27acc7..21062f9a659 100644
--- a/make/data/cldr/common/main/fr_GN.xml
+++ b/make/data/cldr/common/main/fr_GN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_GP.xml b/make/data/cldr/common/main/fr_GP.xml
index 9daf12c7950..60d21f8a045 100644
--- a/make/data/cldr/common/main/fr_GP.xml
+++ b/make/data/cldr/common/main/fr_GP.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_GQ.xml b/make/data/cldr/common/main/fr_GQ.xml
index 3b4d9ba6870..bd4a2e57271 100644
--- a/make/data/cldr/common/main/fr_GQ.xml
+++ b/make/data/cldr/common/main/fr_GQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_HT.xml b/make/data/cldr/common/main/fr_HT.xml
index 9264d4b22d6..67376463b43 100644
--- a/make/data/cldr/common/main/fr_HT.xml
+++ b/make/data/cldr/common/main/fr_HT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_KM.xml b/make/data/cldr/common/main/fr_KM.xml
index 4b4929d8ed9..4f37867f6b8 100644
--- a/make/data/cldr/common/main/fr_KM.xml
+++ b/make/data/cldr/common/main/fr_KM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_LU.xml b/make/data/cldr/common/main/fr_LU.xml
index 7d105961792..a4b2da9658b 100644
--- a/make/data/cldr/common/main/fr_LU.xml
+++ b/make/data/cldr/common/main/fr_LU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_MA.xml b/make/data/cldr/common/main/fr_MA.xml
index da0ec56f128..9a6291f72f6 100644
--- a/make/data/cldr/common/main/fr_MA.xml
+++ b/make/data/cldr/common/main/fr_MA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_MC.xml b/make/data/cldr/common/main/fr_MC.xml
index bfd995edf61..b0c3a56dbd4 100644
--- a/make/data/cldr/common/main/fr_MC.xml
+++ b/make/data/cldr/common/main/fr_MC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_MF.xml b/make/data/cldr/common/main/fr_MF.xml
index ac2e8c17aaf..8e8faa565f2 100644
--- a/make/data/cldr/common/main/fr_MF.xml
+++ b/make/data/cldr/common/main/fr_MF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_MG.xml b/make/data/cldr/common/main/fr_MG.xml
index 773cf447a34..24f4c01fd03 100644
--- a/make/data/cldr/common/main/fr_MG.xml
+++ b/make/data/cldr/common/main/fr_MG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_ML.xml b/make/data/cldr/common/main/fr_ML.xml
index b3ce944479a..92baa844d7b 100644
--- a/make/data/cldr/common/main/fr_ML.xml
+++ b/make/data/cldr/common/main/fr_ML.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_MQ.xml b/make/data/cldr/common/main/fr_MQ.xml
index bfae71f5147..b0843cdfc3f 100644
--- a/make/data/cldr/common/main/fr_MQ.xml
+++ b/make/data/cldr/common/main/fr_MQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_MR.xml b/make/data/cldr/common/main/fr_MR.xml
index 1b1b0325eae..c28494b741b 100644
--- a/make/data/cldr/common/main/fr_MR.xml
+++ b/make/data/cldr/common/main/fr_MR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_MU.xml b/make/data/cldr/common/main/fr_MU.xml
index 19280b8a7ae..a34ad049263 100644
--- a/make/data/cldr/common/main/fr_MU.xml
+++ b/make/data/cldr/common/main/fr_MU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_NC.xml b/make/data/cldr/common/main/fr_NC.xml
index a2d43be981d..5b37c39a95b 100644
--- a/make/data/cldr/common/main/fr_NC.xml
+++ b/make/data/cldr/common/main/fr_NC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_NE.xml b/make/data/cldr/common/main/fr_NE.xml
index 0a5a7940a89..e9326af410d 100644
--- a/make/data/cldr/common/main/fr_NE.xml
+++ b/make/data/cldr/common/main/fr_NE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_PF.xml b/make/data/cldr/common/main/fr_PF.xml
index 5586e2f523e..96285e8276e 100644
--- a/make/data/cldr/common/main/fr_PF.xml
+++ b/make/data/cldr/common/main/fr_PF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_PM.xml b/make/data/cldr/common/main/fr_PM.xml
index 55d4d1670d8..40ffe3e536e 100644
--- a/make/data/cldr/common/main/fr_PM.xml
+++ b/make/data/cldr/common/main/fr_PM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_RE.xml b/make/data/cldr/common/main/fr_RE.xml
index 4f33c169aae..f86d81a11e6 100644
--- a/make/data/cldr/common/main/fr_RE.xml
+++ b/make/data/cldr/common/main/fr_RE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_RW.xml b/make/data/cldr/common/main/fr_RW.xml
index 82baf8660ed..8040bdfa162 100644
--- a/make/data/cldr/common/main/fr_RW.xml
+++ b/make/data/cldr/common/main/fr_RW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_SC.xml b/make/data/cldr/common/main/fr_SC.xml
index ea5cc52cd57..c4cb4cf1788 100644
--- a/make/data/cldr/common/main/fr_SC.xml
+++ b/make/data/cldr/common/main/fr_SC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_SN.xml b/make/data/cldr/common/main/fr_SN.xml
index 124a6fc3d40..89343236f3f 100644
--- a/make/data/cldr/common/main/fr_SN.xml
+++ b/make/data/cldr/common/main/fr_SN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_SY.xml b/make/data/cldr/common/main/fr_SY.xml
index 6551fe91d4a..1dab23168f1 100644
--- a/make/data/cldr/common/main/fr_SY.xml
+++ b/make/data/cldr/common/main/fr_SY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_TD.xml b/make/data/cldr/common/main/fr_TD.xml
index 3c7a3996d34..eb5ab733d98 100644
--- a/make/data/cldr/common/main/fr_TD.xml
+++ b/make/data/cldr/common/main/fr_TD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_TG.xml b/make/data/cldr/common/main/fr_TG.xml
index 1d0e1469873..a01e06a4909 100644
--- a/make/data/cldr/common/main/fr_TG.xml
+++ b/make/data/cldr/common/main/fr_TG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_TN.xml b/make/data/cldr/common/main/fr_TN.xml
index 7b7beb64b29..fed2ed7807f 100644
--- a/make/data/cldr/common/main/fr_TN.xml
+++ b/make/data/cldr/common/main/fr_TN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_VU.xml b/make/data/cldr/common/main/fr_VU.xml
index 6299c4b0c89..f9eb38f20a3 100644
--- a/make/data/cldr/common/main/fr_VU.xml
+++ b/make/data/cldr/common/main/fr_VU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_WF.xml b/make/data/cldr/common/main/fr_WF.xml
index 8b3ed1a9676..e644869fdc3 100644
--- a/make/data/cldr/common/main/fr_WF.xml
+++ b/make/data/cldr/common/main/fr_WF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fr_YT.xml b/make/data/cldr/common/main/fr_YT.xml
index 43842e13fac..134c877e30c 100644
--- a/make/data/cldr/common/main/fr_YT.xml
+++ b/make/data/cldr/common/main/fr_YT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/frr.xml b/make/data/cldr/common/main/frr.xml
index 20fbfe261d8..71e59e401e4 100644
--- a/make/data/cldr/common/main/frr.xml
+++ b/make/data/cldr/common/main/frr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1900,15 +1900,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Taipei">
 				<exemplarCity draft="unconfirmed">Taipee</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="unconfirmed">Uschhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity draft="unconfirmed">Kiew</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">Saporischja</exemplarCity>
-			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity draft="unconfirmed">Beulah, Nuurd Dakota</exemplarCity>
 			</zone>
@@ -2433,11 +2427,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">Lord Howe Somertidj</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">Macquarie Eilun Tidj</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="unconfirmed">Magadan Tidj</generic>
@@ -2477,13 +2466,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">Mawson Tidj</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">Nuurdwaast Meksiko Tidj</generic>
-					<standard draft="unconfirmed">Nuurdwaast Meksiko Standard Tidj</standard>
-					<daylight draft="unconfirmed">Nuurdwaast Meksiko Somertidj</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">Meksiko Pasiifik Tidj</generic>
diff --git a/make/data/cldr/common/main/frr_DE.xml b/make/data/cldr/common/main/frr_DE.xml
index e5cebfe7e3e..e4dd611312f 100644
--- a/make/data/cldr/common/main/frr_DE.xml
+++ b/make/data/cldr/common/main/frr_DE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fur.xml b/make/data/cldr/common/main/fur.xml
index ec137e51b12..5f2858e9bd0 100644
--- a/make/data/cldr/common/main/fur.xml
+++ b/make/data/cldr/common/main/fur.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fur_IT.xml b/make/data/cldr/common/main/fur_IT.xml
index cf04181644d..fcc1dfb18b4 100644
--- a/make/data/cldr/common/main/fur_IT.xml
+++ b/make/data/cldr/common/main/fur_IT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/fy.xml b/make/data/cldr/common/main/fy.xml
index b83df95b056..1e47da09297 100644
--- a/make/data/cldr/common/main/fy.xml
+++ b/make/data/cldr/common/main/fy.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2308,12 +2308,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Istanbul">
 				<exemplarCity draft="contributed">Istanboel</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="contributed">Oezjhorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="contributed">Zaporizja</exemplarCity>
-			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity draft="contributed">Beulah, Noard-Dakota</exemplarCity>
 			</zone>
@@ -2900,11 +2894,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="contributed">Macause simmertiid</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="contributed">Macquarie-eilânske tiid</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="contributed">Magadan-tiid</generic>
diff --git a/make/data/cldr/common/main/fy_NL.xml b/make/data/cldr/common/main/fy_NL.xml
index 5cbe6c0bfc6..db5f697c8a3 100644
--- a/make/data/cldr/common/main/fy_NL.xml
+++ b/make/data/cldr/common/main/fy_NL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ga.xml b/make/data/cldr/common/main/ga.xml
index d1402226e4b..a4ee7b2efbd 100644
--- a/make/data/cldr/common/main/ga.xml
+++ b/make/data/cldr/common/main/ga.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1069,7 +1069,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="gb2312han">Ord sórtála Síneach simplithe - GB 2312</type>
 			<type key="collation" type="phonebook">Ord sórtála an eolaire teileafóin</type>
 			<type key="collation" type="pinyin">Ord sórtála pinyin</type>
-			<type key="collation" type="reformed">Ord Sórtála Athfhoirmithe</type>
 			<type key="collation" type="search">Cuardach Ilfhóinteach</type>
 			<type key="collation" type="searchjl">Cuardach de réir Consan Tosaigh Hangul</type>
 			<type key="collation" type="standard">Ord Sórtála Caighdeánach</type>
@@ -2480,9 +2479,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<gmtFormat>MAG{0}</gmtFormat>
 			<gmtZeroFormat>MAG</gmtZeroFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Am Uilíoch Lárnach</standard>
@@ -2512,9 +2508,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Vín</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Antarctica/Macquarie">
 				<exemplarCity>Mac Guaire</exemplarCity>
 			</zone>
@@ -3534,11 +3527,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Am Samhraidh Mhacao</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Am Oileán Mhic Guaire</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Am Mhagadan</generic>
@@ -3578,13 +3566,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Am Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Am Iarthuaisceart Mheicsiceo</generic>
-					<standard>Am Caighdeánach Iarthuaisceart Mheicsiceo</standard>
-					<daylight>Am Samhraidh Iarthuaisceart Mheicsiceo</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Am Meicsiceach an Aigéin Chiúin</generic>
diff --git a/make/data/cldr/common/main/ga_GB.xml b/make/data/cldr/common/main/ga_GB.xml
index 4c141f681ae..af57908d747 100644
--- a/make/data/cldr/common/main/ga_GB.xml
+++ b/make/data/cldr/common/main/ga_GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ga_IE.xml b/make/data/cldr/common/main/ga_IE.xml
index 8fde2cd1280..3a7250e9763 100644
--- a/make/data/cldr/common/main/ga_IE.xml
+++ b/make/data/cldr/common/main/ga_IE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gaa.xml b/make/data/cldr/common/main/gaa.xml
index a48870a699a..83ffd48e86e 100644
--- a/make/data/cldr/common/main/gaa.xml
+++ b/make/data/cldr/common/main/gaa.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -900,9 +900,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Broken_Hill">
 				<exemplarCity draft="unconfirmed">Ŋmeŋme Ni Ekumɔ</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity draft="unconfirmed">Kurrie</exemplarCity>
-			</zone>
 			<zone type="Antarctica/Macquarie">
 				<exemplarCity draft="unconfirmed">Makwarie</exemplarCity>
 			</zone>
@@ -927,24 +924,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity draft="unconfirmed">Kreston</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity draft="unconfirmed">Kakla Wuɔfɔ</exemplarCity>
-			</zone>
 			<zone type="America/Swift_Current">
 				<exemplarCity draft="unconfirmed">Swift Karɛnt</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
 				<exemplarCity draft="unconfirmed">Kambridge Ŋshɔnine Bibioo</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity draft="unconfirmed">Faa Ni Nɛɔ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity draft="unconfirmed">Rankin Ŋshɔnine</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity draft="unconfirmed">Sarawa Ŋshɔnine Bibioo</exemplarCity>
-			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity draft="unconfirmed">Ikaluit</exemplarCity>
 			</zone>
@@ -1276,13 +1264,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">Mauritius Be Yɛ Latsa Beiaŋ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">Meziko Kooyi-Anaigbɛ Be</generic>
-					<standard draft="unconfirmed">Meziko Kooyi-Anaigbɛ Be Yɛ Fɛi Beiaŋ</standard>
-					<daylight draft="unconfirmed">Meziko Kooyi-Anaigbɛ Be Yɛ Latsa Beiaŋ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">Meziko Pasifik Be</generic>
diff --git a/make/data/cldr/common/main/gaa_GH.xml b/make/data/cldr/common/main/gaa_GH.xml
index 94f9d0dd6d5..84715929253 100644
--- a/make/data/cldr/common/main/gaa_GH.xml
+++ b/make/data/cldr/common/main/gaa_GH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gd.xml b/make/data/cldr/common/main/gd.xml
index 5c8144a7ea1..fb8f5039aa2 100644
--- a/make/data/cldr/common/main/gd.xml
+++ b/make/data/cldr/common/main/gd.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1321,7 +1321,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="gb2312han">Òrdugh seòrsachaidh na Sìnise Simplichte - GB2312</type>
 			<type key="collation" type="phonebook">Òrdugh seòrsachaidh nan leabhraichean-fòn</type>
 			<type key="collation" type="pinyin">Òrdugh seòrsachaidh Pinyin</type>
-			<type key="collation" type="reformed">Òrdugh seòrsachaidh ath-leasaichte</type>
 			<type key="collation" type="search">Lorg coitcheann</type>
 			<type key="collation" type="searchjl">Lorg leis a’ chiad chonnrag Hangul</type>
 			<type key="collation" type="standard">Òrdugh seòrsachaidh stannardach</type>
@@ -3240,9 +3239,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<timeZoneNames>
 			<regionFormat type="daylight">Tìde samhraidh: {0}</regionFormat>
 			<regionFormat type="standard">Bun-àm: {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Àm Uile-choitcheann Co-òrdanaichte</standard>
@@ -3269,9 +3265,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Cordoba">
 				<exemplarCity>Córdoba</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Sidni</exemplarCity>
 			</zone>
@@ -3332,9 +3325,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Kangiqliniq</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangniqtuuq</exemplarCity>
-			</zone>
 			<zone type="America/Glace_Bay">
 				<exemplarCity>Glasbaidh</exemplarCity>
 			</zone>
@@ -4278,11 +4268,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Tìde samhraidh Macàthu</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Àm Eilein MhicGuaire</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Àm Magadan</generic>
@@ -4322,13 +4307,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Àm Mhawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Àm Mheagsago an Iar-thuath</generic>
-					<standard>Bun-àm Mheagsago an Iar-thuath</standard>
-					<daylight>Tìde samhraidh Mheagsago an Iar-thuath</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Àm a’ Chuain Sèimh Mheagsago</generic>
diff --git a/make/data/cldr/common/main/gd_GB.xml b/make/data/cldr/common/main/gd_GB.xml
index 8ff9f1b50d3..1b81536ed80 100644
--- a/make/data/cldr/common/main/gd_GB.xml
+++ b/make/data/cldr/common/main/gd_GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gez.xml b/make/data/cldr/common/main/gez.xml
index 30774449c23..bb405dabb87 100644
--- a/make/data/cldr/common/main/gez.xml
+++ b/make/data/cldr/common/main/gez.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gez_ER.xml b/make/data/cldr/common/main/gez_ER.xml
index c8df591a28e..f5b9ae7497e 100644
--- a/make/data/cldr/common/main/gez_ER.xml
+++ b/make/data/cldr/common/main/gez_ER.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gez_ET.xml b/make/data/cldr/common/main/gez_ET.xml
index 84c9083021c..c9250811ec8 100644
--- a/make/data/cldr/common/main/gez_ET.xml
+++ b/make/data/cldr/common/main/gez_ET.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gl.xml b/make/data/cldr/common/main/gl.xml
index 3666f14c540..cd29e464b50 100644
--- a/make/data/cldr/common/main/gl.xml
+++ b/make/data/cldr/common/main/gl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -911,7 +911,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">orde de clasificación da guía telefónica</type>
 			<type key="collation" type="phonetic">Orde de clasificación fonética</type>
 			<type key="collation" type="pinyin">Orde de clasificación pinyin</type>
-			<type key="collation" type="reformed">Criterio de ordenación reformado</type>
 			<type key="collation" type="search">busca de carácter xeral</type>
 			<type key="collation" type="searchjl">Clasificar por consonante inicial hangul</type>
 			<type key="collation" type="standard">criterio de ordenación estándar</type>
@@ -2058,9 +2057,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>hora de: {0}</regionFormat>
 			<regionFormat type="daylight">hora de verán de: {0}</regionFormat>
 			<regionFormat type="standard">hora estándar de: {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>hora universal coordinada</standard>
@@ -2102,9 +2098,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Adelaide">
 				<exemplarCity>Adelaida</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Sidney</exemplarCity>
 			</zone>
@@ -2480,18 +2473,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Port_of_Spain">
 				<exemplarCity>Porto España</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzghorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kíiv</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Simferópol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizhia</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulú</exemplarCity>
 			</zone>
@@ -3075,11 +3062,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>hora de verán de Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>hora da Illa Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>hora de Magadan</generic>
@@ -3119,13 +3101,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>hora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>hora do noroeste de México</generic>
-					<standard>hora estándar do noroeste de México</standard>
-					<daylight>hora de verán do noroeste de México</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>hora do Pacífico mexicano</generic>
diff --git a/make/data/cldr/common/main/gl_ES.xml b/make/data/cldr/common/main/gl_ES.xml
index d90519bd14d..18cb43c3cec 100644
--- a/make/data/cldr/common/main/gl_ES.xml
+++ b/make/data/cldr/common/main/gl_ES.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gn.xml b/make/data/cldr/common/main/gn.xml
index 9b385539ee7..a1a3df585db 100644
--- a/make/data/cldr/common/main/gn.xml
+++ b/make/data/cldr/common/main/gn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gn_PY.xml b/make/data/cldr/common/main/gn_PY.xml
index 03fbf31e5f8..87af65ad1c6 100644
--- a/make/data/cldr/common/main/gn_PY.xml
+++ b/make/data/cldr/common/main/gn_PY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gsw.xml b/make/data/cldr/common/main/gsw.xml
index ade9ff1fd05..0047e032028 100644
--- a/make/data/cldr/common/main/gsw.xml
+++ b/make/data/cldr/common/main/gsw.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1701,15 +1701,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Daressalam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uschgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiew</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Saporischja</exemplarCity>
-			</zone>
 			<zone type="America/Indiana/Knox">
 				<exemplarCity>Knox</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/gsw_CH.xml b/make/data/cldr/common/main/gsw_CH.xml
index 85465412257..8740af7b759 100644
--- a/make/data/cldr/common/main/gsw_CH.xml
+++ b/make/data/cldr/common/main/gsw_CH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gsw_FR.xml b/make/data/cldr/common/main/gsw_FR.xml
index a1c1009ee47..d90c3ea2e51 100644
--- a/make/data/cldr/common/main/gsw_FR.xml
+++ b/make/data/cldr/common/main/gsw_FR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gsw_LI.xml b/make/data/cldr/common/main/gsw_LI.xml
index b827f1bd238..e7eba946b71 100644
--- a/make/data/cldr/common/main/gsw_LI.xml
+++ b/make/data/cldr/common/main/gsw_LI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gu.xml b/make/data/cldr/common/main/gu.xml
index 0c4eaad1cce..4f33a197050 100644
--- a/make/data/cldr/common/main/gu.xml
+++ b/make/data/cldr/common/main/gu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1111,7 +1111,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">ફોનબુક અનુક્મ</type>
 			<type key="collation" type="phonetic">ધ્વન્યાત્મક સૉર્ટ ક્રમ</type>
 			<type key="collation" type="pinyin">પિનયિન અનુક્મ</type>
-			<type key="collation" type="reformed">પૂનર્સ્વરૂપિત અનુક્મ</type>
 			<type key="collation" type="search">સામાન્ય-ઉદ્દેશ શોધ</type>
 			<type key="collation" type="searchjl">હંગુલ પ્રારંભિક વ્યંજન દ્વારા શોધો</type>
 			<type key="collation" type="standard">માનક સૉર્ટ ક્રમ</type>
@@ -2191,9 +2190,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} સમય</regionFormat>
 			<regionFormat type="daylight">{0} દિવસ સમય</regionFormat>
 			<regionFormat type="standard">{0} માનક સમય</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>સાંતા ઇસાબેલ</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>સંકલિત યુનિવર્સલ સમય</standard>
@@ -2316,9 +2312,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>મેલબોર્ન</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ક્યુરી</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>હોબાર્ટ</exemplarCity>
 			</zone>
@@ -2472,9 +2465,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ક્રેસ્ટન</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>યેલોનાઇફ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>એડમેન્ટન</exemplarCity>
 			</zone>
@@ -2493,30 +2483,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>રેઝોલૂટ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>રેઇની નદી</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>રેંકિન ઇન્લેટ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>એટિકોકેન</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>થંડર બે</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>નિપિગોન</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ટોરન્ટો</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ઇકાલુઇત</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>પેંગનિરતુંગ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>મોન્કટન</exemplarCity>
 			</zone>
@@ -3330,18 +3308,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>દાર એસ સલામ</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ઉઝ્ગોરોદ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>કૈવ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>સિમ્ફેરોપોલ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>જેપોરોઝિયે</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>કમ્પાલા</exemplarCity>
 			</zone>
@@ -3360,9 +3332,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>હોનોલુલુ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>જોહ્નસ્ટોન</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>એન્કોરેજ</exemplarCity>
 			</zone>
@@ -4060,11 +4029,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>મકાઉ ગ્રીષ્મ સમય</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>મેક્વાયર આઇલેન્ડ સમય</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>મગાડન સમય</generic>
@@ -4104,13 +4068,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>મોસન સમય</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>ઉત્તરપશ્ચિમ મેક્સિકો સમય</generic>
-					<standard>ઉત્તરપશ્ચિમ મેક્સિકો માનક સમય</standard>
-					<daylight>ઉત્તરપશ્ચિમ મેક્સિકો દિવસ સમય</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>મેક્સિકન પેસિફિક સમય</generic>
diff --git a/make/data/cldr/common/main/gu_IN.xml b/make/data/cldr/common/main/gu_IN.xml
index f79d6827fa5..d2f77872e11 100644
--- a/make/data/cldr/common/main/gu_IN.xml
+++ b/make/data/cldr/common/main/gu_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/guz.xml b/make/data/cldr/common/main/guz.xml
index 81031de1e73..6e2b253a5d3 100644
--- a/make/data/cldr/common/main/guz.xml
+++ b/make/data/cldr/common/main/guz.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/guz_KE.xml b/make/data/cldr/common/main/guz_KE.xml
index f18f51b51ad..f7c8d95d03d 100644
--- a/make/data/cldr/common/main/guz_KE.xml
+++ b/make/data/cldr/common/main/guz_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gv.xml b/make/data/cldr/common/main/gv.xml
index 7644a2aec30..344a82417c2 100644
--- a/make/data/cldr/common/main/gv.xml
+++ b/make/data/cldr/common/main/gv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/gv_IM.xml b/make/data/cldr/common/main/gv_IM.xml
index f684c49d148..6a8d0ac45cc 100644
--- a/make/data/cldr/common/main/gv_IM.xml
+++ b/make/data/cldr/common/main/gv_IM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ha.xml b/make/data/cldr/common/main/ha.xml
index edb9c6d4fa1..554c18da427 100644
--- a/make/data/cldr/common/main/ha.xml
+++ b/make/data/cldr/common/main/ha.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2097,11 +2097,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Lokacin Rana na Vote Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Lokacin Macquarie Island</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Lokacin Magadan</generic>
@@ -2141,13 +2136,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Lokacin Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Lokacin Arewa Maso Yammacin Mekziko</generic>
-					<standard>Tsayayyen Lokacin Arewa Maso Yammacin Mekziko</standard>
-					<daylight>Lokacin Rana na Arewa Maso Yammacin Mekziko</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Lokacin Mekziko Pacific</generic>
diff --git a/make/data/cldr/common/main/ha_Arab.xml b/make/data/cldr/common/main/ha_Arab.xml
index 99c65685221..06b6eafd72f 100644
--- a/make/data/cldr/common/main/ha_Arab.xml
+++ b/make/data/cldr/common/main/ha_Arab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ha_Arab_NG.xml b/make/data/cldr/common/main/ha_Arab_NG.xml
index d46dbd178e4..de44776f657 100644
--- a/make/data/cldr/common/main/ha_Arab_NG.xml
+++ b/make/data/cldr/common/main/ha_Arab_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ha_Arab_SD.xml b/make/data/cldr/common/main/ha_Arab_SD.xml
index 6c1c8acb348..d36a89d5e5f 100644
--- a/make/data/cldr/common/main/ha_Arab_SD.xml
+++ b/make/data/cldr/common/main/ha_Arab_SD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ha_GH.xml b/make/data/cldr/common/main/ha_GH.xml
index 2d08c6b4045..f93141c71b4 100644
--- a/make/data/cldr/common/main/ha_GH.xml
+++ b/make/data/cldr/common/main/ha_GH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ha_NE.xml b/make/data/cldr/common/main/ha_NE.xml
index 53191fe4796..68391655af9 100644
--- a/make/data/cldr/common/main/ha_NE.xml
+++ b/make/data/cldr/common/main/ha_NE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ha_NG.xml b/make/data/cldr/common/main/ha_NG.xml
index eac780a4c92..1a42e43793a 100644
--- a/make/data/cldr/common/main/ha_NG.xml
+++ b/make/data/cldr/common/main/ha_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/haw.xml b/make/data/cldr/common/main/haw.xml
index 87a71e5c146..dadea206071 100644
--- a/make/data/cldr/common/main/haw.xml
+++ b/make/data/cldr/common/main/haw.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/haw_US.xml b/make/data/cldr/common/main/haw_US.xml
index fc32a964cdd..5a37f908c1c 100644
--- a/make/data/cldr/common/main/haw_US.xml
+++ b/make/data/cldr/common/main/haw_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/he.xml b/make/data/cldr/common/main/he.xml
index fc7396f4f80..d64c80493ef 100644
--- a/make/data/cldr/common/main/he.xml
+++ b/make/data/cldr/common/main/he.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1253,7 +1253,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">מיון ספר טלפונים</type>
 			<type key="collation" type="phonetic">סדר מיון פונטי</type>
 			<type key="collation" type="pinyin">מיון פיניין</type>
-			<type key="collation" type="reformed">סדר מיון מתוקן</type>
 			<type key="collation" type="search">חיפוש למטרה כללית</type>
 			<type key="collation" type="searchjl" draft="contributed">חפש לפי העיצור הראשון באותיות הנגול</type>
 			<type key="collation" type="standard">סדר מיון רגיל</type>
@@ -2875,9 +2874,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>שעון {0}</regionFormat>
 			<regionFormat type="daylight">שעון {0} (קיץ)</regionFormat>
 			<regionFormat type="standard">שעון {0} (חורף)</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>סנטה איזבל</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>זמן אוניברסלי מתואם</standard>
@@ -3000,9 +2996,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>מלבורן</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>קרי</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>הוברט</exemplarCity>
 			</zone>
@@ -3156,9 +3149,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>קרסטון</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ילונייף</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>אדמונטון</exemplarCity>
 			</zone>
@@ -3177,30 +3167,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>רזולוט</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>רייני ריבר</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>רנקין אינלט</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>אטיקוקן</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ת׳אנדר ביי</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ניפיגון</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>טורונטו</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>איקלואיט</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>פנגנירטונג</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>מונקטון</exemplarCity>
 			</zone>
@@ -4014,18 +3992,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>דאר א-סלאם</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>אוז׳הורוד</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>קייב</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>סימפרופול</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>זפורוז׳יה</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>קמפאלה</exemplarCity>
 			</zone>
@@ -4044,9 +4016,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>הונולולו</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ג׳ונסטון</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>אנקורג׳</exemplarCity>
 			</zone>
@@ -4729,11 +4698,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">שעון קיץ מקאו</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>שעון מקווארי</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>שעון מגדן</generic>
@@ -4773,13 +4737,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>שעון מאוסון</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>שעון צפון-מערב מקסיקו</generic>
-					<standard>שעון צפון-מערב מקסיקו (חורף)</standard>
-					<daylight>שעון צפון-מערב מקסיקו (קיץ)</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>שעון מערב מקסיקו</generic>
diff --git a/make/data/cldr/common/main/he_IL.xml b/make/data/cldr/common/main/he_IL.xml
index 0040819d8eb..41be0ec5ddb 100644
--- a/make/data/cldr/common/main/he_IL.xml
+++ b/make/data/cldr/common/main/he_IL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hi.xml b/make/data/cldr/common/main/hi.xml
index 533d1fd4fb3..33facd56c3b 100644
--- a/make/data/cldr/common/main/hi.xml
+++ b/make/data/cldr/common/main/hi.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1116,7 +1116,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">फ़ोनबुक वर्गीकरण क्रम</type>
 			<type key="collation" type="phonetic">ध्वन्यात्मक वर्गीकरण क्रम</type>
 			<type key="collation" type="pinyin">पिनयिन वर्गीकरण क्रम</type>
-			<type key="collation" type="reformed">संशोधित वर्गीकरण क्रम</type>
 			<type key="collation" type="search">सामान्य-उद्देश्य खोज</type>
 			<type key="collation" type="searchjl" draft="contributed">हांगुल आरंभिक व्‍यंजन द्वारा खोजें</type>
 			<type key="collation" type="standard">मानक वर्गीकरण क्रम</type>
@@ -2534,9 +2533,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} समय</regionFormat>
 			<regionFormat type="daylight">{0} डेलाइट समय</regionFormat>
 			<regionFormat type="standard">{0} मानक समय</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>सांता इसाबेल</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>समन्वित वैश्विक समय</standard>
@@ -2659,9 +2655,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>मेलबोर्न</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>क्यूरी</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>होबार्ट</exemplarCity>
 			</zone>
@@ -2815,9 +2808,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>क्रेस्टन</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>येलोनाइफ़</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>एडमंटन</exemplarCity>
 			</zone>
@@ -2836,30 +2826,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>रिसोल्यूट</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>रेनी नदी</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>रेंकिन इनलेट</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>अटिकोकान</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>थंडर खाड़ी</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>निपिगन</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>टोरंटो</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>इकालुईट</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>पांगनिर्टंग</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>मोंकटन</exemplarCity>
 			</zone>
@@ -3673,18 +3651,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>दार अस सलाम</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>अज़्गोरोद</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>कीव</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>सिम्फ़ेरोपोल</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ज़ैपोरोज़ाई</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>कंपाला</exemplarCity>
 			</zone>
@@ -3708,9 +3680,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</short>
 				<exemplarCity>होनोलुलु</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>जॉनस्टन</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>एंकरेज</exemplarCity>
 			</zone>
@@ -4363,11 +4332,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>लॉर्ड होवे डेलाइट समय</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>मक्वारी द्वीप समय</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>मागादान समय</generic>
@@ -4407,13 +4371,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>माव्सन समय</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>उत्तर पश्चिमी मेक्सिको समय</generic>
-					<standard>उत्तर पश्चिमी मेक्सिको मानक समय</standard>
-					<daylight>उत्तर पश्चिमी मेक्सिको डेलाइट समय</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>मेक्सिकन प्रशांत समय</generic>
diff --git a/make/data/cldr/common/main/hi_IN.xml b/make/data/cldr/common/main/hi_IN.xml
index f950c7dc573..20ee8e9fef7 100644
--- a/make/data/cldr/common/main/hi_IN.xml
+++ b/make/data/cldr/common/main/hi_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hi_Latn.xml b/make/data/cldr/common/main/hi_Latn.xml
index d2fd01e2e3e..935ec8e26b2 100644
--- a/make/data/cldr/common/main/hi_Latn.xml
+++ b/make/data/cldr/common/main/hi_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 the U.S. and other countries. CLDR data files are interpreted according to
@@ -48,6 +48,7 @@ annotations.
 			<territory type="BL">St. Barthelemy</territory>
 			<territory type="CI">Cote d’Ivoire</territory>
 			<territory type="CW">Curacao</territory>
+			<territory type="IN">Bharat</territory>
 			<territory type="KN">St. Kitts &amp; Nevis</territory>
 			<territory type="LC">St. Lucia</territory>
 			<territory type="MF">St. Martin</territory>
@@ -88,7 +89,6 @@ annotations.
 			<type key="colCaseLevel" type="yes">Case sensitive sorting karein</type>
 			<type key="collation" type="compat">Compatibility ke liye, picchla sort order</type>
 			<type key="collation" type="dictionary">Dictionary kaa sort order</type>
-			<type key="collation" type="reformed">Reform kiya gaya Sort Order</type>
 			<type key="collation" type="searchjl">Hangul initial consonant se search karein</type>
 			<type key="colNormalization" type="no">Bina normalization ke sort karein</type>
 			<type key="colNormalization" type="yes">Sort Unicode Normalized</type>
@@ -489,14 +489,14 @@ annotations.
 						<intervalFormatItem id="GyMMMd">
 							<greatestDifference id="d">G y MMM d–d</greatestDifference>
 							<greatestDifference id="G">G y MMM d – G y MMM d</greatestDifference>
-							<greatestDifference id="M">G y MMM d  – MMM d</greatestDifference>
-							<greatestDifference id="y">G y MMM d –  y d MMM</greatestDifference>
+							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">G y MMM d – y d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
 							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="G">G y MMM d, E –  G y MMM d, E</greatestDifference>
-							<greatestDifference id="M">G y MMM d, E –  MMM d, E</greatestDifference>
-							<greatestDifference id="y">G y MMM d, E –  y MMM d, E</greatestDifference>
+							<greatestDifference id="G">G y MMM d, E – G y MMM d, E</greatestDifference>
+							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">HH – HH</greatestDifference>
@@ -1234,9 +1234,6 @@ annotations.
 			<zone type="Africa/Sao_Tome">
 				<exemplarCity>Sao Tome</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhgorod</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<short>
 					<generic>HST</generic>
diff --git a/make/data/cldr/common/main/hi_Latn_IN.xml b/make/data/cldr/common/main/hi_Latn_IN.xml
index 56c104ce304..c3ab4c4cf56 100644
--- a/make/data/cldr/common/main/hi_Latn_IN.xml
+++ b/make/data/cldr/common/main/hi_Latn_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hnj.xml b/make/data/cldr/common/main/hnj.xml
index 671bf4da2a6..6492ca8dc35 100644
--- a/make/data/cldr/common/main/hnj.xml
+++ b/make/data/cldr/common/main/hnj.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hnj_Hmnp.xml b/make/data/cldr/common/main/hnj_Hmnp.xml
index 0572f3ad943..edf19bb8cdc 100644
--- a/make/data/cldr/common/main/hnj_Hmnp.xml
+++ b/make/data/cldr/common/main/hnj_Hmnp.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hnj_Hmnp_US.xml b/make/data/cldr/common/main/hnj_Hmnp_US.xml
index f49ef827699..34ff522c1fe 100644
--- a/make/data/cldr/common/main/hnj_Hmnp_US.xml
+++ b/make/data/cldr/common/main/hnj_Hmnp_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hr.xml b/make/data/cldr/common/main/hr.xml
index 3fe00831421..f028c3424bf 100644
--- a/make/data/cldr/common/main/hr.xml
+++ b/make/data/cldr/common/main/hr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1180,7 +1180,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">razvrstavanje po abecedi</type>
 			<type key="collation" type="phonetic">fonetsko razvrstavanje</type>
 			<type key="collation" type="pinyin">pinyin razvrstavanje</type>
-			<type key="collation" type="reformed">reformirano razvrstavanje</type>
 			<type key="collation" type="search">općenito pretraživanje</type>
 			<type key="collation" type="searchjl" draft="contributed">Pretraživanje po početnom suglasniku hangula</type>
 			<type key="collation" type="standard">standardno razvrstavanje</type>
@@ -2859,9 +2858,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<hourFormat>+HH:mm; -HH:mm</hourFormat>
 			<regionFormat type="daylight">{0}, ljetno vrijeme</regionFormat>
 			<regionFormat type="standard">{0}, standardno vrijeme</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>koordinirano svjetsko vrijeme</standard>
@@ -2885,9 +2881,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Beč</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Bruxelles</exemplarCity>
 			</zone>
@@ -3162,18 +3155,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Ashgabat">
 				<exemplarCity>Ašgabat</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kijev</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Simferopolj</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3783,11 +3770,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">ljetno makaosko vrijeme</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>vrijeme otoka Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>magadansko vrijeme</generic>
@@ -3827,13 +3809,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>mawsonsko vrijeme</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>sjeverozapadno meksičko vrijeme</generic>
-					<standard>sjeverozapadno meksičko standardno vrijeme</standard>
-					<daylight>sjeverozapadno meksičko ljetno vrijeme</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>meksičko pacifičko vrijeme</generic>
diff --git a/make/data/cldr/common/main/hr_BA.xml b/make/data/cldr/common/main/hr_BA.xml
index 05d821d685f..93895ec431f 100644
--- a/make/data/cldr/common/main/hr_BA.xml
+++ b/make/data/cldr/common/main/hr_BA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hr_HR.xml b/make/data/cldr/common/main/hr_HR.xml
index b0239a0cc51..34f898cb40d 100644
--- a/make/data/cldr/common/main/hr_HR.xml
+++ b/make/data/cldr/common/main/hr_HR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hsb.xml b/make/data/cldr/common/main/hsb.xml
index dbb0a470f2f..25fa9ffc62b 100644
--- a/make/data/cldr/common/main/hsb.xml
+++ b/make/data/cldr/common/main/hsb.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2598,15 +2598,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Daressalam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiew</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporižžja</exemplarCity>
-			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beulah, Sewjerna Dakota</exemplarCity>
 			</zone>
@@ -3146,11 +3140,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>lětni čas kupy Lord-Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>čas kupy Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadanski čas</generic>
@@ -3190,13 +3179,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mawsonski čas</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>mexiski sewjerozapadny čas</generic>
-					<standard>mexiski sewjerozapadny standardny čas</standard>
-					<daylight>mexiski sewjerozapadny lětni čas</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>mexiski pacifiski čas</generic>
diff --git a/make/data/cldr/common/main/hsb_DE.xml b/make/data/cldr/common/main/hsb_DE.xml
index e09bb1ca4d9..76e15d557b5 100644
--- a/make/data/cldr/common/main/hsb_DE.xml
+++ b/make/data/cldr/common/main/hsb_DE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hu.xml b/make/data/cldr/common/main/hu.xml
index 440cb73512e..878aeb9a439 100644
--- a/make/data/cldr/common/main/hu.xml
+++ b/make/data/cldr/common/main/hu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1179,7 +1179,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Telefonkönyv sorrend</type>
 			<type key="collation" type="phonetic">Fonetikus rendezési sorrend</type>
 			<type key="collation" type="pinyin">Pinyin sorrend</type>
-			<type key="collation" type="reformed">Átalakított rendezési elv</type>
 			<type key="collation" type="search">Általános célú keresés</type>
 			<type key="collation" type="searchjl" draft="contributed">Keresés hangul kezdő mássalhangzó szerint</type>
 			<type key="collation" type="standard">Normál rendezési sorrend</type>
@@ -2356,9 +2355,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} idő</regionFormat>
 			<regionFormat type="daylight">{0} nyári idő</regionFormat>
 			<regionFormat type="standard">{0} zónaidő</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>koordinált világidő</standard>
@@ -2391,9 +2387,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Bécs</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Sarajevo">
 				<exemplarCity>Szarajevó</exemplarCity>
 			</zone>
@@ -2839,18 +2832,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar es-Salaam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ungvár</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kijev</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Szimferopol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizzsja</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Midway-szigetek</exemplarCity>
 			</zone>
@@ -3472,11 +3459,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Macaui nyári idő</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>macquarie-szigeti téli idő</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>magadáni idő</generic>
@@ -3516,13 +3498,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>mawsoni idő</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>északnyugat-mexikói idő</generic>
-					<standard>északnyugat-mexikói zónaidő</standard>
-					<daylight>északnyugat-mexikói nyári idő</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>mexikói csendes-óceáni idő</generic>
diff --git a/make/data/cldr/common/main/hu_HU.xml b/make/data/cldr/common/main/hu_HU.xml
index e710cd4262d..30feb772c9a 100644
--- a/make/data/cldr/common/main/hu_HU.xml
+++ b/make/data/cldr/common/main/hu_HU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/hy.xml b/make/data/cldr/common/main/hy.xml
index b3da8cbdd09..91ecf144eaf 100644
--- a/make/data/cldr/common/main/hy.xml
+++ b/make/data/cldr/common/main/hy.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2000,9 +2000,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 		</fields>
 		<timeZoneNames>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Սանտա Իզաբել</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Համաշխարհային կոորդինացված ժամանակ</standard>
@@ -2125,9 +2122,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Մելբուրն</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Քերի</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Հոբարտ</exemplarCity>
 			</zone>
@@ -2281,9 +2275,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Քրեսթոն</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Յելոունայֆ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Էդմոնտոն</exemplarCity>
 			</zone>
@@ -2302,30 +2293,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Ռեզոլյուտ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Ռեյնի Ռիվեր</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ռանկին Ինլեթ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Ատիկոկան</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Թանդեր Բեյ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Նիպիգոն</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Տորոնտո</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Իկալուիտ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Պանգնիրտանգ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Մոնկտոն</exemplarCity>
 			</zone>
@@ -3139,18 +3118,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Դար-Էս-Սալամ</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ուժգորոդ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Կիև</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Սիմֆերոպոլ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Զապոռոժյե</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Կամպալա</exemplarCity>
 			</zone>
@@ -3169,9 +3142,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Հոնոլուլու</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Ջոնսթոն</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Անքորիջ</exemplarCity>
 			</zone>
@@ -3807,11 +3777,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Լորդ Հաուի ամառային ժամանակ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Մակկուորի կղզու ժամանակ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Մագադանի ժամանակ</generic>
@@ -3851,13 +3816,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Մոուսոնի ժամանակ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Հյուսիսարևմտյան Մեքսիկայի ժամանակ</generic>
-					<standard>Հյուսիսարևմտյան Մեքսիկայի ստանդարտ ժամանակ</standard>
-					<daylight>Հյուսիսարևմտյան Մեքսիկայի ամառային ժամանակ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Մեքսիկայի խաղաղօվկիանոսյան ժամանակ</generic>
diff --git a/make/data/cldr/common/main/hy_AM.xml b/make/data/cldr/common/main/hy_AM.xml
index f17f5cb004e..57234fe8ece 100644
--- a/make/data/cldr/common/main/hy_AM.xml
+++ b/make/data/cldr/common/main/hy_AM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ia.xml b/make/data/cldr/common/main/ia.xml
index 8cb66c6c102..ce130ba71f2 100644
--- a/make/data/cldr/common/main/ia.xml
+++ b/make/data/cldr/common/main/ia.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2607,11 +2607,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>hora estive de Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>hora del Insula Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>hora de Magadan</generic>
@@ -2651,13 +2646,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>hora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>hora del nordwest de Mexico</generic>
-					<standard>hora normal del nordwest de Mexico</standard>
-					<daylight>hora estive del nordwest de Mexico</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>hora del Pacifico mexican</generic>
diff --git a/make/data/cldr/common/main/ia_001.xml b/make/data/cldr/common/main/ia_001.xml
index f38e98dad8d..54b31c5a82e 100644
--- a/make/data/cldr/common/main/ia_001.xml
+++ b/make/data/cldr/common/main/ia_001.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/id.xml b/make/data/cldr/common/main/id.xml
index 3221f9e10d0..db130766d0f 100644
--- a/make/data/cldr/common/main/id.xml
+++ b/make/data/cldr/common/main/id.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1242,7 +1242,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Aturan Pengurutan Buku Telepon</type>
 			<type key="collation" type="phonetic">Aturan Pengurutan Fonetik</type>
 			<type key="collation" type="pinyin">Aturan Pengurutan Pinyin</type>
-			<type key="collation" type="reformed">Aturan Pengurutan yang Diubah Bentuknya</type>
 			<type key="collation" type="search">Pencarian Tujuan Umum</type>
 			<type key="collation" type="searchjl">Pencarian Menurut Konsonan Awal Hangul</type>
 			<type key="collation" type="standard">Aturan Pengurutan Standar</type>
@@ -2820,9 +2819,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Waktu {0}</regionFormat>
 			<regionFormat type="daylight">Waktu Musim Panas {0}</regionFormat>
 			<regionFormat type="standard">Waktu Standar {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Waktu Universal Terkoordinasi</standard>
@@ -2837,9 +2833,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wina</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="America/Costa_Rica">
 				<exemplarCity>Kosta Rika</exemplarCity>
 			</zone>
@@ -2964,15 +2957,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Damascus">
 				<exemplarCity>Damaskus</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizhia</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3612,11 +3599,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Waktu Musim Panas Makau</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Waktu Kepulauan Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Waktu Magadan</generic>
@@ -3656,13 +3638,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Waktu Meksiko Barat Laut</generic>
-					<standard>Waktu Standar Meksiko Barat Laut</standard>
-					<daylight>Waktu Musim Panas Meksiko Barat Laut</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Waktu Pasifik Meksiko</generic>
diff --git a/make/data/cldr/common/main/id_ID.xml b/make/data/cldr/common/main/id_ID.xml
index 6f1b0c04f59..83e9f6051a7 100644
--- a/make/data/cldr/common/main/id_ID.xml
+++ b/make/data/cldr/common/main/id_ID.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ie.xml b/make/data/cldr/common/main/ie.xml
index a2171c229a1..e40e8fad0c7 100644
--- a/make/data/cldr/common/main/ie.xml
+++ b/make/data/cldr/common/main/ie.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1869,15 +1869,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Cambridge_Bay">
 				<exemplarCity draft="unconfirmed">Cambridge-Bay</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity draft="unconfirmed">Rainy-River</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity draft="unconfirmed">Rankin-Inlet</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity draft="unconfirmed">Thunder-Bay</exemplarCity>
-			</zone>
 			<zone type="America/Goose_Bay">
 				<exemplarCity draft="unconfirmed">Goose-Bay</exemplarCity>
 			</zone>
@@ -2245,11 +2239,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">témpor estival del Insul Lord-Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">témpor del Insul Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Marquesas">
 				<long>
 					<standard draft="unconfirmed">témpor del Marquesas</standard>
@@ -2260,13 +2249,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">témpor del Insules Marshall</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">mexican nordwest témpor</generic>
-					<standard draft="unconfirmed">mexican nordwest standard témpor</standard>
-					<daylight draft="unconfirmed">mexican nordwest estival témpor</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">mexican pacific témpor</generic>
diff --git a/make/data/cldr/common/main/ie_EE.xml b/make/data/cldr/common/main/ie_EE.xml
index 8e986db8d87..5faf8528d1c 100644
--- a/make/data/cldr/common/main/ie_EE.xml
+++ b/make/data/cldr/common/main/ie_EE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ig.xml b/make/data/cldr/common/main/ig.xml
index 64a39d80003..4727e79a5fb 100644
--- a/make/data/cldr/common/main/ig.xml
+++ b/make/data/cldr/common/main/ig.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1965,11 +1965,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Oge Ihe Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Oge Macquarie Island</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Oge Magadan</generic>
@@ -2009,13 +2004,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Oge Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Oge Northwest Mexico</generic>
-					<standard>Oge Izugbe Northwest Mexico</standard>
-					<daylight>Oge Ihe Northwest Mexico</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Oge Mexican Pacific</generic>
diff --git a/make/data/cldr/common/main/ig_NG.xml b/make/data/cldr/common/main/ig_NG.xml
index 981d0776e01..7704ec263eb 100644
--- a/make/data/cldr/common/main/ig_NG.xml
+++ b/make/data/cldr/common/main/ig_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ii.xml b/make/data/cldr/common/main/ii.xml
index 667876e03b0..36a24a5f767 100644
--- a/make/data/cldr/common/main/ii.xml
+++ b/make/data/cldr/common/main/ii.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ii_CN.xml b/make/data/cldr/common/main/ii_CN.xml
index d2e5e59adec..478dc23f82f 100644
--- a/make/data/cldr/common/main/ii_CN.xml
+++ b/make/data/cldr/common/main/ii_CN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/io.xml b/make/data/cldr/common/main/io.xml
index 7315536f016..f960e028b81 100644
--- a/make/data/cldr/common/main/io.xml
+++ b/make/data/cldr/common/main/io.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/io_001.xml b/make/data/cldr/common/main/io_001.xml
index 4057f84f647..b7b5f851ab2 100644
--- a/make/data/cldr/common/main/io_001.xml
+++ b/make/data/cldr/common/main/io_001.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/is.xml b/make/data/cldr/common/main/is.xml
index f491c68bf8f..ef7d71d4f7f 100644
--- a/make/data/cldr/common/main/is.xml
+++ b/make/data/cldr/common/main/is.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1062,7 +1062,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Símaskráarröðun</type>
 			<type key="collation" type="phonetic">Hljóðfræðileg röð</type>
 			<type key="collation" type="pinyin">Pinyin-röðun</type>
-			<type key="collation" type="reformed">Endurbætt röð</type>
 			<type key="collation" type="search">Almenn leit</type>
 			<type key="collation" type="searchjl">Leita eftir upphafssamhljóða í Hangul</type>
 			<type key="collation" type="standard">Stöðluð röðun</type>
@@ -2445,9 +2444,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<regionFormat type="daylight">{0} (sumartími)</regionFormat>
 			<regionFormat type="standard">{0} (staðaltími)</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Samræmdur alþjóðlegur tími</standard>
@@ -2471,9 +2467,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Vín</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="America/Aruba">
 				<exemplarCity>Arúba</exemplarCity>
 			</zone>
@@ -3332,11 +3325,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Sumartími á Lord Howe-eyju</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie-eyjartími</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Tími í Magadan</generic>
@@ -3376,13 +3364,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawson-tími</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Tími í Norðvestur-Mexíkó</generic>
-					<standard>Staðaltími í Norðvestur-Mexíkó</standard>
-					<daylight>Sumartími í Norðvestur-Mexíkó</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Kyrrahafstími í Mexíkó</generic>
diff --git a/make/data/cldr/common/main/is_IS.xml b/make/data/cldr/common/main/is_IS.xml
index 463c2a0b8e0..0cec87ac20c 100644
--- a/make/data/cldr/common/main/is_IS.xml
+++ b/make/data/cldr/common/main/is_IS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/it.xml b/make/data/cldr/common/main/it.xml
index 3056b4a77f0..0dce0245bf4 100644
--- a/make/data/cldr/common/main/it.xml
+++ b/make/data/cldr/common/main/it.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1262,7 +1262,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Ordinamento Elenco telefonico</type>
 			<type key="collation" type="phonetic">Ordinamento fonetico</type>
 			<type key="collation" type="pinyin">Ordinamento pinyin</type>
-			<type key="collation" type="reformed">Ordinamento riformato</type>
 			<type key="collation" type="search">Ricerca generica</type>
 			<type key="collation" type="searchjl">Cerca per consonante hangul iniziale</type>
 			<type key="collation" type="standard">Ordinamento standard</type>
@@ -2466,9 +2465,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Ora {0}</regionFormat>
 			<regionFormat type="daylight">Ora legale: {0}</regionFormat>
 			<regionFormat type="standard">Ora standard: {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Tempo coordinato universale</standard>
@@ -2483,9 +2479,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Argentina/Tucuman">
 				<exemplarCity>Tucumán</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Dacca</exemplarCity>
 			</zone>
@@ -2750,9 +2743,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Tunis">
 				<exemplarCity>Tunisi</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
@@ -3325,11 +3315,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Ora legale di Macao</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Ora dell’Isola Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Ora di Magadan</generic>
@@ -3369,13 +3354,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ora di Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Ora del Messico nord-occidentale</generic>
-					<standard>Ora standard del Messico nord-occidentale</standard>
-					<daylight>Ora legale del Messico nord-occidentale</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Ora del Pacifico (Messico)</generic>
@@ -3756,12 +3734,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="10000" count="other">0</pattern>
 					<pattern type="100000" count="one">0</pattern>
 					<pattern type="100000" count="other">0</pattern>
-					<pattern type="1000000" count="one">0 Mio</pattern>
-					<pattern type="1000000" count="other">0 Mio</pattern>
-					<pattern type="10000000" count="one">00 Mio</pattern>
-					<pattern type="10000000" count="other">00 Mio</pattern>
-					<pattern type="100000000" count="one">000 Mio</pattern>
-					<pattern type="100000000" count="other">000 Mio</pattern>
+					<pattern type="1000000" count="one">0 Mln</pattern>
+					<pattern type="1000000" count="other">0 Mln</pattern>
+					<pattern type="10000000" count="one">00 Mln</pattern>
+					<pattern type="10000000" count="other">00 Mln</pattern>
+					<pattern type="100000000" count="one">000 Mln</pattern>
+					<pattern type="100000000" count="other">000 Mln</pattern>
 					<pattern type="1000000000" count="one">0 Mrd</pattern>
 					<pattern type="1000000000" count="other">0 Mrd</pattern>
 					<pattern type="10000000000" count="one">00 Mrd</pattern>
@@ -3791,12 +3769,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="10000" count="other">0</pattern>
 					<pattern type="100000" count="one">0</pattern>
 					<pattern type="100000" count="other">0</pattern>
-					<pattern type="1000000" count="one">0 Mio ¤</pattern>
-					<pattern type="1000000" count="other">0 Mio ¤</pattern>
-					<pattern type="10000000" count="one">00 Mio ¤</pattern>
-					<pattern type="10000000" count="other">00 Mio ¤</pattern>
-					<pattern type="100000000" count="one">000 Mio ¤</pattern>
-					<pattern type="100000000" count="other">000 Mio ¤</pattern>
+					<pattern type="1000000" count="one">0 Mln ¤</pattern>
+					<pattern type="1000000" count="other">0 Mln ¤</pattern>
+					<pattern type="10000000" count="one">00 Mln ¤</pattern>
+					<pattern type="10000000" count="other">00 Mln ¤</pattern>
+					<pattern type="100000000" count="one">000 Mln ¤</pattern>
+					<pattern type="100000000" count="other">000 Mln ¤</pattern>
 					<pattern type="1000000000" count="one">0 Mrd ¤</pattern>
 					<pattern type="1000000000" count="other">0 Mrd ¤</pattern>
 					<pattern type="10000000000" count="one">00 Mrd ¤</pattern>
diff --git a/make/data/cldr/common/main/it_CH.xml b/make/data/cldr/common/main/it_CH.xml
index de05a4d22f6..1843cd39912 100644
--- a/make/data/cldr/common/main/it_CH.xml
+++ b/make/data/cldr/common/main/it_CH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/it_IT.xml b/make/data/cldr/common/main/it_IT.xml
index 8afb7169c20..5f3342415d8 100644
--- a/make/data/cldr/common/main/it_IT.xml
+++ b/make/data/cldr/common/main/it_IT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/it_SM.xml b/make/data/cldr/common/main/it_SM.xml
index 447d74116b7..b30f7e0df51 100644
--- a/make/data/cldr/common/main/it_SM.xml
+++ b/make/data/cldr/common/main/it_SM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/it_VA.xml b/make/data/cldr/common/main/it_VA.xml
index 716bc0e0fc8..4ceb6fc0bff 100644
--- a/make/data/cldr/common/main/it_VA.xml
+++ b/make/data/cldr/common/main/it_VA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/iu.xml b/make/data/cldr/common/main/iu.xml
index 8878d2aef85..dbd87621f8c 100644
--- a/make/data/cldr/common/main/iu.xml
+++ b/make/data/cldr/common/main/iu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/iu_CA.xml b/make/data/cldr/common/main/iu_CA.xml
index e7fa1a5adb6..4e4a6931d38 100644
--- a/make/data/cldr/common/main/iu_CA.xml
+++ b/make/data/cldr/common/main/iu_CA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/iu_Latn.xml b/make/data/cldr/common/main/iu_Latn.xml
index c206d730238..51be22c08a1 100644
--- a/make/data/cldr/common/main/iu_Latn.xml
+++ b/make/data/cldr/common/main/iu_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/iu_Latn_CA.xml b/make/data/cldr/common/main/iu_Latn_CA.xml
index 5a51d0264eb..2ea5fc82a1c 100644
--- a/make/data/cldr/common/main/iu_Latn_CA.xml
+++ b/make/data/cldr/common/main/iu_Latn_CA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ja.xml b/make/data/cldr/common/main/ja.xml
index 711868e7356..7a43fd77aba 100644
--- a/make/data/cldr/common/main/ja.xml
+++ b/make/data/cldr/common/main/ja.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1287,7 +1287,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">電話帳順</type>
 			<type key="collation" type="phonetic">音声順による並べ替え</type>
 			<type key="collation" type="pinyin">ピンイン順</type>
-			<type key="collation" type="reformed">リフォーム</type>
 			<type key="collation" type="search">汎用検索</type>
 			<type key="collation" type="searchjl">ハングル語頭子音による並べ替え</type>
 			<type key="collation" type="standard">標準並べ替え順序</type>
@@ -3625,9 +3624,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">{0}夏時間</regionFormat>
 			<regionFormat type="standard">{0}標準時</regionFormat>
 			<fallbackFormat>{1}（{0}）</fallbackFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>サンタイサベル</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>協定世界時</standard>
@@ -3750,9 +3746,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>メルボルン</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>カリー</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ホバート</exemplarCity>
 			</zone>
@@ -3906,9 +3899,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>クレストン</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>イエローナイフ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>エドモントン</exemplarCity>
 			</zone>
@@ -3927,30 +3917,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>レゾリュート</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>レイニーリバー</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ランキンインレット</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>アティコカン</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>サンダーベイ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ニピゴン</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>トロント</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>イカルイット</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>パンナータング</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>モンクトン</exemplarCity>
 			</zone>
@@ -4764,18 +4742,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ダルエスサラーム</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ウージュホロド</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>キーウ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>シンフェロポリ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ザポリージャ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>カンパラ</exemplarCity>
 			</zone>
@@ -4794,9 +4766,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ホノルル</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ジョンストン島</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>アンカレッジ</exemplarCity>
 			</zone>
@@ -5501,11 +5470,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>マカオ夏時間</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>マッコーリー島時間</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>マガダン時間</generic>
@@ -5545,13 +5509,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>モーソン基地時間</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>メキシコ北西部時間</generic>
-					<standard>メキシコ北西部標準時</standard>
-					<daylight>メキシコ北西部夏時間</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>メキシコ太平洋時間</generic>
diff --git a/make/data/cldr/common/main/ja_JP.xml b/make/data/cldr/common/main/ja_JP.xml
index fa5dd2e0715..d6254b095db 100644
--- a/make/data/cldr/common/main/ja_JP.xml
+++ b/make/data/cldr/common/main/ja_JP.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/jbo.xml b/make/data/cldr/common/main/jbo.xml
index c3a346d762c..6f1a7601a5c 100644
--- a/make/data/cldr/common/main/jbo.xml
+++ b/make/data/cldr/common/main/jbo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/jbo_001.xml b/make/data/cldr/common/main/jbo_001.xml
index 53bfbc897c3..ad6bd6ce3f9 100644
--- a/make/data/cldr/common/main/jbo_001.xml
+++ b/make/data/cldr/common/main/jbo_001.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/jgo.xml b/make/data/cldr/common/main/jgo.xml
index f59811848c6..8fb4a321436 100644
--- a/make/data/cldr/common/main/jgo.xml
+++ b/make/data/cldr/common/main/jgo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/jgo_CM.xml b/make/data/cldr/common/main/jgo_CM.xml
index c52e5776daa..28bcebccf52 100644
--- a/make/data/cldr/common/main/jgo_CM.xml
+++ b/make/data/cldr/common/main/jgo_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/jmc.xml b/make/data/cldr/common/main/jmc.xml
index 3fa938326e5..d6f948f0e39 100644
--- a/make/data/cldr/common/main/jmc.xml
+++ b/make/data/cldr/common/main/jmc.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/jmc_TZ.xml b/make/data/cldr/common/main/jmc_TZ.xml
index ca2a45bd09f..b0748810276 100644
--- a/make/data/cldr/common/main/jmc_TZ.xml
+++ b/make/data/cldr/common/main/jmc_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/jv.xml b/make/data/cldr/common/main/jv.xml
index b88d100392c..23fc8fdb8be 100644
--- a/make/data/cldr/common/main/jv.xml
+++ b/make/data/cldr/common/main/jv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1827,9 +1827,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Cordoba">
 				<exemplarCity>Kordoba</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Santa Barthelemy</exemplarCity>
 			</zone>
@@ -1851,12 +1848,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Cambridge_Bay">
 				<exemplarCity>Teluk Cambridge</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Kali Rainy</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Teluk Gludhug</exemplarCity>
-			</zone>
 			<zone type="America/Halifax">
 				<exemplarCity>Halifak</exemplarCity>
 			</zone>
@@ -2562,11 +2553,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Wektu Ketigo Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Wektu Pulo Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Wektu Magadan</generic>
@@ -2606,13 +2592,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Wektu Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Wektu Meksiko Lor-Kulon</generic>
-					<standard>Wektu Standar Meksiko Lor-Kulon</standard>
-					<daylight>Wektu Ketigo Meksiko Lor-Kulon</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Wektu Pasifik Meksiko</generic>
diff --git a/make/data/cldr/common/main/jv_ID.xml b/make/data/cldr/common/main/jv_ID.xml
index 7888dba6d9d..95d195ca0fe 100644
--- a/make/data/cldr/common/main/jv_ID.xml
+++ b/make/data/cldr/common/main/jv_ID.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ka.xml b/make/data/cldr/common/main/ka.xml
index 0b03ecb2529..1d6f9f3d17d 100644
--- a/make/data/cldr/common/main/ka.xml
+++ b/make/data/cldr/common/main/ka.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2109,9 +2109,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>დრო: {0}</regionFormat>
 			<regionFormat type="daylight">{0} ზაფხულის დრო</regionFormat>
 			<regionFormat type="standard">{0} სტანდარტული დრო</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>სანტა ისაბელი</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>მსოფლიო კოორდინირებული დრო</standard>
@@ -2234,9 +2231,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>მელბურნი</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ქური</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ჰობარტი</exemplarCity>
 			</zone>
@@ -2390,9 +2384,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>კრესტონი</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>იელოუნაიფი</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ედმონტონი</exemplarCity>
 			</zone>
@@ -2411,30 +2402,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>რეზოლუტე</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>რეინი რივერი</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>რენკინ ინლეტი</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ატიკოკანი</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>თანდერ ბეი</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ნიპიგონი</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ტორონტო</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>იქალუიტი</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>პანგნირტუნგი</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>მონქტონი</exemplarCity>
 			</zone>
@@ -3248,18 +3227,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>დარ-ეს-სალამი</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>უჟგოროდი</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>კიევი</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>სიმფეროპოლი</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ზაპოროჟიე</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>კამპალა</exemplarCity>
 			</zone>
@@ -3278,9 +3251,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ჰონოლულუ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ჯონსტონი</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ენქორაჯი</exemplarCity>
 			</zone>
@@ -3916,11 +3886,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>ლორდ-ჰაუს ზაფხულის დრო</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>მაქკუორის კუნძულის დრო</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>მაგადანის დრო</generic>
@@ -3960,13 +3925,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>მოუსონის დრო</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>ჩრდილო-აღმოსავლეთ მექსიკის დრო</generic>
-					<standard>ჩრდილო-დასავლეთ მექსიკის დრო</standard>
-					<daylight>ჩრდილო-დასავლეთ მექსიკის ზაფხულის დრო</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>მექსიკის წყნარი ოკეანის დრო</generic>
diff --git a/make/data/cldr/common/main/ka_GE.xml b/make/data/cldr/common/main/ka_GE.xml
index a6ce75a1049..513b88d0fec 100644
--- a/make/data/cldr/common/main/ka_GE.xml
+++ b/make/data/cldr/common/main/ka_GE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kab.xml b/make/data/cldr/common/main/kab.xml
index afb43b18870..3ea9ec2647c 100644
--- a/make/data/cldr/common/main/kab.xml
+++ b/make/data/cldr/common/main/kab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2013,9 +2013,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity draft="unconfirmed">Malburn</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity draft="unconfirmed">Currie</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity draft="unconfirmed">Sidni</exemplarCity>
 			</zone>
@@ -3101,11 +3098,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">Akud n Unebdu n Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">Akud n Markari</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="unconfirmed">Akud n Magadan</generic>
@@ -3145,13 +3137,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">Akud n Mawsun</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">Akud n ugafa amalu n Miksik</generic>
-					<standard draft="unconfirmed">Akud amezday n ugafa amalu n Miksik</standard>
-					<daylight draft="unconfirmed">Akud n unebdu n ugafa amalu n Miksik</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">Akud amelwi n Miksik</generic>
diff --git a/make/data/cldr/common/main/kab_DZ.xml b/make/data/cldr/common/main/kab_DZ.xml
index 5e66bcc2d06..9c5e9f6f9c1 100644
--- a/make/data/cldr/common/main/kab_DZ.xml
+++ b/make/data/cldr/common/main/kab_DZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kaj.xml b/make/data/cldr/common/main/kaj.xml
index 188cc0683c2..dd2f2d48a3b 100644
--- a/make/data/cldr/common/main/kaj.xml
+++ b/make/data/cldr/common/main/kaj.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kaj_NG.xml b/make/data/cldr/common/main/kaj_NG.xml
index 7c0b4540f6e..446af581cde 100644
--- a/make/data/cldr/common/main/kaj_NG.xml
+++ b/make/data/cldr/common/main/kaj_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kam.xml b/make/data/cldr/common/main/kam.xml
index 9c3a2a56b00..655615f74d0 100644
--- a/make/data/cldr/common/main/kam.xml
+++ b/make/data/cldr/common/main/kam.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kam_KE.xml b/make/data/cldr/common/main/kam_KE.xml
index aefe5a4576b..f77693e6a7d 100644
--- a/make/data/cldr/common/main/kam_KE.xml
+++ b/make/data/cldr/common/main/kam_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kcg.xml b/make/data/cldr/common/main/kcg.xml
index 77dd7ef0930..c5ac5715b48 100644
--- a/make/data/cldr/common/main/kcg.xml
+++ b/make/data/cldr/common/main/kcg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kcg_NG.xml b/make/data/cldr/common/main/kcg_NG.xml
index a9fe0f9c2b8..354b2ab3b37 100644
--- a/make/data/cldr/common/main/kcg_NG.xml
+++ b/make/data/cldr/common/main/kcg_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kde.xml b/make/data/cldr/common/main/kde.xml
index af759fb88c7..fb03f22a83d 100644
--- a/make/data/cldr/common/main/kde.xml
+++ b/make/data/cldr/common/main/kde.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kde_TZ.xml b/make/data/cldr/common/main/kde_TZ.xml
index 5c9ef9697a0..ae70dc44043 100644
--- a/make/data/cldr/common/main/kde_TZ.xml
+++ b/make/data/cldr/common/main/kde_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kea.xml b/make/data/cldr/common/main/kea.xml
index 048b61a318f..04bcbe2209f 100644
--- a/make/data/cldr/common/main/kea.xml
+++ b/make/data/cldr/common/main/kea.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1872,13 +1872,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Ora di Veron di Avaí i Aleutas</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Ora di Noroesti di Méxiku</generic>
-					<standard>Ora Padron di Noroesti di Méxiku</standard>
-					<daylight>Ora di Veron di Noroesti di Méxiku</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Ora di Pasífiku Mexikanu</generic>
diff --git a/make/data/cldr/common/main/kea_CV.xml b/make/data/cldr/common/main/kea_CV.xml
index d089484b892..59bcc9a2ad2 100644
--- a/make/data/cldr/common/main/kea_CV.xml
+++ b/make/data/cldr/common/main/kea_CV.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ken.xml b/make/data/cldr/common/main/ken.xml
index 422b5d48a52..580019ec00e 100644
--- a/make/data/cldr/common/main/ken.xml
+++ b/make/data/cldr/common/main/ken.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ken_CM.xml b/make/data/cldr/common/main/ken_CM.xml
index e44002dbe2e..1e19cade921 100644
--- a/make/data/cldr/common/main/ken_CM.xml
+++ b/make/data/cldr/common/main/ken_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kgp.xml b/make/data/cldr/common/main/kgp.xml
index 8a53e582637..324afedcf68 100644
--- a/make/data/cldr/common/main/kgp.xml
+++ b/make/data/cldr/common/main/kgp.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1098,7 +1098,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Terefonĩ Risita to ke</type>
 			<type key="collation" type="phonetic" draft="contributed">Fonẽtika to ke kuprãg</type>
 			<type key="collation" type="pinyin">Pin-yin to nỹtĩ</type>
-			<type key="collation" type="reformed">Hár tãg nỹtĩ</type>
 			<type key="collation" type="search">Jẽnfĩn to ke Kar</type>
 			<type key="collation" type="searchjl" draft="contributed">Hangul kãsonỹte ve jãnfĩn</type>
 			<type key="collation" type="standard">to ke pẽ</type>
@@ -2262,9 +2261,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Óra kar {0}</regionFormat>
 			<regionFormat type="daylight">Prỹg kã óra kar {0}</regionFormat>
 			<regionFormat type="standard">Óra pẽ {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Sỹta Isamé</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Ga-kar Óra Vẽnh-krén-ja</standard>
@@ -2381,9 +2377,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Mẽrmurnĩ</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kurije</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Homarti</exemplarCity>
 			</zone>
@@ -2537,9 +2530,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Krésitãn</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Rógro Mỹrér</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Enimãntã</exemplarCity>
 			</zone>
@@ -2558,30 +2548,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Rijorute</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Tamumã Goj</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Rỹgkĩg Ĩrén</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Atikokỹn</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tũnner Mej</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nĩpigãn</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Torãto</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikarujin</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pỹgnĩrtũg</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Mãgtãn</exemplarCity>
 			</zone>
@@ -3365,18 +3343,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Nar Enh Sarỹm</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ungoron</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kijévi</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Sĩgfiripor</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Japorisija</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kãmpara</exemplarCity>
 			</zone>
@@ -3395,9 +3367,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honãruru</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Nhionhtãn</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ỹkoragi</exemplarCity>
 			</zone>
@@ -4104,11 +4073,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Rỹ kã óra Mỹkav tá</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Óra Mỹkikuari Goj-vẽso tá</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Óra Mỹganan tá</generic>
@@ -4148,13 +4112,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Óra Mỹusãn tá</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Óra Mẽsiku Nãrti-Rãpur tá</generic>
-					<standard>Óra Pã Mẽsiku Nãrti-Rãpur tá</standard>
-					<daylight>Rỹ Kã óra Mẽsiku Nãrti-Rãpur tá</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Óra Mẽsiku Pasifiku tá</generic>
diff --git a/make/data/cldr/common/main/kgp_BR.xml b/make/data/cldr/common/main/kgp_BR.xml
index ee475992405..af653d29fa7 100644
--- a/make/data/cldr/common/main/kgp_BR.xml
+++ b/make/data/cldr/common/main/kgp_BR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/khq.xml b/make/data/cldr/common/main/khq.xml
index d75167023cf..b06fba711b4 100644
--- a/make/data/cldr/common/main/khq.xml
+++ b/make/data/cldr/common/main/khq.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/khq_ML.xml b/make/data/cldr/common/main/khq_ML.xml
index 0eff5232416..5087d6d1fdd 100644
--- a/make/data/cldr/common/main/khq_ML.xml
+++ b/make/data/cldr/common/main/khq_ML.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ki.xml b/make/data/cldr/common/main/ki.xml
index 6585f0fe811..f129f2e46d9 100644
--- a/make/data/cldr/common/main/ki.xml
+++ b/make/data/cldr/common/main/ki.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ki_KE.xml b/make/data/cldr/common/main/ki_KE.xml
index 7cf6f1d1695..c764864fc45 100644
--- a/make/data/cldr/common/main/ki_KE.xml
+++ b/make/data/cldr/common/main/ki_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kk.xml b/make/data/cldr/common/main/kk.xml
index 5150fb0accc..ae489aaef5a 100644
--- a/make/data/cldr/common/main/kk.xml
+++ b/make/data/cldr/common/main/kk.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2389,9 +2389,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} уақыты</regionFormat>
 			<regionFormat type="daylight">{0} жазғы уақыты</regionFormat>
 			<regionFormat type="standard">{0} стандартты уақыты</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Санта-Исабель</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Дүниежүзілік үйлестірілген уақыт</standard>
@@ -2514,9 +2511,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мельбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Керри</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -2670,9 +2664,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Йеллоунайф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Эдмонтон</exemplarCity>
 			</zone>
@@ -2691,30 +2682,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Резольют</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейни-Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ранкин-Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Атикокан</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Икалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртанг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -3528,18 +3507,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар-эс-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферополь</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожье</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -3558,9 +3531,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Гонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Джонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Анкоридж</exemplarCity>
 			</zone>
@@ -4201,11 +4171,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Лорд-Хау жазғы уақыты</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Маккуори аралы уақыты</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магадан уақыты</generic>
@@ -4245,13 +4210,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Моусон уақыты</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Солтүстік-батыс Мексика уақыты</generic>
-					<standard>Солтүстік-батыс Мексика стандартты уақыты</standard>
-					<daylight>Солтүстік-батыс Мексика жазғы уақыты</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Мексика Тынық мұхит уақыты</generic>
diff --git a/make/data/cldr/common/main/kk_KZ.xml b/make/data/cldr/common/main/kk_KZ.xml
index 5bab54115df..414c04cfce2 100644
--- a/make/data/cldr/common/main/kk_KZ.xml
+++ b/make/data/cldr/common/main/kk_KZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kkj.xml b/make/data/cldr/common/main/kkj.xml
index 793b56e869d..a99945b5c0b 100644
--- a/make/data/cldr/common/main/kkj.xml
+++ b/make/data/cldr/common/main/kkj.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kkj_CM.xml b/make/data/cldr/common/main/kkj_CM.xml
index 7b5c801a4e6..19bd6fd1d94 100644
--- a/make/data/cldr/common/main/kkj_CM.xml
+++ b/make/data/cldr/common/main/kkj_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kl.xml b/make/data/cldr/common/main/kl.xml
index c8778848f02..187beece7db 100644
--- a/make/data/cldr/common/main/kl.xml
+++ b/make/data/cldr/common/main/kl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kl_GL.xml b/make/data/cldr/common/main/kl_GL.xml
index f4e119ea34c..26a85b6f95c 100644
--- a/make/data/cldr/common/main/kl_GL.xml
+++ b/make/data/cldr/common/main/kl_GL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kln.xml b/make/data/cldr/common/main/kln.xml
index 13ddba1c162..d882d25f75e 100644
--- a/make/data/cldr/common/main/kln.xml
+++ b/make/data/cldr/common/main/kln.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kln_KE.xml b/make/data/cldr/common/main/kln_KE.xml
index 22f9e2b5ef8..1b9cc26e504 100644
--- a/make/data/cldr/common/main/kln_KE.xml
+++ b/make/data/cldr/common/main/kln_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/km.xml b/make/data/cldr/common/main/km.xml
index 7e3266de618..5d34b428948 100644
--- a/make/data/cldr/common/main/km.xml
+++ b/make/data/cldr/common/main/km.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1779,9 +1779,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>ម៉ោង​នៅ​ {0}</regionFormat>
 			<regionFormat type="daylight">ម៉ោង​ពេល​ថ្ងៃ​នៅ​ {0}</regionFormat>
 			<regionFormat type="standard">ម៉ោង​ស្តង់ដារ​នៅ ​{0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>សាន់តាអ៊ីសាប៊ែល</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>ម៉ោងសកលដែលមានការសម្រួល</standard>
@@ -1904,9 +1901,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ម៉េលប៊ន</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ខូរៀ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ហូបាត</exemplarCity>
 			</zone>
@@ -2060,9 +2054,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ក្រេស្តុន</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>យេឡូណៃ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>អែតម៉ុងតុង</exemplarCity>
 			</zone>
@@ -2081,30 +2072,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>រ៉េ​ស៊ូឡូត</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>រ៉េនីរីវើ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>រ៉ាន់ឃីន​អ៊ីនឡិត</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>អាទីកូកាន</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>សាន់ដឺ​បេ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>នីពីកុន</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>តូរ៉ុនតូ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>អ៊ីកាឡូអ៊ីត</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ប៉ាងនីទុង</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ម៉ុងតុន</exemplarCity>
 			</zone>
@@ -2918,18 +2897,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ដាអ៊ីសាឡាំ</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>អ៊ុយហ្គោរ៉ូដ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>កៀវ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ស៊ីមហ្វើរ៉ុប៉ូល</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ហ្សាប៉ូរ៉ូហ្ស៊ីយ៉េ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>កំប៉ាឡា</exemplarCity>
 			</zone>
@@ -2948,9 +2921,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ហូណូលូលូ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ចនស្តុន</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>អង់ចូរ៉ាក</exemplarCity>
 			</zone>
@@ -3586,11 +3556,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>ម៉ោង​ពេល​ថ្ងៃ​នៅ​ឡតហៅ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>ម៉ោង​នៅ​កោះ​ម៉ាកគែរី</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>ម៉ោង​នៅ​ម៉ាហ្កាដាន</generic>
@@ -3630,13 +3595,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ម៉ោង​នៅ​ម៉ៅ​សាន់</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>ម៉ោង​នៅ​ម៉ិកស៊ិកភាគពាយព្យ</generic>
-					<standard>ម៉ោង​ស្តង់ដារនៅ​ម៉ិកស៊ិកភាគពាយព្យ</standard>
-					<daylight>ម៉ោង​ពេល​ថ្ងៃ​នៅ​ម៉ិកស៊ិកភាគពាយព្យ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>ម៉ោង​នៅ​ប៉ាស៊ីហ្វិក​ម៉ិកស៊ិក</generic>
diff --git a/make/data/cldr/common/main/km_KH.xml b/make/data/cldr/common/main/km_KH.xml
index 13c1c74512c..6bcd32e45e7 100644
--- a/make/data/cldr/common/main/km_KH.xml
+++ b/make/data/cldr/common/main/km_KH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kn.xml b/make/data/cldr/common/main/kn.xml
index 7271c4da0b7..70d0994060e 100644
--- a/make/data/cldr/common/main/kn.xml
+++ b/make/data/cldr/common/main/kn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1101,7 +1101,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">ಫೋನ್‌ಬುಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
 			<type key="collation" type="phonetic">ಉಚ್ಛಾರಣಾನುರೂಪವಾಗಿ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
 			<type key="collation" type="pinyin">ಪಿನ್‌ಯಿನ್ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
-			<type key="collation" type="reformed">ಪರಿಷ್ಕೃತ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ</type>
 			<type key="collation" type="search">ಸಾಮಾನ್ಯ- ಉದ್ದೇಶ ಹುಡುಕಾಟ</type>
 			<type key="collation" type="searchjl">ಹಂಗುಲ್ ಆದ್ಯಕ್ಷರ ವ್ಯಂಜನದ ಮೂಲಕ ಹುಡುಕಿ</type>
 			<type key="collation" type="standard">ಪ್ರಮಾಣೀಕೃತ ವಿಂಗಡಣೆ ಕ್ರಮ</type>
@@ -2076,9 +2075,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} ಸಮಯ</regionFormat>
 			<regionFormat type="daylight">{0} ದಿನದ ಸಮಯ</regionFormat>
 			<regionFormat type="standard">{0} ಪ್ರಮಾಣಿತ ಸಮಯ</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>ಸಾಂತಾ ಇಸಾಬೆಲ್</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>ಸಂಘಟಿತ ಸಾರ್ವತ್ರಿಕ ಸಮಯ</standard>
@@ -2201,9 +2197,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ಮೆಲ್ಬರ್ನ್</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ಕರೀ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ಹೋಬಾರ್ಟ್‌</exemplarCity>
 			</zone>
@@ -2357,9 +2350,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ಕ್ರೆಸ್ಟನ್</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ಯೆಲ್ಲೋ‌ನೈಫ್</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ಎಡ್ಮಂಟನ್‌</exemplarCity>
 			</zone>
@@ -2378,30 +2368,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ರೆಸೊಲ್ಯೂಟ್</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ರೈನಿ ರಿವರ್</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ರಾಂಕಿನ್ ಇನ್‌ಲೆಟ್</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ಅಟಿಕೊಕಾನ್</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ಥಂಡರ್ ಬೇ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ನಿಪಿಗನ್</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ಟೊರೊಂಟೋ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ಈಕ್ವಾಲಿಟ್</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ಪಂಗ್ನೀರ್‌ಟಂಗ್</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ಮಾಂಕ್ಟನ್</exemplarCity>
 			</zone>
@@ -3215,18 +3193,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ಡಾರ್ ಎಸ್ ಸಲಾಮ್</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ಉಜ್‌ಗೊರೊದ್</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>ಕಿವ್</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ಸಿಮ್ಫೆರೋಪೋಲ್</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ಜಾಪರೀಝಿಯಾ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>ಕಂಪಾಲಾ</exemplarCity>
 			</zone>
@@ -3245,9 +3217,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ಹೊನಲುಲು</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ಜಾನ್‌ಸ್ಟನ್</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ಆಂಕರೋಜ್</exemplarCity>
 			</zone>
@@ -3945,11 +3914,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">ಮಕಾವ್ ಬೇಸಿಗೆ ಸಮಯ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>ಮ್ಯಾಕ್‌ಕ್ಯುರೈ ದ್ವೀಪ ಸಮಯ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>ಮಗಡಾನ್ ಸಮಯ</generic>
@@ -3989,13 +3953,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ಮಾವ್‌ಸನ್ ಸಮಯ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>ವಾಯವ್ಯ ಮೆಕ್ಸಿಕೊ ಸಮಯ</generic>
-					<standard>ವಾಯವ್ಯ ಮೆಕ್ಸಿಕೊ ಪ್ರಮಾಣಿತ ಸಮಯ</standard>
-					<daylight>ವಾಯವ್ಯ ಮೆಕ್ಸಿಕೊ ಹಗಲು ಸಮಯ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>ಮೆಕ್ಸಿಕನ್ ಪೆಸಿಫಿಕ್ ಸಮಯ</generic>
diff --git a/make/data/cldr/common/main/kn_IN.xml b/make/data/cldr/common/main/kn_IN.xml
index e43c47fb5aa..a1c6190e5f5 100644
--- a/make/data/cldr/common/main/kn_IN.xml
+++ b/make/data/cldr/common/main/kn_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ko.xml b/make/data/cldr/common/main/ko.xml
index b9045c2d750..a50bf67f3f8 100644
--- a/make/data/cldr/common/main/ko.xml
+++ b/make/data/cldr/common/main/ko.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1194,7 +1194,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">전화번호부순</type>
 			<type key="collation" type="phonetic">소리나는 대로 정렬 순서</type>
 			<type key="collation" type="pinyin">병음순</type>
-			<type key="collation" type="reformed">개정 정렬순</type>
 			<type key="collation" type="search">범용 검색</type>
 			<type key="collation" type="searchjl" draft="contributed">한글 자음으로 검색</type>
 			<type key="collation" type="standard">표준 정렬 순서</type>
@@ -2932,9 +2931,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">{0} 하계 표준시</regionFormat>
 			<regionFormat type="standard">{0} 표준시</regionFormat>
 			<fallbackFormat>{1}({0})</fallbackFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>산타 이사벨</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>협정 세계시</standard>
@@ -3057,9 +3053,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>멜버른</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>퀴리</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>호바트</exemplarCity>
 			</zone>
@@ -3213,9 +3206,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>크레스톤</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>옐로나이프</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>에드먼턴</exemplarCity>
 			</zone>
@@ -3234,30 +3224,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>리졸루트</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>레이니강</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>랭킹 인렛</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>코랄하버</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>선더베이</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>니피곤</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>토론토</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>이칼루이트</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>팡니르퉁</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>몽턴</exemplarCity>
 			</zone>
@@ -4071,18 +4049,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>다르에스살람</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>우주고로트</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>키예프</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>심페로폴</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>자포로지예</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>캄팔라</exemplarCity>
 			</zone>
@@ -4101,9 +4073,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>호놀룰루</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>존스톤</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>앵커리지</exemplarCity>
 			</zone>
@@ -4803,11 +4772,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>마카오 하계 표준시</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>매쿼리섬 시간</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>마가단 시간</generic>
@@ -4847,13 +4811,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>모슨 시간</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>멕시코 북서부 시간</generic>
-					<standard>멕시코 북서부 표준시</standard>
-					<daylight>멕시코 북서부 하계 표준시</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>멕시코 태평양 시간</generic>
diff --git a/make/data/cldr/common/main/ko_CN.xml b/make/data/cldr/common/main/ko_CN.xml
index 293b6c82ba5..47217db9115 100644
--- a/make/data/cldr/common/main/ko_CN.xml
+++ b/make/data/cldr/common/main/ko_CN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ko_KP.xml b/make/data/cldr/common/main/ko_KP.xml
index 3aa3e56b043..888b2928e53 100644
--- a/make/data/cldr/common/main/ko_KP.xml
+++ b/make/data/cldr/common/main/ko_KP.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ko_KR.xml b/make/data/cldr/common/main/ko_KR.xml
index 2b53ca45df1..087699e3d87 100644
--- a/make/data/cldr/common/main/ko_KR.xml
+++ b/make/data/cldr/common/main/ko_KR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kok.xml b/make/data/cldr/common/main/kok.xml
index 09a4979d066..f7dc54d0c5a 100644
--- a/make/data/cldr/common/main/kok.xml
+++ b/make/data/cldr/common/main/kok.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1837,9 +1837,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>मेलबर्न</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>क्युरी</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>होबार्ट</exemplarCity>
 			</zone>
@@ -1993,9 +1990,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>क्रेस्टोन</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>यलोक्नायफ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ऍडमोंटन</exemplarCity>
 			</zone>
@@ -2014,30 +2008,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>रिसोल्युट</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>पावसाळी न्हंय</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>रँकिन इनलॅट</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>अतिकोकॉन</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>थंडर बे</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>निपिगोन</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>टॉरंटो</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>इकालुयीट</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>पंगनिर्टुंग</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>मोंक्टॉन</exemplarCity>
 			</zone>
@@ -2851,18 +2833,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>दार इ सलाम</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>उझगोरोड</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>कीव</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>सिमफरोपोल</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>झापोरोझे</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>काम्पाला</exemplarCity>
 			</zone>
@@ -2878,9 +2854,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Nome">
 				<exemplarCity>नोमे</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>जॉन्स्टन</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ऐंकरज</exemplarCity>
 			</zone>
@@ -3519,11 +3492,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>लॉर्ड होवे डेलायट वेळ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>मॅक्वेरी आयलँड वेळ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>मगादान वेळ</generic>
@@ -3563,13 +3531,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>मॉसन वेळ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>वायव्य मेक्सिको वेळ</generic>
-					<standard>वायव्य मेक्सिको प्रमाणीत वेळ</standard>
-					<daylight>वायव्य मेक्सिको डेलायट वेळ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>मेक्सिकन प्रशांत वेळ</generic>
diff --git a/make/data/cldr/common/main/kok_IN.xml b/make/data/cldr/common/main/kok_IN.xml
index 82baeca7fff..3703cee56b6 100644
--- a/make/data/cldr/common/main/kok_IN.xml
+++ b/make/data/cldr/common/main/kok_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kpe.xml b/make/data/cldr/common/main/kpe.xml
index 18f4623a160..8bceeab6893 100644
--- a/make/data/cldr/common/main/kpe.xml
+++ b/make/data/cldr/common/main/kpe.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kpe_GN.xml b/make/data/cldr/common/main/kpe_GN.xml
index 6bf6f082de0..520baa5999f 100644
--- a/make/data/cldr/common/main/kpe_GN.xml
+++ b/make/data/cldr/common/main/kpe_GN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kpe_LR.xml b/make/data/cldr/common/main/kpe_LR.xml
index c014fb185f4..cf2c35b0450 100644
--- a/make/data/cldr/common/main/kpe_LR.xml
+++ b/make/data/cldr/common/main/kpe_LR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ks.xml b/make/data/cldr/common/main/ks.xml
index 479d8703aa4..626e06c784d 100644
--- a/make/data/cldr/common/main/ks.xml
+++ b/make/data/cldr/common/main/ks.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -37,7 +37,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="arn">ایرو کونِیَن</language>
 			<language type="arp">اَراپاہو</language>
 			<language type="arw">اَراوَک</language>
-			<language type="as">اسٲمۍ</language>
+			<language type="as">اسٲمؠ</language>
 			<language type="ast">ایسٹوٗریَن</language>
 			<language type="av">اَوارِک</language>
 			<language type="awa">اَوَدی</language>
@@ -57,7 +57,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bin">بِنی</language>
 			<language type="bla">سِکسِکا</language>
 			<language type="bm">بَمبارا</language>
-			<language type="bn">بَنگٲلۍ</language>
+			<language type="bn">بَنگٲلؠ</language>
 			<language type="bo">تِبتی</language>
 			<language type="br">بریٹَن</language>
 			<language type="bra">برج</language>
@@ -113,14 +113,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="eka">ایکاجُک</language>
 			<language type="el">یوٗنٲنی</language>
 			<language type="elx">ایلامایِٹ</language>
-			<language type="en">اَنگیٖزۍ</language>
-			<language type="en_AU">آسٹریلیَن اَنگریٖزۍ</language>
-			<language type="en_CA">کینَڈِیٲیی اَنگریٖزۍ</language>
-			<language type="en_GB">بَرطانوی اَنگریٖزۍ</language>
-			<language type="en_GB" alt="short">UK اَنٛگریٖزۍ</language>
-			<language type="en_US">امریٖکی اَنٛگریٖزۍ</language>
-			<language type="en_US" alt="short">US اَنٛگریٖزۍ</language>
-			<language type="enm">وَسطی اَنگریٖزۍ</language>
+			<language type="en">اَنگیٖزؠ</language>
+			<language type="en_AU">آسٹریلیَن اَنگریٖزؠ</language>
+			<language type="en_CA">کینَڈِیٲیی اَنگریٖزؠ</language>
+			<language type="en_GB">بَرطانوی اَنگریٖزؠ</language>
+			<language type="en_GB" alt="short">UK اَنٛگریٖزؠ</language>
+			<language type="en_US">امریٖکی اَنٛگریٖزؠ</language>
+			<language type="en_US" alt="short">US اَنٛگریٖزؠ</language>
+			<language type="enm">وَسطی اَنگریٖزؠ</language>
 			<language type="eo">ایسپَرینٹو</language>
 			<language type="es">ہسپانوی</language>
 			<language type="es_419">لاطیٖنی امریٖکی ہسپانوی</language>
@@ -170,7 +170,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ha">ہاوسا</language>
 			<language type="hai">ہَیدا</language>
 			<language type="haw">ہوایِیَن</language>
-			<language type="he">عبرٲنۍ</language>
+			<language type="he">عبرٲنؠ</language>
 			<language type="hi">ہِندی</language>
 			<language type="hil">ہِلیٖگینَن</language>
 			<language type="hit">ہِتایِت</language>
@@ -196,7 +196,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="is">آیِسلینڈِک</language>
 			<language type="it">اِطالوی</language>
 			<language type="iu">اِنُکتِتوٗ</language>
-			<language type="ja">جاپٲنۍ</language>
+			<language type="ja">جاپٲنؠ</language>
 			<language type="jbo">لوجبان</language>
 			<language type="jpr">جوڈیو فارسی</language>
 			<language type="jrb">جوڈیو عربی</language>
@@ -278,7 +278,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mni">مَنیپوٗری</language>
 			<language type="moh">موہاک</language>
 			<language type="mos">موسی</language>
-			<language type="mr">مَرٲٹھۍ</language>
+			<language type="mr">مَرٲٹھؠ</language>
 			<language type="ms">مَلَے</language>
 			<language type="mt">مَلتیٖس</language>
 			<language type="mul">واریاہ زبان</language>
@@ -292,7 +292,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="nb">ناروییَن بوکمال</language>
 			<language type="nd">شُمال ڈَبیل</language>
 			<language type="nds">بۆنِم جٔرمَن</language>
-			<language type="ne">نیپٲلۍ</language>
+			<language type="ne">نیپٲلؠ</language>
 			<language type="new">نیواری</language>
 			<language type="ng">ڈونگا</language>
 			<language type="nia">نِیاس</language>
@@ -320,7 +320,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="os">اۆسیٹِک</language>
 			<language type="osa">اۆسیج</language>
 			<language type="ota">اوٹومَن تُرکِش</language>
-			<language type="pa">پَنجٲبۍ</language>
+			<language type="pa">پَنجٲبؠ</language>
 			<language type="pag">پَنگاسِنَن</language>
 			<language type="pal">پَہلَوی</language>
 			<language type="pam">پَمپَنگا</language>
@@ -337,7 +337,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pt_BR">برازیٖلی پُرتَگیٖز</language>
 			<language type="pt_PT">یوٗرپی پُرتَگیٖز</language>
 			<language type="qu">کُویشُوا</language>
-			<language type="raj">راجِستھٲنۍ</language>
+			<language type="raj">راجِستھٲنؠ</language>
 			<language type="rap">رَپانوی</language>
 			<language type="rar">رَروٹونگَن</language>
 			<language type="rm">رومانش</language>
@@ -423,7 +423,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="uga">اُگارتِک</language>
 			<language type="uk">یوٗکرینیٲیی</language>
 			<language type="umb">یُمبُندوٗ</language>
-			<language type="und">اَنزٲنۍ یا نَہ لَگہٕہار زبان</language>
+			<language type="und">اَنزٲنؠ یا نَہ لَگہٕہار زبان</language>
 			<language type="ur">اُردوٗ</language>
 			<language type="uz">اُزبیک</language>
 			<language type="vai">واے</language>
@@ -463,7 +463,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Avst">اَویستَن</script>
 			<script type="Bali">بالَنیٖز</script>
 			<script type="Batk">باتَک</script>
-			<script type="Beng">بینگٲلۍ</script>
+			<script type="Beng">بینگٲلؠ</script>
 			<script type="Blis">بِلِس سِمبلز</script>
 			<script type="Bopo">بوپوموفو</script>
 			<script type="Brah">براہمی</script>
@@ -491,13 +491,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<script type="Goth">گوتھِک</script>
 			<script type="Grek">گرَنتھا</script>
 			<script type="Gujr">گریٖک</script>
-			<script type="Guru">گُجرٲتۍ</script>
+			<script type="Guru">گُجرٲتؠ</script>
 			<script type="Hang">ہانگُل</script>
 			<script type="Hani">ہان</script>
 			<script type="Hano">ہانُنوٗ</script>
-			<script type="Hans">سَہل ﴿ترجمع اِشارٕ: یِم ورژن رَسم الخط ہُک ناؤ چھُ چیٖنی باپتھ زَبانٕ ناؤ کِس مجموعَس سٕتۍ اِستعمال یِوان کرنٕہ۔﴾</script>
+			<script type="Hans">سَہل ﴿ترجمع اِشارٕ: یِم ورژن رَسم الخط ہُک ناؤ چھُ چیٖنی باپتھ زَبانٕ ناؤ کِس مجموعَس سٕتؠ اِستعمال یِوان کرنٕہ۔﴾</script>
 			<script type="Hans" alt="stand-alone">سَہل ہان ﴿ترجمع اِشارٕ: یِم ورژن رَسم الخط ہُک ناؤ چھُ چیٖنی باپتھ زَبانٕ ناؤ کِس مجموعَس بغٲرٕ الگ اِستعمال یِوان کرنٕہ۔﴾</script>
-			<script type="Hant">رِوٲجی ﴿ترجمع اِشارٕ: یِم ورژن رَسم الخط ہُک ناؤ چھُ چیٖنی باپتھ زَبانٕ ناؤ کِس مجموعَس سٕتۍ اِستعمال یِوان کرنٕہ۔﴾</script>
+			<script type="Hant">رِوٲجی ﴿ترجمع اِشارٕ: یِم ورژن رَسم الخط ہُک ناؤ چھُ چیٖنی باپتھ زَبانٕ ناؤ کِس مجموعَس سٕتؠ اِستعمال یِوان کرنٕہ۔﴾</script>
 			<script type="Hant" alt="stand-alone">رِوٲجی ہان ﴿ترجمع اِشارٕ: یِم ورژن رَسم الخط ہُک ناؤ چھُ چیٖنی باپتھ زَبانٕ ناؤ کِس مجموعَس بغٲرٕ الگ اِستعمال یِوان کرنٕہ۔﴾</script>
 			<script type="Hebr">ہِبرِو</script>
 			<script type="Hira">ہیٖراگانا</script>
@@ -728,7 +728,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IL">اسرا ییل</territory>
 			<territory type="IM">آیِل آف مین</territory>
 			<territory type="IN">ہِندوستان</territory>
-			<territory type="IO" draft="provisional">برطانوی بحرِ ہِندۍ علاقہٕ</territory>
+			<territory type="IO" draft="provisional">برطانوی بحرِ ہِندؠ علاقہٕ</territory>
 			<territory type="IQ">ایٖراق</territory>
 			<territory type="IR">ایٖران</territory>
 			<territory type="IS">اَیِسلینڑ</territory>
@@ -804,7 +804,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="PK">پاکِستان</territory>
 			<territory type="PL">پولینڈ</territory>
 			<territory type="PM">سینٹ پیٖری تہٕ موکیلِیَن</territory>
-			<territory type="PN">پِٹکیرٕنۍ جٔزیٖرٕ</territory>
+			<territory type="PN">پِٹکیرٕنؠ جٔزیٖرٕ</territory>
 			<territory type="PR">پٔرٹو رِکو</territory>
 			<territory type="PS">فلسطینی علاقٕہ</territory>
 			<territory type="PS" alt="short">فلسطین</territory>
@@ -890,22 +890,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<variant type="1606NICT">بعد وَقت وَسطی فرانس پؠٹھ ۱۶٠۶ تام</variant>
 			<variant type="AREVELA">مَشرِقی اَمریٖکا</variant>
 			<variant type="BAKU1926">جٔمع کٔرِتھ تُرکی لاطیٖنی اَچھر</variant>
-			<variant type="BISKE">سین جارجِیو/بِلا بوٗلۍ</variant>
+			<variant type="BISKE">سین جارجِیو/بِلا بوٗلؠ</variant>
 			<variant type="FONIPA">آوازیات</variant>
 			<variant type="FONUPA">یوٗ پی اے آوازِیات</variant>
-			<variant type="LIPAW">روٗسی زَبانہِ ہِنز لِپوواز بوٗلۍ</variant>
+			<variant type="LIPAW">روٗسی زَبانہِ ہِنز لِپوواز بوٗلؠ</variant>
 			<variant type="MONOTON">اَکٔے لہجہٕ واجؠن زَبان</variant>
-			<variant type="NEDIS">نؠٹِسون بوٗلۍ</variant>
-			<variant type="NJIVA">نیجِوا بوٗلۍ</variant>
-			<variant type="OSOJS">اُشیکو/اوسوجین بوٗلۍ</variant>
+			<variant type="NEDIS">نؠٹِسون بوٗلؠ</variant>
+			<variant type="NJIVA">نیجِوا بوٗلؠ</variant>
+			<variant type="OSOJS">اُشیکو/اوسوجین بوٗلؠ</variant>
 			<variant type="POLYTON">واریاہ لہجہٕ واجؠن زَبان</variant>
 			<variant type="POSIX">کَمپیوٗٹَر</variant>
 			<variant type="REVISED">دُبارٕ دۄہراونہٕ آمُت عِلمہِ ہِجا</variant>
 			<variant type="ROZAJ">روٗسی</variant>
 			<variant type="SAAHO">سوہو</variant>
-			<variant type="SCOTLAND">سُکاٹِش مَیعٲری اَنگریٖزۍ</variant>
+			<variant type="SCOTLAND">سُکاٹِش مَیعٲری اَنگریٖزؠ</variant>
 			<variant type="SCOUSE">سِکوس</variant>
-			<variant type="SOLBA">ثٹولوِزا/سولبِکا بوٗلۍ</variant>
+			<variant type="SOLBA">ثٹولوِزا/سولبِکا بوٗلؠ</variant>
 			<variant type="TARASK">تاراسکیٖوِکا علمہ ہِجاِ</variant>
 		</variants>
 		<keys>
@@ -921,7 +921,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="islamic" draft="provisional">اِسلٲمی کیلنڑَر</type>
 			<type key="calendar" type="islamic-civil" draft="provisional">اِسلٲمی اِجتمٲیی کیلنڑَر</type>
 			<type key="calendar" type="iso8601">ISO-8601 کیلنڈر</type>
-			<type key="calendar" type="japanese">جاپٲنۍ کیلنڑَر</type>
+			<type key="calendar" type="japanese">جاپٲنؠ کیلنڑَر</type>
 			<type key="calendar" type="roc">جموٗریٲتی چیٖنی کیلَنڑَر</type>
 			<type key="collation" type="big5han">رؠوٲتی چیٖنی تِرتیٖب</type>
 			<type key="collation" type="phonebook">فون بُک تَرتیٖب</type>
@@ -951,7 +951,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</orientation>
 	</layout>
 	<characters>
-		<exemplarCharacters>[ء آ أ ٲ ؤ ا ب پ ت ث ٹ ج چ ح خ د ذ ڈ ر ز ڑ ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں ھ ہ و ۄ ۆ ی ۍ ؠ ے]</exemplarCharacters>
+		<exemplarCharacters>[ء آ أ ٲ ؤ ا ب پ ت ث ٹ ج چ ح خ د ذ ڈ ر ز ڑ ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں ھ ہ و ۄ ۆ ی ؠ ے]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[\u200E\u200F َ ُ ِ ٔ ٕ ٟ ٖ ٗ ئ]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\u200E \- ‑ , ٫ ٬ . % ‰ + 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]</exemplarCharacters>
 		<exemplarCharacters type="punctuation" draft="contributed">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
@@ -989,7 +989,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{0} پٮ۪ٹھۍ {1}</pattern>
+							<pattern>{0} پٮ۪ٹھؠ {1}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
@@ -997,7 +997,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{0} پٮ۪ٹھۍ {1}</pattern>
+							<pattern>{0} پٮ۪ٹھؠ {1}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1338,7 +1338,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{0} پٮ۪ٹھۍ {1}</pattern>
+							<pattern>{0} پٮ۪ٹھؠ {1}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
@@ -1346,7 +1346,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{0} پٮ۪ٹھۍ {1}</pattern>
+							<pattern>{0} پٮ۪ٹھؠ {1}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1523,9 +1523,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="month">
 				<displayName>رؠتھ</displayName>
-				<relative type="-1">پٔتِم ریتھۍ</relative>
-				<relative type="0">یٕہ ریتھۍ</relative>
-				<relative type="1">نو ریتھۍ</relative>
+				<relative type="-1">پٔتِم ریتھؠ</relative>
+				<relative type="0">یٕہ ریتھؠ</relative>
+				<relative type="1">نو ریتھؠ</relative>
 			</field>
 			<field type="week">
 				<displayName>ہفتہٕ</displayName>
@@ -1683,9 +1683,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>مؠلبعارن</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>کیوٗری</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>حۄبٲٹ</exemplarCity>
 			</zone>
@@ -1836,9 +1833,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>کریسٹن</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>یؠلو نایِف</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>اؠڈمَنٹَن</exemplarCity>
 			</zone>
@@ -1857,30 +1851,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>رِسولیوٗٹ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>رینی رِوَر</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>رینکِن اِنلؠٹ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>اٹی کوکنٍ</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>تھَنڈر خلیٖج</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>نِپِگَن</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ٹورونٹو</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>اِقالیوٗیِت</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>پَنگنِرٹَنگ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>مونکٹٕن</exemplarCity>
 			</zone>
@@ -2685,18 +2667,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>دارالسلام</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>اُزگورود</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>کیٖو</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>سِمفیروپول</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>زَپوروزَے</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>کَمپالا</exemplarCity>
 			</zone>
@@ -2715,9 +2691,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ہونولو لو</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>جانسٹَن</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>اَنکوراج</exemplarCity>
 			</zone>
@@ -3289,7 +3262,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Indian_Ocean">
 				<long>
-					<standard>ہِندوستٲنۍ اوشَن ٹائم</standard>
+					<standard>ہِندوستٲنؠ اوشَن ٹائم</standard>
 				</long>
 			</metazone>
 			<metazone type="Indochina">
@@ -3314,8 +3287,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Iran">
 				<long>
-					<generic>اِیٖرٲنۍ ٹایِم</generic>
-					<standard>اِیٖرٲنۍ سٹینڑاڑ ٹایِم</standard>
+					<generic>اِیٖرٲنؠ ٹایِم</generic>
+					<standard>اِیٖرٲنؠ سٹینڑاڑ ٹایِم</standard>
 					<daylight>اِیٖرٲنی سَمَر ٹایِم</daylight>
 				</long>
 			</metazone>
@@ -3335,9 +3308,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Japan">
 				<long>
-					<generic>جاپٲنۍ ٹایِم</generic>
-					<standard>جاپٲنۍ سٹینڈرڈ ٹایِم</standard>
-					<daylight>جاپٲنۍ ڑےلایِٔٹ ٹایِم</daylight>
+					<generic>جاپٲنؠ ٹایِم</generic>
+					<standard>جاپٲنؠ سٹینڈرڈ ٹایِم</standard>
+					<daylight>جاپٲنؠ ڑےلایِٔٹ ٹایِم</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kamchatka">
@@ -3444,13 +3417,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ماسَن ٹایِم</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>شُمال مغربی میکسیکو ٹائم</generic>
-					<standard>شُمال مغربی میکسیکو سٹینڈرڈ ٹائم</standard>
-					<daylight>شُمال مغربی میکسیکو ڈے لائٹ ٹائم</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>میکسیکن پیسیفک ٹائم</generic>
@@ -3484,7 +3450,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Nepal">
 				<long>
-					<standard>نؠپٲلۍ ٹایِم</standard>
+					<standard>نؠپٲلؠ ٹایِم</standard>
 				</long>
 			</metazone>
 			<metazone type="New_Caledonia">
@@ -4114,10 +4080,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>اِزرٲیِلی پاونڑ</displayName>
 			</currency>
 			<currency type="ILS">
-				<displayName>اِزرٲیِلی نٔوۍ شؠقٕل</displayName>
+				<displayName>اِزرٲیِلی نٔوؠ شؠقٕل</displayName>
 			</currency>
 			<currency type="INR">
-				<displayName>ہِندُستٲنۍ رۄپَے</displayName>
+				<displayName>ہِندُستٲنؠ رۄپَے</displayName>
 			</currency>
 			<currency type="IQD">
 				<displayName>ایٖراقُک دیٖنار</displayName>
@@ -4324,7 +4290,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>پھِلِپایِٔن پؠسو</displayName>
 			</currency>
 			<currency type="PKR">
-				<displayName>پاکِستٲنۍ رۄپَے</displayName>
+				<displayName>پاکِستٲنؠ رۄپَے</displayName>
 			</currency>
 			<currency type="PLN">
 				<displayName>پولِش زلوٹی</displayName>
diff --git a/make/data/cldr/common/main/ks_Arab.xml b/make/data/cldr/common/main/ks_Arab.xml
index 4b51c1b6075..2a340e770c1 100644
--- a/make/data/cldr/common/main/ks_Arab.xml
+++ b/make/data/cldr/common/main/ks_Arab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ks_Arab_IN.xml b/make/data/cldr/common/main/ks_Arab_IN.xml
index 383884fe755..6edd11a8d28 100644
--- a/make/data/cldr/common/main/ks_Arab_IN.xml
+++ b/make/data/cldr/common/main/ks_Arab_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ks_Deva.xml b/make/data/cldr/common/main/ks_Deva.xml
index a505f877ff1..9c7a3804207 100644
--- a/make/data/cldr/common/main/ks_Deva.xml
+++ b/make/data/cldr/common/main/ks_Deva.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ks_Deva_IN.xml b/make/data/cldr/common/main/ks_Deva_IN.xml
index 6c84915c0e7..4227f7302fc 100644
--- a/make/data/cldr/common/main/ks_Deva_IN.xml
+++ b/make/data/cldr/common/main/ks_Deva_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ksb.xml b/make/data/cldr/common/main/ksb.xml
index db35fd872d9..f2df1369f13 100644
--- a/make/data/cldr/common/main/ksb.xml
+++ b/make/data/cldr/common/main/ksb.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ksb_TZ.xml b/make/data/cldr/common/main/ksb_TZ.xml
index 9f90a8eba63..da76ac63cf1 100644
--- a/make/data/cldr/common/main/ksb_TZ.xml
+++ b/make/data/cldr/common/main/ksb_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ksf.xml b/make/data/cldr/common/main/ksf.xml
index e864e5aa9c2..4b0c73375eb 100644
--- a/make/data/cldr/common/main/ksf.xml
+++ b/make/data/cldr/common/main/ksf.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ksf_CM.xml b/make/data/cldr/common/main/ksf_CM.xml
index 095c2470c3b..08ed3a551ae 100644
--- a/make/data/cldr/common/main/ksf_CM.xml
+++ b/make/data/cldr/common/main/ksf_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ksh.xml b/make/data/cldr/common/main/ksh.xml
index a1928457fce..91c2227d0b4 100644
--- a/make/data/cldr/common/main/ksh.xml
+++ b/make/data/cldr/common/main/ksh.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1558,12 +1558,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Istanbul">
 				<exemplarCity draft="contributed">Istambul</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="contributed">Uschjorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="contributed">Saporischschja</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity draft="contributed">Honululu</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/ksh_DE.xml b/make/data/cldr/common/main/ksh_DE.xml
index fbbfae22929..b18a18bfc47 100644
--- a/make/data/cldr/common/main/ksh_DE.xml
+++ b/make/data/cldr/common/main/ksh_DE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ku.xml b/make/data/cldr/common/main/ku.xml
index eae730476ba..25b83ac71d2 100644
--- a/make/data/cldr/common/main/ku.xml
+++ b/make/data/cldr/common/main/ku.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1033,9 +1033,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y">G d'ê' MMM'a' y'an' – d'ê' MMM'a' y'an'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">G d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
-							<greatestDifference id="M">G d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
-							<greatestDifference id="y">G d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="d">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="M">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="y">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">G MMMM – MMMM y</greatestDifference>
@@ -1393,9 +1393,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="y">d'ê' MMM'a' y'an' – d'ê' MMM'a' y'an'</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
-							<greatestDifference id="M">d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
-							<greatestDifference id="y">d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="d">d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="M">d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
+							<greatestDifference id="y">d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
 							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
@@ -1991,15 +1991,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Daruselam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ujgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kîev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporojye</exemplarCity>
-			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity>Beûlah, Dakotaya Bakur</exemplarCity>
 			</zone>
@@ -2577,11 +2571,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Saeta Havînê ya Lord Howeyê</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Saeta Girava Macquarieyê</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Saeta Magadanê</generic>
@@ -2621,29 +2610,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Mawsonê</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Saeta Meksîkoya Bakurrojava</generic>
-					<standard>Saeta Standard a Meksîkoya Bakurrojava</standard>
-					<daylight>Saeta Havînê ya Meksîkoya Bakurrojava</daylight>
-				</long>
-				<short>
-					<generic draft="contributed">SMBR</generic>
-					<standard draft="contributed">SSMBR</standard>
-					<daylight draft="contributed">SHMBR</daylight>
-				</short>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Saeta Pasîfîka Meksîkayê</generic>
 					<standard>Saeta Standard a Pasîfîka Meksîkayê</standard>
 					<daylight>Saeta Havînê ya Pasîfîka Meksîkayê</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SPM</generic>
-					<standard draft="contributed">SSPM</standard>
-					<daylight draft="contributed">SHPM</daylight>
-				</short>
 			</metazone>
 			<metazone type="Mongolia">
 				<long>
@@ -2782,11 +2754,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Saeta Standard a Saint Pierre û Miquelonê</standard>
 					<daylight>Saeta Havînê ya Saint Pierre û Miquelonê</daylight>
 				</long>
-				<short>
-					<generic draft="contributed">SSPM</generic>
-					<standard draft="contributed">SSSPM</standard>
-					<daylight draft="contributed">SHSPM</daylight>
-				</short>
 			</metazone>
 			<metazone type="Pitcairn">
 				<long>
diff --git a/make/data/cldr/common/main/ku_TR.xml b/make/data/cldr/common/main/ku_TR.xml
index 73d2460200c..852a953e7a4 100644
--- a/make/data/cldr/common/main/ku_TR.xml
+++ b/make/data/cldr/common/main/ku_TR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kw.xml b/make/data/cldr/common/main/kw.xml
index 86d19c29d24..08ea8631d58 100644
--- a/make/data/cldr/common/main/kw.xml
+++ b/make/data/cldr/common/main/kw.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kw_GB.xml b/make/data/cldr/common/main/kw_GB.xml
index 03eb5bb3666..271dc8fbdfd 100644
--- a/make/data/cldr/common/main/kw_GB.xml
+++ b/make/data/cldr/common/main/kw_GB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kxv.xml b/make/data/cldr/common/main/kxv.xml
index 8682339f2dd..94057d326aa 100644
--- a/make/data/cldr/common/main/kxv.xml
+++ b/make/data/cldr/common/main/kxv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1135,9 +1135,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>kresṭon</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>yellonaip</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>eḍmonṭon</exemplarCity>
 			</zone>
@@ -1156,30 +1153,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>rejalyuṭ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>reni rivr</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>rankin inledṭ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>eṭikoken</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>tanḍr be</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>nipigen</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ṭoronṭo</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ikaluiṭ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>pangnirtung</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>monkṭon</exemplarCity>
 			</zone>
@@ -1987,18 +1972,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>dar es salaam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ujhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>kiyv</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>simperopol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>japorjye</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>kmpala</exemplarCity>
 			</zone>
@@ -2014,9 +1993,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Nome">
 				<exemplarCity>nom</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>johnsṭon</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ankoraj</exemplarCity>
 			</zone>
@@ -2652,11 +2628,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>laṛ hawe ḍelāiṭ belā</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>makwārī dīp belā</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>māgādan belā</generic>
@@ -2696,13 +2667,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>māwosn belā</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>utar weḍā kūṇpū meksik belā</generic>
-					<standard>utar weḍā kūṇpū meksik mānānka belā</standard>
-					<daylight>utar weḍā kūṇpū meksik ḍelāiṭ belā</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>meksikān pesipic belā</generic>
diff --git a/make/data/cldr/common/main/kxv_Deva.xml b/make/data/cldr/common/main/kxv_Deva.xml
index ce4fd9a0462..70a746e6a45 100644
--- a/make/data/cldr/common/main/kxv_Deva.xml
+++ b/make/data/cldr/common/main/kxv_Deva.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kxv_Deva_IN.xml b/make/data/cldr/common/main/kxv_Deva_IN.xml
index c48747ae4f3..06f9b2a11ec 100644
--- a/make/data/cldr/common/main/kxv_Deva_IN.xml
+++ b/make/data/cldr/common/main/kxv_Deva_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kxv_Latn.xml b/make/data/cldr/common/main/kxv_Latn.xml
index 80edfd74b7b..d96d9162905 100644
--- a/make/data/cldr/common/main/kxv_Latn.xml
+++ b/make/data/cldr/common/main/kxv_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kxv_Latn_IN.xml b/make/data/cldr/common/main/kxv_Latn_IN.xml
index d76e6982ae7..fb1044bcca8 100644
--- a/make/data/cldr/common/main/kxv_Latn_IN.xml
+++ b/make/data/cldr/common/main/kxv_Latn_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kxv_Orya.xml b/make/data/cldr/common/main/kxv_Orya.xml
index 2e80de7ee33..948e43892dd 100644
--- a/make/data/cldr/common/main/kxv_Orya.xml
+++ b/make/data/cldr/common/main/kxv_Orya.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kxv_Orya_IN.xml b/make/data/cldr/common/main/kxv_Orya_IN.xml
index 590073986f7..cedd119b862 100644
--- a/make/data/cldr/common/main/kxv_Orya_IN.xml
+++ b/make/data/cldr/common/main/kxv_Orya_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kxv_Telu.xml b/make/data/cldr/common/main/kxv_Telu.xml
index c7b3dd3fabe..349281b4273 100644
--- a/make/data/cldr/common/main/kxv_Telu.xml
+++ b/make/data/cldr/common/main/kxv_Telu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/kxv_Telu_IN.xml b/make/data/cldr/common/main/kxv_Telu_IN.xml
index 31c2167ca3f..efd968cf3d1 100644
--- a/make/data/cldr/common/main/kxv_Telu_IN.xml
+++ b/make/data/cldr/common/main/kxv_Telu_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ky.xml b/make/data/cldr/common/main/ky.xml
index 8c5abd4c2c2..60781875fb6 100644
--- a/make/data/cldr/common/main/ky.xml
+++ b/make/data/cldr/common/main/ky.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1954,9 +1954,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</fields>
 		<timeZoneNames>
 			<regionFormat>{0} убактысы</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Санта Изабел</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Бирдиктүү дүйнөлүк убакыт</standard>
@@ -2079,9 +2076,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мельбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Керри</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -2235,9 +2229,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Йеллоунайф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Эдмонтон</exemplarCity>
 			</zone>
@@ -2256,30 +2247,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Резолут</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейни Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Рэнкин Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Атикокан</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Сандер Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Икалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангиртуң</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -3093,18 +3072,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар эс Салаам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферополь</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожье</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -3123,9 +3096,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Гонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Жонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Анкориж</exemplarCity>
 			</zone>
@@ -3761,11 +3731,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Лорд Хау жайкы убактысы</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Макуари убактысы</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магадан убактысы</generic>
@@ -3805,13 +3770,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Моусон убактысы</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Түндүк-чыгыш Мексика убактысы</generic>
-					<standard>Түндүк-чыгыш Мексика кышкы убактысы</standard>
-					<daylight>Түндүк-чыгыш Мексика жайкы убактысы</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Мексика, Тынч океан убактысы</generic>
diff --git a/make/data/cldr/common/main/ky_KG.xml b/make/data/cldr/common/main/ky_KG.xml
index 7f70962d0f8..ec1b189c382 100644
--- a/make/data/cldr/common/main/ky_KG.xml
+++ b/make/data/cldr/common/main/ky_KG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/la.xml b/make/data/cldr/common/main/la.xml
index 186fdabaf64..ac6303dcfee 100644
--- a/make/data/cldr/common/main/la.xml
+++ b/make/data/cldr/common/main/la.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/la_VA.xml b/make/data/cldr/common/main/la_VA.xml
index c14b6ed224e..882936a2d11 100644
--- a/make/data/cldr/common/main/la_VA.xml
+++ b/make/data/cldr/common/main/la_VA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lag.xml b/make/data/cldr/common/main/lag.xml
index 2da4f1f861a..c24bb2857fe 100644
--- a/make/data/cldr/common/main/lag.xml
+++ b/make/data/cldr/common/main/lag.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lag_TZ.xml b/make/data/cldr/common/main/lag_TZ.xml
index 0f06bad908e..bbada3821da 100644
--- a/make/data/cldr/common/main/lag_TZ.xml
+++ b/make/data/cldr/common/main/lag_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lb.xml b/make/data/cldr/common/main/lb.xml
index a681ff1b741..3088a99f343 100644
--- a/make/data/cldr/common/main/lb.xml
+++ b/make/data/cldr/common/main/lb.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1128,7 +1128,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="gb2312han">Vereinfacht Chinesesch - GB2312</type>
 			<type key="collation" type="phonebook">Telefonsbuch-Zortéierung</type>
 			<type key="collation" type="pinyin">Pinyin-Zortéierregelen</type>
-			<type key="collation" type="reformed">Reforméiert Zortéierreiefolleg</type>
 			<type key="collation" type="search">Allgemeng Sich</type>
 			<type key="collation" type="searchjl">Sich no Ufanksbuschtawen aus dem koreaneschen Alphabet</type>
 			<type key="collation" type="standard">Standard Zortéierreiefolleg</type>
@@ -2342,15 +2341,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Taipei">
 				<exemplarCity>Taipeh</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uschgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiew</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Saporischschja</exemplarCity>
-			</zone>
 			<zone type="Asia/Tashkent">
 				<exemplarCity>Taschkent</exemplarCity>
 			</zone>
@@ -2887,11 +2880,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Lord-Howe-Summerzäit</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarieinsel-Zäit</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan-Zäit</generic>
@@ -2931,13 +2919,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mawson-Zäit</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Nordwest-Mexiko-Zäit</generic>
-					<standard>Nordwest-Mexiko-Normalzäit</standard>
-					<daylight>Nordwest-Mexiko-Summerzäit</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexikanesch Pazifikzäit</generic>
diff --git a/make/data/cldr/common/main/lb_LU.xml b/make/data/cldr/common/main/lb_LU.xml
index ea9fafdce7e..80db736f391 100644
--- a/make/data/cldr/common/main/lb_LU.xml
+++ b/make/data/cldr/common/main/lb_LU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lg.xml b/make/data/cldr/common/main/lg.xml
index e59e727aaf6..968e74f542d 100644
--- a/make/data/cldr/common/main/lg.xml
+++ b/make/data/cldr/common/main/lg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lg_UG.xml b/make/data/cldr/common/main/lg_UG.xml
index 9f794c81e5d..cb4923685dd 100644
--- a/make/data/cldr/common/main/lg_UG.xml
+++ b/make/data/cldr/common/main/lg_UG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lij.xml b/make/data/cldr/common/main/lij.xml
index d69c2e99c27..5ab1baa0174 100644
--- a/make/data/cldr/common/main/lij.xml
+++ b/make/data/cldr/common/main/lij.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Proper interpretation of these files requires synthesis of missing items, as per
@@ -2713,11 +2713,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="unconfirmed">oa de stæ de Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">oa de l’isoa Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="unconfirmed">oa de Magadan</generic>
@@ -2757,13 +2752,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="unconfirmed">oa de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">oa do Mescico do nòrd-ponente</generic>
-					<standard draft="unconfirmed">oa standard do Mescico do nòrd-ponente</standard>
-					<daylight draft="unconfirmed">oa de stæ do Mescico do nòrd-ponente</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">oa do Paçifico mescicaña</generic>
diff --git a/make/data/cldr/common/main/lij_IT.xml b/make/data/cldr/common/main/lij_IT.xml
index 0c7b1575aa9..4481b5e5d41 100644
--- a/make/data/cldr/common/main/lij_IT.xml
+++ b/make/data/cldr/common/main/lij_IT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Proper interpretation of these files requires synthesis of missing items, as per
diff --git a/make/data/cldr/common/main/lkt.xml b/make/data/cldr/common/main/lkt.xml
index 2f5b31006de..7dbe08b1c0d 100644
--- a/make/data/cldr/common/main/lkt.xml
+++ b/make/data/cldr/common/main/lkt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lkt_US.xml b/make/data/cldr/common/main/lkt_US.xml
index 415769eea87..4351b161d3f 100644
--- a/make/data/cldr/common/main/lkt_US.xml
+++ b/make/data/cldr/common/main/lkt_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lmo.xml b/make/data/cldr/common/main/lmo.xml
index 3ca0e5c6e1d..b50fb89c66b 100644
--- a/make/data/cldr/common/main/lmo.xml
+++ b/make/data/cldr/common/main/lmo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lmo_IT.xml b/make/data/cldr/common/main/lmo_IT.xml
index ecc417479a4..6f3d11658bc 100644
--- a/make/data/cldr/common/main/lmo_IT.xml
+++ b/make/data/cldr/common/main/lmo_IT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ln.xml b/make/data/cldr/common/main/ln.xml
index 35d08f6c23b..6f6222fad2a 100644
--- a/make/data/cldr/common/main/ln.xml
+++ b/make/data/cldr/common/main/ln.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ln_AO.xml b/make/data/cldr/common/main/ln_AO.xml
index 6b2faf65b5c..09b1c3d2ea4 100644
--- a/make/data/cldr/common/main/ln_AO.xml
+++ b/make/data/cldr/common/main/ln_AO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ln_CD.xml b/make/data/cldr/common/main/ln_CD.xml
index 38c201d1ef3..7d2f2b7ed93 100644
--- a/make/data/cldr/common/main/ln_CD.xml
+++ b/make/data/cldr/common/main/ln_CD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ln_CF.xml b/make/data/cldr/common/main/ln_CF.xml
index ebe27cdaf37..694908121f5 100644
--- a/make/data/cldr/common/main/ln_CF.xml
+++ b/make/data/cldr/common/main/ln_CF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ln_CG.xml b/make/data/cldr/common/main/ln_CG.xml
index de4c31b22e9..51c8a9a07f8 100644
--- a/make/data/cldr/common/main/ln_CG.xml
+++ b/make/data/cldr/common/main/ln_CG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lo.xml b/make/data/cldr/common/main/lo.xml
index a7dd2f4db09..4bad8dcdf54 100644
--- a/make/data/cldr/common/main/lo.xml
+++ b/make/data/cldr/common/main/lo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1157,7 +1157,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="gb2312han">ລຽງຕາມອັກສອນຈີນປະຍຸກ</type>
 			<type key="collation" type="phonebook">ລຽງຕາມສະໝຸດໂທລະສັບ</type>
 			<type key="collation" type="pinyin">ລຽງຕາມການອອກສຽງພາສາຈີນ</type>
-			<type key="collation" type="reformed">ລຽງຕາມລຳດັບສຸດທ້າຍ</type>
 			<type key="collation" type="search">ການຊອກຫາທົ່ວໄປ</type>
 			<type key="collation" type="searchjl">ຄົ້ນຫາຕາມພະຍັນຊະນະຂຶ້ນຕົ້ນທີ່ເປັນຮັງກີຣ</type>
 			<type key="collation" type="standard">ຮຽງຕາມມາດຕະຖານ</type>
@@ -2754,9 +2753,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>ເວລາ {0}</regionFormat>
 			<regionFormat type="daylight">ເວລາກາງເວັນ {0}</regionFormat>
 			<regionFormat type="standard">ເວລາມາດຕະຖານ {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>ຊານຕາ ອິດຊາເບວ</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>ເວລາສາກົນເຊີງພິກັດ</standard>
@@ -2879,9 +2875,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ເມວເບິນ</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ກູຣີ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ໂຮບາດ</exemplarCity>
 			</zone>
@@ -3035,9 +3028,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ເຄຣສຕັນ</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ເຢໂລໄນຟ໌</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ເອດມອນຕອນ</exemplarCity>
 			</zone>
@@ -3056,30 +3046,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ເຣໂຊລຸດ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ເຣນນີ ຣິເວີ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ແຣນກິນ ອິນເລັດ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ອາທິໂຄຄານ</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ທັນເດີເບ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ນີປີກອນ</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ໂທຣອນໂຕ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ອີກົວລິດ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ແພງເນີດທັງ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ມອນຕັນ</exemplarCity>
 			</zone>
@@ -3893,18 +3871,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ດາເອສສະລາມ</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ອັສຊ໌ກໍໂຣດ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>ຂຽບ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ຊີມເຟໂລໂປ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ຊາໂປໂຣຊີ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>ຄຳປາລາ</exemplarCity>
 			</zone>
@@ -3923,9 +3895,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ໂຮໂນລູລູ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ຈອນສະໂຕນ</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ແອນເຄີເຣກ</exemplarCity>
 			</zone>
@@ -4611,11 +4580,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>ເວລາລະດູຮ້ອນມາເກົາ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>ເວ​ລາ​ເກາະ​ແມັກ​ຄົວ​ຣີ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>ເວລາເມັກກາເດນ</generic>
@@ -4655,13 +4619,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ເວລາມໍສັນ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>​ເວ​ລາ​ນອດ​ເວ​ສ​ເມັກ​ຊິ​ໂກ</generic>
-					<standard>​ເວ​ລາ​ມາດ​ຕະ​ຖານນອດ​ເວ​ສ​ເມັກ​ຊິ​ໂກ</standard>
-					<daylight>ເວລາກາງເວັນເມັກຊິກັນນອດເວສ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>ເວລາແປຊິຟິກເມັກຊິກັນ</generic>
diff --git a/make/data/cldr/common/main/lo_LA.xml b/make/data/cldr/common/main/lo_LA.xml
index ee744a3d3ff..3bb8132ccca 100644
--- a/make/data/cldr/common/main/lo_LA.xml
+++ b/make/data/cldr/common/main/lo_LA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lrc.xml b/make/data/cldr/common/main/lrc.xml
index c4799a2e68f..fc5ef7c2fe8 100644
--- a/make/data/cldr/common/main/lrc.xml
+++ b/make/data/cldr/common/main/lrc.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lrc_IQ.xml b/make/data/cldr/common/main/lrc_IQ.xml
index 522e4775657..28c931d4b5b 100644
--- a/make/data/cldr/common/main/lrc_IQ.xml
+++ b/make/data/cldr/common/main/lrc_IQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lrc_IR.xml b/make/data/cldr/common/main/lrc_IR.xml
index b081c2bba42..ba23a13e760 100644
--- a/make/data/cldr/common/main/lrc_IR.xml
+++ b/make/data/cldr/common/main/lrc_IR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lt.xml b/make/data/cldr/common/main/lt.xml
index 46cc9da0f69..3e2e2951e0a 100644
--- a/make/data/cldr/common/main/lt.xml
+++ b/make/data/cldr/common/main/lt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1251,7 +1251,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">telefonų knygos rūšiavimo tvarka</type>
 			<type key="collation" type="phonetic">Fonetinė rikiavimo tvarka</type>
 			<type key="collation" type="pinyin">supaprastinta kiniškų hieroglifų rūšiavimo tvarka</type>
-			<type key="collation" type="reformed">reformuota rūšiavimo tvarka</type>
 			<type key="collation" type="search">bendroji paieška</type>
 			<type key="collation" type="searchjl" draft="provisional">ieškoti pagal hangul pirmines priebalses</type>
 			<type key="collation" type="standard">standartinis rikiavimas</type>
@@ -2896,9 +2895,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Laikas: {0}</regionFormat>
 			<regionFormat type="daylight">Vasaros laikas: {0}</regionFormat>
 			<regionFormat type="standard">Žiemos laikas: {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Izabelė</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>pasaulio suderintasis laikas</standard>
@@ -3018,9 +3014,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melburnas</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Karis</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Hobartas</exemplarCity>
 			</zone>
@@ -3162,9 +3155,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Krestonas</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Jelounaifas</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Edmontonas</exemplarCity>
 			</zone>
@@ -3183,30 +3173,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Resolutas</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Reini Riveris</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Rankin Inletas</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Atikokanas</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tander Bėjus</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipigonas</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Torontas</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikaluitas</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnirtungas</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Monktonas</exemplarCity>
 			</zone>
@@ -3954,18 +3932,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar es Salamas</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užhorodas</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kijevas</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Simferopolis</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožė</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Midvėjus</exemplarCity>
 			</zone>
@@ -3981,9 +3953,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Džonstonas</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ankoridžas</exemplarCity>
 			</zone>
@@ -4668,11 +4637,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Makau vasaros laikas</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Makvorio Salos laikas</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadano laikas</generic>
@@ -4712,13 +4676,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mosono laikas</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Šiaurės Vakarų Meksikos laikas</generic>
-					<standard>Šiaurės Vakarų Meksikos žiemos laikas</standard>
-					<daylight>Šiaurės Vakarų Meksikos vasaros laikas</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksikos Ramiojo vandenyno laikas</generic>
diff --git a/make/data/cldr/common/main/lt_LT.xml b/make/data/cldr/common/main/lt_LT.xml
index a102ddf6dbc..0d971009e4c 100644
--- a/make/data/cldr/common/main/lt_LT.xml
+++ b/make/data/cldr/common/main/lt_LT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lu.xml b/make/data/cldr/common/main/lu.xml
index dc6a9e6a394..94e964dd36f 100644
--- a/make/data/cldr/common/main/lu.xml
+++ b/make/data/cldr/common/main/lu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lu_CD.xml b/make/data/cldr/common/main/lu_CD.xml
index 7ba972ca5a5..826ad6749cd 100644
--- a/make/data/cldr/common/main/lu_CD.xml
+++ b/make/data/cldr/common/main/lu_CD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/luo.xml b/make/data/cldr/common/main/luo.xml
index 8b6f5d669c5..b60480e457a 100644
--- a/make/data/cldr/common/main/luo.xml
+++ b/make/data/cldr/common/main/luo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/luo_KE.xml b/make/data/cldr/common/main/luo_KE.xml
index 32ea5aee9da..053db7388d7 100644
--- a/make/data/cldr/common/main/luo_KE.xml
+++ b/make/data/cldr/common/main/luo_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/luy.xml b/make/data/cldr/common/main/luy.xml
index df6bd7d76ec..a3ec56ed28f 100644
--- a/make/data/cldr/common/main/luy.xml
+++ b/make/data/cldr/common/main/luy.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/luy_KE.xml b/make/data/cldr/common/main/luy_KE.xml
index 3721de263f0..e5b25757a59 100644
--- a/make/data/cldr/common/main/luy_KE.xml
+++ b/make/data/cldr/common/main/luy_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/lv.xml b/make/data/cldr/common/main/lv.xml
index 1c175ffc3a9..c8009e5b1dd 100644
--- a/make/data/cldr/common/main/lv.xml
+++ b/make/data/cldr/common/main/lv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1058,7 +1058,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">tālruņu grāmatas kārtošanas secība</type>
 			<type key="collation" type="phonetic">Fonētiskā kārtošanas secība</type>
 			<type key="collation" type="pinyin">piņjiņa kārtošanas secība</type>
-			<type key="collation" type="reformed">Reformētā kārtošanas secība</type>
 			<type key="collation" type="search">vispārīga meklēšana</type>
 			<type key="collation" type="searchjl">Meklēt pēc Hangul sākuma līdzskaņa</type>
 			<type key="collation" type="standard">standarta kārtošanas secība</type>
@@ -1146,9 +1145,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[aā b c č d eē f g ģ h iī j k ķ l ļ m n ņ o p r s š t uū v z ž]</exemplarCharacters>
+		<exemplarCharacters>[a ā b c č d e ē f g ģ h i ī j k ķ l ļ m n ņ o p r s š t u ū v z ž]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[y ō q ŗ w x]</exemplarCharacters>
-		<exemplarCharacters type="index">[AĀ B C Č D EĒ F G Ģ H IĪY J K Ķ L Ļ M N Ņ O P Q R S Š T UŪ V W X Z Ž]</exemplarCharacters>
+		<exemplarCharacters type="index">[A Ā B C Č D E Ē F G Ģ H I Y Ī J K Ķ L Ļ M N Ņ O P Q R S Š T U Ū V W X Z Ž]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’‚ &quot;“”„ ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 		<ellipsis type="word-final">{0}…</ellipsis>
@@ -2462,9 +2461,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">{0}: vasaras laiks</regionFormat>
 			<regionFormat type="standard">{0}: standarta laiks</regionFormat>
 			<fallbackFormat>{0} ({1})</fallbackFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santaisabela</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Universālais koordinētais laiks</standard>
@@ -2581,9 +2577,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melburna</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kari</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Hobārta</exemplarCity>
 			</zone>
@@ -2716,9 +2709,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Krestona</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Jelounaifa</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Edmontona</exemplarCity>
 			</zone>
@@ -2737,27 +2727,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Rezolūta</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Reinirivera</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Rankininleta</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Atikokana</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tanderbeja</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipigona</exemplarCity>
-			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikaluita</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pannirtuna</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Monktona</exemplarCity>
 			</zone>
@@ -3472,18 +3450,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dāresalāma</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užhoroda</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kijeva</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Simferopole</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Midvejs</exemplarCity>
 			</zone>
@@ -3499,9 +3471,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Džonstona atols</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ankurāža</exemplarCity>
 			</zone>
@@ -4145,11 +4114,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Lorda Hava salas vasaras laiks</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Makvorija salas laiks</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadanas laiks</generic>
@@ -4189,13 +4153,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mosonas laiks</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Ziemeļrietumu Meksikas laiks</generic>
-					<standard>Ziemeļrietumu Meksikas ziemas laiks</standard>
-					<daylight>Ziemeļrietumu Meksikas vasaras laiks</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksikas Klusā okeāna piekrastes laiks</generic>
diff --git a/make/data/cldr/common/main/lv_LV.xml b/make/data/cldr/common/main/lv_LV.xml
index 74921875c2d..722169e2367 100644
--- a/make/data/cldr/common/main/lv_LV.xml
+++ b/make/data/cldr/common/main/lv_LV.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mai.xml b/make/data/cldr/common/main/mai.xml
index 88234fe368c..2920468139f 100644
--- a/make/data/cldr/common/main/mai.xml
+++ b/make/data/cldr/common/main/mai.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1733,9 +1733,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>क्रेस्टन</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>येलोनाइफ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>एडमोंटोन</exemplarCity>
 			</zone>
@@ -1754,30 +1751,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>रेसालूत</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>रेनी रिवर</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>रेंकिन इनलेट</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>अटिकोकन</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>थंडर बे</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>निपिगान</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>टोरंटो</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>इकालविट</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>पैंगनिरटंग</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>मान्कटान</exemplarCity>
 			</zone>
@@ -2501,18 +2486,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>डारे सलाम</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>उझोरोद</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>कीव</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>सिम्फेरोपोल</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>जपोरोजाए</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>कमपाला</exemplarCity>
 			</zone>
@@ -3092,11 +3071,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>लार्ड होबे डेलाइट टाइम</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>मेक्वैरी द्वीप टाइम</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>मगादान टाइम</generic>
@@ -3121,13 +3095,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>मारीशस समर टाइम</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>उत्तर-पश्चिमी मैक्सिको टाइम</generic>
-					<standard>उत्तर-पश्चिमी मैक्सिको मानक टाइम</standard>
-					<daylight>उत्तर-पश्चिमी मैक्सिको डेलाइट टाइम</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>मैक्सिकन पेसिफिक टाइम</generic>
diff --git a/make/data/cldr/common/main/mai_IN.xml b/make/data/cldr/common/main/mai_IN.xml
index 0a7af5039e4..5723c4896b9 100644
--- a/make/data/cldr/common/main/mai_IN.xml
+++ b/make/data/cldr/common/main/mai_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mas.xml b/make/data/cldr/common/main/mas.xml
index 23cb44b716d..3c9a16ba879 100644
--- a/make/data/cldr/common/main/mas.xml
+++ b/make/data/cldr/common/main/mas.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mas_KE.xml b/make/data/cldr/common/main/mas_KE.xml
index 5e2b2829a32..8fd05e37ceb 100644
--- a/make/data/cldr/common/main/mas_KE.xml
+++ b/make/data/cldr/common/main/mas_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mas_TZ.xml b/make/data/cldr/common/main/mas_TZ.xml
index 521840ff22f..9614975030f 100644
--- a/make/data/cldr/common/main/mas_TZ.xml
+++ b/make/data/cldr/common/main/mas_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mdf.xml b/make/data/cldr/common/main/mdf.xml
index e7b7651901f..23a1e567eab 100644
--- a/make/data/cldr/common/main/mdf.xml
+++ b/make/data/cldr/common/main/mdf.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mdf_RU.xml b/make/data/cldr/common/main/mdf_RU.xml
index e48359e322f..63f14c8e264 100644
--- a/make/data/cldr/common/main/mdf_RU.xml
+++ b/make/data/cldr/common/main/mdf_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mer.xml b/make/data/cldr/common/main/mer.xml
index 105b8d97b2a..d4bcbd8c1eb 100644
--- a/make/data/cldr/common/main/mer.xml
+++ b/make/data/cldr/common/main/mer.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mer_KE.xml b/make/data/cldr/common/main/mer_KE.xml
index 403ce5bca9b..6a9bf6854df 100644
--- a/make/data/cldr/common/main/mer_KE.xml
+++ b/make/data/cldr/common/main/mer_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mfe.xml b/make/data/cldr/common/main/mfe.xml
index 8a2f3072522..a7c8df749a7 100644
--- a/make/data/cldr/common/main/mfe.xml
+++ b/make/data/cldr/common/main/mfe.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mfe_MU.xml b/make/data/cldr/common/main/mfe_MU.xml
index c9cbc6f68e6..bc6821ba085 100644
--- a/make/data/cldr/common/main/mfe_MU.xml
+++ b/make/data/cldr/common/main/mfe_MU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mg.xml b/make/data/cldr/common/main/mg.xml
index 68cb2113a40..0174d0ea16a 100644
--- a/make/data/cldr/common/main/mg.xml
+++ b/make/data/cldr/common/main/mg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mg_MG.xml b/make/data/cldr/common/main/mg_MG.xml
index 21a1a7681c1..fc8aa9874fd 100644
--- a/make/data/cldr/common/main/mg_MG.xml
+++ b/make/data/cldr/common/main/mg_MG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mgh.xml b/make/data/cldr/common/main/mgh.xml
index ad70d89e373..5799a350ee5 100644
--- a/make/data/cldr/common/main/mgh.xml
+++ b/make/data/cldr/common/main/mgh.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mgh_MZ.xml b/make/data/cldr/common/main/mgh_MZ.xml
index e59981df532..c220df1088f 100644
--- a/make/data/cldr/common/main/mgh_MZ.xml
+++ b/make/data/cldr/common/main/mgh_MZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mgo.xml b/make/data/cldr/common/main/mgo.xml
index 9ab489ad71d..66ac0625620 100644
--- a/make/data/cldr/common/main/mgo.xml
+++ b/make/data/cldr/common/main/mgo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mgo_CM.xml b/make/data/cldr/common/main/mgo_CM.xml
index c39835e66f6..493705ed806 100644
--- a/make/data/cldr/common/main/mgo_CM.xml
+++ b/make/data/cldr/common/main/mgo_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mi.xml b/make/data/cldr/common/main/mi.xml
index 75c01090e75..f06a7132a63 100644
--- a/make/data/cldr/common/main/mi.xml
+++ b/make/data/cldr/common/main/mi.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1829,9 +1829,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Cambridge_Bay">
 				<exemplarCity>Kemureti Pei</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Whaitiri Pei</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Tāroto</exemplarCity>
 			</zone>
@@ -2602,11 +2599,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Wā Lord Howe Awatea</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Wā o Te Moutere Makoare</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Wā Magadan</generic>
@@ -2646,13 +2638,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Wā Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Wā Mēhiko ki te uru-mā-raki</generic>
-					<standard>Wā Arowhānui o Mēhiko ki te uru-mā-raki</standard>
-					<daylight>Wā Awatea o Mēhiko ki te uru-mā-raki</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Wā Mēhiko Kiwa</generic>
diff --git a/make/data/cldr/common/main/mi_NZ.xml b/make/data/cldr/common/main/mi_NZ.xml
index bd33d3b7ada..93e252d8726 100644
--- a/make/data/cldr/common/main/mi_NZ.xml
+++ b/make/data/cldr/common/main/mi_NZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mic.xml b/make/data/cldr/common/main/mic.xml
index 5f65b3dd38c..55f82bd7442 100644
--- a/make/data/cldr/common/main/mic.xml
+++ b/make/data/cldr/common/main/mic.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mic_CA.xml b/make/data/cldr/common/main/mic_CA.xml
index 5b8852c7943..cbe2e9e703b 100644
--- a/make/data/cldr/common/main/mic_CA.xml
+++ b/make/data/cldr/common/main/mic_CA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mk.xml b/make/data/cldr/common/main/mk.xml
index f40588a7fec..638e9972a4b 100644
--- a/make/data/cldr/common/main/mk.xml
+++ b/make/data/cldr/common/main/mk.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2884,9 +2884,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</fields>
 		<timeZoneNames>
 			<regionFormat>Време во {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Света Изабела</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Координирано универзално време</standard>
@@ -3009,9 +3006,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мелбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Курие</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -3165,9 +3159,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Јелоунајф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Едмонтон</exemplarCity>
 			</zone>
@@ -3186,30 +3177,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Резолут</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рејни Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ренкин Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Корал Харбор</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандр Беј</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Икалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртунг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -4023,18 +4002,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар ес Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферопол</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожје</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -4053,9 +4026,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Хонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Џонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Енкориџ</exemplarCity>
 			</zone>
@@ -4720,11 +4690,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Летно сметање на времето во Лорд Хау</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Време на Островот Макуари</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Време во Магадан</generic>
@@ -4764,13 +4729,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Време во Мосон</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Време во северозападно Мексико</generic>
-					<standard>Стандардно време во северозападно Мексико</standard>
-					<daylight>Летно сметање на времето во северозападно Мексико</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Пацифичко време во Мексико</generic>
diff --git a/make/data/cldr/common/main/mk_MK.xml b/make/data/cldr/common/main/mk_MK.xml
index dc7c3e7fd8c..2921dd641b5 100644
--- a/make/data/cldr/common/main/mk_MK.xml
+++ b/make/data/cldr/common/main/mk_MK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ml.xml b/make/data/cldr/common/main/ml.xml
index 63a5082b080..f71f5745bf8 100644
--- a/make/data/cldr/common/main/ml.xml
+++ b/make/data/cldr/common/main/ml.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2291,9 +2291,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} സമയം</regionFormat>
 			<regionFormat type="daylight">{0} ഡേലൈറ്റ് സമയം</regionFormat>
 			<regionFormat type="standard">{0} സ്റ്റാൻഡേർഡ് സമയം</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>സാന്ത ഇസബേൽ</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>കോർഡിനേറ്റഡ് യൂണിവേഴ്‌സൽ സമയം</standard>
@@ -2416,9 +2413,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>മെൽബൺ</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ക്യൂറി</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ഹൊബാർട്ട്</exemplarCity>
 			</zone>
@@ -2572,9 +2566,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ക്രെസ്റ്റൺ</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>യെല്ലോനൈഫ്</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>എഡ്മോൺടൺ</exemplarCity>
 			</zone>
@@ -2593,30 +2584,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>റെസല്യൂട്ട്</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>റെയ്നി റിവർ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>റാങ്കിൻ ഇൻലെറ്റ്</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ഏറ്റികോക്കൺ</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>തണ്ടർ ബേ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>നിപ്പിഗോൺ</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ടൊറന്റോ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ഇഖാലിത്</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>പാൻഗ്‌നിറ്റംഗ്</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>മോംഗ്‌ടൻ</exemplarCity>
 			</zone>
@@ -3430,18 +3409,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ദാർ എസ് സലാം</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ഉസ്ഗൊറോഡ്</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>കീവ്</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>സിംഫെറോപോൾ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>സാപ്പറോസൈ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>കമ്പാല</exemplarCity>
 			</zone>
@@ -3460,9 +3433,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ഹോണലൂലു</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ജോൺസ്റ്റൺ</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ആങ്കറേജ്</exemplarCity>
 			</zone>
@@ -4160,11 +4130,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>മകൌ വേനൽക്കാല സമയം</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>മക്വാറി ദ്വീപ് സമയം</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>മഗാദൻ സമയം</generic>
@@ -4204,13 +4169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>മാസൺ സമയം</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>വടക്കുപടിഞ്ഞാറൻ മെക്സിക്കൻ സമയം</generic>
-					<standard>വടക്കുപടിഞ്ഞാറൻ മെക്‌സിക്കൻ സ്റ്റാൻഡേർഡ് സമയം</standard>
-					<daylight>വടക്കുപടിഞ്ഞാറൻ മെക്സിക്കൻ ഡേലൈറ്റ് സമയം</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>മെക്സിക്കൻ പസഫിക് സമയം</generic>
diff --git a/make/data/cldr/common/main/ml_IN.xml b/make/data/cldr/common/main/ml_IN.xml
index 057d97c357a..1cfb17d6fbb 100644
--- a/make/data/cldr/common/main/ml_IN.xml
+++ b/make/data/cldr/common/main/ml_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mn.xml b/make/data/cldr/common/main/mn.xml
index b5085945472..23d8dc9c83c 100644
--- a/make/data/cldr/common/main/mn.xml
+++ b/make/data/cldr/common/main/mn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1004,7 +1004,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="gb2312han">Хялбаршуулсан хятад Эрэмбэлэх дараалал - GB2312</type>
 			<type key="collation" type="phonebook">Утасны дэвтрийн эрэмбэлэх дараалал</type>
 			<type key="collation" type="pinyin">Пиньян эрэмбэлэх дараалал</type>
-			<type key="collation" type="reformed">Шинэчилсэн эрэмбэлэх дараалал</type>
 			<type key="collation" type="search">ерөнхий хайлт</type>
 			<type key="collation" type="searchjl">Хангүлээр эхний гийгүүлэгчээр хайх</type>
 			<type key="collation" type="standard">стандарт эрэмбэлэх дараалал</type>
@@ -2061,9 +2060,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0}-н цаг</regionFormat>
 			<regionFormat type="daylight">{0}-н зуны цаг</regionFormat>
 			<regionFormat type="standard">{0}-н стандарт цаг</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Санта Изабель</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Олон улсын зохицуулалттай цаг</standard>
@@ -2186,9 +2182,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мельбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Кюрри</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -2342,9 +2335,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Йелоунайф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Эдмонтон</exemplarCity>
 			</zone>
@@ -2363,30 +2353,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Резолют</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейни Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Рэнкин Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Атикокан</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Сандер Бэй</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Икалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртунг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -3200,18 +3178,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар-эс-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферополь</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожье</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -3230,9 +3202,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Хонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Жонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Анкораж</exemplarCity>
 			</zone>
@@ -3868,11 +3837,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Лорд Хоугийн зуны цаг</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Маккуори Арлын цаг</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магаданы цаг</generic>
@@ -3912,13 +3876,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Моусоны цаг</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Баруун хойд Мексикийн цаг</generic>
-					<standard>Баруун хойд Мексикийн стандарт цаг</standard>
-					<daylight>Баруун хойд Мексикийн зуны цаг</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Мексик-Номхон далайн цаг</generic>
diff --git a/make/data/cldr/common/main/mn_MN.xml b/make/data/cldr/common/main/mn_MN.xml
index 388fe9ad541..4a2f173ca58 100644
--- a/make/data/cldr/common/main/mn_MN.xml
+++ b/make/data/cldr/common/main/mn_MN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mn_Mong.xml b/make/data/cldr/common/main/mn_Mong.xml
index 2fa8326078a..252ac0d5a1a 100644
--- a/make/data/cldr/common/main/mn_Mong.xml
+++ b/make/data/cldr/common/main/mn_Mong.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mn_Mong_CN.xml b/make/data/cldr/common/main/mn_Mong_CN.xml
index 9879d57fc7e..84aa98185f0 100644
--- a/make/data/cldr/common/main/mn_Mong_CN.xml
+++ b/make/data/cldr/common/main/mn_Mong_CN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mn_Mong_MN.xml b/make/data/cldr/common/main/mn_Mong_MN.xml
index f8b90fe6e11..d512403c7e1 100644
--- a/make/data/cldr/common/main/mn_Mong_MN.xml
+++ b/make/data/cldr/common/main/mn_Mong_MN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mni.xml b/make/data/cldr/common/main/mni.xml
index 811c2753be3..345427427f6 100644
--- a/make/data/cldr/common/main/mni.xml
+++ b/make/data/cldr/common/main/mni.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mni_Beng.xml b/make/data/cldr/common/main/mni_Beng.xml
index 4f6e71f8810..9efb5c5a59c 100644
--- a/make/data/cldr/common/main/mni_Beng.xml
+++ b/make/data/cldr/common/main/mni_Beng.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mni_Beng_IN.xml b/make/data/cldr/common/main/mni_Beng_IN.xml
index 880999fbe30..bf54e2ee0b5 100644
--- a/make/data/cldr/common/main/mni_Beng_IN.xml
+++ b/make/data/cldr/common/main/mni_Beng_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mni_Mtei.xml b/make/data/cldr/common/main/mni_Mtei.xml
index a92604804c7..c3f491dffb6 100644
--- a/make/data/cldr/common/main/mni_Mtei.xml
+++ b/make/data/cldr/common/main/mni_Mtei.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mni_Mtei_IN.xml b/make/data/cldr/common/main/mni_Mtei_IN.xml
index 40c5a7b54c6..7691ca713f2 100644
--- a/make/data/cldr/common/main/mni_Mtei_IN.xml
+++ b/make/data/cldr/common/main/mni_Mtei_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/moh.xml b/make/data/cldr/common/main/moh.xml
index dce1422a3d7..13db5330ce9 100644
--- a/make/data/cldr/common/main/moh.xml
+++ b/make/data/cldr/common/main/moh.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/moh_CA.xml b/make/data/cldr/common/main/moh_CA.xml
index ed26e0c99fe..9f977507b81 100644
--- a/make/data/cldr/common/main/moh_CA.xml
+++ b/make/data/cldr/common/main/moh_CA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mr.xml b/make/data/cldr/common/main/mr.xml
index 26fc360e1d7..d19b803f5ce 100644
--- a/make/data/cldr/common/main/mr.xml
+++ b/make/data/cldr/common/main/mr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1099,7 +1099,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">फोनबुक अनुक्रम</type>
 			<type key="collation" type="phonetic">ध्वनीविचार क्रमवारी क्रम</type>
 			<type key="collation" type="pinyin">पिनयिन अनुक्रम</type>
-			<type key="collation" type="reformed">पुनर्स्वरूपित अनुक्रम</type>
 			<type key="collation" type="search">सामान्य हेतु शोध</type>
 			<type key="collation" type="searchjl">हँगुल प्रारंभिक व्यंजनानुसार शोधा</type>
 			<type key="collation" type="standard">प्रमाणित क्रमवारी क्रम</type>
@@ -2425,9 +2424,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} वेळ</regionFormat>
 			<regionFormat type="daylight">{0} सूर्यप्रकाश वेळ</regionFormat>
 			<regionFormat type="standard">{0} प्रमाण वेळ</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>सांता इसाबेल</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>समन्वित वैश्विक वेळ</standard>
@@ -2550,9 +2546,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>मेलबोर्न</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>कुह्री</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>होबार्ट</exemplarCity>
 			</zone>
@@ -2706,9 +2699,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>क्रेस्टन</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>यलोनाइफ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>एडमाँटन</exemplarCity>
 			</zone>
@@ -2727,30 +2717,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>रेजोल्यूट</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>रेनी नदी</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>रॅनकिन इनलेट</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>अॅटिकोकन</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>थंडर उपसागर</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>निपिगोन</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>टोरोंटो</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>इकालुइत</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>पँगनिरतुंग</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>माँकटन</exemplarCity>
 			</zone>
@@ -3564,18 +3542,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>दार ए सलाम</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>उझहोरोड</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>कीव</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>सिम्फरोपोल</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>झापोरोझे</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>कंपाला</exemplarCity>
 			</zone>
@@ -3594,9 +3566,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>होनोलुलू</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>जोहान्स्टन</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>अँकरेज</exemplarCity>
 			</zone>
@@ -4294,11 +4263,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>मकाऊ ग्रीष्मकालीन वेळ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>मॅक्वेरी बेट वेळ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>मॅगाडन वेळ</generic>
@@ -4338,13 +4302,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>मॉसन वेळ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>वायव्य मेक्सिको वेळ</generic>
-					<standard>वायव्य मेक्सिको प्रमाण वेळ</standard>
-					<daylight>वायव्य मेक्सिको सूर्यप्रकाश वेळ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>मेक्सिको पॅसिफिक वेळ</generic>
diff --git a/make/data/cldr/common/main/mr_IN.xml b/make/data/cldr/common/main/mr_IN.xml
index d465b06c404..f21c66363d5 100644
--- a/make/data/cldr/common/main/mr_IN.xml
+++ b/make/data/cldr/common/main/mr_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ms.xml b/make/data/cldr/common/main/ms.xml
index be6a9762eba..c1382176e51 100644
--- a/make/data/cldr/common/main/ms.xml
+++ b/make/data/cldr/common/main/ms.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1112,7 +1112,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Aturan Isih Buku Telefon</type>
 			<type key="collation" type="phonetic">Urutan Isih Fonetik</type>
 			<type key="collation" type="pinyin">Aturan Isih Pinyin</type>
-			<type key="collation" type="reformed">Aturan Isih Pembaharuan</type>
 			<type key="collation" type="search">Carian Tujuan Umum</type>
 			<type key="collation" type="searchjl">Cari Mengikut Konsonan Awal Hangul</type>
 			<type key="collation" type="standard">Tertib Isih Standard</type>
@@ -2425,9 +2424,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Waktu {0}</regionFormat>
 			<regionFormat type="daylight">Waktu Siang {0}</regionFormat>
 			<regionFormat type="standard">Waktu Piawai {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Waktu Universal Selaras</standard>
@@ -2436,18 +2432,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Bandar Tidak Diketahui</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>Saint Barthelemy</exemplarCity>
 			</zone>
 			<zone type="America/Cambridge_Bay">
 				<exemplarCity>Teluk Cambridge</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Sungai Rainy</exemplarCity>
-			</zone>
 			<zone type="America/Goose_Bay">
 				<exemplarCity>Teluk Goose</exemplarCity>
 			</zone>
@@ -3058,11 +3048,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Waktu Musim Panas Macao</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Waktu Pulau Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Waktu Magadan</generic>
@@ -3105,13 +3090,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Waktu Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Waktu Barat Laut Mexico</generic>
-					<standard>Waktu Piawai Barat Laut Mexico</standard>
-					<daylight>Waktu Siang Barat Laut Mexico</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Waktu Pasifik Mexico</generic>
diff --git a/make/data/cldr/common/main/ms_Arab.xml b/make/data/cldr/common/main/ms_Arab.xml
index f8cea013676..0db76dd7e2a 100644
--- a/make/data/cldr/common/main/ms_Arab.xml
+++ b/make/data/cldr/common/main/ms_Arab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ms_Arab_BN.xml b/make/data/cldr/common/main/ms_Arab_BN.xml
index cfac2af9bcd..03b60d8dc3a 100644
--- a/make/data/cldr/common/main/ms_Arab_BN.xml
+++ b/make/data/cldr/common/main/ms_Arab_BN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ms_Arab_MY.xml b/make/data/cldr/common/main/ms_Arab_MY.xml
index 31478d27c4a..bddd3315cb2 100644
--- a/make/data/cldr/common/main/ms_Arab_MY.xml
+++ b/make/data/cldr/common/main/ms_Arab_MY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ms_BN.xml b/make/data/cldr/common/main/ms_BN.xml
index d8561e0bc36..d156f483167 100644
--- a/make/data/cldr/common/main/ms_BN.xml
+++ b/make/data/cldr/common/main/ms_BN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ms_ID.xml b/make/data/cldr/common/main/ms_ID.xml
index 197b758147e..0ca7f5756c9 100644
--- a/make/data/cldr/common/main/ms_ID.xml
+++ b/make/data/cldr/common/main/ms_ID.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ms_MY.xml b/make/data/cldr/common/main/ms_MY.xml
index 90b29f926c8..dda1253cdb5 100644
--- a/make/data/cldr/common/main/ms_MY.xml
+++ b/make/data/cldr/common/main/ms_MY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ms_SG.xml b/make/data/cldr/common/main/ms_SG.xml
index 4182f9d6c8b..f799e1eef9e 100644
--- a/make/data/cldr/common/main/ms_SG.xml
+++ b/make/data/cldr/common/main/ms_SG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mt.xml b/make/data/cldr/common/main/mt.xml
index 90630a2de8d..b9d33c5e0c7 100644
--- a/make/data/cldr/common/main/mt.xml
+++ b/make/data/cldr/common/main/mt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1720,9 +1720,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Vienna">
 				<exemplarCity>Vjenna</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Brussell</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/mt_MT.xml b/make/data/cldr/common/main/mt_MT.xml
index 1b7a403ebc2..b58fe9e5526 100644
--- a/make/data/cldr/common/main/mt_MT.xml
+++ b/make/data/cldr/common/main/mt_MT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mua.xml b/make/data/cldr/common/main/mua.xml
index ba906c36deb..da45b0d679b 100644
--- a/make/data/cldr/common/main/mua.xml
+++ b/make/data/cldr/common/main/mua.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mua_CM.xml b/make/data/cldr/common/main/mua_CM.xml
index 8af56d08795..caad2d7cc70 100644
--- a/make/data/cldr/common/main/mua_CM.xml
+++ b/make/data/cldr/common/main/mua_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mus.xml b/make/data/cldr/common/main/mus.xml
index 5aa33c03b94..c25ac4b0d9a 100644
--- a/make/data/cldr/common/main/mus.xml
+++ b/make/data/cldr/common/main/mus.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -19,8 +19,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[a c e f h i k l m n o p r s t u v w y ʼ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[b d ē g j q z]</exemplarCharacters>
+		<exemplarCharacters>[a c eē f h i k l m n o p r s t u v w y ʼ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[b d g j q z]</exemplarCharacters>
 		<exemplarCharacters type="index">[A C E F H I K L M N O P R S T U V W Y]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 	</characters>
@@ -73,13 +73,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<days>
 					<dayContext type="format">
 						<dayWidth type="wide">
-							<day type="sun">Nettv Cako</day>
+							<day type="sun">Nettvʼcako</day>
 							<day type="mon">Enhvteceskv</day>
 							<day type="tue">Enhvteceskv Enhvyvtke</day>
 							<day type="wed">Ennvrkvpv</day>
 							<day type="thu">Ennvrkvpv Enhvyvtke</day>
 							<day type="fri">Nak Okkoskv Nettv</day>
-							<day type="sat">Nettv Cakcuse</day>
+							<day type="sat">Nettv Cakʼcuse</day>
 						</dayWidth>
 					</dayContext>
 				</days>
@@ -142,7 +142,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName>Hvse</displayName>
 			</field>
 			<field type="week">
-				<displayName>Nettv Cako</displayName>
+				<displayName>Nettvcako</displayName>
 			</field>
 			<field type="day">
 				<displayName>Nettv</displayName>
diff --git a/make/data/cldr/common/main/mus_US.xml b/make/data/cldr/common/main/mus_US.xml
index 1f8591ec072..3c4734e80a6 100644
--- a/make/data/cldr/common/main/mus_US.xml
+++ b/make/data/cldr/common/main/mus_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/my.xml b/make/data/cldr/common/main/my.xml
index 84c3e543fd9..7fb0996ea9c 100644
--- a/make/data/cldr/common/main/my.xml
+++ b/make/data/cldr/common/main/my.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1710,9 +1710,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} အချိန်</regionFormat>
 			<regionFormat type="daylight">{0} နွေရာသီ စံတော်ချိန်</regionFormat>
 			<regionFormat type="standard">{0} စံတော်ချိန်</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>ဆန်တာ အစ္ဇဘဲလ်</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>ညှိထားသည့် ကမ္ဘာ့ စံတော်ချိန်</standard>
@@ -1835,9 +1832,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>မဲလ်ဘုန်း</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ကာရီ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ဟိုးဘားတ်</exemplarCity>
 			</zone>
@@ -1991,9 +1985,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ကရစ်စတွန်</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ရဲလိုနိုက်ဖ်</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>အက်ဒ်မွန်တန်</exemplarCity>
 			</zone>
@@ -2012,30 +2003,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ရီဆိုလုပ်(တ်)</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ရိမ်းနီး ရီဗာ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ရန်ကင် အင်းလက်</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>အာတီကိုကန်</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>သန်းန်ဒါး ဘေး</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>နီပီဂွန်</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>တိုရန်တို</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>အီကာလူအီတ်</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ဖန်ဂ်နသ်တံ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>မွန်ခ်တွန်</exemplarCity>
 			</zone>
@@ -2849,18 +2828,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ဒါရက်စ်ဆာလမ်</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ဥဇ်ဂိုရို့တ်</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>ခီးအက်ဖ်</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>စင်ဖာရိုးဖို</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ဇာဖိုရိုးစ်ဂျာ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>ကမ်ပါလာ</exemplarCity>
 			</zone>
@@ -2879,9 +2852,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ဟိုနိုလူလူ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ဂျွန်စတန်</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>အန်ကာရေ့ဂျ်</exemplarCity>
 			</zone>
@@ -3529,11 +3499,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>မကာအို နွေရာသီ အချိန်</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>မက်ကွယ်ရီကျွန်း အချိန်</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>မာဂါဒန်း အချိန်</generic>
@@ -3573,13 +3538,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>မော်စွန် အချိန်</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>အနောက်တောင် မက္ကဆီကို အချိန်</generic>
-					<standard>အနောက်တောင် မက္ကဆီကို စံတော်ချိန်</standard>
-					<daylight>အနောက်တောင် မက္ကစီကို နွေရာသီ စံတော်ချိန်</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>မက္ကဆီကန် ပစိဖိတ် အချိန်</generic>
diff --git a/make/data/cldr/common/main/my_MM.xml b/make/data/cldr/common/main/my_MM.xml
index 82b4ea2d629..e55a9021df1 100644
--- a/make/data/cldr/common/main/my_MM.xml
+++ b/make/data/cldr/common/main/my_MM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/myv.xml b/make/data/cldr/common/main/myv.xml
index c02306f8503..58c41e016ae 100644
--- a/make/data/cldr/common/main/myv.xml
+++ b/make/data/cldr/common/main/myv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -508,18 +508,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Taipei">
 				<exemplarCity draft="unconfirmed">Тайпей</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="unconfirmed">Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity draft="unconfirmed">Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity draft="unconfirmed">Симферополь</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">Запорожье</exemplarCity>
-			</zone>
 			<zone type="America/Boise">
 				<exemplarCity draft="unconfirmed">Бойси</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/myv_RU.xml b/make/data/cldr/common/main/myv_RU.xml
index da3bfc9a168..d14f2711c19 100644
--- a/make/data/cldr/common/main/myv_RU.xml
+++ b/make/data/cldr/common/main/myv_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mzn.xml b/make/data/cldr/common/main/mzn.xml
index 76e938f2196..599f5d52656 100644
--- a/make/data/cldr/common/main/mzn.xml
+++ b/make/data/cldr/common/main/mzn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/mzn_IR.xml b/make/data/cldr/common/main/mzn_IR.xml
index acda126e168..86f4ea58065 100644
--- a/make/data/cldr/common/main/mzn_IR.xml
+++ b/make/data/cldr/common/main/mzn_IR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/naq.xml b/make/data/cldr/common/main/naq.xml
index c2d393e7355..de8df9f5c99 100644
--- a/make/data/cldr/common/main/naq.xml
+++ b/make/data/cldr/common/main/naq.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/naq_NA.xml b/make/data/cldr/common/main/naq_NA.xml
index 2e4c49f5d0c..cfc526d85fb 100644
--- a/make/data/cldr/common/main/naq_NA.xml
+++ b/make/data/cldr/common/main/naq_NA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nb.xml b/make/data/cldr/common/main/nb.xml
index 5aa284e5240..e976bed763b 100644
--- a/make/data/cldr/common/main/nb.xml
+++ b/make/data/cldr/common/main/nb.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nb_NO.xml b/make/data/cldr/common/main/nb_NO.xml
index d7d07ed5600..884d9ab3fec 100644
--- a/make/data/cldr/common/main/nb_NO.xml
+++ b/make/data/cldr/common/main/nb_NO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nb_SJ.xml b/make/data/cldr/common/main/nb_SJ.xml
index a6e024c7f95..c4a140911c4 100644
--- a/make/data/cldr/common/main/nb_SJ.xml
+++ b/make/data/cldr/common/main/nb_SJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nd.xml b/make/data/cldr/common/main/nd.xml
index e2bd7af01bd..090794fb3fa 100644
--- a/make/data/cldr/common/main/nd.xml
+++ b/make/data/cldr/common/main/nd.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nd_ZW.xml b/make/data/cldr/common/main/nd_ZW.xml
index d311aada9fb..11463f23aa7 100644
--- a/make/data/cldr/common/main/nd_ZW.xml
+++ b/make/data/cldr/common/main/nd_ZW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nds.xml b/make/data/cldr/common/main/nds.xml
index 3e0ae0bea9e..9f827f0337d 100644
--- a/make/data/cldr/common/main/nds.xml
+++ b/make/data/cldr/common/main/nds.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1554,12 +1554,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Kamchatka">
 				<exemplarCity draft="unconfirmed">Kamschatka</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="unconfirmed">Uschgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">Saporoschje</exemplarCity>
-			</zone>
 			<zone type="America/North_Dakota/New_Salem">
 				<exemplarCity draft="unconfirmed">New Salem, Noord-Dakota</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/nds_DE.xml b/make/data/cldr/common/main/nds_DE.xml
index 437a10b5387..b8080c1b38f 100644
--- a/make/data/cldr/common/main/nds_DE.xml
+++ b/make/data/cldr/common/main/nds_DE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nds_NL.xml b/make/data/cldr/common/main/nds_NL.xml
index 8f4ab54077a..c8b33f0cbb9 100644
--- a/make/data/cldr/common/main/nds_NL.xml
+++ b/make/data/cldr/common/main/nds_NL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ne.xml b/make/data/cldr/common/main/ne.xml
index f40f2e6bdc0..d48508040b6 100644
--- a/make/data/cldr/common/main/ne.xml
+++ b/make/data/cldr/common/main/ne.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1803,9 +1803,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} समय</regionFormat>
 			<regionFormat type="daylight">{0} (+१)</regionFormat>
 			<regionFormat type="standard">{0} (+०)</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>सान्टा ईसाबेल</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>समन्वित विश्व समय</standard>
@@ -1928,9 +1925,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>मेल्बर्न</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>क्युरी</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>होभार्ट</exemplarCity>
 			</zone>
@@ -2084,9 +2078,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>क्रेस्टन</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>येल्लोनाइफ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>एड्मोन्टन</exemplarCity>
 			</zone>
@@ -2105,30 +2096,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>रिजोलुट</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>रेनिरिभर</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>रान्किन इन्लेट</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>एटिकोकान</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>थण्डर बे</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>निपिगन</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>टोरोन्टो</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>इक्वालुइट</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>पाङ्निरतुङ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>मोन्कटन</exemplarCity>
 			</zone>
@@ -2942,18 +2921,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>डार एस् सलाम</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>उझगोरद</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>किभ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>सिम्फेरोपोल</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>जापोरोझ्ये</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>काम्पाला</exemplarCity>
 			</zone>
@@ -2972,9 +2945,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>होनोलुलु</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>जोन्सटन</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>एङ्कोरेज</exemplarCity>
 			</zone>
@@ -3610,11 +3580,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>लर्ड हावे दिवा समय</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>माक्वेरी टापु समय</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>मागादान समय</generic>
@@ -3654,13 +3619,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>म्वसन समय</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>उत्तर पश्चिम मेक्सिको समय</generic>
-					<standard>उत्तर पश्चिम मेक्सिकोको मानक समय</standard>
-					<daylight>उत्तर पश्चिम मेक्सिकोको दिवा समय</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>मेक्सिकन प्यासिफिक समय</generic>
diff --git a/make/data/cldr/common/main/ne_IN.xml b/make/data/cldr/common/main/ne_IN.xml
index 085ee6897bb..3f6a9afd5b2 100644
--- a/make/data/cldr/common/main/ne_IN.xml
+++ b/make/data/cldr/common/main/ne_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ne_NP.xml b/make/data/cldr/common/main/ne_NP.xml
index 5bd9f42df74..47c6ac59d74 100644
--- a/make/data/cldr/common/main/ne_NP.xml
+++ b/make/data/cldr/common/main/ne_NP.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nl.xml b/make/data/cldr/common/main/nl.xml
index faec9f164eb..8ff890e6dd5 100644
--- a/make/data/cldr/common/main/nl.xml
+++ b/make/data/cldr/common/main/nl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1356,7 +1356,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Telefoonboeksorteervolgorde</type>
 			<type key="collation" type="phonetic">Fonetische sorteervolgorde</type>
 			<type key="collation" type="pinyin">Pinyinsorteervolgorde</type>
-			<type key="collation" type="reformed">Herziene sorteervolgorde</type>
 			<type key="collation" type="search">algemeen zoeken</type>
 			<type key="collation" type="searchjl" draft="contributed">Zoeken op eerste Hangul-medeklinker</type>
 			<type key="collation" type="standard">standaard sorteervolgorde</type>
@@ -3561,9 +3560,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>tijd in {0}</regionFormat>
 			<regionFormat type="daylight">zomertijd in {0}</regionFormat>
 			<regionFormat type="standard">standaardtijd in {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>gecoördineerde wereldtijd</standard>
@@ -3590,9 +3586,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wenen</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Baku">
 				<exemplarCity>Bakoe</exemplarCity>
 			</zone>
@@ -3844,15 +3837,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Istanbul">
 				<exemplarCity>Istanboel</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Oezjhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizja</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<short>
 					<generic draft="contributed">HST</generic>
@@ -3921,9 +3908,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Alaska">
 				<long>
-					<generic>Alaska Time</generic>
-					<standard>Alaska Standard Time</standard>
-					<daylight>Alaska Daylight Time</daylight>
+					<generic>Alaska-tijd</generic>
+					<standard>Alaska-standaardtijd</standard>
+					<daylight>Alaska-zomertijd</daylight>
 				</long>
 				<short>
 					<generic draft="contributed">AKT</generic>
@@ -3940,16 +3927,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Amazon">
 				<long>
-					<generic>Amazon Time</generic>
-					<standard>Amazon Standard Time</standard>
-					<daylight>Amazon Summer Time</daylight>
+					<generic>Amazone-tijd</generic>
+					<standard>Amazone-standaardtijd</standard>
+					<daylight>Amazone-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Central Time</generic>
-					<standard>Central Standard Time</standard>
-					<daylight>Central Daylight Time</daylight>
+					<generic>Central-tijd</generic>
+					<standard>Central-standaardtijd</standard>
+					<daylight>Central-zomertijd</daylight>
 				</long>
 				<short>
 					<generic draft="contributed">CT</generic>
@@ -3959,9 +3946,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="America_Eastern">
 				<long>
-					<generic>Eastern Time</generic>
-					<standard>Eastern Standard Time</standard>
-					<daylight>Eastern Daylight Time</daylight>
+					<generic>Eastern-tijd</generic>
+					<standard>Eastern-standaardtijd</standard>
+					<daylight>Eastern-zomertijd</daylight>
 				</long>
 				<short>
 					<generic draft="contributed">ET</generic>
@@ -3971,9 +3958,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="America_Mountain">
 				<long>
-					<generic>Mountain Time</generic>
-					<standard>Mountain Standard Time</standard>
-					<daylight>Mountain Daylight Time</daylight>
+					<generic>Mountain-tijd</generic>
+					<standard>Mountain-standaardtijd</standard>
+					<daylight>Mountain-zomertijd</daylight>
 				</long>
 				<short>
 					<generic draft="contributed">MT</generic>
@@ -3983,9 +3970,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="America_Pacific">
 				<long>
-					<generic>Pacific Time</generic>
-					<standard>Pacific Standard Time</standard>
-					<daylight>Pacific Daylight Time</daylight>
+					<generic>Pacific-tijd</generic>
+					<standard>Pacific-standaardtijd</standard>
+					<daylight>Pacific-zomertijd</daylight>
 				</long>
 				<short>
 					<generic draft="contributed">PT</generic>
@@ -4030,16 +4017,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Argentina">
 				<long>
-					<generic>Argentina Time</generic>
-					<standard>Argentina Standard Time</standard>
-					<daylight>Argentina Summer Time</daylight>
+					<generic>Argentijnse tijd</generic>
+					<standard>Argentijnse standaardtijd</standard>
+					<daylight>Argentijnse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Argentina_Western">
 				<long>
-					<generic>Western Argentina Time</generic>
-					<standard>Western Argentina Standard Time</standard>
-					<daylight>Western Argentina Summer Time</daylight>
+					<generic>West-Argentijnse tijd</generic>
+					<standard>West-Argentijnse standaardtijd</standard>
+					<daylight>West-Argentijnse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Armenia">
@@ -4051,9 +4038,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic>Atlantic Time</generic>
-					<standard>Atlantic Standard Time</standard>
-					<daylight>Atlantic Daylight Time</daylight>
+					<generic>Atlantic-tijd</generic>
+					<standard>Atlantic-standaardtijd</standard>
+					<daylight>Atlantic-zomertijd</daylight>
 				</long>
 				<short>
 					<generic draft="contributed">AT</generic>
@@ -4117,14 +4104,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Bolivia">
 				<long>
-					<standard>Bolivia Time</standard>
+					<standard>Boliviaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Brasilia">
 				<long>
-					<generic>Brasilia Time</generic>
-					<standard>Brasilia Standard Time</standard>
-					<daylight>Brasilia Summer Time</daylight>
+					<generic>Braziliaanse tijd</generic>
+					<standard>Braziliaanse standaardtijd</standard>
+					<daylight>Braziliaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Brunei">
@@ -4158,9 +4145,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Chile">
 				<long>
-					<generic>Chile Time</generic>
-					<standard>Chile Standard Time</standard>
-					<daylight>Chile Summer Time</daylight>
+					<generic>Chileense tijd</generic>
+					<standard>Chileense standaardtijd</standard>
+					<daylight>Chileense zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="China">
@@ -4189,9 +4176,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Colombia">
 				<long>
-					<generic>Colombia Time</generic>
-					<standard>Colombia Standard Time</standard>
-					<daylight>Colombia Summer Time</daylight>
+					<generic>Colombiaanse tijd</generic>
+					<standard>Colombiaanse standaardtijd</standard>
+					<daylight>Colombiaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cook">
@@ -4203,9 +4190,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Cuba">
 				<long>
-					<generic>Cuba Time</generic>
-					<standard>Cuba Standard Time</standard>
-					<daylight>Cuba Daylight Time</daylight>
+					<generic>Cubaanse tijd</generic>
+					<standard>Cubaanse standaardtijd</standard>
+					<daylight>Cubaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Davis">
@@ -4225,14 +4212,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Easter">
 				<long>
-					<generic>Easter Island Time</generic>
-					<standard>Easter Island Standard Time</standard>
-					<daylight>Easter Island Summer Time</daylight>
+					<generic>Paaseilandse tijd</generic>
+					<standard>Paaseilandse standaardtijd</standard>
+					<daylight>Paaseilandse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Ecuador">
 				<long>
-					<standard>Ecuador Time</standard>
+					<standard>Ecuadoraanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Europe_Central">
@@ -4278,9 +4265,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Falkland">
 				<long>
-					<generic>Falkland Islands Time</generic>
-					<standard>Falkland Islands Standard Time</standard>
-					<daylight>Falkland Islands Summer Time</daylight>
+					<generic>Falklandeilandse tijd</generic>
+					<standard>Falklandeilandse standaardtijd</standard>
+					<daylight>Falklandeilandse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Fiji">
@@ -4292,7 +4279,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="French_Guiana">
 				<long>
-					<standard>French Guiana Time</standard>
+					<standard>Frans-Guyaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="French_Southern">
@@ -4302,7 +4289,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Galapagos">
 				<long>
-					<standard>Galapagos Time</standard>
+					<standard>Galapagoseilandse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Gambier">
@@ -4332,16 +4319,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Greenland_Eastern">
 				<long>
-					<generic>East Greenland Time</generic>
-					<standard>East Greenland Standard Time</standard>
-					<daylight>East Greenland Summer Time</daylight>
+					<generic>Oost-Groenlandse tijd</generic>
+					<standard>Oost-Groenlandse standaardtijd</standard>
+					<daylight>Oost-Groenlandse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Greenland_Western">
 				<long>
-					<generic>West Greenland Time</generic>
-					<standard>West Greenland Standard Time</standard>
-					<daylight>West Greenland Summer Time</daylight>
+					<generic>West-Groenlandse tijd</generic>
+					<standard>West-Groenlandse standaardtijd</standard>
+					<daylight>West-Groenlandse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Guam">
@@ -4356,14 +4343,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Guyana">
 				<long>
-					<standard>Guyana Time</standard>
+					<standard>Guyaanse tijd</standard>
 				</long>
 			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
-					<generic>Hawaii-Aleutian Time</generic>
-					<standard>Hawaii-Aleutian Standard Time</standard>
-					<daylight>Hawaii-Aleutian Daylight Time</daylight>
+					<generic>Hawaii-Aleoetische tijd</generic>
+					<standard>Hawaii-Aleoetische standaardtijd</standard>
+					<daylight>Hawaii-Aleoetische zomertijd</daylight>
 				</long>
 				<short>
 					<generic draft="contributed">HAT</generic>
@@ -4508,11 +4495,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Macause zomertijd</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie-eilandse tijd</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan-tijd</generic>
@@ -4552,18 +4534,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawson-tijd</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Northwest Mexico Time</generic>
-					<standard>Northwest Mexico Standard Time</standard>
-					<daylight>Northwest Mexico Daylight Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
-					<generic>Mexican Pacific Time</generic>
-					<standard>Mexican Pacific Standard Time</standard>
-					<daylight>Mexican Pacific Daylight Time</daylight>
+					<generic>Mexicaanse Pacific-tijd</generic>
+					<standard>Mexicaanse Pacific-standaardtijd</standard>
+					<daylight>Mexicaanse Pacific-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Mongolia">
@@ -4611,9 +4586,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Newfoundland">
 				<long>
-					<generic>Newfoundland Time</generic>
-					<standard>Newfoundland Standard Time</standard>
-					<daylight>Newfoundland Daylight Time</daylight>
+					<generic>Newfoundland-tijd</generic>
+					<standard>Newfoundland-standaardtijd</standard>
+					<daylight>Newfoundland-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Niue">
@@ -4630,9 +4605,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Noronha">
 				<long>
-					<generic>Fernando de Noronha Time</generic>
-					<standard>Fernando de Noronha Standard Time</standard>
-					<daylight>Fernando de Noronha Summer Time</daylight>
+					<generic>Fernando de Noronha-tijd</generic>
+					<standard>Fernando de Noronha-standaardtijd</standard>
+					<daylight>Fernando de Noronha-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="North_Mariana">
@@ -4673,16 +4648,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Paraguay">
 				<long>
-					<generic>Paraguay Time</generic>
-					<standard>Paraguay Standard Time</standard>
-					<daylight>Paraguay Summer Time</daylight>
+					<generic>Paraguayaanse tijd</generic>
+					<standard>Paraguayaanse standaardtijd</standard>
+					<daylight>Paraguayaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Peru">
 				<long>
-					<generic>Peru Time</generic>
-					<standard>Peru Standard Time</standard>
-					<daylight>Peru Summer Time</daylight>
+					<generic>Peruaanse tijd</generic>
+					<standard>Peruaanse standaardtijd</standard>
+					<daylight>Peruaanse zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Philippines">
@@ -4699,9 +4674,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Pierre_Miquelon">
 				<long>
-					<generic>St. Pierre &amp; Miquelon Time</generic>
-					<standard>St. Pierre &amp; Miquelon Standard Time</standard>
-					<daylight>St. Pierre &amp; Miquelon Daylight Time</daylight>
+					<generic>Saint Pierre en Miquelon-tijd</generic>
+					<standard>Saint Pierre en Miquelon-standaardtijd</standard>
+					<daylight>Saint Pierre en Miquelon-zomertijd</daylight>
 				</long>
 			</metazone>
 			<metazone type="Pitcairn">
@@ -4835,8 +4810,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Uruguay">
 				<long>
-					<generic>Uruguay Time</generic>
-					<standard>Uruguay Standard Time</standard>
+					<generic>Uruguayaanse tijd</generic>
+					<standard>Uruguayaanse standaardtijd</standard>
 					<daylight>Uruguayaanse zomertijd</daylight>
 				</long>
 			</metazone>
@@ -4904,7 +4879,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Yukon">
 				<long>
-					<standard>Yukon Time</standard>
+					<standard>Yukon-tijd</standard>
 				</long>
 			</metazone>
 		</timeZoneNames>
@@ -6058,6 +6033,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>Oost-Caribische dollar</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Caribische gulden</displayName>
+				<symbol alt="narrow">Cg</symbol>
+			</currency>
 			<currency type="XDR">
 				<displayName>Special Drawing Rights</displayName>
 			</currency>
diff --git a/make/data/cldr/common/main/nl_AW.xml b/make/data/cldr/common/main/nl_AW.xml
index 8c50225ecaf..e48888a9432 100644
--- a/make/data/cldr/common/main/nl_AW.xml
+++ b/make/data/cldr/common/main/nl_AW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nl_BE.xml b/make/data/cldr/common/main/nl_BE.xml
index 6aa80bb5ba6..36e44b41bc0 100644
--- a/make/data/cldr/common/main/nl_BE.xml
+++ b/make/data/cldr/common/main/nl_BE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nl_BQ.xml b/make/data/cldr/common/main/nl_BQ.xml
index f6a7ff1ed45..fb89bec8b13 100644
--- a/make/data/cldr/common/main/nl_BQ.xml
+++ b/make/data/cldr/common/main/nl_BQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nl_CW.xml b/make/data/cldr/common/main/nl_CW.xml
index 356769980c2..11c3f1a2f65 100644
--- a/make/data/cldr/common/main/nl_CW.xml
+++ b/make/data/cldr/common/main/nl_CW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nl_NL.xml b/make/data/cldr/common/main/nl_NL.xml
index c1029d8f90a..1a40318fdf1 100644
--- a/make/data/cldr/common/main/nl_NL.xml
+++ b/make/data/cldr/common/main/nl_NL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nl_SR.xml b/make/data/cldr/common/main/nl_SR.xml
index 4d87212fdbc..c3ae94252dd 100644
--- a/make/data/cldr/common/main/nl_SR.xml
+++ b/make/data/cldr/common/main/nl_SR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nl_SX.xml b/make/data/cldr/common/main/nl_SX.xml
index 362f8d5c9c1..e750bc82886 100644
--- a/make/data/cldr/common/main/nl_SX.xml
+++ b/make/data/cldr/common/main/nl_SX.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nmg.xml b/make/data/cldr/common/main/nmg.xml
index 340245d3698..1b0e1530bd7 100644
--- a/make/data/cldr/common/main/nmg.xml
+++ b/make/data/cldr/common/main/nmg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nmg_CM.xml b/make/data/cldr/common/main/nmg_CM.xml
index c31e6dc2d55..7cdc4c81e89 100644
--- a/make/data/cldr/common/main/nmg_CM.xml
+++ b/make/data/cldr/common/main/nmg_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nn.xml b/make/data/cldr/common/main/nn.xml
index 5e395043c29..3bdbc291fa5 100644
--- a/make/data/cldr/common/main/nn.xml
+++ b/make/data/cldr/common/main/nn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1422,13 +1422,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>mauritisk sommartid</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>tidssone for nordvestlege Mexico</generic>
-					<standard>normaltid for nordvestlege Mexico</standard>
-					<daylight>sommartid for nordvestlege Mexico</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>tidssone for den meksikanske stillehavskysten</generic>
diff --git a/make/data/cldr/common/main/nn_NO.xml b/make/data/cldr/common/main/nn_NO.xml
index c84a0bb5c90..8d15a18fed9 100644
--- a/make/data/cldr/common/main/nn_NO.xml
+++ b/make/data/cldr/common/main/nn_NO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nnh.xml b/make/data/cldr/common/main/nnh.xml
index c4998898298..9d7b4ab82e1 100644
--- a/make/data/cldr/common/main/nnh.xml
+++ b/make/data/cldr/common/main/nnh.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nnh_CM.xml b/make/data/cldr/common/main/nnh_CM.xml
index f40f38c3363..e4be7d0bed3 100644
--- a/make/data/cldr/common/main/nnh_CM.xml
+++ b/make/data/cldr/common/main/nnh_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/no.xml b/make/data/cldr/common/main/no.xml
index 3546bb19b62..d92734444e5 100644
--- a/make/data/cldr/common/main/no.xml
+++ b/make/data/cldr/common/main/no.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1284,7 +1284,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">telefonkatalogsortering</type>
 			<type key="collation" type="phonetic">fonetisk sortering</type>
 			<type key="collation" type="pinyin">pinyinsortering</type>
-			<type key="collation" type="reformed">reformert sortering</type>
 			<type key="collation" type="search">generelt søk</type>
 			<type key="collation" type="searchjl" draft="contributed">Søk etter første konsonant i hangul</type>
 			<type key="collation" type="standard">standard sorteringsrekkefølge</type>
@@ -3203,9 +3202,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>tidssone for {0}</regionFormat>
 			<regionFormat type="daylight">sommertid – {0}</regionFormat>
 			<regionFormat type="standard">normaltid – {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>koordinert universaltid</standard>
@@ -3229,9 +3225,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Brussel</exemplarCity>
 			</zone>
@@ -3479,12 +3472,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar-es-Salaam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzjhorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizjzja</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<short>
 					<generic draft="contributed">HST</generic>
@@ -4134,11 +4121,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Macau, sommertid</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>tidssone for Macquarieøya</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>tidssone for Magadan</generic>
@@ -4178,13 +4160,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>tidssone for Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>tidssone for nordvestlige Mexico</generic>
-					<standard>normaltid for nordvestlige Mexico</standard>
-					<daylight>sommertid for nordvestlige Mexico</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>tidssone for den meksikanske Stillehavskysten</generic>
diff --git a/make/data/cldr/common/main/nqo.xml b/make/data/cldr/common/main/nqo.xml
index 858570d7163..b6b0d597d69 100644
--- a/make/data/cldr/common/main/nqo.xml
+++ b/make/data/cldr/common/main/nqo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nqo_GN.xml b/make/data/cldr/common/main/nqo_GN.xml
index 3bde714a333..18820b62e57 100644
--- a/make/data/cldr/common/main/nqo_GN.xml
+++ b/make/data/cldr/common/main/nqo_GN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nr.xml b/make/data/cldr/common/main/nr.xml
index b6a2e502f2c..12f2badb7a9 100644
--- a/make/data/cldr/common/main/nr.xml
+++ b/make/data/cldr/common/main/nr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nr_ZA.xml b/make/data/cldr/common/main/nr_ZA.xml
index b009779e64c..a3d30e250b9 100644
--- a/make/data/cldr/common/main/nr_ZA.xml
+++ b/make/data/cldr/common/main/nr_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nso.xml b/make/data/cldr/common/main/nso.xml
index b783dfa44aa..2861eaab685 100644
--- a/make/data/cldr/common/main/nso.xml
+++ b/make/data/cldr/common/main/nso.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nso_ZA.xml b/make/data/cldr/common/main/nso_ZA.xml
index ae90284ca6b..dcb283d3b2c 100644
--- a/make/data/cldr/common/main/nso_ZA.xml
+++ b/make/data/cldr/common/main/nso_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nus.xml b/make/data/cldr/common/main/nus.xml
index e6244ed4d3f..fef478634ee 100644
--- a/make/data/cldr/common/main/nus.xml
+++ b/make/data/cldr/common/main/nus.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nus_SS.xml b/make/data/cldr/common/main/nus_SS.xml
index 57dc90e0f6f..8aa24a11103 100644
--- a/make/data/cldr/common/main/nus_SS.xml
+++ b/make/data/cldr/common/main/nus_SS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nv.xml b/make/data/cldr/common/main/nv.xml
index af444dad979..311f0fa810b 100644
--- a/make/data/cldr/common/main/nv.xml
+++ b/make/data/cldr/common/main/nv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nv_US.xml b/make/data/cldr/common/main/nv_US.xml
index fb4fee38263..09914927cd4 100644
--- a/make/data/cldr/common/main/nv_US.xml
+++ b/make/data/cldr/common/main/nv_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ny.xml b/make/data/cldr/common/main/ny.xml
index 3493063fb5d..54f19ee0fd1 100644
--- a/make/data/cldr/common/main/ny.xml
+++ b/make/data/cldr/common/main/ny.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ny_MW.xml b/make/data/cldr/common/main/ny_MW.xml
index acd7b467f2e..e8ac1b7925a 100644
--- a/make/data/cldr/common/main/ny_MW.xml
+++ b/make/data/cldr/common/main/ny_MW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nyn.xml b/make/data/cldr/common/main/nyn.xml
index f9f3867d0b5..cdb3cc3aa85 100644
--- a/make/data/cldr/common/main/nyn.xml
+++ b/make/data/cldr/common/main/nyn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/nyn_UG.xml b/make/data/cldr/common/main/nyn_UG.xml
index 5e90288970e..0594d79bfe9 100644
--- a/make/data/cldr/common/main/nyn_UG.xml
+++ b/make/data/cldr/common/main/nyn_UG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/oc.xml b/make/data/cldr/common/main/oc.xml
index 4f73324d5c5..9112d362b15 100644
--- a/make/data/cldr/common/main/oc.xml
+++ b/make/data/cldr/common/main/oc.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1711,11 +1711,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">ora d’estiu de Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">ora de l’illa Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="unconfirmed">ora de Magadan</generic>
@@ -1755,13 +1750,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">ora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">ora del nòrd-èst de Mexic</generic>
-					<standard draft="unconfirmed">ora estandarda del nòrd-èst de Mexic</standard>
-					<daylight draft="unconfirmed">ora d’estiu del nòrd-èst de Mexic</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">ora del Pacific Mexican</generic>
diff --git a/make/data/cldr/common/main/oc_ES.xml b/make/data/cldr/common/main/oc_ES.xml
index 7553860522f..98fc4cca45e 100644
--- a/make/data/cldr/common/main/oc_ES.xml
+++ b/make/data/cldr/common/main/oc_ES.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1230,9 +1230,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Simferopol">
 				<exemplarCity draft="unconfirmed">Simferòpol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">Zaporiyia</exemplarCity>
-			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity draft="unconfirmed">Beulah, Dakota deth Nòrd</exemplarCity>
 			</zone>
@@ -1671,11 +1668,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">ora des Espòrades Equatorials</standard>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">ora dera Isla Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="unconfirmed">ora de Magadan</generic>
@@ -1700,13 +1692,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">ora d’estiu de Maurici</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">ora deth nòrd-èst de Mexic</generic>
-					<standard draft="unconfirmed">ora estandard deth nòrd-èst de Mexic</standard>
-					<daylight draft="unconfirmed">ora d’estiu deth nòrd-èst de Mexic</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">ora deth Pacífic de Mexic</generic>
diff --git a/make/data/cldr/common/main/oc_FR.xml b/make/data/cldr/common/main/oc_FR.xml
index bd648173ca5..6018774650a 100644
--- a/make/data/cldr/common/main/oc_FR.xml
+++ b/make/data/cldr/common/main/oc_FR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/om.xml b/make/data/cldr/common/main/om.xml
index 42cf179b2fa..673379b1e8a 100644
--- a/make/data/cldr/common/main/om.xml
+++ b/make/data/cldr/common/main/om.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/om_ET.xml b/make/data/cldr/common/main/om_ET.xml
index a307367f36b..c4215878f67 100644
--- a/make/data/cldr/common/main/om_ET.xml
+++ b/make/data/cldr/common/main/om_ET.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/om_KE.xml b/make/data/cldr/common/main/om_KE.xml
index e9708ebea4c..5a9d5b20192 100644
--- a/make/data/cldr/common/main/om_KE.xml
+++ b/make/data/cldr/common/main/om_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/or.xml b/make/data/cldr/common/main/or.xml
index 24fb73de49b..a5680dfbb82 100644
--- a/make/data/cldr/common/main/or.xml
+++ b/make/data/cldr/common/main/or.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2089,9 +2089,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ମେଲବୋର୍ଣ୍ଣ</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>କ୍ୟୁରୀ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ହୋବାର୍ଟ୍‌</exemplarCity>
 			</zone>
@@ -2245,9 +2242,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>କ୍ରେଷ୍ଟୋନ୍</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ୟେଲ୍ଲୋନାଇଫ୍</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ଏଡମୋନଟୋନ୍</exemplarCity>
 			</zone>
@@ -2266,30 +2260,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ରିସୋଲୁଟେ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ରେଇନି ରିଭର୍</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ରାନକିନ୍ ଇନଲେଟ୍</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ଆଟିକୋକାନ୍</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ଥଣ୍ଡର୍ ବେ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ନିପିଗୋନ୍</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ଟୋରୋଣ୍ଟୋ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ଇକ୍ଵାଲୁଇଟ୍</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ପାଙ୍ଗନିର୍ଟୁଙ୍ଗ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ମାନକଟୋନ୍</exemplarCity>
 			</zone>
@@ -3103,18 +3085,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ଡର୍‌ ଇସ୍‌ ସାଲାମ</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ଉଜହୋରୋଦ୍</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>କିଏଭ୍</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ସିମଫେରୋପୋଲ୍</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ଜାପୋରୋଜହୟେ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>କାମ୍ପାଲା</exemplarCity>
 			</zone>
@@ -3133,9 +3109,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ହୋନୋଲୁଲୁ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ଜନଷ୍ଟନ୍</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ଆଙ୍କରେଜ୍</exemplarCity>
 			</zone>
@@ -3831,11 +3804,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>ମକାଓ ଗ୍ରୀଷ୍ମ ସମୟ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>ମାକ୍ୱେରୀ ଦ୍ୱୀପ ସମୟ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>ମାଗାଡାନ୍ ସମୟ</generic>
@@ -3875,13 +3843,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ମାୱସନ୍‌ ସମୟ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>ଉତ୍ତରପଶ୍ଚିମ ମେକ୍ସିକୋ ସମୟ</generic>
-					<standard>ଉତ୍ତରପଶ୍ଚିମ ମେକ୍ସିକୋ ମାନାଙ୍କ ସମୟ</standard>
-					<daylight>ଉତ୍ତରପଶ୍ଚିମ ମେକ୍ସିକୋ ଦିବାଲୋକ ସମୟ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>ମେକ୍ସିକାନ୍ ପାସିଫିକ୍ ସମୟ</generic>
diff --git a/make/data/cldr/common/main/or_IN.xml b/make/data/cldr/common/main/or_IN.xml
index 8aeab3ad919..509ddf974bc 100644
--- a/make/data/cldr/common/main/or_IN.xml
+++ b/make/data/cldr/common/main/or_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/os.xml b/make/data/cldr/common/main/os.xml
index a6e7e64b641..347fec989fa 100644
--- a/make/data/cldr/common/main/os.xml
+++ b/make/data/cldr/common/main/os.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/os_GE.xml b/make/data/cldr/common/main/os_GE.xml
index 20e78f85dba..fd327c6700d 100644
--- a/make/data/cldr/common/main/os_GE.xml
+++ b/make/data/cldr/common/main/os_GE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/os_RU.xml b/make/data/cldr/common/main/os_RU.xml
index 94c09c446ce..3653ce1d58b 100644
--- a/make/data/cldr/common/main/os_RU.xml
+++ b/make/data/cldr/common/main/os_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/osa.xml b/make/data/cldr/common/main/osa.xml
index 5527aacfb9e..43fc58c2334 100644
--- a/make/data/cldr/common/main/osa.xml
+++ b/make/data/cldr/common/main/osa.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/osa_US.xml b/make/data/cldr/common/main/osa_US.xml
index 9056a39064d..961506955d0 100644
--- a/make/data/cldr/common/main/osa_US.xml
+++ b/make/data/cldr/common/main/osa_US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pa.xml b/make/data/cldr/common/main/pa.xml
index 4336c600b8d..7e4c316934e 100644
--- a/make/data/cldr/common/main/pa.xml
+++ b/make/data/cldr/common/main/pa.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1957,9 +1957,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} ਵੇਲਾ</regionFormat>
 			<regionFormat type="daylight">{0} ਪ੍ਰਕਾਸ਼ ਵੇਲਾ</regionFormat>
 			<regionFormat type="standard">{0} ਮਿਆਰੀ ਵੇਲਾ</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>ਸੈਂਟਾ ਇਸਾਬੇਲ</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>ਕੋਔਰਡੀਨੇਟੇਡ ਵਿਆਪਕ ਵੇਲਾ</standard>
@@ -2082,9 +2079,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ਮੈਲਬੋਰਨ</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ਕਰੀ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ਹੋਬਾਰਟ</exemplarCity>
 			</zone>
@@ -2238,9 +2232,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ਕ੍ਰੈਸਟਨ</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ਯੈਲੋਨਾਈਫ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ਐਡਮੋਂਟਨ</exemplarCity>
 			</zone>
@@ -2259,30 +2250,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ਰੈਜ਼ੋਲਿਊਟ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ਰੇਨੀ ਰਿਵਰ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ਰੈਂਕਿਨ ਇਨਲੈਟ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ਐਟੀਕੋਕਨ</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ਥੰਡਰ ਬੇ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ਨਿਪਿਗੌਨ</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ਟੋਰਾਂਟੋ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ਇਕਾਲੁਈਟ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ਪੈਂਗਨਿਰਟੰਗ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ਮੋਂਕਟਨ</exemplarCity>
 			</zone>
@@ -3096,18 +3075,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ਦਾਰ ਏਸ ਸਲਾਮ</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ਉਜ਼ਗੋਰੋਡ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>ਕੀਵ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ਸਿਮਫਰੋਪੋਲ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ਜਪੋਰੋਜ਼ਾਏ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>ਕੰਪਾਲਾ</exemplarCity>
 			</zone>
@@ -3126,9 +3099,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ਹੋਨੋਲੁਲੂ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ਜੋਨਸਟਨ</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ਐਂਕਰੇਜ</exemplarCity>
 			</zone>
@@ -3810,11 +3780,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>ਮਕਾਉ ਗਰਮੀ-ਰੁੱਤ ਸਮਾਂ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>ਮੈਕਕਵੇਰੀ ਆਈਲੈਂਡ ਵੇਲਾ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>ਮੈਗੇਡਨ ਵੇਲਾ</generic>
@@ -3854,13 +3819,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ਮੌਸਨ ਵੇਲਾ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>ਉੱਤਰ ਪੱਛਮੀ ਮੈਕਸੀਕੋ ਵੇਲਾ</generic>
-					<standard>ਉੱਤਰ ਪੱਛਮੀ ਮੈਕਸੀਕੋ ਮਿਆਰੀ ਵੇਲਾ</standard>
-					<daylight>ਉੱਤਰ ਪੱਛਮੀ ਮੈਕਸੀਕੋ ਪ੍ਰਕਾਸ਼ ਵੇਲਾ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>ਮੈਕਸੀਕਨ ਪੈਸਿਫਿਕ ਵੇਲਾ</generic>
diff --git a/make/data/cldr/common/main/pa_Arab.xml b/make/data/cldr/common/main/pa_Arab.xml
index 1eac0c10f15..711493803ea 100644
--- a/make/data/cldr/common/main/pa_Arab.xml
+++ b/make/data/cldr/common/main/pa_Arab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pa_Arab_PK.xml b/make/data/cldr/common/main/pa_Arab_PK.xml
index 14d9e8cb434..b5fbaba6dd5 100644
--- a/make/data/cldr/common/main/pa_Arab_PK.xml
+++ b/make/data/cldr/common/main/pa_Arab_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pa_Guru.xml b/make/data/cldr/common/main/pa_Guru.xml
index 4481adce1bf..7404e53d47e 100644
--- a/make/data/cldr/common/main/pa_Guru.xml
+++ b/make/data/cldr/common/main/pa_Guru.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pa_Guru_IN.xml b/make/data/cldr/common/main/pa_Guru_IN.xml
index 6feaf212303..0373b1e6094 100644
--- a/make/data/cldr/common/main/pa_Guru_IN.xml
+++ b/make/data/cldr/common/main/pa_Guru_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pap.xml b/make/data/cldr/common/main/pap.xml
index 25f47f85795..c3fd361f473 100644
--- a/make/data/cldr/common/main/pap.xml
+++ b/make/data/cldr/common/main/pap.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -331,7 +331,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
 							<greatestDifference id="d" draft="unconfirmed">E, d MMM – d MMM y G</greatestDifference>
-							<greatestDifference id="G" draft="unconfirmed">E, d MMM y G  – E, d MMM y G</greatestDifference>
+							<greatestDifference id="G" draft="unconfirmed">E, d MMM y G – E, d MMM y G</greatestDifference>
 							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y G</greatestDifference>
 							<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y G</greatestDifference>
 						</intervalFormatItem>
@@ -616,7 +616,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d" draft="unconfirmed">d–d MMM</greatestDifference>
-							<greatestDifference id="M" draft="unconfirmed">d MMM  – d MMM</greatestDifference>
+							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
diff --git a/make/data/cldr/common/main/pap_AW.xml b/make/data/cldr/common/main/pap_AW.xml
index 0b4b9f459e8..fe75adea332 100644
--- a/make/data/cldr/common/main/pap_AW.xml
+++ b/make/data/cldr/common/main/pap_AW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pap_CW.xml b/make/data/cldr/common/main/pap_CW.xml
index d3e92b3856d..30f9b0a6471 100644
--- a/make/data/cldr/common/main/pap_CW.xml
+++ b/make/data/cldr/common/main/pap_CW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pcm.xml b/make/data/cldr/common/main/pcm.xml
index f8db8811623..c35230097e0 100644
--- a/make/data/cldr/common/main/pcm.xml
+++ b/make/data/cldr/common/main/pcm.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1779,9 +1779,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Mẹ́lbọn</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kọ́ri</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Hóbat</exemplarCity>
 			</zone>
@@ -1926,9 +1923,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>Krẹ́stọn</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Yẹ́lónaif</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Ẹ́dmọ́ntọn</exemplarCity>
 			</zone>
@@ -1947,30 +1941,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>Rẹ́zólut</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Réní Ríva</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ránkín Ínlẹt</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Atíkókan</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tọ́nda Bè</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nípígọn</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Torónto</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikáluit</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnírtung</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Mọ́nktọn</exemplarCity>
 			</zone>
@@ -2748,18 +2730,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar ẹ́s Salam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ọ́zhọrọd</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiẹv</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Símfẹrópol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporózhia</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kampála</exemplarCity>
 			</zone>
@@ -2775,9 +2751,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Nome">
 				<exemplarCity>Noom</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Jọ́nstun</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ánkọ́rej</exemplarCity>
 			</zone>
@@ -3410,11 +3383,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Lọd Haú Délaít Taim</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Makwuéí Aíland Taim</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Mágádan Taim</generic>
@@ -3454,13 +3422,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mọ́sọn Taim</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Nọ́twẹ́st Mẹ́ksíko Taim</generic>
-					<standard>Nọ́twẹ́st Mẹ́ksíko Fíksd Taim</standard>
-					<daylight>Nọ́twẹ́st Mẹ́ksíko Délaít Taim</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mẹ́ksíkó Pasífík Taim</generic>
diff --git a/make/data/cldr/common/main/pcm_NG.xml b/make/data/cldr/common/main/pcm_NG.xml
index 5d1bbae805a..83ecba1e4aa 100644
--- a/make/data/cldr/common/main/pcm_NG.xml
+++ b/make/data/cldr/common/main/pcm_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pis.xml b/make/data/cldr/common/main/pis.xml
index af211ba9a39..65d4c579ca4 100644
--- a/make/data/cldr/common/main/pis.xml
+++ b/make/data/cldr/common/main/pis.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pis_SB.xml b/make/data/cldr/common/main/pis_SB.xml
index 72e14ac3578..0463fa6cd0c 100644
--- a/make/data/cldr/common/main/pis_SB.xml
+++ b/make/data/cldr/common/main/pis_SB.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pl.xml b/make/data/cldr/common/main/pl.xml
index e77d953415e..81ae0f081be 100644
--- a/make/data/cldr/common/main/pl.xml
+++ b/make/data/cldr/common/main/pl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1255,7 +1255,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">porządek sortowania książki telefonicznej</type>
 			<type key="collation" type="phonetic">sortowanie fonetyczne</type>
 			<type key="collation" type="pinyin">porządek sortowania pinyin</type>
-			<type key="collation" type="reformed">sortowanie zreformowane</type>
 			<type key="collation" type="search">wyszukiwanie ogólnego zastosowania</type>
 			<type key="collation" type="searchjl" draft="contributed">Wyszukiwanie według początkowej spółgłoski hangul</type>
 			<type key="collation" type="standard">standardowa kolejność sortowania</type>
@@ -2662,9 +2661,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>czas: {0}</regionFormat>
 			<regionFormat type="daylight">{0} (czas letni)</regionFormat>
 			<regionFormat type="standard">{0} (czas standardowy)</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>uniwersalny czas koordynowany</standard>
@@ -2694,9 +2690,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wiedeń</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Mariehamn">
 				<exemplarCity>Maarianhamina</exemplarCity>
 			</zone>
@@ -3194,18 +3187,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Taipei">
 				<exemplarCity>Tajpej</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Użgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kijów</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Symferopol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporoże</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3798,11 +3785,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Lord Howe (czas letni)</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>czas Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>czas Magadan</generic>
@@ -3842,13 +3824,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>czas Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>czas Meksyk Północno-Zachodni</generic>
-					<standard>Meksyk Północno-Zachodni (czas standardowy)</standard>
-					<daylight>Meksyk Północno-Zachodni (czas letni)</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksyk (czas pacyficzny)</generic>
diff --git a/make/data/cldr/common/main/pl_PL.xml b/make/data/cldr/common/main/pl_PL.xml
index 6d97184d98e..4ee13a842d8 100644
--- a/make/data/cldr/common/main/pl_PL.xml
+++ b/make/data/cldr/common/main/pl_PL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/prg.xml b/make/data/cldr/common/main/prg.xml
index 50fc4ff3893..2be8a674c6a 100644
--- a/make/data/cldr/common/main/prg.xml
+++ b/make/data/cldr/common/main/prg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/prg_PL.xml b/make/data/cldr/common/main/prg_PL.xml
index 6ac9dba73df..95506f645ed 100644
--- a/make/data/cldr/common/main/prg_PL.xml
+++ b/make/data/cldr/common/main/prg_PL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ps.xml b/make/data/cldr/common/main/ps.xml
index 4b6d562e084..6ab37082d49 100644
--- a/make/data/cldr/common/main/ps.xml
+++ b/make/data/cldr/common/main/ps.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1859,9 +1859,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>میلبورن</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>کرري</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>هوبارټ</exemplarCity>
 			</zone>
@@ -2015,9 +2012,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>کرسټون</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>يلونايف</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ایډمونټن</exemplarCity>
 			</zone>
@@ -2036,30 +2030,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>ريسالوټ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>د باران باران</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>رينکن انلټ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>اتیکوکن</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>تنډر بی</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>نیپګون</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ټورنټو</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>اقلیټ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>پينګنرچونګ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>مونکټون</exemplarCity>
 			</zone>
@@ -2870,18 +2852,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>دار السلام</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>یوژورډ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>کیف</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>سیمفروپول</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>زاپوروژی</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>کمپاله</exemplarCity>
 			</zone>
@@ -2900,9 +2876,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>هینولولو</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>جانسټن</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>اینکریج</exemplarCity>
 			</zone>
@@ -3538,11 +3511,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>لارډ هوي د ورځې روښانه وخت</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>مکواري ټاپو وخت</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>ميګډان وخت</generic>
@@ -3582,13 +3550,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ماوسن وخت</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>د شمال لویدیځ مکسیکو وخت</generic>
-					<standard>د شمال لویدیځ مکسیکو معیاري وخت</standard>
-					<daylight>د شمال لویدیځ مکسیکو رڼا ورځې وخت</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>مکسیکن پیسفک وخت</generic>
diff --git a/make/data/cldr/common/main/ps_AF.xml b/make/data/cldr/common/main/ps_AF.xml
index 03565b354ce..ba7f778fdc9 100644
--- a/make/data/cldr/common/main/ps_AF.xml
+++ b/make/data/cldr/common/main/ps_AF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ps_PK.xml b/make/data/cldr/common/main/ps_PK.xml
index 38a7c4d0ef7..ef66321643b 100644
--- a/make/data/cldr/common/main/ps_PK.xml
+++ b/make/data/cldr/common/main/ps_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -202,11 +202,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>رب هاو د ورځے د رڼا وخت</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<daylight>د شمال لویدیځ مکسیکو رڼا ورځے وخت</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<daylight>مکسیکن پیسفک رڼا ورځے وخت</daylight>
diff --git a/make/data/cldr/common/main/pt.xml b/make/data/cldr/common/main/pt.xml
index 3386faf6bda..83930b83c24 100644
--- a/make/data/cldr/common/main/pt.xml
+++ b/make/data/cldr/common/main/pt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1140,7 +1140,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Ordem de lista telefônica</type>
 			<type key="collation" type="phonetic">Ordem de classificação fonética</type>
 			<type key="collation" type="pinyin">Ordem Pin-yin</type>
-			<type key="collation" type="reformed">Ordem reformulada</type>
 			<type key="collation" type="search">Pesquisa de uso geral</type>
 			<type key="collation" type="searchjl" draft="contributed">Pesquisar por consonante inicial hangul</type>
 			<type key="collation" type="standard">Ordem padrão</type>
@@ -2344,9 +2343,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Horário {0}</regionFormat>
 			<regionFormat type="daylight">Horário de Verão: {0}</regionFormat>
 			<regionFormat type="standard">Horário Padrão: {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Horário Universal Coordenado</standard>
@@ -2376,9 +2372,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Dacca</exemplarCity>
 			</zone>
@@ -2750,9 +2743,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizhia</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3378,11 +3368,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Horário de Verão de Macau</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Horário da Ilha Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Horário de Magadan</generic>
@@ -3422,13 +3407,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Horário de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Horário do Noroeste do México</generic>
-					<standard>Horário Padrão do Noroeste do México</standard>
-					<daylight>Horário de Verão do Noroeste do México</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Horário do Pacífico Mexicano</generic>
diff --git a/make/data/cldr/common/main/pt_AO.xml b/make/data/cldr/common/main/pt_AO.xml
index 1f88da03b8b..9607bce2383 100644
--- a/make/data/cldr/common/main/pt_AO.xml
+++ b/make/data/cldr/common/main/pt_AO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_BR.xml b/make/data/cldr/common/main/pt_BR.xml
index 7b33b1da354..d56d9554f77 100644
--- a/make/data/cldr/common/main/pt_BR.xml
+++ b/make/data/cldr/common/main/pt_BR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_CH.xml b/make/data/cldr/common/main/pt_CH.xml
index a55d5c546b7..5b8ad6f5143 100644
--- a/make/data/cldr/common/main/pt_CH.xml
+++ b/make/data/cldr/common/main/pt_CH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_CV.xml b/make/data/cldr/common/main/pt_CV.xml
index 27562ab33b0..1d9d5db0e2d 100644
--- a/make/data/cldr/common/main/pt_CV.xml
+++ b/make/data/cldr/common/main/pt_CV.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_GQ.xml b/make/data/cldr/common/main/pt_GQ.xml
index 859448ceb3b..b9d78e6a6f1 100644
--- a/make/data/cldr/common/main/pt_GQ.xml
+++ b/make/data/cldr/common/main/pt_GQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_GW.xml b/make/data/cldr/common/main/pt_GW.xml
index 39a465e162c..bb9b77b7d96 100644
--- a/make/data/cldr/common/main/pt_GW.xml
+++ b/make/data/cldr/common/main/pt_GW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_LU.xml b/make/data/cldr/common/main/pt_LU.xml
index 60c6bb06fb6..c4ca53f2af2 100644
--- a/make/data/cldr/common/main/pt_LU.xml
+++ b/make/data/cldr/common/main/pt_LU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_MO.xml b/make/data/cldr/common/main/pt_MO.xml
index 5982c44b432..a5806b02ca4 100644
--- a/make/data/cldr/common/main/pt_MO.xml
+++ b/make/data/cldr/common/main/pt_MO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_MZ.xml b/make/data/cldr/common/main/pt_MZ.xml
index 6c9a3b16690..b056c0ac5d5 100644
--- a/make/data/cldr/common/main/pt_MZ.xml
+++ b/make/data/cldr/common/main/pt_MZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_PT.xml b/make/data/cldr/common/main/pt_PT.xml
index 32345e1c47e..54bbe87de2a 100644
--- a/make/data/cldr/common/main/pt_PT.xml
+++ b/make/data/cldr/common/main/pt_PT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -2036,11 +2036,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Hora de verão de Macau</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Hora da Ilha Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Hora de Magadan</generic>
@@ -2080,13 +2075,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Hora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Hora do Noroeste do México</generic>
-					<standard>Hora padrão do Noroeste do México</standard>
-					<daylight>Hora de verão do Noroeste do México</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Hora do Pacífico Mexicano</generic>
diff --git a/make/data/cldr/common/main/pt_ST.xml b/make/data/cldr/common/main/pt_ST.xml
index 19a58862c51..5328acab556 100644
--- a/make/data/cldr/common/main/pt_ST.xml
+++ b/make/data/cldr/common/main/pt_ST.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/pt_TL.xml b/make/data/cldr/common/main/pt_TL.xml
index 32f76a2743b..488246ffbde 100644
--- a/make/data/cldr/common/main/pt_TL.xml
+++ b/make/data/cldr/common/main/pt_TL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/qu.xml b/make/data/cldr/common/main/qu.xml
index c6b3e71d36b..f6994d2832b 100644
--- a/make/data/cldr/common/main/qu.xml
+++ b/make/data/cldr/common/main/qu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1505,9 +1505,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Adelaide">
 				<exemplarCity>Adelaida</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Sidney</exemplarCity>
 			</zone>
@@ -2271,11 +2268,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Hora de Verano de Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Hora de Isla Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Hora de Magadan</generic>
@@ -2315,13 +2307,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Hora Estandar de Verano de México</generic>
-					<standard>Hora Estandar del Noroeste de México</standard>
-					<daylight>Hora de Verano del Noroeste de México</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Hora del Pacífico Mexicano</generic>
diff --git a/make/data/cldr/common/main/qu_BO.xml b/make/data/cldr/common/main/qu_BO.xml
index cdfcca85645..7eba6f91da0 100644
--- a/make/data/cldr/common/main/qu_BO.xml
+++ b/make/data/cldr/common/main/qu_BO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/qu_EC.xml b/make/data/cldr/common/main/qu_EC.xml
index 754bb8c91e3..2cfdf0b5e0a 100644
--- a/make/data/cldr/common/main/qu_EC.xml
+++ b/make/data/cldr/common/main/qu_EC.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/qu_PE.xml b/make/data/cldr/common/main/qu_PE.xml
index 534932b04b8..7018e5d4942 100644
--- a/make/data/cldr/common/main/qu_PE.xml
+++ b/make/data/cldr/common/main/qu_PE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/quc.xml b/make/data/cldr/common/main/quc.xml
index 9a33eca95db..a30a30b9b7e 100644
--- a/make/data/cldr/common/main/quc.xml
+++ b/make/data/cldr/common/main/quc.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/quc_GT.xml b/make/data/cldr/common/main/quc_GT.xml
index 2c64b467b7d..1a1549c4b9b 100644
--- a/make/data/cldr/common/main/quc_GT.xml
+++ b/make/data/cldr/common/main/quc_GT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/raj.xml b/make/data/cldr/common/main/raj.xml
index d3286df9f9b..55569ec849c 100644
--- a/make/data/cldr/common/main/raj.xml
+++ b/make/data/cldr/common/main/raj.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/raj_IN.xml b/make/data/cldr/common/main/raj_IN.xml
index 37d9b4cbc5d..a2e6c9c10c5 100644
--- a/make/data/cldr/common/main/raj_IN.xml
+++ b/make/data/cldr/common/main/raj_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rhg.xml b/make/data/cldr/common/main/rhg.xml
index 530c8f0be75..f100e9155f2 100644
--- a/make/data/cldr/common/main/rhg.xml
+++ b/make/data/cldr/common/main/rhg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rhg_Rohg.xml b/make/data/cldr/common/main/rhg_Rohg.xml
index 351938d4f6d..f88501c90b1 100644
--- a/make/data/cldr/common/main/rhg_Rohg.xml
+++ b/make/data/cldr/common/main/rhg_Rohg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rhg_Rohg_BD.xml b/make/data/cldr/common/main/rhg_Rohg_BD.xml
index 9cd4f6428ba..97fcdfdc9fd 100644
--- a/make/data/cldr/common/main/rhg_Rohg_BD.xml
+++ b/make/data/cldr/common/main/rhg_Rohg_BD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rhg_Rohg_MM.xml b/make/data/cldr/common/main/rhg_Rohg_MM.xml
index 1a5e3a3b9d8..516f2632466 100644
--- a/make/data/cldr/common/main/rhg_Rohg_MM.xml
+++ b/make/data/cldr/common/main/rhg_Rohg_MM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rif.xml b/make/data/cldr/common/main/rif.xml
index 5fc7882b682..f76062cca82 100644
--- a/make/data/cldr/common/main/rif.xml
+++ b/make/data/cldr/common/main/rif.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1288,13 +1288,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">akud n uzil n haway-alucyan</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">akud n sennej i lɣerb n miksiku</generic>
-					<standard draft="unconfirmed">akud anaway n sennej i lɣerb n miksiku</standard>
-					<daylight draft="unconfirmed">akud n uzil n sennej i lɣerb n miksiku</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">akud n pasifik amiksikan</generic>
diff --git a/make/data/cldr/common/main/rif_MA.xml b/make/data/cldr/common/main/rif_MA.xml
index b099abe9ca4..cb1758ce486 100644
--- a/make/data/cldr/common/main/rif_MA.xml
+++ b/make/data/cldr/common/main/rif_MA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rm.xml b/make/data/cldr/common/main/rm.xml
index efabbdb3fd0..0b7bc117042 100644
--- a/make/data/cldr/common/main/rm.xml
+++ b/make/data/cldr/common/main/rm.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2002,12 +2002,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity draft="contributed">Daressalam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uschhorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="contributed">Saporischja</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity draft="contributed">Alasca</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/rm_CH.xml b/make/data/cldr/common/main/rm_CH.xml
index 3fa28bb6ffc..89fa47c46fc 100644
--- a/make/data/cldr/common/main/rm_CH.xml
+++ b/make/data/cldr/common/main/rm_CH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rn.xml b/make/data/cldr/common/main/rn.xml
index 4e9893319d6..b9863f0374b 100644
--- a/make/data/cldr/common/main/rn.xml
+++ b/make/data/cldr/common/main/rn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rn_BI.xml b/make/data/cldr/common/main/rn_BI.xml
index 2cc7c75231c..5d22cd47227 100644
--- a/make/data/cldr/common/main/rn_BI.xml
+++ b/make/data/cldr/common/main/rn_BI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ro.xml b/make/data/cldr/common/main/ro.xml
index 1de4dede84f..633dacc18c1 100644
--- a/make/data/cldr/common/main/ro.xml
+++ b/make/data/cldr/common/main/ro.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1263,7 +1263,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">ordine de sortare după cartea de telefon</type>
 			<type key="collation" type="phonetic">ordine de sortare fonetică</type>
 			<type key="collation" type="pinyin">ordine de sortare pinyin</type>
-			<type key="collation" type="reformed">ordine de sortare reformată</type>
 			<type key="collation" type="search">căutare cu scop general</type>
 			<type key="collation" type="searchjl" draft="contributed">Căutați în funcție de consoana inițială hangul</type>
 			<type key="collation" type="standard">ordine de sortare standard</type>
@@ -2876,9 +2875,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Ora din {0}</regionFormat>
 			<regionFormat type="daylight">Ora de vară din {0}</regionFormat>
 			<regionFormat type="standard">Ora standard din {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Timpul universal coordonat</standard>
@@ -2899,9 +2895,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viena</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Dacca</exemplarCity>
 			</zone>
@@ -3138,15 +3131,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Ashgabat">
 				<exemplarCity>Așgabat</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ujhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporoje</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3731,11 +3718,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Ora de vară din Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Ora din Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Ora din Magadan</generic>
@@ -3775,13 +3757,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ora din Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Ora Mexicului de nord-vest</generic>
-					<standard>Ora standard a Mexicului de nord-vest</standard>
-					<daylight>Ora de vară a Mexicului de nord-vest</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Ora zonei Pacific mexicane</generic>
diff --git a/make/data/cldr/common/main/ro_MD.xml b/make/data/cldr/common/main/ro_MD.xml
index fce068968ee..b48cb292501 100644
--- a/make/data/cldr/common/main/ro_MD.xml
+++ b/make/data/cldr/common/main/ro_MD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ro_RO.xml b/make/data/cldr/common/main/ro_RO.xml
index afa4e5f5439..ffa86ea3d2d 100644
--- a/make/data/cldr/common/main/ro_RO.xml
+++ b/make/data/cldr/common/main/ro_RO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rof.xml b/make/data/cldr/common/main/rof.xml
index c69cf20abd3..c174f7f1a01 100644
--- a/make/data/cldr/common/main/rof.xml
+++ b/make/data/cldr/common/main/rof.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rof_TZ.xml b/make/data/cldr/common/main/rof_TZ.xml
index f5738ee3f34..4edf5689c7e 100644
--- a/make/data/cldr/common/main/rof_TZ.xml
+++ b/make/data/cldr/common/main/rof_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/root.xml b/make/data/cldr/common/main/root.xml
index 56cf38d18d4..12c883da38f 100644
--- a/make/data/cldr/common/main/root.xml
+++ b/make/data/cldr/common/main/root.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 the U.S. and other countries. CLDR data files are interpreted according to
@@ -2907,6 +2907,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/St_Johns">
 				<exemplarCity>St. John’s</exemplarCity>
 			</zone>
+			<zone type="America/Curacao">
+				<exemplarCity>Curaçao</exemplarCity>
+			</zone>
 			<zone type="Africa/Asmera">
 				<exemplarCity>Asmara</exemplarCity>
 			</zone>
@@ -2955,9 +2958,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Katmandu">
 				<exemplarCity>Kathmandu</exemplarCity>
 			</zone>
+			<zone type="America/Asuncion">
+				<exemplarCity>Asunción</exemplarCity>
+			</zone>
+			<zone type="Indian/Reunion">
+				<exemplarCity>Réunion</exemplarCity>
+			</zone>
 			<zone type="Atlantic/St_Helena">
 				<exemplarCity>St. Helena</exemplarCity>
 			</zone>
+			<zone type="Africa/Sao_Tome">
+				<exemplarCity>São Tomé</exemplarCity>
+			</zone>
 			<zone type="America/Lower_Princes">
 				<exemplarCity>Lower Prince’s Quarter</exemplarCity>
 			</zone>
@@ -3006,18 +3018,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Saigon">
 				<exemplarCity>Ho Chi Minh</exemplarCity>
 			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>São Tomé</exemplarCity>
-			</zone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
@@ -4516,6 +4516,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<symbol>EC$</symbol>
 				<symbol alt="narrow">$</symbol>
 			</currency>
+			<currency type="XCG">
+				<symbol>Cg.</symbol>
+			</currency>
 			<currency type="XOF">
 				<symbol>F CFA</symbol>
 			</currency>
diff --git a/make/data/cldr/common/main/ru.xml b/make/data/cldr/common/main/ru.xml
index 33bfffbc007..5041858c92b 100644
--- a/make/data/cldr/common/main/ru.xml
+++ b/make/data/cldr/common/main/ru.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1170,7 +1170,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">порядок телефонной книги</type>
 			<type key="collation" type="phonetic">фонетический порядок сортировки</type>
 			<type key="collation" type="pinyin">пиньинь</type>
-			<type key="collation" type="reformed">реформированный порядок сортировки</type>
 			<type key="collation" type="search">поиск</type>
 			<type key="collation" type="searchjl" draft="contributed">Поиск по первой согласной хангыль</type>
 			<type key="collation" type="standard">стандартная сортировка</type>
@@ -3325,9 +3324,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<regionFormat type="daylight">{0}, летнее время</regionFormat>
 			<regionFormat type="standard">{0}, стандартное время</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Санта-Изабел</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Всемирное координированное время</standard>
@@ -3450,9 +3446,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мельбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Керри</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -3606,9 +3599,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Йеллоунайф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Эдмонтон</exemplarCity>
 			</zone>
@@ -3627,30 +3617,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Резольют</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейни-Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ранкин-Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Корал-Харбор</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Икалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртанг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -4464,18 +4442,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар-эс-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Киев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферополь</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожье</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -4494,9 +4466,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Гонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Джонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Анкоридж</exemplarCity>
 			</zone>
@@ -5196,11 +5165,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Макао, летнее время</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Маккуори</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магадан</generic>
@@ -5240,13 +5204,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Моусон</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Северо-западное мексиканское время</generic>
-					<standard>Северо-западное мексиканское стандартное время</standard>
-					<daylight>Северо-западное мексиканское летнее время</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Тихоокеанское мексиканское время</generic>
diff --git a/make/data/cldr/common/main/ru_BY.xml b/make/data/cldr/common/main/ru_BY.xml
index aa9e115642e..785bc7e8160 100644
--- a/make/data/cldr/common/main/ru_BY.xml
+++ b/make/data/cldr/common/main/ru_BY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ru_KG.xml b/make/data/cldr/common/main/ru_KG.xml
index ada0ba6f8de..52d7a7b1999 100644
--- a/make/data/cldr/common/main/ru_KG.xml
+++ b/make/data/cldr/common/main/ru_KG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ru_KZ.xml b/make/data/cldr/common/main/ru_KZ.xml
index 6bf4132802a..af683f7fe06 100644
--- a/make/data/cldr/common/main/ru_KZ.xml
+++ b/make/data/cldr/common/main/ru_KZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ru_MD.xml b/make/data/cldr/common/main/ru_MD.xml
index 9640c522c41..f4a39c6903b 100644
--- a/make/data/cldr/common/main/ru_MD.xml
+++ b/make/data/cldr/common/main/ru_MD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ru_RU.xml b/make/data/cldr/common/main/ru_RU.xml
index 1e78c6fc019..aa008c5f446 100644
--- a/make/data/cldr/common/main/ru_RU.xml
+++ b/make/data/cldr/common/main/ru_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ru_UA.xml b/make/data/cldr/common/main/ru_UA.xml
index ce9396a0f38..2b45e4bf7fc 100644
--- a/make/data/cldr/common/main/ru_UA.xml
+++ b/make/data/cldr/common/main/ru_UA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rw.xml b/make/data/cldr/common/main/rw.xml
index c62908a7d75..b2e103528ac 100644
--- a/make/data/cldr/common/main/rw.xml
+++ b/make/data/cldr/common/main/rw.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rw_RW.xml b/make/data/cldr/common/main/rw_RW.xml
index 89525f3cf27..3884fab8cf2 100644
--- a/make/data/cldr/common/main/rw_RW.xml
+++ b/make/data/cldr/common/main/rw_RW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rwk.xml b/make/data/cldr/common/main/rwk.xml
index 31977128ac3..9a32f8431e7 100644
--- a/make/data/cldr/common/main/rwk.xml
+++ b/make/data/cldr/common/main/rwk.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/rwk_TZ.xml b/make/data/cldr/common/main/rwk_TZ.xml
index 12f3bbf8d0d..93a91aee965 100644
--- a/make/data/cldr/common/main/rwk_TZ.xml
+++ b/make/data/cldr/common/main/rwk_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sa.xml b/make/data/cldr/common/main/sa.xml
index dc6ed4ee206..d65097b3366 100644
--- a/make/data/cldr/common/main/sa.xml
+++ b/make/data/cldr/common/main/sa.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sa_IN.xml b/make/data/cldr/common/main/sa_IN.xml
index 628f1753f19..dec966c92af 100644
--- a/make/data/cldr/common/main/sa_IN.xml
+++ b/make/data/cldr/common/main/sa_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sah.xml b/make/data/cldr/common/main/sah.xml
index 1b683a56db4..5d89d39f07b 100644
--- a/make/data/cldr/common/main/sah.xml
+++ b/make/data/cldr/common/main/sah.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sah_RU.xml b/make/data/cldr/common/main/sah_RU.xml
index 20a8d235330..6ea7810b7bf 100644
--- a/make/data/cldr/common/main/sah_RU.xml
+++ b/make/data/cldr/common/main/sah_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/saq.xml b/make/data/cldr/common/main/saq.xml
index 587b3e8c9ad..8c975679f0f 100644
--- a/make/data/cldr/common/main/saq.xml
+++ b/make/data/cldr/common/main/saq.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/saq_KE.xml b/make/data/cldr/common/main/saq_KE.xml
index a6de1faba63..f2781b159ac 100644
--- a/make/data/cldr/common/main/saq_KE.xml
+++ b/make/data/cldr/common/main/saq_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sat.xml b/make/data/cldr/common/main/sat.xml
index 0319b7a4db6..49b72a15b46 100644
--- a/make/data/cldr/common/main/sat.xml
+++ b/make/data/cldr/common/main/sat.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1478,9 +1478,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity draft="unconfirmed">ᱠᱨᱮᱥᱴᱚᱱ</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity draft="unconfirmed">ᱭᱮᱞᱚᱱᱟᱭᱤᱯᱷ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity draft="unconfirmed">ᱮᱰᱢᱚᱱᱴᱚᱱ</exemplarCity>
 			</zone>
@@ -1499,30 +1496,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity draft="unconfirmed">ᱨᱤᱥᱚᱞᱭᱩᱴ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity draft="unconfirmed">ᱨᱚᱱᱤ ᱜᱟᱰᱟ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity draft="unconfirmed">ᱨᱟᱱᱠᱤᱱ ᱤᱱᱞᱮᱴ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity draft="unconfirmed">ᱟᱴᱤᱠᱚᱠᱟᱱ</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity draft="unconfirmed">ᱛᱷᱚᱱᱰᱚᱨ ᱵᱮ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity draft="unconfirmed">ᱱᱤᱯᱤᱜᱚᱱ</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity draft="unconfirmed">ᱴᱚᱨᱚᱱᱴᱚ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity draft="unconfirmed">ᱤᱠᱟᱞᱩᱣᱤᱛ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity draft="unconfirmed">ᱯᱟᱝᱱᱤᱨᱛᱩᱝ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity draft="unconfirmed">ᱢᱚᱱᱠᱴᱚᱱ</exemplarCity>
 			</zone>
@@ -1874,13 +1859,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">ᱦᱟᱣᱟᱭᱤᱼᱟᱞᱮᱣᱴᱤᱭᱟᱱ ᱥᱤᱧᱟᱜ ᱚᱠᱛᱚ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">ᱮᱛᱚᱢᱯᱟᱪᱮ ᱢᱚᱠᱥᱤᱠᱚ ᱚᱠᱛᱚ</generic>
-					<standard draft="unconfirmed">ᱮᱛᱚᱢᱯᱟᱪᱮ ᱢᱚᱠᱥᱤᱠᱚ ᱢᱟᱱᱚᱠ ᱚᱠᱛᱚ</standard>
-					<daylight draft="unconfirmed">ᱮᱛᱚᱢᱯᱟᱪᱮ ᱢᱚᱠᱥᱤᱠᱚ ᱥᱤᱧᱟᱜ ᱚᱠᱛᱚ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">ᱢᱮᱠᱥᱤᱠᱟᱱ ᱯᱨᱚᱥᱟᱱᱛ ᱚᱠᱛᱚ</generic>
diff --git a/make/data/cldr/common/main/sat_Deva.xml b/make/data/cldr/common/main/sat_Deva.xml
index c8982731025..30961e3dfdc 100644
--- a/make/data/cldr/common/main/sat_Deva.xml
+++ b/make/data/cldr/common/main/sat_Deva.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sat_Deva_IN.xml b/make/data/cldr/common/main/sat_Deva_IN.xml
index 9b343ae6dcf..be00da78a9a 100644
--- a/make/data/cldr/common/main/sat_Deva_IN.xml
+++ b/make/data/cldr/common/main/sat_Deva_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sat_Olck.xml b/make/data/cldr/common/main/sat_Olck.xml
index 9f3daa45f22..806495ec77c 100644
--- a/make/data/cldr/common/main/sat_Olck.xml
+++ b/make/data/cldr/common/main/sat_Olck.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sat_Olck_IN.xml b/make/data/cldr/common/main/sat_Olck_IN.xml
index 8d83f9eac06..5f5bc27ec07 100644
--- a/make/data/cldr/common/main/sat_Olck_IN.xml
+++ b/make/data/cldr/common/main/sat_Olck_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sbp.xml b/make/data/cldr/common/main/sbp.xml
index f4f989c4bbb..898598f848c 100644
--- a/make/data/cldr/common/main/sbp.xml
+++ b/make/data/cldr/common/main/sbp.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sbp_TZ.xml b/make/data/cldr/common/main/sbp_TZ.xml
index fb4716fd808..dcab5b8450a 100644
--- a/make/data/cldr/common/main/sbp_TZ.xml
+++ b/make/data/cldr/common/main/sbp_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sc.xml b/make/data/cldr/common/main/sc.xml
index f3ef123869e..90a1d00f3f5 100644
--- a/make/data/cldr/common/main/sc.xml
+++ b/make/data/cldr/common/main/sc.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1106,7 +1106,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="gb2312han">ordinamentu de su tzinesu semplificadu - GB2312</type>
 			<type key="collation" type="phonebook">ordinamentu de s’elencu telefònicu</type>
 			<type key="collation" type="pinyin">ordinamentu pinyin</type>
-			<type key="collation" type="reformed">ordinamentu riformadu</type>
 			<type key="collation" type="search">chirca genèrica</type>
 			<type key="collation" type="searchjl">chirca pro consonante hangul initziale</type>
 			<type key="collation" type="standard">ordinamentu istandard</type>
@@ -2963,9 +2962,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Argentina/Tucuman">
 				<exemplarCity>Tucumán</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Daca</exemplarCity>
 			</zone>
@@ -3834,11 +3830,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Ora legale de Macao</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Ora de s’Ìsula Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Ora de Magadan</generic>
@@ -3878,13 +3869,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Ora de su Mèssicu nord-otzidentale</generic>
-					<standard>Ora istandard de su Mèssicu nord-otzidentale</standard>
-					<daylight>Ora legale de su Mèssicu nord-otzidentale</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Ora de su Patzìficu (Mèssicu)</generic>
diff --git a/make/data/cldr/common/main/sc_IT.xml b/make/data/cldr/common/main/sc_IT.xml
index 6612a65e577..376c0399cca 100644
--- a/make/data/cldr/common/main/sc_IT.xml
+++ b/make/data/cldr/common/main/sc_IT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/scn.xml b/make/data/cldr/common/main/scn.xml
index cc4c1655aa6..a9a1c3499b3 100644
--- a/make/data/cldr/common/main/scn.xml
+++ b/make/data/cldr/common/main/scn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/scn_IT.xml b/make/data/cldr/common/main/scn_IT.xml
index fac9de008ce..54c0c33495b 100644
--- a/make/data/cldr/common/main/scn_IT.xml
+++ b/make/data/cldr/common/main/scn_IT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sd.xml b/make/data/cldr/common/main/sd.xml
index acc7d27ae9a..80e51753dc4 100644
--- a/make/data/cldr/common/main/sd.xml
+++ b/make/data/cldr/common/main/sd.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1642,9 +1642,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ميلبورن</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ڪري</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>هوبارٽ</exemplarCity>
 			</zone>
@@ -1798,9 +1795,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>ڪريسٽن</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ييلو نائيف</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ايڊمونٽن</exemplarCity>
 			</zone>
@@ -1819,30 +1813,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>ريزوليوٽ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ريني رور</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>رينڪن انليٽ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>اٽيڪوڪن</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ٿنڊر بي</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>نپيگان</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ٽورنٽو</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>اڪالوئٽ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>پینگنرٽنگ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>مانڪٽن</exemplarCity>
 			</zone>
@@ -2656,18 +2638,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>دارالسلام</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ازهارڊ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>ڪِيو</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>سمفروپول</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>زيپروزهايا</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>ڪمپالا</exemplarCity>
 			</zone>
@@ -2686,9 +2662,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>هونو لولو</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>جانسٹن</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>اينڪريج</exemplarCity>
 			</zone>
@@ -3324,11 +3297,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>لورڊ هووي جي ڏينهن جو وقت</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>مڪوائري آئي لينڊ جو وقت</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>مگادان جو وقت</generic>
@@ -3368,13 +3336,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>مائوسن جو وقت</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>شمالي مغربي ميڪسيڪو جو وقت</generic>
-					<standard>شمالي مغربي ميڪسيڪو جو معياري وقت</standard>
-					<daylight>شمالي مغربي ميڪسيڪو جي ڏينهن جو وقت</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>ميڪسيڪن پيسيفڪ وقت</generic>
diff --git a/make/data/cldr/common/main/sd_Arab.xml b/make/data/cldr/common/main/sd_Arab.xml
index 52b15d2a2fe..1844976e26f 100644
--- a/make/data/cldr/common/main/sd_Arab.xml
+++ b/make/data/cldr/common/main/sd_Arab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sd_Arab_PK.xml b/make/data/cldr/common/main/sd_Arab_PK.xml
index d68902c97ba..f123030ec5a 100644
--- a/make/data/cldr/common/main/sd_Arab_PK.xml
+++ b/make/data/cldr/common/main/sd_Arab_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sd_Deva.xml b/make/data/cldr/common/main/sd_Deva.xml
index 4c2a39458d9..741db721386 100644
--- a/make/data/cldr/common/main/sd_Deva.xml
+++ b/make/data/cldr/common/main/sd_Deva.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sd_Deva_IN.xml b/make/data/cldr/common/main/sd_Deva_IN.xml
index ad3ad7e5f74..6406ca40a47 100644
--- a/make/data/cldr/common/main/sd_Deva_IN.xml
+++ b/make/data/cldr/common/main/sd_Deva_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sdh.xml b/make/data/cldr/common/main/sdh.xml
index cd72fed82ef..860747bd424 100644
--- a/make/data/cldr/common/main/sdh.xml
+++ b/make/data/cldr/common/main/sdh.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sdh_IQ.xml b/make/data/cldr/common/main/sdh_IQ.xml
index 3cc33628c03..73b71829b57 100644
--- a/make/data/cldr/common/main/sdh_IQ.xml
+++ b/make/data/cldr/common/main/sdh_IQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sdh_IR.xml b/make/data/cldr/common/main/sdh_IR.xml
index bd375ccdb19..7752d73ac19 100644
--- a/make/data/cldr/common/main/sdh_IR.xml
+++ b/make/data/cldr/common/main/sdh_IR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/se.xml b/make/data/cldr/common/main/se.xml
index 4eab45b582b..343d2d6caa5 100644
--- a/make/data/cldr/common/main/se.xml
+++ b/make/data/cldr/common/main/se.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/se_FI.xml b/make/data/cldr/common/main/se_FI.xml
index fa0ae699737..2683caed235 100644
--- a/make/data/cldr/common/main/se_FI.xml
+++ b/make/data/cldr/common/main/se_FI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1674,11 +1674,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Lord Howe geasseáigi</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>MacQuarie sullo áigi</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadana áigi</generic>
@@ -1718,13 +1713,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mawsona áigi</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Oarjedavvi-Meksiko áigi</generic>
-					<standard>Oarjedavvi-Meksiko dálveáigi</standard>
-					<daylight>Oarjedavvi-Meksiko geasseáigi</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksiko Jáskesábi áigi</generic>
diff --git a/make/data/cldr/common/main/se_NO.xml b/make/data/cldr/common/main/se_NO.xml
index ede5d5d5b18..12bdb6a17b9 100644
--- a/make/data/cldr/common/main/se_NO.xml
+++ b/make/data/cldr/common/main/se_NO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/se_SE.xml b/make/data/cldr/common/main/se_SE.xml
index 47754ec19cf..99d52c3ab3e 100644
--- a/make/data/cldr/common/main/se_SE.xml
+++ b/make/data/cldr/common/main/se_SE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/seh.xml b/make/data/cldr/common/main/seh.xml
index a25d21db6f9..2815843850f 100644
--- a/make/data/cldr/common/main/seh.xml
+++ b/make/data/cldr/common/main/seh.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/seh_MZ.xml b/make/data/cldr/common/main/seh_MZ.xml
index 789f9e0805f..857a4e4e0fa 100644
--- a/make/data/cldr/common/main/seh_MZ.xml
+++ b/make/data/cldr/common/main/seh_MZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ses.xml b/make/data/cldr/common/main/ses.xml
index 49dfccecc71..9189d74e8f3 100644
--- a/make/data/cldr/common/main/ses.xml
+++ b/make/data/cldr/common/main/ses.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ses_ML.xml b/make/data/cldr/common/main/ses_ML.xml
index 63e4cbb986c..d0fe59700fd 100644
--- a/make/data/cldr/common/main/ses_ML.xml
+++ b/make/data/cldr/common/main/ses_ML.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sg.xml b/make/data/cldr/common/main/sg.xml
index 43f25cd19bc..c40349f2e99 100644
--- a/make/data/cldr/common/main/sg.xml
+++ b/make/data/cldr/common/main/sg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sg_CF.xml b/make/data/cldr/common/main/sg_CF.xml
index 61b2edae564..6318b0fdf4c 100644
--- a/make/data/cldr/common/main/sg_CF.xml
+++ b/make/data/cldr/common/main/sg_CF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/shi.xml b/make/data/cldr/common/main/shi.xml
index 3246a1bc838..b7b64363ad0 100644
--- a/make/data/cldr/common/main/shi.xml
+++ b/make/data/cldr/common/main/shi.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/shi_Latn.xml b/make/data/cldr/common/main/shi_Latn.xml
index 175582f02e6..8d762fe15e7 100644
--- a/make/data/cldr/common/main/shi_Latn.xml
+++ b/make/data/cldr/common/main/shi_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/shi_Latn_MA.xml b/make/data/cldr/common/main/shi_Latn_MA.xml
index 4bb2f4006f4..e28483d26ea 100644
--- a/make/data/cldr/common/main/shi_Latn_MA.xml
+++ b/make/data/cldr/common/main/shi_Latn_MA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/shi_Tfng.xml b/make/data/cldr/common/main/shi_Tfng.xml
index a56ba98a82c..fa97b50b8c1 100644
--- a/make/data/cldr/common/main/shi_Tfng.xml
+++ b/make/data/cldr/common/main/shi_Tfng.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/shi_Tfng_MA.xml b/make/data/cldr/common/main/shi_Tfng_MA.xml
index 7ad4ef236b7..63001b5c7fb 100644
--- a/make/data/cldr/common/main/shi_Tfng_MA.xml
+++ b/make/data/cldr/common/main/shi_Tfng_MA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/shn.xml b/make/data/cldr/common/main/shn.xml
index e13c174e7f0..4235172f367 100644
--- a/make/data/cldr/common/main/shn.xml
+++ b/make/data/cldr/common/main/shn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/shn_MM.xml b/make/data/cldr/common/main/shn_MM.xml
index 3433e268995..ae944bf3420 100644
--- a/make/data/cldr/common/main/shn_MM.xml
+++ b/make/data/cldr/common/main/shn_MM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/shn_TH.xml b/make/data/cldr/common/main/shn_TH.xml
index 9a6819b9544..32a425c9b40 100644
--- a/make/data/cldr/common/main/shn_TH.xml
+++ b/make/data/cldr/common/main/shn_TH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/si.xml b/make/data/cldr/common/main/si.xml
index 3da1a79f82c..86ef2737c6e 100644
--- a/make/data/cldr/common/main/si.xml
+++ b/make/data/cldr/common/main/si.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1791,9 +1791,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} වේලාව</regionFormat>
 			<regionFormat type="daylight">{0} දිවාආලෝක වේලාව</regionFormat>
 			<regionFormat type="standard">{0} සම්මත වේලාව</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>සැන්ටා ඉසබෙල්</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>සමකක්ෂ සාර්ව වේලාව</standard>
@@ -1916,9 +1913,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>මෙල්බෝර්න්</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>කුරී</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>හෝබාර්ට්</exemplarCity>
 			</zone>
@@ -2072,9 +2066,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>ක්‍රෙස්ටන්</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>යෙලෝනයිෆ්</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>එඩ්මන්ටන්</exemplarCity>
 			</zone>
@@ -2093,30 +2084,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>රෙසොලුට්</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>රෙයිනි ගඟ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>රැන්කින් පිවිසුම</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ඇටිකොකන්</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>තන්ඩර් බොක්ක</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>නිපිගන්</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ටොරන්ටෝ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ඉකාලුයිට්</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>පැන්නීටන්</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>මොන්ක්ටන්</exemplarCity>
 			</zone>
@@ -2930,18 +2909,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>දාර් එස් සලාම්</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>උස්ගොරෝඩ්</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>කිව්</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>සිම්ෆෙරෝපොල්</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>සපොරෝසියේ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>කම්පාලා</exemplarCity>
 			</zone>
@@ -2960,9 +2933,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>හොනොලුලු</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ජොන්ස්ටන්</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ඇනකොරාජ්</exemplarCity>
 			</zone>
@@ -3603,11 +3573,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>ලෝර්ඩ් හෝව් දිවා වේලාව</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>මැක්කුඅරි දුපත් වේලාව</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>මෙගඩන් වේලාව</generic>
@@ -3647,13 +3612,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>මොව්සන් වේලාව</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>වයඹ මෙක්සිකෝ වේලාව</generic>
-					<standard>වයඹ මෙක්සිකෝ සම්මත වේලාව</standard>
-					<daylight>වයඹ මෙක්සිකෝ දිවාආලෝක වේලාව</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>මෙක්සිකෝ පැසිෆික් වේලාව</generic>
diff --git a/make/data/cldr/common/main/si_LK.xml b/make/data/cldr/common/main/si_LK.xml
index a30a6b198c9..e16af631667 100644
--- a/make/data/cldr/common/main/si_LK.xml
+++ b/make/data/cldr/common/main/si_LK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sid.xml b/make/data/cldr/common/main/sid.xml
index 3716786521b..a92e68a3459 100644
--- a/make/data/cldr/common/main/sid.xml
+++ b/make/data/cldr/common/main/sid.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sid_ET.xml b/make/data/cldr/common/main/sid_ET.xml
index f628f2fb25a..29b629c4df4 100644
--- a/make/data/cldr/common/main/sid_ET.xml
+++ b/make/data/cldr/common/main/sid_ET.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sk.xml b/make/data/cldr/common/main/sk.xml
index be0ac9cb76d..3fbeec27ddb 100644
--- a/make/data/cldr/common/main/sk.xml
+++ b/make/data/cldr/common/main/sk.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1034,7 +1034,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">lexikografické zoradenie</type>
 			<type key="collation" type="phonetic">fonetické zoradenie</type>
 			<type key="collation" type="pinyin">zoradenie pinyin</type>
-			<type key="collation" type="reformed">reformované zoradenie</type>
 			<type key="collation" type="search">všeobecné vyhľadávanie</type>
 			<type key="collation" type="searchjl" draft="contributed">Hľadať podľa počiatočnej spoluhlásky písma Hangul</type>
 			<type key="collation" type="standard">štandardné zoradenie</type>
@@ -2630,9 +2629,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</fields>
 		<timeZoneNames>
 			<regionFormat>časové pásmo {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>koordinovaný svetový čas</standard>
@@ -2662,9 +2658,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viedeň</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Dháka</exemplarCity>
 			</zone>
@@ -3066,15 +3059,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Taipei">
 				<exemplarCity>Tchaj-pej</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kyjev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Záporožie</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<short>
 					<generic draft="contributed">HST</generic>
@@ -3682,11 +3669,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">macajský letný čas</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>čas ostrova Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>magadanský čas</generic>
@@ -3726,13 +3708,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>čas Mawsonovej stanice</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>severozápadný mexický čas</generic>
-					<standard>severozápadný mexický štandardný čas</standard>
-					<daylight>severozápadný mexický letný čas</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>mexický tichomorský čas</generic>
diff --git a/make/data/cldr/common/main/sk_SK.xml b/make/data/cldr/common/main/sk_SK.xml
index eb53d5d23f2..9d5d7c6c366 100644
--- a/make/data/cldr/common/main/sk_SK.xml
+++ b/make/data/cldr/common/main/sk_SK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/skr.xml b/make/data/cldr/common/main/skr.xml
index c8687dc4722..88729169b8e 100644
--- a/make/data/cldr/common/main/skr.xml
+++ b/make/data/cldr/common/main/skr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/skr_PK.xml b/make/data/cldr/common/main/skr_PK.xml
index 2227710bbc4..b2614bad2be 100644
--- a/make/data/cldr/common/main/skr_PK.xml
+++ b/make/data/cldr/common/main/skr_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sl.xml b/make/data/cldr/common/main/sl.xml
index 3aa91aca4bc..b0fb8038a8b 100644
--- a/make/data/cldr/common/main/sl.xml
+++ b/make/data/cldr/common/main/sl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1116,7 +1116,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">razvrščanje po sistemu telefonskega imenika</type>
 			<type key="collation" type="phonetic">fonetično razvrščanje</type>
 			<type key="collation" type="pinyin">razvrščanje po sistemu pinjin</type>
-			<type key="collation" type="reformed">reformirano razvrščanje</type>
 			<type key="collation" type="search">Splošno iskanje</type>
 			<type key="collation" type="searchjl" draft="contributed">Iskanje po začetnem soglasniku hangul</type>
 			<type key="collation" type="standard">Standardno razvrščanje</type>
@@ -2542,9 +2541,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} čas</regionFormat>
 			<regionFormat type="daylight">{0} poletni čas</regionFormat>
 			<regionFormat type="standard">{0} standardni čas</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>univerzalni koordinirani čas</standard>
@@ -2571,9 +2567,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Dunaj</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Asia/Dhaka">
 				<exemplarCity>Daka</exemplarCity>
 			</zone>
@@ -2929,15 +2922,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Taipei">
 				<exemplarCity>Tajpej</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kijev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3485,11 +3472,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Poletni čas otoka Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarieski čas</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadanski čas</generic>
@@ -3529,13 +3511,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawsonski čas</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Mehiški severozahodni čas</generic>
-					<standard>Mehiški severozahodni standardni čas</standard>
-					<daylight>Mehiški severozahodni poletni čas</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mehiški pacifiški čas</generic>
diff --git a/make/data/cldr/common/main/sl_SI.xml b/make/data/cldr/common/main/sl_SI.xml
index 3c7992d7580..1368b6fb95a 100644
--- a/make/data/cldr/common/main/sl_SI.xml
+++ b/make/data/cldr/common/main/sl_SI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sma.xml b/make/data/cldr/common/main/sma.xml
index 5d902dd5eb8..56337ccc8f4 100644
--- a/make/data/cldr/common/main/sma.xml
+++ b/make/data/cldr/common/main/sma.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sma_NO.xml b/make/data/cldr/common/main/sma_NO.xml
index 12559efffb3..16ee062d37c 100644
--- a/make/data/cldr/common/main/sma_NO.xml
+++ b/make/data/cldr/common/main/sma_NO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sma_SE.xml b/make/data/cldr/common/main/sma_SE.xml
index 183903b78aa..600fb9fe6ac 100644
--- a/make/data/cldr/common/main/sma_SE.xml
+++ b/make/data/cldr/common/main/sma_SE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/smj.xml b/make/data/cldr/common/main/smj.xml
index e17b382a4e3..2f2d71927e9 100644
--- a/make/data/cldr/common/main/smj.xml
+++ b/make/data/cldr/common/main/smj.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/smj_NO.xml b/make/data/cldr/common/main/smj_NO.xml
index a2dc043987b..c1bfae31c23 100644
--- a/make/data/cldr/common/main/smj_NO.xml
+++ b/make/data/cldr/common/main/smj_NO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/smj_SE.xml b/make/data/cldr/common/main/smj_SE.xml
index a4187d0be90..2d14ac2865f 100644
--- a/make/data/cldr/common/main/smj_SE.xml
+++ b/make/data/cldr/common/main/smj_SE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/smn.xml b/make/data/cldr/common/main/smn.xml
index 58388534b73..d6e4b544b1a 100644
--- a/make/data/cldr/common/main/smn.xml
+++ b/make/data/cldr/common/main/smn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/smn_FI.xml b/make/data/cldr/common/main/smn_FI.xml
index 8c54143bb10..04fc344983a 100644
--- a/make/data/cldr/common/main/smn_FI.xml
+++ b/make/data/cldr/common/main/smn_FI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sms.xml b/make/data/cldr/common/main/sms.xml
index 7930636d844..8d57359d4c8 100644
--- a/make/data/cldr/common/main/sms.xml
+++ b/make/data/cldr/common/main/sms.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sms_FI.xml b/make/data/cldr/common/main/sms_FI.xml
index 91056a71a5e..07c7be6f7e8 100644
--- a/make/data/cldr/common/main/sms_FI.xml
+++ b/make/data/cldr/common/main/sms_FI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sn.xml b/make/data/cldr/common/main/sn.xml
index 50e8b24856f..006c7d0b14b 100644
--- a/make/data/cldr/common/main/sn.xml
+++ b/make/data/cldr/common/main/sn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sn_ZW.xml b/make/data/cldr/common/main/sn_ZW.xml
index 2883241e470..4aa04059c50 100644
--- a/make/data/cldr/common/main/sn_ZW.xml
+++ b/make/data/cldr/common/main/sn_ZW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/so.xml b/make/data/cldr/common/main/so.xml
index 724b401732b..f2d5323c230 100644
--- a/make/data/cldr/common/main/so.xml
+++ b/make/data/cldr/common/main/so.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1027,7 +1027,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="gb2312han">Isku hagaajinta Farta shiineeska</type>
 			<type key="collation" type="phonebook">Isku hagaajinta foonbuuga</type>
 			<type key="collation" type="pinyin">Isku hagaajinta Pinyin</type>
-			<type key="collation" type="reformed">Isku hagaajinta Reformed</type>
 			<type key="collation" type="search">Raadinta Guud</type>
 			<type key="collation" type="searchjl">Raadinta Shibanaha Hangul</type>
 			<type key="collation" type="standard">Amarka Kala Soocidda Caadiga ah</type>
@@ -2758,9 +2757,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melboon</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kuriy</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Hubaart</exemplarCity>
 			</zone>
@@ -2890,9 +2886,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>Karestoon</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Yelowneyf</exemplarCity>
-			</zone>
 			<zone type="America/Swift_Current">
 				<exemplarCity>Iswift Karent</exemplarCity>
 			</zone>
@@ -2908,27 +2901,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>Resoluut</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Reyni Rifer</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Raankin Inleet</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Atikokaan</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tanda Baay</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nibiigoon</exemplarCity>
-			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Iqaaluut</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Bangnirtuung</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Moonktoon</exemplarCity>
 			</zone>
@@ -3616,27 +3597,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Daresalaam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Usgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiyeef</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Simferobol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Saborosey</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kambaala</exemplarCity>
 			</zone>
 			<zone type="America/Nome">
 				<exemplarCity>Noom</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Joonston</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Anjorage</exemplarCity>
 			</zone>
@@ -4316,11 +4288,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Waqtiga Dharaarta ee Lod How</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Waqtiga Makquwariy Aylaan</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Watiga Magedan</generic>
@@ -4360,13 +4327,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Waqtiga Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Waqtiga Waqooyi-Galbeed Meksiko</generic>
-					<standard>Waqtiga Caadiga Ah ee Waqooyi-Galbeed Meksiko</standard>
-					<daylight>Waqtiga Dharaarta ee Waqooyi-Galbeed Meksiko</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Waqtiga Baasifikada Meksiko</generic>
diff --git a/make/data/cldr/common/main/so_DJ.xml b/make/data/cldr/common/main/so_DJ.xml
index 7b369738b2d..fdcc7fea0e1 100644
--- a/make/data/cldr/common/main/so_DJ.xml
+++ b/make/data/cldr/common/main/so_DJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/so_ET.xml b/make/data/cldr/common/main/so_ET.xml
index 2c5f270fd53..8829571b928 100644
--- a/make/data/cldr/common/main/so_ET.xml
+++ b/make/data/cldr/common/main/so_ET.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/so_KE.xml b/make/data/cldr/common/main/so_KE.xml
index 7c2b020044c..f117c320940 100644
--- a/make/data/cldr/common/main/so_KE.xml
+++ b/make/data/cldr/common/main/so_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/so_SO.xml b/make/data/cldr/common/main/so_SO.xml
index 5bf9d753c0c..a576aff8c65 100644
--- a/make/data/cldr/common/main/so_SO.xml
+++ b/make/data/cldr/common/main/so_SO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sq.xml b/make/data/cldr/common/main/sq.xml
index 9c6871e4f93..ccffdff0a04 100644
--- a/make/data/cldr/common/main/sq.xml
+++ b/make/data/cldr/common/main/sq.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1008,7 +1008,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="gb2312han">Radhitje e kinezishtes së thjeshtësuar - GB2312</type>
 			<type key="collation" type="phonebook">Radhitje libri telefonik</type>
 			<type key="collation" type="pinyin">Radhitje pinini</type>
-			<type key="collation" type="reformed">Radhitje e reformuar</type>
 			<type key="collation" type="search">kërkim i përgjithshëm</type>
 			<type key="collation" type="searchjl">kërkim sipas bashkëtingëllores fillestare hangul</type>
 			<type key="collation" type="standard">radhitje standarde</type>
@@ -2125,9 +2124,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Ora: {0}</regionFormat>
 			<regionFormat type="daylight">Ora verore: {0}</regionFormat>
 			<regionFormat type="standard">Ora standarde: {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa-Izabela</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Ora universale e koordinuar</standard>
@@ -2226,9 +2222,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melburn</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kuri</exemplarCity>
-			</zone>
 			<zone type="Australia/Lindeman">
 				<exemplarCity>Lindëmen</exemplarCity>
 			</zone>
@@ -2331,9 +2324,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Kreston</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Jellounajf</exemplarCity>
-			</zone>
 			<zone type="America/Swift_Current">
 				<exemplarCity>Rryma e Shpejtë</exemplarCity>
 			</zone>
@@ -2346,15 +2336,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Winnipeg">
 				<exemplarCity>Uinipeg</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Lumi i Shirave</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Gryka Inlet</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Gjiri i Bubullimës</exemplarCity>
-			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikaluit</exemplarCity>
 			</zone>
@@ -2921,9 +2905,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporozhje</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Miduej</exemplarCity>
 			</zone>
@@ -2933,9 +2914,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Xhonston</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ankorejxh</exemplarCity>
 			</zone>
@@ -3593,11 +3571,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Ora verore e Makaos</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Ora e Ishullit Makuari</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Ora e Magadanit</generic>
@@ -3637,13 +3610,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Ora e Mausonit</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Ora e Meksikës Veriperëndimore</generic>
-					<standard>Ora standarde e Meksikës Veriperëndimore</standard>
-					<daylight>Ora verore e Meksikës Veriperëndimore</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Ora e Territoreve Meksikane të Bregut të Paqësorit</generic>
diff --git a/make/data/cldr/common/main/sq_AL.xml b/make/data/cldr/common/main/sq_AL.xml
index 7e733baceb5..d358f488859 100644
--- a/make/data/cldr/common/main/sq_AL.xml
+++ b/make/data/cldr/common/main/sq_AL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sq_MK.xml b/make/data/cldr/common/main/sq_MK.xml
index 9e98620ffee..1b195b20744 100644
--- a/make/data/cldr/common/main/sq_MK.xml
+++ b/make/data/cldr/common/main/sq_MK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sq_XK.xml b/make/data/cldr/common/main/sq_XK.xml
index 96570d04036..a876cedc6ae 100644
--- a/make/data/cldr/common/main/sq_XK.xml
+++ b/make/data/cldr/common/main/sq_XK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sr.xml b/make/data/cldr/common/main/sr.xml
index a92f8ddbffe..3b6e777f96b 100644
--- a/make/data/cldr/common/main/sr.xml
+++ b/make/data/cldr/common/main/sr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1116,7 +1116,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">сортирање као телефонски именик</type>
 			<type key="collation" type="phonetic">фонетски редослед сортирања</type>
 			<type key="collation" type="pinyin">пинјин сортирање</type>
-			<type key="collation" type="reformed">реформисани редослед сортирања</type>
 			<type key="collation" type="search">претрага опште намене</type>
 			<type key="collation" type="searchjl" draft="contributed">Претрага према хангул почетном сугласнику</type>
 			<type key="collation" type="standard">стандардни редослед сортирања</type>
@@ -2673,9 +2672,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<regionFormat type="daylight">{0}, летње време</regionFormat>
 			<regionFormat type="standard">{0}, стандардно време</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Санта Изабел</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Координисано универзално време</standard>
@@ -2798,9 +2794,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мелбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Кари</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Хобарт</exemplarCity>
 			</zone>
@@ -2954,9 +2947,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Јелоунајф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Едмонтон</exemplarCity>
 			</zone>
@@ -2975,30 +2965,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Ресолут</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рејни Ривер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ранкин Инлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Корал Харбур</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер Беј</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Нипигон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Иквалуит</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртунг</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -3812,18 +3790,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар-ес-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Кијев</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Симферопољ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожје</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -3842,9 +3814,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Хонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Џонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Енкориџ</exemplarCity>
 			</zone>
@@ -4557,11 +4526,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Макао летње рачунање времена</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Острво Маквери време</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магадан време</generic>
@@ -4601,13 +4565,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Мосон време</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Северозападни Мексико</generic>
-					<standard>Северозападни Мексико, стандардно време</standard>
-					<daylight>Северозападни Мексико, летње време</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Мексички Пацифик</generic>
diff --git a/make/data/cldr/common/main/sr_Cyrl.xml b/make/data/cldr/common/main/sr_Cyrl.xml
index 1bc5140e994..f6a9df7ab3b 100644
--- a/make/data/cldr/common/main/sr_Cyrl.xml
+++ b/make/data/cldr/common/main/sr_Cyrl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sr_Cyrl_BA.xml b/make/data/cldr/common/main/sr_Cyrl_BA.xml
index e29c6634342..18516d2272d 100644
--- a/make/data/cldr/common/main/sr_Cyrl_BA.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_BA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -80,7 +80,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="dictionary">редослијед сортирања у рјечнику</type>
 			<type key="collation" type="ducet">подразумијевани Unicode редослијед сортирања</type>
 			<type key="collation" type="phonetic">фонетски редослијед сортирања</type>
-			<type key="collation" type="reformed">реформисани редослијед сортирања</type>
 			<type key="collation" type="search">претрага опште намјене</type>
 			<type key="collation" type="standard">стандардни редослијед сортирања</type>
 			<type key="collation" type="unihan">редослијед сортирања радикалних потеза</type>
@@ -1082,11 +1081,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Лорд Хов, љетње вријеме</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>острво Маквори вријеме</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магадан вријеме</generic>
@@ -1126,13 +1120,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Мосон вријеме</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Сјеверозападни Мексико</generic>
-					<standard>Сјеверозападни Мексико, стандардно вријеме</standard>
-					<daylight>Сјеверозападни Мексико, летње вријеме</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Мексички Пацифик</generic>
diff --git a/make/data/cldr/common/main/sr_Cyrl_ME.xml b/make/data/cldr/common/main/sr_Cyrl_ME.xml
index b6888b6ea04..038894034b8 100644
--- a/make/data/cldr/common/main/sr_Cyrl_ME.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_ME.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sr_Cyrl_RS.xml b/make/data/cldr/common/main/sr_Cyrl_RS.xml
index 31863ae9d74..7006e981801 100644
--- a/make/data/cldr/common/main/sr_Cyrl_RS.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_RS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sr_Cyrl_XK.xml b/make/data/cldr/common/main/sr_Cyrl_XK.xml
index 102831214b2..0d2afec0266 100644
--- a/make/data/cldr/common/main/sr_Cyrl_XK.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_XK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sr_Latn.xml b/make/data/cldr/common/main/sr_Latn.xml
index 87f6bbf4949..277db9469f7 100644
--- a/make/data/cldr/common/main/sr_Latn.xml
+++ b/make/data/cldr/common/main/sr_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1115,7 +1115,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="phonebook">sortiranje kao telefonski imenik</type>
 			<type key="collation" type="phonetic">fonetski redosled sortiranja</type>
 			<type key="collation" type="pinyin">pinjin sortiranje</type>
-			<type key="collation" type="reformed">reformisani redosled sortiranja</type>
 			<type key="collation" type="search">pretraga opšte namene</type>
 			<type key="collation" type="searchjl" draft="contributed">Pretraga prema hangul početnom suglasniku</type>
 			<type key="collation" type="standard">standardni redosled sortiranja</type>
@@ -2673,9 +2672,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<timeZoneNames>
 			<regionFormat type="daylight">{0}, letnje vreme</regionFormat>
 			<regionFormat type="standard">{0}, standardno vreme</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Izabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Koordinisano univerzalno vreme</standard>
@@ -2798,9 +2794,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melburn</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kari</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Hobart</exemplarCity>
 			</zone>
@@ -2954,9 +2947,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>Kreston</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Jelounajf</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Edmonton</exemplarCity>
 			</zone>
@@ -2975,30 +2965,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>Resolut</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Rejni River</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Rankin Inlet</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Koral Harbur</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tander Bej</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipigon</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Toronto</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikvaluit</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnirtung</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Monkton</exemplarCity>
 			</zone>
@@ -3812,18 +3790,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar-es-Salam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kijev</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Simferopolj</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kampala</exemplarCity>
 			</zone>
@@ -3842,9 +3814,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Džonston</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Enkoridž</exemplarCity>
 			</zone>
@@ -4557,11 +4526,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Makao letnje računanje vremena</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Ostrvo Makveri vreme</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan vreme</generic>
@@ -4601,13 +4565,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Moson vreme</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Severozapadni Meksiko</generic>
-					<standard>Severozapadni Meksiko, standardno vreme</standard>
-					<daylight>Severozapadni Meksiko, letnje vreme</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksički Pacifik</generic>
diff --git a/make/data/cldr/common/main/sr_Latn_BA.xml b/make/data/cldr/common/main/sr_Latn_BA.xml
index 1bd4f55afe0..9dd83baddbb 100644
--- a/make/data/cldr/common/main/sr_Latn_BA.xml
+++ b/make/data/cldr/common/main/sr_Latn_BA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -80,7 +80,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="dictionary">redoslijed sortiranja u rječniku</type>
 			<type key="collation" type="ducet">podrazumijevani Unicode redoslijed sortiranja</type>
 			<type key="collation" type="phonetic">fonetski redoslijed sortiranja</type>
-			<type key="collation" type="reformed">reformisani redoslijed sortiranja</type>
 			<type key="collation" type="search">pretraga opšte namjene</type>
 			<type key="collation" type="standard">standardni redoslijed sortiranja</type>
 			<type key="collation" type="unihan">redoslijed sortiranja radikalnih poteza</type>
@@ -1082,11 +1081,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Lord Hov, ljetnje vrijeme</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>ostrvo Makvori vrijeme</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan vrijeme</generic>
@@ -1126,13 +1120,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Moson vrijeme</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Sjeverozapadni Meksiko</generic>
-					<standard>Sjeverozapadni Meksiko, standardno vrijeme</standard>
-					<daylight>Sjeverozapadni Meksiko, letnje vrijeme</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksički Pacifik</generic>
diff --git a/make/data/cldr/common/main/sr_Latn_ME.xml b/make/data/cldr/common/main/sr_Latn_ME.xml
index 5853439f3c6..be0b66fc070 100644
--- a/make/data/cldr/common/main/sr_Latn_ME.xml
+++ b/make/data/cldr/common/main/sr_Latn_ME.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sr_Latn_RS.xml b/make/data/cldr/common/main/sr_Latn_RS.xml
index aace7e587ab..04102a3a7d6 100644
--- a/make/data/cldr/common/main/sr_Latn_RS.xml
+++ b/make/data/cldr/common/main/sr_Latn_RS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sr_Latn_XK.xml b/make/data/cldr/common/main/sr_Latn_XK.xml
index 4d342567f76..f655d5dbe82 100644
--- a/make/data/cldr/common/main/sr_Latn_XK.xml
+++ b/make/data/cldr/common/main/sr_Latn_XK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ss.xml b/make/data/cldr/common/main/ss.xml
index 37807457ad1..c86a4a9c653 100644
--- a/make/data/cldr/common/main/ss.xml
+++ b/make/data/cldr/common/main/ss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ss_SZ.xml b/make/data/cldr/common/main/ss_SZ.xml
index fa930615ead..440f7ef0f89 100644
--- a/make/data/cldr/common/main/ss_SZ.xml
+++ b/make/data/cldr/common/main/ss_SZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ss_ZA.xml b/make/data/cldr/common/main/ss_ZA.xml
index 9e512c4d8b1..f57011adf51 100644
--- a/make/data/cldr/common/main/ss_ZA.xml
+++ b/make/data/cldr/common/main/ss_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ssy.xml b/make/data/cldr/common/main/ssy.xml
index 02e4380d812..ec9d3508fe4 100644
--- a/make/data/cldr/common/main/ssy.xml
+++ b/make/data/cldr/common/main/ssy.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ssy_ER.xml b/make/data/cldr/common/main/ssy_ER.xml
index 33924045617..0953fc3c828 100644
--- a/make/data/cldr/common/main/ssy_ER.xml
+++ b/make/data/cldr/common/main/ssy_ER.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/st.xml b/make/data/cldr/common/main/st.xml
index 95f066593d2..6ecdf2d3a01 100644
--- a/make/data/cldr/common/main/st.xml
+++ b/make/data/cldr/common/main/st.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/st_LS.xml b/make/data/cldr/common/main/st_LS.xml
index 5b5f213072e..508573ff653 100644
--- a/make/data/cldr/common/main/st_LS.xml
+++ b/make/data/cldr/common/main/st_LS.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/st_ZA.xml b/make/data/cldr/common/main/st_ZA.xml
index 8457779ae89..c575262cfe5 100644
--- a/make/data/cldr/common/main/st_ZA.xml
+++ b/make/data/cldr/common/main/st_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/su.xml b/make/data/cldr/common/main/su.xml
index d3699a0431e..57eec539131 100644
--- a/make/data/cldr/common/main/su.xml
+++ b/make/data/cldr/common/main/su.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/su_Latn.xml b/make/data/cldr/common/main/su_Latn.xml
index 34ea37e137c..65f70aab8cb 100644
--- a/make/data/cldr/common/main/su_Latn.xml
+++ b/make/data/cldr/common/main/su_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/su_Latn_ID.xml b/make/data/cldr/common/main/su_Latn_ID.xml
index 1f7b36a1c37..fdac0d2c9e3 100644
--- a/make/data/cldr/common/main/su_Latn_ID.xml
+++ b/make/data/cldr/common/main/su_Latn_ID.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sv.xml b/make/data/cldr/common/main/sv.xml
index ddaf56ef0e2..72eabf6da6a 100644
--- a/make/data/cldr/common/main/sv.xml
+++ b/make/data/cldr/common/main/sv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1350,7 +1350,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">telefonkatalogssorteringsordning</type>
 			<type key="collation" type="phonetic">fonetisk sorteringsordning</type>
 			<type key="collation" type="pinyin">pinyin-sorteringsordning</type>
-			<type key="collation" type="reformed">reformerad sorteringsordning</type>
 			<type key="collation" type="search">allmän sökning</type>
 			<type key="collation" type="searchjl" draft="contributed">söksorteringsordning för att söka på inledande Hangul-konsonant</type>
 			<type key="collation" type="standard">normal sorteringsordning</type>
@@ -3374,9 +3373,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0}tid</regionFormat>
 			<regionFormat type="daylight">{0} (sommartid)</regionFormat>
 			<regionFormat type="standard">{0} (normaltid)</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>koordinerad universell tid</standard>
@@ -3406,9 +3402,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Wien</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Brussels">
 				<exemplarCity>Bryssel</exemplarCity>
 			</zone>
@@ -3677,15 +3670,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar es-Salaam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzjhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizjzja</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Midwayöarna</exemplarCity>
 			</zone>
@@ -3697,9 +3684,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Johnstonatollen</exemplarCity>
-			</zone>
 			<zone type="Asia/Tashkent">
 				<exemplarCity>Tasjkent</exemplarCity>
 			</zone>
@@ -4306,11 +4290,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Macaosommartid</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarietid</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadantid</generic>
@@ -4350,13 +4329,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawsontid</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>nordvästmexikansk tid</generic>
-					<standard>nordvästmexikansk normaltid</standard>
-					<daylight>nordvästmexikansk sommartid</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>mexikansk stillahavstid</generic>
diff --git a/make/data/cldr/common/main/sv_AX.xml b/make/data/cldr/common/main/sv_AX.xml
index 585fe75acbc..f4e5c2916fc 100644
--- a/make/data/cldr/common/main/sv_AX.xml
+++ b/make/data/cldr/common/main/sv_AX.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sv_FI.xml b/make/data/cldr/common/main/sv_FI.xml
index b218456e062..5d651579c59 100644
--- a/make/data/cldr/common/main/sv_FI.xml
+++ b/make/data/cldr/common/main/sv_FI.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sv_SE.xml b/make/data/cldr/common/main/sv_SE.xml
index c72518baabc..de404ba5273 100644
--- a/make/data/cldr/common/main/sv_SE.xml
+++ b/make/data/cldr/common/main/sv_SE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sw.xml b/make/data/cldr/common/main/sw.xml
index 01f309baa3d..163277ea1d7 100644
--- a/make/data/cldr/common/main/sw.xml
+++ b/make/data/cldr/common/main/sw.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -927,7 +927,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Mpangilio wa Orodha za Nambari za Simu</type>
 			<type key="collation" type="phonetic">Utaratibu wa Kupanga Fonetiki</type>
 			<type key="collation" type="pinyin">Mpangilio wa Kipinyin</type>
-			<type key="collation" type="reformed">Mpangilio Uliorekebishwa</type>
 			<type key="collation" type="search">Utafutaji wa Kijumla</type>
 			<type key="collation" type="searchjl">Tafuta kwa Konsonanti Halisi ya Hangul</type>
 			<type key="collation" type="standard">Mpangilio wa Kawaida</type>
@@ -1883,9 +1882,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Saa za {0}</regionFormat>
 			<regionFormat type="daylight">Saa za Mchana za {0}</regionFormat>
 			<regionFormat type="standard">Saa za wastani za {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Mfumo wa kuratibu saa ulimwenguni</standard>
@@ -1894,9 +1890,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Jiji Lisilojulikana</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/London">
 				<long>
 					<daylight>Saa za Majira ya Joto za Uingereza</daylight>
@@ -2463,11 +2456,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Saa za Mchana za Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Saa za kisiwa cha Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Saa za Magadan</generic>
@@ -2507,13 +2495,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Saa za Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Saa za Meksiko Kaskazini Magharibi</generic>
-					<standard>Saa za Wastani za Meksiko Kaskazini Magharibi</standard>
-					<daylight>Saa za mchana za Meksiko Kaskazini Magharibi</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Saa za pasifiki za Meksiko</generic>
diff --git a/make/data/cldr/common/main/sw_CD.xml b/make/data/cldr/common/main/sw_CD.xml
index b21f0223040..47f916723bb 100644
--- a/make/data/cldr/common/main/sw_CD.xml
+++ b/make/data/cldr/common/main/sw_CD.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sw_KE.xml b/make/data/cldr/common/main/sw_KE.xml
index c37448e8370..cae0a900b0e 100644
--- a/make/data/cldr/common/main/sw_KE.xml
+++ b/make/data/cldr/common/main/sw_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -719,11 +719,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Saa za Majira ya Joto za Krasnoyarsk</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Saa za Makwuarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Saa za Magadan</generic>
@@ -748,13 +743,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Saa za Majira ya Joto za Morisi</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Saa za Kaskazini Magharibi mwa Meksiko</generic>
-					<standard>Saa za Wastani za Kaskazini Magharibi mwa Meksiko</standard>
-					<daylight>Saa za Mchana za Kaskazini Magharibi mwa Meksiko</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mongolia">
 				<long>
 					<generic>Saa za Ulaanbataar</generic>
diff --git a/make/data/cldr/common/main/sw_TZ.xml b/make/data/cldr/common/main/sw_TZ.xml
index 93bba6d4019..0f77a90f4f2 100644
--- a/make/data/cldr/common/main/sw_TZ.xml
+++ b/make/data/cldr/common/main/sw_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/sw_UG.xml b/make/data/cldr/common/main/sw_UG.xml
index 9ccb845a124..97567fa2564 100644
--- a/make/data/cldr/common/main/sw_UG.xml
+++ b/make/data/cldr/common/main/sw_UG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/syr.xml b/make/data/cldr/common/main/syr.xml
index e73f1ba1517..a3c6a63ea11 100644
--- a/make/data/cldr/common/main/syr.xml
+++ b/make/data/cldr/common/main/syr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -932,7 +932,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="yw" count="other">ܫܒܘܥܐ w ܕܫܢܬܐ Y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
-						<intervalFormatFallback>{0}  –  {1}</intervalFormatFallback>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G">y G – y G</greatestDifference>
 							<greatestDifference id="y">y – y G</greatestDifference>
@@ -1550,9 +1550,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>ܟܪܝܣܬܘܢ</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ܝܠܘܢܝܦ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ܐܕܡܘܢܬܘܢ</exemplarCity>
 			</zone>
@@ -1571,30 +1568,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>ܪܝܣܘܠܘܬ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ܢܗܪܐ ܕܪܥܢܝ</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ܪܐܢܟܢ ܐܢܠܝܬ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ܐܬܝܟܘܟܐܢ</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ܬܐܢܕܐܪ ܒܐܝ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ܢܝܦܝܓܘܢ</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ܬܘܪܘܢܬܘ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ܐܝܩܠܘܝܬ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ܦܐܢܓܢܝܪܬܘܢܓ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ܡܘܢܟܬܘܢ</exemplarCity>
 			</zone>
@@ -2405,18 +2390,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ܕܐܪ ܫܠܡܐ</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ܐܘܙܓܘܪܘܕ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>ܟܝܝܒ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ܣܡܦܪܘܦܠ</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ܙܐܦܘܪܝܓܝ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>ܟܐܡܦܐܠܐ</exemplarCity>
 			</zone>
@@ -2432,9 +2411,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Nome">
 				<exemplarCity>ܢܘܡ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ܓܘܢܣܬܘܢ</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ܐܢܟܘܪܓ</exemplarCity>
 			</zone>
@@ -3134,11 +3110,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܕܡܐܟܐܘ</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>ܥܕܢܐ ܕܓܙܪܬܐ ܡܐܟܐܘܪܝ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>ܥܕܢܐ ܕܡܐܓܐܕܐܢ</generic>
@@ -3178,13 +3149,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>ܥܕܢܐ ܕܡܐܘܣܘܢ</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>ܥܕܢܐ ܓܪܒܝ ܡܥܪܒ ܡܟܣܝܩܘ</generic>
-					<standard>ܥܕܢܐ ܡܫܘܚܬܢܝܬܐ ܓܪܒܝ ܡܥܪܒ ܡܟܣܝܩܘ</standard>
-					<daylight>ܥܕܢܐ ܕܒܗܪ ܝܘܡܐ ܓܪܒܝ ܡܥܪܒ ܡܟܣܝܩܘ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>ܥܕܢܐ ܕܡܟܣܝܩܘ ܫܝܢܝܬܐ</generic>
diff --git a/make/data/cldr/common/main/syr_IQ.xml b/make/data/cldr/common/main/syr_IQ.xml
index 01741894830..c70f4db66ab 100644
--- a/make/data/cldr/common/main/syr_IQ.xml
+++ b/make/data/cldr/common/main/syr_IQ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/syr_SY.xml b/make/data/cldr/common/main/syr_SY.xml
index 7a342c7a419..4260f446630 100644
--- a/make/data/cldr/common/main/syr_SY.xml
+++ b/make/data/cldr/common/main/syr_SY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/szl.xml b/make/data/cldr/common/main/szl.xml
index 3b601e77a3b..232e3f91bb5 100644
--- a/make/data/cldr/common/main/szl.xml
+++ b/make/data/cldr/common/main/szl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1613,9 +1613,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Europe/Vienna">
 				<exemplarCity draft="unconfirmed">Wiedyń</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity draft="unconfirmed">Currie</exemplarCity>
-			</zone>
 			<zone type="Europe/Mariehamn">
 				<exemplarCity draft="unconfirmed">Maarianhamina</exemplarCity>
 			</zone>
@@ -2134,18 +2131,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Taipei">
 				<exemplarCity draft="unconfirmed">Tajpej</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="unconfirmed">Użgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity draft="unconfirmed">Kijōw</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity draft="unconfirmed">Symferopol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">Zaporoże</exemplarCity>
-			</zone>
 			<zone type="America/North_Dakota/Beulah">
 				<exemplarCity draft="unconfirmed">Beulah, Pōłnocno Dakota</exemplarCity>
 			</zone>
@@ -2713,13 +2704,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">Wyspy Marshalla</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">Meksyk Pōłnocno-Zachodni</generic>
-					<standard draft="unconfirmed">Meksyk Pōłnocno-Zachodni (sztandardowy czas)</standard>
-					<daylight draft="unconfirmed">Meksyk Pōłnocno-Zachodni (latowy czas)</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">Meksyk (czas pacyficzny)</generic>
diff --git a/make/data/cldr/common/main/szl_PL.xml b/make/data/cldr/common/main/szl_PL.xml
index bb8c99c383c..f7d6bb206a8 100644
--- a/make/data/cldr/common/main/szl_PL.xml
+++ b/make/data/cldr/common/main/szl_PL.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ta.xml b/make/data/cldr/common/main/ta.xml
index 12d1a33cc80..922853f2c13 100644
--- a/make/data/cldr/common/main/ta.xml
+++ b/make/data/cldr/common/main/ta.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1105,7 +1105,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">தொலைபேசி புத்தக வரிசை முறை</type>
 			<type key="collation" type="phonetic">ஒலியியல் வரிசைப்படுத்தல் முறை</type>
 			<type key="collation" type="pinyin">பின்யின் வரிசை முறை</type>
-			<type key="collation" type="reformed">சீர்திருத்தப்பட்ட வரிசை முறை</type>
 			<type key="collation" type="search">பொதுப்படையான தேடல்</type>
 			<type key="collation" type="searchjl">ஹங்குல் முதன்மை மெய்யெழுத்தின்படி தேடு</type>
 			<type key="collation" type="standard">நிலையான வரிசை முறை</type>
@@ -1421,16 +1420,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
-						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM, y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM, y G</dateFormatItem>
-						<dateFormatItem id="h">a h</dateFormatItem>
-						<dateFormatItem id="hm">a h:mm</dateFormatItem>
-						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
 						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
@@ -1456,22 +1455,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="d">d – d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">a h – a h</greatestDifference>
-							<greatestDifference id="h">a h–h</greatestDifference>
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
-							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
-							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">a h:mm – a h:mm v</greatestDifference>
-							<greatestDifference id="h">a h:mm–h:mm v</greatestDifference>
-							<greatestDifference id="m">a h:mm–h:mm v</greatestDifference>
+							<greatestDifference id="a">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">a h – a h v</greatestDifference>
-							<greatestDifference id="h">a h–h v</greatestDifference>
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M – M</greatestDifference>
@@ -1644,9 +1643,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
 							<dayPeriod type="midnight">நள்ளிரவு</dayPeriod>
-							<dayPeriod type="am">AM</dayPeriod>
 							<dayPeriod type="noon">நண்பகல்</dayPeriod>
-							<dayPeriod type="pm">பிற்பகல்</dayPeriod>
 							<dayPeriod type="morning1">அதிகாலை</dayPeriod>
 							<dayPeriod type="morning2">காலை</dayPeriod>
 							<dayPeriod type="afternoon1">மதியம்</dayPeriod>
@@ -1657,9 +1654,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="midnight">நள்.</dayPeriod>
-							<dayPeriod type="am">மு.ப</dayPeriod>
 							<dayPeriod type="noon">நண்.</dayPeriod>
-							<dayPeriod type="pm">பி.ப</dayPeriod>
 							<dayPeriod type="morning1">அதி.</dayPeriod>
 							<dayPeriod type="morning2">கா.</dayPeriod>
 							<dayPeriod type="afternoon1">மதி.</dayPeriod>
@@ -1670,15 +1665,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dayPeriodWidth>
 					</dayPeriodContext>
 					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">முற்பகல்</dayPeriod>
-							<dayPeriod type="pm">பிற்பகல்</dayPeriod>
-						</dayPeriodWidth>
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="midnight">நள்.</dayPeriod>
-							<dayPeriod type="am">மு.ப</dayPeriod>
 							<dayPeriod type="noon">நண்.</dayPeriod>
-							<dayPeriod type="pm">பி.ப</dayPeriod>
 							<dayPeriod type="morning1">அதி.</dayPeriod>
 							<dayPeriod type="morning2">கா.</dayPeriod>
 							<dayPeriod type="afternoon1">மதி.</dayPeriod>
@@ -1687,10 +1676,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<dayPeriod type="evening2">அந்தி மா.</dayPeriod>
 							<dayPeriod type="night1">இ.</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">முற்பகல்</dayPeriod>
-							<dayPeriod type="pm">பிற்பகல்</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
@@ -1731,25 +1716,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<timeFormats>
 					<timeFormatLength type="full">
 						<timeFormat>
-							<pattern>a h:mm:ss zzzz</pattern>
+							<pattern>h:mm:ss a zzzz</pattern>
 							<datetimeSkeleton>ahmmsszzzz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
-							<pattern>a h:mm:ss z</pattern>
+							<pattern>h:mm:ss a z</pattern>
 							<datetimeSkeleton>ahmmssz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
-							<pattern>a h:mm:ss</pattern>
+							<pattern>h:mm:ss a</pattern>
 							<datetimeSkeleton>ahmmss</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
-							<pattern>a h:mm</pattern>
+							<pattern>h:mm a</pattern>
 							<datetimeSkeleton>ahmm</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
@@ -1788,14 +1773,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
-						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
-						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
+						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y G</dateFormatItem>
-						<dateFormatItem id="h">a h</dateFormatItem>
-						<dateFormatItem id="hm">a h:mm</dateFormatItem>
-						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
-						<dateFormatItem id="hmsv">a h:mm:ss v</dateFormatItem>
-						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
+						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">dd-MM, E</dateFormatItem>
 						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
@@ -1818,33 +1803,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">a h – a h</greatestDifference>
-							<greatestDifference id="h">a h–h</greatestDifference>
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="H">
 							<greatestDifference id="H">HH – HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">a h:mm – a h:mm</greatestDifference>
-							<greatestDifference id="h">a h:mm–h:mm</greatestDifference>
-							<greatestDifference id="m">a h:mm–h:mm</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hm">
 							<greatestDifference id="H">HH:mm – HH:mm</greatestDifference>
 							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">a h:mm – a h:mm v</greatestDifference>
-							<greatestDifference id="h">a h:mm – h:mm v</greatestDifference>
-							<greatestDifference id="m">a h:mm – h:mm v</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm – h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm – h:mm a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hmv">
 							<greatestDifference id="H">HH:mm – HH:mm v</greatestDifference>
 							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">a h – a h v</greatestDifference>
-							<greatestDifference id="h">a h – h v</greatestDifference>
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h – h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Hv">
 							<greatestDifference id="H">HH – HH v</greatestDifference>
@@ -2582,9 +2567,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} நேரம்</regionFormat>
 			<regionFormat type="daylight">{0} பகலொளி நேரம்</regionFormat>
 			<regionFormat type="standard">{0} நிலையான நேரம்</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>சான்டா இசபெல்</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>ஒருங்கிணைந்த சர்வதேச நேரம்</standard>
@@ -2707,9 +2689,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>மெல்போர்ன்</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>கியூரி</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ஹோபர்ட்</exemplarCity>
 			</zone>
@@ -2863,9 +2842,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>க்ரெஸ்டான்</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>யெல்லோநைஃப்</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>எட்மான்டான்</exemplarCity>
 			</zone>
@@ -2884,30 +2860,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ரெசலூட்</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ரெய்னி ரிவர்</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ரான்கின் இன்லெட்</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>அடிகோகன்</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>தண்டர் பே</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>நிபிகான்</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>டொரொன்டோ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>இகாலூயித்</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>பாங்னிர்துங்</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>மாங்டான்</exemplarCity>
 			</zone>
@@ -3721,18 +3685,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>தார் எஸ் சலாம்</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>உஷோரோட்</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>கீவ்</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>சிம்ஃபெரோபோல்</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ஜபோரோஸியே</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>கம்பாலா</exemplarCity>
 			</zone>
@@ -3751,9 +3709,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ஹோனோலூலூ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ஜோன்ஸ்டன்</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>அங்கோரேஜ்</exemplarCity>
 			</zone>
@@ -4451,11 +4406,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>மக்காவ் கோடை நேரம்</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>மாக்கியூரி தீவு நேரம்</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>மகதன் நேரம்</generic>
@@ -4495,13 +4445,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>மாசன் நேரம்</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>வடமேற்கு மெக்ஸிகோ நேரம்</generic>
-					<standard>வடமேற்கு மெக்ஸிகோ நிலையான நேரம்</standard>
-					<daylight>வடமேற்கு மெக்ஸிகோ பகலொளி நேரம்</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>மெக்ஸிகன் பசிபிக் நேரம்</generic>
diff --git a/make/data/cldr/common/main/ta_IN.xml b/make/data/cldr/common/main/ta_IN.xml
index d8b40bf573b..128edffb144 100644
--- a/make/data/cldr/common/main/ta_IN.xml
+++ b/make/data/cldr/common/main/ta_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ta_LK.xml b/make/data/cldr/common/main/ta_LK.xml
index fb4f6f1f29d..f6fac9f6b17 100644
--- a/make/data/cldr/common/main/ta_LK.xml
+++ b/make/data/cldr/common/main/ta_LK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ta_MY.xml b/make/data/cldr/common/main/ta_MY.xml
index 55a55c25d6d..a893525396a 100644
--- a/make/data/cldr/common/main/ta_MY.xml
+++ b/make/data/cldr/common/main/ta_MY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ta_SG.xml b/make/data/cldr/common/main/ta_SG.xml
index e274aa65866..9b3acf30d75 100644
--- a/make/data/cldr/common/main/ta_SG.xml
+++ b/make/data/cldr/common/main/ta_SG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/te.xml b/make/data/cldr/common/main/te.xml
index 22469578916..91e75e220ee 100644
--- a/make/data/cldr/common/main/te.xml
+++ b/make/data/cldr/common/main/te.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1110,7 +1110,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">ఫోన్‌బుక్ క్రమబద్ధీకరణ క్రమం</type>
 			<type key="collation" type="phonetic">ధ్వని ఉచ్ఛారిత క్రమబద్ధీకరణ క్రమం</type>
 			<type key="collation" type="pinyin">పిన్‌యిన్ క్రమబద్ధీకరణ క్రమం</type>
-			<type key="collation" type="reformed">మళ్ళీ ఆకృతీకరించబడిన క్రమబద్ధీకరణ క్రమం</type>
 			<type key="collation" type="search">సాధారణ-ప్రయోజన శోధన</type>
 			<type key="collation" type="searchjl">హాంగుల్ ప్రారంభ హల్లు ద్వారా శోధించు</type>
 			<type key="collation" type="standard">ప్రామాణిక క్రమబద్ధీకరణ క్రమం</type>
@@ -2298,9 +2297,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} సమయం</regionFormat>
 			<regionFormat type="daylight">{0} పగటి వెలుతురు సమయం</regionFormat>
 			<regionFormat type="standard">{0} ప్రామాణిక సమయం</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>శాంటా ఇసబెల్</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>సమన్వయ సార్వజనీన సమయం</standard>
@@ -2423,9 +2419,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>మెల్బోర్న్</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>కర్రీ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>హోబర్ట్</exemplarCity>
 			</zone>
@@ -2579,9 +2572,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>క్రెస్టన్</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ఎల్లోనైఫ్</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ఎడ్మోంటన్</exemplarCity>
 			</zone>
@@ -2600,30 +2590,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>రిజల్యూట్</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>రెయినీ రివర్</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>రన్‌కిన్ ఇన్‌లెట్</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>అటికోకన్</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>థండర్ బే</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>నిపిగోన్</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>టొరంటో</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ఇక్వాలిట్</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>పాంగ్‌నీర్‌టుంగ్</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>మోన్‌క్టోన్</exemplarCity>
 			</zone>
@@ -3437,18 +3415,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>దార్ ఎస్ సలామ్</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ఉజ్‌హోరోడ్</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>కీవ్</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>సిమ్‌ఫెరోపోల్</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>జపరోజై</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>కంపాలా</exemplarCity>
 			</zone>
@@ -3467,9 +3439,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>హోనోలులు</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>జాన్సటన్</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>యాంకరేజ్</exemplarCity>
 			</zone>
@@ -4167,11 +4136,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>మకావ్ వేసవి సమయం</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>మాక్క్వారీ దీవి సమయం</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>మగడాన్ సమయం</generic>
@@ -4211,13 +4175,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>మాసన్ సమయం</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>వాయువ్య మెక్సికో సమయం</generic>
-					<standard>వాయువ్య మెక్సికో ప్రామాణిక సమయం</standard>
-					<daylight>వాయువ్య మెక్సికో పగటి వెలుతురు సమయం</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>మెక్సికన్ పసిఫిక్ సమయం</generic>
diff --git a/make/data/cldr/common/main/te_IN.xml b/make/data/cldr/common/main/te_IN.xml
index 6abf11edabc..3394316324f 100644
--- a/make/data/cldr/common/main/te_IN.xml
+++ b/make/data/cldr/common/main/te_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/teo.xml b/make/data/cldr/common/main/teo.xml
index 7cc175b207d..d1a6b911446 100644
--- a/make/data/cldr/common/main/teo.xml
+++ b/make/data/cldr/common/main/teo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/teo_KE.xml b/make/data/cldr/common/main/teo_KE.xml
index 460b0b12a7c..40e34580b1f 100644
--- a/make/data/cldr/common/main/teo_KE.xml
+++ b/make/data/cldr/common/main/teo_KE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/teo_UG.xml b/make/data/cldr/common/main/teo_UG.xml
index 2f531c0a412..f2659738cfb 100644
--- a/make/data/cldr/common/main/teo_UG.xml
+++ b/make/data/cldr/common/main/teo_UG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tg.xml b/make/data/cldr/common/main/tg.xml
index ada229a23d3..b721ac4f440 100644
--- a/make/data/cldr/common/main/tg.xml
+++ b/make/data/cldr/common/main/tg.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tg_TJ.xml b/make/data/cldr/common/main/tg_TJ.xml
index 096cf9f2a19..6b8d827b269 100644
--- a/make/data/cldr/common/main/tg_TJ.xml
+++ b/make/data/cldr/common/main/tg_TJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/th.xml b/make/data/cldr/common/main/th.xml
index 99d8c8a696b..21624f3245b 100644
--- a/make/data/cldr/common/main/th.xml
+++ b/make/data/cldr/common/main/th.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1289,7 +1289,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">ลำดับการจัดเรียงตามสมุดโทรศัพท์</type>
 			<type key="collation" type="phonetic">ลำดับการจัดเรียงตามการออกเสียง</type>
 			<type key="collation" type="pinyin">ลำดับการจัดเรียงตามการถอดเสียงภาษาจีน</type>
-			<type key="collation" type="reformed">ลำดับการจัดเรียงตามลำดับล่าสุด</type>
 			<type key="collation" type="search">การค้นหาทั่วไป</type>
 			<type key="collation" type="searchjl" draft="contributed">ค้นหาตามพยัญชนะขึ้นต้นที่เป็นฮันกึล</type>
 			<type key="collation" type="standard">ลำดับการจัดเรียงแบบมาตรฐาน</type>
@@ -3082,9 +3081,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>เวลา{0}</regionFormat>
 			<regionFormat type="daylight">เวลาออมแสง{0}</regionFormat>
 			<regionFormat type="standard">เวลามาตรฐาน{0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>ซานตาอิซาเบล</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>เวลาสากลเชิงพิกัด</standard>
@@ -3207,9 +3203,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>เมลเบิร์น</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>คูร์รี</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>โฮบาร์ต</exemplarCity>
 			</zone>
@@ -3363,9 +3356,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>เครสตัน</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>เยลโลว์ไนฟ์</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>เอดมันตัน</exemplarCity>
 			</zone>
@@ -3384,30 +3374,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>เรโซลูท</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>เรนนี่ริเวอร์</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>แรงกินอินเล็ต</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>คอรัลฮาร์เบอร์</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ทันเดอร์เบย์</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>นิปิกอน</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>โทรอนโต</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>อีกวาลิต</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>พางนีทัง</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>มองตัน</exemplarCity>
 			</zone>
@@ -4221,18 +4199,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ดาร์เอสซาลาม</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>อัซโกร็อด</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>เคียฟ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ซิมเฟอโรโปล</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ซาโปโรซี</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>คัมพาลา</exemplarCity>
 			</zone>
@@ -4251,9 +4223,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>โฮโนลูลู</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>จอห์นสตัน</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>แองเคอเรจ</exemplarCity>
 			</zone>
@@ -4953,11 +4922,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">เวลาฤดูร้อนมาเก๊า</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>เวลาเกาะแมกควอรี</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>เวลามากาดาน</generic>
@@ -4997,13 +4961,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>เวลามอว์สัน</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>เวลาเม็กซิโกตะวันตกเฉียงเหนือ</generic>
-					<standard>เวลามาตรฐานเม็กซิโกตะวันตกเฉียงเหนือ</standard>
-					<daylight>เวลาออมแสงเม็กซิโกตะวันตกเฉียงเหนือ</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>เวลาแปซิฟิกเม็กซิโก</generic>
diff --git a/make/data/cldr/common/main/th_TH.xml b/make/data/cldr/common/main/th_TH.xml
index 94df0771fd6..7feac5e265a 100644
--- a/make/data/cldr/common/main/th_TH.xml
+++ b/make/data/cldr/common/main/th_TH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ti.xml b/make/data/cldr/common/main/ti.xml
index 287ad6ac7dd..cec0852764d 100644
--- a/make/data/cldr/common/main/ti.xml
+++ b/make/data/cldr/common/main/ti.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1615,9 +1615,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>መልበርን</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ኩሪ</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ሆባርት</exemplarCity>
 			</zone>
@@ -1771,9 +1768,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>ክረስተን</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>የለውናይፍ</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ኤድመንተን</exemplarCity>
 			</zone>
@@ -1792,30 +1786,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>ረዞሉት</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ረይኒ ሪቨር</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ራንኪን ኢንለት</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ኣቲኮካን</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ዛንደር በይ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ኒፒጎን</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ቶሮንቶ</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ኢቃልዊት</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ፓንግኒርተንግ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ሞንክተን</exemplarCity>
 			</zone>
@@ -2629,18 +2611,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>ዳር ኤስ ሳላም</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ኡዝጎሮድ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>ክየቭ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>ሲምፈሮፖል</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ዛፖሪዥያ</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>ካምፓላ</exemplarCity>
 			</zone>
@@ -2659,9 +2635,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ሆኖሉሉ</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ጆንስተን</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>ኣንኮረጅ</exemplarCity>
 			</zone>
diff --git a/make/data/cldr/common/main/ti_ER.xml b/make/data/cldr/common/main/ti_ER.xml
index 44e206c8249..4ee2721cf46 100644
--- a/make/data/cldr/common/main/ti_ER.xml
+++ b/make/data/cldr/common/main/ti_ER.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ti_ET.xml b/make/data/cldr/common/main/ti_ET.xml
index 8aa6cc47d11..ec8c7604eb8 100644
--- a/make/data/cldr/common/main/ti_ET.xml
+++ b/make/data/cldr/common/main/ti_ET.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tig.xml b/make/data/cldr/common/main/tig.xml
index 2eecec45382..d59e6eb4a68 100644
--- a/make/data/cldr/common/main/tig.xml
+++ b/make/data/cldr/common/main/tig.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tig_ER.xml b/make/data/cldr/common/main/tig_ER.xml
index 4a946eb9da7..66096312894 100644
--- a/make/data/cldr/common/main/tig_ER.xml
+++ b/make/data/cldr/common/main/tig_ER.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tk.xml b/make/data/cldr/common/main/tk.xml
index df81503b8ee..f97a3d7b2d7 100644
--- a/make/data/cldr/common/main/tk.xml
+++ b/make/data/cldr/common/main/tk.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2154,9 +2154,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat>{0} wagty</regionFormat>
 			<regionFormat type="daylight">{0} tomusky wagty</regionFormat>
 			<regionFormat type="standard">{0} standart wagty</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa-Izabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Utgaşdyrylýan ähliumumy wagt</standard>
@@ -2258,9 +2255,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melburn</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kerri</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Sidneý</exemplarCity>
 			</zone>
@@ -2369,9 +2363,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>Kreston</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Ýellounaýf</exemplarCity>
-			</zone>
 			<zone type="America/Swift_Current">
 				<exemplarCity>Swift-Karent</exemplarCity>
 			</zone>
@@ -2384,21 +2375,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>Rezolýut</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Reýni-Riwer</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Rankin-Inlet</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tander-Beý</exemplarCity>
-			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikaluit</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnirtang</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Monkton</exemplarCity>
 			</zone>
@@ -3006,15 +2988,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar-es-Salam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiýew</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožýe</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Midueý</exemplarCity>
 			</zone>
@@ -3030,9 +3006,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Gonolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Jonston</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ankoridž</exemplarCity>
 			</zone>
@@ -3642,11 +3615,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Lord-Hau tomusky wagty</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Makkuori adasy wagty</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan wagty</generic>
@@ -3686,13 +3654,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mouson wagty</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Demirgazyk-günbatar Meksika wagty</generic>
-					<standard>Demirgazyk-günbatar Meksika standart wagty</standard>
-					<daylight>Demirgazyk-günbatar Meksika tomusky wagty</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksikan Ýuwaş umman wagty</generic>
diff --git a/make/data/cldr/common/main/tk_TM.xml b/make/data/cldr/common/main/tk_TM.xml
index 84a74cc655b..4a14ee3ade1 100644
--- a/make/data/cldr/common/main/tk_TM.xml
+++ b/make/data/cldr/common/main/tk_TM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tn.xml b/make/data/cldr/common/main/tn.xml
index c6f1c4b44d3..7618674e353 100644
--- a/make/data/cldr/common/main/tn.xml
+++ b/make/data/cldr/common/main/tn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tn_BW.xml b/make/data/cldr/common/main/tn_BW.xml
index 9a07e5f9c3c..ec774774ade 100644
--- a/make/data/cldr/common/main/tn_BW.xml
+++ b/make/data/cldr/common/main/tn_BW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tn_ZA.xml b/make/data/cldr/common/main/tn_ZA.xml
index d0a698ebd79..a4675dc9514 100644
--- a/make/data/cldr/common/main/tn_ZA.xml
+++ b/make/data/cldr/common/main/tn_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/to.xml b/make/data/cldr/common/main/to.xml
index da45f39b3e6..841da2c8d95 100644
--- a/make/data/cldr/common/main/to.xml
+++ b/make/data/cldr/common/main/to.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -2688,9 +2688,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat>Taimi {0}</regionFormat>
 			<regionFormat type="daylight">{0} Taimi liliu</regionFormat>
 			<regionFormat type="standard">{0} Taimi totonu</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>taimi fakaemāmani</standard>
@@ -2711,9 +2708,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melipoane</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Senē</exemplarCity>
 			</zone>
@@ -2854,9 +2848,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Sao_Tome">
 				<exemplarCity>Sao Tomé</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
@@ -2874,9 +2865,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Sionesitoni</exemplarCity>
-			</zone>
 			<zone type="America/New_York">
 				<exemplarCity>Niu ʻIoke</exemplarCity>
 			</zone>
@@ -3456,11 +3444,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>houa fakamakau taimi liliu</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>houa fakamotumakuali</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>houa fakalūsia-makatani</generic>
@@ -3500,13 +3483,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>houa fakamausoni</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>houa fakamekisikou-tokelauhihifo</generic>
-					<standard>houa fakamekisikou-tokelauhihifo taimi totonu</standard>
-					<daylight>houa fakamekisikou-tokelauhihifo taimi liliu</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>houa fakamekisikou-pasifika</generic>
diff --git a/make/data/cldr/common/main/to_TO.xml b/make/data/cldr/common/main/to_TO.xml
index 901ddb9da91..bc46c596dd2 100644
--- a/make/data/cldr/common/main/to_TO.xml
+++ b/make/data/cldr/common/main/to_TO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tok.xml b/make/data/cldr/common/main/tok.xml
index 9b0f50216db..65fee38557a 100644
--- a/make/data/cldr/common/main/tok.xml
+++ b/make/data/cldr/common/main/tok.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tok_001.xml b/make/data/cldr/common/main/tok_001.xml
index 69d31266dd5..d70868f3cff 100644
--- a/make/data/cldr/common/main/tok_001.xml
+++ b/make/data/cldr/common/main/tok_001.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tpi.xml b/make/data/cldr/common/main/tpi.xml
index 2b2d74642cd..97e55f31e31 100644
--- a/make/data/cldr/common/main/tpi.xml
+++ b/make/data/cldr/common/main/tpi.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tpi_PG.xml b/make/data/cldr/common/main/tpi_PG.xml
index 59c299a7362..42a5bfe3851 100644
--- a/make/data/cldr/common/main/tpi_PG.xml
+++ b/make/data/cldr/common/main/tpi_PG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tr.xml b/make/data/cldr/common/main/tr.xml
index c26ea7a401a..e597dbb5cf6 100644
--- a/make/data/cldr/common/main/tr.xml
+++ b/make/data/cldr/common/main/tr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1263,7 +1263,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Telefon Defteri Sıralama Düzeni</type>
 			<type key="collation" type="phonetic">Fonetik Sıralama Düzeni</type>
 			<type key="collation" type="pinyin">Pinyin Sıralama Düzeni</type>
-			<type key="collation" type="reformed">Yeni Sıralama Düzeni</type>
 			<type key="collation" type="search">Genel Amaçlı Arama</type>
 			<type key="collation" type="searchjl">Hangul İlk Sessiz Harfe Göre Arama</type>
 			<type key="collation" type="standard">Standart Sıralama Düzeni</type>
@@ -2505,9 +2504,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} Saati</regionFormat>
 			<regionFormat type="daylight">{0} Yaz Saati</regionFormat>
 			<regionFormat type="standard">{0} Standart Saati</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Eş Güdümlü Evrensel Zaman</standard>
@@ -2531,9 +2527,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Europe/Vienna">
 				<exemplarCity>Viyana</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="Australia/Sydney">
 				<exemplarCity>Sidney</exemplarCity>
 			</zone>
@@ -2863,15 +2856,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Darüsselam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ujgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporojye</exemplarCity>
-			</zone>
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
@@ -3466,11 +3453,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Makao Yaz Saati</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie Adası Saati</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan Saati</generic>
@@ -3510,13 +3492,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mawson Saati</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Kuzeybatı Meksika Saati</generic>
-					<standard>Kuzeybatı Meksika Standart Saati</standard>
-					<daylight>Kuzeybatı Meksika Yaz Saati</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksika Pasifik Kıyısı Saati</generic>
diff --git a/make/data/cldr/common/main/tr_CY.xml b/make/data/cldr/common/main/tr_CY.xml
index 5204d43f9d3..51c2665e09d 100644
--- a/make/data/cldr/common/main/tr_CY.xml
+++ b/make/data/cldr/common/main/tr_CY.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tr_TR.xml b/make/data/cldr/common/main/tr_TR.xml
index 87c10bb8eec..b5f4f6b9907 100644
--- a/make/data/cldr/common/main/tr_TR.xml
+++ b/make/data/cldr/common/main/tr_TR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/trv.xml b/make/data/cldr/common/main/trv.xml
index 3675a5afcea..648691d9274 100644
--- a/make/data/cldr/common/main/trv.xml
+++ b/make/data/cldr/common/main/trv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/trv_TW.xml b/make/data/cldr/common/main/trv_TW.xml
index f8194882dcf..a29c48baf71 100644
--- a/make/data/cldr/common/main/trv_TW.xml
+++ b/make/data/cldr/common/main/trv_TW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/trw.xml b/make/data/cldr/common/main/trw.xml
index 4a63b955632..2226a7d3c3f 100644
--- a/make/data/cldr/common/main/trw.xml
+++ b/make/data/cldr/common/main/trw.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1211,9 +1211,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity draft="unconfirmed">ملبورن</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity draft="unconfirmed">کیوری</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity draft="unconfirmed">ہوبارٹ</exemplarCity>
 			</zone>
@@ -1367,9 +1364,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity draft="unconfirmed">کریسٹون</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity draft="unconfirmed">ایلو نائف</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity draft="unconfirmed">ایڈمونٹن</exemplarCity>
 			</zone>
@@ -1388,30 +1382,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity draft="unconfirmed">ریزولیوٹ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity draft="unconfirmed">رینی ریور</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity draft="unconfirmed">رینکن انلیٹ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity draft="unconfirmed">اٹیکوکن</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity draft="unconfirmed">تھنڈر بے</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity draft="unconfirmed">نپیگون</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity draft="unconfirmed">ٹورنٹو</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity draft="unconfirmed">ایکالوئٹ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity draft="unconfirmed">پینگنِرٹنگ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity draft="unconfirmed">مونکٹن</exemplarCity>
 			</zone>
@@ -2219,18 +2201,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity draft="unconfirmed">دار السلام</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity draft="unconfirmed">ازہوراڈ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity draft="unconfirmed">کیو</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity draft="unconfirmed">سمفروپول</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity draft="unconfirmed">زیپوروزائی</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity draft="unconfirmed">کیمپالا</exemplarCity>
 			</zone>
@@ -2246,9 +2222,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Nome">
 				<exemplarCity draft="unconfirmed">نوم</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity draft="unconfirmed">جانسٹن</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity draft="unconfirmed">اینکریج</exemplarCity>
 			</zone>
@@ -2884,11 +2857,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight draft="unconfirmed">لارڈ ہووے ڈے لائٹ ٹائم</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="unconfirmed">مکوآری آئلینڈ سی وَخ</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="unconfirmed">میگیدن ٹائم</generic>
@@ -2928,13 +2896,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">ماؤسن ٹائم</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="unconfirmed">شمال مغربی میکسیکو ٹائم</generic>
-					<standard draft="unconfirmed">شمال مغربی میکسیکو اسٹینڈرڈ ٹائم</standard>
-					<daylight draft="unconfirmed">شمال مغربی میکسیکو ڈے لائٹ ٹائم</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="unconfirmed">میکسیکن پیسفک ٹائم</generic>
diff --git a/make/data/cldr/common/main/trw_PK.xml b/make/data/cldr/common/main/trw_PK.xml
index c7ddcf83557..ac600521497 100644
--- a/make/data/cldr/common/main/trw_PK.xml
+++ b/make/data/cldr/common/main/trw_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ts.xml b/make/data/cldr/common/main/ts.xml
index d7859e46b9c..c9d2049c577 100644
--- a/make/data/cldr/common/main/ts.xml
+++ b/make/data/cldr/common/main/ts.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ts_ZA.xml b/make/data/cldr/common/main/ts_ZA.xml
index 4cb6219d8d8..7b5b0040d33 100644
--- a/make/data/cldr/common/main/ts_ZA.xml
+++ b/make/data/cldr/common/main/ts_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tt.xml b/make/data/cldr/common/main/tt.xml
index 8b8f6056fd9..d616a87b68b 100644
--- a/make/data/cldr/common/main/tt.xml
+++ b/make/data/cldr/common/main/tt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tt_RU.xml b/make/data/cldr/common/main/tt_RU.xml
index 512891763ae..457e22723e5 100644
--- a/make/data/cldr/common/main/tt_RU.xml
+++ b/make/data/cldr/common/main/tt_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/twq.xml b/make/data/cldr/common/main/twq.xml
index 162b1324198..879b928c211 100644
--- a/make/data/cldr/common/main/twq.xml
+++ b/make/data/cldr/common/main/twq.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/twq_NE.xml b/make/data/cldr/common/main/twq_NE.xml
index f8d6bfcb8d8..4cd326ae69f 100644
--- a/make/data/cldr/common/main/twq_NE.xml
+++ b/make/data/cldr/common/main/twq_NE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tyv.xml b/make/data/cldr/common/main/tyv.xml
index 466f67311d5..cb00198bf97 100644
--- a/make/data/cldr/common/main/tyv.xml
+++ b/make/data/cldr/common/main/tyv.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tyv_RU.xml b/make/data/cldr/common/main/tyv_RU.xml
index 34585945091..1968e81a13a 100644
--- a/make/data/cldr/common/main/tyv_RU.xml
+++ b/make/data/cldr/common/main/tyv_RU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tzm.xml b/make/data/cldr/common/main/tzm.xml
index 49805934e90..00c6f99b2fd 100644
--- a/make/data/cldr/common/main/tzm.xml
+++ b/make/data/cldr/common/main/tzm.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/tzm_MA.xml b/make/data/cldr/common/main/tzm_MA.xml
index f91625c497e..bf1595b3bde 100644
--- a/make/data/cldr/common/main/tzm_MA.xml
+++ b/make/data/cldr/common/main/tzm_MA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ug.xml b/make/data/cldr/common/main/ug.xml
index 487e699b1d4..3b5bab65654 100644
--- a/make/data/cldr/common/main/ug.xml
+++ b/make/data/cldr/common/main/ug.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Science Association http://ukij.org
@@ -2496,11 +2496,6 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 					<daylight draft="contributed">ئاۋمېن يازلىق ۋاقتى</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard draft="contributed">ماككۇۋارى ئاراللىرى ۋاقتى</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic draft="contributed">ماگادان ۋاقتى</generic>
@@ -2540,13 +2535,6 @@ Reviewed by Waris Abdukerim Janbaz <oyghan@gmail.com> of the Uyghur Computer Sci
 					<standard draft="contributed">ماۋسون ۋاقتى</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic draft="contributed">مېكسىكا غەربىي شىمالىي قىسىم ۋاقتى</generic>
-					<standard draft="contributed">مېكسىكا غەربىي شىمالىي قىسىم ئۆلچەملىك ۋاقتى</standard>
-					<daylight draft="contributed">مېكسىكا غەربىي شىمالىي قىسىم يازلىق ۋاقتى</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic draft="contributed">مېكسىكا تىنچ ئوكيان ۋاقتى</generic>
diff --git a/make/data/cldr/common/main/ug_CN.xml b/make/data/cldr/common/main/ug_CN.xml
index d78e1aae558..0ef634ba339 100644
--- a/make/data/cldr/common/main/ug_CN.xml
+++ b/make/data/cldr/common/main/ug_CN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/uk.xml b/make/data/cldr/common/main/uk.xml
index 223699ba04e..74b4fe9fd0b 100644
--- a/make/data/cldr/common/main/uk.xml
+++ b/make/data/cldr/common/main/uk.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1160,7 +1160,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">порядок сортування за телефонним довідником</type>
 			<type key="collation" type="phonetic">фонетичний порядок сортування</type>
 			<type key="collation" type="pinyin">порядок сортування піньїнь</type>
-			<type key="collation" type="reformed">реформований порядок сортування</type>
 			<type key="collation" type="search">універсальний пошук</type>
 			<type key="collation" type="searchjl" draft="contributed">пошук за початковою приголосною хангул</type>
 			<type key="collation" type="standard">стандартний порядок сортування</type>
@@ -1444,7 +1443,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, d MMMM y 'р'. G</pattern>
+							<pattern>cccc, d MMMM y 'р'. G</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -1822,7 +1821,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, d MMMM y 'р'.</pattern>
+							<pattern>cccc, d MMMM y 'р'.</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -3188,9 +3187,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>час: {0}</regionFormat>
 			<regionFormat type="daylight">час: {0}, літній</regionFormat>
 			<regionFormat type="standard">час: {0}, стандартний</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Санта-Ісабель</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>за всесвітнім координованим часом</standard>
@@ -3313,9 +3309,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Мельбурн</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Каррі</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Гобарт</exemplarCity>
 			</zone>
@@ -3469,9 +3462,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Крестон</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Єллоунайф</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Едмонтон</exemplarCity>
 			</zone>
@@ -3490,30 +3480,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Резольют</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейні-Рівер</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Ренкін-Інлет</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Атікокан</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Ніпігон</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Торонто</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ікалуїт</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Панґніртанґ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Монктон</exemplarCity>
 			</zone>
@@ -4327,18 +4305,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Дар-ес-Салам</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Київ</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Сімферополь</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запоріжжя</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Кампала</exemplarCity>
 			</zone>
@@ -4357,9 +4329,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Гонолулу</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Джонстон</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Анкоридж</exemplarCity>
 			</zone>
@@ -5026,11 +4995,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>за літнім часом на острові Лорд-Хау</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>за часом на острові Маккуорі</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>за магаданським часом</generic>
@@ -5070,13 +5034,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>за часом на станції Моусон</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>за північнозахідним часом у Мексиці</generic>
-					<standard>за стандартним північнозахідним часом у Мексиці</standard>
-					<daylight>за літнім північнозахідним часом у Мексиці</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>за тихоокеанським часом у Мексиці</generic>
diff --git a/make/data/cldr/common/main/uk_UA.xml b/make/data/cldr/common/main/uk_UA.xml
index bd0222c629e..e8712e1ce53 100644
--- a/make/data/cldr/common/main/uk_UA.xml
+++ b/make/data/cldr/common/main/uk_UA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ur.xml b/make/data/cldr/common/main/ur.xml
index 9db822ec560..53f27ecf32d 100644
--- a/make/data/cldr/common/main/ur.xml
+++ b/make/data/cldr/common/main/ur.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -914,7 +914,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">فون بک کی چھٹنی کی ترتیب</type>
 			<type key="collation" type="phonetic">صوتی چھٹائی کی ترتیب</type>
 			<type key="collation" type="pinyin">پن ین کی چھٹنی کی ترتیب</type>
-			<type key="collation" type="reformed">دوبارہ تشکیل شدہ چھٹنی کی ترتیب</type>
 			<type key="collation" type="search">عمومی تلاش</type>
 			<type key="collation" type="searchjl">Hangul Initial Consonant کے لحاظ سے تلاش کریں</type>
 			<type key="collation" type="standard">معیاری چھانٹی کی ترتیب</type>
@@ -2048,9 +2047,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>{0} وقت</regionFormat>
 			<regionFormat type="daylight">{0} ڈے لائٹ ٹائم</regionFormat>
 			<regionFormat type="standard">{0} معیاری وقت</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>سانتا ایزابیل</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>کوآرڈینیٹڈ یونیورسل ٹائم</standard>
@@ -2173,9 +2169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>ملبورن</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>کیوری</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>ہوبارٹ</exemplarCity>
 			</zone>
@@ -2329,9 +2322,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>کریسٹون</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ایلو نائف</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ایڈمونٹن</exemplarCity>
 			</zone>
@@ -2350,30 +2340,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>ریزولیوٹ</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>رینی ریور</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>رینکن انلیٹ</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>اٹیکوکن</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>تھنڈر بے</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>نپیگون</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ٹورنٹو</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ایکالوئٹ</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>پینگنِرٹنگ</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>مونکٹن</exemplarCity>
 			</zone>
@@ -3187,18 +3165,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>دار السلام</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ازہوراڈ</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>کیو</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>سمفروپول</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>زیپوروزائی</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>کیمپالا</exemplarCity>
 			</zone>
@@ -3217,9 +3189,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>ہونولولو</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>جانسٹن</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>اینکریج</exemplarCity>
 			</zone>
@@ -3869,11 +3838,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>لارڈ ہووے ڈے لائٹ ٹائم</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>مکوآری آئلینڈ کا وقت</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>میگیدن ٹائم</generic>
@@ -3913,13 +3877,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>ماؤسن ٹائم</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>شمال مغربی میکسیکو ٹائم</generic>
-					<standard>شمال مغربی میکسیکو اسٹینڈرڈ ٹائم</standard>
-					<daylight>شمال مغربی میکسیکو ڈے لائٹ ٹائم</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>میکسیکن پیسفک ٹائم</generic>
diff --git a/make/data/cldr/common/main/ur_IN.xml b/make/data/cldr/common/main/ur_IN.xml
index 6cd6b9bc96a..43bb9e844df 100644
--- a/make/data/cldr/common/main/ur_IN.xml
+++ b/make/data/cldr/common/main/ur_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -383,11 +383,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>کرغستان ٹائم</standard>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>مکوآری آئلینڈ ٹائم</standard>
-				</long>
-			</metazone>
 			<metazone type="Maldives">
 				<long>
 					<standard>مالدیپ ٹائم</standard>
diff --git a/make/data/cldr/common/main/ur_PK.xml b/make/data/cldr/common/main/ur_PK.xml
index eb15e80ecfa..15a06e36430 100644
--- a/make/data/cldr/common/main/ur_PK.xml
+++ b/make/data/cldr/common/main/ur_PK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/uz.xml b/make/data/cldr/common/main/uz.xml
index 2f759633d49..647f507ab45 100644
--- a/make/data/cldr/common/main/uz.xml
+++ b/make/data/cldr/common/main/uz.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1888,9 +1888,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 		</fields>
 		<timeZoneNames>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa-Izabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Koordinatali universal vaqt</standard>
@@ -1983,9 +1980,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Melburn</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kerri</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Xobart</exemplarCity>
 			</zone>
@@ -2091,9 +2085,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Kreston</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Yellounayf</exemplarCity>
-			</zone>
 			<zone type="America/Swift_Current">
 				<exemplarCity>Svift-Karrent</exemplarCity>
 			</zone>
@@ -2109,24 +2100,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Rezolyut</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Reyni-River</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Rankin-Inlet</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Koral-Xarbor</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tander-Bey</exemplarCity>
-			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikaluit</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnirtang</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Monkton</exemplarCity>
 			</zone>
@@ -2674,15 +2656,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dor-us-Salom</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ujgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiyev</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporojye</exemplarCity>
-			</zone>
 			<zone type="Pacific/Midway">
 				<exemplarCity>Midvey orollari</exemplarCity>
 			</zone>
@@ -2698,9 +2674,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Gonolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Jonston</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ankorij</exemplarCity>
 			</zone>
@@ -3303,11 +3276,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Lord-Xau yozgi vaqti</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Makkuori oroli vaqti</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan vaqti</generic>
@@ -3347,13 +3315,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mouson vaqti</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Shimoli-g‘arbiy Meksika vaqti</generic>
-					<standard>Shimoli-g‘arbiy Meksika standart vaqti</standard>
-					<daylight>Shimoli-g‘arbiy Meksika yozgi vaqti</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Meksika Tinch okeani vaqti</generic>
diff --git a/make/data/cldr/common/main/uz_Arab.xml b/make/data/cldr/common/main/uz_Arab.xml
index 37cd13fad28..cfee01b5424 100644
--- a/make/data/cldr/common/main/uz_Arab.xml
+++ b/make/data/cldr/common/main/uz_Arab.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/uz_Arab_AF.xml b/make/data/cldr/common/main/uz_Arab_AF.xml
index e1d987d3f17..2811c51a34d 100644
--- a/make/data/cldr/common/main/uz_Arab_AF.xml
+++ b/make/data/cldr/common/main/uz_Arab_AF.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/uz_Cyrl.xml b/make/data/cldr/common/main/uz_Cyrl.xml
index 84f031b3ba5..e40915dfde9 100644
--- a/make/data/cldr/common/main/uz_Cyrl.xml
+++ b/make/data/cldr/common/main/uz_Cyrl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1762,11 +1762,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Лорд Хове кундузги вақти</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Маквари ороли вақти</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Магадан вақти</generic>
diff --git a/make/data/cldr/common/main/uz_Cyrl_UZ.xml b/make/data/cldr/common/main/uz_Cyrl_UZ.xml
index 7275b67c2e3..661662e2a54 100644
--- a/make/data/cldr/common/main/uz_Cyrl_UZ.xml
+++ b/make/data/cldr/common/main/uz_Cyrl_UZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/uz_Latn.xml b/make/data/cldr/common/main/uz_Latn.xml
index df98fe2f66a..751b7b9ad9d 100644
--- a/make/data/cldr/common/main/uz_Latn.xml
+++ b/make/data/cldr/common/main/uz_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/uz_Latn_UZ.xml b/make/data/cldr/common/main/uz_Latn_UZ.xml
index f1601335ce8..186352fa45c 100644
--- a/make/data/cldr/common/main/uz_Latn_UZ.xml
+++ b/make/data/cldr/common/main/uz_Latn_UZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vai.xml b/make/data/cldr/common/main/vai.xml
index 95876167bed..44e89b1a1dd 100644
--- a/make/data/cldr/common/main/vai.xml
+++ b/make/data/cldr/common/main/vai.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vai_Latn.xml b/make/data/cldr/common/main/vai_Latn.xml
index cfa87ac1fd0..5a3fe8b92d6 100644
--- a/make/data/cldr/common/main/vai_Latn.xml
+++ b/make/data/cldr/common/main/vai_Latn.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vai_Latn_LR.xml b/make/data/cldr/common/main/vai_Latn_LR.xml
index a346f6da827..35c079808c8 100644
--- a/make/data/cldr/common/main/vai_Latn_LR.xml
+++ b/make/data/cldr/common/main/vai_Latn_LR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vai_Vaii.xml b/make/data/cldr/common/main/vai_Vaii.xml
index f3dab1614ff..ff8d2dddc32 100644
--- a/make/data/cldr/common/main/vai_Vaii.xml
+++ b/make/data/cldr/common/main/vai_Vaii.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vai_Vaii_LR.xml b/make/data/cldr/common/main/vai_Vaii_LR.xml
index 1ef82ace8b7..8d2a6a96a83 100644
--- a/make/data/cldr/common/main/vai_Vaii_LR.xml
+++ b/make/data/cldr/common/main/vai_Vaii_LR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ve.xml b/make/data/cldr/common/main/ve.xml
index df005fed71e..bba30a59a3d 100644
--- a/make/data/cldr/common/main/ve.xml
+++ b/make/data/cldr/common/main/ve.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/ve_ZA.xml b/make/data/cldr/common/main/ve_ZA.xml
index d55f653225d..4f4702d3e87 100644
--- a/make/data/cldr/common/main/ve_ZA.xml
+++ b/make/data/cldr/common/main/ve_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vec.xml b/make/data/cldr/common/main/vec.xml
index 52d35c8a787..73db662b48b 100644
--- a/make/data/cldr/common/main/vec.xml
+++ b/make/data/cldr/common/main/vec.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1763,9 +1763,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Thimphu">
 				<exemplarCity>Tinpu</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pang</exemplarCity>
-			</zone>
 			<zone type="America/St_Johns">
 				<exemplarCity>S. Joani</exemplarCity>
 			</zone>
@@ -2215,18 +2212,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Dar es Salam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ùzgorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Sinferòpoli</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporija</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kanpala</exemplarCity>
 			</zone>
@@ -2236,9 +2227,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Wake">
 				<exemplarCity>Atolo Wake</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Atolo Johnston</exemplarCity>
-			</zone>
 			<zone type="America/Los_Angeles">
 				<exemplarCity>Los Àngeles</exemplarCity>
 			</zone>
@@ -2811,11 +2799,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Ora d’istà de l’Ìzola Lord Howe</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Ora de l’Ìzola Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Ora de Magadan</generic>
@@ -2855,13 +2838,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Ora de Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Ora de’l Mèsego nord osidentale</generic>
-					<standard>Ora normale de’l Mèsego nord osidentale</standard>
-					<daylight>Ora d’istà de’l Mèsego nord osidentale</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Ora de’l Mèsego de’l Pasìfego</generic>
diff --git a/make/data/cldr/common/main/vec_IT.xml b/make/data/cldr/common/main/vec_IT.xml
index ee6861ddd28..7105959d47a 100644
--- a/make/data/cldr/common/main/vec_IT.xml
+++ b/make/data/cldr/common/main/vec_IT.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vi.xml b/make/data/cldr/common/main/vi.xml
index 2918de18bcc..29c6d094fb1 100644
--- a/make/data/cldr/common/main/vi.xml
+++ b/make/data/cldr/common/main/vi.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1202,7 +1202,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Thứ tự sắp xếp theo danh bạ điện thoại</type>
 			<type key="collation" type="phonetic">Thứ tự sắp xếp theo ngữ âm</type>
 			<type key="collation" type="pinyin">Thứ tự sắp xếp theo bính âm</type>
-			<type key="collation" type="reformed">Thứ tự sắp xếp đã sửa đổi</type>
 			<type key="collation" type="search">Tìm kiếm mục đích chung</type>
 			<type key="collation" type="searchjl" draft="contributed">Tìm kiếm theo Phụ âm Đầu Hangul</type>
 			<type key="collation" type="standard">Thứ tự sắp xếp chuẩn</type>
@@ -1895,15 +1894,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
 							<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="G">d/M/y GGGGG  –  d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="G">d/M/y GGGGG – d/M/y GGGGG</greatestDifference>
 							<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
 							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="G">E, d/M/y GGGGG  –  E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="G">E, d/M/y GGGGG – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
 							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
@@ -1954,19 +1953,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M  –  E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M  –  E, d/M</greatestDifference>
+							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM  –  MMM</greatestDifference>
+							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d – d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM  –  d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM  –  E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM  –  E, d MMM</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
 							<greatestDifference id="y">y–y G</greatestDifference>
@@ -1981,26 +1980,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="M">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
-							<greatestDifference id="y">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM  –  MMM y G</greatestDifference>
-							<greatestDifference id="y">MMM y  –  MMM y G</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d – d MMM, y G</greatestDifference>
-							<greatestDifference id="M">d MMM  –  d MMM, y G</greatestDifference>
-							<greatestDifference id="y">d MMM, y  –  d MMM, y G</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM, y G</greatestDifference>
+							<greatestDifference id="y">d MMM, y – d MMM, y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM  –  E, d MMM, y G</greatestDifference>
-							<greatestDifference id="M">E, d MMM  –  E, d MMM, y G</greatestDifference>
-							<greatestDifference id="y">E, d MMM, y  –  E, d MMM, y G</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM, y G</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM, y G</greatestDifference>
+							<greatestDifference id="y">E, d MMM, y – E, d MMM, y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM  –  MMMM y G</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
 							<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
@@ -2305,7 +2304,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">h 'giờ' B  –  h 'giờ' B</greatestDifference>
+							<greatestDifference id="B">h 'giờ' B – h 'giờ' B</greatestDifference>
 							<greatestDifference id="h">h – h 'giờ' B</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Bhm">
@@ -2320,24 +2319,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">y – y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
-							<greatestDifference id="G">M/y G  –  M/y G</greatestDifference>
+							<greatestDifference id="G">M/y G – M/y G</greatestDifference>
 							<greatestDifference id="M">M/y– M/y G</greatestDifference>
 							<greatestDifference id="y">M/y – M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
 							<greatestDifference id="d">d/M/y – d/M/y G</greatestDifference>
-							<greatestDifference id="G">d/M/y G  –  d/M/y G</greatestDifference>
+							<greatestDifference id="G">d/M/y G – d/M/y G</greatestDifference>
 							<greatestDifference id="M">d/M/y – d/M/y G</greatestDifference>
 							<greatestDifference id="y">d/M/y – d/M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMEd">
-							<greatestDifference id="d">E, d/M/y  –  E, d/M/y G</greatestDifference>
-							<greatestDifference id="G">E, d/M/y G  –  E, d/M/y G</greatestDifference>
-							<greatestDifference id="M">E, d/M/y  –  E, d/M/y G</greatestDifference>
-							<greatestDifference id="y">E, d/M/y  –  E, d/M/y G</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y G</greatestDifference>
+							<greatestDifference id="G">E, d/M/y G – E, d/M/y G</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y G</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y G</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMM">
-							<greatestDifference id="G">MMM y G  –  MMM y G</greatestDifference>
+							<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
 							<greatestDifference id="M">MMM – MMM y G</greatestDifference>
 							<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
 						</intervalFormatItem>
@@ -2379,15 +2378,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M  –  E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M  –  E, d/M</greatestDifference>
+							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
+							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
 							<greatestDifference id="M">MMM – MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d">d – d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM  –  d MMM</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
 							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
@@ -2403,27 +2402,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/y  –  E, d/M/y</greatestDifference>
-							<greatestDifference id="M">E, d/M/y  –  E, d/M/y</greatestDifference>
-							<greatestDifference id="y">E, d/M/y  –  E, d/M/y</greatestDifference>
+							<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
+							<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM  –  MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y  –  MMM y</greatestDifference>
+							<greatestDifference id="M">MMM – MMM y</greatestDifference>
+							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
 							<greatestDifference id="d">d – d MMM, y</greatestDifference>
-							<greatestDifference id="M">d MMM  –  d MMM, y</greatestDifference>
-							<greatestDifference id="y">d MMM, y  –  d MMM, y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM, y</greatestDifference>
+							<greatestDifference id="y">d MMM, y – d MMM, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM  –  E, d MMM, y</greatestDifference>
-							<greatestDifference id="M">E, d MMM  –  E, d MMM, y</greatestDifference>
-							<greatestDifference id="y">E, d MMM, y  –  E, d MMM, y</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM, y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM, y</greatestDifference>
+							<greatestDifference id="y">E, d MMM, y – E, d MMM, y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM  –  MMMM 'năm' y</greatestDifference>
-							<greatestDifference id="y">MMMM 'năm' y  –  MMMM 'năm' y</greatestDifference>
+							<greatestDifference id="M">MMMM – MMMM 'năm' y</greatestDifference>
+							<greatestDifference id="y">MMMM 'năm' y – MMMM 'năm' y</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
@@ -2806,9 +2805,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Giờ {0}</regionFormat>
 			<regionFormat type="daylight">Giờ mùa hè {0}</regionFormat>
 			<regionFormat type="standard">Giờ chuẩn {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Giờ Phối hợp Quốc tế</standard>
@@ -2817,9 +2813,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Etc/Unknown">
 				<exemplarCity>Thành phố không xác định</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Currie</exemplarCity>
-			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>St. Barthélemy</exemplarCity>
 			</zone>
@@ -2896,9 +2889,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Taipei">
 				<exemplarCity>Đài Bắc</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiev</exemplarCity>
 			</zone>
@@ -3527,11 +3517,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight draft="contributed">Giờ Mùa Hè Ma Cao</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Giờ đảo Macquarie</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Giờ Magadan</generic>
@@ -3571,13 +3556,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Giờ Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Giờ Tây Bắc Mexico</generic>
-					<standard>Giờ Chuẩn Tây Bắc Mexico</standard>
-					<daylight>Giờ Mùa Hè Tây Bắc Mexico</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Giờ Thái Bình Dương Mexico</generic>
diff --git a/make/data/cldr/common/main/vi_VN.xml b/make/data/cldr/common/main/vi_VN.xml
index 75f783e9f56..bddbba22d90 100644
--- a/make/data/cldr/common/main/vi_VN.xml
+++ b/make/data/cldr/common/main/vi_VN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vmw.xml b/make/data/cldr/common/main/vmw.xml
index 83f19e6428f..659a9e4e4f4 100644
--- a/make/data/cldr/common/main/vmw.xml
+++ b/make/data/cldr/common/main/vmw.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vmw_MZ.xml b/make/data/cldr/common/main/vmw_MZ.xml
index 8bf4bc264f2..3c6f3b580be 100644
--- a/make/data/cldr/common/main/vmw_MZ.xml
+++ b/make/data/cldr/common/main/vmw_MZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vo.xml b/make/data/cldr/common/main/vo.xml
index 779ae87acf1..f3ab9dc93e1 100644
--- a/make/data/cldr/common/main/vo.xml
+++ b/make/data/cldr/common/main/vo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vo_001.xml b/make/data/cldr/common/main/vo_001.xml
index 93848d5accd..489080db299 100644
--- a/make/data/cldr/common/main/vo_001.xml
+++ b/make/data/cldr/common/main/vo_001.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vun.xml b/make/data/cldr/common/main/vun.xml
index 65f77ebff44..8f618cd9c67 100644
--- a/make/data/cldr/common/main/vun.xml
+++ b/make/data/cldr/common/main/vun.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/vun_TZ.xml b/make/data/cldr/common/main/vun_TZ.xml
index 7e4002959d9..e7380551a6a 100644
--- a/make/data/cldr/common/main/vun_TZ.xml
+++ b/make/data/cldr/common/main/vun_TZ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wa.xml b/make/data/cldr/common/main/wa.xml
index 09cc554c0d6..cf82dc51b86 100644
--- a/make/data/cldr/common/main/wa.xml
+++ b/make/data/cldr/common/main/wa.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wa_BE.xml b/make/data/cldr/common/main/wa_BE.xml
index 1b6bab96e0c..b3851d6d65d 100644
--- a/make/data/cldr/common/main/wa_BE.xml
+++ b/make/data/cldr/common/main/wa_BE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wae.xml b/make/data/cldr/common/main/wae.xml
index 801cb0e21a2..b4f505481b0 100644
--- a/make/data/cldr/common/main/wae.xml
+++ b/make/data/cldr/common/main/wae.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wae_CH.xml b/make/data/cldr/common/main/wae_CH.xml
index 074f749dcd1..1476edb9eba 100644
--- a/make/data/cldr/common/main/wae_CH.xml
+++ b/make/data/cldr/common/main/wae_CH.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wal.xml b/make/data/cldr/common/main/wal.xml
index 38c85b68f91..a01abdb2fdc 100644
--- a/make/data/cldr/common/main/wal.xml
+++ b/make/data/cldr/common/main/wal.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wal_ET.xml b/make/data/cldr/common/main/wal_ET.xml
index 6c199c58faf..7b327c11634 100644
--- a/make/data/cldr/common/main/wal_ET.xml
+++ b/make/data/cldr/common/main/wal_ET.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wbp.xml b/make/data/cldr/common/main/wbp.xml
index 6e1003e173f..567d70cc058 100644
--- a/make/data/cldr/common/main/wbp.xml
+++ b/make/data/cldr/common/main/wbp.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wbp_AU.xml b/make/data/cldr/common/main/wbp_AU.xml
index 04068cc1078..c4eb9cd398c 100644
--- a/make/data/cldr/common/main/wbp_AU.xml
+++ b/make/data/cldr/common/main/wbp_AU.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wo.xml b/make/data/cldr/common/main/wo.xml
index 1eb9bea5abb..fec199e1615 100644
--- a/make/data/cldr/common/main/wo.xml
+++ b/make/data/cldr/common/main/wo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/wo_SN.xml b/make/data/cldr/common/main/wo_SN.xml
index 2ccabce5fde..4404a070ba3 100644
--- a/make/data/cldr/common/main/wo_SN.xml
+++ b/make/data/cldr/common/main/wo_SN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/xh.xml b/make/data/cldr/common/main/xh.xml
index 9d3d8aca861..2f2b457805b 100644
--- a/make/data/cldr/common/main/xh.xml
+++ b/make/data/cldr/common/main/xh.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1180,9 +1180,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Sao_Tome">
 				<exemplarCity>São Tomé</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzhhorod</exemplarCity>
-			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Ho Chi Minh City</exemplarCity>
 			</zone>
@@ -1692,11 +1689,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Lord Howe Daylight Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie Island Time</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan Time</generic>
@@ -1736,13 +1728,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mawson Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Northwest Mexico Time</generic>
-					<standard>Northwest Mexico Standard Time</standard>
-					<daylight>Northwest Mexico Daylight Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Mexican Pacific Time</generic>
diff --git a/make/data/cldr/common/main/xh_ZA.xml b/make/data/cldr/common/main/xh_ZA.xml
index 147e9f55bd6..9b9f1627eb8 100644
--- a/make/data/cldr/common/main/xh_ZA.xml
+++ b/make/data/cldr/common/main/xh_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/xnr.xml b/make/data/cldr/common/main/xnr.xml
index d4050236532..1869a6f5f8c 100644
--- a/make/data/cldr/common/main/xnr.xml
+++ b/make/data/cldr/common/main/xnr.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1829,11 +1829,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>लॉर्ड होवे दे ध्याड़े दे उजाले दा टैम</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>मक्वारी टापू दा टैम</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>मागादान दा टैम</generic>
@@ -1873,13 +1868,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>माव्सन दा टैम</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>उत्तर पश्चिमी मेक्सिको दा टैम</generic>
-					<standard>उत्तर पश्चिमी मेक्सिको दा मानक टैम</standard>
-					<daylight>उत्तर पश्चिमी मेक्सिको दे ध्याड़े दे उजाले दा टैम</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>मेक्सिकन प्रशांत दा टैम</generic>
diff --git a/make/data/cldr/common/main/xnr_IN.xml b/make/data/cldr/common/main/xnr_IN.xml
index c9a676fb782..09931f3aa1b 100644
--- a/make/data/cldr/common/main/xnr_IN.xml
+++ b/make/data/cldr/common/main/xnr_IN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/xog.xml b/make/data/cldr/common/main/xog.xml
index e9373ae2cba..08454c0f076 100644
--- a/make/data/cldr/common/main/xog.xml
+++ b/make/data/cldr/common/main/xog.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/xog_UG.xml b/make/data/cldr/common/main/xog_UG.xml
index a1d12dd6af2..0b882fe9ea5 100644
--- a/make/data/cldr/common/main/xog_UG.xml
+++ b/make/data/cldr/common/main/xog_UG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/yav.xml b/make/data/cldr/common/main/yav.xml
index bbd335e8f90..855051df41d 100644
--- a/make/data/cldr/common/main/yav.xml
+++ b/make/data/cldr/common/main/yav.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/yav_CM.xml b/make/data/cldr/common/main/yav_CM.xml
index 65036387dee..1539a1e7285 100644
--- a/make/data/cldr/common/main/yav_CM.xml
+++ b/make/data/cldr/common/main/yav_CM.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/yi.xml b/make/data/cldr/common/main/yi.xml
index c839c8096ac..412fd89a515 100644
--- a/make/data/cldr/common/main/yi.xml
+++ b/make/data/cldr/common/main/yi.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/yi_UA.xml b/make/data/cldr/common/main/yi_UA.xml
index 2641e12ee71..bf85c1e0b17 100644
--- a/make/data/cldr/common/main/yi_UA.xml
+++ b/make/data/cldr/common/main/yi_UA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/yo.xml b/make/data/cldr/common/main/yo.xml
index a2a4e3cf453..fc47ed7e251 100644
--- a/make/data/cldr/common/main/yo.xml
+++ b/make/data/cldr/common/main/yo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1683,9 +1683,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>ìlú Kírẹstọ́ọ̀nù</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ìlú Yelonáfù</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>ìlú Edmonton</exemplarCity>
 			</zone>
@@ -1704,30 +1701,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>ìlú Resolútì</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ìlú Raini Rifà</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>ìlú Rankin Inlet</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>ìlú àtikọkàn</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ìlú Omi Thunder</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ìlú Nipigoni</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>ìlú Toronto</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>ìlú Iqaluit</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>ìlú Panituni</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>ìlú Montoni</exemplarCity>
 			</zone>
@@ -2475,11 +2460,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Lord Howe Daylight Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Macquarie Island Time</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadan Time</generic>
@@ -2519,13 +2499,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Mawson Time</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Àkókò Apá Ìwọ̀ Oorùn Mẹ́ṣíkò</generic>
-					<standard>Àkókò Àfẹnukò Apá Ìwọ̀ Oorùn Mẹ́ṣíkò</standard>
-					<daylight>Àkókò Ojúmọmọ Apá Ìwọ̀ Oorùn Mẹ́ṣíkò</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Àkókò Pásífíìkì Mẹ́ṣíkò</generic>
diff --git a/make/data/cldr/common/main/yo_BJ.xml b/make/data/cldr/common/main/yo_BJ.xml
index db83646cf1b..df46c47d32b 100644
--- a/make/data/cldr/common/main/yo_BJ.xml
+++ b/make/data/cldr/common/main/yo_BJ.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -898,13 +898,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>Àkókò Ooru Máríshúshì</daylight>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Àkókò Apá Ìwɔ̀ Oorùn Mɛ́shíkò</generic>
-					<standard>Àkókò Àfɛnukò Apá Ìwɔ̀ Oorùn Mɛ́shíkò</standard>
-					<daylight>Àkókò Ojúmɔmɔ Apá Ìwɔ̀ Oorùn Mɛ́shíkò</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Àkókò Pásífíìkì Mɛ́shíkò</generic>
diff --git a/make/data/cldr/common/main/yo_NG.xml b/make/data/cldr/common/main/yo_NG.xml
index 4c27ff826f4..43a18174b67 100644
--- a/make/data/cldr/common/main/yo_NG.xml
+++ b/make/data/cldr/common/main/yo_NG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/yrl.xml b/make/data/cldr/common/main/yrl.xml
index bf2340383d0..2d876b6c3c8 100644
--- a/make/data/cldr/common/main/yrl.xml
+++ b/make/data/cldr/common/main/yrl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1098,7 +1098,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Terefuni sesewara muakaresawa</type>
 			<type key="collation" type="phonetic" draft="contributed">Yupurawakasawa terefuniara mukaresawa</type>
 			<type key="collation" type="pinyin">Pin-yin mukaresawa</type>
-			<type key="collation" type="reformed">Muakaresawa amũrupisawaira</type>
 			<type key="collation" type="search">Sikaisá purusawa panhérupí</type>
 			<type key="collation" type="searchjl" draft="contributed">Resikai kũsuãti uyupiruwa hangul rupí</type>
 			<type key="collation" type="standard">Mukaresawa retewa</type>
@@ -2247,9 +2246,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Hurariyu {0}</regionFormat>
 			<regionFormat type="daylight">Kurasí Ara Hurariyu: {0}</regionFormat>
 			<regionFormat type="standard">Hurariyu Retewa: {0}</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>Sãta Isabeu</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>Hurariyu Mũdi turususawa Kurdenadu</standard>
@@ -2363,9 +2359,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>Meubúni</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kurie</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>Hobati</exemplarCity>
 			</zone>
@@ -2510,9 +2503,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>Kerestũ</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Kisé-tawá</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>Edimũtũ</exemplarCity>
 			</zone>
@@ -2531,30 +2521,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>Resoruti</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Paranã Amanawera</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>Rãkĩ Uikesawa</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Atikokã</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tupã Kuara</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipigũ</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>Turũtu</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>Ikaruiti</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pãginitũgi</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>Mũkitũ</exemplarCity>
 			</zone>
@@ -3311,18 +3289,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>Katuawa ruka</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Usigurudi</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>Kiyewe</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>Sĩwerupu</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Saporisiya</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>Kãpara</exemplarCity>
 			</zone>
@@ -3338,9 +3310,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>Hunururu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Jũsitũ</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>Ãkurage</exemplarCity>
 			</zone>
@@ -4035,11 +4004,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Makau Kurasí Ara Hurariyu</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Kapuãma Makikuari Hurariyu</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Magadã Hurariyu</generic>
@@ -4079,13 +4043,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Mausũ Hurariyu</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Mẽsiku Nutiwesiti Hurariyu</generic>
-					<standard>Mẽsiku Nutiwesiti Hurariyu Retewa</standard>
-					<daylight>Mẽsiku Nutiwesiti Kurasí Ara Hurariyu</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Pasifiku Mexikanu Hurariyu</generic>
diff --git a/make/data/cldr/common/main/yrl_BR.xml b/make/data/cldr/common/main/yrl_BR.xml
index 9b90798de9f..aecac36a980 100644
--- a/make/data/cldr/common/main/yrl_BR.xml
+++ b/make/data/cldr/common/main/yrl_BR.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/yrl_CO.xml b/make/data/cldr/common/main/yrl_CO.xml
index 827622c77ce..a0b060a17ab 100644
--- a/make/data/cldr/common/main/yrl_CO.xml
+++ b/make/data/cldr/common/main/yrl_CO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
diff --git a/make/data/cldr/common/main/yrl_VE.xml b/make/data/cldr/common/main/yrl_VE.xml
index 302375e1ad1..8f084e29fa2 100644
--- a/make/data/cldr/common/main/yrl_VE.xml
+++ b/make/data/cldr/common/main/yrl_VE.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
diff --git a/make/data/cldr/common/main/yue.xml b/make/data/cldr/common/main/yue.xml
index eb83873feb6..8ebfe9a34d1 100644
--- a/make/data/cldr/common/main/yue.xml
+++ b/make/data/cldr/common/main/yue.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1258,7 +1258,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="phonebook">電話簿排序</type>
 			<type key="collation" type="phonetic">發音排序</type>
 			<type key="collation" type="pinyin">拼音排序</type>
-			<type key="collation" type="reformed">改良排序</type>
 			<type key="collation" type="search">一般用途搜尋</type>
 			<type key="collation" type="searchjl" draft="contributed">韓文子音排序</type>
 			<type key="collation" type="standard">標準排序</type>
@@ -3250,9 +3249,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat>{0}時間</regionFormat>
 			<regionFormat type="daylight">{0}夏令時間</regionFormat>
 			<regionFormat type="standard">{0}標準時間</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>聖伊薩貝爾</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>協調世界時間</standard>
@@ -3375,9 +3371,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>墨爾本</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>克黎</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>荷巴特</exemplarCity>
 			</zone>
@@ -3531,9 +3524,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>克雷斯頓</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>耶洛奈夫</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>艾德蒙吞</exemplarCity>
 			</zone>
@@ -3552,30 +3542,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>羅斯魯特</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>雨河鎮</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>蘭今灣</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>阿蒂科肯</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>珊德灣</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>尼皮岡</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>多倫多</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>伊魁特</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>潘尼爾東</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>蒙克頓</exemplarCity>
 			</zone>
@@ -4389,18 +4367,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>沙蘭港</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>烏茲哥洛</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>基輔</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>辛非洛浦</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>札波羅結</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>坎帕拉</exemplarCity>
 			</zone>
@@ -4419,9 +4391,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>檀香山</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>強斯頓</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>安克拉治</exemplarCity>
 			</zone>
@@ -5121,11 +5090,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>澳門夏令時間</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>麥覺理時間</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>馬加丹時間</generic>
@@ -5165,13 +5129,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>莫森時間</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>墨西哥西北部時間</generic>
-					<standard>墨西哥西北部標準時間</standard>
-					<daylight>墨西哥西北部夏令時間</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>墨西哥太平洋時間</generic>
diff --git a/make/data/cldr/common/main/yue_Hans.xml b/make/data/cldr/common/main/yue_Hans.xml
index 8c1bbf61819..b730d5cbc84 100644
--- a/make/data/cldr/common/main/yue_Hans.xml
+++ b/make/data/cldr/common/main/yue_Hans.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -1259,7 +1259,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="phonebook">电话簿排序</type>
 			<type key="collation" type="phonetic">发音排序</type>
 			<type key="collation" type="pinyin">拼音排序</type>
-			<type key="collation" type="reformed">改良排序</type>
 			<type key="collation" type="search">一般用途搜寻</type>
 			<type key="collation" type="searchjl" draft="contributed">韩文子音排序</type>
 			<type key="collation" type="standard">标准排序</type>
@@ -3256,9 +3255,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</fields>
 		<timeZoneNames>
 			<regionFormat>{0}时间</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>圣伊萨贝尔</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>协调世界时间</standard>
@@ -3381,9 +3377,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Melbourne">
 				<exemplarCity>墨尔本</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>克黎</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>荷巴特</exemplarCity>
 			</zone>
@@ -3537,9 +3530,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Creston">
 				<exemplarCity>克雷斯顿</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>耶洛奈夫</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>艾德蒙吞</exemplarCity>
 			</zone>
@@ -3558,30 +3548,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Resolute">
 				<exemplarCity>罗斯鲁特</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>雨河镇</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>兰今湾</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>阿蒂科肯</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>珊德湾</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>尼皮冈</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>多伦多</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>伊魁特</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>潘尼尔东</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>蒙克顿</exemplarCity>
 			</zone>
@@ -4395,18 +4373,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>沙兰港</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>乌兹哥洛</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>基辅</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>辛非洛浦</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>札波罗结</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>坎帕拉</exemplarCity>
 			</zone>
@@ -4425,9 +4397,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>檀香山</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>强斯顿</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>安克拉治</exemplarCity>
 			</zone>
@@ -5127,11 +5096,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>澳门夏令时间</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>麦觉理时间</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>马加丹时间</generic>
@@ -5171,13 +5135,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>莫森时间</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>墨西哥西北部时间</generic>
-					<standard>墨西哥西北部标准时间</standard>
-					<daylight>墨西哥西北部夏令时间</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>墨西哥太平洋时间</generic>
diff --git a/make/data/cldr/common/main/yue_Hans_CN.xml b/make/data/cldr/common/main/yue_Hans_CN.xml
index 2be260a7927..5a0f87470d0 100644
--- a/make/data/cldr/common/main/yue_Hans_CN.xml
+++ b/make/data/cldr/common/main/yue_Hans_CN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/yue_Hant.xml b/make/data/cldr/common/main/yue_Hant.xml
index 4f24496922e..f34cd5b4287 100644
--- a/make/data/cldr/common/main/yue_Hant.xml
+++ b/make/data/cldr/common/main/yue_Hant.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/yue_Hant_HK.xml b/make/data/cldr/common/main/yue_Hant_HK.xml
index 56a6841fe58..24920c69cd5 100644
--- a/make/data/cldr/common/main/yue_Hant_HK.xml
+++ b/make/data/cldr/common/main/yue_Hant_HK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/za.xml b/make/data/cldr/common/main/za.xml
index 7510c24301b..d6b56c0fedd 100644
--- a/make/data/cldr/common/main/za.xml
+++ b/make/data/cldr/common/main/za.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/za_CN.xml b/make/data/cldr/common/main/za_CN.xml
index 2c53062950f..83256fd63a5 100644
--- a/make/data/cldr/common/main/za_CN.xml
+++ b/make/data/cldr/common/main/za_CN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zgh.xml b/make/data/cldr/common/main/zgh.xml
index 785ca3aea00..a2492602028 100644
--- a/make/data/cldr/common/main/zgh.xml
+++ b/make/data/cldr/common/main/zgh.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zgh_MA.xml b/make/data/cldr/common/main/zgh_MA.xml
index 239605f578d..d068734cd5f 100644
--- a/make/data/cldr/common/main/zgh_MA.xml
+++ b/make/data/cldr/common/main/zgh_MA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zh.xml b/make/data/cldr/common/main/zh.xml
index 566c10d3d98..1dcdedd1f6c 100644
--- a/make/data/cldr/common/main/zh.xml
+++ b/make/data/cldr/common/main/zh.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1294,7 +1294,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">电话簿排序</type>
 			<type key="collation" type="phonetic">语音排序</type>
 			<type key="collation" type="pinyin">拼音排序</type>
-			<type key="collation" type="reformed">改良排序</type>
 			<type key="collation" type="search">常规搜索</type>
 			<type key="collation" type="searchjl">按韩文字开首辅音来搜索</type>
 			<type key="collation" type="standard">标准排序</type>
@@ -3560,9 +3559,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat type="daylight">{0}夏令时间</regionFormat>
 			<regionFormat type="standard">{0}标准时间</regionFormat>
 			<fallbackFormat>{1}（{0}）</fallbackFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>圣伊萨贝尔</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>协调世界时</standard>
@@ -3685,9 +3681,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>墨尔本</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>柯里</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>霍巴特</exemplarCity>
 			</zone>
@@ -3841,9 +3834,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>克雷斯顿</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>耶洛奈夫</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>埃德蒙顿</exemplarCity>
 			</zone>
@@ -3862,30 +3852,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>雷索卢特</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>雷尼河</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>兰今湾</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>阿蒂科肯</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>桑德贝</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>尼皮贡</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>多伦多</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>伊魁特</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>旁涅唐</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>蒙克顿</exemplarCity>
 			</zone>
@@ -4699,18 +4677,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>达累斯萨拉姆</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>乌日哥罗德</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>基辅</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>辛菲罗波尔</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>扎波罗热</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>坎帕拉</exemplarCity>
 			</zone>
@@ -4729,9 +4701,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>檀香山</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>约翰斯顿</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>安克雷奇</exemplarCity>
 			</zone>
@@ -5431,11 +5400,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>澳门夏令时间</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>麦夸里岛时间</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>马加丹时间</generic>
@@ -5475,13 +5439,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>莫森时间</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>墨西哥西北部时间</generic>
-					<standard>墨西哥西北部标准时间</standard>
-					<daylight>墨西哥西北部夏令时间</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>墨西哥太平洋时间</generic>
diff --git a/make/data/cldr/common/main/zh_Hans.xml b/make/data/cldr/common/main/zh_Hans.xml
index e8a5aca3877..0c76ce0ebcb 100644
--- a/make/data/cldr/common/main/zh_Hans.xml
+++ b/make/data/cldr/common/main/zh_Hans.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zh_Hans_CN.xml b/make/data/cldr/common/main/zh_Hans_CN.xml
index d0269d75cc3..fcdea0e9e42 100644
--- a/make/data/cldr/common/main/zh_Hans_CN.xml
+++ b/make/data/cldr/common/main/zh_Hans_CN.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zh_Hans_HK.xml b/make/data/cldr/common/main/zh_Hans_HK.xml
index 759b3927384..f94dae7db8c 100644
--- a/make/data/cldr/common/main/zh_Hans_HK.xml
+++ b/make/data/cldr/common/main/zh_Hans_HK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zh_Hans_MO.xml b/make/data/cldr/common/main/zh_Hans_MO.xml
index 1fb246cac5e..16d25d5eeed 100644
--- a/make/data/cldr/common/main/zh_Hans_MO.xml
+++ b/make/data/cldr/common/main/zh_Hans_MO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zh_Hans_SG.xml b/make/data/cldr/common/main/zh_Hans_SG.xml
index 8f0eb4b99fe..5c85bf323f1 100644
--- a/make/data/cldr/common/main/zh_Hans_SG.xml
+++ b/make/data/cldr/common/main/zh_Hans_SG.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zh_Hant.xml b/make/data/cldr/common/main/zh_Hant.xml
index f266c62ea84..0d2228ccbe1 100644
--- a/make/data/cldr/common/main/zh_Hant.xml
+++ b/make/data/cldr/common/main/zh_Hant.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1294,7 +1294,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">電話簿排序</type>
 			<type key="collation" type="phonetic">發音排序</type>
 			<type key="collation" type="pinyin">拼音排序</type>
-			<type key="collation" type="reformed">改良排序</type>
 			<type key="collation" type="search">一般用途搜尋</type>
 			<type key="collation" type="searchjl" draft="contributed">韓文子音排序</type>
 			<type key="collation" type="standard">標準排序</type>
@@ -3637,9 +3636,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<regionFormat>{0}時間</regionFormat>
 			<fallbackFormat>{1}（{0}）</fallbackFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>聖伊薩貝爾</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>世界標準時間</standard>
@@ -3762,9 +3758,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>墨爾本</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>克黎</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>荷巴特</exemplarCity>
 			</zone>
@@ -3918,9 +3911,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>克雷斯頓</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>耶洛奈夫</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>艾德蒙吞</exemplarCity>
 			</zone>
@@ -3939,30 +3929,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>羅斯魯特</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>雨河鎮</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>蘭今灣</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>阿蒂科肯</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>珊德灣</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>尼皮岡</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>多倫多</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>伊魁特</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>潘尼爾東</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>蒙克頓</exemplarCity>
 			</zone>
@@ -4776,18 +4754,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>沙蘭港</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>烏茲哥洛</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>基輔</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>辛非洛浦</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>札波羅結</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>坎帕拉</exemplarCity>
 			</zone>
@@ -4806,9 +4778,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>檀香山</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>強斯頓</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>安克拉治</exemplarCity>
 			</zone>
@@ -5546,11 +5515,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>澳門夏令時間</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>麥覺理時間</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>馬加丹時間</generic>
@@ -5590,13 +5554,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>莫森時間</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>墨西哥西北部時間</generic>
-					<standard>墨西哥西北部標準時間</standard>
-					<daylight>墨西哥西北部夏令時間</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>墨西哥太平洋時間</generic>
diff --git a/make/data/cldr/common/main/zh_Hant_HK.xml b/make/data/cldr/common/main/zh_Hant_HK.xml
index 32e3aca67f4..4c93fedf418 100644
--- a/make/data/cldr/common/main/zh_Hant_HK.xml
+++ b/make/data/cldr/common/main/zh_Hant_HK.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
@@ -209,7 +209,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="collation" type="big5han">繁體中文排序 (Big5)</type>
 			<type key="collation" type="dictionary">詞典排序</type>
 			<type key="collation" type="gb2312han">簡體中文排序 (GB2312)</type>
-			<type key="collation" type="reformed">改革版排序</type>
 			<type key="ms" type="uksystem">英制</type>
 			<type key="ms" type="ussystem">美制</type>
 			<type key="numbers" type="deva">天城體數字</type>
@@ -1106,9 +1105,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Australia/Adelaide">
 				<exemplarCity>阿德萊德</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>卡里</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>荷伯特</exemplarCity>
 			</zone>
@@ -1181,18 +1177,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="America/Dawson_Creek">
 				<exemplarCity>道森灣</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>黃刀鎮</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>愛民頓</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>雷灣</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>尼皮貢</exemplarCity>
-			</zone>
 			<zone type="America/Halifax">
 				<exemplarCity>哈利法克斯</exemplarCity>
 			</zone>
@@ -1481,18 +1468,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>達累斯薩拉姆</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>烏日哥羅德</exemplarCity>
-			</zone>
 			<zone type="Pacific/Wake">
 				<exemplarCity>威克島</exemplarCity>
 			</zone>
 			<zone type="America/Adak">
 				<exemplarCity>埃達克</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>約翰斯頓環礁</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>安克雷奇</exemplarCity>
 			</zone>
@@ -1660,11 +1641,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>科斯雷時間</standard>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>麥夸里群島時間</standard>
-				</long>
-			</metazone>
 			<metazone type="Maldives">
 				<long>
 					<standard>馬爾代夫時間</standard>
diff --git a/make/data/cldr/common/main/zh_Hant_MO.xml b/make/data/cldr/common/main/zh_Hant_MO.xml
index 156b27ece4d..f941bdd6b45 100644
--- a/make/data/cldr/common/main/zh_Hant_MO.xml
+++ b/make/data/cldr/common/main/zh_Hant_MO.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zh_Hant_TW.xml b/make/data/cldr/common/main/zh_Hant_TW.xml
index 03fb15fed07..35382c2bf79 100644
--- a/make/data/cldr/common/main/zh_Hant_TW.xml
+++ b/make/data/cldr/common/main/zh_Hant_TW.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/main/zu.xml b/make/data/cldr/common/main/zu.xml
index 06ac46d877c..94f8e15c8ed 100644
--- a/make/data/cldr/common/main/zu.xml
+++ b/make/data/cldr/common/main/zu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 
 Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
@@ -1128,7 +1128,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="collation" type="phonebook">Ukuhlunga kwebhuku lefoni</type>
 			<type key="collation" type="phonetic">Hlela Ngokwefonetiki</type>
 			<type key="collation" type="pinyin">Ukuhlunga nge-Pinyin</type>
-			<type key="collation" type="reformed">Ukuhlunga okwenziwe kabusha</type>
 			<type key="collation" type="search">Usesho olujwayelekile</type>
 			<type key="collation" type="searchjl">Sesha nge-Hangul Ongwaqa Basekuqaleni</type>
 			<type key="collation" type="standard">I-oda yokuhlunga ejwayelekile</type>
@@ -2147,9 +2146,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<regionFormat>Isikhathi sase-{0}</regionFormat>
 			<regionFormat type="daylight">{0} Isikhathi sasemini</regionFormat>
 			<regionFormat type="standard">{0} isikhathi esivamile</regionFormat>
-			<zone type="America/Santa_Isabel">
-				<exemplarCity>i-Santa Isabel</exemplarCity>
-			</zone>
 			<zone type="Etc/UTC">
 				<long>
 					<standard>isikhathi somhlaba esididiyelwe</standard>
@@ -2272,9 +2268,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Australia/Melbourne">
 				<exemplarCity>i-Melbourne</exemplarCity>
 			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>i-Currie</exemplarCity>
-			</zone>
 			<zone type="Australia/Hobart">
 				<exemplarCity>i-Hobart</exemplarCity>
 			</zone>
@@ -2428,9 +2421,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Creston">
 				<exemplarCity>i-Creston</exemplarCity>
 			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>i-Yellowknife</exemplarCity>
-			</zone>
 			<zone type="America/Edmonton">
 				<exemplarCity>i-Edmonton</exemplarCity>
 			</zone>
@@ -2449,30 +2439,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Resolute">
 				<exemplarCity>i-Resolute</exemplarCity>
 			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>i-Rainy River</exemplarCity>
-			</zone>
 			<zone type="America/Rankin_Inlet">
 				<exemplarCity>i-Rankin Inlet</exemplarCity>
 			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>i-Atikokan</exemplarCity>
 			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>i-Thunder Bay</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>i-Nipigon</exemplarCity>
-			</zone>
 			<zone type="America/Toronto">
 				<exemplarCity>i-Toronto</exemplarCity>
 			</zone>
 			<zone type="America/Iqaluit">
 				<exemplarCity>i-Iqaluit</exemplarCity>
 			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>i-Pangnirtung</exemplarCity>
-			</zone>
 			<zone type="America/Moncton">
 				<exemplarCity>i-Moncton</exemplarCity>
 			</zone>
@@ -3274,18 +3252,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Africa/Dar_es_Salaam">
 				<exemplarCity>i-Dar es Salaam</exemplarCity>
 			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>i-Uzhhorod</exemplarCity>
-			</zone>
 			<zone type="Europe/Kiev">
 				<exemplarCity>i-Kiev</exemplarCity>
 			</zone>
 			<zone type="Europe/Simferopol">
 				<exemplarCity>i-Simferopol</exemplarCity>
 			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>i-Zaporozhye</exemplarCity>
-			</zone>
 			<zone type="Africa/Kampala">
 				<exemplarCity>i-Kampala</exemplarCity>
 			</zone>
@@ -3304,9 +3276,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Honolulu">
 				<exemplarCity>i-Honolulu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>i-Johnston</exemplarCity>
-			</zone>
 			<zone type="America/Anchorage">
 				<exemplarCity>i-Anchorage</exemplarCity>
 			</zone>
@@ -3956,11 +3925,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<daylight>Isikhathi sase-Lord Howe sasemini</daylight>
 				</long>
 			</metazone>
-			<metazone type="Macquarie">
-				<long>
-					<standard>Isikhathi sase-Macquarie Island</standard>
-				</long>
-			</metazone>
 			<metazone type="Magadan">
 				<long>
 					<generic>Isikhathi sase-Magadan</generic>
@@ -4000,13 +3964,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Isikhathi sase-Mawson</standard>
 				</long>
 			</metazone>
-			<metazone type="Mexico_Northwest">
-				<long>
-					<generic>Isikhathi sase-Northwest Mexico</generic>
-					<standard>Isikhathi sase-Northwest Mexico esijwayelekile</standard>
-					<daylight>Isikhathi sase-Northwest Mexico sasemini</daylight>
-				</long>
-			</metazone>
 			<metazone type="Mexico_Pacific">
 				<long>
 					<generic>Isikhathi sase-Mexican Pacific</generic>
diff --git a/make/data/cldr/common/main/zu_ZA.xml b/make/data/cldr/common/main/zu_ZA.xml
index 0f759039e7e..758ca6e92b5 100644
--- a/make/data/cldr/common/main/zu_ZA.xml
+++ b/make/data/cldr/common/main/zu_ZA.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <ldml>
diff --git a/make/data/cldr/common/properties/coverageLevels.txt b/make/data/cldr/common/properties/coverageLevels.txt
index fc4a5d31df7..3a2bb78c703 100644
--- a/make/data/cldr/common/properties/coverageLevels.txt
+++ b/make/data/cldr/common/properties/coverageLevels.txt
@@ -144,7 +144,6 @@ th ;	modern ;	Thai
 ti ;	basic ;	Tigrinya
 tk ;	modern ;	Turkmen
 to ;	basic ;	Tongan
-tok ;	basic ;	Toki Pona
 tr ;	modern ;	Turkish
 tt ;	basic ;	Tatar
 ug ;	basic ;	Uyghur
diff --git a/make/data/cldr/common/supplemental/coverageLevels.xml b/make/data/cldr/common/supplemental/coverageLevels.xml
index 81e3af8c00f..457cdc18660 100644
--- a/make/data/cldr/common/supplemental/coverageLevels.xml
+++ b/make/data/cldr/common/supplemental/coverageLevels.xml
@@ -54,9 +54,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%CJK_Languages" value="(ja|ko|zh)"/>
 		<coverageVariable key="%chineseCalendarTerritories" value="(CN|CX|HK|MO|SG|TW)"/>
 		<coverageVariable key="%collationType80" value="(ducet|search)"/>
-		<coverageVariable key="%collationType80ForTopLangs" value="(big5han|compat|dictionary|gb2312han|phonebook|phonetic|pinyin|reformed|stroke|traditional|unihan|zhuyin)"/>
+		<coverageVariable key="%collationType80ForTopLangs" value="(big5han|compat|dictionary|gb2312han|phonebook|phonetic|pinyin|stroke|traditional|unihan|zhuyin)"/>
 		<coverageVariable key="%collationType80TopLangs" value="(ar|bg|ca|cs|da|de|el|en|es|fi|fr|he|hi|hr|hu|id|it|ja|ko|ms|nl|no|pl|pt|ro|ru|sk|sl|sr|sv|th|tr|uk|vi|zh)"/>
-		<coverageVariable key="%collationType100" value="(big5han|compat|dictionary|emoji|eor|gb2312han|phonebook|phonetic|pinyin|reformed|searchjl|stroke|traditional|unihan|zhuyin)"/>
+		<coverageVariable key="%collationType100" value="(big5han|compat|dictionary|emoji|eor|gb2312han|phonebook|phonetic|pinyin|searchjl|stroke|traditional|unihan|zhuyin)"/>
 		<coverageVariable key="%collationAlternateValues" value="(non-ignorable|shifted)"/>
 		<coverageVariable key="%collationCases" value="(upper|lower)"/>
 		<coverageVariable key="%collationStrengths" value="(primary|secondary|tertiary|quaternary|identical)"/>
@@ -115,7 +115,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%medLong" value="(medium|long)"/>
 		<coverageVariable key="%metazone30_AR" value="Argentina(_Western)?"/>
 		<coverageVariable key="%metazone30_AU" value="(Australia_(Central(Western)?|(East|West)ern)|Lord_Howe)"/>
-		<coverageVariable key="%metazone30_AU_stdonly" value="Macquarie"/>
 		<coverageVariable key="%metazone30_BR" value="(Amazon|Brasilia|Noronha)"/>
 		<coverageVariable key="%metazone30_CA" value="(America_(Eastern|Central|Mountain|Pacific)|Newfoundland|Yukon)"/>
 		<coverageVariable key="%metazone30_EU" value="Europe_(Central|(East|West)ern)"/>
@@ -130,7 +129,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%metazone60_stdonly" value="(Africa_(Central|(East|South)ern)|India|Indochina|Indonesia_(Central|(East|West)ern))"/>
 		<coverageVariable key="%metazone60_AE_stdonly" value="Gulf"/>
 		<coverageVariable key="%metazone80" value="(Alaska|Amazon|Apia|Argentina(_Western)?|Armenia|Azerbaijan|Azores|Bangladesh|Brasilia|Cape_Verde|Chatham|Chile|Choibalsan|Colombia|Cook|Cuba|Easter|Falkland|Fiji|Georgia|Greenland_(East|West)ern|Hawaii_Aleutian|Hong_Kong|Hovd|Iran|Irkutsk|Krasnoyarsk|Lord_Howe|Magadan|Mauritius|Mexico_(Northwest|Pacific)|Mongolia|New_(Caledonia|Zealand)|Newfoundland|Norfolk|Noronha|Novosibirsk|Omsk|Pakistan|Paraguay|Peru|Philippines|Pierre_Miquelon|Sakhalin|Samoa|Taipei|Tonga|Turkmenistan|Uruguay|Uzbekistan|Vanuatu|Vladivostok|Volgograd|Yakutsk|Yekaterinburg)"/>
-		<coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|Europe_Further_Eastern|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Indian_Ocean|Kazakhstan_(East|West)ern|Kosrae|Kyrgystan|Line_Islands|Macquarie|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Pyongyang|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis|Yukon)"/>
+		<coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|Europe_Further_Eastern|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Indian_Ocean|Kazakhstan_(East|West)ern|Kosrae|Kyrgystan|Line_Islands|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Pyongyang|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis|Yukon)"/>
 		<coverageVariable key="%metazone100" value="(Acre|Almaty|Anadyr|Aqtau|Aqtobe|Kamchatka|Macau|Qyzylorda|Samara)"/>
 		<coverageVariable key="%metazone100_stdonly" value="(Casey|Guam|Lanka|North_Mariana)"/>
 		<coverageVariable key="%miscPatternTypes" value="(atLeast|range)"/>
@@ -262,7 +261,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel	value="moderate"	inLanguage="zh"	match="localeDisplayNames/types/type[@key='collation'][@type='(big5han|gb2312han|pinyin|stroke|zhuyin)']"/>
 		<coverageLevel	value="moderate"	inLanguage="si"	match="localeDisplayNames/types/type[@key='collation'][@type='dictionary']"/>
 		<coverageLevel	value="moderate"	inLanguage="%phonebookCollationLanguages"	match="localeDisplayNames/types/type[@key='collation'][@type='phonebook']"/>
-		<coverageLevel	value="moderate"	inLanguage="sv"	match="localeDisplayNames/types/type[@key='collation'][@type='reformed']"/>
 		<coverageLevel	value="moderate"	 	match="localeDisplayNames/types/type[@key='collation'][@type='standard']"/>
 		<coverageLevel	value="moderate"	inLanguage="%traditionalCollationLanguages"	match="localeDisplayNames/types/type[@key='collation'][@type='traditional']"/>
 		<coverageLevel	value="moderate"	inLanguage="%CJK_Languages"	match="localeDisplayNames/types/type[@key='collation'][@type='unihan']"/>
diff --git a/make/data/cldr/common/supplemental/languageGroup.xml b/make/data/cldr/common/supplemental/languageGroup.xml
index fcb764ccb64..1b24bd291e4 100644
--- a/make/data/cldr/common/supplemental/languageGroup.xml
+++ b/make/data/cldr/common/supplemental/languageGroup.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <supplementalData>
@@ -11,7 +11,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<languageGroup parent="aav">bbh bfw bru brv hre irr kdt ktv kuf mkh mmj mun ncq ngt nyl oog pac phg ply sct sss tth tto zng</languageGroup>
 		<languageGroup parent="afa">aal ber btf bvw bxe cdc ckq cop cus glo hdy hig hss hwo jaf kbz kul kvj mes mlw mmf omv sem tdk tsh ttr xdm</languageGroup>
 		<languageGroup parent="alg">aaq abe alq arp atj ats bla chy ciw cr crj crk crl crm crr csw del dep etc kic mez mia mic mjy moe nnt nsk oj ojb ojc ojs ojw otw pim pot pqm psy qyp sac sjw unm wam xlb xlo xnt xpq</languageGroup>
-		<languageGroup parent="alv">aaa aab aba abi abm abn abo abr abu acd acp ada ade adj adq adu afn afu agb agc agq aha ahl ahp aik aiy ajg ak akd akf akp aku ala anf ann anv anw any aqd aqk asg asj ass ati ato aug avi avn awc ayb ayg ayi ayu azo bab bad bai bax bba bbk bbp bbs bcb bce bcg bci bcn bcs bcv bcz bda bdj bdt bec beh bes bfd bfl bfo bga bgf bgj bgu bif bim bin biv bjg bjt bju bkc bkm ble blo bly bme bmf bmq bnt bnz boe bok bom bov box bqa bqj brm brt bsc bse bsp bsx btc bud buy buz bvi bvj bwh bwj bwy byb byc byf byj bzv bzw bzz cae cbj cbo cbq ccg cch ccj cfd cib cko cli cll cou cpn cry cwt dag dai dam dbg dbi dbt dbu dbv dbw dds deg deq dga dgb dgd dgi dir djm dmb dmm doh doo dop doy dtk dtm dto dts dtu dur duz dya dyi dym dyo dza ebg ebr ee efa efi ega ego ehu eja eka eke eki ekp ekr elm ema emn enn env enw eot epi erh esm etb ets etu etx evh eza eze fah fak fal fam fap fer ff fir fll fni fod fon fub fue fuf fuh fuj fum fuq fuv gaa gba gbg gbh gbp gbq gbr gbs gbx gby gdi ged gej gel geq gix gjn gke gkn glc gmd gmm gmz gnh gnz gol gox goy grh gsl gso gur guw gux gvm gwa gwx gye gyg hag hhr hoe ibb ibe ibm ibn ibr ich idc ide idr ids idu ig igb igl ihi ijo iki ikk iko ikw ilv iqw ish isi iso isu itm its itw izr izz jab jer jid jmr jms jni juh juk juo juw kaj kbp kcc kcg kcj kdh kdm kdx kdz kef ken kes keu kez kfl kfn kgt khj kia kid kkm kku klc klk klo kma kmi kmy knf knp kou kov kow kph kpk kpl kpo kqg kqk kqm kqs krh kro krp krx ksa kss kub kvm kxb kye kza kzc kzr lan lar las ldg ldh ldm ldq lee lef lgq lia lip lma lmp lns lob lof lro luq mae mbv mcj mcs mcu mdd mea mfc mfd mff mfn mfq mfv mgj mgn mgo mhk mij mkl mko mlo moj mor mos mql mru msj msw mtk mua muc muo mxl myg myj myk mzk mzm mzv mzw naj nat naw nbm nbo nbp nbr nbv nbw ncr ncu ndd ndi ndr ndt ndv ndz ned nfr nfu nga ngb nge ngg nhu nie nin njr nko nkq nku nkz nlu nmj nmr nmz nnu nnw noy nqk nsc nti ntm nuh nup nuv nyb nza nzi nzz obu oda odu ofu ogb ogc ogg ogo ogu okb oke oku opa orx otr pbl pbo pbp pcn pil pmb png pnl pnq pny pnz pug pwb pym res ruy saf sav scv sde sev sfw sha shw shz sig sil snf snj snw soy spp sqm srr ssl swf sxw tbm tbz tcd tde tdl tem tfi tgw tgy thy tik tiq tiv tkq tnr toz tsp tsw ttb tug tui tuz tvd twn uda uiv ukw ula umm urh usk uta uth utr uya vag vit vor vut wbf wci wem wib wlx wo wof wom wrn wss wwa www xab xkb xoc xrb xsm xsn xwe xwl yam yay yaz yba ybj ybl yer yky yng ynq yo zna</languageGroup>
+		<languageGroup parent="alv">aaa aab aba abi abm abn abo abr abu acd acp ada ade adj adq adu afn afu agb agc agq aha ahl ahp aik aiy ajg ak akd akf akp aku ala anf ann anv anw any aqd aqk asg asj ass ati ato aug avi avn awc ayb ayg ayi ayu azo bab bad bai bax bba bbk bbp bbs bcb bce bcg bci bcn bcs bcv bcz bda bdj bdt bec beh bes bfd bfl bfo bga bgf bgj bgu bif bim bin biv bjg bjt bju bkc bkm ble blo bly bme bmf bmq bnt bnz boe bok bom bov box bqa bqj brm brt bsc bse bsp bsx btc bud buy buz bvi bvj bwh bwj bwy byb byc byf byj bzv bzw bzz cae cbj cbo cbq ccg cch ccj cfd cib cko cli cll cou cpn cry cwt dag dai dam dbg dbi dbt dbu dbv dbw dds deg deq dga dgb dgd dgi dir djm dmb dmm doh doo dop doy dtk dtm dto dts dtu dur duz dya dyi dym dyo dza ebg ebr ee efa efi ega ego ehu eja eka eke eki ekp ekr elm ema emn enn env enw eot epi erh esm etb ets etu etx evh eza eze fah fak fal fam fap fer ff fir fll fni fod fon fub fue fuf fuh fuj fum fuq fuv gaa gba gbg gbh gbp gbq gbr gbs gbx gby gdi ged gej gel geq gix gjn gke gkn glc gmd gmm gmz gnh gnz gol gox goy grh gsl gso gur guw gux gvm gwa gwx gye gyg hag hhr hoe ibb ibe ibm ibn ibr ich idc ide idr ids idu ig igb igl ihi ijo iki ikk iko ikw ilv iqw ish isi iso isu itm its itw izr izz jab jer jid jmr jms jni juh juk juo juw kaj kbp kcc kcg kcj kdh kdm kdx kdz kef ken kes keu kez kfl kfn kgt khj kia kid kkm kku klc klk klo kma kmi kmy knf knp kou kov kow kph kpk kpl kpo kqg kqk kqm kqs krh kro krp kss kub kvm kxb kye kza kzc kzr lan lar las ldg ldh ldm ldq lee lef lgq lia lip lma lmp lns lob lof lro luq mae mbv mcj mcs mcu mdd mea mfc mfd mff mfn mfq mfv mgj mgn mgo mhk mij mkl mko mlo moj mor mos mql mru msj msw mtk mua muc muo mxl myg myj myk mzk mzm mzv mzw naj nat naw nbm nbo nbp nbr nbv nbw ncr ncu ndd ndi ndr ndt ndv ndz ned nfr nfu nga ngb nge ngg nhu nie nin njr nko nkq nku nkz nlu nmj nmr nmz nnu nnw noy nqk nsc nti ntm nuh nup nuv nyb nza nzi nzz obu oda odu ofu ogb ogc ogg ogo ogu okb oke oku opa orx otr pbl pbo pbp pcn pil pmb png pnl pnq pny pnz pug pwb pym res rsw ruy saf sav scv sde sev sfw sha shw shz sig sil snf snj snw soy spp sqm srr ssl swf sxw tbm tbz tcd tde tdl tem tfi tgw tgy thy tik tiq tiv tkq tnr toz tsp tsw ttb tug tui tuz tvd twn uda uiv ukw ula umm urh usk uta uth utr uya vag vit vor vut wbf wci wem wib wlx wo wof wom wrn wss wwa www xab xkb xoc xrb xsm xsn xwe xwl yam yay yaz yba ybj ybl yer yky yng ynq yo zna</languageGroup>
 		<languageGroup parent="apa">apj apk apl apm apw nv</languageGroup>
 		<languageGroup parent="aqa">alc</languageGroup>
 		<languageGroup parent="aql">alg wiy yur</languageGroup>
@@ -19,7 +19,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<languageGroup parent="ath">aht apa bcr bea caf chp clc coq crx den dgr gce gwi haa hup ing kkz koy ktw kuu mvb qwt scs sek srs taa tau tcb tce tfn tgx tht tol ttm tuu txc wlk xup</languageGroup>
 		<languageGroup parent="auf">aru cul dny jaa pad swx</languageGroup>
 		<languageGroup parent="aus">adg adt aea aer aid alh aly amx amy amz ant ard are avm awg awk axe axl ayd bck bdy bia bjb bjy bpt bxi bxj bxn bym bzr dax dbl dda ddj dhg dhl dhr dhu dhx dif dja djb djd djf dji djr dmd dmw drl dth dwu dwy dyn dyy dze eaa fln gbb gbd gbu gbw gdc gdh gdj gdt ggd gia gih gjm gko gll gni gnl gnn gnr gtu gue guf gvn gvy gwm gwu gyf gyy hrp iin ikr jan jao jay jbi jig jui kbe kdd kgl kgs kjn kkp kky kld ktd ktg kux kuy lby lja ljw lku llj lnj lnw mem mep mpj mvl mwf mwp nam nay nbj ngk nha nhf nji nju nly nmv nnr nrk nrl ntg ntj nwg nwo nxn nys nyt nyx okg olk pit piu pjt pkn pnj pnv pnw pti rbp rit rkw rnr rrt rsm rxd rxw tbh tgz thd tju tjw typ ugb uky umd umg ump urf uwa vka vku vma vmb vml vmu wbp wbt wbv wdj wdk wdu wga wgg wgu wgy wie wig wih wij wik wim wkw wky wmb wmi wmt wnm wnn wrb wrg wrh wri wrl wrm wrw wth wua wyb wyi xbb xbe xbg xbp xby xda xdk xgd xgg xgi xgm xgw xjb xmh xmp xmy xni xnk xnu xny xpa xpj xpt xrd xrg xth xul xut xwd xwj xwk xwt xww xya xyj xyk xyt xyy yda yga yia yii yij yil ylr ynd yrm yry yty yub ywg yww yxg yxl zku zmc zmk zmu zmv</languageGroup>
-		<languageGroup parent="awd">aca ame aox apu arw avo bae brg bvv bwi cab cbb ccc cjo cni cot cox cpc crb cuj gae gqn guc ign inp kav kgm kpc mcb mht mmh mpd mpw mzx not pab pbg pib pio plu pnk rgr sar tae ter tnq trn unk wap wau xir yaw ycn yvt</languageGroup>
+		<languageGroup parent="awd">aca ame aox apu arw avo bae brg bvv bwi cab cbb ccc cjo cni cot cox cpc crb cuj gae gqn guc ign inp kav kpc mcb mht mmh mpd mpw mzx not pab pbg pib pio plu pnk rgr sar tae ter tnq trn unk wap wau xir yaw ycn yvt</languageGroup>
 		<languageGroup parent="azc">chl cok com crn cup hch hop lui mfy mnr nah ncx nhi npl ntp ood opt pao par pia ser shh stp tac tar tbu tcu tep thh tla tub twr ute var xaw xgf xpo yaq</languageGroup>
 		<languageGroup parent="bad">bjo kuw lna lnl mnh nue tor</languageGroup>
 		<languageGroup parent="bai">bbj bko byv fmp jgo nla nnh nnz nwe xmg ybb</languageGroup>
@@ -31,7 +31,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<languageGroup parent="cba">arh brn bzd cbg chb cjp cuk gut gym kog kvn mbp mot pay rma sab tbn tfr tnb tnd</languageGroup>
 		<languageGroup parent="ccn">ab abq ady kbd uby</languageGroup>
 		<languageGroup parent="ccs">jge ka lzz oge sva xmf</languageGroup>
-		<languageGroup parent="cdc">ajw anc ank bcw bcy bde bdm bdn bid bol bta bvf bvh bwr bwu bxq ckl cky cla daa dbb dbq dot dwa fie fkk fli gab gde gdk gdu gea gek gew gid gis giz glw gnd gqa grd gwn ha hed hia hna jeu jie jim jmb jmi juu kai kcs ker kil kna kof kot kpa kqx kso ksq kuh kvf kvi ldd lln lme maf mcn mcw mew mfl mif mkf mlj mmy moz mpg mpi mpk mqb mse msv mug muj muy mxf mxu nbh ndm ngi ngw ngx nja nnc nnn pbi pip piy plj pqa saa say scw sir sok sor sur swq swy tak tan tax tmc trj ubi udl xed xmj zah zaz zbu zim ziz zns zrn zua zuy</languageGroup>
+		<languageGroup parent="cdc">ajw anc ank bcw bcy bde bdm bdn bid bol bta bvf bvh bwr bwu bxq ckl cky cla daa dbb dbq dot dwa fie fkk fli gab gde gdk gdu gea gek gew gid gis giz glw gnd gqa grd gwn ha hed hia hna jeu jie jim jmb jmi juu kai kcs ker kil kna kof kot kpa kqx kso ksq kuh kvf kvi ldd lln lme maf mcn mcw mew mfl mif mkf mlj mmy moz mpg mpi mpk mqb mse msv mug muj muy mxf mxu nbh ndm ngi ngw ngx nja nnc nnn pbi pip piy pqa pze saa say scw sir sok sor sur swq swy tak tan tax tmc trj tvi ubi udl xed xmj zah zaz zbu zim ziz zns zrn zuy</languageGroup>
 		<languageGroup parent="cdd">ari cad kii paw wic</languageGroup>
 		<languageGroup parent="cel">br cnx cy ga gd gv kw mga nrc obt oco owl pgl sga sth wlm xbm xcb xce xga xlp xpi</languageGroup>
 		<languageGroup parent="cmc">ace cja cje cjm hro huq ibh jra ocm rad rgs rog</languageGroup>
@@ -90,10 +90,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<languageGroup parent="roa">an ast ca cbk co cpf cpp dlm drc egl es ext fax fr frc frm fro frp fur gl ist it itk lad lij lld lmo mwl mxi nap nrf oc osp pcd pld pln pml pms pro pt rgn rm ro ruo rup ruq sc scn sdc sdn sdt sro vec wa xno zrp</languageGroup>
 		<languageGroup parent="sal">blc cea cjh clm col coo cow crd fla hur lil lut nok oka ptw qun sec shs ska slh sno spo squ str thp til twa</languageGroup>
 		<languageGroup parent="sdv">ach adh alz anu atu bdi bfa bxb byg dau ddd dib din dip diw dks enb eyo jum kdj keo kln koe kpz liu lky loh lot lpx lth luo mas mfz mqu mur muz mym niq njl nnj nsg nub nus oki omt pko saq sgc shj shk soh suq tbi tcc tec teo teq tex toq tuv tuy ukv xel xwg zmo</languageGroup>
-		<languageGroup parent="sem">aao abh acm acq acy aeb aec agj aii ajp akk am amw apc apd ar arc arq ary auz ayl ayn ayp bhm bhn dlk egy fif gdq gez gru har hbo he hoh hrt inm ior jpa jrb jye kqd lhs mey mid mt mvz mys myz oar obm phn rzh sgw shu shv smp sqr sqt syc syr ti tig tru uga wle xaa xeb xha xhd xna xpu xqt xsa yhd zwa</languageGroup>
+		<languageGroup parent="sem">aao abh acm acq acy aeb aec agj aii akk am amw apc apd ar arc arq ary auz ayl ayn ayp bhm bhn dlk egy fif gdq gez gru har hbo he hoh hrt inm ior jpa jrb jye kqd lhs mey mid mt mvz mys myz oar obm phn rzh sgw shu shv smp sqr sqt syc syr ti tig tru uga wle xaa xeb xha xhd xna xpu xqt xsa yhd zwa</languageGroup>
 		<languageGroup parent="sgn">ncs</languageGroup>
 		<languageGroup parent="sio">asb bll chc cmm cro dak hid iow ksk lkt mhq ofo oma osa qua sto tta win xwc</languageGroup>
-		<languageGroup parent="sit">acn aeu ahk aim anm aot aph atb aub bap bfc bgg bgr bhj biu brd bxd byh byo byw bzi cdf cdm cfm ckh ckn clj clk cmr cnc cng cnh cnk csh csj ctd cth ctn cur cuw cvg dao der dhi dis drq dus emg enu ero ers gnb goe gqi grt hle hmr hni hpo ii jee jih jiu jiy jkr jnl jya kac kaf kar kdq kfw kgj kif kip kix kjl kjz kkt kle klr kmm ktp lax lbg lbr lep lgh lhi lhp lhu lif lis lkc llh lmh lov lpo lrr lsh lsi lus lwm mhu mjw mni mpz mrh mro muk mxj my nbe nbi nbu ncd new njb njh njm njn njo nkb nkd nkf nkh nki nma nme nmo nmy nng nnl nnp nos npb npg nph npo npu nre nri nru nsf nsm nty nwc nxq nzm obr pck phh pho phq pkh pmi pmj pmx pub pum pzn qvy qxs raa rab raf rah raq rau rav ria rji rki rmz rtc ruh sch sdp sgk sgp shl sjl slt smh smt ssk suv suz sxg taj tbq tcl tco tcz tdg tdh tge thf tij tji tjs tmk tpe tro trp tvn txg txo ugo usi vap vay weu wme wuh xac ybh ybi ych ycl ycp yig yim yiq yiv ykt ylo ymc ymd ymi ymq ymx ymz yna ypa yph ypn ypo ypp ypz ysd ysp ysy ytl ywl ywq ywt zal zhx zkd zkn zkr zom</languageGroup>
+		<languageGroup parent="sit">acn aeu ahk aim anm aot aph atb aub bap bfc bgg bgr bhj biu brd bxd byh byo byw bzi cdf cdm cfm ckh ckn clj clk cmr cnc cng cnh cnk csh csj ctd cth ctn cur cuw cvg dao der dhi dis drq dus emg enu ero ers gnb goe gqi grt hle hmr hni hpo ii jee jih jiu jiy jkr jnl jya kac kaf kar kdq kfw kgj kif kip kix kjl kjz kkt kle klr kmm ktp lax lbg lbr lep lgh lhi lhp lhu lif lis lkc llh lmh lov lpo lrr lsh lsi lus lwm mhu mjw mni mpz mrh mro muk mxj my nbe nbi nbu ncd new njb njh njm njn njo nkb nkd nkf nkh nki nma nme nmo nmy nng nnl nnp nos npb npg nph npo npu nre nri nru nsf nsm nty nwc nxq nzm obr pck phh pho phq pkh pmi pmj pmx pub pum pzn qvy qxs raa rab raf rah raq rau rav ria rji rki rmz rtc ruh sch sdp sgk sgp shl sjl slt smh smt ssk suv suz sxg taj tbq tcl tco tcz tdg tdh tge thf tij tji tjs tpe tro trp tvn txg txo ugo usi vap vay weu wme wuh xac ybh ybi ych ycl ycp yig yim yiq yiv ykt ylo ymc ymd ymi ymq ymx ymz yna ypa yph ypn ypo ypp ypz ysd ysp ysy ytl ywl ywq ywt zal zhx zkd zkn zkr zom</languageGroup>
 		<languageGroup parent="sla">rsk zle zls zlw</languageGroup>
 		<languageGroup parent="smi">se sia sjd sje sjk sjt sju sma smj smn sms</languageGroup>
 		<languageGroup parent="son">ddn dje dsq hmb kcy khq ses tda tst twq</languageGroup>
@@ -101,11 +101,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<languageGroup parent="syd">enf enh mtm nio sel xas yrk</languageGroup>
 		<languageGroup parent="tai">aho aio blt eee kht ksu lo nod nrr nut pdi phk shn soa tdd th thi tnu tpo tsl tyj tyr tyz za zch zeh zln zlq</languageGroup>
 		<languageGroup parent="tbq">adi adl adx apt bee bft bfu bo bqh bro brx cda cdn cgk chx dka drd dre duu dz dzl ghe ghh ght gro gvr gyo hut jda jna jul kbg kfk kgy khg kkf kte kzq lae lbf lbj lhm lkh loy mrg nbt neh njz nmm npa nun ola ole prx rgk rnp sbu scp scu sgt sip skj spt syw tgf tgj ths tpq tsj tsk ttz twm xct xkf xkz xns xsr xzh zau</languageGroup>
-		<languageGroup parent="trk">aib alt atv az azb ba bgx chg cjs clw crh cv dlg gag ili jct kaa kdr kim kjh kk klj kmz krc kum ky nog ota otk oui qwm qxq sah slq slr sty tk tr tt tyv ug uum uz uzs xbo xpc xqa ybe zkh zkz</languageGroup>
+		<languageGroup parent="trk">aib alt atv az azb ba bgx chg cjs clw crh cv dlg gag ili jct kaa kdr kim kjh kk klj kmz krc kum ky nog ota otk oui qwm qxq sah slr sty tk tr tt tyv ug uum uz uzs xbo xpc xqa ybe zkh zkz</languageGroup>
 		<languageGroup parent="tup">aan ait ama api aqz arr arx asn asu aux avv awe awt cin cod eme gn gnw gub gui gun guq gvj gvo gyr jor jua jur kay kgk kpn ktn kuq kyr kyz mav mdz mnd mpu msp myu nhd omg oym paf pah pak pog psm pta pto skf srq sru taf tpj tpk tpn tpr tpw tqb twt urb uru urz wir wyr xaj xiy xmo yrl yuq</languageGroup>
 		<languageGroup parent="tut">ain trk xgn xhc zkt</languageGroup>
 		<languageGroup parent="tuw">eve evn gld juc mnc neg oaa oac orh sjo ude ulc</languageGroup>
-		<languageGroup parent="urj">fiu hu kca mns omk rts syd xcv ykg yux zkb</languageGroup>
+		<languageGroup parent="urj">fiu hu kca mns omk rts syd xcv ykg yux</languageGroup>
 		<languageGroup parent="wak">dtd has hei kwk myh nuk</languageGroup>
 		<languageGroup parent="wen">dsb hsb</languageGroup>
 		<languageGroup parent="xgn">bua bxm bxu cmg dta kxs mhj mjg mn mvf peh sce xal xng xwo yuy</languageGroup>
diff --git a/make/data/cldr/common/supplemental/languageInfo.xml b/make/data/cldr/common/supplemental/languageInfo.xml
index 3c550dca0fe..bca787901a0 100644
--- a/make/data/cldr/common/supplemental/languageInfo.xml
+++ b/make/data/cldr/common/supplemental/languageInfo.xml
@@ -167,7 +167,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<languageMatch desired="aeb" supported="ar" distance="10" oneway="true"/>	<!-- Tunisian Arabic -->
 			<languageMatch desired="aec" supported="ar" distance="10" oneway="true"/>	<!-- Saidi Arabic -->
 			<languageMatch desired="afb" supported="ar" distance="10" oneway="true"/>	<!-- Gulf Arabic -->
-			<languageMatch desired="ajp" supported="ar" distance="10" oneway="true"/>	<!-- South Levantine Arabic -->
 			<languageMatch desired="apc" supported="ar" distance="10" oneway="true"/>	<!-- North Levantine Arabic -->
 			<languageMatch desired="apd" supported="ar" distance="10" oneway="true"/>	<!-- Sudanese Arabic -->
 			<languageMatch desired="arq" supported="ar" distance="10" oneway="true"/>	<!-- Algerian Arabic -->
diff --git a/make/data/cldr/common/supplemental/likelySubtags.xml b/make/data/cldr/common/supplemental/likelySubtags.xml
index 1a13b214fe2..0a60322deef 100644
--- a/make/data/cldr/common/supplemental/likelySubtags.xml
+++ b/make/data/cldr/common/supplemental/likelySubtags.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
 <!--
-Copyright © 1991-2023 Unicode, Inc.
+Copyright © 1991-2024 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <!--
@@ -1650,7 +1650,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<!--{ Zulu; ?; ? } => { Zulu; Latin; South Africa }-->
 		<likelySubtag from="zza" to="zza_Latn_TR"/>
 		<!--{ Zaza; ?; ? } => { Zaza; Latin; Türkiye }-->
-		
+
 		<!-- Retain und and und+macroregions that are in CLDR locales, except those mapping to en anyway  -->
 		<likelySubtag from="und" to="en_Latn_US"/>
 		<likelySubtag from="und_Latn" to="en_Latn_US"/>
@@ -1658,9 +1658,9 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Latn_419" to="es_Latn_419"/>
 
 		<!--{ ?; ?; ? } => { English; Latin; United States }-->
-		
+
 		<!-- Added und_* so that all regions were handled -->
-		
+
 		<likelySubtag from="und_AC" to="en_Latn_AC"/>
 		<likelySubtag from="und_AG" to="en_Latn_AG"/>
 		<likelySubtag from="und_AI" to="en_Latn_AI"/>
@@ -1724,9 +1724,9 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_VI" to="en_Latn_VI"/>
 		<likelySubtag from="und_ZA" to="en_Latn_ZA"/>
 		<likelySubtag from="und_ZM" to="bem_Latn_ZM"/>
-		
+
 		<!-- Add und_script_region where the fallback from und_script would fail -->
-		
+
 		<likelySubtag from="und_Arab_AF" to="fa_Arab_AF"/>
 		<likelySubtag from="und_Arab_IR" to="fa_Arab_IR"/>
 		<likelySubtag from="und_Cyrl_BG" to="bg_Cyrl_BG"/>
@@ -1872,9 +1872,9 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Latn_WS" to="sm_Latn_WS"/>
 		<likelySubtag from="und_Latn_XK" to="sq_Latn_XK"/>
 		<likelySubtag from="und_Latn_YT" to="fr_Latn_YT"/>
-		<likelySubtag from="und_Latn_ZW" to="sn_Latn_ZW"/>		
+		<likelySubtag from="und_Latn_ZW" to="sn_Latn_ZW"/>
 		<likelySubtag from="und_Tibt_BT" to="dz_Tibt_BT"/>
-		
+
 		<likelySubtag from="und_AD" to="ca_Latn_AD"/>
 		<!--{ ?; ?; Andorra } => { Catalan; Latin; Andorra }-->
 		<likelySubtag from="und_AE" to="ar_Arab_AE"/>
@@ -2880,7 +2880,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="aja" to="aja_Latn_SS" origin="sil1"/>	<!-- Aja [South Sudan] ➡︎ Aja [South Sudan] (Latin, South Sudan) -->
 		<likelySubtag from="aji" to="aji_Latn_NC" origin="sil1"/>	<!-- Ajië ➡︎ Ajië (Latin, New Caledonia) -->
 		<likelySubtag from="ajn" to="ajn_Latn_AU" origin="sil1"/>	<!-- Andajin ➡︎ Andajin (Latin, Australia) -->
-		<likelySubtag from="ajp" to="ajp_Arab_JO" origin="sil1"/>	<!-- South Levantine Arabic ➡︎ South Levantine Arabic (Arabic, Jordan) -->
 		<likelySubtag from="ajw" to="ajw_Latn_NG" origin="sil1"/>	<!-- Ajawa ➡︎ Ajawa (Latin, Nigeria) -->
 		<likelySubtag from="ajz" to="ajz_Latn_IN" origin="sil1"/>	<!-- Amri Karbi ➡︎ Amri Karbi (Latin, India) -->
 		<likelySubtag from="akb" to="akb_Latn_ID" origin="sil1"/>	<!-- Batak Angkola ➡︎ Batak Angkola (Latin, Indonesia) -->
@@ -5043,7 +5042,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kgj" to="kgj_Deva_NP" origin="sil1"/>	<!-- Gamale Kham ➡︎ Gamale Kham (Devanagari, Nepal) -->
 		<likelySubtag from="kgk" to="kgk_Latn_BR" origin="sil1"/>	<!-- Kaiwá ➡︎ Kaiwá (Latin, Brazil) -->
 		<likelySubtag from="kgl" to="kgl_Latn_AU" origin="sil1"/>	<!-- Kunggari ➡︎ Kunggari (Latin, Australia) -->
-		<likelySubtag from="kgm" to="kgm_Latn_BR" origin="sil1"/>	<!-- Karipúna ➡︎ Karipúna (Latin, Brazil) -->
 		<likelySubtag from="kgo" to="kgo_Latn_SD" origin="sil1"/>	<!-- Krongo ➡︎ Krongo (Latin, Sudan) -->
 		<likelySubtag from="kgq" to="kgq_Latn_ID" origin="sil1"/>	<!-- Kamoro ➡︎ Kamoro (Latin, Indonesia) -->
 		<likelySubtag from="kgr" to="kgr_Latn_ID" origin="sil1"/>	<!-- Abun ➡︎ Abun (Latin, Indonesia) -->
@@ -5267,7 +5265,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="krx" to="krx_Latn_SN" origin="sil1"/>	<!-- Karon ➡︎ Karon (Latin, Senegal) -->
 		<likelySubtag from="kry" to="kry_Latn_AZ" origin="sil1"/>	<!-- Kryts ➡︎ Kryts (Latin, Azerbaijan) -->
 		<likelySubtag from="krz" to="krz_Latn_ID" origin="sil1"/>	<!-- Sota Kanum ➡︎ Sota Kanum (Latin, Indonesia) -->
-		<likelySubtag from="ksa" to="ksa_Latn_NG" origin="sil1"/>	<!-- Shuwa-Zamani ➡︎ Shuwa-Zamani (Latin, Nigeria) -->
 		<likelySubtag from="ksc" to="ksc_Latn_PH" origin="sil1"/>	<!-- Southern Kalinga ➡︎ Southern Kalinga (Latin, Philippines) -->
 		<likelySubtag from="kse" to="kse_Latn_PG" origin="sil1"/>	<!-- Kuni ➡︎ Kuni (Latin, Papua New Guinea) -->
 		<likelySubtag from="ksg" to="ksg_Latn_SB" origin="sil1"/>	<!-- Kusaghe ➡︎ Kusaghe (Latin, Solomon Islands) -->
@@ -6467,7 +6464,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="noi" to="noi_Deva_IN" origin="sil1"/>	<!-- Noiri ➡︎ Noiri (Devanagari, India) -->
 		<likelySubtag from="noj" to="noj_Latn_CO" origin="sil1"/>	<!-- Nonuya ➡︎ Nonuya (Latin, Colombia) -->
 		<likelySubtag from="nok" to="nok_Latn_US" origin="sil1"/>	<!-- Nooksack ➡︎ Nooksack (Latin, United States) -->
-		<likelySubtag from="nom" to="nom_Latn_PE" origin="sil1"/>	<!-- Nocamán ➡︎ Nocamán (Latin, Peru) -->
 		<likelySubtag from="noq" to="noq_Latn_CD" origin="sil1"/>	<!-- Ngongo ➡︎ Ngongo (Latin, Congo - Kinshasa) -->
 		<likelySubtag from="nos" to="nos_Yiii_CN" origin="sil1"/>	<!-- Eastern Nisu ➡︎ Eastern Nisu (Yi, China) -->
 		<likelySubtag from="not" to="not_Latn_PE" origin="sil1"/>	<!-- Nomatsiguenga ➡︎ Nomatsiguenga (Latin, Peru) -->
@@ -6872,7 +6868,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ple" to="ple_Latn_ID" origin="sil1"/>	<!-- Palu'e ➡︎ Palu'e (Latin, Indonesia) -->
 		<likelySubtag from="plg" to="plg_Latn_AR" origin="sil1"/>	<!-- Pilagá ➡︎ Pilagá (Latin, Argentina) -->
 		<likelySubtag from="plh" to="plh_Latn_ID" origin="sil1"/>	<!-- Paulohi ➡︎ Paulohi (Latin, Indonesia) -->
-		<likelySubtag from="plj" to="plj_Latn_NG" origin="sil1"/>	<!-- Polci ➡︎ Polci (Latin, Nigeria) -->
 		<likelySubtag from="plk" to="plk_Arab_PK" origin="sil1"/>	<!-- Kohistani Shina ➡︎ Kohistani Shina (Arabic, Pakistan) -->
 		<likelySubtag from="pll" to="pll_Mymr_MM" origin="sil1"/>	<!-- Shwe Palaung ➡︎ Shwe Palaung (Myanmar, Myanmar [Burma]) -->
 		<likelySubtag from="pln" to="pln_Latn_CO" origin="sil1"/>	<!-- Palenquero ➡︎ Palenquero (Latin, Colombia) -->
@@ -6956,7 +6951,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="prk" to="prk_Latn_MM" origin="sil1"/>	<!-- Parauk ➡︎ Parauk (Latin, Myanmar [Burma]) -->
 		<likelySubtag from="prm" to="prm_Latn_PG" origin="sil1"/>	<!-- Kibiri ➡︎ Kibiri (Latin, Papua New Guinea) -->
 		<likelySubtag from="pro" to="pro_Latn_FR" origin="sil1"/>	<!-- Old Provençal ➡︎ Old Provençal (Latin, France) -->
-		<likelySubtag from="prp" to="prp_Gujr_IN" origin="sil1"/>	<!-- Parsi ➡︎ Parsi (Gujarati, India) -->
 		<likelySubtag from="prq" to="prq_Latn_PE" origin="sil1"/>	<!-- Ashéninka Perené ➡︎ Ashéninka Perené (Latin, Peru) -->
 		<likelySubtag from="prr" to="prr_Latn_BR" origin="sil1"/>	<!-- Puri ➡︎ Puri (Latin, Brazil) -->
 		<likelySubtag from="prt" to="prt_Thai_TH" origin="sil1"/>	<!-- Phai ➡︎ Phai (Thai, Thailand) -->
@@ -7015,6 +7009,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="pyu_Hani" to="pyu_Hani_TW" origin="sil1"/>	<!-- Puyuma (Han) ➡︎ Puyuma (Han, Taiwan) -->
 		<likelySubtag from="pyx" to="pyx_Mymr_MM" origin="sil1"/>	<!-- Pyu [Myanmar] ➡︎ Pyu [Myanmar] (Myanmar, Myanmar [Burma]) -->
 		<likelySubtag from="pyy" to="pyy_Latn_MM" origin="sil1"/>	<!-- Pyen ➡︎ Pyen (Latin, Myanmar [Burma]) -->
+		<likelySubtag from="pze" to="pze_Latn_NG" origin="sil1"/>	<!-- Pesse ➡︎ Pesse (Latin, Nigeria) -->
 		<likelySubtag from="pzh" to="pzh_Latn_TW" origin="sil1"/>	<!-- Pazeh ➡︎ Pazeh (Latin, Taiwan) -->
 		<likelySubtag from="pzn" to="pzn_Latn_MM" origin="sil1"/>	<!-- Jejara Naga ➡︎ Jejara Naga (Latin, Myanmar [Burma]) -->
 		<likelySubtag from="qua" to="qua_Latn_US" origin="sil1"/>	<!-- Quapaw ➡︎ Quapaw (Latin, United States) -->
@@ -7164,6 +7159,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="rri" to="rri_Latn_SB" origin="sil1"/>	<!-- Ririo ➡︎ Ririo (Latin, Solomon Islands) -->
 		<likelySubtag from="rrt" to="rrt_Latn_AU" origin="sil1"/>	<!-- Arritinngithigh ➡︎ Arritinngithigh (Latin, Australia) -->
 		<likelySubtag from="rsk" to="rsk_Cyrl_RS" origin="sil1"/>	<!-- Ruthenian ➡︎ Ruthenian (Cyrillic, Serbia) -->
+		<likelySubtag from="rsw" to="rsw_Latn_NG" origin="sil1"/>	<!-- Rishiwa ➡︎ Rishiwa (Latin, Nigeria) -->
 		<likelySubtag from="rtc" to="rtc_Latn_MM" origin="sil1"/>	<!-- Rungtu Chin ➡︎ Rungtu Chin (Latin, Myanmar [Burma]) -->
 		<likelySubtag from="rth" to="rth_Latn_ID" origin="sil1"/>	<!-- Ratahan ➡︎ Ratahan (Latin, Indonesia) -->
 		<likelySubtag from="rtw" to="rtw_Deva_IN" origin="sil1"/>	<!-- Rathawi ➡︎ Rathawi (Devanagari, India) -->
@@ -7372,7 +7368,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="slm" to="slm_Latn_PH" origin="sil1"/>	<!-- Pangutaran Sama ➡︎ Pangutaran Sama (Latin, Philippines) -->
 		<likelySubtag from="sln" to="sln_Latn_US" origin="sil1"/>	<!-- Salinan ➡︎ Salinan (Latin, United States) -->
 		<likelySubtag from="slp" to="slp_Latn_ID" origin="sil1"/>	<!-- Lamaholot ➡︎ Lamaholot (Latin, Indonesia) -->
-		<likelySubtag from="slq" to="slq_Arab_IR" origin="sil1"/>	<!-- Salchuq ➡︎ Salchuq (Arabic, Iran) -->
 		<likelySubtag from="slr" to="slr_Latn_CN" origin="sil1"/>	<!-- Salar ➡︎ Salar (Latin, China) -->
 		<likelySubtag from="slu" to="slu_Latn_ID" origin="sil1"/>	<!-- Selaru ➡︎ Selaru (Latin, Indonesia) -->
 		<likelySubtag from="slw" to="slw_Latn_PG" origin="sil1"/>	<!-- Sialum ➡︎ Sialum (Latin, Papua New Guinea) -->
@@ -7562,7 +7557,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="sza" to="sza_Latn_MY" origin="sil1"/>	<!-- Semelai ➡︎ Semelai (Latin, Malaysia) -->
 		<likelySubtag from="szb" to="szb_Latn_ID" origin="sil1"/>	<!-- Ngalum ➡︎ Ngalum (Latin, Indonesia) -->
 		<likelySubtag from="szc" to="szc_Latn_MY" origin="sil1"/>	<!-- Semaq Beri ➡︎ Semaq Beri (Latin, Malaysia) -->
-		<likelySubtag from="szd" to="szd_Latn_MY" origin="sil1"/>	<!-- Seru ➡︎ Seru (Latin, Malaysia) -->
 		<likelySubtag from="szg" to="szg_Latn_CD" origin="sil1"/>	<!-- Sengele ➡︎ Sengele (Latin, Congo - Kinshasa) -->
 		<likelySubtag from="szn" to="szn_Latn_ID" origin="sil1"/>	<!-- Sula ➡︎ Sula (Latin, Indonesia) -->
 		<likelySubtag from="szp" to="szp_Latn_ID" origin="sil1"/>	<!-- Suabo ➡︎ Suabo (Latin, Indonesia) -->
@@ -7775,7 +7769,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tmg" to="tmg_Latn_ID" origin="sil1"/>	<!-- Ternateño ➡︎ Ternateño (Latin, Indonesia) -->
 		<likelySubtag from="tmi" to="tmi_Latn_VU" origin="sil1"/>	<!-- Tutuba ➡︎ Tutuba (Latin, Vanuatu) -->
 		<likelySubtag from="tmj" to="tmj_Latn_ID" origin="sil1"/>	<!-- Samarokena ➡︎ Samarokena (Latin, Indonesia) -->
-		<likelySubtag from="tmk" to="tmk_Deva_NP" origin="sil1"/>	<!-- Northwestern Tamang ➡︎ Northwestern Tamang (Devanagari, Nepal) -->
 		<likelySubtag from="tml" to="tml_Latn_ID" origin="sil1"/>	<!-- Tamnim Citak ➡︎ Tamnim Citak (Latin, Indonesia) -->
 		<likelySubtag from="tmm" to="tmm_Latn_VN" origin="sil1"/>	<!-- Tai Thanh ➡︎ Tai Thanh (Latin, Vietnam) -->
 		<likelySubtag from="tmn" to="tmn_Latn_ID" origin="sil1"/>	<!-- Taman [Indonesia] ➡︎ Taman [Indonesia] (Latin, Indonesia) -->
@@ -7919,6 +7912,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tuz" to="tuz_Latn_BF" origin="sil1"/>	<!-- Turka ➡︎ Turka (Latin, Burkina Faso) -->
 		<likelySubtag from="tva" to="tva_Latn_SB" origin="sil1"/>	<!-- Vaghua ➡︎ Vaghua (Latin, Solomon Islands) -->
 		<likelySubtag from="tve" to="tve_Latn_ID" origin="sil1"/>	<!-- Te'un ➡︎ Te'un (Latin, Indonesia) -->
+		<likelySubtag from="tvi" to="tvi_Latn_NG" origin="sil1"/>	<!-- Tulai ➡︎ Tulai (Latin, Nigeria) -->
 		<likelySubtag from="tvk" to="tvk_Latn_VU" origin="sil1"/>	<!-- Southeast Ambrym ➡︎ Southeast Ambrym (Latin, Vanuatu) -->
 		<likelySubtag from="tvm" to="tvm_Latn_ID" origin="sil1"/>	<!-- Tela-Masbuar ➡︎ Tela-Masbuar (Latin, Indonesia) -->
 		<likelySubtag from="tvn" to="tvn_Mymr_MM" origin="sil1"/>	<!-- Tavoyan ➡︎ Tavoyan (Myanmar, Myanmar [Burma]) -->
@@ -8483,7 +8477,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="xsn" to="xsn_Latn_NG" origin="sil1"/>	<!-- Sanga [Nigeria] ➡︎ Sanga [Nigeria] (Latin, Nigeria) -->
 		<likelySubtag from="xsp" to="xsp_Latn_PG" origin="sil1"/>	<!-- Silopi ➡︎ Silopi (Latin, Papua New Guinea) -->
 		<likelySubtag from="xsq" to="xsq_Latn_MZ" origin="sil1"/>	<!-- Makhuwa-Saka ➡︎ Makhuwa-Saka (Latin, Mozambique) -->
-		<likelySubtag from="xss" to="xss_Cyrl_RU" origin="sil1"/>	<!-- Assan ➡︎ Assan (Cyrillic, Russia) -->
 		<likelySubtag from="xsu" to="xsu_Latn_VE" origin="sil1"/>	<!-- Sanumá ➡︎ Sanumá (Latin, Venezuela) -->
 		<likelySubtag from="xsy" to="xsy_Latn_TW" origin="sil1"/>	<!-- Saisiyat ➡︎ Saisiyat (Latin, Taiwan) -->
 		<likelySubtag from="xta" to="xta_Latn_MX" origin="sil1"/>	<!-- Alcozauca Mixtec ➡︎ Alcozauca Mixtec (Latin, Mexico) -->
@@ -8747,7 +8740,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ziw" to="ziw_Latn_TZ" origin="sil1"/>	<!-- Zigula ➡︎ Zigula (Latin, Tanzania) -->
 		<likelySubtag from="ziz" to="ziz_Latn_NG" origin="sil1"/>	<!-- Zizilivakan ➡︎ Zizilivakan (Latin, Nigeria) -->
 		<likelySubtag from="zka" to="zka_Latn_ID" origin="sil1"/>	<!-- Kaimbulawa ➡︎ Kaimbulawa (Latin, Indonesia) -->
-		<likelySubtag from="zkb" to="zkb_Cyrl_RU" origin="sil1"/>	<!-- Koibal ➡︎ Koibal (Cyrillic, Russia) -->
 		<likelySubtag from="zkd" to="zkd_Latn_MM" origin="sil1"/>	<!-- Kadu ➡︎ Kadu (Latin, Myanmar [Burma]) -->
 		<likelySubtag from="zko" to="zko_Cyrl_RU" origin="sil1"/>	<!-- Kott ➡︎ Kott (Cyrillic, Russia) -->
 		<likelySubtag from="zkp" to="zkp_Latn_BR" origin="sil1"/>	<!-- São Paulo Kaingáng ➡︎ São Paulo Kaingáng (Latin, Brazil) -->
@@ -8841,7 +8833,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ztu" to="ztu_Latn_MX" origin="sil1"/>	<!-- Güilá Zapotec ➡︎ Güilá Zapotec (Latin, Mexico) -->
 		<likelySubtag from="ztx" to="ztx_Latn_MX" origin="sil1"/>	<!-- Zaachila Zapotec ➡︎ Zaachila Zapotec (Latin, Mexico) -->
 		<likelySubtag from="zty" to="zty_Latn_MX" origin="sil1"/>	<!-- Yatee Zapotec ➡︎ Yatee Zapotec (Latin, Mexico) -->
-		<likelySubtag from="zua" to="zua_Latn_NG" origin="sil1"/>	<!-- Zeem ➡︎ Zeem (Latin, Nigeria) -->
 		<likelySubtag from="zuh" to="zuh_Latn_PG" origin="sil1"/>	<!-- Tokano ➡︎ Tokano (Latin, Papua New Guinea) -->
 		<likelySubtag from="zum" to="zum_Arab_OM" origin="sil1"/>	<!-- Kumzari ➡︎ Kumzari (Arabic, Oman) -->
 		<likelySubtag from="zun" to="zun_Latn_US" origin="sil1"/>	<!-- Zuni ➡︎ Zuni (Latin, United States) -->
diff --git a/make/data/cldr/common/supplemental/metaZones.xml b/make/data/cldr/common/supplemental/metaZones.xml
index 0beb757cacb..e8098c9c0c8 100644
--- a/make/data/cldr/common/supplemental/metaZones.xml
+++ b/make/data/cldr/common/supplemental/metaZones.xml
@@ -402,7 +402,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone mzone="Atlantic"/>
 			</timezone>
 			<timezone type="America/Godthab">
-				<usesMetazone mzone="Greenland_Western"/>
+				<usesMetazone to="2024-03-26 01:00" mzone="Greenland_Western"/>
+				<usesMetazone from="2024-03-26 01:00" mzone="Greenland"/>
 			</timezone>
 			<timezone type="America/Goose_Bay">
 				<usesMetazone to="1988-04-03 04:01" mzone="Atlantic"/>
@@ -596,9 +597,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="America/New_York">
 				<usesMetazone mzone="America_Eastern"/>
 			</timezone>
-			<timezone type="America/Nipigon">
-				<usesMetazone mzone="America_Eastern"/>
-			</timezone>
 			<timezone type="America/Nome">
 				<usesMetazone to="1983-10-30 12:00" mzone="Bering"/>
 				<usesMetazone from="1983-11-30 09:00" mzone="Alaska"/>
@@ -626,11 +624,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="America/Panama">
 				<usesMetazone mzone="America_Eastern"/>
 			</timezone>
-			<timezone type="America/Pangnirtung">
-				<usesMetazone to="1999-10-31 06:00" mzone="America_Eastern"/>
-				<usesMetazone to="2000-10-29 07:00" from="1999-10-31 06:00" mzone="America_Central"/>
-				<usesMetazone from="2000-10-29 07:00" mzone="America_Eastern"/>
-			</timezone>
 			<timezone type="America/Paramaribo">
 				<usesMetazone to="1975-11-20 03:30" mzone="Dutch_Guiana"/>
 				<usesMetazone from="1975-11-20 03:30" mzone="Suriname"/>
@@ -653,9 +646,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="America/Punta_Arenas">
 				<usesMetazone to="2016-12-03 23:00" mzone="Chile"/>
 			</timezone>
-			<timezone type="America/Rainy_River">
-				<usesMetazone mzone="America_Central"/>
-			</timezone>
 			<timezone type="America/Rankin_Inlet">
 				<usesMetazone to="2000-10-29 07:00" mzone="America_Central"/>
 				<usesMetazone to="2001-04-01 08:00" from="2000-10-29 07:00" mzone="America_Eastern"/>
@@ -679,9 +669,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone to="2013-11-10 04:00" from="2008-06-24 05:00" mzone="Amazon"/>
 				<usesMetazone from="2013-11-10 04:00" mzone="Acre"/>
 			</timezone>
-			<timezone type="America/Santa_Isabel">
-				<usesMetazone mzone="Mexico_Northwest"/>
-			</timezone>
 			<timezone type="America/Santarem">
 				<usesMetazone to="2008-06-24 04:00" mzone="Amazon"/>
 				<usesMetazone from="2008-06-24 04:00" mzone="Brasilia"/>
@@ -700,7 +687,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="America/Scoresbysund">
 				<usesMetazone to="1981-03-29 02:00" mzone="Greenland_Central"/>
-				<usesMetazone from="1981-03-29 02:00" mzone="Greenland_Eastern"/>
+				<usesMetazone to="2024-03-31 01:00" from="1981-03-29 02:00" mzone="Greenland_Eastern"/>
+				<usesMetazone from="2024-03-31 01:00" mzone="Greenland"/>
 			</timezone>
 			<timezone type="America/Sitka">
 				<usesMetazone to="1983-10-30 09:00" mzone="America_Pacific"/>
@@ -734,9 +722,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="America/Thule">
 				<usesMetazone mzone="Atlantic"/>
 			</timezone>
-			<timezone type="America/Thunder_Bay">
-				<usesMetazone mzone="America_Eastern"/>
-			</timezone>
 			<timezone type="America/Tijuana">
 				<usesMetazone mzone="America_Pacific"/>
 			</timezone>
@@ -759,9 +744,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="America/Yakutat">
 				<usesMetazone from="1983-11-30 09:00" mzone="Alaska"/>
 			</timezone>
-			<timezone type="America/Yellowknife">
-				<usesMetazone mzone="America_Mountain"/>
-			</timezone>
 			<timezone type="Antarctica/Casey">
 				<usesMetazone to="2009-10-17 18:00" mzone="Australia_Western"/>
 				<usesMetazone to="2010-03-04 15:00" from="2009-10-17 18:00" mzone="Casey"/>
@@ -774,7 +756,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone to="2019-10-03 19:00" from="2019-03-16 16:00" mzone="Australia_Western"/>
 				<usesMetazone to="2020-03-07 16:00" from="2019-10-03 19:00" mzone="Casey"/>
 				<usesMetazone to="2020-10-03 16:01" from="2020-03-07 16:00" mzone="Australia_Western"/>
-				<usesMetazone from="2020-10-03 16:01" mzone="Casey"/>
+				<usesMetazone to="2021-03-13 13:00" from="2020-10-03 16:01" mzone="Casey"/>
+				<usesMetazone to="2021-10-02 16:01" from="2021-03-13 13:00" mzone="Australia_Western"/>
+				<usesMetazone to="2022-03-12 13:00" from="2021-10-02 16:01" mzone="Casey"/>
+				<usesMetazone to="2022-10-01 16:01" from="2022-03-12 13:00" mzone="Australia_Western"/>
+				<usesMetazone to="2023-03-08 16:00" from="2022-10-01 16:01" mzone="Casey"/>
+				<usesMetazone from="2023-03-08 16:00" mzone="Australia_Western"/>
 			</timezone>
 			<timezone type="Antarctica/Davis">
 				<usesMetazone mzone="Davis"/>
@@ -815,7 +802,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="Asia/Almaty">
 				<usesMetazone to="2004-10-30 20:00" mzone="Almaty"/>
-				<usesMetazone from="2004-10-30 20:00" mzone="Kazakhstan_Eastern"/>
+				<usesMetazone to="2024-02-29 18:00" from="2004-10-30 20:00" mzone="Kazakhstan_Eastern"/>
+				<usesMetazone from="2024-02-29 18:00" mzone="Kazakhstan_Western"/>
 			</timezone>
 			<timezone type="Asia/Amman">
 				<usesMetazone to="2022-10-27 22:00" mzone="Europe_Eastern"/>
@@ -1024,7 +1012,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone from="1972-05-31 20:00" mzone="Arabian"/>
 			</timezone>
 			<timezone type="Asia/Qostanay">
-				<usesMetazone from="2004-10-30 21:00" mzone="Kazakhstan_Eastern"/>
+				<usesMetazone to="2024-02-29 18:00" from="2004-10-30 21:00" mzone="Kazakhstan_Eastern"/>
+				<usesMetazone from="2024-02-29 18:00" mzone="Kazakhstan_Western"/>
 			</timezone>
 			<timezone type="Asia/Qyzylorda">
 				<usesMetazone to="1991-12-15 19:00" mzone="Kizilorda"/>
@@ -1156,9 +1145,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="Australia/Broken_Hill">
 				<usesMetazone mzone="Australia_Central"/>
 			</timezone>
-			<timezone type="Australia/Currie">
-				<usesMetazone mzone="Australia_Eastern"/>
-			</timezone>
 			<timezone type="Australia/Darwin">
 				<usesMetazone mzone="Australia_Central"/>
 			</timezone>
@@ -1370,10 +1356,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="Europe/Ulyanovsk">
 				<usesMetazone to="2016-03-26 23:00" from="1992-01-19 00:00" mzone="Moscow"/>
 			</timezone>
-			<timezone type="Europe/Uzhgorod">
-				<usesMetazone to="1990-06-30 22:00" mzone="Moscow"/>
-				<usesMetazone from="1990-06-30 22:00" mzone="Europe_Eastern"/>
-			</timezone>
 			<timezone type="Europe/Vaduz">
 				<usesMetazone mzone="Europe_Central"/>
 			</timezone>
@@ -1398,10 +1380,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<timezone type="Europe/Zagreb">
 				<usesMetazone mzone="Europe_Central"/>
 			</timezone>
-			<timezone type="Europe/Zaporozhye">
-				<usesMetazone to="1990-06-30 22:00" mzone="Moscow"/>
-				<usesMetazone from="1990-06-30 22:00" mzone="Europe_Eastern"/>
-			</timezone>
 			<timezone type="Europe/Zurich">
 				<usesMetazone mzone="Europe_Central"/>
 			</timezone>
@@ -1489,10 +1467,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone to="1983-10-30 11:00" mzone="Alaska_Hawaii"/>
 				<usesMetazone from="1983-10-30 11:00" mzone="Hawaii_Aleutian"/>
 			</timezone>
-			<timezone type="Pacific/Johnston">
-				<usesMetazone to="1983-10-30 11:00" mzone="Alaska_Hawaii"/>
-				<usesMetazone from="1983-10-30 11:00" mzone="Hawaii_Aleutian"/>
-			</timezone>
 			<timezone type="Pacific/Kiritimati">
 				<usesMetazone mzone="Line_Islands"/>
 			</timezone>
@@ -1629,7 +1603,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="America_Eastern" territory="PA" type="America/Panama"/>
 			<mapZone other="America_Mountain" territory="001" type="America/Denver"/>
 			<mapZone other="America_Mountain" territory="CA" type="America/Edmonton"/>
-			<mapZone other="America_Mountain" territory="MX" type="America/Hermosillo"/>
 			<mapZone other="America_Pacific" territory="001" type="America/Los_Angeles"/>
 			<mapZone other="America_Pacific" territory="CA" type="America/Vancouver"/>
 			<mapZone other="America_Pacific" territory="MX" type="America/Tijuana"/>
@@ -1776,6 +1749,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="GMT" territory="SN" type="Africa/Dakar"/>
 			<mapZone other="GMT" territory="TG" type="Africa/Lome"/>
 			<mapZone other="Goose_Bay" territory="001" type="America/Goose_Bay"/>
+			<mapZone other="Greenland" territory="001" type="America/Godthab"/>
 			<mapZone other="Greenland_Central" territory="001" type="America/Scoresbysund"/>
 			<mapZone other="Greenland_Eastern" territory="001" type="America/Scoresbysund"/>
 			<mapZone other="Greenland_Western" territory="001" type="America/Godthab"/>
@@ -1816,7 +1790,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Line_Islands" territory="001" type="Pacific/Kiritimati"/>
 			<mapZone other="Lord_Howe" territory="001" type="Australia/Lord_Howe"/>
 			<mapZone other="Macau" territory="001" type="Asia/Macau"/>
-			<mapZone other="Macquarie" territory="001" type="Antarctica/Macquarie"/>
 			<mapZone other="Magadan" territory="001" type="Asia/Magadan"/>
 			<mapZone other="Malaya" territory="001" type="Asia/Kuala_Lumpur"/>
 			<mapZone other="Malaysia" territory="001" type="Asia/Kuching"/>
@@ -1825,7 +1798,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Marshall_Islands" territory="001" type="Pacific/Majuro"/>
 			<mapZone other="Mauritius" territory="001" type="Indian/Mauritius"/>
 			<mapZone other="Mawson" territory="001" type="Antarctica/Mawson"/>
-			<mapZone other="Mexico_Northwest" territory="001" type="America/Santa_Isabel"/>
 			<mapZone other="Mexico_Pacific" territory="001" type="America/Mazatlan"/>
 			<mapZone other="Mongolia" territory="001" type="Asia/Ulaanbaatar"/>
 			<mapZone other="Moscow" territory="001" type="Europe/Moscow"/>
@@ -1962,6 +1934,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazoneId shortId="giis" longId="Gilbert_Islands" />
 			<metazoneId shortId="mgmt" longId="GMT" />
 			<metazoneId shortId="grea" longId="Greenland_Eastern" />
+			<metazoneId shortId="gree" longId="Greenland" />
 			<metazoneId shortId="grwe" longId="Greenland_Western" />
 			<metazoneId shortId="guam" longId="Guam" />
 			<metazoneId shortId="gulf" longId="Gulf" />
@@ -1990,7 +1963,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazoneId shortId="liis" longId="Line_Islands" />
 			<metazoneId shortId="loho" longId="Lord_Howe" />
 			<metazoneId shortId="maca" longId="Macau" />
-			<metazoneId shortId="macq" longId="Macquarie" />
 			<metazoneId shortId="maga" longId="Magadan" />
 			<metazoneId shortId="mala" longId="Malaysia" />
 			<metazoneId shortId="mald" longId="Maldives" />
@@ -1998,7 +1970,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<metazoneId shortId="mais" longId="Marshall_Islands" />
 			<metazoneId shortId="maur" longId="Mauritius" />
 			<metazoneId shortId="maws" longId="Mawson" />
-			<metazoneId shortId="meno" longId="Mexico_Northwest" />
 			<metazoneId shortId="mepa" longId="Mexico_Pacific" />
 			<metazoneId shortId="mong" longId="Mongolia" />
 			<metazoneId shortId="mosc" longId="Moscow" />
diff --git a/make/data/cldr/common/supplemental/ordinals.xml b/make/data/cldr/common/supplemental/ordinals.xml
index fd210e6fa68..58f7b016340 100644
--- a/make/data/cldr/common/supplemental/ordinals.xml
+++ b/make/data/cldr/common/supplemental/ordinals.xml
@@ -3,7 +3,7 @@
 <!--
 Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <supplementalData>
diff --git a/make/data/cldr/common/supplemental/pluralRanges.xml b/make/data/cldr/common/supplemental/pluralRanges.xml
index 02161f9cf30..25621072bcd 100644
--- a/make/data/cldr/common/supplemental/pluralRanges.xml
+++ b/make/data/cldr/common/supplemental/pluralRanges.xml
@@ -3,7 +3,7 @@
 <!--
 	Copyright © 1991-2022 Unicode, Inc.
 	For terms of use, see http://www.unicode.org/copyright.html
-	SPDX-License-Identifier: Unicode-DFS-2016
+	SPDX-License-Identifier: Unicode-3.0
 	CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 	GENERATED DATA — do not manually update!
 		Generated by tool:	GeneratePluralRanges
diff --git a/make/data/cldr/common/supplemental/plurals.xml b/make/data/cldr/common/supplemental/plurals.xml
index ab8e0e8ea10..27f30b7b4eb 100644
--- a/make/data/cldr/common/supplemental/plurals.xml
+++ b/make/data/cldr/common/supplemental/plurals.xml
@@ -3,7 +3,7 @@
 <!--
 Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
+SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 <supplementalData>
diff --git a/make/data/cldr/common/supplemental/subdivisions.xml b/make/data/cldr/common/supplemental/subdivisions.xml
index 1a2fe3da176..fbcfb8e2e25 100644
--- a/make/data/cldr/common/supplemental/subdivisions.xml
+++ b/make/data/cldr/common/supplemental/subdivisions.xml
@@ -3,7 +3,7 @@
 <!--
 	Copyright © 1991-2022 Unicode, Inc.
 	For terms of use, see http://www.unicode.org/copyright.html
-	SPDX-License-Identifier: Unicode-DFS-2016
+	SPDX-License-Identifier: Unicode-3.0
 	CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 	GENERATED DATA — do not manually update!
 		Generated by tool:	SubDivisionExtractor
diff --git a/make/data/cldr/common/supplemental/supplementalData.xml b/make/data/cldr/common/supplemental/supplementalData.xml
index 86632760734..c40748f3017 100644
--- a/make/data/cldr/common/supplemental/supplementalData.xml
+++ b/make/data/cldr/common/supplemental/supplementalData.xml
@@ -363,7 +363,8 @@ The printed version of ISO-4217:2001
             <currency iso4217="PTE" from="1911-05-22" to="1975-07-05"/>
         </region>
         <region iso3166="CW">
-            <currency iso4217="ANG" from="2010-10-10"/>
+            <currency iso4217="XCG" from="2025-03-31" tz="America/Curacao"/>
+            <currency iso4217="ANG" from="2010-10-10" to="2025-06-30" to-tz="America/Curacao"/>
         </region>
         <region iso3166="CX">
             <currency iso4217="AUD" from="1966-02-14"/>
@@ -545,8 +546,8 @@ The printed version of ISO-4217:2001
             <currency iso4217="HNL" from="1926-04-03"/>
         </region>
         <region iso3166="HR">
-            <currency iso4217="EUR" from="2023-01-01" />
-            <currency iso4217="HRK" from="1994-05-30" to="2023-01-14"/>
+            <currency iso4217="EUR" from="2023-01-01" tz="Europe/Zagreb"/>
+            <currency iso4217="HRK" from="1994-05-30" to="2023-01-14" to-tz="Europe/Zagreb"/>
             <currency iso4217="HRD" from="1991-12-23" to="1995-01-01"/>
             <currency iso4217="YUN" from="1990-01-01" to="1991-12-23"/>
             <currency iso4217="YUD" from="1966-01-01" to="1990-01-01"/>
@@ -957,8 +958,8 @@ The printed version of ISO-4217:2001
             <currency iso4217="CSK" from="1953-06-01" to="1992-12-31"/>
         </region>
         <region iso3166="SL">
-            <currency iso4217="SLE" from="2022-07-01"/>
-            <currency iso4217="SLL" from="1964-08-04" to="2023-12-31"/>
+            <currency iso4217="SLE" from="2022-07-01" tz="Africa/Freetown"/>
+            <currency iso4217="SLL" from="1964-08-04" to="2023-12-31" to-tz="Africa/Freetown"/>
             <currency iso4217="GBP" from="1808-11-30" to="1966-02-04"/>
         </region>
         <region iso3166="SM">
@@ -995,7 +996,8 @@ The printed version of ISO-4217:2001
             <currency iso4217="SVC" from="1919-11-11" to="2001-01-01"/>
         </region>
         <region iso3166="SX">
-            <currency iso4217="ANG" from="2010-10-10"/>
+            <currency iso4217="XCG" from="2025-03-31" tz="America/Lower_Princes"/>
+            <currency iso4217="ANG" from="2010-10-10" to="2025-06-30" to-tz="America/Lower_Princes"/>
         </region>
         <region iso3166="SY">
             <currency iso4217="SYP" from="1948-01-01"/>
@@ -2693,7 +2695,6 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="crl" populationPercent="0.001" references="R1329"/>	<!--Northern East Cree-->
 			<languagePopulation type="kwk" populationPercent="0.001" references="R1329"/>	<!--Kwakʼwala-->
 			<languagePopulation type="gwi" populationPercent="0.0008" officialStatus="official_regional" references="R1329"/>	<!--Gwichʼin-->
-			<languagePopulation type="tok" populationPercent="0.00000001"/>	<!--Tok Pona-->
 		</territory>
 		<territory type="CC" gdp="29210000" literacyPercent="99" population="596">	<!--Cocos (Keeling) Islands-->
 			<languagePopulation type="ms_Arab" populationPercent="83"/>	<!--Malay (Arabic)-->
@@ -2874,7 +2875,6 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="frs" populationPercent="0.0025" references="R1300"/>	<!--Eastern Frisian-->
 			<languagePopulation type="stq" populationPercent="0.0012"/>	<!--Saterland Frisian-->
 			<languagePopulation type="pfl" populationPercent="0" references="R1150"/>	<!--Palatine German-->
-			<languagePopulation type="vo" populationPercent="0"/>	<!--Volapük-->
 		</territory>
 		<territory type="DG" gdp="22240000" literacyPercent="99" population="500">	<!--Diego Garcia-->
 			<languagePopulation type="en" populationPercent="99" officialStatus="de_facto_official" references="R1065"/>	<!--English-->
@@ -3192,7 +3192,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ban" literacyPercent="10" populationPercent="1.8" references="R1144"/>	<!--Balinese-->
 			<languagePopulation type="bug" literacyPercent="10" populationPercent="1.6" references="R1145"/>	<!--Buginese-->
 			<languagePopulation type="bjn" literacyPercent="10" populationPercent="1.5"/>	<!--Banjar-->
-			<languagePopulation type="ace" populationPercent="1.4"/>	<!--Achinese-->
+			<languagePopulation type="ace" populationPercent="1.4"/>	<!--Acehnese-->
 			<languagePopulation type="ms_Arab" populationPercent="1.2"/>	<!--Malay (Arabic)-->
 			<languagePopulation type="sas" populationPercent="0.97"/>	<!--Sasak-->
 			<languagePopulation type="bbc" populationPercent="0.92"/>	<!--Batak Toba-->
@@ -5423,7 +5423,7 @@ XXX Code for transations where no currency is involved
     </codeMappings>
 
 	<parentLocales>
-		<parentLocale parent="root" locales="az_Arab az_Cyrl bal_Latn blt_Latn bm_Nkoo bs_Cyrl byn_Latn cu_Glag dje_Arab dyo_Arab en_Dsrt en_Shaw ff_Adlm ff_Arab ha_Arab iu_Latn kk_Arab ks_Deva ku_Arab kxv_Deva kxv_Orya kxv_Telu ky_Arab ky_Latn ml_Arab mn_Mong mni_Mtei ms_Arab pa_Arab sat_Deva sd_Deva sd_Khoj sd_Sind shi_Latn so_Arab sr_Latn sw_Arab tg_Arab ug_Cyrl uz_Arab uz_Cyrl vai_Latn wo_Arab yo_Arab yue_Hans zh_Hant"/>
+		<parentLocale parent="root" localeRules="nonlikelyScript" locales="az_Arab az_Cyrl bal_Latn blt_Latn bm_Nkoo bs_Cyrl byn_Latn cu_Glag dje_Arab dyo_Arab en_Dsrt en_Shaw ff_Adlm ff_Arab ha_Arab iu_Latn kk_Arab ks_Deva ku_Arab kxv_Deva kxv_Orya kxv_Telu ky_Arab ky_Latn ml_Arab mn_Mong mni_Mtei ms_Arab pa_Arab sat_Deva sd_Deva sd_Khoj sd_Sind shi_Latn so_Arab sr_Latn sw_Arab tg_Arab ug_Cyrl uz_Arab uz_Cyrl vai_Latn wo_Arab yo_Arab yue_Hans zh_Hant"/>
 		<parentLocale parent="en_001" locales="en_150 en_AG en_AI en_AU en_BB en_BM en_BS en_BW en_BZ en_CC en_CK en_CM en_CX en_CY en_DG en_DM en_ER en_FJ en_FK en_FM en_GB en_GD en_GG en_GH en_GI en_GM en_GY en_HK en_ID en_IE en_IL en_IM en_IN en_IO en_JE en_JM en_KE en_KI en_KN en_KY en_LC en_LR en_LS en_MG en_MO en_MS en_MT en_MU en_MV en_MW en_MY en_NA en_NF en_NG en_NR en_NU en_NZ en_PG en_PK en_PN en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_VC en_VG en_VU en_WS en_ZA en_ZM en_ZW"/>
 		<parentLocale parent="en_150" locales="en_AT en_BE en_CH en_DE en_DK en_FI en_NL en_SE en_SI"/>
 		<parentLocale parent="en_IN" locales="hi_Latn"/>
@@ -5434,15 +5434,11 @@ XXX Code for transations where no currency is involved
 		<parentLocale parent="zh_Hant_HK" locales="zh_Hant_MO"/>
 	</parentLocales>
 
-	<parentLocales component="segmentations">
-		<parentLocale parent="zh" locales="zh_Hant"/>
+	<parentLocales component="segmentations grammaticalFeatures plurals">
 	</parentLocales>
 
 	<parentLocales component="collations">
-		<parentLocale parent="bs" locales="bs_Cyrl"/>
-		<parentLocale parent="sr" locales="sr_Latn"/>
 		<parentLocale parent="sr_ME" locales="sr_Cyrl_ME"/>
-		<parentLocale parent="zh" locales="zh_Hant"/>
 		<parentLocale parent="zh_Hant" locales="yue yue_Hant"/>
 		<parentLocale parent="zh_Hans" locales="yue_CN yue_Hans yue_Hans_CN"/>
 	</parentLocales>
diff --git a/make/data/cldr/common/supplemental/supplementalMetadata.xml b/make/data/cldr/common/supplemental/supplementalMetadata.xml
index d80cdfa3ab9..971acfaa27b 100644
--- a/make/data/cldr/common/supplemental/supplementalMetadata.xml
+++ b/make/data/cldr/common/supplemental/supplementalMetadata.xml
@@ -537,6 +537,18 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<languageAlias type="und_xiang" replacement="und" reason="deprecated"/>
 			<languageAlias type="und_hepburn_heploc" replacement="und_alalc97" reason="deprecated"/>
 
+			<!-- more deprecated 2024-03-19 -->
+			<languageAlias type="ajp" replacement="apc" reason="deprecated"/> <!-- South Levantine Arabic ⇒ Levantine Arabic -->
+			<languageAlias type="kgm" replacement="plu" reason="deprecated"/> <!-- Karipúna ⇒ Palikúr -->
+			<languageAlias type="nom" replacement="cbr" reason="deprecated"/> <!-- Nocamán ⇒ Cashibo-Cacataibo -->
+			<languageAlias type="pmk" replacement="crr" reason="deprecated"/> <!-- Pamlico ⇒ Carolina Algonquian -->
+			<languageAlias type="prp" replacement="gu" reason="deprecated"/> <!-- Parsi ⇒ Gujarati -->
+			<languageAlias type="szd" replacement="umi" reason="deprecated"/> <!-- Seru ⇒ Ukit -->
+			<languageAlias type="tmk" replacement="tdg" reason="deprecated"/> <!-- Northwestern Tamang ⇒ Western Tamang -->
+			<languageAlias type="tpw" replacement="tpn" reason="deprecated"/> <!-- Tupí ⇒ Tupinambá -->
+			<languageAlias type="xss" replacement="zko" reason="deprecated"/> <!-- Assan ⇒ Kott -->
+			<languageAlias type="zkb" replacement="kjh" reason="deprecated"/> <!-- Koibal ⇒ Khakas -->
+
             <!-- scripts -->
             <scriptAlias type="Qaai" replacement="Zinh" reason="deprecated"/>
             <!-- deprecated ISO territories in 3066 + CLDR ones (older deprecated ISO codes -->
@@ -1797,6 +1809,16 @@ For terms of use, see http://www.unicode.org/copyright.html
             <zoneAlias type="Asia/Chongqing" replacement="Asia/Shanghai" reason="deprecated"/>
             <zoneAlias type="Asia/Harbin" replacement="Asia/Shanghai" reason="deprecated"/>
             <zoneAlias type="Asia/Kashgar" replacement="Asia/Urumqi" reason="deprecated"/>
+            <zoneAlias type="America/Nipigon" replacement="America/Toronto" reason="deprecated"/>
+            <zoneAlias type="America/Pangnirtung" replacement="America/Iqaluit" reason="deprecated"/>
+            <zoneAlias type="America/Rainy_River" replacement="America/Winnipeg" reason="deprecated"/>
+            <zoneAlias type="America/Santa_Isabel" replacement="America/Tijuana" reason="deprecated"/>
+            <zoneAlias type="America/Thunder_Bay" replacement="America/Toronto" reason="deprecated"/>
+            <zoneAlias type="America/Yellowknife" replacement="America/Edmonton" reason="deprecated"/>
+            <zoneAlias type="Australia/Currie" replacement="Australia/Hobart" reason="deprecated"/>
+            <zoneAlias type="Europe/Uzhgorod" replacement="Europe/Kiev" reason="deprecated"/>
+            <zoneAlias type="Europe/Zaporozhye" replacement="Europe/Kiev" reason="deprecated"/>
+            <zoneAlias type="Pacific/Johnston" replacement="Pacific/Honolulu" reason="deprecated"/>
         </alias>
 		<defaultContent locales="
 			aa_ET ab_GE af_ZA agq_CM ak_GH am_ET an_ES ann_NG apc_SY ar_001 arn_CL as_IN
diff --git a/make/data/cldr/common/supplemental/units.xml b/make/data/cldr/common/supplemental/units.xml
index 27a66a86164..33d6d68d466 100644
--- a/make/data/cldr/common/supplemental/units.xml
+++ b/make/data/cldr/common/supplemental/units.xml
@@ -15,6 +15,40 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<unitIdComponent type="and" values="and"/>
 		<unitIdComponent type="per" values="per"/>
     </unitIdComponents>
+    <unitPrefixes>
+		<unitPrefix type='quecto' symbol='q' power10='-30'/>
+		<unitPrefix type='ronto' symbol='r' power10='-27'/>
+		<unitPrefix type='yocto' symbol='y' power10='-24'/>
+		<unitPrefix type='zepto' symbol='z' power10='-21'/>
+		<unitPrefix type='atto' symbol='a' power10='-18'/>
+		<unitPrefix type='femto' symbol='f' power10='-15'/>
+		<unitPrefix type='pico' symbol='p' power10='-12'/>
+		<unitPrefix type='nano' symbol='n' power10='-9'/>
+		<unitPrefix type='micro' symbol='μ' power10='-6'/>
+		<unitPrefix type='milli' symbol='m' power10='-3'/>
+		<unitPrefix type='centi' symbol='c' power10='-2'/>
+		<unitPrefix type='deci' symbol='d' power10='-1'/>
+		<unitPrefix type='deka' symbol='da' power10='1'/>
+		<unitPrefix type='hecto' symbol='h' power10='2'/>
+		<unitPrefix type='kilo' symbol='k' power10='3'/>
+		<unitPrefix type='mega' symbol='M' power10='6'/>
+		<unitPrefix type='giga' symbol='G' power10='9'/>
+		<unitPrefix type='tera' symbol='T' power10='12'/>
+		<unitPrefix type='peta' symbol='P' power10='15'/>
+		<unitPrefix type='exa' symbol='E' power10='18'/>
+		<unitPrefix type='zetta' symbol='Z' power10='21'/>
+		<unitPrefix type='yotta' symbol='Y' power10='24'/>
+		<unitPrefix type='ronna' symbol='R' power10='27'/>
+		<unitPrefix type='quetta' symbol='Q' power10='30'/>
+		<unitPrefix type='kibi' symbol='Ki' power2='10'/>
+		<unitPrefix type='mebi' symbol='Mi' power2='20'/>
+		<unitPrefix type='gibi' symbol='Gi' power2='30'/>
+		<unitPrefix type='tebi' symbol='Ti' power2='40'/>
+		<unitPrefix type='pebi' symbol='Pi' power2='50'/>
+		<unitPrefix type='exbi' symbol='Ei' power2='60'/>
+		<unitPrefix type='zebi' symbol='Zi' power2='70'/>
+		<unitPrefix type='yobi' symbol='Yi' power2='80'/>
+	</unitPrefixes>
     <unitConstants>
         <unitConstant constant="lb_to_kg" value="0.45359237"/>
         <unitConstant constant="ft_to_m" value="0.3048"/>
@@ -308,6 +342,8 @@ For terms of use, see http://www.unicode.org/copyright.html
        
         <!-- speed -->
         <convertUnit source='knot' baseUnit='meter-per-second' factor='1852/3600' systems="ussystem uksystem si_acceptable"/>
+        <convertUnit source='beaufort' baseUnit='meter-per-second' special='beaufort' systems="metric_adjacent"/>
+
         
         <!-- magnetic-induction -->
         <convertUnit source='tesla' baseUnit='kilogram-per-square-second-ampere' systems='si metric prefixable'/>
diff --git a/make/data/cldr/common/supplemental/windowsZones.xml b/make/data/cldr/common/supplemental/windowsZones.xml
index b49266ef9e3..a81d0beb83c 100644
--- a/make/data/cldr/common/supplemental/windowsZones.xml
+++ b/make/data/cldr/common/supplemental/windowsZones.xml
@@ -30,7 +30,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Hawaiian Standard Time" territory="001" type="Pacific/Honolulu"/>
 			<mapZone other="Hawaiian Standard Time" territory="CK" type="Pacific/Rarotonga"/>
 			<mapZone other="Hawaiian Standard Time" territory="PF" type="Pacific/Tahiti"/>
-			<mapZone other="Hawaiian Standard Time" territory="UM" type="Pacific/Johnston"/>
 			<mapZone other="Hawaiian Standard Time" territory="US" type="Pacific/Honolulu"/>
 			<mapZone other="Hawaiian Standard Time" territory="ZZ" type="Etc/GMT+10"/>
 
@@ -49,7 +48,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC-08:00) Baja California -->
 			<mapZone other="Pacific Standard Time (Mexico)" territory="001" type="America/Tijuana"/>
-			<mapZone other="Pacific Standard Time (Mexico)" territory="MX" type="America/Tijuana America/Santa_Isabel"/>
+			<mapZone other="Pacific Standard Time (Mexico)" territory="MX" type="America/Tijuana"/>
 
 			<!-- (UTC-08:00) Coordinated Universal Time-08 -->
 			<mapZone other="UTC-08" territory="001" type="Etc/GMT+8"/>
@@ -75,7 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC-07:00) Mountain Time (US & Canada) -->
 			<mapZone other="Mountain Standard Time" territory="001" type="America/Denver"/>
-			<mapZone other="Mountain Standard Time" territory="CA" type="America/Edmonton America/Cambridge_Bay America/Inuvik America/Yellowknife"/>
+			<mapZone other="Mountain Standard Time" territory="CA" type="America/Edmonton America/Cambridge_Bay America/Inuvik"/>
 			<mapZone other="Mountain Standard Time" territory="MX" type="America/Ciudad_Juarez"/>
 			<mapZone other="Mountain Standard Time" territory="US" type="America/Denver America/Boise"/>
 			<mapZone other="Mountain Standard Time" territory="ZZ" type="MST7MDT"/>
@@ -97,7 +96,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC-06:00) Central Time (US & Canada) -->
 			<mapZone other="Central Standard Time" territory="001" type="America/Chicago"/>
-			<mapZone other="Central Standard Time" territory="CA" type="America/Winnipeg America/Rainy_River America/Rankin_Inlet America/Resolute"/>
+			<mapZone other="Central Standard Time" territory="CA" type="America/Winnipeg America/Rankin_Inlet America/Resolute"/>
 			<mapZone other="Central Standard Time" territory="MX" type="America/Matamoros America/Ojinaga"/>
 			<mapZone other="Central Standard Time" territory="US" type="America/Chicago America/Indiana/Knox America/Indiana/Tell_City America/Menominee America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem"/>
 			<mapZone other="Central Standard Time" territory="ZZ" type="CST6CDT"/>
@@ -133,7 +132,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<!-- (UTC-05:00) Eastern Time (US & Canada) -->
 			<mapZone other="Eastern Standard Time" territory="001" type="America/New_York"/>
 			<mapZone other="Eastern Standard Time" territory="BS" type="America/Nassau"/>
-			<mapZone other="Eastern Standard Time" territory="CA" type="America/Toronto America/Iqaluit America/Montreal America/Nipigon America/Pangnirtung America/Thunder_Bay"/>
+			<mapZone other="Eastern Standard Time" territory="CA" type="America/Toronto America/Iqaluit"/>
 			<mapZone other="Eastern Standard Time" territory="US" type="America/New_York America/Detroit America/Indiana/Petersburg America/Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticello America/Louisville"/>
 			<mapZone other="Eastern Standard Time" territory="ZZ" type="EST5EDT"/>
 
@@ -421,7 +420,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="FLE Standard Time" territory="FI" type="Europe/Helsinki"/>
 			<mapZone other="FLE Standard Time" territory="LT" type="Europe/Vilnius"/>
 			<mapZone other="FLE Standard Time" territory="LV" type="Europe/Riga"/>
-			<mapZone other="FLE Standard Time" territory="UA" type="Europe/Kiev Europe/Uzhgorod Europe/Zaporozhye"/>
+			<mapZone other="FLE Standard Time" territory="UA" type="Europe/Kiev"/>
 
 			<!-- (UTC+02:00) Jerusalem -->
 			<mapZone other="Israel Standard Time" territory="001" type="Asia/Jerusalem"/>
@@ -538,7 +537,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<!-- (UTC+05:00) Ashgabat, Tashkent -->
 			<mapZone other="West Asia Standard Time" territory="001" type="Asia/Tashkent"/>
 			<mapZone other="West Asia Standard Time" territory="AQ" type="Antarctica/Mawson"/>
-			<mapZone other="West Asia Standard Time" territory="KZ" type="Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau"/>
+			<!-- Microsoft may create a new zone dedicated for Almaty and Qostanay. -->
+			<mapZone other="West Asia Standard Time" territory="KZ" type="Asia/Oral Asia/Almaty Asia/Aqtau Asia/Aqtobe Asia/Atyrau Asia/Qostanay"/>
 			<mapZone other="West Asia Standard Time" territory="MV" type="Indian/Maldives"/>
 			<mapZone other="West Asia Standard Time" territory="TF" type="Indian/Kerguelen"/>
 			<mapZone other="West Asia Standard Time" territory="TJ" type="Asia/Dushanbe"/>
@@ -570,13 +570,12 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Nepal Standard Time" territory="001" type="Asia/Katmandu"/>
 			<mapZone other="Nepal Standard Time" territory="NP" type="Asia/Katmandu"/>
 
-			<!-- (UTC+06:00) Astana -->
-			<mapZone other="Central Asia Standard Time" territory="001" type="Asia/Almaty"/>
+			<!-- (UTC+06:00) Astana --> <!-- Microsoft probably keeps Central Asia Standard Time, but change Astana to something else. -->
+			<mapZone other="Central Asia Standard Time" territory="001" type="Asia/Bishkek"/>
 			<mapZone other="Central Asia Standard Time" territory="AQ" type="Antarctica/Vostok"/>
 			<mapZone other="Central Asia Standard Time" territory="CN" type="Asia/Urumqi"/>
 			<mapZone other="Central Asia Standard Time" territory="IO" type="Indian/Chagos"/>
 			<mapZone other="Central Asia Standard Time" territory="KG" type="Asia/Bishkek"/>
-			<mapZone other="Central Asia Standard Time" territory="KZ" type="Asia/Almaty Asia/Qostanay"/>
 			<mapZone other="Central Asia Standard Time" territory="ZZ" type="Etc/GMT-6"/>
 
 			<!-- (UTC+06:00) Dhaka -->
@@ -710,7 +709,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC+10:00) Hobart -->
 			<mapZone other="Tasmania Standard Time" territory="001" type="Australia/Hobart"/>
-			<mapZone other="Tasmania Standard Time" territory="AU" type="Australia/Hobart Australia/Currie Antarctica/Macquarie"/>
+			<mapZone other="Tasmania Standard Time" territory="AU" type="Australia/Hobart Antarctica/Macquarie"/>
 
 			<!-- (UTC+10:00) Vladivostok -->
 			<mapZone other="Vladivostok Standard Time" territory="001" type="Asia/Vladivostok"/>
diff --git a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
index 86aa580b619..2bf0c711cfe 100644
--- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
+++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
@@ -159,6 +159,8 @@ import java.util.Locale;
  *     <th scope="col">CLDR version</th></tr>
  * </thead>
  * <tbody>
+ * <tr><th scope="row" style="text-align:left">JDK 23</th>
+ *     <td>CLDR 45</td></tr>
  * <tr><th scope="row" style="text-align:left">JDK 22</th>
  *     <td>CLDR 44</td></tr>
  * <tr><th scope="row" style="text-align:left">JDK 21</th>
diff --git a/src/java.base/share/legal/cldr.md b/src/java.base/share/legal/cldr.md
index e0d8102fb7f..97331fcba9f 100644
--- a/src/java.base/share/legal/cldr.md
+++ b/src/java.base/share/legal/cldr.md
@@ -1,14 +1,15 @@
-## Unicode Common Local Data Repository (CLDR) v44
+## Unicode Common Local Data Repository (CLDR) v45
 
 ### CLDR License
 
 ```
 
+
 UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 2019-2023 Unicode, Inc.
+Copyright © 1991-2024 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
@@ -44,4 +45,56 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in these Data Files or Software without prior written
 authorization of the copyright holder.
 
+SPDX-License-Identifier: Unicode-3.0
+
+————————————
+
+Unicode® Copyright and Terms of Use
+For the general privacy policy governing access to this site, see the  Unicode Privacy Policy.
+
+Unicode Copyright
+Copyright © 1991-2024 Unicode, Inc. All rights reserved.
+Definitions
+Unicode Data Files ("DATA FILES") include all data files under the directories:
+https://www.unicode.org/Public/
+https://www.unicode.org/reports/
+https://www.unicode.org/ivd/data/
+
+Unicode Data Files do not include PDF online code charts under the directory:
+https://www.unicode.org/Public/
+
+Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard
+or any source code or compiled code under the directories:
+https://www.unicode.org/Public/PROGRAMS/
+https://www.unicode.org/Public/cldr/
+http://site.icu-project.org/download/
+Terms of Use
+Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein.
+Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein.
+Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License.
+Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page.
+The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart.
+All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.
+No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site.
+Modification is not permitted with respect to this document. All copies of this document must be verbatim.
+Restricted Rights Legend
+Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.
+Warranties and Disclaimers
+This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.
+If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.
+EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
+Waiver of Damages
+In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.
+Trademarks & Logos
+The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.
+The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.
+All third party trademarks referenced herein are the property of their respective owners.
+Miscellaneous
+Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.
+Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent.
+Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income.
+Severability.  If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.
+Entire Agreement. This Agreement constitutes the entire agreement between the parties.
+
+
 ```
diff --git a/src/jdk.localedata/share/legal/cldr.md b/src/jdk.localedata/share/legal/cldr.md
index e0d8102fb7f..97331fcba9f 100644
--- a/src/jdk.localedata/share/legal/cldr.md
+++ b/src/jdk.localedata/share/legal/cldr.md
@@ -1,14 +1,15 @@
-## Unicode Common Local Data Repository (CLDR) v44
+## Unicode Common Local Data Repository (CLDR) v45
 
 ### CLDR License
 
 ```
 
+
 UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 2019-2023 Unicode, Inc.
+Copyright © 1991-2024 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
@@ -44,4 +45,56 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in these Data Files or Software without prior written
 authorization of the copyright holder.
 
+SPDX-License-Identifier: Unicode-3.0
+
+————————————
+
+Unicode® Copyright and Terms of Use
+For the general privacy policy governing access to this site, see the  Unicode Privacy Policy.
+
+Unicode Copyright
+Copyright © 1991-2024 Unicode, Inc. All rights reserved.
+Definitions
+Unicode Data Files ("DATA FILES") include all data files under the directories:
+https://www.unicode.org/Public/
+https://www.unicode.org/reports/
+https://www.unicode.org/ivd/data/
+
+Unicode Data Files do not include PDF online code charts under the directory:
+https://www.unicode.org/Public/
+
+Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard
+or any source code or compiled code under the directories:
+https://www.unicode.org/Public/PROGRAMS/
+https://www.unicode.org/Public/cldr/
+http://site.icu-project.org/download/
+Terms of Use
+Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein.
+Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein.
+Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License.
+Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page.
+The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart.
+All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.
+No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site.
+Modification is not permitted with respect to this document. All copies of this document must be verbatim.
+Restricted Rights Legend
+Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.
+Warranties and Disclaimers
+This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.
+If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.
+EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
+Waiver of Damages
+In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.
+Trademarks & Logos
+The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.
+The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.
+All third party trademarks referenced herein are the property of their respective owners.
+Miscellaneous
+Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.
+Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent.
+Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income.
+Severability.  If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.
+Entire Agreement. This Agreement constitutes the entire agreement between the parties.
+
+
 ```
diff --git a/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java b/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java
index 723b6b62687..40da19adfe7 100644
--- a/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java
+++ b/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 8177552 8217721 8222756 8295372 8306116
+ * @bug 8177552 8217721 8222756 8295372 8306116 8319990
  * @summary Checks the functioning of compact number format
  * @modules jdk.localedata
  * @run testng/othervm TestCompactNumber
@@ -256,9 +256,9 @@ public class TestCompactNumber {
             // Boundary number
             {FORMAT_IT_SHORT, 1000, "1.000"},
             // Long path
-            {FORMAT_IT_SHORT, 3000000L, "3\u00a0Mio"},
+            {FORMAT_IT_SHORT, 3000000L, "3\u00a0Mln"},
             // Double path
-            {FORMAT_IT_SHORT, 3000000.0, "3\u00a0Mio"},
+            {FORMAT_IT_SHORT, 3000000.0, "3\u00a0Mln"},
             // BigInteger path
             {FORMAT_IT_SHORT, new BigInteger("12345678901234567890"),
                 "12345679\u00a0Bln"},
@@ -418,9 +418,9 @@ public class TestCompactNumber {
                 {FORMAT_JA_JP_SHORT, "12345679\u5146", 1.2345679E19, Double.class},
                 {FORMAT_JA_JP_SHORT, "-12345679\u5146", -1.2345679E19, Double.class},
                 {FORMAT_IT_SHORT, "-99", -99L, Long.class},
-                {FORMAT_IT_SHORT, "1\u00a0Mio", 1000000L, Long.class},
-                {FORMAT_IT_SHORT, "30\u00a0Mio", 30000000L, Long.class},
-                {FORMAT_IT_SHORT, "-30\u00a0Mio", -30000000L, Long.class},
+                {FORMAT_IT_SHORT, "1\u00a0Mln", 1000000L, Long.class},
+                {FORMAT_IT_SHORT, "30\u00a0Mln", 30000000L, Long.class},
+                {FORMAT_IT_SHORT, "-30\u00a0Mln", -30000000L, Long.class},
                 {FORMAT_IT_SHORT, "12345679\u00a0Bln", 1.2345679E19, Double.class},
                 {FORMAT_IT_SHORT, "-12345679\u00a0Bln", -1.2345679E19, Double.class},
                 {FORMAT_SW_LONG, "-0.0", -0.0, Double.class},
diff --git a/test/jdk/java/text/Format/CompactNumberFormat/TestParseBigDecimal.java b/test/jdk/java/text/Format/CompactNumberFormat/TestParseBigDecimal.java
index b4eaf67b976..dc88ce4de4a 100644
--- a/test/jdk/java/text/Format/CompactNumberFormat/TestParseBigDecimal.java
+++ b/test/jdk/java/text/Format/CompactNumberFormat/TestParseBigDecimal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 8177552 8306116
+ * @bug 8177552 8306116 8319990
  * @summary Checks CNF.parse() when parseBigDecimal is set to true
  * @modules jdk.localedata
  * @run testng/othervm TestParseBigDecimal
@@ -133,9 +133,9 @@ public class TestParseBigDecimal {
             {FORMAT_JA_JP_SHORT, "12345679\u5146", new BigDecimal("12345679000000000000")},
             {FORMAT_JA_JP_SHORT, "-12345679\u5146", new BigDecimal("-12345679000000000000")},
             {FORMAT_IT_SHORT, "-99", new BigDecimal("-99")},
-            {FORMAT_IT_SHORT, "1\u00a0Mio", new BigDecimal("1000000")},
-            {FORMAT_IT_SHORT, "30\u00a0Mio", new BigDecimal("30000000")},
-            {FORMAT_IT_SHORT, "-30\u00a0Mio", new BigDecimal("-30000000")},
+            {FORMAT_IT_SHORT, "1\u00a0Mln", new BigDecimal("1000000")},
+            {FORMAT_IT_SHORT, "30\u00a0Mln", new BigDecimal("30000000")},
+            {FORMAT_IT_SHORT, "-30\u00a0Mln", new BigDecimal("-30000000")},
             {FORMAT_IT_SHORT, "12345679\u00a0Bln", new BigDecimal("12345679000000000000")},
             {FORMAT_IT_SHORT, "-12345679\u00a0Bln", new BigDecimal("-12345679000000000000")},
             {FORMAT_SW_LONG, "-0.0", new BigDecimal("-0.0")},

From b3bcc49491b8f8ad337eb4c06201a5468e5c1159 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Thu, 25 Apr 2024 22:46:11 +0000
Subject: [PATCH 207/486] 8330181: Move PcDesc cache from nmethod header

Reviewed-by: dlong, jrose
---
 src/hotspot/os/posix/signals_posix.cpp      |   1 -
 src/hotspot/share/code/nmethod.cpp          | 111 ++++++++++++--------
 src/hotspot/share/code/nmethod.hpp          |  44 +++-----
 src/hotspot/share/runtime/sharedRuntime.cpp |   6 +-
 4 files changed, 84 insertions(+), 78 deletions(-)

diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 5172853ecd5..a9d3bb9284c 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -614,7 +614,6 @@ int JVM_HANDLE_XXX_SIGNAL(int sig, siginfo_t* info,
     if (NativeDeoptInstruction::is_deopt_at(pc)) {
       CodeBlob* cb = CodeCache::find_blob(pc);
       if (cb != nullptr && cb->is_nmethod()) {
-        MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, t);) // can call PcDescCache::add_pc_desc
         nmethod* nm = cb->as_nmethod();
         assert(nm->insts_contains_inclusive(pc), "");
         address deopt = nm->is_method_handle_return(pc) ?
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index ee57e11f932..7e4f6994ff1 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -208,7 +208,7 @@ struct native_nmethod_stats_struct {
 };
 
 struct pc_nmethod_stats_struct {
-  uint pc_desc_resets;   // number of resets (= number of caches)
+  uint pc_desc_init;     // number of initialization of cache (= number of caches)
   uint pc_desc_queries;  // queries to nmethod::find_pc_desc
   uint pc_desc_approx;   // number of those which have approximate true
   uint pc_desc_repeats;  // number of _pc_descs[0] hits
@@ -223,7 +223,7 @@ struct pc_nmethod_stats_struct {
                   (double)(pc_desc_tests + pc_desc_searches)
                   / pc_desc_queries);
     tty->print_cr("  caches=%d queries=%u/%u, hits=%u+%u, tests=%u+%u, adds=%u",
-                  pc_desc_resets,
+                  pc_desc_init,
                   pc_desc_queries, pc_desc_approx,
                   pc_desc_repeats, pc_desc_hits,
                   pc_desc_tests, pc_desc_searches, pc_desc_adds);
@@ -341,28 +341,24 @@ void ExceptionCache::set_next(ExceptionCache *ec) {
 // Helper used by both find_pc_desc methods.
 static inline bool match_desc(PcDesc* pc, int pc_offset, bool approximate) {
   NOT_PRODUCT(++pc_nmethod_stats.pc_desc_tests);
-  if (!approximate)
+  if (!approximate) {
     return pc->pc_offset() == pc_offset;
-  else
+  } else {
     return (pc-1)->pc_offset() < pc_offset && pc_offset <= pc->pc_offset();
+  }
 }
 
-void PcDescCache::reset_to(PcDesc* initial_pc_desc) {
-  if (initial_pc_desc == nullptr) {
-    _pc_descs[0] = nullptr; // native method; no PcDescs at all
-    return;
-  }
-  NOT_PRODUCT(++pc_nmethod_stats.pc_desc_resets);
-  // reset the cache by filling it with benign (non-null) values
-  assert(initial_pc_desc->pc_offset() < 0, "must be sentinel");
-  for (int i = 0; i < cache_size; i++)
+void PcDescCache::init_to(PcDesc* initial_pc_desc) {
+  NOT_PRODUCT(++pc_nmethod_stats.pc_desc_init);
+  // initialize the cache by filling it with benign (non-null) values
+  assert(initial_pc_desc != nullptr && initial_pc_desc->pc_offset() == PcDesc::lower_offset_limit,
+         "must start with a sentinel");
+  for (int i = 0; i < cache_size; i++) {
     _pc_descs[i] = initial_pc_desc;
+  }
 }
 
 PcDesc* PcDescCache::find_pc_desc(int pc_offset, bool approximate) {
-  NOT_PRODUCT(++pc_nmethod_stats.pc_desc_queries);
-  NOT_PRODUCT(if (approximate) ++pc_nmethod_stats.pc_desc_approx);
-
   // Note: one might think that caching the most recently
   // read value separately would be a win, but one would be
   // wrong.  When many threads are updating it, the cache
@@ -375,8 +371,10 @@ PcDesc* PcDescCache::find_pc_desc(int pc_offset, bool approximate) {
 
   // Step one:  Check the most recently added value.
   res = _pc_descs[0];
-  if (res == nullptr) return nullptr;  // native method; no PcDescs at all
-  if (match_desc(res, pc_offset, approximate)) {
+  assert(res != nullptr, "PcDesc cache should be initialized already");
+
+  // Approximate only here since PcDescContainer::find_pc_desc() checked for exact case.
+  if (approximate && match_desc(res, pc_offset, approximate)) {
     NOT_PRODUCT(++pc_nmethod_stats.pc_desc_repeats);
     return res;
   }
@@ -396,7 +394,6 @@ PcDesc* PcDescCache::find_pc_desc(int pc_offset, bool approximate) {
 }
 
 void PcDescCache::add_pc_desc(PcDesc* pc_desc) {
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, Thread::current());)
   NOT_PRODUCT(++pc_nmethod_stats.pc_desc_adds);
   // Update the LRU cache by shifting pc_desc forward.
   for (int i = 0; i < cache_size; i++)  {
@@ -1245,6 +1242,7 @@ nmethod::nmethod(
     init_defaults(code_buffer, offsets);
 
     _osr_entry_point         = nullptr;
+    _pc_desc_container       = nullptr;
     _entry_bci               = InvocationEntryBci;
     _compile_id              = compile_id;
     _comp_level              = CompLevel_none;
@@ -1279,8 +1277,6 @@ nmethod::nmethod(
 #endif
     assert((data_offset() + data_end_offset) <= nmethod_size, "wrong nmethod's size: %d < %d", nmethod_size, (data_offset() + data_end_offset));
 
-    _pc_desc_container.reset_to(nullptr);
-
     code_buffer->copy_code_and_locs_to(this);
     code_buffer->copy_values_to(this);
 
@@ -1445,14 +1441,16 @@ nmethod::nmethod(
 #endif
     assert((data_offset() + data_end_offset) <= nmethod_size, "wrong nmethod's size: %d < %d", nmethod_size, (data_offset() + data_end_offset));
 
-    // after _scopes_pcs_offset is set
-    _pc_desc_container.reset_to(scopes_pcs_begin());
-
+    // Copy code and relocation info
     code_buffer->copy_code_and_locs_to(this);
-    // Copy contents of ScopeDescRecorder to nmethod
+    // Copy oops and metadata
     code_buffer->copy_values_to(this);
-    debug_info->copy_to(this);
     dependencies->copy_to(this);
+    // Copy PcDesc and ScopeDesc data
+    debug_info->copy_to(this);
+
+    // Create cache after PcDesc data is copied - it will be used to initialize cache
+    _pc_desc_container = new PcDescContainer(scopes_pcs_begin());
 
 #if INCLUDE_JVMCI
     if (compiler->is_jvmci()) {
@@ -2044,7 +2042,9 @@ void nmethod::purge(bool unregister_nmethod) {
     delete ec;
     ec = next;
   }
-
+  if (_pc_desc_container != nullptr) {
+    delete _pc_desc_container;
+  }
   delete[] _compiled_ic_data;
 
   if (unregister_nmethod) {
@@ -2619,18 +2619,19 @@ void nmethod::copy_scopes_data(u_char* buffer, int size) {
 }
 
 #ifdef ASSERT
-static PcDesc* linear_search(const PcDescSearch& search, int pc_offset, bool approximate) {
-  PcDesc* lower = search.scopes_pcs_begin();
-  PcDesc* upper = search.scopes_pcs_end();
-  lower += 1; // exclude initial sentinel
+static PcDesc* linear_search(int pc_offset, bool approximate, PcDesc* lower, PcDesc* upper) {
   PcDesc* res = nullptr;
-  for (PcDesc* p = lower; p < upper; p++) {
+  assert(lower != nullptr && lower->pc_offset() == PcDesc::lower_offset_limit,
+         "must start with a sentinel");
+  // lower + 1 to exclude initial sentinel
+  for (PcDesc* p = lower + 1; p < upper; p++) {
     NOT_PRODUCT(--pc_nmethod_stats.pc_desc_tests);  // don't count this call to match_desc
     if (match_desc(p, pc_offset, approximate)) {
-      if (res == nullptr)
+      if (res == nullptr) {
         res = p;
-      else
+      } else {
         res = (PcDesc*) badAddress;
+      }
     }
   }
   return res;
@@ -2638,20 +2639,39 @@ static PcDesc* linear_search(const PcDescSearch& search, int pc_offset, bool app
 #endif
 
 
+#ifndef PRODUCT
+// Version of method to collect statistic
+PcDesc* PcDescContainer::find_pc_desc(address pc, bool approximate, address code_begin,
+                                      PcDesc* lower, PcDesc* upper) {
+  ++pc_nmethod_stats.pc_desc_queries;
+  if (approximate) ++pc_nmethod_stats.pc_desc_approx;
+
+  PcDesc* desc = _pc_desc_cache.last_pc_desc();
+  assert(desc != nullptr, "PcDesc cache should be initialized already");
+  if (desc->pc_offset() == (pc - code_begin)) {
+    // Cached value matched
+    ++pc_nmethod_stats.pc_desc_tests;
+    ++pc_nmethod_stats.pc_desc_repeats;
+    return desc;
+  }
+  return find_pc_desc_internal(pc, approximate, code_begin, lower, upper);
+}
+#endif
+
 // Finds a PcDesc with real-pc equal to "pc"
-PcDesc* PcDescContainer::find_pc_desc_internal(address pc, bool approximate, const PcDescSearch& search) {
-  address base_address = search.code_begin();
-  if ((pc < base_address) ||
-      (pc - base_address) >= (ptrdiff_t) PcDesc::upper_offset_limit) {
+PcDesc* PcDescContainer::find_pc_desc_internal(address pc, bool approximate, address code_begin,
+                                               PcDesc* lower_incl, PcDesc* upper_incl) {
+  if ((pc < code_begin) ||
+      (pc - code_begin) >= (ptrdiff_t) PcDesc::upper_offset_limit) {
     return nullptr;  // PC is wildly out of range
   }
-  int pc_offset = (int) (pc - base_address);
+  int pc_offset = (int) (pc - code_begin);
 
   // Check the PcDesc cache if it contains the desired PcDesc
   // (This as an almost 100% hit rate.)
   PcDesc* res = _pc_desc_cache.find_pc_desc(pc_offset, approximate);
   if (res != nullptr) {
-    assert(res == linear_search(search, pc_offset, approximate), "cache ok");
+    assert(res == linear_search(pc_offset, approximate, lower_incl, upper_incl), "cache ok");
     return res;
   }
 
@@ -2659,10 +2679,9 @@ PcDesc* PcDescContainer::find_pc_desc_internal(address pc, bool approximate, con
   // Find the last pc_offset less than the given offset.
   // The successor must be the required match, if there is a match at all.
   // (Use a fixed radix to avoid expensive affine pointer arithmetic.)
-  PcDesc* lower = search.scopes_pcs_begin();
-  PcDesc* upper = search.scopes_pcs_end();
-  upper -= 1; // exclude final sentinel
-  if (lower >= upper)  return nullptr;  // native method; no PcDescs at all
+  PcDesc* lower = lower_incl;     // this is initial sentiel
+  PcDesc* upper = upper_incl - 1; // exclude final sentinel
+  if (lower >= upper)  return nullptr;  // no PcDescs at all
 
 #define assert_LU_OK \
   /* invariant on lower..upper during the following search: */ \
@@ -2711,7 +2730,7 @@ PcDesc* PcDescContainer::find_pc_desc_internal(address pc, bool approximate, con
 #undef assert_LU_OK
 
   if (match_desc(upper, pc_offset, approximate)) {
-    assert(upper == linear_search(search, pc_offset, approximate), "search ok");
+    assert(upper == linear_search(pc_offset, approximate, lower_incl, upper_incl), "search mismatch");
     if (!Thread::current_in_asgct()) {
       // we don't want to modify the cache if we're in ASGCT
       // which is typically called in a signal handler
@@ -2719,7 +2738,7 @@ PcDesc* PcDescContainer::find_pc_desc_internal(address pc, bool approximate, con
     }
     return upper;
   } else {
-    assert(nullptr == linear_search(search, pc_offset, approximate), "search ok");
+    assert(nullptr == linear_search(pc_offset, approximate, lower_incl, upper_incl), "search mismatch");
     return nullptr;
   }
 }
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index b22edaec5ac..8ffb75eda34 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -101,45 +101,34 @@ class PcDescCache {
   volatile PcDescPtr _pc_descs[cache_size]; // last cache_size pc_descs found
  public:
   PcDescCache() { debug_only(_pc_descs[0] = nullptr); }
-  void    reset_to(PcDesc* initial_pc_desc);
+  void    init_to(PcDesc* initial_pc_desc);
   PcDesc* find_pc_desc(int pc_offset, bool approximate);
   void    add_pc_desc(PcDesc* pc_desc);
   PcDesc* last_pc_desc() { return _pc_descs[0]; }
 };
 
-class PcDescSearch {
-private:
-  address _code_begin;
-  PcDesc* _lower;
-  PcDesc* _upper;
-public:
-  PcDescSearch(address code, PcDesc* lower, PcDesc* upper) :
-    _code_begin(code), _lower(lower), _upper(upper)
-  {
-  }
-
-  address code_begin() const { return _code_begin; }
-  PcDesc* scopes_pcs_begin() const { return _lower; }
-  PcDesc* scopes_pcs_end() const { return _upper; }
-};
-
-class PcDescContainer {
+class PcDescContainer : public CHeapObj<mtCode> {
 private:
   PcDescCache _pc_desc_cache;
 public:
-  PcDescContainer() {}
+  PcDescContainer(PcDesc* initial_pc_desc) { _pc_desc_cache.init_to(initial_pc_desc); }
 
-  PcDesc* find_pc_desc_internal(address pc, bool approximate, const PcDescSearch& search);
-  void    reset_to(PcDesc* initial_pc_desc) { _pc_desc_cache.reset_to(initial_pc_desc); }
+  PcDesc* find_pc_desc_internal(address pc, bool approximate, address code_begin,
+                                PcDesc* lower, PcDesc* upper);
 
-  PcDesc* find_pc_desc(address pc, bool approximate, const PcDescSearch& search) {
-    address base_address = search.code_begin();
+  PcDesc* find_pc_desc(address pc, bool approximate, address code_begin, PcDesc* lower, PcDesc* upper)
+#ifdef PRODUCT
+  {
     PcDesc* desc = _pc_desc_cache.last_pc_desc();
-    if (desc != nullptr && desc->pc_offset() == pc - base_address) {
+    assert(desc != nullptr, "PcDesc cache should be initialized already");
+    if (desc->pc_offset() == (pc - code_begin)) {
+      // Cached value matched
       return desc;
     }
-    return find_pc_desc_internal(pc, approximate, search);
+    return find_pc_desc_internal(pc, approximate, code_begin, lower, upper);
   }
+#endif
+  ;
 };
 
 // nmethods (native methods) are the compiled code versions of Java methods.
@@ -206,7 +195,7 @@ class nmethod : public CodeBlob {
     };
   };
 
-  PcDescContainer _pc_desc_container;
+  PcDescContainer* _pc_desc_container;
   ExceptionCache* volatile _exception_cache;
 
   void* _gc_data;
@@ -359,7 +348,8 @@ class nmethod : public CodeBlob {
   void post_compiled_method_unload();
 
   PcDesc* find_pc_desc(address pc, bool approximate) {
-    return _pc_desc_container.find_pc_desc(pc, approximate, PcDescSearch(code_begin(), scopes_pcs_begin(), scopes_pcs_end()));
+    if (_pc_desc_container == nullptr) return nullptr; // native method
+    return _pc_desc_container->find_pc_desc(pc, approximate, code_begin(), scopes_pcs_begin(), scopes_pcs_end());
   }
 
   // STW two-phase nmethod root processing helpers.
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 802ef22ed62..0a7f5c54676 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -481,9 +481,6 @@ address SharedRuntime::raw_exception_handler_for_return_address(JavaThread* curr
     return StubRoutines::cont_returnBarrierExc();
   }
 
-  // write lock needed because we might update the pc desc cache via PcDescCache::add_pc_desc
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current));
-
   // The fastest case first
   CodeBlob* blob = CodeCache::find_blob(return_address);
   nmethod* nm = (blob != nullptr) ? blob->as_nmethod_or_null() : nullptr;
@@ -1752,7 +1749,8 @@ JRT_LEAF(void, SharedRuntime::fixup_callers_callsite(Method* method, address cal
     return;
   }
 
-  // write lock needed because we might update the pc desc cache via PcDescCache::add_pc_desc
+  // write lock needed because we might patch call site by set_to_clean()
+  // and is_unloading() can modify nmethod's state
   MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, JavaThread::current()));
 
   CodeBlob* cb = CodeCache::find_blob(caller_pc);

From ea06129851be7bd9876685f74e35392874154179 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Fri, 26 Apr 2024 07:02:45 +0000
Subject: [PATCH 208/486] 8322847: java.lang.classfile.BufWriter should specify
 @throws for its writeXXX methods

Reviewed-by: psandoz
---
 .../share/classes/java/lang/classfile/BufWriter.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/BufWriter.java b/src/java.base/share/classes/java/lang/classfile/BufWriter.java
index bab8ebda4b8..f178b6b2db0 100644
--- a/src/java.base/share/classes/java/lang/classfile/BufWriter.java
+++ b/src/java.base/share/classes/java/lang/classfile/BufWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -124,6 +124,7 @@ public sealed interface BufWriter
      * @param arr the byte array
      * @param start the offset within the byte array of the range
      * @param length the length of the range
+     * @throws IndexOutOfBoundsException if range is outside of the array bounds
      */
     void writeBytes(byte[] arr, int start, int length);
 
@@ -134,6 +135,7 @@ public sealed interface BufWriter
      * @param offset the offset at which to patch
      * @param size the size of the integer value being written, in bytes
      * @param value the integer value
+     * @throws IndexOutOfBoundsException if patched int is outside of bounds
      */
     void patchInt(int offset, int size, int value);
 
@@ -152,7 +154,7 @@ public sealed interface BufWriter
      * to the buffer
      *
      * @param entry the constant pool entry
-     * @throws NullPointerException if the entry is null
+     * @throws IllegalArgumentException if the entry has invalid index
      */
     void writeIndex(PoolEntry entry);
 
@@ -161,6 +163,7 @@ public sealed interface BufWriter
      * to the buffer, or zero if the entry is null
      *
      * @param entry the constant pool entry
+     * @throws IllegalArgumentException if the entry has invalid index
      */
     void writeIndexOrZero(PoolEntry entry);
 
@@ -180,6 +183,7 @@ public sealed interface BufWriter
      * entry in the list.
      *
      * @param list the list of entries
+     * @throws IllegalArgumentException if any entry has invalid index
      */
     void writeListIndices(List<? extends PoolEntry> list);
 
@@ -199,6 +203,7 @@ public sealed interface BufWriter
      * @param array the byte array
      * @param bufferOffset the offset into the array at which to write the
      *                     contents of the buffer
+     * @throws IndexOutOfBoundsException if copying outside of the array bounds
      */
     void copyTo(byte[] array, int bufferOffset);
 }

From a407dc9cbb48c4f66af51433067925605d3bc39d Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Fri, 26 Apr 2024 07:23:49 +0000
Subject: [PATCH 209/486] 8327512: JShell does not work correctly when a class
 named Object or Throwable is defined

Reviewed-by: asotona
---
 .../jdk/jshell/ExpressionToTypeInfo.java      |  7 ++-
 .../share/classes/jdk/jshell/KeyMap.java      |  4 ++
 .../share/classes/jdk/jshell/SnippetMaps.java | 11 +++-
 .../share/classes/jdk/jshell/TypePrinter.java |  3 +-
 .../share/classes/jdk/jshell/Wrap.java        |  6 +-
 .../langtools/jdk/jshell/JLCollisionTest.java | 59 +++++++++++++++++++
 6 files changed, 82 insertions(+), 8 deletions(-)
 create mode 100644 test/langtools/jdk/jshell/JLCollisionTest.java

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java b/src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java
index e9eaccea321..8bc339c6dab 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java
@@ -71,7 +71,8 @@ import jdk.jshell.TypePrinter.AnonymousTypeKind;
  */
 class ExpressionToTypeInfo {
 
-    private static final String OBJECT_TYPE_NAME = "Object";
+     //only used in erroneous/non-standard circumstances; OK to use a FQN:
+    private static final String OBJECT_TYPE_NAME = "java.lang.Object";
 
     final AnalyzeTask at;
     final CompilationUnitTree cu;
@@ -394,8 +395,8 @@ class ExpressionToTypeInfo {
                             break;
                         case NULL:
                             ei.isNonVoid = true;
-                            ei.typeName = OBJECT_TYPE_NAME;
-                            ei.accessibleTypeName = OBJECT_TYPE_NAME;
+                            ei.typeName = varTypeName(syms.objectType, false, AnonymousTypeKind.SUPER);
+                            ei.accessibleTypeName = ei.typeName;
                             break;
                         default: {
                             ei.isNonVoid = true;
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/KeyMap.java b/src/jdk.jshell/share/classes/jdk/jshell/KeyMap.java
index a2011a111bf..e350cf4a7d7 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/KeyMap.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/KeyMap.java
@@ -99,4 +99,8 @@ class KeyMap {
     Stream<ImportKey> importKeys() {
         return importMap.values().stream();
     }
+
+    Stream<TypeDeclKey> typeDeclKeys() {
+        return classMap.values().stream();
+    }
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java b/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
index c801e489e20..0bbf2a5dceb 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
@@ -158,6 +158,15 @@ final class SnippetMaps {
         if (mat.lookingAt()) {
             return full.substring(mat.end());
         }
+        String simpleName = full.substring(full.lastIndexOf(".") + 1);
+        Stream<String> declaredInSnippets = state.keyMap.typeDeclKeys()
+                .map(key -> (TypeDeclSnippet) getSnippet(key))
+                .map(decl -> decl.name());
+        if (declaredInSnippets.anyMatch(clazz -> simpleName.equals(clazz))) {
+            //simple name of full clashes with a name of a user-defined class,
+            //use the fully-qualified name:
+            return full;
+        }
         state.debug(DBG_DEP, "SM %s %s\n", full, pkg);
         List<String> klasses = importSnippets()
                                .filter(isi -> !isi.isStar)
@@ -165,7 +174,7 @@ final class SnippetMaps {
                                .toList();
         for (String k : klasses) {
             if (k.equals(full)) {
-                return full.substring(full.lastIndexOf(".")+1);
+                return simpleName;
             }
         }
         if (pkg.isEmpty()) {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/TypePrinter.java b/src/jdk.jshell/share/classes/jdk/jshell/TypePrinter.java
index 36d3e882f38..76f2e929e34 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/TypePrinter.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/TypePrinter.java
@@ -47,7 +47,8 @@ import java.util.stream.Collectors;
  */
 class TypePrinter extends Printer {
 
-    private static final String OBJECT = "Object";
+     //only used in erroneous/non-standard circumstances; OK to use a FQN:
+    private static final String OBJECT = "java.lang.Object";
 
     private final JavacMessages messages;
     private final Types types;
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java b/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java
index f9ae63b9cde..57ed543ce25 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java
@@ -113,9 +113,9 @@ abstract class Wrap implements GeneralWrap {
                     scratchName += "$";
                 }
                 Wrap waux = new CompoundWrap(
-                        "    private static <" + scratchName + "> " + scratchName +" ", DOIT_METHOD_NAME + "Aux", "() throws Throwable {\n",
+                        "    private static <" + scratchName + "> " + scratchName +" ", DOIT_METHOD_NAME + "Aux", "() throws java.lang.Throwable {\n",
                         wtype, brackets + " ", scratchName, "_ =\n        ", winit, semi(winit),
-                        "        @SuppressWarnings(\"unchecked\") ", scratchName, " ", scratchName, "__ = (", scratchName, ")", scratchName, "_;\n",
+                        "        @java.lang.SuppressWarnings(\"unchecked\") ", scratchName, " ", scratchName, "__ = (", scratchName, ")", scratchName, "_;\n",
                         "        return ", scratchName, "__;\n",
                         "}"
                 );
@@ -550,7 +550,7 @@ abstract class Wrap implements GeneralWrap {
     private static class DoitMethodWrap extends CompoundWrap {
 
         DoitMethodWrap(Wrap w) {
-            super("    public static Object " + DOIT_METHOD_NAME + "() throws Throwable {\n"
+            super("    public static java.lang.Object " + DOIT_METHOD_NAME + "() throws java.lang.Throwable {\n"
                     + "        ", w,
                     "    }\n");
         }
diff --git a/test/langtools/jdk/jshell/JLCollisionTest.java b/test/langtools/jdk/jshell/JLCollisionTest.java
new file mode 100644
index 00000000000..2859c1a49f7
--- /dev/null
+++ b/test/langtools/jdk/jshell/JLCollisionTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024, 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 8327512
+ * @summary Clashes between java.lang classes and custom-defined classes with
+ *          the same simple names
+ * @modules jdk.jshell/jdk.jshell
+ * @build KullaTesting
+ * @run testng JLCollisionTest
+ */
+
+import org.testng.annotations.Test;
+
+@Test
+public class JLCollisionTest extends KullaTesting {
+
+    public void testObject() {
+        assertEval("class Object {}");
+        assertEval("1");
+        assertEval("null");
+        assertEval("$2 = \"\"");
+    }
+
+    public void testThrowable() {
+        assertEval("class Throwable {}");
+        assertEval("1");
+        //var with an "enhanced" (non-denotable) type:
+        assertEval("var _ = new Object() {};");
+    }
+
+    public void testSuppressWarnings() {
+        assertEval("class SuppressWarnings {}");
+        //var with an "enhanced" (non-denotable) type:
+        assertEval("var _ = new Object() {};");
+    }
+
+}

From 006f090f98135e0d3b0450c455d545272cfe6a38 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 26 Apr 2024 07:50:51 +0000
Subject: [PATCH 210/486] 8331150: RISC-V: Fix "bad AD file" bug

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/riscv_v.ad | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 01a367a46ea..3069336ac11 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -73,6 +73,7 @@ source %{
           return false;
         }
         break;
+      case Op_LoadVectorGather:
       case Op_LoadVectorGatherMasked:
         if (is_subword_type(bt)) {
           return false;

From 377f2e538ae0fc94fc5483700a3ae70175017741 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 26 Apr 2024 08:12:09 +0000
Subject: [PATCH 211/486] 8329862: libjli GetApplicationHome cleanups and
 enhance jli tracing

Reviewed-by: clanger, stuefe
---
 src/java.base/unix/native/libjli/java_md.c    | 18 ++++-------
 src/java.base/windows/native/libjli/java_md.c | 30 ++++---------------
 2 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/src/java.base/unix/native/libjli/java_md.c b/src/java.base/unix/native/libjli/java_md.c
index 024cec571b7..d2c04d8c25d 100644
--- a/src/java.base/unix/native/libjli/java_md.c
+++ b/src/java.base/unix/native/libjli/java_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -495,6 +495,8 @@ GetJREPath(char *path, jint pathsize, jboolean speculative)
     char libjava[MAXPATHLEN];
     struct stat s;
 
+    JLI_TraceLauncher("Attempt to get JRE path from launcher executable path\n");
+
     if (GetApplicationHome(path, pathsize)) {
         /* Is JRE co-located with the application? */
         JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/" JAVA_DLL, path);
@@ -502,20 +504,10 @@ GetJREPath(char *path, jint pathsize, jboolean speculative)
             JLI_TraceLauncher("JRE path is %s\n", path);
             return JNI_TRUE;
         }
-        /* ensure storage for path + /jre + NULL */
-        if ((JLI_StrLen(path) + 4  + 1) > (size_t) pathsize) {
-            JLI_TraceLauncher("Insufficient space to store JRE path\n");
-            return JNI_FALSE;
-        }
-        /* Does the app ship a private JRE in <apphome>/jre directory? */
-        JLI_Snprintf(libjava, sizeof(libjava), "%s/jre/lib/" JAVA_DLL, path);
-        if (access(libjava, F_OK) == 0) {
-            JLI_StrCat(path, "/jre");
-            JLI_TraceLauncher("JRE path is %s\n", path);
-            return JNI_TRUE;
-        }
     }
 
+    JLI_TraceLauncher("Attempt to get JRE path from shared lib of the image\n");
+
     if (GetApplicationHomeFromDll(path, pathsize)) {
         JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/" JAVA_DLL, path);
         if (stat(libjava, &s) == 0) {
diff --git a/src/java.base/windows/native/libjli/java_md.c b/src/java.base/windows/native/libjli/java_md.c
index 39930a38535..6ff155bcb9b 100644
--- a/src/java.base/windows/native/libjli/java_md.c
+++ b/src/java.base/windows/native/libjli/java_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -49,10 +49,6 @@ static jboolean GetJVMPath(const char *jrepath, const char *jvmtype,
                            char *jvmpath, jint jvmpathsize);
 static jboolean GetJREPath(char *path, jint pathsize);
 
-#ifdef USE_REGISTRY_LOOKUP
-jboolean GetPublicJREHome(char *buf, jint bufsize);
-#endif
-
 /* We supports warmup for UI stack that is performed in parallel
  * to VM initialization.
  * This helps to improve startup of UI application as warmup phase
@@ -300,6 +296,8 @@ GetJREPath(char *path, jint pathsize)
     char javadll[MAXPATHLEN];
     struct stat s;
 
+    JLI_TraceLauncher("Attempt to get JRE path from launcher executable path\n");
+
     if (GetApplicationHome(path, pathsize)) {
         /* Is JRE co-located with the application? */
         JLI_Snprintf(javadll, sizeof(javadll), "%s\\bin\\" JAVA_DLL, path);
@@ -307,20 +305,10 @@ GetJREPath(char *path, jint pathsize)
             JLI_TraceLauncher("JRE path is %s\n", path);
             return JNI_TRUE;
         }
-        /* ensure storage for path + \jre + NULL */
-        if ((JLI_StrLen(path) + 4 + 1) > (size_t) pathsize) {
-            JLI_TraceLauncher("Insufficient space to store JRE path\n");
-            return JNI_FALSE;
-        }
-        /* Does this app ship a private JRE in <apphome>\jre directory? */
-        JLI_Snprintf(javadll, sizeof (javadll), "%s\\jre\\bin\\" JAVA_DLL, path);
-        if (stat(javadll, &s) == 0) {
-            JLI_StrCat(path, "\\jre");
-            JLI_TraceLauncher("JRE path is %s\n", path);
-            return JNI_TRUE;
-        }
     }
 
+    JLI_TraceLauncher("Attempt to get JRE path from shared lib of the image\n");
+
     /* Try getting path to JRE from path to JLI.DLL */
     if (GetApplicationHomeFromDll(path, pathsize)) {
         JLI_Snprintf(javadll, sizeof(javadll), "%s\\bin\\" JAVA_DLL, path);
@@ -330,14 +318,6 @@ GetJREPath(char *path, jint pathsize)
         }
     }
 
-#ifdef USE_REGISTRY_LOOKUP
-    /* Lookup public JRE using Windows registry. */
-    if (GetPublicJREHome(path, pathsize)) {
-        JLI_TraceLauncher("JRE path is %s\n", path);
-        return JNI_TRUE;
-    }
-#endif
-
     JLI_ReportErrorMessage(JRE_ERROR8 JAVA_DLL);
     return JNI_FALSE;
 }

From ffd850f17efc88dddfeab629f829a03ad22dc49d Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Fri, 26 Apr 2024 08:26:22 +0000
Subject: [PATCH 212/486] 8309881: Qualified name of a type element depends on
 its origin (source vs class)

Reviewed-by: darcy, jlahoda
---
 .../com/sun/tools/javac/code/Type.java        |  1 +
 test/langtools/tools/javac/TypeToString.java  | 74 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 test/langtools/tools/javac/TypeToString.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
index 5acb4c384eb..702b51d3b96 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
@@ -1120,6 +1120,7 @@ public abstract class Type extends AnnoConstruct implements TypeMirror, PoolCons
                         s += String.valueOf(sym.hashCode());
                     return s;
                 } else if (longform) {
+                    sym.apiComplete();
                     return sym.getQualifiedName().toString();
                 } else {
                     return sym.name.toString();
diff --git a/test/langtools/tools/javac/TypeToString.java b/test/langtools/tools/javac/TypeToString.java
new file mode 100644
index 00000000000..422eb7e2314
--- /dev/null
+++ b/test/langtools/tools/javac/TypeToString.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024, 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 8309881
+ * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
+ * @build JavacTestingAbstractProcessor TypeToString
+ * @compile -cp . -processor TypeToString -proc:only TypeToString.java
+ * @compile/process -cp . -processor TypeToString -proc:only Test
+ */
+import java.lang.Runtime.Version;
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.util.*;
+
+@SupportedAnnotationTypes("*")
+public class TypeToString extends JavacTestingAbstractProcessor {
+
+    public boolean process(Set<? extends TypeElement> typeElementSet,RoundEnvironment renv) {
+        if (renv.processingOver()) {
+            TypeElement testClass = processingEnv.getElementUtils().getTypeElement("Test");
+            ExecutableElement method = ElementFilter.methodsIn(testClass.getEnclosedElements())
+                                                    .iterator()
+                                                    .next();
+            String expectedTypeToString = "java.lang.Runtime.Version";
+            String actualToString = method.getReturnType().toString();
+
+            if (!Objects.equals(expectedTypeToString, actualToString)) {
+                throw new AssertionError("Unexpected toString value. " +
+                                         "Expected: " + expectedTypeToString + ", " +
+                                         "but got: " + actualToString);
+            }
+
+            actualToString = method.getParameters().get(0).asType().toString();
+
+            if (!Objects.equals(expectedTypeToString, actualToString)) {
+                throw new AssertionError("Unexpected toString value. " +
+                                         "Expected: " + expectedTypeToString + ", " +
+                                         "but got: " + actualToString);
+            }
+        }
+        return false;
+    }
+}
+
+class Test {
+    public Version get(Version v) {
+        return null;
+    }
+}

From cfd19f017681a7aded67937c5132263bbcc7be6f Mon Sep 17 00:00:00 2001
From: Joachim Kern <jkern@openjdk.org>
Date: Fri, 26 Apr 2024 09:26:18 +0000
Subject: [PATCH 213/486] 8329850: [AIX] Allow loading of different members of
 same shared library archive

Reviewed-by: mdoerr, mbaesken, stuefe
---
 src/hotspot/os/aix/porting_aix.cpp | 31 +++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/os/aix/porting_aix.cpp b/src/hotspot/os/aix/porting_aix.cpp
index c06d4ad9a7f..ac0cc8d53d8 100644
--- a/src/hotspot/os/aix/porting_aix.cpp
+++ b/src/hotspot/os/aix/porting_aix.cpp
@@ -906,10 +906,11 @@ struct TableLocker {
   ~TableLocker() { pthread_mutex_unlock(&g_handletable_mutex); }
 };
 struct handletableentry{
-    void*   handle;
-    ino64_t inode;
-    dev64_t devid;
-    uint    refcount;
+    void*         handle;
+    ino64_t       inode;
+    dev64_t       devid;
+    char*         member;
+    uint          refcount;
 };
 constexpr unsigned init_num_handles = 128;
 static unsigned max_handletable = 0;
@@ -1049,6 +1050,14 @@ void* Aix_dlopen(const char* filename, int Flags, const char** error_report) {
     return nullptr;
   }
   else {
+    // extract member string if exist duplicate it and store pointer of it
+    // if member does not exist store nullptr
+    char* member = nullptr;
+    const char* substr;
+    if (filename[strlen(filename) - 1] == ')' && (substr = strrchr(filename, '('))) {
+      member = os::strdup(substr);
+    }
+
     unsigned i = 0;
     TableLocker lock;
     // check if library belonging to filename is already loaded.
@@ -1056,7 +1065,10 @@ void* Aix_dlopen(const char* filename, int Flags, const char** error_report) {
     for (i = 0; i < g_handletable_used; i++) {
       if ((p_handletable + i)->handle &&
           (p_handletable + i)->inode == libstat.st_ino &&
-          (p_handletable + i)->devid == libstat.st_dev) {
+          (p_handletable + i)->devid == libstat.st_dev &&
+          (((p_handletable + i)->member == nullptr && member == nullptr) ||
+           ((p_handletable + i)->member != nullptr && member != nullptr &&
+           strcmp((p_handletable + i)->member, member) == 0))) {
         (p_handletable + i)->refcount++;
         result = (p_handletable + i)->handle;
         break;
@@ -1084,6 +1096,7 @@ void* Aix_dlopen(const char* filename, int Flags, const char** error_report) {
         (p_handletable + i)->handle = result;
         (p_handletable + i)->inode = libstat.st_ino;
         (p_handletable + i)->devid = libstat.st_dev;
+        (p_handletable + i)->member = member;
         (p_handletable + i)->refcount = 1;
       }
       else {
@@ -1131,7 +1144,7 @@ bool os::pd_dll_unload(void* libhandle, char* ebuf, int ebuflen) {
     // while in the second case we simply have to nag.
     res = (0 == ::dlclose(libhandle));
     if (!res) {
-      // error analysis when dlopen fails
+      // error analysis when dlclose fails
       const char* error_report = ::dlerror();
       if (error_report == nullptr) {
         error_report = "dlerror returned no error description";
@@ -1145,7 +1158,11 @@ bool os::pd_dll_unload(void* libhandle, char* ebuf, int ebuflen) {
     if (i < g_handletable_used) {
       if (res) {
         // First case: libhandle was found (with refcount == 0) and ::dlclose successful,
-        // so delete entry from array
+        // so delete entry from array (do not forget to free member-string space if member exists)
+        if ((p_handletable + i)->member) {
+          os::free((p_handletable + i)->member);
+          (p_handletable + i)->member = nullptr;
+        }
         g_handletable_used--;
         // If the entry was the last one of the array, the previous g_handletable_used--
         // is sufficient to remove the entry from the array, otherwise we move the last

From e4ed7ced75c53cf5ff40c5dae4830b1ee2589802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Fri, 26 Apr 2024 11:01:46 +0000
Subject: [PATCH 214/486] 8331063: Some HttpClient tests don't report leaks

Reviewed-by: dfuchs, vtewari, michaelm
---
 .../net/httpclient/ForbiddenHeadTest.java     | 30 +++++++++++--------
 .../net/httpclient/ProxySelectorTest.java     | 23 +++++++-------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/test/jdk/java/net/httpclient/ForbiddenHeadTest.java b/test/jdk/java/net/httpclient/ForbiddenHeadTest.java
index 0c39b44d7f5..4b651eb4813 100644
--- a/test/jdk/java/net/httpclient/ForbiddenHeadTest.java
+++ b/test/jdk/java/net/httpclient/ForbiddenHeadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -205,18 +205,18 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
     @DataProvider(name = "all")
     public Object[][] allcases() {
         List<Object[]> result = new ArrayList<>();
-        for (var client : List.of(authClient, noAuthClient)) {
+        for (boolean useAuth : List.of(true, false)) {
             for (boolean async : List.of(true, false)) {
                 for (int code : List.of(UNAUTHORIZED, PROXY_UNAUTHORIZED)) {
                     var srv = code == PROXY_UNAUTHORIZED ? "/proxy" : "/server";
                     for (var auth : List.of("/auth", "/noauth")) {
                         var pcode = code;
                         if (auth.equals("/noauth")) {
-                            if (client == authClient) continue;
+                            if (useAuth) continue;
                             pcode = FORBIDDEN;
                         }
                         for (var uri : List.of(httpURI, httpsURI, http2URI, https2URI)) {
-                            result.add(new Object[]{uri + srv + auth, pcode, async, client});
+                            result.add(new Object[]{uri + srv + auth, pcode, async, useAuth});
                         }
                     }
                 }
@@ -237,12 +237,13 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
     static final AtomicLong sleepCount = new AtomicLong();
 
     @Test(dataProvider = "all")
-    void test(String uriString, int code, boolean async, HttpClient client) throws Throwable {
+    void test(String uriString, int code, boolean async, boolean useAuth) throws Throwable {
         checkSkip();
+        HttpClient client = useAuth ? authClient : noAuthClient;
         var name = String.format("test(%s, %d, %s, %s)", uriString, code, async ? "async" : "sync",
                 client.authenticator().isPresent() ? "authClient" : "noAuthClient");
         out.printf("%n---- starting %s ----%n", name);
-        assert client.authenticator().isPresent() ? client == authClient : client == noAuthClient;
+        assert client.authenticator().isPresent() == useAuth;
         uriString = uriString + "/ForbiddenTest";
         for (int i=0; i<ITERATIONS; i++) {
             if (ITERATIONS > 1) out.printf("---- ITERATION %d%n",i);
@@ -381,13 +382,16 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
         authClient = noAuthClient = null;
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(500);
-
-        proxy.stop();
-        authproxy.stop();
-        httpTestServer.stop();
-        httpsTestServer.stop();
-        http2TestServer.stop();
-        https2TestServer.stop();
+        try {
+            proxy.stop();
+            authproxy.stop();
+            httpTestServer.stop();
+            httpsTestServer.stop();
+            http2TestServer.stop();
+            https2TestServer.stop();
+        } finally {
+            if (fail != null) throw fail;
+        }
     }
 
     static class TestProxySelector extends ProxySelector {
diff --git a/test/jdk/java/net/httpclient/ProxySelectorTest.java b/test/jdk/java/net/httpclient/ProxySelectorTest.java
index bb3ddc84017..fd8f85fa6d7 100644
--- a/test/jdk/java/net/httpclient/ProxySelectorTest.java
+++ b/test/jdk/java/net/httpclient/ProxySelectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -377,15 +377,18 @@ public class ProxySelectorTest implements HttpServerAdapters {
         client = null;
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(500);
-
-        proxy.stop();
-        authproxy.stop();
-        httpTestServer.stop();
-        proxyHttpTestServer.stop();
-        authProxyHttpTestServer.stop();
-        httpsTestServer.stop();
-        http2TestServer.stop();
-        https2TestServer.stop();
+        try {
+            proxy.stop();
+            authproxy.stop();
+            httpTestServer.stop();
+            proxyHttpTestServer.stop();
+            authProxyHttpTestServer.stop();
+            httpsTestServer.stop();
+            http2TestServer.stop();
+            https2TestServer.stop();
+        } finally {
+            if (fail != null) throw fail;
+        }
     }
 
     class TestProxySelector extends ProxySelector {

From 2b7176a55ad0e5c6ba34abba3fe8fc1a411a5e2d Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Fri, 26 Apr 2024 12:06:57 +0000
Subject: [PATCH 215/486] 8330625: Compilation memory statistic: prevent
 tearing of the final report

Reviewed-by: kvn, thartmann
---
 .../compiler/compilationMemoryStatistic.cpp   | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 6bc3f39b939..2cf8efa23c3 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -404,14 +404,6 @@ void CompilationMemoryStatistic::on_end_compilation() {
   assert(directive->should_collect_memstat(), "Only call if memstat is enabled");
   const bool print = directive->should_print_memstat();
 
-  if (print) {
-    char buf[1024];
-    fmn.as_C_string(buf, sizeof(buf));
-    tty->print("%s Arena usage %s: ", compilertype2name(ct), buf);
-    arena_stat->print_on(tty);
-    tty->cr();
-  }
-
   // Store result
   // For this to work, we must call on_end_compilation() at a point where
   // Compile|Compilation already handed over the failure string to ciEnv,
@@ -436,6 +428,13 @@ void CompilationMemoryStatistic::on_end_compilation() {
                     arena_stat->live_nodes_at_peak(),
                     result);
   }
+  if (print) {
+    char buf[1024];
+    fmn.as_C_string(buf, sizeof(buf));
+    tty->print("%s Arena usage %s: ", compilertype2name(ct), buf);
+    arena_stat->print_on(tty);
+    tty->cr();
+  }
 
   arena_stat->end(); // reset things
 }
@@ -539,6 +538,10 @@ static inline ssize_t diff_entries_by_size(const MemStatEntry* e1, const MemStat
 }
 
 void CompilationMemoryStatistic::print_all_by_size(outputStream* st, bool human_readable, size_t min_size) {
+
+  MutexLocker ml(NMTCompilationCostHistory_lock, Mutex::_no_safepoint_check_flag);
+
+  st->cr();
   st->print_cr("Compilation memory statistics");
 
   if (!enabled()) {
@@ -559,29 +562,27 @@ void CompilationMemoryStatistic::print_all_by_size(outputStream* st, bool human_
   MemStatEntry::print_header(st);
 
   MemStatEntry** filtered = nullptr;
-  {
-    MutexLocker ml(NMTCompilationCostHistory_lock, Mutex::_no_safepoint_check_flag);
 
-    if (_the_table != nullptr) {
-      // We sort with quicksort
-      int num = 0;
-      filtered = _the_table->calc_flat_array(num, min_size);
-      if (min_size > 0) {
-        st->print_cr("(%d/%d)", num, _the_table->number_of_entries());
-      }
-      if (num > 0) {
-        QuickSort::sort(filtered, num, diff_entries_by_size, false);
-        // Now print. Has to happen under lock protection too, since entries may be changed.
-        for (int i = 0; i < num; i ++) {
-          filtered[i]->print_on(st, human_readable);
-        }
-      } else {
-        st->print_cr("No entries.");
+  if (_the_table != nullptr) {
+    // We sort with quicksort
+    int num = 0;
+    filtered = _the_table->calc_flat_array(num, min_size);
+    if (min_size > 0) {
+      st->print_cr("(%d/%d)", num, _the_table->number_of_entries());
+    }
+    if (num > 0) {
+      QuickSort::sort(filtered, num, diff_entries_by_size, false);
+      // Now print. Has to happen under lock protection too, since entries may be changed.
+      for (int i = 0; i < num; i ++) {
+        filtered[i]->print_on(st, human_readable);
       }
     } else {
-      st->print_cr("Not initialized.");
+      st->print_cr("No entries.");
     }
-  } // locked
+  } else {
+    st->print_cr("Not initialized.");
+  }
+  st->cr();
 
   FREE_C_HEAP_ARRAY(Entry, filtered);
 }

From 5e2ced4b9e1c9953e459dc152076520e5ef9d76c Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Fri, 26 Apr 2024 12:36:55 +0000
Subject: [PATCH 216/486] 8327247: C2 uses up to 2GB of RAM to compile complex
 string concat in extreme cases

Reviewed-by: mchung, shade
---
 .../java/lang/invoke/StringConcatFactory.java | 262 +++++++++++++++++-
 .../openjdk/bench/java/lang/StringConcat.java |  43 +++
 2 files changed, 297 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index b918b756332..67e22c384ac 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,20 @@ package java.lang.invoke;
 
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
-import jdk.internal.javac.PreviewFeature;
+import jdk.internal.misc.VM;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.util.ClassFileDumper;
 import jdk.internal.vm.annotation.Stable;
 import sun.invoke.util.Wrapper;
 
 import java.lang.invoke.MethodHandles.Lookup;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
+import static java.lang.invoke.MethodHandles.Lookup.ClassOption.STRONG;
 import static java.lang.invoke.MethodType.methodType;
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
 
 /**
  * <p>Methods to facilitate the creation of String concatenation methods, that
@@ -98,6 +101,13 @@ import static java.lang.invoke.MethodType.methodType;
  */
 public final class StringConcatFactory {
 
+    private static final int HIGH_ARITY_THRESHOLD;
+
+    static {
+        String highArity = VM.getSavedProperty("java.lang.invoke.StringConcat.highArityThreshold");
+        HIGH_ARITY_THRESHOLD = highArity != null ? Integer.parseInt(highArity) : 20;
+    }
+
     /**
      * Tag used to demarcate an ordinary argument.
      */
@@ -354,9 +364,14 @@ public final class StringConcatFactory {
         }
 
         try {
-            return new ConstantCallSite(
-                    generateMHInlineCopy(concatType, constantStrings)
-                            .viewAsType(concatType, true));
+            if (concatType.parameterCount() < HIGH_ARITY_THRESHOLD) {
+                return new ConstantCallSite(
+                        generateMHInlineCopy(concatType, constantStrings)
+                                .viewAsType(concatType, true));
+            } else {
+                return new ConstantCallSite(
+                        SimpleStringBuilderStrategy.generate(lookup, concatType, constantStrings));
+            }
         } catch (Error e) {
             // Pass through any error
             throw e;
@@ -1032,4 +1047,235 @@ public final class StringConcatFactory {
         // no instantiation
     }
 
+    /**
+     * Bytecode StringBuilder strategy.
+     *
+     * <p>This strategy emits StringBuilder chains as similar as possible
+     * to what javac would. No exact sizing of parameters or estimates.
+     */
+    private static final class SimpleStringBuilderStrategy {
+        static final int CLASSFILE_VERSION = 52; // JDK 8
+        static final String METHOD_NAME = "concat";
+        // ClassFileDumper replaced java.lang.invoke.ProxyClassDumper in JDK 21
+        // -- see JDK-8304846
+        static final ClassFileDumper DUMPER =
+                ClassFileDumper.getInstance("java.lang.invoke.StringConcatFactory.dump", "stringConcatClasses");
+
+        /**
+         * Ensure a capacity in the initial StringBuilder to accommodate all
+         * constants plus this factor times the number of arguments.
+         */
+        static final int ARGUMENT_SIZE_FACTOR = 4;
+
+        static final Set<Lookup.ClassOption> SET_OF_STRONG = Set.of(STRONG);
+
+        private SimpleStringBuilderStrategy() {
+            // no instantiation
+        }
+
+        private static MethodHandle generate(Lookup lookup, MethodType args, String[] constants) throws Exception {
+            String className = getClassName(lookup.lookupClass());
+            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS + ClassWriter.COMPUTE_FRAMES);
+
+            cw.visit(CLASSFILE_VERSION,
+                    ACC_SUPER + ACC_PUBLIC + ACC_FINAL + ACC_SYNTHETIC,
+                    className,
+                    null,
+                    "java/lang/Object",
+                    null
+            );
+
+            MethodVisitor mv = cw.visitMethod(
+                    ACC_PUBLIC + ACC_STATIC + ACC_FINAL,
+                    METHOD_NAME,
+                    args.toMethodDescriptorString(),
+                    null,
+                    null);
+
+            mv.visitCode();
+
+
+            // Prepare StringBuilder instance
+            mv.visitTypeInsn(NEW, "java/lang/StringBuilder");
+            mv.visitInsn(DUP);
+
+            int len = 0;
+            for (String constant : constants) {
+                if (constant != null) {
+                    len += constant.length();
+                }
+            }
+            len += args.parameterCount() * ARGUMENT_SIZE_FACTOR;
+            iconst(mv, len);
+            mv.visitMethodInsn(
+                    INVOKESPECIAL,
+                    "java/lang/StringBuilder",
+                    "<init>",
+                    "(I)V",
+                    false
+            );
+
+            // At this point, we have a blank StringBuilder on stack, fill it in with .append calls.
+            {
+                int off = 0;
+                for (int c = 0; c < args.parameterCount(); c++) {
+                    if (constants[c] != null) {
+                        mv.visitLdcInsn(constants[c]);
+                        sbAppend(mv, "(Ljava/lang/String;)Ljava/lang/StringBuilder;");
+                    }
+                    Class<?> cl = args.parameterType(c);
+                    mv.visitVarInsn(getLoadOpcode(cl), off);
+                    off += getParameterSize(cl);
+                    String desc = getSBAppendDesc(cl);
+                    sbAppend(mv, desc);
+                }
+                if (constants[constants.length - 1] != null) {
+                    mv.visitLdcInsn(constants[constants.length - 1]);
+                    sbAppend(mv, "(Ljava/lang/String;)Ljava/lang/StringBuilder;");
+                }
+            }
+
+            mv.visitMethodInsn(
+                    INVOKEVIRTUAL,
+                    "java/lang/StringBuilder",
+                    "toString",
+                    "()Ljava/lang/String;",
+                    false
+            );
+
+            mv.visitInsn(ARETURN);
+
+            mv.visitMaxs(-1, -1);
+            mv.visitEnd();
+            cw.visitEnd();
+
+            byte[] classBytes = cw.toByteArray();
+            try {
+                Lookup hiddenLookup = lookup.makeHiddenClassDefiner(className, classBytes, SET_OF_STRONG, DUMPER)
+                                            .defineClassAsLookup(true);
+                Class<?> innerClass = hiddenLookup.lookupClass();
+                return hiddenLookup.findStatic(innerClass, METHOD_NAME, args);
+            } catch (Exception e) {
+                throw new StringConcatException("Exception while spinning the class", e);
+            }
+        }
+
+        private static void sbAppend(MethodVisitor mv, String desc) {
+            mv.visitMethodInsn(
+                    INVOKEVIRTUAL,
+                    "java/lang/StringBuilder",
+                    "append",
+                    desc,
+                    false
+            );
+        }
+
+        /**
+         * The generated class is in the same package as the host class as
+         * it's the implementation of the string concatenation for the host
+         * class.
+         */
+        private static String getClassName(Class<?> hostClass) {
+            String name = hostClass.isHidden() ? hostClass.getName().replace('/', '_')
+                    : hostClass.getName();
+            return name.replace('.', '/') + "$$StringConcat";
+        }
+
+        private static String getSBAppendDesc(Class<?> cl) {
+            if (cl.isPrimitive()) {
+                if (cl == Integer.TYPE || cl == Byte.TYPE || cl == Short.TYPE) {
+                    return "(I)Ljava/lang/StringBuilder;";
+                } else if (cl == Boolean.TYPE) {
+                    return "(Z)Ljava/lang/StringBuilder;";
+                } else if (cl == Character.TYPE) {
+                    return "(C)Ljava/lang/StringBuilder;";
+                } else if (cl == Double.TYPE) {
+                    return "(D)Ljava/lang/StringBuilder;";
+                } else if (cl == Float.TYPE) {
+                    return "(F)Ljava/lang/StringBuilder;";
+                } else if (cl == Long.TYPE) {
+                    return "(J)Ljava/lang/StringBuilder;";
+                } else {
+                    throw new IllegalStateException("Unhandled primitive StringBuilder.append: " + cl);
+                }
+            } else if (cl == String.class) {
+                return "(Ljava/lang/String;)Ljava/lang/StringBuilder;";
+            } else {
+                return "(Ljava/lang/Object;)Ljava/lang/StringBuilder;";
+            }
+        }
+
+        private static String getStringValueOfDesc(Class<?> cl) {
+            if (cl.isPrimitive()) {
+                if (cl == Integer.TYPE || cl == Byte.TYPE || cl == Short.TYPE) {
+                    return "(I)Ljava/lang/String;";
+                } else if (cl == Boolean.TYPE) {
+                    return "(Z)Ljava/lang/String;";
+                } else if (cl == Character.TYPE) {
+                    return "(C)Ljava/lang/String;";
+                } else if (cl == Double.TYPE) {
+                    return "(D)Ljava/lang/String;";
+                } else if (cl == Float.TYPE) {
+                    return "(F)Ljava/lang/String;";
+                } else if (cl == Long.TYPE) {
+                    return "(J)Ljava/lang/String;";
+                } else {
+                    throw new IllegalStateException("Unhandled String.valueOf: " + cl);
+                }
+            } else if (cl == String.class) {
+                return "(Ljava/lang/String;)Ljava/lang/String;";
+            } else {
+                return "(Ljava/lang/Object;)Ljava/lang/String;";
+            }
+        }
+
+        /**
+         * The following method is copied from
+         * org.objectweb.asm.commons.InstructionAdapter. Part of ASM: a very small
+         * and fast Java bytecode manipulation framework.
+         * Copyright (c) 2000-2005 INRIA, France Telecom All rights reserved.
+         */
+        private static void iconst(MethodVisitor mv, final int cst) {
+            if (cst >= -1 && cst <= 5) {
+                mv.visitInsn(ICONST_0 + cst);
+            } else if (cst >= Byte.MIN_VALUE && cst <= Byte.MAX_VALUE) {
+                mv.visitIntInsn(BIPUSH, cst);
+            } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) {
+                mv.visitIntInsn(SIPUSH, cst);
+            } else {
+                mv.visitLdcInsn(cst);
+            }
+        }
+
+        private static int getLoadOpcode(Class<?> c) {
+            if (c == Void.TYPE) {
+                throw new InternalError("Unexpected void type of load opcode");
+            }
+            return ILOAD + getOpcodeOffset(c);
+        }
+
+        private static int getOpcodeOffset(Class<?> c) {
+            if (c.isPrimitive()) {
+                if (c == Long.TYPE) {
+                    return 1;
+                } else if (c == Float.TYPE) {
+                    return 2;
+                } else if (c == Double.TYPE) {
+                    return 3;
+                }
+                return 0;
+            } else {
+                return 4;
+            }
+        }
+
+        private static int getParameterSize(Class<?> c) {
+            if (c == Void.TYPE) {
+                return 0;
+            } else if (c == Long.TYPE || c == Double.TYPE) {
+                return 2;
+            }
+            return 1;
+        }
+    }
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/StringConcat.java b/test/micro/org/openjdk/bench/java/lang/StringConcat.java
index 82254f56e79..c27514ec442 100644
--- a/test/micro/org/openjdk/bench/java/lang/StringConcat.java
+++ b/test/micro/org/openjdk/bench/java/lang/StringConcat.java
@@ -149,4 +149,47 @@ public class StringConcat {
         return "string" + objectValue + objectValue + objectValue + objectValue + objectValue + objectValue;
     }
 
+    private String
+            f0="1", f1="1", f2="1", f3="1", f4="1", f5="1", f6="1", f7="1", f8="1", f9="1",
+            f10="1", f11="1", f12="1", f13="1", f14="1", f15="1", f16="1", f17="1", f18="1", f19="1",
+            f20="1", f21="1", f22="1", f23="1", f24="1", f25="1", f26="1", f27="1", f28="1", f29="1",
+            f30="1", f31="1", f32="1", f33="1", f34="1", f35="1", f36="1", f37="1", f38="1", f39="1",
+            f40="1", f41="1", f42="1", f43="1", f44="1", f45="1", f46="1", f47="1", f48="1", f49="1",
+            f50="1", f51="1", f52="1", f53="1", f54="1", f55="1", f56="1", f57="1", f58="1", f59="1",
+            f60="1", f61="1", f62="1", f63="1", f64="1", f65="1", f66="1", f67="1", f68="1", f69="1",
+            f70="1", f71="1", f72="1", f73="1", f74="1", f75="1", f76="1", f77="1", f78="1", f79="1",
+            f80="1", f81="1", f82="1", f83="1", f84="1", f85="1", f86="1", f87="1", f88="1", f89="1",
+            f90="1", f91="1", f92="1", f93="1", f94="1", f95="1", f96="1", f97="1", f98="1", f99="1",
+            f100="1",f101="1",f102="1",f103="1",f104="1",f105="1",f106="1",f107="1",f108="1",f109="1",
+            f110="1",f111="1",f112="1",f113="1",f114="1",f115="1",f116="1",f117="1",f118="1",f119="1",
+            f120="1",f121="1",f122="1";
+
+    @Benchmark
+    public String concat13String() {
+        return f0 + ","+ f1 + ","+ f2 + ","+ f3 + ","+ f4 + ","+ f5 + ","+ f6 + ","+ f7 + ","+ f8 + ","+ f9 + ","
+                + f10 + ","+ f11 + ","+ f12;
+    }
+
+    @Benchmark
+    public String concat23String() {
+        return f0 + ","+ f1 + ","+ f2 + ","+ f3 + ","+ f4 + ","+ f5 + ","+ f6 + ","+ f7 + ","+ f8 + ","+ f9 + ","
+                + f10 + ","+ f11 + ","+ f12 + ","+ f13 + ","+ f14 + ","+ f15 + ","+ f16 + ","+ f17 + ","+ f18 + ","+ f19 + ","
+                + f20 + ","+ f21 + ","+ f22;
+    }
+    @Benchmark
+    public String concat123String() {
+        return f0 + ","+ f1 + ","+ f2 + ","+ f3 + ","+ f4 + ","+ f5 + ","+ f6 + ","+ f7 + ","+ f8 + ","+ f9 + ","
+                + f10 + ","+ f11 + ","+ f12 + ","+ f13 + ","+ f14 + ","+ f15 + ","+ f16 + ","+ f17 + ","+ f18 + ","+ f19 + ","
+                + f20 + ","+ f21 + ","+ f22 + ","+ f23 + ","+ f24 + ","+ f25 + ","+ f26 + ","+ f27 + ","+ f28 + ","+ f29 + ","
+                + f30 + ","+ f31 + ","+ f32 + ","+ f33 + ","+ f34 + ","+ f35 + ","+ f36 + ","+ f37 + ","+ f38 + ","+ f39 + ","
+                + f40 + ","+ f41 + ","+ f42 + ","+ f43 + ","+ f44 + ","+ f45 + ","+ f46 + ","+ f47 + ","+ f48 + ","+ f49 + ","
+                + f50 + ","+ f51 + ","+ f52 + ","+ f53 + ","+ f54 + ","+ f55 + ","+ f56 + ","+ f57 + ","+ f58 + ","+ f59 + ","
+                + f60 + ","+ f61 + ","+ f62 + ","+ f63 + ","+ f64 + ","+ f65 + ","+ f66 + ","+ f67 + ","+ f68 + ","+ f69 + ","
+                + f70 + ","+ f71 + ","+ f72 + ","+ f73 + ","+ f74 + ","+ f75 + ","+ f76 + ","+ f77 + ","+ f78 + ","+ f79 + ","
+                + f80 + ","+ f81 + ","+ f82 + ","+ f83 + ","+ f84 + ","+ f85 + ","+ f86 + ","+ f87 + ","+ f88 + ","+ f89 + ","
+                + f90 + ","+ f91 + ","+ f92 + ","+ f93 + ","+ f94 + ","+ f95 + ","+ f96 + ","+ f97 + ","+ f98 + ","+ f99 + ","
+                +f100 + ","+f101 + ","+f102 + ","+f103 + ","+f104 + ","+f105 + ","+f106 + ","+f107 + ","+f108 + ","+f109 + ","
+                +f110 + ","+f111 + ","+f112 + ","+f113 + ","+f114 + ","+f115 + ","+f116 + ","+f117 + ","+f118 + ","+f119 + ","
+                +f120 + ","+f121 + ","+f122;
+    }
 }

From 8bbd7251a596c6fad1a6675c077deb9fd7c8ff95 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Fri, 26 Apr 2024 14:06:53 +0000
Subject: [PATCH 217/486] 8331187: Optimize MethodTypeDesc and
 ClassDesc.ofDescriptor for primitive types

Reviewed-by: jvernee, liach
---
 .../classes/java/lang/constant/ClassDesc.java | 17 ++---
 .../java/lang/constant/ConstantDescs.java     | 20 +++---
 .../java/lang/constant/ConstantUtils.java     | 21 +++++--
 .../lang/constant/MethodTypeDescImpl.java     | 20 +++---
 .../classes/sun/invoke/util/Wrapper.java      | 33 ++++++----
 .../lang/constant/ClassDescFactories.java     | 63 +++++++++++++++++++
 6 files changed, 121 insertions(+), 53 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java

diff --git a/src/java.base/share/classes/java/lang/constant/ClassDesc.java b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
index 60adc7f1ab1..6adba119180 100644
--- a/src/java.base/share/classes/java/lang/constant/ClassDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -158,19 +158,10 @@ public sealed interface ClassDesc
      * @see ClassDesc#ofInternalName(String)
      */
     static ClassDesc ofDescriptor(String descriptor) {
-        requireNonNull(descriptor);
-        if (descriptor.isEmpty()) {
-            throw new IllegalArgumentException(
-                    "not a valid reference type descriptor: " + descriptor);
-        }
-        int depth = ConstantUtils.arrayDepth(descriptor);
-        if (depth > ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
-            throw new IllegalArgumentException(
-                    "Cannot create an array type descriptor with more than " +
-                    ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS + " dimensions");
-        }
+        // implicit null-check
         return (descriptor.length() == 1)
-               ? new PrimitiveClassDescImpl(descriptor)
+               ? Wrapper.forPrimitiveType(descriptor.charAt(0)).primitiveClassDescriptor()
+               // will throw IAE on descriptor.length == 0 or if array dimensions too long
                : new ReferenceClassDescImpl(descriptor);
     }
 
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantDescs.java b/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
index 82f56b7cbd4..de895fc7af5 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
+++ b/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -236,31 +236,31 @@ public final class ConstantDescs {
             CD_Object, CD_Object);
 
     /** {@link ClassDesc} representing the primitive type {@code int} */
-    public static final ClassDesc CD_int = ClassDesc.ofDescriptor("I");
+    public static final ClassDesc CD_int = new PrimitiveClassDescImpl("I");
 
     /** {@link ClassDesc} representing the primitive type {@code long} */
-    public static final ClassDesc CD_long = ClassDesc.ofDescriptor("J");
+    public static final ClassDesc CD_long = new PrimitiveClassDescImpl("J");
 
     /** {@link ClassDesc} representing the primitive type {@code float} */
-    public static final ClassDesc CD_float = ClassDesc.ofDescriptor("F");
+    public static final ClassDesc CD_float = new PrimitiveClassDescImpl("F");
 
     /** {@link ClassDesc} representing the primitive type {@code double} */
-    public static final ClassDesc CD_double = ClassDesc.ofDescriptor("D");
+    public static final ClassDesc CD_double = new PrimitiveClassDescImpl("D");
 
     /** {@link ClassDesc} representing the primitive type {@code short} */
-    public static final ClassDesc CD_short = ClassDesc.ofDescriptor("S");
+    public static final ClassDesc CD_short = new PrimitiveClassDescImpl("S");
 
     /** {@link ClassDesc} representing the primitive type {@code byte} */
-    public static final ClassDesc CD_byte = ClassDesc.ofDescriptor("B");
+    public static final ClassDesc CD_byte = new PrimitiveClassDescImpl("B");
 
     /** {@link ClassDesc} representing the primitive type {@code char} */
-    public static final ClassDesc CD_char = ClassDesc.ofDescriptor("C");
+    public static final ClassDesc CD_char = new PrimitiveClassDescImpl("C");
 
     /** {@link ClassDesc} representing the primitive type {@code boolean} */
-    public static final ClassDesc CD_boolean = ClassDesc.ofDescriptor("Z");
+    public static final ClassDesc CD_boolean = new PrimitiveClassDescImpl("Z");
 
     /** {@link ClassDesc} representing the primitive type {@code void} */
-    public static final ClassDesc CD_void = ClassDesc.ofDescriptor("V");
+    public static final ClassDesc CD_void = new PrimitiveClassDescImpl("V");
 
     /**
      * {@link MethodHandleDesc} representing {@link MethodHandles#classData(Lookup, String, Class) MethodHandles.classData}
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java b/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
index 10ed2758e3a..312aac68c63 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
+++ b/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
  */
 package java.lang.constant;
 
+import sun.invoke.util.Wrapper;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -195,10 +197,10 @@ class ConstantUtils {
      * @return the list of types
      * @throws IllegalArgumentException if the descriptor string is not valid
      */
-    static List<String> parseMethodDescriptor(String descriptor) {
+    static List<ClassDesc> parseMethodDescriptor(String descriptor) {
         int cur = 0, end = descriptor.length();
-        ArrayList<String> ptypes = new ArrayList<>();
-        ptypes.add(null); //placeholder for return type
+        ArrayList<ClassDesc> ptypes = new ArrayList<>();
+        ptypes.add(null); // placeholder for return type
 
         if (cur >= end || descriptor.charAt(cur) != '(')
             throw new IllegalArgumentException("Bad method descriptor: " + descriptor);
@@ -208,7 +210,7 @@ class ConstantUtils {
             int len = skipOverFieldSignature(descriptor, cur, end, false);
             if (len == 0)
                 throw new IllegalArgumentException("Bad method descriptor: " + descriptor);
-            ptypes.add(descriptor.substring(cur, cur + len));
+            ptypes.add(resolveClassDesc(descriptor, cur, len));
             cur += len;
         }
         if (cur >= end)
@@ -218,10 +220,17 @@ class ConstantUtils {
         int rLen = skipOverFieldSignature(descriptor, cur, end, true);
         if (rLen == 0 || cur + rLen != end)
             throw new IllegalArgumentException("Bad method descriptor: " + descriptor);
-        ptypes.set(0, descriptor.substring(cur, cur + rLen));
+        ptypes.set(0, resolveClassDesc(descriptor, cur, rLen));
         return ptypes;
     }
 
+    private static ClassDesc resolveClassDesc(String descriptor, int start, int len) {
+        if (len == 1) {
+            return Wrapper.forBasicType(descriptor.charAt(start)).primitiveClassDescriptor();
+        }
+        return ClassDesc.ofDescriptor(descriptor.substring(start, start + len));
+    }
+
     private static final char JVM_SIGNATURE_ARRAY = '[';
     private static final char JVM_SIGNATURE_BYTE = 'B';
     private static final char JVM_SIGNATURE_CHAR = 'C';
diff --git a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java b/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
index c50cf7c58f0..40a9cf8bd60 100644
--- a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
+++ b/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -88,21 +88,19 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
      * @jvms 4.3.3 Method Descriptors
      */
     static MethodTypeDescImpl ofDescriptor(String descriptor) {
-        requireNonNull(descriptor);
+        // Implicit null-check of descriptor
+        List<ClassDesc> ptypes = ConstantUtils.parseMethodDescriptor(descriptor);
+        int args = ptypes.size() - 1;
+        ClassDesc[] paramTypes = args > 0
+                ? ptypes.subList(1, args + 1).toArray(ConstantUtils.EMPTY_CLASSDESC)
+                : ConstantUtils.EMPTY_CLASSDESC;
 
-        List<String> types = ConstantUtils.parseMethodDescriptor(descriptor);
-
-        int paramCount = types.size() - 1;
-        var paramTypes = paramCount > 0 ? new ClassDesc[paramCount] : ConstantUtils.EMPTY_CLASSDESC;
-        for (int i = 0; i < paramCount; i++) {
-            paramTypes[i] = ClassDesc.ofDescriptor(types.get(i + 1));
-        }
-
-        MethodTypeDescImpl result = ofTrusted(ClassDesc.ofDescriptor(types.getFirst()), paramTypes);
+        MethodTypeDescImpl result = ofTrusted(ptypes.get(0), paramTypes);
         result.cachedDescriptorString = descriptor;
         return result;
     }
 
+
     @Override
     public ClassDesc returnType() {
         return returnType;
diff --git a/src/java.base/share/classes/sun/invoke/util/Wrapper.java b/src/java.base/share/classes/sun/invoke/util/Wrapper.java
index 76aede09487..3a28d63b7c4 100644
--- a/src/java.base/share/classes/sun/invoke/util/Wrapper.java
+++ b/src/java.base/share/classes/sun/invoke/util/Wrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,25 +25,27 @@
 
 package sun.invoke.util;
 
-import java.util.Map;
 import static sun.invoke.util.Wrapper.NumericClasses.*;
 import jdk.internal.vm.annotation.DontInline;
 
+import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDescs;
+
 public enum Wrapper {
     //        wrapperType      simple     primitiveType  simple     char  emptyArray     format               numericClass  superClass
-    BOOLEAN(  Boolean.class,   "Boolean", boolean.class, "boolean", 'Z', new boolean[0], Format.unsigned( 1), 0, 0),
+    BOOLEAN(  Boolean.class,   "Boolean", boolean.class, "boolean", 'Z', new boolean[0], Format.unsigned( 1), 0, 0, ConstantDescs.CD_boolean),
     // These must be in the order defined for widening primitive conversions in JLS 5.1.2
     // Avoid boxing integral types here to defer initialization of internal caches
-    BYTE   (     Byte.class,      "Byte",    byte.class,    "byte", 'B', new    byte[0], Format.signed(   8), BYTE_CLASS, BYTE_SUPERCLASSES),
-    SHORT  (    Short.class,     "Short",   short.class,   "short", 'S', new   short[0], Format.signed(  16), SHORT_CLASS, SHORT_SUPERCLASSES),
-    CHAR   (Character.class, "Character",    char.class,    "char", 'C', new    char[0], Format.unsigned(16), CHAR_CLASS, CHAR_SUPERCLASSES),
-    INT    (  Integer.class,   "Integer",     int.class,     "int", 'I', new     int[0], Format.signed(  32), INT_CLASS, INT_SUPERCLASSES),
-    LONG   (     Long.class,      "Long",    long.class,    "long", 'J', new    long[0], Format.signed(  64), LONG_CLASS, LONG_SUPERCLASSES),
-    FLOAT  (    Float.class,     "Float",   float.class,   "float", 'F', new   float[0], Format.floating(32), FLOAT_CLASS, FLOAT_SUPERCLASSES),
-    DOUBLE (   Double.class,    "Double",  double.class,  "double", 'D', new  double[0], Format.floating(64), DOUBLE_CLASS, DOUBLE_CLASS),
-    OBJECT (   Object.class,    "Object",  Object.class,  "Object", 'L', new  Object[0], Format.other(    1), 0, 0),
+    BYTE   (     Byte.class,      "Byte",    byte.class,    "byte", 'B', new    byte[0], Format.signed(   8), BYTE_CLASS, BYTE_SUPERCLASSES, ConstantDescs.CD_byte),
+    SHORT  (    Short.class,     "Short",   short.class,   "short", 'S', new   short[0], Format.signed(  16), SHORT_CLASS, SHORT_SUPERCLASSES, ConstantDescs.CD_short),
+    CHAR   (Character.class, "Character",    char.class,    "char", 'C', new    char[0], Format.unsigned(16), CHAR_CLASS, CHAR_SUPERCLASSES, ConstantDescs.CD_char),
+    INT    (  Integer.class,   "Integer",     int.class,     "int", 'I', new     int[0], Format.signed(  32), INT_CLASS, INT_SUPERCLASSES, ConstantDescs.CD_int),
+    LONG   (     Long.class,      "Long",    long.class,    "long", 'J', new    long[0], Format.signed(  64), LONG_CLASS, LONG_SUPERCLASSES, ConstantDescs.CD_long),
+    FLOAT  (    Float.class,     "Float",   float.class,   "float", 'F', new   float[0], Format.floating(32), FLOAT_CLASS, FLOAT_SUPERCLASSES, ConstantDescs.CD_float),
+    DOUBLE (   Double.class,    "Double",  double.class,  "double", 'D', new  double[0], Format.floating(64), DOUBLE_CLASS, DOUBLE_CLASS, ConstantDescs.CD_double),
+    OBJECT (   Object.class,    "Object",  Object.class,  "Object", 'L', new  Object[0], Format.other(    1), 0, 0, ConstantDescs.CD_Object),
     // VOID must be the last type, since it is "assignable" from any other type:
-    VOID   (     Void.class,      "Void",    void.class,    "void", 'V',           null, Format.other(    0), 0, 0),
+    VOID   (     Void.class,      "Void",    void.class,    "void", 'V',           null, Format.other(    0), 0, 0, ConstantDescs.CD_void),
     ;
 
     public static final int COUNT = 10;
@@ -58,8 +60,9 @@ public enum Wrapper {
     private final int      superClasses;
     private final String   wrapperSimpleName;
     private final String   primitiveSimpleName;
+    private final ClassDesc primitiveTypeDesc;
 
-    private Wrapper(Class<?> wtype, String wtypeName, Class<?> ptype, String ptypeName, char tchar, Object emptyArray, int format, int numericClass, int superClasses) {
+    private Wrapper(Class<?> wtype, String wtypeName, Class<?> ptype, String ptypeName, char tchar, Object emptyArray, int format, int numericClass, int superClasses, ClassDesc primitiveTypeDesc) {
         this.wrapperType = wtype;
         this.primitiveType = ptype;
         this.basicTypeChar = tchar;
@@ -70,6 +73,7 @@ public enum Wrapper {
         this.superClasses = superClasses;
         this.wrapperSimpleName = wtypeName;
         this.primitiveSimpleName = ptypeName;
+        this.primitiveTypeDesc = primitiveTypeDesc;
     }
 
     /** For debugging, give the details of this wrapper. */
@@ -376,6 +380,9 @@ public enum Wrapper {
         }
     }
 
+    /** A nominal descriptor of the primitive type */
+    public ClassDesc primitiveClassDescriptor() { return primitiveTypeDesc; }
+
     /** What is the primitive type wrapped by this wrapper? */
     public Class<?> primitiveType() { return primitiveType; }
 
diff --git a/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java
new file mode 100644
index 00000000000..c74271995d5
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+package org.openjdk.bench.java.lang.constant;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.lang.constant.ClassDesc;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Performance of conversion from and to method type descriptor symbols with
+ * descriptor strings and class descriptor symbols
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 3, time = 2)
+@Measurement(iterations = 6, time = 1)
+@Fork(1)
+@State(Scope.Thread)
+public class ClassDescFactories {
+
+    @Param({
+            "Ljava/lang/Object;",
+            "V",
+            "I"
+    })
+    public String descString;
+
+    @Benchmark
+    public ClassDesc ofDescriptor() {
+        return ClassDesc.ofDescriptor(descString);
+    }
+}

From d13e53346f3cd50bf7a4241ba86d2e21d9081bbe Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 26 Apr 2024 14:09:29 +0000
Subject: [PATCH 218/486] 8321014: RISC-V: C2 VectorLoadShuffle

Reviewed-by: luhenry, fyang
---
 src/hotspot/cpu/riscv/riscv_v.ad | 44 ++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 3069336ac11..7869d6156e5 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -82,6 +82,15 @@ source %{
       case Op_VectorCastHF2F:
       case Op_VectorCastF2HF:
         return UseZvfh;
+      case Op_VectorLoadShuffle:
+      case Op_VectorRearrange:
+        // vlen >= 4 is required, because min vector size for byte is 4 on riscv,
+        // VectorLoadShuffle is from byte to X, so it requires vlen >= 4.
+        // VectorRearrange depends on VectorLoadShuffle, so it also requires vlen >= 4.
+        if (vlen < 4) {
+          return false;
+        }
+        break;
       default:
         break;
     }
@@ -3561,6 +3570,41 @@ instruct vmask_reinterpret_diff_esize(vRegMask dst, vRegMask_V0 src, vReg tmp) %
   ins_pipe(pipe_slow);
 %}
 
+// ------------------------------ Vector shuffle -------------------------------
+
+instruct loadshuffleB(vReg dst) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE);
+  match(Set dst (VectorLoadShuffle dst));
+  format %{ "loadshuffleB $dst, $dst" %}
+  ins_encode %{
+    // For T_BYTE, no need to do anything
+  %}
+  ins_pipe(pipe_class_empty);
+%}
+
+instruct loadshuffleX(vReg dst, vReg src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_DOUBLE ||
+            Matcher::vector_element_basic_type(n) == T_LONG ||
+            Matcher::vector_element_basic_type(n) == T_FLOAT ||
+            Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst (VectorLoadShuffle src));
+  effect(TEMP_DEF dst);
+  format %{ "loadshuffleX $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    if (bt == T_SHORT) {
+      __ vzext_vf2(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+    } else if (bt == T_FLOAT || bt == T_INT) {
+      __ vzext_vf4(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+    } else { // bt == T_DOUBLE || bt == T_LONG
+      __ vzext_vf8(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector rearrange -----------------------------
 
 instruct rearrange(vReg dst, vReg src, vReg shuffle) %{

From 0bf516f7ba8425134ca42d856648ab19f5c69a86 Mon Sep 17 00:00:00 2001
From: Korov <korov9@163.com>
Date: Fri, 26 Apr 2024 14:12:49 +0000
Subject: [PATCH 219/486] 8330624: Inconsistent use of semicolon in the code
 snippet of java.io.Serializable javadoc

Reviewed-by: rriggs
---
 src/java.base/share/classes/java/io/Serializable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/io/Serializable.java b/src/java.base/share/classes/java/io/Serializable.java
index 9add677049c..eb50316925a 100644
--- a/src/java.base/share/classes/java/io/Serializable.java
+++ b/src/java.base/share/classes/java/io/Serializable.java
@@ -68,7 +68,7 @@ package java.io;
  *
  * <PRE>
  * private void writeObject(java.io.ObjectOutputStream out)
- *     throws IOException
+ *     throws IOException;
  * private void readObject(java.io.ObjectInputStream in)
  *     throws IOException, ClassNotFoundException;
  * private void readObjectNoData()

From 07facd0420c5e51f6e85e6210644df1659fbf765 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 26 Apr 2024 17:15:09 +0000
Subject: [PATCH 220/486] 8330734: JFR: Re-engineer mirror class mechanism

Reviewed-by: mgronlun
---
 .../jdk/jfr/events/DeserializationEvent.java  |  5 +-
 .../jdk/jfr/events/ErrorThrownEvent.java      |  5 +-
 .../jfr/events/ExceptionStatisticsEvent.java  |  5 +-
 .../jdk/jfr/events/ExceptionThrownEvent.java  |  5 +-
 .../jdk/jfr/events/ProcessStartEvent.java     |  5 +-
 .../SecurityPropertyModificationEvent.java    |  5 +-
 .../events/SecurityProviderServiceEvent.java  |  5 +-
 .../SerializationMisdeclarationEvent.java     |  5 +-
 .../jdk/jfr/events/SocketReadEvent.java       |  5 +-
 .../jdk/jfr/events/SocketWriteEvent.java      |  5 +-
 .../jdk/jfr/events/TLSHandshakeEvent.java     |  5 +-
 .../jdk/jfr/events/ThreadSleepEvent.java      |  5 +-
 .../jdk/jfr/events/VirtualThreadEndEvent.java |  5 +-
 .../jfr/events/VirtualThreadPinnedEvent.java  |  5 +-
 .../jfr/events/VirtualThreadStartEvent.java   |  5 +-
 .../VirtualThreadSubmitFailedEvent.java       |  5 +-
 .../jdk/jfr/events/X509CertificateEvent.java  |  5 +-
 .../jdk/jfr/events/X509ValidationEvent.java   |  5 +-
 .../jfr/internal/EventInstrumentation.java    | 21 +----
 .../classes/jdk/jfr/internal/JVMUpcalls.java  |  5 +-
 .../jdk/jfr/internal/MetadataRepository.java  |  7 +-
 .../classes/jdk/jfr/internal/MirrorEvent.java | 48 +++++------
 .../jdk/jfr/internal/MirrorEvents.java        | 81 +++++++++----------
 .../classes/jdk/jfr/internal/TypeLibrary.java | 12 ++-
 .../jdk/jfr/internal/util/ImplicitFields.java |  6 +-
 .../classes/jdk/jfr/internal/util/Utils.java  | 18 ++++-
 26 files changed, 128 insertions(+), 160 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/DeserializationEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/DeserializationEvent.java
index 66c376e9022..dd90a38b14c 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/DeserializationEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/DeserializationEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,8 @@ import jdk.jfr.internal.RemoveFields;
 @Label("Deserialization")
 @Name("jdk.Deserialization")
 @Description("Results of deserialization and ObjectInputFilter checks")
-@MirrorEvent(className = "jdk.internal.event.DeserializationEvent")
 @RemoveFields("duration")
-public final class DeserializationEvent extends AbstractJDKEvent {
+public final class DeserializationEvent extends MirrorEvent {
 
     @Label("Filter Configured")
     public boolean filterConfigured;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/ErrorThrownEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/ErrorThrownEvent.java
index 337cfad20fb..a87f51ff718 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/ErrorThrownEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/ErrorThrownEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,8 @@ import jdk.jfr.internal.Type;
 @Label("Java Error")
 @Category("Java Application")
 @Description("An object derived from java.lang.Error has been created. OutOfMemoryErrors are ignored")
-@MirrorEvent(className = "jdk.internal.event.ErrorThrownEvent")
 @RemoveFields("duration")
-public final class ErrorThrownEvent extends AbstractJDKEvent {
+public final class ErrorThrownEvent extends MirrorEvent {
 
     @Label("Message")
     public String message;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionStatisticsEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionStatisticsEvent.java
index cdaa6372f68..795f618b4e6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionStatisticsEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionStatisticsEvent.java
@@ -31,14 +31,15 @@ import jdk.jfr.Label;
 import jdk.jfr.Name;
 import jdk.jfr.StackTrace;
 import jdk.jfr.internal.MirrorEvent;
+import jdk.jfr.internal.RemoveFields;
 import jdk.jfr.internal.Type;
 
 @Name(Type.EVENT_NAME_PREFIX + "ExceptionStatistics")
 @Label("Exception Statistics")
 @Category({ "Java Application", "Statistics" })
 @Description("Number of objects derived from java.lang.Throwable that have been created")
-@MirrorEvent(className = "jdk.internal.event.ExceptionStatisticsEvent")
-public final class ExceptionStatisticsEvent extends AbstractPeriodicEvent {
+@RemoveFields({"duration", "eventThread", "stackTrace"})
+public final class ExceptionStatisticsEvent extends MirrorEvent {
 
     @Label("Exceptions Created")
     public long throwables;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionThrownEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionThrownEvent.java
index c61965755bd..22c87f3132d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionThrownEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionThrownEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -37,9 +37,8 @@ import jdk.jfr.internal.Type;
 @Label("Java Exception")
 @Category("Java Application")
 @Description("An object derived from java.lang.Exception has been created")
-@MirrorEvent(className = "jdk.internal.event.ExceptionThrownEvent")
 @RemoveFields("duration")
-public final class ExceptionThrownEvent extends AbstractJDKEvent {
+public final class ExceptionThrownEvent extends MirrorEvent {
 
     @Label("Message")
     public String message;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/ProcessStartEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/ProcessStartEvent.java
index 5ad2dc82fc1..01abc75e155 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/ProcessStartEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/ProcessStartEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,9 @@ import jdk.jfr.internal.RemoveFields;
 @Label("Process Start")
 @Name("jdk.ProcessStart")
 @Description("Operating system process started")
-@MirrorEvent(className = "jdk.internal.event.ProcessStartEvent")
 @RemoveFields("duration")
 @StackFilter({"java.lang.ProcessBuilder", "java.lang.Runtime::exec"})
-public final class ProcessStartEvent extends AbstractJDKEvent {
+public final class ProcessStartEvent extends MirrorEvent {
     @Label("Process Id")
     public long pid;
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/SecurityPropertyModificationEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/SecurityPropertyModificationEvent.java
index 7f4e5045c9d..1e6aea7b536 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/SecurityPropertyModificationEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/SecurityPropertyModificationEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -33,10 +33,9 @@ import jdk.jfr.internal.RemoveFields;
 @Label("Security Property Modification")
 @Name("jdk.SecurityPropertyModification")
 @Description("Modification of Security property")
-@MirrorEvent(className = "jdk.internal.event.SecurityPropertyModificationEvent")
 @RemoveFields("duration")
 @StackFilter({"java.security.Security::setProperty"})
-public final class SecurityPropertyModificationEvent extends AbstractJDKEvent {
+public final class SecurityPropertyModificationEvent extends MirrorEvent {
     @Label("Key")
     public String key;
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/SecurityProviderServiceEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/SecurityProviderServiceEvent.java
index 8bbbf09d87d..fe4dbaec31d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/SecurityProviderServiceEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/SecurityProviderServiceEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,9 @@ import jdk.jfr.internal.RemoveFields;
 @Label("Security Provider Instance Request")
 @Name("jdk.SecurityProviderService")
 @Description("Details of Provider.getInstance(String type, String algorithm) calls")
-@MirrorEvent(className = "jdk.internal.event.SecurityProviderServiceEvent")
 @RemoveFields("duration")
 @StackFilter({"java.security.Provider::getService"})
-public final class SecurityProviderServiceEvent extends AbstractJDKEvent {
+public final class SecurityProviderServiceEvent extends MirrorEvent {
     @Label("Type of Service")
     public String type;
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/SerializationMisdeclarationEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/SerializationMisdeclarationEvent.java
index b88ba270708..ce170d5ad9e 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/SerializationMisdeclarationEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/SerializationMisdeclarationEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -40,9 +40,8 @@ import jdk.jfr.internal.Type;
         " The checks are usually performed just once per serializable class," +
         " the first time it is used by serialization." +
         " Under high memory pressure, a class might be re-checked again.")
-@MirrorEvent(className = "jdk.internal.event.SerializationMisdeclarationEvent")
 @RemoveFields({"duration", "stackTrace", "eventThread"})
-public final class SerializationMisdeclarationEvent extends AbstractJDKEvent {
+public final class SerializationMisdeclarationEvent extends MirrorEvent {
 
     @Label("Misdeclared Class")
     public Class<?> misdeclaredClass;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java
index 7ef63765eec..917eabd9206 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -38,8 +38,7 @@ import jdk.jfr.internal.Type;
 @Label("Socket Read")
 @Category("Java Application")
 @Description("Reading data from a socket")
-@MirrorEvent(className = "jdk.internal.event.SocketReadEvent")
-public final class SocketReadEvent extends AbstractJDKEvent {
+public final class SocketReadEvent extends MirrorEvent {
 
     @Label("Remote Host")
     public String host;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java
index 6e776b8871d..92c85c132d4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -37,8 +37,7 @@ import jdk.jfr.internal.Type;
 @Label("Socket Write")
 @Category("Java Application")
 @Description("Writing data to a socket")
-@MirrorEvent(className = "jdk.internal.event.SocketWriteEvent")
-public final class SocketWriteEvent extends AbstractJDKEvent {
+public final class SocketWriteEvent extends MirrorEvent {
 
     @Label("Remote Host")
     public String host;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/TLSHandshakeEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/TLSHandshakeEvent.java
index df2f4cfc2ed..d0d81ac63bc 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/TLSHandshakeEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/TLSHandshakeEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -37,10 +37,9 @@ import jdk.jfr.internal.RemoveFields;
 @Label("TLS Handshake")
 @Name("jdk.TLSHandshake")
 @Description("Parameters used in TLS Handshake")
-@MirrorEvent(className = "jdk.internal.event.TLSHandshakeEvent")
 @RemoveFields("duration")
 @StackFilter("sun.security.ssl.Finished::recordEvent")
-public final class TLSHandshakeEvent extends AbstractJDKEvent {
+public final class TLSHandshakeEvent extends MirrorEvent {
     @Label("Peer Host")
     public String peerHost;
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/ThreadSleepEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/ThreadSleepEvent.java
index 216ad370aca..617f18511ce 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/ThreadSleepEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/ThreadSleepEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,11 +34,10 @@ import jdk.jfr.internal.MirrorEvent;
 @Category("Java Application")
 @Label("Java Thread Sleep")
 @Name("jdk.ThreadSleep")
-@MirrorEvent(className = "jdk.internal.event.ThreadSleepEvent")
 @StackFilter({"java.lang.Thread::afterSleep",
               "java.lang.Thread::sleepNanos",
               "java.lang.Thread::sleep"})
-public final class ThreadSleepEvent extends AbstractJDKEvent {
+public final class ThreadSleepEvent extends MirrorEvent {
     @Label("Sleep Time")
     @Timespan(Timespan.NANOSECONDS)
     public long time;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadEndEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadEndEvent.java
index 8ad64abf1bf..12d404ace44 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadEndEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadEndEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,8 @@ import jdk.jfr.internal.RemoveFields;
 @Category("Java Application")
 @Label("Virtual Thread End")
 @Name("jdk.VirtualThreadEnd")
-@MirrorEvent(className = "jdk.internal.event.VirtualThreadEndEvent")
 @RemoveFields({"duration", "stackTrace"})
-public final class VirtualThreadEndEvent extends AbstractJDKEvent {
+public final class VirtualThreadEndEvent extends MirrorEvent {
 
     @Label("Thread Id")
     public long javaThreadId;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java
index f109966f1be..83547125ac5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadPinnedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, 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
@@ -33,6 +33,5 @@ import jdk.jfr.internal.MirrorEvent;
 @Category("Java Application")
 @Label("Virtual Thread Pinned")
 @Name("jdk.VirtualThreadPinned")
-@MirrorEvent(className = "jdk.internal.event.VirtualThreadPinnedEvent")
-public final class VirtualThreadPinnedEvent extends AbstractJDKEvent {
+public final class VirtualThreadPinnedEvent extends MirrorEvent {
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadStartEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadStartEvent.java
index 646c2379178..216ecd9ba79 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadStartEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadStartEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,8 @@ import jdk.jfr.internal.RemoveFields;
 @Category("Java Application")
 @Label("Virtual Thread Start")
 @Name("jdk.VirtualThreadStart")
-@MirrorEvent(className = "jdk.internal.event.VirtualThreadStartEvent")
 @RemoveFields("duration")
-public final class VirtualThreadStartEvent extends AbstractJDKEvent {
+public final class VirtualThreadStartEvent extends MirrorEvent {
 
     @Label("Thread Id")
     public long javaThreadId;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadSubmitFailedEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadSubmitFailedEvent.java
index d59fbe2931e..5fab1eaebf0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadSubmitFailedEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/VirtualThreadSubmitFailedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,8 @@ import jdk.jfr.internal.RemoveFields;
 @Label("Virtual Thread Submit Failed")
 @Name("jdk.VirtualThreadSubmitFailed")
 @Description("Submit of task for virtual thread failed")
-@MirrorEvent(className = "jdk.internal.event.VirtualThreadSubmitFailedEvent")
 @RemoveFields("duration")
-public final class VirtualThreadSubmitFailedEvent extends AbstractJDKEvent {
+public final class VirtualThreadSubmitFailedEvent extends MirrorEvent {
 
     @Label("Thread Id")
     public long javaThreadId;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/X509CertificateEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/X509CertificateEvent.java
index 7ec9c043605..ab3aaafc524 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/X509CertificateEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/X509CertificateEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -33,9 +33,8 @@ import jdk.jfr.internal.RemoveFields;
 @Label("X509 Certificate")
 @Name("jdk.X509Certificate")
 @Description("Details of X.509 Certificate parsed by JDK")
-@MirrorEvent(className = "jdk.internal.event.X509CertificateEvent")
 @RemoveFields("duration")
-public final class X509CertificateEvent extends AbstractJDKEvent {
+public final class X509CertificateEvent extends MirrorEvent {
     @Label("Signature Algorithm")
     public String algorithm;
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/X509ValidationEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/X509ValidationEvent.java
index c4a73d2ffe8..5cc05f2f3eb 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/X509ValidationEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/X509ValidationEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -33,9 +33,8 @@ import jdk.jfr.internal.RemoveFields;
 @Label("X509 Validation")
 @Name("jdk.X509Validation")
 @Description("Serial numbers from X.509 Certificates forming chain of trust")
-@MirrorEvent(className = "jdk.internal.event.X509ValidationEvent")
 @RemoveFields("duration")
-public final class X509ValidationEvent extends AbstractJDKEvent {
+public final class X509ValidationEvent extends MirrorEvent {
     @CertificateId
     @Label("Certificate Id")
     @Unsigned
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
index b8d386f08bf..9e99c90788c 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,7 +90,6 @@ final class EventInstrumentation {
     private static final ClassDesc TYPE_ISE = Bytecode.classDesc(IllegalStateException.class);
     private static final ClassDesc TYPE_EVENT_WRITER = classDesc(EventWriter.class);
     private static final ClassDesc TYPE_EVENT_WRITER_FACTORY = ClassDesc.of("jdk.jfr.internal.event.EventWriterFactory");
-    private static final ClassDesc TYPE_MIRROR_EVENT = Bytecode.classDesc(MirrorEvent.class);
     private static final ClassDesc TYPE_OBJECT = Bytecode.classDesc(Object.class);
     private static final ClassDesc TYPE_SETTING_DEFINITION = Bytecode.classDesc(SettingDefinition.class);
     private static final MethodDesc METHOD_BEGIN = MethodDesc.of("begin", "()V");
@@ -144,9 +143,7 @@ final class EventInstrumentation {
 
     private ImplicitFields determineImplicitFields() {
         if (isJDK) {
-            // For now, only support mirror events in java.base
-            String fullName = "java.base:" + className;
-            Class<?> eventClass = MirrorEvents.find(fullName);
+            Class<?> eventClass = MirrorEvents.find(isJDK, className);
             if (eventClass != null) {
                 return new ImplicitFields(eventClass);
             }
@@ -221,20 +218,6 @@ final class EventInstrumentation {
         return true;
     }
 
-    boolean isMirrorEvent() {
-        String typeDescriptor = TYPE_MIRROR_EVENT.descriptorString();
-        for (ClassElement ce : classModel.elements()) {
-            if (ce instanceof RuntimeVisibleAnnotationsAttribute rvaa) {
-                for (var annotation : rvaa.annotations()) {
-                    if (annotation.className().equalsString(typeDescriptor)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
     @SuppressWarnings("unchecked")
     // Only supports String, String[] and Boolean values
     private static <T> T annotationValue(ClassModel classModel, ClassDesc classDesc, Class<T> type) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
index 25d0e0418f1..9c37a1ab660 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,9 +112,6 @@ final class JVMUpcalls {
                 Logger.log(LogTag.JFR_SYSTEM, LogLevel.INFO, "Skipping instrumentation for " + eventName + " since container support is missing");
                 return oldBytes;
             }
-            if (ei.isMirrorEvent()) {
-                return oldBytes;
-            }
 
             if (!forceInstrumentation) {
                 // Assume we are recording
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
index 29267803009..7d61d3c984f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -144,10 +144,6 @@ public final class MetadataRepository {
         }
         EventConfiguration configuration = getConfiguration(eventClass, true);
         if (configuration == null) {
-            if (eventClass.getAnnotation(MirrorEvent.class) != null) {
-                // Don't register mirror classes.
-                return null;
-            }
             PlatformEventType pe = findMirrorType(eventClass);
             configuration = makeConfiguration(eventClass, pe, dynamicAnnotations, dynamicFields);
         }
@@ -162,8 +158,7 @@ public final class MetadataRepository {
     }
 
     private PlatformEventType findMirrorType(Class<? extends jdk.internal.event.Event> eventClass) throws InternalError {
-        String fullName = eventClass.getModule().getName() + ":" + eventClass.getName();
-        Class<? extends Event> mirrorClass = MirrorEvents.find(fullName);
+        Class<? extends MirrorEvent> mirrorClass = MirrorEvents.find(eventClass);
         if (mirrorClass == null) {
             return null; // not a mirror
         }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvent.java
index ce5126e3afe..deabd2aaacd 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,32 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package jdk.jfr.internal;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
-/**
- * Any event class annotated with this annotation must be added
- * to the {@link MirrorEvents) class for it to take effect.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE })
-public @interface MirrorEvent {
-    /**
-     * Fully qualified name of the class to mirror metadata for (for example,
-     * {@code "jdk.internal.event.Example"})
-     *
-     * @return the fully qualified class name of the event
-     */
-    String className();
+import jdk.jfr.Enabled;
+import jdk.jfr.Registered;
+import jdk.jfr.StackTrace;
 
-    /**
-     * The module where the event is located, by default {@code "java.base"}.
-     *
-     * @return the module name
-     */
-    String module() default "java.base";
+/**
+ * A mirror event is a fictitious event class that contains metadata about an
+ * event, but not the implementation to write the event data to buffers.
+ * <p>
+ * A mirror event should be used when an event class is in a module where a
+ * dependency on the jdk.jfr module is not possible, for example, due to a
+ * circular dependency.
+ * <p>
+ * Subclass the MirrorEvent class and add the exact same fields as the actual
+ * event, but with labels, descriptions etc.
+ * <p>
+ * For the mirror mechanism to work, the mirror class must be registered in the
+ * jdk.jfr.internal.MirrorEvents class.
+ */
+@Registered(false)
+@Enabled(false)
+@StackTrace(false)
+public abstract class MirrorEvent {
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
index 7c74bb41f4a..db148c105c4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,9 @@
  */
 package jdk.jfr.internal;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.jfr.Event;
 import jdk.jfr.events.DeserializationEvent;
 import jdk.jfr.events.ErrorThrownEvent;
 import jdk.jfr.events.ExceptionStatisticsEvent;
@@ -47,52 +46,46 @@ import jdk.jfr.events.VirtualThreadSubmitFailedEvent;
 import jdk.jfr.events.X509CertificateEvent;
 import jdk.jfr.events.X509ValidationEvent;
 
-public final class MirrorEvents {
-    private static final Class<?>[] mirrorEventClasses = {
-        DeserializationEvent.class,
-        ProcessStartEvent.class,
-        SecurityPropertyModificationEvent.class,
-        SecurityProviderServiceEvent.class,
-        SerializationMisdeclarationEvent.class,
-        SocketReadEvent.class,
-        SocketWriteEvent.class,
-        ThreadSleepEvent.class,
-        TLSHandshakeEvent.class,
-        VirtualThreadStartEvent.class,
-        VirtualThreadEndEvent.class,
-        VirtualThreadPinnedEvent.class,
-        VirtualThreadSubmitFailedEvent.class,
-        X509CertificateEvent.class,
-        X509ValidationEvent.class,
-        ErrorThrownEvent.class,
-        ExceptionStatisticsEvent.class,
-        ExceptionThrownEvent.class,
+/**
+ * This class registers all mirror events.
+ */
+final class MirrorEvents {
+    private static final Map<String, Class<? extends MirrorEvent>> mirrorLookup = new ConcurrentHashMap<>();
+
+    // Add mirror event mapping here. See MirrorEvent class for details.
+    static {
+        register("jdk.internal.event.DeserializationEvent", DeserializationEvent.class);
+        register("jdk.internal.event.ProcessStartEvent", ProcessStartEvent.class);
+        register("jdk.internal.event.SecurityPropertyModificationEvent", SecurityPropertyModificationEvent.class);
+        register("jdk.internal.event.SecurityProviderServiceEvent", SecurityProviderServiceEvent.class);
+        register("jdk.internal.event.SerializationMisdeclarationEvent", SerializationMisdeclarationEvent.class);
+        register("jdk.internal.event.SocketReadEvent", SocketReadEvent.class);
+        register("jdk.internal.event.SocketWriteEvent", SocketWriteEvent.class);
+        register("jdk.internal.event.ThreadSleepEvent", ThreadSleepEvent.class);
+        register("jdk.internal.event.TLSHandshakeEvent", TLSHandshakeEvent.class);
+        register("jdk.internal.event.VirtualThreadStartEvent", VirtualThreadStartEvent.class);
+        register("jdk.internal.event.VirtualThreadEndEvent", VirtualThreadEndEvent.class);
+        register("jdk.internal.event.VirtualThreadPinnedEvent", VirtualThreadPinnedEvent.class);
+        register("jdk.internal.event.VirtualThreadSubmitFailedEvent", VirtualThreadSubmitFailedEvent.class);
+        register("jdk.internal.event.X509CertificateEvent", X509CertificateEvent.class);
+        register("jdk.internal.event.X509ValidationEvent", X509ValidationEvent.class);
+        register("jdk.internal.event.ErrorThrownEvent", ErrorThrownEvent.class);
+        register("jdk.internal.event.ExceptionStatisticsEvent", ExceptionStatisticsEvent.class);
+        register("jdk.internal.event.ExceptionThrownEvent", ExceptionThrownEvent.class);
     };
 
-    private static final Map<String, Class<? extends Event>> mirrorLookup = createLookup();
+    private static void register(String eventClassName, Class<? extends MirrorEvent> mirrorClass) {
+        mirrorLookup.put(eventClassName, mirrorClass);
+    }
 
-    public static Class<? extends Event> find(String name) {
-        // When <clinit> of this class is executed it may lead
-        // to a JVM up call and invocation of this method before
-        // the mirrorLookup field has been set. This is fine,
-        // mirrors should not be instrumented.
-        if (mirrorLookup != null) {
+    static Class<? extends MirrorEvent> find(Class<? extends jdk.internal.event.Event> eventClass) {
+        return find(eventClass.getClassLoader() == null, eventClass.getName());
+    }
+
+    static Class<? extends MirrorEvent> find(boolean bootClassLoader, String name) {
+        if (bootClassLoader) {
             return mirrorLookup.get(name);
         }
         return null;
     }
-
-    @SuppressWarnings("unchecked")
-    private static Map<String, Class<? extends Event>> createLookup() {
-        Map<String, Class<? extends Event>> mirrors = new HashMap<>();
-        for (Class<?> eventClass : mirrorEventClasses) {
-            MirrorEvent me = eventClass.getAnnotation(MirrorEvent.class);
-            if (me == null) {
-                throw new InternalError("Mirror class must have annotation " + MirrorEvent.class.getName());
-            }
-            String fullName = me.module() + ":" + me.className();
-            mirrors.put(fullName, (Class<? extends Event>) eventClass);
-        }
-        return mirrors;
-    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java
index 19c83b3dc1c..cab6e7befe1 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java
@@ -263,7 +263,7 @@ public final class TypeLibrary {
         // STRUCT
         String superType = null;
         boolean eventType = false;
-        if (jdk.internal.event.Event.class.isAssignableFrom(clazz)) {
+        if (isEventClass(clazz)) {
             superType = Type.SUPER_TYPE_EVENT;
             eventType= true;
         }
@@ -291,6 +291,16 @@ public final class TypeLibrary {
         return type;
     }
 
+    private static boolean isEventClass(Class<?> clazz) {
+        if (jdk.internal.event.Event.class.isAssignableFrom(clazz)) {
+            return true;
+        }
+        if (MirrorEvent.class.isAssignableFrom(clazz)) {
+            return true;
+        }
+        return false;
+    }
+
     private static void addAnnotations(Class<?> clazz, Type type, List<AnnotationElement> dynamicAnnotations) {
         ArrayList<AnnotationElement> aes = new ArrayList<>();
         if (dynamicAnnotations.isEmpty()) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ImplicitFields.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ImplicitFields.java
index 8e302f8542f..c97efe0bdb9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ImplicitFields.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ImplicitFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -41,11 +41,11 @@ public final class ImplicitFields {
     private final List<String> fields = new ArrayList<>(4);
 
     public ImplicitFields(Class<?> eventClass) {
-        fields.add(START_TIME); // for completeness, not really needed
+        fields.add(START_TIME);
         fields.add(DURATION);
         fields.add(STACK_TRACE);
         fields.add(EVENT_THREAD);
-        for (Class<?> c = eventClass; jdk.internal.event.Event.class != c; c = c.getSuperclass()) {
+        for (Class<?> c = eventClass; !Utils.isEventBaseClass(c); c = c.getSuperclass()) {
             RemoveFields rf = c.getAnnotation(RemoveFields.class);
             if (rf != null) {
                 for (String value : rf.value()) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
index 4ed36989277..c133a11b3c5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
@@ -51,6 +51,7 @@ import jdk.jfr.RecordingState;
 import jdk.jfr.internal.LogLevel;
 import jdk.jfr.internal.LogTag;
 import jdk.jfr.internal.Logger;
+import jdk.jfr.internal.MirrorEvent;
 import jdk.jfr.internal.SecuritySupport;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.settings.PeriodSetting;
@@ -206,9 +207,8 @@ public final class Utils {
     }
 
     public static List<Field> getVisibleEventFields(Class<?> clazz) {
-        Utils.ensureValidEventSubclass(clazz);
         List<Field> fields = new ArrayList<>();
-        for (Class<?> c = clazz; c != jdk.internal.event.Event.class; c = c.getSuperclass()) {
+        for (Class<?> c = clazz; !Utils.isEventBaseClass(c); c = c.getSuperclass()) {
             for (Field field : c.getDeclaredFields()) {
                 // skip private field in base classes
                 if (c == clazz || !Modifier.isPrivate(field.getModifiers())) {
@@ -219,6 +219,16 @@ public final class Utils {
         return fields;
     }
 
+    public static boolean isEventBaseClass(Class<?> clazz) {
+        if (jdk.internal.event.Event.class == clazz) {
+            return true;
+        }
+        if (jdk.jfr.internal.MirrorEvent.class == clazz) {
+            return true;
+        }
+        return false;
+    }
+
     public static void ensureValidEventSubclass(Class<?> eventClass) {
         if (jdk.internal.event.Event.class.isAssignableFrom(eventClass) && Modifier.isAbstract(eventClass.getModifiers())) {
             throw new IllegalArgumentException("Abstract event classes are not allowed");
@@ -338,7 +348,7 @@ public final class Utils {
         return eventName;
     }
 
-    public static void verifyMirror(Class<?> mirror, Class<?> real) {
+    public static void verifyMirror(Class<? extends MirrorEvent> mirror, Class<?> real) {
         Class<?> cMirror = Objects.requireNonNull(mirror);
         Class<?> cReal = Objects.requireNonNull(real);
 
@@ -353,7 +363,7 @@ public final class Utils {
         }
         while (cReal != null) {
             for (Field realField : cReal.getDeclaredFields()) {
-                if (isSupportedType(realField.getType())) {
+                if (isSupportedType(realField.getType()) && !realField.isSynthetic()) {
                     String fieldName = realField.getName();
                     Field mirrorField = mirrorFields.get(fieldName);
                     if (mirrorField == null) {

From f3bb3e21704dd47c6c5d5753ca5882520a538c06 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 26 Apr 2024 19:20:27 +0000
Subject: [PATCH 221/486] 8331153: JFR: Improve logging of
 jdk/jfr/api/consumer/filestream/TestOrdered.java

Reviewed-by: mgronlun
---
 .../api/consumer/filestream/TestOrdered.java  | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/test/jdk/jdk/jfr/api/consumer/filestream/TestOrdered.java b/test/jdk/jdk/jfr/api/consumer/filestream/TestOrdered.java
index 94383298ddc..8edb74b847a 100644
--- a/test/jdk/jdk/jfr/api/consumer/filestream/TestOrdered.java
+++ b/test/jdk/jdk/jfr/api/consumer/filestream/TestOrdered.java
@@ -88,46 +88,60 @@ public class TestOrdered {
 
     private static void testSetOrderedTrue(Path p) throws Exception {
         for (boolean reuse : BOOLEAN_STATES) {
+            System.out.println();
+            System.out.println("Testing: testSetOrderedTrue reuse = " + reuse);
             AtomicReference<Instant> timestamp = new AtomicReference<>(Instant.MIN);
+            AtomicBoolean unordered = new AtomicBoolean(false);
             try (EventStream es = EventStream.openFile(p)) {
                 es.setReuse(reuse);
                 es.setOrdered(true);
                 es.onEvent(e -> {
                     Instant endTime = e.getEndTime();
+                    printTimestamp(endTime);
                     if (endTime.isBefore(timestamp.get())) {
-                        throw new Error("Events are not ordered! Reuse = " + reuse);
+                        unordered.set(true);
                     }
                     timestamp.set(endTime);
                 });
                 es.start();
             }
+            if (unordered.get()) {
+                throw new Exception("Events are not ordered! Reuse = " + reuse);
+            }
         }
     }
 
     private static void testSetOrderedFalse(Path p) throws Exception {
         for (boolean reuse : BOOLEAN_STATES) {
+            System.out.println();
+            System.out.println("Testing: testSetOrderedFalse reuse = " + reuse);
             AtomicReference<Instant> timestamp = new AtomicReference<>(Instant.MIN);
-            AtomicBoolean unoreded = new AtomicBoolean(false);
+            AtomicBoolean unordered = new AtomicBoolean(false);
             try (EventStream es = EventStream.openFile(p)) {
                 es.setReuse(reuse);
                 es.setOrdered(false);
                 es.onEvent(e -> {
                     Instant endTime = e.getEndTime();
-                    System.out.println("testSetOrderedFalse: endTime: " + endTime);
+                    printTimestamp(endTime);
                     if (endTime.isBefore(timestamp.get())) {
-                        unoreded.set(true);
-                        es.close();
+                        unordered.set(true);
                     }
                     timestamp.set(endTime);
                 });
                 es.start();
-                if (!unoreded.get()) {
+                if (!unordered.get()) {
                     throw new Exception("Expected at least some events to be out of order! Reuse = " + reuse);
                 }
             }
         }
     }
 
+    private static void printTimestamp(Instant timestamp) {
+        long seconds = timestamp.getEpochSecond();
+        long nanos = timestamp.getNano();
+        System.out.println(timestamp + " seconds = " + seconds + " nanos = " + nanos);
+    }
+
     private static Path makeUnorderedRecording() throws Exception {
         CyclicBarrier barrier = new CyclicBarrier(THREAD_COUNT + 1);
 

From a920af233a11592af113f456f7608cb59dd1617e Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Fri, 26 Apr 2024 19:47:06 +0000
Subject: [PATCH 222/486] 8303689: javac -Xlint could/should report on
 "dangling" doc comments

Reviewed-by: vromero, ihse, prr
---
 make/CompileDemos.gmk                         |   2 +-
 make/CompileToolsJdk.gmk                      |   4 +-
 make/GenerateLinkOptData.gmk                  |   3 +-
 make/modules/java.desktop/Java.gmk            |   4 +-
 make/modules/java.management/Java.gmk         |   4 +-
 make/modules/java.naming/Java.gmk             |   4 +-
 make/modules/java.security.jgss/Java.gmk      |   4 +-
 make/modules/java.security.sasl/Java.gmk      |   4 +-
 make/modules/java.sql.rowset/Java.gmk         |   4 +-
 make/modules/java.sql/Java.gmk                |   4 +-
 make/modules/java.xml.crypto/Java.gmk         |   4 +-
 make/modules/java.xml/Java.gmk                |   4 +-
 make/modules/jdk.accessibility/Java.gmk       |  26 +++
 make/modules/jdk.crypto.cryptoki/Java.gmk     |  26 +++
 make/modules/jdk.hotspot.agent/Java.gmk       |   4 +-
 make/modules/jdk.internal.le/Java.gmk         |   4 +-
 make/modules/jdk.internal.vm.ci/Java.gmk      |   4 +-
 make/modules/jdk.jdi/Java.gmk                 |   4 +-
 make/modules/jdk.jfr/Java.gmk                 |   4 +-
 make/modules/jdk.security.auth/Java.gmk       |  26 +++
 make/modules/jdk.zipfs/Java.gmk               |  27 ++++
 make/test/BuildTestLib.gmk                    |   2 +-
 .../com/sun/tools/javac/api/JavacTrees.java   |   7 +-
 .../tools/javac/code/DeferredLintHandler.java |  18 ++-
 .../com/sun/tools/javac/code/Lint.java        |   8 +-
 .../com/sun/tools/javac/comp/Annotate.java    |   4 +-
 .../com/sun/tools/javac/comp/Attr.java        |  10 +-
 .../com/sun/tools/javac/comp/Check.java       |  28 ++--
 .../com/sun/tools/javac/comp/TypeEnter.java   |   4 +-
 .../sun/tools/javac/parser/JavaTokenizer.java |  14 ++
 .../sun/tools/javac/parser/JavacParser.java   | 150 +++++++++++++++++-
 .../com/sun/tools/javac/parser/Lexer.java     |  16 +-
 .../sun/tools/javac/parser/ParserFactory.java |   6 +-
 .../com/sun/tools/javac/parser/Scanner.java   |  23 ++-
 .../com/sun/tools/javac/parser/Tokens.java    |   3 +-
 .../sun/tools/javac/parser/VirtualParser.java |   8 +-
 .../tools/javac/resources/compiler.properties |   3 +
 .../tools/javac/resources/javac.properties    |   5 +-
 .../sun/tools/javac/tree/DocTreeMaker.java    |   7 +-
 .../share/classes/module-info.java            |   4 +-
 src/jdk.compiler/share/man/javac.1            |   3 +
 .../internal/tool/JavadocMemberEnter.java     |   4 +-
 src/jdk.javadoc/share/man/javadoc.1           |  16 ++
 .../OverrideChecks/6199153/T6199153.java      |   2 +-
 .../DanglingDocCommentsClass.enabled.out      |   7 +
 .../DanglingDocCommentsClass.java             |  46 ++++++
 .../DanglingDocCommentsEnum.enabled.out       |   8 +
 .../DanglingDocCommentsEnum.java              |  37 +++++
 .../tools/javac/danglingDocComments/empty.out |   0
 .../depDocComment/DeprecatedDocComment3.java  |   6 +-
 .../DanglingDocCommentWarning.java            |  29 ++++
 .../platform/PreviewAPIsWithRelease.java      |   2 +-
 .../tools/javac/warnings/DepAnn.java          |   2 +-
 .../tools/javac/warnings/Deprecation.java     |   2 +-
 .../NestedDeprecation/NestedDeprecation.java  |   2 +-
 .../tools/javac/warnings/Unchecked.java       |   2 +-
 .../warnings/VerifyLintDescriptions.java      |   4 +-
 .../javac/warnings/suppress/T6480588.java     |   2 +-
 58 files changed, 575 insertions(+), 89 deletions(-)
 create mode 100644 make/modules/jdk.accessibility/Java.gmk
 create mode 100644 make/modules/jdk.crypto.cryptoki/Java.gmk
 create mode 100644 make/modules/jdk.security.auth/Java.gmk
 create mode 100644 make/modules/jdk.zipfs/Java.gmk
 create mode 100644 test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out
 create mode 100644 test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java
 create mode 100644 test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out
 create mode 100644 test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java
 create mode 100644 test/langtools/tools/javac/danglingDocComments/empty.out
 create mode 100644 test/langtools/tools/javac/diags/examples/DanglingDocCommentWarning/DanglingDocCommentWarning.java

diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
index 9339250c4fb..599ce9842e4 100644
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -216,7 +216,7 @@ $(eval $(call SetupBuildDemo, SampleTree, \
 ))
 
 $(eval $(call SetupBuildDemo, TableExample, \
-    DISABLED_WARNINGS := rawtypes unchecked deprecation this-escape, \
+    DISABLED_WARNINGS := rawtypes unchecked deprecation this-escape dangling-doc-comments, \
     DEMO_SUBDIR := jfc, \
 ))
 
diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
index 50ffe73a096..feba5d8a902 100644
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, 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
@@ -55,7 +55,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
         build/tools/depend \
         , \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
-    DISABLED_WARNINGS := options, \
+    DISABLED_WARNINGS := dangling-doc-comments options, \
     JAVAC_FLAGS := \
         --add-exports java.desktop/sun.awt=ALL-UNNAMED \
         --add-exports java.base/sun.text=ALL-UNNAMED \
diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index e7d6962fb79..576bc4190b9 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ $(eval $(call SetupJavaCompilation, CLASSLIST_JAR, \
     SMALL_JAVA := false, \
     SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/classlist, \
+    DISABLED_WARNINGS := dangling-doc-comments, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/classlist_classes, \
     JAR := $(SUPPORT_OUTPUTDIR)/classlist.jar, \
 ))
diff --git a/make/modules/java.desktop/Java.gmk b/make/modules/java.desktop/Java.gmk
index 66ef88dcf14..7cc9cf47034 100644
--- a/make/modules/java.desktop/Java.gmk
+++ b/make/modules/java.desktop/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += lossy-conversions this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments lossy-conversions this-escape
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
 COPY += .gif .png .wav .txt .xml .css .pf
diff --git a/make/modules/java.management/Java.gmk b/make/modules/java.management/Java.gmk
index 781370b2e18..7a337946cd7 100644
--- a/make/modules/java.management/Java.gmk
+++ b/make/modules/java.management/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.naming/Java.gmk b/make/modules/java.naming/Java.gmk
index a7ade637af5..207329f5944 100644
--- a/make/modules/java.naming/Java.gmk
+++ b/make/modules/java.naming/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.security.jgss/Java.gmk b/make/modules/java.security.jgss/Java.gmk
index 781370b2e18..7a337946cd7 100644
--- a/make/modules/java.security.jgss/Java.gmk
+++ b/make/modules/java.security.jgss/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.security.sasl/Java.gmk b/make/modules/java.security.sasl/Java.gmk
index 269a1195b6a..136b311a827 100644
--- a/make/modules/java.security.sasl/Java.gmk
+++ b/make/modules/java.security.sasl/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,4 +23,4 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
diff --git a/make/modules/java.sql.rowset/Java.gmk b/make/modules/java.sql.rowset/Java.gmk
index 2dc60515a1b..9f430a7121b 100644
--- a/make/modules/java.sql.rowset/Java.gmk
+++ b/make/modules/java.sql.rowset/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
+
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
 CLEAN_FILES += $(wildcard \
diff --git a/make/modules/java.sql/Java.gmk b/make/modules/java.sql/Java.gmk
index 781370b2e18..7a337946cd7 100644
--- a/make/modules/java.sql/Java.gmk
+++ b/make/modules/java.sql/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.xml.crypto/Java.gmk b/make/modules/java.xml.crypto/Java.gmk
index 53e282aca27..9ee19c8c302 100644
--- a/make/modules/java.xml.crypto/Java.gmk
+++ b/make/modules/java.xml.crypto/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/java.xml/Java.gmk b/make/modules/java.xml/Java.gmk
index cf6f1753f1c..22c1dde2c2b 100644
--- a/make/modules/java.xml/Java.gmk
+++ b/make/modules/java.xml/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += lossy-conversions this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments lossy-conversions this-escape
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \
     javax.xml.transform javax.xml.validation javax.xml.xpath)'
diff --git a/make/modules/jdk.accessibility/Java.gmk b/make/modules/jdk.accessibility/Java.gmk
new file mode 100644
index 00000000000..fc8b2f832d7
--- /dev/null
+++ b/make/modules/jdk.accessibility/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2024, 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.
+#
+
+DISABLED_WARNINGS_java += dangling-doc-comments
diff --git a/make/modules/jdk.crypto.cryptoki/Java.gmk b/make/modules/jdk.crypto.cryptoki/Java.gmk
new file mode 100644
index 00000000000..fc8b2f832d7
--- /dev/null
+++ b/make/modules/jdk.crypto.cryptoki/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2024, 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.
+#
+
+DISABLED_WARNINGS_java += dangling-doc-comments
diff --git a/make/modules/jdk.hotspot.agent/Java.gmk b/make/modules/jdk.hotspot.agent/Java.gmk
index 52cb0c8d91a..333d28a5aa0 100644
--- a/make/modules/jdk.hotspot.agent/Java.gmk
+++ b/make/modules/jdk.hotspot.agent/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,5 +24,5 @@
 #
 
 DISABLED_WARNINGS_java += rawtypes serial cast static overrides \
-    fallthrough this-escape
+    dangling-doc-comments fallthrough this-escape
 COPY += .gif .png .properties
diff --git a/make/modules/jdk.internal.le/Java.gmk b/make/modules/jdk.internal.le/Java.gmk
index 75d99b8d2bb..4c952b63574 100644
--- a/make/modules/jdk.internal.le/Java.gmk
+++ b/make/modules/jdk.internal.le/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,6 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
 
 COPY += .properties .caps .txt
diff --git a/make/modules/jdk.internal.vm.ci/Java.gmk b/make/modules/jdk.internal.vm.ci/Java.gmk
index 0dd5af1f3ea..6bf8ad5e74c 100644
--- a/make/modules/jdk.internal.vm.ci/Java.gmk
+++ b/make/modules/jdk.internal.vm.ci/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
 
 # -parameters provides method's parameters information in class file,
 # JVMCI compilers make use of that information for various sanity checks.
diff --git a/make/modules/jdk.jdi/Java.gmk b/make/modules/jdk.jdi/Java.gmk
index 2e7cf805bc0..12ec29986b9 100644
--- a/make/modules/jdk.jdi/Java.gmk
+++ b/make/modules/jdk.jdi/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape
+
 EXCLUDES += \
     com/sun/tools/example/debug/bdi \
     com/sun/tools/example/debug/event \
diff --git a/make/modules/jdk.jfr/Java.gmk b/make/modules/jdk.jfr/Java.gmk
index 207256fde20..d07f9117c2d 100644
--- a/make/modules/jdk.jfr/Java.gmk
+++ b/make/modules/jdk.jfr/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,6 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += exports
+DISABLED_WARNINGS_java += dangling-doc-comments exports
 COPY := .xsd .xml .dtd .ini
 JAVAC_FLAGS := -XDstringConcat=inline
diff --git a/make/modules/jdk.security.auth/Java.gmk b/make/modules/jdk.security.auth/Java.gmk
new file mode 100644
index 00000000000..fc8b2f832d7
--- /dev/null
+++ b/make/modules/jdk.security.auth/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2024, 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.
+#
+
+DISABLED_WARNINGS_java += dangling-doc-comments
diff --git a/make/modules/jdk.zipfs/Java.gmk b/make/modules/jdk.zipfs/Java.gmk
new file mode 100644
index 00000000000..0771884172f
--- /dev/null
+++ b/make/modules/jdk.zipfs/Java.gmk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2024, 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.
+#
+
+DISABLED_WARNINGS_java += dangling-doc-comments
+
diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
index 00642a1e7cf..d48f263f6f9 100644
--- a/make/test/BuildTestLib.gmk
+++ b/make/test/BuildTestLib.gmk
@@ -64,7 +64,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
     BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
     HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
     JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
-    DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview, \
+    DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview dangling-doc-comments, \
     JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
index 081367fa26a..45c76071f8b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -1059,6 +1059,11 @@ public class JavacTrees extends DocTrees {
                 return "";
             }
 
+            @Override
+            public JCDiagnostic.DiagnosticPosition getPos() {
+                return null;
+            }
+
             @Override
             public int getSourcePos(int index) {
                 return offset + index;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
index 94d121ad04d..9fba9b5318b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -52,10 +52,15 @@ public class DeferredLintHandler {
         return instance;
     }
 
+    /** The Lint to use when {@link #immediate(Lint)} is used,
+     * instead of {@link #setPos(DiagnosticPosition)}. */
+    private Lint immediateLint;
+
     @SuppressWarnings("this-escape")
     protected DeferredLintHandler(Context context) {
         context.put(deferredLintHandlerKey, this);
         this.currentPos = IMMEDIATE_POSITION;
+        immediateLint = Lint.instance(context);
     }
 
     /**An interface for deferred lint reporting - loggers passed to
@@ -63,7 +68,7 @@ public class DeferredLintHandler {
      * {@link #flush(DiagnosticPosition) } is invoked.
      */
     public interface LintLogger {
-        void report();
+        void report(Lint lint);
     }
 
     private DiagnosticPosition currentPos;
@@ -77,7 +82,7 @@ public class DeferredLintHandler {
      */
     public void report(LintLogger logger) {
         if (currentPos == IMMEDIATE_POSITION) {
-            logger.report();
+            logger.report(immediateLint);
         } else {
             ListBuffer<LintLogger> loggers = loggersQueue.get(currentPos);
             if (loggers == null) {
@@ -89,11 +94,11 @@ public class DeferredLintHandler {
 
     /**Invoke all {@link LintLogger}s that were associated with the provided {@code pos}.
      */
-    public void flush(DiagnosticPosition pos) {
+    public void flush(DiagnosticPosition pos, Lint lint) {
         ListBuffer<LintLogger> loggers = loggersQueue.get(pos);
         if (loggers != null) {
             for (LintLogger lintLogger : loggers) {
-                lintLogger.report();
+                lintLogger.report(lint);
             }
             loggersQueue.remove(pos);
         }
@@ -112,7 +117,8 @@ public class DeferredLintHandler {
     /**{@link LintLogger}s passed to subsequent invocations of
      * {@link #report(LintLogger) } will be invoked immediately.
      */
-    public DiagnosticPosition immediate() {
+    public DiagnosticPosition immediate(Lint lint) {
+        immediateLint = lint;
         return setPos(IMMEDIATE_POSITION);
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
index 92b2a773ffa..d024dc75225 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -180,6 +180,12 @@ public class Lint
          */
         CLASSFILE("classfile"),
 
+        /**
+         * Warn about"dangling" documentation comments,
+         * not attached to any declaration.
+         */
+        DANGLING_DOC_COMMENTS("dangling-doc-comments"),
+
         /**
          * Warn about use of deprecated items.
          */
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
index 71c9d59cb27..40a2da35488 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -254,7 +254,7 @@ public class Annotate {
             DiagnosticPosition prevLintPos =
                     deferPos != null
                             ? deferredLintHandler.setPos(deferPos)
-                            : deferredLintHandler.immediate();
+                            : deferredLintHandler.immediate(lint);
             Lint prevLint = deferPos != null ? null : chk.setLint(lint);
             try {
                 if (s.hasAnnotations() && annotations.nonEmpty())
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 0d6e39c8b06..d0f3ae7464a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -979,7 +979,7 @@ public class Attr extends JCTree.Visitor {
         env.info.ctorPrologue = false;
         MethodSymbol prevMethod = chk.setMethod(m);
         try {
-            deferredLintHandler.flush(tree.pos());
+            deferredLintHandler.flush(tree.pos(), lint);
             chk.checkDeprecatedAnnotation(tree.pos(), m);
 
 
@@ -1280,7 +1280,7 @@ public class Attr extends JCTree.Visitor {
 
         try {
             v.getConstValue(); // ensure compile-time constant initializer is evaluated
-            deferredLintHandler.flush(tree.pos());
+            deferredLintHandler.flush(tree.pos(), lint);
             chk.checkDeprecatedAnnotation(tree.pos(), v);
 
             if (tree.init != null) {
@@ -5297,7 +5297,7 @@ public class Attr extends JCTree.Visitor {
         JavaFileObject prev = log.useSource(env.toplevel.sourcefile);
 
         try {
-            deferredLintHandler.flush(env.tree.pos());
+            deferredLintHandler.flush(env.tree.pos(), lint);
             attrib.accept(env);
         } finally {
             log.useSource(prev);
@@ -5472,7 +5472,7 @@ public class Attr extends JCTree.Visitor {
                     }
                 }
 
-                deferredLintHandler.flush(env.tree);
+                deferredLintHandler.flush(env.tree, env.info.lint);
                 env.info.returnResult = null;
                 // java.lang.Enum may not be subclassed by a non-enum
                 if (st.tsym == syms.enumSym &&
@@ -5522,7 +5522,7 @@ public class Attr extends JCTree.Visitor {
         chk.checkDeprecatedAnnotation(tree, msym);
 
         try {
-            deferredLintHandler.flush(tree.pos());
+            deferredLintHandler.flush(tree.pos(), lint);
         } finally {
             chk.setLint(prevLint);
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index 1e717b2b034..e909afc0bdf 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -673,7 +673,7 @@ public class Check {
                 && types.isSameType(tree.expr.type, tree.clazz.type)
                 && !(ignoreAnnotatedCasts && TreeInfo.containsTypeAnnotation(tree.clazz))
                 && !is292targetTypeCast(tree)) {
-            deferredLintHandler.report(() -> {
+            deferredLintHandler.report(_l -> {
                 if (lint.isEnabled(LintCategory.CAST))
                     log.warning(LintCategory.CAST,
                             tree.pos(), Warnings.RedundantCast(tree.clazz.type));
@@ -1350,7 +1350,7 @@ public class Check {
     private void warnOnExplicitStrictfp(DiagnosticPosition pos) {
         DiagnosticPosition prevLintPos = deferredLintHandler.setPos(pos);
         try {
-            deferredLintHandler.report(() -> {
+            deferredLintHandler.report(_l -> {
                                            if (lint.isEnabled(LintCategory.STRICTFP)) {
                                                log.warning(LintCategory.STRICTFP,
                                                            pos, Warnings.Strictfp); }
@@ -3809,13 +3809,13 @@ public class Check {
                 || s.isDeprecated() && !other.isDeprecated())
                 && (s.outermostClass() != other.outermostClass() || s.outermostClass() == null)
                 && s.kind != Kind.PCK) {
-            deferredLintHandler.report(() -> warnDeprecated(pos.get(), s));
+            deferredLintHandler.report(_l -> warnDeprecated(pos.get(), s));
         }
     }
 
     void checkSunAPI(final DiagnosticPosition pos, final Symbol s) {
         if ((s.flags() & PROPRIETARY) != 0) {
-            deferredLintHandler.report(() -> {
+            deferredLintHandler.report(_l -> {
                 log.mandatoryWarning(pos, Warnings.SunProprietary(s));
             });
         }
@@ -3834,10 +3834,10 @@ public class Check {
                     log.error(pos, Errors.IsPreview(s));
                 } else {
                     preview.markUsesPreview(pos);
-                    deferredLintHandler.report(() -> warnPreviewAPI(pos, Warnings.IsPreview(s)));
+                    deferredLintHandler.report(_l -> warnPreviewAPI(pos, Warnings.IsPreview(s)));
                 }
             } else {
-                    deferredLintHandler.report(() -> warnPreviewAPI(pos, Warnings.IsPreviewReflective(s)));
+                    deferredLintHandler.report(_l -> warnPreviewAPI(pos, Warnings.IsPreviewReflective(s)));
             }
         }
         if (preview.declaredUsingPreviewFeature(s)) {
@@ -3846,14 +3846,14 @@ public class Check {
                 //If "s" is compiled from source, then there was an error for it already;
                 //if "s" is from classfile, there already was an error for the classfile.
                 preview.markUsesPreview(pos);
-                deferredLintHandler.report(() -> warnDeclaredUsingPreview(pos, s));
+                deferredLintHandler.report(_l -> warnDeclaredUsingPreview(pos, s));
             }
         }
     }
 
     void checkRestricted(DiagnosticPosition pos, Symbol s) {
         if (s.kind == MTH && (s.flags() & RESTRICTED) != 0) {
-            deferredLintHandler.report(() -> warnRestrictedAPI(pos, s));
+            deferredLintHandler.report(_l -> warnRestrictedAPI(pos, s));
         }
     }
 
@@ -4102,7 +4102,7 @@ public class Check {
             int opc = ((OperatorSymbol)operator).opcode;
             if (opc == ByteCodes.idiv || opc == ByteCodes.imod
                 || opc == ByteCodes.ldiv || opc == ByteCodes.lmod) {
-                deferredLintHandler.report(() -> warnDivZero(pos));
+                deferredLintHandler.report(_l -> warnDivZero(pos));
             }
         }
     }
@@ -4115,7 +4115,7 @@ public class Check {
      */
     void checkLossOfPrecision(final DiagnosticPosition pos, Type found, Type req) {
         if (found.isNumeric() && req.isNumeric() && !types.isAssignable(found, req)) {
-            deferredLintHandler.report(() -> {
+            deferredLintHandler.report(_l -> {
                 if (lint.isEnabled(LintCategory.LOSSY_CONVERSIONS))
                     log.warning(LintCategory.LOSSY_CONVERSIONS,
                             pos, Warnings.PossibleLossOfPrecision(found, req));
@@ -4319,7 +4319,7 @@ public class Check {
                             // Warning may be suppressed by
                             // annotations; check again for being
                             // enabled in the deferred context.
-                            deferredLintHandler.report(() -> {
+                            deferredLintHandler.report(_l -> {
                                 if (lint.isEnabled(LintCategory.MISSING_EXPLICIT_CTOR))
                                    log.warning(LintCategory.MISSING_EXPLICIT_CTOR,
                                                pos, Warnings.MissingExplicitCtor(c, pkg, modle));
@@ -4654,7 +4654,7 @@ public class Check {
 
     void checkModuleExists(final DiagnosticPosition pos, ModuleSymbol msym) {
         if (msym.kind != MDL) {
-            deferredLintHandler.report(() -> {
+            deferredLintHandler.report(_l -> {
                 if (lint.isEnabled(LintCategory.MODULE))
                     log.warning(LintCategory.MODULE, pos, Warnings.ModuleNotFound(msym));
             });
@@ -4664,7 +4664,7 @@ public class Check {
     void checkPackageExistsForOpens(final DiagnosticPosition pos, PackageSymbol packge) {
         if (packge.members().isEmpty() &&
             ((packge.flags() & Flags.HAS_RESOURCE) == 0)) {
-            deferredLintHandler.report(() -> {
+            deferredLintHandler.report(_l -> {
                 if (lint.isEnabled(LintCategory.OPENS))
                     log.warning(pos, Warnings.PackageEmptyOrNotFound(packge));
             });
@@ -4673,7 +4673,7 @@ public class Check {
 
     void checkModuleRequires(final DiagnosticPosition pos, final RequiresDirective rd) {
         if ((rd.module.flags() & Flags.AUTOMATIC_MODULE) != 0) {
-            deferredLintHandler.report(() -> {
+            deferredLintHandler.report(_l -> {
                 if (rd.isTransitive() && lint.isEnabled(LintCategory.REQUIRES_TRANSITIVE_AUTOMATIC)) {
                     log.warning(pos, Warnings.RequiresTransitiveAutomatic);
                 } else if (lint.isEnabled(LintCategory.REQUIRES_AUTOMATIC)) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
index af5f3dccdd6..9366e802b16 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -348,7 +348,7 @@ public class TypeEnter implements Completer {
 
             ImportFilter prevStaticImportFilter = staticImportFilter;
             ImportFilter prevTypeImportFilter = typeImportFilter;
-            DiagnosticPosition prevLintPos = deferredLintHandler.immediate();
+            DiagnosticPosition prevLintPos = deferredLintHandler.immediate(lint);
             Lint prevLint = chk.setLint(lint);
             Env<AttrContext> prevEnv = this.env;
             try {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
index 88de2333069..403cb30921a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -34,6 +34,8 @@ import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
 import com.sun.tools.javac.resources.CompilerProperties.Warnings;
+import com.sun.tools.javac.tree.EndPosTable;
+import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.*;
 
@@ -1207,6 +1209,8 @@ public class JavaTokenizer extends UnicodeReader {
          */
         CommentStyle cs;
 
+        DiagnosticPosition pos;
+
         /**
          * true if comment contains @deprecated at beginning of a line.
          */
@@ -1228,6 +1232,12 @@ public class JavaTokenizer extends UnicodeReader {
         protected BasicComment(CommentStyle cs, UnicodeReader reader, int pos, int endPos) {
             super(reader, pos, endPos);
             this.cs = cs;
+            this.pos = new SimpleDiagnosticPosition(pos) {
+                @Override
+                public int getEndPosition(EndPosTable endPosTable) {
+                    return endPos;
+                }
+            };
         }
 
         /**
@@ -1239,6 +1249,10 @@ public class JavaTokenizer extends UnicodeReader {
             return null;
         }
 
+        public DiagnosticPosition getPos() {
+            return pos;
+        }
+
         /**
          * Return buffer position in original buffer mapped from buffer position in comment.
          *
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index bc53b18b3a5..4eb7aa7c17d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -111,6 +111,12 @@ public class JavacParser implements Parser {
     /** End position mappings container */
     protected final AbstractEndPosTable endPosTable;
 
+    /** A map associating "other nearby documentation comments"
+     *  with the preferred documentation comment for a declaration. */
+    protected Map<Comment, List<Comment>> danglingComments = new HashMap<>();
+    /** Handler for deferred diagnostics. */
+    protected final DeferredLintHandler deferredLintHandler;
+
     // Because of javac's limited lookahead, some contexts are ambiguous in
     // the presence of type annotations even though they are not ambiguous
     // in the absence of type annotations.  Consider this code:
@@ -181,6 +187,7 @@ public class JavacParser implements Parser {
         this.names = fac.names;
         this.source = fac.source;
         this.preview = fac.preview;
+        this.deferredLintHandler = fac.deferredLintHandler;
         this.allowStringFolding = fac.options.getBoolean("allowStringFolding", true);
         this.keepDocComments = keepDocComments;
         this.parseModuleInfo = parseModuleInfo;
@@ -205,6 +212,7 @@ public class JavacParser implements Parser {
         this.names = parser.names;
         this.source = parser.source;
         this.preview = parser.preview;
+        this.deferredLintHandler = parser.deferredLintHandler;
         this.allowStringFolding = parser.allowStringFolding;
         this.keepDocComments = parser.keepDocComments;
         this.parseModuleInfo = false;
@@ -551,16 +559,119 @@ public class JavacParser implements Parser {
      */
     private final DocCommentTable docComments;
 
+    /** Record nearby documentation comments against the
+     *  primary documentation comment for a declaration.
+     *
+     *  Dangling documentation comments are handled as follows.
+     *  1. {@code Scanner} adds all doc comments to a queue of
+     *     recent doc comments. The queue is flushed whenever
+     *     it is known that the recent doc comments should be
+     *     ignored and should not cause any warnings.
+     *  2. The primary documentation comment is the one obtained
+     *     from the first token of any declaration.
+     *     (using {@code token.getDocComment()}.
+     *  3. At the end of the "signature" of the declaration
+     *     (that is, before any initialization or body for the
+     *     declaration) any other "recent" comments are saved
+     *     in a map using the primary comment as a key,
+     *     using this method, {@code saveDanglingComments}.
+     *  4. When the tree node for the declaration is finally
+     *     available, and the primary comment, if any,
+     *     is "attached", (in {@link #attach}) any related
+     *     dangling comments are also attached to the tree node
+     *     by registering them using the {@link #deferredLintHandler}.
+     *  5. (Later) Warnings may be generated for the dangling
+     *     comments, subject to the {@code -Xlint} and
+     *     {@code @SuppressWarnings}.
+     *
+     *  @param dc the primary documentation comment
+     */
+    private void saveDanglingDocComments(Comment dc) {
+        var recentComments = S.getDocComments();
+
+        switch (recentComments.size()) {
+            case 0:
+                // no recent comments
+                return;
+
+            case 1:
+                if (recentComments.peek() == dc) {
+                    // no other recent comments
+                    recentComments.remove();
+                    return;
+                }
+        }
+
+        var lb = new ListBuffer<Comment>();
+        while (!recentComments.isEmpty()) {
+            var c = recentComments.remove();
+            if (c != dc) {
+                lb.add(c);
+            }
+        }
+        danglingComments.put(dc, lb.toList());
+    }
+
     /** Make an entry into docComments hashtable,
      *  provided flag keepDocComments is set and given doc comment is non-null.
+     *  If there are any related "dangling comments", register
+     *  diagnostics to be handled later, when @SuppressWarnings
+     *  can be taken into account.
+     *
      *  @param tree   The tree to be used as index in the hashtable
      *  @param dc     The doc comment to associate with the tree, or null.
      */
     protected void attach(JCTree tree, Comment dc) {
         if (keepDocComments && dc != null) {
-//          System.out.println("doc comment = ");System.out.println(dc);//DEBUG
             docComments.putComment(tree, dc);
         }
+        reportDanglingComments(tree, dc);
+    }
+
+    /** Reports all dangling comments associated with the
+     *  primary comment for a declaration against the position
+     *  of the tree node for a declaration.
+     *
+     * @param tree the tree node for the declaration
+     * @param dc the primary comment for the declaration
+     */
+    void reportDanglingComments(JCTree tree, Comment dc) {
+        var list = danglingComments.remove(dc);
+        if (list != null) {
+            var prevPos = deferredLintHandler.setPos(tree);
+            try {
+                list.forEach(this::reportDanglingDocComment);
+            } finally {
+                deferredLintHandler.setPos(prevPos);
+            }
+        }
+    }
+
+    /**
+     * Reports an individual dangling comment using the {@link #deferredLintHandler}.
+     * The comment may or not may generate an actual diagnostic, depending on
+     * the settings for {@code -Xlint} and/or {@code @SuppressWarnings}.
+     *
+     * @param c the comment
+     */
+    void reportDanglingDocComment(Comment c) {
+        var pos = c.getPos();
+        if (pos != null) {
+            deferredLintHandler.report(lint -> {
+                if (lint.isEnabled(Lint.LintCategory.DANGLING_DOC_COMMENTS)) {
+                    log.warning(Lint.LintCategory.DANGLING_DOC_COMMENTS,
+                            pos, Warnings.DanglingDocComment);
+                }
+            });
+        }
+    }
+
+    /**
+     * Ignores any recent documentation comments found by the scanner,
+     * such as those that cannot be associated with a nearby declaration.
+     */
+    private void ignoreDanglingComments() {
+        S.getDocComments().clear();
     }
 
 /* -------- source positions ------- */
@@ -2626,6 +2737,7 @@ public class JavacParser implements Parser {
         List<JCExpression> args = arguments();
         JCClassDecl body = null;
         if (token.kind == LBRACE) {
+            ignoreDanglingComments(); // ignore any comments from before the '{'
             int pos = token.pos;
             List<JCTree> defs = classInterfaceOrRecordBody(names.empty, false, false);
             JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
@@ -2678,6 +2790,7 @@ public class JavacParser implements Parser {
      */
     JCBlock block(int pos, long flags) {
         accept(LBRACE);
+        ignoreDanglingComments();   // ignore any comments from before the '{'
         List<JCStatement> stats = blockStatements();
         JCBlock t = F.at(pos).Block(flags, stats);
         while (token.kind == CASE || token.kind == DEFAULT) {
@@ -2709,6 +2822,7 @@ public class JavacParser implements Parser {
         ListBuffer<JCStatement> stats = new ListBuffer<>();
         while (true) {
             List<JCStatement> stat = blockStatement();
+            ignoreDanglingComments();  // ignore comments not consumed by the statement
             if (stat.isEmpty()) {
                 return stats.toList();
             } else {
@@ -2780,7 +2894,7 @@ public class JavacParser implements Parser {
                 return List.of(classOrRecordOrInterfaceOrEnumDeclaration(mods, dc));
             } else {
                 JCExpression t = parseType(true);
-                return localVariableDeclarations(mods, t);
+                return localVariableDeclarations(mods, t, dc);
             }
         }
         case ABSTRACT: case STRICTFP: {
@@ -2866,8 +2980,8 @@ public class JavacParser implements Parser {
                 }
             }
         }
+        dc = token.docComment();
         if (isRecordStart() && allowRecords) {
-            dc = token.docComment();
             return List.of(recordDeclaration(F.at(pos).Modifiers(0), dc));
         } else {
             Token prevToken = token;
@@ -2880,7 +2994,7 @@ public class JavacParser implements Parser {
                 pos = token.pos;
                 JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
                 F.at(pos);
-                return localVariableDeclarations(mods, t);
+                return localVariableDeclarations(mods, t, dc);
             } else {
                 // This Exec is an "ExpressionStatement"; it subsumes the terminating semicolon
                 t = checkExprStat(t);
@@ -2891,7 +3005,11 @@ public class JavacParser implements Parser {
         }
     }
     //where
-        private List<JCStatement> localVariableDeclarations(JCModifiers mods, JCExpression type) {
+        private List<JCStatement> localVariableDeclarations(JCModifiers mods, JCExpression type, Comment dc) {
+            if (dc != null) {
+                // ignore a well-placed doc comment, but save any misplaced ones
+                saveDanglingDocComments(dc);
+            }
             ListBuffer<JCStatement> stats =
                     variableDeclarators(mods, type, new ListBuffer<>(), true);
             // A "LocalVariableDeclarationStatement" subsumes the terminating semicolon
@@ -2919,6 +3037,7 @@ public class JavacParser implements Parser {
      *     | ";"
      */
     public JCStatement parseSimpleStatement() {
+        ignoreDanglingComments(); // ignore comments before statement
         int pos = token.pos;
         switch (token.kind) {
         case LBRACE:
@@ -3649,6 +3768,8 @@ public class JavacParser implements Parser {
             name = names.empty;
         }
 
+        saveDanglingDocComments(dc);
+
         if (token.kind == EQ) {
             nextToken();
             init = variableInitializer();
@@ -4221,6 +4342,9 @@ public class JavacParser implements Parser {
             implementing = typeList();
         }
         List<JCExpression> permitting = permitsClause(mods, "class");
+
+        saveDanglingDocComments(dc);
+
         List<JCTree> defs = classInterfaceOrRecordBody(name, false, false);
         JCClassDecl result = toP(F.at(pos).ClassDef(
             mods, name, typarams, extending, implementing, permitting, defs));
@@ -4243,6 +4367,9 @@ public class JavacParser implements Parser {
             nextToken();
             implementing = typeList();
         }
+
+        saveDanglingDocComments(dc);
+
         List<JCTree> defs = classInterfaceOrRecordBody(name, false, true);
         java.util.List<JCVariableDecl> fields = new ArrayList<>();
         for (JCVariableDecl field : headerFields) {
@@ -4302,6 +4429,9 @@ public class JavacParser implements Parser {
             extending = typeList();
         }
         List<JCExpression> permitting = permitsClause(mods, "interface");
+
+        saveDanglingDocComments(dc);
+
         List<JCTree> defs;
         defs = classInterfaceOrRecordBody(name, true, false);
         JCClassDecl result = toP(F.at(pos).ClassDef(
@@ -4347,6 +4477,8 @@ public class JavacParser implements Parser {
             implementing = typeList();
         }
 
+        saveDanglingDocComments(dc);
+
         List<JCTree> defs = enumBody(name);
         mods.flags |= Flags.ENUM;
         JCClassDecl result = toP(F.at(pos).
@@ -4474,8 +4606,12 @@ public class JavacParser implements Parser {
         int identPos = token.pos;
         Name name = ident();
         int createPos = token.pos;
+
+        saveDanglingDocComments(dc);
+
         List<JCExpression> args = (token.kind == LPAREN)
             ? arguments() : List.nil();
+
         JCClassDecl body = null;
         if (token.kind == LBRACE) {
             JCModifiers mods1 = F.at(Position.NOPOS).Modifiers(Flags.ENUM);
@@ -4580,6 +4716,7 @@ public class JavacParser implements Parser {
                 } else if (isRecord && (mods.flags & Flags.STATIC) == 0) {
                     log.error(DiagnosticFlag.SYNTAX, token.pos, Errors.InstanceInitializerNotAllowedInRecords);
                 }
+                ignoreDanglingComments();   // no declaration with which dangling comments can be associated
                 return List.of(block(pos, mods.flags));
             } else {
                 return constructorOrMethodOrFieldDeclaration(mods, className, isInterface, isRecord, dc);
@@ -4857,6 +4994,9 @@ public class JavacParser implements Parser {
                     thrown = qualidentList(true);
                 }
             }
+
+            saveDanglingDocComments(dc);
+
             JCBlock body = null;
             JCExpression defaultValue;
             if (token.kind == LBRACE) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java
index 2223999bebe..bff4e027db7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Lexer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package com.sun.tools.javac.parser;
 
+import java.util.Queue;
+
 import com.sun.tools.javac.parser.Tokens.*;
 import com.sun.tools.javac.util.Position.LineMap;
 
@@ -89,4 +91,16 @@ public interface Lexer {
      * @return a LineMap
      */
     LineMap getLineMap();
+
+    /**
+     * Returns a queue for the documentation comments encountered
+     * in a compilation unit.
+     *
+     * Comments may be added to this queue by the implementation;
+     * clients may remove them from the queue as they are analyzed.
+     *
+     * Note: all comments may also be associated with the following
+     * token.
+     */
+    Queue<Comment> getDocComments();
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
index d27a785e363..3c07c382aa3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@ package com.sun.tools.javac.parser;
 
 import java.util.Locale;
 
+import com.sun.tools.javac.code.DeferredLintHandler;
+import com.sun.tools.javac.code.Lint;
 import com.sun.tools.javac.code.Preview;
 import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.tree.DocTreeMaker;
@@ -68,6 +70,7 @@ public class ParserFactory {
     final Options options;
     final ScannerFactory scannerFactory;
     final Locale locale;
+    final DeferredLintHandler deferredLintHandler;
 
     @SuppressWarnings("this-escape")
     protected ParserFactory(Context context) {
@@ -83,6 +86,7 @@ public class ParserFactory {
         this.options = Options.instance(context);
         this.scannerFactory = ScannerFactory.instance(context);
         this.locale = context.get(Locale.class);
+        this.deferredLintHandler = DeferredLintHandler.instance(context);
     }
 
     public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
index 3cfb8b9ddbe..a182c74b07b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,10 @@
 package com.sun.tools.javac.parser;
 
 import java.nio.*;
+import java.util.ArrayDeque;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Queue;
 
 import com.sun.tools.javac.util.Position.LineMap;
 import static com.sun.tools.javac.parser.Tokens.*;
@@ -58,6 +60,11 @@ public class Scanner implements Lexer {
 
     private final JavaTokenizer tokenizer;
 
+    /** Queue of recently seen documentation comments.
+     *  It is assumed the queue will typically be small.
+     */
+    private final Queue<Comment> docComments = new ArrayDeque<>();
+
     /**
      * Create a scanner from the input array.  This method might
      * modify the array.  To avoid copying the input array, ensure
@@ -115,6 +122,15 @@ public class Scanner implements Lexer {
             token = savedTokens.remove(0);
         } else {
             token = tokenizer.readToken();
+            if (token.comments != null) {
+                for (var c : token.comments) {
+                    switch (c.getStyle()) {
+                        case JAVADOC -> {
+                            docComments.add(c);
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -129,6 +145,11 @@ public class Scanner implements Lexer {
         return tokenizer.getLineMap();
     }
 
+    @Override
+    public Queue<Comment> getDocComments() {
+        return docComments;
+    }
+
     public int errPos() {
         return tokenizer.errPos();
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
index b6be0a84b7d..a05d48d320b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -280,6 +280,7 @@ public class Tokens {
         }
 
         String getText();
+        JCDiagnostic.DiagnosticPosition getPos();
         int getSourcePos(int index);
         CommentStyle getStyle();
         boolean isDeprecated();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/VirtualParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/VirtualParser.java
index 1d716f75a90..f32c1bf4756 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/VirtualParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/VirtualParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.Position.LineMap;
 
 import java.util.Optional;
+import java.util.Queue;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -146,6 +147,11 @@ public class VirtualParser extends JavacParser {
             return token;
         }
 
+        @Override
+        public Queue<Tokens.Comment> getDocComments() {
+            return S.getDocComments();
+        }
+
         @Override
         public int errPos() {
             return S.errPos();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 273c5bef7b4..26c16ebdc2c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1869,6 +1869,9 @@ compiler.warn.lintOption=\
 compiler.warn.constant.SVUID=\
     serialVersionUID must be constant in class {0}
 
+compiler.warn.dangling.doc.comment=\
+    documentation comment is not attached to any declaration
+
 # 0: path
 compiler.warn.dir.path.element.not.found=\
     bad path element "{0}": no such directory
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index 7893d328afa..0566272ca1b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2024, 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
@@ -189,6 +189,9 @@ javac.opt.Xlint.desc.cast=\
 javac.opt.Xlint.desc.classfile=\
     Warn about issues related to classfile contents.
 
+javac.opt.Xlint.desc.dangling-doc-comments=\
+    Warn about dangling documentation comments, not attached to any declaration.
+
 javac.opt.Xlint.desc.missing-explicit-ctor=\
     Warn about missing explicit constructors in public and protected classes in exported packages.
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
index afa590240e2..c729b6ff832 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -218,6 +218,11 @@ public class DocTreeMaker implements DocTreeFactory {
                 return null;
             }
 
+            @Override
+            public JCDiagnostic.DiagnosticPosition getPos() {
+                return null;
+            }
+
             @Override
             public int getSourcePos(int index) {
                 return Position.NOPOS;
diff --git a/src/jdk.compiler/share/classes/module-info.java b/src/jdk.compiler/share/classes/module-info.java
index 9826b3f576b..9b12171ef6d 100644
--- a/src/jdk.compiler/share/classes/module-info.java
+++ b/src/jdk.compiler/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -153,6 +153,8 @@ import javax.tools.StandardLocation;
  *                                                      from other files
  * <tr><th scope="row">{@code cast}                 <td>use of unnecessary casts
  * <tr><th scope="row">{@code classfile}            <td>issues related to classfile contents
+ * <tr><th scope="row">{@code dangling-doc-comments} <td>issues related to "dangling" documentation comments,
+ *                                                       not attached to a declaration
  * <tr><th scope="row">{@code deprecation}          <td>use of deprecated items
  * <tr><th scope="row">{@code dep-ann}              <td>items marked as deprecated in a documentation comment but not
  *                                                      using the {@code @Deprecated} annotation
diff --git a/src/jdk.compiler/share/man/javac.1 b/src/jdk.compiler/share/man/javac.1
index ab429ab7d9a..6586bcaf83f 100644
--- a/src/jdk.compiler/share/man/javac.1
+++ b/src/jdk.compiler/share/man/javac.1
@@ -708,6 +708,9 @@ in a source file, and is used from other files.
 \f[V]classfile\f[R]: Warns about the issues related to classfile
 contents.
 .IP \[bu] 2
+\f[V]dangling-doc-comments\f[R]: Warns about extra or misplaced
+documentation comments near the beginning of a declaration.
+.IP \[bu] 2
 \f[V]deprecation\f[R]: Warns about the use of deprecated items.
 .IP \[bu] 2
 \f[V]dep-ann\f[R]: Warns about the items marked as deprecated in
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java
index 51f45627f31..4628d851ab0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocMemberEnter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -132,8 +132,8 @@ public class JavadocMemberEnter extends MemberEnter {
                 tree.accept(this);
         }
 
-        @Override
         /** default for any non-overridden visit method. */
+        @Override
         public void visitTree(JCTree tree) {
             maybeConstantExpr = false;
         }
diff --git a/src/jdk.javadoc/share/man/javadoc.1 b/src/jdk.javadoc/share/man/javadoc.1
index 30256207b3e..d42d7137657 100644
--- a/src/jdk.javadoc/share/man/javadoc.1
+++ b/src/jdk.javadoc/share/man/javadoc.1
@@ -96,6 +96,22 @@ option either to recursively traverse a directory and its
 subdirectories, or to pass in an explicit list of package names.
 When you document individual source files, pass in a list of Java source
 file names.
+.SS Documentation Comments
+.PP
+The \f[V]javadoc\f[R] tool uses the documentation comment, if any, that
+immediately precedes the beginning of the declaration, whether that is
+an annotation, modifier, or the name being declared.
+If there are multiple documentation comments before the declaration,
+only the last one (closest to the declaration) will be used.
+If there are any documentation comments after the beginning of the
+declaration, they will be ignored.
+To check for any extra or misplaced documentation comments, compile your
+source code with the \f[V]javac\f[R] option \f[V]-Xlint\f[R], or more
+specifically, \f[V]-Xlint:dangling-doc-comments\f[R].
+Within a source file, you may use suppress any warnings generated by
+these options by using
+\f[V]\[at]SuppressWarnings(\[dq]dangling-doc-comments\[dq])\f[R] on a
+suitable enclosing declaration.
 .SS Conformance
 .PP
 The standard doclet does not validate the content of documentation
diff --git a/test/langtools/tools/javac/OverrideChecks/6199153/T6199153.java b/test/langtools/tools/javac/OverrideChecks/6199153/T6199153.java
index 4a800d1f415..d696301f6d2 100644
--- a/test/langtools/tools/javac/OverrideChecks/6199153/T6199153.java
+++ b/test/langtools/tools/javac/OverrideChecks/6199153/T6199153.java
@@ -1,4 +1,4 @@
-/**
+/*
  * @test /nodynamiccopyright/
  * @bug 6199153
  * @summary Generic throws and overriding
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out
new file mode 100644
index 00000000000..76082537ed9
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out
@@ -0,0 +1,7 @@
+DanglingDocCommentsClass.java:8:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:11:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:12:8: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:12:69: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:13:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:17:5: compiler.warn.dangling.doc.comment
+6 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java
new file mode 100644
index 00000000000..2075bf4495a
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java
@@ -0,0 +1,46 @@
+/*
+ * @test /nodynamiccopyright/
+ * @compile -Xlint:dangling-doc-comments DanglingDocCommentsClass.java
+ * @compile/ref=empty.out -XDrawDiagnostics DanglingDocCommentsClass.java
+ * @compile/ref=DanglingDocCommentsClass.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsClass.java
+ */
+
+/** Bad/Extra Class Comment. */
+/** Good Class Comment. */
+@Deprecated
+/** Misplaced: after anno. */
+public /** Misplaced: after mods. */ class DanglingDocCommentsClass /** Misplaced: after ident */ {
+    /** Bad/Extra Field Comment. */
+    /** Good Field Comment. */
+    public int i;
+
+    /** Bad/Extra Method Comment. */
+    /** Good Method Comment. */
+    public void m1() { }
+
+    @SuppressWarnings("dangling-doc-comments")
+    /** Bad/misplaced/suppressed comment. */
+    public void m2() { }
+
+    public void m3(boolean b) {
+        /****************
+         * Box comment  *
+         ***************/
+        if (b) return;
+    }
+
+    public void m4a() {
+        /** Not a doc comment. */
+        System.out.println();
+        /** Not a doc comment; not dangling for m4b */
+    }
+
+    /** Good comment for m4b; no dangling comments. */
+    public void m4b() { }
+
+    /** Comment ignored here: does not affect decls in block */
+    static {
+        /** Good comment. */
+        int i = 0;
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out
new file mode 100644
index 00000000000..78dfd6e9633
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out
@@ -0,0 +1,8 @@
+DanglingDocCommentsEnum.java:8:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:11:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:12:8: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:12:67: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:14:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:20:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:26:5: compiler.warn.dangling.doc.comment
+7 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java
new file mode 100644
index 00000000000..eae98433b70
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java
@@ -0,0 +1,37 @@
+/*
+ * @test /nodynamiccopyright/
+ * @compile -Xlint:dangling-doc-comments DanglingDocCommentsEnum.java
+ * @compile/ref=empty.out -XDrawDiagnostics DanglingDocCommentsEnum.java
+ * @compile/ref=DanglingDocCommentsEnum.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsEnum.java
+ */
+
+/** Bad/Extra Enum Comment. */
+/** Good Enum Comment. */
+@Deprecated
+/** Misplaced: after anno. */
+public /** Misplaced: after mods. */ enum DanglingDocCommentsEnum /** Misplaced: after ident */
+{
+    /** Bad/Extra enum-member Comment. */
+    /**
+     * Good enum-member Comment.
+     */
+    E1;
+
+    /** Bad/Extra Field Comment. */
+    /**
+     * Good Field Comment.
+     */
+    public int i;
+
+    /** Bad/Extra Method Comment. */
+    /**
+     * Good Method Comment.
+     */
+    public void m1() {
+    }
+
+    @SuppressWarnings("dangling-doc-comments")
+    /** Bad/misplaced/suppressed comment. */
+    public void m2() {
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/danglingDocComments/empty.out b/test/langtools/tools/javac/danglingDocComments/empty.out
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/langtools/tools/javac/depDocComment/DeprecatedDocComment3.java b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment3.java
index d7f4dbc0f2c..4765444f069 100644
--- a/test/langtools/tools/javac/depDocComment/DeprecatedDocComment3.java
+++ b/test/langtools/tools/javac/depDocComment/DeprecatedDocComment3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 7096014
  * @summary Javac tokens should retain state
- * @compile -Xlint -Werror DeprecatedDocComment3.java
+ * @compile -Xlint:-dangling-doc-comments -Werror DeprecatedDocComment3.java
  */
 
 class DeprecatedDocComment3 {
diff --git a/test/langtools/tools/javac/diags/examples/DanglingDocCommentWarning/DanglingDocCommentWarning.java b/test/langtools/tools/javac/diags/examples/DanglingDocCommentWarning/DanglingDocCommentWarning.java
new file mode 100644
index 00000000000..9e87c2d0482
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/DanglingDocCommentWarning/DanglingDocCommentWarning.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+// key: compiler.warn.dangling.doc.comment
+// options: -Xlint:dangling-doc-comments
+
+/** Comment 1. */
+/** Comment 2. */
+class DanglingDocCommentWarning { }
diff --git a/test/langtools/tools/javac/platform/PreviewAPIsWithRelease.java b/test/langtools/tools/javac/platform/PreviewAPIsWithRelease.java
index 155dd5335d9..a9167fc34df 100644
--- a/test/langtools/tools/javac/platform/PreviewAPIsWithRelease.java
+++ b/test/langtools/tools/javac/platform/PreviewAPIsWithRelease.java
@@ -1,4 +1,4 @@
-/**
+/*
  * @test /nodynamiccopyright/
  * @bug 8246704
  * @summary Verify preview APIs are reported correctly when using --release.
diff --git a/test/langtools/tools/javac/warnings/DepAnn.java b/test/langtools/tools/javac/warnings/DepAnn.java
index 4f25d290e7b..d725258cf3a 100644
--- a/test/langtools/tools/javac/warnings/DepAnn.java
+++ b/test/langtools/tools/javac/warnings/DepAnn.java
@@ -1,7 +1,7 @@
 /*
  * @test /nodynamiccopyright/
  * @bug 4986256
- * @compile/ref=DepAnn.out -XDrawDiagnostics -Xlint:all DepAnn.java
+ * @compile/ref=DepAnn.out -XDrawDiagnostics -Xlint:all,-dangling-doc-comments DepAnn.java
  */
 
 // control: this class should generate warnings
diff --git a/test/langtools/tools/javac/warnings/Deprecation.java b/test/langtools/tools/javac/warnings/Deprecation.java
index 4a9d4fb2b3a..551ce6dc13e 100644
--- a/test/langtools/tools/javac/warnings/Deprecation.java
+++ b/test/langtools/tools/javac/warnings/Deprecation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * @test  /nodynamiccopyright/
  * @bug 4986256 6598104 8032211 8194764
  * @compile/ref=Deprecation.noLint.out                                                   -XDrawDiagnostics Deprecation.java
diff --git a/test/langtools/tools/javac/warnings/NestedDeprecation/NestedDeprecation.java b/test/langtools/tools/javac/warnings/NestedDeprecation/NestedDeprecation.java
index 2e41f72b58b..0e4d19826ee 100644
--- a/test/langtools/tools/javac/warnings/NestedDeprecation/NestedDeprecation.java
+++ b/test/langtools/tools/javac/warnings/NestedDeprecation/NestedDeprecation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * @test  /nodynamiccopyright/
  * @bug 6598104 8032211
  * @build p.Dep1 p.Dep2
diff --git a/test/langtools/tools/javac/warnings/Unchecked.java b/test/langtools/tools/javac/warnings/Unchecked.java
index 7d5e4aa83a4..e64fd760a07 100644
--- a/test/langtools/tools/javac/warnings/Unchecked.java
+++ b/test/langtools/tools/javac/warnings/Unchecked.java
@@ -1,4 +1,4 @@
-/**
+/*
  * @test  /nodynamiccopyright/
  * @bug 4986256
  * @compile/ref=Unchecked.noLint.out                         -XDrawDiagnostics Unchecked.java
diff --git a/test/langtools/tools/javac/warnings/VerifyLintDescriptions.java b/test/langtools/tools/javac/warnings/VerifyLintDescriptions.java
index 54472a3b682..4a025ca497f 100644
--- a/test/langtools/tools/javac/warnings/VerifyLintDescriptions.java
+++ b/test/langtools/tools/javac/warnings/VerifyLintDescriptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8033961
  * @summary Verify that all LintCategories have their descriptions filled.
diff --git a/test/langtools/tools/javac/warnings/suppress/T6480588.java b/test/langtools/tools/javac/warnings/suppress/T6480588.java
index 84454d251a1..da9513709d9 100644
--- a/test/langtools/tools/javac/warnings/suppress/T6480588.java
+++ b/test/langtools/tools/javac/warnings/suppress/T6480588.java
@@ -1,4 +1,4 @@
-/**
+/*
  * @test /nodynamiccopyright/
  * @bug 6470588
  * @summary Verify that \\@SuppressWarnings("deprecation") works OK for all parts

From aee91fbc70df716b96c202511b4ff1b302df8d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 26 Apr 2024 19:59:57 +0000
Subject: [PATCH 223/486] 8296175: Output warning if generated docs contain
 diagnostic markers

Reviewed-by: jjg
---
 .../doclets/formats/html/HtmlDoclet.java      |  4 +++
 .../formats/html/HtmlDocletWriter.java        |  1 +
 .../internal/doclets/toolkit/Messages.java    | 16 +++++++++
 .../toolkit/resources/doclets.properties      |  2 ++
 .../jdk/javadoc/tool/doclint/DocLintTest.java | 33 ++++++++++++-------
 5 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
index aedaee2b828..17867e368bf 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
@@ -335,6 +335,10 @@ public class HtmlDoclet extends AbstractDoclet {
                     DocPaths.RESOURCE_FILES.resolve(DocPaths.JQUERY_UI_CSS), false);        }
 
         copyLegalFiles(options.createIndex());
+        // Print a notice if the documentation contains diagnostic markers
+        if (messages.containsDiagnosticMarkers()) {
+            messages.notice("doclet.contains.diagnostic.markers");
+        }
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 25ec603a064..3e461dc3e74 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -1611,6 +1611,7 @@ public abstract class HtmlDocletWriter {
      * @return the output
      */
     public Content invalidTagOutput(String summary, Optional<Content> detail) {
+        messages.setContainsDiagnosticMarkers();
         if (detail.isEmpty() || detail.get().isEmpty()) {
             return HtmlTree.SPAN(HtmlStyle.invalidTag, Text.of(summary));
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java
index 9183804ddc6..576bf64e751 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Messages.java
@@ -47,6 +47,7 @@ public class Messages {
     private final BaseConfiguration configuration;
     private final Resources resources;
     private final Reporter reporter;
+    private boolean containsDiagnosticMarkers = false;
 
     /**
      * Creates a {@code Messages} object to provide standardized access to
@@ -212,6 +213,21 @@ public class Messages {
         }
     }
 
+    /**
+     * {@return true if the generated documentation contains one or more diagnostic markers
+     * for invalid input}
+     */
+    public boolean containsDiagnosticMarkers() {
+        return containsDiagnosticMarkers;
+    }
+
+    /**
+     * Sets the flag for documentation containing a diagnostic marker for invalid input.
+     */
+    public void setContainsDiagnosticMarkers() {
+        this.containsDiagnosticMarkers = true;
+    }
+
     // ***** Internal support *****
 
     private void report(Diagnostic.Kind k, String msg) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
index 7c5b43d35df..859289ff8bd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
@@ -262,6 +262,8 @@ doclet.urlRedirected=URL {0} was redirected to {1} -- Update the command-line op
 doclet.unexpectedRedirect=Unexpected redirection for URL {0} to {1}
 doclet.duplicate.comment.for.property=Duplicate comment for property.\n\
   Remove the comment on the property field or on this method to suppress this warning.
+doclet.contains.diagnostic.markers=\
+ The generated documentation contains diagnostic markers for invalid input.
 
 #Documentation for Enums
 doclet.enum_values_doc.fullbody=\
diff --git a/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java b/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java
index 4af51070468..ff6e5ec8dff 100644
--- a/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java
+++ b/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8004834 8007610 8129909 8182765 8247815
+ * @bug 8004834 8007610 8129909 8182765 8247815 8296175
  * @summary Add doclint support into javadoc
  * @modules jdk.compiler/com.sun.tools.javac.main
  */
@@ -117,7 +117,10 @@ public class DocLintTest {
         // javadoc messages for bad options
         OPT_BADARG(ERROR, "error: Invalid argument for -Xdoclint option"),
         OPT_BADQUAL(ERROR, "error: Access qualifiers not permitted for -Xdoclint arguments"),
-        OPT_BADPACKAGEARG(ERROR, "error: Invalid argument for -Xdoclint/package option");
+        OPT_BADPACKAGEARG(ERROR, "error: Invalid argument for -Xdoclint/package option"),
+
+        // javadoc notice about markers for invalid input
+        JD_NOTE_MARK(NOTE, "The generated documentation contains diagnostic markers for invalid input.");
 
         final Diagnostic.Kind kind;
         final String text;
@@ -151,11 +154,13 @@ public class DocLintTest {
 
             test(List.of(htmlVersion),
                     Main.Result.ERROR,
-                    EnumSet.of(Message.DL_ERR10A, Message.DL_WRN14A));
+                    EnumSet.of(Message.DL_ERR10A, Message.DL_WRN14A,
+                            Message.JD_NOTE_MARK));
 
             test(List.of(htmlVersion, rawDiags),
                     Main.Result.ERROR,
-                    EnumSet.of(Message.DL_ERR10, Message.DL_WRN14));
+                    EnumSet.of(Message.DL_ERR10, Message.DL_WRN14,
+                            Message.JD_NOTE_MARK));
 
 //            test(List.of("-Xdoclint:none"),
 //                    Main.Result.OK,
@@ -163,7 +168,8 @@ public class DocLintTest {
 
             test(List.of(htmlVersion, rawDiags, "-Xdoclint"),
                     Main.Result.ERROR,
-                    EnumSet.of(Message.DL_ERR10, Message.DL_WRN14));
+                    EnumSet.of(Message.DL_ERR10, Message.DL_WRN14,
+                            Message.JD_NOTE_MARK));
 
             test(List.of(htmlVersion, rawDiags, "-Xdoclint:all/public"),
                     Main.Result.ERROR,
@@ -175,19 +181,21 @@ public class DocLintTest {
 
             test(List.of(htmlVersion, rawDiags, "-Xdoclint:missing"),
                     Main.Result.OK,
-                    EnumSet.of(Message.DL_WRN14));
+                    EnumSet.of(Message.DL_WRN14, Message.JD_NOTE_MARK));
 
             test(List.of(htmlVersion, rawDiags, "-private"),
                     Main.Result.ERROR,
-                    EnumSet.of(Message.DL_ERR6, Message.DL_ERR10, Message.DL_WRN14));
+                    EnumSet.of(Message.DL_ERR6, Message.DL_ERR10,
+                            Message.DL_WRN14, Message.JD_NOTE_MARK));
 
             test(List.of(htmlVersion, rawDiags, "-Xdoclint:missing,syntax", "-private"),
                     Main.Result.ERROR,
-                    EnumSet.of(Message.DL_ERR6, Message.DL_WRN14));
+                    EnumSet.of(Message.DL_ERR6, Message.DL_WRN14,
+                            Message.JD_NOTE_MARK));
 
             test(List.of(htmlVersion, rawDiags, "-Xdoclint:reference"),
                     Main.Result.ERROR,
-                    EnumSet.of(Message.DL_ERR10));
+                    EnumSet.of(Message.DL_ERR10, Message.JD_NOTE_MARK));
 
             test(List.of(htmlVersion, rawDiags, "-Xdoclint:badarg"),
                     Main.Result.ERROR,
@@ -199,12 +207,13 @@ public class DocLintTest {
             test(List.of(htmlVersion, rawDiags),
                     Main.Result.ERROR,
                     EnumSet.of(Message.DL_ERR_P1TEST, Message.DL_ERR_P2TEST,
-                            Message.DL_WARN_P1TEST, Message.DL_WARN_P2TEST));
+                            Message.DL_WARN_P1TEST, Message.DL_WARN_P2TEST, Message.JD_NOTE_MARK));
 
             test(List.of(htmlVersion, rawDiags, "-Xdoclint/package:p1"),
                     Main.Result.ERROR,
                     EnumSet.of(Message.DL_ERR_P1TEST,
-                            Message.DL_WARN_P1TEST));
+                            Message.DL_WARN_P1TEST,
+                            Message.JD_NOTE_MARK));
 
             test(List.of(htmlVersion, rawDiags, "-Xdoclint/package:*p"),
                     Main.Result.ERROR,

From aa2edd491345cca1d8798848d71b151bc06c6c02 Mon Sep 17 00:00:00 2001
From: Jin Kwon <onacit@gmail.com>
Date: Sat, 27 Apr 2024 01:11:33 +0000
Subject: [PATCH 224/486] 8330686: Fix typos in the DatabaseMetaData javadoc

Reviewed-by: jpai, lancea, iris
---
 .../share/classes/java/sql/DatabaseMetaData.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/java.sql/share/classes/java/sql/DatabaseMetaData.java b/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
index 6f63c2989b8..f4cb8787b5f 100644
--- a/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
+++ b/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
@@ -1215,7 +1215,7 @@ public interface DatabaseMetaData extends Wrapper {
      * Only procedure descriptions matching the schema and
      * procedure name criteria are returned.  They are ordered by
      * {@code PROCEDURE_CAT}, {@code PROCEDURE_SCHEM},
-     * {@code PROCEDURE_NAME} and {@code SPECIFIC_ NAME}.
+     * {@code PROCEDURE_NAME} and {@code SPECIFIC_NAME}.
      *
      * <P>Each procedure description has the following columns:
      *  <OL>
@@ -3289,7 +3289,7 @@ public interface DatabaseMetaData extends Wrapper {
      * function name criteria are returned.  They are ordered by
      * {@code FUNCTION_CAT}, {@code FUNCTION_SCHEM},
      * {@code FUNCTION_NAME} and
-     * {@code SPECIFIC_ NAME}.
+     * {@code SPECIFIC_NAME}.
      *
      * <P>Each function description has the following columns:
      *  <OL>
@@ -3339,7 +3339,7 @@ public interface DatabaseMetaData extends Wrapper {
      * parameter name criteria are returned. They are ordered by
      * {@code FUNCTION_CAT}, {@code FUNCTION_SCHEM},
      * {@code FUNCTION_NAME} and
-     * {@code SPECIFIC_ NAME}. Within this, the return value,
+     * {@code SPECIFIC_NAME}. Within this, the return value,
      * if any, is first. Next are the parameter descriptions in call
      * order. The column descriptions follow in column number order.
      *
@@ -3358,7 +3358,7 @@ public interface DatabaseMetaData extends Wrapper {
      *      <LI> functionColumnIn - IN parameter
      *      <LI> functionColumnInOut - INOUT parameter
      *      <LI> functionColumnOut - OUT parameter
-     *      <LI> functionColumnReturn - function return value
+     *      <LI> functionReturn - function return value
      *      <LI> functionColumnResult - Indicates that the parameter or column
      *  is a column in the {@code ResultSet}
      *      </UL>

From e3eb652c251e8298c9df95d7ed2788f2cbb5f337 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Sat, 27 Apr 2024 11:52:05 +0000
Subject: [PATCH 225/486] 8296543: Update exception documentation for
 ExecutorService.invokeAll overriders as required

Reviewed-by: prappo, alanb
---
 .../concurrent/AbstractExecutorService.java   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java b/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
index f45c0036230..1b1ba4b29a0 100644
--- a/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
+++ b/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
@@ -117,6 +117,7 @@ public abstract class AbstractExecutorService implements ExecutorService {
      * @throws RejectedExecutionException {@inheritDoc}
      * @throws NullPointerException       {@inheritDoc}
      */
+    @Override
     public Future<?> submit(Runnable task) {
         if (task == null) throw new NullPointerException();
         RunnableFuture<Void> ftask = newTaskFor(task, null);
@@ -128,6 +129,7 @@ public abstract class AbstractExecutorService implements ExecutorService {
      * @throws RejectedExecutionException {@inheritDoc}
      * @throws NullPointerException       {@inheritDoc}
      */
+    @Override
     public <T> Future<T> submit(Runnable task, T result) {
         if (task == null) throw new NullPointerException();
         RunnableFuture<T> ftask = newTaskFor(task, result);
@@ -139,6 +141,7 @@ public abstract class AbstractExecutorService implements ExecutorService {
      * @throws RejectedExecutionException {@inheritDoc}
      * @throws NullPointerException       {@inheritDoc}
      */
+    @Override
     public <T> Future<T> submit(Callable<T> task) {
         if (task == null) throw new NullPointerException();
         RunnableFuture<T> ftask = newTaskFor(task);
@@ -219,6 +222,14 @@ public abstract class AbstractExecutorService implements ExecutorService {
         }
     }
 
+    /**
+     * @throws InterruptedException       {@inheritDoc}
+     * @throws NullPointerException       {@inheritDoc}
+     * @throws IllegalArgumentException   {@inheritDoc}
+     * @throws ExecutionException         {@inheritDoc}
+     * @throws RejectedExecutionException {@inheritDoc}
+     */
+    @Override
     public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
         throws InterruptedException, ExecutionException {
         try {
@@ -229,12 +240,26 @@ public abstract class AbstractExecutorService implements ExecutorService {
         }
     }
 
+    /**
+     * @throws InterruptedException       {@inheritDoc}
+     * @throws NullPointerException       {@inheritDoc}
+     * @throws TimeoutException           {@inheritDoc}
+     * @throws ExecutionException         {@inheritDoc}
+     * @throws RejectedExecutionException {@inheritDoc}
+     */
+    @Override
     public <T> T invokeAny(Collection<? extends Callable<T>> tasks,
                            long timeout, TimeUnit unit)
         throws InterruptedException, ExecutionException, TimeoutException {
         return doInvokeAny(tasks, true, unit.toNanos(timeout));
     }
 
+    /**
+     * @throws InterruptedException       {@inheritDoc}
+     * @throws NullPointerException       {@inheritDoc}
+     * @throws RejectedExecutionException {@inheritDoc}
+     */
+    @Override
     public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
         throws InterruptedException {
         if (tasks == null)
@@ -260,6 +285,12 @@ public abstract class AbstractExecutorService implements ExecutorService {
         }
     }
 
+    /**
+     * @throws InterruptedException       {@inheritDoc}
+     * @throws NullPointerException       {@inheritDoc}
+     * @throws RejectedExecutionException {@inheritDoc}
+     */
+    @Override
     public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks,
                                          long timeout, TimeUnit unit)
         throws InterruptedException {

From a078b5e6117d2a99386fecd349eb0e0c11b74953 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Sat, 27 Apr 2024 12:12:51 +0000
Subject: [PATCH 226/486] 8331114: Further improve performance of
 MethodTypeDesc::descriptorString

Reviewed-by: mchung, liach
---
 .../classes/java/lang/constant/ClassDesc.java |  2 +-
 .../java/lang/constant/ConstantUtils.java     |  2 +-
 .../lang/constant/MethodTypeDescImpl.java     | 15 ++++++++-----
 .../classes/sun/invoke/util/Wrapper.java      | 21 +++++++++++++------
 .../constant/MethodTypeDescFactories.java     |  8 +++++--
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/constant/ClassDesc.java b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
index 6adba119180..767fa953e97 100644
--- a/src/java.base/share/classes/java/lang/constant/ClassDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
@@ -160,7 +160,7 @@ public sealed interface ClassDesc
     static ClassDesc ofDescriptor(String descriptor) {
         // implicit null-check
         return (descriptor.length() == 1)
-               ? Wrapper.forPrimitiveType(descriptor.charAt(0)).primitiveClassDescriptor()
+               ? Wrapper.forPrimitiveType(descriptor.charAt(0)).classDescriptor()
                // will throw IAE on descriptor.length == 0 or if array dimensions too long
                : new ReferenceClassDescImpl(descriptor);
     }
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java b/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
index 312aac68c63..d975eaa1d0c 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
+++ b/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
@@ -226,7 +226,7 @@ class ConstantUtils {
 
     private static ClassDesc resolveClassDesc(String descriptor, int start, int len) {
         if (len == 1) {
-            return Wrapper.forBasicType(descriptor.charAt(start)).primitiveClassDescriptor();
+            return Wrapper.forPrimitiveType(descriptor.charAt(start)).classDescriptor();
         }
         return ClassDesc.ofDescriptor(descriptor.substring(start, start + len));
     }
diff --git a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java b/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
index 40a9cf8bd60..a2d06615e5d 100644
--- a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
+++ b/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
@@ -33,7 +33,6 @@ import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.StringJoiner;
 
 import static java.util.Objects.requireNonNull;
 
@@ -168,11 +167,17 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
         if (desc != null)
             return desc;
 
-        var sj = new StringJoiner("", "(", ")" + returnType().descriptorString());
-        for (int i = 0; i < parameterCount(); i++) {
-            sj.add(parameterType(i).descriptorString());
+        int len = 2 + returnType.descriptorString().length();
+        for (ClassDesc argType : argTypes) {
+            len += argType.descriptorString().length();
         }
-        return cachedDescriptorString = sj.toString();
+        StringBuilder sb = new StringBuilder(len).append('(');
+        for (ClassDesc argType : argTypes) {
+            sb.append(argType.descriptorString());
+        }
+        desc = sb.append(')').append(returnType.descriptorString()).toString();
+        cachedDescriptorString = desc;
+        return desc;
     }
 
     @Override
diff --git a/src/java.base/share/classes/sun/invoke/util/Wrapper.java b/src/java.base/share/classes/sun/invoke/util/Wrapper.java
index 3a28d63b7c4..fef9192932d 100644
--- a/src/java.base/share/classes/sun/invoke/util/Wrapper.java
+++ b/src/java.base/share/classes/sun/invoke/util/Wrapper.java
@@ -32,7 +32,7 @@ import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
 
 public enum Wrapper {
-    //        wrapperType      simple     primitiveType  simple     char  emptyArray     format               numericClass  superClass
+    //        wrapperType      simple     primitiveType  simple     char  emptyArray     format               numericClass  superClass  classDescriptor
     BOOLEAN(  Boolean.class,   "Boolean", boolean.class, "boolean", 'Z', new boolean[0], Format.unsigned( 1), 0, 0, ConstantDescs.CD_boolean),
     // These must be in the order defined for widening primitive conversions in JLS 5.1.2
     // Avoid boxing integral types here to defer initialization of internal caches
@@ -60,9 +60,18 @@ public enum Wrapper {
     private final int      superClasses;
     private final String   wrapperSimpleName;
     private final String   primitiveSimpleName;
-    private final ClassDesc primitiveTypeDesc;
+    private final ClassDesc classDesc;
 
-    private Wrapper(Class<?> wtype, String wtypeName, Class<?> ptype, String ptypeName, char tchar, Object emptyArray, int format, int numericClass, int superClasses, ClassDesc primitiveTypeDesc) {
+    private Wrapper(Class<?> wtype,
+                    String wtypeName,
+                    Class<?> ptype,
+                    String ptypeName,
+                    char tchar,
+                    Object emptyArray,
+                    int format,
+                    int numericClass,
+                    int superClasses,
+                    ClassDesc classDesc) {
         this.wrapperType = wtype;
         this.primitiveType = ptype;
         this.basicTypeChar = tchar;
@@ -73,7 +82,7 @@ public enum Wrapper {
         this.superClasses = superClasses;
         this.wrapperSimpleName = wtypeName;
         this.primitiveSimpleName = ptypeName;
-        this.primitiveTypeDesc = primitiveTypeDesc;
+        this.classDesc = classDesc;
     }
 
     /** For debugging, give the details of this wrapper. */
@@ -380,8 +389,8 @@ public enum Wrapper {
         }
     }
 
-    /** A nominal descriptor of the primitive type */
-    public ClassDesc primitiveClassDescriptor() { return primitiveTypeDesc; }
+    /** A nominal descriptor of the wrapped type */
+    public ClassDesc classDescriptor() { return classDesc; }
 
     /** What is the primitive type wrapped by this wrapper? */
     public Class<?> primitiveType() { return primitiveType; }
diff --git a/test/micro/org/openjdk/bench/java/lang/constant/MethodTypeDescFactories.java b/test/micro/org/openjdk/bench/java/lang/constant/MethodTypeDescFactories.java
index b9614fccfd2..64019c37c14 100644
--- a/test/micro/org/openjdk/bench/java/lang/constant/MethodTypeDescFactories.java
+++ b/test/micro/org/openjdk/bench/java/lang/constant/MethodTypeDescFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -54,11 +54,14 @@ public class MethodTypeDescFactories {
 
     private static final ClassDesc DUMMY_CD = ClassDesc.of("Dummy_invalid");
 
+    /** Dots will be replaced by the descriptor of this benchmark class. */
     @Param({
             "(Ljava/lang/Object;Ljava/lang/String;)I",
             "()V",
             "([IJLjava/lang/String;Z)Ljava/util/List;",
-            "()[Ljava/lang/String;"
+            "()[Ljava/lang/String;",
+            "(..IIJ)V",
+            "(.....................)."
     })
     public String descString;
     public MethodTypeDesc desc;
@@ -68,6 +71,7 @@ public class MethodTypeDescFactories {
 
     @Setup
     public void setup() {
+        descString = descString.replaceAll("\\.", MethodTypeDescFactories.class.descriptorString());
         desc = MethodTypeDesc.ofDescriptor(descString);
         ret = desc.returnType();
         args = desc.parameterArray();

From c3372c455542cef2aaf673d1f14be8759bb98e8d Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Sat, 27 Apr 2024 12:13:53 +0000
Subject: [PATCH 227/486] 8331134: Port SimpleStringBuilderStrategy to use
 ClassFile API

Reviewed-by: mchung
---
 .../java/lang/invoke/StringConcatFactory.java | 255 ++++++------------
 .../openjdk/bench/java/lang/StringConcat.java |  29 +-
 2 files changed, 111 insertions(+), 173 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index 67e22c384ac..cd2f7ec170a 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -28,19 +28,25 @@ package java.lang.invoke;
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.VM;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.internal.util.ClassFileDumper;
 import jdk.internal.vm.annotation.Stable;
 import sun.invoke.util.Wrapper;
 
+import java.lang.classfile.ClassBuilder;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.TypeKind;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDescs;
+import java.lang.constant.MethodTypeDesc;
 import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.reflect.AccessFlag;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import static java.lang.invoke.MethodHandles.Lookup.ClassOption.STRONG;
 import static java.lang.invoke.MethodType.methodType;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
 
 /**
  * <p>Methods to facilitate the creation of String concatenation methods, that
@@ -364,7 +370,7 @@ public final class StringConcatFactory {
         }
 
         try {
-            if (concatType.parameterCount() < HIGH_ARITY_THRESHOLD) {
+            if (concatType.parameterCount() <= HIGH_ARITY_THRESHOLD) {
                 return new ConstantCallSite(
                         generateMHInlineCopy(concatType, constantStrings)
                                 .viewAsType(concatType, true));
@@ -1054,12 +1060,20 @@ public final class StringConcatFactory {
      * to what javac would. No exact sizing of parameters or estimates.
      */
     private static final class SimpleStringBuilderStrategy {
-        static final int CLASSFILE_VERSION = 52; // JDK 8
         static final String METHOD_NAME = "concat";
-        // ClassFileDumper replaced java.lang.invoke.ProxyClassDumper in JDK 21
-        // -- see JDK-8304846
+        static final ClassDesc STRING_BUILDER = ClassDesc.ofDescriptor("Ljava/lang/StringBuilder;");
         static final ClassFileDumper DUMPER =
                 ClassFileDumper.getInstance("java.lang.invoke.StringConcatFactory.dump", "stringConcatClasses");
+        static final MethodTypeDesc APPEND_BOOLEAN_TYPE = MethodTypeDesc.of(STRING_BUILDER, ConstantDescs.CD_boolean);
+        static final MethodTypeDesc APPEND_CHAR_TYPE = MethodTypeDesc.of(STRING_BUILDER, ConstantDescs.CD_char);
+        static final MethodTypeDesc APPEND_DOUBLE_TYPE = MethodTypeDesc.of(STRING_BUILDER, ConstantDescs.CD_double);
+        static final MethodTypeDesc APPEND_FLOAT_TYPE = MethodTypeDesc.of(STRING_BUILDER, ConstantDescs.CD_float);
+        static final MethodTypeDesc APPEND_INT_TYPE = MethodTypeDesc.of(STRING_BUILDER, ConstantDescs.CD_int);
+        static final MethodTypeDesc APPEND_LONG_TYPE = MethodTypeDesc.of(STRING_BUILDER, ConstantDescs.CD_long);
+        static final MethodTypeDesc APPEND_OBJECT_TYPE = MethodTypeDesc.of(STRING_BUILDER, ConstantDescs.CD_Object);
+        static final MethodTypeDesc APPEND_STRING_TYPE = MethodTypeDesc.of(STRING_BUILDER, ConstantDescs.CD_String);
+        static final MethodTypeDesc INT_CONSTRUCTOR_TYPE = MethodTypeDesc.of(ConstantDescs.CD_void, ConstantDescs.CD_int);
+        static final MethodTypeDesc TO_STRING_TYPE = MethodTypeDesc.of(ConstantDescs.CD_String);
 
         /**
          * Ensure a capacity in the initial StringBuilder to accommodate all
@@ -1075,81 +1089,17 @@ public final class StringConcatFactory {
 
         private static MethodHandle generate(Lookup lookup, MethodType args, String[] constants) throws Exception {
             String className = getClassName(lookup.lookupClass());
-            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS + ClassWriter.COMPUTE_FRAMES);
 
-            cw.visit(CLASSFILE_VERSION,
-                    ACC_SUPER + ACC_PUBLIC + ACC_FINAL + ACC_SYNTHETIC,
-                    className,
-                    null,
-                    "java/lang/Object",
-                    null
-            );
-
-            MethodVisitor mv = cw.visitMethod(
-                    ACC_PUBLIC + ACC_STATIC + ACC_FINAL,
-                    METHOD_NAME,
-                    args.toMethodDescriptorString(),
-                    null,
-                    null);
-
-            mv.visitCode();
-
-
-            // Prepare StringBuilder instance
-            mv.visitTypeInsn(NEW, "java/lang/StringBuilder");
-            mv.visitInsn(DUP);
-
-            int len = 0;
-            for (String constant : constants) {
-                if (constant != null) {
-                    len += constant.length();
-                }
-            }
-            len += args.parameterCount() * ARGUMENT_SIZE_FACTOR;
-            iconst(mv, len);
-            mv.visitMethodInsn(
-                    INVOKESPECIAL,
-                    "java/lang/StringBuilder",
-                    "<init>",
-                    "(I)V",
-                    false
-            );
-
-            // At this point, we have a blank StringBuilder on stack, fill it in with .append calls.
-            {
-                int off = 0;
-                for (int c = 0; c < args.parameterCount(); c++) {
-                    if (constants[c] != null) {
-                        mv.visitLdcInsn(constants[c]);
-                        sbAppend(mv, "(Ljava/lang/String;)Ljava/lang/StringBuilder;");
-                    }
-                    Class<?> cl = args.parameterType(c);
-                    mv.visitVarInsn(getLoadOpcode(cl), off);
-                    off += getParameterSize(cl);
-                    String desc = getSBAppendDesc(cl);
-                    sbAppend(mv, desc);
-                }
-                if (constants[constants.length - 1] != null) {
-                    mv.visitLdcInsn(constants[constants.length - 1]);
-                    sbAppend(mv, "(Ljava/lang/String;)Ljava/lang/StringBuilder;");
-                }
-            }
-
-            mv.visitMethodInsn(
-                    INVOKEVIRTUAL,
-                    "java/lang/StringBuilder",
-                    "toString",
-                    "()Ljava/lang/String;",
-                    false
-            );
-
-            mv.visitInsn(ARETURN);
-
-            mv.visitMaxs(-1, -1);
-            mv.visitEnd();
-            cw.visitEnd();
-
-            byte[] classBytes = cw.toByteArray();
+            byte[] classBytes = ClassFile.of().build(ClassDesc.of(className),
+                    new Consumer<ClassBuilder>() {
+                        @Override
+                        public void accept(ClassBuilder clb) {
+                            clb.withFlags(AccessFlag.FINAL, AccessFlag.SUPER, AccessFlag.SYNTHETIC)
+                                .withMethodBody(METHOD_NAME,
+                                        MethodTypeDesc.ofDescriptor(args.toMethodDescriptorString()),
+                                        ClassFile.ACC_FINAL | ClassFile.ACC_PRIVATE | ClassFile.ACC_STATIC,
+                                        generateMethod(constants, args));
+                    }});
             try {
                 Lookup hiddenLookup = lookup.makeHiddenClassDefiner(className, classBytes, SET_OF_STRONG, DUMPER)
                                             .defineClassAsLookup(true);
@@ -1160,14 +1110,48 @@ public final class StringConcatFactory {
             }
         }
 
-        private static void sbAppend(MethodVisitor mv, String desc) {
-            mv.visitMethodInsn(
-                    INVOKEVIRTUAL,
-                    "java/lang/StringBuilder",
-                    "append",
-                    desc,
-                    false
-            );
+        private static Consumer<CodeBuilder> generateMethod(String[] constants, MethodType args) {
+            return new Consumer<CodeBuilder>() {
+                @Override
+                public void accept(CodeBuilder cb) {
+                    cb.new_(STRING_BUILDER);
+                    cb.dup();
+
+                    int len = 0;
+                    for (String constant : constants) {
+                        if (constant != null) {
+                            len += constant.length();
+                        }
+                    }
+                    len += args.parameterCount() * ARGUMENT_SIZE_FACTOR;
+                    cb.constantInstruction(len);
+                    cb.invokespecial(STRING_BUILDER, "<init>", INT_CONSTRUCTOR_TYPE);
+
+                    // At this point, we have a blank StringBuilder on stack, fill it in with .append calls.
+                    {
+                        int off = 0;
+                        for (int c = 0; c < args.parameterCount(); c++) {
+                            if (constants[c] != null) {
+                                cb.ldc(constants[c]);
+                                cb.invokevirtual(STRING_BUILDER, "append", APPEND_STRING_TYPE);
+                            }
+                            Class<?> cl = args.parameterType(c);
+                            TypeKind kind = TypeKind.from(cl);
+                            cb.loadInstruction(kind, off);
+                            off += kind.slotSize();
+                            MethodTypeDesc desc = getSBAppendDesc(cl);
+                            cb.invokevirtual(STRING_BUILDER, "append", desc);
+                        }
+                        if (constants[constants.length - 1] != null) {
+                            cb.ldc(constants[constants.length - 1]);
+                            cb.invokevirtual(STRING_BUILDER, "append", APPEND_STRING_TYPE);
+                        }
+                    }
+
+                    cb.invokevirtual(STRING_BUILDER, "toString", TO_STRING_TYPE);
+                    cb.areturn();
+                }
+            };
         }
 
         /**
@@ -1178,104 +1162,31 @@ public final class StringConcatFactory {
         private static String getClassName(Class<?> hostClass) {
             String name = hostClass.isHidden() ? hostClass.getName().replace('/', '_')
                     : hostClass.getName();
-            return name.replace('.', '/') + "$$StringConcat";
+            return name + "$$StringConcat";
         }
 
-        private static String getSBAppendDesc(Class<?> cl) {
+        private static MethodTypeDesc getSBAppendDesc(Class<?> cl) {
             if (cl.isPrimitive()) {
                 if (cl == Integer.TYPE || cl == Byte.TYPE || cl == Short.TYPE) {
-                    return "(I)Ljava/lang/StringBuilder;";
+                    return APPEND_INT_TYPE;
                 } else if (cl == Boolean.TYPE) {
-                    return "(Z)Ljava/lang/StringBuilder;";
+                    return APPEND_BOOLEAN_TYPE;
                 } else if (cl == Character.TYPE) {
-                    return "(C)Ljava/lang/StringBuilder;";
+                    return APPEND_CHAR_TYPE;
                 } else if (cl == Double.TYPE) {
-                    return "(D)Ljava/lang/StringBuilder;";
+                    return APPEND_DOUBLE_TYPE;
                 } else if (cl == Float.TYPE) {
-                    return "(F)Ljava/lang/StringBuilder;";
+                    return APPEND_FLOAT_TYPE;
                 } else if (cl == Long.TYPE) {
-                    return "(J)Ljava/lang/StringBuilder;";
+                    return APPEND_LONG_TYPE;
                 } else {
                     throw new IllegalStateException("Unhandled primitive StringBuilder.append: " + cl);
                 }
             } else if (cl == String.class) {
-                return "(Ljava/lang/String;)Ljava/lang/StringBuilder;";
+                return APPEND_STRING_TYPE;
             } else {
-                return "(Ljava/lang/Object;)Ljava/lang/StringBuilder;";
+                return APPEND_OBJECT_TYPE;
             }
         }
-
-        private static String getStringValueOfDesc(Class<?> cl) {
-            if (cl.isPrimitive()) {
-                if (cl == Integer.TYPE || cl == Byte.TYPE || cl == Short.TYPE) {
-                    return "(I)Ljava/lang/String;";
-                } else if (cl == Boolean.TYPE) {
-                    return "(Z)Ljava/lang/String;";
-                } else if (cl == Character.TYPE) {
-                    return "(C)Ljava/lang/String;";
-                } else if (cl == Double.TYPE) {
-                    return "(D)Ljava/lang/String;";
-                } else if (cl == Float.TYPE) {
-                    return "(F)Ljava/lang/String;";
-                } else if (cl == Long.TYPE) {
-                    return "(J)Ljava/lang/String;";
-                } else {
-                    throw new IllegalStateException("Unhandled String.valueOf: " + cl);
-                }
-            } else if (cl == String.class) {
-                return "(Ljava/lang/String;)Ljava/lang/String;";
-            } else {
-                return "(Ljava/lang/Object;)Ljava/lang/String;";
-            }
-        }
-
-        /**
-         * The following method is copied from
-         * org.objectweb.asm.commons.InstructionAdapter. Part of ASM: a very small
-         * and fast Java bytecode manipulation framework.
-         * Copyright (c) 2000-2005 INRIA, France Telecom All rights reserved.
-         */
-        private static void iconst(MethodVisitor mv, final int cst) {
-            if (cst >= -1 && cst <= 5) {
-                mv.visitInsn(ICONST_0 + cst);
-            } else if (cst >= Byte.MIN_VALUE && cst <= Byte.MAX_VALUE) {
-                mv.visitIntInsn(BIPUSH, cst);
-            } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) {
-                mv.visitIntInsn(SIPUSH, cst);
-            } else {
-                mv.visitLdcInsn(cst);
-            }
-        }
-
-        private static int getLoadOpcode(Class<?> c) {
-            if (c == Void.TYPE) {
-                throw new InternalError("Unexpected void type of load opcode");
-            }
-            return ILOAD + getOpcodeOffset(c);
-        }
-
-        private static int getOpcodeOffset(Class<?> c) {
-            if (c.isPrimitive()) {
-                if (c == Long.TYPE) {
-                    return 1;
-                } else if (c == Float.TYPE) {
-                    return 2;
-                } else if (c == Double.TYPE) {
-                    return 3;
-                }
-                return 0;
-            } else {
-                return 4;
-            }
-        }
-
-        private static int getParameterSize(Class<?> c) {
-            if (c == Void.TYPE) {
-                return 0;
-            } else if (c == Long.TYPE || c == Double.TYPE) {
-                return 2;
-            }
-            return 1;
-        }
     }
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/StringConcat.java b/test/micro/org/openjdk/bench/java/lang/StringConcat.java
index c27514ec442..c4d2d1bfe11 100644
--- a/test/micro/org/openjdk/bench/java/lang/StringConcat.java
+++ b/test/micro/org/openjdk/bench/java/lang/StringConcat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -192,4 +192,31 @@ public class StringConcat {
                 +f110 + ","+f111 + ","+f112 + ","+f113 + ","+f114 + ","+f115 + ","+f116 + ","+f117 + ","+f118 + ","+f119 + ","
                 +f120 + ","+f121 + ","+f122;
     }
+
+    @Benchmark
+    public String concat23StringConst() {
+        return f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + f0 + """
+                A really long constant string. Such as a copyright header:
+                 * Copyright (c) 2018, 2024, 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.
+                """;
+    }
 }

From 16c7dcdb04a7c220684a20eb4a0da4505ae03813 Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Sat, 27 Apr 2024 13:10:40 +0000
Subject: [PATCH 228/486] 8330523: Reduce runtime and improve efficiency of
 KeepAliveTest

Reviewed-by: djelinski
---
 .../www/http/HttpClient/KeepAliveTest.java    | 1387 +++--------------
 1 file changed, 225 insertions(+), 1162 deletions(-)

diff --git a/test/jdk/sun/net/www/http/HttpClient/KeepAliveTest.java b/test/jdk/sun/net/www/http/HttpClient/KeepAliveTest.java
index 344ff5f89e9..02e60ebc75f 100644
--- a/test/jdk/sun/net/www/http/HttpClient/KeepAliveTest.java
+++ b/test/jdk/sun/net/www/http/HttpClient/KeepAliveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,177 +24,29 @@
 /*
  * @test
  * @library /test/lib
- * @bug 8291226 8291638
- * @modules java.base/sun.net:+open
- *          java.base/sun.net.www.http:+open
- *          java.base/sun.net.www:+open
+ * @bug 8291226 8291638 8330523
+ * @modules java.base/sun.net.www.http:+open
  *          java.base/sun.net.www.protocol.http:+open
- * @run main/othervm KeepAliveTest 0
- * @run main/othervm KeepAliveTest 1
- * @run main/othervm KeepAliveTest 2
- * @run main/othervm KeepAliveTest 3
- * @run main/othervm KeepAliveTest 4
- * @run main/othervm KeepAliveTest 5
- * @run main/othervm KeepAliveTest 6
- * @run main/othervm KeepAliveTest 7
- * @run main/othervm KeepAliveTest 8
- * @run main/othervm KeepAliveTest 9
- * @run main/othervm KeepAliveTest 10
- * @run main/othervm KeepAliveTest 11
- * @run main/othervm KeepAliveTest 12
- * @run main/othervm KeepAliveTest 13
- * @run main/othervm KeepAliveTest 14
- * @run main/othervm KeepAliveTest 15
- * @run main/othervm KeepAliveTest 16
- * @run main/othervm KeepAliveTest 17
- * @run main/othervm KeepAliveTest 18
- * @run main/othervm KeepAliveTest 19
- * @run main/othervm KeepAliveTest 20
- * @run main/othervm KeepAliveTest 21
- * @run main/othervm KeepAliveTest 22
- * @run main/othervm KeepAliveTest 23
- * @run main/othervm KeepAliveTest 24
- * @run main/othervm KeepAliveTest 25
- * @run main/othervm KeepAliveTest 26
- * @run main/othervm KeepAliveTest 27
- * @run main/othervm KeepAliveTest 28
- * @run main/othervm KeepAliveTest 29
- * @run main/othervm KeepAliveTest 30
- * @run main/othervm KeepAliveTest 31
- * @run main/othervm KeepAliveTest 32
- * @run main/othervm KeepAliveTest 33
- * @run main/othervm KeepAliveTest 34
- * @run main/othervm KeepAliveTest 35
- * @run main/othervm KeepAliveTest 36
- * @run main/othervm KeepAliveTest 37
- * @run main/othervm KeepAliveTest 38
- * @run main/othervm KeepAliveTest 39
- * @run main/othervm KeepAliveTest 40
- * @run main/othervm KeepAliveTest 41
- * @run main/othervm KeepAliveTest 42
- * @run main/othervm KeepAliveTest 43
- * @run main/othervm KeepAliveTest 44
- * @run main/othervm KeepAliveTest 45
- * @run main/othervm KeepAliveTest 46
- * @run main/othervm KeepAliveTest 47
- * @run main/othervm KeepAliveTest 48
- * @run main/othervm KeepAliveTest 49
- * @run main/othervm KeepAliveTest 50
- * @run main/othervm KeepAliveTest 51
- * @run main/othervm KeepAliveTest 52
- * @run main/othervm KeepAliveTest 53
- * @run main/othervm KeepAliveTest 54
- * @run main/othervm KeepAliveTest 55
- * @run main/othervm KeepAliveTest 56
- * @run main/othervm KeepAliveTest 57
- * @run main/othervm KeepAliveTest 58
- * @run main/othervm KeepAliveTest 59
- * @run main/othervm KeepAliveTest 60
- * @run main/othervm KeepAliveTest 61
- * @run main/othervm KeepAliveTest 62
- * @run main/othervm KeepAliveTest 63
- * @run main/othervm KeepAliveTest 64
- * @run main/othervm KeepAliveTest 65
- * @run main/othervm KeepAliveTest 66
- * @run main/othervm KeepAliveTest 67
- * @run main/othervm KeepAliveTest 68
- * @run main/othervm KeepAliveTest 69
- * @run main/othervm KeepAliveTest 70
- * @run main/othervm KeepAliveTest 71
- * @run main/othervm KeepAliveTest 72
- * @run main/othervm KeepAliveTest 73
- * @run main/othervm KeepAliveTest 74
- * @run main/othervm KeepAliveTest 75
- * @run main/othervm KeepAliveTest 76
- * @run main/othervm KeepAliveTest 77
- * @run main/othervm KeepAliveTest 78
- * @run main/othervm KeepAliveTest 79
- * @run main/othervm KeepAliveTest 80
- * @run main/othervm KeepAliveTest 81
- * @run main/othervm KeepAliveTest 82
- * @run main/othervm KeepAliveTest 83
- * @run main/othervm KeepAliveTest 84
- * @run main/othervm KeepAliveTest 85
- * @run main/othervm KeepAliveTest 86
- * @run main/othervm KeepAliveTest 87
- * @run main/othervm KeepAliveTest 88
- * @run main/othervm KeepAliveTest 89
- * @run main/othervm KeepAliveTest 90
- * @run main/othervm KeepAliveTest 91
- * @run main/othervm KeepAliveTest 92
- * @run main/othervm KeepAliveTest 93
- * @run main/othervm KeepAliveTest 94
- * @run main/othervm KeepAliveTest 95
- * @run main/othervm KeepAliveTest 96
- * @run main/othervm KeepAliveTest 97
- * @run main/othervm KeepAliveTest 98
- * @run main/othervm KeepAliveTest 99
- * @run main/othervm KeepAliveTest 100
- * @run main/othervm KeepAliveTest 101
- * @run main/othervm KeepAliveTest 102
- * @run main/othervm KeepAliveTest 103
- * @run main/othervm KeepAliveTest 104
- * @run main/othervm KeepAliveTest 105
- * @run main/othervm KeepAliveTest 106
- * @run main/othervm KeepAliveTest 107
- * @run main/othervm KeepAliveTest 108
- * @run main/othervm KeepAliveTest 109
- * @run main/othervm KeepAliveTest 110
- * @run main/othervm KeepAliveTest 111
- * @run main/othervm KeepAliveTest 112
- * @run main/othervm KeepAliveTest 113
- * @run main/othervm KeepAliveTest 114
- * @run main/othervm KeepAliveTest 115
- * @run main/othervm KeepAliveTest 116
- * @run main/othervm KeepAliveTest 117
- * @run main/othervm KeepAliveTest 118
- * @run main/othervm KeepAliveTest 119
- * @run main/othervm KeepAliveTest 120
- * @run main/othervm KeepAliveTest 121
- * @run main/othervm KeepAliveTest 122
- * @run main/othervm KeepAliveTest 123
- * @run main/othervm KeepAliveTest 124
- * @run main/othervm KeepAliveTest 125
- * @run main/othervm KeepAliveTest 126
- * @run main/othervm KeepAliveTest 127
- * @run main/othervm KeepAliveTest 128
- * @run main/othervm KeepAliveTest 129
- * @run main/othervm KeepAliveTest 130
- * @run main/othervm KeepAliveTest 131
- * @run main/othervm KeepAliveTest 132
- * @run main/othervm KeepAliveTest 133
- * @run main/othervm KeepAliveTest 134
- * @run main/othervm KeepAliveTest 135
- * @run main/othervm KeepAliveTest 136
- * @run main/othervm KeepAliveTest 137
- * @run main/othervm KeepAliveTest 138
- * @run main/othervm KeepAliveTest 139
- * @run main/othervm KeepAliveTest 140
- * @run main/othervm KeepAliveTest 141
- * @run main/othervm KeepAliveTest 142
- * @run main/othervm KeepAliveTest 143
- * @run main/othervm KeepAliveTest 144
- * @run main/othervm KeepAliveTest 145
- * @run main/othervm KeepAliveTest 146
- * @run main/othervm KeepAliveTest 147
- * @run main/othervm KeepAliveTest 148
- * @run main/othervm KeepAliveTest 149
- * @run main/othervm KeepAliveTest 150
- * @run main/othervm KeepAliveTest 151
- * @run main/othervm KeepAliveTest 152
- * @run main/othervm KeepAliveTest 153
- * @run main/othervm KeepAliveTest 154
- * @run main/othervm KeepAliveTest 155
- * @run main/othervm KeepAliveTest 156
- * @run main/othervm KeepAliveTest 157
- * @run main/othervm KeepAliveTest 158
- * @run main/othervm KeepAliveTest 159
+ * @run main/othervm KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=100 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.proxy=200 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=100 -Dhttp.keepAlive.time.proxy=200 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=-100 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.proxy=-200 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=-100 -Dhttp.keepAlive.time.proxy=-200 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=0 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.proxy=0 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=0 -Dhttp.keepAlive.time.proxy=0 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=0 -Dhttp.keepAlive.time.proxy=-200 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=-100 -Dhttp.keepAlive.time.proxy=0 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=100 -Dhttp.keepAlive.time.proxy=0 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=0 -Dhttp.keepAlive.time.proxy=200 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=100 -Dhttp.keepAlive.time.proxy=-200 KeepAliveTest
+ * @run main/othervm -Dhttp.keepAlive.time.server=-100 -Dhttp.keepAlive.time.proxy=200 KeepAliveTest
  */
-
-import java.nio.charset.StandardCharsets;
-import java.io.InputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.lang.reflect.Constructor;
@@ -206,841 +58,59 @@ import java.net.Proxy.Type;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Phaser;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import jdk.test.lib.net.URIBuilder;
+
 import sun.net.www.http.HttpClient;
 import sun.net.www.http.KeepAliveCache;
 import sun.net.www.protocol.http.HttpURLConnection;
-import jdk.test.lib.net.URIBuilder;
 
 public class KeepAliveTest {
-    private static final Logger logger = Logger.getLogger("sun.net.www.protocol.http.HttpURLConnection");
-    private static final String NOT_CACHED = "NotCached";
-    private static final String CLIENT_SEPARATOR = ";";
-    private static final String NEW_LINE = "\r\n";
-    private volatile int SERVER_PORT = 0;
+
     /*
-     * isProxySet is shared variable between server thread and client thread(main) and it should be set and reset to false for each and
-     * every scenario.
-     * isProxySet variable should be set by server thread before proceeding to client thread(main).
+     * This test covers a matrix of 10 server scenarios and 16 client scenarios.
      */
-    private volatile boolean isProxySet = false;
+    private static final Logger logger = Logger.getLogger("sun.net.www.protocol.http.HttpURLConnection");
+
+    private static final String NEW_LINE = "\r\n";
+
     private static final String CONNECTION_KEEP_ALIVE_ONLY = "Connection: keep-alive";
     private static final String PROXY_CONNECTION_KEEP_ALIVE_ONLY = "Proxy-Connection: keep-alive";
     private static final String KEEP_ALIVE_TIMEOUT_NEG = "Keep-alive: timeout=-20";
     private static final String KEEP_ALIVE_TIMEOUT_ZERO = "Keep-alive: timeout=0";
     private static final String KEEP_ALIVE_TIMEOUT = "Keep-alive: timeout=20";
     private static final String KEEP_ALIVE_PROXY_TIMEOUT = "Keep-alive: timeout=120";
-    private static final String CLIENT_HTTP_KEEP_ALIVE_TIME_SERVER_NEGATIVE = "http.keepAlive.time.server=-100";
-    private static final String CLIENT_HTTP_KEEP_ALIVE_TIME_PROXY_NEGATIVE = "http.keepAlive.time.proxy=-200";
-    private static final String CLIENT_HTTP_KEEP_ALIVE_TIME_SERVER_ZERO = "http.keepAlive.time.server=0";
-    private static final String CLIENT_HTTP_KEEP_ALIVE_TIME_PROXY_ZERO = "http.keepAlive.time.proxy=0";
-    private static final String CLIENT_HTTP_KEEP_ALIVE_TIME_SERVER_POSITIVE = "http.keepAlive.time.server=100";
-    private static final String CLIENT_HTTP_KEEP_ALIVE_TIME_PROXY_POSITIVE = "http.keepAlive.time.proxy=200";
-    private static final String CONNECTION_KEEP_ALIVE_WITH_TIMEOUT = CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE
-        + KEEP_ALIVE_TIMEOUT;
-   /*
-    * Following Constants represents Client Side Properties and is used as reference in below table as
-    * CLIENT_INPUT_CONSTANT_NAMES
-    */
-    private static final String SERVER_100_NEGATIVE = CLIENT_HTTP_KEEP_ALIVE_TIME_SERVER_NEGATIVE;
-    private static final String PROXY_200_NEGATIVE = CLIENT_HTTP_KEEP_ALIVE_TIME_PROXY_NEGATIVE;
-    private static final String SERVER_ZERO = CLIENT_HTTP_KEEP_ALIVE_TIME_SERVER_ZERO;
-    private static final String PROXY_ZERO = CLIENT_HTTP_KEEP_ALIVE_TIME_PROXY_ZERO;
-    private static final String SERVER_100 = CLIENT_HTTP_KEEP_ALIVE_TIME_SERVER_POSITIVE;
-    private static final String PROXY_200 = CLIENT_HTTP_KEEP_ALIVE_TIME_PROXY_POSITIVE;
+    private static final String CONNECTION_KEEP_ALIVE_WITH_TIMEOUT = CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE + KEEP_ALIVE_TIMEOUT;
 
-   /*
-    * CONSTANTS A,B,C,D,E,NI,F,G,H,I represents ServerScenarios and is used as reference in below table
-    * as SERVER_RESPONSE_CONSTANT_NAME
-    */
-    private static final String A = CONNECTION_KEEP_ALIVE_ONLY;
-    private static final String B = CONNECTION_KEEP_ALIVE_WITH_TIMEOUT;
-    private static final String C = PROXY_CONNECTION_KEEP_ALIVE_ONLY;
-    private static final String D = PROXY_CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE + CONNECTION_KEEP_ALIVE_ONLY;
-    private static final String E = C + NEW_LINE + KEEP_ALIVE_PROXY_TIMEOUT;
-    private static final String NI = "NO_INPUT";
-    private static final String F = A + NEW_LINE + KEEP_ALIVE_TIMEOUT_NEG;
-    private static final String G = A + NEW_LINE + KEEP_ALIVE_TIMEOUT_ZERO;
-    private static final String H = C + NEW_LINE + KEEP_ALIVE_TIMEOUT_NEG;
-    private static final String I = C + NEW_LINE + KEEP_ALIVE_TIMEOUT_ZERO;
-
-   /*
-    * There are 160 scenarios run by this program.
-    * For every scenario there is mapping between serverScenarios[int],clientScenarios[int] and expectedOutput[int]
-    *
-    * serverScenarios[0] clientScenarios[0] expectedOutput[0]
-    * serverScenarios[1] clientScenarios[1] expectedOutput[1]
-    * serverScenarios[2] clientScenarios[2] expectedOutput[2]
-    *
-    * ...
-    *
-    * serverScenarios[159] cientScenarios[159] expectedOutput[159]
-    *
-    * whereas serverScenarios[int] is retrieved using getServerScenario(int)
-    * whereas clientScenarios[int] is retrieved using clientScenario[getClientScenarioNumber[int]]
-    * and
-    * expectedOutput[int] is retrieved using expectedOuput[int] directly.
-    *
-    */
-
-   /* Here is the complete table of server_response, client system properties input and expected cached timeout at client side */
-   /* ScNo  |  SERVER RESPONSE (SERVER_RESPONSE_CONSTANT_NAME)| CLIENT SYSTEM PROPERTIES INPUT (CLIENT_INPUT_CONSTANT_NAMES) | EXPECTED CACHED TIMEOUT AT CLIENT SIDE
-    *****************************************************************************************************************************************
-    *    0  |  Connection: keep-alive (A)                     | No Input Provided (NI)                       | Default Timeout set to 5
-    *---------------------------------------------------------------------------------------------------------------------------
-    *    1  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=100 (SERVER_100)| Client Timeout set to 100
-    *--------------------------------------------------------------------------------------------------------------------------
-    *    2  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.proxy=200 (PROXY_200)  | Default Timeout set to 5
-    *---------------------------------------------------------------------------------------------------------------------------
-    *    3  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=100 &&          |
-    *       |                                                 | -Dhttp.keepAlive.time.proxy=200              | Timeout set to 100
-    *       |                                                 | (SERVER_100 && PROXY_200)                    |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *    4  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=-100            | Default Timeout set to 5
-    *       |                                                 | (SERVER_100_NEGATIVE)                        |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *    5  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.proxy=-200             | Default Timeout set to 5
-    *       |                                                 | (PROXY_200_NEGATIVE)                         |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *    6  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=-100 &&         |
-    *       |                                                 | -Dhttp.keepAlive.time.proxy=-200             | Default Timeout set to 5
-    *       |                                                 | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE)  |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *    7  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=0               | Connection Closed Immediately
-    *       |                                                 | (SERVER_ZERO)                                |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *    8  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.proxy=0                | Default Timeout set to 5
-    *       |                                                 | (PROXY_ZERO)                                 |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *    9  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=0 &&            |
-    *       |                                                 | -Dhttp.keepAlive.time.proxy=0                | Connection Closed Immediately
-    *       |                                                 | (SERVER_ZERO && PROXY_ZERO)                  |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   10  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=0 &&            |
-    *       |                                                 | -Dhttp.keepAlive.time.proxy=-200             | Connection Closed Immediately
-    *       |                                                 | (SERVER_ZERO && PROXY_200_NEGATIVE)          |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   11  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=-100 &&         |
-    *       |                                                 | -Dhttp.keepAlive.time.proxy=0                | Default Timeout set to 5
-    *       |                                                 | (SERVER_100_NEGATIVE && PROXY_ZERO)          |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   12  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=100 &&          |
-    *       |                                                 |  -Dhttp.keepAlive.time.proxy=0               | Timeout set to 100
-    *       |                                                 | (SERVER_100 && PROXY_ZERO)                   |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   13  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=0 &&            |
-    *       |                                                 | -Dhttp.keepAlive.time.proxy=200              | Connection Closed Immediately
-    *       |                                                 | (SERVER_ZERO && PROXY_200)                   |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   14  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=100 &&          |
-    *       |                                                 | -Dhttp.keepAlive.time.proxy=-200             | Timeout set to 100
-    *       |                                                 | (SERVER_100 && PROXY_200_NEGATIVE)           |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   15  |  Connection: keep-alive (A)                     | -Dhttp.keepAlive.time.server=-100 &&         |
-    *       |                                                 | -Dhttp.keepAlive.time.proxy=200              | Default Timeout set to 5
-    *       |                                                 | (SERVER_100_NEGATIVE && PROXY_200)           |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   16  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | No Input Provided (NI)                   | Timeout set to 20
-    *------------------------------------------------------------------------------------------------------------------------
-    *   17  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=100         | Timeout set to 20
-    *       |                                                     | (SERVER_100)                             |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   18  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.proxy=200          | Timeout set to 20
-    *       |                                                     | (PROXY_200)                              |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   19  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=100 &&      |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=200          | Timeout set to 20
-    *       |                                                     | (SERVER_100 && PROXY_200)                |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   20  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=-100        | Timeout set to 20
-    *       |                                                     | (SERVER_100_NEGATIVE)                    |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   21  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.proxy=-200         | Timeout set to 20
-    *       |                                                     | (PROXY_200_NEGATIVE)                     |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   22  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=-100 &&       |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=-200           | Timeout set to 20
-    *       |                                                     | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE)|
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   23  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=0      | Timeout set to 20
-    *       |                                                     | (SERVER_ZERO)                       |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   24  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.proxy=0       | Timeout set to 20
-    *       |                                                     | (PROXY_ZERO)                        |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   25  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=0       | Timeout set to 20
-    *       |                                                     | (SERVER_ZERO && PROXY_ZERO)         |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   26  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=-200    | Timeout set to 20
-    *       |                                                     | (SERVER_ZERO && PROXY_200_NEGATIVE) |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   27  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=-100 &&|
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=0       | Timeout set to 20
-    *       |                                                     | (SERVER_100_NEGATIVE && PROXY_ZERO) |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   28  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=0       | Timeout set to 20
-    *       |                                                     | (SERVER_100 && PROXY_ZERO)          |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   29  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 20
-    *       |                                                     | (SERVER_ZERO && PROXY_200)          |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   30  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=-200    | Timeout set to 20
-    *       |                                                     | (SERVER_100 && PROXY_200_NEGATIVE)  |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   31  |Connection: keep-alive\r\nKeep-alive: timeout=20 (B) |-Dhttp.keepAlive.time.server=-100 && |
-    *       |                                                     |-Dhttp.keepAlive.time.proxy=200      | Timeout set to 20
-    *       |                                                     | (SERVER_100_NEGATIVE && PROXY_200)  |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   32  |Proxy-Connection: keep-alive (C)                     | No Input Provided (NI)              | Default timeout set to 60
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   33  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.server=100    | Default timeout set to 60
-    *       |                                                     | (SERVER_100)                        |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   34  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 200
-    *       |                                                     | (PROXY_200)                         |
-    *--------------------------------------------------------------------------------------------------------------------------
-    *   35  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 200
-    *       |                                                     | (SERVER_100 && PROXY_200)           |
-    *--------------------------------------------------------------------------------------------------------------------------
-    *   36  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.server=-100   | Default timeout set to 60
-    *       |                                                     | (SERVER_100_NEGATIVE)               |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   37  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.proxy=-200    | Default timeout set to 60
-    *       |                                                     | (PROXY_200_NEGATIVE)                |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   38  |Proxy-Connection: keep-alive (C)                     |-Dhttp.keepAlive.time.server=-100 &&       |
-    *       |                                                     |-Dhttp.keepAlive.time.proxy=-200           | Default timeout set to 60
-    *       |                                                     |(SERVER_100_NEGATIVE && PROXY_200_NEGATIVE)|
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   39  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.server=0      | Default timeout set to 60
-    *       |                                                     | (SERVER_ZERO)                       |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   40  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                     | (PROXY_ZERO)                        |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   41  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                     | (SERVER_ZERO && PROXY_ZERO)         |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   42  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=-200    | Default timeout set to 60
-    *       |                                                     | (SERVER_ZERO && PROXY_200_NEGATIVE) |
-    *---------------------------------------------------------------------------------------------------------------------------------
-    *   43  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.server=-100 &&|
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                     | (SERVER_100_NEGATIVE && PROXY_ZERO) |
-    *---------------------------------------------------------------------------------------------------------------------------------
-    *   44  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                     | (SERVER_100 && PROXY_ZERO)          |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   45  |Proxy-Connection: keep-alive (C)                     | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                     | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 200
-    *       |                                                     | (SERVER_ZERO && PROXY_200)          |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   46  |Proxy-Connection: keep-alive (C)                     |-Dhttp.keepAlive.time.server=100 &&  |
-    *       |                                                     |-Dhttp.keepAlive.time.proxy=-200     | Default timeout set to 60
-    *       |                                                     | (SERVER_100 && PROXY_200_NEGATIVE)  |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   47  |Proxy-Connection: keep-alive (C)                     |-Dhttp.keepAlive.time.server=-100 && |
-    *       |                                                     |-Dhttp.keepAlive.time.proxy=200      | Timeout set to 200
-    *       |                                                     | (SERVER_100_NEGATIVE && PROXY_ZERO) |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   48  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | No Input Provided (NI)              | Default timeout set to 60
-    *-----------------------------------------------------------------------------------------------------------------------------
-    *   49  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=100    | Default timeout set to 60
-    *       |                                                         | (SERVER_100)                        |
-    *---------------------------------------------------------------------------------------------------------------------------
-    *   50  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 200
-    *       |                                                         | (PROXY_200)                         |
-    *------------------------------------------------------------------------------------------------------------------------------
-    *   51  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 200
-    *       |                                                         | (SERVER_100 && PROXY_200)           |
-    *------------------------------------------------------------------------------------------------------------------------------
-    *   52  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=-100   | Default timeout set to 60
-    *       |                                                         | (SERVER_100_NEGATIVE)               |
-    *------------------------------------------------------------------------------------------------------------------------------
-    *   53  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.proxy=-200    | Default timeout set to 60
-    *       |                                                         | (PROXY_200_NEGATIVE)                |
-    *------------------------------------------------------------------------------------------------------------------------------
-    *   54  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=-100&&        |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200           | Default timeout set to 60
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   55  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=0      | Default timeout set to 60
-    *       |                                                         | (SERVER_ZERO)                       |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   56  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (PROXY_ZERO)                        |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   57  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_ZERO)         |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   58  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200    | Default timeout set to 60
-    *       |                                                         | (SERVER_ZERO && PROXY_200_NEGATIVE) |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   59  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=-100 &&|
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_ZERO) |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   60  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (SERVER_100 && PROXY_ZERO)          |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   61  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 200
-    *       |                                                         | (SERVER_ZERO && PROXY_200)          |
-    *------------------------------------------------------------------------------------------------------------------------------
-    *   62  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200    | default timeout set to 60
-    *       |                                                         | (SERVER_100 && PROXY_200_NEGATIVE)  |
-    *------------------------------------------------------------------------------------------------------------------------------
-    *   63  |Connection:keep-alive\r\nProxy-connection:keep-alive (D) | -Dhttp.keepAlive.time.server=-100 &&|
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 200
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200)  |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   64  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| No Input Provided (NI)              | Timeout set to 120
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   65  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=100    | Timeout set to 120
-    *       |                                                         | (SERVER_100)                        |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   66  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.proxy=200     | Timeout set to 120
-    *       |                                                         | (PROXY_200)                         |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   67  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 120
-    *       |                                                         | (SERVER_100 && PROXY_200)           |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   68  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=-100   | Timeout set to 120
-    *       |                                                         | (SERVER_100_NEGATIVE)               |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   69  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.proxy=-200    | Timeout set to 120
-    *       |                                                         | (PROXY_200_NEGATIVE)                |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   70  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=-100 &&       |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200           | Timeout set to 120
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE)|
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   71  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=0      | Timeout set to 120
-    *       |                                                         | (SERVER_ZERO)                       |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   72  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.proxy=0       | Timeout set to 120
-    *       |                                                         | (PROXY_ZERO)                        |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   73  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | Timeout set to 120
-    *       |                                                         | (SERVER_ZERO && PROXY_ZERO)         |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   74  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200    | Timeout set to 120
-    *       |                                                         | (SERVER_ZERO && PROXY_200_NEGATIVE) |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   75  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=-100 &&|
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | Timeout set to 120
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_ZERO) |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   76  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | Timeout set to 120
-    *       |                                                         | (SERVER_100 && PROXY_ZERO)          |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   77  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 120
-    *       |                                                         | (SERVER_ZERO && PROXY_200)          |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   78  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=100 &&         |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200            | Timeout set to 120
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE) |
-    *-------------------------------------------------------------------------------------------------------------------------------
-    *   79  |Proxy-connection:keep-alive\r\nKeep-alive:timeout=120 (E)| -Dhttp.keepAlive.time.server=-100 &&|
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | Timeout set to 120
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200)  |
-    *-----------------------------------------------------------------------------------------------------------------------------
-    *   80  |No Input (NI)                                            | No Input Provided (NI)              | default timeout set to 5
-    *-----------------------------------------------------------------------------------------------------------------------------
-    *   81  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=100    | Timeout set to 100
-    *       |                                                         | (SERVER_100)                        |
-    *-----------------------------------------------------------------------------------------------------------------------------
-    *   82  |No Input (NI)                                            | -Dhttp.keepAlive.time.proxy=200     | default timeout set to 5
-    *       |                                                         | (PROXY_200)                         |
-    *-----------------------------------------------------------------------------------------------------------------------------
-    *   83  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | client timeot set to 100
-    *       |                                                         | (SERVER_100 && PROXY_200)           |
-    *------------------------------------------------------------------------------------------------------------------------------
-    *   84  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=-100   | default timeout set to 5
-    *       |                                                         | (SERVER_100_NEGATIVE)               |
-    *------------------------------------------------------------------------------------------------------------------------------
-    *   85  |No Input (NI)                                            | -Dhttp.keepAlive.time.proxy=-200    | default timeout set to 5
-    *       |                                                         | (PROXY_200_NEGATIVE)                |
-    *----------------------------------------------------------------------------------------------------------------------------
-    *   86  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=-100 &&       |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200           | default timeout set to 5
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE)|
-    *------------------------------------------------------------------------------------------------------------------------------
-    *   87  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=0      | close connection immediately
-    *       |                                                         | (SERVER_ZERO)                       |
-    *---------------------------------------------------------------------------------------------------------------------------------
-    *   88  |No Input (NI)                                            | -Dhttp.keepAlive.time.proxy=0       | default timeout set to 5
-    *       |                                                         | (PROXY_ZERO)                        |
-    *---------------------------------------------------------------------------------------------------------------------------------
-    *   89  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_ZERO)         |
-    *---------------------------------------------------------------------------------------------------------------------------------
-    *   90  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200    | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_200_NEGATIVE) |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   91  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=-100 &&|
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | default timeout set to 5
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_ZERO) |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   92  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | Timeout set to 100
-    *       |                                                         | (SERVER_100 && PROXY_ZERO)          |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   93  |No Input (NI)                                            | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_200)          |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   94  |No Input (NI)                                            |-Dhttp.keepAlive.time.server=100 &&  |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=-200     | Timeout set to 100
-    *       |                                                         | (SERVER_100 && PROXY_200_NEGATIVE)  |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   95  |No Input (NI)                                            |-Dhttp.keepAlive.time.server=-100 && |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=200      | default timeout set to 5
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200)  |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   96  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    | No Input Provided (NI)              | default timeout set to 5
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   97  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=100     | Timeout set to 100
-    *       |                                                         | (SERVER_100)                        |
-    *--------------------------------------------------------------------------------------------------------------------------------
-    *   98  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.proxy=200      | default timeout set to 5
-    *       |                                                         | (PROXY_200)                         |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *   99  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=100 &&  |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=200      | Timeout set to 100
-    *       |                                                         |(SERVER_100 && PROXY_200)            |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  100  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=-100    | default timeout set to 5
-    *       |                                                         |(SERVER_100_NEGATIVE)                |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  101  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.proxy=-200     | default timeout set to 5
-    *       |                                                         |(PROXY_200_NEGATIVE)                 |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  102  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=-100 &&        |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=-200            | default timeout set to 5
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE)|
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  103  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=0       | close connection immediately
-    *       |                                                         | (SERVER_ZERO)                       |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  104  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.proxy=0        | default timeout set to 5
-    *       |                                                         | (PROXY_ZERO)                        |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  105  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=0 &&    |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_ZERO)         |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  106  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=0 &&    |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=-200     | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_ZERO_NEGATIVE)|
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  107  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=-100 && |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=0        | default timeout set to 5
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_ZERO) |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  108  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=100 &&  |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=0        | Timeout set to 100
-    *       |                                                         | (SERVER_100 && PROXY_ZERO)          |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  109  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=0 &&    |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=200      | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_200)          |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  110  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=100 &&  |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=-200     | Timeout set to 100
-    *       |                                                         |(SERVER_100 && PROXY_200_NEGATIVE)   |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  111  |Connection: keep-alive\r\nKeep-alive: timeout=-20 (F)    |-Dhttp.keepAlive.time.server=-100 && |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=200      | default timeout set to 5
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200)  |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  112  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | No Input Provided (NI)              | close connection immediately
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  113  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=100    | close connection immediately
-    *       |                                                         | (SERVER_100)                        |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  114  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.proxy=200     | close connection immediately
-    *       |                                                         | (PROXY_200)                         |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  115  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | close connection immediately
-    *       |                                                         | (SERVER_100 && PROXY_200)           |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  116  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=-100   | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE)               |
-    *------------------------------------------------------------------------------------------------------------------------------------
-    *  117  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.proxy=-200    | close connection immediately
-    *       |                                                         | (PROXY_200_NEGATIVE)                |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  118  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      |-Dhttp.keepAlive.time.server=-100 &&         |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=-200             | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE) |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  119  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=0      | close connection immediately
-    *       |                                                         | (SERVER_ZERO)                       |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  120  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (PROXY_ZERO)                        |
-    *------------------------------------------------------------------------------------------------------------------------------------
-    *  121  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_ZERO)         |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  122  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200    | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_200_NEGATIVE) |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  123  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=-100 &&|
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_ZERO) |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  124  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0       | close connection immediately
-    *       |                                                         | (SERVER_100 && PROXY_ZERO)          |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  125  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=0 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_200)          |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  126  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=100 && |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200    | close connection immediately
-    *       |                                                         | (SERVER_100 && PROXY_200_NEGATIVE)  |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  127  |Connection: keep-alive\r\nKeep-alive: timeout=0 (G)      | -Dhttp.keepAlive.time.server=-100 &&|
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200     | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200)  |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  128  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| No Input Provided (NI)                | default timeout set to 60
-    ---------------------------------------------------------------------------------------------------------------------------------------
-    *  129  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.server=100      | default timeout set to 60
-    *       |                                                         | (SERVER_100)                          |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  130  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.proxy=200       | Timeout set to 200
-    *       |                                                         | (PROXY_200)                           |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  131  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.server=100 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200       | Timeout set to 200
-    *       |                                                         | (SERVER_100 && PROXY_200)             |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  132  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.server=-100     | default timeout set to 60
-    *       |                                                         | (SERVER_100_NEGATIVE)                 |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  133  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.proxy=-200      | default timeout set to 60
-    *       |                                                         | (PROXY_200_NEGATIVE)                  |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  134  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)|-Dhttp.keepAlive.time.server=-100 &&        |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=-200            | default timeout set to 60
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE)|
-    *---------------------------------------------------------------------------------------------------------------------------------
-    *  135  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.server=0        | default timeout set to 60
-    *       |                                                         | (SERVER_ZERO)                         |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  136  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.proxy=0         | close connection immediately
-    *       |                                                         | (PROXY_ZERO)                          |
-    *----------------------------------------------------------------------------------------------------------------------------------
-    *  137  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.server=0 &&     |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0         | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_ZERO)           |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  138  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.server=0 &&     |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200      | default timeout set to 60
-    *       |                                                         | (SERVER_ZERO && PROXY_200_NEGATIVE)   |
-    *---------------------------------------------------------------------------------------------------------------------------------------
-    *  139  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.server=-100 &&  |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0         | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_ZERO)   |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  140  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.server=100 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0         | close connection immediately
-    *       |                                                         | (SERVER_100 && PROXY_ZERO)            |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  141  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)| -Dhttp.keepAlive.time.server=0 &&     |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200       | Timeout set to 20
-    *       |                                                         | (SERVER_ZERO && PROXY_200)            |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  142  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)|-Dhttp.keepAlive.time.server=100 &&    |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=-200       | default timeout set to 60
-    *       |                                                         | (SERVER_100 && PROXY_200_NEGATIVE)    |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  143  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=-20 (H)|-Dhttp.keepAlive.time.server=-100 &&   |
-    *       |                                                         |-Dhttp.keepAlive.time.proxy=200        | Timeout set to 200
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200)    |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  144  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | No Input Provided (NI)                | close connection immediately
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  145  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=100      | close connection immediately
-    *       |                                                         | (SERVER_100)                          |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  146  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.proxy=200       | close connection immediately
-    *       |                                                         | (PROXY_200)                           |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  147  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=100 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200       | close connection immediately
-    *       |                                                         | (SERVER_100 && PROXY_200)             |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  148  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=-100     | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE)                 |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  149  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.proxy=-200      | close connection immediately
-    *       |                                                         | (PROXY_200_NEGATIVE)                  |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  150  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=-100 &&        |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200            | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200_NEGATIVE) |
-    *------------------------------------------------------------------------------------------------------------------------------------
-    *  151  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=0        | close connection immediately
-    *       |                                                         | (SERVER_ZERO)                         |
-    *-----------------------------------------------------------------------------------------------------------------------------------
-    *  152  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.proxy=0         | close connection immediately
-    *       |                                                         | (PROXY_ZERO)                          |
-    *---------------------------------------------------------------------------------------------------------------------------------
-    *  153  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=0 &&     |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0         | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_ZERO)           |
-    *------------------------------------------------------------------------------------------------------------------------------------
-    *  154  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=0 &&     |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200      | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_200_NEGATIVE)   |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  155  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=-100 &&  |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0         | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_ZERO)   |
-    *-------------------------------------------------------------------------------------------------------------------------------------
-    *  156  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=100 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=0         | close connection immediately
-    *       |                                                         | (SERVER_100 && PROXY_ZERO)            |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  157  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=0 &&     |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200       | close connection immediately
-    *       |                                                         | (SERVER_ZERO && PROXY_200)            |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  158  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=100 &&   |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=-200      | close connection immediately
-    *       |                                                         | (SERVER_100 && PROXY_200_NEGATIVE)    |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    *  159  |Proxy-Connection:keep-alive\r\nKeep-alive:timeout=0 (I)  | -Dhttp.keepAlive.time.server=-100 &&  |
-    *       |                                                         | -Dhttp.keepAlive.time.proxy=200       | close connection immediately
-    *       |                                                         | (SERVER_100_NEGATIVE && PROXY_200)    |
-    *--------------------------------------------------------------------------------------------------------------------------------------
-    */
-
-   /* private static final String[] serverScenarios = {
-        A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-        B, B, B, B, B, B, B, B, B, B,B, B, B, B, B, B,
-        C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C,
-        D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D,
-        E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E,
-        NI, NI, NI, NI, NI, NI, NI, NI, NI, NI, NI, NI, NI, NI, NI, NI,
-        F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-        G, G, G, G, G, G, G, G, G, G, G, G, G, G, G, G,
-        H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H,
-        I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I
-    }; */
-    /*
-     * following are client scenarios which are repeated.
-     */
-    private static final String[] a = {
-        NI, SERVER_100,     PROXY_200, SERVER_100 + CLIENT_SEPARATOR + PROXY_200,    SERVER_100_NEGATIVE,
-        PROXY_200_NEGATIVE, SERVER_100_NEGATIVE + CLIENT_SEPARATOR + PROXY_200_NEGATIVE,
-        SERVER_ZERO,         PROXY_ZERO, SERVER_ZERO + CLIENT_SEPARATOR + PROXY_ZERO,
-        SERVER_ZERO + CLIENT_SEPARATOR + PROXY_200_NEGATIVE, SERVER_100_NEGATIVE + CLIENT_SEPARATOR + PROXY_ZERO,
-        SERVER_100 + CLIENT_SEPARATOR + PROXY_ZERO, SERVER_ZERO + CLIENT_SEPARATOR + PROXY_200,
-        SERVER_100 + CLIENT_SEPARATOR + PROXY_200_NEGATIVE, SERVER_100_NEGATIVE + CLIENT_SEPARATOR + PROXY_200
+    private static final String[] serverHeaders = {
+        null,
+        CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE,
+        CONNECTION_KEEP_ALIVE_WITH_TIMEOUT + NEW_LINE,
+        PROXY_CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE,
+        PROXY_CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE + CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE,
+        PROXY_CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE + KEEP_ALIVE_PROXY_TIMEOUT + NEW_LINE,
+        CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE + KEEP_ALIVE_TIMEOUT_NEG + NEW_LINE,
+        CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE + KEEP_ALIVE_TIMEOUT_ZERO + NEW_LINE,
+        PROXY_CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE + KEEP_ALIVE_TIMEOUT_NEG + NEW_LINE,
+        PROXY_CONNECTION_KEEP_ALIVE_ONLY + NEW_LINE + KEEP_ALIVE_TIMEOUT_ZERO + NEW_LINE
     };
 
-   /* private String[] clientScenarios = {
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15],
-    }; */
+    private static KeepAliveCache keepAliveCache;
 
-    private static final String[] clientScenarios = {
-        a[0] , a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15]
-    };
+    private static Constructor<?> keepAliveKeyClassconstructor;
 
-    private static final int[] expectedValues = {
-        5,  100,    5, 100,  5,  5,  5,  0,  5,   0,   0,   5,  100,    0,   100,    5,
-        20,   20 ,  20,  20, 20, 20, 20, 20, 20,  20 , 20,  20,   20,   20,    20,   20,
-        60,   60,  200, 200, 60, 60, 60, 60,  0,   0,  60,   0,    0,  200,    60,  200,
-        60,   60,  200, 200, 60, 60, 60, 60,  0,   0,  60,   0,    0,  200,    60,  200,
-        120, 120,  120, 120,120,120,120,120,120, 120, 120, 120,  120,  120,   120,  120,
-        5,  100,    5, 100,  5,  5,  5,  0,  5,   0,   0,   5,  100,    0,   100,    5,
-        5,  100,    5, 100,  5,  5,  5,  0,  5,   0,   0,   5,  100,    0,   100,    5,
-        0,    0,    0,   0,  0,  0,  0,  0,  0,   0,   0,   0,    0,    0,     0,    0,
-        60,  60,  200, 200, 60, 60, 60, 60,  0,   0,  60,   0,    0,  200,    60,  200,
-        0,    0,    0,   0,  0,  0,  0,  0,  0,   0,   0,   0,    0,    0,     0,    0,
-    };
+    // variables set by server thread
+    private volatile int serverPort;
+    private volatile boolean isProxySet;
 
-    private final CountDownLatch countDownLatch = new CountDownLatch(1);
-
-    private final CountDownLatch serverCountDownLatch = new CountDownLatch(1);
-
-    /*
-     * setting of client properties -Dhttp.keepAlive.time.server and -Dhttp.keepAlive.time.proxy is handled through this method.
-     * There are 16 client scenarios in total starting with scenarioNumber 0(zero) and ending with 15.
-     * Server Scenarios are grouped into batch of 16 scenarios.
-     * There are 10 batches in total and each batch contains 16 scenarios so 10 * 16 = 160 scenarios in total.
-     * 16 Client Scenarios are used repeatedly for every server scenario batch.
-     * for serverscenario[0],serverscenario[16],serverscenario[32] ... serverscenario[144] is mapped to clientscenario[0]
-     * for serverscenario[1],serverscenario[17],serverscenario[33] ... serverscenario[145] is mapped to clientscenario[1]
-     * for serverscenario[2],serverscenario[18],serverscenario[34] ... serverscenario[146] is mapped to clientscenario[2]
-     * ...
-     * for serverscenario[15],serverscenario[31],serverscenario[47] ... serverscenario[159] is mapped to clientscenario[15]
-     */
-    private int getClientScenarioNumber(int scenarioNumber) {
-        return scenarioNumber % 16 ;
-    }
-
-    /*
-     * Returns SERVER_RESPONSE as String based on integer inputParameter scenarioNumber.
-     * Server Scenarios are grouped into batch of 16 scenarios starting with scenarioNumber 0 (zero)
-     * so there are 10 batches in total and each batch contains 16 scenarios so 10 * 16 = 160 scenarios in total.
-     * For each batch of 16 scenarios, there will be common SERVER_RESPONSE for all 16 scenarios in batch.
-     * for scenario numbers from 0 to 15 server  response is: Connection:keep-alive
-     * for scenario numbers from 16 to 31 server response is: SERVER_RESPONSE=Connection: keep-alive\r\nKeep-alive: timeout=20
-     * for scenario numbers from 32 to 47 server response is: SERVER_RESPONSE=Proxy-Connection: keep-alive
-     * for scenario numbers from 48 to 63 server response is: SERVER_RESPONSE=Connection:keep-alive\r\nProxy-connection:keep-alive
-     * for scenario numbers from 64 to 79 server response is: SERVER_RESPONSE=Proxy-connection:keep-alive\r\nKeep-alive:timeout=120
-     * for scenario numbers from 80 to 95 server response is: SERVER_RESPONSE=No Input
-     * for scenario numbers from 96 to 111 server response is: SERVER_RESPONSE=Connection: keep-alive\r\nKeep-alive: timeout=-20
-     * for scenario numbers from 112 to 127 server resonse is: Connection: keep-alive\r\nKeep-alive: timeout=0
-     * for scenario numbers from 128 to 143 server response is: Proxy-connection:keep-alive\r\nKeep-alive:timeout=-20
-     * for scenario numbers from 144 to 159 server response is: Proxy-connection:keep-alive\r\nKeep-alive:timeout=0
-     */
-    private String getServerScenario(int scenarioNumber) {
-        /*
-         *  ServerResponse for scenarios from 0 to 15
-         *  SERVER_RESPONSE:Connection:keep-alive
-         */
-        if(scenarioNumber >= 0 && scenarioNumber <= 15) {
-            return A;
-        }
-        /*
-         * ServerResponse for scenarios from 16 to 31
-         * SERVER_RESPONSE=Connection: keep-alive\r\nKeep-alive: timeout=20
-         */
-        else if (scenarioNumber >= 16 && scenarioNumber <= 31){
-            return B;
-        }
-        /*
-         * ServerResponse for scenarios from 32 to 47
-         * SERVER_RESPONSE=Proxy-Connection: keep-alive
-         */
-        else if (scenarioNumber >= 32 && scenarioNumber <= 47){
-            return C;
-        }
-        /*
-         * ServerResponse for scenarios from 48 to 63
-         * SERVER_RESPONSE=Connection:keep-alive\r\nProxy-connection:keep-alive
-         */
-        else if (scenarioNumber >= 48 && scenarioNumber <= 63){
-            return D;
-        /*
-         * ServerResponse for scenarios from 64 to 79
-         * SERVER_RESPONSE=Proxy-connection:keep-alive\r\nKeep-alive:timeout=120
-         */
-        } else if (scenarioNumber >= 64 && scenarioNumber <= 79){
-            return E;
-        }
-        /*
-         * ServerResponse for scenarios from 80 to 95
-         * SERVER_RESPONSE=No Input
-         */
-        else if (scenarioNumber >= 80 && scenarioNumber <= 95){
-            return NI;
-        }
-        /*
-         * ServerResponse for scenarios from 96 to 111
-         * SERVER_RESPONSE=Connection: keep-alive\r\nKeep-alive: timeout=-20
-         */
-        else if (scenarioNumber >= 96 && scenarioNumber <= 111){
-            return F;
-        }
-        /*
-         * ServerResponse for scenarios from 112 to 127
-         * SERVER_RESPONSE=Connection: keep-alive\r\nKeep-alive: timeout=0
-         */
-        else if (scenarioNumber >= 112 && scenarioNumber <= 127){
-            return G;
-        }
-        /*
-         * ServerResponse for scenarios from 128 to 143
-         * SERVER_RESPONSE=Proxy-connection:keep-alive\r\nKeep-alive:timeout=-20
-         */
-        else if (scenarioNumber >= 128 && scenarioNumber <= 143){
-            return H;
-        }
-        /*
-         * ServerResponse for scenarios from 144 to 159
-         * SERVER_RESPONSE=Proxy-connection:keep-alive\r\nKeep-alive:timeout=0
-         */
-        else if (scenarioNumber >= 144 && scenarioNumber <= 159){
-            return I;
-        }
-        /*Invalid Case*/
-        return null;
-    }
-
-    private void startScenario(int scenarioNumber) throws Exception {
-        System.out.println("serverScenarios[" + scenarioNumber + "]=" + getServerScenario(scenarioNumber));
-        System.out.println("clientScenarios[" + scenarioNumber + "]=" + clientScenarios[getClientScenarioNumber(scenarioNumber)]);
-        if(expectedValues[scenarioNumber] == 0) {
-            System.out.println("ExpectedOutput=" + NOT_CACHED);
-        } else {
-            System.out.println("ExpectedOutput=" + expectedValues[scenarioNumber]);
-        }
-        System.out.println();
-        startServer(scenarioNumber);
-        runClient(scenarioNumber);
-    }
-
-    private void startServer(int scenarioNumber) {
-        Thread server = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                   executeServer(scenarioNumber);
-                } catch (IOException e) {
-                   e.printStackTrace();
-                }
-            }
-        }, "SERVER");
-        server.start();
-    }
+    private static final Phaser serverGate = new Phaser(2);
 
     private void readAll(Socket s) throws IOException {
         byte[] buf = new byte[128];
@@ -1058,215 +128,208 @@ public class KeepAliveTest {
         }
     }
 
-    private void executeServer(int scenarioNumber) throws IOException {
-        String serverScenarioContent = null;
-        if (!getServerScenario(scenarioNumber).equalsIgnoreCase(NI)) {
-            serverScenarioContent = getServerScenario(scenarioNumber) + NEW_LINE;
-            /*
-             * isProxySet should be set before Server is moved to Listen State.
-             */
-            if (serverScenarioContent.contains("Proxy")) {
-                isProxySet = true;
-            } else {
-                isProxySet = false;
-            }
+    private void executeServer(int scenarioNumber) {
+        String scenarioHeaders = serverHeaders[scenarioNumber];
+        if (scenarioHeaders != null) {
+            // isProxySet should be set before Server is moved to Listen State.
+            isProxySet = scenarioHeaders.contains("Proxy");
         }
-        ServerSocket serverSocket = null;
-        Socket socket = null;
-        OutputStreamWriter out = null;
-        InetAddress loopback = InetAddress.getLoopbackAddress();
-        try {
-            serverSocket = new ServerSocket();
-            serverSocket.bind(new InetSocketAddress(loopback, 0));
-            SERVER_PORT = serverSocket.getLocalPort();
-            //serverReady = true;
-            this.serverCountDownLatch.countDown();
-            System.out
-                .println("SERVER_PORT= " + SERVER_PORT +" isProxySet=" + isProxySet);
-            /*
-             * Server will be waiting for clients to connect.
-             */
-            socket = serverSocket.accept();
-            readAll(socket);
-            out = new OutputStreamWriter(socket.getOutputStream());
-            String BODY = "SERVER REPLY: Hello world";
-            String CLEN = "Content-Length: " + BODY.length() + NEW_LINE;
-            /* send the header */
-            out.write("HTTP/1.1 200 OK\r\n");
-            out.write("Content-Type: text/plain; charset=iso-8859-1\r\n");
-            /*
-             * append each scenario content from array.
-             */
-            if(serverScenarioContent != null) {
-                out.write(serverScenarioContent);
-            }
-            out.write(CLEN);
-            out.write(NEW_LINE);
-            out.write(BODY);
-            out.flush();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (out != null) {
-                out.flush();
-                out.close();
-            }
-            if (socket != null) {
-                socket.close();
-            }
-            if (serverSocket != null) {
-                serverSocket.close();
-            }
-        }
-    }
+        try (ServerSocket serverSocket = new ServerSocket()) {
+            serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+            serverPort = serverSocket.getLocalPort();
+            serverGate.arrive();
 
-    private void runClient(int scenarioNumber) throws Exception {
-        try {
-            connectToServerURL(scenarioNumber);
-        } finally {
-            System.out.println("client count down latch:" + scenarioNumber);
-            this.countDownLatch.countDown();
-            System.out.println();
-            System.out.println();
-        }
-    }
+            // Server will be waiting for clients to connect.
+            try (Socket socket = serverSocket.accept()) {
+                readAll(socket);
+                try (OutputStreamWriter out = new OutputStreamWriter(socket.getOutputStream())) {
+                    String BODY = "SERVER REPLY: Hello world";
+                    String CLEN = "Content-Length: " + BODY.length() + NEW_LINE;
 
-    private void connectToServerURL(int scenarioNumber) throws Exception {
-        //    System.setProperty("java.net.useSystemProxies", "false");
-        //    System.setProperty("http.nonProxyHosts", "");
-        //    System.setProperty("http.proxyHost", "localhost");
-        //    System.setProperty("http.proxyPort", String.valueOf(SERVER_PORT));
-        System.out.println("Following are Existing System Properties if set any");
-        System.out.println("http.keepAlive.time.server:" + System.getProperty("http.keepAlive.time.server"));
-        System.out.println("http.keepAlive.time.proxy:" + System.getProperty("http.keepAlive.time.proxy"));
-        System.setProperty("java.net.useSystemProxies", "false");
-        System.out.println("http.proxyPort:"+System.getProperty("http.proxyPort"));
-        System.out.println("http.proxyHost:"+System.getProperty("http.proxyHost"));
-        System.clearProperty("http.keepAlive.time.server");
-        System.clearProperty("http.keepAlive.time.proxy");
-        // fetch clientScenearios for each scenarioNumber from array and set it to
-        // System property.
-        if (!clientScenarios[getClientScenarioNumber(scenarioNumber)].equalsIgnoreCase(NI)) {
-            System.out.println("Client Input Parsing");
-            for (String clientScenarioString : clientScenarios[getClientScenarioNumber(scenarioNumber)].split(CLIENT_SEPARATOR)) {
-                System.out.println(clientScenarioString);
-                String key = clientScenarioString.split("=")[0];
-                String value = clientScenarioString.split("=")[1];
-                System.setProperty(key, value);
-            }
-        }
-        // wait until ServerSocket moves to listening state.
-        this.serverCountDownLatch.await();
-        System.out.println("client started");
-        URL url = URIBuilder.newBuilder().scheme("http").loopback().port(SERVER_PORT).toURL();
-        System.out.println("connecting from client to SERVER URL:" + url);
-        HttpURLConnection httpUrlConnection = null;
-        /*
-         * isProxySet is set to true when Expected Server Response contains Proxy-Connection header.
-         */
-        if (isProxySet) {
-            httpUrlConnection = (sun.net.www.protocol.http.HttpURLConnection) url
-                .openConnection(new Proxy(Type.HTTP, new InetSocketAddress("localhost", SERVER_PORT)));
-        } else {
-            httpUrlConnection = (sun.net.www.protocol.http.HttpURLConnection) url.openConnection();
-        }
-        InputStreamReader inputStreamReader = new InputStreamReader(httpUrlConnection.getInputStream());
-        BufferedReader bufferedReader = null;
-        try {
-            bufferedReader = new BufferedReader(inputStreamReader);
-            while (true) {
-                String eachLine = bufferedReader.readLine();
-                if (eachLine == null) {
-                    break;
+                    // send common headers
+                    out.write("HTTP/1.1 200 OK\r\n");
+                    out.write("Content-Type: text/plain; charset=iso-8859-1\r\n");
+
+                    // set scenario headers
+                    if (scenarioHeaders != null) {
+                        out.write(scenarioHeaders);
+                    }
+
+                    // send content
+                    out.write(CLEN);
+                    out.write(NEW_LINE);
+                    out.write(BODY);
                 }
-                System.out.println(eachLine);
-            }
-        } finally {
-            if (bufferedReader != null) {
-                bufferedReader.close();
             }
+        } catch (IOException ioe) {
+            throw new RuntimeException("IOException in server thread", ioe);
         }
-        //    System.out.println("ResponseCode:" + httpUrlConnection.getResponseCode());
-        //    System.out.println("ResponseMessage:" + httpUrlConnection.getResponseMessage());
-        //    System.out.println("Content:" + httpUrlConnection.getContent());
-        //    Thread.sleep(2000);
-        for (Entry<String, List<String>> header : httpUrlConnection.getHeaderFields().entrySet()) {
-            System.out.println(header.getKey() + "=" + header.getValue());
-        }
-        fetchInfo(scenarioNumber, httpUrlConnection);
     }
 
-    private void fetchInfo(int scenarioNumber, sun.net.www.protocol.http.HttpURLConnection httpUrlConnection)
-        throws Exception {
-       Field field = Class.forName("sun.net.www.protocol.http.HttpURLConnection").getDeclaredField("http");
-       field.setAccessible(true);
-       HttpClient httpClient = (HttpClient) field.get(httpUrlConnection);
-       //    System.out.println("httpclient=" + httpClient);
-       Field keepAliveField = Class.forName("sun.net.www.http.HttpClient").getDeclaredField("kac");
-       keepAliveField.setAccessible(true);
-       KeepAliveCache keepAliveCache = (KeepAliveCache) keepAliveField.get(httpClient);
-       System.out.println("keepAliveCache" + keepAliveCache);
-       System.out.println("SERVER URL:" + httpUrlConnection.getURL());
-       /*
-        * create KeepAliveKey(URL,Object) object and compare created KeepAliveKey and
-        * existing using equals() method: KeepAliveKey.equals()
-        */
-       Class keepAliveKeyClass = Class.forName("sun.net.www.http.KeepAliveKey");
-       //    System.out.println("keepAliveKeyClass=" + keepAliveKeyClass);
-       Constructor keepAliveKeyClassconstructor = keepAliveKeyClass.getDeclaredConstructors()[0];
-       keepAliveKeyClassconstructor.setAccessible(true);
-       Object expectedKeepAliveKey = keepAliveKeyClassconstructor.newInstance(httpUrlConnection.getURL(), null);
-       System.out.println("ExpectedKeepAliveKey=" + expectedKeepAliveKey);
-       Object clientVectorObjectInMap = keepAliveCache.get(expectedKeepAliveKey);
-       System.out.println("ClientVector=" + clientVectorObjectInMap);
-       HttpClient httpClientCached = keepAliveCache.get(httpUrlConnection.getURL(), null);
-       System.out.println("HttpClient in Cache:" + httpClientCached);
-       if(httpClientCached != null) {
+    private void fetchInfo(int expectedValue, HttpURLConnection httpUrlConnection) throws Exception {
+        Object expectedKeepAliveKey = keepAliveKeyClassconstructor.newInstance(httpUrlConnection.getURL(), null);
+        Object clientVectorObjectInMap = keepAliveCache.get(expectedKeepAliveKey);
+        System.out.println("ClientVector for KeepAliveKey:" + clientVectorObjectInMap);
+        HttpClient httpClientCached = keepAliveCache.get(httpUrlConnection.getURL(), null);
+        System.out.println("HttpClient in Cache:" + httpClientCached);
+
+        if (httpClientCached != null) {
             System.out.println("KeepingAlive:" + httpClientCached.isKeepingAlive());
             System.out.println("UsingProxy:" + httpClientCached.getUsingProxy());
             System.out.println("ProxiedHost:" + httpClientCached.getProxyHostUsed());
             System.out.println("ProxiedPort:" + httpClientCached.getProxyPortUsed());
-            System.out.println("ProxyPortUsingSystemProperty:" + System.getProperty("http.proxyPort"));
-            System.out.println("ProxyHostUsingSystemProperty:" + System.getProperty("http.proxyHost"));
-            System.out.println("http.keepAlive.time.server=" + System.getProperty("http.keepAlive.time.server"));
-            System.out.println("http.keepAlive.time.proxy=" + System.getProperty("http.keepAlive.time.proxy"));
-            Class clientVectorClass = Class.forName("sun.net.www.http.KeepAliveCache$ClientVector");
-            //      System.out.println("clientVectorClass=" + clientVectorClass);
+            Class<?> clientVectorClass = Class.forName("sun.net.www.http.KeepAliveCache$ClientVector");
             Field napField = clientVectorClass.getDeclaredField("nap");
             napField.setAccessible(true);
             int napValue = (int) napField.get(clientVectorObjectInMap);
             int actualValue = napValue / 1000;
-            //      System.out.println("nap=" + napValue / 1000);
-            System.out.printf("ExpectedOutput:%d ActualOutput:%d ", expectedValues[scenarioNumber], actualValue);
-            System.out.println();
-            if (expectedValues[scenarioNumber] != actualValue) {
-                throw new RuntimeException(
-                            "ExpectedOutput:" + expectedValues[scenarioNumber] + " ActualOutput: " + actualValue);
+            if (expectedValue == actualValue) {
+                System.out.printf("Cache time:%d\n", actualValue);
+            } else {
+                throw new RuntimeException("Sleep time of " + actualValue + " not expected (" + expectedValue + ")");
             }
         } else {
-            //executed when value is not cached.
-            String expected = expectedValues[scenarioNumber] == 0 ? NOT_CACHED
-                    : String.valueOf(expectedValues[scenarioNumber]);
-            System.out.println("ExpectedOutput:" + expected + " ActualOutput:" + NOT_CACHED);
-            if (!expected.equalsIgnoreCase(NOT_CACHED)) {
-                    throw new RuntimeException("ExpectedOutput:" + expected + " ActualOutput:" + NOT_CACHED);
+            if (expectedValue == 0) {
+                System.out.println("Connection not cached.");
+            } else {
+                throw new RuntimeException("Connection was not cached although expected with sleep time of:" + expectedValue);
             }
-       }
+        }
     }
 
-    public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Usage:java KeepAliveTest.java <scenarioNumber>");
+    private void connectToServerURL(int expectedValue) throws Exception {
+        // wait until ServerSocket moves to listening state.
+        serverGate.arriveAndAwaitAdvance();
+        URL url = URIBuilder.newBuilder().scheme("http").loopback().port(serverPort).toURL();
+        System.out.println("connecting to server URL: " + url + ", isProxySet: " + isProxySet);
+        HttpURLConnection httpUrlConnection = null;
+
+        // isProxySet is set to true when Expected Server Response contains Proxy-Connection header.
+        if (isProxySet) {
+            httpUrlConnection = (HttpURLConnection) url
+                .openConnection(new Proxy(Type.HTTP, new InetSocketAddress("localhost", serverPort)));
+        } else {
+            httpUrlConnection = (HttpURLConnection) url.openConnection();
         }
+
+        try (InputStreamReader inputStreamReader = new InputStreamReader(httpUrlConnection.getInputStream());
+             BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
+            while (true) {
+                String line = bufferedReader.readLine();
+                if (line == null) {
+                    break;
+                }
+                System.out.println(line);
+            }
+        }
+        for (Entry<String, List<String>> header : httpUrlConnection.getHeaderFields().entrySet()) {
+            System.out.println(header.getKey() + "=" + header.getValue());
+        }
+        fetchInfo(expectedValue, httpUrlConnection);
+    }
+
+    private int getExpectedCachingValue(int serverScenario) {
+        if (serverScenario == 2) {
+            // Connection: keep-alive && Keep-alive: timeout=20
+            //
+            // server side keep-alive timeout is what counts here
+            return 20;
+        } else if (serverScenario == 3 || serverScenario == 4 || serverScenario == 8) {
+            // Proxy-Connection: keep-alive
+            // Connection:keep-alive && Proxy-connection:keep-alive
+            // Proxy-Connection:keep-alive && Keep-alive:timeout=-20
+            //
+            // Proxy-connection:keep-alive is set, timeout could be invalid -> value of http.keepAlive.time.proxy or default of 60
+            int httpKeepAliveTimeProxy;
+            try {
+                httpKeepAliveTimeProxy = Integer.valueOf(System.getProperty("http.keepAlive.time.proxy"));
+            } catch (NumberFormatException e) {
+                httpKeepAliveTimeProxy = -1;
+            }
+            return httpKeepAliveTimeProxy < 0 ? 60 : httpKeepAliveTimeProxy;
+        } else if (serverScenario == 5) {
+            // Proxy-connection:keep-alive && Keep-alive:timeout=120
+            //
+            // server side keep-alive timeout is what counts here
+            return 120;
+        } else if (serverScenario == 7 || serverScenario == 9) {
+            // Connection: keep-alive && Keep-alive: timeout=0
+            // Proxy-Connection:keep-alive && Keep-alive:timeout=0
+            //
+            // no caching
+            return 0;
+        } else {
+            // No server parameters
+            // Connection: keep-alive
+            // Connection: keep-alive && Keep-alive: timeout=-20
+            //
+            // Nothing or Connection:keep-alive is set, timeout could be invalid -> value of http.keepAlive.time.server or default of 5
+            int httpKeepAliveTimeServer;
+            try {
+                httpKeepAliveTimeServer = Integer.valueOf(System.getProperty("http.keepAlive.time.server"));
+            } catch (NumberFormatException e) {
+                httpKeepAliveTimeServer = -1;
+            }
+            return httpKeepAliveTimeServer < 0 ? 5 : httpKeepAliveTimeServer;
+        }
+    }
+
+    private void runScenario(int scenarioNumber) throws Exception {
+        int expectedValue = getExpectedCachingValue(scenarioNumber);
+        System.out.println("Expecting Cache Time of " + expectedValue + " for server headers:");
+        if (serverHeaders[scenarioNumber] == null) {
+            System.out.println();
+        } else {
+            System.out.print(serverHeaders[scenarioNumber]);
+        }
+        Thread server = Thread.ofPlatform().start(() -> executeServer(scenarioNumber));
+        connectToServerURL(expectedValue);
+        server.join();
+        System.out.println();
+    }
+
+    private static void initialize() throws Exception {
+        System.clearProperty("http.proxyPort");
+        System.clearProperty("http.proxyHost");
+        System.setProperty("java.net.useSystemProxies", "false");
+
+        Field keepAliveField = sun.net.www.http.HttpClient.class.getDeclaredField("kac");
+        keepAliveField.setAccessible(true);
+        keepAliveCache = (KeepAliveCache) keepAliveField.get(null);
+        System.out.println("KeepAliveCache: " + keepAliveCache);
+        keepAliveKeyClassconstructor = Class.forName("sun.net.www.http.KeepAliveKey").getDeclaredConstructors()[0];
+        keepAliveKeyClassconstructor.setAccessible(true);
+
         logger.setLevel(Level.FINEST);
         ConsoleHandler h = new ConsoleHandler();
         h.setLevel(Level.FINEST);
         logger.addHandler(h);
-        KeepAliveTest keepAliveTest = new KeepAliveTest();
-        if (args.length != 0) {
-            keepAliveTest.startScenario(Integer.valueOf(args[0]));
+
+        System.out.println("Client properties: http.keepAlive.time.server=" + System.getProperty("http.keepAlive.time.server") +
+                ", http.keepAlive.time.proxy=" + System.getProperty("http.keepAlive.time.proxy"));
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (args.length > 1) {
+            throw new IllegalArgumentException("Usage:java KeepAliveTest.java <scenarioNumber>");
+        } else if (args.length == 1) {
+            // an individual test scenario
+            try {
+                int scenarioNumber = Integer.valueOf(args[0]);
+                if (scenarioNumber < 0 || scenarioNumber > 9) {
+                    throw new IllegalArgumentException("Scenario " + scenarioNumber + " does not exist");
+                }
+                initialize();
+                new KeepAliveTest().runScenario(scenarioNumber);
+            } catch (NumberFormatException e) {
+                throw new IllegalArgumentException("Scenario must be a number, got " + args[0]);
+            }
+        } else {
+            // all server scenarios
+            initialize();
+            for (int i = 0; i < 10; i++) {
+                new KeepAliveTest().runScenario(i);
+            }
         }
-        // make main thread wait until server and client is completed.
-        keepAliveTest.countDownLatch.await();
     }
 }

From 4e5c25ee43d4ec31ed5160fd93a2fd15e35182f8 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Sun, 28 Apr 2024 22:55:44 +0000
Subject: [PATCH 229/486] 8331108: Unused Math.abs call in
 java.lang.FdLibm.Expm1#compute

Reviewed-by: naoto, bpb, rgiulietti
---
 src/java.base/share/classes/java/lang/FdLibm.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/FdLibm.java b/src/java.base/share/classes/java/lang/FdLibm.java
index dd79ee82863..70d728a16db 100644
--- a/src/java.base/share/classes/java/lang/FdLibm.java
+++ b/src/java.base/share/classes/java/lang/FdLibm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -3005,7 +3005,6 @@ final class FdLibm {
 
             hx  = __HI(x);  // high word of x
             xsb = hx & SIGN_BIT;                 // sign bit of x
-            y = Math.abs(x);
             hx &= EXP_SIGNIF_BITS;               // high word of |x|
 
             // filter out huge and non-finite argument

From fb63cbadb419f1de91acae9fc66be258e1d3d214 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Mon, 29 Apr 2024 07:12:46 +0000
Subject: [PATCH 230/486] 8330684: ClassFile API runs into StackOverflowError
 while parsing certain class' bytes

Reviewed-by: psandoz
---
 .../classfile/impl/ClassReaderImpl.java       | 32 ++++++++++++++-----
 test/jdk/jdk/classfile/LimitsTest.java        |  9 +++++-
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
index 9b6c7d7ad4c..2022f8f0154 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
@@ -150,7 +150,7 @@ public final class ClassReaderImpl
     @Override
     public ClassEntry thisClassEntry() {
         if (thisClass == null) {
-            thisClass = readEntry(thisClassPos, ClassEntry.class);
+            thisClass = readClassEntry(thisClassPos);
         }
         return thisClass;
     }
@@ -339,6 +339,10 @@ public final class ClassReaderImpl
     // Constantpool
     @Override
     public PoolEntry entryByIndex(int index) {
+        return entryByIndex(index, 0, 0xff);
+    }
+
+    private PoolEntry entryByIndex(int index, int lowerBoundTag, int upperBoundTag) {
         if (index <= 0 || index >= constantPoolCount) {
             throw new ConstantPoolException("Bad CP index: " + index);
         }
@@ -349,6 +353,10 @@ public final class ClassReaderImpl
                 throw new ConstantPoolException("Unusable CP index: " + index);
             }
             int tag = readU1(offset);
+            if (tag < lowerBoundTag || tag > upperBoundTag) {
+                throw new ConstantPoolException(
+                        "Bad tag (" + tag + ") at index (" + index + ") position (" + offset + ")");
+            }
             final int q = offset + 1;
             info = switch (tag) {
                 case TAG_UTF8 -> new AbstractPoolEntry.Utf8EntryImpl(this, index, buffer, q + 2, readU2(q));
@@ -367,7 +375,7 @@ public final class ClassReaderImpl
                 case TAG_NAMEANDTYPE -> new AbstractPoolEntry.NameAndTypeEntryImpl(this, index, (AbstractPoolEntry.Utf8EntryImpl) readUtf8Entry(q),
                                                                                    (AbstractPoolEntry.Utf8EntryImpl) readUtf8Entry(q + 2));
                 case TAG_METHODHANDLE -> new AbstractPoolEntry.MethodHandleEntryImpl(this, index, readU1(q),
-                                                                                     (AbstractPoolEntry.AbstractMemberRefEntry) readEntry(q + 1));
+                                                                                     readEntry(q + 1, AbstractPoolEntry.AbstractMemberRefEntry.class, TAG_FIELDREF, TAG_INTERFACEMETHODREF));
                 case TAG_METHODTYPE -> new AbstractPoolEntry.MethodTypeEntryImpl(this, index, (AbstractPoolEntry.Utf8EntryImpl) readUtf8Entry(q));
                 case TAG_CONSTANTDYNAMIC -> new AbstractPoolEntry.ConstantDynamicEntryImpl(this, index, readU2(q), (AbstractPoolEntry.NameAndTypeEntryImpl) readNameAndTypeEntry(q + 2));
                 case TAG_INVOKEDYNAMIC -> new AbstractPoolEntry.InvokeDynamicEntryImpl(this, index, readU2(q), (AbstractPoolEntry.NameAndTypeEntryImpl) readNameAndTypeEntry(q + 2));
@@ -423,7 +431,15 @@ public final class ClassReaderImpl
 
     @Override
     public <T extends PoolEntry> T readEntry(int pos, Class<T> cls) {
-        var e = readEntry(pos);
+        return readEntry(pos, cls, 0, 0xff);
+    }
+
+    private <T extends PoolEntry> T readEntry(int pos, Class<T> cls, int expectedTag) {
+        return readEntry(pos, cls, expectedTag, expectedTag);
+    }
+
+    private <T extends PoolEntry> T readEntry(int pos, Class<T> cls, int lowerBoundTag, int upperBoundTag) {
+        var e = entryByIndex(readU2(pos), lowerBoundTag, upperBoundTag);
         if (cls.isInstance(e)) return cls.cast(e);
         throw new ConstantPoolException("Not a " + cls.getSimpleName() + " at index: " + readU2(pos));
     }
@@ -454,27 +470,27 @@ public final class ClassReaderImpl
 
     @Override
     public ModuleEntry readModuleEntry(int pos) {
-        return readEntry(pos, ModuleEntry.class);
+        return readEntry(pos, ModuleEntry.class, TAG_MODULE);
     }
 
     @Override
     public PackageEntry readPackageEntry(int pos) {
-        return readEntry(pos, PackageEntry.class);
+        return readEntry(pos, PackageEntry.class, TAG_PACKAGE);
     }
 
     @Override
     public ClassEntry readClassEntry(int pos) {
-        return readEntry(pos, ClassEntry.class);
+        return readEntry(pos, ClassEntry.class, TAG_CLASS);
     }
 
     @Override
     public NameAndTypeEntry readNameAndTypeEntry(int pos) {
-        return readEntry(pos, NameAndTypeEntry.class);
+        return readEntry(pos, NameAndTypeEntry.class, TAG_NAMEANDTYPE);
     }
 
     @Override
     public MethodHandleEntry readMethodHandleEntry(int pos) {
-        return readEntry(pos, MethodHandleEntry.class);
+        return readEntry(pos, MethodHandleEntry.class, TAG_METHODHANDLE);
     }
 
     @Override
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index d23a948fe9f..00aaf32385d 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8320360
+ * @bug 8320360 8330684
  * @summary Testing ClassFile limits.
  * @run junit LimitsTest
  */
@@ -31,6 +31,7 @@ import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.MethodTypeDesc;
 import java.lang.classfile.ClassFile;
+import java.lang.classfile.constantpool.ConstantPoolException;
 import jdk.internal.classfile.impl.LabelContext;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
@@ -92,4 +93,10 @@ class LimitsTest {
         assertThrows(IllegalArgumentException.class, () -> ClassFile.of().parse(new byte[]{(byte)0xCA, (byte)0xFE, (byte)0xBA, (byte)0xBE}), "reading magic only");
         assertThrows(IllegalArgumentException.class, () -> ClassFile.of().parse(new byte[]{(byte)0xCA, (byte)0xFE, (byte)0xBA, (byte)0xBE, 0, 0, 0, 0, 0, 2}), "reading invalid CP size");
     }
+
+    @Test
+    void testInvalidClassEntry() {
+        assertThrows(ConstantPoolException.class, () -> ClassFile.of().parse(new byte[]{(byte)0xCA, (byte)0xFE, (byte)0xBA, (byte)0xBE,
+            0, 0, 0, 0, 0, 2, ClassFile.TAG_METHODREF, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}).thisClass());
+    }
 }

From c615c18e9f92dc9fdc2db512fbd47fd255f7fe86 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Mon, 29 Apr 2024 07:36:14 +0000
Subject: [PATCH 231/486] 8330158: C2: Loop strip mining uses ABS with min int

Reviewed-by: shade, kvn, dlong, mbalao
---
 src/hotspot/share/opto/loopnode.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index eb082bd7439..fcd0e1a4df2 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -2352,7 +2352,8 @@ Node* PhaseIdealLoop::exact_limit( IdealLoopTree *loop ) {
   CountedLoopNode *cl = loop->_head->as_CountedLoop();
   assert(cl->is_valid_counted_loop(T_INT), "");
 
-  if (ABS(cl->stride_con()) == 1 ||
+  if (cl->stride_con() == 1 ||
+      cl->stride_con() == -1 ||
       cl->limit()->Opcode() == Op_LoopLimit) {
     // Old code has exact limit (it could be incorrect in case of int overflow).
     // Loop limit is exact with stride == 1. And loop may already have exact limit.
@@ -2962,14 +2963,22 @@ void OuterStripMinedLoopNode::adjust_strip_mined_loop(PhaseIterGVN* igvn) {
   CountedLoopEndNode* inner_cle = inner_cl->loopexit();
 
   int stride = inner_cl->stride_con();
-  jlong scaled_iters_long = ((jlong)LoopStripMiningIter) * ABS(stride);
+  // For a min int stride, LoopStripMiningIter * stride overflows the int range for all values of LoopStripMiningIter
+  // except 0 or 1. Those values are handled early on in this method and causes the method to return. So for a min int
+  // stride, the method is guaranteed to return at the next check below.
+  jlong scaled_iters_long = ((jlong)LoopStripMiningIter) * ABS((jlong)stride);
   int scaled_iters = (int)scaled_iters_long;
-  int short_scaled_iters = LoopStripMiningIterShortLoop* ABS(stride);
+  if ((jlong)scaled_iters != scaled_iters_long) {
+    // Remove outer loop and safepoint (too few iterations)
+    remove_outer_loop_and_safepoint(igvn);
+    return;
+  }
+  jlong short_scaled_iters = LoopStripMiningIterShortLoop * ABS(stride);
   const TypeInt* inner_iv_t = igvn->type(inner_iv_phi)->is_int();
   jlong iter_estimate = (jlong)inner_iv_t->_hi - (jlong)inner_iv_t->_lo;
   assert(iter_estimate > 0, "broken");
-  if ((jlong)scaled_iters != scaled_iters_long || iter_estimate <= short_scaled_iters) {
-    // Remove outer loop and safepoint (too few iterations)
+  if (iter_estimate <= short_scaled_iters) {
+    // Remove outer loop and safepoint: loop executes less than LoopStripMiningIterShortLoop
     remove_outer_loop_and_safepoint(igvn);
     return;
   }

From 4edac349a5d695ce7923344ad5ad0400842241eb Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 29 Apr 2024 07:58:18 +0000
Subject: [PATCH 232/486] 8331167: UBSan enabled build fails in adlc on macOS

Reviewed-by: stuefe, lucy
---
 src/hotspot/share/adlc/adlparse.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/adlc/adlparse.cpp b/src/hotspot/share/adlc/adlparse.cpp
index 48dea8804f3..033e8d26ca7 100644
--- a/src/hotspot/share/adlc/adlparse.cpp
+++ b/src/hotspot/share/adlc/adlparse.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -5225,7 +5225,7 @@ void ADLParser::skipws_common(bool do_preproc) {
     if (*_ptr == '\n') {                   // keep proper track of new lines
       if (!do_preproc)  break;             // let caller handle the newline
       next_line();
-      _ptr = _curline; next = _ptr + 1;
+      _ptr = _curline; if (_ptr != nullptr) next = _ptr + 1;
     }
     else if ((*_ptr == '/') && (*next == '/'))      // C++ comment
       do { _ptr++; next++; } while(*_ptr != '\n');  // So go to end of line

From 766d0b0fa0809a0bf500f1883592f5074482f168 Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Mon, 29 Apr 2024 08:16:12 +0000
Subject: [PATCH 233/486] 8330960: Serial: Remove
 SerialFullGC::_total_invocations

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/serial/serialFullGC.cpp | 7 +------
 src/hotspot/share/gc/serial/serialFullGC.hpp | 6 ------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index 514a6e6ab74..1621aec7b64 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -74,8 +74,6 @@
 #include "jvmci/jvmci.hpp"
 #endif
 
-uint                    SerialFullGC::_total_invocations = 0;
-
 Stack<oop, mtGC>              SerialFullGC::_marking_stack;
 Stack<ObjArrayTask, mtGC>     SerialFullGC::_objarray_stack;
 
@@ -113,7 +111,7 @@ public:
       // we don't start compacting before there is a significant gain to be made.
       // Occasionally, we want to ensure a full compaction, which is determined
       // by the MarkSweepAlwaysCompactCount parameter.
-      if ((SerialFullGC::total_invocations() % MarkSweepAlwaysCompactCount) != 0) {
+      if ((SerialHeap::heap()->total_full_collections() % MarkSweepAlwaysCompactCount) != 0) {
         _allowed_deadspace_words = (space->capacity() * ratio / 100) / HeapWordSize;
       } else {
         _active = false;
@@ -694,9 +692,6 @@ void SerialFullGC::invoke_at_safepoint(bool clear_all_softrefs) {
 
   gch->trace_heap_before_gc(_gc_tracer);
 
-  // Increment the invocation count
-  _total_invocations++;
-
   // Capture used regions for old-gen to reestablish old-to-young invariant
   // after full-gc.
   gch->old_gen()->save_used_region();
diff --git a/src/hotspot/share/gc/serial/serialFullGC.hpp b/src/hotspot/share/gc/serial/serialFullGC.hpp
index fff287b1f50..4b1a78a0994 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.hpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.hpp
@@ -81,9 +81,6 @@ class SerialFullGC : AllStatic {
   };
 
  protected:
-  // Total invocations of serial full GC
-  static uint _total_invocations;
-
   // Traversal stacks used during phase1
   static Stack<oop, mtGC>                      _marking_stack;
   static Stack<ObjArrayTask, mtGC>             _objarray_stack;
@@ -119,9 +116,6 @@ class SerialFullGC : AllStatic {
 
   static void invoke_at_safepoint(bool clear_all_softrefs);
 
-  // Accessors
-  static uint total_invocations() { return _total_invocations; }
-
   // Reference Processing
   static ReferenceProcessor* ref_processor() { return _ref_processor; }
 

From 76cda7b8955b934716136092e25de19b3b4dc6c3 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 29 Apr 2024 08:41:49 +0000
Subject: [PATCH 234/486] 8331118: Remove Serial includes from space.hpp

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp       | 1 +
 src/hotspot/share/gc/serial/tenuredGeneration.hpp        | 2 +-
 src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp | 1 -
 src/hotspot/share/gc/shared/space.hpp                    | 8 --------
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp
index c18523e203e..b90d6e38d28 100644
--- a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/epsilon/epsilonHeap.hpp"
 #include "gc/epsilon/epsilonMemoryPool.hpp"
+#include "gc/shared/gc_globals.hpp"
 
 EpsilonMemoryPool::EpsilonMemoryPool(EpsilonHeap* heap) :
         CollectedMemoryPool("Epsilon Heap",
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 965208e20ee..9cbf7fef5fc 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -27,11 +27,11 @@
 
 #include "gc/serial/cSpaceCounters.hpp"
 #include "gc/serial/generation.hpp"
+#include "gc/serial/serialBlockOffsetTable.hpp"
 #include "gc/shared/generationCounters.hpp"
 #include "gc/shared/space.hpp"
 #include "utilities/macros.hpp"
 
-class SerialBlockOffsetTable;
 class CardTableRS;
 class ContiguousSpace;
 
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
index 955f7b395dd..ba0dbcdc02d 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
@@ -26,7 +26,6 @@
 #define SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
 
 #include "gc/serial/tenuredGeneration.hpp"
-
 #include "gc/shared/space.hpp"
 
 inline size_t TenuredGeneration::capacity() const {
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 23715ccd9dc..2a831ddad89 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -35,9 +35,6 @@
 #include "runtime/mutexLocker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/macros.hpp"
-#if INCLUDE_SERIALGC
-#include "gc/serial/serialBlockOffsetTable.hpp"
-#endif
 
 // A space is an abstraction for the "storage units" backing
 // up the generation abstraction. It includes specific
@@ -45,11 +42,6 @@
 // for iterating over objects and free blocks, etc.
 
 // Forward decls.
-class ContiguousSpace;
-class Generation;
-class ContiguousSpace;
-class CardTableRS;
-class DirtyCardToOopClosure;
 class GenSpaceMangler;
 
 // A space in which the free area is contiguous.  It therefore supports

From 549bc6a0398906df3cc08679c751eb0c633ef0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Mon, 29 Apr 2024 08:41:59 +0000
Subject: [PATCH 235/486] 8330685: ZGC: share barrier spilling logic

Reviewed-by: eosterlund, mdoerr, fyang, aboldtch
---
 src/hotspot/cpu/aarch64/aarch64.ad            |   4 -
 .../gc/shared/barrierSetAssembler_aarch64.cpp | 205 +++++++++++++
 .../gc/shared/barrierSetAssembler_aarch64.hpp |  54 ++++
 .../gc/z/zBarrierSetAssembler_aarch64.cpp     | 222 +-------------
 .../gc/z/zBarrierSetAssembler_aarch64.hpp     |   6 -
 src/hotspot/cpu/aarch64/register_aarch64.hpp  |   3 +
 .../arm/gc/shared/barrierSetAssembler_arm.cpp |   8 +
 .../arm/gc/shared/barrierSetAssembler_arm.hpp |  11 +
 .../ppc/gc/shared/barrierSetAssembler_ppc.cpp | 119 ++++++++
 .../ppc/gc/shared/barrierSetAssembler_ppc.hpp |  45 +++
 .../cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp | 130 +-------
 .../cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp |   2 -
 .../gc/shared/barrierSetAssembler_riscv.cpp   |  72 +++++
 .../gc/shared/barrierSetAssembler_riscv.hpp   |  36 +++
 .../riscv/gc/z/zBarrierSetAssembler_riscv.cpp |  75 +----
 .../riscv/gc/z/zBarrierSetAssembler_riscv.hpp |   3 -
 .../gc/shared/barrierSetAssembler_s390.cpp    |   8 +
 .../gc/shared/barrierSetAssembler_s390.hpp    |  11 +
 .../x86/gc/shared/barrierSetAssembler_x86.cpp | 280 +++++++++++++++++
 .../x86/gc/shared/barrierSetAssembler_x86.hpp |  62 ++++
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp | 285 +-----------------
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp |   3 -
 .../share/gc/shared/c2/barrierSetC2.cpp       | 104 +++++++
 .../share/gc/shared/c2/barrierSetC2.hpp       |  43 +++
 src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp   | 129 +-------
 src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp   |  11 +-
 26 files changed, 1077 insertions(+), 854 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 402cdb8a30c..bb7f7370c5f 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1126,10 +1126,6 @@ extern RegMask _NO_SPECIAL_REG32_mask;
 extern RegMask _NO_SPECIAL_REG_mask;
 extern RegMask _NO_SPECIAL_PTR_REG_mask;
 
-// Figure out which register class each belongs in: rc_int, rc_float or
-// rc_stack.
-enum RC { rc_bad, rc_int, rc_float, rc_predicate, rc_stack };
-
 class CallStubImpl {
 
   //--------------------------------------------------------------
diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
index 070c685a07b..62414611cce 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
@@ -34,6 +34,10 @@
 #include "runtime/jniHandles.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
+#ifdef COMPILER2
+#include "code/vmreg.inline.hpp"
+#include "gc/shared/c2/barrierSetC2.hpp"
+#endif // COMPILER2
 
 
 #define __ masm->
@@ -419,3 +423,204 @@ void BarrierSetAssembler::check_oop(MacroAssembler* masm, Register obj, Register
   __ load_klass(obj, obj); // get klass
   __ cbz(obj, error);      // if klass is null it is broken
 }
+
+#ifdef COMPILER2
+
+OptoReg::Name BarrierSetAssembler::encode_float_vector_register_size(const Node* node, OptoReg::Name opto_reg) {
+  switch (node->ideal_reg()) {
+    case Op_RegF:
+      // No need to refine. The original encoding is already fine to distinguish.
+      assert(opto_reg % 4 == 0, "Float register should only occupy a single slot");
+      break;
+    // Use different encoding values of the same fp/vector register to help distinguish different sizes.
+    // Such as V16. The OptoReg::name and its corresponding slot value are
+    // "V16": 64, "V16_H": 65, "V16_J": 66, "V16_K": 67.
+    case Op_RegD:
+    case Op_VecD:
+      opto_reg &= ~3;
+      opto_reg |= 1;
+      break;
+    case Op_VecX:
+      opto_reg &= ~3;
+      opto_reg |= 2;
+      break;
+    case Op_VecA:
+      opto_reg &= ~3;
+      opto_reg |= 3;
+      break;
+    default:
+      assert(false, "unexpected ideal register");
+      ShouldNotReachHere();
+  }
+  return opto_reg;
+}
+
+OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
+  if (!OptoReg::is_reg(opto_reg)) {
+    return OptoReg::Bad;
+  }
+
+  const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+  if (vm_reg->is_FloatRegister()) {
+    opto_reg = encode_float_vector_register_size(node, opto_reg);
+  }
+
+  return opto_reg;
+}
+
+#undef __
+#define __ _masm->
+
+void SaveLiveRegisters::initialize(BarrierStubC2* stub) {
+  int index = -1;
+  GrowableArray<RegisterData> registers;
+  VMReg prev_vm_reg = VMRegImpl::Bad();
+
+  RegMaskIterator rmi(stub->live());
+  while (rmi.has_next()) {
+    OptoReg::Name opto_reg = rmi.next();
+    VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+
+    if (vm_reg->is_Register()) {
+      // GPR may have one or two slots in regmask
+      // Determine whether the current vm_reg is the same physical register as the previous one
+      if (is_same_register(vm_reg, prev_vm_reg)) {
+        registers.at(index)._slots++;
+      } else {
+        RegisterData reg_data = { vm_reg, 1 };
+        index = registers.append(reg_data);
+      }
+    } else if (vm_reg->is_FloatRegister()) {
+      // We have size encoding in OptoReg of stub->live()
+      // After encoding, float/neon/sve register has only one slot in regmask
+      // Decode it to get the actual size
+      VMReg vm_reg_base = vm_reg->as_FloatRegister()->as_VMReg();
+      int slots = decode_float_vector_register_size(opto_reg);
+      RegisterData reg_data = { vm_reg_base, slots };
+      index = registers.append(reg_data);
+    } else if (vm_reg->is_PRegister()) {
+      // PRegister has only one slot in regmask
+      RegisterData reg_data = { vm_reg, 1 };
+      index = registers.append(reg_data);
+    } else {
+      assert(false, "Unknown register type");
+      ShouldNotReachHere();
+    }
+    prev_vm_reg = vm_reg;
+  }
+
+  // Record registers that needs to be saved/restored
+  for (GrowableArrayIterator<RegisterData> it = registers.begin(); it != registers.end(); ++it) {
+    RegisterData reg_data = *it;
+    VMReg vm_reg = reg_data._reg;
+    int slots = reg_data._slots;
+    if (vm_reg->is_Register()) {
+      assert(slots == 1 || slots == 2, "Unexpected register save size");
+      _gp_regs += RegSet::of(vm_reg->as_Register());
+    } else if (vm_reg->is_FloatRegister()) {
+      if (slots == 1 || slots == 2) {
+        _fp_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
+      } else if (slots == 4) {
+        _neon_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
+      } else {
+        assert(slots == Matcher::scalable_vector_reg_size(T_FLOAT), "Unexpected register save size");
+        _sve_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
+      }
+    } else {
+      assert(vm_reg->is_PRegister() && slots == 1, "Unknown register type");
+      _p_regs += PRegSet::of(vm_reg->as_PRegister());
+    }
+  }
+
+  // Remove C-ABI SOE registers, scratch regs and _ref register that will be updated
+  if (stub->result() != noreg) {
+    _gp_regs -= RegSet::range(r19, r30) + RegSet::of(r8, r9, stub->result());
+  } else {
+    _gp_regs -= RegSet::range(r19, r30) + RegSet::of(r8, r9);
+  }
+
+  // Remove C-ABI SOE fp registers
+  _fp_regs -= FloatRegSet::range(v8, v15);
+}
+
+enum RC SaveLiveRegisters::rc_class(VMReg reg) {
+  if (reg->is_reg()) {
+    if (reg->is_Register()) {
+      return rc_int;
+    } else if (reg->is_FloatRegister()) {
+      return rc_float;
+    } else if (reg->is_PRegister()) {
+      return rc_predicate;
+    }
+  }
+  if (reg->is_stack()) {
+    return rc_stack;
+  }
+  return rc_bad;
+}
+
+bool SaveLiveRegisters::is_same_register(VMReg reg1, VMReg reg2) {
+  if (reg1 == reg2) {
+    return true;
+  }
+  if (rc_class(reg1) == rc_class(reg2)) {
+    if (reg1->is_Register()) {
+      return reg1->as_Register() == reg2->as_Register();
+    } else if (reg1->is_FloatRegister()) {
+      return reg1->as_FloatRegister() == reg2->as_FloatRegister();
+    } else if (reg1->is_PRegister()) {
+      return reg1->as_PRegister() == reg2->as_PRegister();
+    }
+  }
+  return false;
+}
+
+int SaveLiveRegisters::decode_float_vector_register_size(OptoReg::Name opto_reg) {
+  switch (opto_reg & 3) {
+    case 0:
+      return 1;
+    case 1:
+      return 2;
+    case 2:
+      return 4;
+    case 3:
+      return Matcher::scalable_vector_reg_size(T_FLOAT);
+    default:
+      ShouldNotReachHere();
+      return 0;
+  }
+}
+
+SaveLiveRegisters::SaveLiveRegisters(MacroAssembler* masm, BarrierStubC2* stub)
+  : _masm(masm),
+    _gp_regs(),
+    _fp_regs(),
+    _neon_regs(),
+    _sve_regs(),
+    _p_regs() {
+
+  // Figure out what registers to save/restore
+  initialize(stub);
+
+  // Save registers
+  __ push(_gp_regs, sp);
+  __ push_fp(_fp_regs, sp, MacroAssembler::PushPopFp);
+  __ push_fp(_neon_regs, sp, MacroAssembler::PushPopNeon);
+  __ push_fp(_sve_regs, sp, MacroAssembler::PushPopSVE);
+  __ push_p(_p_regs, sp);
+}
+
+SaveLiveRegisters::~SaveLiveRegisters() {
+  // Restore registers
+  __ pop_p(_p_regs, sp);
+  __ pop_fp(_sve_regs, sp, MacroAssembler::PushPopSVE);
+  __ pop_fp(_neon_regs, sp, MacroAssembler::PushPopNeon);
+  __ pop_fp(_fp_regs, sp, MacroAssembler::PushPopFp);
+
+  // External runtime call may clobber ptrue reg
+  __ reinitialize_ptrue();
+
+  __ pop(_gp_regs, sp);
+}
+
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
index bfe9df86850..8dc475e0597 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
@@ -30,6 +30,12 @@
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "memory/allocation.hpp"
 #include "oops/access.hpp"
+#ifdef COMPILER2
+#include "opto/optoreg.hpp"
+
+class BarrierStubC2;
+class Node;
+#endif // COMPILER2
 
 enum class NMethodPatchingType {
   stw_instruction_and_data_patch,
@@ -129,6 +135,54 @@ public:
   static address patching_epoch_addr();
   static void clear_patching_epoch();
   static void increment_patching_epoch();
+
+#ifdef COMPILER2
+  OptoReg::Name encode_float_vector_register_size(const Node* node,
+                                                  OptoReg::Name opto_reg);
+  OptoReg::Name refine_register(const Node* node,
+                                OptoReg::Name opto_reg);
+#endif // COMPILER2
 };
 
+#ifdef COMPILER2
+
+// This class saves and restores the registers that need to be preserved across
+// the runtime call represented by a given C2 barrier stub. Use as follows:
+// {
+//   SaveLiveRegisters save(masm, stub);
+//   ..
+//   __ blr(...);
+//   ..
+// }
+class SaveLiveRegisters {
+private:
+  struct RegisterData {
+    VMReg _reg;
+    int   _slots; // slots occupied once pushed into stack
+
+    // Used by GrowableArray::find()
+    bool operator == (const RegisterData& other) {
+      return _reg == other._reg;
+    }
+  };
+
+  MacroAssembler* const _masm;
+  RegSet                _gp_regs;
+  FloatRegSet           _fp_regs;
+  FloatRegSet           _neon_regs;
+  FloatRegSet           _sve_regs;
+  PRegSet               _p_regs;
+
+  static enum RC rc_class(VMReg reg);
+  static bool is_same_register(VMReg reg1, VMReg reg2);
+  static int decode_float_vector_register_size(OptoReg::Name opto_reg);
+
+public:
+  void initialize(BarrierStubC2* stub);
+  SaveLiveRegisters(MacroAssembler* masm, BarrierStubC2* stub);
+  ~SaveLiveRegisters();
+};
+
+#endif // COMPILER2
+
 #endif // CPU_AARCH64_GC_SHARED_BARRIERSETASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
index b8f4a2f2439..466e77a4460 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
@@ -1081,224 +1081,6 @@ void ZBarrierSetAssembler::generate_c1_store_barrier_runtime_stub(StubAssembler*
 
 #ifdef COMPILER2
 
-OptoReg::Name ZBarrierSetAssembler::encode_float_vector_register_size(const Node* node, OptoReg::Name opto_reg) {
-  switch (node->ideal_reg()) {
-    case Op_RegF:
-      // No need to refine. The original encoding is already fine to distinguish.
-      assert(opto_reg % 4 == 0, "Float register should only occupy a single slot");
-      break;
-    // Use different encoding values of the same fp/vector register to help distinguish different sizes.
-    // Such as V16. The OptoReg::name and its corresponding slot value are
-    // "V16": 64, "V16_H": 65, "V16_J": 66, "V16_K": 67.
-    case Op_RegD:
-    case Op_VecD:
-      opto_reg &= ~3;
-      opto_reg |= 1;
-      break;
-    case Op_VecX:
-      opto_reg &= ~3;
-      opto_reg |= 2;
-      break;
-    case Op_VecA:
-      opto_reg &= ~3;
-      opto_reg |= 3;
-      break;
-    default:
-      assert(false, "unexpected ideal register");
-      ShouldNotReachHere();
-  }
-  return opto_reg;
-}
-
-OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
-  if (!OptoReg::is_reg(opto_reg)) {
-    return OptoReg::Bad;
-  }
-
-  const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
-  if (vm_reg->is_FloatRegister()) {
-    opto_reg = encode_float_vector_register_size(node, opto_reg);
-  }
-
-  return opto_reg;
-}
-
-#undef __
-#define __ _masm->
-
-class ZSaveLiveRegisters {
-private:
-  struct RegisterData {
-    VMReg _reg;
-    int   _slots; // slots occupied once pushed into stack
-
-    // Used by GrowableArray::find()
-    bool operator == (const RegisterData& other) {
-      return _reg == other._reg;
-    }
-  };
-
-  MacroAssembler* const _masm;
-  RegSet                _gp_regs;
-  FloatRegSet           _fp_regs;
-  FloatRegSet           _neon_regs;
-  FloatRegSet           _sve_regs;
-  PRegSet               _p_regs;
-
-public:
-  void initialize(ZBarrierStubC2* stub) {
-    int index = -1;
-    GrowableArray<RegisterData> registers;
-    VMReg prev_vm_reg = VMRegImpl::Bad();
-
-    RegMaskIterator rmi(stub->live());
-    while (rmi.has_next()) {
-      OptoReg::Name opto_reg = rmi.next();
-      VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
-
-      if (vm_reg->is_Register()) {
-        // GPR may have one or two slots in regmask
-        // Determine whether the current vm_reg is the same physical register as the previous one
-        if (is_same_register(vm_reg, prev_vm_reg)) {
-          registers.at(index)._slots++;
-        } else {
-          RegisterData reg_data = { vm_reg, 1 };
-          index = registers.append(reg_data);
-        }
-      } else if (vm_reg->is_FloatRegister()) {
-        // We have size encoding in OptoReg of stub->live()
-        // After encoding, float/neon/sve register has only one slot in regmask
-        // Decode it to get the actual size
-        VMReg vm_reg_base = vm_reg->as_FloatRegister()->as_VMReg();
-        int slots = decode_float_vector_register_size(opto_reg);
-        RegisterData reg_data = { vm_reg_base, slots };
-        index = registers.append(reg_data);
-      } else if (vm_reg->is_PRegister()) {
-        // PRegister has only one slot in regmask
-        RegisterData reg_data = { vm_reg, 1 };
-        index = registers.append(reg_data);
-      } else {
-        assert(false, "Unknown register type");
-        ShouldNotReachHere();
-      }
-      prev_vm_reg = vm_reg;
-    }
-
-    // Record registers that needs to be saved/restored
-    for (GrowableArrayIterator<RegisterData> it = registers.begin(); it != registers.end(); ++it) {
-      RegisterData reg_data = *it;
-      VMReg vm_reg = reg_data._reg;
-      int slots = reg_data._slots;
-      if (vm_reg->is_Register()) {
-        assert(slots == 1 || slots == 2, "Unexpected register save size");
-        _gp_regs += RegSet::of(vm_reg->as_Register());
-      } else if (vm_reg->is_FloatRegister()) {
-        if (slots == 1 || slots == 2) {
-          _fp_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
-        } else if (slots == 4) {
-          _neon_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
-        } else {
-          assert(slots == Matcher::scalable_vector_reg_size(T_FLOAT), "Unexpected register save size");
-          _sve_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
-        }
-      } else {
-        assert(vm_reg->is_PRegister() && slots == 1, "Unknown register type");
-        _p_regs += PRegSet::of(vm_reg->as_PRegister());
-      }
-    }
-
-    // Remove C-ABI SOE registers, scratch regs and _ref register that will be updated
-    if (stub->result() != noreg) {
-      _gp_regs -= RegSet::range(r19, r30) + RegSet::of(r8, r9, stub->result());
-    } else {
-      _gp_regs -= RegSet::range(r19, r30) + RegSet::of(r8, r9);
-    }
-
-    // Remove C-ABI SOE fp registers
-    _fp_regs -= FloatRegSet::range(v8, v15);
-  }
-
-  static enum RC rc_class(VMReg reg) {
-    if (reg->is_reg()) {
-      if (reg->is_Register()) {
-        return rc_int;
-      } else if (reg->is_FloatRegister()) {
-        return rc_float;
-      } else if (reg->is_PRegister()) {
-        return rc_predicate;
-      }
-    }
-    if (reg->is_stack()) {
-      return rc_stack;
-    }
-    return rc_bad;
-  }
-
-  static bool is_same_register(VMReg reg1, VMReg reg2) {
-    if (reg1 == reg2) {
-      return true;
-    }
-    if (rc_class(reg1) == rc_class(reg2)) {
-      if (reg1->is_Register()) {
-        return reg1->as_Register() == reg2->as_Register();
-      } else if (reg1->is_FloatRegister()) {
-        return reg1->as_FloatRegister() == reg2->as_FloatRegister();
-      } else if (reg1->is_PRegister()) {
-        return reg1->as_PRegister() == reg2->as_PRegister();
-      }
-    }
-    return false;
-  }
-
-  static int decode_float_vector_register_size(OptoReg::Name opto_reg) {
-    switch (opto_reg & 3) {
-      case 0:
-        return 1;
-      case 1:
-        return 2;
-      case 2:
-        return 4;
-      case 3:
-        return Matcher::scalable_vector_reg_size(T_FLOAT);
-      default:
-        ShouldNotReachHere();
-        return 0;
-    }
-  }
-
-  ZSaveLiveRegisters(MacroAssembler* masm, ZBarrierStubC2* stub)
-    : _masm(masm),
-      _gp_regs(),
-      _fp_regs(),
-      _neon_regs(),
-      _sve_regs(),
-      _p_regs() {
-
-    // Figure out what registers to save/restore
-    initialize(stub);
-
-    // Save registers
-    __ push(_gp_regs, sp);
-    __ push_fp(_fp_regs, sp, MacroAssembler::PushPopFp);
-    __ push_fp(_neon_regs, sp, MacroAssembler::PushPopNeon);
-    __ push_fp(_sve_regs, sp, MacroAssembler::PushPopSVE);
-    __ push_p(_p_regs, sp);
-  }
-
-  ~ZSaveLiveRegisters() {
-    // Restore registers
-    __ pop_p(_p_regs, sp);
-    __ pop_fp(_sve_regs, sp, MacroAssembler::PushPopSVE);
-    __ pop_fp(_neon_regs, sp, MacroAssembler::PushPopNeon);
-    __ pop_fp(_fp_regs, sp, MacroAssembler::PushPopFp);
-
-    // External runtime call may clobber ptrue reg
-    __ reinitialize_ptrue();
-
-    __ pop(_gp_regs, sp);
-  }
-};
-
 #undef __
 #define __ _masm->
 
@@ -1368,7 +1150,7 @@ void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, Z
   }
 
   {
-    ZSaveLiveRegisters save_live_registers(masm, stub);
+    SaveLiveRegisters save_live_registers(masm, stub);
     ZSetupArguments setup_arguments(masm, stub);
     __ mov(rscratch1, stub->slow_path());
     __ blr(rscratch1);
@@ -1400,7 +1182,7 @@ void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm,
   __ bind(slow);
 
   {
-    ZSaveLiveRegisters save_live_registers(masm, stub);
+    SaveLiveRegisters save_live_registers(masm, stub);
     __ lea(c_rarg0, stub->ref_addr());
 
     if (stub->is_native()) {
diff --git a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
index 705dcc61a62..2f716140ed1 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
@@ -187,12 +187,6 @@ public:
 #endif // COMPILER1
 
 #ifdef COMPILER2
-  OptoReg::Name encode_float_vector_register_size(const Node* node,
-                                                  OptoReg::Name opto_reg);
-
-  OptoReg::Name refine_register(const Node* node,
-                                OptoReg::Name opto_reg);
-
   void generate_c2_load_barrier_stub(MacroAssembler* masm,
                                      ZLoadBarrierStubC2* stub) const;
   void generate_c2_store_barrier_stub(MacroAssembler* masm,
diff --git a/src/hotspot/cpu/aarch64/register_aarch64.hpp b/src/hotspot/cpu/aarch64/register_aarch64.hpp
index 44892e61e2a..3c2571eb4a3 100644
--- a/src/hotspot/cpu/aarch64/register_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp
@@ -403,4 +403,7 @@ inline Register as_Register(FloatRegister reg) {
   return as_Register(reg->encoding());
 }
 
+// High-level register class of an OptoReg or a VMReg register.
+enum RC { rc_bad, rc_int, rc_float, rc_predicate, rc_stack };
+
 #endif // CPU_AARCH64_REGISTER_AARCH64_HPP
diff --git a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp
index 9329876b808..a4e7f35ec81 100644
--- a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp
@@ -242,3 +242,11 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm) {
   __ bind(skip);
   __ block_comment("nmethod_barrier end");
 }
+
+#ifdef COMPILER2
+
+OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
+  Unimplemented(); // This must be implemented to support late barrier expansion.
+}
+
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp
index 37e0c6525f3..ae51a054540 100644
--- a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp
@@ -28,6 +28,12 @@
 #include "asm/macroAssembler.hpp"
 #include "memory/allocation.hpp"
 #include "oops/access.hpp"
+#ifdef COMPILER2
+#include "code/vmreg.hpp"
+#include "opto/optoreg.hpp"
+
+class Node;
+#endif // COMPILER2
 
 enum class NMethodPatchingType {
   stw_instruction_and_data_patch,
@@ -62,6 +68,11 @@ public:
   virtual void barrier_stubs_init() {}
   virtual NMethodPatchingType nmethod_patching_type() { return NMethodPatchingType::stw_instruction_and_data_patch; }
   virtual void nmethod_entry_barrier(MacroAssembler* masm);
+
+#ifdef COMPILER2
+  OptoReg::Name refine_register(const Node* node,
+                                OptoReg::Name opto_reg);
+#endif // COMPILER2
 };
 
 #endif // CPU_ARM_GC_SHARED_BARRIERSETASSEMBLER_ARM_HPP
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
index f15e79534a2..3bb205d659f 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
@@ -34,6 +34,9 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/macros.hpp"
+#ifdef COMPILER2
+#include "gc/shared/c2/barrierSetC2.hpp"
+#endif // COMPILER2
 
 #define __ masm->
 
@@ -259,3 +262,119 @@ void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler *masm, Register tmp1,
 void BarrierSetAssembler::check_oop(MacroAssembler *masm, Register oop, const char* msg) {
   __ verify_oop(oop, msg);
 }
+
+#ifdef COMPILER2
+
+OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) const {
+  if (!OptoReg::is_reg(opto_reg)) {
+    return OptoReg::Bad;
+  }
+
+  VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+  if ((vm_reg->is_Register() || vm_reg ->is_FloatRegister()) && (opto_reg & 1) != 0) {
+    return OptoReg::Bad;
+  }
+
+  return opto_reg;
+}
+
+#undef __
+#define __ _masm->
+
+SaveLiveRegisters::SaveLiveRegisters(MacroAssembler *masm, BarrierStubC2 *stub)
+  : _masm(masm), _reg_mask(stub->live()), _result_reg(stub->result()) {
+
+  const int register_save_size = iterate_over_register_mask(ACTION_COUNT_ONLY) * BytesPerWord;
+  _frame_size = align_up(register_save_size, frame::alignment_in_bytes)
+                + frame::native_abi_reg_args_size;
+
+  __ save_LR_CR(R0);
+  __ push_frame(_frame_size, R0);
+
+  iterate_over_register_mask(ACTION_SAVE, _frame_size);
+}
+
+SaveLiveRegisters::~SaveLiveRegisters() {
+  iterate_over_register_mask(ACTION_RESTORE, _frame_size);
+
+  __ addi(R1_SP, R1_SP, _frame_size);
+  __ restore_LR_CR(R0);
+}
+
+int SaveLiveRegisters::iterate_over_register_mask(IterationAction action, int offset) {
+  int reg_save_index = 0;
+  RegMaskIterator live_regs_iterator(_reg_mask);
+
+  while(live_regs_iterator.has_next()) {
+    const OptoReg::Name opto_reg = live_regs_iterator.next();
+
+    // Filter out stack slots (spilled registers, i.e., stack-allocated registers).
+    if (!OptoReg::is_reg(opto_reg)) {
+      continue;
+    }
+
+    const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+    if (vm_reg->is_Register()) {
+      Register std_reg = vm_reg->as_Register();
+
+      // '_result_reg' will hold the end result of the operation. Its content must thus not be preserved.
+      if (std_reg == _result_reg) {
+        continue;
+      }
+
+      if (std_reg->encoding() >= R2->encoding() && std_reg->encoding() <= R12->encoding()) {
+        reg_save_index++;
+
+        if (action == ACTION_SAVE) {
+          _masm->std(std_reg, offset - reg_save_index * BytesPerWord, R1_SP);
+        } else if (action == ACTION_RESTORE) {
+          _masm->ld(std_reg, offset - reg_save_index * BytesPerWord, R1_SP);
+        } else {
+          assert(action == ACTION_COUNT_ONLY, "Sanity");
+        }
+      }
+    } else if (vm_reg->is_FloatRegister()) {
+      FloatRegister fp_reg = vm_reg->as_FloatRegister();
+      if (fp_reg->encoding() >= F0->encoding() && fp_reg->encoding() <= F13->encoding()) {
+        reg_save_index++;
+
+        if (action == ACTION_SAVE) {
+          _masm->stfd(fp_reg, offset - reg_save_index * BytesPerWord, R1_SP);
+        } else if (action == ACTION_RESTORE) {
+          _masm->lfd(fp_reg, offset - reg_save_index * BytesPerWord, R1_SP);
+        } else {
+          assert(action == ACTION_COUNT_ONLY, "Sanity");
+        }
+      }
+    } else if (vm_reg->is_ConditionRegister()) {
+      // NOP. Conditions registers are covered by save_LR_CR
+    } else if (vm_reg->is_VectorSRegister()) {
+      assert(SuperwordUseVSX, "or should not reach here");
+      VectorSRegister vs_reg = vm_reg->as_VectorSRegister();
+      if (vs_reg->encoding() >= VSR32->encoding() && vs_reg->encoding() <= VSR51->encoding()) {
+        reg_save_index += 2;
+
+        Register spill_addr = R0;
+        if (action == ACTION_SAVE) {
+          _masm->addi(spill_addr, R1_SP, offset - reg_save_index * BytesPerWord);
+          _masm->stxvd2x(vs_reg, spill_addr);
+        } else if (action == ACTION_RESTORE) {
+          _masm->addi(spill_addr, R1_SP, offset - reg_save_index * BytesPerWord);
+          _masm->lxvd2x(vs_reg, spill_addr);
+        } else {
+          assert(action == ACTION_COUNT_ONLY, "Sanity");
+        }
+      }
+    } else {
+      if (vm_reg->is_SpecialRegister()) {
+        fatal("Special registers are unsupported. Found register %s", vm_reg->name());
+      } else {
+        fatal("Register type is not known");
+      }
+    }
+  }
+
+  return reg_save_index;
+}
+
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
index eeb5dcce940..d70fce77acc 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
@@ -29,6 +29,14 @@
 #include "asm/macroAssembler.hpp"
 #include "memory/allocation.hpp"
 #include "oops/access.hpp"
+#ifdef COMPILER2
+#include "code/vmreg.hpp"
+#include "opto/optoreg.hpp"
+#include "opto/regmask.hpp"
+
+class BarrierStubC2;
+class Node;
+#endif // COMPILER2
 
 enum class NMethodPatchingType {
   stw_instruction_and_data_patch,
@@ -71,6 +79,43 @@ public:
   virtual void c2i_entry_barrier(MacroAssembler* masm, Register tmp1, Register tmp2, Register tmp3);
 
   virtual void check_oop(MacroAssembler *masm, Register oop, const char* msg);
+
+#ifdef COMPILER2
+  OptoReg::Name refine_register(const Node* node, OptoReg::Name opto_reg) const;
+#endif // COMPILER2
 };
 
+#ifdef COMPILER2
+
+// This class saves and restores the registers that need to be preserved across
+// the runtime call represented by a given C2 barrier stub. Use as follows:
+// {
+//   SaveLiveRegisters save(masm, stub);
+//   ..
+//   __ call_VM_leaf(...);
+//   ..
+// }
+class SaveLiveRegisters {
+  MacroAssembler* _masm;
+  RegMask _reg_mask;
+  Register _result_reg;
+  int _frame_size;
+
+ public:
+  SaveLiveRegisters(MacroAssembler *masm, BarrierStubC2 *stub);
+
+  ~SaveLiveRegisters();
+
+ private:
+  enum IterationAction : int {
+    ACTION_SAVE,
+    ACTION_RESTORE,
+    ACTION_COUNT_ONLY
+  };
+
+  int iterate_over_register_mask(IterationAction action, int offset = 0);
+};
+
+#endif // COMPILER2
+
 #endif // CPU_PPC_GC_SHARED_BARRIERSETASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp
index 9ed47b688ff..5696b78eba8 100644
--- a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp
@@ -838,132 +838,6 @@ void ZBarrierSetAssembler::generate_c1_store_barrier_runtime_stub(StubAssembler*
 
 #ifdef COMPILER2
 
-OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) const {
-  if (!OptoReg::is_reg(opto_reg)) {
-    return OptoReg::Bad;
-  }
-
-  VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
-  if ((vm_reg->is_Register() || vm_reg ->is_FloatRegister()) && (opto_reg & 1) != 0) {
-    return OptoReg::Bad;
-  }
-
-  return opto_reg;
-}
-
-#define __ _masm->
-
-class ZSaveLiveRegisters {
-  MacroAssembler* _masm;
-  RegMask _reg_mask;
-  Register _result_reg;
-  int _frame_size;
-
- public:
-  ZSaveLiveRegisters(MacroAssembler *masm, ZBarrierStubC2 *stub)
-    : _masm(masm), _reg_mask(stub->live()), _result_reg(stub->result()) {
-
-    const int register_save_size = iterate_over_register_mask(ACTION_COUNT_ONLY) * BytesPerWord;
-    _frame_size = align_up(register_save_size, frame::alignment_in_bytes)
-                  + frame::native_abi_reg_args_size;
-
-    __ save_LR_CR(R0);
-    __ push_frame(_frame_size, R0);
-
-    iterate_over_register_mask(ACTION_SAVE, _frame_size);
-  }
-
-  ~ZSaveLiveRegisters() {
-    iterate_over_register_mask(ACTION_RESTORE, _frame_size);
-
-    __ addi(R1_SP, R1_SP, _frame_size);
-    __ restore_LR_CR(R0);
-  }
-
- private:
-  enum IterationAction : int {
-    ACTION_SAVE,
-    ACTION_RESTORE,
-    ACTION_COUNT_ONLY
-  };
-
-  int iterate_over_register_mask(IterationAction action, int offset = 0) {
-    int reg_save_index = 0;
-    RegMaskIterator live_regs_iterator(_reg_mask);
-
-    while(live_regs_iterator.has_next()) {
-      const OptoReg::Name opto_reg = live_regs_iterator.next();
-
-      // Filter out stack slots (spilled registers, i.e., stack-allocated registers).
-      if (!OptoReg::is_reg(opto_reg)) {
-        continue;
-      }
-
-      const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
-      if (vm_reg->is_Register()) {
-        Register std_reg = vm_reg->as_Register();
-
-        // '_result_reg' will hold the end result of the operation. Its content must thus not be preserved.
-        if (std_reg == _result_reg) {
-          continue;
-        }
-
-        if (std_reg->encoding() >= R2->encoding() && std_reg->encoding() <= R12->encoding()) {
-          reg_save_index++;
-
-          if (action == ACTION_SAVE) {
-            _masm->std(std_reg, offset - reg_save_index * BytesPerWord, R1_SP);
-          } else if (action == ACTION_RESTORE) {
-            _masm->ld(std_reg, offset - reg_save_index * BytesPerWord, R1_SP);
-          } else {
-            assert(action == ACTION_COUNT_ONLY, "Sanity");
-          }
-        }
-      } else if (vm_reg->is_FloatRegister()) {
-        FloatRegister fp_reg = vm_reg->as_FloatRegister();
-        if (fp_reg->encoding() >= F0->encoding() && fp_reg->encoding() <= F13->encoding()) {
-          reg_save_index++;
-
-          if (action == ACTION_SAVE) {
-            _masm->stfd(fp_reg, offset - reg_save_index * BytesPerWord, R1_SP);
-          } else if (action == ACTION_RESTORE) {
-            _masm->lfd(fp_reg, offset - reg_save_index * BytesPerWord, R1_SP);
-          } else {
-            assert(action == ACTION_COUNT_ONLY, "Sanity");
-          }
-        }
-      } else if (vm_reg->is_ConditionRegister()) {
-        // NOP. Conditions registers are covered by save_LR_CR
-      } else if (vm_reg->is_VectorSRegister()) {
-        assert(SuperwordUseVSX, "or should not reach here");
-        VectorSRegister vs_reg = vm_reg->as_VectorSRegister();
-        if (vs_reg->encoding() >= VSR32->encoding() && vs_reg->encoding() <= VSR51->encoding()) {
-          reg_save_index += 2;
-
-          Register spill_addr = R0;
-          if (action == ACTION_SAVE) {
-            _masm->addi(spill_addr, R1_SP, offset - reg_save_index * BytesPerWord);
-            _masm->stxvd2x(vs_reg, spill_addr);
-          } else if (action == ACTION_RESTORE) {
-            _masm->addi(spill_addr, R1_SP, offset - reg_save_index * BytesPerWord);
-            _masm->lxvd2x(vs_reg, spill_addr);
-          } else {
-            assert(action == ACTION_COUNT_ONLY, "Sanity");
-          }
-        }
-      } else {
-        if (vm_reg->is_SpecialRegister()) {
-          fatal("Special registers are unsupported. Found register %s", vm_reg->name());
-        } else {
-          fatal("Register type is not known");
-        }
-      }
-    }
-
-    return reg_save_index;
-  }
-};
-
 #undef __
 #define __ _masm->
 
@@ -1024,7 +898,7 @@ void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, Z
   assert_different_registers(ref, ref_addr.base());
 
   {
-    ZSaveLiveRegisters save_live_registers(masm, stub);
+    SaveLiveRegisters save_live_registers(masm, stub);
     ZSetupArguments setup_arguments(masm, stub);
 
     __ call_VM_leaf(stub->slow_path());
@@ -1063,7 +937,7 @@ void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm,
 
   __ bind(slow);
   {
-    ZSaveLiveRegisters save_live_registers(masm, stub);
+    SaveLiveRegisters save_live_registers(masm, stub);
     __ add(R3_ARG1, ind_or_offs, rbase);
     if (stub->is_native()) {
       __ call_VM_leaf(ZBarrierSetRuntime::store_barrier_on_native_oop_field_without_healing_addr(), R3_ARG1);
diff --git a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp
index 7aca78db7d0..fcfc0f91533 100644
--- a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp
@@ -105,8 +105,6 @@ public:
 #endif // COMPILER1
 
 #ifdef COMPILER2
-  OptoReg::Name refine_register(const Node* node, OptoReg::Name opto_reg) const;
-
   void generate_c2_load_barrier_stub(MacroAssembler* masm, ZLoadBarrierStubC2* stub) const;
 
   void generate_c2_store_barrier_stub(MacroAssembler* masm, ZStoreBarrierStubC2* stub) const;
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
index 1ac1fc18f1e..f411a5572c7 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
@@ -35,6 +35,9 @@
 #include "runtime/jniHandles.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
+#ifdef COMPILER2
+#include "gc/shared/c2/barrierSetC2.hpp"
+#endif // COMPILER2
 
 #define __ masm->
 
@@ -372,3 +375,72 @@ void BarrierSetAssembler::check_oop(MacroAssembler* masm, Register obj, Register
   __ load_klass(obj, obj, tmp1); // get klass
   __ beqz(obj, error);           // if klass is null it is broken
 }
+
+#ifdef COMPILER2
+
+OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
+  if (!OptoReg::is_reg(opto_reg)) {
+    return OptoReg::Bad;
+  }
+
+  const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+  if (vm_reg->is_FloatRegister()) {
+    return opto_reg & ~1;
+  }
+
+  return opto_reg;
+}
+
+#undef __
+#define __ _masm->
+
+void SaveLiveRegisters::initialize(BarrierStubC2* stub) {
+  // Record registers that needs to be saved/restored
+  RegMaskIterator rmi(stub->live());
+  while (rmi.has_next()) {
+    const OptoReg::Name opto_reg = rmi.next();
+    if (OptoReg::is_reg(opto_reg)) {
+      const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+      if (vm_reg->is_Register()) {
+        _gp_regs += RegSet::of(vm_reg->as_Register());
+      } else if (vm_reg->is_FloatRegister()) {
+        _fp_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
+      } else if (vm_reg->is_VectorRegister()) {
+        const VMReg vm_reg_base = OptoReg::as_VMReg(opto_reg & ~(VectorRegister::max_slots_per_register - 1));
+        _vp_regs += VectorRegSet::of(vm_reg_base->as_VectorRegister());
+      } else {
+        fatal("Unknown register type");
+      }
+    }
+  }
+
+  // Remove C-ABI SOE registers, tmp regs and _ref register that will be updated
+  if (stub->result() != noreg) {
+    _gp_regs -= RegSet::range(x18, x27) + RegSet::of(x2) + RegSet::of(x8, x9) + RegSet::of(x5, stub->result());
+  } else {
+    _gp_regs -= RegSet::range(x18, x27) + RegSet::of(x2, x5) + RegSet::of(x8, x9);
+  }
+}
+
+SaveLiveRegisters::SaveLiveRegisters(MacroAssembler* masm, BarrierStubC2* stub)
+  : _masm(masm),
+    _gp_regs(),
+    _fp_regs(),
+    _vp_regs() {
+  // Figure out what registers to save/restore
+  initialize(stub);
+
+  // Save registers
+  __ push_reg(_gp_regs, sp);
+  __ push_fp(_fp_regs, sp);
+  __ push_v(_vp_regs, sp);
+}
+
+SaveLiveRegisters::~SaveLiveRegisters() {
+  // Restore registers
+  __ pop_v(_vp_regs, sp);
+  __ pop_fp(_fp_regs, sp);
+  __ pop_reg(_gp_regs, sp);
+}
+
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
index d20c7fb1824..eb0801d237f 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
@@ -31,6 +31,12 @@
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "memory/allocation.hpp"
 #include "oops/access.hpp"
+#ifdef COMPILER2
+#include "opto/optoreg.hpp"
+
+class BarrierStubC2;
+class Node;
+#endif // COMPILER2
 
 enum class NMethodPatchingType {
   stw_instruction_and_data_patch,
@@ -106,6 +112,36 @@ public:
   static address patching_epoch_addr();
   static void clear_patching_epoch();
   static void increment_patching_epoch();
+
+#ifdef COMPILER2
+  OptoReg::Name refine_register(const Node* node,
+                                OptoReg::Name opto_reg);
+#endif // COMPILER2
 };
 
+#ifdef COMPILER2
+
+// This class saves and restores the registers that need to be preserved across
+// the runtime call represented by a given C2 barrier stub. Use as follows:
+// {
+//   SaveLiveRegisters save(masm, stub);
+//   ..
+//   __ jalr(...);
+//   ..
+// }
+class SaveLiveRegisters {
+private:
+  MacroAssembler* const _masm;
+  RegSet                _gp_regs;
+  FloatRegSet           _fp_regs;
+  VectorRegSet          _vp_regs;
+
+public:
+  void initialize(BarrierStubC2* stub);
+  SaveLiveRegisters(MacroAssembler* masm, BarrierStubC2* stub);
+  ~SaveLiveRegisters();
+};
+
+#endif // COMPILER2
+
 #endif // CPU_RISCV_GC_SHARED_BARRIERSETASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
index d0a28144225..7f7f19957e9 100644
--- a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
@@ -642,80 +642,9 @@ void ZBarrierSetAssembler::patch_barrier_relocation(address addr, int format) {
 
 #ifdef COMPILER2
 
-OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
-  if (!OptoReg::is_reg(opto_reg)) {
-    return OptoReg::Bad;
-  }
-
-  const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
-  if (vm_reg->is_FloatRegister()) {
-    return opto_reg & ~1;
-  }
-
-  return opto_reg;
-}
-
 #undef __
 #define __ _masm->
 
-class ZSaveLiveRegisters {
-private:
-  MacroAssembler* const _masm;
-  RegSet                _gp_regs;
-  FloatRegSet           _fp_regs;
-  VectorRegSet          _vp_regs;
-
-public:
-  void initialize(ZBarrierStubC2* stub) {
-    // Record registers that needs to be saved/restored
-    RegMaskIterator rmi(stub->live());
-    while (rmi.has_next()) {
-      const OptoReg::Name opto_reg = rmi.next();
-      if (OptoReg::is_reg(opto_reg)) {
-        const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
-        if (vm_reg->is_Register()) {
-          _gp_regs += RegSet::of(vm_reg->as_Register());
-        } else if (vm_reg->is_FloatRegister()) {
-          _fp_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
-        } else if (vm_reg->is_VectorRegister()) {
-          const VMReg vm_reg_base = OptoReg::as_VMReg(opto_reg & ~(VectorRegister::max_slots_per_register - 1));
-          _vp_regs += VectorRegSet::of(vm_reg_base->as_VectorRegister());
-        } else {
-          fatal("Unknown register type");
-        }
-      }
-    }
-
-    // Remove C-ABI SOE registers, tmp regs and _ref register that will be updated
-    if (stub->result() != noreg) {
-      _gp_regs -= RegSet::range(x18, x27) + RegSet::of(x2) + RegSet::of(x8, x9) + RegSet::of(x5, stub->result());
-    } else {
-      _gp_regs -= RegSet::range(x18, x27) + RegSet::of(x2, x5) + RegSet::of(x8, x9);
-    }
-  }
-
-  ZSaveLiveRegisters(MacroAssembler* masm, ZBarrierStubC2* stub)
-    : _masm(masm),
-      _gp_regs(),
-      _fp_regs(),
-      _vp_regs() {
-    // Figure out what registers to save/restore
-    initialize(stub);
-
-    // Save registers
-    __ push_reg(_gp_regs, sp);
-    __ push_fp(_fp_regs, sp);
-    __ push_v(_vp_regs, sp);
-  }
-
-  ~ZSaveLiveRegisters() {
-    // Restore registers
-    __ pop_v(_vp_regs, sp);
-    __ pop_fp(_fp_regs, sp);
-    __ pop_reg(_gp_regs, sp);
-  }
-};
-
 class ZSetupArguments {
 private:
   MacroAssembler* const _masm;
@@ -781,7 +710,7 @@ void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, Z
   }
 
   {
-    ZSaveLiveRegisters save_live_registers(masm, stub);
+    SaveLiveRegisters save_live_registers(masm, stub);
     ZSetupArguments setup_arguments(masm, stub);
     __ mv(t0, stub->slow_path());
     __ jalr(t0);
@@ -813,7 +742,7 @@ void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm,
   __ bind(slow);
 
   {
-    ZSaveLiveRegisters save_live_registers(masm, stub);
+    SaveLiveRegisters save_live_registers(masm, stub);
     __ la(c_rarg0, stub->ref_addr());
 
     if (stub->is_native()) {
diff --git a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
index 4597949d189..ef7d1c41e0e 100644
--- a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
@@ -166,9 +166,6 @@ public:
 #endif // COMPILER1
 
 #ifdef COMPILER2
-  OptoReg::Name refine_register(const Node* node,
-                                OptoReg::Name opto_reg);
-
   void generate_c2_load_barrier_stub(MacroAssembler* masm,
                                      ZLoadBarrierStubC2* stub) const;
   void generate_c2_store_barrier_stub(MacroAssembler* masm,
diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
index 480af074a4c..d3457916bc9 100644
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
@@ -147,3 +147,11 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm) {
     // Fall through to method body.
   __ block_comment("} nmethod_entry_barrier (nmethod_entry_barrier)");
 }
+
+#ifdef COMPILER2
+
+OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
+  Unimplemented(); // This must be implemented to support late barrier expansion.
+}
+
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
index b0f7233812b..f83bbb864ea 100644
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
@@ -29,6 +29,12 @@
 #include "asm/macroAssembler.hpp"
 #include "memory/allocation.hpp"
 #include "oops/access.hpp"
+#ifdef COMPILER2
+#include "code/vmreg.hpp"
+#include "opto/optoreg.hpp"
+
+class Node;
+#endif // COMPILER2
 
 class InterpreterMacroAssembler;
 
@@ -52,6 +58,11 @@ public:
   virtual void nmethod_entry_barrier(MacroAssembler* masm);
 
   virtual void barrier_stubs_init() {}
+
+#ifdef COMPILER2
+  OptoReg::Name refine_register(const Node* node,
+                                OptoReg::Name opto_reg);
+#endif // COMPILER2
 };
 
 #endif // CPU_S390_GC_SHARED_BARRIERSETASSEMBLER_S390_HPP
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
index f09e1c92162..a06fde061f8 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
@@ -34,6 +34,9 @@
 #include "runtime/jniHandles.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
+#ifdef COMPILER2
+#include "gc/shared/c2/barrierSetC2.hpp"
+#endif // COMPILER2
 
 #define __ masm->
 
@@ -488,3 +491,280 @@ void BarrierSetAssembler::check_oop(MacroAssembler* masm, Register obj, Register
   __ testptr(obj, obj);
   __ jcc(Assembler::zero, error); // if klass is null it is broken
 }
+
+#ifdef COMPILER2
+
+#ifdef _LP64
+
+OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
+  if (!OptoReg::is_reg(opto_reg)) {
+    return OptoReg::Bad;
+  }
+
+  const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+  if (vm_reg->is_XMMRegister()) {
+    opto_reg &= ~15;
+    switch (node->ideal_reg()) {
+    case Op_VecX:
+      opto_reg |= 2;
+      break;
+    case Op_VecY:
+      opto_reg |= 4;
+      break;
+    case Op_VecZ:
+      opto_reg |= 8;
+      break;
+    default:
+      opto_reg |= 1;
+      break;
+    }
+  }
+
+  return opto_reg;
+}
+
+// We use the vec_spill_helper from the x86.ad file to avoid reinventing this wheel
+extern void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
+                            int stack_offset, int reg, uint ireg, outputStream* st);
+
+#undef __
+#define __ _masm->
+
+int SaveLiveRegisters::xmm_compare_register_size(XMMRegisterData* left, XMMRegisterData* right) {
+  if (left->_size == right->_size) {
+    return 0;
+  }
+
+  return (left->_size < right->_size) ? -1 : 1;
+}
+
+int SaveLiveRegisters::xmm_slot_size(OptoReg::Name opto_reg) {
+  // The low order 4 bytes denote what size of the XMM register is live
+  return (opto_reg & 15) << 3;
+}
+
+uint SaveLiveRegisters::xmm_ideal_reg_for_size(int reg_size) {
+  switch (reg_size) {
+  case 8:
+    return Op_VecD;
+  case 16:
+    return Op_VecX;
+  case 32:
+    return Op_VecY;
+  case 64:
+    return Op_VecZ;
+  default:
+    fatal("Invalid register size %d", reg_size);
+    return 0;
+  }
+}
+
+bool SaveLiveRegisters::xmm_needs_vzeroupper() const {
+  return _xmm_registers.is_nonempty() && _xmm_registers.at(0)._size > 16;
+}
+
+void SaveLiveRegisters::xmm_register_save(const XMMRegisterData& reg_data) {
+  const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
+  const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
+  _spill_offset -= reg_data._size;
+  C2_MacroAssembler c2_masm(__ code());
+  vec_spill_helper(&c2_masm, false /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
+}
+
+void SaveLiveRegisters::xmm_register_restore(const XMMRegisterData& reg_data) {
+  const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
+  const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
+  C2_MacroAssembler c2_masm(__ code());
+  vec_spill_helper(&c2_masm, true /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
+  _spill_offset += reg_data._size;
+}
+
+void SaveLiveRegisters::gp_register_save(Register reg) {
+  _spill_offset -= 8;
+  __ movq(Address(rsp, _spill_offset), reg);
+}
+
+void SaveLiveRegisters::opmask_register_save(KRegister reg) {
+  _spill_offset -= 8;
+  __ kmov(Address(rsp, _spill_offset), reg);
+}
+
+void SaveLiveRegisters::gp_register_restore(Register reg) {
+  __ movq(reg, Address(rsp, _spill_offset));
+  _spill_offset += 8;
+}
+
+void SaveLiveRegisters::opmask_register_restore(KRegister reg) {
+  __ kmov(reg, Address(rsp, _spill_offset));
+  _spill_offset += 8;
+}
+
+void SaveLiveRegisters::initialize(BarrierStubC2* stub) {
+  // Create mask of caller saved registers that need to
+  // be saved/restored if live
+  RegMask caller_saved;
+  caller_saved.Insert(OptoReg::as_OptoReg(rax->as_VMReg()));
+  caller_saved.Insert(OptoReg::as_OptoReg(rcx->as_VMReg()));
+  caller_saved.Insert(OptoReg::as_OptoReg(rdx->as_VMReg()));
+  caller_saved.Insert(OptoReg::as_OptoReg(rsi->as_VMReg()));
+  caller_saved.Insert(OptoReg::as_OptoReg(rdi->as_VMReg()));
+  caller_saved.Insert(OptoReg::as_OptoReg(r8->as_VMReg()));
+  caller_saved.Insert(OptoReg::as_OptoReg(r9->as_VMReg()));
+  caller_saved.Insert(OptoReg::as_OptoReg(r10->as_VMReg()));
+  caller_saved.Insert(OptoReg::as_OptoReg(r11->as_VMReg()));
+
+  if (stub->result() != noreg) {
+    caller_saved.Remove(OptoReg::as_OptoReg(stub->result()->as_VMReg()));
+  }
+
+  // Create mask of live registers
+  RegMask live = stub->live();
+
+  int gp_spill_size = 0;
+  int opmask_spill_size = 0;
+  int xmm_spill_size = 0;
+
+  // Record registers that needs to be saved/restored
+  RegMaskIterator rmi(live);
+  while (rmi.has_next()) {
+    const OptoReg::Name opto_reg = rmi.next();
+    const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+
+    if (vm_reg->is_Register()) {
+      if (caller_saved.Member(opto_reg)) {
+        _gp_registers.append(vm_reg->as_Register());
+        gp_spill_size += 8;
+      }
+    } else if (vm_reg->is_KRegister()) {
+      // All opmask registers are caller saved, thus spill the ones
+      // which are live.
+      if (_opmask_registers.find(vm_reg->as_KRegister()) == -1) {
+        _opmask_registers.append(vm_reg->as_KRegister());
+        opmask_spill_size += 8;
+      }
+    } else if (vm_reg->is_XMMRegister()) {
+      // We encode in the low order 4 bits of the opto_reg, how large part of the register is live
+      const VMReg vm_reg_base = OptoReg::as_VMReg(opto_reg & ~15);
+      const int reg_size = xmm_slot_size(opto_reg);
+      const XMMRegisterData reg_data = { vm_reg_base->as_XMMRegister(), reg_size };
+      const int reg_index = _xmm_registers.find(reg_data);
+      if (reg_index == -1) {
+        // Not previously appended
+        _xmm_registers.append(reg_data);
+        xmm_spill_size += reg_size;
+      } else {
+        // Previously appended, update size
+        const int reg_size_prev = _xmm_registers.at(reg_index)._size;
+        if (reg_size > reg_size_prev) {
+          _xmm_registers.at_put(reg_index, reg_data);
+          xmm_spill_size += reg_size - reg_size_prev;
+        }
+      }
+    } else {
+      fatal("Unexpected register type");
+    }
+  }
+
+  // Sort by size, largest first
+  _xmm_registers.sort(xmm_compare_register_size);
+
+  // On Windows, the caller reserves stack space for spilling register arguments
+  const int arg_spill_size = frame::arg_reg_save_area_bytes;
+
+  // Stack pointer must be 16 bytes aligned for the call
+  _spill_offset = _spill_size = align_up(xmm_spill_size + gp_spill_size + opmask_spill_size + arg_spill_size, 16);
+}
+
+SaveLiveRegisters::SaveLiveRegisters(MacroAssembler* masm, BarrierStubC2* stub)
+  : _masm(masm),
+    _gp_registers(),
+    _opmask_registers(),
+    _xmm_registers(),
+    _spill_size(0),
+    _spill_offset(0) {
+
+  //
+  // Stack layout after registers have been spilled:
+  //
+  // | ...            | original rsp, 16 bytes aligned
+  // ------------------
+  // | zmm0 high      |
+  // | ...            |
+  // | zmm0 low       | 16 bytes aligned
+  // | ...            |
+  // | ymm1 high      |
+  // | ...            |
+  // | ymm1 low       | 16 bytes aligned
+  // | ...            |
+  // | xmmN high      |
+  // | ...            |
+  // | xmmN low       | 8 bytes aligned
+  // | reg0           | 8 bytes aligned
+  // | reg1           |
+  // | ...            |
+  // | regN           | new rsp, if 16 bytes aligned
+  // | <padding>      | else new rsp, 16 bytes aligned
+  // ------------------
+  //
+
+  // Figure out what registers to save/restore
+  initialize(stub);
+
+  // Allocate stack space
+  if (_spill_size > 0) {
+    __ subptr(rsp, _spill_size);
+  }
+
+  // Save XMM/YMM/ZMM registers
+  for (int i = 0; i < _xmm_registers.length(); i++) {
+    xmm_register_save(_xmm_registers.at(i));
+  }
+
+  if (xmm_needs_vzeroupper()) {
+    __ vzeroupper();
+  }
+
+  // Save general purpose registers
+  for (int i = 0; i < _gp_registers.length(); i++) {
+    gp_register_save(_gp_registers.at(i));
+  }
+
+  // Save opmask registers
+  for (int i = 0; i < _opmask_registers.length(); i++) {
+    opmask_register_save(_opmask_registers.at(i));
+  }
+}
+
+SaveLiveRegisters::~SaveLiveRegisters() {
+  // Restore opmask registers
+  for (int i = _opmask_registers.length() - 1; i >= 0; i--) {
+    opmask_register_restore(_opmask_registers.at(i));
+  }
+
+  // Restore general purpose registers
+  for (int i = _gp_registers.length() - 1; i >= 0; i--) {
+    gp_register_restore(_gp_registers.at(i));
+  }
+
+  __ vzeroupper();
+
+  // Restore XMM/YMM/ZMM registers
+  for (int i = _xmm_registers.length() - 1; i >= 0; i--) {
+    xmm_register_restore(_xmm_registers.at(i));
+  }
+
+  // Free stack space
+  if (_spill_size > 0) {
+    __ addptr(rsp, _spill_size);
+  }
+}
+
+#else // !_LP64
+
+OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
+  Unimplemented(); // This must be implemented to support late barrier expansion.
+}
+
+#endif // _LP64
+
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
index a2f2d86f46a..a74d5cc7676 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
@@ -28,7 +28,12 @@
 #include "asm/macroAssembler.hpp"
 #include "memory/allocation.hpp"
 #include "oops/access.hpp"
+#ifdef COMPILER2
+#include "opto/optoreg.hpp"
 
+class BarrierStubC2;
+class Node;
+#endif // COMPILER2
 class InterpreterMacroAssembler;
 
 class BarrierSetAssembler: public CHeapObj<mtGC> {
@@ -106,6 +111,63 @@ public:
   virtual void c2i_entry_barrier(MacroAssembler* masm);
 
   virtual void check_oop(MacroAssembler* masm, Register obj, Register tmp1, Register tmp2, Label& error);
+
+#ifdef COMPILER2
+  OptoReg::Name refine_register(const Node* node,
+                                OptoReg::Name opto_reg);
+#endif // COMPILER2
 };
 
+#ifdef COMPILER2
+
+#ifdef _LP64
+
+// This class saves and restores the registers that need to be preserved across
+// the runtime call represented by a given C2 barrier stub. Use as follows:
+// {
+//   SaveLiveRegisters save(masm, stub);
+//   ..
+//   __ call(RuntimeAddress(...);
+//   ..
+// }
+class SaveLiveRegisters {
+private:
+  struct XMMRegisterData {
+    XMMRegister _reg;
+    int         _size;
+
+    // Used by GrowableArray::find()
+    bool operator == (const XMMRegisterData& other) {
+      return _reg == other._reg;
+    }
+  };
+
+  MacroAssembler* const          _masm;
+  GrowableArray<Register>        _gp_registers;
+  GrowableArray<KRegister>       _opmask_registers;
+  GrowableArray<XMMRegisterData> _xmm_registers;
+  int                            _spill_size;
+  int                            _spill_offset;
+
+  static int xmm_compare_register_size(XMMRegisterData* left, XMMRegisterData* right);
+  static int xmm_slot_size(OptoReg::Name opto_reg);
+  static uint xmm_ideal_reg_for_size(int reg_size);
+  bool xmm_needs_vzeroupper() const;
+  void xmm_register_save(const XMMRegisterData& reg_data);
+  void xmm_register_restore(const XMMRegisterData& reg_data);
+  void gp_register_save(Register reg);
+  void opmask_register_save(KRegister reg);
+  void gp_register_restore(Register reg);
+  void opmask_register_restore(KRegister reg);
+  void initialize(BarrierStubC2* stub);
+
+public:
+  SaveLiveRegisters(MacroAssembler* masm, BarrierStubC2* stub);
+  ~SaveLiveRegisters();
+};
+
+#endif // _LP64
+
+#endif // COMPILER2
+
 #endif // CPU_X86_GC_SHARED_BARRIERSETASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index 5f0b73bf23f..f5f0d6c8841 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -1156,290 +1156,9 @@ void ZBarrierSetAssembler::generate_c1_store_barrier_runtime_stub(StubAssembler*
 
 #ifdef COMPILER2
 
-OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
-  if (!OptoReg::is_reg(opto_reg)) {
-    return OptoReg::Bad;
-  }
-
-  const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
-  if (vm_reg->is_XMMRegister()) {
-    opto_reg &= ~15;
-    switch (node->ideal_reg()) {
-      case Op_VecX:
-        opto_reg |= 2;
-        break;
-      case Op_VecY:
-        opto_reg |= 4;
-        break;
-      case Op_VecZ:
-        opto_reg |= 8;
-        break;
-      default:
-        opto_reg |= 1;
-        break;
-    }
-  }
-
-  return opto_reg;
-}
-
-// We use the vec_spill_helper from the x86.ad file to avoid reinventing this wheel
-extern void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
-                            int stack_offset, int reg, uint ireg, outputStream* st);
-
 #undef __
 #define __ _masm->
 
-class ZSaveLiveRegisters {
-private:
-  struct XMMRegisterData {
-    XMMRegister _reg;
-    int         _size;
-
-    // Used by GrowableArray::find()
-    bool operator == (const XMMRegisterData& other) {
-      return _reg == other._reg;
-    }
-  };
-
-  MacroAssembler* const          _masm;
-  GrowableArray<Register>        _gp_registers;
-  GrowableArray<KRegister>       _opmask_registers;
-  GrowableArray<XMMRegisterData> _xmm_registers;
-  int                            _spill_size;
-  int                            _spill_offset;
-
-  static int xmm_compare_register_size(XMMRegisterData* left, XMMRegisterData* right) {
-    if (left->_size == right->_size) {
-      return 0;
-    }
-
-    return (left->_size < right->_size) ? -1 : 1;
-  }
-
-  static int xmm_slot_size(OptoReg::Name opto_reg) {
-    // The low order 4 bytes denote what size of the XMM register is live
-    return (opto_reg & 15) << 3;
-  }
-
-  static uint xmm_ideal_reg_for_size(int reg_size) {
-    switch (reg_size) {
-    case 8:
-      return Op_VecD;
-    case 16:
-      return Op_VecX;
-    case 32:
-      return Op_VecY;
-    case 64:
-      return Op_VecZ;
-    default:
-      fatal("Invalid register size %d", reg_size);
-      return 0;
-    }
-  }
-
-  bool xmm_needs_vzeroupper() const {
-    return _xmm_registers.is_nonempty() && _xmm_registers.at(0)._size > 16;
-  }
-
-  void xmm_register_save(const XMMRegisterData& reg_data) {
-    const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
-    const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
-    _spill_offset -= reg_data._size;
-    C2_MacroAssembler c2_masm(__ code());
-    vec_spill_helper(&c2_masm, false /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
-  }
-
-  void xmm_register_restore(const XMMRegisterData& reg_data) {
-    const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
-    const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
-    C2_MacroAssembler c2_masm(__ code());
-    vec_spill_helper(&c2_masm, true /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
-    _spill_offset += reg_data._size;
-  }
-
-  void gp_register_save(Register reg) {
-    _spill_offset -= 8;
-    __ movq(Address(rsp, _spill_offset), reg);
-  }
-
-  void opmask_register_save(KRegister reg) {
-    _spill_offset -= 8;
-    __ kmov(Address(rsp, _spill_offset), reg);
-  }
-
-  void gp_register_restore(Register reg) {
-    __ movq(reg, Address(rsp, _spill_offset));
-    _spill_offset += 8;
-  }
-
-  void opmask_register_restore(KRegister reg) {
-    __ kmov(reg, Address(rsp, _spill_offset));
-    _spill_offset += 8;
-  }
-
-  void initialize(ZBarrierStubC2* stub) {
-    // Create mask of caller saved registers that need to
-    // be saved/restored if live
-    RegMask caller_saved;
-    caller_saved.Insert(OptoReg::as_OptoReg(rax->as_VMReg()));
-    caller_saved.Insert(OptoReg::as_OptoReg(rcx->as_VMReg()));
-    caller_saved.Insert(OptoReg::as_OptoReg(rdx->as_VMReg()));
-    caller_saved.Insert(OptoReg::as_OptoReg(rsi->as_VMReg()));
-    caller_saved.Insert(OptoReg::as_OptoReg(rdi->as_VMReg()));
-    caller_saved.Insert(OptoReg::as_OptoReg(r8->as_VMReg()));
-    caller_saved.Insert(OptoReg::as_OptoReg(r9->as_VMReg()));
-    caller_saved.Insert(OptoReg::as_OptoReg(r10->as_VMReg()));
-    caller_saved.Insert(OptoReg::as_OptoReg(r11->as_VMReg()));
-
-    if (stub->result() != noreg) {
-      caller_saved.Remove(OptoReg::as_OptoReg(stub->result()->as_VMReg()));
-    }
-
-    // Create mask of live registers
-    RegMask live = stub->live();
-
-    int gp_spill_size = 0;
-    int opmask_spill_size = 0;
-    int xmm_spill_size = 0;
-
-    // Record registers that needs to be saved/restored
-    RegMaskIterator rmi(live);
-    while (rmi.has_next()) {
-      const OptoReg::Name opto_reg = rmi.next();
-      const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
-
-      if (vm_reg->is_Register()) {
-        if (caller_saved.Member(opto_reg)) {
-          _gp_registers.append(vm_reg->as_Register());
-          gp_spill_size += 8;
-        }
-      } else if (vm_reg->is_KRegister()) {
-        // All opmask registers are caller saved, thus spill the ones
-        // which are live.
-        if (_opmask_registers.find(vm_reg->as_KRegister()) == -1) {
-          _opmask_registers.append(vm_reg->as_KRegister());
-          opmask_spill_size += 8;
-        }
-      } else if (vm_reg->is_XMMRegister()) {
-        // We encode in the low order 4 bits of the opto_reg, how large part of the register is live
-        const VMReg vm_reg_base = OptoReg::as_VMReg(opto_reg & ~15);
-        const int reg_size = xmm_slot_size(opto_reg);
-        const XMMRegisterData reg_data = { vm_reg_base->as_XMMRegister(), reg_size };
-        const int reg_index = _xmm_registers.find(reg_data);
-        if (reg_index == -1) {
-          // Not previously appended
-          _xmm_registers.append(reg_data);
-          xmm_spill_size += reg_size;
-        } else {
-          // Previously appended, update size
-          const int reg_size_prev = _xmm_registers.at(reg_index)._size;
-          if (reg_size > reg_size_prev) {
-            _xmm_registers.at_put(reg_index, reg_data);
-            xmm_spill_size += reg_size - reg_size_prev;
-          }
-        }
-      } else {
-        fatal("Unexpected register type");
-      }
-    }
-
-    // Sort by size, largest first
-    _xmm_registers.sort(xmm_compare_register_size);
-
-    // On Windows, the caller reserves stack space for spilling register arguments
-    const int arg_spill_size = frame::arg_reg_save_area_bytes;
-
-    // Stack pointer must be 16 bytes aligned for the call
-    _spill_offset = _spill_size = align_up(xmm_spill_size + gp_spill_size + opmask_spill_size + arg_spill_size, 16);
-  }
-
-public:
-  ZSaveLiveRegisters(MacroAssembler* masm, ZBarrierStubC2* stub)
-    : _masm(masm),
-      _gp_registers(),
-      _opmask_registers(),
-      _xmm_registers(),
-      _spill_size(0),
-      _spill_offset(0) {
-
-    //
-    // Stack layout after registers have been spilled:
-    //
-    // | ...            | original rsp, 16 bytes aligned
-    // ------------------
-    // | zmm0 high      |
-    // | ...            |
-    // | zmm0 low       | 16 bytes aligned
-    // | ...            |
-    // | ymm1 high      |
-    // | ...            |
-    // | ymm1 low       | 16 bytes aligned
-    // | ...            |
-    // | xmmN high      |
-    // | ...            |
-    // | xmmN low       | 8 bytes aligned
-    // | reg0           | 8 bytes aligned
-    // | reg1           |
-    // | ...            |
-    // | regN           | new rsp, if 16 bytes aligned
-    // | <padding>      | else new rsp, 16 bytes aligned
-    // ------------------
-    //
-
-    // Figure out what registers to save/restore
-    initialize(stub);
-
-    // Allocate stack space
-    if (_spill_size > 0) {
-      __ subptr(rsp, _spill_size);
-    }
-
-    // Save XMM/YMM/ZMM registers
-    for (int i = 0; i < _xmm_registers.length(); i++) {
-      xmm_register_save(_xmm_registers.at(i));
-    }
-
-    if (xmm_needs_vzeroupper()) {
-      __ vzeroupper();
-    }
-
-    // Save general purpose registers
-    for (int i = 0; i < _gp_registers.length(); i++) {
-      gp_register_save(_gp_registers.at(i));
-    }
-
-    // Save opmask registers
-    for (int i = 0; i < _opmask_registers.length(); i++) {
-      opmask_register_save(_opmask_registers.at(i));
-    }
-  }
-
-  ~ZSaveLiveRegisters() {
-    // Restore opmask registers
-    for (int i = _opmask_registers.length() - 1; i >= 0; i--) {
-      opmask_register_restore(_opmask_registers.at(i));
-    }
-
-    // Restore general purpose registers
-    for (int i = _gp_registers.length() - 1; i >= 0; i--) {
-      gp_register_restore(_gp_registers.at(i));
-    }
-
-    __ vzeroupper();
-
-    // Restore XMM/YMM/ZMM registers
-    for (int i = _xmm_registers.length() - 1; i >= 0; i--) {
-      xmm_register_restore(_xmm_registers.at(i));
-    }
-
-    // Free stack space
-    if (_spill_size > 0) {
-      __ addptr(rsp, _spill_size);
-    }
-  }
-};
-
 class ZSetupArguments {
 private:
   MacroAssembler* const _masm;
@@ -1504,7 +1223,7 @@ void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, Z
   __ movptr(stub->ref(), stub->ref_addr());
 
   {
-    ZSaveLiveRegisters save_live_registers(masm, stub);
+    SaveLiveRegisters save_live_registers(masm, stub);
     ZSetupArguments setup_arguments(masm, stub);
     __ call(RuntimeAddress(stub->slow_path()));
   }
@@ -1534,7 +1253,7 @@ void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm,
   __ bind(slow);
 
   {
-    ZSaveLiveRegisters save_live_registers(masm, stub);
+    SaveLiveRegisters save_live_registers(masm, stub);
     __ lea(c_rarg0, stub->ref_addr());
 
     if (stub->is_native()) {
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
index 752cff0125d..7c3716ba0da 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
@@ -164,9 +164,6 @@ public:
 #endif // COMPILER1
 
 #ifdef COMPILER2
-  OptoReg::Name refine_register(const Node* node,
-                                OptoReg::Name opto_reg);
-
   void generate_c2_load_barrier_stub(MacroAssembler* masm,
                                      ZLoadBarrierStubC2* stub) const;
   void generate_c2_store_barrier_stub(MacroAssembler* masm,
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
index 41bd15ab000..3f712c9d391 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
@@ -23,16 +23,22 @@
  */
 
 #include "precompiled.hpp"
+#include "code/vmreg.inline.hpp"
+#include "gc/shared/barrierSet.hpp"
 #include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/c2/barrierSetC2.hpp"
 #include "opto/arraycopynode.hpp"
+#include "opto/block.hpp"
 #include "opto/convertnode.hpp"
 #include "opto/graphKit.hpp"
 #include "opto/idealKit.hpp"
 #include "opto/macro.hpp"
 #include "opto/narrowptrnode.hpp"
+#include "opto/output.hpp"
+#include "opto/regalloc.hpp"
 #include "opto/runtime.hpp"
 #include "utilities/macros.hpp"
+#include CPU_HEADER(gc/shared/barrierSetAssembler)
 
 // By default this is a no-op.
 void BarrierSetC2::resolve_address(C2Access& access) const { }
@@ -77,6 +83,31 @@ bool C2Access::needs_cpu_membar() const {
   return false;
 }
 
+static BarrierSetC2State* barrier_set_state() {
+  return reinterpret_cast<BarrierSetC2State*>(Compile::current()->barrier_set_state());
+}
+
+BarrierStubC2::BarrierStubC2(const MachNode* node)
+  : _node(node),
+    _entry(),
+    _continuation() {}
+
+RegMask& BarrierStubC2::live() const {
+  return *barrier_set_state()->live(_node);
+}
+
+Label* BarrierStubC2::entry() {
+  // The _entry will never be bound when in_scratch_emit_size() is true.
+  // However, we still need to return a label that is not bound now, but
+  // will eventually be bound. Any eventually bound label will do, as it
+  // will only act as a placeholder, so we return the _continuation label.
+  return Compile::current()->output()->in_scratch_emit_size() ? &_continuation : &_entry;
+}
+
+Label* BarrierStubC2::continuation() {
+  return &_continuation;
+}
+
 Node* BarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& val) const {
   DecoratorSet decorators = access.decorators();
 
@@ -788,3 +819,76 @@ void BarrierSetC2::clone_at_expansion(PhaseMacroExpand* phase, ArrayCopyNode* ac
 }
 
 #undef XTOP
+
+void BarrierSetC2::compute_liveness_at_stubs() const {
+  ResourceMark rm;
+  Compile* const C = Compile::current();
+  Arena* const A = Thread::current()->resource_area();
+  PhaseCFG* const cfg = C->cfg();
+  PhaseRegAlloc* const regalloc = C->regalloc();
+  RegMask* const live = NEW_ARENA_ARRAY(A, RegMask, cfg->number_of_blocks() * sizeof(RegMask));
+  BarrierSetAssembler* const bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  Block_List worklist;
+
+  for (uint i = 0; i < cfg->number_of_blocks(); ++i) {
+    new ((void*)(live + i)) RegMask();
+    worklist.push(cfg->get_block(i));
+  }
+
+  while (worklist.size() > 0) {
+    const Block* const block = worklist.pop();
+    RegMask& old_live = live[block->_pre_order];
+    RegMask new_live;
+
+    // Initialize to union of successors
+    for (uint i = 0; i < block->_num_succs; i++) {
+      const uint succ_id = block->_succs[i]->_pre_order;
+      new_live.OR(live[succ_id]);
+    }
+
+    // Walk block backwards, computing liveness
+    for (int i = block->number_of_nodes() - 1; i >= 0; --i) {
+      const Node* const node = block->get_node(i);
+
+      // Remove def bits
+      const OptoReg::Name first = bs->refine_register(node, regalloc->get_reg_first(node));
+      const OptoReg::Name second = bs->refine_register(node, regalloc->get_reg_second(node));
+      if (first != OptoReg::Bad) {
+        new_live.Remove(first);
+      }
+      if (second != OptoReg::Bad) {
+        new_live.Remove(second);
+      }
+
+      // Add use bits
+      for (uint j = 1; j < node->req(); ++j) {
+        const Node* const use = node->in(j);
+        const OptoReg::Name first = bs->refine_register(use, regalloc->get_reg_first(use));
+        const OptoReg::Name second = bs->refine_register(use, regalloc->get_reg_second(use));
+        if (first != OptoReg::Bad) {
+          new_live.Insert(first);
+        }
+        if (second != OptoReg::Bad) {
+          new_live.Insert(second);
+        }
+      }
+
+       // If this node tracks liveness, update it
+      RegMask* const regs = barrier_set_state()->live(node);
+      if (regs != NULL) {
+        regs->OR(new_live);
+      }
+    }
+
+    // Now at block top, see if we have any changes
+    new_live.SUBTRACT(old_live);
+    if (new_live.is_NotEmpty()) {
+      // Liveness has refined, update and propagate to prior blocks
+      old_live.OR(new_live);
+      for (uint i = 1; i < block->num_preds(); ++i) {
+        Block* const pred = cfg->get_block_for_node(block->pred(i));
+        worklist.push(pred);
+      }
+    }
+  }
+}
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
index bef2fc5607e..aa2df96412d 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
@@ -205,6 +205,48 @@ public:
   virtual bool is_opt_access() const { return true; }
 };
 
+class BarrierSetC2State : public ArenaObj {
+protected:
+  Node_Array                      _live;
+
+public:
+  BarrierSetC2State(Arena* arena) : _live(arena) {}
+
+  RegMask* live(const Node* node) {
+    if (!node->is_Mach() || !needs_liveness_data(node->as_Mach())) {
+      // Don't need liveness for non-MachNodes or if the GC doesn't request it
+      return nullptr;
+    }
+    RegMask* live = (RegMask*)_live[node->_idx];
+    if (live == nullptr) {
+      live = new (Compile::current()->comp_arena()->AmallocWords(sizeof(RegMask))) RegMask();
+      _live.map(node->_idx, (Node*)live);
+    }
+
+    return live;
+  }
+
+  virtual bool needs_liveness_data(const MachNode* mach) const = 0;
+};
+
+// This class represents the slow path in a C2 barrier. It is defined by a
+// memory access, an entry point, and a continuation point (typically the end of
+// the barrier). It provides a set of registers whose value is live across the
+// barrier, and hence must be preserved across runtime calls from the stub.
+class BarrierStubC2 : public ArenaObj {
+protected:
+  const MachNode* _node;
+  Label           _entry;
+  Label           _continuation;
+
+public:
+  BarrierStubC2(const MachNode* node);
+  RegMask& live() const;
+  Label* entry();
+  Label* continuation();
+
+  virtual Register result() const = 0;
+};
 
 // This is the top-level class for the backend of the Access API in C2.
 // The top-level class is responsible for performing raw accesses. The
@@ -302,6 +344,7 @@ public:
   virtual bool matcher_is_store_load_barrier(Node* x, uint xop) const { return false; }
 
   virtual void late_barrier_analysis() const { }
+  virtual void compute_liveness_at_stubs() const;
   virtual int estimate_stub_size() const { return 0; }
   virtual void emit_stubs(CodeBuffer& cb) const { }
 
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
index 4c876500f70..85d45553202 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
@@ -120,17 +120,16 @@ public:
 
 typedef ZArenaHashtable<intptr_t, bool, 4> ZOffsetTable;
 
-class ZBarrierSetC2State : public ArenaObj {
+class ZBarrierSetC2State : public BarrierSetC2State {
 private:
   GrowableArray<ZBarrierStubC2*>* _stubs;
-  Node_Array                      _live;
   int                             _trampoline_stubs_count;
   int                             _stubs_start_offset;
 
 public:
   ZBarrierSetC2State(Arena* arena)
-    : _stubs(new (arena) GrowableArray<ZBarrierStubC2*>(arena, 8,  0, nullptr)),
-      _live(arena),
+    : BarrierSetC2State(arena),
+      _stubs(new (arena) GrowableArray<ZBarrierStubC2*>(arena, 8,  0, nullptr)),
       _trampoline_stubs_count(0),
       _stubs_start_offset(0) {}
 
@@ -138,25 +137,9 @@ public:
     return _stubs;
   }
 
-  RegMask* live(const Node* node) {
-    if (!node->is_Mach()) {
-      // Don't need liveness for non-MachNodes
-      return nullptr;
-    }
-
-    const MachNode* const mach = node->as_Mach();
-    if (mach->barrier_data() == ZBarrierElided) {
-      // Don't need liveness data for nodes without barriers
-      return nullptr;
-    }
-
-    RegMask* live = (RegMask*)_live[node->_idx];
-    if (live == nullptr) {
-      live = new (Compile::current()->comp_arena()->AmallocWords(sizeof(RegMask))) RegMask();
-      _live.map(node->_idx, (Node*)live);
-    }
-
-    return live;
+  bool needs_liveness_data(const MachNode* mach) const {
+    // Don't need liveness data for nodes without barriers
+    return mach->barrier_data() != ZBarrierElided;
   }
 
   void inc_trampoline_stubs_count() {
@@ -201,30 +184,7 @@ int ZBarrierStubC2::stubs_start_offset() {
   return barrier_set_state()->stubs_start_offset();
 }
 
-ZBarrierStubC2::ZBarrierStubC2(const MachNode* node)
-  : _node(node),
-    _entry(),
-    _continuation() {}
-
-Register ZBarrierStubC2::result() const {
-  return noreg;
-}
-
-RegMask& ZBarrierStubC2::live() const {
-  return *barrier_set_state()->live(_node);
-}
-
-Label* ZBarrierStubC2::entry() {
-  // The _entry will never be bound when in_scratch_emit_size() is true.
-  // However, we still need to return a label that is not bound now, but
-  // will eventually be bound. Any eventually bound label will do, as it
-  // will only act as a placeholder, so we return the _continuation label.
-  return Compile::current()->output()->in_scratch_emit_size() ? &_continuation : &_entry;
-}
-
-Label* ZBarrierStubC2::continuation() {
-  return &_continuation;
-}
+ZBarrierStubC2::ZBarrierStubC2(const MachNode* node) : BarrierStubC2(node) {}
 
 ZLoadBarrierStubC2* ZLoadBarrierStubC2::create(const MachNode* node, Address ref_addr, Register ref) {
   AARCH64_ONLY(fatal("Should use ZLoadBarrierStubC2Aarch64::create"));
@@ -884,81 +844,6 @@ void ZBarrierSetC2::analyze_dominating_barriers() const {
   analyze_dominating_barriers_impl(atomics, atomic_dominators);
 }
 
-// == Reduced spilling optimization ==
-
-void ZBarrierSetC2::compute_liveness_at_stubs() const {
-  ResourceMark rm;
-  Compile* const C = Compile::current();
-  Arena* const A = Thread::current()->resource_area();
-  PhaseCFG* const cfg = C->cfg();
-  PhaseRegAlloc* const regalloc = C->regalloc();
-  RegMask* const live = NEW_ARENA_ARRAY(A, RegMask, cfg->number_of_blocks() * sizeof(RegMask));
-  ZBarrierSetAssembler* const bs = ZBarrierSet::assembler();
-  Block_List worklist;
-
-  for (uint i = 0; i < cfg->number_of_blocks(); ++i) {
-    new ((void*)(live + i)) RegMask();
-    worklist.push(cfg->get_block(i));
-  }
-
-  while (worklist.size() > 0) {
-    const Block* const block = worklist.pop();
-    RegMask& old_live = live[block->_pre_order];
-    RegMask new_live;
-
-    // Initialize to union of successors
-    for (uint i = 0; i < block->_num_succs; i++) {
-      const uint succ_id = block->_succs[i]->_pre_order;
-      new_live.OR(live[succ_id]);
-    }
-
-    // Walk block backwards, computing liveness
-    for (int i = block->number_of_nodes() - 1; i >= 0; --i) {
-      const Node* const node = block->get_node(i);
-
-      // Remove def bits
-      const OptoReg::Name first = bs->refine_register(node, regalloc->get_reg_first(node));
-      const OptoReg::Name second = bs->refine_register(node, regalloc->get_reg_second(node));
-      if (first != OptoReg::Bad) {
-        new_live.Remove(first);
-      }
-      if (second != OptoReg::Bad) {
-        new_live.Remove(second);
-      }
-
-      // Add use bits
-      for (uint j = 1; j < node->req(); ++j) {
-        const Node* const use = node->in(j);
-        const OptoReg::Name first = bs->refine_register(use, regalloc->get_reg_first(use));
-        const OptoReg::Name second = bs->refine_register(use, regalloc->get_reg_second(use));
-        if (first != OptoReg::Bad) {
-          new_live.Insert(first);
-        }
-        if (second != OptoReg::Bad) {
-          new_live.Insert(second);
-        }
-      }
-
-      // If this node tracks liveness, update it
-      RegMask* const regs = barrier_set_state()->live(node);
-      if (regs != nullptr) {
-        regs->OR(new_live);
-      }
-    }
-
-    // Now at block top, see if we have any changes
-    new_live.SUBTRACT(old_live);
-    if (new_live.is_NotEmpty()) {
-      // Liveness has refined, update and propagate to prior blocks
-      old_live.OR(new_live);
-      for (uint i = 1; i < block->num_preds(); ++i) {
-        Block* const pred = cfg->get_block_for_node(block->pred(i));
-        worklist.push(pred);
-      }
-    }
-  }
-}
-
 void ZBarrierSetC2::eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const {
   eliminate_gc_barrier_data(node);
 }
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
index e4b3be4dadc..f8892defcff 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
@@ -41,12 +41,8 @@ class MachNode;
 
 class MacroAssembler;
 
-class ZBarrierStubC2 : public ArenaObj {
+class ZBarrierStubC2 : public BarrierStubC2 {
 protected:
-  const MachNode* _node;
-  Label           _entry;
-  Label           _continuation;
-
 static void register_stub(ZBarrierStubC2* stub);
 static void inc_trampoline_stubs_count();
 static int trampoline_stubs_count();
@@ -55,10 +51,6 @@ static int stubs_start_offset();
   ZBarrierStubC2(const MachNode* node);
 
 public:
-  RegMask& live() const;
-  Label* entry();
-  Label* continuation();
-
   virtual Register result() const = 0;
   virtual void emit_code(MacroAssembler& masm) = 0;
 };
@@ -108,7 +100,6 @@ public:
 
 class ZBarrierSetC2 : public BarrierSetC2 {
 private:
-  void compute_liveness_at_stubs() const;
   void analyze_dominating_barriers_impl(Node_List& accesses, Node_List& access_dominators) const;
   void analyze_dominating_barriers() const;
 

From 70d3f22b70521011027748f8cd078bd2ab9be730 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 29 Apr 2024 08:42:09 +0000
Subject: [PATCH 236/486] 8331175: Parallel: Remove VerifyRememberedSets

Reviewed-by: tschatzl, gli
---
 src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp   | 3 +++
 src/hotspot/share/gc/parallel/psScavenge.cpp             | 9 ---------
 src/hotspot/share/gc/shared/gc_globals.hpp               | 3 ---
 .../jtreg/gc/g1/TestVerificationInConcurrentCycle.java   | 2 --
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 4a74e2d838d..0ced8ed9336 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -787,6 +787,9 @@ void ParallelScavengeHeap::verify(VerifyOption option /* ignored */) {
 
     log_debug(gc, verify)("Eden");
     young_gen()->verify();
+
+    log_debug(gc, verify)("CardTable");
+    card_table()->verify_all_young_refs_imprecise();
   }
 }
 
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index 92befe23438..ac7ca1bb8b7 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -419,11 +419,6 @@ bool PSScavenge::invoke_no_policy() {
     // Let the size policy know we're starting
     size_policy->minor_collection_begin();
 
-    // Verify no unmarked old->young roots
-    if (VerifyRememberedSets) {
-      heap->card_table()->verify_all_young_refs_imprecise();
-    }
-
     assert(young_gen->to_space()->is_empty(),
            "Attempt to scavenge with live objects in to_space");
     young_gen->to_space()->clear(SpaceDecorator::Mangle);
@@ -628,10 +623,6 @@ bool PSScavenge::invoke_no_policy() {
     DerivedPointerTable::update_pointers();
 #endif
 
-    if (VerifyRememberedSets) {
-      heap->card_table()->verify_all_young_refs_imprecise();
-    }
-
     if (log_is_enabled(Debug, gc, heap, exit)) {
       accumulated_time()->stop();
     }
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index af735a865dc..13583874d84 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -494,9 +494,6 @@
   product(bool, UseCondCardMark, false,                                     \
           "Check for already marked card before updating card table")       \
                                                                             \
-  product(bool, VerifyRememberedSets, false, DIAGNOSTIC,                    \
-          "Verify GC remembered sets")                                      \
-                                                                            \
   product(bool, DisableExplicitGC, false,                                   \
           "Ignore calls to System.gc()")                                    \
                                                                             \
diff --git a/test/hotspot/jtreg/gc/g1/TestVerificationInConcurrentCycle.java b/test/hotspot/jtreg/gc/g1/TestVerificationInConcurrentCycle.java
index 044636c7c5f..7618e8c1708 100644
--- a/test/hotspot/jtreg/gc/g1/TestVerificationInConcurrentCycle.java
+++ b/test/hotspot/jtreg/gc/g1/TestVerificationInConcurrentCycle.java
@@ -36,7 +36,6 @@ package gc.g1;
  *   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *   -XX:+VerifyBeforeGC -XX:+VerifyDuringGC -XX:+VerifyAfterGC
  *   -XX:+UseG1GC -XX:+G1VerifyHeapRegionCodeRoots
- *   -XX:+VerifyRememberedSets
  *   -XX:+G1VerifyBitmaps
  *   gc.g1.TestVerificationInConcurrentCycle
  */
@@ -55,7 +54,6 @@ package gc.g1;
  *   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *   -XX:+VerifyBeforeGC -XX:+VerifyDuringGC -XX:+VerifyAfterGC
  *   -XX:+UseG1GC -XX:+G1VerifyHeapRegionCodeRoots
- *   -XX:+VerifyRememberedSets
  *   gc.g1.TestVerificationInConcurrentCycle
  */
 

From 727293906430cfd95c0e2b2bd7a9df658f6fe94d Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 29 Apr 2024 08:43:12 +0000
Subject: [PATCH 237/486] 8331200: Serial: Remove unused methods in SerialHeap

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/serial/serialHeap.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index 12a4261feec..fca877e2925 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -147,9 +147,6 @@ public:
   void post_initialize() override;
 
   bool is_young_gen(const Generation* gen) const { return gen == _young_gen; }
-  bool is_old_gen(const Generation* gen) const { return gen == _old_gen; }
-
-  MemRegion reserved_region() const { return _reserved; }
   bool is_in_reserved(const void* addr) const { return _reserved.contains(addr); }
 
   // Performance Counter support

From 151ef5d4d261c9fc740d3ccd64a70d3b9ccc1ab5 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Mon, 29 Apr 2024 10:58:07 +0000
Subject: [PATCH 238/486] 8330677: Add Per-Compilation memory usage to JFR

Reviewed-by: kvn, mbaesken
---
 .../share/compiler/compilationMemoryStatistic.cpp  | 14 +++++++++-----
 src/hotspot/share/compiler/compileBroker.cpp       |  3 ++-
 src/hotspot/share/compiler/compileTask.cpp         |  3 ++-
 src/hotspot/share/compiler/compileTask.hpp         |  6 +++++-
 src/hotspot/share/compiler/compilerEvent.cpp       |  7 +++++--
 src/hotspot/share/compiler/compilerEvent.hpp       |  6 ++++--
 src/hotspot/share/jfr/metadata/metadata.xml        |  1 +
 .../jfr/event/compiler/TestCompilerCompile.java    |  2 ++
 8 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 2cf8efa23c3..ae3c2c75fdb 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -394,16 +394,20 @@ void CompilationMemoryStatistic::on_end_compilation() {
   ResourceMark rm;
   CompilerThread* const th = Thread::current()->as_Compiler_thread();
   ArenaStatCounter* const arena_stat = th->arena_stat();
-  const CompilerType ct = th->task()->compiler()->type();
+  CompileTask* const task = th->task();
+  const CompilerType ct = task->compiler()->type();
 
   const Method* const m = th->task()->method();
   FullMethodName fmn(m);
   fmn.make_permanent();
 
   const DirectiveSet* directive = th->task()->directive();
-  assert(directive->should_collect_memstat(), "Only call if memstat is enabled");
+  assert(directive->should_collect_memstat(), "Should only be called if memstat is enabled for this method");
   const bool print = directive->should_print_memstat();
 
+  // Store memory used in task, for later processing by JFR
+  task->set_arena_bytes(arena_stat->peak_since_start());
+
   // Store result
   // For this to work, we must call on_end_compilation() at a point where
   // Compile|Compilation already handed over the failure string to ciEnv,
@@ -492,7 +496,7 @@ void CompilationMemoryStatistic::on_arena_change(ssize_t diff, const Arena* aren
       CompilerType ct = compiler_none;
 
       // get some more info
-      const CompileTask* task = th->task();
+      const CompileTask* const task = th->task();
       if (task != nullptr) {
         ct = task->compiler()->type();
         const DirectiveSet* directive = task->directive();
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index 82f0996bc60..0935ea6a8e1 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -2126,7 +2126,8 @@ static void post_compilation_event(EventCompilation& event, CompileTask* task) {
                                         task->is_success(),
                                         task->osr_bci() != CompileBroker::standard_entry_bci,
                                         task->nm_total_size(),
-                                        task->num_inlined_bytecodes());
+                                        task->num_inlined_bytecodes(),
+                                        task->arena_bytes());
 }
 
 int DirectivesStack::_depth = 0;
diff --git a/src/hotspot/share/compiler/compileTask.cpp b/src/hotspot/share/compiler/compileTask.cpp
index 4690cd5c134..1a2af572166 100644
--- a/src/hotspot/share/compiler/compileTask.cpp
+++ b/src/hotspot/share/compiler/compileTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -123,6 +123,7 @@ void CompileTask::initialize(int compile_id,
   _nm_total_size = 0;
   _failure_reason = nullptr;
   _failure_reason_on_C_heap = false;
+  _arena_bytes = 0;
 
   if (LogCompilation) {
     if (hot_method.not_null()) {
diff --git a/src/hotspot/share/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp
index fabfb8e0487..137e9843c35 100644
--- a/src/hotspot/share/compiler/compileTask.hpp
+++ b/src/hotspot/share/compiler/compileTask.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,6 +114,7 @@ class CompileTask : public CHeapObj<mtCompiler> {
   const char*          _failure_reason;
   // Specifies if _failure_reason is on the C heap.
   bool                 _failure_reason_on_C_heap;
+  size_t               _arena_bytes;  // peak size of temporary memory during compilation (e.g. node arenas)
 
  public:
   CompileTask() : _failure_reason(nullptr), _failure_reason_on_C_heap(false) {
@@ -200,6 +201,9 @@ class CompileTask : public CHeapObj<mtCompiler> {
   void         metadata_do(MetadataClosure* f);
   void         mark_on_stack();
 
+  void         set_arena_bytes(size_t s)         { _arena_bytes = s; }
+  size_t       arena_bytes() const               { return _arena_bytes; }
+
 private:
   static void  print_impl(outputStream* st, Method* method, int compile_id, int comp_level,
                                       bool is_osr_method = false, int osr_bci = -1, bool is_blocking = false,
diff --git a/src/hotspot/share/compiler/compilerEvent.cpp b/src/hotspot/share/compiler/compilerEvent.cpp
index 0e14f62a468..d2f6e7ba886 100644
--- a/src/hotspot/share/compiler/compilerEvent.cpp
+++ b/src/hotspot/share/compiler/compilerEvent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -134,7 +134,9 @@ static inline void commit(EventType& event) {
   }
  }
 
-void CompilerEvent::CompilationEvent::post(EventCompilation& event, int compile_id, CompilerType compiler_type, Method* method, int compile_level, bool success, bool is_osr, int code_size, int inlined_bytecodes) {
+void CompilerEvent::CompilationEvent::post(EventCompilation& event, int compile_id, CompilerType compiler_type, Method* method,
+    int compile_level, bool success, bool is_osr, int code_size,
+    int inlined_bytecodes, size_t arenaBytes) {
   event.set_compileId(compile_id);
   event.set_compiler(compiler_type);
   event.set_method(method);
@@ -143,6 +145,7 @@ void CompilerEvent::CompilationEvent::post(EventCompilation& event, int compile_
   event.set_isOsr(is_osr);
   event.set_codeSize(code_size);
   event.set_inlinedBytes(inlined_bytecodes);
+  event.set_arenaBytes(arenaBytes);
   commit(event);
 }
 
diff --git a/src/hotspot/share/compiler/compilerEvent.hpp b/src/hotspot/share/compiler/compilerEvent.hpp
index d2ffd8fe2d4..aaebe86b5dc 100644
--- a/src/hotspot/share/compiler/compilerEvent.hpp
+++ b/src/hotspot/share/compiler/compilerEvent.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -52,7 +52,9 @@ class CompilerEvent : AllStatic {
 
   class CompilationEvent : AllStatic {
    public:
-    static void post(EventCompilation& event, int compile_id, CompilerType type, Method* method, int compile_level, bool success, bool is_osr, int code_size, int inlined_bytecodes) NOT_JFR_RETURN();
+    static void post(EventCompilation& event, int compile_id, CompilerType type, Method* method,
+                     int compile_level, bool success, bool is_osr, int code_size,
+                     int inlined_bytecodes, size_t arenaBytes) NOT_JFR_RETURN();
   };
 
   class CompilationFailureEvent : AllStatic {
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 42facf56217..0ebfdd9210c 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -608,6 +608,7 @@
     <Field type="boolean" name="isOsr" label="On Stack Replacement" />
     <Field type="ulong" contentType="bytes" name="codeSize" label="Compiled Code Size" />
     <Field type="ulong" contentType="bytes" name="inlinedBytes" label="Inlined Code Size" />
+    <Field type="ulong" contentType="bytes" name="arenaBytes" label="Arena Usage" />
   </Event>
 
   <Event name="CompilerPhase" category="Java Virtual Machine, Compiler" label="Compiler Phase"
diff --git a/test/jdk/jdk/jfr/event/compiler/TestCompilerCompile.java b/test/jdk/jdk/jfr/event/compiler/TestCompilerCompile.java
index 775d7789bee..8d070db8262 100644
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerCompile.java
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerCompile.java
@@ -48,6 +48,7 @@ import jdk.test.whitebox.WhiteBox;
  * @run main/othervm -Xbootclasspath/a:.
  *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *     -XX:CompileOnly=jdk.jfr.event.compiler.TestCompilerCompile::dummyMethod,jdk.jfr.event.compiler.TestCompilerCompile::doTest
+ *     -XX:CompileCommand=MemStat,*.*
  *     jdk.jfr.event.compiler.TestCompilerCompile
  */
 public class TestCompilerCompile {
@@ -138,5 +139,6 @@ public class TestCompilerCompile {
         Events.assertField(event, "inlinedBytes").atLeast(0L);
         Events.assertField(event, "codeSize").atLeast(0L);
         Events.assertField(event, "isOsr");
+        Events.assertField(event, "arenaBytes").atLeast(1024L);
     }
 }

From 8b8fb6427e3cbc16b818ddcbd6a971f3d2370f94 Mon Sep 17 00:00:00 2001
From: Liming Liu <limingliu@os.amperecomputing.com>
Date: Mon, 29 Apr 2024 15:14:37 +0000
Subject: [PATCH 239/486] 8324776: runtime/os/TestTransparentHugePageUsage.java
 fails with The usage of THP is not enough

Reviewed-by: stuefe
---
 test/hotspot/jtreg/ProblemList.txt            |   1 -
 .../os/TestTransparentHugePageUsage.java      | 105 ------------------
 2 files changed, 106 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/os/TestTransparentHugePageUsage.java

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 8e144b692f2..4b787c1b1ee 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -111,7 +111,6 @@ runtime/StackGuardPages/TestStackGuardPagesNative.java 8303612 linux-all
 runtime/ErrorHandling/TestDwarf.java#checkDecoder 8305489 linux-all
 runtime/ErrorHandling/MachCodeFramesInErrorFile.java 8313315 linux-ppc64le
 runtime/cds/appcds/customLoader/HelloCustom_JFR.java 8241075 linux-all,windows-x64
-runtime/os/TestTransparentHugePageUsage.java 8324776 linux-all
 runtime/Thread/TestAlwaysPreTouchStacks.java 8324781 linux-all
 
 applications/jcstress/accessAtomic.java 8325984 generic-all
diff --git a/test/hotspot/jtreg/runtime/os/TestTransparentHugePageUsage.java b/test/hotspot/jtreg/runtime/os/TestTransparentHugePageUsage.java
deleted file mode 100644
index 2b054fd6f4b..00000000000
--- a/test/hotspot/jtreg/runtime/os/TestTransparentHugePageUsage.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) Ampere Computing 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 TestTransparentHugePageUsage
- * @bug 8315923
- * @library /test/lib
- * @requires vm.gc.Serial & os.family == "linux" & os.maxMemory > 2G
- * @summary Check that a pretouched java heap appears to use THPs by checking
- *          AnonHugePages in smaps
- * @comment Use SerialGC to increase the time window for pretouching
- * @run driver runtime.os.TestTransparentHugePageUsage
- */
-
-package runtime.os;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.InputStreamReader;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import jdk.test.lib.process.ProcessTools;
-
-public class TestTransparentHugePageUsage {
-  private static final String[] fixedCmdLine = {
-    "-XX:+UseTransparentHugePages", "-XX:+AlwaysPreTouch",
-    "-Xlog:startuptime,pagesize,gc+heap=debug",
-    "-XX:+UseSerialGC", "-Xms1G", "-Xmx1G",
-  };
-
-  public static void main(String[] args) throws Exception {
-    ArrayList<String> cmdLine = new ArrayList<>(Arrays.asList(fixedCmdLine));
-    cmdLine.add("runtime.os.TestTransparentHugePageUsage$CatSmaps");
-    ProcessBuilder builder = ProcessTools.createTestJavaProcessBuilder(cmdLine);
-    checkUsage(new BufferedReader(new InputStreamReader(builder.start().getInputStream())));
-  }
-
-  private static void checkUsage(BufferedReader reader) throws Exception {
-    final Pattern useThp = Pattern.compile(".*\\[info\\]\\[pagesize\\].+UseTransparentHugePages=1.*");
-    // Ensure THP is not disabled by OS.
-    if (reader.lines().filter(line -> useThp.matcher(line).matches()).findFirst().isPresent()) {
-      final Pattern heapAddr = Pattern.compile(".*\\sHeap:\\s.+base=0x0*(\\p{XDigit}+).*");
-      final Optional<Long> addr = reader.lines()
-          .map(line -> new SimpleEntry<String, Matcher>(line, heapAddr.matcher(line)))
-          .filter(e -> e.getValue().matches())
-          .findFirst()
-          .map(e -> Long.valueOf(e.getKey().substring(e.getValue().start(1), e.getValue().end(1)), 16));
-      if (!addr.isPresent()) throw new RuntimeException("Heap base was not found in smaps.");
-      // Match the start of a mapping, for example:
-      // 200000000-800000000 rw-p 00000000 00:00 0
-      final Pattern mapping = Pattern.compile("^(\\p{XDigit}+)-\\p{XDigit}+.*");
-      reader.lines()
-            .filter(line -> {
-                  Matcher matcher = mapping.matcher(line);
-                  if (matcher.matches()) {
-                    Long mappingAddr = Long.valueOf(line.substring(matcher.start(1), matcher.end(1)), 16);
-                    if (mappingAddr.equals(addr.get())) return true;
-                  }
-                  return false;
-                })
-            .findFirst();
-      final Pattern thpUsage = Pattern.compile("^AnonHugePages:\\s+(\\d+)\\skB");
-      final Optional<Long> usage = reader.lines()
-          .map(line -> new SimpleEntry<String, Matcher>(line, thpUsage.matcher(line)))
-          .filter(e -> e.getValue().matches())
-          .findFirst()
-          .map(e -> Long.valueOf(e.getKey().substring(e.getValue().start(1), e.getValue().end(1))));
-      if (!usage.isPresent()) throw new RuntimeException("The usage of THP was not found.");
-      // Even with MADV_POPULATE_WRITE, the usage of THP is still one page less than the whole heap.
-      if (usage.get() < 524288) throw new RuntimeException("The usage of THP is not enough.");
-    }
-  }
-
-  public static class CatSmaps {
-    public static void main(String[] args) throws Exception {
-      new BufferedReader(new FileReader("/proc/self/smaps"))
-          .lines()
-          .forEach(line -> System.out.println(line));
-    }
-  }
-}

From bdcc2400db63e604d76f9b5bd3c876271743f69f Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Mon, 29 Apr 2024 15:58:03 +0000
Subject: [PATCH 240/486] 8331087: Move immutable nmethod data from CodeCache

Reviewed-by: thartmann, dlong, dnsimon
---
 src/hotspot/share/code/nmethod.cpp            | 249 ++++++++++++------
 src/hotspot/share/code/nmethod.hpp            | 102 ++++---
 src/hotspot/share/runtime/vmStructs.cpp       |   9 +-
 .../classes/sun/jvm/hotspot/code/NMethod.java |  50 ++--
 .../compiler/c1/TestLinearScanOrderMain.java  |   3 +-
 5 files changed, 267 insertions(+), 146 deletions(-)

diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 7e4f6994ff1..26d393d06db 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -110,6 +110,11 @@
 
 #endif
 
+// Cast from int value to narrow type
+#define CHECKED_CAST(result, T, thing)      \
+  result = static_cast<T>(thing); \
+  assert(static_cast<int>(result) == thing, "failed: %d != %d", static_cast<int>(result), thing);
+
 //---------------------------------------------------------------------------------
 // NMethod statistics
 // They are printed under various flags, including:
@@ -121,26 +126,28 @@
 // and make it simpler to print from the debugger.
 struct java_nmethod_stats_struct {
   uint nmethod_count;
-  uint total_size;
+  uint total_nm_size;
+  uint total_immut_size;
   uint relocation_size;
   uint consts_size;
   uint insts_size;
   uint stub_size;
-  uint scopes_data_size;
-  uint scopes_pcs_size;
+  uint oops_size;
+  uint metadata_size;
   uint dependencies_size;
-  uint handler_table_size;
   uint nul_chk_table_size;
+  uint handler_table_size;
+  uint scopes_pcs_size;
+  uint scopes_data_size;
 #if INCLUDE_JVMCI
   uint speculations_size;
   uint jvmci_data_size;
 #endif
-  uint oops_size;
-  uint metadata_size;
 
   void note_nmethod(nmethod* nm) {
     nmethod_count += 1;
-    total_size          += nm->size();
+    total_nm_size       += nm->size();
+    total_immut_size    += nm->immutable_data_size();
     relocation_size     += nm->relocation_size();
     consts_size         += nm->consts_size();
     insts_size          += nm->insts_size();
@@ -160,23 +167,60 @@ struct java_nmethod_stats_struct {
   void print_nmethod_stats(const char* name) {
     if (nmethod_count == 0)  return;
     tty->print_cr("Statistics for %u bytecoded nmethods for %s:", nmethod_count, name);
-    if (total_size != 0)          tty->print_cr(" total in heap  = %u (100%%)", total_size);
+    uint total_size = total_nm_size + total_immut_size;
+    if (total_nm_size != 0) {
+      tty->print_cr(" total size      = %u (100%%)", total_size);
+      tty->print_cr(" in CodeCache    = %u (%f%%)", total_nm_size, (total_nm_size * 100.0f)/total_size);
+    }
     uint header_size = (uint)(nmethod_count * sizeof(nmethod));
-    if (nmethod_count != 0)       tty->print_cr(" header         = %u (%f%%)", header_size, (header_size * 100.0f)/total_size);
-    if (relocation_size != 0)     tty->print_cr(" relocation     = %u (%f%%)", relocation_size, (relocation_size * 100.0f)/total_size);
-    if (consts_size != 0)         tty->print_cr(" constants      = %u (%f%%)", consts_size, (consts_size * 100.0f)/total_size);
-    if (insts_size != 0)          tty->print_cr(" main code      = %u (%f%%)", insts_size, (insts_size * 100.0f)/total_size);
-    if (stub_size != 0)           tty->print_cr(" stub code      = %u (%f%%)", stub_size, (stub_size * 100.0f)/total_size);
-    if (oops_size != 0)           tty->print_cr(" oops           = %u (%f%%)", oops_size, (oops_size * 100.0f)/total_size);
-    if (metadata_size != 0)       tty->print_cr(" metadata       = %u (%f%%)", metadata_size, (metadata_size * 100.0f)/total_size);
-    if (scopes_data_size != 0)    tty->print_cr(" scopes data    = %u (%f%%)", scopes_data_size, (scopes_data_size * 100.0f)/total_size);
-    if (scopes_pcs_size != 0)     tty->print_cr(" scopes pcs     = %u (%f%%)", scopes_pcs_size, (scopes_pcs_size * 100.0f)/total_size);
-    if (dependencies_size != 0)   tty->print_cr(" dependencies   = %u (%f%%)", dependencies_size, (dependencies_size * 100.0f)/total_size);
-    if (handler_table_size != 0)  tty->print_cr(" handler table  = %u (%f%%)", handler_table_size, (handler_table_size * 100.0f)/total_size);
-    if (nul_chk_table_size != 0)  tty->print_cr(" nul chk table  = %u (%f%%)", nul_chk_table_size, (nul_chk_table_size * 100.0f)/total_size);
+    if (nmethod_count != 0) {
+      tty->print_cr("   header        = %u (%f%%)", header_size, (header_size * 100.0f)/total_nm_size);
+    }
+    if (relocation_size != 0) {
+      tty->print_cr("   relocation    = %u (%f%%)", relocation_size, (relocation_size * 100.0f)/total_nm_size);
+    }
+    if (consts_size != 0) {
+      tty->print_cr("   constants     = %u (%f%%)", consts_size, (consts_size * 100.0f)/total_nm_size);
+    }
+    if (insts_size != 0) {
+      tty->print_cr("   main code     = %u (%f%%)", insts_size, (insts_size * 100.0f)/total_nm_size);
+    }
+    if (stub_size != 0) {
+      tty->print_cr("   stub code     = %u (%f%%)", stub_size, (stub_size * 100.0f)/total_nm_size);
+    }
+    if (oops_size != 0) {
+      tty->print_cr("   oops          = %u (%f%%)", oops_size, (oops_size * 100.0f)/total_nm_size);
+    }
+    if (metadata_size != 0) {
+      tty->print_cr("   metadata      = %u (%f%%)", metadata_size, (metadata_size * 100.0f)/total_nm_size);
+    }
 #if INCLUDE_JVMCI
-    if (speculations_size != 0)   tty->print_cr(" speculations   = %u (%f%%)", speculations_size, (speculations_size * 100.0f)/total_size);
-    if (jvmci_data_size != 0)     tty->print_cr(" JVMCI data     = %u (%f%%)", jvmci_data_size, (jvmci_data_size * 100.0f)/total_size);
+    if (jvmci_data_size != 0) {
+      tty->print_cr("   JVMCI data    = %u (%f%%)", jvmci_data_size, (jvmci_data_size * 100.0f)/total_nm_size);
+    }
+#endif
+    if (total_immut_size != 0) {
+      tty->print_cr(" immutable data  = %u (%f%%)", total_immut_size, (total_immut_size * 100.0f)/total_size);
+    }
+    if (dependencies_size != 0) {
+      tty->print_cr("   dependencies  = %u (%f%%)", dependencies_size, (dependencies_size * 100.0f)/total_immut_size);
+    }
+    if (nul_chk_table_size != 0) {
+      tty->print_cr("   nul chk table = %u (%f%%)", nul_chk_table_size, (nul_chk_table_size * 100.0f)/total_immut_size);
+    }
+    if (handler_table_size != 0) {
+      tty->print_cr("   handler table = %u (%f%%)", handler_table_size, (handler_table_size * 100.0f)/total_immut_size);
+    }
+    if (scopes_pcs_size != 0) {
+      tty->print_cr("   scopes pcs    = %u (%f%%)", scopes_pcs_size, (scopes_pcs_size * 100.0f)/total_immut_size);
+    }
+    if (scopes_data_size != 0) {
+      tty->print_cr("   scopes data   = %u (%f%%)", scopes_data_size, (scopes_data_size * 100.0f)/total_immut_size);
+    }
+#if INCLUDE_JVMCI
+    if (speculations_size != 0) {
+      tty->print_cr("   speculations  = %u (%f%%)", speculations_size, (speculations_size * 100.0f)/total_immut_size);
+    }
 #endif
   }
 };
@@ -1101,31 +1145,40 @@ nmethod* nmethod::new_nmethod(const methodHandle& method,
   code_buffer->finalize_oop_references(method);
   // create nmethod
   nmethod* nm = nullptr;
+  int nmethod_size = CodeBlob::allocation_size(code_buffer, sizeof(nmethod));
 #if INCLUDE_JVMCI
-  int jvmci_data_size = compiler->is_jvmci() ? jvmci_data->size() : 0;
+    if (compiler->is_jvmci()) {
+      nmethod_size += align_up(jvmci_data->size(), oopSize);
+    }
 #endif
-  int nmethod_size =
-    CodeBlob::allocation_size(code_buffer, sizeof(nmethod))
-    + adjust_pcs_size(debug_info->pcs_size())
+
+  int immutable_data_size =
+      adjust_pcs_size(debug_info->pcs_size())
     + align_up((int)dependencies->size_in_bytes(), oopSize)
     + align_up(handler_table->size_in_bytes()    , oopSize)
     + align_up(nul_chk_table->size_in_bytes()    , oopSize)
 #if INCLUDE_JVMCI
     + align_up(speculations_len                  , oopSize)
-    + align_up(jvmci_data_size                   , oopSize)
 #endif
     + align_up(debug_info->data_size()           , oopSize);
+
+  // First, allocate space for immutable data in C heap.
+  address immutable_data = nullptr;
+  if (immutable_data_size > 0) {
+    immutable_data = (address)os::malloc(immutable_data_size, mtCode);
+    if (immutable_data == nullptr) {
+      vm_exit_out_of_memory(immutable_data_size, OOM_MALLOC_ERROR, "nmethod: no space for immutable data");
+      return nullptr;
+    }
+  }
   {
     MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 
     nm = new (nmethod_size, comp_level)
-    nmethod(method(), compiler->type(), nmethod_size, compile_id, entry_bci, offsets,
-            orig_pc_offset, debug_info, dependencies, code_buffer, frame_size,
-            oop_maps,
-            handler_table,
-            nul_chk_table,
-            compiler,
-            comp_level
+    nmethod(method(), compiler->type(), nmethod_size, immutable_data_size,
+            compile_id, entry_bci, immutable_data, offsets, orig_pc_offset,
+            debug_info, dependencies, code_buffer, frame_size, oop_maps,
+            handler_table, nul_chk_table, compiler, comp_level
 #if INCLUDE_JVMCI
             , speculations,
             speculations_len,
@@ -1196,11 +1249,11 @@ void nmethod::init_defaults(CodeBuffer *code_buffer, CodeOffsets* offsets) {
   int consts_offset = code_buffer->total_offset_of(code_buffer->consts());
   assert(consts_offset == 0, "const_offset: %d", consts_offset);
 
-  _entry_offset          = checked_cast<uint16_t>(offsets->value(CodeOffsets::Entry));
-  _verified_entry_offset = checked_cast<uint16_t>(offsets->value(CodeOffsets::Verified_Entry));
-  _stub_offset           = content_offset() + code_buffer->total_offset_of(code_buffer->stubs());
+  _stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs());
 
-  _skipped_instructions_size = checked_cast<uint16_t>(code_buffer->total_skipped_instructions_size());
+  CHECKED_CAST(_entry_offset,              uint16_t, (offsets->value(CodeOffsets::Entry)));
+  CHECKED_CAST(_verified_entry_offset,     uint16_t, (offsets->value(CodeOffsets::Verified_Entry)));
+  CHECKED_CAST(_skipped_instructions_size, uint16_t, (code_buffer->total_skipped_instructions_size()));
 }
 
 // Post initialization
@@ -1262,21 +1315,26 @@ nmethod::nmethod(
     _deopt_mh_handler_offset = 0;
     _unwind_handler_offset   = 0;
 
-    _metadata_offset         = checked_cast<uint16_t>(align_up(code_buffer->total_oop_size(), oopSize));
-    _dependencies_offset     = checked_cast<uint16_t>(_metadata_offset + align_up(code_buffer->total_metadata_size(), wordSize));
-    _scopes_pcs_offset       = _dependencies_offset;
-    _scopes_data_offset      = _scopes_pcs_offset;
-    _handler_table_offset    = _scopes_data_offset;
-    _nul_chk_table_offset    = _handler_table_offset;
+    CHECKED_CAST(_metadata_offset, uint16_t, (align_up(code_buffer->total_oop_size(), oopSize)));
+    int data_end_offset = _metadata_offset + align_up(code_buffer->total_metadata_size(), wordSize);
 #if INCLUDE_JVMCI
-    _speculations_offset     = _nul_chk_table_offset;
-    _jvmci_data_offset       = _speculations_offset;
-    DEBUG_ONLY( int data_end_offset = _jvmci_data_offset; )
-#else
-    DEBUG_ONLY( int data_end_offset = _nul_chk_table_offset; )
+    // jvmci_data_size is 0 in native wrapper but we need to set offset
+    // to correctly calculate metadata_end address
+    CHECKED_CAST(_jvmci_data_offset, uint16_t, data_end_offset);
 #endif
     assert((data_offset() + data_end_offset) <= nmethod_size, "wrong nmethod's size: %d < %d", nmethod_size, (data_offset() + data_end_offset));
 
+    // native wrapper does not have read-only data but we need unique not null address
+    _immutable_data          = data_end();
+    _immutable_data_size     = 0;
+    _nul_chk_table_offset    = 0;
+    _handler_table_offset    = 0;
+    _scopes_pcs_offset       = 0;
+    _scopes_data_offset      = 0;
+#if INCLUDE_JVMCI
+    _speculations_offset     = 0;
+#endif
+
     code_buffer->copy_code_and_locs_to(this);
     code_buffer->copy_values_to(this);
 
@@ -1343,8 +1401,10 @@ nmethod::nmethod(
   Method* method,
   CompilerType type,
   int nmethod_size,
+  int immutable_data_size,
   int compile_id,
   int entry_bci,
+  address immutable_data,
   CodeOffsets* offsets,
   int orig_pc_offset,
   DebugInformationRecorder* debug_info,
@@ -1421,25 +1481,48 @@ nmethod::nmethod(
       }
     }
     if (offsets->value(CodeOffsets::UnwindHandler) != -1) {
-      _unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler);
+      // C1 generates UnwindHandler at the end of instructions section.
+      // Calculate positive offset as distance between the start of stubs section
+      // (which is also the end of instructions section) and the start of the handler.
+      int unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler);
+      CHECKED_CAST(_unwind_handler_offset, int16_t, (_stub_offset - unwind_handler_offset));
     } else {
       _unwind_handler_offset = -1;
     }
-    _metadata_offset      = checked_cast<uint16_t>(align_up(code_buffer->total_oop_size(), oopSize));
-    _dependencies_offset  = checked_cast<uint16_t>(_metadata_offset     + align_up(code_buffer->total_metadata_size(), wordSize));
-    _scopes_pcs_offset    = checked_cast<uint16_t>(_dependencies_offset + align_up((int)dependencies->size_in_bytes(), oopSize));
-    _scopes_data_offset   = _scopes_pcs_offset    + adjust_pcs_size(debug_info->pcs_size());
-    _handler_table_offset = _scopes_data_offset   + align_up(debug_info->data_size       (), oopSize);
-    _nul_chk_table_offset = _handler_table_offset + align_up(handler_table->size_in_bytes(), oopSize);
+    CHECKED_CAST(_metadata_offset, uint16_t, (align_up(code_buffer->total_oop_size(), oopSize)));
+    int metadata_end_offset = _metadata_offset + align_up(code_buffer->total_metadata_size(), wordSize);
+
 #if INCLUDE_JVMCI
-    _speculations_offset  = _nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize);
-    _jvmci_data_offset    = _speculations_offset  + align_up(speculations_len, oopSize);
+    CHECKED_CAST(_jvmci_data_offset, uint16_t, metadata_end_offset);
     int jvmci_data_size   = compiler->is_jvmci() ? jvmci_data->size() : 0;
-    DEBUG_ONLY( int data_end_offset = _jvmci_data_offset    + align_up(jvmci_data_size, oopSize); )
+    DEBUG_ONLY( int data_end_offset = _jvmci_data_offset  + align_up(jvmci_data_size, oopSize); )
 #else
-    DEBUG_ONLY( int data_end_offset = _nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize); )
+    DEBUG_ONLY( int data_end_offset = metadata_end_offset; )
 #endif
-    assert((data_offset() + data_end_offset) <= nmethod_size, "wrong nmethod's size: %d < %d", nmethod_size, (data_offset() + data_end_offset));
+    assert((data_offset() + data_end_offset) <= nmethod_size, "wrong nmethod's size: %d > %d",
+           (data_offset() + data_end_offset), nmethod_size);
+
+    _immutable_data_size  = immutable_data_size;
+    if (immutable_data_size > 0) {
+      assert(immutable_data != nullptr, "required");
+      _immutable_data     = immutable_data;
+    } else {
+      // We need unique not null address
+      _immutable_data     = data_end();
+    }
+    CHECKED_CAST(_nul_chk_table_offset, uint16_t, (align_up((int)dependencies->size_in_bytes(), oopSize)));
+    CHECKED_CAST(_handler_table_offset, uint16_t, (_nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize)));
+    _scopes_pcs_offset    = _handler_table_offset + align_up(handler_table->size_in_bytes(), oopSize);
+    _scopes_data_offset   = _scopes_pcs_offset    + adjust_pcs_size(debug_info->pcs_size());
+
+#if INCLUDE_JVMCI
+    _speculations_offset  = _scopes_data_offset   + align_up(debug_info->data_size(), oopSize);
+    DEBUG_ONLY( int immutable_data_end_offset = _speculations_offset  + align_up(speculations_len, oopSize); )
+#else
+    DEBUG_ONLY( int immutable_data_end_offset = _scopes_data_offset + align_up(debug_info->data_size(), oopSize); )
+#endif
+    assert(immutable_data_end_offset <= immutable_data_size, "wrong read-only data size: %d > %d",
+           immutable_data_end_offset, immutable_data_size);
 
     // Copy code and relocation info
     code_buffer->copy_code_and_locs_to(this);
@@ -2047,6 +2130,10 @@ void nmethod::purge(bool unregister_nmethod) {
   }
   delete[] _compiled_ic_data;
 
+  if (_immutable_data != data_end()) {
+    os::free(_immutable_data);
+    _immutable_data = data_end(); // Valid not null address
+  }
   if (unregister_nmethod) {
     Universe::heap()->unregister_nmethod(this);
   }
@@ -2679,7 +2766,7 @@ PcDesc* PcDescContainer::find_pc_desc_internal(address pc, bool approximate, add
   // Find the last pc_offset less than the given offset.
   // The successor must be the required match, if there is a match at all.
   // (Use a fixed radix to avoid expensive affine pointer arithmetic.)
-  PcDesc* lower = lower_incl;     // this is initial sentiel
+  PcDesc* lower = lower_incl;     // this is initial sentinel
   PcDesc* upper = upper_incl - 1; // exclude final sentinel
   if (lower >= upper)  return nullptr;  // no PcDescs at all
 
@@ -3002,35 +3089,41 @@ void nmethod::print(outputStream* st) const {
                                              p2i(metadata_begin()),
                                              p2i(metadata_end()),
                                              metadata_size());
-  if (scopes_data_size  () > 0) st->print_cr(" scopes data    [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
-                                             p2i(scopes_data_begin()),
-                                             p2i(scopes_data_end()),
-                                             scopes_data_size());
-  if (scopes_pcs_size   () > 0) st->print_cr(" scopes pcs     [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
-                                             p2i(scopes_pcs_begin()),
-                                             p2i(scopes_pcs_end()),
-                                             scopes_pcs_size());
+#if INCLUDE_JVMCI
+  if (jvmci_data_size   () > 0) st->print_cr(" JVMCI data     [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
+                                             p2i(jvmci_data_begin()),
+                                             p2i(jvmci_data_end()),
+                                             jvmci_data_size());
+#endif
+  if (immutable_data_size() > 0) st->print_cr(" immutable data [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
+                                             p2i(immutable_data_begin()),
+                                             p2i(immutable_data_end()),
+                                             immutable_data_size());
   if (dependencies_size () > 0) st->print_cr(" dependencies   [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
                                              p2i(dependencies_begin()),
                                              p2i(dependencies_end()),
                                              dependencies_size());
-  if (handler_table_size() > 0) st->print_cr(" handler table  [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
-                                             p2i(handler_table_begin()),
-                                             p2i(handler_table_end()),
-                                             handler_table_size());
   if (nul_chk_table_size() > 0) st->print_cr(" nul chk table  [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
                                              p2i(nul_chk_table_begin()),
                                              p2i(nul_chk_table_end()),
                                              nul_chk_table_size());
+  if (handler_table_size() > 0) st->print_cr(" handler table  [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
+                                             p2i(handler_table_begin()),
+                                             p2i(handler_table_end()),
+                                             handler_table_size());
+  if (scopes_pcs_size   () > 0) st->print_cr(" scopes pcs     [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
+                                             p2i(scopes_pcs_begin()),
+                                             p2i(scopes_pcs_end()),
+                                             scopes_pcs_size());
+  if (scopes_data_size  () > 0) st->print_cr(" scopes data    [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
+                                             p2i(scopes_data_begin()),
+                                             p2i(scopes_data_end()),
+                                             scopes_data_size());
 #if INCLUDE_JVMCI
   if (speculations_size () > 0) st->print_cr(" speculations   [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
                                              p2i(speculations_begin()),
                                              p2i(speculations_end()),
                                              speculations_size());
-  if (jvmci_data_size   () > 0) st->print_cr(" JVMCI data     [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
-                                             p2i(jvmci_data_begin()),
-                                             p2i(jvmci_data_end()),
-                                             jvmci_data_size());
 #endif
 }
 
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 8ffb75eda34..22e38afeebd 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -195,6 +195,9 @@ class nmethod : public CodeBlob {
     };
   };
 
+  // nmethod's read-only data
+  address _immutable_data;
+
   PcDescContainer* _pc_desc_container;
   ExceptionCache* volatile _exception_cache;
 
@@ -211,6 +214,7 @@ class nmethod : public CodeBlob {
   uint16_t _entry_offset;          // entry point with class check
   uint16_t _verified_entry_offset; // entry point without class check
   int      _entry_bci;             // != InvocationEntryBci if this nmethod is an on-stack replacement method
+  int      _immutable_data_size;
 
   // _consts_offset == _content_offset because SECT_CONSTS is first in code buffer
 
@@ -224,21 +228,27 @@ class nmethod : public CodeBlob {
   // All deoptee's at a MethodHandle call site will resume execution
   // at this location described by this offset.
   int _deopt_mh_handler_offset;
-  // Offset of the unwind handler if it exists
-  int _unwind_handler_offset;
-
+  // Offset (from insts_end) of the unwind handler if it exists
+  int16_t  _unwind_handler_offset;
+  // Number of arguments passed on the stack
+  uint16_t _num_stack_arg_slots;
   uint16_t _skipped_instructions_size;
 
+  // Offsets in mutable data section
   // _oops_offset == _data_offset,  offset where embedded oop table begins (inside data)
   uint16_t _metadata_offset; // embedded meta data table
-  uint16_t _dependencies_offset;
-  uint16_t _scopes_pcs_offset;
+#if INCLUDE_JVMCI
+  uint16_t _jvmci_data_offset;
+#endif
+
+  // Offset in immutable data section
+  // _dependencies_offset == 0
+  uint16_t _nul_chk_table_offset;
+  uint16_t _handler_table_offset; // This table could be big in C1 code
+  int      _scopes_pcs_offset;
   int      _scopes_data_offset;
-  int      _handler_table_offset;
-  int      _nul_chk_table_offset;
 #if INCLUDE_JVMCI
   int      _speculations_offset;
-  int      _jvmci_data_offset;
 #endif
 
   // location in frame (offset for sp) that deopt can store the original
@@ -249,8 +259,6 @@ class nmethod : public CodeBlob {
   CompLevel    _comp_level;            // compilation level (s1)
   CompilerType _compiler_type;         // which compiler made this nmethod (u1)
 
-  uint16_t     _num_stack_arg_slots;   // Number of arguments passed on the stack
-
 #if INCLUDE_RTM_OPT
   // RTM state at compile time. Used during deoptimization to decide
   // whether to restart collecting RTM locking abort statistic again.
@@ -307,8 +315,10 @@ class nmethod : public CodeBlob {
   nmethod(Method* method,
           CompilerType type,
           int nmethod_size,
+          int immutable_data_size,
           int compile_id,
           int entry_bci,
+          address immutable_data,
           CodeOffsets* offsets,
           int orig_pc_offset,
           DebugInformationRecorder *recorder,
@@ -524,48 +534,56 @@ public:
   address exception_begin       () const { return           header_begin() + _exception_offset        ; }
   address deopt_handler_begin   () const { return           header_begin() + _deopt_handler_offset    ; }
   address deopt_mh_handler_begin() const { return           header_begin() + _deopt_mh_handler_offset ; }
-  address unwind_handler_begin  () const { return _unwind_handler_offset != -1 ? (header_begin() + _unwind_handler_offset) : nullptr; }
-
-  oop*    oops_begin            () const { return (oop*)    data_begin(); }
-  oop*    oops_end              () const { return (oop*)   (data_begin() + _metadata_offset)          ; }
+  address unwind_handler_begin  () const { return _unwind_handler_offset != -1 ? (insts_end() - _unwind_handler_offset) : nullptr; }
 
+  // mutable data
+  oop*    oops_begin            () const { return (oop*)        data_begin(); }
+  oop*    oops_end              () const { return (oop*)       (data_begin() + _metadata_offset)      ; }
   Metadata** metadata_begin     () const { return (Metadata**) (data_begin() + _metadata_offset)      ; }
-  Metadata** metadata_end       () const { return (Metadata**) (data_begin() + _dependencies_offset)  ; }
+#if INCLUDE_JVMCI
+  Metadata** metadata_end       () const { return (Metadata**) (data_begin() + _jvmci_data_offset)    ; }
+  address jvmci_data_begin      () const { return               data_begin() + _jvmci_data_offset     ; }
+  address jvmci_data_end        () const { return               data_end(); }
+#else
+  Metadata** metadata_end       () const { return (Metadata**)  data_end(); }
+#endif
 
-  address dependencies_begin    () const { return           data_begin() + _dependencies_offset       ; }
-  address dependencies_end      () const { return           data_begin() + _scopes_pcs_offset         ; }
-  PcDesc* scopes_pcs_begin      () const { return (PcDesc*)(data_begin() + _scopes_pcs_offset)        ; }
-  PcDesc* scopes_pcs_end        () const { return (PcDesc*)(data_begin() + _scopes_data_offset)       ; }
-  address scopes_data_begin     () const { return           data_begin() + _scopes_data_offset        ; }
-  address scopes_data_end       () const { return           data_begin() + _handler_table_offset      ; }
-  address handler_table_begin   () const { return           data_begin() + _handler_table_offset      ; }
-  address handler_table_end     () const { return           data_begin() + _nul_chk_table_offset      ; }
-  address nul_chk_table_begin   () const { return           data_begin() + _nul_chk_table_offset      ; }
+  // immutable data
+  address immutable_data_begin  () const { return           _immutable_data; }
+  address immutable_data_end    () const { return           _immutable_data + _immutable_data_size ; }
+  address dependencies_begin    () const { return           _immutable_data; }
+  address dependencies_end      () const { return           _immutable_data + _nul_chk_table_offset; }
+  address nul_chk_table_begin   () const { return           _immutable_data + _nul_chk_table_offset; }
+  address nul_chk_table_end     () const { return           _immutable_data + _handler_table_offset; }
+  address handler_table_begin   () const { return           _immutable_data + _handler_table_offset; }
+  address handler_table_end     () const { return           _immutable_data + _scopes_pcs_offset   ; }
+  PcDesc* scopes_pcs_begin      () const { return (PcDesc*)(_immutable_data + _scopes_pcs_offset)  ; }
+  PcDesc* scopes_pcs_end        () const { return (PcDesc*)(_immutable_data + _scopes_data_offset) ; }
+  address scopes_data_begin     () const { return           _immutable_data + _scopes_data_offset  ; }
 
 #if INCLUDE_JVMCI
-  address nul_chk_table_end     () const { return           data_begin() + _speculations_offset       ; }
-  address speculations_begin    () const { return           data_begin() + _speculations_offset       ; }
-  address speculations_end      () const { return           data_begin() + _jvmci_data_offset         ; }
-  address jvmci_data_begin      () const { return           data_begin() + _jvmci_data_offset         ; }
-  address jvmci_data_end        () const { return           data_end(); }
+  address scopes_data_end       () const { return           _immutable_data + _speculations_offset ; }
+  address speculations_begin    () const { return           _immutable_data + _speculations_offset ; }
+  address speculations_end      () const { return            immutable_data_end(); }
 #else
-  address nul_chk_table_end     () const { return           data_end(); }
+  address scopes_data_end       () const { return            immutable_data_end(); }
 #endif
 
   // Sizes
-  int consts_size       () const { return int(          consts_end       () -           consts_begin       ()); }
-  int insts_size        () const { return int(          insts_end        () -           insts_begin        ()); }
-  int stub_size         () const { return int(          stub_end         () -           stub_begin         ()); }
-  int oops_size         () const { return int((address) oops_end         () - (address) oops_begin         ()); }
-  int metadata_size     () const { return int((address) metadata_end     () - (address) metadata_begin     ()); }
-  int scopes_data_size  () const { return int(          scopes_data_end  () -           scopes_data_begin  ()); }
-  int scopes_pcs_size   () const { return int((intptr_t)scopes_pcs_end   () - (intptr_t)scopes_pcs_begin   ()); }
-  int dependencies_size () const { return int(          dependencies_end () -           dependencies_begin ()); }
-  int handler_table_size() const { return int(          handler_table_end() -           handler_table_begin()); }
-  int nul_chk_table_size() const { return int(          nul_chk_table_end() -           nul_chk_table_begin()); }
+  int immutable_data_size() const { return _immutable_data_size; }
+  int consts_size        () const { return int(          consts_end       () -           consts_begin       ()); }
+  int insts_size         () const { return int(          insts_end        () -           insts_begin        ()); }
+  int stub_size          () const { return int(          stub_end         () -           stub_begin         ()); }
+  int oops_size          () const { return int((address) oops_end         () - (address) oops_begin         ()); }
+  int metadata_size      () const { return int((address) metadata_end     () - (address) metadata_begin     ()); }
+  int scopes_data_size   () const { return int(          scopes_data_end  () -           scopes_data_begin  ()); }
+  int scopes_pcs_size    () const { return int((intptr_t)scopes_pcs_end   () - (intptr_t)scopes_pcs_begin   ()); }
+  int dependencies_size  () const { return int(          dependencies_end () -           dependencies_begin ()); }
+  int handler_table_size () const { return int(          handler_table_end() -           handler_table_begin()); }
+  int nul_chk_table_size () const { return int(          nul_chk_table_end() -           nul_chk_table_begin()); }
 #if INCLUDE_JVMCI
-  int speculations_size () const { return int(          speculations_end () -           speculations_begin ()); }
-  int jvmci_data_size   () const { return int(          jvmci_data_end   () -           jvmci_data_begin   ()); }
+  int speculations_size  () const { return int(          speculations_end () -           speculations_begin ()); }
+  int jvmci_data_size    () const { return int(          jvmci_data_end   () -           jvmci_data_begin   ()); }
 #endif
 
   int     oops_count() const { assert(oops_size() % oopSize == 0, "");  return (oops_size() / oopSize) + 1; }
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 8d86fb6ceb4..cc1351e2742 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -576,14 +576,15 @@
   nonstatic_field(nmethod,                     _orig_pc_offset,                               int)                                   \
   nonstatic_field(nmethod,                     _stub_offset,                                  int)                                   \
   nonstatic_field(nmethod,                     _metadata_offset,                              u2)                                    \
-  nonstatic_field(nmethod,                     _scopes_pcs_offset,                            u2)                                    \
+  nonstatic_field(nmethod,                     _scopes_pcs_offset,                            int)                                    \
   nonstatic_field(nmethod,                     _scopes_data_offset,                           int)                                   \
-  nonstatic_field(nmethod,                     _dependencies_offset,                          u2)                                    \
-  nonstatic_field(nmethod,                     _handler_table_offset,                         int)                                   \
-  nonstatic_field(nmethod,                     _nul_chk_table_offset,                         int)                                   \
+  nonstatic_field(nmethod,                     _handler_table_offset,                         u2)                                    \
+  nonstatic_field(nmethod,                     _nul_chk_table_offset,                         u2)                                    \
   nonstatic_field(nmethod,                     _entry_offset,                                 u2)                                    \
   nonstatic_field(nmethod,                     _verified_entry_offset,                        u2)                                    \
   nonstatic_field(nmethod,                     _osr_entry_point,                              address)                               \
+  nonstatic_field(nmethod,                     _immutable_data,                               address)                               \
+  nonstatic_field(nmethod,                     _immutable_data_size,                          int)                                   \
   nonstatic_field(nmethod,                     _compile_id,                                   int)                                   \
   nonstatic_field(nmethod,                     _comp_level,                                   CompLevel)                             \
   volatile_nonstatic_field(nmethod,            _exception_cache,                              ExceptionCache*)                       \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
index edcf85ce0c7..ec329aa131a 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -42,6 +42,8 @@ public class NMethod extends CodeBlob {
   private static CIntegerField entryBCIField;
   /** To support simple linked-list chaining of nmethods */
   private static AddressField  osrLinkField;
+  private static AddressField  immutableDataField;
+  private static CIntegerField immutableDataSizeField;
 
   /** Offsets for different nmethod parts */
   private static CIntegerField exceptionOffsetField;
@@ -50,11 +52,10 @@ public class NMethod extends CodeBlob {
   private static CIntegerField origPCOffsetField;
   private static CIntegerField stubOffsetField;
   private static CIntField     metadataOffsetField;
-  private static CIntField     dependenciesOffsetField;
-  private static CIntField     scopesPCsOffsetField;
+  private static CIntField     handlerTableOffsetField;
+  private static CIntField     nulChkTableOffsetField;
+  private static CIntegerField scopesPCsOffsetField;
   private static CIntegerField scopesDataOffsetField;
-  private static CIntegerField handlerTableOffsetField;
-  private static CIntegerField nulChkTableOffsetField;
 
   /** Offsets for entry points */
   /** Entry point with class check */
@@ -82,6 +83,8 @@ public class NMethod extends CodeBlob {
     methodField                 = type.getAddressField("_method");
     entryBCIField               = type.getCIntegerField("_entry_bci");
     osrLinkField                = type.getAddressField("_osr_link");
+    immutableDataField          = type.getAddressField("_immutable_data");
+    immutableDataSizeField      = type.getCIntegerField("_immutable_data_size");
 
     exceptionOffsetField        = type.getCIntegerField("_exception_offset");
     deoptHandlerOffsetField     = type.getCIntegerField("_deopt_handler_offset");
@@ -89,11 +92,10 @@ public class NMethod extends CodeBlob {
     origPCOffsetField           = type.getCIntegerField("_orig_pc_offset");
     stubOffsetField             = type.getCIntegerField("_stub_offset");
     metadataOffsetField         = new CIntField(type.getCIntegerField("_metadata_offset"), 0);
-    dependenciesOffsetField     = new CIntField(type.getCIntegerField("_dependencies_offset"), 0);
-    scopesPCsOffsetField        = new CIntField(type.getCIntegerField("_scopes_pcs_offset"), 0);
+    scopesPCsOffsetField        = type.getCIntegerField("_scopes_pcs_offset");
     scopesDataOffsetField       = type.getCIntegerField("_scopes_data_offset");
-    handlerTableOffsetField     = type.getCIntegerField("_handler_table_offset");
-    nulChkTableOffsetField      = type.getCIntegerField("_nul_chk_table_offset");
+    handlerTableOffsetField     = new CIntField(type.getCIntegerField("_handler_table_offset"), 0);
+    nulChkTableOffsetField      = new CIntField(type.getCIntegerField("_nul_chk_table_offset"), 0);
     entryOffsetField            = new CIntField(type.getCIntegerField("_entry_offset"), 0);
     verifiedEntryOffsetField    = new CIntField(type.getCIntegerField("_verified_entry_offset"), 0);
     osrEntryPointField          = type.getAddressField("_osr_entry_point");
@@ -133,18 +135,22 @@ public class NMethod extends CodeBlob {
   public Address oopsBegin()            { return dataBegin();                                        }
   public Address oopsEnd()              { return dataBegin().addOffsetTo(getMetadataOffset());       }
   public Address metadataBegin()        { return dataBegin().addOffsetTo(getMetadataOffset());       }
-  public Address metadataEnd()          { return dataBegin().addOffsetTo(getDependenciesOffset());   }
-  public Address dependenciesBegin()    { return dataBegin().addOffsetTo(getDependenciesOffset());   }
-  public Address dependenciesEnd()      { return dataBegin().addOffsetTo(getScopesDataOffset());     }
-  public Address scopesDataBegin()      { return dataBegin().addOffsetTo(getScopesDataOffset());     }
-  public Address scopesDataEnd()        { return dataBegin().addOffsetTo(getScopesPCsOffset());      }
-  public Address scopesPCsBegin()       { return dataBegin().addOffsetTo(getScopesPCsOffset());      }
-  public Address scopesPCsEnd()         { return dataBegin().addOffsetTo(getHandlerTableOffset());   }
-  public Address handlerTableBegin()    { return dataBegin().addOffsetTo(getHandlerTableOffset());   }
-  public Address handlerTableEnd()      { return dataBegin().addOffsetTo(getNulChkTableOffset());    }
-  public Address nulChkTableBegin()     { return dataBegin().addOffsetTo(getNulChkTableOffset());    }
-  public Address nulChkTableEnd()       { return dataEnd();                                          }
+  public Address metadataEnd()          { return dataEnd();                                          }
 
+  public Address immutableDataBegin()   { return immutableDataField.getValue(addr);                         }
+  public Address immutableDataEnd()     { return immutableDataBegin().addOffsetTo(getImmutableDataSize());  }
+  public Address dependenciesBegin()    { return immutableDataBegin();                                      }
+  public Address dependenciesEnd()      { return immutableDataBegin().addOffsetTo(getHandlerTableOffset()); }
+  public Address handlerTableBegin()    { return immutableDataBegin().addOffsetTo(getHandlerTableOffset()); }
+  public Address handlerTableEnd()      { return immutableDataBegin().addOffsetTo(getNulChkTableOffset());  }
+  public Address nulChkTableBegin()     { return immutableDataBegin().addOffsetTo(getNulChkTableOffset());  }
+  public Address nulChkTableEnd()       { return immutableDataBegin().addOffsetTo(getScopesDataOffset());   }
+  public Address scopesDataBegin()      { return immutableDataBegin().addOffsetTo(getScopesDataOffset());   }
+  public Address scopesDataEnd()        { return immutableDataBegin().addOffsetTo(getScopesPCsOffset());    }
+  public Address scopesPCsBegin()       { return immutableDataBegin().addOffsetTo(getScopesPCsOffset());    }
+  public Address scopesPCsEnd()         { return immutableDataEnd();                                        }
+
+  public int getImmutableDataSize()     { return (int) immutableDataSizeField.getValue(addr);        }
   public int constantsSize()            { return (int) constantsEnd()   .minus(constantsBegin());    }
   public int instsSize()                { return (int) instsEnd()       .minus(instsBegin());        }
   public int stubSize()                 { return (int) stubEnd()        .minus(stubBegin());         }
@@ -161,7 +167,10 @@ public class NMethod extends CodeBlob {
     return
       constantsSize()    +
       instsSize()        +
-      stubSize()         +
+      stubSize();
+  }
+  public int immutableDataSize() {
+    return
       scopesDataSize()   +
       scopesPCsSize()    +
       dependenciesSize() +
@@ -516,7 +525,6 @@ public class NMethod extends CodeBlob {
   private int getMetadataOffset()     { return (int) metadataOffsetField    .getValue(addr); }
   private int getScopesDataOffset()   { return (int) scopesDataOffsetField  .getValue(addr); }
   private int getScopesPCsOffset()    { return (int) scopesPCsOffsetField   .getValue(addr); }
-  private int getDependenciesOffset() { return (int) dependenciesOffsetField.getValue(addr); }
   private int getHandlerTableOffset() { return (int) handlerTableOffsetField.getValue(addr); }
   private int getNulChkTableOffset()  { return (int) nulChkTableOffsetField .getValue(addr); }
   private int getCompLevel()          { return (int) compLevelField         .getValue(addr); }
diff --git a/test/hotspot/jtreg/compiler/c1/TestLinearScanOrderMain.java b/test/hotspot/jtreg/compiler/c1/TestLinearScanOrderMain.java
index 4165fa4d0e1..a154427530a 100644
--- a/test/hotspot/jtreg/compiler/c1/TestLinearScanOrderMain.java
+++ b/test/hotspot/jtreg/compiler/c1/TestLinearScanOrderMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8207355
  * @compile TestLinearScanOrder.jasm
  * @run main/othervm -Xcomp -XX:+TieredCompilation -XX:TieredStopAtLevel=1
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:NMethodSizeLimit=655360
  *                   -XX:CompileCommand=compileonly,compiler.c1.TestLinearScanOrder::test
  *                   compiler.c1.TestLinearScanOrderMain
  */

From 4e4229438ad2e8ac59ac675465e4d3d4e13bf156 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Mon, 29 Apr 2024 16:27:54 +0000
Subject: [PATCH 241/486] 8329004: Update Libpng to 1.6.43

Reviewed-by: prr, dnguyen
---
 src/java.desktop/share/legal/libpng.md        |  43 +--
 .../native/libsplashscreen/libpng/CHANGES     |  67 +++++
 .../native/libsplashscreen/libpng/LICENSE     |   4 +-
 .../native/libsplashscreen/libpng/README      |  12 +-
 .../libsplashscreen/libpng/UPDATING.txt       |  21 +-
 .../share/native/libsplashscreen/libpng/png.c | 110 +++-----
 .../share/native/libsplashscreen/libpng/png.h |  63 ++---
 .../native/libsplashscreen/libpng/pngconf.h   |   4 +-
 .../native/libsplashscreen/libpng/pngerror.c  |  34 +--
 .../native/libsplashscreen/libpng/pngget.c    | 245 +++++++++---------
 .../libsplashscreen/libpng/pnglibconf.h       |   2 +-
 .../native/libsplashscreen/libpng/pngpread.c  |  16 +-
 .../native/libsplashscreen/libpng/pngpriv.h   | 118 +++++++--
 .../native/libsplashscreen/libpng/pngread.c   |  12 +-
 .../native/libsplashscreen/libpng/pngrtran.c  |  34 ++-
 .../native/libsplashscreen/libpng/pngrutil.c  |  19 +-
 .../native/libsplashscreen/libpng/pngset.c    |  22 +-
 .../native/libsplashscreen/libpng/pngtrans.c  |  14 +-
 18 files changed, 489 insertions(+), 351 deletions(-)

diff --git a/src/java.desktop/share/legal/libpng.md b/src/java.desktop/share/legal/libpng.md
index f420ccd94ed..cbffed81332 100644
--- a/src/java.desktop/share/legal/libpng.md
+++ b/src/java.desktop/share/legal/libpng.md
@@ -1,4 +1,4 @@
-## libpng v1.6.40
+## libpng v1.6.43
 
 ### libpng License
 <pre>
@@ -9,11 +9,11 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
-Copyright (c) 1995-2023 The PNG Reference Library Authors.
-Copyright (c) 2018-2023 Cosmin Truta
-Copyright (c) 1998-2018 Glenn Randers-Pehrson
-Copyright (c) 1996-1997 Andreas Dilger
-Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+Copyright (C) 1995-2024 The PNG Reference Library Authors.
+Copyright (C) 2018-2024 Cosmin Truta
+Copyright (C) 1998-2018 Glenn Randers-Pehrson
+Copyright (C) 1996-1997 Andreas Dilger
+Copyright (C) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
 
 The software is supplied "as is", without warranty of any kind,
 express or implied, including, without limitation, the warranties
@@ -157,7 +157,9 @@ PNG REFERENCE LIBRARY AUTHORS
 This is the list of PNG Reference Library ("libpng") Contributing
 Authors, for copyright and licensing purposes.
 
+ * Adam Richter
  * Andreas Dilger
+ * Chris Blume
  * Cosmin Truta
  * Dave Martindale
  * Eric S. Raymond
@@ -186,21 +188,28 @@ Authors, for copyright and licensing purposes.
  * Vadim Barkov
  * Willem van Schaik
  * Zhijie Liang
+ * Apple Inc.
+    - Zixu Wang (王子旭)
  * Arm Holdings
-   - Richard Townsend
+    - Richard Townsend
  * Google Inc.
-   - Dan Field
-   - Leon Scroggins III
-   - Matt Sarett
-   - Mike Klein
-   - Sami Boukortt
-   - Wan-Teh Chang
+    - Dan Field
+    - Leon Scroggins III
+    - Matt Sarett
+    - Mike Klein
+    - Sami Boukortt
+    - Wan-Teh Chang
+ * Loongson Technology Corporation Ltd.
+    - GuXiWei (顾希伟)
+    - JinBo (金波)
+    - ZhangLixia (张利霞)
 
 The build projects, the build scripts, the test scripts, and other
-files in the "ci", "projects", "scripts" and "tests" directories, have
+files in the "projects", "scripts" and "tests" directories, have
 other copyright owners, but are released under the libpng license.
 
-Some files in the "contrib" directory, and some tools-generated files
-that are distributed with libpng, have other copyright owners, and are
-released under other open source licenses.
+Some files in the "ci" and "contrib" directories, as well as some
+of the tools-generated files that are distributed with libpng, have
+other copyright owners, and are released under other open source
+licenses.
 ```
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
index 2d8c585c0e7..441b57ecf1a 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
@@ -6129,6 +6129,73 @@ Version 1.6.40 [June 21, 2023]
   Updated the configurations and the scripts for continuous integration.
   Cleaned up the code, the build scripts, and the documentation.
 
+Version 1.6.41 [January 24, 2024]
+  Added SIMD-optimized code for the LoongArch LSX hardware.
+    (Contributed by GuXiWei, JinBo and ZhangLixia)
+  Fixed the run-time discovery of MIPS MSA hardware.
+    (Contributed by Sui Jingfeng)
+  Fixed an off-by-one error in the function png_do_check_palette_indexes(),
+    which failed to recognize errors that might have existed in the first
+    column of a broken palette-encoded image. This was a benign regression
+    accidentally introduced in libpng-1.6.33. No pixel was harmed.
+    (Contributed by Adam Richter; reviewed by John Bowler)
+  Fixed, improved and modernized the contrib/pngminus programs, i.e.,
+    png2pnm.c and pnm2png.c
+  Removed old and peculiar portability hacks that were meant to silence
+    warnings issued by gcc version 7.1 alone.
+    (Contributed by John Bowler)
+  Fixed and modernized the CMake file, and raised the minimum required
+    CMake version from 3.1 to 3.6.
+    (Contributed by Clinton Ingram, Timothy Lyanguzov, Tyler Kropp, et al.)
+  Allowed the configure script to disable the building of auxiliary tools
+    and tests, thus catching up with the CMake file.
+    (Contributed by Carlo Bramini)
+  Fixed a build issue on Mac.
+    (Contributed by Zixu Wang)
+  Moved the Autoconf macro files to scripts/autoconf.
+  Moved the CMake files (except for the main CMakeLists.txt) to
+    scripts/cmake and moved the list of their contributing authors to
+    scripts/cmake/AUTHORS.md
+  Updated the CI configurations and scripts.
+  Relicensed the CI scripts to the MIT License.
+  Improved the test coverage.
+    (Contributed by John Bowler)
+
+Version 1.6.42 [January 29, 2024]
+  Fixed the implementation of the macro function png_check_sig().
+    This was an API regression, introduced in libpng-1.6.41.
+    (Reported by Matthieu Darbois)
+  Fixed and updated the libpng manual.
+
+Version 1.6.43 [February 23, 2024]
+  Fixed the row width check in png_check_IHDR().
+    This corrected a bug that was specific to the 16-bit platforms,
+    and removed a spurious compiler warning from the 64-bit builds.
+    (Reported by Jacek Caban; fixed by John Bowler)
+  Added eXIf chunk support to the push-mode reader in pngpread.c.
+    (Contributed by Chris Blume)
+  Added contrib/pngexif for the benefit of the users who would like
+    to inspect the content of eXIf chunks.
+  Added contrib/conftest/basic.dfa, a basic build-time configuration.
+    (Contributed by John Bowler)
+  Fixed a preprocessor condition in pngread.c that broke build-time
+    configurations like contrib/conftest/pngcp.dfa.
+    (Contributed by John Bowler)
+  Added CMake build support for LoongArch LSX.
+    (Contributed by GuXiWei)
+  Fixed a CMake build error that occurred under a peculiar state of the
+    dependency tree. This was a regression introduced in libpng-1.6.41.
+    (Contributed by Dan Rosser)
+  Marked the installed libpng headers as system headers in CMake.
+    (Contributed by Benjamin Buch)
+  Updated the build support for RISCOS.
+    (Contributed by Cameron Cawley)
+  Updated the makefiles to allow cross-platform builds to initialize
+    conventional make variables like AR and ARFLAGS.
+  Added various improvements to the CI scripts in areas like version
+    consistency verification and text linting.
+  Added version consistency verification to pngtest.c also.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
 Subscription is required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE b/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
index 086d1c2fda6..25f298f0fcf 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
@@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2023 The PNG Reference Library Authors.
- * Copyright (c) 2018-2023 Cosmin Truta.
+ * Copyright (c) 1995-2024 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2024 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/README b/src/java.desktop/share/native/libsplashscreen/libpng/README
index dedd2c1639e..a6ca3ae9f94 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/README
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.40
+README for libpng version 1.6.43
 ================================
 
 See the note about version numbers near the top of `png.h`.
@@ -142,10 +142,11 @@ Files included in this distribution
     pngwrite.c    =>  High-level write functions
     pngwtran.c    =>  Write data transformations
     pngwutil.c    =>  Write utility functions
-    arm/          =>  Optimized code for the ARM platform
-    intel/        =>  Optimized code for the INTEL-SSE2 platform
-    mips/         =>  Optimized code for the MIPS platform
-    powerpc/      =>  Optimized code for the PowerPC platform
+    arm/          =>  Optimized code for ARM Neon
+    intel/        =>  Optimized code for INTEL SSE2
+    loongarch/    =>  Optimized code for LoongArch LSX
+    mips/         =>  Optimized code for MIPS MSA and MIPS MMI
+    powerpc/      =>  Optimized code for PowerPC VSX
     ci/           =>  Scripts for continuous integration
     contrib/      =>  External contributions
         arm-neon/     =>  Optimized code for the ARM-NEON platform
@@ -158,6 +159,7 @@ Files included in this distribution
         libtests/     =>  Test programs
         oss-fuzz/     =>  Files used by the OSS-Fuzz project for fuzz-testing
                           libpng
+        pngexif/      =>  Program to inspect the EXIF information in PNG files
         pngminim/     =>  Minimal decoder, encoder, and progressive decoder
                           programs demonstrating the use of pngusr.dfa
         pngminus/     =>  Simple pnm2png and png2pnm programs
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/UPDATING.txt b/src/java.desktop/share/native/libsplashscreen/libpng/UPDATING.txt
index 93c8f5bb703..88200db5d73 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/UPDATING.txt
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/UPDATING.txt
@@ -37,18 +37,21 @@ and instead just tweak the existing one.
 
 First cd into the libpng folder and run the following script.
 
+    shopt -s nullglob
     for f in *.c *.h;
-    do
-      # replace tabs with spaces
-      expand ${f} > ${f}.tmp;
-      mv ${f}.tmp $f;
+         do
+            # replace tabs with spaces
+            expand ${f} > ${f}.tmp
+            mv ${f}.tmp $f
 
-      # fix line endings to LF
-      sed -i -e 's/\r$//g' ${f};
+            # fix line endings to LF
+            sed -e 's/\r$//g' ${f} > ${f}.tmp
+            mv ${f}.tmp $f
 
-      # remove trailing spaces
-      sed -i -e 's/[ ]* $//g' ${f};
-    done
+            # remove trailing spaces
+            sed -e 's/[ ]* $//g' ${f} > ${f}.tmp
+            mv ${f}.tmp $f
+         done
 
 6) As with all native code, run it through the official build systems, in case
 the updated code trigger any fatal warnings with the official compilers.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.c b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
index 91a92e5f718..232dff876c7 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2023 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -42,27 +42,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_40 Your_png_h_is_not_version_1_6_40;
-
-#ifdef __GNUC__
-/* The version tests may need to be added to, but the problem warning has
- * consistently been fixed in GCC versions which obtain wide-spread release.
- * The problem is that many versions of GCC rearrange comparison expressions in
- * the optimizer in such a way that the results of the comparison will change
- * if signed integer overflow occurs.  Such comparisons are not permitted in
- * ANSI C90, however GCC isn't clever enough to work out that that do not occur
- * below in png_ascii_from_fp and png_muldiv, so it produces a warning with
- * -Wextra.  Unfortunately this is highly dependent on the optimizer and the
- * machine architecture so the warning comes and goes unpredictably and is
- * impossible to "fix", even were that a good idea.
- */
-#if __GNUC__ == 7 && __GNUC_MINOR__ == 1
-#define GCC_STRICT_OVERFLOW 1
-#endif /* GNU 7.1.x */
-#endif /* GNU */
-#ifndef GCC_STRICT_OVERFLOW
-#define GCC_STRICT_OVERFLOW 0
-#endif
+typedef png_libpng_version_1_6_43 Your_png_h_is_not_version_1_6_43;
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -101,21 +81,21 @@ png_set_sig_bytes(png_structrp png_ptr, int num_bytes)
 int PNGAPI
 png_sig_cmp(png_const_bytep sig, size_t start, size_t num_to_check)
 {
-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+   static const png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
 
    if (num_to_check > 8)
       num_to_check = 8;
 
    else if (num_to_check < 1)
-      return (-1);
+      return -1;
 
    if (start > 7)
-      return (-1);
+      return -1;
 
    if (start + num_to_check > 8)
       num_to_check = 8 - start;
 
-   return ((int)(memcmp(&sig[start], &png_signature[start], num_to_check)));
+   return memcmp(&sig[start], &png_signature[start], num_to_check);
 }
 
 #endif /* READ */
@@ -475,7 +455,6 @@ png_info_init_3,(png_infopp ptr_ptr, size_t png_info_struct_size),
    memset(info_ptr, 0, (sizeof *info_ptr));
 }
 
-/* The following API is not called internally */
 void PNGAPI
 png_data_freer(png_const_structrp png_ptr, png_inforp info_ptr,
     int freer, png_uint_32 mask)
@@ -714,9 +693,9 @@ png_voidp PNGAPI
 png_get_io_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
-      return (NULL);
+      return NULL;
 
-   return (png_ptr->io_ptr);
+   return png_ptr->io_ptr;
 }
 
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
@@ -780,7 +759,7 @@ png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime)
 
    {
       size_t pos = 0;
-      char number_buf[5]; /* enough for a four-digit year */
+      char number_buf[5] = {0, 0, 0, 0, 0}; /* enough for a four-digit year */
 
 #     define APPEND_STRING(string) pos = png_safecat(out, 29, pos, (string))
 #     define APPEND_NUMBER(format, value)\
@@ -843,8 +822,8 @@ png_get_copyright(png_const_structrp png_ptr)
    return PNG_STRING_COPYRIGHT
 #else
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.40" PNG_STRING_NEWLINE \
-      "Copyright (c) 2018-2023 Cosmin Truta" PNG_STRING_NEWLINE \
+      "libpng version 1.6.43" PNG_STRING_NEWLINE \
+      "Copyright (c) 2018-2024 Cosmin Truta" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
       "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
@@ -1005,7 +984,7 @@ png_reset_zstream(png_structrp png_ptr)
       return Z_STREAM_ERROR;
 
    /* WARNING: this resets the window bits to the maximum! */
-   return (inflateReset(&png_ptr->zstream));
+   return inflateReset(&png_ptr->zstream);
 }
 #endif /* READ */
 
@@ -1014,7 +993,7 @@ png_uint_32 PNGAPI
 png_access_version_number(void)
 {
    /* Version of *.c files used when building libpng */
-   return((png_uint_32)PNG_LIBPNG_VER);
+   return (png_uint_32)PNG_LIBPNG_VER;
 }
 
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
@@ -1870,14 +1849,14 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
    }
 #  ifdef PNG_WARNINGS_SUPPORTED
    else
-      {
-         char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114 */
+   {
+      char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114 */
 
-         pos = png_safecat(message, (sizeof message), pos,
-             png_format_number(number, number+(sizeof number),
-             PNG_NUMBER_FORMAT_x, value));
-         pos = png_safecat(message, (sizeof message), pos, "h: "); /* +2 = 116 */
-      }
+      pos = png_safecat(message, (sizeof message), pos,
+          png_format_number(number, number+(sizeof number),
+          PNG_NUMBER_FORMAT_x, value));
+      pos = png_safecat(message, (sizeof message), pos, "h: "); /* +2 = 116 */
+   }
 #  endif
    /* The 'reason' is an arbitrary message, allow +79 maximum 195 */
    pos = png_safecat(message, (sizeof message), pos, reason);
@@ -2560,17 +2539,6 @@ png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
 
 #endif /* COLORSPACE */
 
-#ifdef __GNUC__
-/* This exists solely to work round a warning from GNU C. */
-static int /* PRIVATE */
-png_gt(size_t a, size_t b)
-{
-   return a > b;
-}
-#else
-#   define png_gt(a,b) ((a) > (b))
-#endif
-
 void /* PRIVATE */
 png_check_IHDR(png_const_structrp png_ptr,
     png_uint_32 width, png_uint_32 height, int bit_depth,
@@ -2592,8 +2560,16 @@ png_check_IHDR(png_const_structrp png_ptr,
       error = 1;
    }
 
-   if (png_gt(((width + 7) & (~7U)),
-       ((PNG_SIZE_MAX
+   /* The bit mask on the first line below must be at least as big as a
+    * png_uint_32.  "~7U" is not adequate on 16-bit systems because it will
+    * be an unsigned 16-bit value.  Casting to (png_alloc_size_t) makes the
+    * type of the result at least as bit (in bits) as the RHS of the > operator
+    * which also avoids a common warning on 64-bit systems that the comparison
+    * of (png_uint_32) against the constant value on the RHS will always be
+    * false.
+    */
+   if (((width + 7) & ~(png_alloc_size_t)7) >
+       (((PNG_SIZE_MAX
            - 48        /* big_row_buf hack */
            - 1)        /* filter byte */
            / 8)        /* 8-byte RGBA pixels */
@@ -2919,14 +2895,6 @@ png_pow10(int power)
 /* Function to format a floating point value in ASCII with a given
  * precision.
  */
-#if GCC_STRICT_OVERFLOW
-#pragma GCC diagnostic push
-/* The problem arises below with exp_b10, which can never overflow because it
- * comes, originally, from frexp and is therefore limited to a range which is
- * typically +/-710 (log2(DBL_MAX)/log2(DBL_MIN)).
- */
-#pragma GCC diagnostic warning "-Wstrict-overflow=2"
-#endif /* GCC_STRICT_OVERFLOW */
 void /* PRIVATE */
 png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, size_t size,
     double fp, unsigned int precision)
@@ -3248,10 +3216,6 @@ png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, size_t size,
    /* Here on buffer too small. */
    png_error(png_ptr, "ASCII conversion buffer too small");
 }
-#if GCC_STRICT_OVERFLOW
-#pragma GCC diagnostic pop
-#endif /* GCC_STRICT_OVERFLOW */
-
 #  endif /* FLOATING_POINT */
 
 #  ifdef PNG_FIXED_POINT_SUPPORTED
@@ -3279,7 +3243,7 @@ png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii,
       if (num <= 0x80000000) /* else overflowed */
       {
          unsigned int ndigits = 0, first = 16 /* flag value */;
-         char digits[10];
+         char digits[10] = {0};
 
          while (num)
          {
@@ -3364,15 +3328,6 @@ png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
  * the nearest .00001).  Overflow and divide by zero are signalled in
  * the result, a boolean - true on success, false on overflow.
  */
-#if GCC_STRICT_OVERFLOW /* from above */
-/* It is not obvious which comparison below gets optimized in such a way that
- * signed overflow would change the result; looking through the code does not
- * reveal any tests which have the form GCC complains about, so presumably the
- * optimizer is moving an add or subtract into the 'if' somewhere.
- */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Wstrict-overflow=2"
-#endif /* GCC_STRICT_OVERFLOW */
 int
 png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
     png_int_32 divisor)
@@ -3487,9 +3442,6 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
 
    return 0;
 }
-#if GCC_STRICT_OVERFLOW
-#pragma GCC diagnostic pop
-#endif /* GCC_STRICT_OVERFLOW */
 #endif /* READ_GAMMA || INCH_CONVERSIONS */
 
 #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.h b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
index 578841c9580..9f61a773c1d 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
@@ -29,9 +29,9 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * libpng version 1.6.40
+ * libpng version 1.6.43
  *
- * Copyright (c) 2018-2023 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -43,7 +43,7 @@
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
  *   libpng versions 0.97, January 1998, through 1.6.35, July 2018:
  *     Glenn Randers-Pehrson
- *   libpng versions 1.6.36, December 2018, through 1.6.40, June 2023:
+ *   libpng versions 1.6.36, December 2018, through 1.6.43, February 2024:
  *     Cosmin Truta
  *   See also "Contributing Authors", below.
  */
@@ -55,8 +55,8 @@
  * PNG Reference Library License version 2
  * ---------------------------------------
  *
- *  * Copyright (c) 1995-2023 The PNG Reference Library Authors.
- *  * Copyright (c) 2018-2023 Cosmin Truta.
+ *  * Copyright (c) 1995-2024 The PNG Reference Library Authors.
+ *  * Copyright (c) 2018-2024 Cosmin Truta.
  *  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  *  * Copyright (c) 1996-1997 Andreas Dilger.
  *  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -267,7 +267,7 @@
  *    ...
  *    1.5.30                  15    10530  15.so.15.30[.0]
  *    ...
- *    1.6.40                  16    10640  16.so.16.40[.0]
+ *    1.6.43                  16    10643  16.so.16.43[.0]
  *
  *    Henceforth the source version will match the shared-library major and
  *    minor numbers; the shared-library major version number will be used for
@@ -283,9 +283,6 @@
  *    to the info_ptr or png_ptr members through png.h, and the compiled
  *    application is loaded with a different version of the library.
  *
- *    DLLNUM will change each time there are forward or backward changes
- *    in binary compatibility (e.g., when a new feature is added).
- *
  * See libpng.txt or libpng.3 for more information.  The PNG specification
  * is available as a W3C Recommendation and as an ISO/IEC Standard; see
  * <https://www.w3.org/TR/2003/REC-PNG-20031110/>
@@ -306,19 +303,21 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.40"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.40 - June 21, 2023\n"
+#define PNG_LIBPNG_VER_STRING "1.6.43"
+#define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
 
-#define PNG_LIBPNG_VER_SONUM   16
-#define PNG_LIBPNG_VER_DLLNUM  16
+/* The versions of shared library builds should stay in sync, going forward */
+#define PNG_LIBPNG_VER_SHAREDLIB 16
+#define PNG_LIBPNG_VER_SONUM     PNG_LIBPNG_VER_SHAREDLIB /* [Deprecated] */
+#define PNG_LIBPNG_VER_DLLNUM    PNG_LIBPNG_VER_SHAREDLIB /* [Deprecated] */
 
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 40
+#define PNG_LIBPNG_VER_RELEASE 43
 
 /* This should be zero for a public release, or non-zero for a
- * development version.  [Deprecated]
+ * development version.
  */
 #define PNG_LIBPNG_VER_BUILD  0
 
@@ -346,7 +345,7 @@
  * From version 1.0.1 it is:
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
  */
-#define PNG_LIBPNG_VER 10640 /* 1.6.40 */
+#define PNG_LIBPNG_VER 10643 /* 1.6.43 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -456,7 +455,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_40;
+typedef char* png_libpng_version_1_6_43;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
@@ -877,7 +876,7 @@ PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
 #define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */
 /* Added to libpng-1.5.4 */
 #define PNG_TRANSFORM_EXPAND_16     0x4000      /* read only */
-#if INT_MAX >= 0x8000 /* else this might break */
+#if ~0U > 0xffffU /* or else this might break on a 16-bit machine */
 #define PNG_TRANSFORM_SCALE_16      0x8000      /* read only */
 #endif
 
@@ -936,15 +935,15 @@ PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
 /* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
  * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
  * signature, and non-zero otherwise.  Having num_to_check == 0 or
- * start > 7 will always fail (ie return non-zero).
+ * start > 7 will always fail (i.e. return non-zero).
  */
 PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start,
     size_t num_to_check));
 
 /* Simple signature checking function.  This is the same as calling
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
+ * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) == 0).
  */
-#define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))
+#define png_check_sig(sig, n) (png_sig_cmp((sig), 0, (n)) == 0) /* DEPRECATED */
 
 /* Allocate and initialize png_ptr struct for reading, and any other memory. */
 PNG_EXPORTA(4, png_structp, png_create_read_struct,
@@ -1758,12 +1757,9 @@ PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));
 PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,
     png_inforp info_ptr, png_uint_32 free_me, int num));
 
-/* Reassign responsibility for freeing existing data, whether allocated
+/* Reassign the responsibility for freeing existing data, whether allocated
  * by libpng or by the application; this works on the png_info structure passed
- * in, it does not change the state for other png_info structures.
- *
- * It is unlikely that this function works correctly as of 1.6.0 and using it
- * may result either in memory leaks or double free of allocated data.
+ * in, without changing the state for other png_info structures.
  */
 PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
     png_inforp info_ptr, int freer, png_uint_32 mask));
@@ -3235,11 +3231,18 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
 #ifdef PNG_MIPS_MSA_API_SUPPORTED
 #  define PNG_MIPS_MSA   6 /* HARDWARE: MIPS Msa SIMD instructions supported */
 #endif
-#define PNG_IGNORE_ADLER32 8
-#ifdef PNG_POWERPC_VSX_API_SUPPORTED
-#  define PNG_POWERPC_VSX   10 /* HARDWARE: PowerPC VSX SIMD instructions supported */
+#ifdef PNG_DISABLE_ADLER32_CHECK_SUPPORTED
+#  define PNG_IGNORE_ADLER32 8 /* SOFTWARE: disable Adler32 check on IDAT */
 #endif
-#define PNG_OPTION_NEXT  12 /* Next option - numbers must be even */
+#ifdef PNG_POWERPC_VSX_API_SUPPORTED
+#  define PNG_POWERPC_VSX   10 /* HARDWARE: PowerPC VSX SIMD instructions
+                                * supported */
+#endif
+#ifdef PNG_MIPS_MMI_API_SUPPORTED
+#  define PNG_MIPS_MMI   12 /* HARDWARE: MIPS MMI SIMD instructions supported */
+#endif
+
+#define PNG_OPTION_NEXT  14 /* Next option - numbers must be even */
 
 /* Return values: NOTE: there are four values and 'off' is *not* zero */
 #define PNG_OPTION_UNSET   0 /* Unset - defaults to off */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
index 41cbc91d398..b3b441b1122 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
@@ -29,9 +29,9 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * libpng version 1.6.40
+ * libpng version 1.6.43
  *
- * Copyright (c) 2018-2022 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
index 623735f06f1..ea8dd172197 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -283,7 +283,7 @@ void
 png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,
     png_alloc_size_t value)
 {
-   char buffer[PNG_NUMBER_BUFFER_SIZE];
+   char buffer[PNG_NUMBER_BUFFER_SIZE] = {0};
    png_warning_parameter(p, number, PNG_FORMAT_NUMBER(buffer, format, value));
 }
 
@@ -293,7 +293,7 @@ png_warning_parameter_signed(png_warning_parameters p, int number, int format,
 {
    png_alloc_size_t u;
    png_charp str;
-   char buffer[PNG_NUMBER_BUFFER_SIZE];
+   char buffer[PNG_NUMBER_BUFFER_SIZE] = {0};
 
    /* Avoid overflow by doing the negate in a png_alloc_size_t: */
    u = (png_alloc_size_t)value;
@@ -886,7 +886,7 @@ png_get_error_ptr(png_const_structrp png_ptr)
    if (png_ptr == NULL)
       return NULL;
 
-   return ((png_voidp)png_ptr->error_ptr);
+   return (png_voidp)png_ptr->error_ptr;
 }
 
 
@@ -961,31 +961,25 @@ png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
 #endif
 
 int /* PRIVATE */
-png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg)
+png_safe_execute(png_imagep image, int (*function)(png_voidp), png_voidp arg)
 {
-   volatile png_imagep image = image_in;
-   volatile int result;
-   volatile png_voidp saved_error_buf;
+   png_voidp saved_error_buf = image->opaque->error_buf;
    jmp_buf safe_jmpbuf;
+   int result;
 
-   /* Safely execute function(arg) with png_error returning to this function. */
-   saved_error_buf = image->opaque->error_buf;
-   result = setjmp(safe_jmpbuf) == 0;
-
-   if (result != 0)
+   /* Safely execute function(arg), with png_error returning back here. */
+   if (setjmp(safe_jmpbuf) == 0)
    {
-
       image->opaque->error_buf = safe_jmpbuf;
       result = function(arg);
+      image->opaque->error_buf = saved_error_buf;
+      return result;
    }
 
+   /* On png_error, return via longjmp, pop the jmpbuf, and free the image. */
    image->opaque->error_buf = saved_error_buf;
-
-   /* And do the cleanup prior to any failure return. */
-   if (result == 0)
-      png_image_free(image);
-
-   return result;
+   png_image_free(image);
+   return 0;
 }
 #endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */
 #endif /* READ || WRITE */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
index 6e510b27327..41e0a5abc3a 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2023 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -56,22 +56,22 @@ png_get_valid(png_const_structrp png_ptr, png_const_inforp info_ptr,
        * valid tRNS chunk in this case.
        */
       if (flag == PNG_INFO_tRNS && png_ptr->num_trans == 0)
-         return(0);
+         return 0;
 #endif
 
-      return(info_ptr->valid & flag);
+      return info_ptr->valid & flag;
    }
 
-   return(0);
+   return 0;
 }
 
 size_t PNGAPI
 png_get_rowbytes(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->rowbytes);
+      return info_ptr->rowbytes;
 
-   return(0);
+   return 0;
 }
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
@@ -79,9 +79,9 @@ png_bytepp PNGAPI
 png_get_rows(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->row_pointers);
+      return info_ptr->row_pointers;
 
-   return(0);
+   return 0;
 }
 #endif
 
@@ -93,7 +93,7 @@ png_get_image_width(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->width;
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -102,7 +102,7 @@ png_get_image_height(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->height;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -111,7 +111,7 @@ png_get_bit_depth(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->bit_depth;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -120,7 +120,7 @@ png_get_color_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->color_type;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -129,7 +129,7 @@ png_get_filter_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->filter_type;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -138,7 +138,7 @@ png_get_interlace_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->interlace_type;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -147,7 +147,7 @@ png_get_compression_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->compression_type;
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -155,21 +155,20 @@ png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
    info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
+   png_debug(1, "in png_get_x_pixels_per_meter");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
-      {
-         png_debug1(1, "in %s retrieval function",
-             "png_get_x_pixels_per_meter");
-
-         if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-            return (info_ptr->x_pixels_per_unit);
-      }
+   {
+      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
+         return info_ptr->x_pixels_per_unit;
+   }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -177,42 +176,41 @@ png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
     info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
+   png_debug(1, "in png_get_y_pixels_per_meter");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
-      png_debug1(1, "in %s retrieval function",
-          "png_get_y_pixels_per_meter");
-
       if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-         return (info_ptr->y_pixels_per_unit);
+         return info_ptr->y_pixels_per_unit;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
 png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
+   png_debug(1, "in png_get_pixels_per_meter");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
-
       if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER &&
           info_ptr->x_pixels_per_unit == info_ptr->y_pixels_per_unit)
-         return (info_ptr->x_pixels_per_unit);
+         return info_ptr->x_pixels_per_unit;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
@@ -221,21 +219,21 @@ png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp
    info_ptr)
 {
 #ifdef PNG_READ_pHYs_SUPPORTED
+   png_debug(1, "in png_get_pixel_aspect_ratio");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
-
       if (info_ptr->x_pixels_per_unit != 0)
-         return ((float)((float)info_ptr->y_pixels_per_unit
-             /(float)info_ptr->x_pixels_per_unit));
+         return (float)info_ptr->y_pixels_per_unit
+              / (float)info_ptr->x_pixels_per_unit;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return ((float)0.0);
+   return (float)0.0;
 }
 #endif
 
@@ -245,6 +243,8 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
     png_const_inforp info_ptr)
 {
 #ifdef PNG_READ_pHYs_SUPPORTED
+   png_debug(1, "in png_get_pixel_aspect_ratio_fixed");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0 &&
        info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 &&
@@ -253,8 +253,6 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
    {
       png_fixed_point res;
 
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio_fixed");
-
       /* The following casts work because a PNG 4 byte integer only has a valid
        * range of 0..2^31-1; otherwise the cast might overflow.
        */
@@ -275,80 +273,80 @@ png_int_32 PNGAPI
 png_get_x_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
+   png_debug(1, "in png_get_x_offset_microns");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
-
       if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->x_offset);
+         return info_ptr->x_offset;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_int_32 PNGAPI
 png_get_y_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
+   png_debug(1, "in png_get_y_offset_microns");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
-
       if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->y_offset);
+         return info_ptr->y_offset;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_int_32 PNGAPI
 png_get_x_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
+   png_debug(1, "in png_get_x_offset_pixels");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");
-
       if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->x_offset);
+         return info_ptr->x_offset;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_int_32 PNGAPI
 png_get_y_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
+   png_debug(1, "in png_get_y_offset_pixels");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");
-
       if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->y_offset);
+         return info_ptr->y_offset;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 #ifdef PNG_INCH_CONVERSIONS_SUPPORTED
@@ -462,11 +460,11 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
 {
    png_uint_32 retval = 0;
 
+   png_debug1(1, "in %s retrieval function", "pHYs");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "pHYs");
-
       if (res_x != NULL)
       {
          *res_x = info_ptr->x_pixels_per_unit;
@@ -492,7 +490,7 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
       }
    }
 
-   return (retval);
+   return retval;
 }
 #endif /* pHYs */
 #endif /* INCH_CONVERSIONS */
@@ -506,9 +504,9 @@ png_byte PNGAPI
 png_get_channels(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->channels);
+      return info_ptr->channels;
 
-   return (0);
+   return 0;
 }
 
 #ifdef PNG_READ_SUPPORTED
@@ -516,9 +514,9 @@ png_const_bytep PNGAPI
 png_get_signature(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->signature);
+      return info_ptr->signature;
 
-   return (NULL);
+   return NULL;
 }
 #endif
 
@@ -527,17 +525,17 @@ png_uint_32 PNGAPI
 png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
     png_color_16p *background)
 {
+   png_debug1(1, "in %s retrieval function", "bKGD");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_bKGD) != 0 &&
        background != NULL)
    {
-      png_debug1(1, "in %s retrieval function", "bKGD");
-
       *background = &(info_ptr->background);
-      return (PNG_INFO_bKGD);
+      return PNG_INFO_bKGD;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -552,6 +550,8 @@ png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
     double *white_x, double *white_y, double *red_x, double *red_y,
     double *green_x, double *green_y, double *blue_x, double *blue_y)
 {
+   png_debug1(1, "in %s retrieval function", "cHRM");
+
    /* Quiet API change: this code used to only return the end points if a cHRM
     * chunk was present, but the end points can also come from iCCP or sRGB
     * chunks, so in 1.6.0 the png_get_ APIs return the end points regardless and
@@ -561,8 +561,6 @@ png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
    if (png_ptr != NULL && info_ptr != NULL &&
       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "cHRM");
-
       if (white_x != NULL)
          *white_x = png_float(png_ptr,
              info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");
@@ -587,10 +585,10 @@ png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
       if (blue_y != NULL)
          *blue_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluey,
              "cHRM blue Y");
-      return (PNG_INFO_cHRM);
+      return PNG_INFO_cHRM;
    }
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -599,11 +597,11 @@ png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
     double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
     double *blue_Z)
 {
+   png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
-
       if (red_X != NULL)
          *red_X = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_X,
              "cHRM red X");
@@ -631,10 +629,10 @@ png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
       if (blue_Z != NULL)
          *blue_Z = png_float(png_ptr,
              info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");
-      return (PNG_INFO_cHRM);
+      return PNG_INFO_cHRM;
    }
 
-   return (0);
+   return 0;
 }
 #  endif
 
@@ -647,11 +645,11 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
     png_fixed_point *int_blue_Z)
 {
+   png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
+
    if (png_ptr != NULL && info_ptr != NULL &&
       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
-
       if (int_red_X != NULL)
          *int_red_X = info_ptr->colorspace.end_points_XYZ.red_X;
       if (int_red_Y != NULL)
@@ -670,10 +668,10 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
          *int_blue_Y = info_ptr->colorspace.end_points_XYZ.blue_Y;
       if (int_blue_Z != NULL)
          *int_blue_Z = info_ptr->colorspace.end_points_XYZ.blue_Z;
-      return (PNG_INFO_cHRM);
+      return PNG_INFO_cHRM;
    }
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -703,10 +701,10 @@ png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
          *blue_x = info_ptr->colorspace.end_points_xy.bluex;
       if (blue_y != NULL)
          *blue_y = info_ptr->colorspace.end_points_xy.bluey;
-      return (PNG_INFO_cHRM);
+      return PNG_INFO_cHRM;
    }
 
-   return (0);
+   return 0;
 }
 #  endif
 #endif
@@ -724,10 +722,10 @@ png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
        file_gamma != NULL)
    {
       *file_gamma = info_ptr->colorspace.gamma;
-      return (PNG_INFO_gAMA);
+      return PNG_INFO_gAMA;
    }
 
-   return (0);
+   return 0;
 }
 #  endif
 
@@ -744,10 +742,10 @@ png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,
    {
       *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,
           "png_get_gAMA");
-      return (PNG_INFO_gAMA);
+      return PNG_INFO_gAMA;
    }
 
-   return (0);
+   return 0;
 }
 #  endif
 #endif
@@ -763,10 +761,10 @@ png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,
       (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)
    {
       *file_srgb_intent = info_ptr->colorspace.rendering_intent;
-      return (PNG_INFO_sRGB);
+      return PNG_INFO_sRGB;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -790,10 +788,10 @@ png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
        */
       if (compression_type != NULL)
          *compression_type = PNG_COMPRESSION_TYPE_BASE;
-      return (PNG_INFO_iCCP);
+      return PNG_INFO_iCCP;
    }
 
-   return (0);
+   return 0;
 
 }
 #endif
@@ -803,13 +801,15 @@ int PNGAPI
 png_get_sPLT(png_const_structrp png_ptr, png_inforp info_ptr,
     png_sPLT_tpp spalettes)
 {
+   png_debug1(1, "in %s retrieval function", "sPLT");
+
    if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
    {
       *spalettes = info_ptr->splt_palettes;
       return info_ptr->splt_palettes_num;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -835,10 +835,10 @@ png_get_eXIf_1(png_const_structrp png_ptr, png_const_inforp info_ptr,
    {
       *num_exif = info_ptr->num_exif;
       *exif = info_ptr->exif;
-      return (PNG_INFO_eXIf);
+      return PNG_INFO_eXIf;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -853,10 +853,10 @@ png_get_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
        (info_ptr->valid & PNG_INFO_hIST) != 0 && hist != NULL)
    {
       *hist = info_ptr->hist;
-      return (PNG_INFO_hIST);
+      return PNG_INFO_hIST;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -869,7 +869,7 @@ png_get_IHDR(png_const_structrp png_ptr, png_const_inforp info_ptr,
    png_debug1(1, "in %s retrieval function", "IHDR");
 
    if (png_ptr == NULL || info_ptr == NULL)
-      return (0);
+      return 0;
 
    if (width != NULL)
        *width = info_ptr->width;
@@ -901,7 +901,7 @@ png_get_IHDR(png_const_structrp png_ptr, png_const_inforp info_ptr,
        info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
        info_ptr->compression_type, info_ptr->filter_type);
 
-   return (1);
+   return 1;
 }
 
 #ifdef PNG_oFFs_SUPPORTED
@@ -918,10 +918,10 @@ png_get_oFFs(png_const_structrp png_ptr, png_const_inforp info_ptr,
       *offset_x = info_ptr->x_offset;
       *offset_y = info_ptr->y_offset;
       *unit_type = (int)info_ptr->offset_unit_type;
-      return (PNG_INFO_oFFs);
+      return PNG_INFO_oFFs;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -945,10 +945,10 @@ png_get_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
       *nparams = (int)info_ptr->pcal_nparams;
       *units = info_ptr->pcal_units;
       *params = info_ptr->pcal_params;
-      return (PNG_INFO_pCAL);
+      return PNG_INFO_pCAL;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -960,6 +960,8 @@ png_uint_32 PNGAPI
 png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, png_fixed_point *width, png_fixed_point *height)
 {
+   png_debug1(1, "in %s retrieval function", "sCAL");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
@@ -971,10 +973,10 @@ png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
       *width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width");
       *height = png_fixed(png_ptr, atof(info_ptr->scal_s_height),
           "sCAL height");
-      return (PNG_INFO_sCAL);
+      return PNG_INFO_sCAL;
    }
 
-   return(0);
+   return 0;
 }
 #    endif /* FLOATING_ARITHMETIC */
 #  endif /* FIXED_POINT */
@@ -983,32 +985,36 @@ png_uint_32 PNGAPI
 png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, double *width, double *height)
 {
+   png_debug1(1, "in %s retrieval function", "sCAL(float)");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
       *unit = info_ptr->scal_unit;
       *width = atof(info_ptr->scal_s_width);
       *height = atof(info_ptr->scal_s_height);
-      return (PNG_INFO_sCAL);
+      return PNG_INFO_sCAL;
    }
 
-   return(0);
+   return 0;
 }
 #  endif /* FLOATING POINT */
 png_uint_32 PNGAPI
 png_get_sCAL_s(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, png_charpp width, png_charpp height)
 {
+   png_debug1(1, "in %s retrieval function", "sCAL(str)");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
       *unit = info_ptr->scal_unit;
       *width = info_ptr->scal_s_width;
       *height = info_ptr->scal_s_height;
-      return (PNG_INFO_sCAL);
+      return PNG_INFO_sCAL;
    }
 
-   return(0);
+   return 0;
 }
 #endif /* sCAL */
 
@@ -1043,7 +1049,7 @@ png_get_pHYs(png_const_structrp png_ptr, png_const_inforp info_ptr,
       }
    }
 
-   return (retval);
+   return retval;
 }
 #endif /* pHYs */
 
@@ -1059,10 +1065,10 @@ png_get_PLTE(png_const_structrp png_ptr, png_inforp info_ptr,
       *palette = info_ptr->palette;
       *num_palette = info_ptr->num_palette;
       png_debug1(3, "num_palette = %d", *num_palette);
-      return (PNG_INFO_PLTE);
+      return PNG_INFO_PLTE;
    }
 
-   return (0);
+   return 0;
 }
 
 #ifdef PNG_sBIT_SUPPORTED
@@ -1076,10 +1082,10 @@ png_get_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
        (info_ptr->valid & PNG_INFO_sBIT) != 0 && sig_bit != NULL)
    {
       *sig_bit = &(info_ptr->sig_bit);
-      return (PNG_INFO_sBIT);
+      return PNG_INFO_sBIT;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -1090,7 +1096,7 @@ png_get_text(png_const_structrp png_ptr, png_inforp info_ptr,
 {
    if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
    {
-      png_debug1(1, "in 0x%lx retrieval function",
+      png_debug1(1, "in text retrieval function, chunk typeid = 0x%lx",
          (unsigned long)png_ptr->chunk_name);
 
       if (text_ptr != NULL)
@@ -1105,7 +1111,7 @@ png_get_text(png_const_structrp png_ptr, png_inforp info_ptr,
    if (num_text != NULL)
       *num_text = 0;
 
-   return(0);
+   return 0;
 }
 #endif
 
@@ -1120,10 +1126,10 @@ png_get_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
        (info_ptr->valid & PNG_INFO_tIME) != 0 && mod_time != NULL)
    {
       *mod_time = &(info_ptr->mod_time);
-      return (PNG_INFO_tIME);
+      return PNG_INFO_tIME;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -1133,11 +1139,12 @@ png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,
     png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
 {
    png_uint_32 retval = 0;
+
+   png_debug1(1, "in %s retrieval function", "tRNS");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_tRNS) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "tRNS");
-
       if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
       {
          if (trans_alpha != NULL)
@@ -1169,7 +1176,7 @@ png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,
       }
    }
 
-   return (retval);
+   return retval;
 }
 #endif
 
@@ -1184,7 +1191,7 @@ png_get_unknown_chunks(png_const_structrp png_ptr, png_inforp info_ptr,
       return info_ptr->unknown_chunks_num;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -1280,7 +1287,7 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return png_ptr->num_palette_max;
 
-   return (-1);
+   return -1;
 }
 #  endif
 #endif
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
index e98d49cf0cc..e238ccdb9a4 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
@@ -31,7 +31,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  */
-/* libpng version 1.6.40 */
+/* libpng version 1.6.43 */
 
 /* Copyright (c) 2018-2023 Cosmin Truta */
 /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
index a98b2013256..816631cae18 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -173,10 +173,10 @@ png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)
        num_to_check);
    png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
 
-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0)
    {
       if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4) != 0)
          png_error(png_ptr, "Not a PNG file");
 
       else
@@ -322,6 +322,14 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
       png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
    }
 
+#endif
+#ifdef PNG_READ_eXIf_SUPPORTED
+   else if (png_ptr->chunk_name == png_eXIf)
+   {
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
+      png_handle_eXIf(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
 #endif
 #ifdef PNG_READ_sRGB_SUPPORTED
    else if (chunk_name == png_sRGB)
@@ -1117,7 +1125,7 @@ png_voidp PNGAPI
 png_get_progressive_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
-      return (NULL);
+      return NULL;
 
    return png_ptr->io_ptr;
 }
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
index 914d0b97b1d..18424542b00 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2023 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -64,7 +64,7 @@
  * still required (as of 2011-05-02.)
  */
 #ifndef _POSIX_SOURCE
-# define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
+#  define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
 #endif
 
 #ifndef PNG_VERSION_INFO_ONLY
@@ -218,13 +218,27 @@
 #endif /* PNG_ARM_NEON_OPT > 0 */
 
 #ifndef PNG_MIPS_MSA_OPT
-#  if defined(__mips_msa) && (__mips_isa_rev >= 5) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+#  if defined(__mips_msa) && (__mips_isa_rev >= 5) && \
+   defined(PNG_ALIGNED_MEMORY_SUPPORTED)
 #     define PNG_MIPS_MSA_OPT 2
 #  else
 #     define PNG_MIPS_MSA_OPT 0
 #  endif
 #endif
 
+#ifndef PNG_MIPS_MMI_OPT
+#  ifdef PNG_MIPS_MMI
+#    if defined(__mips_loongson_mmi) && (_MIPS_SIM == _ABI64) && \
+     defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+#       define PNG_MIPS_MMI_OPT 1
+#    else
+#       define PNG_MIPS_MMI_OPT 0
+#    endif
+#  else
+#    define PNG_MIPS_MMI_OPT 0
+#  endif
+#endif
+
 #ifndef PNG_POWERPC_VSX_OPT
 #  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
 #     define PNG_POWERPC_VSX_OPT 2
@@ -233,13 +247,21 @@
 #  endif
 #endif
 
+#ifndef PNG_LOONGARCH_LSX_OPT
+#  if defined(__loongarch_sx)
+#     define PNG_LOONGARCH_LSX_OPT 1
+#  else
+#     define PNG_LOONGARCH_LSX_OPT 0
+#  endif
+#endif
+
 #ifndef PNG_INTEL_SSE_OPT
 #   ifdef PNG_INTEL_SSE
       /* Only check for SSE if the build configuration has been modified to
        * enable SSE optimizations.  This means that these optimizations will
        * be off by default.  See contrib/intel for more details.
        */
-#     if defined(__SSE4_1__) || defined(__AVX__) || defined(__SSSE3__) || \
+#      if defined(__SSE4_1__) || defined(__AVX__) || defined(__SSSE3__) || \
        defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \
        (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
 #         define PNG_INTEL_SSE_OPT 1
@@ -276,7 +298,6 @@
 #endif
 
 #if PNG_MIPS_MSA_OPT > 0
-#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_msa
 #  ifndef PNG_MIPS_MSA_IMPLEMENTATION
 #     if defined(__mips_msa)
 #        if defined(__clang__)
@@ -292,11 +313,28 @@
 
 #  ifndef PNG_MIPS_MSA_IMPLEMENTATION
 #     define PNG_MIPS_MSA_IMPLEMENTATION 1
+#     define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_mips
 #  endif
 #else
 #  define PNG_MIPS_MSA_IMPLEMENTATION 0
 #endif /* PNG_MIPS_MSA_OPT > 0 */
 
+#if PNG_MIPS_MMI_OPT > 0
+#  ifndef PNG_MIPS_MMI_IMPLEMENTATION
+#     if defined(__mips_loongson_mmi) && (_MIPS_SIM == _ABI64)
+#        define PNG_MIPS_MMI_IMPLEMENTATION 2
+#     else /* !defined __mips_loongson_mmi  || _MIPS_SIM != _ABI64 */
+#        define PNG_MIPS_MMI_IMPLEMENTATION 0
+#     endif /* __mips_loongson_mmi  && _MIPS_SIM == _ABI64 */
+#  endif /* !PNG_MIPS_MMI_IMPLEMENTATION */
+
+#   if PNG_MIPS_MMI_IMPLEMENTATION > 0
+#      define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_mips
+#   endif
+#else
+#   define PNG_MIPS_MMI_IMPLEMENTATION 0
+#endif /* PNG_MIPS_MMI_OPT > 0 */
+
 #if PNG_POWERPC_VSX_OPT > 0
 #  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx
 #  define PNG_POWERPC_VSX_IMPLEMENTATION 1
@@ -304,6 +342,12 @@
 #  define PNG_POWERPC_VSX_IMPLEMENTATION 0
 #endif
 
+#if PNG_LOONGARCH_LSX_OPT > 0
+#   define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_lsx
+#   define PNG_LOONGARCH_LSX_IMPLEMENTATION 1
+#else
+#   define PNG_LOONGARCH_LSX_IMPLEMENTATION 0
+#endif
 
 /* Is this a build of a DLL where compilation of the object modules requires
  * different preprocessor settings to those required for a simple library?  If
@@ -542,18 +586,8 @@
     */
 #  include <float.h>
 
-#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
-    defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
-   /* We need to check that <math.h> hasn't already been included earlier
-    * as it seems it doesn't agree with <fp.h>, yet we should really use
-    * <fp.h> if possible.
-    */
-#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
-#      include <fp.h>
-#    endif
-#  else
-#    include <math.h>
-#  endif
+#  include <math.h>
+
 #  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
    /* Amiga SAS/C: We must include builtin FPU functions when compiling using
     * MATH=68881
@@ -1334,7 +1368,7 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop
     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 #endif
 
-#if PNG_MIPS_MSA_OPT > 0
+#if PNG_MIPS_MSA_IMPLEMENTATION == 1
 PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_msa,(png_row_infop row_info,
     png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_msa,(png_row_infop
@@ -1351,6 +1385,23 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_msa,(png_row_infop
     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 #endif
 
+#if PNG_MIPS_MMI_IMPLEMENTATION > 0
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_mmi,(png_row_infop row_info,
+    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+#endif
+
 #if PNG_POWERPC_VSX_OPT > 0
 PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_vsx,(png_row_infop row_info,
     png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
@@ -1383,6 +1434,23 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop
     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 #endif
 
+#if PNG_LOONGARCH_LSX_IMPLEMENTATION == 1
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+#endif
+
 /* Choose the best filter to use and filter the row data */
 PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
     png_row_infop row_info),PNG_EMPTY);
@@ -2122,17 +2190,27 @@ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,
    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #endif
 
-#if PNG_MIPS_MSA_OPT > 0
-PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa,
+#if PNG_MIPS_MSA_IMPLEMENTATION == 1
+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_mips,
    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #endif
 
+#  if PNG_MIPS_MMI_IMPLEMENTATION > 0
+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_mips,
+   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+#  endif
+
 #  if PNG_INTEL_SSE_IMPLEMENTATION > 0
 PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2,
    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #  endif
 #endif
 
+#if PNG_LOONGARCH_LSX_OPT > 0
+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_lsx,
+    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+#endif
+
 PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
    png_const_charp key, png_bytep new_key), PNG_EMPTY);
 
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
index 3631e60f36b..e9e94477545 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -596,7 +596,11 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
 #endif
 
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   if (png_ptr->transformations)
+   if (png_ptr->transformations
+#     ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+         || png_ptr->num_palette_max >= 0
+#     endif
+      )
       png_do_read_transformations(png_ptr, &row_info);
 #endif
 
@@ -813,7 +817,7 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
 #ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
    /* Report invalid palette index; added at libng-1.5.10 */
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-       png_ptr->num_palette_max > png_ptr->num_palette)
+       png_ptr->num_palette_max >= png_ptr->num_palette)
       png_benign_error(png_ptr, "Read palette index exceeding num_palette");
 #endif
 
@@ -1077,6 +1081,8 @@ void PNGAPI
 png_read_png(png_structrp png_ptr, png_inforp info_ptr,
     int transforms, voidp params)
 {
+   png_debug(1, "in png_read_png");
+
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
index 843eb5fff2a..a393de4b79d 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -318,21 +318,20 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
    int compose = 0;
    png_fixed_point file_gamma;
 
-   png_debug(1, "in png_set_alpha_mode");
+   png_debug(1, "in png_set_alpha_mode_fixed");
 
    if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);
 
-   /* Validate the value to ensure it is in a reasonable range. The value
+   /* Validate the value to ensure it is in a reasonable range.  The value
     * is expected to be 1 or greater, but this range test allows for some
-    * viewing correction values.  The intent is to weed out users of this API
-    * who use the inverse of the gamma value accidentally!  Since some of these
-    * values are reasonable this may have to be changed:
+    * viewing correction values.  The intent is to weed out the API users
+    * who might use the inverse of the gamma value accidentally!
     *
-    * 1.6.x: changed from 0.07..3 to 0.01..100 (to accommodate the optimal 16-bit
-    * gamma of 36, and its reciprocal.)
+    * In libpng 1.6.0, we changed from 0.07..3 to 0.01..100, to accommodate
+    * the optimal 16-bit gamma of 36 and its reciprocal.
     */
    if (output_gamma < 1000 || output_gamma > 10000000)
       png_error(png_ptr, "output gamma out of expected range");
@@ -469,7 +468,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
       int i;
 
       png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
-          (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));
+          (png_alloc_size_t)num_palette);
       for (i = 0; i < num_palette; i++)
          png_ptr->quantize_index[i] = (png_byte)i;
    }
@@ -486,7 +485,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
 
          /* Initialize an array to sort colors */
          png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));
+             (png_alloc_size_t)num_palette);
 
          /* Initialize the quantize_sort array */
          for (i = 0; i < num_palette; i++)
@@ -620,11 +619,9 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
 
          /* Initialize palette index arrays */
          png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)((png_uint_32)num_palette *
-             (sizeof (png_byte))));
+             (png_alloc_size_t)num_palette);
          png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)((png_uint_32)num_palette *
-             (sizeof (png_byte))));
+             (png_alloc_size_t)num_palette);
 
          /* Initialize the sort array */
          for (i = 0; i < num_palette; i++)
@@ -789,12 +786,11 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
       size_t num_entries = ((size_t)1 << total_bits);
 
       png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,
-          (png_alloc_size_t)(num_entries * (sizeof (png_byte))));
+          (png_alloc_size_t)(num_entries));
 
-      distance = (png_bytep)png_malloc(png_ptr, (png_alloc_size_t)(num_entries *
-          (sizeof (png_byte))));
+      distance = (png_bytep)png_malloc(png_ptr, (png_alloc_size_t)num_entries);
 
-      memset(distance, 0xff, num_entries * (sizeof (png_byte)));
+      memset(distance, 0xff, num_entries);
 
       for (i = 0; i < num_palette; i++)
       {
@@ -998,7 +994,7 @@ void PNGFAPI
 png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,
     png_fixed_point red, png_fixed_point green)
 {
-   png_debug(1, "in png_set_rgb_to_gray");
+   png_debug(1, "in png_set_rgb_to_gray_fixed");
 
    /* Need the IHDR here because of the check on color_type below. */
    /* TODO: fix this */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
index 524297c5a10..5280140d12b 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2022 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -54,7 +54,7 @@ png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
    if (uval > PNG_UINT_31_MAX)
       png_error(png_ptr, "PNG unsigned integer out of range");
 
-   return (uval);
+   return uval;
 }
 
 #if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)
@@ -168,7 +168,7 @@ png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
    if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0)
    {
       if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4) != 0)
          png_error(png_ptr, "Not a PNG file");
       else
          png_error(png_ptr, "PNG file corrupted by ASCII conversion");
@@ -199,7 +199,7 @@ png_read_chunk_header(png_structrp png_ptr)
    /* Put the chunk name into png_ptr->chunk_name. */
    png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
 
-   png_debug2(0, "Reading %lx chunk, length = %lu",
+   png_debug2(0, "Reading chunk typeid = 0x%lx, length = %lu",
        (unsigned long)png_ptr->chunk_name, (unsigned long)length);
 
    /* Reset the crc and run it over the chunk name. */
@@ -266,10 +266,10 @@ png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
       else
          png_chunk_error(png_ptr, "CRC error");
 
-      return (1);
+      return 1;
    }
 
-   return (0);
+   return 0;
 }
 
 /* Compare the CRC stored in the PNG file with that calculated by libpng from
@@ -305,11 +305,11 @@ png_crc_error(png_structrp png_ptr)
    if (need_crc != 0)
    {
       crc = png_get_uint_32(crc_bytes);
-      return ((int)(crc != png_ptr->crc));
+      return crc != png_ptr->crc;
    }
 
    else
-      return (0);
+      return 0;
 }
 
 #if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\
@@ -449,8 +449,7 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
             png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
       }
 
-#if ZLIB_VERNUM >= 0x1290 && \
-   defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32)
+#ifdef PNG_DISABLE_ADLER32_CHECK_SUPPORTED
       if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON)
          /* Turn off validation of the ADLER32 checksum in IDAT chunks */
          ret = inflateValidate(&png_ptr->zstream, 0);
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
index 62612a02278..f53ab6fa1d1 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2023 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -791,11 +791,11 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
 {
    int i;
 
-   png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11U :
-      (unsigned long)png_ptr->chunk_name);
+   png_debug1(1, "in text storage function, chunk typeid = 0x%lx",
+      png_ptr == NULL ? 0xabadca11UL : (unsigned long)png_ptr->chunk_name);
 
    if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)
-      return(0);
+      return 0;
 
    /* Make sure we have enough space in the "text" array in info_struct
     * to hold all of the incoming text_ptr objects.  This compare can't overflow
@@ -975,7 +975,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
       png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
    }
 
-   return(0);
+   return 0;
 }
 #endif
 
@@ -1091,6 +1091,8 @@ png_set_sPLT(png_const_structrp png_ptr,
 {
    png_sPLT_tp np;
 
+   png_debug1(1, "in %s storage function", "sPLT");
+
    if (png_ptr == NULL || info_ptr == NULL || nentries <= 0 || entries == NULL)
       return;
 
@@ -1565,7 +1567,7 @@ void PNGAPI
 png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,
     png_bytepp row_pointers)
 {
-   png_debug1(1, "in %s storage function", "rows");
+   png_debug(1, "in png_set_rows");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
@@ -1584,6 +1586,8 @@ png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,
 void PNGAPI
 png_set_compression_buffer_size(png_structrp png_ptr, size_t size)
 {
+   png_debug(1, "in png_set_compression_buffer_size");
+
    if (png_ptr == NULL)
       return;
 
@@ -1655,6 +1659,8 @@ void PNGAPI
 png_set_user_limits(png_structrp png_ptr, png_uint_32 user_width_max,
     png_uint_32 user_height_max)
 {
+   png_debug(1, "in png_set_user_limits");
+
    /* Images with dimensions larger than these limits will be
     * rejected by png_set_IHDR().  To accept any PNG datastream
     * regardless of dimensions, set both limits to 0x7fffffff.
@@ -1670,6 +1676,8 @@ png_set_user_limits(png_structrp png_ptr, png_uint_32 user_width_max,
 void PNGAPI
 png_set_chunk_cache_max(png_structrp png_ptr, png_uint_32 user_chunk_cache_max)
 {
+   png_debug(1, "in png_set_chunk_cache_max");
+
    if (png_ptr != NULL)
       png_ptr->user_chunk_cache_max = user_chunk_cache_max;
 }
@@ -1679,6 +1687,8 @@ void PNGAPI
 png_set_chunk_malloc_max(png_structrp png_ptr,
     png_alloc_size_t user_chunk_malloc_max)
 {
+   png_debug(1, "in png_set_chunk_malloc_max");
+
    if (png_ptr != NULL)
       png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
 }
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c
index 89a62191b6f..2350057e70e 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -131,10 +131,10 @@ png_set_interlace_handling(png_structrp png_ptr)
    if (png_ptr != 0 && png_ptr->interlaced != 0)
    {
       png_ptr->transformations |= PNG_INTERLACE;
-      return (7);
+      return 7;
    }
 
-   return (1);
+   return 1;
 }
 #endif
 
@@ -526,6 +526,8 @@ png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start)
    png_bytep dp = row; /* destination pointer */
    png_bytep ep = row + row_info->rowbytes; /* One beyond end of row */
 
+   png_debug(1, "in png_do_strip_channel");
+
    /* At the start sp will point to the first byte to copy and dp to where
     * it is copied to.  ep always points just beyond the end of the row, so
     * the loop simply copies (channels-1) channels until sp reaches ep.
@@ -726,6 +728,8 @@ png_do_bgr(png_row_infop row_info, png_bytep row)
 void /* PRIVATE */
 png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
 {
+   png_debug(1, "in png_do_check_palette_indexes");
+
    if (png_ptr->num_palette < (1 << row_info->bit_depth) &&
       png_ptr->num_palette > 0) /* num_palette can be 0 in MNG files */
    {
@@ -736,7 +740,7 @@ png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
        * forms produced on either GCC or MSVC.
        */
       int padding = PNG_PADBITS(row_info->pixel_depth, row_info->width);
-      png_bytep rp = png_ptr->row_buf + row_info->rowbytes - 1;
+      png_bytep rp = png_ptr->row_buf + row_info->rowbytes;
 
       switch (row_info->bit_depth)
       {
@@ -861,7 +865,7 @@ png_voidp PNGAPI
 png_get_user_transform_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
-      return (NULL);
+      return NULL;
 
    return png_ptr->user_transform_ptr;
 }

From 9b423a8509d6bf8a76297d74aaaea40613f5f2ae Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Mon, 29 Apr 2024 17:14:09 +0000
Subject: [PATCH 242/486] 8330253: Remove verify_consistent_lock_order

Co-authored-by: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Reviewed-by: dcubed, pchilanomate, dnsimon
---
 src/hotspot/share/runtime/deoptimization.cpp | 13 -----
 src/hotspot/share/runtime/lockStack.cpp      | 54 --------------------
 src/hotspot/share/runtime/lockStack.hpp      |  3 --
 3 files changed, 70 deletions(-)

diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index cf2f7e9c216..7a4a59a8553 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -391,7 +391,6 @@ static void restore_eliminated_locks(JavaThread* thread, GrowableArray<compiledV
 #ifndef PRODUCT
   bool first = true;
 #endif // !PRODUCT
-  DEBUG_ONLY(GrowableArray<oop> lock_order{0};)
   // Start locking from outermost/oldest frame
   for (int i = (chunk->length() - 1); i >= 0; i--) {
     compiledVFrame* cvf = chunk->at(i);
@@ -401,13 +400,6 @@ static void restore_eliminated_locks(JavaThread* thread, GrowableArray<compiledV
       bool relocked = Deoptimization::relock_objects(thread, monitors, deoptee_thread, deoptee,
                                                      exec_mode, realloc_failures);
       deoptimized_objects = deoptimized_objects || relocked;
-#ifdef ASSERT
-      if (LockingMode == LM_LIGHTWEIGHT && !realloc_failures) {
-        for (MonitorInfo* mi : *monitors) {
-          lock_order.push(mi->owner());
-        }
-      }
-#endif // ASSERT
 #ifndef PRODUCT
       if (PrintDeoptimizationDetails) {
         ResourceMark rm;
@@ -439,11 +431,6 @@ static void restore_eliminated_locks(JavaThread* thread, GrowableArray<compiledV
 #endif // !PRODUCT
     }
   }
-#ifdef ASSERT
-  if (LockingMode == LM_LIGHTWEIGHT && !realloc_failures) {
-    deoptee_thread->lock_stack().verify_consistent_lock_order(lock_order, exec_mode != Deoptimization::Unpack_none);
-  }
-#endif // ASSERT
 }
 
 // Deoptimize objects, that is reallocate and relock them, just before they escape through JVMTI.
diff --git a/src/hotspot/share/runtime/lockStack.cpp b/src/hotspot/share/runtime/lockStack.cpp
index c7889da1a76..2f783c97c99 100644
--- a/src/hotspot/share/runtime/lockStack.cpp
+++ b/src/hotspot/share/runtime/lockStack.cpp
@@ -103,60 +103,6 @@ void LockStack::verify(const char* msg) const {
 }
 #endif
 
-#ifdef ASSERT
-void LockStack::verify_consistent_lock_order(GrowableArray<oop>& lock_order, bool leaf_frame) const {
-  int top_index = to_index(_top);
-  int lock_index = lock_order.length();
-
-  if (!leaf_frame) {
-    // If the lock_order is not from the leaf frame we must search
-    // for the top_index which fits with the most recent fast_locked
-    // objects in the lock stack.
-    while (lock_index-- > 0) {
-      const oop obj = lock_order.at(lock_index);
-      if (contains(obj)) {
-        for (int index = 0; index < top_index; index++) {
-          if (_base[index] == obj) {
-            // Found top index
-            top_index = index + 1;
-            break;
-          }
-        }
-
-        if (VM_Version::supports_recursive_lightweight_locking()) {
-          // With recursive looks there may be more of the same object
-          while (lock_index-- > 0 && lock_order.at(lock_index) == obj) {
-            top_index++;
-          }
-          assert(top_index <= to_index(_top), "too many obj in lock_order");
-        }
-
-        break;
-      }
-    }
-
-    lock_index = lock_order.length();
-  }
-
-  while (lock_index-- > 0) {
-    const oop obj = lock_order.at(lock_index);
-    const markWord mark = obj->mark_acquire();
-    assert(obj->is_locked(), "must be locked");
-    if (top_index > 0 && obj == _base[top_index - 1]) {
-      assert(mark.is_fast_locked() || mark.monitor()->is_owner_anonymous(),
-             "must be fast_locked or inflated by other thread");
-      top_index--;
-    } else {
-      assert(!mark.is_fast_locked(), "must be inflated");
-      assert(mark.monitor()->owner_raw() == get_thread() ||
-             (!leaf_frame && get_thread()->current_waiting_monitor() == mark.monitor()),
-             "must be owned by (or waited on by) thread");
-      assert(!contains(obj), "must not be on lock_stack");
-    }
-  }
-}
-#endif
-
 void LockStack::print_on(outputStream* st) {
   for (int i = to_index(_top); (--i) >= 0;) {
     st->print("LockStack[%d]: ", i);
diff --git a/src/hotspot/share/runtime/lockStack.hpp b/src/hotspot/share/runtime/lockStack.hpp
index 2cf02f00a8d..064f70a37fb 100644
--- a/src/hotspot/share/runtime/lockStack.hpp
+++ b/src/hotspot/share/runtime/lockStack.hpp
@@ -121,9 +121,6 @@ public:
 
   // Printing
   void print_on(outputStream* st);
-
-  // Verify Lock Stack consistent with lock order
-  void verify_consistent_lock_order(GrowableArray<oop>& lock_order, bool leaf_frame) const NOT_DEBUG_RETURN;
 };
 
 #endif // SHARE_RUNTIME_LOCKSTACK_HPP

From eb88343fb763ee89010b7a9879638152decc6892 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Mon, 29 Apr 2024 17:50:39 +0000
Subject: [PATCH 243/486] 8331164: createJMHBundle.sh download jars fail when
 url needed to be redirected

Reviewed-by: erikj, shade
---
 make/devkit/createJMHBundle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/devkit/createJMHBundle.sh b/make/devkit/createJMHBundle.sh
index b2b10769d15..889b7f914a4 100644
--- a/make/devkit/createJMHBundle.sh
+++ b/make/devkit/createJMHBundle.sh
@@ -44,7 +44,7 @@ rm -f *
 fetchJar() {
   url="${MAVEN_MIRROR}/$1/$2/$3/$2-$3.jar"
   if command -v curl > /dev/null; then
-      curl -O --fail $url
+      curl -OL --fail $url
   elif command -v wget > /dev/null; then
       wget $url
   else

From 819f3d6fc70ff6fe54ac5f9033c17c3dd4326aa5 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Mon, 29 Apr 2024 17:54:13 +0000
Subject: [PATCH 244/486] 8330748: ByteArrayOutputStream.writeTo(OutputStream)
 pins carrier

Reviewed-by: alanb
---
 .../java/io/ByteArrayOutputStream.java        |  14 +-
 .../WriteToReleasesCarrier.java               | 131 ++++++++++++++++++
 2 files changed, 142 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/java/io/ByteArrayOutputStream/WriteToReleasesCarrier.java

diff --git a/src/java.base/share/classes/java/io/ByteArrayOutputStream.java b/src/java.base/share/classes/java/io/ByteArrayOutputStream.java
index 109acce3853..8f5ff41957e 100644
--- a/src/java.base/share/classes/java/io/ByteArrayOutputStream.java
+++ b/src/java.base/share/classes/java/io/ByteArrayOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2024, 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
@@ -159,8 +159,16 @@ public class ByteArrayOutputStream extends OutputStream {
      * @throws  NullPointerException if {@code out} is {@code null}.
      * @throws  IOException if an I/O error occurs.
      */
-    public synchronized void writeTo(OutputStream out) throws IOException {
-        out.write(buf, 0, count);
+    public void writeTo(OutputStream out) throws IOException {
+        if (Thread.currentThread().isVirtual()) {
+            byte[] bytes;
+            synchronized (this) {
+                bytes = Arrays.copyOf(buf, count);
+            }
+            out.write(bytes);
+        } else synchronized (this) {
+            out.write(buf, 0, count);
+        }
     }
 
     /**
diff --git a/test/jdk/java/io/ByteArrayOutputStream/WriteToReleasesCarrier.java b/test/jdk/java/io/ByteArrayOutputStream/WriteToReleasesCarrier.java
new file mode 100644
index 00000000000..c0607fd9494
--- /dev/null
+++ b/test/jdk/java/io/ByteArrayOutputStream/WriteToReleasesCarrier.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2024, 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 8330748
+ * @summary Test ByteArrayOutputStream.writeTo releases carrier thread
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open
+ * @run main WriteToReleasesCarrier
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.lang.reflect.Constructor;
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.LockSupport;
+
+public class WriteToReleasesCarrier {
+    public static void main(String[] args) throws Exception {
+        byte[] bytes = "Hello".getBytes(StandardCharsets.UTF_8);
+
+        var baos = new ByteArrayOutputStream();
+        baos.write(bytes);
+
+        var target = new ParkingOutputStream();
+
+        try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
+            Thread.Builder builder = virtualThreadBuilder(scheduler);
+            var started = new CountDownLatch(1);
+            var vthread1 = builder.start(() -> {
+                started.countDown();
+                try {
+                    baos.writeTo(target);
+                } catch (IOException ioe) { }
+            });
+            try {
+                started.await();
+                await(vthread1, Thread.State.WAITING);
+
+                // carrier should be released, use it for another thread
+                var executed = new AtomicBoolean();
+                var vthread2 = builder.start(() -> {
+                    executed.set(true);
+                });
+                vthread2.join();
+                if (!executed.get()) {
+                    throw new RuntimeException("Second virtual thread did not run");
+                }
+            } finally {
+                LockSupport.unpark(vthread1);
+                vthread1.join();
+            }
+        }
+
+        if (!Arrays.equals(target.toByteArray(), bytes)) {
+            throw new RuntimeException("Expected bytes not written");
+        }
+    }
+
+    /**
+     * Waits for a thread to get to the expected state.
+     */
+    private static void await(Thread thread, Thread.State expectedState) throws Exception {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+
+    /**
+     * An OutputStream that parks when writing.
+     */
+    static class ParkingOutputStream extends OutputStream {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+        @Override
+        public void write(int i) {
+            LockSupport.park();
+            baos.write(i);
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) {
+            LockSupport.park();
+            baos.write(b, off, len);
+        }
+
+        byte[] toByteArray() {
+            return baos.toByteArray();
+        }
+    }
+
+    /**
+     * Returns a builder to create virtual threads that use the given scheduler.
+     */
+    static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler) throws Exception {
+        Class<?> clazz = Class.forName("java.lang.ThreadBuilders$VirtualThreadBuilder");
+        Constructor<?> ctor = clazz.getDeclaredConstructor(Executor.class);
+        ctor.setAccessible(true);
+        return (Thread.Builder.OfVirtual) ctor.newInstance(scheduler);
+    }
+}

From b128bd7b5a1dcf3e7a55d3e3b0c4a9998bde963e Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 30 Apr 2024 06:53:16 +0000
Subject: [PATCH 245/486] 8331021: Deprecate and then obsolete the
 DontYieldALot flag

Reviewed-by: coleenp, stuefe, shade
---
 src/hotspot/share/runtime/arguments.cpp                      | 1 +
 src/hotspot/share/runtime/globals.hpp                        | 5 +----
 .../jtreg/runtime/CommandLine/VMDeprecatedOptions.java       | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 802ddee756f..f2b37003731 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -501,6 +501,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "RequireSharedSpaces",          JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "UseSharedSpaces",              JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "RegisterFinalizersAtInit",     JDK_Version::jdk(22), JDK_Version::jdk(23), JDK_Version::jdk(24) },
+  { "DontYieldALot",                JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "PreserveAllAnnotations",       JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseNotificationThread",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseEmptySlotsInSupers",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 1d23e4164c4..3995a871474 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -698,7 +698,7 @@ const int ObjectAlignmentInBytes = 8;
           "registering as parallel capable")                                \
                                                                             \
   product_pd(bool, DontYieldALot,                                           \
-          "Throw away obvious excess yield calls")                          \
+             "(Deprecated) Throw away obvious excess yield calls")          \
                                                                             \
   product(bool, DisablePrimordialThreadGuardPages, false, EXPERIMENTAL,     \
                "Disable the use of stack guard pages if the JVM is loaded " \
@@ -1313,9 +1313,6 @@ const int ObjectAlignmentInBytes = 8;
   develop(intx, MethodHistogramCutoff, 100,                                 \
           "The cutoff value for method invocation histogram (+CountCalls)") \
                                                                             \
-  develop(intx, DontYieldALotInterval,    10,                               \
-          "Interval between which yields will be dropped (milliseconds)")   \
-                                                                            \
   develop(intx, DeoptimizeALotInterval,     5,                              \
           "Number of exits until DeoptimizeALot kicks in")                  \
                                                                             \
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
index 50751a62bdf..fa4ff56b691 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
@@ -56,6 +56,7 @@ public class VMDeprecatedOptions {
         ArrayList<String[]> deprecated = new ArrayList(
           Arrays.asList(new String[][] {
             // deprecated non-alias flags:
+            {"DontYieldALot", "false"},
             {"UseNotificationThread", "true"},
             {"PreserveAllAnnotations", "true"},
             {"AllowRedefinitionToAddDeleteMethods", "true"},

From 60b61e588c1252b4b1fbc64d0f818a85670f7146 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 30 Apr 2024 07:31:29 +0000
Subject: [PATCH 246/486] 8331298: avoid alignment checks in UBSAN enabled
 build

Reviewed-by: erikj, mdoerr
---
 make/autoconf/jdk-options.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 1e9a5637ae5..8c91a2ccd33 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -491,7 +491,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
 [
   # GCC reports lots of likely false positives for stringop-truncation and format-overflow.
   # Silence them for now.
-  UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base"
+  UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment"
   UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
   UBSAN_LDFLAGS="$UBSAN_CHECKS"
   UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,

From 0630bb02eb760081ddd612ccb1b12d57d43aab5e Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Tue, 30 Apr 2024 08:27:38 +0000
Subject: [PATCH 247/486] 8331264: Reduce java.lang.constant initialization
 overhead

Reviewed-by: liach, mchung
---
 .../classes/java/lang/constant/ClassDesc.java |  4 +-
 .../java/lang/constant/ConstantDescs.java     | 86 +++++++++----------
 .../java/lang/constant/ConstantUtils.java     |  1 -
 .../constant/DirectMethodHandleDescImpl.java  |  4 +-
 .../lang/constant/DynamicConstantDesc.java    |  7 +-
 .../lang/constant/MethodTypeDescImpl.java     | 27 +++---
 .../lang/constant/ReferenceClassDescImpl.java |  7 +-
 7 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/constant/ClassDesc.java b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
index 767fa953e97..89be851dbf5 100644
--- a/src/java.base/share/classes/java/lang/constant/ClassDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
@@ -270,7 +270,7 @@ public sealed interface ClassDesc
      * @return whether this {@linkplain ClassDesc} describes an array type
      */
     default boolean isArray() {
-        return descriptorString().startsWith("[");
+        return descriptorString().charAt(0) == '[';
     }
 
     /**
@@ -288,7 +288,7 @@ public sealed interface ClassDesc
      * @return whether this {@linkplain ClassDesc} describes a class or interface type
      */
     default boolean isClassOrInterface() {
-        return descriptorString().startsWith("L");
+        return descriptorString().charAt(0) == 'L';
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantDescs.java b/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
index de895fc7af5..a67a16643c3 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
+++ b/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
@@ -64,125 +64,125 @@ public final class ConstantDescs {
     // Don't change the order of these declarations!
 
     /** {@link ClassDesc} representing {@link Object} */
-    public static final ClassDesc CD_Object = ClassDesc.of("java.lang.Object");
+    public static final ClassDesc CD_Object = new ReferenceClassDescImpl("Ljava/lang/Object;");
 
     /** {@link ClassDesc} representing {@link String} */
-    public static final ClassDesc CD_String = ClassDesc.of("java.lang.String");
+    public static final ClassDesc CD_String = new ReferenceClassDescImpl("Ljava/lang/String;");
 
     /** {@link ClassDesc} representing {@link Class} */
-    public static final ClassDesc CD_Class = ClassDesc.of("java.lang.Class");
+    public static final ClassDesc CD_Class = new ReferenceClassDescImpl("Ljava/lang/Class;");
 
     /** {@link ClassDesc} representing {@link Number} */
-    public static final ClassDesc CD_Number = ClassDesc.of("java.lang.Number");
+    public static final ClassDesc CD_Number = new ReferenceClassDescImpl("Ljava/lang/Number;");
 
     /** {@link ClassDesc} representing {@link Integer} */
-    public static final ClassDesc CD_Integer = ClassDesc.of("java.lang.Integer");
+    public static final ClassDesc CD_Integer = new ReferenceClassDescImpl("Ljava/lang/Integer;");
 
     /** {@link ClassDesc} representing {@link Long} */
-    public static final ClassDesc CD_Long = ClassDesc.of("java.lang.Long");
+    public static final ClassDesc CD_Long = new ReferenceClassDescImpl("Ljava/lang/Long;");
 
     /** {@link ClassDesc} representing {@link Float} */
-    public static final ClassDesc CD_Float = ClassDesc.of("java.lang.Float");
+    public static final ClassDesc CD_Float = new ReferenceClassDescImpl("Ljava/lang/Float;");
 
     /** {@link ClassDesc} representing {@link Double} */
-    public static final ClassDesc CD_Double = ClassDesc.of("java.lang.Double");
+    public static final ClassDesc CD_Double = new ReferenceClassDescImpl("Ljava/lang/Double;");
 
     /** {@link ClassDesc} representing {@link Short} */
-    public static final ClassDesc CD_Short = ClassDesc.of("java.lang.Short");
+    public static final ClassDesc CD_Short = new ReferenceClassDescImpl("Ljava/lang/Short;");
 
     /** {@link ClassDesc} representing {@link Byte} */
-    public static final ClassDesc CD_Byte = ClassDesc.of("java.lang.Byte");
+    public static final ClassDesc CD_Byte = new ReferenceClassDescImpl("Ljava/lang/Byte;");
 
     /** {@link ClassDesc} representing {@link Character} */
-    public static final ClassDesc CD_Character = ClassDesc.of("java.lang.Character");
+    public static final ClassDesc CD_Character = new ReferenceClassDescImpl("Ljava/lang/Character;");
 
     /** {@link ClassDesc} representing {@link Boolean} */
-    public static final ClassDesc CD_Boolean = ClassDesc.of("java.lang.Boolean");
+    public static final ClassDesc CD_Boolean = new ReferenceClassDescImpl("Ljava/lang/Boolean;");
 
     /** {@link ClassDesc} representing {@link Void} */
-    public static final ClassDesc CD_Void = ClassDesc.of("java.lang.Void");
+    public static final ClassDesc CD_Void = new ReferenceClassDescImpl("Ljava/lang/Void;");
 
     /** {@link ClassDesc} representing {@link Throwable} */
-    public static final ClassDesc CD_Throwable = ClassDesc.of("java.lang.Throwable");
+    public static final ClassDesc CD_Throwable = new ReferenceClassDescImpl("Ljava/lang/Throwable;");
 
     /** {@link ClassDesc} representing {@link Exception} */
-    public static final ClassDesc CD_Exception = ClassDesc.of("java.lang.Exception");
+    public static final ClassDesc CD_Exception = new ReferenceClassDescImpl("Ljava/lang/Exception;");
 
     /** {@link ClassDesc} representing {@link Enum} */
-    public static final ClassDesc CD_Enum = ClassDesc.of("java.lang.Enum");
+    public static final ClassDesc CD_Enum = new ReferenceClassDescImpl("Ljava/lang/Enum;");
 
     /** {@link ClassDesc} representing {@link VarHandle} */
-    public static final ClassDesc CD_VarHandle = ClassDesc.of("java.lang.invoke.VarHandle");
+    public static final ClassDesc CD_VarHandle = new ReferenceClassDescImpl("Ljava/lang/invoke/VarHandle;");
 
     /** {@link ClassDesc} representing {@link MethodHandles} */
-    public static final ClassDesc CD_MethodHandles = ClassDesc.of("java.lang.invoke.MethodHandles");
+    public static final ClassDesc CD_MethodHandles = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodHandles;");
 
     /** {@link ClassDesc} representing {@link MethodHandles.Lookup} */
-    public static final ClassDesc CD_MethodHandles_Lookup = CD_MethodHandles.nested("Lookup");
+    public static final ClassDesc CD_MethodHandles_Lookup = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodHandles$Lookup;");
 
     /** {@link ClassDesc} representing {@link MethodHandle} */
-    public static final ClassDesc CD_MethodHandle = ClassDesc.of("java.lang.invoke.MethodHandle");
+    public static final ClassDesc CD_MethodHandle = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodHandle;");
 
     /** {@link ClassDesc} representing {@link MethodType} */
-    public static final ClassDesc CD_MethodType = ClassDesc.of("java.lang.invoke.MethodType");
+    public static final ClassDesc CD_MethodType = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodType;");
 
     /** {@link ClassDesc} representing {@link CallSite} */
-    public static final ClassDesc CD_CallSite = ClassDesc.of("java.lang.invoke.CallSite");
+    public static final ClassDesc CD_CallSite = new ReferenceClassDescImpl("Ljava/lang/invoke/CallSite;");
 
     /** {@link ClassDesc} representing {@link Collection} */
-    public static final ClassDesc CD_Collection = ClassDesc.of("java.util.Collection");
+    public static final ClassDesc CD_Collection = new ReferenceClassDescImpl("Ljava/util/Collection;");
 
     /** {@link ClassDesc} representing {@link List} */
-    public static final ClassDesc CD_List = ClassDesc.of("java.util.List");
+    public static final ClassDesc CD_List = new ReferenceClassDescImpl("Ljava/util/List;");
 
     /** {@link ClassDesc} representing {@link Set} */
-    public static final ClassDesc CD_Set = ClassDesc.of("java.util.Set");
+    public static final ClassDesc CD_Set = new ReferenceClassDescImpl("Ljava/util/Set;");
 
     /** {@link ClassDesc} representing {@link Map} */
-    public static final ClassDesc CD_Map = ClassDesc.of("java.util.Map");
+    public static final ClassDesc CD_Map = new ReferenceClassDescImpl("Ljava/util/Map;");
 
     /** {@link ClassDesc} representing {@link ConstantDesc} */
-    public static final ClassDesc CD_ConstantDesc = ClassDesc.of("java.lang.constant.ConstantDesc");
+    public static final ClassDesc CD_ConstantDesc = new ReferenceClassDescImpl("Ljava/lang/constant/ConstantDesc;");
 
     /** {@link ClassDesc} representing {@link ClassDesc} */
-    public static final ClassDesc CD_ClassDesc = ClassDesc.of("java.lang.constant.ClassDesc");
+    public static final ClassDesc CD_ClassDesc = new ReferenceClassDescImpl("Ljava/lang/constant/ClassDesc;");
 
     /** {@link ClassDesc} representing {@link EnumDesc} */
-    public static final ClassDesc CD_EnumDesc = CD_Enum.nested("EnumDesc");
+    public static final ClassDesc CD_EnumDesc = new ReferenceClassDescImpl("Ljava/lang/Enum$EnumDesc;");
 
     /** {@link ClassDesc} representing {@link MethodTypeDesc} */
-    public static final ClassDesc CD_MethodTypeDesc = ClassDesc.of("java.lang.constant.MethodTypeDesc");
+    public static final ClassDesc CD_MethodTypeDesc = new ReferenceClassDescImpl("Ljava/lang/constant/MethodTypeDesc;");
 
     /** {@link ClassDesc} representing {@link MethodHandleDesc} */
-    public static final ClassDesc CD_MethodHandleDesc = ClassDesc.of("java.lang.constant.MethodHandleDesc");
+    public static final ClassDesc CD_MethodHandleDesc = new ReferenceClassDescImpl("Ljava/lang/constant/MethodHandleDesc;");
 
     /** {@link ClassDesc} representing {@link DirectMethodHandleDesc} */
-    public static final ClassDesc CD_DirectMethodHandleDesc = ClassDesc.of("java.lang.constant.DirectMethodHandleDesc");
+    public static final ClassDesc CD_DirectMethodHandleDesc = new ReferenceClassDescImpl("Ljava/lang/constant/DirectMethodHandleDesc;");
 
     /** {@link ClassDesc} representing {@link VarHandleDesc} */
-    public static final ClassDesc CD_VarHandleDesc = CD_VarHandle.nested("VarHandleDesc");
+    public static final ClassDesc CD_VarHandleDesc = new ReferenceClassDescImpl("Ljava/lang/invoke/VarHandle$VarHandleDesc;");
 
     /** {@link ClassDesc} representing {@link DirectMethodHandleDesc.Kind} */
-    public static final ClassDesc CD_MethodHandleDesc_Kind = CD_DirectMethodHandleDesc.nested("Kind");
+    public static final ClassDesc CD_MethodHandleDesc_Kind = new ReferenceClassDescImpl("Ljava/lang/constant/DirectMethodHandleDesc$Kind;");
 
     /** {@link ClassDesc} representing {@link DynamicConstantDesc} */
-    public static final ClassDesc CD_DynamicConstantDesc = ClassDesc.of("java.lang.constant.DynamicConstantDesc");
+    public static final ClassDesc CD_DynamicConstantDesc = new ReferenceClassDescImpl("Ljava/lang/constant/DynamicConstantDesc;");
 
     /** {@link ClassDesc} representing {@link DynamicCallSiteDesc} */
-    public static final ClassDesc CD_DynamicCallSiteDesc = ClassDesc.of("java.lang.constant.DynamicCallSiteDesc");
+    public static final ClassDesc CD_DynamicCallSiteDesc = new ReferenceClassDescImpl("Ljava/lang/constant/DynamicCallSiteDesc;");
 
     /** {@link ClassDesc} representing {@link ConstantBootstraps} */
-    public static final ClassDesc CD_ConstantBootstraps = ClassDesc.of("java.lang.invoke.ConstantBootstraps");
+    public static final ClassDesc CD_ConstantBootstraps = new ReferenceClassDescImpl("Ljava/lang/invoke/ConstantBootstraps;");
 
     private static final ClassDesc[] INDY_BOOTSTRAP_ARGS = {
-            ConstantDescs.CD_MethodHandles_Lookup,
-            ConstantDescs.CD_String,
-            ConstantDescs.CD_MethodType};
+            CD_MethodHandles_Lookup,
+            CD_String,
+            CD_MethodType};
 
     private static final ClassDesc[] CONDY_BOOTSTRAP_ARGS = {
-            ConstantDescs.CD_MethodHandles_Lookup,
-            ConstantDescs.CD_String,
-            ConstantDescs.CD_Class};
+            CD_MethodHandles_Lookup,
+            CD_String,
+            CD_Class};
 
     /** {@link MethodHandleDesc} representing {@link ConstantBootstraps#primitiveClass(Lookup, String, Class) ConstantBootstraps.primitiveClass} */
     public static final DirectMethodHandleDesc BSM_PRIMITIVE_CLASS
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java b/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
index d975eaa1d0c..d8a1ccd543b 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
+++ b/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
@@ -146,7 +146,6 @@ class ConstantUtils {
      * @throws IllegalArgumentException if the member name is invalid
      */
     public static String validateMemberName(String name, boolean method) {
-        requireNonNull(name);
         if (name.length() == 0)
             throw new IllegalArgumentException("zero-length member name");
         for (int i=0; i<name.length(); i++) {
diff --git a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java b/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java
index 77f61d83133..47aa3dc36d2 100644
--- a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java
+++ b/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java
@@ -67,8 +67,8 @@ final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
             name = "<init>";
 
         requireNonNull(kind);
-        validateClassOrInterface(requireNonNull(owner));
-        validateMemberName(requireNonNull(name), true);
+        validateClassOrInterface(owner);
+        validateMemberName(name, true);
         requireNonNull(type);
 
         switch (kind) {
diff --git a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
index bf6ae2670b1..180841cd798 100644
--- a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
@@ -87,12 +87,9 @@ public abstract non-sealed class DynamicConstantDesc<T>
                                   ClassDesc constantType,
                                   ConstantDesc... bootstrapArgs) {
         this.bootstrapMethod = requireNonNull(bootstrapMethod);
-        this.constantName = validateMemberName(requireNonNull(constantName), true);
+        this.constantName = validateMemberName(constantName, true);
         this.constantType = requireNonNull(constantType);
-        this.bootstrapArgs = requireNonNull(bootstrapArgs).clone();
-
-        if (constantName.length() == 0)
-            throw new IllegalArgumentException("Illegal invocation name: " + constantName);
+        this.bootstrapArgs = bootstrapArgs.length == 0 ? EMPTY_CONSTANTDESC : bootstrapArgs.clone();
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java b/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
index a2d06615e5d..7ee0995439a 100644
--- a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
+++ b/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
@@ -54,8 +54,8 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
      * @param validatedArgTypes {@link ClassDesc}s describing the trusted and validated parameter types
      */
     private MethodTypeDescImpl(ClassDesc returnType, ClassDesc[] validatedArgTypes) {
-        this.returnType = requireNonNull(returnType);
-        this.argTypes = requireNonNull(validatedArgTypes);
+        this.returnType = returnType;
+        this.argTypes = validatedArgTypes;
     }
 
     /**
@@ -66,12 +66,12 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
      * @param trustedArgTypes {@link ClassDesc}s describing the trusted parameter types
      */
     static MethodTypeDescImpl ofTrusted(ClassDesc returnType, ClassDesc[] trustedArgTypes) {
-        Objects.requireNonNull(returnType);
+        requireNonNull(returnType);
         if (trustedArgTypes.length == 0) // implicit null check
             return new MethodTypeDescImpl(returnType, ConstantUtils.EMPTY_CLASSDESC);
 
         for (ClassDesc cd : trustedArgTypes)
-            if (cd.isPrimitive() && cd.descriptorString().charAt(0) == 'V') // implicit null check
+            if (cd.descriptorString().charAt(0) == 'V') // implicit null check
                 throw new IllegalArgumentException("Void parameters not permitted");
 
         return new MethodTypeDescImpl(returnType, trustedArgTypes);
@@ -127,7 +127,7 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
 
     @Override
     public MethodTypeDesc changeReturnType(ClassDesc returnType) {
-        return new MethodTypeDescImpl(returnType, argTypes);
+        return new MethodTypeDescImpl(requireNonNull(returnType), argTypes);
     }
 
     @Override
@@ -143,8 +143,12 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
         Objects.checkFromToIndex(start, end, argTypes.length);
 
         ClassDesc[] newArgs = new ClassDesc[argTypes.length - (end - start)];
-        System.arraycopy(argTypes, 0, newArgs, 0, start);
-        System.arraycopy(argTypes, end, newArgs, start, argTypes.length - end);
+        if (start > 0) {
+            System.arraycopy(argTypes, 0, newArgs, 0, start);
+        }
+        if (end < argTypes.length) {
+            System.arraycopy(argTypes, end, newArgs, start, argTypes.length - end);
+        }
         return ofTrusted(returnType, newArgs);
     }
 
@@ -154,10 +158,13 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
             throw new IndexOutOfBoundsException(pos);
 
         ClassDesc[] newArgs = new ClassDesc[argTypes.length + paramTypes.length];
-        System.arraycopy(argTypes, 0, newArgs, 0, pos);
+        if (pos > 0) {
+            System.arraycopy(argTypes, 0, newArgs, 0, pos);
+        }
         System.arraycopy(paramTypes, 0, newArgs, pos, paramTypes.length);
-        System.arraycopy(argTypes, pos, newArgs, pos+paramTypes.length, argTypes.length - pos);
-
+        if (pos < argTypes.length) {
+            System.arraycopy(argTypes, pos, newArgs, pos + paramTypes.length, argTypes.length - pos);
+        }
         return ofTrusted(returnType, newArgs);
     }
 
diff --git a/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java b/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
index 4cc77b1851d..5e2aaa98442 100644
--- a/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
+++ b/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
@@ -47,10 +47,9 @@ final class ReferenceClassDescImpl implements ClassDesc {
      * @jvms 4.3.2 Field Descriptors
      */
     ReferenceClassDescImpl(String descriptor) {
-        requireNonNull(descriptor);
-        int len = ConstantUtils.skipOverFieldSignature(descriptor, 0, descriptor.length(), false);
-        if (len == 0 || len == 1
-            || len != descriptor.length())
+        int dLen = descriptor.length();
+        int len = ConstantUtils.skipOverFieldSignature(descriptor, 0, dLen, false);
+        if (len <= 1 || len != dLen)
             throw new IllegalArgumentException(String.format("not a valid reference type descriptor: %s", descriptor));
         this.descriptor = descriptor;
     }

From cff841f1de41c911ec1b642b998c074e13e75554 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 30 Apr 2024 09:13:12 +0000
Subject: [PATCH 248/486] 8328934: Assert that ABS input and output are legal

Reviewed-by: aph, dlong
---
 .../share/utilities/globalDefinitions.hpp     |  14 ++-
 test/hotspot/gtest/utilities/test_abs.cpp     | 115 ++++++++++++++++++
 2 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/gtest/utilities/test_abs.cpp

diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 87af33d97e7..34f0a40a826 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -37,6 +37,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <limits>
 #include <type_traits>
 
 class oopDesc;
@@ -1110,7 +1111,18 @@ template<class T> constexpr T MIN3(T a, T b, T c)      { return MIN2(MIN2(a, b),
 template<class T> constexpr T MAX4(T a, T b, T c, T d) { return MAX2(MAX3(a, b, c), d); }
 template<class T> constexpr T MIN4(T a, T b, T c, T d) { return MIN2(MIN3(a, b, c), d); }
 
-template<class T> inline T ABS(T x)                 { return (x > 0) ? x : -x; }
+#define ABS(x) asserted_abs(x, __FILE__, __LINE__)
+
+template<class T> inline T asserted_abs(T x, const char* file, int line) {
+  bool valid_arg = !(std::is_integral<T>::value && x == std::numeric_limits<T>::min());
+#ifdef ASSERT
+  if (!valid_arg) {
+    report_vm_error(file, line, "ABS: argument should not allow overflow");
+  }
+#endif
+  // Prevent exposure to UB by checking valid_arg here as well.
+  return (x < 0 && valid_arg) ? -x : x;
+}
 
 // Return the given value clamped to the range [min ... max]
 template<typename T>
diff --git a/test/hotspot/gtest/utilities/test_abs.cpp b/test/hotspot/gtest/utilities/test_abs.cpp
new file mode 100644
index 00000000000..74e4fdb02e9
--- /dev/null
+++ b/test/hotspot/gtest/utilities/test_abs.cpp
@@ -0,0 +1,115 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "precompiled.hpp"
+#include "unittest.hpp"
+#include "memory/allocation.hpp"
+#include "memory/resourceArea.inline.hpp"
+#include "runtime/thread.hpp"
+
+TEST(absTest, sanity) {
+  // Simple integer cases
+  EXPECT_EQ(0, ABS(0));
+  EXPECT_EQ(1, ABS(1));
+  EXPECT_EQ(1, ABS(-1));
+
+  // Simple floating point cases, should be exactly representable
+  EXPECT_EQ(0.0f, ABS(0.0f));
+  EXPECT_EQ(1.0f, ABS(1.0f));
+  EXPECT_EQ(1.0f, ABS(-1.0f));
+
+  EXPECT_EQ(0.0, ABS(0.0));
+  EXPECT_EQ(1.0, ABS(1.0));
+  EXPECT_EQ(1.0, ABS(-1.0));
+
+  // Upper bounds for unsigned integers
+  EXPECT_EQ(max_jubyte,  ABS(max_jubyte));
+  EXPECT_EQ(max_jushort, ABS(max_jushort));
+  EXPECT_EQ(max_juint,   ABS(max_juint));
+  EXPECT_EQ(max_julong,  ABS(max_julong));
+
+  // Upper bounds for signed integers
+  EXPECT_EQ(max_jbyte,  ABS(max_jbyte));
+  EXPECT_EQ(max_jshort, ABS(max_jshort));
+  EXPECT_EQ(max_jint,   ABS(max_jint));
+  EXPECT_EQ(max_jlong,  ABS(max_jlong));
+
+  // Lower valid bounds for signed integers
+  EXPECT_EQ(max_jbyte,  ABS(min_jbyte + 1));
+  EXPECT_EQ(max_jshort, ABS(min_jshort + 1));
+  EXPECT_EQ(max_jint,   ABS(min_jint + 1));
+  EXPECT_EQ(max_jlong,  ABS(min_jlong + 1));
+
+  // Lower bounds for signed integers after explicit FP cast
+  EXPECT_TRUE(ABS((float)min_jbyte)  > 0);
+  EXPECT_TRUE(ABS((float)min_jshort) > 0);
+  EXPECT_TRUE(ABS((float)min_jint)   > 0);
+  EXPECT_TRUE(ABS((float)min_jlong)  > 0);
+}
+
+// Now check what happens when we feed invalid arguments.
+
+#ifndef ASSERT
+
+// In release builds, ABS would return incorrect values.
+
+TEST(absTest, release_sanity) {
+  EXPECT_EQ(min_jbyte,  ABS(min_jbyte));
+  EXPECT_EQ(min_jshort, ABS(min_jshort));
+  EXPECT_EQ(min_jint,   ABS(min_jint));
+  EXPECT_EQ(min_jlong,  ABS(min_jlong));
+}
+
+#else
+
+// In debug builds, ABS would assert.
+
+TEST_VM_ASSERT_MSG(absTest, debug_sanity_min_jbyte,
+  "Error: ABS: argument should not allow overflow") {
+
+  jbyte r = ABS(min_jbyte); // should fail
+  EXPECT_TRUE(r > 0); // should not be normally reachable
+}
+
+TEST_VM_ASSERT_MSG(absTest, debug_sanity_min_jshort,
+  "Error: ABS: argument should not allow overflow") {
+
+  jshort r = ABS(min_jshort); // should fail
+  EXPECT_TRUE(r > 0); // should not be normally reachable
+}
+
+TEST_VM_ASSERT_MSG(absTest, debug_sanity_min_jint,
+  "Error: ABS: argument should not allow overflow") {
+
+  jint r = ABS(min_jint); // should fail
+  EXPECT_TRUE(r > 0); // should not be normally reachable
+}
+
+TEST_VM_ASSERT_MSG(absTest, debug_sanity_min_jlong,
+  "Error: ABS: argument should not allow overflow") {
+
+  jlong r = ABS(min_jlong); // should fail
+  EXPECT_TRUE(r > 0); // should not be normally reachable
+}
+
+#endif

From ef4ec2d3b061c0eeea1aba88135e8d0e272b3bea Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 30 Apr 2024 10:37:33 +0000
Subject: [PATCH 249/486] 8331284: Inline methods in softRefPolicy.cpp

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/shared/softRefPolicy.cpp | 35 -------------------
 src/hotspot/share/gc/shared/softRefPolicy.hpp |  8 +++--
 2 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 src/hotspot/share/gc/shared/softRefPolicy.cpp

diff --git a/src/hotspot/share/gc/shared/softRefPolicy.cpp b/src/hotspot/share/gc/shared/softRefPolicy.cpp
deleted file mode 100644
index b3467b523b8..00000000000
--- a/src/hotspot/share/gc/shared/softRefPolicy.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "gc/shared/softRefPolicy.hpp"
-
-SoftRefPolicy::SoftRefPolicy() :
-    _should_clear_all_soft_refs(false),
-    _all_soft_refs_clear(false) {
-}
-
-void SoftRefPolicy::cleared_all_soft_refs() {
-  _all_soft_refs_clear = true;
-}
diff --git a/src/hotspot/share/gc/shared/softRefPolicy.hpp b/src/hotspot/share/gc/shared/softRefPolicy.hpp
index 1b31262eca5..d3240d7079f 100644
--- a/src/hotspot/share/gc/shared/softRefPolicy.hpp
+++ b/src/hotspot/share/gc/shared/softRefPolicy.hpp
@@ -41,7 +41,9 @@ class SoftRefPolicy {
   bool _all_soft_refs_clear;
 
  public:
-  SoftRefPolicy();
+  SoftRefPolicy() :
+    _should_clear_all_soft_refs(false),
+    _all_soft_refs_clear(false) {}
 
   bool should_clear_all_soft_refs() { return _should_clear_all_soft_refs; }
   void set_should_clear_all_soft_refs(bool v) { _should_clear_all_soft_refs = v; }
@@ -51,7 +53,9 @@ class SoftRefPolicy {
 
   // Called by the GC after Soft Refs have been cleared to indicate
   // that the request in _should_clear_all_soft_refs has been fulfilled.
-  virtual void cleared_all_soft_refs();
+  void cleared_all_soft_refs() {
+    _all_soft_refs_clear = true;
+  }
 };
 
 class ClearedAllSoftRefs : public StackObj {

From 22a1c617dbe771d8f5cea52af0e2a630af34b35b Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Tue, 30 Apr 2024 13:08:35 +0000
Subject: [PATCH 250/486] 8330817: jdk/internal/vm/Continuation/OSRTest.java
 times out on libgraal

Reviewed-by: dnsimon, dlong
---
 test/jdk/jdk/internal/vm/Continuation/OSRTest.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/jdk/jdk/internal/vm/Continuation/OSRTest.java b/test/jdk/jdk/internal/vm/Continuation/OSRTest.java
index bf0bfeab674..a9eed4e93b6 100644
--- a/test/jdk/jdk/internal/vm/Continuation/OSRTest.java
+++ b/test/jdk/jdk/internal/vm/Continuation/OSRTest.java
@@ -32,13 +32,13 @@
 * @build jdk.test.whitebox.WhiteBox
 * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
 *
-* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI OSRTest true true true
-* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=inline,*::yield0 OSRTest true true false
-* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=dontinline,*::yield* OSRTest true true false
-* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=exclude,*::bar() OSRTest true false false
-* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI OSRTest false true true
-* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI OSRTest false true false
-* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=exclude,*::bar() OSRTest false false false
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=dontinline,*::foo* OSRTest true true true
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=dontinline,*::foo* -XX:CompileCommand=inline,*::yield0 OSRTest true true false
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=dontinline,*::foo* -XX:CompileCommand=dontinline,*::yield* OSRTest true true false
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=dontinline,*::foo* -XX:CompileCommand=exclude,*::bar() OSRTest true false false
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=dontinline,*::foo* OSRTest false true true
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=dontinline,*::foo* OSRTest false true false
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=dontinline,*::foo* -XX:CompileCommand=exclude,*::bar() OSRTest false false false
 *
 */
 

From 33e81229bd1b4b28cf2e35f0f8f0a42a04d59c3d Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 30 Apr 2024 13:52:08 +0000
Subject: [PATCH 251/486] 8331410: Remove unused
 MemAllocator::mem_allocate_inside_tlab

Reviewed-by: tschatzl, gli
---
 src/hotspot/share/gc/shared/memAllocator.cpp | 14 --------------
 src/hotspot/share/gc/shared/memAllocator.hpp |  1 -
 2 files changed, 15 deletions(-)

diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index 053f49dd6dd..971feed6aaf 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -250,19 +250,6 @@ HeapWord* MemAllocator::mem_allocate_outside_tlab(Allocation& allocation) const
   return mem;
 }
 
-HeapWord* MemAllocator::mem_allocate_inside_tlab(Allocation& allocation) const {
-  assert(UseTLAB, "should use UseTLAB");
-
-  // Try allocating from an existing TLAB.
-  HeapWord* mem = mem_allocate_inside_tlab_fast();
-  if (mem != nullptr) {
-    return mem;
-  }
-
-  // Try refilling the TLAB and allocating the object in it.
-  return mem_allocate_inside_tlab_slow(allocation);
-}
-
 HeapWord* MemAllocator::mem_allocate_inside_tlab_fast() const {
   return _thread->tlab().allocate(_word_size);
 }
@@ -331,7 +318,6 @@ HeapWord* MemAllocator::mem_allocate_inside_tlab_slow(Allocation& allocation) co
   return mem;
 }
 
-
 HeapWord* MemAllocator::mem_allocate_slow(Allocation& allocation) const {
   // Allocation of an oop can always invoke a safepoint.
   debug_only(allocation._thread->check_for_valid_safepoint_state());
diff --git a/src/hotspot/share/gc/shared/memAllocator.hpp b/src/hotspot/share/gc/shared/memAllocator.hpp
index bd4ae04babf..dca1add31b6 100644
--- a/src/hotspot/share/gc/shared/memAllocator.hpp
+++ b/src/hotspot/share/gc/shared/memAllocator.hpp
@@ -47,7 +47,6 @@ protected:
 
 private:
   // Allocate in a TLAB. Could allocate a new TLAB, and therefore potentially safepoint.
-  HeapWord* mem_allocate_inside_tlab(Allocation& allocation) const;
   HeapWord* mem_allocate_inside_tlab_slow(Allocation& allocation) const;
 
   // Allocate outside a TLAB. Could safepoint.

From 2cc8eccb360848f3ddf3259f1d943552f86234b9 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Tue, 30 Apr 2024 15:11:04 +0000
Subject: [PATCH 252/486] 8331346: Update PreviewFeature of STREAM_GATHERERS to
 JEP-473

Reviewed-by: pminborg, alanb
---
 .../share/classes/jdk/internal/javac/PreviewFeature.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index c24a58f0230..cfccff7dd93 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -79,7 +79,7 @@ public @interface PreviewFeature {
         STRUCTURED_CONCURRENCY,
         @JEP(number=466, title="ClassFile API", status="Second Preview")
         CLASSFILE_API,
-        @JEP(number=461, title="Stream Gatherers", status="Preview")
+        @JEP(number=473, title="Stream Gatherers", status="Second Preview")
         STREAM_GATHERERS,
         LANGUAGE_MODEL,
         /**

From f4caac8dea1c95234743712386cb28a1ecb11197 Mon Sep 17 00:00:00 2001
From: Tim Prinzing <tprinzing@openjdk.org>
Date: Tue, 30 Apr 2024 15:39:23 +0000
Subject: [PATCH 253/486] 8329138: Convert JFR FileForceEvent to static mirror
 event

Reviewed-by: alanb, egahlin
---
 .../jdk/internal/event/FileForceEvent.java    | 110 ++++++++++++++++++
 .../classes/sun/nio/ch/FileChannelImpl.java   |  15 ++-
 .../ch/SimpleAsynchronousFileChannelImpl.java |  26 ++++-
 .../sun/nio/fs/UnixChannelFactory.java        |   2 +-
 .../WindowsAsynchronousFileChannelImpl.java   |  26 ++++-
 .../sun/nio/fs/WindowsChannelFactory.java     |   2 +-
 .../jdk/jfr/events/EventConfigurations.java   |   3 +-
 .../jdk/jfr/events/FileForceEvent.java        |   8 +-
 .../jdk/jfr/internal/MirrorEvents.java        |   4 +-
 .../FileChannelImplInstrumentor.java          |  21 +---
 .../jfr/internal/instrument/JDKEvents.java    |   2 +-
 .../io/TestAsynchronousFileChannelEvents.java |  75 ++++++++++++
 12 files changed, 252 insertions(+), 42 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/event/FileForceEvent.java
 create mode 100644 test/jdk/jdk/jfr/event/io/TestAsynchronousFileChannelEvents.java

diff --git a/src/java.base/share/classes/jdk/internal/event/FileForceEvent.java b/src/java.base/share/classes/jdk/internal/event/FileForceEvent.java
new file mode 100644
index 00000000000..f6dec6c8a5e
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/event/FileForceEvent.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2024, 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.event;
+
+/**
+ * A JFR event for forced updates written to files.  This event is mirrored in
+ * {@code jdk.jfr.events.FileForceEvent } where the event annotations are
+ * provided.  Some of the methods are replaced by generated
+ * methods when jfr is enabled.  Note that the order of the arguments of the
+ * {@link #commit(long, long, String, boolean)} method
+ * must be the same as the order of the fields.
+ */
+public class FileForceEvent extends Event {
+
+    // THE ORDER OF THE FOLLOWING FIELDS IS IMPORTANT!
+    // The order must match the argument order of the generated commit method.
+    public String path;
+    public boolean metaData;
+
+    /**
+     * Helper method to offer the data needed to potentially commit an event.
+     * The duration of the operation is computed using the current
+     * timestamp and the given start time.  If the duration is meets
+     * or exceeds the configured value (determined by calling the generated method
+     * {@link #shouldCommit(long)}), an event will be emitted by calling
+     * {@link #commit(long, long, String, boolean)}.
+     *
+     * @param start     timestamp of the start of the operation
+     * @param path      the full pathname of the file
+     * @param metaData  true if the file metadata is updated
+     */
+    public static void offer(long start, String path, boolean metaData) {
+        long duration = timestamp() - start;
+        if (shouldCommit(duration)) {
+            commit(start, duration, path, metaData);
+        }
+    }
+
+    /**
+     * Actually commit an event.  The implementation is generated automatically.
+     * The order of the fields must be the same as the parameters in this method.
+     *
+     * @param start     timestamp of the start of the operation
+     * @param duration  time in nanoseconds to complete the operation
+     * @param path      the full pathname of the file
+     * @param metaData  true if the file metadata is updated
+     */
+    public static void commit(long start, long duration, String path, boolean metaData) {
+        // Generated by JFR
+    }
+
+    /**
+     * Determine if an event should be emitted.  The duration of the operation
+     * must exceed some threshold in order to commit the event.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     *
+     * @param duration  time in nanoseconds to complete the operation
+     * @return  true if the event should be commited
+     */
+    public static boolean shouldCommit(long duration) {
+        // Generated by JFR
+        return false;
+    }
+
+    /**
+     * Determine if this kind of event is enabled.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     *
+     * @return true if this type of event is enabled, false otherwise
+     */
+    public static boolean enabled() {
+        // Generated by JFR
+        return false;
+    }
+
+    /**
+     * Fetch the current timestamp in nanoseconds.  This method is used
+     * to determine the start and end of an operation.  The implementation
+     * of this method is generated automatically if jfr is enabled.
+     *
+     * @return  the current timestamp value
+     */
+    public static long timestamp() {
+        // Generated by JFR
+        return 0L;
+    }
+}
diff --git a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
index ab386bb14a5..0b72ee6a7c2 100644
--- a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
@@ -50,6 +50,7 @@ import java.util.Objects;
 
 import jdk.internal.access.JavaIOFileDescriptorAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.event.FileForceEvent;
 import jdk.internal.foreign.MemorySessionImpl;
 import jdk.internal.foreign.SegmentFactories;
 import jdk.internal.misc.Blocker;
@@ -486,8 +487,7 @@ public class FileChannelImpl
         }
     }
 
-    @Override
-    public void force(boolean metaData) throws IOException {
+    private void implForce(boolean metaData) throws IOException {
         ensureOpen();
         int rv = -1;
         int ti = -1;
@@ -511,6 +511,17 @@ public class FileChannelImpl
         }
     }
 
+    @Override
+    public void force(boolean metaData) throws IOException {
+        if (!FileForceEvent.enabled()) {
+            implForce(metaData);
+            return;
+        }
+        long start = FileForceEvent.timestamp();
+        implForce(metaData);
+        FileForceEvent.offer(start, path, metaData);
+    }
+
     // Assume at first that the underlying kernel supports sendfile/equivalent;
     // set this to true if we find out later that it doesn't
     //
diff --git a/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
index b41430c8d9d..5f3f91e7aff 100644
--- a/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package sun.nio.ch;
 
+import jdk.internal.event.FileForceEvent;
+
 import java.nio.channels.*;
 import java.util.concurrent.*;
 import java.nio.ByteBuffer;
@@ -50,19 +52,25 @@ public class SimpleAsynchronousFileChannelImpl
     // Used to make native read and write calls
     private static final FileDispatcher nd = new FileDispatcherImpl();
 
+    // file path
+    private final String path;
+
     // Thread-safe set of IDs of native threads, for signalling
     private final NativeThreadSet threads = new NativeThreadSet(2);
 
 
     SimpleAsynchronousFileChannelImpl(FileDescriptor fdObj,
+                                      String path,
                                       boolean reading,
                                       boolean writing,
                                       ExecutorService executor)
     {
         super(fdObj, reading, writing, executor);
+        this.path = path;
     }
 
     public static AsynchronousFileChannel open(FileDescriptor fdo,
+                                               String path,
                                                boolean reading,
                                                boolean writing,
                                                ThreadPool pool)
@@ -70,7 +78,7 @@ public class SimpleAsynchronousFileChannelImpl
         // Executor is either default or based on pool parameters
         ExecutorService executor = (pool == null) ?
             DefaultExecutorHolder.defaultExecutor : pool.executor();
-        return new SimpleAsynchronousFileChannelImpl(fdo, reading, writing, executor);
+        return new SimpleAsynchronousFileChannelImpl(fdo, path, reading, writing, executor);
     }
 
     @Override
@@ -151,8 +159,7 @@ public class SimpleAsynchronousFileChannelImpl
         }
     }
 
-    @Override
-    public void force(boolean metaData) throws IOException {
+    private void implForce(boolean metaData) throws IOException {
         int ti = threads.add();
         try {
             int n = 0;
@@ -169,6 +176,17 @@ public class SimpleAsynchronousFileChannelImpl
         }
     }
 
+    @Override
+    public void force(boolean metaData) throws IOException {
+        if (!FileForceEvent.enabled()) {
+            implForce(metaData);
+            return;
+        }
+        long start = FileForceEvent.timestamp();
+        implForce(metaData);
+        FileForceEvent.offer(start, path, metaData);
+    }
+
     @Override
     <A> Future<FileLock> implLock(final long position,
                                   final long size,
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java b/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
index 475b61036a2..8e5bf38882c 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
@@ -168,7 +168,7 @@ class UnixChannelFactory {
 
         // for now use simple implementation
         FileDescriptor fdObj = open(-1, path, null, flags, mode);
-        return SimpleAsynchronousFileChannelImpl.open(fdObj, flags.read, flags.write, pool);
+        return SimpleAsynchronousFileChannelImpl.open(fdObj, path.toString(), flags.read, flags.write, pool);
     }
 
     /**
diff --git a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
index a1bacc1fae1..15ae425850e 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
@@ -33,6 +33,7 @@ import java.io.IOException;
 import java.io.FileDescriptor;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.access.JavaIOFileDescriptorAccess;
+import jdk.internal.event.FileForceEvent;
 
 /**
  * Windows implementation of AsynchronousFileChannel using overlapped I/O.
@@ -63,6 +64,9 @@ public class WindowsAsynchronousFileChannelImpl
     // Used for force/truncate/size methods
     private static final FileDispatcher nd = new FileDispatcherImpl();
 
+    // file path
+    private final String path;
+
     // The handle is extracted for use in native methods invoked from this class.
     private final long handle;
 
@@ -79,6 +83,7 @@ public class WindowsAsynchronousFileChannelImpl
 
 
     private WindowsAsynchronousFileChannelImpl(FileDescriptor fdObj,
+                                               String path,
                                                boolean reading,
                                                boolean writing,
                                                Iocp iocp,
@@ -86,6 +91,7 @@ public class WindowsAsynchronousFileChannelImpl
         throws IOException
     {
         super(fdObj, reading, writing, iocp.executor());
+        this.path = path;
         this.handle = fdAccess.getHandle(fdObj);
         this.iocp = iocp;
         this.isDefaultIocp = isDefaultIocp;
@@ -94,6 +100,7 @@ public class WindowsAsynchronousFileChannelImpl
     }
 
     public static AsynchronousFileChannel open(FileDescriptor fdo,
+                                               String path,
                                                boolean reading,
                                                boolean writing,
                                                ThreadPool pool)
@@ -109,8 +116,7 @@ public class WindowsAsynchronousFileChannelImpl
             isDefaultIocp = false;
         }
         try {
-            return new
-                WindowsAsynchronousFileChannelImpl(fdo, reading, writing, iocp, isDefaultIocp);
+            return new WindowsAsynchronousFileChannelImpl(fdo, path, reading, writing, iocp, isDefaultIocp);
         } catch (IOException x) {
             // error binding to port so need to close it (if created for this channel)
             if (!isDefaultIocp)
@@ -196,8 +202,7 @@ public class WindowsAsynchronousFileChannelImpl
         return this;
     }
 
-    @Override
-    public void force(boolean metaData) throws IOException {
+    private void implForce(boolean metaData) throws IOException {
         try {
             begin();
             nd.force(fdObj, metaData);
@@ -206,6 +211,17 @@ public class WindowsAsynchronousFileChannelImpl
         }
     }
 
+    @Override
+    public void force(boolean metaData) throws IOException {
+        if (!FileForceEvent.enabled()) {
+            implForce(metaData);
+            return;
+        }
+        long start = FileForceEvent.timestamp();
+        implForce(metaData);
+        FileForceEvent.offer(start, path, metaData);
+    }
+
     // -- file locking --
 
     /**
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java b/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
index 3a14221d62a..59db82d3fab 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsChannelFactory.java
@@ -212,7 +212,7 @@ class WindowsChannelFactory {
 
         // create the AsynchronousFileChannel
         try {
-            return WindowsAsynchronousFileChannelImpl.open(fdObj, flags.read, flags.write, pool);
+            return WindowsAsynchronousFileChannelImpl.open(fdObj, pathForWindows, flags.read, flags.write, pool);
         } catch (IOException x) {
             // IOException is thrown if the file handle cannot be associated
             // with the completion port. All we can do is close the file.
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/EventConfigurations.java b/src/jdk.jfr/share/classes/jdk/jfr/events/EventConfigurations.java
index d4dba462f4b..7d829f69076 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/EventConfigurations.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/EventConfigurations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,5 +30,4 @@ import jdk.jfr.internal.event.EventConfiguration;
 public final class EventConfigurations {
     public static final EventConfiguration FILE_READ = JVMSupport.getConfiguration(FileReadEvent.class);
     public static final EventConfiguration FILE_WRITE = JVMSupport.getConfiguration(FileWriteEvent.class);
-    public static final EventConfiguration FILE_FORCE = JVMSupport.getConfiguration(FileForceEvent.class);
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/FileForceEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/FileForceEvent.java
index d54d5e9b2a4..495112ffa9d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/FileForceEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/FileForceEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,13 +29,14 @@ import jdk.jfr.Category;
 import jdk.jfr.Description;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
+import jdk.jfr.internal.MirrorEvent;
 import jdk.jfr.internal.Type;
 
 @Name(Type.EVENT_NAME_PREFIX + "FileForce")
 @Label("File Force")
 @Category("Java Application")
 @Description("Force updates to be written to file")
-public final class FileForceEvent extends AbstractJDKEvent {
+public final class FileForceEvent extends MirrorEvent {
 
     // The order of these fields must be the same as the parameters in
     // commit(..., String, boolean)
@@ -48,7 +49,4 @@ public final class FileForceEvent extends AbstractJDKEvent {
     @Description("Whether the file metadata is updated")
     public boolean metaData;
 
-    public static void commit(long start, long duration, String path, boolean metaData) {
-        // Generated
-    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
index db148c105c4..8ae1f3b031f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ import jdk.jfr.events.DeserializationEvent;
 import jdk.jfr.events.ErrorThrownEvent;
 import jdk.jfr.events.ExceptionStatisticsEvent;
 import jdk.jfr.events.ExceptionThrownEvent;
+import jdk.jfr.events.FileForceEvent;
 import jdk.jfr.events.ProcessStartEvent;
 import jdk.jfr.events.SecurityPropertyModificationEvent;
 import jdk.jfr.events.SecurityProviderServiceEvent;
@@ -55,6 +56,7 @@ final class MirrorEvents {
     // Add mirror event mapping here. See MirrorEvent class for details.
     static {
         register("jdk.internal.event.DeserializationEvent", DeserializationEvent.class);
+        register("jdk.internal.event.FileForceEvent", FileForceEvent.class);
         register("jdk.internal.event.ProcessStartEvent", ProcessStartEvent.class);
         register("jdk.internal.event.SecurityPropertyModificationEvent", SecurityPropertyModificationEvent.class);
         register("jdk.internal.event.SecurityProviderServiceEvent", SecurityProviderServiceEvent.class);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/FileChannelImplInstrumentor.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/FileChannelImplInstrumentor.java
index d0d8d9b4509..5a795395c72 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/FileChannelImplInstrumentor.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/FileChannelImplInstrumentor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,25 +45,6 @@ final class FileChannelImplInstrumentor {
 
     private String path;
 
-    @JIInstrumentationMethod
-    public void force(boolean metaData) throws IOException {
-        EventConfiguration eventConfiguration = EventConfigurations.FILE_FORCE;
-        if (!eventConfiguration.isEnabled()) {
-            force(metaData);
-            return;
-        }
-        long start = 0;
-        try {
-            start = EventConfiguration.timestamp();
-            force(metaData);
-        } finally {
-            long duration = EventConfiguration.timestamp() - start;
-            if (eventConfiguration.shouldCommit(duration)) {
-                FileForceEvent.commit(start, duration, path, metaData);
-            }
-        }
-    }
-
     @JIInstrumentationMethod
     public int read(ByteBuffer dst) throws IOException {
         EventConfiguration eventConfiguration = EventConfigurations.FILE_READ;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
index a6c65641cd3..fb981c42cae 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java
@@ -57,7 +57,6 @@ import jdk.internal.platform.Metrics;
 public final class JDKEvents {
 
     private static final Class<?>[] eventClasses = {
-        FileForceEvent.class,
         FileReadEvent.class,
         FileWriteEvent.class,
         ActiveSettingEvent.class,
@@ -68,6 +67,7 @@ public final class JDKEvents {
         jdk.internal.event.ErrorThrownEvent.class,
         jdk.internal.event.ExceptionStatisticsEvent.class,
         jdk.internal.event.ExceptionThrownEvent.class,
+        jdk.internal.event.FileForceEvent.class,
         jdk.internal.event.ProcessStartEvent.class,
         jdk.internal.event.SecurityPropertyModificationEvent.class,
         jdk.internal.event.SecurityProviderServiceEvent.class,
diff --git a/test/jdk/jdk/jfr/event/io/TestAsynchronousFileChannelEvents.java b/test/jdk/jdk/jfr/event/io/TestAsynchronousFileChannelEvents.java
new file mode 100644
index 00000000000..f1ddba369eb
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/io/TestAsynchronousFileChannelEvents.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package jdk.jfr.event.io;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Utils;
+import jdk.test.lib.jfr.Events;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousFileChannel;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.nio.file.StandardOpenOption.READ;
+import static java.nio.file.StandardOpenOption.WRITE;
+
+/**
+ * @test
+ * @key jfr
+ * @requires vm.hasJFR
+ * @library /test/lib /test/jdk
+ * @run main/othervm jdk.jfr.event.io.TestAsynchronousFileChannelEvents
+ */
+public class TestAsynchronousFileChannelEvents {
+
+    public static void main(String[] args) throws Throwable {
+        File tmp = Utils.createTempFile("TestAsynchronousFileChannelEvents", ".tmp").toFile();
+        String s = "unremarkable data";
+        ByteBuffer data = ByteBuffer.allocate(s.length());
+        data.put(s.getBytes());
+
+        try (Recording recording = new Recording();
+             AsynchronousFileChannel ch = AsynchronousFileChannel.open(tmp.toPath(), READ, WRITE)) {
+
+            List<IOEvent> expectedEvents = new ArrayList<>();
+            recording.enable(IOEvent.EVENT_FILE_FORCE).withThreshold(Duration.ofMillis(0));
+            recording.start();
+
+            data.flip();
+            ch.write(data, 0).get();
+
+            // test force(boolean)
+            ch.force(true);
+            expectedEvents.add(IOEvent.createFileForceEvent(tmp));
+
+            recording.stop();
+            List<RecordedEvent> events = Events.fromRecording(recording);
+            IOHelper.verifyEqualsInOrder(events, expectedEvents);
+        }
+    }
+}

From 130f71cadca5b46d9bf589708dcea03ad51e8de0 Mon Sep 17 00:00:00 2001
From: Evgeny Nikitin <enikitin@openjdk.org>
Date: Tue, 30 Apr 2024 15:48:09 +0000
Subject: [PATCH 254/486] 8326742: Change compiler tests without additional VM
 flags from @run driver to @run main

Reviewed-by: kvn, thartmann, chagedorn
---
 .../jtreg/compiler/ccp/TestShiftConvertAndNotification.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/ccp/TestShiftConvertAndNotification.java b/test/hotspot/jtreg/compiler/ccp/TestShiftConvertAndNotification.java
index 7ce44633670..a076a1c2558 100644
--- a/test/hotspot/jtreg/compiler/ccp/TestShiftConvertAndNotification.java
+++ b/test/hotspot/jtreg/compiler/ccp/TestShiftConvertAndNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -38,7 +38,7 @@
  * @bug 8313672
  * @summary Test CCP notification for value update of AndL through LShiftI and
  *          ConvI2L (no flags).
- * @run driver compiler.ccp.TestShiftConvertAndNotification
+ * @run main compiler.ccp.TestShiftConvertAndNotification
  *
  */
 

From 9ce21d1382a4f5ad601a7ee610bab64a9c575302 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Tue, 30 Apr 2024 16:02:55 +0000
Subject: [PATCH 255/486] 8327647: Occasional SIGSEGV in
 markWord::displaced_mark_helper() for SPECjvm2008 sunflow

Reviewed-by: coleenp, fyang, dlong
---
 src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp   |  2 ++
 src/hotspot/cpu/aarch64/templateTable_aarch64.cpp | 15 +++++----------
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp       |  2 ++
 src/hotspot/cpu/riscv/templateTable_riscv.cpp     | 15 +++++----------
 src/hotspot/cpu/x86/templateTable_x86.cpp         |  2 +-
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index da38f1d12e7..5fea0b8d925 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -1778,6 +1778,8 @@ void InterpreterMacroAssembler::load_field_entry(Register cache, Register index,
   ldr(cache, Address(rcpool, ConstantPoolCache::field_entries_offset()));
   add(cache, cache, Array<ResolvedFieldEntry>::base_offset_in_bytes());
   lea(cache, Address(cache, index));
+  // Prevents stale data from being read after the bytecode is patched to the fast bytecode
+  membar(MacroAssembler::LoadLoad);
 }
 
 void InterpreterMacroAssembler::load_method_entry(Register cache, Register index, int bcp_offset) {
diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index eaaefb55f36..f32a4ee7372 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -2355,7 +2355,9 @@ void TemplateTable::load_resolved_field_entry(Register obj,
   __ load_unsigned_byte(flags, Address(cache, in_bytes(ResolvedFieldEntry::flags_offset())));
 
   // TOS state
-  __ load_unsigned_byte(tos_state, Address(cache, in_bytes(ResolvedFieldEntry::type_offset())));
+  if (tos_state != noreg) {
+    __ load_unsigned_byte(tos_state, Address(cache, in_bytes(ResolvedFieldEntry::type_offset())));
+  }
 
   // Klass overwrite register
   if (is_static) {
@@ -3069,13 +3071,9 @@ void TemplateTable::fast_storefield(TosState state)
 
   // access constant pool cache
   __ load_field_entry(r2, r1);
-  __ push(r0);
-  // R1: field offset, R2: TOS, R3: flags
-  load_resolved_field_entry(r2, r2, r0, r1, r3);
-  __ pop(r0);
 
-  // Must prevent reordering of the following cp cache loads with bytecode load
-  __ membar(MacroAssembler::LoadLoad);
+  // R1: field offset, R2: field holder, R3: flags
+  load_resolved_field_entry(r2, r2, noreg, r1, r3);
 
   {
     Label notVolatile;
@@ -3163,9 +3161,6 @@ void TemplateTable::fast_accessfield(TosState state)
   // access constant pool cache
   __ load_field_entry(r2, r1);
 
-  // Must prevent reordering of the following cp cache loads with bytecode load
-  __ membar(MacroAssembler::LoadLoad);
-
   __ load_sized_value(r1, Address(r2, in_bytes(ResolvedFieldEntry::field_offset_offset())), sizeof(int), true /*is_signed*/);
   __ load_unsigned_byte(r3, Address(r2, in_bytes(ResolvedFieldEntry::flags_offset())));
 
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index a770482b121..c5f97b60c42 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -1881,6 +1881,8 @@ void InterpreterMacroAssembler::load_field_entry(Register cache, Register index,
   ld(cache, Address(xcpool, ConstantPoolCache::field_entries_offset()));
   add(cache, cache, Array<ResolvedIndyEntry>::base_offset_in_bytes());
   add(cache, cache, index);
+  // Prevents stale data from being read after the bytecode is patched to the fast bytecode
+  membar(MacroAssembler::LoadLoad);
 }
 
 void InterpreterMacroAssembler::get_method_counters(Register method,
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
index 6240e4b4b50..5c72ddc9f81 100644
--- a/src/hotspot/cpu/riscv/templateTable_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -2272,7 +2272,9 @@ void TemplateTable::load_resolved_field_entry(Register obj,
   __ load_unsigned_byte(flags, Address(cache, in_bytes(ResolvedFieldEntry::flags_offset())));
 
   // TOS state
-  __ load_unsigned_byte(tos_state, Address(cache, in_bytes(ResolvedFieldEntry::type_offset())));
+  if (tos_state != noreg) {
+    __ load_unsigned_byte(tos_state, Address(cache, in_bytes(ResolvedFieldEntry::type_offset())));
+  }
 
   // Klass overwrite register
   if (is_static) {
@@ -3036,13 +3038,9 @@ void TemplateTable::fast_storefield(TosState state) {
 
   // access constant pool cache
   __ load_field_entry(x12, x11);
-  __ push_reg(x10);
-  // X11: field offset, X12: TOS, X13: flags
-  load_resolved_field_entry(x12, x12, x10, x11, x13);
-  __ pop_reg(x10);
 
-  // Must prevent reordering of the following cp cache loads with bytecode load
-  __ membar(MacroAssembler::LoadLoad);
+  // X11: field offset, X12: field holder, X13: flags
+  load_resolved_field_entry(x12, x12, noreg, x11, x13);
 
   {
     Label notVolatile;
@@ -3133,9 +3131,6 @@ void TemplateTable::fast_accessfield(TosState state) {
   // access constant pool cache
   __ load_field_entry(x12, x11);
 
-  // Must prevent reordering of the following cp cache loads with bytecode load
-  __ membar(MacroAssembler::LoadLoad);
-
   __ load_sized_value(x11, Address(x12, in_bytes(ResolvedFieldEntry::field_offset_offset())), sizeof(int), true /*is_signed*/);
   __ load_unsigned_byte(x13, Address(x12, in_bytes(ResolvedFieldEntry::flags_offset())));
 
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 664cd86d486..248055337d8 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -3495,7 +3495,7 @@ void TemplateTable::fast_storefield(TosState state) {
   __ push(rax);
   __ load_field_entry(rcx, rax);
   load_resolved_field_entry(noreg, cache, rax, rbx, rdx);
-  // RBX: field offset, RCX: RAX: TOS, RDX: flags
+  // RBX: field offset, RAX: TOS, RDX: flags
   __ andl(rdx, (1 << ResolvedFieldEntry::is_volatile_shift));
   __ pop(rax);
 

From 3d11692bf369af951867209962e8bf5886d1655f Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 30 Apr 2024 16:15:07 +0000
Subject: [PATCH 256/486] 8331252: C2: MergeStores: handle negative shift
 values

Reviewed-by: kvn, shade
---
 src/hotspot/share/opto/memnode.cpp            |  4 +--
 .../jtreg/compiler/c2/TestMergeStores.java    | 25 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index a13a53f9b19..e0eed9e3f57 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -3108,8 +3108,8 @@ bool MergePrimitiveArrayStores::is_con_RShift(const Node* n, Node const*& base_o
       n->in(2)->is_ConI()) {
     base_out = n->in(1);
     shift_out = n->in(2)->get_int();
-    assert(shift_out >= 0, "must be positive");
-    return true;
+    // The shift must be positive:
+    return shift_out >= 0;
   }
   return false;
 }
diff --git a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
index 2f662a1ed26..55594650219 100644
--- a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
+++ b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
@@ -187,6 +187,10 @@ public class TestMergeStores {
         testGroups.put("test600", new HashMap<String,TestFunction>());
         testGroups.get("test600").put("test600R", (_,i) -> { return test600R(aB.clone(), aI.clone(), i); });
         testGroups.get("test600").put("test600a", (_,i) -> { return test600a(aB.clone(), aI.clone(), i); });
+
+        testGroups.put("test700", new HashMap<String,TestFunction>());
+        testGroups.get("test700").put("test700R", (_,i) -> { return test700R(aI.clone(), i); });
+        testGroups.get("test700").put("test700a", (_,i) -> { return test700a(aI.clone(), i); });
     }
 
     @Warmup(100)
@@ -220,7 +224,8 @@ public class TestMergeStores {
                  "test500a",
                  "test501a",
                  "test502a",
-                 "test600a"})
+                 "test600a",
+                 "test700a"})
     public void runTests(RunInfo info) {
         // Repeat many times, so that we also have multiple iterations for post-warmup to potentially recompile
         int iters = info.isWarmUp() ? 1_000 : 50_000;
@@ -1296,4 +1301,22 @@ public class TestMergeStores {
         return new Object[]{ aB, aI };
     }
 
+    @DontCompile
+    static Object[] test700R(int[] a, long v1) {
+        a[0] = (int)(v1 >> -1);
+        a[1] = (int)(v1 >> -2);
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_C_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",
+                  IRNode.STORE_L_OF_CLASS, "int\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"})
+    static Object[] test700a(int[] a, long v1) {
+        // Negative shift: cannot optimize
+        a[0] = (int)(v1 >> -1);
+        a[1] = (int)(v1 >> -2);
+        return new Object[]{ a };
+    }
 }

From aca1e8365bf0f64bf18caf798bbca1d25b3c4117 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Tue, 30 Apr 2024 16:20:10 +0000
Subject: [PATCH 257/486] 8329223: Parallel: Parallel GC resizes heap even if
 -Xms = -Xmx

Reviewed-by: ayang, gli
---
 src/hotspot/share/gc/shared/genArguments.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/gc/shared/genArguments.cpp b/src/hotspot/share/gc/shared/genArguments.cpp
index 8e8abc6fb96..da9fc3f9a85 100644
--- a/src/hotspot/share/gc/shared/genArguments.cpp
+++ b/src/hotspot/share/gc/shared/genArguments.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -276,6 +276,9 @@ void GenArguments::initialize_size_info() {
   // and maximum heap size since no explicit flags exist
   // for setting the old generation maximum.
   MaxOldSize = MAX2(MaxHeapSize - max_young_size, GenAlignment);
+  MinOldSize = MIN3(MaxOldSize,
+                    InitialHeapSize - initial_young_size,
+                    MinHeapSize - MinNewSize);
 
   size_t initial_old_size = OldSize;
 
@@ -287,9 +290,8 @@ void GenArguments::initialize_size_info() {
     // with the overall heap size).  In either case make
     // the minimum, maximum and initial sizes consistent
     // with the young sizes and the overall heap sizes.
-    MinOldSize = GenAlignment;
     initial_old_size = clamp(InitialHeapSize - initial_young_size, MinOldSize, MaxOldSize);
-    // MaxOldSize has already been made consistent above.
+    // MaxOldSize and MinOldSize have already been made consistent above.
   } else {
     // OldSize has been explicitly set on the command line. Use it
     // for the initial size but make sure the minimum allow a young
@@ -304,9 +306,10 @@ void GenArguments::initialize_size_info() {
                             ", -XX:OldSize flag is being ignored",
                             MaxHeapSize);
       initial_old_size = MaxOldSize;
+    } else if (initial_old_size < MinOldSize) {
+      log_warning(gc, ergo)("Inconsistency between initial old size and minimum old size");
+      MinOldSize = initial_old_size;
     }
-
-    MinOldSize = MIN2(initial_old_size, MinHeapSize - MinNewSize);
   }
 
   // The initial generation sizes should match the initial heap size,

From a863ef5d74e9001a143af4638422348ee946c939 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Tue, 30 Apr 2024 16:50:01 +0000
Subject: [PATCH 258/486] 8331207: Misleading example in DateFormat#parse docs

Reviewed-by: naoto
---
 src/java.base/share/classes/java/text/DateFormat.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/text/DateFormat.java b/src/java.base/share/classes/java/text/DateFormat.java
index d7a4b5a39b7..a67ba676836 100644
--- a/src/java.base/share/classes/java/text/DateFormat.java
+++ b/src/java.base/share/classes/java/text/DateFormat.java
@@ -407,7 +407,8 @@ public abstract class DateFormat extends Format {
 
     /**
      * Parse a date/time string according to the given parse position.  For
-     * example, a time text {@code "07/10/96 4:5 PM, PDT"} will be parsed into a {@code Date}
+     * example, if {@code this} has the pattern {@code "M/d/yy h:m a, z"},
+     * then a time text {@code "07/10/96 4:5 PM, PDT"} will be parsed into a {@code Date}
      * that is equivalent to {@code Date(837039900000L)}.
      *
      * <p> By default, parsing is lenient: If the input is not in the form used

From b96b38c2c9a310d5fe49b2eda3e113a71223c7d1 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <never@openjdk.org>
Date: Tue, 30 Apr 2024 17:33:23 +0000
Subject: [PATCH 259/486] 8318682: SA decoding of scalar replaced objects is
 broken

Reviewed-by: cjplummer, cslucas
---
 .../sun/jvm/hotspot/asm/Disassembler.java     |   5 +-
 .../jvm/hotspot/code/DebugInfoReadStream.java |  18 ++-
 .../sun/jvm/hotspot/code/MarkerValue.java     |  38 ++++++
 .../classes/sun/jvm/hotspot/code/NMethod.java |  17 ++-
 .../jvm/hotspot/code/ObjectMergeValue.java    |  71 +++++++++++
 .../sun/jvm/hotspot/code/ObjectValue.java     |   8 +-
 .../sun/jvm/hotspot/code/ScopeValue.java      |  23 +++-
 .../sun/jvm/hotspot/oops/ConstMethod.java     |   8 +-
 .../jtreg/ProblemList-generational-zgc.txt    |   1 +
 .../serviceability/sa/ClhsdbLauncher.java     |   1 +
 .../sa/ClhsdbTestAllocationMerge.java         |  64 ++++++++++
 .../sa/LingeredAppWithAllocationMerge.java    |  64 ++++++++++
 .../sa/TestDebugInfoDecode.java               | 119 ++++++++++++++++++
 13 files changed, 423 insertions(+), 14 deletions(-)
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MarkerValue.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectMergeValue.java
 create mode 100644 test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java
 create mode 100644 test/hotspot/jtreg/serviceability/sa/LingeredAppWithAllocationMerge.java
 create mode 100644 test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java
index 6fc7f94af38..11a4c3962bc 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/asm/Disassembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -91,6 +91,9 @@ public class Disassembler {
                           .get();
 
          String arch = targetSysProps.getProperty("os.arch");
+         if (arch.equals("x86_64")) {
+            arch = "amd64";
+         }
          String libname = "hsdis-" + arch + ext;
 
          List<String> libs = List.of(
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java
index 0ab2bbdc608..c687fa0bbf5 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,6 +74,22 @@ public class DebugInfoReadStream extends CompressedReadStream {
     return result;
   }
 
+  ScopeValue readObjectMergeValue() {
+    int id = readInt();
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(objectPool != null, "object pool does not exist");
+      for (Iterator itr = objectPool.iterator(); itr.hasNext();) {
+        ObjectValue ov = (ObjectValue) itr.next();
+        Assert.that(ov.id() != id, "should not be read twice");
+      }
+    }
+    ObjectValue result = new ObjectMergeValue(id);
+    // Cache the object since an object field could reference it.
+    objectPool.add(result);
+    result.readObject(this);
+    return result;
+  }
+
   ScopeValue getCachedObject() {
     int id = readInt();
     Assert.that(objectPool != null, "object pool does not exist");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MarkerValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MarkerValue.java
new file mode 100644
index 00000000000..39d48c60f2e
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MarkerValue.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024, 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.
+ *
+ */
+
+package sun.jvm.hotspot.code;
+
+import java.io.PrintStream;
+
+/** A placeholder value that has no concrete meaning other than helping constructing
+ * other values.
+ */
+public class MarkerValue extends ScopeValue {
+    public boolean isMarker() { return true; }
+
+    public void printOn(PrintStream tty) {
+        tty.print("marker");
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
index ec329aa131a..8eacd1a8a86 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -199,7 +199,7 @@ public class NMethod extends CodeBlob {
   public OopHandle getOopAt(int index) {
     if (index == 0) return null;
     if (Assert.ASSERTS_ENABLED) {
-      Assert.that(index > 0 && index <= getOopsLength(), "must be a valid non-zero index");
+      Assert.that(index > 0 && index <= getOopsLength(), "must be a valid non-zero index: " + index);
     }
     return oopsBegin().getOopHandleAt((index - 1) * VM.getVM().getOopSize());
   }
@@ -208,7 +208,7 @@ public class NMethod extends CodeBlob {
   public Address getMetadataAt(int index) {
     if (index == 0) return null;
     if (Assert.ASSERTS_ENABLED) {
-      Assert.that(index > 0 && index <= getMetadataLength(), "must be a valid non-zero index");
+      Assert.that(index > 0 && index <= getMetadataLength(), "must be a valid non-zero index: " + index);
     }
     return metadataBegin().getAddressAt((index - 1) * VM.getVM().getOopSize());
   }
@@ -298,6 +298,19 @@ public class NMethod extends CodeBlob {
     return null;
   }
 
+  /**
+   * Attempt to decode all the debug info in this nmethod.  This is intended purely for testing.
+   */
+  public void decodeAllScopeDescs() {
+    for (Address p = scopesPCsBegin(); p.lessThan(scopesPCsEnd()); p = p.addOffsetTo(pcDescSize)) {
+      PCDesc pd = new PCDesc(p);
+      if (pd.getPCOffset() == -1) {
+        break;
+      }
+      ScopeDesc sd = new ScopeDesc(this, pd.getScopeDecodeOffset(), pd.getObjDecodeOffset(), pd.getReexecute());
+    }
+  }
+
   /** ScopeDesc for an instruction */
   public ScopeDesc getScopeDescAt(Address pc) {
     PCDesc pd = getPCDescAt(pc);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectMergeValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectMergeValue.java
new file mode 100644
index 00000000000..e91c70f7597
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectMergeValue.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2024, 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.
+ *
+ */
+
+package sun.jvm.hotspot.code;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+class ObjectMergeValue extends ObjectValue {
+
+    private ScopeValue selector;
+    private ScopeValue mergePointer;
+    private List<ScopeValue> possibleObjects;
+
+    public ObjectMergeValue(int id) {
+        super(id);
+    }
+
+    public boolean isObjectMerge() { return true; }
+
+    void readObject(DebugInfoReadStream stream) {
+        selector = ScopeValue.readFrom(stream);
+        mergePointer = ScopeValue.readFrom(stream);
+        possibleObjects = new ArrayList<>();
+        int length = stream.readInt();
+        for (int i = 0; i < length; i++) {
+            ScopeValue val = readFrom(stream);
+            possibleObjects.add(val);
+        }
+    }
+
+    @Override
+    public void printOn(PrintStream tty) {
+        tty.print("merge_obj[" + id + "]");
+        tty.print(" selector=\"");
+        selector.printOn(tty);
+        tty.print("\"");
+
+        tty.print(" merge_pointer=\"");
+        mergePointer.printOn(tty);
+        tty.print("\"");
+
+        tty.print(", candidate_objs=[" + ((ObjectValue) possibleObjects.get(0)).id);
+        for (int i = 1; i < possibleObjects.size(); i++) {
+            tty.print("," + ((ObjectValue) possibleObjects.get(i)).id);
+        }
+        tty.print("]");
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectValue.java
index 56d0ce160f2..1cbc1f71e02 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectValue.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ObjectValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, 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
@@ -33,7 +33,8 @@ import sun.jvm.hotspot.utilities.*;
 /** An ObjectValue describes an object eliminated by escape analysis. */
 
 public class ObjectValue extends ScopeValue {
-  private int              id;
+  protected final int      id;
+  private boolean          isRoot;
   private ScopeValue       klass;
   private List<ScopeValue> fieldsValue;
 
@@ -61,8 +62,9 @@ public class ObjectValue extends ScopeValue {
   /** Serialization of debugging information */
 
   void readObject(DebugInfoReadStream stream) {
+    isRoot = stream.readBoolean();
     klass = readFrom(stream);
-    Assert.that(klass.isConstantOop(), "should be constant klass oop");
+    Assert.that(klass.isConstantOop(), "should be constant klass oop: " + klass);
     int length = stream.readInt();
     for (int i = 0; i < length; i++) {
       ScopeValue val = readFrom(stream);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeValue.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeValue.java
index 163b0d12294..4bb2076e8e9 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeValue.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ScopeValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 package sun.jvm.hotspot.code;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 
 import sun.jvm.hotspot.utilities.*;
 
@@ -51,6 +52,9 @@ public abstract class ScopeValue {
   static final int CONSTANT_DOUBLE_CODE = 4;
   static final int CONSTANT_OBJECT_CODE = 5;
   static final int CONSTANT_OBJECT_ID_CODE = 6;
+  static final int AUTO_BOX_OBJECT_CODE = 7;
+  static final int MARKER_CODE = 8;
+  static final int OBJECT_MERGE_CODE = 9;
 
   public boolean isLocation()       { return false; }
   public boolean isConstantInt()    { return false; }
@@ -58,6 +62,8 @@ public abstract class ScopeValue {
   public boolean isConstantLong()   { return false; }
   public boolean isConstantOop()    { return false; }
   public boolean isObject()         { return false; }
+  public boolean isMarker()         { return false; }
+  public boolean isObjectMerge()    { return false; }
 
   public static ScopeValue readFrom(DebugInfoReadStream stream) {
     switch (stream.readInt()) {
@@ -72,9 +78,17 @@ public abstract class ScopeValue {
     case CONSTANT_DOUBLE_CODE:
       return new ConstantDoubleValue(stream);
     case CONSTANT_OBJECT_CODE:
+    case AUTO_BOX_OBJECT_CODE:
+      // The C++ code handles these 2 cases separately because the autobox case needs
+      // some extra state during deoptimization.  That's not required to display the
+      // information so treat it like a normal object value.
       return stream.readObjectValue();
     case CONSTANT_OBJECT_ID_CODE:
       return stream.getCachedObject();
+    case MARKER_CODE:
+      return new MarkerValue();
+    case OBJECT_MERGE_CODE:
+      return stream.readObjectMergeValue();
     default:
       Assert.that(false, "should not reach here");
       return null;
@@ -82,4 +96,11 @@ public abstract class ScopeValue {
   }
 
   public abstract void printOn(PrintStream tty);
+
+  public String toString() {
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    PrintStream ps = new PrintStream(baos, true, StandardCharsets.UTF_8);
+    printOn(ps);
+    return baos.toString(StandardCharsets.UTF_8);
+  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java
index 4bd2c9d3cbd..4e7456a7745 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -317,13 +317,9 @@ public class ConstMethod extends Metadata {
       return -1;
     }
 
-    if (Assert.ASSERTS_ENABLED) {
-        Assert.that(0 <= bci && bci < getCodeSize(),
-                    "illegal bci(" + bci + ") codeSize(" + getCodeSize() + ")");
-    }
     int bestBCI  =  0;
     int bestLine = -1;
-    if (hasLineNumberTable()) {
+    if (0 <= bci && bci < getCodeSize() && hasLineNumberTable()) {
       // The line numbers are a short array of 2-tuples [start_pc, line_number].
       // Not necessarily sorted and not necessarily one-to-one.
       CompressedLineNumberReadStream stream =
diff --git a/test/hotspot/jtreg/ProblemList-generational-zgc.txt b/test/hotspot/jtreg/ProblemList-generational-zgc.txt
index cbe76d68dff..a92751cc621 100644
--- a/test/hotspot/jtreg/ProblemList-generational-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-generational-zgc.txt
@@ -106,6 +106,7 @@ serviceability/sa/jmap-hprof/JMapHProfLargeHeapProc.java      8307393   generic-
 serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java      8307393   generic-all
 serviceability/sa/sadebugd/ClhsdbAttachToDebugServer.java     8307393   generic-all
 serviceability/sa/sadebugd/ClhsdbTestConnectArgument.java     8307393   generic-all
+serviceability/sa/ClhsdbTestAllocationMerge.java              8307393   generic-all
 serviceability/sa/sadebugd/DebugdConnectTest.java             8307393   generic-all
 serviceability/sa/sadebugd/DebugdUtils.java                   8307393   generic-all
 serviceability/sa/sadebugd/DisableRegistryTest.java           8307393   generic-all
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbLauncher.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbLauncher.java
index 961311f5d5b..849ec2eb109 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbLauncher.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbLauncher.java
@@ -149,6 +149,7 @@ public class ClhsdbLauncher {
         oa.shouldNotMatch("^WARNING in native method:.*$");
         // This will detect most SA failures, including during the attach.
         oa.shouldNotMatch("^sun.jvm.hotspot.debugger.DebuggerException:.*$");
+        oa.shouldNotMatch("sun.jvm.hotspot.utilities.AssertionFailure");
         // This will detect unexpected exceptions, like NPEs and asserts, that are caught
         // by sun.jvm.hotspot.CommandProcessor.
         oa.shouldNotMatch("^Error: .*$");
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java
new file mode 100644
index 00000000000..2e17bc038de
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.List;
+import jdk.test.lib.apps.LingeredApp;
+import jtreg.SkippedException;
+
+/**
+ * @test
+ * @bug 8318682
+ * @summary Test clhsdb that decoding of AllocationMerge objects in debug info works correctly
+ * @requires vm.hasSA
+ * @library /test/lib
+ * @run main/othervm ClhsdbTestAllocationMerge
+ */
+
+public class ClhsdbTestAllocationMerge {
+
+    public static void main(String[] args) throws Exception {
+        System.out.println("Starting ClhsdbTestDebugInfodDecode test");
+
+        LingeredApp theApp = null;
+        try {
+            ClhsdbLauncher test = new ClhsdbLauncher();
+
+            theApp = new LingeredAppWithAllocationMerge();
+            LingeredApp.startApp(theApp);
+            System.out.println("Started LingeredAppWithAllocationMerge with pid " + theApp.getPid());
+
+            List<String> cmds = List.of("jstack -v");
+
+            // sun.jvm.hotspot.utilities.AssertionFailure is caught by the harness so it's not
+            // necessary to include extra filters here.
+            test.run(theApp.getPid(), cmds, null, null);
+        } catch (SkippedException se) {
+            throw se;
+        } catch (Exception ex) {
+            throw new RuntimeException("Test ERROR " + ex, ex);
+        } finally {
+            LingeredApp.stopApp(theApp);
+        }
+        System.out.println("Test PASSED");
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/sa/LingeredAppWithAllocationMerge.java b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithAllocationMerge.java
new file mode 100644
index 00000000000..a4743d76307
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithAllocationMerge.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.apps.LingeredApp;
+
+// Derived from test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java
+public class LingeredAppWithAllocationMerge extends LingeredApp {
+    // Helper class
+    static class Point {
+        public int x;
+
+        public Point(int xx) {
+            this.x = xx;
+        }
+    }
+
+
+    public static Point p = new Point(0);
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 5000; i++) {
+            testIt(i, args);
+        }
+    }
+
+    public static void testIt(int i, String[] args) {
+        Point p = (i % 2 == 0) ? new Point(i) : new Point(i);
+
+        dummy(i, args);
+
+        if (i < 5000) {
+            dummy(i, args);
+        } else {
+            dummy(p.x + i, args);
+        }
+    }
+
+    public static void dummy(int x, String[] args) {
+        if (x > 4900) {
+            LingeredApp.main(args);
+            throw new InternalError("should never return");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java b/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java
new file mode 100644
index 00000000000..257f950b12f
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import sun.jvm.hotspot.HotSpotAgent;
+import sun.jvm.hotspot.code.CodeCacheVisitor;
+import sun.jvm.hotspot.code.CodeBlob;
+import sun.jvm.hotspot.code.NMethod;
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+
+import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.SA.SATestUtils;
+
+/**
+ * @test
+ * @bug 8318682
+ * @summary Test decoding debug info for all nmethods in the code cache
+ * @requires vm.hasSA
+ * @library /test/lib
+ * @modules jdk.hotspot.agent/sun.jvm.hotspot
+ *          jdk.hotspot.agent/sun.jvm.hotspot.code
+ *          jdk.hotspot.agent/sun.jvm.hotspot.debugger
+ *          jdk.hotspot.agent/sun.jvm.hotspot.runtime
+ * @run main/othervm/timeout=2400 -Xmx1g -Xcomp TestDebugInfoDecode
+ */
+
+public class TestDebugInfoDecode {
+
+    private static LingeredApp theApp = null;
+
+    private static void checkDecode(String pid) throws Exception {
+        HotSpotAgent agent = new HotSpotAgent();
+
+        try {
+            agent.attach(Integer.parseInt(pid));
+
+            CodeCacheVisitor v = new CodeCacheVisitor() {
+                    Throwable throwable;
+                    public void prologue(Address start, Address end) {
+                    }
+                    public void visit(CodeBlob blob) {
+                        if (throwable != null) {
+                            // Only report the first failure.
+                            return;
+                        }
+                        if (blob instanceof NMethod) {
+                            NMethod nm = (NMethod) blob;
+                            try {
+                                nm.decodeAllScopeDescs();
+                            } catch (Throwable t) {
+                                System.err.println("Exception while decoding debug info for " + blob);
+                                throwable = t;
+                                throw t;
+                            }
+                        }
+                    }
+                    public void epilogue() {
+                    }
+                };
+            VM.getVM().getCodeCache().iterate(v);
+        } finally {
+            agent.detach();
+        }
+    }
+
+    private static void createAnotherToAttach(long lingeredAppPid) throws Exception {
+        // Start a new process to attach to the lingered app
+        ProcessBuilder processBuilder = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "--add-modules=jdk.hotspot.agent",
+            "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot=ALL-UNNAMED",
+            "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.code=ALL-UNNAMED",
+            "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.debugger=ALL-UNNAMED",
+            "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.runtime=ALL-UNNAMED",
+            "TestDebugInfoDecode",
+            Long.toString(lingeredAppPid)
+        );
+        SATestUtils.addPrivilegesIfNeeded(processBuilder);
+        OutputAnalyzer SAOutput = ProcessTools.executeProcess(processBuilder);
+        SAOutput.shouldHaveExitValue(0);
+        System.out.println(SAOutput.getOutput());
+    }
+
+    public static void main (String... args) throws Exception {
+        SATestUtils.skipIfCannotAttach(); // throws SkippedException if attach not expected to work.
+        if (args == null || args.length == 0) {
+            try {
+                theApp = new LingeredApp();
+                LingeredApp.startApp(theApp);
+                createAnotherToAttach(theApp.getPid());
+            } finally {
+                LingeredApp.stopApp(theApp);
+            }
+        } else {
+            checkDecode(args[0]);
+        }
+    }
+}

From f215899a088d1abe86adccf0e65a073189272ddd Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Wed, 1 May 2024 08:09:53 +0000
Subject: [PATCH 260/486] 8331393: AArch64: u32 _partial_subtype_ctr
 loaded/stored as 64

Reviewed-by: aph, fyang
---
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp | 6 +-----
 src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp  | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 8eb2000359c..b90b5862ee5 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -1560,11 +1560,7 @@ void MacroAssembler::check_klass_subtype_slow_path(Register sub_klass,
   }
 
 #ifndef PRODUCT
-  mov(rscratch2, (address)&SharedRuntime::_partial_subtype_ctr);
-  Address pst_counter_addr(rscratch2);
-  ldr(rscratch1, pst_counter_addr);
-  add(rscratch1, rscratch1, 1);
-  str(rscratch1, pst_counter_addr);
+  incrementw(ExternalAddress((address)&SharedRuntime::_partial_subtype_ctr));
 #endif //PRODUCT
 
   // We will consult the secondary-super array.
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 29b95fdb2dd..8d207b3f665 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -86,10 +86,7 @@ class StubGenerator: public StubCodeGenerator {
 #define inc_counter_np(counter) ((void)0)
 #else
   void inc_counter_np_(uint& counter) {
-    __ lea(rscratch2, ExternalAddress((address)&counter));
-    __ ldrw(rscratch1, Address(rscratch2));
-    __ addw(rscratch1, rscratch1, 1);
-    __ strw(rscratch1, Address(rscratch2));
+    __ incrementw(ExternalAddress((address)&counter));
   }
 #define inc_counter_np(counter) \
   BLOCK_COMMENT("inc_counter " #counter); \

From 663acd2e173114fec7c2f50084af9ec56150d394 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Wed, 1 May 2024 08:40:48 +0000
Subject: [PATCH 261/486] 8330969: scalability issue with loaded JVMTI agent

Reviewed-by: amenkov, cjplummer
---
 src/hotspot/share/prims/jvmtiEnvBase.cpp     | 17 +++++------
 src/hotspot/share/prims/jvmtiThreadState.cpp | 32 +++++++++++---------
 src/hotspot/share/prims/jvmtiThreadState.hpp |  5 +--
 src/hotspot/share/runtime/javaThread.cpp     |  1 +
 src/hotspot/share/runtime/javaThread.hpp     |  4 +++
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index 4ed01df0b3d..1615e3c349c 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -1633,19 +1633,16 @@ private:
   }
 
   // This function is called only if _enable == true.
-  // Iterates over all JavaThread's, counts VTMS transitions and restores
-  // jt->jvmti_thread_state() and jt->jvmti_vthread() for VTMS transition protocol.
-  int count_transitions_and_correct_jvmti_thread_states() {
-    int count = 0;
-
+  // Iterates over all JavaThread's, restores jt->jvmti_thread_state() and
+  // jt->jvmti_vthread() for VTMS transition protocol.
+  void correct_jvmti_thread_states() {
     for (JavaThread* jt : ThreadsListHandle()) {
       if (jt->is_in_VTMS_transition()) {
-        count++;
+        jt->set_VTMS_transition_mark(true);
         continue; // no need in JvmtiThreadState correction below if in transition
       }
       correct_jvmti_thread_state(jt);
     }
-    return count;
   }
 
 public:
@@ -1655,9 +1652,9 @@ public:
   }
 
   void doit() {
-    int count = _enable ? count_transitions_and_correct_jvmti_thread_states() : 0;
-
-    JvmtiVTMSTransitionDisabler::set_VTMS_transition_count(count);
+    if (_enable) {
+      correct_jvmti_thread_states();
+    }
     JvmtiVTMSTransitionDisabler::set_VTMS_notify_jvmti_events(_enable);
   }
 };
diff --git a/src/hotspot/share/prims/jvmtiThreadState.cpp b/src/hotspot/share/prims/jvmtiThreadState.cpp
index 1e866236c98..c95f5646193 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.cpp
@@ -214,9 +214,6 @@ JvmtiThreadState::periodic_clean_up() {
 // Virtual Threads Mount State transition (VTMS transition) mechanism
 //
 
-// VTMS transitions cannot be disabled while this counter is positive.
-volatile int JvmtiVTMSTransitionDisabler::_VTMS_transition_count = 0;
-
 // VTMS transitions for one virtual thread are disabled while it is positive
 volatile int JvmtiVTMSTransitionDisabler::_VTMS_transition_disable_for_one_count = 0;
 
@@ -238,11 +235,14 @@ volatile bool JvmtiVTMSTransitionDisabler::_sync_protocol_enabled_permanently =
 #ifdef ASSERT
 void
 JvmtiVTMSTransitionDisabler::print_info() {
-  log_error(jvmti)("_VTMS_transition_count: %d\n", _VTMS_transition_count);
   log_error(jvmti)("_VTMS_transition_disable_for_one_count: %d\n", _VTMS_transition_disable_for_one_count);
   log_error(jvmti)("_VTMS_transition_disable_for_all_count: %d\n\n", _VTMS_transition_disable_for_all_count);
   int attempts = 10000;
   for (JavaThreadIteratorWithHandle jtiwh; JavaThread *java_thread = jtiwh.next(); ) {
+    if (java_thread->VTMS_transition_mark()) {
+      log_error(jvmti)("jt: %p VTMS_transition_mark: %d\n",
+                       (void*)java_thread, java_thread->VTMS_transition_mark());
+    }
     ResourceMark rm;
     // Handshake with target.
     PrintStackTraceClosure pstc;
@@ -358,11 +358,13 @@ JvmtiVTMSTransitionDisabler::VTMS_transition_disable_for_all() {
 
     // Block while some mount/unmount transitions are in progress.
     // Debug version fails and prints diagnostic information.
-    while (_VTMS_transition_count > 0) {
-      if (ml.wait(10)) {
-        attempts--;
+    for (JavaThreadIteratorWithHandle jtiwh; JavaThread *jt = jtiwh.next(); ) {
+      while (jt->VTMS_transition_mark()) {
+        if (ml.wait(10)) {
+          attempts--;
+        }
+        DEBUG_ONLY(if (attempts == 0) break;)
       }
-      DEBUG_ONLY(if (attempts == 0) break;)
     }
     assert(!thread->is_VTMS_transition_disabler(), "VTMS_transition sanity check");
 #ifdef ASSERT
@@ -427,8 +429,9 @@ JvmtiVTMSTransitionDisabler::start_VTMS_transition(jthread vthread, bool is_moun
   assert(!thread->is_in_VTMS_transition(), "VTMS_transition sanity check");
 
   // Avoid using MonitorLocker on performance critical path, use
-  // two-level synchronization with lock-free operations on counters.
-  Atomic::inc(&_VTMS_transition_count); // Try to enter VTMS transition section optmistically.
+  // two-level synchronization with lock-free operations on state bits.
+  assert(!thread->VTMS_transition_mark(), "sanity check");
+  thread->set_VTMS_transition_mark(true); // Try to enter VTMS transition section optmistically.
   java_lang_Thread::set_is_in_VTMS_transition(vt, true);
 
   if (!sync_protocol_enabled()) {
@@ -448,9 +451,9 @@ JvmtiVTMSTransitionDisabler::start_VTMS_transition(jthread vthread, bool is_moun
       thread->is_suspended() ||
       JvmtiVTSuspender::is_vthread_suspended(thread_id)
   ) {
-    // Slow path: undo unsuccessful optimistic counter incrementation.
+    // Slow path: undo unsuccessful optimistic set of the VTMS_transition_mark.
     // It can cause an extra waiting cycle for VTMS transition disablers.
-    Atomic::dec(&_VTMS_transition_count);
+    thread->set_VTMS_transition_mark(false);
     java_lang_Thread::set_is_in_VTMS_transition(vth(), false);
 
     while (true) {
@@ -470,7 +473,7 @@ JvmtiVTMSTransitionDisabler::start_VTMS_transition(jthread vthread, bool is_moun
         DEBUG_ONLY(if (attempts == 0) break;)
         continue;  // ~ThreadBlockInVM has handshake-based suspend point.
       }
-      Atomic::inc(&_VTMS_transition_count);
+      thread->set_VTMS_transition_mark(true);
       java_lang_Thread::set_is_in_VTMS_transition(vth(), true);
       break;
     }
@@ -495,7 +498,8 @@ JvmtiVTMSTransitionDisabler::finish_VTMS_transition(jthread vthread, bool is_mou
   thread->set_is_in_VTMS_transition(false);
   oop vt = JNIHandles::resolve_external_guard(vthread);
   java_lang_Thread::set_is_in_VTMS_transition(vt, false);
-  Atomic::dec(&_VTMS_transition_count);
+  assert(thread->VTMS_transition_mark(), "sanity check");
+  thread->set_VTMS_transition_mark(false);
 
   if (!sync_protocol_enabled()) {
     return;
diff --git a/src/hotspot/share/prims/jvmtiThreadState.hpp b/src/hotspot/share/prims/jvmtiThreadState.hpp
index 8d49f8af96c..ff7b6a1ebde 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.hpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.hpp
@@ -82,9 +82,8 @@ class JvmtiVTMSTransitionDisabler {
   static volatile int _VTMS_transition_disable_for_one_count; // transitions for one virtual thread are disabled while it is positive
   static volatile int _VTMS_transition_disable_for_all_count; // transitions for all virtual threads are disabled while it is positive
   static volatile bool _SR_mode;                         // there is an active suspender or resumer
-  static volatile int _VTMS_transition_count;            // current number of VTMS transitions
   static volatile int _sync_protocol_enabled_count;      // current number of JvmtiVTMSTransitionDisablers enabled sync protocol
-  static volatile bool _sync_protocol_enabled_permanently; // seen a suspender: JvmtiVTMSTraansitionDisabler protocol is enabled permanently
+  static volatile bool _sync_protocol_enabled_permanently; // seen a suspender: JvmtiVTMSTransitionDisabler protocol is enabled permanently
 
   bool _is_SR;                                           // is suspender or resumer
   jthread _thread;                                       // virtual thread to disable transitions for, no-op if it is a platform thread
@@ -100,8 +99,6 @@ class JvmtiVTMSTransitionDisabler {
   static bool VTMS_notify_jvmti_events()             { return _VTMS_notify_jvmti_events; }
   static void set_VTMS_notify_jvmti_events(bool val) { _VTMS_notify_jvmti_events = val; }
 
-  static void set_VTMS_transition_count(bool val)    { _VTMS_transition_count = val; }
-
   static void inc_sync_protocol_enabled_count()      { Atomic::inc(&_sync_protocol_enabled_count); }
   static void dec_sync_protocol_enabled_count()      { Atomic::dec(&_sync_protocol_enabled_count); }
   static int  sync_protocol_enabled_count()          { return Atomic::load(&_sync_protocol_enabled_count); }
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index cbb63fd60df..2e40c99455c 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -450,6 +450,7 @@ JavaThread::JavaThread() :
   _is_in_VTMS_transition(false),
   _is_in_tmp_VTMS_transition(false),
   _is_disable_suspend(false),
+  _VTMS_transition_mark(false),
 #ifdef ASSERT
   _is_VTMS_transition_disabler(false),
 #endif
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index abba4c75de8..6b6c9139b78 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -317,6 +317,7 @@ class JavaThread: public Thread {
   bool                  _is_in_VTMS_transition;          // thread is in virtual thread mount state transition
   bool                  _is_in_tmp_VTMS_transition;      // thread is in temporary virtual thread mount state transition
   bool                  _is_disable_suspend;             // JVMTI suspend is temporarily disabled; used on current thread only
+  bool                  _VTMS_transition_mark;           // used for sync between VTMS transitions and disablers
 #ifdef ASSERT
   bool                  _is_VTMS_transition_disabler;    // thread currently disabled VTMS transitions
 #endif
@@ -664,6 +665,9 @@ private:
   bool is_disable_suspend() const                { return _is_disable_suspend; }
   void toggle_is_disable_suspend()               { _is_disable_suspend = !_is_disable_suspend; };
 
+  bool VTMS_transition_mark() const              { return Atomic::load(&_VTMS_transition_mark); }
+  void set_VTMS_transition_mark(bool val)        { Atomic::store(&_VTMS_transition_mark, val); }
+
 #ifdef ASSERT
   bool is_VTMS_transition_disabler() const       { return _is_VTMS_transition_disabler; }
   void set_is_VTMS_transition_disabler(bool val);

From b2fb5ea13ba5087411410519213fc953ecc44618 Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Wed, 1 May 2024 11:53:28 +0000
Subject: [PATCH 262/486] 8331142: Add test for number of loader threads in
 BasicDirectoryModel

Reviewed-by: serb, tr
---
 .../LoaderThreadCount.java                    | 276 ++++++++++++++++++
 1 file changed, 276 insertions(+)
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java

diff --git a/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
new file mode 100644
index 00000000000..b471c51a260
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.LongStream;
+import java.util.stream.Stream;
+
+import javax.swing.JFileChooser;
+
+/*
+ * @test
+ * @bug 8325179
+ * @summary Verifies there's only one BasicDirectoryModel.FilesLoader thread
+ *          at any given moment
+ * @run main/othervm -Djava.awt.headless=true LoaderThreadCount
+ */
+public final class LoaderThreadCount extends ThreadGroup {
+    /** Initial number of files. */
+    private static final long NUMBER_OF_FILES = 500;
+
+    /**
+     * Number of threads running {@code fileChooser.rescanCurrentDirectory()}.
+     */
+    private static final int NUMBER_OF_THREADS = 5;
+
+    /** Number of snapshots with live threads. */
+    private static final int SNAPSHOTS = 20;
+
+    /** The barrier to synchronise scanner threads and capturing live threads. */
+    private static final CyclicBarrier start = new CyclicBarrier(NUMBER_OF_THREADS + 1);
+
+    /** List of scanner threads. */
+    private static final List<Thread> threads = new ArrayList<>(NUMBER_OF_THREADS);
+
+    /**
+     * Stores an exception caught by any of the threads.
+     * If more exceptions are caught, they're added as suppressed exceptions.
+     */
+    private static final AtomicReference<Throwable> exception =
+            new AtomicReference<>();
+
+    /**
+     * Stores an {@code IOException} thrown while removing the files.
+     */
+    private static final AtomicReference<IOException> ioException =
+            new AtomicReference<>();
+
+
+    public static void main(String[] args) throws Throwable {
+        try {
+            // Start the test in its own thread group to catch and handle
+            // all thrown exceptions, in particular in
+            // BasicDirectoryModel.FilesLoader which is created by Swing.
+            ThreadGroup threadGroup = new LoaderThreadCount();
+            Thread runner = new Thread(threadGroup,
+                                       LoaderThreadCount::wrapper,
+                                       "Test Runner");
+            runner.start();
+            runner.join();
+        } catch (Throwable throwable) {
+            handleException(throwable);
+        }
+
+        if (ioException.get() != null) {
+            System.err.println("An error occurred while removing files:");
+            ioException.get().printStackTrace();
+        }
+
+        if (exception.get() != null) {
+            throw exception.get();
+        }
+    }
+
+    private static void wrapper() {
+        final long timeStart = System.currentTimeMillis();
+        try {
+            runTest(timeStart);
+        } catch (Throwable throwable) {
+            handleException(throwable);
+        } finally {
+            System.out.printf("Duration: %,d\n",
+                              (System.currentTimeMillis() - timeStart));
+        }
+    }
+
+    private static void runTest(final long timeStart) throws Throwable {
+        final Path temp = Files.createDirectory(Paths.get("fileChooser-concurrency-" + timeStart));
+
+        try {
+            createFiles(temp);
+
+            final JFileChooser fc = new JFileChooser(temp.toFile());
+
+            threads.addAll(Stream.generate(() -> new Thread(new Scanner(fc)))
+                                 .limit(NUMBER_OF_THREADS)
+                                 .toList());
+            threads.forEach(Thread::start);
+
+            // Create snapshots of live threads
+            List<Thread[]> threadsCapture =
+                    Stream.generate(LoaderThreadCount::getThreadSnapshot)
+                          .limit(SNAPSHOTS)
+                          .toList();
+
+            threads.forEach(Thread::interrupt);
+
+            List<Long> loaderCount =
+                    threadsCapture.stream()
+                                  .map(ta -> Arrays.stream(ta)
+                                                   .filter(Objects::nonNull)
+                                                   .map(Thread::getName)
+                                                   .filter(tn -> tn.startsWith("Basic L&F File Loading Thread"))
+                                                   .count())
+                                  .filter(c -> c > 0)
+                                  .toList();
+
+            if (loaderCount.isEmpty()) {
+                throw new RuntimeException("Invalid results: no loader threads detected");
+            }
+
+            System.out.println("Number of snapshots: " + loaderCount.size());
+
+            long ones = loaderCount.stream()
+                                   .filter(n -> n == 1)
+                                   .count();
+            long twos = loaderCount.stream()
+                                   .filter(n -> n == 2)
+                                   .count();
+            long count = loaderCount.stream()
+                                    .filter(n -> n > 2)
+                                    .count();
+            System.out.println("Number of snapshots where number of loader threads:");
+            System.out.println("  = 1: " + ones);
+            System.out.println("  = 2: " + twos);
+            System.out.println("  > 2: " + count);
+            if (count > 0) {
+                throw new RuntimeException("Detected " + count + " snapshots "
+                                           + "with several loading threads");
+            }
+        } catch (Throwable e) {
+            threads.forEach(Thread::interrupt);
+            throw e;
+        } finally {
+            deleteFiles(temp);
+            deleteFile(temp);
+        }
+    }
+
+    private static Thread[] getThreadSnapshot() {
+        try {
+            start.await();
+            // Allow for the scanner threads to initiate re-scanning
+            Thread.sleep(10);
+
+            Thread[] array = new Thread[Thread.activeCount()];
+            Thread.currentThread()
+                  .getThreadGroup()
+                  .enumerate(array, false);
+
+            // Additional delay between captures
+            Thread.sleep(500);
+
+            return array;
+        } catch (InterruptedException | BrokenBarrierException e) {
+            handleException(e);
+            throw new RuntimeException("getThreadSnapshot is interrupted");
+        }
+    }
+
+
+    private LoaderThreadCount() {
+        super("bdmConcurrency");
+    }
+
+    @Override
+    public void uncaughtException(Thread t, Throwable e) {
+        handleException(t, e);
+    }
+
+    private static void handleException(Throwable throwable) {
+        handleException(Thread.currentThread(), throwable);
+    }
+
+    private static void handleException(final Thread thread,
+                                        final Throwable throwable) {
+        System.err.println("Exception in " + thread.getName() + ": "
+                           + throwable.getClass()
+                           + (throwable.getMessage() != null
+                              ? ": " + throwable.getMessage()
+                              : ""));
+        if (!exception.compareAndSet(null, throwable)) {
+            exception.get().addSuppressed(throwable);
+        }
+        threads.stream()
+               .filter(t -> t != thread)
+               .forEach(Thread::interrupt);
+    }
+
+
+    private record Scanner(JFileChooser fileChooser)
+            implements Runnable {
+
+        @Override
+        public void run() {
+            try {
+                do {
+                    start.await();
+                    fileChooser.rescanCurrentDirectory();
+                } while (!Thread.interrupted());
+            } catch (InterruptedException | BrokenBarrierException e) {
+                // Just exit the loop
+            }
+        }
+    }
+
+    private static void createFiles(final Path parent) {
+        LongStream.range(0, LoaderThreadCount.NUMBER_OF_FILES)
+                  .mapToObj(n -> parent.resolve(n + ".file"))
+                  .forEach(LoaderThreadCount::createFile);
+    }
+
+    private static void createFile(final Path file) {
+        try {
+            Files.createFile(file);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void deleteFiles(final Path parent) throws IOException {
+        try (var stream = Files.walk(parent)) {
+            stream.filter(p -> p != parent)
+                  .forEach(LoaderThreadCount::deleteFile);
+        }
+    }
+
+    private static void deleteFile(final Path file) {
+        try {
+            Files.delete(file);
+        } catch (IOException e) {
+            if (!ioException.compareAndSet(null, e)) {
+                ioException.get().addSuppressed(e);
+            }
+        }
+    }
+}

From 44dc85001d8c17a12efebd1a69d52e0b7e4e95e4 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Wed, 1 May 2024 12:19:11 +0000
Subject: [PATCH 263/486] 8331212: Error recovery for broken switch expressions
 could be improved

Reviewed-by: asotona
---
 .../com/sun/tools/javac/comp/Flow.java        |  3 +-
 .../tools/javac/recovery/FlowRecovery.java    | 92 +++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 test/langtools/tools/javac/recovery/FlowRecovery.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
index eda2772fb75..da008bc4b53 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -470,7 +470,8 @@ public class Flow {
 
         protected void scanSyntheticBreak(TreeMaker make, JCTree swtch) {
             if (swtch.hasTag(SWITCH_EXPRESSION)) {
-                JCYield brk = make.at(Position.NOPOS).Yield(null);
+                JCYield brk = make.at(Position.NOPOS).Yield(make.Erroneous()
+                                                                .setType(swtch.type));
                 brk.target = swtch;
                 scan(brk);
             } else {
diff --git a/test/langtools/tools/javac/recovery/FlowRecovery.java b/test/langtools/tools/javac/recovery/FlowRecovery.java
new file mode 100644
index 00000000000..930f230222b
--- /dev/null
+++ b/test/langtools/tools/javac/recovery/FlowRecovery.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2024, 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 8331212
+ * @summary Verify error recovery w.r.t. Flow
+ * @library /tools/lib
+ * @enablePreview
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          java.base/jdk.internal.classfile.impl
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main FlowRecovery
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+
+import toolbox.JavacTask;
+import toolbox.Task.Expect;
+import toolbox.Task.OutputKind;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+public class FlowRecovery extends TestRunner {
+
+    ToolBox tb;
+
+    public FlowRecovery() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public static void main(String[] args) throws Exception {
+        FlowRecovery t = new FlowRecovery();
+        t.runTests();
+    }
+
+    @Test //8331212
+    public void testYieldErrors() throws Exception {
+        String code = """
+                      class Test {
+                          public boolean test() {
+                              return switch (0) {
+                                  case 0 -> true;
+                                  default -> {}
+                              };
+                          }
+                      }
+                      """;
+        Path curPath = Path.of(".");
+        List<String> actual = new JavacTask(tb)
+                .options("-XDrawDiagnostics", "-XDdev")
+                .sources(code)
+                .outdir(curPath)
+                .run(Expect.FAIL)
+                .writeAll()
+                .getOutputLines(OutputKind.DIRECT);
+
+        List<String> expected = List.of(
+                "Test.java:5:25: compiler.err.rule.completes.normally",
+                "1 error"
+        );
+
+        if (!Objects.equals(actual, expected)) {
+            error("Expected: " + expected + ", but got: " + actual);
+        }
+    }
+
+}

From 4f529f8c232b4082aa4aa39766bcf42b09885ee4 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Wed, 1 May 2024 12:23:13 +0000
Subject: [PATCH 264/486] 8331427: Rename confusingly named
 ArraysSupport.signedHashCode

Reviewed-by: redestad
---
 .../share/classes/jdk/internal/util/ArraysSupport.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java b/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
index 61be28519fc..8f8ea651d65 100644
--- a/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
+++ b/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -200,7 +200,7 @@ public class ArraysSupport {
     public static int vectorizedHashCode(Object array, int fromIndex, int length, int initialValue,
                                          int basicType) {
         return switch (basicType) {
-            case T_BOOLEAN -> signedHashCode(initialValue, (byte[]) array, fromIndex, length);
+            case T_BOOLEAN -> unsignedHashCode(initialValue, (byte[]) array, fromIndex, length);
             case T_CHAR -> array instanceof byte[]
                     ? utf16hashCode(initialValue, (byte[]) array, fromIndex, length)
                     : hashCode(initialValue, (char[]) array, fromIndex, length);
@@ -211,7 +211,7 @@ public class ArraysSupport {
         };
     }
 
-    private static int signedHashCode(int result, byte[] a, int fromIndex, int length) {
+    private static int unsignedHashCode(int result, byte[] a, int fromIndex, int length) {
         int end = fromIndex + length;
         for (int i = fromIndex; i < end; i++) {
             result = 31 * result + (a[i] & 0xff);

From e833bfc8ac6104522d037e7eb300f5aa112688bb Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 1 May 2024 15:26:57 +0000
Subject: [PATCH 265/486] 8331222: Malformed text in the jpackage doc page

Reviewed-by: almatvee
---
 src/jdk.jpackage/share/man/jpackage.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jdk.jpackage/share/man/jpackage.1 b/src/jdk.jpackage/share/man/jpackage.1
index 3f5e062ee6c..f9848200059 100644
--- a/src/jdk.jpackage/share/man/jpackage.1
+++ b/src/jdk.jpackage/share/man/jpackage.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2018, 2024, 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
@@ -189,7 +189,7 @@ All files in the input directory will be packaged into the application
 image.
 .RE
 .TP
-\[ga]--app-content \f[I]additional-content\f[R][,\f[I]additional-content\f[R]...]
+\f[V]--app-content\f[R] \f[I]additional-content\f[R] [\f[V],\f[R]\f[I]additional-content\f[R]...]
 A comma separated list of paths to files and/or directories to add to
 the application payload.
 .RS
@@ -443,7 +443,7 @@ Group value of the RPM /.spec file or Section value of DEB control file
 Creates a shortcut for the application.
 .SS macOS platform options (available only when running on macOS):
 .TP
-\[aq]--mac-dmg-content \f[I]additional-content\f[R][,\f[I]additional-content\f[R]...]
+\f[V]--mac-dmg-content\f[R] \f[I]additional-content\f[R] [\f[V],\f[R]\f[I]additional-content\f[R]...]
 Include all the referenced content in the dmg.
 .RS
 .PP

From 2a95cd473aaefcacd976d1c17aa2badf330a6c32 Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Wed, 1 May 2024 16:38:25 +0000
Subject: [PATCH 266/486] 8331495: Limit
 BasicDirectoryModel/LoaderThreadCount.java to Windows only

Reviewed-by: prr
---
 .../swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
index b471c51a260..689aca5bbdb 100644
--- a/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
+++ b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
@@ -40,6 +40,7 @@ import javax.swing.JFileChooser;
 /*
  * @test
  * @bug 8325179
+ * @requires os.family == "windows"
  * @summary Verifies there's only one BasicDirectoryModel.FilesLoader thread
  *          at any given moment
  * @run main/othervm -Djava.awt.headless=true LoaderThreadCount

From 62d5d1e99c118b6ed26e79a2f7247308f8c23310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Trukenm=C3=BCller?= <truj@users.noreply.github.com>
Date: Wed, 1 May 2024 16:45:42 +0000
Subject: [PATCH 267/486] 8319598: SMFParser misinterprets interrupted running
 status

Reviewed-by: prr, serb
---
 .../media/sound/StandardMidiFileReader.java   |  13 +-
 .../File/SMFInterruptedRunningStatus.java     | 144 ++++++++++++++++++
 2 files changed, 154 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/javax/sound/midi/File/SMFInterruptedRunningStatus.java

diff --git a/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
index fb24eca6611..de2a8b6306b 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
@@ -313,10 +313,10 @@ final class SMFParser {
             // reset current tick to 0
             long tick = 0;
 
-            // reset current status byte to 0 (invalid value).
+            // reset current running status byte to 0 (invalid value).
             // this should cause us to throw an InvalidMidiDataException if we don't
             // get a valid status byte from the beginning of the track.
-            int status = 0;
+            int runningStatus = 0;
             boolean endOfTrackFound = false;
 
             while (!trackFinished() && !endOfTrackFound) {
@@ -333,10 +333,17 @@ final class SMFParser {
                 // check for new status
                 int byteValue = readUnsigned();
 
+                int status;
                 if (byteValue >= 0x80) {
                     status = byteValue;
+
+                    // update running status (only for channel messages)
+                    if ((status & 0xF0) != 0xF0) {
+                        runningStatus = status;
+                    }
                 } else {
-                    data1 = byteValue;
+                    status = runningStatus;
+                    data1  = byteValue;
                 }
 
                 switch (status & 0xF0) {
diff --git a/test/jdk/javax/sound/midi/File/SMFInterruptedRunningStatus.java b/test/jdk/javax/sound/midi/File/SMFInterruptedRunningStatus.java
new file mode 100644
index 00000000000..8aac012b455
--- /dev/null
+++ b/test/jdk/javax/sound/midi/File/SMFInterruptedRunningStatus.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.ByteArrayInputStream;
+
+import javax.sound.midi.MidiSystem;
+import javax.sound.midi.Sequence;
+import javax.sound.midi.Track;
+
+/**
+ * @test
+ * @bug 8319598
+ * @summary SMFParser bug with running status, interrupted by Meta or SysEx messages
+ */
+public class SMFInterruptedRunningStatus {
+
+    public static void main(String[] args) throws Exception {
+
+        byte[][] files = new byte[][] {SMF_1, SMF_2, SMF_3};
+        for (int i = 0; i < files.length; i++) {
+            Sequence seq = MidiSystem.getSequence(
+                    new ByteArrayInputStream(files[i]));
+            testSequence(seq, i + 1);
+        }
+
+        // no exception thrown, all files have been parsed correctly
+        System.out.println("Test passed");
+    }
+
+    private static void testSequence(Sequence seq, int fileNumber) {
+
+        // check number of tracks and number of events
+        Track[] tracks = seq.getTracks();
+        if (1 != tracks.length) {
+            throw new RuntimeException("file number "
+                    + fileNumber + " fails (incorrect number of tracks: "
+                    + tracks.length + ")");
+        }
+        Track track = tracks[0];
+        if (7 != track.size()) {
+            throw new RuntimeException("file number " + fileNumber
+                    + " fails (incorrect number of events: "
+                    + track.size() + ")");
+        }
+
+        // check status byte of each message
+        int[] expectedStatusBytes = new int[] {
+                0x90, 0xFF, 0x90, 0x90, 0x90, 0xFF, 0xFF};
+        for (int i = 0; i < expectedStatusBytes.length; i++) {
+            int expected = expectedStatusBytes[i];
+            if (expected != track.get(i).getMessage().getStatus()) {
+                throw new RuntimeException("file number " + fileNumber
+                        + " fails (wrong status byte in event " + i + ")");
+            }
+        }
+    }
+
+    // MIDI file without running status - should work equally before
+    // and after the bugfix
+    private static final byte[] SMF_1 = {
+        0x4D, 0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06,  // file header (start)
+        0x00, 0x01, 0x00, 0x01, 0x00, (byte) 0x80,       // file header (end)
+        0x4D, 0x54, 0x72, 0x6B, 0x00, 0x00, 0x00, 0x24,  // track header
+        0x00,                                            // delta time
+        (byte) 0x90, 0x3C, 0x7F,                         // Note-ON (C)
+        0x40,                                            // delta time
+        (byte) 0xFF, 0x01, 0x04, 0x54, 0x65, 0x73, 0x74, // META (text)
+        0x20,                                            // delta time
+        (byte) 0x90, 0x3C, 0x00,                         // Note-OFF (C)
+        0x20,                                            // delta time
+        (byte) 0x90, 0x3E, 0x7F,                         // Note-ON (D)
+        0x60,                                            // delta time
+        (byte) 0x90, 0x3E, 0x00,                         // Note-OFF (D)
+        0x20,                                            // delta time
+        (byte) 0xFF, 0x01, 0x04, 0x54, 0x65, 0x73, 0x74, // META (text)
+        0x00,                                            // delta time
+        (byte) 0xFF, 0x2F, 0x00                          // META (end of track)
+    };
+
+    // MIDI file with running status, interrupted by a META message
+    // - failed before the bugfix
+    private static final byte[] SMF_2 = {
+        0x4D, 0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06,  // file header (start)
+        0x00, 0x01, 0x00, 0x01, 0x00, (byte) 0x80,       // file header (end)
+        0x4D, 0x54, 0x72, 0x6B, 0x00, 0x00, 0x00, 0x21,  // track header
+        0x00,                                            // delta time
+        (byte) 0x90, 0x3C, 0x7F,                         // Note-ON (C)
+        0x40,                                            // delta time
+        (byte) 0xFF, 0x01, 0x04, 0x54, 0x65, 0x73, 0x74, // META (interruptor)
+        0x20,                                            // delta time
+        0x3C, 0x00,                                      // Note-OFF (C) - running status
+        0x20,                                            // delta time
+        0x3E, 0x7F,                                      // Note-ON (D) - running status
+        0x60,                                            // delta time
+        0x3E, 0x00,                                      // Note-OFF (D) - running status
+        0x20,                                            // delta time
+        (byte) 0xFF, 0x01, 0x04, 0x54, 0x65, 0x73, 0x74, // META (text)
+        0x00,                                            // delta time
+        (byte) 0xFF, 0x2F, 0x00                          // META (end of track)
+    };
+
+    // MIDI file with running status, interrupted by a META message
+    // - succeeded before the bugfix but with wrong interpretation of the data
+    private static final byte[] SMF_3 = {
+        0x4D, 0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06,  // file header (start)
+        0x00, 0x01, 0x00, 0x01, 0x00, (byte) 0x80,       // file header (end)
+        0x4D, 0x54, 0x72, 0x6B, 0x00, 0x00, 0x00, 0x21,  // track header
+        0x00,                                            // delta time
+        (byte) 0x90, 0x3C, 0x7F,                         // Note-ON (C)
+        0x40,                                            // delta time
+        (byte) 0xFF, 0x01, 0x04, 0x54, 0x65, 0x73, 0x74, // META (interruptor)
+        0x20,                                            // delta time
+        0x3C, 0x00,                                      // Note-OFF (C) - running status
+        0x0D,                                            // delta time
+        0x3E, 0x7F,                                      // Note-ON (D) - running status
+        0x60,                                            // delta time
+        0x3E, 0x00,                                      // Note-OFF (D) - running status
+        0x20,                                            // delta time
+        (byte) 0xFF, 0x01, 0x04, 0x54, 0x65, 0x73, 0x74, // META (text)
+        0x00,                                            // delta time
+        (byte) 0xFF, 0x2F, 0x00                          // META (end of track)
+    };
+}
+

From 0a24daecebd90eb46a813923bb2d5672514197ce Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Wed, 1 May 2024 18:02:47 +0000
Subject: [PATCH 268/486] 8322043: HeapDumper should use parallel dump by
 default

Reviewed-by: yyang, sspitsyn, dholmes
---
 src/hotspot/share/services/attachListener.cpp |  2 +-
 src/hotspot/share/services/heapDumper.cpp     | 12 ++++++++++++
 src/hotspot/share/services/heapDumper.hpp     |  6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/services/attachListener.cpp b/src/hotspot/share/services/attachListener.cpp
index 40b1a744018..d1531e1ec01 100644
--- a/src/hotspot/share/services/attachListener.cpp
+++ b/src/hotspot/share/services/attachListener.cpp
@@ -254,7 +254,7 @@ static jint dump_heap(AttachOperation* op, outputStream* out) {
     // This helps reduces the amount of unreachable objects in the dump
     // and makes it easier to browse.
     HeapDumper dumper(live_objects_only /* request GC */);
-    dumper.dump(path, out, level, false, HeapDumper::default_num_of_dump_threads());
+    dumper.dump(path, out, level);
   }
   return JNI_OK;
 }
diff --git a/src/hotspot/share/services/heapDumper.cpp b/src/hotspot/share/services/heapDumper.cpp
index c28f1021540..eb568304dc0 100644
--- a/src/hotspot/share/services/heapDumper.cpp
+++ b/src/hotspot/share/services/heapDumper.cpp
@@ -2604,6 +2604,18 @@ int HeapDumper::dump(const char* path, outputStream* out, int compression, bool
     out->print_cr("Dumping heap to %s ...", path);
     timer()->start();
   }
+
+  if (_oome && num_dump_threads > 1) {
+    // Each additional parallel writer requires several MB of internal memory
+    // (DumpWriter buffer, DumperClassCacheTable, GZipCompressor buffers).
+    // For the OOM handling we may already be limited in memory.
+    // Lets ensure we have at least 20MB per thread.
+    julong max_threads = os::free_memory() / (20 * M);
+    if (num_dump_threads > max_threads) {
+      num_dump_threads = MAX2<uint>(1, (uint)max_threads);
+    }
+  }
+
   // create JFR event
   EventHeapDump event;
 
diff --git a/src/hotspot/share/services/heapDumper.hpp b/src/hotspot/share/services/heapDumper.hpp
index bfc31b2f231..a69cf72aaf0 100644
--- a/src/hotspot/share/services/heapDumper.hpp
+++ b/src/hotspot/share/services/heapDumper.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -60,8 +60,8 @@ class HeapDumper : public StackObj {
   // dumps the heap to the specified file, returns 0 if success.
   // additional info is written to out if not null.
   // compression >= 0 creates a gzipped file with the given compression level.
-  // parallel_thread_num >= 0 indicates thread numbers of parallel object dump
-  int dump(const char* path, outputStream* out = nullptr, int compression = -1, bool overwrite = false, uint parallel_thread_num = 1);
+  // parallel_thread_num >= 0 indicates thread numbers of parallel object dump.
+  int dump(const char* path, outputStream* out = nullptr, int compression = -1, bool overwrite = false, uint parallel_thread_num = default_num_of_dump_threads());
 
   // returns error message (resource allocated), or null if no error
   char* error_as_C_string() const;

From 19e46eed580339a61fd1309c2cc7040e8c83597d Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Thu, 2 May 2024 01:41:09 +0000
Subject: [PATCH 269/486] 8331088: Incorrect TraceLoopPredicate output

Reviewed-by: chagedorn, dlong
---
 src/hotspot/share/opto/loopPredicate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index 29f4e6257fc..278f636d9c7 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -1247,7 +1247,7 @@ bool PhaseIdealLoop::loop_predication_impl_helper(IdealLoopTree* loop, IfProjNod
     IfNode* upper_bound_iff = upper_bound_proj->in(0)->as_If();
     _igvn.hash_delete(upper_bound_iff);
     upper_bound_iff->set_req(1, upper_bound_bol);
-    if (TraceLoopPredicate) tty->print_cr("upper bound check if: %d", lower_bound_iff->_idx);
+    if (TraceLoopPredicate) tty->print_cr("upper bound check if: %d", upper_bound_iff->_idx);
 
     // Fall through into rest of the cleanup code which will move any dependent nodes to the skeleton predicates of the
     // upper bound test. We always need to create skeleton predicates in order to properly remove dead loops when later

From 5ab8713b3fcdf8a1e9d44fc71190845f32449fce Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Thu, 2 May 2024 06:29:46 +0000
Subject: [PATCH 270/486] 8331360: RISCV: u32 _partial_subtype_ctr
 loaded/stored as 64

Reviewed-by: fyang, mli, tonyp
---
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp | 6 +-----
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp  | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 1cd7ac98b34..234d85ed246 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -3344,11 +3344,7 @@ void MacroAssembler::check_klass_subtype_slow_path(Register sub_klass,
   mv(x10, super_klass);
 
 #ifndef PRODUCT
-  mv(t1, (address)&SharedRuntime::_partial_subtype_ctr);
-  Address pst_counter_addr(t1);
-  ld(t0, pst_counter_addr);
-  add(t0, t0, 1);
-  sd(t0, pst_counter_addr);
+  incrementw(ExternalAddress((address)&SharedRuntime::_partial_subtype_ctr));
 #endif // PRODUCT
 
   // We will consult the secondary-super array.
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 9712f8c326c..582538a18b4 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -77,10 +77,7 @@ class StubGenerator: public StubCodeGenerator {
 #define inc_counter_np(counter) ((void)0)
 #else
   void inc_counter_np_(uint& counter) {
-    __ la(t1, ExternalAddress((address)&counter));
-    __ lwu(t0, Address(t1, 0));
-    __ addiw(t0, t0, 1);
-    __ sw(t0, Address(t1, 0));
+    __ incrementw(ExternalAddress((address)&counter));
   }
 #define inc_counter_np(counter) \
   BLOCK_COMMENT("inc_counter " #counter); \

From 9108091f0ce21a52c3b8b22a52485ee5594eb185 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 2 May 2024 07:06:25 +0000
Subject: [PATCH 271/486] 8330989: unify os::create_binary_file across
 platforms

Reviewed-by: dholmes, kbarrett
---
 src/hotspot/os/aix/os_aix.cpp         | 7 -------
 src/hotspot/os/bsd/os_bsd.cpp         | 8 --------
 src/hotspot/os/linux/os_linux.cpp     | 8 --------
 src/hotspot/os/windows/os_windows.cpp | 7 -------
 src/hotspot/share/runtime/os.cpp      | 7 +++++++
 5 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 1925357e1b4..f0a984d3d1f 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -2442,13 +2442,6 @@ int os::open(const char *path, int oflag, int mode) {
   return fd;
 }
 
-// create binary file, rewriting existing file if required
-int os::create_binary_file(const char* path, bool rewrite_existing) {
-  int oflags = O_WRONLY | O_CREAT;
-  oflags |= rewrite_existing ? O_TRUNC : O_EXCL;
-  return ::open(path, oflags, S_IREAD | S_IWRITE);
-}
-
 // return current position of file pointer
 jlong os::current_file_offset(int fd) {
   return (jlong)::lseek(fd, (off_t)0, SEEK_CUR);
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 17b52bc1efa..e5b6c74ce2f 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -2384,14 +2384,6 @@ int os::open(const char *path, int oflag, int mode) {
   return fd;
 }
 
-
-// create binary file, rewriting existing file if required
-int os::create_binary_file(const char* path, bool rewrite_existing) {
-  int oflags = O_WRONLY | O_CREAT;
-  oflags |= rewrite_existing ? O_TRUNC : O_EXCL;
-  return ::open(path, oflags, S_IREAD | S_IWRITE);
-}
-
 // return current position of file pointer
 jlong os::current_file_offset(int fd) {
   return (jlong)::lseek(fd, (off_t)0, SEEK_CUR);
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 3180dddfe50..20d3c99cd3e 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -5121,14 +5121,6 @@ int os::open(const char *path, int oflag, int mode) {
   return fd;
 }
 
-
-// create binary file, rewriting existing file if required
-int os::create_binary_file(const char* path, bool rewrite_existing) {
-  int oflags = O_WRONLY | O_CREAT;
-  oflags |= rewrite_existing ? O_TRUNC : O_EXCL;
-  return ::open(path, oflags, S_IREAD | S_IWRITE);
-}
-
 // return current position of file pointer
 jlong os::current_file_offset(int fd) {
   return (jlong)::lseek(fd, (off_t)0, SEEK_CUR);
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index ccd7a8f10ce..20422e83cb7 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -4889,13 +4889,6 @@ bool os::dir_is_empty(const char* path) {
   return is_empty;
 }
 
-// create binary file, rewriting existing file if required
-int os::create_binary_file(const char* path, bool rewrite_existing) {
-  int oflags = _O_CREAT | _O_WRONLY | _O_BINARY;
-  oflags |= rewrite_existing ? _O_TRUNC : _O_EXCL;
-  return ::open(path, oflags, _S_IREAD | _S_IWRITE);
-}
-
 // return current position of file pointer
 jlong os::current_file_offset(int fd) {
   return (jlong)::_lseeki64(fd, (__int64)0L, SEEK_CUR);
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 4e3bce88181..53c438cd208 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1711,6 +1711,13 @@ const char* os::errno_name(int e) {
   return errno_to_string(e, true);
 }
 
+// create binary file, rewriting existing file if required
+int os::create_binary_file(const char* path, bool rewrite_existing) {
+  int oflags = O_WRONLY | O_CREAT WINDOWS_ONLY(| O_BINARY);
+  oflags |= rewrite_existing ? O_TRUNC : O_EXCL;
+  return ::open(path, oflags, S_IREAD | S_IWRITE);
+}
+
 #define trace_page_size_params(size) byte_size_in_exact_unit(size), exact_unit_for_byte_size(size)
 
 void os::trace_page_sizes(const char* str,

From 4036d7d8246da0550adf8543848606c777da20a1 Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Thu, 2 May 2024 07:19:56 +0000
Subject: [PATCH 272/486] 8330076: NMT: add/make a mandatory MEMFLAGS argument
 to family of os::reserve/commit/uncommit memory API

Reviewed-by: stefank, jsjolen, stuefe
---
 .../cpu/aarch64/compressedKlass_aarch64.cpp   |   4 +-
 src/hotspot/os/aix/os_aix.cpp                 |  10 +-
 .../bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp   |   4 +-
 .../bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp   |   4 +-
 src/hotspot/os/bsd/os_bsd.cpp                 |  16 +--
 src/hotspot/os/linux/os_linux.cpp             |  26 ++--
 src/hotspot/os/posix/os_posix.cpp             |   6 +-
 src/hotspot/os/posix/perfMemory_posix.cpp     |   6 +-
 src/hotspot/os/windows/os_windows.cpp         |  70 ++++++-----
 src/hotspot/os/windows/perfMemory_windows.cpp |   6 +-
 src/hotspot/share/cds/archiveBuilder.cpp      |   2 +-
 src/hotspot/share/cds/filemap.cpp             |  27 +++--
 src/hotspot/share/cds/metaspaceShared.cpp     |  15 +--
 .../share/classfile/compactHashtable.cpp      |   4 +-
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |   2 +-
 .../share/gc/g1/g1PageBasedVirtualSpace.cpp   |   8 +-
 .../share/gc/g1/g1RegionToSpaceMapper.cpp     |   6 +-
 .../share/gc/parallel/mutableNUMASpace.cpp    |   4 +-
 .../share/gc/parallel/mutableSpace.cpp        |   4 +-
 .../share/gc/parallel/objectStartArray.cpp    |   3 +-
 .../share/gc/parallel/parMarkBitMap.cpp       |   6 +-
 .../share/gc/parallel/psParallelCompact.cpp   |   4 +-
 .../share/gc/parallel/psVirtualspace.cpp      |   4 +-
 .../gc/serial/serialBlockOffsetTable.cpp      |   4 +-
 src/hotspot/share/gc/shared/cardTable.cpp     |   9 +-
 .../gc/shenandoah/shenandoahCollectionSet.cpp |  10 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  40 +++---
 .../gc/shenandoah/shenandoahHeapRegion.cpp    |   4 +-
 .../share/gc/x/xMarkStackAllocator.cpp        |   6 +-
 src/hotspot/share/gc/x/xPhysicalMemory.cpp    |   6 +-
 src/hotspot/share/gc/x/xVirtualMemory.cpp     |   5 +-
 .../share/gc/z/zMarkStackAllocator.cpp        |   6 +-
 src/hotspot/share/gc/z/zNMT.cpp               |   4 +-
 .../jfr/recorder/storage/jfrVirtualMemory.cpp |   6 +-
 .../share/memory/allocation.inline.hpp        |   6 +-
 src/hotspot/share/memory/heap.cpp             |   6 +-
 src/hotspot/share/memory/metaspace.cpp        |   9 +-
 .../share/memory/metaspace/testHelpers.cpp    |   4 +-
 .../memory/metaspace/virtualSpaceNode.cpp     |   7 +-
 src/hotspot/share/memory/virtualspace.cpp     | 114 +++++++++---------
 src/hotspot/share/memory/virtualspace.hpp     |  38 +++---
 src/hotspot/share/nmt/memTracker.hpp          |  16 +--
 .../share/nmt/virtualMemoryTracker.cpp        |  12 +-
 .../share/nmt/virtualMemoryTracker.hpp        |  13 +-
 src/hotspot/share/oops/compressedKlass.cpp    |   4 +-
 src/hotspot/share/prims/jni.cpp               |   5 +-
 src/hotspot/share/prims/whitebox.cpp          |  16 +--
 src/hotspot/share/runtime/os.cpp              |  46 +++----
 src/hotspot/share/runtime/os.hpp              |  47 ++++----
 .../share/runtime/safepointMechanism.cpp      |   7 +-
 src/hotspot/share/utilities/debug.cpp         |   5 +-
 .../gtest/gc/g1/test_freeRegionList.cpp       |   2 +-
 .../gtest/gc/g1/test_stressCommitUncommit.cpp |   4 +-
 test/hotspot/gtest/gc/z/test_zForwarding.cpp  |   8 +-
 .../gtest/memory/test_virtualspace.cpp        |  24 ++--
 .../gtest/nmt/test_nmt_locationprinting.cpp   |   2 +-
 .../runtime/test_committed_virtualmemory.cpp  |   6 +-
 test/hotspot/gtest/runtime/test_os.cpp        |  36 +++---
 test/hotspot/gtest/runtime/test_os_linux.cpp  |  16 +--
 .../gtest/runtime/test_os_reserve_between.cpp |   8 +-
 .../hotspot/gtest/runtime/test_os_windows.cpp |   8 +-
 .../runtime/test_virtualMemoryTracker.cpp     |   8 +-
 62 files changed, 398 insertions(+), 420 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
index 54af69ffaba..c918d9bdf0e 100644
--- a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
@@ -69,7 +69,7 @@ static char* reserve_at_eor_compatible_address(size_t size, bool aslr) {
     const uint64_t immediate = ((uint64_t)immediates[index]) << 32;
     assert(immediate > 0 && Assembler::operand_valid_for_logical_immediate(/*is32*/false, immediate),
            "Invalid immediate %d " UINT64_FORMAT, index, immediate);
-    result = os::attempt_reserve_memory_at((char*)immediate, size, false);
+    result = os::attempt_reserve_memory_at((char*)immediate, size, !ExecMem, mtClass);
     if (result == nullptr) {
       log_trace(metaspace, map)("Failed to attach at " UINT64_FORMAT_X, immediate);
     }
@@ -112,7 +112,7 @@ char* CompressedKlassPointers::reserve_address_space_for_compressed_classes(size
   if (result == nullptr) {
     constexpr size_t alignment = nth_bit(32);
     log_debug(metaspace, map)("Trying to reserve at a 32-bit-aligned address");
-    result = os::reserve_memory_aligned(size, alignment, false);
+    result = os::reserve_memory_aligned(size, alignment, !ExecMem, mtClass);
   }
 
   return result;
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index f0a984d3d1f..862d8e8b0f4 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -1805,7 +1805,7 @@ bool os::remove_stack_guard_pages(char* addr, size_t size) {
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
 }
 
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
+void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) {
 }
 
 size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
@@ -1847,7 +1847,7 @@ bool os::numa_get_group_ids_for_range(const void** addresses, int* lgrp_ids, siz
 }
 
 // Reserves and attaches a shared memory segment.
-char* os::pd_reserve_memory(size_t bytes, bool exec) {
+char* os::pd_reserve_memory(size_t bytes, bool exec, MEMFLAGS flag) {
   // Always round to os::vm_page_size(), which may be larger than 4K.
   bytes = align_up(bytes, os::vm_page_size());
 
@@ -1996,7 +1996,7 @@ void os::large_page_init() {
   return; // Nothing to do. See query_multipage_support and friends.
 }
 
-char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec) {
+char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec, MEMFLAGS flag) {
   fatal("os::reserve_memory_special should not be called on AIX.");
   return nullptr;
 }
@@ -2015,7 +2015,7 @@ bool os::can_commit_large_page_memory() {
   return false;
 }
 
-char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc) {
+char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc, MEMFLAGS flag) {
   assert(file_desc >= 0, "file_desc is not valid");
   char* result = nullptr;
 
@@ -2033,7 +2033,7 @@ char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, i
 
 // Reserve memory at an arbitrary address, only if that area is
 // available (and not reserved for something else).
-char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec) {
+char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec, MEMFLAGS flag) {
   char* addr = nullptr;
 
   // Always round to os::vm_page_size(), which may be larger than 4K.
diff --git a/src/hotspot/os/bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp b/src/hotspot/os/bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp
index 2c64c3788d3..ea7a128cd13 100644
--- a/src/hotspot/os/bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp
+++ b/src/hotspot/os/bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -78,7 +78,7 @@ XPhysicalMemoryBacking::XPhysicalMemoryBacking(size_t max_capacity) :
     _initialized(false) {
 
   // Reserve address space for backing memory
-  _base = (uintptr_t)os::reserve_memory(max_capacity);
+  _base = (uintptr_t)os::reserve_memory(max_capacity, !ExecMem, mtJavaHeap);
   if (_base == 0) {
     // Failed
     log_error_pd(gc)("Failed to reserve address space for backing memory");
diff --git a/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp b/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
index bd1d7174c12..5bc901d0c0b 100644
--- a/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
+++ b/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -79,7 +79,7 @@ ZPhysicalMemoryBacking::ZPhysicalMemoryBacking(size_t max_capacity)
     _initialized(false) {
 
   // Reserve address space for backing memory
-  _base = (uintptr_t)os::reserve_memory(max_capacity);
+  _base = (uintptr_t)os::reserve_memory(max_capacity, !ExecMem, mtJavaHeap);
   if (_base == 0) {
     // Failed
     log_error_pd(gc)("Failed to reserve address space for backing memory");
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index e5b6c74ce2f..95f8016e2e9 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1668,7 +1668,7 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size,
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
 }
 
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
+void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) {
   ::madvise(addr, bytes, MADV_DONTNEED);
 }
 
@@ -1766,13 +1766,13 @@ bool os::pd_uncommit_memory(char* addr, size_t size, bool exec) {
 }
 
 bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
-  return os::commit_memory(addr, size, !ExecMem);
+  return os::commit_memory(addr, size, !ExecMem, mtThreadStack);
 }
 
 // If this is a growable mapping, remove the guard pages entirely by
 // munmap()ping them.  If not, just call uncommit_memory().
 bool os::remove_stack_guard_pages(char* addr, size_t size) {
-  return os::uncommit_memory(addr, size);
+  return os::uncommit_memory(addr, size, !ExecMem, mtThreadStack);
 }
 
 // 'requested_addr' is only treated as a hint, the return value may or
@@ -1809,7 +1809,7 @@ static int anon_munmap(char * addr, size_t size) {
   }
 }
 
-char* os::pd_reserve_memory(size_t bytes, bool exec) {
+char* os::pd_reserve_memory(size_t bytes, bool exec, MEMFLAGS flag) {
   return anon_mmap(nullptr /* addr */, bytes, exec);
 }
 
@@ -1869,7 +1869,7 @@ void os::large_page_init() {
 }
 
 
-char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec) {
+char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec, MEMFLAGS flag) {
   fatal("os::reserve_memory_special should not be called on BSD.");
   return nullptr;
 }
@@ -1888,9 +1888,9 @@ bool os::can_commit_large_page_memory() {
   return false;
 }
 
-char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc) {
+char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc, MEMFLAGS flag) {
   assert(file_desc >= 0, "file_desc is not valid");
-  char* result = pd_attempt_reserve_memory_at(requested_addr, bytes, !ExecMem);
+  char* result = pd_attempt_reserve_memory_at(requested_addr, bytes, !ExecMem, flag);
   if (result != nullptr) {
     if (replace_existing_mapping_with_file_mapping(result, bytes, file_desc) == nullptr) {
       vm_exit_during_initialization(err_msg("Error in mapping Java heap at the given filesystem directory"));
@@ -1902,7 +1902,7 @@ char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, i
 // Reserve memory at an arbitrary address, only if that area is
 // available (and not reserved for something else).
 
-char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec) {
+char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec, MEMFLAGS flag) {
   // Assert only that the size is a multiple of the page size, since
   // that's all that mmap requires, and since that's all we really know
   // about at this low abstraction level.  If we need higher alignment,
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 20d3c99cd3e..3181ad82dab 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -3023,14 +3023,14 @@ void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
   }
 }
 
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
+void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) {
   // This method works by doing an mmap over an existing mmaping and effectively discarding
   // the existing pages. However it won't work for SHM-based large pages that cannot be
   // uncommitted at all. We don't do anything in this case to avoid creating a segment with
   // small pages on top of the SHM segment. This method always works for small pages, so we
   // allow that in any case.
   if (alignment_hint <= os::vm_page_size() || can_commit_large_page_memory()) {
-    commit_memory(addr, bytes, alignment_hint, !ExecMem);
+    commit_memory(addr, bytes, alignment_hint, !ExecMem, flag);
   }
 }
 
@@ -3637,7 +3637,7 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
     }
   }
 
-  return os::commit_memory(addr, size, !ExecMem);
+  return os::commit_memory(addr, size, !ExecMem, mtThreadStack);
 }
 
 // If this is a growable mapping, remove the guard pages entirely by
@@ -3653,7 +3653,7 @@ bool os::remove_stack_guard_pages(char* addr, size_t size) {
     return ::munmap(addr, size) == 0;
   }
 
-  return os::uncommit_memory(addr, size);
+  return os::uncommit_memory(addr, size, !ExecMem, mtThreadStack);
 }
 
 // 'requested_addr' is only treated as a hint, the return value may or
@@ -3757,7 +3757,7 @@ static int anon_munmap(char * addr, size_t size) {
   return 1;
 }
 
-char* os::pd_reserve_memory(size_t bytes, bool exec) {
+char* os::pd_reserve_memory(size_t bytes, bool exec, MEMFLAGS flag) {
   return anon_mmap(nullptr, bytes);
 }
 
@@ -4214,7 +4214,7 @@ static char* reserve_memory_special_huge_tlbfs(size_t bytes,
 }
 
 char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size,
-                                    char* req_addr, bool exec) {
+                                    char* req_addr, bool exec, MEMFLAGS flag) {
   assert(UseLargePages, "only for large pages");
 
   char* const addr = reserve_memory_special_huge_tlbfs(bytes, alignment, page_size, req_addr, exec);
@@ -4249,9 +4249,9 @@ bool os::can_commit_large_page_memory() {
   return UseTransparentHugePages;
 }
 
-char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc) {
+char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc, MEMFLAGS flag) {
   assert(file_desc >= 0, "file_desc is not valid");
-  char* result = pd_attempt_reserve_memory_at(requested_addr, bytes, !ExecMem);
+  char* result = pd_attempt_reserve_memory_at(requested_addr, bytes, !ExecMem, flag);
   if (result != nullptr) {
     if (replace_existing_mapping_with_file_mapping(result, bytes, file_desc) == nullptr) {
       vm_exit_during_initialization(err_msg("Error in mapping Java heap at the given filesystem directory"));
@@ -4263,7 +4263,7 @@ char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, i
 // Reserve memory at an arbitrary address, only if that area is
 // available (and not reserved for something else).
 
-char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec) {
+char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec, MEMFLAGS flag) {
   // Assert only that the size is a multiple of the page size, since
   // that's all that mmap requires, and since that's all we really know
   // about at this low abstraction level.  If we need higher alignment,
@@ -4655,7 +4655,7 @@ static void workaround_expand_exec_shield_cs_limit() {
    */
   char* hint = (char*)(os::Linux::initial_thread_stack_bottom() -
                        (StackOverflow::stack_guard_zone_size() + page_size));
-  char* codebuf = os::attempt_reserve_memory_at(hint, page_size);
+  char* codebuf = os::attempt_reserve_memory_at(hint, page_size, !ExecMem, mtInternal);
 
   if (codebuf == nullptr) {
     // JDK-8197429: There may be a stack gap of one megabyte between
@@ -4663,15 +4663,13 @@ static void workaround_expand_exec_shield_cs_limit() {
     // Linux kernel workaround for CVE-2017-1000364.  If we failed to
     // map our codebuf, try again at an address one megabyte lower.
     hint -= 1 * M;
-    codebuf = os::attempt_reserve_memory_at(hint, page_size);
+    codebuf = os::attempt_reserve_memory_at(hint, page_size, !ExecMem, mtInternal);
   }
 
-  if ((codebuf == nullptr) || (!os::commit_memory(codebuf, page_size, true))) {
+  if ((codebuf == nullptr) || (!os::commit_memory(codebuf, page_size, ExecMem, mtInternal))) {
     return; // No matter, we tried, best effort.
   }
 
-  MemTracker::record_virtual_memory_type((address)codebuf, mtInternal);
-
   log_info(os)("[CS limit NX emulation work-around, exec code at: %p]", codebuf);
 
   // Some code to exec: the 'ret' instruction
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index a18a633002c..db3aef14543 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -395,9 +395,9 @@ static char* chop_extra_memory(size_t size, size_t alignment, char* extra_base,
 // Multiple threads can race in this code, and can remap over each other with MAP_FIXED,
 // so on posix, unmap the section at the start and at the end of the chunk that we mapped
 // rather than unmapping and remapping the whole chunk to get requested alignment.
-char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec) {
+char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec, MEMFLAGS flag) {
   size_t extra_size = calculate_aligned_extra_size(size, alignment);
-  char* extra_base = os::reserve_memory(extra_size, exec);
+  char* extra_base = os::reserve_memory(extra_size, exec, flag);
   if (extra_base == nullptr) {
     return nullptr;
   }
@@ -421,7 +421,7 @@ char* os::map_memory_to_file_aligned(size_t size, size_t alignment, int file_des
   if (replace_existing_mapping_with_file_mapping(aligned_base, size, file_desc) == nullptr) {
     vm_exit_during_initialization(err_msg("Error in mapping Java heap at the given filesystem directory"));
   }
-  MemTracker::record_virtual_memory_commit((address)aligned_base, size, CALLER_PC);
+  MemTracker::record_virtual_memory_commit((address)aligned_base, size, CALLER_PC, flag);
   return aligned_base;
 }
 
diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp
index 4339a21ae4e..2ed33c3fb9c 100644
--- a/src/hotspot/os/posix/perfMemory_posix.cpp
+++ b/src/hotspot/os/posix/perfMemory_posix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -65,14 +65,14 @@ static char* backing_store_file_name = nullptr;  // name of the backing store
 static char* create_standard_memory(size_t size) {
 
   // allocate an aligned chuck of memory
-  char* mapAddress = os::reserve_memory(size);
+  char* mapAddress = os::reserve_memory(size, !ExecMem, mtInternal);
 
   if (mapAddress == nullptr) {
     return nullptr;
   }
 
   // commit memory
-  if (!os::commit_memory(mapAddress, size, !ExecMem)) {
+  if (!os::commit_memory(mapAddress, size, !ExecMem, mtInternal)) {
     if (PrintMiscellaneous && Verbose) {
       warning("Could not commit PerfData memory\n");
     }
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 20422e83cb7..a99e67d417c 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -2755,7 +2755,7 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
           addr = (address)((uintptr_t)addr &
                             (~((uintptr_t)os::vm_page_size() - (uintptr_t)1)));
           os::commit_memory((char *)addr, thread->stack_base() - addr,
-                            !ExecMem);
+                            !ExecMem, mtThreadStack);
           return EXCEPTION_CONTINUE_EXECUTION;
         }
 #endif
@@ -3117,8 +3117,9 @@ static bool numa_interleaving_init() {
 // Reasons for doing this:
 //  * UseLargePagesIndividualAllocation was set (normally only needed on WS2003 but possible to be set otherwise)
 //  * UseNUMAInterleaving requires a separate node for each piece
-static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
+static char* allocate_pages_individually(size_t bytes, char* addr, DWORD alloc_type,
                                          DWORD prot,
+                                         MEMFLAGS flag,
                                          bool should_inject_error = false) {
   char * p_buf;
   // note: at setup time we guaranteed that NUMAInterleaveGranularity was aligned up to a page size
@@ -3142,7 +3143,7 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
                                 PAGE_READWRITE);
   // If reservation failed, return null
   if (p_buf == nullptr) return nullptr;
-  MemTracker::record_virtual_memory_reserve((address)p_buf, size_of_reserve, CALLER_PC);
+  MemTracker::record_virtual_memory_reserve((address)p_buf, size_of_reserve, CALLER_PC, flag);
   os::release_memory(p_buf, bytes + chunk_size);
 
   // we still need to round up to a page boundary (in case we are using large pages)
@@ -3184,13 +3185,13 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
       if (!UseNUMAInterleaving) {
         p_new = (char *) virtualAlloc(next_alloc_addr,
                                       bytes_to_rq,
-                                      flags,
+                                      alloc_type,
                                       prot);
       } else {
         // get the next node to use from the used_node_list
         assert(numa_node_list_holder.get_count() > 0, "Multiple NUMA nodes expected");
         DWORD node = numa_node_list_holder.get_node_list_entry(count % numa_node_list_holder.get_count());
-        p_new = (char *)virtualAllocExNuma(hProc, next_alloc_addr, bytes_to_rq, flags, prot, node);
+        p_new = (char *)virtualAllocExNuma(hProc, next_alloc_addr, bytes_to_rq, alloc_type, prot, node);
       }
     }
 
@@ -3203,7 +3204,7 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
         // need to create a dummy 'reserve' record to match
         // the release.
         MemTracker::record_virtual_memory_reserve((address)p_buf,
-                                                  bytes_to_release, CALLER_PC);
+                                                  bytes_to_release, CALLER_PC, flag);
         os::release_memory(p_buf, bytes_to_release);
       }
 #ifdef ASSERT
@@ -3220,10 +3221,10 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
   }
   // Although the memory is allocated individually, it is returned as one.
   // NMT records it as one block.
-  if ((flags & MEM_COMMIT) != 0) {
-    MemTracker::record_virtual_memory_reserve_and_commit((address)p_buf, bytes, CALLER_PC);
+  if ((alloc_type & MEM_COMMIT) != 0) {
+    MemTracker::record_virtual_memory_reserve_and_commit((address)p_buf, bytes, CALLER_PC, flag);
   } else {
-    MemTracker::record_virtual_memory_reserve((address)p_buf, bytes, CALLER_PC);
+    MemTracker::record_virtual_memory_reserve((address)p_buf, bytes, CALLER_PC, flag);
   }
 
   // made it this far, success
@@ -3351,7 +3352,7 @@ char* os::replace_existing_mapping_with_file_mapping(char* base, size_t size, in
 // Multiple threads can race in this code but it's not possible to unmap small sections of
 // virtual space to get requested alignment, like posix-like os's.
 // Windows prevents multiple thread from remapping over each other so this loop is thread-safe.
-static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int file_desc, MEMFLAGS flag = mtNone) {
+static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int file_desc, MEMFLAGS flag) {
   assert(is_aligned(alignment, os::vm_allocation_granularity()),
       "Alignment must be a multiple of allocation granularity (page size)");
   assert(is_aligned(size, os::vm_allocation_granularity()),
@@ -3365,7 +3366,7 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
 
   for (int attempt = 0; attempt < max_attempts && aligned_base == nullptr; attempt ++) {
     char* extra_base = file_desc != -1 ? os::map_memory_to_file(extra_size, file_desc, flag) :
-                                         os::reserve_memory(extra_size, false, flag);
+                                         os::reserve_memory(extra_size, !ExecMem, flag);
     if (extra_base == nullptr) {
       return nullptr;
     }
@@ -3382,7 +3383,7 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
     // Attempt to map, into the just vacated space, the slightly smaller aligned area.
     // Which may fail, hence the loop.
     aligned_base = file_desc != -1 ? os::attempt_map_memory_to_file_at(aligned_base, size, file_desc, flag) :
-                                     os::attempt_reserve_memory_at(aligned_base, size, false, flag);
+                                     os::attempt_reserve_memory_at(aligned_base, size, !ExecMem, flag);
   }
 
   assert(aligned_base != nullptr, "Did not manage to re-map after %d attempts?", max_attempts);
@@ -3390,22 +3391,22 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
   return aligned_base;
 }
 
-char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec) {
+char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec, MEMFLAGS flag) {
   // exec can be ignored
-  return map_or_reserve_memory_aligned(size, alignment, -1 /* file_desc */);
+  return map_or_reserve_memory_aligned(size, alignment, -1 /* file_desc */, flag);
 }
 
 char* os::map_memory_to_file_aligned(size_t size, size_t alignment, int fd, MEMFLAGS flag) {
   return map_or_reserve_memory_aligned(size, alignment, fd, flag);
 }
 
-char* os::pd_reserve_memory(size_t bytes, bool exec) {
-  return pd_attempt_reserve_memory_at(nullptr /* addr */, bytes, exec);
+char* os::pd_reserve_memory(size_t bytes, bool exec, MEMFLAGS flag) {
+  return pd_attempt_reserve_memory_at(nullptr /* addr */, bytes, exec, flag);
 }
 
 // Reserve memory at an arbitrary address, only if that area is
 // available (and not reserved for something else).
-char* os::pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool exec) {
+char* os::pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool exec, MEMFLAGS flag) {
   assert((size_t)addr % os::vm_allocation_granularity() == 0,
          "reserve alignment");
   assert(bytes % os::vm_page_size() == 0, "reserve page size");
@@ -3420,7 +3421,7 @@ char* os::pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool exec) {
     if (Verbose && PrintMiscellaneous) reserveTimer.start();
     // in numa interleaving, we have to allocate pages individually
     // (well really chunks of NUMAInterleaveGranularity size)
-    res = allocate_pages_individually(bytes, addr, MEM_RESERVE, PAGE_READWRITE);
+    res = allocate_pages_individually(bytes, addr, MEM_RESERVE, PAGE_READWRITE, flag);
     if (res == nullptr) {
       warning("NUMA page allocation failed");
     }
@@ -3441,7 +3442,7 @@ size_t os::vm_min_address() {
   return _vm_min_address_default;
 }
 
-char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc) {
+char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc, MEMFLAGS flag) {
   assert(file_desc >= 0, "file_desc is not valid");
   return map_memory_to_file(requested_addr, bytes, file_desc);
 }
@@ -3457,13 +3458,13 @@ bool os::can_commit_large_page_memory() {
   return false;
 }
 
-static char* reserve_large_pages_individually(size_t size, char* req_addr, bool exec) {
+static char* reserve_large_pages_individually(size_t size, char* req_addr, bool exec, MEMFLAGS flag) {
   log_debug(pagesize)("Reserving large pages individually.");
 
   const DWORD prot = exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
-  const DWORD flags = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
+  const DWORD alloc_type = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
 
-  char * p_buf = allocate_pages_individually(size, req_addr, flags, prot, LargePagesIndividualAllocationInjectError);
+  char * p_buf = allocate_pages_individually(size, req_addr, alloc_type, prot, flag, LargePagesIndividualAllocationInjectError);
   if (p_buf == nullptr) {
     // give an appropriate warning message
     if (UseNUMAInterleaving) {
@@ -3487,12 +3488,12 @@ static char* reserve_large_pages_single_range(size_t size, char* req_addr, bool
   return (char *) virtualAlloc(req_addr, size, flags, prot);
 }
 
-static char* reserve_large_pages(size_t size, char* req_addr, bool exec) {
+static char* reserve_large_pages(size_t size, char* req_addr, bool exec, MEMFLAGS flag) {
   // with large pages, there are two cases where we need to use Individual Allocation
   // 1) the UseLargePagesIndividualAllocation flag is set (set by default on WS2003)
   // 2) NUMA Interleaving is enabled, in which case we use a different node for each page
   if (UseLargePagesIndividualAllocation || UseNUMAInterleaving) {
-    return reserve_large_pages_individually(size, req_addr, exec);
+    return reserve_large_pages_individually(size, req_addr, exec, flag);
   }
   return reserve_large_pages_single_range(size, req_addr, exec);
 }
@@ -3509,7 +3510,7 @@ static char* find_aligned_address(size_t size, size_t alignment) {
   return aligned_addr;
 }
 
-static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exec) {
+static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exec, MEMFLAGS flag) {
   log_debug(pagesize)("Reserving large pages at an aligned address, alignment=" SIZE_FORMAT "%s",
                       byte_size_in_exact_unit(alignment), exact_unit_for_byte_size(alignment));
 
@@ -3522,7 +3523,7 @@ static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exe
     char* aligned_address = find_aligned_address(size, alignment);
 
     // Try to do the large page reservation using the aligned address.
-    aligned_address = reserve_large_pages(size, aligned_address, exec);
+    aligned_address = reserve_large_pages(size, aligned_address, exec, flag);
     if (aligned_address != nullptr) {
       // Reservation at the aligned address succeeded.
       guarantee(is_aligned(aligned_address, alignment), "Must be aligned");
@@ -3535,7 +3536,7 @@ static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exe
 }
 
 char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* addr,
-                                    bool exec) {
+                                    bool exec, MEMFLAGS flag) {
   assert(UseLargePages, "only for large pages");
   assert(page_size == os::large_page_size(), "Currently only support one large page size on Windows");
   assert(is_aligned(addr, alignment), "Must be");
@@ -3551,11 +3552,11 @@ char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_
   // ensure that the requested alignment is met. When there is a requested address
   // this solves it self, since it must be properly aligned already.
   if (addr == nullptr && alignment > page_size) {
-    return reserve_large_pages_aligned(bytes, alignment, exec);
+    return reserve_large_pages_aligned(bytes, alignment, exec, flag);
   }
 
   // No additional requirements, just reserve the large pages.
-  return reserve_large_pages(bytes, addr, exec);
+  return reserve_large_pages(bytes, addr, exec, flag);
 }
 
 bool os::pd_release_memory_special(char* base, size_t bytes) {
@@ -3721,11 +3722,11 @@ bool os::pd_release_memory(char* addr, size_t bytes) {
 }
 
 bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
-  return os::commit_memory(addr, size, !ExecMem);
+  return os::commit_memory(addr, size, !ExecMem, mtThreadStack);
 }
 
 bool os::remove_stack_guard_pages(char* addr, size_t size) {
-  return os::uncommit_memory(addr, size);
+  return os::uncommit_memory(addr, size, !ExecMem, mtThreadStack);
 }
 
 static bool protect_pages_individually(char* addr, size_t bytes, unsigned int p, DWORD *old_status) {
@@ -3776,7 +3777,7 @@ bool os::protect_memory(char* addr, size_t bytes, ProtType prot,
   // memory, not a big deal anyway, as bytes less or equal than 64K
   if (!is_committed) {
     commit_memory_or_exit(addr, bytes, prot == MEM_PROT_RWX,
-                          "cannot commit protection page");
+                          mtInternal, "cannot commit protection page");
   }
   // One cannot use os::guard_memory() here, as on Win32 guard page
   // have different (one-shot) semantics, from MSDN on PAGE_GUARD:
@@ -3816,7 +3817,7 @@ bool os::unguard_memory(char* addr, size_t bytes) {
 }
 
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) { }
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) { }
+void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) { }
 
 size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
   return page_size;
@@ -5104,9 +5105,6 @@ char* os::pd_map_memory(int fd, const char* file_name, size_t file_offset,
       return nullptr;
     }
 
-    // Record virtual memory allocation
-    MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, CALLER_PC);
-
     DWORD bytes_read;
     OVERLAPPED overlapped;
     overlapped.Offset = (DWORD)file_offset;
diff --git a/src/hotspot/os/windows/perfMemory_windows.cpp b/src/hotspot/os/windows/perfMemory_windows.cpp
index a71101731fb..0e5b5fedbcd 100644
--- a/src/hotspot/os/windows/perfMemory_windows.cpp
+++ b/src/hotspot/os/windows/perfMemory_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -55,14 +55,14 @@ typedef BOOL (WINAPI *SetSecurityDescriptorControlFnPtr)(
 static char* create_standard_memory(size_t size) {
 
   // allocate an aligned chuck of memory
-  char* mapAddress = os::reserve_memory(size);
+  char* mapAddress = os::reserve_memory(size, !ExecMem, mtInternal);
 
   if (mapAddress == nullptr) {
     return nullptr;
   }
 
   // commit memory
-  if (!os::commit_memory(mapAddress, size, !ExecMem)) {
+  if (!os::commit_memory(mapAddress, size, !ExecMem, mtInternal)) {
     if (PrintMiscellaneous && Verbose) {
       warning("Could not commit PerfData memory\n");
     }
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 51399f03434..b8004f741ba 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -326,7 +326,7 @@ size_t ArchiveBuilder::estimate_archive_size() {
 
 address ArchiveBuilder::reserve_buffer() {
   size_t buffer_size = estimate_archive_size();
-  ReservedSpace rs(buffer_size, MetaspaceShared::core_region_alignment(), os::vm_page_size());
+  ReservedSpace rs(buffer_size, MetaspaceShared::core_region_alignment(), os::vm_page_size(), mtClassShared);
   if (!rs.is_reserved()) {
     log_error(cds)("Failed to reserve " SIZE_FORMAT " bytes of output buffer.", buffer_size);
     MetaspaceShared::unrecoverable_writing_error();
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 2182865ebaa..22895bd3261 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -1710,9 +1710,9 @@ void FileMapInfo::close() {
 /*
  * Same as os::map_memory() but also pretouches if AlwaysPreTouch is enabled.
  */
-static char* map_memory(int fd, const char* file_name, size_t file_offset,
-                        char *addr, size_t bytes, bool read_only,
-                        bool allow_exec, MEMFLAGS flags = mtNone) {
+static char* map_and_pretouch_memory(int fd, const char* file_name, size_t file_offset,
+                                     char *addr, size_t bytes, bool read_only,
+                                     bool allow_exec, MEMFLAGS flags) {
   char* mem = os::map_memory(fd, file_name, file_offset, addr, bytes,
                              AlwaysPreTouch ? false : read_only,
                              allow_exec, flags);
@@ -1741,7 +1741,7 @@ bool FileMapInfo::remap_shared_readonly_as_readwrite() {
   // Replace old mapping with new one that is writable.
   char *base = os::map_memory(_fd, _full_path, r->file_offset(),
                               addr, size, false /* !read_only */,
-                              r->allow_exec());
+                              r->allow_exec(), mtClassShared);
   close();
   // These have to be errors because the shared region is now unmapped.
   if (base == nullptr) {
@@ -1800,7 +1800,7 @@ bool FileMapInfo::read_region(int i, char* base, size_t size, bool do_commit) {
     log_info(cds)("Commit %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)%s",
                   is_static() ? "static " : "dynamic", i, p2i(base), p2i(base + size),
                   shared_region_name[i], r->allow_exec() ? " exec" : "");
-    if (!os::commit_memory(base, size, r->allow_exec())) {
+    if (!os::commit_memory(base, size, r->allow_exec(), mtClassShared)) {
       log_error(cds)("Failed to commit %s region #%d (%s)", is_static() ? "static " : "dynamic",
                      i, shared_region_name[i]);
       return false;
@@ -1860,9 +1860,9 @@ MapArchiveResult FileMapInfo::map_region(int i, intx addr_delta, char* mapped_ba
     // Note that this may either be a "fresh" mapping into unreserved address
     // space (Windows, first mapping attempt), or a mapping into pre-reserved
     // space (Posix). See also comment in MetaspaceShared::map_archives().
-    char* base = map_memory(_fd, _full_path, r->file_offset(),
-                            requested_addr, size, r->read_only(),
-                            r->allow_exec(), mtClassShared);
+    char* base = map_and_pretouch_memory(_fd, _full_path, r->file_offset(),
+                                         requested_addr, size, r->read_only(),
+                                         r->allow_exec(), mtClassShared);
     if (base != requested_addr) {
       log_info(cds)("Unable to map %s shared space at " INTPTR_FORMAT,
                     shared_region_name[i], p2i(requested_addr));
@@ -1889,8 +1889,8 @@ char* FileMapInfo::map_bitmap_region() {
   }
   bool read_only = true, allow_exec = false;
   char* requested_addr = nullptr; // allow OS to pick any location
-  char* bitmap_base = map_memory(_fd, _full_path, r->file_offset(),
-                                 requested_addr, r->used_aligned(), read_only, allow_exec, mtClassShared);
+  char* bitmap_base = map_and_pretouch_memory(_fd, _full_path, r->file_offset(),
+                                              requested_addr, r->used_aligned(), read_only, allow_exec, mtClassShared);
   if (bitmap_base == nullptr) {
     log_info(cds)("failed to map relocation bitmap");
     return nullptr;
@@ -2176,10 +2176,11 @@ bool FileMapInfo::map_heap_region_impl() {
 
   // Map the archived heap data. No need to call MemTracker::record_virtual_memory_type()
   // for mapped region as it is part of the reserved java heap, which is already recorded.
+  // So we pass the mtJavaHeap to tell MemTracker the type of the already tracked memory.
   char* addr = (char*)_mapped_heap_memregion.start();
-  char* base = map_memory(_fd, _full_path, r->file_offset(),
-                          addr, _mapped_heap_memregion.byte_size(), r->read_only(),
-                          r->allow_exec());
+  char* base = map_and_pretouch_memory(_fd, _full_path, r->file_offset(),
+                                       addr, _mapped_heap_memregion.byte_size(), r->read_only(),
+                                       r->allow_exec(), mtJavaHeap);
   if (base == nullptr || base != addr) {
     dealloc_heap_region();
     log_info(cds)("UseSharedSpaces: Unable to map at required address in java heap. "
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index c7d14f83d03..3f5560ca22a 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -269,7 +269,7 @@ void MetaspaceShared::initialize_for_static_dump() {
   SharedBaseAddress = (size_t)_requested_base_address;
 
   size_t symbol_rs_size = LP64_ONLY(3 * G) NOT_LP64(128 * M);
-  _symbol_rs = ReservedSpace(symbol_rs_size);
+  _symbol_rs = ReservedSpace(symbol_rs_size, mtClassShared);
   if (!_symbol_rs.is_reserved()) {
     log_error(cds)("Unable to reserve memory for symbols: " SIZE_FORMAT " bytes.", symbol_rs_size);
     MetaspaceShared::unrecoverable_writing_error();
@@ -1270,12 +1270,10 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
     // Get the simple case out of the way first:
     // no compressed class space, simple allocation.
     archive_space_rs = ReservedSpace(archive_space_size, archive_space_alignment,
-                                     os::vm_page_size(), (char*)base_address);
+                                     os::vm_page_size(), mtClassShared, (char*)base_address);
     if (archive_space_rs.is_reserved()) {
       assert(base_address == nullptr ||
              (address)archive_space_rs.base() == base_address, "Sanity");
-      // Register archive space with NMT.
-      MemTracker::record_virtual_memory_type(archive_space_rs.base(), mtClassShared);
       return archive_space_rs.base();
     }
     return nullptr;
@@ -1319,21 +1317,18 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
       // via sequential file IO.
       address ccs_base = base_address + archive_space_size + gap_size;
       archive_space_rs = ReservedSpace(archive_space_size, archive_space_alignment,
-                                       os::vm_page_size(), (char*)base_address);
+                                       os::vm_page_size(), mtClassShared, (char*)base_address);
       class_space_rs   = ReservedSpace(class_space_size, class_space_alignment,
-                                       os::vm_page_size(), (char*)ccs_base);
+                                       os::vm_page_size(), mtClass, (char*)ccs_base);
     }
     if (!archive_space_rs.is_reserved() || !class_space_rs.is_reserved()) {
       release_reserved_spaces(total_space_rs, archive_space_rs, class_space_rs);
       return nullptr;
     }
-    // NMT: fix up the space tags
-    MemTracker::record_virtual_memory_type(archive_space_rs.base(), mtClassShared);
-    MemTracker::record_virtual_memory_type(class_space_rs.base(), mtClass);
   } else {
     if (use_archive_base_addr && base_address != nullptr) {
       total_space_rs = ReservedSpace(total_range_size, archive_space_alignment,
-                                     os::vm_page_size(), (char*) base_address);
+                                     os::vm_page_size(), mtClassShared, (char*) base_address);
     } else {
       // We did not manage to reserve at the preferred address, or were instructed to relocate. In that
       // case we reserve wherever possible, but the start address needs to be encodable as narrow Klass
diff --git a/src/hotspot/share/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp
index d4657e35a84..890d0e035f8 100644
--- a/src/hotspot/share/classfile/compactHashtable.cpp
+++ b/src/hotspot/share/classfile/compactHashtable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -240,7 +240,7 @@ HashtableTextDump::HashtableTextDump(const char* filename) : _fd(-1) {
   if (_fd < 0) {
     quit("Unable to open hashtable dump file", filename);
   }
-  _base = os::map_memory(_fd, filename, 0, nullptr, _size, true, false);
+  _base = os::map_memory(_fd, filename, 0, nullptr, _size, true, false, mtClassShared);
   if (_base == nullptr) {
     quit("Unable to map hashtable dump file", filename);
   }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 1384c30d2be..2b890530c4b 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -1213,7 +1213,7 @@ G1RegionToSpaceMapper* G1CollectedHeap::create_aux_memory_mapper(const char* des
                                                                  size_t translation_factor) {
   size_t preferred_page_size = os::page_size_for_region_unaligned(size, 1);
   // Allocate a new reserved space, preferring to use large pages.
-  ReservedSpace rs(size, preferred_page_size);
+  ReservedSpace rs(size, preferred_page_size, mtGC);
   size_t page_size = rs.page_size();
   G1RegionToSpaceMapper* result  =
     G1RegionToSpaceMapper::create_mapper(rs,
diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
index bdb732f6ebb..c0cf66fb2fd 100644
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,14 +135,14 @@ void G1PageBasedVirtualSpace::commit_preferred_pages(size_t start, size_t num_pa
   char* start_addr = page_start(start);
   size_t size = num_pages * _page_size;
 
-  os::commit_memory_or_exit(start_addr, size, _page_size, false, "G1 virtual space");
+  os::commit_memory_or_exit(start_addr, size, _page_size, !ExecMem, mtGC, "G1 virtual space");
 }
 
 void G1PageBasedVirtualSpace::commit_tail() {
   vmassert(_tail_size > 0, "The size of the tail area must be > 0 when reaching here");
 
   char* const aligned_end_address = align_down(_high_boundary, _page_size);
-  os::commit_memory_or_exit(aligned_end_address, _tail_size, os::vm_page_size(), false, "G1 virtual space");
+  os::commit_memory_or_exit(aligned_end_address, _tail_size, os::vm_page_size(), !ExecMem, mtGC, "G1 virtual space");
 }
 
 void G1PageBasedVirtualSpace::commit_internal(size_t start_page, size_t end_page) {
@@ -201,7 +201,7 @@ void G1PageBasedVirtualSpace::uncommit_internal(size_t start_page, size_t end_pa
             "Given start page " SIZE_FORMAT " is larger or equal to end page " SIZE_FORMAT, start_page, end_page);
 
   char* start_addr = page_start(start_page);
-  os::uncommit_memory(start_addr, pointer_delta(bounded_end_addr(end_page), start_addr, sizeof(char)));
+  os::uncommit_memory(start_addr, pointer_delta(bounded_end_addr(end_page), start_addr, sizeof(char)), !ExecMem, mtGC);
 }
 
 void G1PageBasedVirtualSpace::uncommit(size_t start_page, size_t size_in_pages) {
diff --git a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
index 5f903960cce..104b126c016 100644
--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,12 +43,10 @@ G1RegionToSpaceMapper::G1RegionToSpaceMapper(ReservedSpace rs,
                                              MEMFLAGS type) :
   _listener(nullptr),
   _storage(rs, used_size, page_size),
-  _region_commit_map(rs.size() * commit_factor / region_granularity, mtGC),
+  _region_commit_map(rs.size() * commit_factor / region_granularity, type),
   _memory_type(type) {
   guarantee(is_power_of_2(page_size), "must be");
   guarantee(is_power_of_2(region_granularity), "must be");
-
-  MemTracker::record_virtual_memory_type((address)rs.base(), type);
 }
 
 // Used to manually signal a mapper to handle a set of regions as committed.
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index 2a39ce7b470..c94da377410 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -227,7 +227,7 @@ void MutableNUMASpace::bias_region(MemRegion mr, uint lgrp_id) {
     // Then we uncommit the pages in the range.
     // The alignment_hint argument must be less than or equal to the small page
     // size if not using large pages or else this function does nothing.
-    os::free_memory((char*)aligned_region.start(), aligned_region.byte_size(), os_align);
+    os::free_memory((char*)aligned_region.start(), aligned_region.byte_size(), os_align, mtGC);
     // And make them local/first-touch biased.
     os::numa_make_local((char*)aligned_region.start(), aligned_region.byte_size(), checked_cast<int>(lgrp_id));
   }
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 4641b4ce5c6..019d457f293 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -60,7 +60,7 @@ void MutableSpace::numa_setup_pages(MemRegion mr, size_t page_size, bool clear_s
       size_t size = pointer_delta(end, start, sizeof(char));
       if (clear_space) {
         // Prefer page reallocation to migration.
-        os::free_memory((char*)start, size, page_size);
+        os::free_memory((char*)start, size, page_size, mtJavaHeap);
       }
       os::numa_make_global((char*)start, size);
     }
diff --git a/src/hotspot/share/gc/parallel/objectStartArray.cpp b/src/hotspot/share/gc/parallel/objectStartArray.cpp
index b1fc956a54a..2a0f12ec70e 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.cpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.cpp
@@ -47,11 +47,10 @@ void ObjectStartArray::initialize(MemRegion reserved_region) {
 
   // Do not use large-pages for the backing store. The one large page region
   // will be used for the heap proper.
-  ReservedSpace backing_store(bytes_to_reserve);
+  ReservedSpace backing_store(bytes_to_reserve, mtGC);
   if (!backing_store.is_reserved()) {
     vm_exit_during_initialization("Could not reserve space for ObjectStartArray");
   }
-  MemTracker::record_virtual_memory_type(backing_store.base(), mtGC);
 
   // We do not commit any memory initially
   _virtual_space.initialize(backing_store);
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
index deffcc019c9..fefc9150945 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -49,13 +49,11 @@ ParMarkBitMap::initialize(MemRegion covered_region)
 
   const size_t rs_align = page_sz == os::vm_page_size() ? 0 :
     MAX2(page_sz, granularity);
-  ReservedSpace rs(_reserved_byte_size, rs_align, page_sz);
+  ReservedSpace rs(_reserved_byte_size, rs_align, page_sz, mtGC);
   const size_t used_page_sz = rs.page_size();
   os::trace_page_sizes("Mark Bitmap", raw_bytes, raw_bytes,
                        rs.base(), rs.size(), used_page_sz);
 
-  MemTracker::record_virtual_memory_type((address)rs.base(), mtGC);
-
   _virtual_space = new PSVirtualSpace(rs, page_sz);
   if (_virtual_space != nullptr && _virtual_space->expand_by(_reserved_byte_size)) {
     _region_start = covered_region.start();
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 8ac16e059b1..165f9d3c05c 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -440,12 +440,10 @@ ParallelCompactData::create_vspace(size_t count, size_t element_size)
 
   const size_t rs_align = page_sz == os::vm_page_size() ? 0 :
     MAX2(page_sz, granularity);
-  ReservedSpace rs(_reserved_byte_size, rs_align, page_sz);
+  ReservedSpace rs(_reserved_byte_size, rs_align, page_sz, mtGC);
   os::trace_page_sizes("Parallel Compact Data", raw_bytes, raw_bytes, rs.base(),
                        rs.size(), page_sz);
 
-  MemTracker::record_virtual_memory_type((address)rs.base(), mtGC);
-
   PSVirtualSpace* vspace = new PSVirtualSpace(rs, page_sz);
   if (vspace != 0) {
     if (vspace->expand_by(_reserved_byte_size)) {
diff --git a/src/hotspot/share/gc/parallel/psVirtualspace.cpp b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
index a4d686d8670..8e441ec8061 100644
--- a/src/hotspot/share/gc/parallel/psVirtualspace.cpp
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
@@ -78,7 +78,7 @@ bool PSVirtualSpace::expand_by(size_t bytes) {
 
   char* const base_addr = committed_high_addr();
   bool result = special() ||
-         os::commit_memory(base_addr, bytes, alignment(), !ExecMem);
+         os::commit_memory(base_addr, bytes, alignment(), !ExecMem, mtGC);
   if (result) {
     _committed_high_addr += bytes;
   }
@@ -95,7 +95,7 @@ bool PSVirtualSpace::shrink_by(size_t bytes) {
   }
 
   char* const base_addr = committed_high_addr() - bytes;
-  bool result = special() || os::uncommit_memory(base_addr, bytes);
+  bool result = special() || os::uncommit_memory(base_addr, bytes, !ExecMem, mtGC);
   if (result) {
     _committed_high_addr -= bytes;
   }
diff --git a/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
index 59b7f130df3..7ac0fcc8b53 100644
--- a/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
@@ -37,13 +37,11 @@ SerialBlockOffsetTable::SerialBlockOffsetTable(MemRegion reserved,
                                                size_t init_word_size):
   _reserved(reserved) {
   size_t size = compute_size(reserved.word_size());
-  ReservedSpace rs(size);
+  ReservedSpace rs(size, mtGC);
   if (!rs.is_reserved()) {
     vm_exit_during_initialization("Could not reserve enough space for heap offset array");
   }
 
-  MemTracker::record_virtual_memory_type((address)rs.base(), mtGC);
-
   if (!_vs.initialize(rs, 0)) {
     vm_exit_during_initialization("Could not reserve enough space for heap offset array");
   }
diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp
index 95f7058f4e4..243f47eee23 100644
--- a/src/hotspot/share/gc/shared/cardTable.cpp
+++ b/src/hotspot/share/gc/shared/cardTable.cpp
@@ -82,9 +82,7 @@ void CardTable::initialize(void* region0_start, void* region1_start) {
 
   const size_t rs_align = _page_size == os::vm_page_size() ? 0 :
     MAX2(_page_size, os::vm_allocation_granularity());
-  ReservedSpace heap_rs(_byte_map_size, rs_align, _page_size);
-
-  MemTracker::record_virtual_memory_type((address)heap_rs.base(), mtGC);
+  ReservedSpace heap_rs(_byte_map_size, rs_align, _page_size, mtGC);
 
   os::trace_page_sizes("Card Table", num_bytes, num_bytes,
                        heap_rs.base(), heap_rs.size(), _page_size);
@@ -166,6 +164,7 @@ void CardTable::resize_covered_region(MemRegion new_region) {
                               delta.byte_size(),
                               _page_size,
                               !ExecMem,
+                              mtGCCardSet,
                               "card table expansion");
 
     memset(delta.start(), clean_card, delta.byte_size());
@@ -174,7 +173,9 @@ void CardTable::resize_covered_region(MemRegion new_region) {
     MemRegion delta = MemRegion(new_committed.end(),
                                 old_committed.word_size() - new_committed.word_size());
     bool res = os::uncommit_memory((char*)delta.start(),
-                                   delta.byte_size());
+                                   delta.byte_size(),
+                                   !ExecMem,
+                                   mtGCCardSet);
     assert(res, "uncommit should succeed");
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
index 25062c5317d..34a66d9f6d9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
@@ -57,21 +57,19 @@ ShenandoahCollectionSet::ShenandoahCollectionSet(ShenandoahHeap* heap, ReservedS
   // subsystem for mapping not-yet-written-to pages to a single physical backing page,
   // but this is not guaranteed, and would confuse NMT and other memory accounting tools.
 
-  MemTracker::record_virtual_memory_type(_map_space.base(), mtGC);
-
   size_t page_size = os::vm_page_size();
 
   if (!_map_space.special()) {
     // Commit entire pages that cover the heap cset map.
     char* bot_addr = align_down(_cset_map, page_size);
     char* top_addr = align_up(_cset_map + _map_size, page_size);
-    os::commit_memory_or_exit(bot_addr, pointer_delta(top_addr, bot_addr, 1), false,
-                              "Unable to commit collection set bitmap: heap");
+    os::commit_memory_or_exit(bot_addr, pointer_delta(top_addr, bot_addr, 1), !ExecMem,
+                              mtGC, "Unable to commit collection set bitmap: heap");
 
     // Commit the zero page, if not yet covered by heap cset map.
     if (bot_addr != _biased_cset_map) {
-      os::commit_memory_or_exit(_biased_cset_map, page_size, false,
-                                "Unable to commit collection set bitmap: zero page");
+      os::commit_memory_or_exit(_biased_cset_map, page_size, !ExecMem,
+                                mtGC, "Unable to commit collection set bitmap: zero page");
     }
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index c9d3d1d9364..09737d68352 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -213,8 +213,8 @@ jint ShenandoahHeap::initialize() {
 
   ReservedSpace sh_rs = heap_rs.first_part(max_byte_size);
   if (!_heap_region_special) {
-    os::commit_memory_or_exit(sh_rs.base(), _initial_size, heap_alignment, false,
-                              "Cannot commit heap memory");
+    os::commit_memory_or_exit(sh_rs.base(), _initial_size, heap_alignment, !ExecMem,
+                              mtGC, "Cannot commit heap memory");
   }
 
   //
@@ -247,12 +247,11 @@ jint ShenandoahHeap::initialize() {
             "Bitmap slices should be page-granular: bps = " SIZE_FORMAT ", page size = " SIZE_FORMAT,
             _bitmap_bytes_per_slice, bitmap_page_size);
 
-  ReservedSpace bitmap(_bitmap_size, bitmap_page_size);
+  ReservedSpace bitmap(_bitmap_size, bitmap_page_size, mtGC);
   os::trace_page_sizes_for_requested_size("Mark Bitmap",
                                           bitmap_size_orig, bitmap_page_size,
                                           bitmap.base(),
                                           bitmap.size(), bitmap.page_size());
-  MemTracker::record_virtual_memory_type(bitmap.base(), mtGC);
   _bitmap_region = MemRegion((HeapWord*) bitmap.base(), bitmap.size() / HeapWordSize);
   _bitmap_region_special = bitmap.special();
 
@@ -260,23 +259,22 @@ jint ShenandoahHeap::initialize() {
                               align_up(num_committed_regions, _bitmap_regions_per_slice) / _bitmap_regions_per_slice;
   bitmap_init_commit = MIN2(_bitmap_size, bitmap_init_commit);
   if (!_bitmap_region_special) {
-    os::commit_memory_or_exit((char *) _bitmap_region.start(), bitmap_init_commit, bitmap_page_size, false,
-                              "Cannot commit bitmap memory");
+    os::commit_memory_or_exit((char *) _bitmap_region.start(), bitmap_init_commit, bitmap_page_size, !ExecMem,
+                              mtGC, "Cannot commit bitmap memory");
   }
 
   _marking_context = new ShenandoahMarkingContext(_heap_region, _bitmap_region, _num_regions, _max_workers);
 
   if (ShenandoahVerify) {
-    ReservedSpace verify_bitmap(_bitmap_size, bitmap_page_size);
+    ReservedSpace verify_bitmap(_bitmap_size, bitmap_page_size, mtGC);
     os::trace_page_sizes_for_requested_size("Verify Bitmap",
                                             bitmap_size_orig, bitmap_page_size,
                                             verify_bitmap.base(),
                                             verify_bitmap.size(), verify_bitmap.page_size());
     if (!verify_bitmap.special()) {
-      os::commit_memory_or_exit(verify_bitmap.base(), verify_bitmap.size(), bitmap_page_size, false,
-                                "Cannot commit verification bitmap memory");
+      os::commit_memory_or_exit(verify_bitmap.base(), verify_bitmap.size(), bitmap_page_size, !ExecMem,
+                                mtGC, "Cannot commit verification bitmap memory");
     }
-    MemTracker::record_virtual_memory_type(verify_bitmap.base(), mtGC);
     MemRegion verify_bitmap_region = MemRegion((HeapWord *) verify_bitmap.base(), verify_bitmap.size() / HeapWordSize);
     _verification_bit_map.initialize(_heap_region, verify_bitmap_region);
     _verifier = new ShenandoahVerifier(this, &_verification_bit_map);
@@ -292,12 +290,11 @@ jint ShenandoahHeap::initialize() {
     aux_bitmap_page_size = os::vm_page_size();
   }
 #endif
-  ReservedSpace aux_bitmap(_bitmap_size, aux_bitmap_page_size);
+  ReservedSpace aux_bitmap(_bitmap_size, aux_bitmap_page_size, mtGC);
   os::trace_page_sizes_for_requested_size("Aux Bitmap",
                                           bitmap_size_orig, aux_bitmap_page_size,
                                           aux_bitmap.base(),
                                           aux_bitmap.size(), aux_bitmap.page_size());
-  MemTracker::record_virtual_memory_type(aux_bitmap.base(), mtGC);
   _aux_bitmap_region = MemRegion((HeapWord*) aux_bitmap.base(), aux_bitmap.size() / HeapWordSize);
   _aux_bitmap_region_special = aux_bitmap.special();
   _aux_bit_map.initialize(_heap_region, _aux_bitmap_region);
@@ -310,15 +307,14 @@ jint ShenandoahHeap::initialize() {
   size_t region_storage_size = align_up(region_storage_size_orig,
                                         MAX2(region_page_size, os::vm_allocation_granularity()));
 
-  ReservedSpace region_storage(region_storage_size, region_page_size);
+  ReservedSpace region_storage(region_storage_size, region_page_size, mtGC);
   os::trace_page_sizes_for_requested_size("Region Storage",
                                           region_storage_size_orig, region_page_size,
                                           region_storage.base(),
                                           region_storage.size(), region_storage.page_size());
-  MemTracker::record_virtual_memory_type(region_storage.base(), mtGC);
   if (!region_storage.special()) {
-    os::commit_memory_or_exit(region_storage.base(), region_storage_size, region_page_size, false,
-                              "Cannot commit region memory");
+    os::commit_memory_or_exit(region_storage.base(), region_storage_size, region_page_size, !ExecMem,
+                              mtGC, "Cannot commit region memory");
   }
 
   // Try to fit the collection set bitmap at lower addresses. This optimizes code generation for cset checks.
@@ -336,7 +332,7 @@ jint ShenandoahHeap::initialize() {
     for (uintptr_t addr = min; addr <= max; addr <<= 1u) {
       char* req_addr = (char*)addr;
       assert(is_aligned(req_addr, cset_align), "Should be aligned");
-      cset_rs = ReservedSpace(cset_size, cset_align, cset_page_size, req_addr);
+      cset_rs = ReservedSpace(cset_size, cset_align, cset_page_size, mtGC, req_addr);
       if (cset_rs.is_reserved()) {
         assert(cset_rs.base() == req_addr, "Allocated where requested: " PTR_FORMAT ", " PTR_FORMAT, p2i(cset_rs.base()), addr);
         _collection_set = new ShenandoahCollectionSet(this, cset_rs, sh_rs.base());
@@ -345,7 +341,7 @@ jint ShenandoahHeap::initialize() {
     }
 
     if (_collection_set == nullptr) {
-      cset_rs = ReservedSpace(cset_size, cset_align, os::vm_page_size());
+      cset_rs = ReservedSpace(cset_size, cset_align, os::vm_page_size(), mtGC);
       _collection_set = new ShenandoahCollectionSet(this, cset_rs, sh_rs.base());
     }
     os::trace_page_sizes_for_requested_size("Collection Set",
@@ -1414,7 +1410,7 @@ void ShenandoahHeap::object_iterate(ObjectClosure* cl) {
 bool ShenandoahHeap::prepare_aux_bitmap_for_iteration() {
   assert(SafepointSynchronize::is_at_safepoint(), "safe iteration is only available during safepoints");
 
-  if (!_aux_bitmap_region_special && !os::commit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size(), false)) {
+  if (!_aux_bitmap_region_special && !os::commit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size(), !ExecMem, mtGC)) {
     log_warning(gc)("Could not commit native memory for auxiliary marking bitmap for heap iteration");
     return false;
   }
@@ -1434,7 +1430,7 @@ void ShenandoahHeap::scan_roots_for_iteration(ShenandoahScanObjectStack* oop_sta
 }
 
 void ShenandoahHeap::reclaim_aux_bitmap_for_iteration() {
-  if (!_aux_bitmap_region_special && !os::uncommit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size())) {
+  if (!_aux_bitmap_region_special && !os::uncommit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size(), !ExecMem, mtGC)) {
     log_warning(gc)("Could not uncommit native memory for auxiliary marking bitmap for heap iteration");
   }
 }
@@ -2264,7 +2260,7 @@ bool ShenandoahHeap::commit_bitmap_slice(ShenandoahHeapRegion* r) {
   size_t len = _bitmap_bytes_per_slice;
   char* start = (char*) _bitmap_region.start() + off;
 
-  if (!os::commit_memory(start, len, false)) {
+  if (!os::commit_memory(start, len, !ExecMem, mtGC)) {
     return false;
   }
 
@@ -2293,7 +2289,7 @@ bool ShenandoahHeap::uncommit_bitmap_slice(ShenandoahHeapRegion *r) {
   size_t slice = r->index() / _bitmap_regions_per_slice;
   size_t off = _bitmap_bytes_per_slice * slice;
   size_t len = _bitmap_bytes_per_slice;
-  if (!os::uncommit_memory((char*)_bitmap_region.start() + off, len)) {
+  if (!os::uncommit_memory((char*)_bitmap_region.start() + off, len, !ExecMem, mtGC)) {
     return false;
   }
   return true;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index 8a94b20670a..a8386a36c3f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -620,7 +620,7 @@ size_t ShenandoahHeapRegion::setup_sizes(size_t max_heap_size) {
 
 void ShenandoahHeapRegion::do_commit() {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
-  if (!heap->is_heap_region_special() && !os::commit_memory((char *) bottom(), RegionSizeBytes, false)) {
+  if (!heap->is_heap_region_special() && !os::commit_memory((char *) bottom(), RegionSizeBytes, !ExecMem, mtJavaHeap)) {
     report_java_out_of_memory("Unable to commit region");
   }
   if (!heap->commit_bitmap_slice(this)) {
@@ -634,7 +634,7 @@ void ShenandoahHeapRegion::do_commit() {
 
 void ShenandoahHeapRegion::do_uncommit() {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
-  if (!heap->is_heap_region_special() && !os::uncommit_memory((char *) bottom(), RegionSizeBytes)) {
+  if (!heap->is_heap_region_special() && !os::uncommit_memory((char *) bottom(), RegionSizeBytes, !ExecMem, mtJavaHeap)) {
     report_java_out_of_memory("Unable to uncommit region");
   }
   if (!heap->uncommit_bitmap_slice(this)) {
diff --git a/src/hotspot/share/gc/x/xMarkStackAllocator.cpp b/src/hotspot/share/gc/x/xMarkStackAllocator.cpp
index b5cc3ad641a..70892879d2b 100644
--- a/src/hotspot/share/gc/x/xMarkStackAllocator.cpp
+++ b/src/hotspot/share/gc/x/xMarkStackAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -88,7 +88,7 @@ size_t XMarkStackSpace::expand_space() {
                          old_size / M, new_size / M);
 
   // Expand
-  os::commit_memory_or_exit((char*)_end, expand_size, false /* executable */, "Mark stack space");
+  os::commit_memory_or_exit((char*)_end, expand_size, !ExecMem, mtGC, "Mark stack space");
 
   return expand_size;
 }
@@ -105,7 +105,7 @@ size_t XMarkStackSpace::shrink_space() {
                            old_size / M, new_size / M);
 
     const uintptr_t shrink_start = _end - shrink_size;
-    os::uncommit_memory((char*)shrink_start, shrink_size, false /* executable */);
+    os::uncommit_memory((char*)shrink_start, shrink_size, !ExecMem, mtGC);
   }
 
   return shrink_size;
diff --git a/src/hotspot/share/gc/x/xPhysicalMemory.cpp b/src/hotspot/share/gc/x/xPhysicalMemory.cpp
index 0269c64f0f1..619e41cab9c 100644
--- a/src/hotspot/share/gc/x/xPhysicalMemory.cpp
+++ b/src/hotspot/share/gc/x/xPhysicalMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -279,13 +279,13 @@ void XPhysicalMemoryManager::try_enable_uncommit(size_t min_capacity, size_t max
 void XPhysicalMemoryManager::nmt_commit(uintptr_t offset, size_t size) const {
   // From an NMT point of view we treat the first heap view (marked0) as committed
   const uintptr_t addr = XAddress::marked0(offset);
-  MemTracker::record_virtual_memory_commit((void*)addr, size, CALLER_PC);
+  MemTracker::record_virtual_memory_commit((void*)addr, size, CALLER_PC, mtGC);
 }
 
 void XPhysicalMemoryManager::nmt_uncommit(uintptr_t offset, size_t size) const {
   const uintptr_t addr = XAddress::marked0(offset);
   ThreadCritical tc;
-  MemTracker::record_virtual_memory_uncommit((address)addr, size);
+  MemTracker::record_virtual_memory_uncommit((address)addr, size, mtGC);
 }
 
 void XPhysicalMemoryManager::alloc(XPhysicalMemory& pmem, size_t size) {
diff --git a/src/hotspot/share/gc/x/xVirtualMemory.cpp b/src/hotspot/share/gc/x/xVirtualMemory.cpp
index 1d66cdd069e..496dcdc2464 100644
--- a/src/hotspot/share/gc/x/xVirtualMemory.cpp
+++ b/src/hotspot/share/gc/x/xVirtualMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -181,8 +181,7 @@ bool XVirtualMemoryManager::reserve(size_t max_capacity) {
 }
 
 void XVirtualMemoryManager::nmt_reserve(uintptr_t start, size_t size) {
-  MemTracker::record_virtual_memory_reserve((void*)start, size, CALLER_PC);
-  MemTracker::record_virtual_memory_type((void*)start, mtJavaHeap);
+  MemTracker::record_virtual_memory_reserve((void*)start, size, CALLER_PC, mtJavaHeap);
 }
 
 bool XVirtualMemoryManager::is_initialized() const {
diff --git a/src/hotspot/share/gc/z/zMarkStackAllocator.cpp b/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
index a9e404a0f55..866121ce0d3 100644
--- a/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
+++ b/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -87,7 +87,7 @@ size_t ZMarkStackSpace::expand_space() {
                          old_size / M, new_size / M);
 
   // Expand
-  os::commit_memory_or_exit((char*)_end, expand_size, false /* executable */, "Mark stack space");
+  os::commit_memory_or_exit((char*)_end, expand_size, !ExecMem, mtGC, "Mark stack space");
 
   return expand_size;
 }
@@ -104,7 +104,7 @@ size_t ZMarkStackSpace::shrink_space() {
                            old_size / M, new_size / M);
 
     const uintptr_t shrink_start = _end - shrink_size;
-    os::uncommit_memory((char*)shrink_start, shrink_size, false /* executable */);
+    os::uncommit_memory((char*)shrink_start, shrink_size, !ExecMem, mtGC);
   }
 
   return shrink_size;
diff --git a/src/hotspot/share/gc/z/zNMT.cpp b/src/hotspot/share/gc/z/zNMT.cpp
index 9a54c0f5963..9778ac0c975 100644
--- a/src/hotspot/share/gc/z/zNMT.cpp
+++ b/src/hotspot/share/gc/z/zNMT.cpp
@@ -71,10 +71,10 @@ void ZNMT::process_fake_mapping(zoffset offset, size_t size, bool commit) {
 
     // commit / uncommit memory
     if (commit) {
-      MemTracker::record_virtual_memory_commit((void*)sub_range_addr, sub_range_size, CALLER_PC);
+      MemTracker::record_virtual_memory_commit((void*)sub_range_addr, sub_range_size, CALLER_PC, mtGC);
     } else {
       ThreadCritical tc;
-      MemTracker::record_virtual_memory_uncommit((address)sub_range_addr, sub_range_size);
+      MemTracker::record_virtual_memory_uncommit((address)sub_range_addr, sub_range_size, mtGC);
     }
 
     left_to_process -= sub_range_size;
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
index 78309f00913..31855ee1eb6 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, 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
@@ -104,7 +104,8 @@ bool JfrVirtualMemorySegment::initialize(size_t reservation_size_request_bytes)
   assert(is_aligned(reservation_size_request_bytes, os::vm_allocation_granularity()), "invariant");
   _rs = ReservedSpace(reservation_size_request_bytes,
                       os::vm_allocation_granularity(),
-                      os::vm_page_size());
+                      os::vm_page_size(),
+                      mtTracing);
   if (!_rs.is_reserved()) {
     return false;
   }
@@ -117,7 +118,6 @@ bool JfrVirtualMemorySegment::initialize(size_t reservation_size_request_bytes)
                               _rs.base(),
                               _rs.size(),
                               os::vm_page_size());
-  MemTracker::record_virtual_memory_type((address)_rs.base(), mtTracing);
   assert(is_aligned(_rs.base(), os::vm_page_size()), "invariant");
   assert(is_aligned(_rs.size(), os::vm_page_size()), "invariant");
 
diff --git a/src/hotspot/share/memory/allocation.inline.hpp b/src/hotspot/share/memory/allocation.inline.hpp
index 4a1b0b0c597..3b4f163a51d 100644
--- a/src/hotspot/share/memory/allocation.inline.hpp
+++ b/src/hotspot/share/memory/allocation.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ E* MmapArrayAllocator<E>::allocate_or_null(size_t length, MEMFLAGS flags) {
     return nullptr;
   }
 
-  if (os::commit_memory(addr, size, !ExecMem)) {
+  if (os::commit_memory(addr, size, !ExecMem, flags)) {
     return (E*)addr;
   } else {
     os::release_memory(addr, size);
@@ -80,7 +80,7 @@ E* MmapArrayAllocator<E>::allocate(size_t length, MEMFLAGS flags) {
     vm_exit_out_of_memory(size, OOM_MMAP_ERROR, "Allocator (reserve)");
   }
 
-  os::commit_memory_or_exit(addr, size, !ExecMem, "Allocator (commit)");
+  os::commit_memory_or_exit(addr, size, !ExecMem, flags, "Allocator (commit)");
 
   return (E*)addr;
 }
diff --git a/src/hotspot/share/memory/heap.cpp b/src/hotspot/share/memory/heap.cpp
index 98e59f58184..92a376defa5 100644
--- a/src/hotspot/share/memory/heap.cpp
+++ b/src/hotspot/share/memory/heap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -227,13 +227,11 @@ bool CodeHeap::reserve(ReservedSpace rs, size_t committed_size, size_t segment_s
   const size_t committed_segments_size = align_to_page_size(_number_of_committed_segments);
 
   // reserve space for _segmap
-  ReservedSpace seg_rs(reserved_segments_size);
+  ReservedSpace seg_rs(reserved_segments_size, mtCode);
   if (!_segmap.initialize(seg_rs, committed_segments_size)) {
     return false;
   }
 
-  MemTracker::record_virtual_memory_type((address)_segmap.low_boundary(), mtCode);
-
   assert(_segmap.committed_size() >= (size_t) _number_of_committed_segments, "could not commit  enough space for segment map");
   assert(_segmap.reserved_size()  >= (size_t) _number_of_reserved_segments , "could not reserve enough space for segment map");
   assert(_segmap.reserved_size()  >= _segmap.committed_size()     , "just checking");
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index 22ec4d942a6..65eeaefe74c 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -589,7 +589,7 @@ ReservedSpace Metaspace::reserve_address_space_for_compressed_classes(size_t siz
   if (result == nullptr) {
     // Fallback: reserve anywhere
     log_debug(metaspace, map)("Trying anywhere...");
-    result = os::reserve_memory_aligned(size, Metaspace::reserve_alignment(), false);
+    result = os::reserve_memory_aligned(size, Metaspace::reserve_alignment(), !ExecMem, mtClass);
   }
 
   // Wrap resulting range in ReservedSpace
@@ -598,7 +598,7 @@ ReservedSpace Metaspace::reserve_address_space_for_compressed_classes(size_t siz
     log_debug(metaspace, map)("Mapped at " PTR_FORMAT, p2i(result));
     assert(is_aligned(result, Metaspace::reserve_alignment()), "Alignment too small for metaspace");
     rs = ReservedSpace::space_for_range(result, size, Metaspace::reserve_alignment(),
-                                                      os::vm_page_size(), false, false);
+                                                      os::vm_page_size(), false, false, mtClass);
   } else {
     log_debug(metaspace, map)("Failed to map.");
     rs = ReservedSpace();
@@ -739,7 +739,7 @@ void Metaspace::global_initialize() {
                     CompressedClassSpaceBaseAddress, Metaspace::reserve_alignment()));
       }
       rs = ReservedSpace(size, Metaspace::reserve_alignment(),
-                         os::vm_page_size() /* large */, (char*)base);
+                         os::vm_page_size() /* large */, mtClass, (char*)base);
       if (rs.is_reserved()) {
         log_info(metaspace)("Successfully forced class space address to " PTR_FORMAT, p2i(base));
       } else {
@@ -767,9 +767,6 @@ void Metaspace::global_initialize() {
                    CompressedClassSpaceSize));
     }
 
-    // Mark class space as such
-    MemTracker::record_virtual_memory_type((address)rs.base(), mtClass);
-
     // Initialize space
     Metaspace::initialize_class_space(rs);
 
diff --git a/src/hotspot/share/memory/metaspace/testHelpers.cpp b/src/hotspot/share/memory/metaspace/testHelpers.cpp
index 2d1071d77dd..ecc8af2f7dc 100644
--- a/src/hotspot/share/memory/metaspace/testHelpers.cpp
+++ b/src/hotspot/share/memory/metaspace/testHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -78,7 +78,7 @@ MetaspaceTestContext::MetaspaceTestContext(const char* name, size_t commit_limit
                     reserve_limit, Metaspace::reserve_alignment_words());
   if (reserve_limit > 0) {
     // have reserve limit -> non-expandable context
-    _rs = ReservedSpace(reserve_limit * BytesPerWord, Metaspace::reserve_alignment(), os::vm_page_size());
+    _rs = ReservedSpace(reserve_limit * BytesPerWord, Metaspace::reserve_alignment(), os::vm_page_size(), mtMetaspace);
     _context = MetaspaceContext::create_nonexpandable_context(name, _rs, &_commit_limiter);
   } else {
     // no reserve limit -> expandable vslist
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
index a8afbc130c9..52553b889df 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
@@ -109,7 +109,7 @@ bool VirtualSpaceNode::commit_range(MetaWord* p, size_t word_size) {
   }
 
   // Commit...
-  if (os::commit_memory((char*)p, word_size * BytesPerWord, false) == false) {
+  if (os::commit_memory((char*)p, word_size * BytesPerWord, !ExecMem, _rs.nmt_flag()) == false) {
     vm_exit_out_of_memory(word_size * BytesPerWord, OOM_MMAP_ERROR, "Failed to commit metaspace.");
   }
 
@@ -188,7 +188,7 @@ void VirtualSpaceNode::uncommit_range(MetaWord* p, size_t word_size) {
   }
 
   // Uncommit...
-  if (os::uncommit_memory((char*)p, word_size * BytesPerWord) == false) {
+  if (os::uncommit_memory((char*)p, word_size * BytesPerWord, !ExecMem, _rs.nmt_flag()) == false) {
     // Note: this can actually happen, since uncommit may increase the number of mappings.
     fatal("Failed to uncommit metaspace.");
   }
@@ -255,11 +255,10 @@ VirtualSpaceNode* VirtualSpaceNode::create_node(size_t word_size,
   DEBUG_ONLY(assert_is_aligned(word_size, chunklevel::MAX_CHUNK_WORD_SIZE);)
   ReservedSpace rs(word_size * BytesPerWord,
                    Settings::virtual_space_node_reserve_alignment_words() * BytesPerWord,
-                   os::vm_page_size());
+                   os::vm_page_size(), mtMetaspace);
   if (!rs.is_reserved()) {
     vm_exit_out_of_memory(word_size * BytesPerWord, OOM_MMAP_ERROR, "Failed to reserve memory for metaspace");
   }
-  MemTracker::record_virtual_memory_type(rs.base(), mtMetaspace);
   assert_is_aligned(rs.base(), chunklevel::MAX_CHUNK_BYTE_SIZE);
   InternalStats::inc_num_vsnodes_births();
   return new VirtualSpaceNode(rs, true, limiter, reserve_words_counter, commit_words_counter);
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index a75d9f076ad..ffa918f0998 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -42,19 +42,19 @@
 
 // Dummy constructor
 ReservedSpace::ReservedSpace() : _base(nullptr), _size(0), _noaccess_prefix(0),
-    _alignment(0), _special(false), _fd_for_heap(-1), _executable(false) {
+    _alignment(0), _fd_for_heap(-1), _special(false), _executable(false), _flag(mtNone) {
 }
 
-ReservedSpace::ReservedSpace(size_t size) : _fd_for_heap(-1) {
+ReservedSpace::ReservedSpace(size_t size, MEMFLAGS flag) : _fd_for_heap(-1), _flag(flag) {
   // Want to use large pages where possible. If the size is
   // not large page aligned the mapping will be a mix of
   // large and normal pages.
   size_t page_size = os::page_size_for_region_unaligned(size, 1);
   size_t alignment = os::vm_allocation_granularity();
-  initialize(size, alignment, page_size, nullptr, false);
+  initialize(size, alignment, page_size, nullptr, false, flag);
 }
 
-ReservedSpace::ReservedSpace(size_t size, size_t preferred_page_size) : _fd_for_heap(-1) {
+ReservedSpace::ReservedSpace(size_t size, size_t preferred_page_size, MEMFLAGS flag) : _fd_for_heap(-1), _flag(flag) {
   // When a page size is given we don't want to mix large
   // and normal pages. If the size is not a multiple of the
   // page size it will be aligned up to achieve this.
@@ -63,45 +63,46 @@ ReservedSpace::ReservedSpace(size_t size, size_t preferred_page_size) : _fd_for_
     alignment = MAX2(preferred_page_size, alignment);
     size = align_up(size, alignment);
   }
-  initialize(size, alignment, preferred_page_size, nullptr, false);
+  initialize(size, alignment, preferred_page_size, nullptr, false, flag);
 }
 
 ReservedSpace::ReservedSpace(size_t size,
                              size_t alignment,
                              size_t page_size,
-                             char* requested_address) : _fd_for_heap(-1) {
-  initialize(size, alignment, page_size, requested_address, false);
+                             MEMFLAGS flag,
+                             char* requested_address) : _fd_for_heap(-1), _flag(flag) {
+  initialize(size, alignment, page_size, requested_address, false, flag);
 }
 
 ReservedSpace::ReservedSpace(char* base, size_t size, size_t alignment, size_t page_size,
-                             bool special, bool executable) : _fd_for_heap(-1) {
+                             bool special, bool executable, MEMFLAGS flag) : _fd_for_heap(-1), _flag(flag) {
   assert((size % os::vm_allocation_granularity()) == 0,
          "size not allocation aligned");
-  initialize_members(base, size, alignment, page_size, special, executable);
+  initialize_members(base, size, alignment, page_size, special, executable, flag);
 }
 
 // Helper method
-static char* attempt_map_or_reserve_memory_at(char* base, size_t size, int fd, bool executable) {
+static char* attempt_map_or_reserve_memory_at(char* base, size_t size, int fd, bool executable, MEMFLAGS flag) {
   if (fd != -1) {
-    return os::attempt_map_memory_to_file_at(base, size, fd);
+    return os::attempt_map_memory_to_file_at(base, size, fd, flag);
   }
-  return os::attempt_reserve_memory_at(base, size, executable);
+  return os::attempt_reserve_memory_at(base, size, executable, flag);
 }
 
 // Helper method
-static char* map_or_reserve_memory(size_t size, int fd, bool executable) {
+static char* map_or_reserve_memory(size_t size, int fd, bool executable, MEMFLAGS flag) {
   if (fd != -1) {
-    return os::map_memory_to_file(size, fd);
+    return os::map_memory_to_file(size, fd, flag);
   }
-  return os::reserve_memory(size, executable);
+  return os::reserve_memory(size, executable, flag);
 }
 
 // Helper method
-static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fd, bool executable) {
+static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fd, bool executable, MEMFLAGS flag) {
   if (fd != -1) {
-    return os::map_memory_to_file_aligned(size, alignment, fd);
+    return os::map_memory_to_file_aligned(size, alignment, fd, flag);
   }
-  return os::reserve_memory_aligned(size, alignment, executable);
+  return os::reserve_memory_aligned(size, alignment, executable, flag);
 }
 
 // Helper method
@@ -154,7 +155,7 @@ static void log_on_large_pages_failure(char* req_addr, size_t bytes) {
 }
 
 static char* reserve_memory(char* requested_address, const size_t size,
-                            const size_t alignment, int fd, bool exec) {
+                            const size_t alignment, int fd, bool exec, MEMFLAGS flag) {
   char* base;
   // If the memory was requested at a particular address, use
   // os::attempt_reserve_memory_at() to avoid mapping over something
@@ -163,19 +164,19 @@ static char* reserve_memory(char* requested_address, const size_t size,
     assert(is_aligned(requested_address, alignment),
            "Requested address " PTR_FORMAT " must be aligned to " SIZE_FORMAT,
            p2i(requested_address), alignment);
-    base = attempt_map_or_reserve_memory_at(requested_address, size, fd, exec);
+    base = attempt_map_or_reserve_memory_at(requested_address, size, fd, exec, flag);
   } else {
     // Optimistically assume that the OS returns an aligned base pointer.
     // When reserving a large address range, most OSes seem to align to at
     // least 64K.
-    base = map_or_reserve_memory(size, fd, exec);
+    base = map_or_reserve_memory(size, fd, exec, flag);
     // Check alignment constraints. This is only needed when there is
     // no requested address.
     if (!is_aligned(base, alignment)) {
       // Base not aligned, retry.
       unmap_or_release_memory(base, size, fd != -1 /*is_file_mapped*/);
       // Map using the requested alignment.
-      base = map_or_reserve_memory_aligned(size, alignment, fd, exec);
+      base = map_or_reserve_memory_aligned(size, alignment, fd, exec, flag);
     }
   }
 
@@ -183,14 +184,14 @@ static char* reserve_memory(char* requested_address, const size_t size,
 }
 
 static char* reserve_memory_special(char* requested_address, const size_t size,
-                                    const size_t alignment, const size_t page_size, bool exec) {
+                                    const size_t alignment, const size_t page_size, bool exec, MEMFLAGS flag) {
 
   log_trace(pagesize)("Attempt special mapping: size: " SIZE_FORMAT "%s, "
                       "alignment: " SIZE_FORMAT "%s",
                       byte_size_in_exact_unit(size), exact_unit_for_byte_size(size),
                       byte_size_in_exact_unit(alignment), exact_unit_for_byte_size(alignment));
 
-  char* base = os::reserve_memory_special(size, alignment, page_size, requested_address, exec);
+  char* base = os::reserve_memory_special(size, alignment, page_size, requested_address, exec, flag);
   if (base != nullptr) {
     // Check alignment constraints.
     assert(is_aligned(base, alignment),
@@ -202,18 +203,19 @@ static char* reserve_memory_special(char* requested_address, const size_t size,
 }
 
 void ReservedSpace::clear_members() {
-  initialize_members(nullptr, 0, 0, 0, false, false);
+  initialize_members(nullptr, 0, 0, 0, false, false, mtNone);
 }
 
 void ReservedSpace::initialize_members(char* base, size_t size, size_t alignment,
-                                       size_t page_size, bool special, bool executable) {
+                                       size_t page_size, bool special, bool executable, MEMFLAGS flag) {
   _base = base;
   _size = size;
+  _noaccess_prefix = 0;
   _alignment = alignment;
   _page_size = page_size;
   _special = special;
   _executable = executable;
-  _noaccess_prefix = 0;
+  _flag = flag;
 }
 
 void ReservedSpace::reserve(size_t size,
@@ -235,9 +237,9 @@ void ReservedSpace::reserve(size_t size,
     // When there is a backing file directory for this space then whether
     // large pages are allocated is up to the filesystem of the backing file.
     // So UseLargePages is not taken into account for this reservation.
-    char* base = reserve_memory(requested_address, size, alignment, _fd_for_heap, executable);
+    char* base = reserve_memory(requested_address, size, alignment, _fd_for_heap, executable, _flag);
     if (base != nullptr) {
-      initialize_members(base, size, alignment, os::vm_page_size(), true, executable);
+      initialize_members(base, size, alignment, os::vm_page_size(), true, executable, _flag);
     }
     // Always return, not possible to fall back to reservation not using a file.
     return;
@@ -250,10 +252,10 @@ void ReservedSpace::reserve(size_t size,
     // explicit large pages and these have to be committed up front to ensure
     // no reservations are lost.
     do {
-      char* base = reserve_memory_special(requested_address, size, alignment, page_size, executable);
+      char* base = reserve_memory_special(requested_address, size, alignment, page_size, executable, _flag);
       if (base != nullptr) {
         // Successful reservation using large pages.
-        initialize_members(base, size, alignment, page_size, true, executable);
+        initialize_members(base, size, alignment, page_size, true, executable, _flag);
         return;
       }
       page_size = os::page_sizes().next_smaller(page_size);
@@ -266,10 +268,10 @@ void ReservedSpace::reserve(size_t size,
   }
 
   // == Case 3 ==
-  char* base = reserve_memory(requested_address, size, alignment, -1, executable);
+  char* base = reserve_memory(requested_address, size, alignment, -1, executable, _flag);
   if (base != nullptr) {
     // Successful mapping.
-    initialize_members(base, size, alignment, page_size, false, executable);
+    initialize_members(base, size, alignment, page_size, false, executable, _flag);
   }
 }
 
@@ -277,7 +279,8 @@ void ReservedSpace::initialize(size_t size,
                                size_t alignment,
                                size_t page_size,
                                char* requested_address,
-                               bool executable) {
+                               bool executable,
+                               MEMFLAGS flag) {
   const size_t granularity = os::vm_allocation_granularity();
   assert((size & (granularity - 1)) == 0,
          "size not aligned to os::vm_allocation_granularity()");
@@ -290,6 +293,9 @@ void ReservedSpace::initialize(size_t size,
 
   clear_members();
 
+  // _flag is cleared in clear_members in above call
+  _flag = flag;
+
   if (size == 0) {
     return;
   }
@@ -310,14 +316,14 @@ void ReservedSpace::initialize(size_t size,
 
 ReservedSpace ReservedSpace::first_part(size_t partition_size, size_t alignment) {
   assert(partition_size <= size(), "partition failed");
-  ReservedSpace result(base(), partition_size, alignment, page_size(), special(), executable());
+  ReservedSpace result(base(), partition_size, alignment, page_size(), special(), executable(), nmt_flag());
   return result;
 }
 
 ReservedSpace ReservedSpace::last_part(size_t partition_size, size_t alignment) {
   assert(partition_size <= size(), "partition failed");
   ReservedSpace result(base() + partition_size, size() - partition_size,
-                       alignment, page_size(), special(), executable());
+                       alignment, page_size(), special(), executable(), nmt_flag());
   return result;
 }
 
@@ -360,12 +366,12 @@ void ReservedSpace::release() {
 
 // Put a ReservedSpace over an existing range
 ReservedSpace ReservedSpace::space_for_range(char* base, size_t size, size_t alignment,
-                                             size_t page_size, bool special, bool executable) {
+                                             size_t page_size, bool special, bool executable, MEMFLAGS flag) {
   assert(is_aligned(base, os::vm_allocation_granularity()), "Unaligned base");
   assert(is_aligned(size, os::vm_page_size()), "Unaligned size");
   assert(os::page_sizes().contains(page_size), "Invalid pagesize");
   ReservedSpace space;
-  space.initialize_members(base, size, alignment, page_size, special, executable);
+  space.initialize_members(base, size, alignment, page_size, special, executable, flag);
   return space;
 }
 
@@ -607,16 +613,17 @@ void ReservedHeapSpace::initialize_compressed_heap(const size_t size, size_t ali
     // Last, desperate try without any placement.
     if (_base == nullptr) {
       log_trace(gc, heap, coops)("Trying to allocate at address null heap of size " SIZE_FORMAT_X, size + noaccess_prefix);
-      initialize(size + noaccess_prefix, alignment, page_size, nullptr, false);
+      initialize(size + noaccess_prefix, alignment, page_size, nullptr, !ExecMem, nmt_flag());
     }
   }
 }
 
 ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, size_t page_size, const char* heap_allocation_directory) : ReservedSpace() {
-
   if (size == 0) {
     return;
   }
+  // _flag is used internally by initialize_compressed_heap
+  _flag = mtJavaHeap;
 
   if (heap_allocation_directory != nullptr) {
     _fd_for_heap = os::create_file_for_heap(heap_allocation_directory);
@@ -644,7 +651,7 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, size_t page_
       establish_noaccess_prefix();
     }
   } else {
-    initialize(size, alignment, page_size, nullptr, false);
+    initialize(size, alignment, page_size, nullptr, false, nmt_flag());
   }
 
   assert(markWord::encode_pointer_as_mark(_base).decode_pointer() == _base,
@@ -652,9 +659,6 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, size_t page_
   assert(markWord::encode_pointer_as_mark(&_base[size]).decode_pointer() == &_base[size],
          "area must be distinguishable from marks for mark-sweep");
 
-  if (base() != nullptr) {
-    MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
-  }
 
   if (_fd_for_heap != -1) {
     ::close(_fd_for_heap);
@@ -670,8 +674,7 @@ MemRegion ReservedHeapSpace::region() const {
 ReservedCodeSpace::ReservedCodeSpace(size_t r_size,
                                      size_t rs_align,
                                      size_t rs_page_size) : ReservedSpace() {
-  initialize(r_size, rs_align, rs_page_size, /*requested address*/ nullptr, /*executable*/ true);
-  MemTracker::record_virtual_memory_type((address)base(), mtCode);
+  initialize(r_size, rs_align, rs_page_size, /*requested address*/ nullptr, /*executable*/ true, mtCode);
 }
 
 // VirtualSpace
@@ -692,6 +695,7 @@ VirtualSpace::VirtualSpace() {
   _upper_alignment        = 0;
   _special                = false;
   _executable             = false;
+  _flag                   = mtNone;
 }
 
 
@@ -713,6 +717,7 @@ bool VirtualSpace::initialize_with_granularity(ReservedSpace rs, size_t committe
 
   _special = rs.special();
   _executable = rs.executable();
+  _flag = rs.nmt_flag();
 
   // When a VirtualSpace begins life at a large size, make all future expansion
   // and shrinking occur aligned to a granularity of large pages.  This avoids
@@ -771,6 +776,7 @@ void VirtualSpace::release() {
   _upper_alignment        = 0;
   _special                = false;
   _executable             = false;
+  _flag                   = mtNone;
 }
 
 
@@ -836,8 +842,8 @@ static void pretouch_expanded_memory(void* start, void* end) {
   os::pretouch_memory(start, end);
 }
 
-static bool commit_expanded(char* start, size_t size, size_t alignment, bool pre_touch, bool executable) {
-  if (os::commit_memory(start, size, alignment, executable)) {
+static bool commit_expanded(char* start, size_t size, size_t alignment, bool pre_touch, bool executable, MEMFLAGS flag) {
+  if (os::commit_memory(start, size, alignment, executable, flag)) {
     if (pre_touch || AlwaysPreTouch) {
       pretouch_expanded_memory(start, start + size);
     }
@@ -926,7 +932,7 @@ bool VirtualSpace::expand_by(size_t bytes, bool pre_touch) {
   // Commit regions
   if (lower_needs > 0) {
     assert(lower_high() + lower_needs <= lower_high_boundary(), "must not expand beyond region");
-    if (!commit_expanded(lower_high(), lower_needs, _lower_alignment, pre_touch, _executable)) {
+    if (!commit_expanded(lower_high(), lower_needs, _lower_alignment, pre_touch, _executable, _flag)) {
       return false;
     }
     _lower_high += lower_needs;
@@ -934,7 +940,7 @@ bool VirtualSpace::expand_by(size_t bytes, bool pre_touch) {
 
   if (middle_needs > 0) {
     assert(middle_high() + middle_needs <= middle_high_boundary(), "must not expand beyond region");
-    if (!commit_expanded(middle_high(), middle_needs, _middle_alignment, pre_touch, _executable)) {
+    if (!commit_expanded(middle_high(), middle_needs, _middle_alignment, pre_touch, _executable, _flag)) {
       return false;
     }
     _middle_high += middle_needs;
@@ -942,7 +948,7 @@ bool VirtualSpace::expand_by(size_t bytes, bool pre_touch) {
 
   if (upper_needs > 0) {
     assert(upper_high() + upper_needs <= upper_high_boundary(), "must not expand beyond region");
-    if (!commit_expanded(upper_high(), upper_needs, _upper_alignment, pre_touch, _executable)) {
+    if (!commit_expanded(upper_high(), upper_needs, _upper_alignment, pre_touch, _executable, _flag)) {
       return false;
     }
     _upper_high += upper_needs;
@@ -1014,7 +1020,7 @@ void VirtualSpace::shrink_by(size_t size) {
     assert(middle_high_boundary() <= aligned_upper_new_high &&
            aligned_upper_new_high + upper_needs <= upper_high_boundary(),
            "must not shrink beyond region");
-    if (!os::uncommit_memory(aligned_upper_new_high, upper_needs, _executable)) {
+    if (!os::uncommit_memory(aligned_upper_new_high, upper_needs, _executable, _flag)) {
       debug_only(warning("os::uncommit_memory failed"));
       return;
     } else {
@@ -1025,7 +1031,7 @@ void VirtualSpace::shrink_by(size_t size) {
     assert(lower_high_boundary() <= aligned_middle_new_high &&
            aligned_middle_new_high + middle_needs <= middle_high_boundary(),
            "must not shrink beyond region");
-    if (!os::uncommit_memory(aligned_middle_new_high, middle_needs, _executable)) {
+    if (!os::uncommit_memory(aligned_middle_new_high, middle_needs, _executable, _flag)) {
       debug_only(warning("os::uncommit_memory failed"));
       return;
     } else {
@@ -1036,7 +1042,7 @@ void VirtualSpace::shrink_by(size_t size) {
     assert(low_boundary() <= aligned_lower_new_high &&
            aligned_lower_new_high + lower_needs <= lower_high_boundary(),
            "must not shrink beyond region");
-    if (!os::uncommit_memory(aligned_lower_new_high, lower_needs, _executable)) {
+    if (!os::uncommit_memory(aligned_lower_new_high, lower_needs, _executable, _flag)) {
       debug_only(warning("os::uncommit_memory failed"));
       return;
     } else {
diff --git a/src/hotspot/share/memory/virtualspace.hpp b/src/hotspot/share/memory/virtualspace.hpp
index 046ad0cf7a4..357c4952c34 100644
--- a/src/hotspot/share/memory/virtualspace.hpp
+++ b/src/hotspot/share/memory/virtualspace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,19 +35,20 @@ class outputStream;
 class ReservedSpace {
   friend class VMStructs;
  protected:
-  char*  _base;
-  size_t _size;
-  size_t _noaccess_prefix;
-  size_t _alignment;
-  size_t _page_size;
-  bool   _special;
-  int    _fd_for_heap;
+  char*    _base;
+  size_t   _size;
+  size_t   _noaccess_prefix;
+  size_t   _alignment;
+  size_t   _page_size;
+  int      _fd_for_heap;
+  bool     _special;
+  bool     _executable;
+  MEMFLAGS _flag;
  private:
-  bool   _executable;
 
   // ReservedSpace
   ReservedSpace(char* base, size_t size, size_t alignment,
-                size_t page_size, bool special, bool executable);
+                size_t page_size, bool special, bool executable, MEMFLAGS flag);
  protected:
   // Helpers to clear and set members during initialization. Two members
   // require special treatment:
@@ -58,25 +59,28 @@ class ReservedSpace {
   //                       0 during initialization.
   void clear_members();
   void initialize_members(char* base, size_t size, size_t alignment,
-                          size_t page_size, bool special, bool executable);
+                          size_t page_size, bool special, bool executable, MEMFLAGS flag);
 
   void initialize(size_t size, size_t alignment, size_t page_size,
-                  char* requested_address, bool executable);
+                  char* requested_address, bool executable, MEMFLAGS flag);
 
   void reserve(size_t size, size_t alignment, size_t page_size,
                char* requested_address, bool executable);
  public:
+
+  MEMFLAGS nmt_flag() const { return _flag; }
+
   // Constructor
   ReservedSpace();
   // Initialize the reserved space with the given size. Depending on the size
   // a suitable page size and alignment will be used.
-  explicit ReservedSpace(size_t size);
+  explicit ReservedSpace(size_t size, MEMFLAGS flag);
   // Initialize the reserved space with the given size. The preferred_page_size
   // is used as the minimum page size/alignment. This may waste some space if
   // the given size is not aligned to that value, as the reservation will be
   // aligned up to the final alignment in this case.
-  ReservedSpace(size_t size, size_t preferred_page_size);
-  ReservedSpace(size_t size, size_t alignment, size_t page_size,
+  ReservedSpace(size_t size, size_t preferred_page_size, MEMFLAGS flag);
+  ReservedSpace(size_t size, size_t alignment, size_t page_size, MEMFLAGS flag,
                 char* requested_address = nullptr);
 
   // Accessors
@@ -112,7 +116,7 @@ class ReservedSpace {
 
   // Put a ReservedSpace over an existing range
   static ReservedSpace space_for_range(char* base, size_t size, size_t alignment,
-                                       size_t page_size, bool special, bool executable);
+                                       size_t page_size, bool special, bool executable, MEMFLAGS flag);
 };
 
 ReservedSpace ReservedSpace::first_part(size_t partition_size)
@@ -179,6 +183,8 @@ class VirtualSpace {
   // Need to know if commit should be executable.
   bool   _executable;
 
+  MEMFLAGS _flag;
+
   // MPSS Support
   // Each virtualspace region has a lower, middle, and upper region.
   // Each region has an end boundary and a high pointer which is the
diff --git a/src/hotspot/share/nmt/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp
index 41a8f72b527..83880fc6dcc 100644
--- a/src/hotspot/share/nmt/memTracker.hpp
+++ b/src/hotspot/share/nmt/memTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, 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
@@ -120,7 +120,7 @@ class MemTracker : AllStatic {
   //  (we do not do any reservations before that).
 
   static inline void record_virtual_memory_reserve(void* addr, size_t size, const NativeCallStack& stack,
-    MEMFLAGS flag = mtNone) {
+    MEMFLAGS flag) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
@@ -137,32 +137,32 @@ class MemTracker : AllStatic {
     }
   }
 
-  static inline void record_virtual_memory_uncommit(address addr, size_t size) {
+  static inline void record_virtual_memory_uncommit(address addr, size_t size, MEMFLAGS flag) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
-      VirtualMemoryTracker::remove_uncommitted_region((address)addr, size);
+      VirtualMemoryTracker::remove_uncommitted_region((address)addr, size, flag);
     }
   }
 
   static inline void record_virtual_memory_reserve_and_commit(void* addr, size_t size,
-    const NativeCallStack& stack, MEMFLAGS flag = mtNone) {
+    const NativeCallStack& stack, MEMFLAGS flag) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
       ThreadCritical tc;
       VirtualMemoryTracker::add_reserved_region((address)addr, size, stack, flag);
-      VirtualMemoryTracker::add_committed_region((address)addr, size, stack);
+      VirtualMemoryTracker::add_committed_region((address)addr, size, stack, flag);
     }
   }
 
   static inline void record_virtual_memory_commit(void* addr, size_t size,
-    const NativeCallStack& stack) {
+    const NativeCallStack& stack, MEMFLAGS flag) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
       ThreadCritical tc;
-      VirtualMemoryTracker::add_committed_region((address)addr, size, stack);
+      VirtualMemoryTracker::add_committed_region((address)addr, size, stack, flag);
     }
   }
 
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index 06f9469f25e..a96718f59ff 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, 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
@@ -424,20 +424,20 @@ void VirtualMemoryTracker::set_reserved_region_type(address addr, MEMFLAGS flag)
   if (reserved_rgn != nullptr) {
     assert(reserved_rgn->contain_address(addr), "Containment");
     if (reserved_rgn->flag() != flag) {
-      assert(reserved_rgn->flag() == mtNone, "Overwrite memory type (should be mtNone, is: \"%s\")",
-             NMTUtil::flag_to_name(reserved_rgn->flag()));
+      assert(reserved_rgn->flag() == mtNone, "Overwrite memory type (should be mtNone, is: \"%s\") wants to change to \"%s\"",
+             NMTUtil::flag_to_name(reserved_rgn->flag()), NMTUtil::flag_to_name(flag));
       reserved_rgn->set_flag(flag);
     }
   }
 }
 
 bool VirtualMemoryTracker::add_committed_region(address addr, size_t size,
-  const NativeCallStack& stack) {
+  const NativeCallStack& stack, MEMFLAGS flag) {
   assert(addr != nullptr, "Invalid address");
   assert(size > 0, "Invalid size");
   assert(_reserved_regions != nullptr, "Sanity check");
 
-  ReservedMemoryRegion  rgn(addr, size);
+  ReservedMemoryRegion  rgn(addr, size, stack, flag);
   ReservedMemoryRegion* reserved_rgn = _reserved_regions->find(rgn);
 
   if (reserved_rgn == nullptr) {
@@ -452,7 +452,7 @@ bool VirtualMemoryTracker::add_committed_region(address addr, size_t size,
   return result;
 }
 
-bool VirtualMemoryTracker::remove_uncommitted_region(address addr, size_t size) {
+bool VirtualMemoryTracker::remove_uncommitted_region(address addr, size_t size, MEMFLAGS flag) {
   assert(addr != nullptr, "Invalid address");
   assert(size > 0, "Invalid size");
   assert(_reserved_regions != nullptr, "Sanity check");
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.hpp b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
index db49f108c84..6404f3fac4b 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.hpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, 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
@@ -296,13 +296,16 @@ class ReservedMemoryRegion : public VirtualMemoryRegion {
 
  public:
   ReservedMemoryRegion(address base, size_t size, const NativeCallStack& stack,
-    MEMFLAGS flag = mtNone) :
+    MEMFLAGS flag) :
     VirtualMemoryRegion(base, size), _stack(stack), _flag(flag) { }
 
 
   ReservedMemoryRegion(address base, size_t size) :
     VirtualMemoryRegion(base, size), _stack(NativeCallStack::empty_stack()), _flag(mtNone) { }
 
+  ReservedMemoryRegion(address base, size_t size, MEMFLAGS flag) :
+    VirtualMemoryRegion(base, size), _stack(NativeCallStack::empty_stack()), _flag(flag) { }
+
   // Copy constructor
   ReservedMemoryRegion(const ReservedMemoryRegion& rr) :
     VirtualMemoryRegion(rr.base(), rr.size()) {
@@ -379,10 +382,10 @@ class VirtualMemoryTracker : AllStatic {
  public:
   static bool initialize(NMT_TrackingLevel level);
 
-  static bool add_reserved_region (address base_addr, size_t size, const NativeCallStack& stack, MEMFLAGS flag = mtNone);
+  static bool add_reserved_region (address base_addr, size_t size, const NativeCallStack& stack, MEMFLAGS flag);
 
-  static bool add_committed_region      (address base_addr, size_t size, const NativeCallStack& stack);
-  static bool remove_uncommitted_region (address base_addr, size_t size);
+  static bool add_committed_region      (address base_addr, size_t size, const NativeCallStack& stack, MEMFLAGS flag);
+  static bool remove_uncommitted_region (address base_addr, size_t size, MEMFLAGS flag);
   static bool remove_released_region    (address base_addr, size_t size);
   static bool remove_released_region    (ReservedMemoryRegion* rgn);
   static void set_reserved_region_type  (address addr, MEMFLAGS flag);
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
index 4a94eb9bde0..98be5dc9781 100644
--- a/src/hotspot/share/oops/compressedKlass.cpp
+++ b/src/hotspot/share/oops/compressedKlass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t
 
 char* CompressedKlassPointers::reserve_address_space_X(uintptr_t from, uintptr_t to, size_t size, size_t alignment, bool aslr) {
   alignment = MAX2(Metaspace::reserve_alignment(), alignment);
-  return os::attempt_reserve_memory_between((char*)from, (char*)to, size, alignment, aslr);
+  return os::attempt_reserve_memory_between((char*)from, (char*)to, size, alignment, aslr, mtMetaspace);
 }
 
 char* CompressedKlassPointers::reserve_address_space_for_unscaled_encoding(size_t size, bool aslr) {
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index b6a4443a8c7..e66daa1db9c 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 Red Hat, Inc.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2396,11 +2396,10 @@ static char* get_bad_address() {
   static char* bad_address = nullptr;
   if (bad_address == nullptr) {
     size_t size = os::vm_allocation_granularity();
-    bad_address = os::reserve_memory(size);
+    bad_address = os::reserve_memory(size, !ExecMem, mtInternal);
     if (bad_address != nullptr) {
       os::protect_memory(bad_address, size, os::MEM_PROT_READ,
                          /*is_committed*/false);
-      MemTracker::record_virtual_memory_type((void*)bad_address, mtInternal);
     }
   }
   return bad_address;
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 54fb62180bf..2a99e33eaf8 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -697,27 +697,21 @@ WB_END
 
 WB_ENTRY(jlong, WB_NMTReserveMemory(JNIEnv* env, jobject o, jlong size))
   jlong addr = 0;
-
-  addr = (jlong)(uintptr_t)os::reserve_memory(size);
-  MemTracker::record_virtual_memory_type((address)addr, mtTest);
-
+  addr = (jlong)(uintptr_t)os::reserve_memory(size, !ExecMem, mtTest);
   return addr;
 WB_END
 
 WB_ENTRY(jlong, WB_NMTAttemptReserveMemoryAt(JNIEnv* env, jobject o, jlong addr, jlong size))
-  addr = (jlong)(uintptr_t)os::attempt_reserve_memory_at((char*)(uintptr_t)addr, (size_t)size);
-  MemTracker::record_virtual_memory_type((address)addr, mtTest);
-
+  addr = (jlong)(uintptr_t)os::attempt_reserve_memory_at((char*)(uintptr_t)addr, (size_t)size, !ExecMem, mtTest);
   return addr;
 WB_END
 
 WB_ENTRY(void, WB_NMTCommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
-  os::commit_memory((char *)(uintptr_t)addr, size, !ExecMem);
-  MemTracker::record_virtual_memory_type((address)(uintptr_t)addr, mtTest);
+  os::commit_memory((char *)(uintptr_t)addr, size, !ExecMem, mtTest);
 WB_END
 
 WB_ENTRY(void, WB_NMTUncommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
-  os::uncommit_memory((char *)(uintptr_t)addr, size);
+  os::uncommit_memory((char *)(uintptr_t)addr, size, !ExecMem, mtTest);
 WB_END
 
 WB_ENTRY(void, WB_NMTReleaseMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
@@ -1486,7 +1480,7 @@ WB_ENTRY(void, WB_ReadReservedMemory(JNIEnv* env, jobject o))
   static char c;
   static volatile char* p;
 
-  p = os::reserve_memory(os::vm_allocation_granularity());
+  p = os::reserve_memory(os::vm_allocation_granularity(), !ExecMem, mtTest);
   if (p == nullptr) {
     THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(), "Failed to reserve memory");
   }
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 53c438cd208..5197abf5b54 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1821,7 +1821,7 @@ bool os::create_stack_guard_pages(char* addr, size_t bytes) {
 }
 
 char* os::reserve_memory(size_t bytes, bool executable, MEMFLAGS flags) {
-  char* result = pd_reserve_memory(bytes, executable);
+  char* result = pd_reserve_memory(bytes, executable, flags);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve(result, bytes, CALLER_PC, flags);
     log_debug(os, map)("Reserved " RANGEFMT, RANGEFMTARGS(result, bytes));
@@ -1832,7 +1832,7 @@ char* os::reserve_memory(size_t bytes, bool executable, MEMFLAGS flags) {
 }
 
 char* os::attempt_reserve_memory_at(char* addr, size_t bytes, bool executable, MEMFLAGS flag) {
-  char* result = SimulateFullAddressSpace ? nullptr : pd_attempt_reserve_memory_at(addr, bytes, executable);
+  char* result = SimulateFullAddressSpace ? nullptr : pd_attempt_reserve_memory_at(addr, bytes, executable, flag);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC, flag);
     log_debug(os, map)("Reserved " RANGEFMT, RANGEFMTARGS(result, bytes));
@@ -1879,7 +1879,7 @@ static void hemi_split(T* arr, unsigned num) {
 
 // Given an address range [min, max), attempts to reserve memory within this area, with the given alignment.
 // If randomize is true, the location will be randomized.
-char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomize) {
+char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomize, MEMFLAGS flag) {
 
   // Please keep the following constants in sync with the companion gtests:
 
@@ -2017,7 +2017,7 @@ char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, siz
     const unsigned candidate_offset = points[i];
     char* const candidate = lo_att + candidate_offset * alignment_adjusted;
     assert(candidate <= hi_att, "Invalid offset %u (" ARGSFMT ")", candidate_offset, ARGSFMTARGS);
-    result = SimulateFullAddressSpace ? nullptr : os::pd_attempt_reserve_memory_at(candidate, bytes, false);
+    result = SimulateFullAddressSpace ? nullptr : os::pd_attempt_reserve_memory_at(candidate, bytes, !ExecMem, flag);
     if (!result) {
       log_trace(os, map)("Failed to attach at " PTR_FORMAT, p2i(candidate));
     }
@@ -2034,7 +2034,7 @@ char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, siz
     assert(is_aligned(result, alignment), "alignment invalid (" ERRFMT ")", ERRFMTARGS);
     log_trace(os, map)(ERRFMT, ERRFMTARGS);
     log_debug(os, map)("successfully attached at " PTR_FORMAT, p2i(result));
-    MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
+    MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC, flag);
   } else {
     log_debug(os, map)("failed to attach anywhere in [" PTR_FORMAT "-" PTR_FORMAT ")", p2i(min), p2i(max));
   }
@@ -2050,11 +2050,11 @@ static void assert_nonempty_range(const char* addr, size_t bytes) {
          p2i(addr), p2i(addr) + bytes);
 }
 
-bool os::commit_memory(char* addr, size_t bytes, bool executable) {
+bool os::commit_memory(char* addr, size_t bytes, bool executable, MEMFLAGS flag) {
   assert_nonempty_range(addr, bytes);
   bool res = pd_commit_memory(addr, bytes, executable);
   if (res) {
-    MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC);
+    MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC, flag);
     log_debug(os, map)("Committed " RANGEFMT, RANGEFMTARGS(addr, bytes));
   } else {
     log_info(os, map)("Failed to commit " RANGEFMT, RANGEFMTARGS(addr, bytes));
@@ -2063,11 +2063,11 @@ bool os::commit_memory(char* addr, size_t bytes, bool executable) {
 }
 
 bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
-                              bool executable) {
+                              bool executable, MEMFLAGS flag) {
   assert_nonempty_range(addr, size);
   bool res = os::pd_commit_memory(addr, size, alignment_hint, executable);
   if (res) {
-    MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC);
+    MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC, flag);
     log_debug(os, map)("Committed " RANGEFMT, RANGEFMTARGS(addr, size));
   } else {
     log_info(os, map)("Failed to commit " RANGEFMT, RANGEFMTARGS(addr, size));
@@ -2076,27 +2076,27 @@ bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
 }
 
 void os::commit_memory_or_exit(char* addr, size_t bytes, bool executable,
-                               const char* mesg) {
+                               MEMFLAGS flag, const char* mesg) {
   assert_nonempty_range(addr, bytes);
   pd_commit_memory_or_exit(addr, bytes, executable, mesg);
-  MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC);
+  MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC, flag);
 }
 
 void os::commit_memory_or_exit(char* addr, size_t size, size_t alignment_hint,
-                               bool executable, const char* mesg) {
+                               bool executable, MEMFLAGS flag, const char* mesg) {
   assert_nonempty_range(addr, size);
   os::pd_commit_memory_or_exit(addr, size, alignment_hint, executable, mesg);
-  MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC);
+  MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC, flag);
 }
 
-bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
+bool os::uncommit_memory(char* addr, size_t bytes, bool executable, MEMFLAGS flag) {
   assert_nonempty_range(addr, bytes);
   bool res;
   if (MemTracker::enabled()) {
     ThreadCritical tc;
     res = pd_uncommit_memory(addr, bytes, executable);
     if (res) {
-      MemTracker::record_virtual_memory_uncommit((address)addr, bytes);
+      MemTracker::record_virtual_memory_uncommit((address)addr, bytes, flag);
     }
   } else {
     res = pd_uncommit_memory(addr, bytes, executable);
@@ -2180,7 +2180,7 @@ char* os::map_memory_to_file(size_t bytes, int file_desc, MEMFLAGS flag) {
 }
 
 char* os::attempt_map_memory_to_file_at(char* addr, size_t bytes, int file_desc, MEMFLAGS flag) {
-  char* result = pd_attempt_map_memory_to_file_at(addr, bytes, file_desc);
+  char* result = pd_attempt_map_memory_to_file_at(addr, bytes, file_desc, flag);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve_and_commit((address)result, bytes, CALLER_PC, flag);
   }
@@ -2188,8 +2188,8 @@ char* os::attempt_map_memory_to_file_at(char* addr, size_t bytes, int file_desc,
 }
 
 char* os::map_memory(int fd, const char* file_name, size_t file_offset,
-                           char *addr, size_t bytes, bool read_only,
-                           bool allow_exec, MEMFLAGS flags) {
+                     char *addr, size_t bytes, bool read_only,
+                     bool allow_exec, MEMFLAGS flags) {
   char* result = pd_map_memory(fd, file_name, file_offset, addr, bytes, read_only, allow_exec);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve_and_commit((address)result, bytes, CALLER_PC, flags);
@@ -2211,8 +2211,8 @@ bool os::unmap_memory(char *addr, size_t bytes) {
   return result;
 }
 
-void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {
-  pd_free_memory(addr, bytes, alignment_hint);
+void os::free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) {
+  pd_free_memory(addr, bytes, alignment_hint, flag);
 }
 
 void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
@@ -2220,14 +2220,14 @@ void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
 }
 
 char* os::reserve_memory_special(size_t size, size_t alignment, size_t page_size,
-                                 char* addr, bool executable) {
+                                 char* addr, bool executable, MEMFLAGS flag) {
 
   assert(is_aligned(addr, alignment), "Unaligned request address");
 
-  char* result = pd_reserve_memory_special(size, alignment, page_size, addr, executable);
+  char* result = pd_reserve_memory_special(size, alignment, page_size, addr, executable, flag);
   if (result != nullptr) {
     // The memory is committed
-    MemTracker::record_virtual_memory_reserve_and_commit((address)result, size, CALLER_PC);
+    MemTracker::record_virtual_memory_reserve_and_commit((address)result, size, CALLER_PC, flag);
     log_debug(os, map)("Reserved and committed " RANGEFMT, RANGEFMTARGS(result, size));
   } else {
     log_info(os, map)("Reserve and commit failed (%zu bytes)", size);
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index 4bfcd9c2da5..29ef6d5d29d 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -208,9 +208,9 @@ class os: AllStatic {
   // low enough to leave most of the valuable low-4gb address space open.
   static constexpr size_t _vm_min_address_default = 16 * M;
 
-  static char*  pd_reserve_memory(size_t bytes, bool executable);
+  static char*  pd_reserve_memory(size_t bytes, bool executable, MEMFLAGS flag);
 
-  static char*  pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool executable);
+  static char*  pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool executable, MEMFLAGS flag);
 
   static bool   pd_commit_memory(char* addr, size_t bytes, bool executable);
   static bool   pd_commit_memory(char* addr, size_t size, size_t alignment_hint,
@@ -225,13 +225,13 @@ class os: AllStatic {
   static bool   pd_uncommit_memory(char* addr, size_t bytes, bool executable);
   static bool   pd_release_memory(char* addr, size_t bytes);
 
-  static char*  pd_attempt_map_memory_to_file_at(char* addr, size_t bytes, int file_desc);
+  static char*  pd_attempt_map_memory_to_file_at(char* addr, size_t bytes, int file_desc, MEMFLAGS flag);
 
   static char*  pd_map_memory(int fd, const char* file_name, size_t file_offset,
-                           char *addr, size_t bytes, bool read_only = false,
-                           bool allow_exec = false);
+                              char *addr, size_t bytes, bool read_only = false,
+                              bool allow_exec = false);
   static bool   pd_unmap_memory(char *addr, size_t bytes);
-  static void   pd_free_memory(char *addr, size_t bytes, size_t alignment_hint);
+  static void   pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag);
   static void   pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint);
 
   // Returns 0 if pretouch is done via platform dependent method, or otherwise
@@ -239,8 +239,7 @@ class os: AllStatic {
   static size_t pd_pretouch_memory(void* first, void* last, size_t page_size);
 
   static char*  pd_reserve_memory_special(size_t size, size_t alignment, size_t page_size,
-
-                                          char* addr, bool executable);
+                                          char* addr, bool executable, MEMFLAGS flag);
   static bool   pd_release_memory_special(char* addr, size_t bytes);
 
   static size_t page_size_for_region(size_t region_size, size_t min_pages, bool must_be_aligned);
@@ -448,30 +447,30 @@ class os: AllStatic {
   inline static size_t cds_core_region_alignment();
 
   // Reserves virtual memory.
-  static char*  reserve_memory(size_t bytes, bool executable = false, MEMFLAGS flags = mtNone);
+  static char*  reserve_memory(size_t bytes, bool executable, MEMFLAGS flags);
 
   // Reserves virtual memory that starts at an address that is aligned to 'alignment'.
-  static char*  reserve_memory_aligned(size_t size, size_t alignment, bool executable = false);
+  static char*  reserve_memory_aligned(size_t size, size_t alignment, bool executable, MEMFLAGS flag);
 
   // Attempts to reserve the virtual memory at [addr, addr + bytes).
   // Does not overwrite existing mappings.
-  static char*  attempt_reserve_memory_at(char* addr, size_t bytes, bool executable = false, MEMFLAGS flag = mtNone);
+  static char*  attempt_reserve_memory_at(char* addr, size_t bytes, bool executable, MEMFLAGS flag);
 
   // Given an address range [min, max), attempts to reserve memory within this area, with the given alignment.
   // If randomize is true, the location will be randomized.
-  static char* attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomize);
+  static char* attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomize, MEMFLAGS flag);
 
-  static bool   commit_memory(char* addr, size_t bytes, bool executable);
+  static bool   commit_memory(char* addr, size_t bytes, bool executable, MEMFLAGS flag);
   static bool   commit_memory(char* addr, size_t size, size_t alignment_hint,
-                              bool executable);
+                              bool executable, MEMFLAGS flag);
   // Same as commit_memory() that either succeeds or calls
   // vm_exit_out_of_memory() with the specified mesg.
   static void   commit_memory_or_exit(char* addr, size_t bytes,
-                                      bool executable, const char* mesg);
+                                      bool executable, MEMFLAGS flag, const char* mesg);
   static void   commit_memory_or_exit(char* addr, size_t size,
                                       size_t alignment_hint,
-                                      bool executable, const char* mesg);
-  static bool   uncommit_memory(char* addr, size_t bytes, bool executable = false);
+                                      bool executable, MEMFLAGS flag, const char* mesg);
+  static bool   uncommit_memory(char* addr, size_t bytes, bool executable, MEMFLAGS flag);
   static bool   release_memory(char* addr, size_t bytes);
 
   // Does the platform support trimming the native heap?
@@ -507,18 +506,18 @@ class os: AllStatic {
   static int create_file_for_heap(const char* dir);
   // Map memory to the file referred by fd. This function is slightly different from map_memory()
   // and is added to be used for implementation of -XX:AllocateHeapAt
-  static char* map_memory_to_file(size_t size, int fd, MEMFLAGS flag = mtNone);
-  static char* map_memory_to_file_aligned(size_t size, size_t alignment, int fd, MEMFLAGS flag = mtNone);
+  static char* map_memory_to_file(size_t size, int fd, MEMFLAGS flag);
+  static char* map_memory_to_file_aligned(size_t size, size_t alignment, int fd, MEMFLAGS flag);
   static char* map_memory_to_file(char* base, size_t size, int fd);
-  static char* attempt_map_memory_to_file_at(char* base, size_t size, int fd, MEMFLAGS flag = mtNone);
+  static char* attempt_map_memory_to_file_at(char* base, size_t size, int fd, MEMFLAGS flag);
   // Replace existing reserved memory with file mapping
   static char* replace_existing_mapping_with_file_mapping(char* base, size_t size, int fd);
 
   static char*  map_memory(int fd, const char* file_name, size_t file_offset,
-                           char *addr, size_t bytes, bool read_only = false,
-                           bool allow_exec = false, MEMFLAGS flags = mtNone);
+                           char *addr, size_t bytes, bool read_only,
+                           bool allow_exec, MEMFLAGS flag);
   static bool   unmap_memory(char *addr, size_t bytes);
-  static void   free_memory(char *addr, size_t bytes, size_t alignment_hint);
+  static void   free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag);
   static void   realign_memory(char *addr, size_t bytes, size_t alignment_hint);
 
   // NUMA-specific interface
@@ -540,7 +539,7 @@ class os: AllStatic {
   static char*  non_memory_address_word();
   // reserve, commit and pin the entire memory region
   static char*  reserve_memory_special(size_t size, size_t alignment, size_t page_size,
-                                       char* addr, bool executable);
+                                       char* addr, bool executable, MEMFLAGS flag);
   static bool   release_memory_special(char* addr, size_t bytes);
   static void   large_page_init();
   static size_t large_page_size();
diff --git a/src/hotspot/share/runtime/safepointMechanism.cpp b/src/hotspot/share/runtime/safepointMechanism.cpp
index 624583db3d1..dcad8acb215 100644
--- a/src/hotspot/share/runtime/safepointMechanism.cpp
+++ b/src/hotspot/share/runtime/safepointMechanism.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,9 +58,8 @@ void SafepointMechanism::default_initialize() {
     // Polling page
     const size_t page_size = os::vm_page_size();
     const size_t allocation_size = 2 * page_size;
-    char* polling_page = os::reserve_memory(allocation_size);
-    os::commit_memory_or_exit(polling_page, allocation_size, false, "Unable to commit Safepoint polling page");
-    MemTracker::record_virtual_memory_type((address)polling_page, mtSafepoint);
+    char* polling_page = os::reserve_memory(allocation_size, !ExecMem, mtSafepoint);
+    os::commit_memory_or_exit(polling_page, allocation_size, !ExecMem, mtSafepoint, "Unable to commit Safepoint polling page");
 
     char* bad_page  = polling_page;
     char* good_page = polling_page + page_size;
diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp
index 9f839fc1a13..e12e55e4984 100644
--- a/src/hotspot/share/utilities/debug.cpp
+++ b/src/hotspot/share/utilities/debug.cpp
@@ -709,10 +709,9 @@ struct TestMultipleStaticAssertFormsInClassScope {
 static ucontext_t g_stored_assertion_context;
 
 void initialize_assert_poison() {
-  char* page = os::reserve_memory(os::vm_page_size());
+  char* page = os::reserve_memory(os::vm_page_size(), !ExecMem, mtInternal);
   if (page) {
-    MemTracker::record_virtual_memory_type(page, mtInternal);
-    if (os::commit_memory(page, os::vm_page_size(), false) &&
+    if (os::commit_memory(page, os::vm_page_size(), !ExecMem, mtInternal) &&
         os::protect_memory(page, os::vm_page_size(), os::MEM_PROT_NONE)) {
       g_assert_poison = page;
     }
diff --git a/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp b/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp
index 4639f1c9694..6dfde68678a 100644
--- a/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp
+++ b/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp
@@ -50,7 +50,7 @@ TEST_OTHER_VM(FreeRegionList, length) {
   // the BOT.
   size_t bot_size = G1BlockOffsetTable::compute_size(heap.word_size());
   HeapWord* bot_data = NEW_C_HEAP_ARRAY(HeapWord, bot_size, mtGC);
-  ReservedSpace bot_rs(G1BlockOffsetTable::compute_size(heap.word_size()));
+  ReservedSpace bot_rs(G1BlockOffsetTable::compute_size(heap.word_size()), mtTest);
   G1RegionToSpaceMapper* bot_storage =
     G1RegionToSpaceMapper::create_mapper(bot_rs,
                                          bot_rs.size(),
diff --git a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
index 8ce98827ab2..2285f58d55c 100644
--- a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
+++ b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
@@ -81,7 +81,7 @@ TEST_VM(G1RegionToSpaceMapper, smallStressAdjacent) {
   size_t size = G1BlockOffsetTable::compute_size(num_regions * region_size / HeapWordSize);
   size_t page_size = os::vm_page_size();
 
-  ReservedSpace rs(size, os::vm_page_size());
+  ReservedSpace rs(size, os::vm_page_size(), mtTest);
 
   G1RegionToSpaceMapper* small_mapper  =
     G1RegionToSpaceMapper::create_mapper(rs,
@@ -105,7 +105,7 @@ TEST_VM(G1RegionToSpaceMapper, largeStressAdjacent) {
   size_t size = G1BlockOffsetTable::compute_size(num_regions * region_size / HeapWordSize);
   size_t page_size = os::vm_page_size();
 
-  ReservedSpace rs(size, page_size);
+  ReservedSpace rs(size, page_size, mtTest);
 
   G1RegionToSpaceMapper* large_mapper  =
     G1RegionToSpaceMapper::create_mapper(rs,
diff --git a/test/hotspot/gtest/gc/z/test_zForwarding.cpp b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
index 622c6d9d8f4..570e402ccd7 100644
--- a/test/hotspot/gtest/gc/z/test_zForwarding.cpp
+++ b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -56,7 +56,7 @@ public:
     const size_t increment = MAX2(align_up(unused / 100, ZGranuleSize), ZGranuleSize);
 
     for (uintptr_t start = 0; start + ZGranuleSize <= ZAddressOffsetMax; start += increment) {
-      char* const reserved = os::attempt_reserve_memory_at((char*)ZAddressHeapBase + start, ZGranuleSize, false /* executable */);
+      char* const reserved = os::attempt_reserve_memory_at((char*)ZAddressHeapBase + start, ZGranuleSize, !ExecMem /* executable */, mtTest);
       if (reserved != nullptr) {
         // Success
         return reserved;
@@ -100,7 +100,7 @@ public:
 
     _reserved = reserved;
 
-    os::commit_memory((char*)_reserved, ZGranuleSize, false /* executable */);
+    os::commit_memory((char*)_reserved, ZGranuleSize, !ExecMem /* executable */, mtTest);
 
     _page_offset = uintptr_t(_reserved) - ZAddressHeapBase;
   }
@@ -111,7 +111,7 @@ public:
     ZGeneration::_old = _old_old;
     ZGeneration::_young = _old_young;
     if (_reserved != nullptr) {
-      os::uncommit_memory((char*)_reserved, ZGranuleSize, false /* executable */);
+      os::uncommit_memory((char*)_reserved, ZGranuleSize, !ExecMem, mtTest);
       os::release_memory((char*)_reserved, ZGranuleSize);
     }
   }
diff --git a/test/hotspot/gtest/memory/test_virtualspace.cpp b/test/hotspot/gtest/memory/test_virtualspace.cpp
index 2240f0f4cb3..a20f85ba6c5 100644
--- a/test/hotspot/gtest/memory/test_virtualspace.cpp
+++ b/test/hotspot/gtest/memory/test_virtualspace.cpp
@@ -64,7 +64,7 @@ namespace {
   static void test_reserved_size(size_t size) {
     ASSERT_PRED2(is_size_aligned, size, os::vm_allocation_granularity());
 
-    ReservedSpace rs(size);
+    ReservedSpace rs(size, mtTest);
     MemoryReleaser releaser(&rs);
 
     EXPECT_TRUE(rs.base() != nullptr) << "rs.special: " << rs.special();
@@ -78,7 +78,7 @@ namespace {
   static void test_reserved_size_alignment(size_t size, size_t alignment) {
     ASSERT_PRED2(is_size_aligned, size, alignment) << "Incorrect input parameters";
     size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
-    ReservedSpace rs(size, alignment, page_size, (char *) nullptr);
+    ReservedSpace rs(size, alignment, page_size, mtTest, (char *) nullptr);
 
     ASSERT_TRUE(rs.base() != nullptr) << "rs.special = " << rs.special();
     ASSERT_EQ(size, rs.size()) << "rs.special = " << rs.special();
@@ -106,7 +106,7 @@ namespace {
     bool large = maybe_large && UseLargePages && size >= os::large_page_size();
     size_t page_size = large ? os::large_page_size() : os::vm_page_size();
 
-    ReservedSpace rs(size, alignment, page_size);
+    ReservedSpace rs(size, alignment, page_size, mtTest);
     MemoryReleaser releaser(&rs);
 
     EXPECT_TRUE(rs.base() != nullptr) << "rs.special: " << rs.special();
@@ -215,12 +215,13 @@ namespace {
       default:
       case Default:
       case Reserve:
-        return ReservedSpace(reserve_size_aligned);
+        return ReservedSpace(reserve_size_aligned, mtTest);
       case Disable:
       case Commit:
         return ReservedSpace(reserve_size_aligned,
                              os::vm_allocation_granularity(),
-                             os::vm_page_size());
+                             os::vm_page_size(),
+                             mtTest);
     }
   }
 
@@ -299,7 +300,7 @@ TEST_VM(VirtualSpace, actual_committed_space_one_large_page) {
 
   size_t large_page_size = os::large_page_size();
 
-  ReservedSpace reserved(large_page_size, large_page_size, large_page_size);
+  ReservedSpace reserved(large_page_size, large_page_size, large_page_size, mtTest);
   ReservedSpaceReleaser releaser(&reserved);
   ASSERT_TRUE(reserved.is_reserved());
 
@@ -369,6 +370,7 @@ class TestReservedSpace : AllStatic {
     ReservedSpace rs(size,          // size
                      alignment,     // alignment
                      page_size, // page size
+                     mtTest, // NMT MEM Flag
                      (char *)nullptr); // requested_address
 
     EXPECT_TRUE(rs.base() != nullptr);
@@ -387,7 +389,7 @@ class TestReservedSpace : AllStatic {
   static void test_reserved_space2(size_t size) {
     ASSERT_TRUE(is_aligned(size, os::vm_allocation_granularity())) << "Must be at least AG aligned";
 
-    ReservedSpace rs(size);
+    ReservedSpace rs(size, mtTest);
 
     EXPECT_TRUE(rs.base() != nullptr);
     EXPECT_EQ(rs.size(), size) <<  "rs.size: " << rs.size();
@@ -412,7 +414,7 @@ class TestReservedSpace : AllStatic {
     bool large = maybe_large && UseLargePages && size >= os::large_page_size();
     size_t page_size = large ? os::large_page_size() : os::vm_page_size();
 
-    ReservedSpace rs(size, alignment, page_size);
+    ReservedSpace rs(size, alignment, page_size, mtTest);
 
     EXPECT_TRUE(rs.base() != nullptr);
     EXPECT_EQ(rs.size(), size) <<  "rs.size: " << rs.size();
@@ -516,12 +518,12 @@ class TestVirtualSpace : AllStatic {
     default:
     case Default:
     case Reserve:
-      return ReservedSpace(reserve_size_aligned);
+      return ReservedSpace(reserve_size_aligned, mtTest);
     case Disable:
     case Commit:
       return ReservedSpace(reserve_size_aligned,
                            os::vm_allocation_granularity(),
-                           os::vm_page_size());
+                           os::vm_page_size(), mtTest);
     }
   }
 
@@ -576,7 +578,7 @@ class TestVirtualSpace : AllStatic {
 
     size_t large_page_size = os::large_page_size();
 
-    ReservedSpace reserved(large_page_size, large_page_size, large_page_size);
+    ReservedSpace reserved(large_page_size, large_page_size, large_page_size, mtTest);
 
     EXPECT_TRUE(reserved.is_reserved());
 
diff --git a/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp b/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
index 87ad2a798e0..359c492bb6a 100644
--- a/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
@@ -114,7 +114,7 @@ TEST_VM(NMT, DISABLED_location_printing_cheap_dead_7) { test_for_dead_c_heap_blo
 #endif
 
 static void test_for_mmap(size_t sz, ssize_t offset) {
-  char* addr = os::reserve_memory(sz, false, mtTest);
+  char* addr = os::reserve_memory(sz, !ExecMem, mtTest);
   if (MemTracker::enabled()) {
     test_pointer(addr + offset, true, "in mmap'd memory region");
   } else {
diff --git a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
index d4959cfa008..4036c798079 100644
--- a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
+++ b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
@@ -93,7 +93,7 @@ public:
     const size_t page_sz = os::vm_page_size();
     const size_t size = num_pages * page_sz;
     char* base = os::reserve_memory(size, !ExecMem, mtThreadStack);
-    bool result = os::commit_memory(base, size, !ExecMem);
+    bool result = os::commit_memory(base, size, !ExecMem, mtThreadStack);
     size_t index;
     ASSERT_NE(base, (char*)nullptr);
     for (index = 0; index < touch_pages; index ++) {
@@ -132,7 +132,7 @@ public:
     }
 
     // Cleanup
-    os::free_memory(base, size, page_sz);
+    os::free_memory(base, size, page_sz, mtThreadStack);
     VirtualMemoryTracker::remove_released_region((address)base, size);
 
     rmr = VirtualMemoryTracker::_reserved_regions->find(ReservedMemoryRegion((address)base, size));
@@ -162,7 +162,7 @@ public:
     const size_t size = num_pages * page_sz;
     char* base = os::reserve_memory(size, !ExecMem, mtTest);
     ASSERT_NE(base, (char*)nullptr);
-    result = os::commit_memory(base, size, !ExecMem);
+    result = os::commit_memory(base, size, !ExecMem, mtTest);
 
     ASSERT_TRUE(result);
     // touch all pages
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 55d30349ee5..3b7267b5790 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -367,7 +367,7 @@ TEST_VM(os, jio_snprintf) {
 static inline bool can_reserve_executable_memory(void) {
   bool executable = true;
   size_t len = 128;
-  char* p = os::reserve_memory(len, executable);
+  char* p = os::reserve_memory(len, executable, mtTest);
   bool exec_supported = (p != nullptr);
   if (exec_supported) {
     os::release_memory(p, len);
@@ -405,7 +405,7 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
   for (int tries = 0; tries < 256 && p == nullptr; tries ++) {
     size_t total_range_len = num_stripes * stripe_len;
     // Reserve a large contiguous area to get the address space...
-    p = (address)os::reserve_memory(total_range_len);
+    p = (address)os::reserve_memory(total_range_len, !ExecMem, mtTest);
     EXPECT_NE(p, (address)nullptr);
     // .. release it...
     EXPECT_TRUE(os::release_memory((char*)p, total_range_len));
@@ -419,14 +419,14 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
 #else
       const bool executable = stripe % 2 == 0;
 #endif
-      q = (address)os::attempt_reserve_memory_at((char*)q, stripe_len, executable);
+      q = (address)os::attempt_reserve_memory_at((char*)q, stripe_len, executable, mtTest);
       if (q == nullptr) {
         // Someone grabbed that area concurrently. Cleanup, then retry.
         tty->print_cr("reserve_multiple: retry (%d)...", stripe);
         carefully_release_multiple(p, stripe, stripe_len);
         p = nullptr;
       } else {
-        EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, executable));
+        EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, executable, mtTest));
       }
     }
   }
@@ -439,12 +439,12 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
 static address reserve_one_commit_multiple(int num_stripes, size_t stripe_len) {
   assert(is_aligned(stripe_len, os::vm_allocation_granularity()), "Sanity");
   size_t total_range_len = num_stripes * stripe_len;
-  address p = (address)os::reserve_memory(total_range_len);
+  address p = (address)os::reserve_memory(total_range_len, !ExecMem, mtTest);
   EXPECT_NE(p, (address)nullptr);
   for (int stripe = 0; stripe < num_stripes; stripe++) {
     address q = p + (stripe * stripe_len);
     if (stripe % 2 == 0) {
-      EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, false));
+      EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, !ExecMem, mtTest));
     }
   }
   return p;
@@ -506,7 +506,7 @@ TEST_VM(os, release_multi_mappings) {
   PRINT_MAPPINGS("B");
 
   // ...re-reserve the middle stripes. This should work unless release silently failed.
-  address p2 = (address)os::attempt_reserve_memory_at((char*)p_middle_stripes, middle_stripe_len);
+  address p2 = (address)os::attempt_reserve_memory_at((char*)p_middle_stripes, middle_stripe_len, !ExecMem, mtTest);
 
   ASSERT_EQ(p2, p_middle_stripes);
 
@@ -529,7 +529,7 @@ TEST_VM_ASSERT_MSG(os, release_bad_ranges, ".*bad release") {
 #else
 TEST_VM(os, release_bad_ranges) {
 #endif
-  char* p = os::reserve_memory(4 * M);
+  char* p = os::reserve_memory(4 * M, !ExecMem, mtTest);
   ASSERT_NE(p, (char*)nullptr);
   // Release part of range
   ASSERT_FALSE(os::release_memory(p, M));
@@ -564,7 +564,7 @@ TEST_VM(os, release_one_mapping_multi_commits) {
 
   // // make things even more difficult by trying to reserve at the border of the region
   address border = p + num_stripes * stripe_len;
-  address p2 = (address)os::attempt_reserve_memory_at((char*)border, stripe_len);
+  address p2 = (address)os::attempt_reserve_memory_at((char*)border, stripe_len, !ExecMem, mtTest);
   PRINT_MAPPINGS("B");
 
   ASSERT_TRUE(p2 == nullptr || p2 == border);
@@ -605,9 +605,9 @@ TEST_VM(os, show_mappings_small_range) {
 TEST_VM(os, show_mappings_full_range) {
   // Reserve a small range and fill it with a marker string, should show up
   // on implementations displaying range snippets
-  char* p = os::reserve_memory(1 * M, false, mtInternal);
+  char* p = os::reserve_memory(1 * M, !ExecMem, mtInternal);
   if (p != nullptr) {
-    if (os::commit_memory(p, 1 * M, false)) {
+    if (os::commit_memory(p, 1 * M, !ExecMem, mtTest)) {
       strcpy(p, "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
     }
   }
@@ -629,7 +629,7 @@ TEST_VM(os, find_mapping_simple) {
 
   // A simple allocation
   {
-    address p = (address)os::reserve_memory(total_range_len);
+    address p = (address)os::reserve_memory(total_range_len, !ExecMem, mtTest);
     ASSERT_NE(p, (address)nullptr);
     PRINT_MAPPINGS("A");
     for (size_t offset = 0; offset < total_range_len; offset += 4711) {
@@ -934,9 +934,9 @@ TEST_VM(os, open_O_CLOEXEC) {
 }
 
 TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_smallpages) {
-  char* p1 = os::reserve_memory(M, false, mtTest);
+  char* p1 = os::reserve_memory(M, !ExecMem, mtTest);
   ASSERT_NE(p1, nullptr);
-  char* p2 = os::attempt_reserve_memory_at(p1, M);
+  char* p2 = os::attempt_reserve_memory_at(p1, M, !ExecMem, mtTest);
   ASSERT_EQ(p2, nullptr); // should have failed
   os::release_memory(p1, M);
 }
@@ -944,9 +944,9 @@ TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_smallpages) {
 TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_largepages) {
   if (UseLargePages && !os::can_commit_large_page_memory()) { // aka special
     const size_t lpsz = os::large_page_size();
-    char* p1 = os::reserve_memory_aligned(lpsz, lpsz, false);
+    char* p1 = os::reserve_memory_aligned(lpsz, lpsz, !ExecMem, mtTest);
     ASSERT_NE(p1, nullptr);
-    char* p2 = os::reserve_memory_special(lpsz, lpsz, lpsz, p1, false);
+    char* p2 = os::reserve_memory_special(lpsz, lpsz, lpsz, p1, !ExecMem, mtTest);
     ASSERT_EQ(p2, nullptr); // should have failed
     os::release_memory(p1, M);
   } else {
@@ -958,9 +958,9 @@ TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_largepages) {
 // On Aix, we should fail attach attempts not aligned to segment boundaries (256m)
 TEST_VM(os, aix_reserve_at_non_shmlba_aligned_address) {
   if (Use64KPages) {
-    char* p = os::attempt_reserve_memory_at((char*)0x1f00000, M);
+    char* p = os::attempt_reserve_memory_at((char*)0x1f00000, M, !ExecMem, mtTest);
     ASSERT_EQ(p, nullptr); // should have failed
-    p = os::attempt_reserve_memory_at((char*)((64 * G) + M), M);
+    p = os::attempt_reserve_memory_at((char*)((64 * G) + M), M, !ExecMem, mtTest);
     ASSERT_EQ(p, nullptr); // should have failed
   }
 }
diff --git a/test/hotspot/gtest/runtime/test_os_linux.cpp b/test/hotspot/gtest/runtime/test_os_linux.cpp
index 69c3d991b2a..582a516465c 100644
--- a/test/hotspot/gtest/runtime/test_os_linux.cpp
+++ b/test/hotspot/gtest/runtime/test_os_linux.cpp
@@ -54,7 +54,7 @@ namespace {
     const size_t _size;
    public:
     static char* reserve_memory_special_huge_tlbfs(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec) {
-      return os::reserve_memory_special(bytes, alignment, page_size, req_addr, exec);
+      return os::reserve_memory_special(bytes, alignment, page_size, req_addr, exec, mtTest);
     }
     HugeTlbfsMemory(char* const ptr, size_t size) : _ptr(ptr), _size(size) { }
     ~HugeTlbfsMemory() {
@@ -224,7 +224,7 @@ class TestReserveMemorySpecial : AllStatic {
     if (!using_explicit_hugepages()) {
       return;
     }
-    char* addr = os::reserve_memory_special(size, alignment, page_size, nullptr, false);
+    char* addr = os::reserve_memory_special(size, alignment, page_size, nullptr, !ExecMem, mtTest);
     if (addr != nullptr) {
       small_page_write(addr, size);
       os::release_memory_special(addr, size);
@@ -281,7 +281,7 @@ class TestReserveMemorySpecial : AllStatic {
     for (int i = 0; i < num_sizes; i++) {
       const size_t size = sizes[i];
       for (size_t alignment = ag; is_aligned(size, alignment); alignment *= 2) {
-        char* p = os::reserve_memory_special(size, alignment, lp, nullptr, false);
+        char* p = os::reserve_memory_special(size, alignment, lp, nullptr, !ExecMem, mtTest);
         if (p != nullptr) {
           EXPECT_TRUE(is_aligned(p, alignment));
           small_page_write(p, size);
@@ -296,7 +296,7 @@ class TestReserveMemorySpecial : AllStatic {
       for (size_t alignment = ag; is_aligned(size, alignment); alignment *= 2) {
         // req_addr must be at least large page aligned.
         char* const req_addr = align_up(mapping1, MAX2(alignment, lp));
-        char* p = os::reserve_memory_special(size, alignment, lp, req_addr, false);
+        char* p = os::reserve_memory_special(size, alignment, lp, req_addr, !ExecMem, mtTest);
         if (p != nullptr) {
           EXPECT_EQ(p, req_addr);
           small_page_write(p, size);
@@ -311,7 +311,7 @@ class TestReserveMemorySpecial : AllStatic {
       for (size_t alignment = ag; is_aligned(size, alignment); alignment *= 2) {
         // req_addr must be at least large page aligned.
         char* const req_addr = align_up(mapping2, MAX2(alignment, lp));
-        char* p = os::reserve_memory_special(size, alignment, lp, req_addr, false);
+        char* p = os::reserve_memory_special(size, alignment, lp, req_addr, !ExecMem, mtTest);
         // as the area around req_addr contains already existing mappings, the API should always
         // return nullptr (as per contract, it cannot return another address)
         EXPECT_TRUE(p == nullptr);
@@ -355,9 +355,9 @@ TEST_VM(os_linux, pretouch_thp_and_use_concurrent) {
   const size_t size = 1 * G;
   const bool useThp = UseTransparentHugePages;
   UseTransparentHugePages = true;
-  char* const heap = os::reserve_memory(size, false, mtInternal);
+  char* const heap = os::reserve_memory(size, !ExecMem, mtInternal);
   EXPECT_NE(heap, nullptr);
-  EXPECT_TRUE(os::commit_memory(heap, size, false));
+  EXPECT_TRUE(os::commit_memory(heap, size, !ExecMem, mtInternal));
 
   {
     auto pretouch = [heap, size](Thread*, int) {
@@ -379,7 +379,7 @@ TEST_VM(os_linux, pretouch_thp_and_use_concurrent) {
   for (int i = 0; i < 1000; i++)
     EXPECT_EQ(*iptr++, i);
 
-  EXPECT_TRUE(os::uncommit_memory(heap, size, false));
+  EXPECT_TRUE(os::uncommit_memory(heap, size, !ExecMem, mtInternal));
   EXPECT_TRUE(os::release_memory(heap, size));
   UseTransparentHugePages = useThp;
 }
diff --git a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
index aad6acc095a..1e052ddf65e 100644
--- a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
+++ b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
@@ -66,7 +66,7 @@ static size_t allocation_granularity() {
                  << " bytes: " << bytes << " alignment: " << alignment << " randomized: " << randomized
 
 static char* call_attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomized) {
-  char* const  addr = os::attempt_reserve_memory_between(min, max, bytes, alignment, randomized);
+  char* const  addr = os::attempt_reserve_memory_between(min, max, bytes, alignment, randomized, mtTest);
   if (addr != nullptr) {
     EXPECT_TRUE(is_aligned(addr, alignment)) << ERRINFO;
     EXPECT_TRUE(is_aligned(addr, allocation_granularity())) << ERRINFO;
@@ -158,7 +158,7 @@ public:
       // the hole.
       const uintptr_t candidate = nth_bit(i);
       if ((candidate + _len) <= ARMB_constants::absolute_max) {
-        _base = os::attempt_reserve_memory_at((char*)candidate, _len);
+        _base = os::attempt_reserve_memory_at((char*)candidate, _len, !ExecMem, mtTest);
       }
     }
     if (_base == nullptr) {
@@ -166,8 +166,8 @@ public:
     }
     // Release total mapping, remap the individual non-holy parts
     os::release_memory(_base, _len);
-    _p1 = os::attempt_reserve_memory_at(_base + _p1_offset, _p1_size);
-    _p2 = os::attempt_reserve_memory_at(_base + _p2_offset, _p2_size);
+    _p1 = os::attempt_reserve_memory_at(_base + _p1_offset, _p1_size, !ExecMem, mtTest);
+    _p2 = os::attempt_reserve_memory_at(_base + _p2_offset, _p2_size, !ExecMem, mtTest);
     if (_p1 == nullptr || _p2 == nullptr) {
       return false;
     }
diff --git a/test/hotspot/gtest/runtime/test_os_windows.cpp b/test/hotspot/gtest/runtime/test_os_windows.cpp
index 8c6f003de6f..87ae501a08b 100644
--- a/test/hotspot/gtest/runtime/test_os_windows.cpp
+++ b/test/hotspot/gtest/runtime/test_os_windows.cpp
@@ -67,7 +67,7 @@ void TestReserveMemorySpecial_test() {
   FLAG_SET_CMDLINE(UseNUMAInterleaving, false);
 
   const size_t large_allocation_size = os::large_page_size() * 4;
-  char* result = os::reserve_memory_special(large_allocation_size, os::large_page_size(), os::large_page_size(), nullptr, false);
+  char* result = os::reserve_memory_special(large_allocation_size, os::large_page_size(), os::large_page_size(), nullptr, !ExecMem, mtTest);
   if (result == nullptr) {
       // failed to allocate memory, skipping the test
       return;
@@ -77,12 +77,12 @@ void TestReserveMemorySpecial_test() {
   // Reserve another page within the recently allocated memory area. This should fail
   const size_t expected_allocation_size = os::large_page_size();
   char* expected_location = result + os::large_page_size();
-  char* actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), os::large_page_size(), expected_location, false);
+  char* actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), os::large_page_size(), expected_location, !ExecMem, mtTest);
   EXPECT_TRUE(actual_location == nullptr) << "Should not be allowed to reserve within present reservation";
 
   // Instead try reserving after the first reservation.
   expected_location = result + large_allocation_size;
-  actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), os::large_page_size(), expected_location, false);
+  actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), os::large_page_size(), expected_location, !ExecMem, mtTest);
   EXPECT_TRUE(actual_location != nullptr) << "Unexpected reservation failure, can’t verify correct location";
   EXPECT_TRUE(actual_location == expected_location) << "Reservation must be at requested location";
   MemoryReleaser m2(actual_location, os::large_page_size());
@@ -90,7 +90,7 @@ void TestReserveMemorySpecial_test() {
   // Now try to do a reservation with a larger alignment.
   const size_t alignment = os::large_page_size() * 2;
   const size_t new_large_size = alignment * 4;
-  char* aligned_request = os::reserve_memory_special(new_large_size, alignment, os::large_page_size(), nullptr, false);
+  char* aligned_request = os::reserve_memory_special(new_large_size, alignment, os::large_page_size(), nullptr, !ExecMem, mtTest);
   EXPECT_TRUE(aligned_request != nullptr) << "Unexpected reservation failure, can’t verify correct alignment";
   EXPECT_TRUE(is_aligned(aligned_request, alignment)) << "Returned address must be aligned";
   MemoryReleaser m3(aligned_request, new_large_size);
diff --git a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
index b098416456d..f2b3b843c23 100644
--- a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
+++ b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
@@ -93,7 +93,7 @@ public:
   static void test_add_committed_region_adjacent() {
 
     size_t size  = 0x01000000;
-    ReservedSpace rs(size);
+    ReservedSpace rs(size, mtTest);
     address addr = (address)rs.base();
 
     address frame1 = (address)0x1234;
@@ -167,7 +167,7 @@ public:
   static void test_add_committed_region_adjacent_overlapping() {
 
     size_t size  = 0x01000000;
-    ReservedSpace rs(size);
+    ReservedSpace rs(size, mtTest);
     address addr = (address)rs.base();
 
     address frame1 = (address)0x1234;
@@ -254,7 +254,7 @@ public:
   static void test_add_committed_region_overlapping() {
 
     size_t size  = 0x01000000;
-    ReservedSpace rs(size);
+    ReservedSpace rs(size, mtTest);
     address addr = (address)rs.base();
 
     address frame1 = (address)0x1234;
@@ -425,7 +425,7 @@ public:
   static void test_remove_uncommitted_region() {
 
     size_t size  = 0x01000000;
-    ReservedSpace rs(size);
+    ReservedSpace rs(size, mtTest);
     address addr = (address)rs.base();
 
     address frame1 = (address)0x1234;

From d3bf52628efb79e1b98749d628c4b6d035e1d511 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Thu, 2 May 2024 07:49:12 +0000
Subject: [PATCH 273/486] 8331518: Tests should not use the "Classpath"
 exception form of the legal header

Reviewed-by: dholmes
---
 .../jtreg/compiler/c2/TestUninitializedKlassField.java        | 4 +---
 .../jtreg/compiler/codegen/TestConvertImplicitNullCheck.java  | 4 +---
 .../loopopts/TestPartialPeelingAtSingleInputRegion.java       | 4 +---
 .../org/openjdk/bench/java/lang/foreign/libToJavaString.c     | 4 +---
 test/micro/org/openjdk/bench/vm/compiler/MergeStores.java     | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/TestUninitializedKlassField.java b/test/hotspot/jtreg/compiler/c2/TestUninitializedKlassField.java
index 3bad2bde7b1..63daec895ef 100644
--- a/test/hotspot/jtreg/compiler/c2/TestUninitializedKlassField.java
+++ b/test/hotspot/jtreg/compiler/c2/TestUninitializedKlassField.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/hotspot/jtreg/compiler/codegen/TestConvertImplicitNullCheck.java b/test/hotspot/jtreg/compiler/codegen/TestConvertImplicitNullCheck.java
index 0e0c3545844..c8883b9c04e 100644
--- a/test/hotspot/jtreg/compiler/codegen/TestConvertImplicitNullCheck.java
+++ b/test/hotspot/jtreg/compiler/codegen/TestConvertImplicitNullCheck.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestPartialPeelingAtSingleInputRegion.java b/test/hotspot/jtreg/compiler/loopopts/TestPartialPeelingAtSingleInputRegion.java
index 2b2231a89f3..9159c3627ec 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestPartialPeelingAtSingleInputRegion.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestPartialPeelingAtSingleInputRegion.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c b/test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c
index f4c407c1ab6..e7da435b43d 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java b/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java
index e1f0d5eaedc..84017573c07 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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

From dd906ffdcb7d965cd4798cb7eebd9c1b71b3c136 Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Thu, 2 May 2024 08:10:59 +0000
Subject: [PATCH 274/486] 8331399: RISC-V: Don't us mv instead of la

Reviewed-by: fyang, mli, tonyp
---
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp | 4 ++--
 src/hotspot/cpu/riscv/macroAssembler_riscv.hpp | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 234d85ed246..b450d93680f 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -2098,7 +2098,7 @@ void MacroAssembler::movoop(Register dst, jobject obj) {
   RelocationHolder rspec = oop_Relocation::spec(oop_index);
 
   if (BarrierSet::barrier_set()->barrier_set_assembler()->supports_instruction_patching()) {
-    mv(dst, Address((address)obj, rspec));
+    la(dst, Address((address)obj, rspec));
   } else {
     address dummy = address(uintptr_t(pc()) & -wordSize); // A nearby aligned address
     ld_constant(dst, Address(dummy, rspec));
@@ -2114,7 +2114,7 @@ void MacroAssembler::mov_metadata(Register dst, Metadata* obj) {
     oop_index = oop_recorder()->find_index(obj);
   }
   RelocationHolder rspec = metadata_Relocation::spec(oop_index);
-  mv(dst, Address((address)obj, rspec));
+  la(dst, Address((address)obj, rspec));
 }
 
 // Writes to stack successive pages until offset reached to check for
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index a46f3d5779e..7c77edd8711 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -763,13 +763,6 @@ public:
   template<typename T, ENABLE_IF(std::is_integral<T>::value)>
   inline void mv(Register Rd, T o)                    { li(Rd, (int64_t)o); }
 
-  void mv(Register Rd, Address dest) {
-    assert(dest.getMode() == Address::literal, "Address mode should be Address::literal");
-    relocate(dest.rspec(), [&] {
-      movptr(Rd, dest.target());
-    });
-  }
-
   void mv(Register Rd, RegisterOrConstant src) {
     if (src.is_register()) {
       mv(Rd, src.as_register());

From c4fe5bf90c2d368c29714de63a90eca444fb3ece Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 2 May 2024 08:26:09 +0000
Subject: [PATCH 275/486] 8331405: Shenandoah: Optimize ShenandoahLock with
 TTAS

Reviewed-by: zgu, ysr
---
 src/hotspot/share/gc/shenandoah/shenandoahLock.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
index 39588d68bc8..349f5415cdc 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
@@ -54,7 +54,8 @@ template<typename BlockOp>
 void ShenandoahLock::contended_lock_internal(JavaThread* java_thread) {
   int ctr = 0;
   int yields = 0;
-  while (Atomic::cmpxchg(&_state, unlocked, locked) != unlocked) {
+  while (Atomic::load(&_state) == locked ||
+         Atomic::cmpxchg(&_state, unlocked, locked) != unlocked) {
     if ((++ctr & 0xFFF) == 0) {
       BlockOp block(java_thread);
       if (yields > 5) {

From 8bcd2e61aec51f7c5b09ae162f8cca85a8bbf105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20=C3=96sterlund?= <eosterlund@openjdk.org>
Date: Thu, 2 May 2024 08:31:49 +0000
Subject: [PATCH 276/486] 8329088: Stack chunk thawing races with concurrent GC
 stack iteration

Reviewed-by: stefank, pchilanomate
---
 src/hotspot/share/classfile/vmSymbols.hpp     |  2 +-
 .../share/oops/instanceStackChunkKlass.cpp    |  4 +-
 src/hotspot/share/oops/oop.hpp                |  2 +
 src/hotspot/share/oops/oop.inline.hpp         |  2 +
 src/hotspot/share/oops/stackChunkOop.cpp      | 21 ++---
 src/hotspot/share/oops/stackChunkOop.hpp      |  1 +
 .../share/oops/stackChunkOop.inline.hpp       | 17 ++--
 .../share/runtime/continuationFreezeThaw.cpp  | 79 ++++++++-----------
 .../share/runtime/continuationJavaClasses.cpp |  4 +-
 .../share/runtime/continuationJavaClasses.hpp |  7 +-
 .../continuationJavaClasses.inline.hpp        | 19 +++--
 .../classes/jdk/internal/vm/StackChunk.java   |  4 +-
 12 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index f35858fe586..f79af705f0b 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -432,7 +432,7 @@ class SerializeClosure;
   template(yieldInfo_name,                            "yieldInfo")                                \
   template(tail_name,                                 "tail")                                     \
   template(size_name,                                 "size")                                     \
-  template(argsize_name,                              "argsize")                                  \
+  template(bottom_name,                               "bottom")                                   \
   template(mode_name,                                 "mode")                                     \
   template(numFrames_name,                            "numFrames")                                \
   template(numOops_name,                              "numOops")                                  \
diff --git a/src/hotspot/share/oops/instanceStackChunkKlass.cpp b/src/hotspot/share/oops/instanceStackChunkKlass.cpp
index 0164ad0a9ba..8171188d357 100644
--- a/src/hotspot/share/oops/instanceStackChunkKlass.cpp
+++ b/src/hotspot/share/oops/instanceStackChunkKlass.cpp
@@ -250,8 +250,8 @@ void InstanceStackChunkKlass::print_chunk(const stackChunkOop c, bool verbose, o
   st->print_cr("       barriers: %d gc_mode: %d bitmap: %d parent: " PTR_FORMAT,
                c->requires_barriers(), c->is_gc_mode(), c->has_bitmap(), p2i(c->parent()));
   st->print_cr("       flags mixed: %d", c->has_mixed_frames());
-  st->print_cr("       size: %d argsize: %d max_size: %d sp: %d pc: " PTR_FORMAT,
-               c->stack_size(), c->argsize(), c->max_thawing_size(), c->sp(), p2i(c->pc()));
+  st->print_cr("       size: %d bottom: %d max_size: %d sp: %d pc: " PTR_FORMAT,
+               c->stack_size(), c->bottom(), c->max_thawing_size(), c->sp(), p2i(c->pc()));
 
   if (verbose) {
     st->cr();
diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp
index 6766b683731..2d827699b41 100644
--- a/src/hotspot/share/oops/oop.hpp
+++ b/src/hotspot/share/oops/oop.hpp
@@ -206,6 +206,8 @@ class oopDesc {
   jboolean bool_field_acquire(int offset) const;
   void release_bool_field_put(int offset, jboolean contents);
 
+  jint int_field_relaxed(int offset) const;
+  void int_field_put_relaxed(int offset, jint contents);
   jint int_field_acquire(int offset) const;
   void release_int_field_put(int offset, jint contents);
 
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index b7dbc7b2224..ffcc9af24c3 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -238,6 +238,8 @@ inline void   oopDesc::short_field_put(int offset, jshort value)    { *field_add
 
 inline jint oopDesc::int_field(int offset) const                    { return *field_addr<jint>(offset);     }
 inline void oopDesc::int_field_put(int offset, jint value)          { *field_addr<jint>(offset) = value;    }
+inline jint oopDesc::int_field_relaxed(int offset) const            { return Atomic::load(field_addr<jint>(offset)); }
+inline void oopDesc::int_field_put_relaxed(int offset, jint value)  { Atomic::store(field_addr<jint>(offset), value); }
 
 inline jlong oopDesc::long_field(int offset) const                  { return *field_addr<jlong>(offset);    }
 inline void  oopDesc::long_field_put(int offset, jlong value)       { *field_addr<jlong>(offset) = value;   }
diff --git a/src/hotspot/share/oops/stackChunkOop.cpp b/src/hotspot/share/oops/stackChunkOop.cpp
index c0bef6659a3..8d230b334c8 100644
--- a/src/hotspot/share/oops/stackChunkOop.cpp
+++ b/src/hotspot/share/oops/stackChunkOop.cpp
@@ -533,12 +533,12 @@ bool stackChunkOopDesc::verify(size_t* out_size, int* out_oops, int* out_frames,
   assert(oopDesc::is_oop(this), "");
 
   assert(stack_size() >= 0, "");
-  assert(argsize() >= 0, "");
   assert(!has_bitmap() || is_gc_mode(), "");
 
   if (is_empty()) {
-    assert(argsize() == 0, "");
     assert(max_thawing_size() == 0, "");
+  } else {
+    assert(argsize() >= 0, "");
   }
 
   assert(oopDesc::is_oop_or_null(parent()), "");
@@ -547,7 +547,7 @@ bool stackChunkOopDesc::verify(size_t* out_size, int* out_oops, int* out_frames,
 
   // If argsize == 0 and the chunk isn't mixed, the chunk contains the metadata (pc, fp -- frame::sender_sp_offset)
   // for the top frame (below sp), and *not* for the bottom frame.
-  int size = stack_size() - argsize() - sp();
+  int size = bottom() - sp();
   assert(size >= 0, "");
   assert((size == 0) == is_empty(), "");
 
@@ -570,12 +570,15 @@ bool stackChunkOopDesc::verify(size_t* out_size, int* out_oops, int* out_frames,
   assert(closure._num_interpreted_frames == 0 || has_mixed_frames(), "");
 
   if (!concurrent) {
-    assert(closure._size <= size + argsize() + frame::metadata_words,
-           "size: %d argsize: %d closure.size: %d end sp: " PTR_FORMAT " start sp: %d chunk size: %d",
-           size, argsize(), closure._size, closure._sp - start_address(), sp(), stack_size());
-    assert(argsize() == closure._argsize - (closure._num_frames > 0 ? frame::metadata_words_at_top : 0),
-           "argsize(): %d closure.argsize: %d closure.callee_interpreted: %d",
-           argsize(), closure._argsize, closure._callee_interpreted);
+    assert(closure._size <= size + (stack_size() - bottom()),
+           "size: %d bottom: %d closure.size: %d end sp: " PTR_FORMAT " start sp: %d chunk size: %d",
+           size, bottom(), closure._size, closure._sp - start_address(), sp(), stack_size());
+    if (closure._num_frames > 0) {
+      assert(closure._argsize >= frame::metadata_words_at_top, "should be set up");
+      assert(argsize() == closure._argsize - frame::metadata_words_at_top,
+             "argsize(): %d closure.argsize: %d closure.callee_interpreted: %d",
+             argsize(), closure._argsize, closure._callee_interpreted);
+    }
 
     int calculated_max_size = closure._size
                               + closure._num_i2c * frame::align_wiggle
diff --git a/src/hotspot/share/oops/stackChunkOop.hpp b/src/hotspot/share/oops/stackChunkOop.hpp
index abfe47ad3f1..250acc8d165 100644
--- a/src/hotspot/share/oops/stackChunkOop.hpp
+++ b/src/hotspot/share/oops/stackChunkOop.hpp
@@ -101,6 +101,7 @@ public:
   inline void set_cont_access(oop value);
 
   inline int bottom() const;
+  inline void set_bottom(int value);
 
   inline HeapWord* start_of_stack() const;
 
diff --git a/src/hotspot/share/oops/stackChunkOop.inline.hpp b/src/hotspot/share/oops/stackChunkOop.inline.hpp
index c7590861032..54f1423fd1c 100644
--- a/src/hotspot/share/oops/stackChunkOop.inline.hpp
+++ b/src/hotspot/share/oops/stackChunkOop.inline.hpp
@@ -60,15 +60,15 @@ inline void stackChunkOopDesc::set_parent_access(oop value)    { jdk_internal_vm
 
 inline int stackChunkOopDesc::stack_size() const        { return jdk_internal_vm_StackChunk::size(as_oop()); }
 
+inline int stackChunkOopDesc::bottom() const            { return jdk_internal_vm_StackChunk::bottom(as_oop()); }
+inline void stackChunkOopDesc::set_bottom(int value)    { jdk_internal_vm_StackChunk::set_bottom(this, value); }
+
 inline int stackChunkOopDesc::sp() const                { return jdk_internal_vm_StackChunk::sp(as_oop()); }
 inline void stackChunkOopDesc::set_sp(int value)        { jdk_internal_vm_StackChunk::set_sp(this, value); }
 
 inline address stackChunkOopDesc::pc() const            { return jdk_internal_vm_StackChunk::pc(as_oop()); }
 inline void stackChunkOopDesc::set_pc(address value)    { jdk_internal_vm_StackChunk::set_pc(this, value); }
 
-inline int stackChunkOopDesc::argsize() const           { return jdk_internal_vm_StackChunk::argsize(as_oop()); }
-inline void stackChunkOopDesc::set_argsize(int value)   { jdk_internal_vm_StackChunk::set_argsize(as_oop(), value); }
-
 inline uint8_t stackChunkOopDesc::flags() const         { return jdk_internal_vm_StackChunk::flags(as_oop()); }
 inline void stackChunkOopDesc::set_flags(uint8_t value) { jdk_internal_vm_StackChunk::set_flags(this, value); }
 
@@ -108,7 +108,10 @@ inline void stackChunkOopDesc::set_cont_raw(oop value)    { jdk_internal_vm_Stac
 template<DecoratorSet decorators>
 inline void stackChunkOopDesc::set_cont_access(oop value) { jdk_internal_vm_StackChunk::set_cont_access<decorators>(this, value); }
 
-inline int stackChunkOopDesc::bottom() const { return stack_size() - argsize() - frame::metadata_words_at_top; }
+inline int stackChunkOopDesc::argsize() const {
+  assert(!is_empty(), "should not ask for argsize in empty chunk");
+  return stack_size() - bottom() - frame::metadata_words_at_top;
+}
 
 inline HeapWord* stackChunkOopDesc::start_of_stack() const {
    return (HeapWord*)(cast_from_oop<intptr_t>(as_oop()) + InstanceStackChunkKlass::offset_of_stack());
@@ -132,10 +135,8 @@ inline intptr_t* stackChunkOopDesc::from_offset(int offset) const {
 }
 
 inline bool stackChunkOopDesc::is_empty() const {
-  assert(sp() <= stack_size(), "");
-  assert((sp() == stack_size()) == (sp() >= stack_size() - argsize() - frame::metadata_words_at_top),
-    "sp: %d size: %d argsize: %d", sp(), stack_size(), argsize());
-  return sp() == stack_size();
+  assert(sp() <= bottom(), "");
+  return sp() == bottom();
 }
 
 inline bool stackChunkOopDesc::is_in_chunk(void* p) const {
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index 527e0da15a8..77ec9642d48 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -403,7 +403,7 @@ protected:
   inline void patch_stack_pd(intptr_t* frame_sp, intptr_t* heap_sp);
 
   // slow path
-  virtual stackChunkOop allocate_chunk_slow(size_t stack_size) = 0;
+  virtual stackChunkOop allocate_chunk_slow(size_t stack_size, int argsize_md) = 0;
 
   int cont_size() { return pointer_delta_as_int(_cont_stack_bottom, _cont_stack_top); }
 
@@ -438,20 +438,12 @@ private:
 protected:
   void freeze_fast_copy(stackChunkOop chunk, int chunk_start_sp CONT_JFR_ONLY(COMMA bool chunk_is_allocated));
   bool freeze_fast_new_chunk(stackChunkOop chunk);
-
-#ifdef ASSERT
-  bool is_empty(stackChunkOop chunk) {
-    // during freeze, the chunk is in an intermediate state (after setting the chunk's argsize but before setting its
-    // ultimate sp) so we use this instead of stackChunkOopDesc::is_empty
-    return chunk->sp() >= chunk->stack_size() - chunk->argsize() - frame::metadata_words_at_top;
-  }
-#endif
 };
 
 template <typename ConfigT>
 class Freeze : public FreezeBase {
 private:
-  stackChunkOop allocate_chunk(size_t stack_size);
+  stackChunkOop allocate_chunk(size_t stack_size, int argsize_md);
 
 public:
   inline Freeze(JavaThread* thread, ContinuationWrapper& cont, intptr_t* frame_sp)
@@ -460,7 +452,7 @@ public:
   freeze_result try_freeze_fast();
 
 protected:
-  virtual stackChunkOop allocate_chunk_slow(size_t stack_size) override { return allocate_chunk(stack_size); }
+  virtual stackChunkOop allocate_chunk_slow(size_t stack_size, int argsize_md) override { return allocate_chunk(stack_size, argsize_md); }
 };
 
 FreezeBase::FreezeBase(JavaThread* thread, ContinuationWrapper& cont, intptr_t* frame_sp) :
@@ -543,7 +535,7 @@ freeze_result Freeze<ConfigT>::try_freeze_fast() {
   DEBUG_ONLY(_fast_freeze_size = size_if_fast_freeze_available();)
   assert(_fast_freeze_size == 0, "");
 
-  stackChunkOop chunk = allocate_chunk(cont_size() + frame::metadata_words);
+  stackChunkOop chunk = allocate_chunk(cont_size() + frame::metadata_words, _cont.argsize() + frame::metadata_words_at_top);
   if (freeze_fast_new_chunk(chunk)) {
     return freeze_ok;
   }
@@ -572,7 +564,7 @@ int FreezeBase::size_if_fast_freeze_available() {
   // so we subtract it only if we overlap with the caller, i.e. the current chunk isn't empty.
   // Consider leaving the chunk's argsize set when emptying it and removing the following branch,
   // although that would require changing stackChunkOopDesc::is_empty
-  if (chunk_sp < chunk->stack_size()) {
+  if (!chunk->is_empty()) {
     total_size_needed -= _cont.argsize() + frame::metadata_words_at_top;
   }
 
@@ -585,14 +577,13 @@ int FreezeBase::size_if_fast_freeze_available() {
 
 void FreezeBase::freeze_fast_existing_chunk() {
   stackChunkOop chunk = _cont.tail();
-  DEBUG_ONLY(_orig_chunk_sp = chunk->sp_address();)
 
   DEBUG_ONLY(_fast_freeze_size = size_if_fast_freeze_available();)
   assert(_fast_freeze_size > 0, "");
 
-  if (chunk->sp() < chunk->stack_size()) { // we are copying into a non-empty chunk
+  if (!chunk->is_empty()) { // we are copying into a non-empty chunk
     DEBUG_ONLY(_empty = false;)
-    assert(chunk->sp() < (chunk->stack_size() - chunk->argsize()), "");
+    DEBUG_ONLY(_orig_chunk_sp = chunk->sp_address();)
 #ifdef ASSERT
     {
       intptr_t* retaddr_slot = (chunk->sp_address()
@@ -630,13 +621,14 @@ void FreezeBase::freeze_fast_existing_chunk() {
 
     freeze_fast_copy(chunk, chunk_start_sp CONT_JFR_ONLY(COMMA false));
   } else { // the chunk is empty
-    DEBUG_ONLY(_empty = true;)
-    const int chunk_start_sp = chunk->sp();
+    const int chunk_start_sp = chunk->stack_size();
 
-    assert(chunk_start_sp == chunk->stack_size(), "");
+    DEBUG_ONLY(_empty = true;)
+    DEBUG_ONLY(_orig_chunk_sp = chunk->start_address() + chunk_start_sp;)
 
     chunk->set_max_thawing_size(cont_size());
-    chunk->set_argsize(_cont.argsize());
+    chunk->set_bottom(chunk_start_sp - _cont.argsize() - frame::metadata_words_at_top);
+    chunk->set_sp(chunk->bottom());
 
     freeze_fast_copy(chunk, chunk_start_sp CONT_JFR_ONLY(COMMA false));
   }
@@ -654,7 +646,6 @@ bool FreezeBase::freeze_fast_new_chunk(stackChunkOop chunk) {
   }
 
   chunk->set_max_thawing_size(cont_size());
-  chunk->set_argsize(_cont.argsize());
 
   // in a fresh chunk, we freeze *with* the bottom-most frame's stack arguments.
   // They'll then be stored twice: in the chunk and in the parent chunk's top frame
@@ -931,7 +922,6 @@ freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, in
   int overlap = 0; // the args overlap the caller -- if there is one in this chunk and is of the same kind
   int unextended_sp = -1;
   if (chunk != nullptr) {
-    unextended_sp = chunk->sp();
     if (!chunk->is_empty()) {
       StackChunkFrameStream<ChunkFrames::Mixed> last(chunk);
       unextended_sp = chunk->to_offset(StackChunkFrameStream<ChunkFrames::Mixed>(chunk).unextended_sp());
@@ -939,6 +929,8 @@ freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, in
       if (callee.is_interpreted_frame() == top_interpreted) {
         overlap = argsize_md;
       }
+    } else {
+      unextended_sp = chunk->stack_size() - frame::metadata_words_at_top;
     }
   }
 
@@ -976,25 +968,21 @@ freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, in
     _freeze_size += overlap; // we're allocating a new chunk, so no overlap
     // overlap = 0;
 
-    chunk = allocate_chunk_slow(_freeze_size);
+    chunk = allocate_chunk_slow(_freeze_size, argsize_md);
     if (chunk == nullptr) {
       return freeze_exception;
     }
 
     // Install new chunk
     _cont.set_tail(chunk);
-
-    int sp = chunk->stack_size() - argsize_md;
-    chunk->set_sp(sp);
-    chunk->set_argsize(argsize);
-    assert(is_empty(chunk), "");
+    assert(chunk->is_empty(), "");
   } else {
     // REUSE EXISTING CHUNK
     log_develop_trace(continuations)("Reusing chunk mixed: %d empty: %d", chunk->has_mixed_frames(), chunk->is_empty());
     if (chunk->is_empty()) {
       int sp = chunk->stack_size() - argsize_md;
       chunk->set_sp(sp);
-      chunk->set_argsize(argsize);
+      chunk->set_bottom(sp);
       _freeze_size += overlap;
       assert(chunk->max_thawing_size() == 0, "");
     } DEBUG_ONLY(else empty_chunk = false;)
@@ -1004,10 +992,10 @@ freeze_result FreezeBase::finalize_freeze(const frame& callee, frame& caller, in
   chunk->set_has_mixed_frames(true);
 
   assert(chunk->requires_barriers() == _barriers, "");
-  assert(!_barriers || is_empty(chunk), "");
+  assert(!_barriers || chunk->is_empty(), "");
 
-  assert(!is_empty(chunk) || StackChunkFrameStream<ChunkFrames::Mixed>(chunk).is_done(), "");
-  assert(!is_empty(chunk) || StackChunkFrameStream<ChunkFrames::Mixed>(chunk).to_frame().is_empty(), "");
+  assert(!chunk->is_empty() || StackChunkFrameStream<ChunkFrames::Mixed>(chunk).is_done(), "");
+  assert(!chunk->is_empty() || StackChunkFrameStream<ChunkFrames::Mixed>(chunk).to_frame().is_empty(), "");
 
   // We unwind frames after the last safepoint so that the GC will have found the oops in the frames, but before
   // writing into the chunk. This is so that an asynchronous stack walk (not at a safepoint) that suspends us here
@@ -1053,7 +1041,7 @@ void FreezeBase::patch(const frame& f, frame& hf, const frame& caller, bool is_b
     // If we're the bottom frame, we need to replace the return barrier with the real
     // caller's pc.
     address last_pc = caller.pc();
-    assert((last_pc == nullptr) == is_empty(_cont.tail()), "");
+    assert((last_pc == nullptr) == _cont.tail()->is_empty(), "");
     ContinuationHelper::Frame::patch_pc(caller, last_pc);
   } else {
     assert(!caller.is_empty(), "");
@@ -1306,6 +1294,7 @@ inline bool FreezeBase::stack_overflow() { // detect stack overflow in recursive
 
 class StackChunkAllocator : public MemAllocator {
   const size_t                                 _stack_size;
+  int                                          _argsize_md;
   ContinuationWrapper&                         _continuation_wrapper;
   JvmtiSampledObjectAllocEventCollector* const _jvmti_event_collector;
   mutable bool                                 _took_slow_path;
@@ -1321,8 +1310,11 @@ class StackChunkAllocator : public MemAllocator {
     const size_t hs = oopDesc::header_size();
     Copy::fill_to_aligned_words(mem + hs, vmClasses::StackChunk_klass()->size_helper() - hs);
 
+    int bottom = (int)_stack_size - _argsize_md;
+
     jdk_internal_vm_StackChunk::set_size(mem, (int)_stack_size);
-    jdk_internal_vm_StackChunk::set_sp(mem, (int)_stack_size);
+    jdk_internal_vm_StackChunk::set_bottom(mem, bottom);
+    jdk_internal_vm_StackChunk::set_sp(mem, bottom);
 
     return finish(mem);
   }
@@ -1346,10 +1338,12 @@ public:
                       size_t word_size,
                       Thread* thread,
                       size_t stack_size,
+                      int argsize_md,
                       ContinuationWrapper& continuation_wrapper,
                       JvmtiSampledObjectAllocEventCollector* jvmti_event_collector)
     : MemAllocator(klass, word_size, thread),
       _stack_size(stack_size),
+      _argsize_md(argsize_md),
       _continuation_wrapper(continuation_wrapper),
       _jvmti_event_collector(jvmti_event_collector),
       _took_slow_path(false) {}
@@ -1383,7 +1377,7 @@ public:
 };
 
 template <typename ConfigT>
-stackChunkOop Freeze<ConfigT>::allocate_chunk(size_t stack_size) {
+stackChunkOop Freeze<ConfigT>::allocate_chunk(size_t stack_size, int argsize_md) {
   log_develop_trace(continuations)("allocate_chunk allocating new chunk");
 
   InstanceStackChunkKlass* klass = InstanceStackChunkKlass::cast(vmClasses::StackChunk_klass());
@@ -1405,7 +1399,7 @@ stackChunkOop Freeze<ConfigT>::allocate_chunk(size_t stack_size) {
   // instrumentation have been deferred. This property is important for
   // some GCs, as this ensures that the allocated object is in the young
   // generation / newly allocated memory.
-  StackChunkAllocator allocator(klass, size_in_words, current, stack_size, _cont, _jvmti_event_collector);
+  StackChunkAllocator allocator(klass, size_in_words, current, stack_size, argsize_md, _cont, _jvmti_event_collector);
   stackChunkOop chunk = allocator.allocate();
 
   if (chunk == nullptr) {
@@ -1415,11 +1409,11 @@ stackChunkOop Freeze<ConfigT>::allocate_chunk(size_t stack_size) {
   // assert that chunk is properly initialized
   assert(chunk->stack_size() == (int)stack_size, "");
   assert(chunk->size() >= stack_size, "chunk->size(): %zu size: %zu", chunk->size(), stack_size);
-  assert(chunk->sp() == chunk->stack_size(), "");
+  assert(chunk->sp() == chunk->bottom(), "");
   assert((intptr_t)chunk->start_address() % 8 == 0, "");
   assert(chunk->max_thawing_size() == 0, "");
   assert(chunk->pc() == nullptr, "");
-  assert(chunk->argsize() == 0, "");
+  assert(chunk->is_empty(), "");
   assert(chunk->flags() == 0, "");
   assert(chunk->is_gc_mode() == false, "");
 
@@ -1852,12 +1846,11 @@ public:
 };
 
 inline void ThawBase::clear_chunk(stackChunkOop chunk) {
-  chunk->set_sp(chunk->stack_size());
-  chunk->set_argsize(0);
+  chunk->set_sp(chunk->bottom());
   chunk->set_max_thawing_size(0);
 }
 
- int ThawBase::remove_top_compiled_frame_from_chunk(stackChunkOop chunk, int &argsize) {
+int ThawBase::remove_top_compiled_frame_from_chunk(stackChunkOop chunk, int &argsize) {
   bool empty = false;
   StackChunkFrameStream<ChunkFrames::CompiledOnly> f(chunk);
   DEBUG_ONLY(intptr_t* const chunk_sp = chunk->start_address() + chunk->sp();)
@@ -2104,8 +2097,7 @@ void ThawBase::finalize_thaw(frame& entry, int argsize) {
     chunk->set_sp(chunk->to_offset(_stream.sp()));
     chunk->set_pc(_stream.pc());
   } else {
-    chunk->set_argsize(0);
-    chunk->set_sp(chunk->stack_size());
+    chunk->set_sp(chunk->bottom());
     chunk->set_pc(nullptr);
   }
   assert(_stream.is_done() == chunk->is_empty(), "");
@@ -2377,7 +2369,6 @@ void ThawBase::finish_thaw(frame& f) {
       chunk->set_has_mixed_frames(false);
     }
     chunk->set_max_thawing_size(0);
-    assert(chunk->argsize() == 0, "");
   } else {
     chunk->set_max_thawing_size(chunk->max_thawing_size() - _align_size);
   }
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.cpp b/src/hotspot/share/runtime/continuationJavaClasses.cpp
index 1185af8d6a0..d9f2d05b7e9 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.cpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.cpp
@@ -84,7 +84,7 @@ int jdk_internal_vm_StackChunk::_parent_offset;
 int jdk_internal_vm_StackChunk::_size_offset;
 int jdk_internal_vm_StackChunk::_sp_offset;
 int jdk_internal_vm_StackChunk::_pc_offset;
-int jdk_internal_vm_StackChunk::_argsize_offset;
+int jdk_internal_vm_StackChunk::_bottom_offset;
 int jdk_internal_vm_StackChunk::_flags_offset;
 int jdk_internal_vm_StackChunk::_maxThawingSize_offset;
 int jdk_internal_vm_StackChunk::_cont_offset;
@@ -93,7 +93,7 @@ int jdk_internal_vm_StackChunk::_cont_offset;
   macro(_parent_offset,  k, vmSymbols::parent_name(),  stackchunk_signature, false); \
   macro(_size_offset,    k, vmSymbols::size_name(),    int_signature,        false); \
   macro(_sp_offset,      k, vmSymbols::sp_name(),      int_signature,        false); \
-  macro(_argsize_offset, k, vmSymbols::argsize_name(), int_signature,        false);
+  macro(_bottom_offset,  k, vmSymbols::bottom_name(),  int_signature,        false);
 
 void jdk_internal_vm_StackChunk::compute_offsets() {
   InstanceKlass* k = vmClasses::StackChunk_klass();
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.hpp b/src/hotspot/share/runtime/continuationJavaClasses.hpp
index 54d10d04154..05cba90a0f5 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.hpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.hpp
@@ -83,7 +83,7 @@ class jdk_internal_vm_StackChunk: AllStatic {
   static int _size_offset;
   static int _sp_offset;
   static int _pc_offset;
-  static int _argsize_offset;
+  static int _bottom_offset;
   static int _flags_offset;
   static int _maxThawingSize_offset;
   static int _cont_offset;
@@ -112,8 +112,9 @@ class jdk_internal_vm_StackChunk: AllStatic {
   static inline void set_sp(HeapWord* chunk, int value); // used while allocating
   static inline address pc(oop chunk);
   static inline void set_pc(oop chunk, address value);
-  static inline int argsize(oop chunk);
-  static inline void set_argsize(oop chunk, int value);
+  static inline int bottom(oop chunk);
+  static inline void set_bottom(oop chunk, int value);
+  static inline void set_bottom(HeapWord* chunk, int value);
   static inline uint8_t flags(oop chunk);
   static inline void set_flags(oop chunk, uint8_t value);
   static inline uint8_t flags_acquire(oop chunk);
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp b/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp
index 987f367303d..b2dea2d704a 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.inline.hpp
@@ -115,12 +115,19 @@ inline void jdk_internal_vm_StackChunk::set_size(HeapWord* chunk, int value) {
   *(int*)(((char*)chunk) + _size_offset) = (int)value;
 }
 
+inline void jdk_internal_vm_StackChunk::set_bottom(HeapWord* chunk, int value) {
+  // Used by StackChunkAllocator before the Object has been finished,
+  // so don't cast too oop and use int_field_put in this function.
+  assert(_bottom_offset != 0, "must be set");
+  *(int*)(((char*)chunk) + _bottom_offset) = (int)value;
+}
+
 inline int jdk_internal_vm_StackChunk::sp(oop chunk) {
-  return chunk->int_field(_sp_offset);
+  return chunk->int_field_relaxed(_sp_offset);
 }
 
 inline void jdk_internal_vm_StackChunk::set_sp(oop chunk, int value) {
-  chunk->int_field_put(_sp_offset, value);
+  chunk->int_field_put_relaxed(_sp_offset, value);
 }
 
 inline void jdk_internal_vm_StackChunk::set_sp(HeapWord* chunk, int value) {
@@ -138,12 +145,12 @@ inline void jdk_internal_vm_StackChunk::set_pc(oop chunk, address value) {
   chunk->address_field_put(_pc_offset, value);
 }
 
-inline int jdk_internal_vm_StackChunk::argsize(oop chunk) {
-  return chunk->int_field(_argsize_offset);
+inline int jdk_internal_vm_StackChunk::bottom(oop chunk) {
+  return chunk->int_field(_bottom_offset);
 }
 
-inline void jdk_internal_vm_StackChunk::set_argsize(oop chunk, int value) {
-  chunk->int_field_put(_argsize_offset, value);
+inline void jdk_internal_vm_StackChunk::set_bottom(oop chunk, int value) {
+  chunk->int_field_put(_bottom_offset, value);
 }
 
 inline uint8_t jdk_internal_vm_StackChunk::flags(oop chunk) {
diff --git a/src/java.base/share/classes/jdk/internal/vm/StackChunk.java b/src/java.base/share/classes/jdk/internal/vm/StackChunk.java
index 0c48ce67934..ab562706c24 100644
--- a/src/java.base/share/classes/jdk/internal/vm/StackChunk.java
+++ b/src/java.base/share/classes/jdk/internal/vm/StackChunk.java
@@ -31,10 +31,10 @@ public final class StackChunk {
     private StackChunk parent;
     private int size;    // in words
     private int sp;      // in words
-    private int argsize; // bottom stack-passed arguments, in words
+    private int bottom;  // in words
 
     // The stack itself is appended here by the VM, as well as some injected fields
 
     public StackChunk parent() { return parent; }
-    public boolean isEmpty()   { return sp >= (size - argsize); }
+    public boolean isEmpty()   { return sp == bottom; }
 }

From 33243d44a96bf47066e19bb743c076cbd4ba48ed Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 2 May 2024 08:42:38 +0000
Subject: [PATCH 277/486] 8331394: G1: Remove SKIP_RETIRED_FULL_REGIONS define
 in G1HRPrinter

Reviewed-by: gli, iwalulya
---
 src/hotspot/share/gc/g1/g1HRPrinter.hpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
index 9d6d151084f..3b712067e0b 100644
--- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp
+++ b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
@@ -28,8 +28,6 @@
 #include "gc/g1/g1HeapRegion.hpp"
 #include "logging/log.hpp"
 
-#define SKIP_RETIRED_FULL_REGIONS 1
-
 class FreeRegionList;
 
 class G1HRPrinter {
@@ -58,9 +56,7 @@ public:
 
   void retire(HeapRegion* hr) {
     if (is_active()) {
-      if (!SKIP_RETIRED_FULL_REGIONS || hr->top() < hr->end()) {
-        print("RETIRE", hr);
-      }
+      print("RETIRE", hr);
     }
   }
 

From fe23068d946181b0346e470d3172c5d29cc2e05c Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 2 May 2024 08:43:57 +0000
Subject: [PATCH 278/486] 8331392: G1: Make HRPrinter distinguish between
 different types of reclamation

Reviewed-by: ayang, iwalulya, gli
---
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp     |  2 +-
 src/hotspot/share/gc/g1/g1HRPrinter.cpp          |  4 ++--
 src/hotspot/share/gc/g1/g1HRPrinter.hpp          | 16 +++++++++++++---
 .../share/gc/g1/g1YoungGCPostEvacuateTasks.cpp   |  4 ++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 4b20bb43317..fdb380ae99f 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -1317,7 +1317,7 @@ public:
     if (!_cleanup_list.is_empty()) {
       log_debug(gc)("Reclaimed %u empty regions", _cleanup_list.length());
       // Now print the empty regions list.
-      _g1h->hr_printer()->cleanup(&_cleanup_list);
+      _g1h->hr_printer()->mark_reclaim(&_cleanup_list);
       // And actually make them available.
       _g1h->prepend_to_freelist(&_cleanup_list);
     }
diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.cpp b/src/hotspot/share/gc/g1/g1HRPrinter.cpp
index 7ec4f2a0d96..99769f85390 100644
--- a/src/hotspot/share/gc/g1/g1HRPrinter.cpp
+++ b/src/hotspot/share/gc/g1/g1HRPrinter.cpp
@@ -27,12 +27,12 @@
 #include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1HRPrinter.hpp"
 
-void G1HRPrinter::cleanup(FreeRegionList* cleanup_list) {
+void G1HRPrinter::mark_reclaim(FreeRegionList* cleanup_list) {
   if (is_active()) {
     FreeRegionListIterator iter(cleanup_list);
     while (iter.more_available()) {
       HeapRegion* hr = iter.get_next();
-      cleanup(hr);
+      mark_reclaim(hr);
     }
   }
 }
diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
index 3b712067e0b..5c1736b13ab 100644
--- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp
+++ b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
@@ -40,6 +40,10 @@ private:
                           action, hr->get_type_str(), p2i(hr->bottom()), p2i(hr->top()), p2i(hr->end()));
   }
 
+  void mark_reclaim(HeapRegion* hr) {
+    print("MARK-RECLAIM", hr);
+  }
+
 public:
   // In some places we iterate over a list in order to generate output
   // for the list's elements. By exposing this we can avoid this
@@ -78,13 +82,19 @@ public:
     }
   }
 
-  void cleanup(HeapRegion* hr) {
+  void mark_reclaim(FreeRegionList* free_list);
+
+  void eager_reclaim(HeapRegion* hr) {
     if (is_active()) {
-      print("CLEANUP", hr);
+      print("EAGER-RECLAIM", hr);
     }
   }
 
-  void cleanup(FreeRegionList* free_list);
+  void evac_reclaim(HeapRegion* hr) {
+    if (is_active()) {
+      print("EVAC-RECLAIM", hr);
+    }
+  }
 
   void post_compaction(HeapRegion* hr) {
     if (is_active()) {
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
index 572f970c73f..98f4c43d275 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
@@ -412,7 +412,7 @@ public:
       r->set_containing_set(nullptr);
       _humongous_regions_reclaimed++;
       _g1h->free_humongous_region(r, nullptr);
-      _g1h->hr_printer()->cleanup(r);
+      _g1h->hr_printer()->eager_reclaim(r);
     };
 
     _g1h->humongous_obj_regions_iterate(r, free_humongous_region);
@@ -760,7 +760,7 @@ class FreeCSetClosure : public HeapRegionClosure {
 
     // Free the region and its remembered set.
     _g1h->free_region(r, nullptr);
-    _g1h->hr_printer()->cleanup(r);
+    _g1h->hr_printer()->evac_reclaim(r);
   }
 
   void handle_failed_region(HeapRegion* r) {

From 286cbf831c2eb76e31bd69b4a93cd5ae9a821493 Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Thu, 2 May 2024 09:58:32 +0000
Subject: [PATCH 279/486] 8331546: Build failure after 8330076

Reviewed-by: mdoerr, tschatzl, shade
---
 src/hotspot/share/memory/virtualspace.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index ffa918f0998..6811d6be846 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -329,7 +329,7 @@ ReservedSpace ReservedSpace::last_part(size_t partition_size, size_t alignment)
 
 ReservedSpace ReservedSpace::partition(size_t offset, size_t partition_size, size_t alignment) {
   assert(offset + partition_size <= size(), "partition failed");
-  ReservedSpace result(base() + offset, partition_size, alignment, page_size(), special(), executable());
+  ReservedSpace result(base() + offset, partition_size, alignment, page_size(), special(), executable(), nmt_flag());
   return result;
 }
 

From ae82405ff7a48bc6e61b1d05bf74839b7ed50c11 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 2 May 2024 10:08:29 +0000
Subject: [PATCH 280/486] 8323058: Revisit j.l.classfile.CodeBuilder API
 surface

Reviewed-by: briangoetz, psandoz
---
 .../java/lang/classfile/CodeBuilder.java      | 707 +++++++-----------
 .../java/lang/classfile/package-info.java     |   2 +-
 .../snippet-files/PackageSnippets.java        |   4 +-
 .../java/lang/invoke/MethodHandleProxies.java |  12 +-
 .../java/lang/invoke/StringConcatFactory.java |   4 +-
 .../java/lang/reflect/ProxyGenerator.java     |  14 +-
 .../java/lang/runtime/SwitchBootstraps.java   |  26 +-
 .../classfile/impl/CatchBuilderImpl.java      |   4 +-
 .../classfile/impl/ClassRemapperImpl.java     |  12 +-
 .../classfile/impl/CodeLocalsShifterImpl.java |   6 +-
 .../classfile/impl/CodeRelabelerImpl.java     |   6 +-
 .../foreign/abi/BindingSpecializer.java       | 130 ++--
 .../jfr/internal/EventInstrumentation.java    |  14 +-
 .../internal/plugins/SystemModulesPlugin.java | 122 +--
 .../internal/plugins/VersionPropsPlugin.java  |   2 +-
 .../records/ProhibitedMethods.java            |   2 +-
 .../records/SerialPersistentFieldsTest.java   |   6 +-
 .../instrument/NativeMethodPrefixAgent.java   |   4 +-
 .../lang/instrument/RetransformAgent.java     |   2 +-
 .../lang/instrument/asmlib/Instrumentor.java  |   6 +-
 .../WrapperHiddenClassTest.java               |   2 +-
 .../classData/ClassDataTest.java              |  12 +-
 .../lang/invoke/lib/InstructionHelper.java    |   6 +-
 .../lang/invoke/condy/CondyNestedTest.java    |   2 +-
 .../lang/invoke/lookup/SpecialStatic.java     |   2 +-
 .../TestPrivateInterfaceMethodReflect.java    |   2 +-
 test/jdk/jdk/classfile/AdaptCodeTest.java     |   2 +-
 test/jdk/jdk/classfile/BSMTest.java           |   2 +-
 test/jdk/jdk/classfile/BuilderBlockTest.java  |  16 +-
 .../jdk/classfile/BuilderTryCatchTest.java    |  44 +-
 .../DiscontinuedInstructionsTest.java         |   4 +-
 test/jdk/jdk/classfile/LDCTest.java           |  22 +-
 test/jdk/jdk/classfile/LowAdaptTest.java      |  18 +-
 test/jdk/jdk/classfile/LvtTest.java           |  58 +-
 test/jdk/jdk/classfile/OneToOneTest.java      |  40 +-
 .../jdk/classfile/OpcodesValidationTest.java  |   4 +-
 .../classfile/PrimitiveClassConstantTest.java |   2 +-
 test/jdk/jdk/classfile/ShortJumpsFixTest.java |  10 +-
 test/jdk/jdk/classfile/StackMapsTest.java     |   8 +-
 test/jdk/jdk/classfile/StackTrackerTest.java  |   4 +-
 .../TempConstantPoolBuilderTest.java          |   6 +-
 test/jdk/jdk/classfile/TransformTests.java    |   2 +-
 test/jdk/jdk/classfile/Utf8EntryTest.java     |   4 +-
 test/jdk/jdk/classfile/WriteTest.java         |  80 +-
 .../classfile/examples/ExampleGallery.java    |   6 +-
 .../InstructionModelToCodeBuilder.java        |  48 +-
 .../helpers/RebuildingTransformation.java     |  16 +-
 .../jdk/jdk/classfile/helpers/Transforms.java |   2 +-
 .../separate/ClassToInterfaceConverter.java   |   2 +-
 .../java/lang/invoke/LazyStaticColdStart.java |   2 +-
 .../jdk/classfile/RebuildMethodBodies.java    |   6 +-
 .../bench/jdk/classfile/Transforms.java       |   2 +-
 .../openjdk/bench/jdk/classfile/Write.java    |  80 +-
 53 files changed, 725 insertions(+), 876 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
index 544d7322c1c..e954be079fa 100644
--- a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
@@ -212,8 +212,7 @@ public sealed interface CodeBuilder
         child.start();
         handler.accept(child);
         child.end();
-        labelBinding(breakLabel);
-        return this;
+        return labelBinding(breakLabel);
     }
 
     /**
@@ -253,12 +252,11 @@ public sealed interface CodeBuilder
 
         Label breakLabel = newLabel();
         BlockCodeBuilderImpl thenBlock = new BlockCodeBuilderImpl(this, breakLabel);
-        branchInstruction(BytecodeHelpers.reverseBranchOpcode(opcode), thenBlock.endLabel());
+        branch(BytecodeHelpers.reverseBranchOpcode(opcode), thenBlock.endLabel());
         thenBlock.start();
         thenHandler.accept(thenBlock);
         thenBlock.end();
-        labelBinding(breakLabel);
-        return this;
+        return labelBinding(breakLabel);
     }
 
     /**
@@ -305,17 +303,16 @@ public sealed interface CodeBuilder
         Label breakLabel = newLabel();
         BlockCodeBuilderImpl thenBlock = new BlockCodeBuilderImpl(this, breakLabel);
         BlockCodeBuilderImpl elseBlock = new BlockCodeBuilderImpl(this, breakLabel);
-        branchInstruction(BytecodeHelpers.reverseBranchOpcode(opcode), elseBlock.startLabel());
+        branch(BytecodeHelpers.reverseBranchOpcode(opcode), elseBlock.startLabel());
         thenBlock.start();
         thenHandler.accept(thenBlock);
         if (thenBlock.reachable())
-            thenBlock.branchInstruction(Opcode.GOTO, thenBlock.breakLabel());
+            thenBlock.branch(Opcode.GOTO, thenBlock.breakLabel());
         thenBlock.end();
         elseBlock.start();
         elseHandler.accept(elseBlock);
         elseBlock.end();
-        labelBinding(breakLabel);
-        return this;
+        return labelBinding(breakLabel);
     }
 
     /**
@@ -416,10 +413,10 @@ public sealed interface CodeBuilder
      * @param tk the load type
      * @param slot the local variable slot
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder loadInstruction(TypeKind tk, int slot) {
-        with(LoadInstruction.of(tk, slot));
-        return this;
+    default CodeBuilder loadLocal(TypeKind tk, int slot) {
+        return with(LoadInstruction.of(tk, slot));
     }
 
     /**
@@ -427,21 +424,10 @@ public sealed interface CodeBuilder
      * @param tk the store type
      * @param slot the local variable slot
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder storeInstruction(TypeKind tk, int slot) {
-        with(StoreInstruction.of(tk, slot));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to increment a local variable by a constant
-     * @param slot the local variable slot
-     * @param val the increment value
-     * @return this builder
-     */
-    default CodeBuilder incrementInstruction(int slot, int val) {
-        with(IncrementInstruction.of(slot, val));
-        return this;
+    default CodeBuilder storeLocal(TypeKind tk, int slot) {
+        return with(StoreInstruction.of(tk, slot));
     }
 
     /**
@@ -450,53 +436,20 @@ public sealed interface CodeBuilder
      * @param op the branch opcode
      * @param target the branch target
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder branchInstruction(Opcode op, Label target) {
-        with(BranchInstruction.of(op, target));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to access a jump table by key match and jump
-     * @param defaultTarget the default jump target
-     * @param cases the switch cases
-     * @return this builder
-     */
-    default CodeBuilder lookupSwitchInstruction(Label defaultTarget, List<SwitchCase> cases) {
-        with(LookupSwitchInstruction.of(defaultTarget, cases));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to access a jump table by index and jump
-     * @param lowValue the low key value
-     * @param highValue the high key value
-     * @param defaultTarget the default jump target
-     * @param cases the switch cases
-     * @return this builder
-     */
-    default CodeBuilder tableSwitchInstruction(int lowValue, int highValue, Label defaultTarget, List<SwitchCase> cases) {
-        with(TableSwitchInstruction.of(lowValue, highValue, defaultTarget, cases));
-        return this;
+    default CodeBuilder branch(Opcode op, Label target) {
+        return with(BranchInstruction.of(op, target));
     }
 
     /**
      * Generate return instruction
      * @param tk the return type
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder returnInstruction(TypeKind tk) {
-        with(ReturnInstruction.of(tk));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to throw an exception or error
-     * @return this builder
-     */
-    default CodeBuilder throwInstruction() {
-        with(ThrowInstruction.of());
-        return this;
+    default CodeBuilder return_(TypeKind tk) {
+        return with(ReturnInstruction.of(tk));
     }
 
     /**
@@ -505,10 +458,10 @@ public sealed interface CodeBuilder
      * @param opcode the field access opcode
      * @param ref the field reference
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder fieldInstruction(Opcode opcode, FieldRefEntry ref) {
-        with(FieldInstruction.of(opcode, ref));
-        return this;
+    default CodeBuilder fieldAccess(Opcode opcode, FieldRefEntry ref) {
+        return with(FieldInstruction.of(opcode, ref));
     }
 
     /**
@@ -519,9 +472,10 @@ public sealed interface CodeBuilder
      * @param name the field name
      * @param type the field type
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder fieldInstruction(Opcode opcode, ClassDesc owner, String name, ClassDesc type) {
-        return fieldInstruction(opcode, constantPool().fieldRefEntry(owner, name, type));
+    default CodeBuilder fieldAccess(Opcode opcode, ClassDesc owner, String name, ClassDesc type) {
+        return fieldAccess(opcode, constantPool().fieldRefEntry(owner, name, type));
     }
 
     /**
@@ -530,8 +484,9 @@ public sealed interface CodeBuilder
      * @param opcode the invoke opcode
      * @param ref the interface method or method reference
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder invokeInstruction(Opcode opcode, MemberRefEntry ref) {
+    default CodeBuilder invoke(Opcode opcode, MemberRefEntry ref) {
         return with(InvokeInstruction.of(opcode, ref));
     }
 
@@ -544,191 +499,101 @@ public sealed interface CodeBuilder
      * @param desc the method type
      * @param isInterface the interface method invocation indication
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder invokeInstruction(Opcode opcode, ClassDesc owner, String name, MethodTypeDesc desc, boolean isInterface) {
-        return invokeInstruction(opcode,
+    default CodeBuilder invoke(Opcode opcode, ClassDesc owner, String name, MethodTypeDesc desc, boolean isInterface) {
+        return invoke(opcode,
                 isInterface ? constantPool().interfaceMethodRefEntry(owner, name, desc)
                             : constantPool().methodRefEntry(owner, name, desc));
     }
 
-    /**
-     * Generate an instruction to invoke a dynamically-computed call site
-     * @param ref the dynamic call site
-     * @return this builder
-     */
-    default CodeBuilder invokeDynamicInstruction(InvokeDynamicEntry ref) {
-        with(InvokeDynamicInstruction.of(ref));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to invoke a dynamically-computed call site
-     * @param desc the dynamic call site
-     * @return this builder
-     */
-    default CodeBuilder invokeDynamicInstruction(DynamicCallSiteDesc desc) {
-        MethodHandleEntry bsMethod = handleDescToHandleInfo(constantPool(), (DirectMethodHandleDesc) desc.bootstrapMethod());
-        var cpArgs = desc.bootstrapArgs();
-        List<LoadableConstantEntry> bsArguments = new ArrayList<>(cpArgs.length);
-        for (var constantValue : cpArgs) {
-            bsArguments.add(BytecodeHelpers.constantEntry(constantPool(), constantValue));
-        }
-        BootstrapMethodEntry bm = constantPool().bsmEntry(bsMethod, bsArguments);
-        NameAndTypeEntry nameAndType = constantPool().nameAndTypeEntry(desc.invocationName(), desc.invocationType());
-        invokeDynamicInstruction(constantPool().invokeDynamicEntry(bm, nameAndType));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to create a new object
-     * @param type the object type
-     * @return this builder
-     */
-    default CodeBuilder newObjectInstruction(ClassEntry type) {
-        with(NewObjectInstruction.of(type));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to create a new object
-     * @param type the object type
-     * @return this builder
-     * @throws IllegalArgumentException if {@code type} represents a primitive type
-     */
-    default CodeBuilder newObjectInstruction(ClassDesc type) {
-        return newObjectInstruction(constantPool().classEntry(type));
-    }
-
-    /**
-     * Generate an instruction to create a new array of a primitive type
-     * @param typeKind the primitive component type
-     * @return this builder
-     */
-    default CodeBuilder newPrimitiveArrayInstruction(TypeKind typeKind) {
-        with(NewPrimitiveArrayInstruction.of(typeKind));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to create a new array of reference
-     * @param type the component type
-     * @return this builder
-     */
-    default CodeBuilder newReferenceArrayInstruction(ClassEntry type) {
-        with(NewReferenceArrayInstruction.of(type));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to create a new array of reference
-     * @param type the component type
-     * @return this builder
-     * @throws IllegalArgumentException if {@code type} represents a primitive type
-     */
-    default CodeBuilder newReferenceArrayInstruction(ClassDesc type) {
-        return newReferenceArrayInstruction(constantPool().classEntry(type));
-    }
-
-    /**
-     * Generate an instruction to create a new multidimensional array
-     * @param dimensions the number of dimensions
-     * @param type the array type
-     * @return this builder
-     */
-    default CodeBuilder newMultidimensionalArrayInstruction(int dimensions,
-                                                            ClassEntry type) {
-        with(NewMultiArrayInstruction.of(type, dimensions));
-        return this;
-    }
-
-    /**
-     * Generate an instruction to create a new multidimensional array
-     * @param dimensions the number of dimensions
-     * @param type the array type
-     * @return this builder
-     */
-    default CodeBuilder newMultidimensionalArrayInstruction(int dimensions,
-                                                            ClassDesc type) {
-        return newMultidimensionalArrayInstruction(dimensions, constantPool().classEntry(type));
-    }
-
     /**
      * Generate an instruction to load from an array
      * @param tk the array element type
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder arrayLoadInstruction(TypeKind tk) {
+    default CodeBuilder arrayLoad(TypeKind tk) {
         Opcode opcode = BytecodeHelpers.arrayLoadOpcode(tk);
-        with(ArrayLoadInstruction.of(opcode));
-        return this;
+        return with(ArrayLoadInstruction.of(opcode));
     }
 
     /**
      * Generate an instruction to store into an array
      * @param tk the array element type
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder arrayStoreInstruction(TypeKind tk) {
+    default CodeBuilder arrayStore(TypeKind tk) {
         Opcode opcode = BytecodeHelpers.arrayStoreOpcode(tk);
-        with(ArrayStoreInstruction.of(opcode));
-        return this;
+        return with(ArrayStoreInstruction.of(opcode));
     }
 
     /**
-     * Generate a type checking instruction
-     * @see Opcode.Kind#TYPE_CHECK
-     * @param opcode the type check instruction opcode
-     * @param type the type
-     * @return this builder
-     */
-    default CodeBuilder typeCheckInstruction(Opcode opcode,
-                                             ClassEntry type) {
-        with(TypeCheckInstruction.of(opcode, type));
-        return this;
-    }
-
-    /**
-     * Generate a type checking instruction
-     * @see Opcode.Kind#TYPE_CHECK
-     * @param opcode the type check instruction opcode
-     * @param type the type
-     * @return this builder
-     */
-    default CodeBuilder typeCheckInstruction(Opcode opcode, ClassDesc type) {
-        return typeCheckInstruction(opcode, constantPool().classEntry(type));
-    }
-
-    /**
-     * Generate a type converting instruction
+     * Generate instruction(s) to convert {@code fromType} to {@code toType}
      * @param fromType the source type
      * @param toType the target type
      * @return this builder
+     * @throws IllegalArgumentException for conversions of {@code VoidType} or {@code ReferenceType}
+     * @since 23
      */
-    default CodeBuilder convertInstruction(TypeKind fromType, TypeKind toType) {
-        with(ConvertInstruction.of(fromType, toType));
-        return this;
-    }
-
-    /**
-     * Generate a stack manipulating instruction
-     * @param opcode the stack instruction opcode
-     * @see Opcode.Kind#STACK
-     * @return this builder
-     */
-    default CodeBuilder stackInstruction(Opcode opcode) {
-        with(StackInstruction.of(opcode));
-        return this;
-    }
-
-    /**
-     * Generate an operator instruction
-     * @see Opcode.Kind#OPERATOR
-     * @param opcode the operator instruction opcode
-     * @return this builder
-     */
-    default CodeBuilder operatorInstruction(Opcode opcode) {
-        with(OperatorInstruction.of(opcode));
-        return this;
+    default CodeBuilder conversion(TypeKind fromType, TypeKind toType) {
+        return switch (fromType) {
+            case IntType, ByteType, CharType, ShortType, BooleanType ->
+                    switch (toType) {
+                        case IntType -> this;
+                        case LongType -> i2l();
+                        case DoubleType -> i2d();
+                        case FloatType -> i2f();
+                        case ByteType -> i2b();
+                        case CharType -> i2c();
+                        case ShortType -> i2s();
+                        case BooleanType -> iconst_1().iand();
+                        case VoidType, ReferenceType ->
+                            throw new IllegalArgumentException(String.format("convert %s -> %s", fromType, toType));
+                    };
+            case LongType ->
+                    switch (toType) {
+                        case IntType -> l2i();
+                        case LongType -> this;
+                        case DoubleType -> l2d();
+                        case FloatType -> l2f();
+                        case ByteType -> l2i().i2b();
+                        case CharType -> l2i().i2c();
+                        case ShortType -> l2i().i2s();
+                        case BooleanType -> l2i().iconst_1().iand();
+                        case VoidType, ReferenceType ->
+                            throw new IllegalArgumentException(String.format("convert %s -> %s", fromType, toType));
+                    };
+            case DoubleType ->
+                    switch (toType) {
+                        case IntType -> d2i();
+                        case LongType -> d2l();
+                        case DoubleType -> this;
+                        case FloatType -> d2f();
+                        case ByteType -> d2i().i2b();
+                        case CharType -> d2i().i2c();
+                        case ShortType -> d2i().i2s();
+                        case BooleanType -> d2i().iconst_1().iand();
+                        case VoidType, ReferenceType ->
+                            throw new IllegalArgumentException(String.format("convert %s -> %s", fromType, toType));
+                    };
+            case FloatType ->
+                    switch (toType) {
+                        case IntType -> f2i();
+                        case LongType -> f2l();
+                        case DoubleType -> f2d();
+                        case FloatType -> this;
+                        case ByteType -> f2i().i2b();
+                        case CharType -> f2i().i2c();
+                        case ShortType -> f2i().i2s();
+                        case BooleanType -> f2i().iconst_1().iand();
+                        case VoidType, ReferenceType ->
+                            throw new IllegalArgumentException(String.format("convert %s -> %s", fromType, toType));
+                    };
+            case VoidType, ReferenceType ->
+                throw new IllegalArgumentException(String.format("convert %s -> %s", fromType, toType));
+        };
     }
 
     /**
@@ -737,8 +602,9 @@ public sealed interface CodeBuilder
      * @param opcode the constant instruction opcode
      * @param value the constant value
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder constantInstruction(Opcode opcode, ConstantDesc value) {
+    default CodeBuilder loadConstant(Opcode opcode, ConstantDesc value) {
         BytecodeHelpers.validateValue(opcode, value);
         return with(switch (opcode) {
             case SIPUSH, BIPUSH -> ConstantInstruction.ofArgument(opcode, ((Number)value).intValue());
@@ -751,8 +617,9 @@ public sealed interface CodeBuilder
      * Generate an instruction pushing a constant onto the operand stack
      * @param value the constant value
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder constantInstruction(ConstantDesc value) {
+    default CodeBuilder loadConstant(ConstantDesc value) {
         //avoid switch expressions here
         if (value == null || value == ConstantDescs.NULL)
             return aconst_null();
@@ -785,32 +652,12 @@ public sealed interface CodeBuilder
         return ldc(value);
     }
 
-    /**
-     * Generate a monitor instruction
-     * @see Opcode.Kind#MONITOR
-     * @param opcode the monitor instruction opcode
-     * @return this builder
-     */
-    default CodeBuilder monitorInstruction(Opcode opcode) {
-        with(MonitorInstruction.of(opcode));
-        return null;
-    }
-
-    /**
-     * Generate a do nothing instruction
-     * @return this builder
-     */
-    default CodeBuilder nopInstruction() {
-        with(NopInstruction.of());
-        return this;
-    }
-
     /**
      * Generate a do nothing instruction
      * @return this builder
      */
     default CodeBuilder nop() {
-        return nopInstruction();
+        return with(NopInstruction.of());
     }
 
     // Base pseudo-instruction builder methods
@@ -831,8 +678,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder labelBinding(Label label) {
-        with((LabelImpl) label);
-        return this;
+        return with((LabelImpl) label);
     }
 
     /**
@@ -841,8 +687,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lineNumber(int line) {
-        with(LineNumber.of(line));
-        return this;
+        return with(LineNumber.of(line));
     }
 
     /**
@@ -854,8 +699,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder exceptionCatch(Label start, Label end, Label handler, ClassEntry catchType) {
-        with(ExceptionCatch.of(handler, start, end, Optional.of(catchType)));
-        return this;
+        return with(ExceptionCatch.of(handler, start, end, Optional.of(catchType)));
     }
 
     /**
@@ -867,8 +711,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder exceptionCatch(Label start, Label end, Label handler, Optional<ClassEntry> catchType) {
-        with(ExceptionCatch.of(handler, start, end, catchType));
-        return this;
+        return with(ExceptionCatch.of(handler, start, end, catchType));
     }
 
     /**
@@ -892,8 +735,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder exceptionCatchAll(Label start, Label end, Label handler) {
-        with(ExceptionCatch.of(handler, start, end));
-        return this;
+        return with(ExceptionCatch.of(handler, start, end));
     }
 
     /**
@@ -906,8 +748,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder characterRange(Label startScope, Label endScope, int characterRangeStart, int characterRangeEnd, int flags) {
-        with(CharacterRange.of(startScope, endScope, characterRangeStart, characterRangeEnd, flags));
-        return this;
+        return with(CharacterRange.of(startScope, endScope, characterRangeStart, characterRangeEnd, flags));
     }
 
     /**
@@ -920,8 +761,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder localVariable(int slot, Utf8Entry nameEntry, Utf8Entry descriptorEntry, Label startScope, Label endScope) {
-        with(LocalVariable.of(slot, nameEntry, descriptorEntry, startScope, endScope));
-        return this;
+        return with(LocalVariable.of(slot, nameEntry, descriptorEntry, startScope, endScope));
     }
 
     /**
@@ -950,8 +790,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder localVariableType(int slot, Utf8Entry nameEntry, Utf8Entry signatureEntry, Label startScope, Label endScope) {
-        with(LocalVariableType.of(slot, nameEntry, signatureEntry, startScope, endScope));
-        return this;
+        return with(LocalVariableType.of(slot, nameEntry, signatureEntry, startScope, endScope));
     }
 
     /**
@@ -985,7 +824,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder aaload() {
-        return arrayLoadInstruction(TypeKind.ReferenceType);
+        return arrayLoad(TypeKind.ReferenceType);
     }
 
     /**
@@ -993,7 +832,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder aastore() {
-        return arrayStoreInstruction(TypeKind.ReferenceType);
+        return arrayStore(TypeKind.ReferenceType);
     }
 
     /**
@@ -1002,7 +841,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder aload(int slot) {
-        return loadInstruction(TypeKind.ReferenceType, slot);
+        return loadLocal(TypeKind.ReferenceType, slot);
     }
 
     /**
@@ -1011,7 +850,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder anewarray(ClassEntry classEntry) {
-        return newReferenceArrayInstruction(classEntry);
+        return with(NewReferenceArrayInstruction.of(classEntry));
     }
 
     /**
@@ -1021,7 +860,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code className} represents a primitive type
      */
     default CodeBuilder anewarray(ClassDesc className) {
-        return newReferenceArrayInstruction(constantPool().classEntry(className));
+        return anewarray(constantPool().classEntry(className));
     }
 
     /**
@@ -1029,7 +868,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder areturn() {
-        return returnInstruction(TypeKind.ReferenceType);
+        return return_(TypeKind.ReferenceType);
     }
 
     /**
@@ -1037,7 +876,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder arraylength() {
-        return operatorInstruction(Opcode.ARRAYLENGTH);
+        return with(OperatorInstruction.of(Opcode.ARRAYLENGTH));
     }
 
     /**
@@ -1046,7 +885,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder astore(int slot) {
-        return storeInstruction(TypeKind.ReferenceType, slot);
+        return storeLocal(TypeKind.ReferenceType, slot);
     }
 
     /**
@@ -1054,7 +893,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder athrow() {
-        return throwInstruction();
+        return with(ThrowInstruction.of());
     }
 
     /**
@@ -1062,7 +901,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder baload() {
-        return arrayLoadInstruction(TypeKind.ByteType);
+        return arrayLoad(TypeKind.ByteType);
     }
 
     /**
@@ -1070,7 +909,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder bastore() {
-        return arrayStoreInstruction(TypeKind.ByteType);
+        return arrayStore(TypeKind.ByteType);
     }
 
     /**
@@ -1079,7 +918,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder bipush(int b) {
-        return constantInstruction(Opcode.BIPUSH, b);
+        return loadConstant(Opcode.BIPUSH, b);
     }
 
     /**
@@ -1087,7 +926,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder caload() {
-        return arrayLoadInstruction(TypeKind.CharType);
+        return arrayLoad(TypeKind.CharType);
     }
 
     /**
@@ -1095,7 +934,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder castore() {
-        return arrayStoreInstruction(TypeKind.CharType);
+        return arrayStore(TypeKind.CharType);
     }
 
     /**
@@ -1104,7 +943,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder checkcast(ClassEntry type) {
-        return typeCheckInstruction(Opcode.CHECKCAST, type);
+        return with(TypeCheckInstruction.of(Opcode.CHECKCAST, type));
     }
 
     /**
@@ -1114,7 +953,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code type} represents a primitive type
      */
     default CodeBuilder checkcast(ClassDesc type) {
-        return typeCheckInstruction(Opcode.CHECKCAST, type);
+        return checkcast(constantPool().classEntry(type));
     }
 
     /**
@@ -1122,7 +961,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder d2f() {
-        return convertInstruction(TypeKind.DoubleType, TypeKind.FloatType);
+        return with(ConvertInstruction.of(Opcode.D2F));
     }
 
     /**
@@ -1130,7 +969,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder d2i() {
-        return convertInstruction(TypeKind.DoubleType, TypeKind.IntType);
+        return with(ConvertInstruction.of(Opcode.D2I));
     }
 
     /**
@@ -1138,7 +977,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder d2l() {
-        return convertInstruction(TypeKind.DoubleType, TypeKind.LongType);
+        return with(ConvertInstruction.of(Opcode.D2L));
     }
 
     /**
@@ -1146,7 +985,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dadd() {
-        return operatorInstruction(Opcode.DADD);
+        return with(OperatorInstruction.of(Opcode.DADD));
     }
 
     /**
@@ -1154,7 +993,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder daload() {
-        return arrayLoadInstruction(TypeKind.DoubleType);
+        return arrayLoad(TypeKind.DoubleType);
     }
 
     /**
@@ -1162,7 +1001,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dastore() {
-        return arrayStoreInstruction(TypeKind.DoubleType);
+        return arrayStore(TypeKind.DoubleType);
     }
 
     /**
@@ -1170,7 +1009,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dcmpg() {
-        return operatorInstruction(Opcode.DCMPG);
+        return with(OperatorInstruction.of(Opcode.DCMPG));
     }
 
     /**
@@ -1178,7 +1017,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dcmpl() {
-        return operatorInstruction(Opcode.DCMPL);
+        return with(OperatorInstruction.of(Opcode.DCMPL));
     }
 
     /**
@@ -1202,7 +1041,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ddiv() {
-        return operatorInstruction(Opcode.DDIV);
+        return with(OperatorInstruction.of(Opcode.DDIV));
     }
 
     /**
@@ -1211,7 +1050,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dload(int slot) {
-        return loadInstruction(TypeKind.DoubleType, slot);
+        return loadLocal(TypeKind.DoubleType, slot);
     }
 
     /**
@@ -1219,7 +1058,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dmul() {
-        return operatorInstruction(Opcode.DMUL);
+        return with(OperatorInstruction.of(Opcode.DMUL));
     }
 
     /**
@@ -1227,7 +1066,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dneg() {
-        return operatorInstruction(Opcode.DNEG);
+        return with(OperatorInstruction.of(Opcode.DNEG));
     }
 
     /**
@@ -1235,7 +1074,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder drem() {
-        return operatorInstruction(Opcode.DREM);
+        return with(OperatorInstruction.of(Opcode.DREM));
     }
 
     /**
@@ -1243,7 +1082,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dreturn() {
-        return returnInstruction(TypeKind.DoubleType);
+        return return_(TypeKind.DoubleType);
     }
 
     /**
@@ -1252,7 +1091,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dstore(int slot) {
-        return storeInstruction(TypeKind.DoubleType, slot);
+        return storeLocal(TypeKind.DoubleType, slot);
     }
 
     /**
@@ -1260,7 +1099,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dsub() {
-        return operatorInstruction(Opcode.DSUB);
+        return with(OperatorInstruction.of(Opcode.DSUB));
     }
 
     /**
@@ -1268,7 +1107,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dup() {
-        return stackInstruction(Opcode.DUP);
+        return with(StackInstruction.of(Opcode.DUP));
     }
 
     /**
@@ -1276,7 +1115,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dup2() {
-        return stackInstruction(Opcode.DUP2);
+        return with(StackInstruction.of(Opcode.DUP2));
     }
 
     /**
@@ -1285,7 +1124,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dup2_x1() {
-        return stackInstruction(Opcode.DUP2_X1);
+        return with(StackInstruction.of(Opcode.DUP2_X1));
     }
 
     /**
@@ -1294,7 +1133,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dup2_x2() {
-        return stackInstruction(Opcode.DUP2_X2);
+        return with(StackInstruction.of(Opcode.DUP2_X2));
     }
 
     /**
@@ -1302,7 +1141,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dup_x1() {
-        return stackInstruction(Opcode.DUP_X1);
+        return with(StackInstruction.of(Opcode.DUP_X1));
     }
 
     /**
@@ -1310,7 +1149,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder dup_x2() {
-        return stackInstruction(Opcode.DUP_X2);
+        return with(StackInstruction.of(Opcode.DUP_X2));
     }
 
     /**
@@ -1318,7 +1157,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder f2d() {
-        return convertInstruction(TypeKind.FloatType, TypeKind.DoubleType);
+        return with(ConvertInstruction.of(Opcode.F2D));
     }
 
     /**
@@ -1326,7 +1165,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder f2i() {
-        return convertInstruction(TypeKind.FloatType, TypeKind.IntType);
+        return with(ConvertInstruction.of(Opcode.F2I));
     }
 
     /**
@@ -1334,7 +1173,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder f2l() {
-        return convertInstruction(TypeKind.FloatType, TypeKind.LongType);
+        return with(ConvertInstruction.of(Opcode.F2L));
     }
 
     /**
@@ -1342,7 +1181,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fadd() {
-        return operatorInstruction(Opcode.FADD);
+        return with(OperatorInstruction.of(Opcode.FADD));
     }
 
     /**
@@ -1350,7 +1189,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder faload() {
-        return arrayLoadInstruction(TypeKind.FloatType);
+        return arrayLoad(TypeKind.FloatType);
     }
 
     /**
@@ -1358,7 +1197,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fastore() {
-        return arrayStoreInstruction(TypeKind.FloatType);
+        return arrayStore(TypeKind.FloatType);
     }
 
     /**
@@ -1366,7 +1205,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fcmpg() {
-        return operatorInstruction(Opcode.FCMPG);
+        return with(OperatorInstruction.of(Opcode.FCMPG));
     }
 
     /**
@@ -1374,7 +1213,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fcmpl() {
-        return operatorInstruction(Opcode.FCMPL);
+        return with(OperatorInstruction.of(Opcode.FCMPL));
     }
 
     /**
@@ -1406,7 +1245,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fdiv() {
-        return operatorInstruction(Opcode.FDIV);
+        return with(OperatorInstruction.of(Opcode.FDIV));
     }
 
     /**
@@ -1415,7 +1254,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fload(int slot) {
-        return loadInstruction(TypeKind.FloatType, slot);
+        return loadLocal(TypeKind.FloatType, slot);
     }
 
     /**
@@ -1423,7 +1262,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fmul() {
-        return operatorInstruction(Opcode.FMUL);
+        return with(OperatorInstruction.of(Opcode.FMUL));
     }
 
     /**
@@ -1431,7 +1270,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fneg() {
-        return operatorInstruction(Opcode.FNEG);
+        return with(OperatorInstruction.of(Opcode.FNEG));
     }
 
     /**
@@ -1439,7 +1278,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder frem() {
-        return operatorInstruction(Opcode.FREM);
+        return with(OperatorInstruction.of(Opcode.FREM));
     }
 
     /**
@@ -1447,7 +1286,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder freturn() {
-        return returnInstruction(TypeKind.FloatType);
+        return return_(TypeKind.FloatType);
     }
 
     /**
@@ -1456,7 +1295,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fstore(int slot) {
-        return storeInstruction(TypeKind.FloatType, slot);
+        return storeLocal(TypeKind.FloatType, slot);
     }
 
     /**
@@ -1464,7 +1303,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder fsub() {
-        return operatorInstruction(Opcode.FSUB);
+        return with(OperatorInstruction.of(Opcode.FSUB));
     }
 
     /**
@@ -1473,7 +1312,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder getfield(FieldRefEntry ref) {
-        return fieldInstruction(Opcode.GETFIELD, ref);
+        return fieldAccess(Opcode.GETFIELD, ref);
     }
 
     /**
@@ -1485,7 +1324,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder getfield(ClassDesc owner, String name, ClassDesc type) {
-        return fieldInstruction(Opcode.GETFIELD, owner, name, type);
+        return fieldAccess(Opcode.GETFIELD, owner, name, type);
     }
 
     /**
@@ -1494,7 +1333,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder getstatic(FieldRefEntry ref) {
-        return fieldInstruction(Opcode.GETSTATIC, ref);
+        return fieldAccess(Opcode.GETSTATIC, ref);
     }
 
     /**
@@ -1506,7 +1345,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder getstatic(ClassDesc owner, String name, ClassDesc type) {
-        return fieldInstruction(Opcode.GETSTATIC, owner, name, type);
+        return fieldAccess(Opcode.GETSTATIC, owner, name, type);
     }
 
     /**
@@ -1515,7 +1354,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder goto_(Label target) {
-        return branchInstruction(Opcode.GOTO, target);
+        return branch(Opcode.GOTO, target);
     }
 
     /**
@@ -1524,7 +1363,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder goto_w(Label target) {
-        return branchInstruction(Opcode.GOTO_W, target);
+        return branch(Opcode.GOTO_W, target);
     }
 
     /**
@@ -1532,7 +1371,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder i2b() {
-        return convertInstruction(TypeKind.IntType, TypeKind.ByteType);
+        return with(ConvertInstruction.of(Opcode.I2B));
     }
 
     /**
@@ -1540,7 +1379,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder i2c() {
-        return convertInstruction(TypeKind.IntType, TypeKind.CharType);
+        return with(ConvertInstruction.of(Opcode.I2C));
     }
 
     /**
@@ -1548,7 +1387,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder i2d() {
-        return convertInstruction(TypeKind.IntType, TypeKind.DoubleType);
+        return with(ConvertInstruction.of(Opcode.I2D));
     }
 
     /**
@@ -1556,7 +1395,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder i2f() {
-        return convertInstruction(TypeKind.IntType, TypeKind.FloatType);
+        return with(ConvertInstruction.of(Opcode.I2F));
     }
 
     /**
@@ -1564,7 +1403,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder i2l() {
-        return convertInstruction(TypeKind.IntType, TypeKind.LongType);
+        return with(ConvertInstruction.of(Opcode.I2L));
     }
 
     /**
@@ -1572,7 +1411,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder i2s() {
-        return convertInstruction(TypeKind.IntType, TypeKind.ShortType);
+        return with(ConvertInstruction.of(Opcode.I2S));
     }
 
     /**
@@ -1580,7 +1419,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder iadd() {
-        return operatorInstruction(Opcode.IADD);
+        return with(OperatorInstruction.of(Opcode.IADD));
     }
 
     /**
@@ -1588,7 +1427,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder iaload() {
-        return arrayLoadInstruction(TypeKind.IntType);
+        return arrayLoad(TypeKind.IntType);
     }
 
     /**
@@ -1596,7 +1435,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder iand() {
-        return operatorInstruction(Opcode.IAND);
+        return with(OperatorInstruction.of(Opcode.IAND));
     }
 
     /**
@@ -1604,7 +1443,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder iastore() {
-        return arrayStoreInstruction(TypeKind.IntType);
+        return arrayStore(TypeKind.IntType);
     }
 
     /**
@@ -1668,7 +1507,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder idiv() {
-        return operatorInstruction(Opcode.IDIV);
+        return with(OperatorInstruction.of(Opcode.IDIV));
     }
 
     /**
@@ -1677,7 +1516,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_acmpeq(Label target) {
-        return branchInstruction(Opcode.IF_ACMPEQ, target);
+        return branch(Opcode.IF_ACMPEQ, target);
     }
 
     /**
@@ -1686,7 +1525,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_acmpne(Label target) {
-        return branchInstruction(Opcode.IF_ACMPNE, target);
+        return branch(Opcode.IF_ACMPNE, target);
     }
 
     /**
@@ -1695,7 +1534,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_icmpeq(Label target) {
-        return branchInstruction(Opcode.IF_ICMPEQ, target);
+        return branch(Opcode.IF_ICMPEQ, target);
     }
 
     /**
@@ -1704,7 +1543,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_icmpge(Label target) {
-        return branchInstruction(Opcode.IF_ICMPGE, target);
+        return branch(Opcode.IF_ICMPGE, target);
     }
 
     /**
@@ -1713,7 +1552,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_icmpgt(Label target) {
-        return branchInstruction(Opcode.IF_ICMPGT, target);
+        return branch(Opcode.IF_ICMPGT, target);
     }
 
     /**
@@ -1722,7 +1561,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_icmple(Label target) {
-        return branchInstruction(Opcode.IF_ICMPLE, target);
+        return branch(Opcode.IF_ICMPLE, target);
     }
 
     /**
@@ -1731,7 +1570,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_icmplt(Label target) {
-        return branchInstruction(Opcode.IF_ICMPLT, target);
+        return branch(Opcode.IF_ICMPLT, target);
     }
 
     /**
@@ -1740,7 +1579,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_icmpne(Label target) {
-        return branchInstruction(Opcode.IF_ICMPNE, target);
+        return branch(Opcode.IF_ICMPNE, target);
     }
 
     /**
@@ -1749,7 +1588,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_nonnull(Label target) {
-        return branchInstruction(Opcode.IFNONNULL, target);
+        return branch(Opcode.IFNONNULL, target);
     }
 
     /**
@@ -1758,7 +1597,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder if_null(Label target) {
-        return branchInstruction(Opcode.IFNULL, target);
+        return branch(Opcode.IFNULL, target);
     }
 
     /**
@@ -1767,7 +1606,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ifeq(Label target) {
-        return branchInstruction(Opcode.IFEQ, target);
+        return branch(Opcode.IFEQ, target);
     }
 
     /**
@@ -1776,7 +1615,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ifge(Label target) {
-        return branchInstruction(Opcode.IFGE, target);
+        return branch(Opcode.IFGE, target);
     }
 
     /**
@@ -1785,7 +1624,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ifgt(Label target) {
-        return branchInstruction(Opcode.IFGT, target);
+        return branch(Opcode.IFGT, target);
     }
 
     /**
@@ -1794,7 +1633,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ifle(Label target) {
-        return branchInstruction(Opcode.IFLE, target);
+        return branch(Opcode.IFLE, target);
     }
 
     /**
@@ -1803,7 +1642,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder iflt(Label target) {
-        return branchInstruction(Opcode.IFLT, target);
+        return branch(Opcode.IFLT, target);
     }
 
     /**
@@ -1812,7 +1651,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ifne(Label target) {
-        return branchInstruction(Opcode.IFNE, target);
+        return branch(Opcode.IFNE, target);
     }
 
     /**
@@ -1822,7 +1661,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder iinc(int slot, int val) {
-        return incrementInstruction(slot, val);
+        return with(IncrementInstruction.of(slot, val));
     }
 
     /**
@@ -1831,7 +1670,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder iload(int slot) {
-        return loadInstruction(TypeKind.IntType, slot);
+        return loadLocal(TypeKind.IntType, slot);
     }
 
     /**
@@ -1839,7 +1678,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder imul() {
-        return operatorInstruction(Opcode.IMUL);
+        return with(OperatorInstruction.of(Opcode.IMUL));
     }
 
     /**
@@ -1847,16 +1686,17 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ineg() {
-        return operatorInstruction(Opcode.INEG);
+        return with(OperatorInstruction.of(Opcode.INEG));
     }
 
     /**
      * Generate an instruction to determine if an object is of the given type
      * @param target the target type
      * @return this builder
+     * @since 23
      */
-    default CodeBuilder instanceof_(ClassEntry target) {
-        return typeCheckInstruction(Opcode.INSTANCEOF, target);
+    default CodeBuilder instanceOf(ClassEntry target) {
+        return with(TypeCheckInstruction.of(Opcode.INSTANCEOF, target));
     }
 
     /**
@@ -1864,9 +1704,10 @@ public sealed interface CodeBuilder
      * @param target the target type
      * @return this builder
      * @throws IllegalArgumentException if {@code target} represents a primitive type
+     * @since 23
      */
-    default CodeBuilder instanceof_(ClassDesc target) {
-        return typeCheckInstruction(Opcode.INSTANCEOF, constantPool().classEntry(target));
+    default CodeBuilder instanceOf(ClassDesc target) {
+        return instanceOf(constantPool().classEntry(target));
     }
 
     /**
@@ -1875,7 +1716,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder invokedynamic(InvokeDynamicEntry ref) {
-        return invokeDynamicInstruction(ref);
+        return with(InvokeDynamicInstruction.of(ref));
     }
 
     /**
@@ -1884,7 +1725,15 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder invokedynamic(DynamicCallSiteDesc ref) {
-        return invokeDynamicInstruction(ref);
+        MethodHandleEntry bsMethod = handleDescToHandleInfo(constantPool(), (DirectMethodHandleDesc) ref.bootstrapMethod());
+        var cpArgs = ref.bootstrapArgs();
+        List<LoadableConstantEntry> bsArguments = new ArrayList<>(cpArgs.length);
+        for (var constantValue : cpArgs) {
+            bsArguments.add(BytecodeHelpers.constantEntry(constantPool(), constantValue));
+        }
+        BootstrapMethodEntry bm = constantPool().bsmEntry(bsMethod, bsArguments);
+        NameAndTypeEntry nameAndType = constantPool().nameAndTypeEntry(ref.invocationName(), ref.invocationType());
+        return invokedynamic(constantPool().invokeDynamicEntry(bm, nameAndType));
     }
 
     /**
@@ -1893,7 +1742,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder invokeinterface(InterfaceMethodRefEntry ref) {
-        return invokeInstruction(Opcode.INVOKEINTERFACE, ref);
+        return invoke(Opcode.INVOKEINTERFACE, ref);
     }
 
     /**
@@ -1905,7 +1754,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder invokeinterface(ClassDesc owner, String name, MethodTypeDesc type) {
-        return invokeInstruction(Opcode.INVOKEINTERFACE, constantPool().interfaceMethodRefEntry(owner, name, type));
+        return invoke(Opcode.INVOKEINTERFACE, constantPool().interfaceMethodRefEntry(owner, name, type));
     }
 
     /**
@@ -1915,7 +1764,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder invokespecial(InterfaceMethodRefEntry ref) {
-        return invokeInstruction(Opcode.INVOKESPECIAL, ref);
+        return invoke(Opcode.INVOKESPECIAL, ref);
     }
 
     /**
@@ -1925,7 +1774,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder invokespecial(MethodRefEntry ref) {
-        return invokeInstruction(Opcode.INVOKESPECIAL, ref);
+        return invoke(Opcode.INVOKESPECIAL, ref);
     }
 
     /**
@@ -1938,7 +1787,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder invokespecial(ClassDesc owner, String name, MethodTypeDesc type) {
-        return invokeInstruction(Opcode.INVOKESPECIAL, owner, name, type, false);
+        return invoke(Opcode.INVOKESPECIAL, owner, name, type, false);
     }
 
     /**
@@ -1952,7 +1801,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder invokespecial(ClassDesc owner, String name, MethodTypeDesc type, boolean isInterface) {
-        return invokeInstruction(Opcode.INVOKESPECIAL, owner, name, type, isInterface);
+        return invoke(Opcode.INVOKESPECIAL, owner, name, type, isInterface);
     }
 
     /**
@@ -1961,7 +1810,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder invokestatic(InterfaceMethodRefEntry ref) {
-        return invokeInstruction(Opcode.INVOKESTATIC, ref);
+        return invoke(Opcode.INVOKESTATIC, ref);
     }
 
     /**
@@ -1970,7 +1819,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder invokestatic(MethodRefEntry ref) {
-        return invokeInstruction(Opcode.INVOKESTATIC, ref);
+        return invoke(Opcode.INVOKESTATIC, ref);
     }
 
     /**
@@ -1982,7 +1831,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder invokestatic(ClassDesc owner, String name, MethodTypeDesc type) {
-        return invokeInstruction(Opcode.INVOKESTATIC, owner, name, type, false);
+        return invoke(Opcode.INVOKESTATIC, owner, name, type, false);
     }
 
     /**
@@ -1995,7 +1844,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder invokestatic(ClassDesc owner, String name, MethodTypeDesc type, boolean isInterface) {
-        return invokeInstruction(Opcode.INVOKESTATIC, owner, name, type, isInterface);
+        return invoke(Opcode.INVOKESTATIC, owner, name, type, isInterface);
     }
 
     /**
@@ -2004,7 +1853,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder invokevirtual(MethodRefEntry ref) {
-        return invokeInstruction(Opcode.INVOKEVIRTUAL, ref);
+        return invoke(Opcode.INVOKEVIRTUAL, ref);
     }
 
     /**
@@ -2016,7 +1865,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder invokevirtual(ClassDesc owner, String name, MethodTypeDesc type) {
-        return invokeInstruction(Opcode.INVOKEVIRTUAL, owner, name, type, false);
+        return invoke(Opcode.INVOKEVIRTUAL, owner, name, type, false);
     }
 
     /**
@@ -2024,7 +1873,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ior() {
-        return operatorInstruction(Opcode.IOR);
+        return with(OperatorInstruction.of(Opcode.IOR));
     }
 
     /**
@@ -2032,7 +1881,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder irem() {
-        return operatorInstruction(Opcode.IREM);
+        return with(OperatorInstruction.of(Opcode.IREM));
     }
 
     /**
@@ -2040,7 +1889,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ireturn() {
-        return returnInstruction(TypeKind.IntType);
+        return return_(TypeKind.IntType);
     }
 
     /**
@@ -2048,7 +1897,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ishl() {
-        return operatorInstruction(Opcode.ISHL);
+        return with(OperatorInstruction.of(Opcode.ISHL));
     }
 
     /**
@@ -2056,7 +1905,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ishr() {
-        return operatorInstruction(Opcode.ISHR);
+        return with(OperatorInstruction.of(Opcode.ISHR));
     }
 
     /**
@@ -2065,7 +1914,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder istore(int slot) {
-        return storeInstruction(TypeKind.IntType, slot);
+        return storeLocal(TypeKind.IntType, slot);
     }
 
     /**
@@ -2073,7 +1922,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder isub() {
-        return operatorInstruction(Opcode.ISUB);
+        return with(OperatorInstruction.of(Opcode.ISUB));
     }
 
     /**
@@ -2081,7 +1930,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder iushr() {
-        return operatorInstruction(Opcode.IUSHR);
+        return with(OperatorInstruction.of(Opcode.IUSHR));
     }
 
     /**
@@ -2089,7 +1938,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ixor() {
-        return operatorInstruction(Opcode.IXOR);
+        return with(OperatorInstruction.of(Opcode.IXOR));
     }
 
     /**
@@ -2099,7 +1948,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lookupswitch(Label defaultTarget, List<SwitchCase> cases) {
-        return lookupSwitchInstruction(defaultTarget, cases);
+        return with(LookupSwitchInstruction.of(defaultTarget, cases));
     }
 
     /**
@@ -2107,7 +1956,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder l2d() {
-        return convertInstruction(TypeKind.LongType, TypeKind.DoubleType);
+        return with(ConvertInstruction.of(Opcode.L2D));
     }
 
     /**
@@ -2115,7 +1964,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder l2f() {
-        return convertInstruction(TypeKind.LongType, TypeKind.FloatType);
+        return with(ConvertInstruction.of(Opcode.L2F));
     }
 
     /**
@@ -2123,7 +1972,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder l2i() {
-        return convertInstruction(TypeKind.LongType, TypeKind.IntType);
+        return with(ConvertInstruction.of(Opcode.L2I));
     }
 
     /**
@@ -2131,7 +1980,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ladd() {
-        return operatorInstruction(Opcode.LADD);
+        return with(OperatorInstruction.of(Opcode.LADD));
     }
 
     /**
@@ -2139,7 +1988,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder laload() {
-        return arrayLoadInstruction(TypeKind.LongType);
+        return arrayLoad(TypeKind.LongType);
     }
 
     /**
@@ -2147,7 +1996,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder land() {
-        return operatorInstruction(Opcode.LAND);
+        return with(OperatorInstruction.of(Opcode.LAND));
     }
 
     /**
@@ -2155,7 +2004,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lastore() {
-        return arrayStoreInstruction(TypeKind.LongType);
+        return arrayStore(TypeKind.LongType);
     }
 
     /**
@@ -2163,7 +2012,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lcmp() {
-        return operatorInstruction(Opcode.LCMP);
+        return with(OperatorInstruction.of(Opcode.LCMP));
     }
 
     /**
@@ -2208,7 +2057,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder ldiv() {
-        return operatorInstruction(Opcode.LDIV);
+        return with(OperatorInstruction.of(Opcode.LDIV));
     }
 
     /**
@@ -2217,7 +2066,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lload(int slot) {
-        return loadInstruction(TypeKind.LongType, slot);
+        return loadLocal(TypeKind.LongType, slot);
     }
 
     /**
@@ -2225,7 +2074,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lmul() {
-        return operatorInstruction(Opcode.LMUL);
+        return with(OperatorInstruction.of(Opcode.LMUL));
     }
 
     /**
@@ -2233,7 +2082,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lneg() {
-        return operatorInstruction(Opcode.LNEG);
+        return with(OperatorInstruction.of(Opcode.LNEG));
     }
 
     /**
@@ -2241,7 +2090,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lor() {
-        return operatorInstruction(Opcode.LOR);
+        return with(OperatorInstruction.of(Opcode.LOR));
     }
 
     /**
@@ -2249,7 +2098,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lrem() {
-        return operatorInstruction(Opcode.LREM);
+        return with(OperatorInstruction.of(Opcode.LREM));
     }
 
     /**
@@ -2257,7 +2106,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lreturn() {
-        return returnInstruction(TypeKind.LongType);
+        return return_(TypeKind.LongType);
     }
 
     /**
@@ -2265,7 +2114,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lshl() {
-        return operatorInstruction(Opcode.LSHL);
+        return with(OperatorInstruction.of(Opcode.LSHL));
     }
 
     /**
@@ -2273,7 +2122,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lshr() {
-        return operatorInstruction(Opcode.LSHR);
+        return with(OperatorInstruction.of(Opcode.LSHR));
     }
 
     /**
@@ -2282,7 +2131,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lstore(int slot) {
-        return storeInstruction(TypeKind.LongType, slot);
+        return storeLocal(TypeKind.LongType, slot);
     }
 
     /**
@@ -2290,7 +2139,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lsub() {
-        return operatorInstruction(Opcode.LSUB);
+        return with(OperatorInstruction.of(Opcode.LSUB));
     }
 
     /**
@@ -2298,7 +2147,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lushr() {
-        return operatorInstruction(Opcode.LUSHR);
+        return with(OperatorInstruction.of(Opcode.LUSHR));
     }
 
     /**
@@ -2306,7 +2155,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder lxor() {
-        return operatorInstruction(Opcode.LXOR);
+        return with(OperatorInstruction.of(Opcode.LXOR));
     }
 
     /**
@@ -2314,7 +2163,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder monitorenter() {
-        return monitorInstruction(Opcode.MONITORENTER);
+        return with(MonitorInstruction.of(Opcode.MONITORENTER));
     }
 
     /**
@@ -2322,7 +2171,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder monitorexit() {
-        return monitorInstruction(Opcode.MONITOREXIT);
+        return with(MonitorInstruction.of(Opcode.MONITOREXIT));
     }
 
     /**
@@ -2332,7 +2181,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder multianewarray(ClassEntry array, int dims) {
-        return newMultidimensionalArrayInstruction(dims, array);
+        return with(NewMultiArrayInstruction.of(array, dims));
     }
 
     /**
@@ -2343,7 +2192,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code array} represents a primitive type
      */
     default CodeBuilder multianewarray(ClassDesc array, int dims) {
-        return newMultidimensionalArrayInstruction(dims, constantPool().classEntry(array));
+        return multianewarray(constantPool().classEntry(array), dims);
     }
 
     /**
@@ -2352,7 +2201,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder new_(ClassEntry clazz) {
-        return newObjectInstruction(clazz);
+        return with(NewObjectInstruction.of(clazz));
     }
 
     /**
@@ -2362,7 +2211,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code clazz} represents a primitive type
      */
     default CodeBuilder new_(ClassDesc clazz) {
-        return newObjectInstruction(constantPool().classEntry(clazz));
+        return new_(constantPool().classEntry(clazz));
     }
 
     /**
@@ -2371,7 +2220,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder newarray(TypeKind typeKind) {
-        return newPrimitiveArrayInstruction(typeKind);
+        return with(NewPrimitiveArrayInstruction.of(typeKind));
     }
 
     /**
@@ -2379,7 +2228,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder pop() {
-        return stackInstruction(Opcode.POP);
+        return with(StackInstruction.of(Opcode.POP));
     }
 
     /**
@@ -2387,7 +2236,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder pop2() {
-        return stackInstruction(Opcode.POP2);
+        return with(StackInstruction.of(Opcode.POP2));
     }
 
     /**
@@ -2396,7 +2245,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder putfield(FieldRefEntry ref) {
-        return fieldInstruction(Opcode.PUTFIELD, ref);
+        return fieldAccess(Opcode.PUTFIELD, ref);
     }
 
     /**
@@ -2408,7 +2257,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder putfield(ClassDesc owner, String name, ClassDesc type) {
-        return fieldInstruction(Opcode.PUTFIELD, owner, name, type);
+        return fieldAccess(Opcode.PUTFIELD, owner, name, type);
     }
 
     /**
@@ -2417,7 +2266,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder putstatic(FieldRefEntry ref) {
-        return fieldInstruction(Opcode.PUTSTATIC, ref);
+        return fieldAccess(Opcode.PUTSTATIC, ref);
     }
 
     /**
@@ -2429,7 +2278,7 @@ public sealed interface CodeBuilder
      * @throws IllegalArgumentException if {@code owner} represents a primitive type
      */
     default CodeBuilder putstatic(ClassDesc owner, String name, ClassDesc type) {
-        return fieldInstruction(Opcode.PUTSTATIC, owner, name, type);
+        return fieldAccess(Opcode.PUTSTATIC, owner, name, type);
     }
 
     /**
@@ -2437,7 +2286,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder return_() {
-        return returnInstruction(TypeKind.VoidType);
+        return return_(TypeKind.VoidType);
     }
 
     /**
@@ -2445,7 +2294,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder saload() {
-        return arrayLoadInstruction(TypeKind.ShortType);
+        return arrayLoad(TypeKind.ShortType);
     }
 
     /**
@@ -2453,7 +2302,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder sastore() {
-        return arrayStoreInstruction(TypeKind.ShortType);
+        return arrayStore(TypeKind.ShortType);
     }
 
     /**
@@ -2462,7 +2311,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder sipush(int s) {
-        return constantInstruction(Opcode.SIPUSH, s);
+        return loadConstant(Opcode.SIPUSH, s);
     }
 
     /**
@@ -2470,7 +2319,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder swap() {
-        return stackInstruction(Opcode.SWAP);
+        return with(StackInstruction.of(Opcode.SWAP));
     }
 
     /**
@@ -2482,7 +2331,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder tableswitch(int low, int high, Label defaultTarget, List<SwitchCase> cases) {
-        return tableSwitchInstruction(low, high, defaultTarget, cases);
+        return with(TableSwitchInstruction.of(low, high, defaultTarget, cases));
     }
 
     /**
@@ -2499,6 +2348,6 @@ public sealed interface CodeBuilder
             if (i < low) low = i;
             if (i > high) high = i;
         }
-        return tableSwitchInstruction(low, high, defaultTarget, cases);
+        return tableswitch(low, high, defaultTarget, cases);
     }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/package-info.java b/src/java.base/share/classes/java/lang/classfile/package-info.java
index edeafc439d3..49413d35660 100644
--- a/src/java.base/share/classes/java/lang/classfile/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/package-info.java
@@ -228,7 +228,7 @@
  * instruction invoking {@code println} could have been generated with {@link
  * java.lang.classfile.CodeBuilder#invokevirtual(java.lang.constant.ClassDesc,
  * java.lang.String, java.lang.constant.MethodTypeDesc) CodeBuilder.invokevirtual}, {@link
- * java.lang.classfile.CodeBuilder#invokeInstruction(java.lang.classfile.Opcode,
+ * java.lang.classfile.CodeBuilder#invoke(java.lang.classfile.Opcode,
  * java.lang.constant.ClassDesc, java.lang.String, java.lang.constant.MethodTypeDesc,
  * boolean) CodeBuilder.invokeInstruction}, or {@link
  * java.lang.classfile.CodeBuilder#with(java.lang.classfile.ClassFileElement)
diff --git a/src/java.base/share/classes/java/lang/classfile/snippet-files/PackageSnippets.java b/src/java.base/share/classes/java/lang/classfile/snippet-files/PackageSnippets.java
index 3776c6f66e9..5073e108465 100644
--- a/src/java.base/share/classes/java/lang/classfile/snippet-files/PackageSnippets.java
+++ b/src/java.base/share/classes/java/lang/classfile/snippet-files/PackageSnippets.java
@@ -213,7 +213,7 @@ class PackageSnippets {
             if (e instanceof InvokeInstruction i
                     && i.owner().asInternalName().equals("Foo")
                     && i.opcode() == Opcode.INVOKESTATIC)
-                        b.invokeInstruction(i.opcode(), CD_Bar, i.name().stringValue(), i.typeSymbol(), i.isInterface());
+                        b.invoke(i.opcode(), CD_Bar, i.name().stringValue(), i.typeSymbol(), i.isInterface());
             else b.with(e);
         };
         // @end
@@ -327,7 +327,7 @@ class PackageSnippets {
                                               for (CodeElement e : xm) {
                                                   if (e instanceof InvokeInstruction i && i.owner().asInternalName().equals("Foo")
                                                                                && i.opcode() == Opcode.INVOKESTATIC)
-                                                              codeBuilder.invokeInstruction(i.opcode(), CD_Bar,
+                                                              codeBuilder.invoke(i.opcode(), CD_Bar,
                                                                                             i.name().stringValue(), i.typeSymbol(), i.isInterface());
                                                   else codeBuilder.with(e);
                                               }});
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
index 15dc1301db5..5ca45e3fe52 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
@@ -382,7 +382,7 @@ public class MethodHandleProxies {
 
             // <clinit>
             clb.withMethodBody(CLASS_INIT_NAME, MTD_void, ACC_STATIC, cob -> {
-                cob.constantInstruction(ifaceDesc);
+                cob.loadConstant(ifaceDesc);
                 cob.putstatic(proxyDesc, TYPE_NAME, CD_Class);
                 cob.return_();
             });
@@ -406,7 +406,7 @@ public class MethodHandleProxies {
                     // this.m<i> = callerBoundTarget.asType(xxType);
                     cob.aload(0);
                     cob.aload(3);
-                    cob.constantInstruction(mi.desc);
+                    cob.loadConstant(mi.desc);
                     cob.invokevirtual(CD_MethodHandle, "asType", MTD_MethodHandle_MethodType);
                     cob.putfield(proxyDesc, mi.fieldName, CD_MethodHandle);
                 }
@@ -423,12 +423,12 @@ public class MethodHandleProxies {
                 // check lookupClass
                 cob.aload(0);
                 cob.invokevirtual(CD_MethodHandles_Lookup, "lookupClass", MTD_Class);
-                cob.constantInstruction(proxyDesc);
+                cob.loadConstant(proxyDesc);
                 cob.if_acmpne(failLabel);
                 // check original access
                 cob.aload(0);
                 cob.invokevirtual(CD_MethodHandles_Lookup, "lookupModes", MTD_int);
-                cob.constantInstruction(Lookup.ORIGINAL);
+                cob.loadConstant(Lookup.ORIGINAL);
                 cob.iand();
                 cob.ifeq(failLabel);
                 // success
@@ -452,11 +452,11 @@ public class MethodHandleProxies {
                                     bcb.aload(0);
                                     bcb.getfield(proxyDesc, mi.fieldName, CD_MethodHandle);
                                     for (int j = 0; j < mi.desc.parameterCount(); j++) {
-                                        bcb.loadInstruction(TypeKind.from(mi.desc.parameterType(j)),
+                                        bcb.loadLocal(TypeKind.from(mi.desc.parameterType(j)),
                                                 bcb.parameterSlot(j));
                                     }
                                     bcb.invokevirtual(CD_MethodHandle, "invokeExact", mi.desc);
-                                    bcb.returnInstruction(TypeKind.from(mi.desc.returnType()));
+                                    bcb.return_(TypeKind.from(mi.desc.returnType()));
                                 }, ctb -> ctb
                                         // catch (Error | RuntimeException | Declared ex) { throw ex; }
                                         .catchingMulti(mi.thrown, CodeBuilder::athrow)
diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index cd2f7ec170a..3499fd83525 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -1124,7 +1124,7 @@ public final class StringConcatFactory {
                         }
                     }
                     len += args.parameterCount() * ARGUMENT_SIZE_FACTOR;
-                    cb.constantInstruction(len);
+                    cb.loadConstant(len);
                     cb.invokespecial(STRING_BUILDER, "<init>", INT_CONSTRUCTOR_TYPE);
 
                     // At this point, we have a blank StringBuilder on stack, fill it in with .append calls.
@@ -1137,7 +1137,7 @@ public final class StringConcatFactory {
                             }
                             Class<?> cl = args.parameterType(c);
                             TypeKind kind = TypeKind.from(cl);
-                            cb.loadInstruction(kind, off);
+                            cb.loadLocal(kind, off);
                             off += kind.slotSize();
                             MethodTypeDesc desc = getSBAppendDesc(cl);
                             cb.invokevirtual(STRING_BUILDER, "append", desc);
diff --git a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
index 9637af4b251..08f971b0902 100644
--- a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
+++ b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
@@ -689,7 +689,7 @@ final class ProxyGenerator {
                             .block(blockBuilder -> blockBuilder
                                     .aload(cob.parameterSlot(0))
                                     .invokevirtual(CD_MethodHandles_Lookup, "lookupClass", MTD_Class)
-                                    .constantInstruction(Opcode.LDC, CD_Proxy)
+                                    .ldc(CD_Proxy)
                                     .if_acmpne(blockBuilder.breakLabel())
                                     .aload(cob.parameterSlot(0))
                                     .invokevirtual(CD_MethodHandles_Lookup, "hasFullPrivilegeAccess", MTD_boolean)
@@ -763,11 +763,11 @@ final class ProxyGenerator {
 
                         if (parameterTypes.length > 0) {
                             // Create an array and fill with the parameters converting primitives to wrappers
-                            cob.constantInstruction(parameterTypes.length)
+                            cob.loadConstant(parameterTypes.length)
                                .anewarray(CE_Object);
                             for (int i = 0; i < parameterTypes.length; i++) {
                                 cob.dup()
-                                   .constantInstruction(i);
+                                   .loadConstant(i);
                                 codeWrapArgument(cob, parameterTypes[i], cob.parameterSlot(i));
                                 cob.aastore();
                             }
@@ -811,7 +811,7 @@ final class ProxyGenerator {
          */
         private void codeWrapArgument(CodeBuilder cob, Class<?> type, int slot) {
             if (type.isPrimitive()) {
-                cob.loadInstruction(TypeKind.from(type).asLoadable(), slot);
+                cob.loadLocal(TypeKind.from(type).asLoadable(), slot);
                 PrimitiveTypeInfo prim = PrimitiveTypeInfo.get(type);
                 cob.invokestatic(prim.wrapperMethodRef);
             } else {
@@ -830,7 +830,7 @@ final class ProxyGenerator {
 
                 cob.checkcast(prim.wrapperClass)
                    .invokevirtual(prim.unwrapMethodRef)
-                   .returnInstruction(TypeKind.from(type).asLoadable());
+                   .return_(TypeKind.from(type).asLoadable());
             } else {
                 cob.checkcast(toClassDesc(type))
                    .areturn();
@@ -847,13 +847,13 @@ final class ProxyGenerator {
             codeClassForName(cob, fromClass);
 
             cob.ldc(method.getName())
-               .constantInstruction(parameterTypes.length)
+               .loadConstant(parameterTypes.length)
                .anewarray(CE_Class);
 
             // Construct an array with the parameter types mapping primitives to Wrapper types
             for (int i = 0; i < parameterTypes.length; i++) {
                 cob.dup()
-                   .constantInstruction(i);
+                   .loadConstant(i);
                 if (parameterTypes[i].isPrimitive()) {
                     PrimitiveTypeInfo prim = PrimitiveTypeInfo.get(parameterTypes[i]);
                     cob.getstatic(prim.typeFieldRef);
diff --git a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
index f91a9ad4de3..9ec60d9a152 100644
--- a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
+++ b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
@@ -414,7 +414,7 @@ public class SwitchBootstraps {
             cb.ireturn();
             cb.labelBinding(nonNullLabel);
             if (labelConstants.length == 0) {
-                cb.constantInstruction(0)
+                cb.loadConstant(0)
                         .ireturn();
                 return;
             }
@@ -454,7 +454,7 @@ public class SwitchBootstraps {
                             // Object o = ...
                             // o instanceof Wrapped(float)
                             cb.aload(SELECTOR_OBJ);
-                            cb.instanceof_(Wrapper.forBasicType(classLabel)
+                            cb.instanceOf(Wrapper.forBasicType(classLabel)
                                     .wrapperType()
                                     .describeConstable()
                                     .orElseThrow());
@@ -464,7 +464,7 @@ public class SwitchBootstraps {
                             // o instanceof float
                             Label notNumber = cb.newLabel();
                             cb.aload(SELECTOR_OBJ);
-                            cb.instanceof_(ConstantDescs.CD_Number);
+                            cb.instanceOf(ConstantDescs.CD_Number);
                             if (selectorType == long.class || selectorType == float.class || selectorType == double.class ||
                                 selectorType == Long.class || selectorType == Float.class || selectorType == Double.class) {
                                 cb.ifeq(next);
@@ -493,7 +493,7 @@ public class SwitchBootstraps {
                                 cb.goto_(compare);
                                 cb.labelBinding(notNumber);
                                 cb.aload(SELECTOR_OBJ);
-                                cb.instanceof_(ConstantDescs.CD_Character);
+                                cb.instanceOf(ConstantDescs.CD_Character);
                                 cb.ifeq(next);
                                 cb.aload(SELECTOR_OBJ);
                                 cb.checkcast(ConstantDescs.CD_Character);
@@ -514,11 +514,11 @@ public class SwitchBootstraps {
                         Optional<ClassDesc> classLabelConstableOpt = classLabel.describeConstable();
                         if (classLabelConstableOpt.isPresent()) {
                             cb.aload(SELECTOR_OBJ);
-                            cb.instanceof_(classLabelConstableOpt.orElseThrow());
+                            cb.instanceOf(classLabelConstableOpt.orElseThrow());
                             cb.ifeq(next);
                         } else {
                             cb.aload(EXTRA_CLASS_LABELS);
-                            cb.constantInstruction(extraClassLabels.size());
+                            cb.loadConstant(extraClassLabels.size());
                             cb.invokeinterface(ConstantDescs.CD_List,
                                     "get",
                                     MethodTypeDesc.of(ConstantDescs.CD_Object,
@@ -537,7 +537,7 @@ public class SwitchBootstraps {
                     int enumIdx = enumDescs.size();
                     enumDescs.add(enumLabel);
                     cb.aload(ENUM_CACHE);
-                    cb.constantInstruction(enumIdx);
+                    cb.loadConstant(enumIdx);
                     cb.invokestatic(ConstantDescs.CD_Integer,
                             "valueOf",
                             MethodTypeDesc.of(ConstantDescs.CD_Integer,
@@ -561,7 +561,7 @@ public class SwitchBootstraps {
                     Label compare = cb.newLabel();
                     Label notNumber = cb.newLabel();
                     cb.aload(SELECTOR_OBJ);
-                    cb.instanceof_(ConstantDescs.CD_Number);
+                    cb.instanceOf(ConstantDescs.CD_Number);
                     cb.ifeq(notNumber);
                     cb.aload(SELECTOR_OBJ);
                     cb.checkcast(ConstantDescs.CD_Number);
@@ -571,7 +571,7 @@ public class SwitchBootstraps {
                     cb.goto_(compare);
                     cb.labelBinding(notNumber);
                     cb.aload(SELECTOR_OBJ);
-                    cb.instanceof_(ConstantDescs.CD_Character);
+                    cb.instanceOf(ConstantDescs.CD_Character);
                     cb.ifeq(next);
                     cb.aload(SELECTOR_OBJ);
                     cb.checkcast(ConstantDescs.CD_Character);
@@ -587,9 +587,9 @@ public class SwitchBootstraps {
                         element.caseLabel() instanceof Double ||
                         element.caseLabel() instanceof Boolean)) {
                     if (element.caseLabel() instanceof Boolean c) {
-                        cb.constantInstruction(c ? 1 : 0);
+                        cb.loadConstant(c ? 1 : 0);
                     } else {
-                        cb.constantInstruction((ConstantDesc) element.caseLabel());
+                        cb.loadConstant((ConstantDesc) element.caseLabel());
                     }
                     cb.invokestatic(element.caseLabel().getClass().describeConstable().orElseThrow(),
                             "valueOf",
@@ -605,11 +605,11 @@ public class SwitchBootstraps {
                     throw new InternalError("Unsupported label type: " +
                             element.caseLabel().getClass());
                 }
-                cb.constantInstruction(idx);
+                cb.loadConstant(idx);
                 cb.ireturn();
             }
             cb.labelBinding(dflt);
-            cb.constantInstruction(cases.size());
+            cb.loadConstant(cases.size());
             cb.ireturn();
         };
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CatchBuilderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CatchBuilderImpl.java
index 0878682ae56..5d262c397f6 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CatchBuilderImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CatchBuilderImpl.java
@@ -62,7 +62,7 @@ public final class CatchBuilderImpl implements CodeBuilder.CatchBuilder {
 
         if (catchBlock == null) {
             if (tryBlock.reachable()) {
-                b.branchInstruction(Opcode.GOTO, tryCatchEnd);
+                b.branch(Opcode.GOTO, tryCatchEnd);
             }
         }
 
@@ -76,7 +76,7 @@ public final class CatchBuilderImpl implements CodeBuilder.CatchBuilder {
         if (catchBlock != null) {
             catchBlock.end();
             if (catchBlock.reachable()) {
-                b.branchInstruction(Opcode.GOTO, tryCatchEnd);
+                b.branch(Opcode.GOTO, tryCatchEnd);
             }
         }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
index 8f35b85b5de..6e80e289064 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
@@ -231,25 +231,25 @@ public record ClassRemapperImpl(Function<ClassDesc, ClassDesc> mapFunction) impl
         return (CodeBuilder cob, CodeElement coe) -> {
             switch (coe) {
                 case FieldInstruction fai ->
-                    cob.fieldInstruction(fai.opcode(), map(fai.owner().asSymbol()),
+                    cob.fieldAccess(fai.opcode(), map(fai.owner().asSymbol()),
                             fai.name().stringValue(), map(fai.typeSymbol()));
                 case InvokeInstruction ii ->
-                    cob.invokeInstruction(ii.opcode(), map(ii.owner().asSymbol()),
+                    cob.invoke(ii.opcode(), map(ii.owner().asSymbol()),
                             ii.name().stringValue(), mapMethodDesc(ii.typeSymbol()),
                             ii.isInterface());
                 case InvokeDynamicInstruction idi ->
-                    cob.invokeDynamicInstruction(DynamicCallSiteDesc.of(
+                    cob.invokedynamic(DynamicCallSiteDesc.of(
                             idi.bootstrapMethod(), idi.name().stringValue(),
                             mapMethodDesc(idi.typeSymbol()),
                             idi.bootstrapArgs().stream().map(this::mapConstantValue).toArray(ConstantDesc[]::new)));
                 case NewObjectInstruction c ->
-                    cob.newObjectInstruction(map(c.className().asSymbol()));
+                    cob.new_(map(c.className().asSymbol()));
                 case NewReferenceArrayInstruction c ->
                     cob.anewarray(map(c.componentType().asSymbol()));
                 case NewMultiArrayInstruction c ->
                     cob.multianewarray(map(c.arrayType().asSymbol()), c.dimensions());
                 case TypeCheckInstruction c ->
-                    cob.typeCheckInstruction(c.opcode(), map(c.type().asSymbol()));
+                    cob.with(TypeCheckInstruction.of(c.opcode(), map(c.type().asSymbol())));
                 case ExceptionCatch c ->
                     cob.exceptionCatch(c.tryStart(), c.tryEnd(), c.handler(),c.catchType()
                             .map(d -> TemporaryConstantPool.INSTANCE.classEntry(map(d.asSymbol()))));
@@ -260,7 +260,7 @@ public record ClassRemapperImpl(Function<ClassDesc, ClassDesc> mapFunction) impl
                     cob.localVariableType(c.slot(), c.name().stringValue(),
                             mapSignature(c.signatureSymbol()), c.startScope(), c.endScope());
                 case LoadConstantInstruction ldc ->
-                    cob.constantInstruction(ldc.opcode(),
+                    cob.loadConstant(ldc.opcode(),
                             mapConstantValue(ldc.constantValue()));
                 case RuntimeVisibleTypeAnnotationsAttribute aa ->
                     cob.with(RuntimeVisibleTypeAnnotationsAttribute.of(
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeLocalsShifterImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeLocalsShifterImpl.java
index 9b301ccc822..a68225fbf27 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeLocalsShifterImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeLocalsShifterImpl.java
@@ -50,15 +50,15 @@ public final class CodeLocalsShifterImpl implements CodeLocalsShifter {
     public void accept(CodeBuilder cob, CodeElement coe) {
         switch (coe) {
             case LoadInstruction li ->
-                cob.loadInstruction(
+                cob.loadLocal(
                         li.typeKind(),
                         shift(cob, li.slot(), li.typeKind()));
             case StoreInstruction si ->
-                cob.storeInstruction(
+                cob.storeLocal(
                         si.typeKind(),
                         shift(cob, si.slot(), si.typeKind()));
             case IncrementInstruction ii ->
-                cob.incrementInstruction(
+                cob.iinc(
                         shift(cob, ii.slot(), TypeKind.IntType),
                         ii.constant());
             case LocalVariable lv ->
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeRelabelerImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeRelabelerImpl.java
index 0e9bacd1cd9..f191cbf3c1f 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeRelabelerImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeRelabelerImpl.java
@@ -51,18 +51,18 @@ public record CodeRelabelerImpl(BiFunction<Label, CodeBuilder, Label> mapFunctio
     public void accept(CodeBuilder cob, CodeElement coe) {
         switch (coe) {
             case BranchInstruction bi ->
-                cob.branchInstruction(
+                cob.branch(
                         bi.opcode(),
                         relabel(bi.target(), cob));
             case LookupSwitchInstruction lsi ->
-                cob.lookupSwitchInstruction(
+                cob.lookupswitch(
                         relabel(lsi.defaultTarget(), cob),
                         lsi.cases().stream().map(c ->
                                 SwitchCase.of(
                                         c.caseValue(),
                                         relabel(c.target(), cob))).toList());
             case TableSwitchInstruction tsi ->
-                cob.tableSwitchInstruction(
+                cob.tableswitch(
                         tsi.lowValue(),
                         tsi.highValue(),
                         relabel(tsi.defaultTarget(), cob),
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/BindingSpecializer.java b/src/java.base/share/classes/jdk/internal/foreign/abi/BindingSpecializer.java
index a399b815ee6..7f5ef54bdca 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/BindingSpecializer.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/BindingSpecializer.java
@@ -274,8 +274,8 @@ public class BindingSpecializer {
                 if (shouldAcquire(i)) {
                     int scopeLocal = cb.allocateLocal(ReferenceType);
                     initialScopeSlots[numScopes++] = scopeLocal;
-                    cb.constantInstruction(null);
-                    cb.storeInstruction(ReferenceType, scopeLocal); // need to initialize all scope locals here in case an exception occurs
+                    cb.loadConstant(null);
+                    cb.storeLocal(ReferenceType, scopeLocal); // need to initialize all scope locals here in case an exception occurs
                 }
             }
             scopeSlots = Arrays.copyOf(initialScopeSlots, numScopes); // fit to size
@@ -284,7 +284,7 @@ public class BindingSpecializer {
 
         // create a Binding.Context for this call
         if (callingSequence.allocationSize() != 0) {
-            cb.constantInstruction(callingSequence.allocationSize());
+            cb.loadConstant(callingSequence.allocationSize());
             cb.invokestatic(CD_SharedUtils, "newBoundedArena", MTD_NEW_BOUNDED_ARENA);
         } else if (callingSequence.forUpcall() && needsSession()) {
             cb.invokestatic(CD_SharedUtils, "newEmptyArena", MTD_NEW_EMPTY_ARENA);
@@ -292,7 +292,7 @@ public class BindingSpecializer {
             cb.getstatic(CD_SharedUtils, "DUMMY_ARENA", CD_Arena);
         }
         contextIdx = cb.allocateLocal(ReferenceType);
-        cb.storeInstruction(ReferenceType, contextIdx);
+        cb.storeLocal(ReferenceType, contextIdx);
 
         // in case the call needs a return buffer, allocate it here.
         // for upcalls the VM wrapper stub allocates the buffer.
@@ -300,7 +300,7 @@ public class BindingSpecializer {
             emitLoadInternalAllocator();
             emitAllocateCall(callingSequence.returnBufferSize(), 1);
             returnBufferIdx = cb.allocateLocal(ReferenceType);
-            cb.storeInstruction(ReferenceType, returnBufferIdx);
+            cb.storeLocal(ReferenceType, returnBufferIdx);
         }
 
         Label tryStart = cb.newLabel();
@@ -323,7 +323,7 @@ public class BindingSpecializer {
                 // for downcalls, recipes have an input value, which we set up here
                 if (callingSequence.needsReturnBuffer() && i == 0) {
                     assert returnBufferIdx != -1;
-                    cb.loadInstruction(ReferenceType, returnBufferIdx);
+                    cb.loadLocal(ReferenceType, returnBufferIdx);
                     pushType(MemorySegment.class);
                 } else {
                     emitGetInput();
@@ -339,7 +339,7 @@ public class BindingSpecializer {
                     // return buffer ptr is wrapped in a MemorySegment above, but not passed to the leaf handle
                     popType(MemorySegment.class);
                     returnBufferIdx = cb.allocateLocal(ReferenceType);
-                    cb.storeInstruction(ReferenceType, returnBufferIdx);
+                    cb.storeLocal(ReferenceType, returnBufferIdx);
                 } else {
                     // for upcalls the recipe result is an argument to the leaf handle
                     emitSetOutput(typeStack.pop());
@@ -352,14 +352,14 @@ public class BindingSpecializer {
 
         // load the leaf MethodHandle
         if (callingSequence.forDowncall()) {
-            cb.constantInstruction(CLASS_DATA_DESC);
+            cb.loadConstant(CLASS_DATA_DESC);
         } else {
-            cb.loadInstruction(ReferenceType, 0); // load target arg
+            cb.loadLocal(ReferenceType, 0); // load target arg
         }
         cb.checkcast(CD_MethodHandle);
         // load all the leaf args
         for (int i = 0; i < leafArgSlots.length; i++) {
-            cb.loadInstruction(TypeKind.from(leafArgTypes.get(i)), leafArgSlots[i]);
+            cb.loadLocal(TypeKind.from(leafArgTypes.get(i)), leafArgSlots[i]);
         }
         // call leaf MH
         cb.invokevirtual(CD_MethodHandle, "invokeExact", desc(leafType));
@@ -396,7 +396,7 @@ public class BindingSpecializer {
             } else {
                 popType(callerMethodType.returnType());
                 assert typeStack.isEmpty();
-                cb.returnInstruction(TypeKind.from(callerMethodType.returnType()));
+                cb.return_(TypeKind.from(callerMethodType.returnType()));
             }
         } else {
             assert callerMethodType.returnType() == void.class;
@@ -411,13 +411,13 @@ public class BindingSpecializer {
         // finally
         emitCleanup();
         if (callingSequence.forDowncall()) {
-            cb.throwInstruction();
+            cb.athrow();
         } else {
             cb.invokestatic(CD_SharedUtils, "handleUncaughtException", MTD_HANDLE_UNCAUGHT_EXCEPTION);
             if (callerMethodType.returnType() != void.class) {
                 TypeKind returnTypeKind = TypeKind.from(callerMethodType.returnType());
                 emitConstZero(returnTypeKind);
-                cb.returnInstruction(returnTypeKind);
+                cb.return_(returnTypeKind);
             } else {
                 cb.return_();
             }
@@ -477,13 +477,13 @@ public class BindingSpecializer {
     }
 
     private void emitSetOutput(Class<?> storeType) {
-        cb.storeInstruction(TypeKind.from(storeType), leafArgSlots[leafArgTypes.size()]);
+        cb.storeLocal(TypeKind.from(storeType), leafArgSlots[leafArgTypes.size()]);
         leafArgTypes.add(storeType);
     }
 
     private void emitGetInput() {
         Class<?> highLevelType = callerMethodType.parameterType(paramIndex);
-        cb.loadInstruction(TypeKind.from(highLevelType), cb.parameterSlot(paramIndex));
+        cb.loadLocal(TypeKind.from(highLevelType), cb.parameterSlot(paramIndex));
 
         if (shouldAcquire(paramIndex)) {
             cb.dup();
@@ -505,7 +505,7 @@ public class BindingSpecializer {
         boolean hasOtherScopes = curScopeLocalIdx != 0;
         for (int i = 0; i < curScopeLocalIdx; i++) {
             cb.dup(); // dup for comparison
-            cb.loadInstruction(ReferenceType, scopeSlots[i]);
+            cb.loadLocal(ReferenceType, scopeSlots[i]);
             cb.if_acmpeq(skipAcquire);
         }
 
@@ -514,7 +514,7 @@ public class BindingSpecializer {
         int nextScopeLocal = scopeSlots[curScopeLocalIdx++];
         // call acquire first here. So that if it fails, we don't call release
         cb.invokevirtual(CD_MemorySessionImpl, "acquire0", MTD_ACQUIRE0); // call acquire on the other
-        cb.storeInstruction(ReferenceType, nextScopeLocal); // store off one to release later
+        cb.storeLocal(ReferenceType, nextScopeLocal); // store off one to release later
 
         if (hasOtherScopes) { // avoid ASM generating a bunch of nops for the dead code
             cb.goto_(end);
@@ -528,9 +528,9 @@ public class BindingSpecializer {
 
     private void emitReleaseScopes() {
         for (int scopeLocal : scopeSlots) {
-            cb.loadInstruction(ReferenceType, scopeLocal);
+            cb.loadLocal(ReferenceType, scopeLocal);
             cb.ifThen(Opcode.IFNONNULL, ifCb -> {
-                ifCb.loadInstruction(ReferenceType, scopeLocal);
+                ifCb.loadLocal(ReferenceType, scopeLocal);
                 ifCb.invokevirtual(CD_MemorySessionImpl, "release0", MTD_RELEASE0);
             });
         }
@@ -539,18 +539,18 @@ public class BindingSpecializer {
     private void emitSaveReturnValue(Class<?> storeType) {
         TypeKind typeKind = TypeKind.from(storeType);
         retValIdx = cb.allocateLocal(typeKind);
-        cb.storeInstruction(typeKind, retValIdx);
+        cb.storeLocal(typeKind, retValIdx);
     }
 
     private void emitRestoreReturnValue(Class<?> loadType) {
         assert retValIdx != -1;
-        cb.loadInstruction(TypeKind.from(loadType), retValIdx);
+        cb.loadLocal(TypeKind.from(loadType), retValIdx);
         pushType(loadType);
     }
 
     private void emitLoadInternalSession() {
         assert contextIdx != -1;
-        cb.loadInstruction(ReferenceType, contextIdx);
+        cb.loadLocal(ReferenceType, contextIdx);
         cb.checkcast(CD_Arena);
         cb.invokeinterface(CD_Arena, "scope", MTD_SCOPE);
         cb.checkcast(CD_MemorySessionImpl);
@@ -558,20 +558,20 @@ public class BindingSpecializer {
 
     private void emitLoadInternalAllocator() {
         assert contextIdx != -1;
-        cb.loadInstruction(ReferenceType, contextIdx);
+        cb.loadLocal(ReferenceType, contextIdx);
     }
 
     private void emitCloseContext() {
         assert contextIdx != -1;
-        cb.loadInstruction(ReferenceType, contextIdx);
+        cb.loadLocal(ReferenceType, contextIdx);
         cb.checkcast(CD_Arena);
         cb.invokeinterface(CD_Arena, "close", MTD_CLOSE);
     }
 
     private void emitBoxAddress(BoxAddress boxAddress) {
         popType(long.class);
-        cb.constantInstruction(boxAddress.size());
-        cb.constantInstruction(boxAddress.align());
+        cb.loadConstant(boxAddress.size());
+        cb.loadConstant(boxAddress.align());
         if (needsSession()) {
             emitLoadInternalSession();
             cb.invokestatic(CD_Utils, "longToAddress", MTD_LONG_TO_ADDRESS_SCOPE);
@@ -584,7 +584,7 @@ public class BindingSpecializer {
     private void emitAllocBuffer(Allocate binding) {
         if (callingSequence.forDowncall()) {
             assert returnAllocatorIdx != -1;
-            cb.loadInstruction(ReferenceType, returnAllocatorIdx);
+            cb.loadLocal(ReferenceType, returnAllocatorIdx);
         } else {
             emitLoadInternalAllocator();
         }
@@ -603,11 +603,11 @@ public class BindingSpecializer {
 
         if (SharedUtils.isPowerOfTwo(byteWidth)) {
             int valueIdx = cb.allocateLocal(storeTypeKind);
-            cb.storeInstruction(storeTypeKind, valueIdx);
+            cb.storeLocal(storeTypeKind, valueIdx);
 
             ClassDesc valueLayoutType = emitLoadLayoutConstant(storeType);
-            cb.constantInstruction(offset);
-            cb.loadInstruction(storeTypeKind, valueIdx);
+            cb.loadConstant(offset);
+            cb.loadLocal(storeTypeKind, valueIdx);
             MethodTypeDesc descriptor = MethodTypeDesc.of(CD_void, valueLayoutType, CD_long, desc(storeType));
             cb.invokeinterface(CD_MemorySegment, "set", descriptor);
         } else {
@@ -618,9 +618,9 @@ public class BindingSpecializer {
                 assert storeType == long.class; // chunking only for int and long
             }
             int longValueIdx = cb.allocateLocal(LongType);
-            cb.storeInstruction(LongType, longValueIdx);
+            cb.storeLocal(LongType, longValueIdx);
             int writeAddrIdx = cb.allocateLocal(ReferenceType);
-            cb.storeInstruction(ReferenceType, writeAddrIdx);
+            cb.storeLocal(ReferenceType, writeAddrIdx);
 
             int remaining = byteWidth;
             int chunkOffset = 0;
@@ -647,25 +647,25 @@ public class BindingSpecializer {
                 //int writeChunk = (int) (((0xFFFF_FFFFL << shiftAmount) & longValue) >>> shiftAmount);
                 int shiftAmount = chunkOffset * Byte.SIZE;
                 mask = mask << shiftAmount;
-                cb.loadInstruction(LongType, longValueIdx);
-                cb.constantInstruction(mask);
+                cb.loadLocal(LongType, longValueIdx);
+                cb.loadConstant(mask);
                 cb.land();
                 if (shiftAmount != 0) {
-                    cb.constantInstruction(shiftAmount);
+                    cb.loadConstant(shiftAmount);
                     cb.lushr();
                 }
                 cb.l2i();
                 TypeKind chunkStoreTypeKind = TypeKind.from(chunkStoreType);
                 int chunkIdx = cb.allocateLocal(chunkStoreTypeKind);
-                cb.storeInstruction(chunkStoreTypeKind, chunkIdx);
+                cb.storeLocal(chunkStoreTypeKind, chunkIdx);
                 // chunk done, now write it
 
                 //writeAddress.set(JAVA_SHORT_UNALIGNED, offset, writeChunk);
-                cb.loadInstruction(ReferenceType, writeAddrIdx);
+                cb.loadLocal(ReferenceType, writeAddrIdx);
                 ClassDesc valueLayoutType = emitLoadLayoutConstant(chunkStoreType);
                 long writeOffset = offset + SharedUtils.pickChunkOffset(chunkOffset, byteWidth, chunkSize);
-                cb.constantInstruction(writeOffset);
-                cb.loadInstruction(chunkStoreTypeKind, chunkIdx);
+                cb.loadConstant(writeOffset);
+                cb.loadLocal(chunkStoreTypeKind, chunkIdx);
                 MethodTypeDesc descriptor = MethodTypeDesc.of(CD_void, valueLayoutType, CD_long, desc(chunkStoreType));
                 cb.invokeinterface(CD_MemorySegment, "set", descriptor);
 
@@ -690,13 +690,13 @@ public class BindingSpecializer {
                 emitSaveReturnValue(storeType);
             } else {
                 int valueIdx = cb.allocateLocal(storeTypeKind);
-                cb.storeInstruction(storeTypeKind, valueIdx); // store away the stored value, need it later
+                cb.storeLocal(storeTypeKind, valueIdx); // store away the stored value, need it later
 
                 assert returnBufferIdx != -1;
-                cb.loadInstruction(ReferenceType, returnBufferIdx);
+                cb.loadLocal(ReferenceType, returnBufferIdx);
                 ClassDesc valueLayoutType = emitLoadLayoutConstant(storeType);
-                cb.constantInstruction(retBufOffset);
-                cb.loadInstruction(storeTypeKind, valueIdx);
+                cb.loadConstant(retBufOffset);
+                cb.loadLocal(storeTypeKind, valueIdx);
                 MethodTypeDesc descriptor = MethodTypeDesc.of(CD_void, valueLayoutType, CD_long, desc(storeType));
                 cb.invokeinterface(CD_MemorySegment, "set", descriptor);
                 retBufOffset += abi.arch.typeSize(vmStore.storage().type());
@@ -713,9 +713,9 @@ public class BindingSpecializer {
                 emitRestoreReturnValue(loadType);
             } else {
                 assert returnBufferIdx != -1;
-                cb.loadInstruction(ReferenceType, returnBufferIdx);
+                cb.loadLocal(ReferenceType, returnBufferIdx);
                 ClassDesc valueLayoutType = emitLoadLayoutConstant(loadType);
-                cb.constantInstruction(retBufOffset);
+                cb.loadConstant(retBufOffset);
                 MethodTypeDesc descriptor = MethodTypeDesc.of(desc(loadType), valueLayoutType, CD_long);
                 cb.invokeinterface(CD_MemorySegment, "get", descriptor);
                 retBufOffset += abi.arch.typeSize(vmLoad.storage().type());
@@ -735,14 +735,14 @@ public class BindingSpecializer {
 
     private void emitShiftLeft(ShiftLeft shiftLeft) {
         popType(long.class);
-        cb.constantInstruction(shiftLeft.shiftAmount() * Byte.SIZE);
+        cb.loadConstant(shiftLeft.shiftAmount() * Byte.SIZE);
         cb.lshl();
         pushType(long.class);
     }
 
     private void emitShiftRight(ShiftRight shiftRight) {
         popType(long.class);
-        cb.constantInstruction(shiftRight.shiftAmount() * Byte.SIZE);
+        cb.loadConstant(shiftRight.shiftAmount() * Byte.SIZE);
         cb.lushr();
         pushType(long.class);
     }
@@ -757,7 +757,7 @@ public class BindingSpecializer {
                 // implement least significant byte non-zero test
 
                 // select first byte
-                cb.constantInstruction(0xFF);
+                cb.loadConstant(0xFF);
                 cb.iand();
 
                 // convert to boolean
@@ -808,17 +808,17 @@ public class BindingSpecializer {
 
         if (SharedUtils.isPowerOfTwo(byteWidth)) {
             ClassDesc valueLayoutType = emitLoadLayoutConstant(loadType);
-            cb.constantInstruction(offset);
+            cb.loadConstant(offset);
             MethodTypeDesc descriptor = MethodTypeDesc.of(desc(loadType), valueLayoutType, CD_long);
             cb.invokeinterface(CD_MemorySegment, "get", descriptor);
         } else {
             // chunked
             int readAddrIdx = cb.allocateLocal(ReferenceType);
-            cb.storeInstruction(ReferenceType, readAddrIdx);
+            cb.storeLocal(ReferenceType, readAddrIdx);
 
-            cb.constantInstruction(0L); // result
+            cb.loadConstant(0L); // result
             int resultIdx = cb.allocateLocal(LongType);
-            cb.storeInstruction(LongType, resultIdx);
+            cb.storeLocal(LongType, resultIdx);
 
             int remaining = byteWidth;
             int chunkOffset = 0;
@@ -847,30 +847,30 @@ public class BindingSpecializer {
                         throw new IllegalStateException("Unexpected chunk size for chunked write: " + chunkSize);
                 }
                 // read from segment
-                cb.loadInstruction(ReferenceType, readAddrIdx);
+                cb.loadLocal(ReferenceType, readAddrIdx);
                 ClassDesc valueLayoutType = emitLoadLayoutConstant(chunkType);
                 MethodTypeDesc descriptor = MethodTypeDesc.of(desc(chunkType), valueLayoutType, CD_long);
                 long readOffset = offset + SharedUtils.pickChunkOffset(chunkOffset, byteWidth, chunkSize);
-                cb.constantInstruction(readOffset);
+                cb.loadConstant(readOffset);
                 cb.invokeinterface(CD_MemorySegment, "get", descriptor);
                 cb.invokestatic(toULongHolder, "toUnsignedLong", toULongDescriptor);
 
                 // shift to right offset
                 int shiftAmount = chunkOffset * Byte.SIZE;
                 if (shiftAmount != 0) {
-                    cb.constantInstruction(shiftAmount);
+                    cb.loadConstant(shiftAmount);
                     cb.lshl();
                 }
                 // add to result
-                cb.loadInstruction(LongType, resultIdx);
+                cb.loadLocal(LongType, resultIdx);
                 cb.lor();
-                cb.storeInstruction(LongType, resultIdx);
+                cb.storeLocal(LongType, resultIdx);
 
                 remaining -= chunkSize;
                 chunkOffset += chunkSize;
             } while (remaining != 0);
 
-            cb.loadInstruction(LongType, resultIdx);
+            cb.loadLocal(LongType, resultIdx);
             if (loadType == int.class) {
                 cb.l2i();
             } else {
@@ -890,25 +890,25 @@ public class BindingSpecializer {
         // operand/srcSegment is on the stack
         // generating a call to:
         //   MemorySegment::copy(MemorySegment srcSegment, long srcOffset, MemorySegment dstSegment, long dstOffset, long bytes)
-        cb.constantInstruction(0L);
+        cb.loadConstant(0L);
         // create the dstSegment by allocating it. Similar to:
         //   context.allocator().allocate(size, alignment)
         emitLoadInternalAllocator();
         emitAllocateCall(size, alignment);
         cb.dup();
         int storeIdx = cb.allocateLocal(ReferenceType);
-        cb.storeInstruction(ReferenceType, storeIdx);
-        cb.constantInstruction(0L);
-        cb.constantInstruction(size);
+        cb.storeLocal(ReferenceType, storeIdx);
+        cb.loadConstant(0L);
+        cb.loadConstant(size);
         cb.invokestatic(CD_MemorySegment, "copy", MTD_COPY, true);
 
-        cb.loadInstruction(ReferenceType, storeIdx);
+        cb.loadLocal(ReferenceType, storeIdx);
         pushType(MemorySegment.class);
     }
 
     private void emitAllocateCall(long size, long alignment) {
-        cb.constantInstruction(size);
-        cb.constantInstruction(alignment);
+        cb.loadConstant(size);
+        cb.loadConstant(alignment);
         cb.invokeinterface(CD_SegmentAllocator, "allocate", MTD_ALLOCATE);
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
index 9e99c90788c..cf7e162a42e 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
@@ -470,7 +470,7 @@ final class EventInstrumentation {
                     // stack:[ex] [EW]
                     catchAllHandler.pop();
                     // stack:[ex]
-                    catchAllHandler.throwInstruction();
+                    catchAllHandler.athrow();
                 });
             });
             codeBuilder.labelBinding(excluded);
@@ -562,7 +562,7 @@ final class EventInstrumentation {
         // write begin event
         getEventConfiguration(blockCodeBuilder);
         // stack: [EW], [EW], [EventConfiguration]
-        blockCodeBuilder.constantInstruction(Opcode.LDC2_W, eventTypeId);
+        blockCodeBuilder.loadConstant(Opcode.LDC2_W, eventTypeId);
         // stack: [EW], [EW], [EventConfiguration] [long]
         invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.BEGIN_EVENT.method());
         // stack: [EW], [integer]
@@ -572,7 +572,7 @@ final class EventInstrumentation {
         blockCodeBuilder.dup();
         // stack: [EW], [EW]
         tk = TypeKind.from(argumentTypes[argIndex++]);
-        blockCodeBuilder.loadInstruction(tk, slotIndex);
+        blockCodeBuilder.loadLocal(tk, slotIndex);
         // stack: [EW], [EW], [long]
         slotIndex += tk.slotSize();
         invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.PUT_LONG.method());
@@ -583,7 +583,7 @@ final class EventInstrumentation {
             blockCodeBuilder.dup();
             // stack: [EW], [EW]
             tk = TypeKind.from(argumentTypes[argIndex++]);
-            blockCodeBuilder.loadInstruction(tk, slotIndex);
+            blockCodeBuilder.loadLocal(tk, slotIndex);
             // stack: [EW], [EW], [long]
             slotIndex += tk.slotSize();
             invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.PUT_LONG.method());
@@ -609,7 +609,7 @@ final class EventInstrumentation {
             blockCodeBuilder.dup();
             // stack: [EW], [EW]
             tk = TypeKind.from(argumentTypes[argIndex++]);
-            blockCodeBuilder.loadInstruction(tk, slotIndex);
+            blockCodeBuilder.loadLocal(tk, slotIndex);
             // stack:[EW], [EW], [field]
             slotIndex += tk.slotSize();
             FieldDesc field = fieldDescs.get(fieldIndex);
@@ -676,7 +676,7 @@ final class EventInstrumentation {
         // stack: [EW] [EW]
         getEventConfiguration(blockCodeBuilder);
         // stack: [EW] [EW] [EC]
-        blockCodeBuilder.constantInstruction(Opcode.LDC2_W, eventTypeId);
+        blockCodeBuilder.loadConstant(Opcode.LDC2_W, eventTypeId);
         invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.BEGIN_EVENT.method());
         // stack: [EW] [int]
         blockCodeBuilder.ifeq(excluded);
@@ -738,7 +738,7 @@ final class EventInstrumentation {
             Label nullLabel = codeBuilder.newLabel();
             if (guardEventConfiguration) {
                 getEventConfiguration(codeBuilder);
-                codeBuilder.branchInstruction(Opcode.IFNULL, nullLabel);
+                codeBuilder.if_null(nullLabel);
             }
             getEventConfiguration(codeBuilder);
             invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_IS_ENABLED);
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
index 40693b33d6d..96b7c76f24d 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
@@ -668,7 +668,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                     "hasSplitPackages",
                     MTD_boolean,
                     ACC_PUBLIC,
-                    cob -> cob.constantInstruction(hasSplitPackages ? 1 : 0)
+                    cob -> cob.loadConstant(hasSplitPackages ? 1 : 0)
                               .ireturn());
         }
 
@@ -686,7 +686,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                     "hasIncubatorModules",
                     MTD_boolean,
                     ACC_PUBLIC,
-                    cob -> cob.constantInstruction(hasIncubatorModules ? 1 : 0)
+                    cob -> cob.loadConstant(hasIncubatorModules ? 1 : 0)
                               .ireturn());
         }
 
@@ -700,7 +700,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                         MTD_ModuleDescriptorArray,
                         ACC_PUBLIC,
                         cob -> {
-                            cob.constantInstruction(moduleInfos.size())
+                            cob.loadConstant(moduleInfos.size())
                                .anewarray(CD_MODULE_DESCRIPTOR)
                                .astore(MD_VAR);
 
@@ -764,13 +764,13 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                     MTD_ModuleDescriptorArray,
                     ACC_PUBLIC,
                     cob -> {
-                        cob.constantInstruction(moduleInfos.size())
+                        cob.loadConstant(moduleInfos.size())
                            .anewarray(CD_MODULE_DESCRIPTOR)
                            .dup()
                            .astore(MD_VAR);
                         cob.new_(arrayListClassDesc)
                            .dup()
-                           .constantInstruction(moduleInfos.size())
+                           .loadConstant(moduleInfos.size())
                            .invokespecial(arrayListClassDesc, INIT_NAME, MethodTypeDesc.of(CD_void, CD_int))
                            .astore(DEDUP_LIST_VAR);
                         cob.aload(0)
@@ -797,7 +797,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                             if (curDedupVar > dedupVarStart) {
                                 for (int i = dedupVarStart; i < curDedupVar; i++) {
                                     cob.aload(DEDUP_LIST_VAR)
-                                       .constantInstruction(i - dedupVarStart)
+                                       .loadConstant(i - dedupVarStart)
                                        .invokevirtual(arrayListClassDesc, "get", MethodTypeDesc.of(CD_Object, CD_int))
                                        .astore(i);
                                 }
@@ -845,7 +845,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                     MTD_ModuleTargetArray,
                     ACC_PUBLIC,
                     cob -> {
-                        cob.constantInstruction(moduleInfos.size())
+                        cob.loadConstant(moduleInfos.size())
                            .anewarray(CD_MODULE_TARGET)
                            .astore(MT_VAR);
 
@@ -868,12 +868,12 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                             ModuleInfo minfo = moduleInfos.get(index);
                             if (minfo.target() != null) {
                                 cob.aload(MT_VAR)
-                                   .constantInstruction(index);
+                                   .loadConstant(index);
 
                                 // new ModuleTarget(String)
                                 cob.new_(CD_MODULE_TARGET)
                                    .dup()
-                                   .constantInstruction(minfo.target().targetPlatform())
+                                   .loadConstant(minfo.target().targetPlatform())
                                    .invokespecial(CD_MODULE_TARGET,
                                                   INIT_NAME,
                                                   MTD_void_String);
@@ -896,7 +896,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                     MTD_ModuleHashesArray,
                     ACC_PUBLIC,
                     cob -> {
-                        cob.constantInstruction(moduleInfos.size())
+                        cob.loadConstant(moduleInfos.size())
                            .anewarray(CD_MODULE_HASHES)
                            .astore(MH_VAR);
 
@@ -923,7 +923,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                     MTD_ModuleResolutionArray,
                     ACC_PUBLIC,
                     cob -> {
-                        cob.constantInstruction(moduleInfos.size())
+                        cob.loadConstant(moduleInfos.size())
                            .anewarray(CD_MODULE_RESOLUTION)
                            .astore(0);
 
@@ -931,10 +931,10 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                             ModuleInfo minfo = moduleInfos.get(index);
                             if (minfo.moduleResolution() != null) {
                                 cob.aload(0)
-                                   .constantInstruction(index)
+                                   .loadConstant(index)
                                    .new_(CD_MODULE_RESOLUTION)
                                    .dup()
-                                   .constantInstruction(minfo.moduleResolution().value())
+                                   .loadConstant(minfo.moduleResolution().value())
                                    .invokespecial(CD_MODULE_RESOLUTION,
                                                   INIT_NAME,
                                                   MTD_void_int)
@@ -1000,7 +1000,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                         }
 
                         // new Map$Entry[size]
-                        cob.constantInstruction(map.size())
+                        cob.loadConstant(map.size())
                            .anewarray(CD_Map_Entry);
 
                         int index = 0;
@@ -1009,8 +1009,8 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                             Set<String> s = e.getValue();
 
                             cob.dup()
-                               .constantInstruction(index)
-                               .constantInstruction(name);
+                               .loadConstant(index)
+                               .loadConstant(name);
 
                             // if de-duplicated then load the local, otherwise generate code
                             Integer varIndex = locals.get(s);
@@ -1046,13 +1046,13 @@ public final class SystemModulesPlugin extends AbstractPlugin {
             // use Set.of(Object[]) when there are more than 2 elements
             // use Set.of(Object) or Set.of(Object, Object) when fewer
             if (size > 2) {
-                cob.constantInstruction(size)
+                cob.loadConstant(size)
                    .anewarray(CD_String);
                 int i = 0;
                 for (String element : sorted(set)) {
                     cob.dup()
-                       .constantInstruction(i)
-                       .constantInstruction(element)
+                       .loadConstant(i)
+                       .loadConstant(element)
                        .aastore();
                     i++;
                 }
@@ -1062,7 +1062,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                                  true);
             } else {
                 for (String element : sorted(set)) {
-                    cob.constantInstruction(element);
+                    cob.loadConstant(element);
                 }
                 var mtdArgs = new ClassDesc[size];
                 Arrays.fill(mtdArgs, CD_Object);
@@ -1166,7 +1166,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
             void newBuilder() {
                 cob.new_(CD_MODULE_BUILDER)
                    .dup()
-                   .constantInstruction(md.name())
+                   .loadConstant(md.name())
                    .invokespecial(CD_MODULE_BUILDER,
                                   INIT_NAME,
                                   MTD_void_String)
@@ -1188,7 +1188,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              */
             void setModuleBit(String methodName, boolean value) {
                 cob.aload(BUILDER_VAR)
-                   .constantInstruction(value ? 1 : 0)
+                   .loadConstant(value ? 1 : 0)
                    .invokevirtual(CD_MODULE_BUILDER,
                                   methodName,
                                   MTD_BOOLEAN)
@@ -1200,9 +1200,9 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              */
             void putModuleDescriptor() {
                 cob.aload(MD_VAR)
-                   .constantInstruction(index)
+                   .loadConstant(index)
                    .aload(BUILDER_VAR)
-                   .constantInstruction(md.hashCode())
+                   .loadConstant(md.hashCode())
                    .invokevirtual(CD_MODULE_BUILDER,
                                   "build",
                                   MTD_ModuleDescriptor_int)
@@ -1217,7 +1217,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              */
             void requires(Set<Requires> requires) {
                 cob.aload(BUILDER_VAR)
-                   .constantInstruction(requires.size())
+                   .loadConstant(requires.size())
                    .anewarray(CD_REQUIRES);
                 int arrayIndex = 0;
                 for (Requires require : sorted(requires)) {
@@ -1227,7 +1227,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                     }
 
                     cob.dup()               // arrayref
-                       .constantInstruction(arrayIndex++);
+                       .loadConstant(arrayIndex++);
                     newRequires(require.modifiers(), require.name(), compiledVersion);
                     cob.aastore();
                 }
@@ -1246,9 +1246,9 @@ public final class SystemModulesPlugin extends AbstractPlugin {
             void newRequires(Set<Requires.Modifier> mods, String name, String compiledVersion) {
                 int varIndex = dedupSetBuilder.indexOfRequiresModifiers(cob, mods);
                 cob.aload(varIndex)
-                   .constantInstruction(name);
+                   .loadConstant(name);
                 if (compiledVersion != null) {
-                    cob.constantInstruction(compiledVersion)
+                    cob.loadConstant(compiledVersion)
                        .invokestatic(CD_MODULE_BUILDER,
                                      "newRequires",
                                      MTD_REQUIRES_SET_STRING_STRING);
@@ -1267,12 +1267,12 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              */
             void exports(Set<Exports> exports) {
                 cob.aload(BUILDER_VAR)
-                   .constantInstruction(exports.size())
+                   .loadConstant(exports.size())
                    .anewarray(CD_EXPORTS);
                 int arrayIndex = 0;
                 for (Exports export : sorted(exports)) {
                     cob.dup()    // arrayref
-                       .constantInstruction(arrayIndex++);
+                       .loadConstant(arrayIndex++);
                     newExports(export.modifiers(), export.source(), export.targets());
                     cob.aastore();
                 }
@@ -1302,14 +1302,14 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                 if (!targets.isEmpty()) {
                     int stringSetIndex = dedupSetBuilder.indexOfStringSet(cob, targets);
                     cob.aload(modifiersSetIndex)
-                       .constantInstruction(pn)
+                       .loadConstant(pn)
                        .aload(stringSetIndex)
                        .invokestatic(CD_MODULE_BUILDER,
                                      "newExports",
                                      MTD_EXPORTS_MODIFIER_SET_STRING_SET);
                 } else {
                     cob.aload(modifiersSetIndex)
-                       .constantInstruction(pn)
+                       .loadConstant(pn)
                        .invokestatic(CD_MODULE_BUILDER,
                                      "newExports",
                                      MTD_EXPORTS_MODIFIER_SET_STRING);
@@ -1324,12 +1324,12 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              */
             void opens(Set<Opens> opens) {
                 cob.aload(BUILDER_VAR)
-                   .constantInstruction(opens.size())
+                   .loadConstant(opens.size())
                    .anewarray(CD_OPENS);
                 int arrayIndex = 0;
                 for (Opens open : sorted(opens)) {
                     cob.dup()    // arrayref
-                       .constantInstruction(arrayIndex++);
+                       .loadConstant(arrayIndex++);
                     newOpens(open.modifiers(), open.source(), open.targets());
                     cob.aastore();
                 }
@@ -1359,14 +1359,14 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                 if (!targets.isEmpty()) {
                     int stringSetIndex = dedupSetBuilder.indexOfStringSet(cob, targets);
                     cob.aload(modifiersSetIndex)
-                       .constantInstruction(pn)
+                       .loadConstant(pn)
                        .aload(stringSetIndex)
                        .invokestatic(CD_MODULE_BUILDER,
                                      "newOpens",
                                      MTD_OPENS_MODIFIER_SET_STRING_SET);
                 } else {
                     cob.aload(modifiersSetIndex)
-                       .constantInstruction(pn)
+                       .loadConstant(pn)
                        .invokestatic(CD_MODULE_BUILDER,
                                      "newOpens",
                                      MTD_OPENS_MODIFIER_SET_STRING);
@@ -1394,12 +1394,12 @@ public final class SystemModulesPlugin extends AbstractPlugin {
             */
             void provides(Collection<Provides> provides) {
                 cob.aload(BUILDER_VAR)
-                   .constantInstruction(provides.size())
+                   .loadConstant(provides.size())
                    .anewarray(CD_PROVIDES);
                 int arrayIndex = 0;
                 for (Provides provide : sorted(provides)) {
                     cob.dup()    // arrayref
-                       .constantInstruction(arrayIndex++);
+                       .loadConstant(arrayIndex++);
                     newProvides(provide.service(), provide.providers());
                     cob.aastore();
                 }
@@ -1419,14 +1419,14 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              * Builder.newProvides(service, providers);
              */
             void newProvides(String service, List<String> providers) {
-                cob.constantInstruction(service)
-                   .constantInstruction(providers.size())
+                cob.loadConstant(service)
+                   .loadConstant(providers.size())
                    .anewarray(CD_String);
                 int arrayIndex = 0;
                 for (String provider : providers) {
                     cob.dup()    // arrayref
-                       .constantInstruction(arrayIndex++)
-                       .constantInstruction(provider)
+                       .loadConstant(arrayIndex++)
+                       .loadConstant(provider)
                        .aastore();
                 }
                 cob.invokestatic(CD_List,
@@ -1456,7 +1456,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              */
             void mainClass(String cn) {
                 cob.aload(BUILDER_VAR)
-                   .constantInstruction(cn)
+                   .loadConstant(cn)
                    .invokevirtual(CD_MODULE_BUILDER,
                                   "mainClass",
                                   MTD_STRING)
@@ -1468,7 +1468,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              */
             void version(Version v) {
                 cob.aload(BUILDER_VAR)
-                   .constantInstruction(v.toString())
+                   .loadConstant(v.toString())
                    .invokevirtual(CD_MODULE_BUILDER,
                                   "version",
                                   MTD_STRING)
@@ -1477,7 +1477,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
 
             void invokeBuilderMethod(String methodName, String value) {
                 cob.aload(BUILDER_VAR)
-                   .constantInstruction(value)
+                   .loadConstant(value)
                    .invokevirtual(CD_MODULE_BUILDER,
                                   methodName,
                                   MTD_STRING)
@@ -1531,8 +1531,8 @@ public final class SystemModulesPlugin extends AbstractPlugin {
             void newModuleHashesBuilder() {
                 cob.new_(MODULE_HASHES_BUILDER)
                    .dup()
-                   .constantInstruction(recordedHashes.algorithm())
-                   .constantInstruction(((4 * recordedHashes.names().size()) / 3) + 1)
+                   .loadConstant(recordedHashes.algorithm())
+                   .loadConstant(((4 * recordedHashes.names().size()) / 3) + 1)
                    .invokespecial(MODULE_HASHES_BUILDER,
                                   INIT_NAME,
                                   MTD_void_String_int)
@@ -1547,7 +1547,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              */
             void pushModuleHashes() {
                 cob.aload(MH_VAR)
-                   .constantInstruction(index)
+                   .loadConstant(index)
                    .aload(BUILDER_VAR)
                    .invokevirtual(MODULE_HASHES_BUILDER,
                                   "build",
@@ -1560,13 +1560,13 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              */
             void hashForModule(String name, byte[] hash) {
                 cob.aload(BUILDER_VAR)
-                   .constantInstruction(name)
-                   .constantInstruction(hash.length)
+                   .loadConstant(name)
+                   .loadConstant(hash.length)
                    .newarray(TypeKind.ByteType);
                 for (int i = 0; i < hash.length; i++) {
                     cob.dup()              // arrayref
-                       .constantInstruction(i)
-                       .constantInstruction((int)hash[i])
+                       .loadConstant(i)
+                       .loadConstant((int)hash[i])
                        .bastore();
                 }
 
@@ -1729,7 +1729,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
              * to the element onto the stack.
              */
             void visitElement(T element, CodeBuilder cob) {
-                cob.constantInstruction((ConstantDesc)element);
+                cob.loadConstant((ConstantDesc)element);
             }
 
             /*
@@ -1772,12 +1772,12 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                                      true);
                 } else {
                     // call Set.of(E... elements)
-                    cob.constantInstruction(elements.size())
+                    cob.loadConstant(elements.size())
                        .anewarray(CD_String);
                     int arrayIndex = 0;
                     for (T t : sorted(elements)) {
                         cob.dup()    // arrayref
-                           .constantInstruction(arrayIndex);
+                           .loadConstant(arrayIndex);
                         visitElement(t, cob);  // value
                         cob.aastore();
                         arrayIndex++;
@@ -1876,14 +1876,14 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                                   MTD_StringArray,
                                   ACC_STATIC,
                                   cob -> {
-                                      cob.constantInstruction(map.size());
+                                      cob.loadConstant(map.size());
                                       cob.anewarray(CD_String);
 
                                       int index = 0;
                                       for (Map.Entry<String,String> entry : systemModulesMap) {
                                           cob.dup() // arrayref
-                                             .constantInstruction(index)
-                                             .constantInstruction(entry.getKey())
+                                             .loadConstant(index)
+                                             .loadConstant(entry.getKey())
                                              .aastore();
                                           index++;
                                       }
@@ -1897,14 +1897,14 @@ public final class SystemModulesPlugin extends AbstractPlugin {
                                   MTD_StringArray,
                                   ACC_STATIC,
                                   cob -> {
-                                      cob.constantInstruction(map.size())
+                                      cob.loadConstant(map.size())
                                          .anewarray(CD_String);
 
                                       int index = 0;
                                       for (Map.Entry<String,String> entry : systemModulesMap) {
                                           cob.dup() // arrayref
-                                             .constantInstruction(index)
-                                             .constantInstruction(entry.getValue().replace('/', '.'))
+                                             .loadConstant(index)
+                                             .loadConstant(entry.getValue().replace('/', '.'))
                                              .aastore();
                                           index++;
                                       }
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java
index 42b6357866f..973fa4d1268 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java
@@ -143,7 +143,7 @@ abstract class VersionPropsPlugin extends AbstractPlugin {
                                         // forget about it
                                         pendingLDC = null;
                                         // and add an ldc for the new value
-                                        cob.constantInstruction(value);
+                                        cob.loadConstant(value);
                                         redefined = true;
                                     } else {
                                         flushPendingLDC(cob);
diff --git a/test/jdk/java/io/Serializable/records/ProhibitedMethods.java b/test/jdk/java/io/Serializable/records/ProhibitedMethods.java
index 371500497f9..53252aaf558 100644
--- a/test/jdk/java/io/Serializable/records/ProhibitedMethods.java
+++ b/test/jdk/java/io/Serializable/records/ProhibitedMethods.java
@@ -245,7 +245,7 @@ public class ProhibitedMethods {
         var cf = ClassFile.of();
         return cf.transform(cf.parse(classBytes), ClassTransform.endHandler(clb -> {
             clb.withMethodBody(name, desc, ACC_PRIVATE, cob -> {
-                cob.constantInstruction(name + " should not be invoked");
+                cob.loadConstant(name + " should not be invoked");
                 cob.invokestatic(Assert.class.describeConstable().orElseThrow(), "fail",
                         MethodTypeDesc.of(CD_void, CD_String));
                 cob.return_();
diff --git a/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java b/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java
index 31397ad60cb..4ff15aa84d4 100644
--- a/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java
+++ b/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java
@@ -270,13 +270,13 @@ public class SerialPersistentFieldsTest {
                     cob.bipush(i);
                     cob.new_(CD_ObjectStreamField);
                     cob.dup();
-                    cob.constantInstruction(osf.getName());
+                    cob.loadConstant(osf.getName());
                     if (osf.isPrimitive()) {
-                        cob.constantInstruction(DynamicConstantDesc.ofNamed(
+                        cob.loadConstant(DynamicConstantDesc.ofNamed(
                                 ConstantDescs.BSM_PRIMITIVE_CLASS, String.valueOf(osf.getTypeCode()), CD_Class));
                     } else {
                         // Currently Classfile API cannot encode primitive classdescs as condy
-                        cob.constantInstruction(osf.getType().describeConstable().orElseThrow());
+                        cob.loadConstant(osf.getType().describeConstable().orElseThrow());
                     }
                     cob.invokespecial(CD_ObjectStreamField, INIT_NAME, MethodTypeDesc.of(CD_void, CD_String, CD_Class));
                     cob.aastore();
diff --git a/test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java b/test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java
index e8b5bbe7dd9..daf36c2c0b5 100644
--- a/test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java
+++ b/test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java
@@ -83,8 +83,8 @@ class NativeMethodPrefixAgent {
                     byte[] newcf = Instrumentor.instrFor(classfileBuffer)
                                    .addNativeMethodTrackingInjection(
                                         "wrapped_" + trname + "_", (name, h) -> {
-                                            h.constantInstruction(name);
-                                            h.constantInstruction(transformId);
+                                            h.loadConstant(name);
+                                            h.loadConstant(transformId);
                                             h.invokestatic(
                                                     CD_StringIdCallbackReporter,
                                                     "tracker",
diff --git a/test/jdk/java/lang/instrument/RetransformAgent.java b/test/jdk/java/lang/instrument/RetransformAgent.java
index f5eadabad16..89300a43a7d 100644
--- a/test/jdk/java/lang/instrument/RetransformAgent.java
+++ b/test/jdk/java/lang/instrument/RetransformAgent.java
@@ -91,7 +91,7 @@ class RetransformAgent {
                                    .addMethodEntryInjection(
                                         nname,
                                         cb -> {
-                                           cb.constantInstruction(fixedIndex);
+                                           cb.loadConstant(fixedIndex);
                                            cb.invokestatic(
                                                    CD_RetransformAgent,
                                                    "callTracker", MTD_void_int);
diff --git a/test/jdk/java/lang/instrument/asmlib/Instrumentor.java b/test/jdk/java/lang/instrument/asmlib/Instrumentor.java
index ed5e219dd4d..29f2740a874 100644
--- a/test/jdk/java/lang/instrument/asmlib/Instrumentor.java
+++ b/test/jdk/java/lang/instrument/asmlib/Instrumentor.java
@@ -122,13 +122,13 @@ public class Instrumentor {
                                 // load method parameters
                                 for (int i = 0; i < mt.parameterCount(); i++) {
                                     TypeKind kind = TypeKind.from(mt.parameterType(i));
-                                    cb.loadInstruction(kind, ptr);
+                                    cb.loadLocal(kind, ptr);
                                     ptr += kind.slotSize();
                                 }
 
-                                cb.invokeInstruction(isStatic ? Opcode.INVOKESTATIC : Opcode.INVOKESPECIAL,
+                                cb.invoke(isStatic ? Opcode.INVOKESTATIC : Opcode.INVOKESPECIAL,
                                         model.thisClass().asSymbol(), newName, mt, false);
-                                cb.returnInstruction(TypeKind.from(mt.returnType()));
+                                cb.return_(TypeKind.from(mt.returnType()));
                             }));
                         }
                     }));
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java b/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java
index 435f59fe755..3e1f0f41d6f 100644
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/WrapperHiddenClassTest.java
@@ -95,7 +95,7 @@ public class WrapperHiddenClassTest {
 
             // <clinit>
             clb.withMethodBody(CLASS_INIT_NAME, MTD_void, ACC_STATIC, cob -> {
-                cob.constantInstruction(CD_Comparator);
+                cob.loadConstant(CD_Comparator);
                 cob.putstatic(CD_HostileWrapper, TYPE, CD_Class);
                 cob.return_();
             });
diff --git a/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java b/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java
index edcc095c77b..af35d0edd03 100644
--- a/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java
@@ -390,8 +390,8 @@ public class ClassDataTest {
             MethodTypeDesc mt = MethodTypeDesc.of(returnDesc);
             cw = cw.andThen(clb -> {
                 clb.withMethodBody("classData", mt, accessFlags, cob -> {
-                    cob.constantInstruction(DynamicConstantDesc.ofNamed(BSM_CLASS_DATA, DEFAULT_NAME, returnDesc));
-                    cob.returnInstruction(TypeKind.from(returnType));
+                    cob.loadConstant(DynamicConstantDesc.ofNamed(BSM_CLASS_DATA, DEFAULT_NAME, returnDesc));
+                    cob.return_(TypeKind.from(returnType));
                 });
             });
             return this;
@@ -405,8 +405,8 @@ public class ClassDataTest {
             MethodTypeDesc mt = MethodTypeDesc.of(returnDesc);
             cw = cw.andThen(clb -> {
                 clb.withMethodBody("classData", mt, accessFlags, cob -> {
-                    cob.constantInstruction(DynamicConstantDesc.ofNamed(BSM_CLASS_DATA_AT, DEFAULT_NAME, returnDesc, index));
-                    cob.returnInstruction(TypeKind.from(returnType));
+                    cob.loadConstant(DynamicConstantDesc.ofNamed(BSM_CLASS_DATA_AT, DEFAULT_NAME, returnDesc, index));
+                    cob.return_(TypeKind.from(returnType));
                 });
             });
             return this;
@@ -417,8 +417,8 @@ public class ClassDataTest {
             MethodTypeDesc mt = MethodTypeDesc.of(returnDesc);
             cw = cw.andThen(clb -> {
                 clb.withMethodBody(name, mt, accessFlags, cob -> {
-                    cob.constantInstruction(dynamic);
-                    cob.returnInstruction(TypeKind.from(returnType));
+                    cob.loadConstant(dynamic);
+                    cob.return_(TypeKind.from(returnType));
                 });
             });
             return this;
diff --git a/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java b/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java
index 722f0ee4d8f..4b9a4fa8f8b 100644
--- a/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java
+++ b/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/InstructionHelper.java
@@ -62,7 +62,7 @@ public class InstructionHelper {
                             ClassFile.ACC_PUBLIC + ClassFile.ACC_STATIC, methodBuilder -> methodBuilder
                                     .withCode(codeBuilder -> {
                                         for (int i = 0; i < type.parameterCount(); i++) {
-                                            codeBuilder.loadInstruction(TypeKind.from(type.parameterType(i)), i);
+                                            codeBuilder.loadLocal(TypeKind.from(type.parameterType(i)), i);
                                         }
                                         codeBuilder.invokedynamic(DynamicCallSiteDesc.of(
                                                 MethodHandleDesc.ofMethod(
@@ -74,7 +74,7 @@ public class InstructionHelper {
                                                 name,
                                                 MethodTypeDesc.ofDescriptor(type.toMethodDescriptorString()),
                                                 boostrapArgs));
-                                        codeBuilder.returnInstruction(TypeKind.from(type.returnType()));
+                                        codeBuilder.return_(TypeKind.from(type.returnType()));
                                     }));
         });
         Class<?> gc = l.defineClass(byteArray);
@@ -116,7 +116,7 @@ public class InstructionHelper {
                                             name,
                                             ClassDesc.ofDescriptor(type),
                                             bootstrapArgs))
-                                    .returnInstruction(TypeKind.fromDescriptor(type))));
+                                    .return_(TypeKind.fromDescriptor(type))));
         });
         Class<?> gc = l.defineClass(bytes);
         return l.findStatic(gc, "m", fromMethodDescriptorString(methodType, l.lookupClass().getClassLoader()));
diff --git a/test/jdk/java/lang/invoke/condy/CondyNestedTest.java b/test/jdk/java/lang/invoke/condy/CondyNestedTest.java
index 53275905abb..2cdbff4ffdd 100644
--- a/test/jdk/java/lang/invoke/condy/CondyNestedTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyNestedTest.java
@@ -138,7 +138,7 @@ public class CondyNestedTest {
 //                                .withCode(codeBuilder -> {
 //                                            codeBuilder
 //                                                    .aload(2)
-//                                                    .instanceof_(ConstantDescs.CD_MethodType)
+//                                                    .instanceOf(ConstantDescs.CD_MethodType)
 //                                                    .iconst_0();
 //                                            Label condy = codeBuilder.newLabel();
 //                                            codeBuilder
diff --git a/test/jdk/java/lang/invoke/lookup/SpecialStatic.java b/test/jdk/java/lang/invoke/lookup/SpecialStatic.java
index 59db5d29788..4a44a898a77 100644
--- a/test/jdk/java/lang/invoke/lookup/SpecialStatic.java
+++ b/test/jdk/java/lang/invoke/lookup/SpecialStatic.java
@@ -164,7 +164,7 @@ public class SpecialStatic {
             });
             clb.withMethodBody("getMethodHandle", MethodTypeDesc.of(CD_MethodHandle),
                     ACC_PUBLIC | ACC_STATIC, cob -> {
-                cob.constantInstruction(MethodHandleDesc.ofMethod(SPECIAL, CD_T1, METHOD_NAME, MTD_int));
+                cob.loadConstant(MethodHandleDesc.ofMethod(SPECIAL, CD_T1, METHOD_NAME, MTD_int));
                 cob.areturn();
             });
             clb.withMethodBody("getLookup", MTD_Lookup,
diff --git a/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java b/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java
index 17f9c6665c1..2b19189ceed 100644
--- a/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java
+++ b/test/jdk/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java
@@ -68,7 +68,7 @@ public class TestPrivateInterfaceMethodReflect {
                     clb.withFlags(AccessFlag.ABSTRACT, AccessFlag.INTERFACE, AccessFlag.PUBLIC);
                     clb.withSuperclass(CD_Object);
                     clb.withMethodBody("privInstance", MethodTypeDesc.of(CD_int), ACC_PRIVATE, cob -> {
-                        cob.constantInstruction(EXPECTED);
+                        cob.loadConstant(EXPECTED);
                         cob.ireturn();
                     });
                 });
diff --git a/test/jdk/jdk/classfile/AdaptCodeTest.java b/test/jdk/jdk/classfile/AdaptCodeTest.java
index 2fd9fcb2c95..2a75cd7e020 100644
--- a/test/jdk/jdk/classfile/AdaptCodeTest.java
+++ b/test/jdk/jdk/classfile/AdaptCodeTest.java
@@ -95,7 +95,7 @@ class AdaptCodeTest {
                     if ((val instanceof Integer) && ((Integer) val) == 13) {
                         val = 7;
                     }
-                    codeB.constantInstruction(i.opcode(), val);
+                    codeB.loadConstant(i.opcode(), val);
                 }
                 default -> codeB.with(codeE);
             }
diff --git a/test/jdk/jdk/classfile/BSMTest.java b/test/jdk/jdk/classfile/BSMTest.java
index 79ecfb2f53e..927549f0210 100644
--- a/test/jdk/jdk/classfile/BSMTest.java
+++ b/test/jdk/jdk/classfile/BSMTest.java
@@ -78,7 +78,7 @@ public class BSMTest {
                                     BootstrapMethodEntry bme = cpb.bsmEntry(methodHandleEntry, staticArgs);
                                     ConstantDynamicEntry cde = cpb.constantDynamicEntry(bme, cpb.nameAndTypeEntry("name", CD_String));
 
-                                    codeB.constantInstruction(Opcode.LDC, cde.constantValue());
+                                    codeB.ldc(cde.constantValue());
                                 }
                                 default -> codeB.with(codeE);
                             }
diff --git a/test/jdk/jdk/classfile/BuilderBlockTest.java b/test/jdk/jdk/classfile/BuilderBlockTest.java
index c75869f740f..c8e13b79f72 100644
--- a/test/jdk/jdk/classfile/BuilderBlockTest.java
+++ b/test/jdk/jdk/classfile/BuilderBlockTest.java
@@ -64,7 +64,7 @@ class BuilderBlockTest {
                           mb -> mb.withCode(xb -> {
                               startEnd[0] = xb.startLabel();
                               startEnd[1] = xb.endLabel();
-                              xb.returnInstruction(TypeKind.VoidType);
+                              xb.return_();
                               assertEquals(((LabelImpl) startEnd[0]).getBCI(), 0);
                               assertEquals(((LabelImpl) startEnd[1]).getBCI(), -1);
                           }));
@@ -83,13 +83,13 @@ class BuilderBlockTest {
                           mb -> mb.withCode(xb -> {
                               startEnd[0] = xb.startLabel();
                               startEnd[1] = xb.endLabel();
-                              xb.nopInstruction();
+                              xb.nop();
                               xb.block(xxb -> {
                                   startEnd[2] = xxb.startLabel();
                                   startEnd[3] = xxb.endLabel();
-                                  xxb.nopInstruction();
+                                  xxb.nop();
                               });
-                              xb.returnInstruction(TypeKind.VoidType);
+                              xb.return_();
                           }));
         });
 
@@ -106,9 +106,9 @@ class BuilderBlockTest {
             cb.withMethod("foo", MethodTypeDesc.of(CD_int, CD_int),
                           AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
                           mb -> mb.withCode(xb -> xb.iload(0)
-                                                    .ifThen(xxb -> xxb.iconst_1().returnInstruction(TypeKind.IntType))
+                                                    .ifThen(xxb -> xxb.iconst_1().ireturn())
                                                     .iconst_2()
-                                                    .returnInstruction(TypeKind.IntType)));
+                                                    .ireturn()));
         });
 
         Method fooMethod = new ByteArrayClassLoader(BuilderBlockTest.class.getClassLoader(), "Foo", bytes)
@@ -125,8 +125,8 @@ class BuilderBlockTest {
             cb.withMethod("foo", MethodTypeDesc.of(CD_int, CD_int),
                           AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
                           mb -> mb.withCode(xb -> xb.iload(0)
-                                                    .ifThenElse(xxb -> xxb.iconst_1().returnInstruction(TypeKind.IntType),
-                                                                xxb -> xxb.iconst_2().returnInstruction(TypeKind.IntType))));
+                                                    .ifThenElse(xxb -> xxb.iconst_1().ireturn(),
+                                                                xxb -> xxb.iconst_2().ireturn())));
         });
 
         Method fooMethod = new ByteArrayClassLoader(BuilderBlockTest.class.getClassLoader(), "Foo", bytes)
diff --git a/test/jdk/jdk/classfile/BuilderTryCatchTest.java b/test/jdk/jdk/classfile/BuilderTryCatchTest.java
index 89117d4abd1..666b36e11a7 100644
--- a/test/jdk/jdk/classfile/BuilderTryCatchTest.java
+++ b/test/jdk/jdk/classfile/BuilderTryCatchTest.java
@@ -66,13 +66,13 @@ class BuilderTryCatchTest {
             catchBuilder.catching(CD_IOOBE, tb -> {
                 tb.pop();
 
-                tb.constantInstruction(Opcode.LDC, "IndexOutOfBoundsException");
-                tb.returnInstruction(TypeKind.ReferenceType);
+                tb.ldc("IndexOutOfBoundsException");
+                tb.areturn();
             }).catchingAll(tb -> {
                 tb.pop();
 
-                tb.constantInstruction(Opcode.LDC, "any");
-                tb.returnInstruction(TypeKind.ReferenceType);
+                tb.ldc("any");
+                tb.areturn();
             });
         });
 
@@ -91,12 +91,12 @@ class BuilderTryCatchTest {
             catchBuilder.catching(CD_IOOBE, tb -> {
                 tb.pop();
 
-                tb.constantInstruction(Opcode.LDC, "IndexOutOfBoundsException");
+                tb.ldc("IndexOutOfBoundsException");
                 tb.astore(1);
             }).catchingAll(tb -> {
                 tb.pop();
 
-                tb.constantInstruction(Opcode.LDC, "any");
+                tb.ldc("any");
                 tb.astore(1);
             });
         });
@@ -132,8 +132,8 @@ class BuilderTryCatchTest {
             catchBuilder.catching(CD_IOOBE, tb -> {
                 tb.pop();
 
-                tb.constantInstruction(Opcode.LDC, "IndexOutOfBoundsException");
-                tb.returnInstruction(TypeKind.ReferenceType);
+                tb.ldc("IndexOutOfBoundsException");
+                tb.areturn();
             });
         });
 
@@ -153,8 +153,8 @@ class BuilderTryCatchTest {
             catchBuilder.catchingAll(tb -> {
                 tb.pop();
 
-                tb.constantInstruction(Opcode.LDC, "any");
-                tb.returnInstruction(TypeKind.ReferenceType);
+                tb.ldc("any");
+                tb.areturn();
             });
         });
 
@@ -187,7 +187,7 @@ class BuilderTryCatchTest {
                     AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(), mb -> {
                         mb.withCode(xb -> {
                             int stringSlot = xb.allocateLocal(TypeKind.ReferenceType);
-                            xb.constantInstruction("S");
+                            xb.loadConstant("S");
                             xb.astore(stringSlot);
 
                             assertThrows(IllegalArgumentException.class, () -> {
@@ -198,14 +198,14 @@ class BuilderTryCatchTest {
                                     catchBuilder.catchingAll(tb -> {
                                         tb.pop();
 
-                                        tb.constantInstruction(Opcode.LDC, "any");
-                                        tb.returnInstruction(TypeKind.ReferenceType);
+                                        tb.ldc("any");
+                                        tb.areturn();
                                     });
                                 });
                             });
 
                             xb.aload(stringSlot);
-                            xb.returnInstruction(TypeKind.ReferenceType);
+                            xb.areturn();
                         });
                     });
         });
@@ -218,14 +218,14 @@ class BuilderTryCatchTest {
                     AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(), mb -> {
                         mb.withCode(xb -> {
                             int stringSlot = xb.allocateLocal(TypeKind.ReferenceType);
-                            xb.constantInstruction("S");
+                            xb.loadConstant("S");
                             xb.astore(stringSlot);
 
                             xb.trying(tb -> {
                                 int intSlot = tb.allocateLocal(TypeKind.IntType);
 
                                 tb.aload(0);
-                                tb.constantInstruction(0);
+                                tb.loadConstant(0);
                                 // IndexOutOfBoundsException
                                 tb.aaload();
                                 // NullPointerException
@@ -240,7 +240,7 @@ class BuilderTryCatchTest {
                                     tb.pop();
 
                                     int doubleSlot = tb.allocateLocal(TypeKind.DoubleType);
-                                    tb.constantInstruction(Math.PI);
+                                    tb.loadConstant(Math.PI);
                                     tb.dstore(doubleSlot);
 
                                     tb.dload(doubleSlot);
@@ -250,7 +250,7 @@ class BuilderTryCatchTest {
                                     tb.pop();
 
                                     int refSlot = tb.allocateLocal(TypeKind.ReferenceType);
-                                    tb.constantInstruction("REF");
+                                    tb.loadConstant("REF");
                                     tb.astore(refSlot);
 
                                     tb.aload(refSlot);
@@ -260,7 +260,7 @@ class BuilderTryCatchTest {
                             });
 
                             xb.aload(stringSlot);
-                            xb.returnInstruction(TypeKind.ReferenceType);
+                            xb.areturn();
                         });
                     });
         });
@@ -281,12 +281,12 @@ class BuilderTryCatchTest {
                     AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(), mb -> {
                         mb.withCode(xb -> {
                             int stringSlot = xb.allocateLocal(TypeKind.ReferenceType);
-                            xb.constantInstruction("S");
+                            xb.loadConstant("S");
                             xb.astore(stringSlot);
 
                             xb.trying(tb -> {
                                 tb.aload(0);
-                                tb.constantInstruction(0);
+                                tb.loadConstant(0);
                                 // IndexOutOfBoundsException
                                 tb.aaload();
                                 // NullPointerException
@@ -295,7 +295,7 @@ class BuilderTryCatchTest {
                             }, c);
 
                             xb.aload(stringSlot);
-                            xb.returnInstruction(TypeKind.ReferenceType);
+                            xb.areturn();
                         });
                     });
         });
diff --git a/test/jdk/jdk/classfile/DiscontinuedInstructionsTest.java b/test/jdk/jdk/classfile/DiscontinuedInstructionsTest.java
index 8d5b11c28e6..be7e425c694 100644
--- a/test/jdk/jdk/classfile/DiscontinuedInstructionsTest.java
+++ b/test/jdk/jdk/classfile/DiscontinuedInstructionsTest.java
@@ -50,9 +50,9 @@ class DiscontinuedInstructionsTest {
                 .withVersion(JAVA_5_VERSION, 0)
                 .withMethodBody(testMethod, MethodTypeDesc.of(CD_void, cd_list), ACC_PUBLIC | ACC_STATIC, cob -> cob
                         .block(bb -> {
-                            bb.constantInstruction("Hello")
+                            bb.loadConstant("Hello")
                               .with(DiscontinuedInstruction.JsrInstruction.of(bb.breakLabel()));
-                            bb.constantInstruction("World")
+                            bb.loadConstant("World")
                               .with(DiscontinuedInstruction.JsrInstruction.of(Opcode.JSR_W, bb.breakLabel()))
                               .return_();
                         })
diff --git a/test/jdk/jdk/classfile/LDCTest.java b/test/jdk/jdk/classfile/LDCTest.java
index 1ece8967576..1e7639de4bb 100644
--- a/test/jdk/jdk/classfile/LDCTest.java
+++ b/test/jdk/jdk/classfile/LDCTest.java
@@ -49,9 +49,9 @@ class LDCTest {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.withVersion(52, 0);
             cb.withMethod("<init>", MethodTypeDesc.of(CD_void), 0, mb -> mb
-                      .withCode(codeb -> codeb.loadInstruction(TypeKind.ReferenceType, 0)
-                                              .invokeInstruction(INVOKESPECIAL, CD_Object, "<init>", MTD_VOID, false)
-                                              .returnInstruction(VoidType)
+                      .withCode(codeb -> codeb.aload(0)
+                                              .invokespecial(CD_Object, "<init>", MTD_VOID, false)
+                                              .return_()
                       )
               )
 
@@ -62,15 +62,15 @@ class LDCTest {
                                   for (int i = 0; i <= 256/2 + 2; i++) { // two entries per String
                                       StringEntry s = cpb.stringEntry("string" + i);
                                   }
-                                  c0.constantInstruction(LDC, "string0")
-                                    .constantInstruction(LDC, "string131")
-                                    .constantInstruction(LDC, "string50")
-                                    .constantInstruction(-0.0f)
-                                    .constantInstruction(-0.0d)
+                                  c0.loadConstant(LDC, "string0")
+                                    .loadConstant(LDC, "string131")
+                                    .loadConstant(LDC, "string50")
+                                    .loadConstant(-0.0f)
+                                    .loadConstant(-0.0d)
                                     //non-LDC test cases
-                                    .constantInstruction(0.0f)
-                                    .constantInstruction(0.0d)
-                                    .returnInstruction(VoidType);
+                                    .loadConstant(0.0f)
+                                    .loadConstant(0.0d)
+                                    .return_();
                               }));
         });
 
diff --git a/test/jdk/jdk/classfile/LowAdaptTest.java b/test/jdk/jdk/classfile/LowAdaptTest.java
index 4be4a259ac0..46d033a8676 100644
--- a/test/jdk/jdk/classfile/LowAdaptTest.java
+++ b/test/jdk/jdk/classfile/LowAdaptTest.java
@@ -80,15 +80,15 @@ class LowAdaptTest {
             cb.withMethod("doit", MethodTypeDesc.of(CD_int, CD_int),
                           AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
                           mb -> mb.withCode(xb -> {
-                              xb.invokeDynamicInstruction(indy);
-                              xb.storeInstruction(TypeKind.ReferenceType, 1);
-                              xb.loadInstruction(TypeKind.ReferenceType, 1);
-                              xb.loadInstruction(TypeKind.IntType, 0);
-                              xb.invokeInstruction(Opcode.INVOKEINTERFACE, ClassDesc.of("java.util.function.IntUnaryOperator"),
-                                                   "applyAsInt", MethodTypeDesc.ofDescriptor("(I)I"), true);
-                              xb.storeInstruction(TypeKind.IntType, 2);
-                              xb.loadInstruction(TypeKind.IntType, 2);
-                              xb.returnInstruction(TypeKind.IntType);
+                              xb.invokedynamic(indy);
+                              xb.astore(1);
+                              xb.aload(1);
+                              xb.iload(0);
+                              xb.invokeinterface(ClassDesc.of("java.util.function.IntUnaryOperator"),
+                                                   "applyAsInt", MethodTypeDesc.ofDescriptor("(I)I"));
+                              xb.istore(2);
+                              xb.iload(2);
+                              xb.ireturn();
                           }));
         });
 
diff --git a/test/jdk/jdk/classfile/LvtTest.java b/test/jdk/jdk/classfile/LvtTest.java
index 1c35b071cc2..35ec8dfcfa3 100644
--- a/test/jdk/jdk/classfile/LvtTest.java
+++ b/test/jdk/jdk/classfile/LvtTest.java
@@ -122,9 +122,9 @@ class LvtTest {
             cb.withVersion(52, 0);
             cb.with(SourceFileAttribute.of(cb.constantPool().utf8Entry(("MyClass.java"))))
               .withMethod("<init>", MethodTypeDesc.of(CD_void), 0, mb -> mb
-                      .withCode(codeb -> codeb.loadInstruction(TypeKind.ReferenceType, 0)
-                                              .invokeInstruction(INVOKESPECIAL, CD_Object, "<init>", MTD_VOID, false)
-                                              .returnInstruction(VoidType)
+                      .withCode(codeb -> codeb.aload(0)
+                                              .invokespecial(CD_Object, "<init>", MTD_VOID, false)
+                                              .return_()
                       )
               )
               .withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
@@ -146,27 +146,27 @@ class LvtTest {
                                   c0.localVariable(1, i1n, intSig, i1, preEnd) // LV Entries can be added before the labels
                                     .localVariable(2, i2, intSig, loopTop, preEnd)
                                     .labelBinding(start)
-                                    .constantInstruction(ICONST_1, 1)         // 0
-                                    .storeInstruction(TypeKind.IntType, 1)          // 1
+                                    .iconst_1()         // 0
+                                    .istore(1)          // 1
                                     .labelBinding(i1)
-                                    .constantInstruction(ICONST_1, 1)         // 2
-                                    .storeInstruction(TypeKind.IntType, 2)          // 3
+                                    .iconst_1()         // 2
+                                    .istore(2)          // 3
                                     .labelBinding(loopTop)
-                                    .loadInstruction(TypeKind.IntType, 2)           // 4
-                                    .constantInstruction(BIPUSH, 10)         // 5
-                                    .branchInstruction(IF_ICMPGE, loopEnd) // 6
-                                    .loadInstruction(TypeKind.IntType, 1)           // 7
-                                    .loadInstruction(TypeKind.IntType, 2)           // 8
-                                    .operatorInstruction(IMUL)             // 9
-                                    .storeInstruction(TypeKind.IntType, 1)          // 10
-                                    .incrementInstruction(2, 1)    // 11
-                                    .branchInstruction(GOTO, loopTop)     // 12
+                                    .iload(2)           // 4
+                                    .bipush(10)         // 5
+                                    .if_icmpge(loopEnd) // 6
+                                    .iload(1)           // 7
+                                    .iload(2)           // 8
+                                    .imul()             // 9
+                                    .istore(1)          // 10
+                                    .iinc(2, 1)    // 11
+                                    .goto_(loopTop)     // 12
                                     .labelBinding(loopEnd)
-                                    .fieldInstruction(GETSTATIC, CD_System, "out", CD_PrintStream)   // 13
-                                    .loadInstruction(TypeKind.IntType, 1)
-                                    .invokeInstruction(INVOKEVIRTUAL, CD_PrintStream, "println", MTD_INT_VOID, false)  // 15
+                                    .getstatic(CD_System, "out", CD_PrintStream)   // 13
+                                    .iload(1)
+                                    .invokevirtual(CD_PrintStream, "println", MTD_INT_VOID)  // 15
                                     .labelBinding(preEnd)
-                                    .returnInstruction(VoidType)
+                                    .return_()
                                     .labelBinding(end)
                                     .localVariable(0, slotName, desc, start, end); // and lv entries can be added after the labels
                               }));
@@ -236,9 +236,9 @@ class LvtTest {
             cb.with(SourceFileAttribute.of(cb.constantPool().utf8Entry(("MyClass.java"))))
 
               .withMethod("<init>", MethodTypeDesc.of(CD_void), 0, mb -> mb
-                      .withCode(codeb -> codeb.loadInstruction(TypeKind.ReferenceType, 0)
-                                              .invokeInstruction(INVOKESPECIAL, CD_Object, "<init>", MTD_VOID, false)
-                                              .returnInstruction(VoidType)
+                      .withCode(codeb -> codeb.aload(0)
+                                              .invokespecial(CD_Object, "<init>", MTD_VOID, false)
+                                              .return_()
                       )
               )
 
@@ -263,14 +263,14 @@ class LvtTest {
                                       c0.localVariable(2, l, juList, beforeRet, end)
                                         .localVariableType(1, u, TU, start, end)
                                         .labelBinding(start)
-                                        .newObjectInstruction(ClassDesc.of("java.util.ArrayList"))
-                                        .stackInstruction(DUP)
-                                        .invokeInstruction(INVOKESPECIAL, CD_ArrayList, "<init>", MTD_VOID, false)
-                                        .storeInstruction(TypeKind.ReferenceType, 2)
+                                        .new_(ClassDesc.of("java.util.ArrayList"))
+                                        .dup()
+                                        .invokespecial(CD_ArrayList, "<init>", MTD_VOID, false)
+                                        .astore(2)
                                         .labelBinding(beforeRet)
                                         .localVariableType(2, l, sig, beforeRet, end)
-                                        .loadInstruction(TypeKind.ReferenceType, 1)
-                                        .returnInstruction(TypeKind.ReferenceType)
+                                        .aload(1)
+                                        .areturn()
                                         .labelBinding(end)
                                         .localVariable(0, slotName, desc, start, end)
                                         .localVariable(1, u, jlObject, start, end);
diff --git a/test/jdk/jdk/classfile/OneToOneTest.java b/test/jdk/jdk/classfile/OneToOneTest.java
index 5db0489ac3e..b20d07025e6 100644
--- a/test/jdk/jdk/classfile/OneToOneTest.java
+++ b/test/jdk/jdk/classfile/OneToOneTest.java
@@ -68,9 +68,9 @@ class OneToOneTest {
             cb.with(SourceFileAttribute.of(cb.constantPool().utf8Entry(("MyClass.java"))))
 
               .withMethod("<init>", MethodTypeDesc.of(CD_void), 0, mb -> mb
-                                  .withCode(codeb -> codeb.loadInstruction(TypeKind.ReferenceType, 0)
-                                                          .invokeInstruction(INVOKESPECIAL, CD_Object, "<init>", MTD_VOID, false)
-                                                          .returnInstruction(TypeKind.VoidType)
+                                  .withCode(codeb -> codeb.aload(0)
+                                                          .invokespecial(CD_Object, "<init>", MTD_VOID, false)
+                                                          .return_()
                                   )
               )
               .withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
@@ -80,25 +80,25 @@ class OneToOneTest {
                                                 Label loopEnd = c0.newLabel();
                                                 int fac = 1;
                                                 int i = 2;
-                                                c0.constantInstruction(ICONST_1, 1)         // 0
-                                                  .storeInstruction(TypeKind.IntType, fac)        // 1
-                                                  .constantInstruction(ICONST_1, 1)         // 2
-                                                  .storeInstruction(TypeKind.IntType, i)          // 3
+                                                c0.iconst_1()         // 0
+                                                  .istore(fac)        // 1
+                                                  .iconst_1()         // 2
+                                                  .istore(i)          // 3
                                                   .labelBinding(loopTop)
-                                                  .loadInstruction(TypeKind.IntType, i)           // 4
-                                                  .constantInstruction(BIPUSH, 10)         // 5
-                                                  .branchInstruction(IF_ICMPGE, loopEnd) // 6
-                                                  .loadInstruction(TypeKind.IntType, fac)         // 7
-                                                  .loadInstruction(TypeKind.IntType, i)           // 8
-                                                  .operatorInstruction(IMUL)             // 9
-                                                  .storeInstruction(TypeKind.IntType, fac)        // 10
-                                                  .incrementInstruction(i, 1)    // 11
-                                                  .branchInstruction(GOTO, loopTop)     // 12
+                                                  .iload(i)           // 4
+                                                  .bipush(10)         // 5
+                                                  .if_icmpge(loopEnd) // 6
+                                                  .iload(fac)         // 7
+                                                  .iload(i)           // 8
+                                                  .imul()             // 9
+                                                  .istore(fac)        // 10
+                                                  .iinc(i, 1)         // 11
+                                                  .goto_(loopTop)     // 12
                                                   .labelBinding(loopEnd)
-                                                  .fieldInstruction(GETSTATIC, CD_System, "out", CD_PrintStream)   // 13
-                                                  .loadInstruction(TypeKind.IntType, fac)
-                                                  .invokeInstruction(INVOKEVIRTUAL, CD_PrintStream, "println", MTD_INT_VOID, false)  // 15
-                                                  .returnInstruction(TypeKind.VoidType);
+                                                  .getstatic(CD_System, "out", CD_PrintStream)   // 13
+                                                  .iload(fac)
+                                                  .invokevirtual(CD_PrintStream, "println", MTD_INT_VOID)  // 15
+                                                  .return_();
                                             }
                           )
               );
diff --git a/test/jdk/jdk/classfile/OpcodesValidationTest.java b/test/jdk/jdk/classfile/OpcodesValidationTest.java
index 085ba631349..f44bdfd2725 100644
--- a/test/jdk/jdk/classfile/OpcodesValidationTest.java
+++ b/test/jdk/jdk/classfile/OpcodesValidationTest.java
@@ -107,7 +107,7 @@ public class OpcodesValidationTest {
                         cb -> cb.withFlags(AccessFlag.PUBLIC)
                                 .withMethod("<init>", MethodTypeDesc.of(CD_void), 0,
                                       mb -> mb.withCode(
-                                              codeb -> codeb.constantInstruction(opcode, (ConstantDesc) constant))));
+                                              codeb -> codeb.loadConstant(opcode, (ConstantDesc) constant))));
     }
 
 
@@ -124,6 +124,6 @@ public class OpcodesValidationTest {
                         cb -> cb.withFlags(AccessFlag.PUBLIC)
                                 .withMethod("<init>", MethodTypeDesc.of(CD_void), 0,
                         mb -> mb .withCode(
-                                codeb -> codeb.constantInstruction(opcode, (ConstantDesc)constant))));
+                                codeb -> codeb.loadConstant(opcode, (ConstantDesc)constant))));
     }
 }
diff --git a/test/jdk/jdk/classfile/PrimitiveClassConstantTest.java b/test/jdk/jdk/classfile/PrimitiveClassConstantTest.java
index 376fe389826..89cf43751f8 100644
--- a/test/jdk/jdk/classfile/PrimitiveClassConstantTest.java
+++ b/test/jdk/jdk/classfile/PrimitiveClassConstantTest.java
@@ -60,7 +60,7 @@ public final class PrimitiveClassConstantTest {
                 cob.return_();
             });
             clb.withMethodBody("get", MethodTypeDesc.of(CD_Object), ACC_PUBLIC, cob -> {
-                cob.constantInstruction(CD_int);
+                cob.loadConstant(CD_int);
                 cob.areturn();
             });
             clb.withMethodBody("get2", MethodTypeDesc.of(CD_Class), ACC_PUBLIC, cob -> {
diff --git a/test/jdk/jdk/classfile/ShortJumpsFixTest.java b/test/jdk/jdk/classfile/ShortJumpsFixTest.java
index 15a777bf713..a259795b551 100644
--- a/test/jdk/jdk/classfile/ShortJumpsFixTest.java
+++ b/test/jdk/jdk/classfile/ShortJumpsFixTest.java
@@ -211,9 +211,9 @@ class ShortJumpsFixTest {
                                     for (int i = 0; i < sample.expected.length - 4; i++) //cherry-pick XCONST_ instructions from expected output
                                         cob.with(ConstantInstruction.ofIntrinsic(sample.expected[i]));
                                     var target = cob.newLabel();
-                                    cob.branchInstruction(sample.jumpCode, target);
+                                    cob.branch(sample.jumpCode, target);
                                     for (int i = overflow ? 40000 : 1; i > 0; i--)
-                                        cob.nopInstruction();
+                                        cob.nop();
                                     cob.labelBinding(target);
                                     cob.return_();
                                 }))));
@@ -228,12 +228,12 @@ class ShortJumpsFixTest {
                                     cob.goto_w(fwd);
                                     cob.labelBinding(target);
                                     for (int i = overflow ? 40000 : 1; i > 0; i--)
-                                        cob.nopInstruction();
+                                        cob.nop();
                                     cob.return_();
                                     cob.labelBinding(fwd);
                                     for (int i = 3; i < sample.expected.length - 3; i++) //cherry-pick XCONST_ instructions from expected output
                                         cob.with(ConstantInstruction.ofIntrinsic(sample.expected[i]));
-                                    cob.branchInstruction(sample.jumpCode, target);
+                                    cob.branch(sample.jumpCode, target);
                                     cob.return_();
                                 }))));
     }
@@ -244,7 +244,7 @@ class ShortJumpsFixTest {
                                 (cob, coe) -> {
                                     if (coe instanceof NopInstruction)
                                         for (int i = 0; i < 40000; i++) //cause label overflow during transform
-                                            cob.nopInstruction();
+                                            cob.nop();
                                     cob.with(coe);
                                 }));
     }
diff --git a/test/jdk/jdk/classfile/StackMapsTest.java b/test/jdk/jdk/classfile/StackMapsTest.java
index 88858ce8394..b3df31291bc 100644
--- a/test/jdk/jdk/classfile/StackMapsTest.java
+++ b/test/jdk/jdk/classfile/StackMapsTest.java
@@ -286,10 +286,10 @@ class StackMapsTest {
                                            Label next = cb.newLabel();
                                            cb.iload(0);
                                            cb.ifeq(next);
-                                           cb.constantInstruction(0.0d);
+                                           cb.loadConstant(0.0d);
                                            cb.goto_(target);
                                            cb.labelBinding(next);
-                                           cb.constantInstruction(0);
+                                           cb.loadConstant(0);
                                            cb.labelBinding(target);
                                            cb.pop();
                                        })));
@@ -304,10 +304,10 @@ class StackMapsTest {
                                            Label next = cb.newLabel();
                                            cb.iload(0);
                                            cb.ifeq(next);
-                                           cb.constantInstruction(0.0f);
+                                           cb.loadConstant(0.0f);
                                            cb.goto_(target);
                                            cb.labelBinding(next);
-                                           cb.constantInstruction(0);
+                                           cb.loadConstant(0);
                                            cb.labelBinding(target);
                                            cb.pop();
                                        })));
diff --git a/test/jdk/jdk/classfile/StackTrackerTest.java b/test/jdk/jdk/classfile/StackTrackerTest.java
index 15a5fe490ba..ba472231079 100644
--- a/test/jdk/jdk/classfile/StackTrackerTest.java
+++ b/test/jdk/jdk/classfile/StackTrackerTest.java
@@ -58,7 +58,7 @@ class StackTrackerTest {
                         assertIterableEquals(stackTracker.stack().get(), List.of(IntType, LongType, ReferenceType, DoubleType, FloatType));
                         tryb.ifThen(thb -> {
                             assertIterableEquals(stackTracker.stack().get(), List.of(LongType, ReferenceType, DoubleType, FloatType));
-                            thb.constantInstruction(ClassDesc.of("Phee"));
+                            thb.loadConstant(ClassDesc.of("Phee"));
                             assertIterableEquals(stackTracker.stack().get(), List.of(ReferenceType, LongType, ReferenceType, DoubleType, FloatType));
                             thb.athrow();
                             assertFalse(stackTracker.stack().isPresent());
@@ -91,7 +91,7 @@ class StackTrackerTest {
                     var l2 = stcb.newBoundLabel(); //back jump target
                     assertFalse(stackTracker.stack().isPresent()); //no stack
                     assertTrue(stackTracker.maxStackSize().isPresent()); //however still tracking
-                    stcb.constantInstruction(ClassDesc.of("Phee")); //stack instruction on unknown stack cause tracking lost
+                    stcb.loadConstant(ClassDesc.of("Phee")); //stack instruction on unknown stack cause tracking lost
                     assertFalse(stackTracker.stack().isPresent()); //no stack
                     assertFalse(stackTracker.maxStackSize().isPresent()); //because tracking lost
                     stcb.athrow();
diff --git a/test/jdk/jdk/classfile/TempConstantPoolBuilderTest.java b/test/jdk/jdk/classfile/TempConstantPoolBuilderTest.java
index 0c324846647..f2debf041e4 100644
--- a/test/jdk/jdk/classfile/TempConstantPoolBuilderTest.java
+++ b/test/jdk/jdk/classfile/TempConstantPoolBuilderTest.java
@@ -58,9 +58,9 @@ class TempConstantPoolBuilderTest {
             cb.withFlags(AccessFlag.PUBLIC)
               .with(SourceFileAttribute.of(cb.constantPool().utf8Entry(("MyClass.java"))))
               .withMethod("<init>", MethodTypeDesc.of(CD_void), 0, mb -> mb
-                            .withCode(codeb -> codeb.loadInstruction(TypeKind.ReferenceType, 0)
-                                    .invokeInstruction(INVOKESPECIAL, CD_Object, "<init>", MTD_VOID, false)
-                                    .returnInstruction(VoidType)
+                            .withCode(codeb -> codeb.aload(0)
+                                    .invokespecial(CD_Object, "<init>", MTD_VOID, false)
+                                    .return_()
                             )
                             .with(RuntimeVisibleAnnotationsAttribute.of(Annotation.of(INTERFACE,
                                                                                       AnnotationElement.ofString("foo", "bar"))))
diff --git a/test/jdk/jdk/classfile/TransformTests.java b/test/jdk/jdk/classfile/TransformTests.java
index 31e75dc2ef2..13abca0ec52 100644
--- a/test/jdk/jdk/classfile/TransformTests.java
+++ b/test/jdk/jdk/classfile/TransformTests.java
@@ -59,7 +59,7 @@ class TransformTests {
     static CodeTransform swapLdc(String x, String y) {
         return (b, e) -> {
             if (e instanceof ConstantInstruction ci && ci.constantValue().equals(x)) {
-                b.constantInstruction(y);
+                b.loadConstant(y);
             }
             else
                 b.with(e);
diff --git a/test/jdk/jdk/classfile/Utf8EntryTest.java b/test/jdk/jdk/classfile/Utf8EntryTest.java
index e4cc5664992..82815755761 100644
--- a/test/jdk/jdk/classfile/Utf8EntryTest.java
+++ b/test/jdk/jdk/classfile/Utf8EntryTest.java
@@ -196,7 +196,7 @@ class Utf8EntryTest {
     static byte[] createClassFile(String s) {
         return ClassFile.of().build(ClassDesc.of("C"),
                                clb -> clb.withMethod("m", MethodTypeDesc.of(CD_void), 0,
-                                                     mb -> mb.withCode(cb -> cb.constantInstruction(s)
-                                                                               .returnInstruction(VoidType))));
+                                                     mb -> mb.withCode(cb -> cb.loadConstant(s)
+                                                                               .return_())));
     }
 }
diff --git a/test/jdk/jdk/classfile/WriteTest.java b/test/jdk/jdk/classfile/WriteTest.java
index afd5c9f5e34..b4af9135d12 100644
--- a/test/jdk/jdk/classfile/WriteTest.java
+++ b/test/jdk/jdk/classfile/WriteTest.java
@@ -54,10 +54,10 @@ class WriteTest {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.with(SourceFileAttribute.of(cb.constantPool().utf8Entry(("MyClass.java"))))
               .withMethod("<init>", MethodTypeDesc.of(CD_void), 0, mb -> mb
-                      .withCode(codeb -> codeb.loadInstruction(TypeKind.ReferenceType, 0)
-                                              .invokeInstruction(INVOKESPECIAL, CD_Object, "<init>",
+                      .withCode(codeb -> codeb.aload(0)
+                                              .invokespecial(CD_Object, "<init>",
                                                                  MethodTypeDesc.ofDescriptor("()V"), false)
-                                              .returnInstruction(VoidType)
+                                              .return_()
                       )
               )
               .withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
@@ -66,25 +66,25 @@ class WriteTest {
                                   Label loopTop = c0.newLabel();
                                   Label loopEnd = c0.newLabel();
                                   c0
-                                          .constantInstruction(ICONST_1, 1)         // 0
-                                          .storeInstruction(TypeKind.IntType, 1)          // 1
-                                          .constantInstruction(ICONST_1, 1)         // 2
-                                          .storeInstruction(TypeKind.IntType, 2)          // 3
+                                          .iconst_1()         // 0
+                                          .istore(1)          // 1
+                                          .iconst_1()         // 2
+                                          .istore(2)          // 3
                                           .labelBinding(loopTop)
-                                          .loadInstruction(TypeKind.IntType, 2)           // 4
-                                          .constantInstruction(BIPUSH, 10)         // 5
-                                          .branchInstruction(IF_ICMPGE, loopEnd) // 6
-                                          .loadInstruction(TypeKind.IntType, 1)           // 7
-                                          .loadInstruction(TypeKind.IntType, 2)           // 8
-                                          .operatorInstruction(IMUL)             // 9
-                                          .storeInstruction(TypeKind.IntType, 1)          // 10
-                                          .incrementInstruction(2, 1)    // 11
-                                          .branchInstruction(GOTO, loopTop)     // 12
+                                          .iload(2)           // 4
+                                          .bipush(10)         // 5
+                                          .if_icmpge(loopEnd) // 6
+                                          .iload(1)           // 7
+                                          .iload(2)           // 8
+                                          .imul()             // 9
+                                          .istore(1)          // 10
+                                          .iinc(2, 1)    // 11
+                                          .goto_(loopTop)     // 12
                                           .labelBinding(loopEnd)
-                                          .fieldInstruction(GETSTATIC, TestConstants.CD_System, "out", TestConstants.CD_PrintStream)   // 13
-                                          .loadInstruction(TypeKind.IntType, 1)
-                                          .invokeInstruction(INVOKEVIRTUAL, TestConstants.CD_PrintStream, "println", TestConstants.MTD_INT_VOID, false)  // 15
-                                          .returnInstruction(VoidType);
+                                          .getstatic(TestConstants.CD_System, "out", TestConstants.CD_PrintStream)   // 13
+                                          .iload(1)
+                                          .invokevirtual(TestConstants.CD_PrintStream, "println", TestConstants.MTD_INT_VOID)  // 15
+                                          .return_();
                               }));
         });
     }
@@ -96,9 +96,9 @@ class WriteTest {
             cb.withFlags(AccessFlag.PUBLIC)
               .with(SourceFileAttribute.of(cb.constantPool().utf8Entry(("MyClass.java"))))
               .withMethod("<init>", MethodTypeDesc.of(CD_void), 0, mb -> mb
-                      .withCode(codeb -> codeb.loadInstruction(ReferenceType, 0)
-                                              .invokeInstruction(INVOKESPECIAL, CD_Object, "<init>", MTD_VOID, false)
-                                              .returnInstruction(VoidType)
+                      .withCode(codeb -> codeb.aload(0)
+                                              .invokespecial(CD_Object, "<init>", MTD_VOID, false)
+                                              .return_()
                       )
               )
               .withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
@@ -107,25 +107,25 @@ class WriteTest {
                                   Label loopTop = c0.newLabel();
                                   Label loopEnd = c0.newLabel();
                                   c0
-                                          .constantInstruction(ICONST_1, 1)        // 0
-                                          .storeInstruction(IntType, 1)          // 1
-                                          .constantInstruction(ICONST_1, 1)        // 2
-                                          .storeInstruction(IntType, 2)          // 3
+                                          .iconst_1()        // 0
+                                          .istore(1)          // 1
+                                          .iconst_1()        // 2
+                                          .istore(2)          // 3
                                           .labelBinding(loopTop)
-                                          .loadInstruction(IntType, 2)           // 4
-                                          .constantInstruction(BIPUSH, 10)         // 5
-                                          .branchInstruction(IF_ICMPGE, loopEnd) // 6
-                                          .loadInstruction(IntType, 1)           // 7
-                                          .loadInstruction(IntType, 2)           // 8
-                                          .operatorInstruction(IMUL)             // 9
-                                          .storeInstruction(IntType, 1)          // 10
-                                          .incrementInstruction(2, 1)    // 11
-                                          .branchInstruction(GOTO, loopTop)     // 12
+                                          .iload(2)           // 4
+                                          .bipush(10)         // 5
+                                          .if_icmpge(loopEnd) // 6
+                                          .iload(1)           // 7
+                                          .iload(2)           // 8
+                                          .imul()             // 9
+                                          .istore(1)          // 10
+                                          .iinc(2, 1)    // 11
+                                          .goto_(loopTop)     // 12
                                           .labelBinding(loopEnd)
-                                          .fieldInstruction(GETSTATIC, TestConstants.CD_System, "out", TestConstants.CD_PrintStream)   // 13
-                                          .loadInstruction(IntType, 1)
-                                          .invokeInstruction(INVOKEVIRTUAL, TestConstants.CD_PrintStream, "println", TestConstants.MTD_INT_VOID, false)  // 15
-                                          .returnInstruction(VoidType);
+                                          .getstatic(TestConstants.CD_System, "out", TestConstants.CD_PrintStream)   // 13
+                                          .iload(1)
+                                          .invokevirtual(TestConstants.CD_PrintStream, "println", TestConstants.MTD_INT_VOID)  // 15
+                                          .return_();
                               }));
         });
     }
diff --git a/test/jdk/jdk/classfile/examples/ExampleGallery.java b/test/jdk/jdk/classfile/examples/ExampleGallery.java
index cb155e6f64a..736725eeebe 100644
--- a/test/jdk/jdk/classfile/examples/ExampleGallery.java
+++ b/test/jdk/jdk/classfile/examples/ExampleGallery.java
@@ -251,7 +251,7 @@ public class ExampleGallery {
             @Override
             public void accept(CodeBuilder codeB, CodeElement codeE) {
                 if (found) {
-                    codeB.nopInstruction();
+                    codeB.nop();
                     found = false;
                 }
                 codeB.with(codeE);
@@ -265,7 +265,7 @@ public class ExampleGallery {
         return ClassFile.of().transform(cm, ClassTransform.transformingMethodBodies((codeB, codeE) -> {
             switch (codeE) {
                 case InvokeInstruction i -> {
-                    codeB.nopInstruction();
+                    codeB.nop();
                     codeB.with(codeE);
                 }
                 default -> codeB.with(codeE);
@@ -277,7 +277,7 @@ public class ExampleGallery {
         return ClassFile.of().transform(cm, ClassTransform.transformingMethodBodies((codeB, codeE) -> {
             switch (codeE) {
                 case ConstantInstruction ci -> {
-                        if (ci.constantValue() instanceof Integer i) codeB.constantInstruction(i + 1);
+                        if (ci.constantValue() instanceof Integer i) codeB.loadConstant(i + 1);
                         else codeB.with(codeE);
                 }
                 default -> codeB.with(codeE);
diff --git a/test/jdk/jdk/classfile/helpers/InstructionModelToCodeBuilder.java b/test/jdk/jdk/classfile/helpers/InstructionModelToCodeBuilder.java
index 828862ef2cc..d7d9e9c267f 100644
--- a/test/jdk/jdk/classfile/helpers/InstructionModelToCodeBuilder.java
+++ b/test/jdk/jdk/classfile/helpers/InstructionModelToCodeBuilder.java
@@ -35,53 +35,53 @@ public class InstructionModelToCodeBuilder {
     public static void toBuilder(CodeElement model, CodeBuilder cb) {
         switch (model) {
             case LoadInstruction im ->
-                cb.loadInstruction(im.typeKind(), im.slot());
+                cb.loadLocal(im.typeKind(), im.slot());
             case StoreInstruction im ->
-                cb.storeInstruction(im.typeKind(), im.slot());
+                cb.storeLocal(im.typeKind(), im.slot());
             case IncrementInstruction im ->
-                cb.incrementInstruction(im.slot(), im.constant());
+                cb.iinc(im.slot(), im.constant());
             case BranchInstruction im ->
-                cb.branchInstruction(im.opcode(), im.target());
+                cb.branch(im.opcode(), im.target());
             case LookupSwitchInstruction im ->
-                cb.lookupSwitchInstruction(im.defaultTarget(), im.cases());
+                cb.lookupswitch(im.defaultTarget(), im.cases());
             case TableSwitchInstruction im ->
-                cb.tableSwitchInstruction(im.lowValue(), im.highValue(), im.defaultTarget(), im.cases());
+                cb.tableswitch(im.lowValue(), im.highValue(), im.defaultTarget(), im.cases());
             case ReturnInstruction im ->
-                cb.returnInstruction(im.typeKind());
+                cb.return_(im.typeKind());
             case ThrowInstruction im ->
-                cb.throwInstruction();
+                cb.athrow();
             case FieldInstruction im ->
-                cb.fieldInstruction(im.opcode(), im.owner().asSymbol(), im.name().stringValue(), im.typeSymbol());
+                cb.fieldAccess(im.opcode(), im.owner().asSymbol(), im.name().stringValue(), im.typeSymbol());
             case InvokeInstruction im ->
-                cb.invokeInstruction(im.opcode(), im.owner().asSymbol(), im.name().stringValue(), im.typeSymbol(), im.isInterface());
+                cb.invoke(im.opcode(), im.owner().asSymbol(), im.name().stringValue(), im.typeSymbol(), im.isInterface());
             case InvokeDynamicInstruction im ->
-                cb.invokeDynamicInstruction(DynamicCallSiteDesc.of(im.bootstrapMethod(), im.name().stringValue(), MethodTypeDesc.ofDescriptor(im.type().stringValue()), im.bootstrapArgs().toArray(ConstantDesc[]::new)));
+                cb.invokedynamic(DynamicCallSiteDesc.of(im.bootstrapMethod(), im.name().stringValue(), MethodTypeDesc.ofDescriptor(im.type().stringValue()), im.bootstrapArgs().toArray(ConstantDesc[]::new)));
             case NewObjectInstruction im ->
-                cb.newObjectInstruction(im.className().asSymbol());
+                cb.new_(im.className().asSymbol());
             case NewPrimitiveArrayInstruction im ->
-                cb.newPrimitiveArrayInstruction(im.typeKind());
+                cb.newarray(im.typeKind());
             case NewReferenceArrayInstruction im ->
-                cb.newReferenceArrayInstruction(im.componentType());
+                cb.anewarray(im.componentType());
             case NewMultiArrayInstruction im ->
-                cb.newMultidimensionalArrayInstruction(im.dimensions(), im.arrayType());
+                cb.multianewarray(im.arrayType(), im.dimensions());
             case TypeCheckInstruction im ->
-                cb.typeCheckInstruction(im.opcode(), im.type().asSymbol());
+                cb.with(TypeCheckInstruction.of(im.opcode(), im.type().asSymbol()));
             case ArrayLoadInstruction im ->
-                cb.arrayLoadInstruction(im.typeKind());
+                cb.arrayLoad(im.typeKind());
             case ArrayStoreInstruction im ->
-                cb.arrayStoreInstruction(im.typeKind());
+                cb.arrayStore(im.typeKind());
             case StackInstruction im ->
-                cb.stackInstruction(im.opcode());
+                cb.with(StackInstruction.of(im.opcode()));
             case ConvertInstruction im ->
-                cb.convertInstruction(im.fromType(), im.toType());
+                cb.conversion(im.fromType(), im.toType());
             case OperatorInstruction im ->
-                cb.operatorInstruction(im.opcode());
+                cb.with(OperatorInstruction.of(im.opcode()));
             case ConstantInstruction im ->
-                cb.constantInstruction(im.opcode(), im.constantValue());
+                cb.loadConstant(im.opcode(), im.constantValue());
             case MonitorInstruction im ->
-                cb.monitorInstruction(im.opcode());
+                cb.with(MonitorInstruction.of(im.opcode()));
             case NopInstruction im ->
-                cb.nopInstruction();
+                cb.nop();
             case LabelTarget im ->
                 cb.labelBinding(im.label());
             case ExceptionCatch im ->
diff --git a/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java b/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java
index 88958939317..85fac494066 100644
--- a/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java
+++ b/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java
@@ -271,7 +271,7 @@ class RebuildingTransformation {
                 case ConstantInstruction i -> {
                     if (i.constantValue() == null)
                         if (pathSwitch.nextBoolean()) cob.aconst_null();
-                        else cob.constantInstruction(null);
+                        else cob.loadConstant(null);
                     else switch (i.constantValue()) {
                         case Integer iVal -> {
                             if (iVal == 1 && pathSwitch.nextBoolean()) cob.iconst_1();
@@ -282,25 +282,25 @@ class RebuildingTransformation {
                             else if (iVal == -1 && pathSwitch.nextBoolean()) cob.iconst_m1();
                             else if (iVal >= -128 && iVal <= 127 && pathSwitch.nextBoolean()) cob.bipush(iVal);
                             else if (iVal >= -32768 && iVal <= 32767 && pathSwitch.nextBoolean()) cob.sipush(iVal);
-                            else cob.constantInstruction(iVal);
+                            else cob.loadConstant(iVal);
                         }
                         case Long lVal -> {
                             if (lVal == 0 && pathSwitch.nextBoolean()) cob.lconst_0();
                             else if (lVal == 1 && pathSwitch.nextBoolean()) cob.lconst_1();
-                            else cob.constantInstruction(lVal);
+                            else cob.loadConstant(lVal);
                         }
                         case Float fVal -> {
                             if (fVal == 0.0 && pathSwitch.nextBoolean()) cob.fconst_0();
                             else if (fVal == 1.0 && pathSwitch.nextBoolean()) cob.fconst_1();
                             else if (fVal == 2.0 && pathSwitch.nextBoolean()) cob.fconst_2();
-                            else cob.constantInstruction(fVal);
+                            else cob.loadConstant(fVal);
                         }
                         case Double dVal -> {
                             if (dVal == 0.0d && pathSwitch.nextBoolean()) cob.dconst_0();
                             else if (dVal == 1.0d && pathSwitch.nextBoolean()) cob.dconst_1();
-                            else cob.constantInstruction(dVal);
+                            else cob.loadConstant(dVal);
                         }
-                        default -> cob.constantInstruction(i.constantValue());
+                        default -> cob.loadConstant(i.constantValue());
                     }
                 }
                 case ConvertInstruction i -> {
@@ -549,13 +549,13 @@ class RebuildingTransformation {
                     if (pathSwitch.nextBoolean()) {
                         switch (i.opcode()) {
                             case CHECKCAST -> cob.checkcast(i.type().asSymbol());
-                            case INSTANCEOF -> cob.instanceof_(i.type().asSymbol());
+                            case INSTANCEOF -> cob.instanceOf(i.type().asSymbol());
                             default -> throw new AssertionError("Should not reach here");
                         }
                     } else {
                         switch (i.opcode()) {
                             case CHECKCAST -> cob.checkcast(i.type());
-                            case INSTANCEOF -> cob.instanceof_(i.type());
+                            case INSTANCEOF -> cob.instanceOf(i.type());
                             default -> throw new AssertionError("Should not reach here");
                         }
                     }
diff --git a/test/jdk/jdk/classfile/helpers/Transforms.java b/test/jdk/jdk/classfile/helpers/Transforms.java
index a08c5d25717..64b4836d50a 100644
--- a/test/jdk/jdk/classfile/helpers/Transforms.java
+++ b/test/jdk/jdk/classfile/helpers/Transforms.java
@@ -217,7 +217,7 @@ public class Transforms {
                     cb.transformMethod(mm, (mb, me) -> {
                         if (me instanceof CodeModel xm) {
                             mb.withCode(xb -> {
-                                xb.nopInstruction();
+                                xb.nop();
                                 xm.forEachElement(new Consumer<>() {
                                     @Override
                                     public void accept(CodeElement e) {
diff --git a/test/jdk/jdk/lambda/separate/ClassToInterfaceConverter.java b/test/jdk/jdk/lambda/separate/ClassToInterfaceConverter.java
index 44c5c6ab179..26c17901281 100644
--- a/test/jdk/jdk/lambda/separate/ClassToInterfaceConverter.java
+++ b/test/jdk/jdk/lambda/separate/ClassToInterfaceConverter.java
@@ -43,7 +43,7 @@ public class ClassToInterfaceConverter implements ClassFilePreprocessor {
         CodeTransform ct = (b, e) -> {
             if (e instanceof InvokeInstruction i && i.owner() == classModel.thisClass()) {
                 Opcode opcode = i.opcode() == Opcode.INVOKEVIRTUAL ? Opcode.INVOKEINTERFACE : i.opcode();
-                b.invokeInstruction(opcode, i.owner().asSymbol(),
+                b.invoke(opcode, i.owner().asSymbol(),
                         i.name().stringValue(), i.typeSymbol(), true);
             } else {
                 b.with(e);
diff --git a/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java b/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java
index 45fc67aea25..fb73901adf4 100644
--- a/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java
+++ b/test/micro/org/openjdk/bench/java/lang/invoke/LazyStaticColdStart.java
@@ -76,7 +76,7 @@ public class LazyStaticColdStart {
             static final byte[] classBytes = ClassFile.of().build(describedClass, clb -> {
                 clb.withField("v", CD_long, ACC_STATIC);
                 clb.withMethodBody(CLASS_INIT_NAME, MTD_void, ACC_STATIC, cob -> {
-                    cob.constantInstruction(100L);
+                    cob.loadConstant(100L);
                     cob.invokestatic(CD_Blackhole, "consumeCPU", MTD_void_long);
                     cob.invokestatic(CD_ThreadLocalRandom, "current", MTD_ThreadLocalRandom);
                     cob.invokevirtual(CD_ThreadLocalRandom, "nextLong", MTD_long);
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/RebuildMethodBodies.java b/test/micro/org/openjdk/bench/jdk/classfile/RebuildMethodBodies.java
index 4c657b961b1..d5e77c1a2a7 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/RebuildMethodBodies.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/RebuildMethodBodies.java
@@ -91,11 +91,11 @@ public class RebuildMethodBodies {
         cc.transform(clm, ClassTransform.transformingMethodBodies((cob, coe) -> {
             switch (coe) {
                 case FieldInstruction i ->
-                    cob.fieldInstruction(i.opcode(), i.owner().asSymbol(), i.name().stringValue(), i.typeSymbol());
+                    cob.fieldAccess(i.opcode(), i.owner().asSymbol(), i.name().stringValue(), i.typeSymbol());
                 case InvokeDynamicInstruction i ->
                     cob.invokedynamic(i.invokedynamic().asSymbol());
                 case InvokeInstruction i ->
-                    cob.invokeInstruction(i.opcode(), i.owner().asSymbol(), i.name().stringValue(), i.typeSymbol(), i.isInterface());
+                    cob.invoke(i.opcode(), i.owner().asSymbol(), i.name().stringValue(), i.typeSymbol(), i.isInterface());
                 case NewMultiArrayInstruction i ->
                     cob.multianewarray(i.arrayType().asSymbol(), i.dimensions());
                 case NewObjectInstruction i ->
@@ -103,7 +103,7 @@ public class RebuildMethodBodies {
                 case NewReferenceArrayInstruction i ->
                     cob.anewarray(i.componentType().asSymbol());
                 case TypeCheckInstruction i ->
-                    cob.typeCheckInstruction(i.opcode(), i.type().asSymbol());
+                    cob.with(TypeCheckInstruction.of(i.opcode(), i.type().asSymbol()));
                 default -> cob.with(coe);
             }
         }));
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java b/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java
index b5582bcf52e..def55b5f20c 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java
@@ -203,7 +203,7 @@ public class Transforms {
                     cb.transformMethod(mm, (mb, me) -> {
                         if (me instanceof CodeModel xm) {
                             mb.withCode(xb -> {
-                                xb.nopInstruction();
+                                xb.nop();
                                 xm.forEachElement(new Consumer<>() {
                                     @Override
                                     public void accept(CodeElement e) {
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/Write.java b/test/micro/org/openjdk/bench/jdk/classfile/Write.java
index 96aafb6f38e..59d07b05927 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/Write.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/Write.java
@@ -141,9 +141,9 @@ public class Write {
             cb.withVersion(52, 0);
             cb.with(SourceFileAttribute.of(cb.constantPool().utf8Entry(("MyClass.java"))))
               .withMethod(INIT_NAME, MTD_void, 0, mb -> mb
-                      .withCode(codeb -> codeb.loadInstruction(TypeKind.ReferenceType, 0)
-                                              .invokeInstruction(INVOKESPECIAL, CD_Object, INIT_NAME, MTD_void, false)
-                                              .returnInstruction(VoidType)
+                      .withCode(codeb -> codeb.loadLocal(TypeKind.ReferenceType, 0)
+                                              .invoke(INVOKESPECIAL, CD_Object, INIT_NAME, MTD_void, false)
+                                              .return_(VoidType)
                       )
               );
             for (int xi = 0; xi < 40; ++xi) {
@@ -154,25 +154,25 @@ public class Write {
                                   java.lang.classfile.Label loopEnd = c0.newLabel();
                                   int vFac = 1;
                                   int vI = 2;
-                                  c0.constantInstruction(ICONST_1, 1)         // 0
-                                    .storeInstruction(IntType, vFac)        // 1
-                                    .constantInstruction(ICONST_1, 1)         // 2
-                                    .storeInstruction(IntType, vI)          // 3
+                                  c0.iconst_1()         // 0
+                                    .istore(vFac)       // 1
+                                    .iconst_1()         // 2
+                                    .istore(vI)         // 3
                                     .labelBinding(loopTop)
-                                    .loadInstruction(IntType, vI)           // 4
-                                    .constantInstruction(BIPUSH, 10)         // 5
-                                    .branchInstruction(IF_ICMPGE, loopEnd) // 6
-                                    .loadInstruction(IntType, vFac)         // 7
-                                    .loadInstruction(IntType, vI)           // 8
-                                    .operatorInstruction(IMUL)             // 9
-                                    .storeInstruction(IntType, vFac)        // 10
-                                    .incrementInstruction(vI, 1)    // 11
-                                    .branchInstruction(GOTO, loopTop)     // 12
+                                    .iload(vI)          // 4
+                                    .bipush(10)         // 5
+                                    .if_icmpge(loopEnd) // 6
+                                    .iload(vFac)        // 7
+                                    .iload(vI)          // 8
+                                    .imul()             // 9
+                                    .istore(vFac)       // 10
+                                    .iinc(vI, 1)        // 11
+                                    .goto_(loopTop)     // 12
                                     .labelBinding(loopEnd)
-                                    .fieldInstruction(GETSTATIC, CD_System, "out", CD_PrintStream)   // 13
-                                    .loadInstruction(IntType, vFac)
-                                    .invokeInstruction(INVOKEVIRTUAL, CD_PrintStream, "println", MTD_void_int, false)  // 15
-                                    .returnInstruction(VoidType);
+                                    .getstatic(CD_System, "out", CD_PrintStream) // 13
+                                    .iload(vFac)
+                                    .invokevirtual(CD_PrintStream, "println", MTD_void_int) // 15
+                                    .return_();
                         }));
             }
         });
@@ -189,9 +189,9 @@ public class Write {
             cb.withVersion(52, 0);
             cb.with(SourceFileAttribute.of(cb.constantPool().utf8Entry(("MyClass.java"))))
               .withMethod(INIT_NAME, MTD_void, 0,
-                          mb -> mb.withCode(codeb -> codeb.loadInstruction(ReferenceType, 0)
-                                                          .invokeInstruction(INVOKESPECIAL, CD_Object, INIT_NAME, MTD_void, false)
-                                                          .returnInstruction(VoidType)
+                          mb -> mb.withCode(codeb -> codeb.loadLocal(ReferenceType, 0)
+                                                          .invokespecial(CD_Object, INIT_NAME, MTD_void, false)
+                                                          .return_()
                           )
               );
             for (int xi = 0; xi < 40; ++xi) {
@@ -202,25 +202,25 @@ public class Write {
                                   java.lang.classfile.Label loopEnd = c0.newLabel();
                                   int vFac = 1;
                                   int vI = 2;
-                                  c0.constantInstruction(ICONST_1, 1)        // 0
-                                    .storeInstruction(IntType, 1)          // 1
-                                    .constantInstruction(ICONST_1, 1)        // 2
-                                    .storeInstruction(IntType, 2)          // 3
+                                  c0.iconst_1()         // 0
+                                    .istore(1)          // 1
+                                    .iconst_1()         // 2
+                                    .istore(2)          // 3
                                     .labelBinding(loopTop)
-                                    .loadInstruction(IntType, 2)           // 4
-                                    .constantInstruction(BIPUSH, 10)         // 5
-                                    .branchInstruction(IF_ICMPGE, loopEnd) // 6
-                                    .loadInstruction(IntType, 1)           // 7
-                                    .loadInstruction(IntType, 2)           // 8
-                                    .operatorInstruction(IMUL)             // 9
-                                    .storeInstruction(IntType, 1)          // 10
-                                    .incrementInstruction(2, 1)    // 11
-                                    .branchInstruction(GOTO, loopTop)     // 12
+                                    .iload(2)           // 4
+                                    .bipush(10)         // 5
+                                    .if_icmpge(loopEnd) // 6
+                                    .iload(1)           // 7
+                                    .iload(2)           // 8
+                                    .imul()             // 9
+                                    .istore(1)          // 10
+                                    .iinc(2, 1)         // 11
+                                    .goto_(loopTop)     // 12
                                     .labelBinding(loopEnd)
-                                    .fieldInstruction(GETSTATIC, CD_System, "out", CD_PrintStream)   // 13
-                                    .loadInstruction(IntType, 1)
-                                    .invokeInstruction(INVOKEVIRTUAL, CD_PrintStream, "println", MTD_void_int, false)  // 15
-                                    .returnInstruction(VoidType);
+                                    .getstatic(CD_System, "out", CD_PrintStream)  // 13
+                                    .iload(1)
+                                    .invokevirtual(CD_PrintStream, "println", MTD_void_int)  // 15
+                                    .return_();
                         }));
             }
         });

From beebce044db97e50a7aea3f83d70e134b2128d0a Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Thu, 2 May 2024 10:21:21 +0000
Subject: [PATCH 281/486] 8331421: ubsan: vmreg.cpp checking error member call
 on misaligned address

Reviewed-by: mbaesken, lucy
---
 src/hotspot/share/code/vmreg.cpp | 2 +-
 src/hotspot/share/code/vmreg.hpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/code/vmreg.cpp b/src/hotspot/share/code/vmreg.cpp
index 37c3137a102..ba30c114c6c 100644
--- a/src/hotspot/share/code/vmreg.cpp
+++ b/src/hotspot/share/code/vmreg.cpp
@@ -30,7 +30,7 @@
 // used by SA and jvmti, but it's a leaky abstraction: SA and jvmti
 // "know" that stack0 is an integer masquerading as a pointer. For the
 // sake of those clients, we preserve this interface.
-VMReg VMRegImpl::stack0 = (VMReg)(intptr_t)VMRegImpl::stack_0()->value();
+VMReg VMRegImpl::stack0 = (VMReg)(intptr_t)FIRST_STACK;
 
 // VMRegs are 4 bytes wide on all platforms
 const int VMRegImpl::stack_slot_size = 4;
diff --git a/src/hotspot/share/code/vmreg.hpp b/src/hotspot/share/code/vmreg.hpp
index 78f52b8d57a..41e40e9a017 100644
--- a/src/hotspot/share/code/vmreg.hpp
+++ b/src/hotspot/share/code/vmreg.hpp
@@ -54,7 +54,8 @@ friend class OptoReg;
 // friend class Location;
 private:
   enum {
-    BAD_REG = -1
+    BAD_REG = -1,
+    FIRST_STACK = (ConcreteRegisterImpl::number_of_registers + 7) & ~7
   };
 
   // Despite being private, this field is exported to the
@@ -71,7 +72,7 @@ private:
 public:
 
   static constexpr VMReg stack_0() {
-    return first() + ((ConcreteRegisterImpl::number_of_registers + 7) & ~7);
+    return first() + FIRST_STACK;
   }
 
   static VMReg as_VMReg(int val, bool bad_ok = false) {

From c9255f3f5d3b826b9502e21aa953f0cf9f9abdec Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 2 May 2024 10:46:29 +0000
Subject: [PATCH 282/486] 8331514: Tests should not use the "Classpath"
 exception form of the legal header

Reviewed-by: dfuchs
---
 test/jdk/java/lang/ProcessBuilder/JspawnhelperWarnings.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/jdk/java/lang/ProcessBuilder/JspawnhelperWarnings.java b/test/jdk/java/lang/ProcessBuilder/JspawnhelperWarnings.java
index daffb4b8c84..d9896f16e00 100644
--- a/test/jdk/java/lang/ProcessBuilder/JspawnhelperWarnings.java
+++ b/test/jdk/java/lang/ProcessBuilder/JspawnhelperWarnings.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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

From 2056968777f3c8e3f783a8d52ff8a537c52fa8b1 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 2 May 2024 10:46:41 +0000
Subject: [PATCH 283/486] 8331513: Tests should not use the "Classpath"
 exception form of the legal header

Reviewed-by: dfuchs
---
 test/jdk/java/net/httpclient/RedirectTimeoutTest.java         | 4 +---
 .../java/net/httpclient/http2/ExpectContinueResetTest.java    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/jdk/java/net/httpclient/RedirectTimeoutTest.java b/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
index e907bcd8228..f549898386c 100644
--- a/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
+++ b/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/jdk/java/net/httpclient/http2/ExpectContinueResetTest.java b/test/jdk/java/net/httpclient/http2/ExpectContinueResetTest.java
index faab08e2862..b733eb180eb 100644
--- a/test/jdk/java/net/httpclient/http2/ExpectContinueResetTest.java
+++ b/test/jdk/java/net/httpclient/http2/ExpectContinueResetTest.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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

From 4a78906db1ebb56a759b43c2dfa909215491d4c0 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Thu, 2 May 2024 11:13:41 +0000
Subject: [PATCH 284/486] 8331537: Test code should not use the "Classpath"
 exception clause

Reviewed-by: jpai
---
 .../tools/javac/launcher/BasicSourceLauncherTests.java        | 4 +---
 .../tools/javac/launcher/ModuleSourceLauncherTests.java       | 4 +---
 .../tools/javac/launcher/MultiFileSourceLauncherTests.java    | 4 +---
 .../tools/javac/launcher/ProgramDescriptorTests.java          | 4 +---
 test/langtools/tools/javac/launcher/Run.java                  | 4 +---
 test/langtools/tools/javac/launcher/src/p/q/CLTest.java       | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/test/langtools/tools/javac/launcher/BasicSourceLauncherTests.java b/test/langtools/tools/javac/launcher/BasicSourceLauncherTests.java
index bf44a704b31..eb000276e14 100644
--- a/test/langtools/tools/javac/launcher/BasicSourceLauncherTests.java
+++ b/test/langtools/tools/javac/launcher/BasicSourceLauncherTests.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/langtools/tools/javac/launcher/ModuleSourceLauncherTests.java b/test/langtools/tools/javac/launcher/ModuleSourceLauncherTests.java
index d5103525f57..908674eb692 100644
--- a/test/langtools/tools/javac/launcher/ModuleSourceLauncherTests.java
+++ b/test/langtools/tools/javac/launcher/ModuleSourceLauncherTests.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/langtools/tools/javac/launcher/MultiFileSourceLauncherTests.java b/test/langtools/tools/javac/launcher/MultiFileSourceLauncherTests.java
index 6148bcaf67c..dbf6be5b121 100644
--- a/test/langtools/tools/javac/launcher/MultiFileSourceLauncherTests.java
+++ b/test/langtools/tools/javac/launcher/MultiFileSourceLauncherTests.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/langtools/tools/javac/launcher/ProgramDescriptorTests.java b/test/langtools/tools/javac/launcher/ProgramDescriptorTests.java
index 8e0f1cdba90..93dd7a42072 100644
--- a/test/langtools/tools/javac/launcher/ProgramDescriptorTests.java
+++ b/test/langtools/tools/javac/launcher/ProgramDescriptorTests.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/langtools/tools/javac/launcher/Run.java b/test/langtools/tools/javac/launcher/Run.java
index 4d40d9d6a4c..f6fd6abb0e3 100644
--- a/test/langtools/tools/javac/launcher/Run.java
+++ b/test/langtools/tools/javac/launcher/Run.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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
diff --git a/test/langtools/tools/javac/launcher/src/p/q/CLTest.java b/test/langtools/tools/javac/launcher/src/p/q/CLTest.java
index e4517e78fc4..9f7e5577847 100644
--- a/test/langtools/tools/javac/launcher/src/p/q/CLTest.java
+++ b/test/langtools/tools/javac/launcher/src/p/q/CLTest.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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

From cccc95358d5c38cbcabc7f79abc53674deb1e6d8 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Thu, 2 May 2024 11:38:00 +0000
Subject: [PATCH 285/486] 8329258: TailCall should not use frame pointer
 register for jump target

Co-authored-by: Fei Yang <fyang@openjdk.org>
Reviewed-by: rcastanedalo, aph
---
 src/hotspot/cpu/aarch64/aarch64.ad            | 28 ++++++++-
 src/hotspot/cpu/riscv/riscv.ad                | 31 +++++++++-
 src/hotspot/cpu/x86/x86_32.ad                 |  2 +
 src/hotspot/cpu/x86/x86_64.ad                 |  2 +
 .../TestTailCallInArrayCopyStub.java          | 58 +++++++++++++++++++
 5 files changed, 117 insertions(+), 4 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/arraycopy/TestTailCallInArrayCopyStub.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index bb7f7370c5f..a82a1b396e0 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -694,6 +694,11 @@ reg_class no_special_ptr_reg %{
   return _NO_SPECIAL_PTR_REG_mask;
 %}
 
+// Class for all non_special pointer registers (excluding rfp)
+reg_class no_special_no_rfp_ptr_reg %{
+  return _NO_SPECIAL_NO_RFP_PTR_REG_mask;
+%}
+
 // Class for all float registers
 reg_class float_reg(
     V0,
@@ -1125,6 +1130,7 @@ extern RegMask _PTR_REG_mask;
 extern RegMask _NO_SPECIAL_REG32_mask;
 extern RegMask _NO_SPECIAL_REG_mask;
 extern RegMask _NO_SPECIAL_PTR_REG_mask;
+extern RegMask _NO_SPECIAL_NO_RFP_PTR_REG_mask;
 
 class CallStubImpl {
 
@@ -1213,6 +1219,7 @@ source %{
   RegMask _NO_SPECIAL_REG32_mask;
   RegMask _NO_SPECIAL_REG_mask;
   RegMask _NO_SPECIAL_PTR_REG_mask;
+  RegMask _NO_SPECIAL_NO_RFP_PTR_REG_mask;
 
   void reg_mask_init() {
     // We derive below RegMask(s) from the ones which are auto-generated from
@@ -1249,6 +1256,9 @@ source %{
       _NO_SPECIAL_REG_mask.Remove(OptoReg::as_OptoReg(r29->as_VMReg()));
       _NO_SPECIAL_PTR_REG_mask.Remove(OptoReg::as_OptoReg(r29->as_VMReg()));
     }
+
+    _NO_SPECIAL_NO_RFP_PTR_REG_mask = _NO_SPECIAL_PTR_REG_mask;
+    _NO_SPECIAL_NO_RFP_PTR_REG_mask.Remove(OptoReg::as_OptoReg(r29->as_VMReg()));
   }
 
   // Optimizaton of volatile gets and puts
@@ -4690,6 +4700,18 @@ operand iRegPNoSp()
   interface(REG_INTER);
 %}
 
+// This operand is not allowed to use rfp even if
+// rfp is not used to hold the frame pointer.
+operand iRegPNoSpNoRfp()
+%{
+  constraint(ALLOC_IN_RC(no_special_no_rfp_ptr_reg));
+  match(RegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
 // Pointer 64 bit Register R0 only
 operand iRegP_R0()
 %{
@@ -16087,7 +16109,9 @@ instruct CallLeafNoFPDirect(method meth)
 // Also known as an 'interprocedural jump'.
 // Target of jump will eventually return to caller.
 // TailJump below removes the return address.
-instruct TailCalljmpInd(iRegPNoSp jump_target, inline_cache_RegP method_ptr)
+// Don't use rfp for 'jump_target' because a MachEpilogNode has already been
+// emitted just above the TailCall which has reset rfp to the caller state.
+instruct TailCalljmpInd(iRegPNoSpNoRfp jump_target, inline_cache_RegP method_ptr)
 %{
   match(TailCall jump_target method_ptr);
 
@@ -16100,7 +16124,7 @@ instruct TailCalljmpInd(iRegPNoSp jump_target, inline_cache_RegP method_ptr)
   ins_pipe(pipe_class_call);
 %}
 
-instruct TailjmpInd(iRegPNoSp jump_target, iRegP_R0 ex_oop)
+instruct TailjmpInd(iRegPNoSpNoRfp jump_target, iRegP_R0 ex_oop)
 %{
   match(TailJump jump_target ex_oop);
 
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index f9d66f158fb..826049f4b8a 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -649,10 +649,12 @@ reg_class non_allocatable_reg(
     R23, R23_H                // java thread
 );
 
+// Class for all non-special integer registers
 reg_class no_special_reg32 %{
   return _NO_SPECIAL_REG32_mask;
 %}
 
+// Class for all non-special long integer registers
 reg_class no_special_reg %{
   return _NO_SPECIAL_REG_mask;
 %}
@@ -661,10 +663,16 @@ reg_class ptr_reg %{
   return _PTR_REG_mask;
 %}
 
+// Class for all non_special pointer registers
 reg_class no_special_ptr_reg %{
   return _NO_SPECIAL_PTR_REG_mask;
 %}
 
+// Class for all non_special pointer registers (excluding fp)
+reg_class no_special_no_fp_ptr_reg %{
+  return _NO_SPECIAL_NO_FP_PTR_REG_mask;
+%}
+
 // Class for 64 bit register r10
 reg_class r10_reg(
     R10, R10_H
@@ -1037,6 +1045,7 @@ extern RegMask _PTR_REG_mask;
 extern RegMask _NO_SPECIAL_REG32_mask;
 extern RegMask _NO_SPECIAL_REG_mask;
 extern RegMask _NO_SPECIAL_PTR_REG_mask;
+extern RegMask _NO_SPECIAL_NO_FP_PTR_REG_mask;
 
 class CallStubImpl {
 
@@ -1099,6 +1108,7 @@ RegMask _PTR_REG_mask;
 RegMask _NO_SPECIAL_REG32_mask;
 RegMask _NO_SPECIAL_REG_mask;
 RegMask _NO_SPECIAL_PTR_REG_mask;
+RegMask _NO_SPECIAL_NO_FP_PTR_REG_mask;
 
 void reg_mask_init() {
 
@@ -1133,6 +1143,9 @@ void reg_mask_init() {
     _NO_SPECIAL_REG_mask.Remove(OptoReg::as_OptoReg(x8->as_VMReg()));
     _NO_SPECIAL_PTR_REG_mask.Remove(OptoReg::as_OptoReg(x8->as_VMReg()));
   }
+
+  _NO_SPECIAL_NO_FP_PTR_REG_mask = _NO_SPECIAL_PTR_REG_mask;
+  _NO_SPECIAL_NO_FP_PTR_REG_mask.Remove(OptoReg::as_OptoReg(x8->as_VMReg()));
 }
 
 void PhaseOutput::pd_perform_mach_node_analysis() {
@@ -3175,6 +3188,18 @@ operand iRegPNoSp()
   interface(REG_INTER);
 %}
 
+// This operand is not allowed to use fp even if
+// fp is not used to hold the frame pointer.
+operand iRegPNoSpNoFp()
+%{
+  constraint(ALLOC_IN_RC(no_special_no_fp_ptr_reg));
+  match(RegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
 operand iRegP_R10()
 %{
   constraint(ALLOC_IN_RC(r10_reg));
@@ -10506,7 +10531,9 @@ instruct cmpFastUnlockLightweight(rFlagsReg cr, iRegP object, iRegP_R10 box, iRe
 // Also known as an 'interprocedural jump'.
 // Target of jump will eventually return to caller.
 // TailJump below removes the return address.
-instruct TailCalljmpInd(iRegPNoSp jump_target, inline_cache_RegP method_oop)
+// Don't use fp for 'jump_target' because a MachEpilogNode has already been
+// emitted just above the TailCall which has reset fp to the caller state.
+instruct TailCalljmpInd(iRegPNoSpNoFp jump_target, inline_cache_RegP method_oop)
 %{
   match(TailCall jump_target method_oop);
 
@@ -10519,7 +10546,7 @@ instruct TailCalljmpInd(iRegPNoSp jump_target, inline_cache_RegP method_oop)
   ins_pipe(pipe_class_call);
 %}
 
-instruct TailjmpInd(iRegPNoSp jump_target, iRegP_R10 ex_oop)
+instruct TailjmpInd(iRegPNoSpNoFp jump_target, iRegP_R10 ex_oop)
 %{
   match(TailJump jump_target ex_oop);
 
diff --git a/src/hotspot/cpu/x86/x86_32.ad b/src/hotspot/cpu/x86/x86_32.ad
index 39c09efc49c..240e9b10323 100644
--- a/src/hotspot/cpu/x86/x86_32.ad
+++ b/src/hotspot/cpu/x86/x86_32.ad
@@ -13558,6 +13558,8 @@ instruct Ret() %{
 // Also known as an 'interprocedural jump'.
 // Target of jump will eventually return to caller.
 // TailJump below removes the return address.
+// Don't use ebp for 'jump_target' because a MachEpilogNode has already been
+// emitted just above the TailCall which has reset ebp to the caller state.
 instruct TailCalljmpInd(eRegP_no_EBP jump_target, eBXRegP method_ptr) %{
   match(TailCall jump_target method_ptr);
   ins_cost(300);
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 288212d6d13..5d1c513b10f 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -12469,6 +12469,8 @@ instruct Ret()
 // Also known as an 'interprocedural jump'.
 // Target of jump will eventually return to caller.
 // TailJump below removes the return address.
+// Don't use rbp for 'jump_target' because a MachEpilogNode has already been
+// emitted just above the TailCall which has reset rbp to the caller state.
 instruct TailCalljmpInd(no_rbp_RegP jump_target, rbx_RegP method_ptr)
 %{
   match(TailCall jump_target method_ptr);
diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestTailCallInArrayCopyStub.java b/test/hotspot/jtreg/compiler/arraycopy/TestTailCallInArrayCopyStub.java
new file mode 100644
index 00000000000..19ea82509bc
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/arraycopy/TestTailCallInArrayCopyStub.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024, 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
+ * @key stress randomness
+ * @bug 8329258
+ * @summary Test correct execution of the tail call at the end of the arraycopy stub.
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -Xbatch -XX:-TieredCompilation
+ *                   -XX:+StressGCM -XX:+StressLCM
+ *                   -XX:CompileCommand=quiet -XX:CompileCommand=compileonly,*::test
+ *                   compiler.arraycopy.TestTailCallInArrayCopyStub
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -Xbatch -XX:-TieredCompilation
+ *                   -XX:+StressGCM -XX:+StressLCM -XX:StressSeed=75451718
+ *                   -XX:CompileCommand=quiet -XX:CompileCommand=compileonly,*::test
+ *                   compiler.arraycopy.TestTailCallInArrayCopyStub
+ */
+
+package compiler.arraycopy;
+
+public class TestTailCallInArrayCopyStub {
+
+    public static void test(byte[] src, byte[] dst) {
+        try {
+            System.arraycopy(src, -1, dst, 0, src.length);
+        } catch (Exception e) {
+            // Expected
+        }
+    }
+
+    public static void main(String[] args) {
+        byte[] array = new byte[5];
+        for (int i = 0; i < 10_000; ++i) {
+            test(array, array);
+        }
+    }
+}

From c21672d8c94da6aa613174744ceaa945ca2a474a Mon Sep 17 00:00:00 2001
From: Weibing Xiao <wxiao@openjdk.org>
Date: Thu, 2 May 2024 11:48:41 +0000
Subject: [PATCH 286/486] 8331077: nroff man page update for jar tool

Reviewed-by: jjg, coffeys
---
 src/jdk.jartool/share/man/jar.1 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/jdk.jartool/share/man/jar.1 b/src/jdk.jartool/share/man/jar.1
index 26d2c422b2d..49a028e0f29 100644
--- a/src/jdk.jartool/share/man/jar.1
+++ b/src/jdk.jartool/share/man/jar.1
@@ -186,7 +186,8 @@ created or a non-modular JAR file being updated.
 Specifies the location of module dependence for generating the hash.
 .TP
 \f[V]\[at]\f[R]\f[I]file\f[R]
-Reads \f[V]jar\f[R] options and file names from a text file.
+Reads \f[V]jar\f[R] options and file names from a text file as if they
+were supplied on the command line
 .SH OPERATION MODIFIERS VALID ONLY IN CREATE, UPDATE, AND GENERATE-INDEX MODES
 .PP
 You can use the following options to customize the actions of the create
@@ -330,11 +331,14 @@ class files from the file \f[V]classes.list\f[R].
 .PP
 \f[B]Note:\f[R]
 .PP
-To shorten or simplify the \f[V]jar\f[R] command, you can specify
-arguments in a separate text file and pass it to the \f[V]jar\f[R]
-command with the at sign (\f[V]\[at]\f[R]) as a prefix.
+To shorten or simplify the \f[V]jar\f[R] command, you can provide an arg
+file that lists the files to include in the JAR file and pass it to the
+\f[V]jar\f[R] command with the at sign (\f[V]\[at]\f[R]) as a prefix.
 .RS
 .PP
 \f[V]jar --create --file my.jar \[at]classes.list\f[R]
 .RE
+.PP
+If one or more entries in the arg file cannot be found then the jar
+command fails without creating the JAR file.
 .RE

From 257a07d5ca4d876f7f79a5f2598054ca261777ee Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 2 May 2024 12:20:07 +0000
Subject: [PATCH 287/486] 8331511: Tests should not use the "Classpath"
 exception form of the legal header

Reviewed-by: jpai
---
 test/jdk/jdk/classfile/OptionsTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/jdk/jdk/classfile/OptionsTest.java b/test/jdk/jdk/classfile/OptionsTest.java
index 4a47c899d8e..eecc2d7a385 100644
--- a/test/jdk/jdk/classfile/OptionsTest.java
+++ b/test/jdk/jdk/classfile/OptionsTest.java
@@ -4,9 +4,7 @@
  *
  * 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.
+ * 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

From 9912abf586f4e0f76591639ae18d5c074edaa2c5 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 2 May 2024 12:20:18 +0000
Subject: [PATCH 288/486] 8331011: [XWayland] TokenStorage fails under Security
 Manager

Reviewed-by: prr, honkar, serb
---
 .../sun/awt/screencast/TokenStorage.java      | 66 +++++++++++++------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
index 2f31611cf5f..3daf9b2a8b8 100644
--- a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -37,6 +37,8 @@ import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
 import java.nio.file.attribute.PosixFilePermission;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -58,6 +60,7 @@ import static sun.awt.screencast.ScreencastHelper.SCREENCAST_DEBUG;
  * The restore token allows the ScreenCast session to be restored
  * with previously granted screen access permissions.
  */
+@SuppressWarnings("removal")
 final class TokenStorage {
 
     private TokenStorage() {}
@@ -69,8 +72,24 @@ final class TokenStorage {
     private static final Path PROPS_PATH;
     private static final Path PROP_FILENAME;
 
+    private static void doPrivilegedRunnable(Runnable runnable) {
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            @Override
+            public Void run() {
+                runnable.run();
+                return null;
+            }
+        });
+    }
+
     static {
-        PROPS_PATH = setupPath();
+        PROPS_PATH = AccessController.doPrivileged(new PrivilegedAction<Path>() {
+            @Override
+            public Path run() {
+                return setupPath();
+            }
+        });
+
         if (PROPS_PATH != null) {
             PROP_FILENAME = PROPS_PATH.getFileName();
             if (SCREENCAST_DEBUG) {
@@ -192,9 +211,9 @@ final class TokenStorage {
                     }
 
                     if (kind == ENTRY_CREATE) {
-                        setFilePermission(PROPS_PATH);
+                        doPrivilegedRunnable(() -> setFilePermission(PROPS_PATH));
                     } else if (kind == ENTRY_MODIFY) {
-                        readTokens(PROPS_PATH);
+                        doPrivilegedRunnable(() -> readTokens(PROPS_PATH));
                     } else if (kind == ENTRY_DELETE) {
                         synchronized (PROPS) {
                             PROPS.clear();
@@ -207,24 +226,31 @@ final class TokenStorage {
         }
     }
 
+    private static WatchService watchService;
+
     private static void setupWatch() {
-        try {
-            WatchService watchService =
-                    FileSystems.getDefault().newWatchService();
+        doPrivilegedRunnable(() -> {
+            try {
+                watchService =
+                        FileSystems.getDefault().newWatchService();
 
-            PROPS_PATH
-                    .getParent()
-                    .register(watchService,
-                            ENTRY_CREATE,
-                            ENTRY_DELETE,
-                            ENTRY_MODIFY);
+                PROPS_PATH
+                        .getParent()
+                        .register(watchService,
+                                ENTRY_CREATE,
+                                ENTRY_DELETE,
+                                ENTRY_MODIFY);
 
-            new WatcherThread(watchService).start();
-        } catch (Exception e) {
-            if (SCREENCAST_DEBUG) {
-                System.err.printf("Token storage: failed to setup " +
-                        "file watch %s\n", e);
+            } catch (Exception e) {
+                if (SCREENCAST_DEBUG) {
+                    System.err.printf("Token storage: failed to setup " +
+                            "file watch %s\n", e);
+                }
             }
+        });
+
+        if (watchService != null) {
+            new WatcherThread(watchService).start();
         }
     }
 
@@ -276,7 +302,7 @@ final class TokenStorage {
             }
 
             if (changed) {
-                store("save tokens");
+                doPrivilegedRunnable(() -> store("save tokens"));
             }
         }
     }
@@ -331,7 +357,7 @@ final class TokenStorage {
                     .toList();
         }
 
-        removeMalformedRecords(malformed);
+        doPrivilegedRunnable(() -> removeMalformedRecords(malformed));
 
         // 1. Try to find exact matches
         for (TokenItem tokenItem : allTokenItems) {

From a024eed7384828643e302f021a253717f53e3778 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 2 May 2024 12:42:59 +0000
Subject: [PATCH 289/486] 8331478: JFR: Rename printHelp methods for
 jdk.jfr.internal.dcmd classes

Reviewed-by: mgronlun
---
 src/hotspot/share/jfr/dcmd/jfrDcmds.cpp                | 10 +++++-----
 .../classes/jdk/jfr/internal/dcmd/AbstractDCmd.java    |  6 +++---
 .../share/classes/jdk/jfr/internal/dcmd/DCmdCheck.java |  4 ++--
 .../classes/jdk/jfr/internal/dcmd/DCmdConfigure.java   |  4 ++--
 .../share/classes/jdk/jfr/internal/dcmd/DCmdDump.java  |  4 ++--
 .../share/classes/jdk/jfr/internal/dcmd/DCmdQuery.java |  4 ++--
 .../share/classes/jdk/jfr/internal/dcmd/DCmdStart.java |  4 ++--
 .../share/classes/jdk/jfr/internal/dcmd/DCmdStop.java  |  4 ++--
 .../share/classes/jdk/jfr/internal/dcmd/DCmdView.java  |  4 ++--
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
index 34ccef434d0..c6944cfa219 100644
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
@@ -221,7 +221,7 @@ void JfrDCmd::execute(DCmdSource source, TRAPS) {
     return;
   }
   if (source == DCmd_Source_Internal && _args != nullptr && strcmp(_args, "help") == 0) {
-     print_java_help("printStartupHelp");
+     print_java_help("getStartupHelp");
      vm_exit(0);
   }
 
@@ -246,17 +246,17 @@ void JfrDCmd::execute(DCmdSource source, TRAPS) {
   handle_dcmd_result(output(), result.get_oop(), source, THREAD);
 }
 
-void JfrDCmd::print_java_help(const char* help_method) const {
+void JfrDCmd::print_java_help(const char* get_help_method) const {
   static const char signature[] = "()[Ljava/lang/String;";
   JavaThread* thread = JavaThread::current();
   JavaValue result(T_OBJECT);
-  JfrJavaArguments printHelp(&result, javaClass(), help_method, signature, thread);
-  invoke(printHelp, thread);
+  JfrJavaArguments java_method(&result, javaClass(), get_help_method, signature, thread);
+  invoke(java_method, thread);
   handle_dcmd_result(output(), result.get_oop(), DCmd_Source_MBean, thread);
 }
 
 void JfrDCmd::print_help(const char* name) const {
-  print_java_help("printHelp");
+  print_java_help("getHelp");
 }
 
 static void initialize_dummy_descriptors(GrowableArray<DCmdArgumentInfo*>* array) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/AbstractDCmd.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/AbstractDCmd.java
index 21a33481fe8..d0b95df8484 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/AbstractDCmd.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/AbstractDCmd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ abstract class AbstractDCmd {
     private String source;
 
     // Called by native
-    public abstract String[] printHelp();
+    public abstract String[] getHelp();
 
     // Called by native. The number of arguments for each command is
     // reported to the DCmdFramework as a hardcoded number in native.
@@ -233,7 +233,7 @@ abstract class AbstractDCmd {
     }
 
     protected final void printHelpText() {
-        for (String line : printHelp()) {
+        for (String line : getHelp()) {
             println(line);
         }
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdCheck.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdCheck.java
index fdf077fa6c9..998cca46131 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdCheck.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,7 +139,7 @@ final class DCmdCheck extends AbstractDCmd {
     }
 
     @Override
-    public String[] printHelp() {
+    public String[] getHelp() {
             // 0123456789001234567890012345678900123456789001234567890012345678900123456789001234567890
         return """
                Syntax : JFR.check [options]
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
index c67c8a756c7..8ea49cbd3a5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -248,7 +248,7 @@ final class DCmdConfigure extends AbstractDCmd {
     }
 
     @Override
-    public String[] printHelp() {
+    public String[] getHelp() {
         throw new InternalError("Should not reach here!");
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdDump.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdDump.java
index 594e78bdbbf..605eb4bc745 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdDump.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -194,7 +194,7 @@ final class DCmdDump extends AbstractDCmd {
     }
 
     @Override
-    public String[] printHelp() {
+    public String[] getHelp() {
             // 0123456789001234567890012345678900123456789001234567890012345678900123456789001234567890
         return """
                Syntax : JFR.dump [options]
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdQuery.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdQuery.java
index e892477bb45..4c296d8a78f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdQuery.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -87,7 +87,7 @@ public final class DCmdQuery extends AbstractDCmd {
     }
 
     @Override
-    public String[] printHelp() {
+    public String[] getHelp() {
         List<String> lines = new ArrayList<>();
         lines.addAll(getOptions().lines().toList());
         lines.add("");
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
index 692ab578478..0dbd70801d2 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
@@ -318,7 +318,7 @@ final class DCmdStart extends AbstractDCmd {
         return false;
     }
 
-    public String[] printStartupHelp() {
+    public String[] getStartupHelp() {
         Map<String, String> parameters = Map.of(
             "$SYNTAX", "-XX:StartFlightRecording:[options]",
             "$SOURCE", "-XX:StartFlightRecording:",
@@ -331,7 +331,7 @@ final class DCmdStart extends AbstractDCmd {
     }
 
     @Override
-    public String[] printHelp() {
+    public String[] getHelp() {
         Map<String, String> parameters = Map.of(
            "$SYNTAX", "JFR.start [options]",
            "$SOURCE", "$ jcmd <pid> JFR.start ",
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStop.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStop.java
index baa45396a4b..92d2d28b472 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStop.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -71,7 +71,7 @@ final class DCmdStop extends AbstractDCmd {
     }
 
     @Override
-    public String[] printHelp() {
+    public String[] getHelp() {
             // 0123456789001234567890012345678900123456789001234567890012345678900123456789001234567890
         return """
                Syntax : JFR.stop [options]
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdView.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdView.java
index cc8a381de0b..1d6f6e3dd23 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdView.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -89,7 +89,7 @@ public class DCmdView extends AbstractDCmd {
     }
 
     @Override
-    public String[] printHelp() {
+    public String[] getHelp() {
         List<String> lines = new ArrayList<>();
         lines.addAll(getOptions().lines().toList());
         lines.add("");

From 389f6fe97c348e28d8573fe4754138d2a0bd6c0d Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Thu, 2 May 2024 13:41:29 +0000
Subject: [PATCH 290/486] 8331344: No compiler replay file with CompilerCommand
 MemLimit

Reviewed-by: kvn, asmehra
---
 .../share/compiler/compilationMemoryStatistic.cpp | 11 +++++++++--
 .../share/compiler/compilationMemoryStatistic.hpp |  4 ++++
 .../compiler/print/CompileCommandMemLimit.java    | 15 +++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index ae3c2c75fdb..585d55febb8 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -54,7 +54,7 @@
 ArenaStatCounter::ArenaStatCounter() :
   _current(0), _start(0), _peak(0),
   _na(0), _ra(0),
-  _limit(0), _hit_limit(false),
+  _limit(0), _hit_limit(false), _limit_in_process(false),
   _na_at_peak(0), _ra_at_peak(0), _live_nodes_at_peak(0)
 {}
 
@@ -483,18 +483,23 @@ void CompilationMemoryStatistic::on_arena_change(ssize_t diff, const Arena* aren
   CompilerThread* const th = Thread::current()->as_Compiler_thread();
 
   ArenaStatCounter* const arena_stat = th->arena_stat();
+  if (arena_stat->limit_in_process()) {
+    return; // avoid recursion on limit hit
+  }
+
   bool hit_limit_before = arena_stat->hit_limit();
 
   if (arena_stat->account(diff, (int)arena->get_tag())) { // new peak?
 
     // Limit handling
     if (arena_stat->hit_limit()) {
-
       char name[1024] = "";
       bool print = false;
       bool crash = false;
       CompilerType ct = compiler_none;
 
+      arena_stat->set_limit_in_process(true); // prevent recursive limit hits
+
       // get some more info
       const CompileTask* const task = th->task();
       if (task != nullptr) {
@@ -533,6 +538,8 @@ void CompilationMemoryStatistic::on_arena_change(ssize_t diff, const Arena* aren
       } else {
         inform_compilation_about_oom(ct);
       }
+
+      arena_stat->set_limit_in_process(false);
     }
   }
 }
diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.hpp b/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
index 625875f05f4..d7cccad17fd 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
@@ -50,6 +50,7 @@ class ArenaStatCounter : public CHeapObj<mtCompiler> {
   // MemLimit handling
   size_t _limit;
   bool _hit_limit;
+  bool _limit_in_process;
 
   // Peak composition:
   // Size of node arena when total peaked (c2 only)
@@ -86,6 +87,9 @@ public:
 
   size_t limit() const              { return _limit; }
   bool   hit_limit() const          { return _hit_limit; }
+  bool   limit_in_process() const     { return _limit_in_process; }
+  void   set_limit_in_process(bool v) { _limit_in_process = v; }
+
 };
 
 class CompilationMemoryStatistic : public AllStatic {
diff --git a/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java b/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
index d9f9aa3f7d4..c3ac0ae9c81 100644
--- a/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
+++ b/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
@@ -58,6 +58,7 @@ package compiler.print;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -123,6 +124,20 @@ public class CompileCommandMemLimit {
             oa.shouldMatch("# *Internal Error.*");
             oa.shouldMatch("# *fatal error: " + ct + " *" + expectedNameIncl + ".*: Hit MemLimit .*limit: 4096.*");
             oa.shouldNotMatch(".*" + expectedNameExcl + ".*");
+            // Make sure we get a non-zero-sized replay file (JDK-8331314)
+            oa.shouldContain("# Compiler replay data is saved as:");
+            String replayfile = oa.firstMatch("# (\\S+replay_pid\\d+\\.log)", 1);
+            if (replayfile == null) {
+                throw new RuntimeException("Found no replay file in output");
+            }
+            File f = new File(replayfile);
+            if (!f.exists()) {
+                throw new RuntimeException("Replayfile " + replayfile + " not found");
+            }
+            if (f.length() == 0) {
+                throw new RuntimeException("Replayfile " + replayfile + " has size 0");
+            }
+
         } else {
             // Should see trace output when methods are compiled
             oa.shouldHaveExitValue(0)

From dd0b6418191c765a92bfd03ec4d4206e0da7ee45 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Thu, 2 May 2024 13:48:36 +0000
Subject: [PATCH 291/486] 8330813: Don't call methods from
 Compressed(Oops|Klass) if the associated mode is inactive

Reviewed-by: stefank, asmehra
---
 .../share/jvmci/jvmciCompilerToVMInit.cpp      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index 8822aed0cbe..a2ba0f2b3e5 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -175,10 +175,20 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
 
   Universe_collectedHeap = Universe::heap();
   Universe_base_vtable_size = Universe::base_vtable_size();
-  Universe_narrow_oop_base = CompressedOops::base();
-  Universe_narrow_oop_shift = CompressedOops::shift();
-  Universe_narrow_klass_base = CompressedKlassPointers::base();
-  Universe_narrow_klass_shift = CompressedKlassPointers::shift();
+  if (UseCompressedOops) {
+    Universe_narrow_oop_base = CompressedOops::base();
+    Universe_narrow_oop_shift = CompressedOops::shift();
+  } else {
+    Universe_narrow_oop_base = nullptr;
+    Universe_narrow_oop_shift = 0;
+  }
+  if (UseCompressedClassPointers) {
+    Universe_narrow_klass_base = CompressedKlassPointers::base();
+    Universe_narrow_klass_shift = CompressedKlassPointers::shift();
+  } else {
+    Universe_narrow_klass_base = nullptr;
+    Universe_narrow_klass_shift = 0;
+  }
   Universe_non_oop_bits = Universe::non_oop_word();
   Universe_verify_oop_mask = Universe::verify_oop_mask();
   Universe_verify_oop_bits = Universe::verify_oop_bits();

From 553d45b11460a794613651373f34c8379c11729b Mon Sep 17 00:00:00 2001
From: Fredrik Bredberg <fbredberg@openjdk.org>
Date: Thu, 2 May 2024 13:53:45 +0000
Subject: [PATCH 292/486] 8323724: Remove potential re-inflation from
 FastHashCode under LM_LIGHTWEIGHT

Reviewed-by: aboldtch, coleenp
---
 src/hotspot/share/runtime/synchronizer.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index 356be7cba43..f8d4b323156 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -1077,9 +1077,11 @@ intptr_t ObjectSynchronizer::FastHashCode(Thread* current, oop obj) {
 
     // Inflate the monitor to set the hash.
 
-    // An async deflation can race after the inflate() call and before we
-    // can update the ObjectMonitor's header with the hash value below.
-    monitor = inflate(current, obj, inflate_cause_hash_code);
+    // There's no need to inflate if the mark has already got a monitor.
+    // NOTE: an async deflation can race after we get the monitor and
+    // before we can update the ObjectMonitor's header with the hash
+    // value below.
+    monitor = mark.has_monitor() ? mark.monitor() : inflate(current, obj, inflate_cause_hash_code);
     // Load ObjectMonitor's header/dmw field and see if it has a hash.
     mark = monitor->header();
     assert(mark.is_neutral(), "invariant: header=" INTPTR_FORMAT, mark.value());

From 8771015d7e3c4349ad58b58150a49217b1ffb902 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 2 May 2024 14:32:03 +0000
Subject: [PATCH 293/486] 8331027: JDK's ct.sym file packs corrupted
 module-info classes

Reviewed-by: asotona
---
 .../tools/symbolgenerator/CreateSymbols.java  |   4 +-
 .../javac/platform/VerifyCTSymClassFiles.java |  86 ++++++++++
 .../createsymbols/CreateSymbolsTest.java      |   8 +-
 .../createsymbols/CreateSymbolsTestImpl.java  | 162 +++++++++++++++---
 4 files changed, 228 insertions(+), 32 deletions(-)
 create mode 100644 test/langtools/tools/javac/platform/VerifyCTSymClassFiles.java

diff --git a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
index 154810e20f2..a88eabe01b2 100644
--- a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
+++ b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -970,7 +970,7 @@ public class CreateSymbols {
         }
         if (header.moduleMainClass != null) {
             int attrIdx = addString(cp, Attribute.ModuleMainClass);
-            int targetIdx = addString(cp, header.moduleMainClass);
+            int targetIdx = addClassName(cp, header.moduleMainClass);
             attributes.put(Attribute.ModuleMainClass,
                            new ModuleMainClass_attribute(attrIdx, targetIdx));
         }
diff --git a/test/langtools/tools/javac/platform/VerifyCTSymClassFiles.java b/test/langtools/tools/javac/platform/VerifyCTSymClassFiles.java
new file mode 100644
index 00000000000..c97b15a2b15
--- /dev/null
+++ b/test/langtools/tools/javac/platform/VerifyCTSymClassFiles.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2024, 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 8331027
+ * @summary Verify classfile inside ct.sym
+ * @enablePreview
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.platform
+ *          jdk.compiler/com.sun.tools.javac.util:+open
+ * @build toolbox.ToolBox VerifyCTSymClassFiles
+ * @run main VerifyCTSymClassFiles
+ */
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.attribute.ModuleMainClassAttribute;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class VerifyCTSymClassFiles {
+
+    public static void main(String... args) throws IOException, URISyntaxException {
+        VerifyCTSymClassFiles t = new VerifyCTSymClassFiles();
+
+        t.checkClassFiles();
+    }
+
+    void checkClassFiles() throws IOException {
+        Path ctSym = Paths.get(System.getProperty("java.home"), "lib", "ct.sym");
+
+        if (!Files.exists(ctSym)) {
+            //no ct.sym, nothing to check:
+            return ;
+        }
+        try (FileSystem fs = FileSystems.newFileSystem(ctSym)) {
+            Files.walk(fs.getRootDirectories().iterator().next())
+                 .filter(p -> Files.isRegularFile(p))
+                 .forEach(p -> checkClassFile(p));
+        }
+    }
+
+    void checkClassFile(Path p) {
+        if (!"module-info.sig".equals(p.getFileName().toString())) {
+            return ;
+        }
+        try {
+            ClassFile.of().parse(p).attributes().forEach(attr -> {
+                if (attr instanceof ModuleMainClassAttribute mmca) {
+                    mmca.mainClass();
+                }
+            });
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+}
diff --git a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java
index c54c21bfc0d..7f7400a65b4 100644
--- a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java
+++ b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,9 @@
 
 /**
  * @test
- * @bug 8072480 8277106
+ * @bug 8072480 8277106 8331027
  * @summary Unit test for CreateSymbols
+ * @enablePreview
  * @modules java.compiler
  *          jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.jvm
@@ -101,6 +102,9 @@ public class CreateSymbolsTest {
                                       null,
                                       List.of("-d",
                                               compileDir.toAbsolutePath().toString(),
+                                              "--enable-preview",
+                                              "--source",
+                                              "" + System.getProperty("java.specification.version"),
                                               "-g",
                                               "--add-modules", "jdk.jdeps",
                                               "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
diff --git a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTestImpl.java b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTestImpl.java
index be9137226b4..3a4fd85e54e 100644
--- a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTestImpl.java
+++ b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTestImpl.java
@@ -26,6 +26,11 @@ import java.io.InputStream;
 import java.io.Writer;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.attribute.ModuleAttribute;
+import java.lang.classfile.attribute.ModulePackagesAttribute;
+import java.lang.constant.PackageDesc;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.ArrayList;
@@ -58,14 +63,11 @@ import build.tools.symbolgenerator.CreateSymbols.ClassDescription;
 import build.tools.symbolgenerator.CreateSymbols.ClassList;
 import build.tools.symbolgenerator.CreateSymbols.ExcludeIncludeList;
 import build.tools.symbolgenerator.CreateSymbols.VersionDescription;
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.Attributes;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ClassWriter;
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPool.CPInfo;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Utf8_info;
-import com.sun.tools.classfile.ModulePackages_attribute;
+import java.io.UncheckedIOException;
+import java.lang.classfile.attribute.ModuleMainClassAttribute;
+import java.lang.constant.ClassDesc;
+import java.util.Objects;
+import java.util.function.Consumer;
 
 public class CreateSymbolsTestImpl {
 
@@ -981,14 +983,19 @@ public class CreateSymbolsTestImpl {
     }
 
     Path prepareVersionedCTSym(String[] code7, String[] code8) throws Exception {
+        return prepareVersionedCTSym(code7, code8, _ -> {});
+    }
+
+    Path prepareVersionedCTSym(String[] code7, String[] code8,
+                               Consumer<Path> adjustClassFiles) throws Exception {
         String testClasses = System.getProperty("test.classes");
         Path output = Paths.get(testClasses, "test-data" + i++);
         deleteRecursively(output);
         Files.createDirectories(output);
         Path ver7Jar = output.resolve("7.jar");
-        compileAndPack(output, ver7Jar, code7);
+        compileAndPack(output, ver7Jar, adjustClassFiles, code7);
         Path ver8Jar = output.resolve("8.jar");
-        compileAndPack(output, ver8Jar, code8);
+        compileAndPack(output, ver8Jar, adjustClassFiles, code8);
 
         Path classes = output.resolve("classes.zip");
 
@@ -1048,7 +1055,112 @@ public class CreateSymbolsTestImpl {
         new CreateSymbols().createSymbols(null, symbolsDesc.toAbsolutePath().toString(), classDest, 0, "8", "", modules.toString(), modulesList.toString());
     }
 
+    @Test
+    void testModuleMainClass() throws Exception {
+        ClassFile cf = ClassFile.of();
+        ToolBox tb = new ToolBox();
+        String testClasses = System.getProperty("test.classes");
+        Path output = Paths.get(testClasses, "test-data" + i++);
+        deleteRecursively(output);
+        Files.createDirectories(output);
+        Path ver9Jar = output.resolve("9.jar");
+        compileAndPack(output,
+                       ver9Jar,
+                       classesDir -> {
+                           try {
+                               Path moduleInfo = classesDir.resolve("module-info.class");
+                               byte[] newClassData =
+                                       cf.transform(cf.parse(moduleInfo),
+                                                    (builder, element) -> {
+                                                        builder.with(element);
+                                                        if (element instanceof ModuleAttribute) {
+                                                            builder.with(ModuleMainClassAttribute.of(ClassDesc.of("main.Main")));
+                                                        }
+                                                    });
+                               try (OutputStream out = Files.newOutputStream(moduleInfo)) {
+                                   out.write(newClassData);
+                               }
+                           } catch (IOException ex) {
+                               throw new UncheckedIOException(ex);
+                           }
+                       },
+                       """
+                       module m {
+                       }
+                       """,
+                       """
+                       package main;
+                       public class Main {}
+                       """);
+
+
+        Path ctSym = output.resolve("ct.sym");
+
+        deleteRecursively(ctSym);
+
+        CreateSymbols.ALLOW_NON_EXISTING_CLASSES = true;
+        CreateSymbols.EXTENSION = ".class";
+
+        List<VersionDescription> versions =
+                Arrays.asList(new VersionDescription(ver9Jar.toAbsolutePath().toString(), "9", null));
+
+        ExcludeIncludeList acceptAll = new ExcludeIncludeList(null, null) {
+            @Override public boolean accepts(String className, boolean includePrivateClasses) {
+                return true;
+            }
+        };
+        new CreateSymbols().createBaseLine(versions, acceptAll, ctSym, new String[0]);
+        Path symbolsDesc = ctSym.resolve("symbols");
+        Path modules = ctSym.resolve("modules");
+        Path modulesList = ctSym.resolve("modules-list");
+
+        Files.createDirectories(modules);
+        try (Writer w = Files.newBufferedWriter(modulesList)) {}
+
+        Path classesZip = output.resolve("classes.zip");
+        Path classesDir = output.resolve("classes");
+
+        new CreateSymbols().createSymbols(null, symbolsDesc.toAbsolutePath().toString(), classesZip.toAbsolutePath().toString(), 0, "9", "", modules.toString(), modulesList.toString());
+
+        try (JarFile jf = new JarFile(classesZip.toFile())) {
+            Enumeration<JarEntry> en = jf.entries();
+
+            while (en.hasMoreElements()) {
+                JarEntry je = en.nextElement();
+                if (je.isDirectory()) continue;
+                Path target = classesDir.resolve(je.getName());
+                Files.createDirectories(target.getParent());
+                Files.copy(jf.getInputStream(je), target);
+            }
+        }
+
+        Path moduleInfo = classesDir.resolve("9")
+                                    .resolve("m")
+                                    .resolve("module-info.class");
+
+        cf.parse(moduleInfo)
+          .attributes()
+          .stream()
+          .filter(attr -> attr instanceof ModuleMainClassAttribute)
+          .forEach(attr -> {
+              String expectedMain = "Lmain/Main;";
+              String mainClass =
+                      ((ModuleMainClassAttribute) attr).mainClass()
+                                                       .asSymbol()
+                                                       .descriptorString();
+              if (!Objects.equals(expectedMain, mainClass)) {
+                  throw new AssertionError("Expected " + expectedMain + " as a main class, " +
+                                           "but got: " + mainClass);
+              }
+          });
+    }
+
     void compileAndPack(Path output, Path outputFile, String... code) throws Exception {
+        compileAndPack(output, outputFile, _ -> {}, code);
+    }
+
+    void compileAndPack(Path output, Path outputFile,
+                        Consumer<Path> adjustClassFiles, String... code) throws Exception {
         ToolBox tb = new ToolBox();
         Path scratch = output.resolve("temp");
         deleteRecursively(scratch);
@@ -1065,27 +1177,21 @@ public class CreateSymbolsTestImpl {
                     packages.add(cf.substring(0, sep));
                 }
             }
-            ClassFile cf = ClassFile.read(moduleInfo);
-            List<CPInfo> cp = new ArrayList<>();
-            cp.add(null);
-            cf.constant_pool.entries().forEach(cp::add);
-            Map<String, Attribute> attrs = new HashMap<>(cf.attributes.map);
-            int[] encodedPackages = new int[packages.size()];
-            int i = 0;
-            for (String p : packages) {
-                int nameIndex = cp.size();
-                cp.add(new CONSTANT_Utf8_info(p));
-                encodedPackages[i++] = cp.size();
-                cp.add(new ConstantPool.CONSTANT_Package_info(null, nameIndex));
-            }
-            int attrName = cp.size();
-            cp.add(new CONSTANT_Utf8_info(Attribute.ModulePackages));
-            attrs.put(Attribute.ModulePackages, new ModulePackages_attribute(attrName, encodedPackages));
-            ClassFile newFile = new ClassFile(cf.magic, cf.minor_version, cf.major_version, new ConstantPool(cp.toArray(new CPInfo[0])), cf.access_flags, cf.this_class, cf.super_class, cf.interfaces, cf.fields, cf.methods, new Attributes(attrs));
+            ClassFile cf = ClassFile.of();
+            ClassModel cm = cf.parse(moduleInfo);
+            byte[] newData = cf.transform(cm, (builder, element) -> {
+                builder.with(element);
+                if (element instanceof ModuleAttribute) {
+                    builder.with(ModulePackagesAttribute.ofNames(packages.stream()
+                                                                         .map(pack -> PackageDesc.of(pack))
+                                                                         .toList()));
+                }
+            });
             try (OutputStream out = Files.newOutputStream(moduleInfo)) {
-                new ClassWriter().write(newFile, out);
+                out.write(newData);
             }
         }
+        adjustClassFiles.accept(scratch);
         try (Writer out = Files.newBufferedWriter(outputFile)) {
             for (String classFile : classFiles) {
                 try (InputStream in = Files.newInputStream(scratch.resolve(classFile))) {

From 3383ad6397d5a2d8fb232ffd3e29a54e0b37b686 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Thu, 2 May 2024 14:41:30 +0000
Subject: [PATCH 294/486] 8331253: 16 bits is not enough for
 nmethod::_skipped_instructions_size field

Reviewed-by: dlong, thartmann
---
 .../aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp |  2 --
 .../cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp     |  4 +---
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp     |  4 +---
 src/hotspot/share/asm/codeBuffer.cpp              |  2 ++
 src/hotspot/share/asm/codeBuffer.hpp              |  7 +++++++
 src/hotspot/share/ci/ciMethod.cpp                 |  5 +++--
 src/hotspot/share/code/nmethod.cpp                | 15 ++++++++++++++-
 src/hotspot/share/code/nmethod.hpp                |  5 +++--
 src/hotspot/share/opto/output.cpp                 | 14 ++++++++------
 9 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
index 466e77a4460..306ff5f8c6e 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
@@ -1141,7 +1141,6 @@ public:
 #define __ masm->
 
 void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, ZLoadBarrierStubC2* stub) const {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   BLOCK_COMMENT("ZLoadBarrierStubC2");
 
   // Stub entry
@@ -1160,7 +1159,6 @@ void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, Z
 }
 
 void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm, ZStoreBarrierStubC2* stub) const {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   BLOCK_COMMENT("ZStoreBarrierStubC2");
 
   // Stub entry
diff --git a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp
index 5696b78eba8..a54e2844e39 100644
--- a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -887,7 +887,6 @@ class ZSetupArguments {
 #define __ masm->
 
 void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, ZLoadBarrierStubC2* stub) const {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   __ block_comment("generate_c2_load_barrier_stub (zgc) {");
 
   __ bind(*stub->entry());
@@ -911,7 +910,6 @@ void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, Z
 }
 
 void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm, ZStoreBarrierStubC2* stub) const {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   __ block_comment("ZStoreBarrierStubC2");
 
   // Stub entry
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index f5f0d6c8841..c30b139c7ef 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -1213,7 +1213,6 @@ public:
 #define __ masm->
 
 void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, ZLoadBarrierStubC2* stub) const {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   BLOCK_COMMENT("ZLoadBarrierStubC2");
 
   // Stub entry
@@ -1233,7 +1232,6 @@ void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, Z
 }
 
 void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm, ZStoreBarrierStubC2* stub) const {
-  Assembler::InlineSkippedInstructionsCounter skipped_counter(masm);
   BLOCK_COMMENT("ZStoreBarrierStubC2");
 
   // Stub entry
diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index 4bc33cc89a6..e818853870e 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -1012,6 +1012,8 @@ void CodeBuffer::log_section_sizes(const char* name) {
 }
 
 bool CodeBuffer::finalize_stubs() {
+  // Record size of code before we generate stubs in instructions section
+  _main_code_size = _insts.size();
   if (_finalize_stubs && !pd_finalize_stubs()) {
     // stub allocation failure
     return false;
diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp
index 48476bedfe2..5cff78a96cc 100644
--- a/src/hotspot/share/asm/codeBuffer.hpp
+++ b/src/hotspot/share/asm/codeBuffer.hpp
@@ -427,6 +427,9 @@ class CodeBuffer: public StackObj DEBUG_ONLY(COMMA private Scrubber) {
   address      _total_start;    // first address of combined memory buffer
   csize_t      _total_size;     // size in bytes of combined memory buffer
 
+  // Size of code without stubs generated at the end of instructions section
+  csize_t      _main_code_size;
+
   OopRecorder* _oop_recorder;
 
   OopRecorder  _default_oop_recorder;  // override with initialize_oop_recorder
@@ -457,6 +460,7 @@ class CodeBuffer: public StackObj DEBUG_ONLY(COMMA private Scrubber) {
     _oop_recorder    = nullptr;
     _overflow_arena  = nullptr;
     _last_insn       = nullptr;
+    _main_code_size  = 0;
     _finalize_stubs  = false;
     _shared_stub_to_interp_requests = nullptr;
     _shared_trampoline_requests = nullptr;
@@ -630,6 +634,9 @@ class CodeBuffer: public StackObj DEBUG_ONLY(COMMA private Scrubber) {
   // number of bytes remaining in the insts section
   csize_t insts_remaining() const        { return _insts.remaining(); }
 
+  // size of code without stubs in instruction section
+  csize_t main_code_size() const         { return _main_code_size; }
+
   // is a given address in the insts section?  (2nd version is end-inclusive)
   bool insts_contains(address pc) const  { return _insts.contains(pc); }
   bool insts_contains2(address pc) const { return _insts.contains2(pc); }
diff --git a/src/hotspot/share/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp
index aac2a553cda..532ac7856b8 100644
--- a/src/hotspot/share/ci/ciMethod.cpp
+++ b/src/hotspot/share/ci/ciMethod.cpp
@@ -1126,13 +1126,14 @@ int ciMethod::code_size_for_inlining() {
 // not highly relevant to an inlined method.  So we use the more
 // specific accessor nmethod::insts_size.
 // Also some instructions inside the code are excluded from inline
-// heuristic (e.g. post call nop instructions; see InlineSkippedInstructionsCounter)
+// heuristic (e.g. post call nop instructions and GC barriers;
+// see InlineSkippedInstructionsCounter).
 int ciMethod::inline_instructions_size() {
   if (_inline_instructions_size == -1) {
     GUARDED_VM_ENTRY(
       nmethod* code = get_Method()->code();
       if (code != nullptr && (code->comp_level() == CompLevel_full_optimization)) {
-        int isize = code->insts_end() - code->verified_entry_point() - code->skipped_instructions_size();
+        int isize = code->inline_insts_size();
         _inline_instructions_size = isize > 0 ? isize : 0;
       } else {
         _inline_instructions_size = 0;
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 26d393d06db..8cc36ba1b64 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -131,6 +131,7 @@ struct java_nmethod_stats_struct {
   uint relocation_size;
   uint consts_size;
   uint insts_size;
+  uint inline_insts_size;
   uint stub_size;
   uint oops_size;
   uint metadata_size;
@@ -151,6 +152,7 @@ struct java_nmethod_stats_struct {
     relocation_size     += nm->relocation_size();
     consts_size         += nm->consts_size();
     insts_size          += nm->insts_size();
+    inline_insts_size   += nm->inline_insts_size();
     stub_size           += nm->stub_size();
     oops_size           += nm->oops_size();
     metadata_size       += nm->metadata_size();
@@ -185,6 +187,9 @@ struct java_nmethod_stats_struct {
     if (insts_size != 0) {
       tty->print_cr("   main code     = %u (%f%%)", insts_size, (insts_size * 100.0f)/total_nm_size);
     }
+    if (inline_insts_size != 0) {
+      tty->print_cr("     inline code = %u (%f%%)", inline_insts_size, (inline_insts_size * 100.0f)/total_nm_size);
+    }
     if (stub_size != 0) {
       tty->print_cr("   stub code     = %u (%f%%)", stub_size, (stub_size * 100.0f)/total_nm_size);
     }
@@ -1253,7 +1258,15 @@ void nmethod::init_defaults(CodeBuffer *code_buffer, CodeOffsets* offsets) {
 
   CHECKED_CAST(_entry_offset,              uint16_t, (offsets->value(CodeOffsets::Entry)));
   CHECKED_CAST(_verified_entry_offset,     uint16_t, (offsets->value(CodeOffsets::Verified_Entry)));
-  CHECKED_CAST(_skipped_instructions_size, uint16_t, (code_buffer->total_skipped_instructions_size()));
+
+  int size = code_buffer->main_code_size();
+  assert(size >= 0, "should be initialized");
+  // Use instructions section size if it is 0 (e.g. native wrapper)
+  if (size == 0) size = code_size(); // requires _stub_offset to be set
+  assert(size <= code_size(), "incorrect size: %d > %d", size, code_size());
+  _inline_insts_size = size - _verified_entry_offset
+                     - code_buffer->total_skipped_instructions_size();
+  assert(_inline_insts_size >= 0, "sanity");
 }
 
 // Post initialization
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 22e38afeebd..0677aeec14e 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -218,6 +218,8 @@ class nmethod : public CodeBlob {
 
   // _consts_offset == _content_offset because SECT_CONSTS is first in code buffer
 
+  int _inline_insts_size;
+
   int _stub_offset;
 
   // Offsets for different stubs section parts
@@ -232,7 +234,6 @@ class nmethod : public CodeBlob {
   int16_t  _unwind_handler_offset;
   // Number of arguments passed on the stack
   uint16_t _num_stack_arg_slots;
-  uint16_t _skipped_instructions_size;
 
   // Offsets in mutable data section
   // _oops_offset == _data_offset,  offset where embedded oop table begins (inside data)
@@ -589,7 +590,7 @@ public:
   int     oops_count() const { assert(oops_size() % oopSize == 0, "");  return (oops_size() / oopSize) + 1; }
   int metadata_count() const { assert(metadata_size() % wordSize == 0, ""); return (metadata_size() / wordSize) + 1; }
 
-  int skipped_instructions_size () const { return _skipped_instructions_size; }
+  int inline_insts_size() const { return _inline_insts_size; }
   int total_size() const;
 
   // Containment
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index a3b99263469..4d623144a84 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -1324,8 +1324,9 @@ CodeBuffer* PhaseOutput::init_buffer() {
 
   int pad_req   = NativeCall::instruction_size;
 
+  // GC barrier stubs are generated in code section
   BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
-  stub_req += bs->estimate_stub_size();
+  code_req += bs->estimate_stub_size();
 
   // nmethod and CodeBuffer count stubs & constants as part of method's code.
   // class HandlerImpl is platform-specific and defined in the *.ad files.
@@ -1334,9 +1335,9 @@ CodeBuffer* PhaseOutput::init_buffer() {
   stub_req += MAX_stubs_size;   // ensure per-stub margin
   code_req += MAX_inst_size;    // ensure per-instruction margin
 
-  if (StressCodeBuffers)
+  if (StressCodeBuffers) {
     code_req = const_req = stub_req = exception_handler_req = deopt_handler_req = 0x10;  // force expansion
-
+  }
   int total_req =
           const_req +
           code_req +
@@ -1345,9 +1346,10 @@ CodeBuffer* PhaseOutput::init_buffer() {
           exception_handler_req +
           deopt_handler_req;               // deopt handler
 
-  if (C->has_method_handle_invokes())
-    total_req += deopt_handler_req;  // deopt MH handler
-
+  if (C->has_method_handle_invokes()) {
+    total_req += deopt_handler_req;        // deopt MH handler
+    stub_req  += deopt_handler_req;
+  }
   CodeBuffer* cb = code_buffer();
   cb->initialize(total_req, _buf_sizes._reloc);
 

From 7a41a525deb796396ade1456f1d0a101ac705014 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 2 May 2024 15:03:48 +0000
Subject: [PATCH 295/486] 8331549: Inline MemAllocator::mem_allocate_slow

Reviewed-by: stefank, gli
---
 src/hotspot/share/gc/shared/memAllocator.cpp | 22 ++++++++------------
 src/hotspot/share/gc/shared/memAllocator.hpp |  3 ---
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index 971feed6aaf..ed38c448590 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -318,7 +318,15 @@ HeapWord* MemAllocator::mem_allocate_inside_tlab_slow(Allocation& allocation) co
   return mem;
 }
 
-HeapWord* MemAllocator::mem_allocate_slow(Allocation& allocation) const {
+HeapWord* MemAllocator::mem_allocate(Allocation& allocation) const {
+  if (UseTLAB) {
+    // Try allocating from an existing TLAB.
+    HeapWord* mem = mem_allocate_inside_tlab_fast();
+    if (mem != nullptr) {
+      return mem;
+    }
+  }
+
   // Allocation of an oop can always invoke a safepoint.
   debug_only(allocation._thread->check_for_valid_safepoint_state());
 
@@ -333,18 +341,6 @@ HeapWord* MemAllocator::mem_allocate_slow(Allocation& allocation) const {
   return mem_allocate_outside_tlab(allocation);
 }
 
-HeapWord* MemAllocator::mem_allocate(Allocation& allocation) const {
-  if (UseTLAB) {
-    // Try allocating from an existing TLAB.
-    HeapWord* mem = mem_allocate_inside_tlab_fast();
-    if (mem != nullptr) {
-      return mem;
-    }
-  }
-
-  return mem_allocate_slow(allocation);
-}
-
 oop MemAllocator::allocate() const {
   oop obj = nullptr;
   {
diff --git a/src/hotspot/share/gc/shared/memAllocator.hpp b/src/hotspot/share/gc/shared/memAllocator.hpp
index dca1add31b6..5d3f892ca14 100644
--- a/src/hotspot/share/gc/shared/memAllocator.hpp
+++ b/src/hotspot/share/gc/shared/memAllocator.hpp
@@ -52,9 +52,6 @@ private:
   // Allocate outside a TLAB. Could safepoint.
   HeapWord* mem_allocate_outside_tlab(Allocation& allocation) const;
 
-  // Fast-path TLAB allocation failed. Takes a slow-path and potentially safepoint.
-  HeapWord* mem_allocate_slow(Allocation& allocation) const;
-
 protected:
   MemAllocator(Klass* klass, size_t word_size, Thread* thread)
     : _thread(thread),

From 6969a9e0b2143eee5a7cfa02460a8ab6dfa08cda Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Thu, 2 May 2024 15:36:10 +0000
Subject: [PATCH 296/486] 8328999: Update GIFlib to 5.2.2

Reviewed-by: tr, dnguyen, prr
---
 src/java.desktop/share/legal/giflib.md        |  26 +-
 .../native/libsplashscreen/giflib/dgif_lib.c  | 737 ++++++++++--------
 .../native/libsplashscreen/giflib/gif_err.c   |  52 +-
 .../native/libsplashscreen/giflib/gif_hash.h  |  24 +-
 .../native/libsplashscreen/giflib/gif_lib.h   | 209 +++--
 .../libsplashscreen/giflib/gif_lib_private.h  |  70 +-
 .../native/libsplashscreen/giflib/gifalloc.c  | 255 +++---
 .../giflib/openbsd-reallocarray.c             |  13 +-
 8 files changed, 730 insertions(+), 656 deletions(-)

diff --git a/src/java.desktop/share/legal/giflib.md b/src/java.desktop/share/legal/giflib.md
index 0be4fb8226e..8b8fde8706d 100644
--- a/src/java.desktop/share/legal/giflib.md
+++ b/src/java.desktop/share/legal/giflib.md
@@ -1,4 +1,4 @@
-## GIFLIB v5.2.1
+## GIFLIB v5.2.2
 
 ### GIFLIB License
 ```
@@ -24,7 +24,27 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-https://sourceforge.net/p/giflib/code/ci/master/tree/openbsd-reallocarray.c
+tree/README
 
-Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
+== Authors ==
+
+Gershon Elber <gershon[AT]cs.technion.sc.il>
+original giflib code
+
+Toshio Kuratomi <toshio[AT]tiki-lounge.com>
+uncompressed gif writing code
+former maintainer
+
+Eric Raymond <esr[AT]snark.thyrsus.com>
+current as well as long time former maintainer of giflib code
+
+There have been many other contributors; see the attributions in the
+version-control history to learn more.
+
+
+tree/openbsd-reallocarray.c
+
+Copyright (C) 2008 Otto Moerbeek <otto@drijf.net>
 SPDX-License-Identifier: MIT
+
+```
diff --git a/src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c b/src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c
index 6ddfb46060d..0b2860b4b50 100644
--- a/src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c
+++ b/src/java.desktop/share/native/libsplashscreen/giflib/dgif_lib.c
@@ -34,11 +34,11 @@ SPDX-License-Identifier: MIT
 
 *****************************************************************************/
 
-#include <stdlib.h>
+#include <fcntl.h>
 #include <limits.h>
 #include <stdint.h>
-#include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #ifdef _WIN32
@@ -55,18 +55,19 @@ SPDX-License-Identifier: MIT
 
 /* avoid extra function call in case we use fread (TVT) */
 static int InternalRead(GifFileType *gif, GifByteType *buf, int len) {
-    //fprintf(stderr, "### Read: %d\n", len);
-    return
-    (((GifFilePrivateType*)gif->Private)->Read ?
-     ((GifFilePrivateType*)gif->Private)->Read(gif,buf,len) :
-     fread(buf,1,len,((GifFilePrivateType*)gif->Private)->File));
+    // fprintf(stderr, "### Read: %d\n", len);
+    return (((GifFilePrivateType *)gif->Private)->Read
+                ? ((GifFilePrivateType *)gif->Private)->Read(gif, buf, len)
+                : fread(buf, 1, len,
+                        ((GifFilePrivateType *)gif->Private)->File));
 }
 
 static int DGifGetWord(GifFileType *GifFile, GifWord *Word);
 static int DGifSetupDecompress(GifFileType *GifFile);
 static int DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line,
                               int LineLen);
-static int DGifGetPrefixChar(GifPrefixType *Prefix, int Code, int ClearCode);
+static int DGifGetPrefixChar(const GifPrefixType *Prefix, int Code,
+                             int ClearCode);
 static int DGifDecompressInput(GifFileType *GifFile, int *Code);
 static int DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf,
                              GifByteType *NextByte);
@@ -76,15 +77,14 @@ static int DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf,
  Returns dynamically allocated GifFileType pointer which serves as the GIF
  info record.
 ******************************************************************************/
-GifFileType *
-DGifOpenFileName(const char *FileName, int *Error)
-{
+GifFileType *DGifOpenFileName(const char *FileName, int *Error) {
     int FileHandle;
     GifFileType *GifFile;
 
     if ((FileHandle = open(FileName, O_RDONLY)) == -1) {
-        if (Error != NULL)
+        if (Error != NULL) {
             *Error = D_GIF_ERR_OPEN_FAILED;
+        }
         return NULL;
     }
 
@@ -97,9 +97,7 @@ DGifOpenFileName(const char *FileName, int *Error)
  Returns dynamically allocated GifFileType pointer which serves as the GIF
  info record.
 ******************************************************************************/
-GifFileType *
-DGifOpenFileHandle(int FileHandle, int *Error)
-{
+GifFileType *DGifOpenFileHandle(int FileHandle, int *Error) {
     char Buf[GIF_STAMP_LEN + 1];
     GifFileType *GifFile;
     GifFilePrivateType *Private;
@@ -107,13 +105,14 @@ DGifOpenFileHandle(int FileHandle, int *Error)
 
     GifFile = (GifFileType *)malloc(sizeof(GifFileType));
     if (GifFile == NULL) {
-        if (Error != NULL)
+        if (Error != NULL) {
             *Error = D_GIF_ERR_NOT_ENOUGH_MEM;
+        }
         (void)close(FileHandle);
         return NULL;
     }
 
-    /*@i1@*/memset(GifFile, '\0', sizeof(GifFileType));
+    /*@i1@*/ memset(GifFile, '\0', sizeof(GifFileType));
 
     /* Belt and suspenders, in case the null pointer isn't zero */
     GifFile->SavedImages = NULL;
@@ -121,35 +120,38 @@ DGifOpenFileHandle(int FileHandle, int *Error)
 
     Private = (GifFilePrivateType *)calloc(1, sizeof(GifFilePrivateType));
     if (Private == NULL) {
-        if (Error != NULL)
+        if (Error != NULL) {
             *Error = D_GIF_ERR_NOT_ENOUGH_MEM;
+        }
         (void)close(FileHandle);
         free((char *)GifFile);
         return NULL;
     }
 
-    /*@i1@*/memset(Private, '\0', sizeof(GifFilePrivateType));
+    /*@i1@*/ memset(Private, '\0', sizeof(GifFilePrivateType));
 
 #ifdef _WIN32
-    _setmode(FileHandle, O_BINARY);    /* Make sure it is in binary mode. */
-#endif /* _WIN32 */
+    _setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */
+#endif                                  /* _WIN32 */
 
-    f = fdopen(FileHandle, "rb");    /* Make it into a stream: */
+    f = fdopen(FileHandle, "rb"); /* Make it into a stream: */
 
     /*@-mustfreeonly@*/
     GifFile->Private = (void *)Private;
     Private->FileHandle = FileHandle;
     Private->File = f;
     Private->FileState = FILE_STATE_READ;
-    Private->Read = NULL;        /* don't use alternate input method (TVT) */
-    GifFile->UserData = NULL;    /* TVT */
+    Private->Read = NULL;     /* don't use alternate input method (TVT) */
+    GifFile->UserData = NULL; /* TVT */
     /*@=mustfreeonly@*/
 
     /* Let's see if this is a GIF file: */
     /* coverity[check_return] */
-    if (InternalRead(GifFile, (unsigned char *)Buf, GIF_STAMP_LEN) != GIF_STAMP_LEN) {
-        if (Error != NULL)
+    if (InternalRead(GifFile, (unsigned char *)Buf, GIF_STAMP_LEN) !=
+        GIF_STAMP_LEN) {
+        if (Error != NULL) {
             *Error = D_GIF_ERR_READ_FAILED;
+        }
         (void)fclose(f);
         free((char *)Private);
         free((char *)GifFile);
@@ -159,8 +161,9 @@ DGifOpenFileHandle(int FileHandle, int *Error)
     /* Check for GIF prefix at start of file */
     Buf[GIF_STAMP_LEN] = 0;
     if (strncmp(GIF_STAMP, Buf, GIF_VERSION_POS) != 0) {
-        if (Error != NULL)
+        if (Error != NULL) {
             *Error = D_GIF_ERR_NOT_GIF_FILE;
+        }
         (void)fclose(f);
         free((char *)Private);
         free((char *)GifFile);
@@ -177,7 +180,7 @@ DGifOpenFileHandle(int FileHandle, int *Error)
     GifFile->Error = 0;
 
     /* What version of GIF? */
-    Private->gif89 = (Buf[GIF_VERSION_POS] == '9');
+    Private->gif89 = (Buf[GIF_VERSION_POS + 1] == '9');
 
     return GifFile;
 }
@@ -185,17 +188,16 @@ DGifOpenFileHandle(int FileHandle, int *Error)
 /******************************************************************************
  GifFileType constructor with user supplied input function (TVT)
 ******************************************************************************/
-GifFileType *
-DGifOpen(void *userData, InputFunc readFunc, int *Error)
-{
+GifFileType *DGifOpen(void *userData, InputFunc readFunc, int *Error) {
     char Buf[GIF_STAMP_LEN + 1];
     GifFileType *GifFile;
     GifFilePrivateType *Private;
 
     GifFile = (GifFileType *)malloc(sizeof(GifFileType));
     if (GifFile == NULL) {
-        if (Error != NULL)
+        if (Error != NULL) {
             *Error = D_GIF_ERR_NOT_ENOUGH_MEM;
+        }
         return NULL;
     }
 
@@ -207,26 +209,29 @@ DGifOpen(void *userData, InputFunc readFunc, int *Error)
 
     Private = (GifFilePrivateType *)calloc(1, sizeof(GifFilePrivateType));
     if (!Private) {
-        if (Error != NULL)
+        if (Error != NULL) {
             *Error = D_GIF_ERR_NOT_ENOUGH_MEM;
+        }
         free((char *)GifFile);
         return NULL;
     }
-    /*@i1@*/memset(Private, '\0', sizeof(GifFilePrivateType));
+    /*@i1@*/ memset(Private, '\0', sizeof(GifFilePrivateType));
 
     GifFile->Private = (void *)Private;
     Private->FileHandle = 0;
     Private->File = NULL;
     Private->FileState = FILE_STATE_READ;
 
-    Private->Read = readFunc;    /* TVT */
-    GifFile->UserData = userData;    /* TVT */
+    Private->Read = readFunc;     /* TVT */
+    GifFile->UserData = userData; /* TVT */
 
     /* Lets see if this is a GIF file: */
     /* coverity[check_return] */
-    if (InternalRead(GifFile, (unsigned char *)Buf, GIF_STAMP_LEN) != GIF_STAMP_LEN) {
-        if (Error != NULL)
+    if (InternalRead(GifFile, (unsigned char *)Buf, GIF_STAMP_LEN) !=
+        GIF_STAMP_LEN) {
+        if (Error != NULL) {
             *Error = D_GIF_ERR_READ_FAILED;
+        }
         free((char *)Private);
         free((char *)GifFile);
         return NULL;
@@ -235,8 +240,9 @@ DGifOpen(void *userData, InputFunc readFunc, int *Error)
     /* Check for GIF prefix at start of file */
     Buf[GIF_STAMP_LEN] = '\0';
     if (strncmp(GIF_STAMP, Buf, GIF_VERSION_POS) != 0) {
-        if (Error != NULL)
+        if (Error != NULL) {
             *Error = D_GIF_ERR_NOT_GIF_FILE;
+        }
         free((char *)Private);
         free((char *)GifFile);
         return NULL;
@@ -245,15 +251,16 @@ DGifOpen(void *userData, InputFunc readFunc, int *Error)
     if (DGifGetScreenDesc(GifFile) == GIF_ERROR) {
         free((char *)Private);
         free((char *)GifFile);
-        if (Error != NULL)
+        if (Error != NULL) {
             *Error = D_GIF_ERR_NO_SCRN_DSCR;
+        }
         return NULL;
     }
 
     GifFile->Error = 0;
 
     /* What version of GIF? */
-    Private->gif89 = (Buf[GIF_VERSION_POS] == '9');
+    Private->gif89 = (Buf[GIF_VERSION_POS + 1] == '9');
 
     return GifFile;
 }
@@ -262,9 +269,7 @@ DGifOpen(void *userData, InputFunc readFunc, int *Error)
  This routine should be called before any other DGif calls. Note that
  this routine is called automatically from DGif file open routines.
 ******************************************************************************/
-int
-DGifGetScreenDesc(GifFileType *GifFile)
-{
+int DGifGetScreenDesc(GifFileType *GifFile) {
     int BitsPerPixel;
     bool SortFlag;
     GifByteType Buf[3];
@@ -278,8 +283,9 @@ DGifGetScreenDesc(GifFileType *GifFile)
 
     /* Put the screen descriptor into the file: */
     if (DGifGetWord(GifFile, &GifFile->SWidth) == GIF_ERROR ||
-        DGifGetWord(GifFile, &GifFile->SHeight) == GIF_ERROR)
+        DGifGetWord(GifFile, &GifFile->SHeight) == GIF_ERROR) {
         return GIF_ERROR;
+    }
 
     if (InternalRead(GifFile, Buf, 3) != 3) {
         GifFile->Error = D_GIF_ERR_READ_FAILED;
@@ -292,7 +298,7 @@ DGifGetScreenDesc(GifFileType *GifFile)
     BitsPerPixel = (Buf[0] & 0x07) + 1;
     GifFile->SBackGroundColor = Buf[1];
     GifFile->AspectByte = Buf[2];
-    if (Buf[0] & 0x80) {    /* Do we have global color map? */
+    if (Buf[0] & 0x80) { /* Do we have global color map? */
         int i;
 
         GifFile->SColorMap = GifMakeMapObject(1 << BitsPerPixel, NULL);
@@ -327,23 +333,20 @@ DGifGetScreenDesc(GifFileType *GifFile)
     return GIF_OK;
 }
 
-const char *
-DGifGetGifVersion(GifFileType *GifFile)
-{
-    GifFilePrivateType *Private = (GifFilePrivateType *) GifFile->Private;
+const char *DGifGetGifVersion(GifFileType *GifFile) {
+    GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
-    if (Private->gif89)
+    if (Private->gif89) {
         return GIF89_STAMP;
-    else
+    } else {
         return GIF87_STAMP;
+    }
 }
 
 /******************************************************************************
  This routine should be called before any attempt to read an image.
 ******************************************************************************/
-int
-DGifGetRecordType(GifFileType *GifFile, GifRecordType* Type)
-{
+int DGifGetRecordType(GifFileType *GifFile, GifRecordType *Type) {
     GifByteType Buf;
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
@@ -359,29 +362,27 @@ DGifGetRecordType(GifFileType *GifFile, GifRecordType* Type)
         return GIF_ERROR;
     }
 
-    //fprintf(stderr, "### DGifGetRecordType: %02x\n", Buf);
+    // fprintf(stderr, "### DGifGetRecordType: %02x\n", Buf);
     switch (Buf) {
-      case DESCRIPTOR_INTRODUCER:
-          *Type = IMAGE_DESC_RECORD_TYPE;
-          break;
-      case EXTENSION_INTRODUCER:
-          *Type = EXTENSION_RECORD_TYPE;
-          break;
-      case TERMINATOR_INTRODUCER:
-          *Type = TERMINATE_RECORD_TYPE;
-          break;
-      default:
-          *Type = UNDEFINED_RECORD_TYPE;
-          GifFile->Error = D_GIF_ERR_WRONG_RECORD;
-          return GIF_ERROR;
+    case DESCRIPTOR_INTRODUCER:
+        *Type = IMAGE_DESC_RECORD_TYPE;
+        break;
+    case EXTENSION_INTRODUCER:
+        *Type = EXTENSION_RECORD_TYPE;
+        break;
+    case TERMINATOR_INTRODUCER:
+        *Type = TERMINATE_RECORD_TYPE;
+        break;
+    default:
+        *Type = UNDEFINED_RECORD_TYPE;
+        GifFile->Error = D_GIF_ERR_WRONG_RECORD;
+        return GIF_ERROR;
     }
 
     return GIF_OK;
 }
 
-int
-DGifGetImageHeader(GifFileType *GifFile)
-{
+int DGifGetImageHeader(GifFileType *GifFile) {
     unsigned int BitsPerPixel;
     GifByteType Buf[3];
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
@@ -395,8 +396,9 @@ DGifGetImageHeader(GifFileType *GifFile)
     if (DGifGetWord(GifFile, &GifFile->Image.Left) == GIF_ERROR ||
         DGifGetWord(GifFile, &GifFile->Image.Top) == GIF_ERROR ||
         DGifGetWord(GifFile, &GifFile->Image.Width) == GIF_ERROR ||
-        DGifGetWord(GifFile, &GifFile->Image.Height) == GIF_ERROR)
+        DGifGetWord(GifFile, &GifFile->Image.Height) == GIF_ERROR) {
         return GIF_ERROR;
+    }
     if (InternalRead(GifFile, Buf, 1) != 1) {
         GifFile->Error = D_GIF_ERR_READ_FAILED;
         GifFreeMapObject(GifFile->Image.ColorMap);
@@ -415,7 +417,8 @@ DGifGetImageHeader(GifFileType *GifFile)
     if (Buf[0] & 0x80) {
         unsigned int i;
 
-        GifFile->Image.ColorMap = GifMakeMapObject(1 << BitsPerPixel, NULL);
+        GifFile->Image.ColorMap =
+            GifMakeMapObject(1 << BitsPerPixel, NULL);
         if (GifFile->Image.ColorMap == NULL) {
             GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM;
             return GIF_ERROR;
@@ -436,8 +439,8 @@ DGifGetImageHeader(GifFileType *GifFile)
         }
     }
 
-    Private->PixelCount = (long)GifFile->Image.Width *
-       (long)GifFile->Image.Height;
+    Private->PixelCount =
+        (long)GifFile->Image.Width * (long)GifFile->Image.Height;
 
     /* Reset decompress algorithm parameters. */
     return DGifSetupDecompress(GifFile);
@@ -447,9 +450,7 @@ DGifGetImageHeader(GifFileType *GifFile)
  This routine should be called before any attempt to read an image.
  Note it is assumed the Image desc. header has been read.
 ******************************************************************************/
-int
-DGifGetImageDesc(GifFileType *GifFile)
-{
+int DGifGetImageDesc(GifFileType *GifFile) {
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
     SavedImage *sp;
 
@@ -464,9 +465,9 @@ DGifGetImageDesc(GifFileType *GifFile)
     }
 
     if (GifFile->SavedImages) {
-        SavedImage* new_saved_images =
-            (SavedImage *)reallocarray(GifFile->SavedImages,
-                            (GifFile->ImageCount + 1), sizeof(SavedImage));
+        SavedImage *new_saved_images = (SavedImage *)reallocarray(
+            GifFile->SavedImages, (GifFile->ImageCount + 1),
+            sizeof(SavedImage));
         if (new_saved_images == NULL) {
             GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM;
             return GIF_ERROR;
@@ -474,7 +475,7 @@ DGifGetImageDesc(GifFileType *GifFile)
         GifFile->SavedImages = new_saved_images;
     } else {
         if ((GifFile->SavedImages =
-             (SavedImage *) malloc(sizeof(SavedImage))) == NULL) {
+                 (SavedImage *)malloc(sizeof(SavedImage))) == NULL) {
             GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM;
             return GIF_ERROR;
         }
@@ -483,9 +484,9 @@ DGifGetImageDesc(GifFileType *GifFile)
     sp = &GifFile->SavedImages[GifFile->ImageCount];
     memcpy(&sp->ImageDesc, &GifFile->Image, sizeof(GifImageDesc));
     if (GifFile->Image.ColorMap != NULL) {
-        sp->ImageDesc.ColorMap = GifMakeMapObject(
-                                 GifFile->Image.ColorMap->ColorCount,
-                                 GifFile->Image.ColorMap->Colors);
+        sp->ImageDesc.ColorMap =
+            GifMakeMapObject(GifFile->Image.ColorMap->ColorCount,
+                             GifFile->Image.ColorMap->Colors);
         if (sp->ImageDesc.ColorMap == NULL) {
             GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM;
             return GIF_ERROR;
@@ -493,7 +494,7 @@ DGifGetImageDesc(GifFileType *GifFile)
     }
     sp->RasterBits = (unsigned char *)NULL;
     sp->ExtensionBlockCount = 0;
-    sp->ExtensionBlocks = (ExtensionBlock *) NULL;
+    sp->ExtensionBlocks = (ExtensionBlock *)NULL;
 
     GifFile->ImageCount++;
 
@@ -503,11 +504,9 @@ DGifGetImageDesc(GifFileType *GifFile)
 /******************************************************************************
  Get one full scanned line (Line) of length LineLen from GIF file.
 ******************************************************************************/
-int
-DGifGetLine(GifFileType *GifFile, GifPixelType *Line, int LineLen)
-{
+int DGifGetLine(GifFileType *GifFile, GifPixelType *Line, int LineLen) {
     GifByteType *Dummy;
-    GifFilePrivateType *Private = (GifFilePrivateType *) GifFile->Private;
+    GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
     if (!IS_READABLE(Private)) {
         /* This file was NOT open for reading: */
@@ -515,8 +514,9 @@ DGifGetLine(GifFileType *GifFile, GifPixelType *Line, int LineLen)
         return GIF_ERROR;
     }
 
-    if (!LineLen)
+    if (!LineLen) {
         LineLen = GifFile->Image.Width;
+    }
 
     if ((Private->PixelCount -= LineLen) > 0xffff0000UL) {
         GifFile->Error = D_GIF_ERR_DATA_TOO_BIG;
@@ -525,56 +525,59 @@ DGifGetLine(GifFileType *GifFile, GifPixelType *Line, int LineLen)
 
     if (DGifDecompressLine(GifFile, Line, LineLen) == GIF_OK) {
         if (Private->PixelCount == 0) {
-            /* We probably won't be called any more, so let's clean up
-             * everything before we return: need to flush out all the
-             * rest of image until an empty block (size 0)
+            /* We probably won't be called any more, so let's clean
+             * up everything before we return: need to flush out all
+             * the rest of image until an empty block (size 0)
              * detected. We use GetCodeNext.
              */
-            do
-                if (DGifGetCodeNext(GifFile, &Dummy) == GIF_ERROR)
+            do {
+                if (DGifGetCodeNext(GifFile, &Dummy) ==
+                    GIF_ERROR) {
                     return GIF_ERROR;
-            while (Dummy != NULL) ;
+                }
+            } while (Dummy != NULL);
         }
         return GIF_OK;
-    } else
+    } else {
         return GIF_ERROR;
+    }
 }
 
 /******************************************************************************
  Put one pixel (Pixel) into GIF file.
 ******************************************************************************/
-int
-DGifGetPixel(GifFileType *GifFile, GifPixelType Pixel)
-{
+int DGifGetPixel(GifFileType *GifFile, GifPixelType Pixel) {
     GifByteType *Dummy;
-    GifFilePrivateType *Private = (GifFilePrivateType *) GifFile->Private;
+    GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
     if (!IS_READABLE(Private)) {
         /* This file was NOT open for reading: */
         GifFile->Error = D_GIF_ERR_NOT_READABLE;
         return GIF_ERROR;
     }
-    if (--Private->PixelCount > 0xffff0000UL)
-    {
+    if (--Private->PixelCount > 0xffff0000UL) {
         GifFile->Error = D_GIF_ERR_DATA_TOO_BIG;
         return GIF_ERROR;
     }
 
     if (DGifDecompressLine(GifFile, &Pixel, 1) == GIF_OK) {
         if (Private->PixelCount == 0) {
-            /* We probably won't be called any more, so let's clean up
-             * everything before we return: need to flush out all the
-             * rest of image until an empty block (size 0)
+            /* We probably won't be called any more, so let's clean
+             * up everything before we return: need to flush out all
+             * the rest of image until an empty block (size 0)
              * detected. We use GetCodeNext.
              */
-            do
-                if (DGifGetCodeNext(GifFile, &Dummy) == GIF_ERROR)
+            do {
+                if (DGifGetCodeNext(GifFile, &Dummy) ==
+                    GIF_ERROR) {
                     return GIF_ERROR;
-            while (Dummy != NULL) ;
+                }
+            } while (Dummy != NULL);
         }
         return GIF_OK;
-    } else
+    } else {
         return GIF_ERROR;
+    }
 }
 
 /******************************************************************************
@@ -584,13 +587,12 @@ DGifGetPixel(GifFileType *GifFile, GifPixelType Pixel)
  The Extension should NOT be freed by the user (not dynamically allocated).
  Note it is assumed the Extension description header has been read.
 ******************************************************************************/
-int
-DGifGetExtension(GifFileType *GifFile, int *ExtCode, GifByteType **Extension)
-{
+int DGifGetExtension(GifFileType *GifFile, int *ExtCode,
+                     GifByteType **Extension) {
     GifByteType Buf;
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
-    //fprintf(stderr, "### -> DGifGetExtension:\n");
+    // fprintf(stderr, "### -> DGifGetExtension:\n");
     if (!IS_READABLE(Private)) {
         /* This file was NOT open for reading: */
         GifFile->Error = D_GIF_ERR_NOT_READABLE;
@@ -603,7 +605,8 @@ DGifGetExtension(GifFileType *GifFile, int *ExtCode, GifByteType **Extension)
         return GIF_ERROR;
     }
     *ExtCode = Buf;
-    //fprintf(stderr, "### <- DGifGetExtension: %02x, about to call next\n", Buf);
+    // fprintf(stderr, "### <- DGifGetExtension: %02x, about to call
+    // next\n", Buf);
 
     return DGifGetExtensionNext(GifFile, Extension);
 }
@@ -613,30 +616,30 @@ DGifGetExtension(GifFileType *GifFile, int *ExtCode, GifByteType **Extension)
  routine should be called until NULL Extension is returned.
  The Extension should NOT be freed by the user (not dynamically allocated).
 ******************************************************************************/
-int
-DGifGetExtensionNext(GifFileType *GifFile, GifByteType ** Extension)
-{
+int DGifGetExtensionNext(GifFileType *GifFile, GifByteType **Extension) {
     GifByteType Buf;
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
-    //fprintf(stderr, "### -> DGifGetExtensionNext\n");
+    // fprintf(stderr, "### -> DGifGetExtensionNext\n");
     if (InternalRead(GifFile, &Buf, 1) != 1) {
         GifFile->Error = D_GIF_ERR_READ_FAILED;
         return GIF_ERROR;
     }
-    //fprintf(stderr, "### DGifGetExtensionNext sees %d\n", Buf);
+    // fprintf(stderr, "### DGifGetExtensionNext sees %d\n", Buf);
 
     if (Buf > 0) {
-        *Extension = Private->Buf;    /* Use private unused buffer. */
-        (*Extension)[0] = Buf;  /* Pascal strings notation (pos. 0 is len.). */
-        /* coverity[tainted_data,check_return] */
+        *Extension = Private->Buf; /* Use private unused buffer. */
+        (*Extension)[0] =
+            Buf; /* Pascal strings notation (pos. 0 is len.). */
+                 /* coverity[tainted_data,check_return] */
         if (InternalRead(GifFile, &((*Extension)[1]), Buf) != Buf) {
             GifFile->Error = D_GIF_ERR_READ_FAILED;
             return GIF_ERROR;
         }
-    } else
+    } else {
         *Extension = NULL;
-    //fprintf(stderr, "### <- DGifGetExtensionNext: %p\n", Extension);
+    }
+    // fprintf(stderr, "### <- DGifGetExtensionNext: %p\n", Extension);
 
     return GIF_OK;
 }
@@ -647,19 +650,20 @@ DGifGetExtensionNext(GifFileType *GifFile, GifByteType ** Extension)
 
 int DGifExtensionToGCB(const size_t GifExtensionLength,
                        const GifByteType *GifExtension,
-                       GraphicsControlBlock *GCB)
-{
+                       GraphicsControlBlock *GCB) {
     if (GifExtensionLength != 4) {
         return GIF_ERROR;
     }
 
     GCB->DisposalMode = (GifExtension[0] >> 2) & 0x07;
     GCB->UserInputFlag = (GifExtension[0] & 0x02) != 0;
-    GCB->DelayTime = UNSIGNED_LITTLE_ENDIAN(GifExtension[1], GifExtension[2]);
-    if (GifExtension[0] & 0x01)
+    GCB->DelayTime =
+        UNSIGNED_LITTLE_ENDIAN(GifExtension[1], GifExtension[2]);
+    if (GifExtension[0] & 0x01) {
         GCB->TransparentColor = (int)GifExtension[3];
-    else
+    } else {
         GCB->TransparentColor = NO_TRANSPARENT_COLOR;
+    }
 
     return GIF_OK;
 }
@@ -668,23 +672,27 @@ int DGifExtensionToGCB(const size_t GifExtensionLength,
  Extract the Graphics Control Block for a saved image, if it exists.
 ******************************************************************************/
 
-int DGifSavedExtensionToGCB(GifFileType *GifFile,
-                int ImageIndex, GraphicsControlBlock *GCB)
-{
+int DGifSavedExtensionToGCB(GifFileType *GifFile, int ImageIndex,
+                            GraphicsControlBlock *GCB) {
     int i;
 
-    if (ImageIndex < 0 || ImageIndex > GifFile->ImageCount - 1)
+    if (ImageIndex < 0 || ImageIndex > GifFile->ImageCount - 1) {
         return GIF_ERROR;
+    }
 
     GCB->DisposalMode = DISPOSAL_UNSPECIFIED;
     GCB->UserInputFlag = false;
     GCB->DelayTime = 0;
     GCB->TransparentColor = NO_TRANSPARENT_COLOR;
 
-    for (i = 0; i < GifFile->SavedImages[ImageIndex].ExtensionBlockCount; i++) {
-        ExtensionBlock *ep = &GifFile->SavedImages[ImageIndex].ExtensionBlocks[i];
-        if (ep->Function == GRAPHICS_EXT_FUNC_CODE)
-            return DGifExtensionToGCB(ep->ByteCount, ep->Bytes, GCB);
+    for (i = 0; i < GifFile->SavedImages[ImageIndex].ExtensionBlockCount;
+         i++) {
+        ExtensionBlock *ep =
+            &GifFile->SavedImages[ImageIndex].ExtensionBlocks[i];
+        if (ep->Function == GRAPHICS_EXT_FUNC_CODE) {
+            return DGifExtensionToGCB(ep->ByteCount, ep->Bytes,
+                                      GCB);
+        }
     }
 
     return GIF_ERROR;
@@ -693,13 +701,12 @@ int DGifSavedExtensionToGCB(GifFileType *GifFile,
 /******************************************************************************
  This routine should be called last, to close the GIF file.
 ******************************************************************************/
-int
-DGifCloseFile(GifFileType *GifFile, int *ErrorCode)
-{
+int DGifCloseFile(GifFileType *GifFile, int *ErrorCode) {
     GifFilePrivateType *Private;
 
-    if (GifFile == NULL || GifFile->Private == NULL)
+    if (GifFile == NULL || GifFile->Private == NULL) {
         return GIF_ERROR;
+    }
 
     if (GifFile->Image.ColorMap) {
         GifFreeMapObject(GifFile->Image.ColorMap);
@@ -716,22 +723,25 @@ DGifCloseFile(GifFileType *GifFile, int *ErrorCode)
         GifFile->SavedImages = NULL;
     }
 
-    GifFreeExtensions(&GifFile->ExtensionBlockCount, &GifFile->ExtensionBlocks);
+    GifFreeExtensions(&GifFile->ExtensionBlockCount,
+                      &GifFile->ExtensionBlocks);
 
-    Private = (GifFilePrivateType *) GifFile->Private;
+    Private = (GifFilePrivateType *)GifFile->Private;
 
     if (!IS_READABLE(Private)) {
         /* This file was NOT open for reading: */
-        if (ErrorCode != NULL)
+        if (ErrorCode != NULL) {
             *ErrorCode = D_GIF_ERR_NOT_READABLE;
+        }
         free((char *)GifFile->Private);
         free(GifFile);
         return GIF_ERROR;
     }
 
     if (Private->File && (fclose(Private->File) != 0)) {
-        if (ErrorCode != NULL)
+        if (ErrorCode != NULL) {
             *ErrorCode = D_GIF_ERR_CLOSE_FAILED;
+        }
         free((char *)GifFile->Private);
         free(GifFile);
         return GIF_ERROR;
@@ -739,17 +749,16 @@ DGifCloseFile(GifFileType *GifFile, int *ErrorCode)
 
     free((char *)GifFile->Private);
     free(GifFile);
-    if (ErrorCode != NULL)
+    if (ErrorCode != NULL) {
         *ErrorCode = D_GIF_SUCCEEDED;
+    }
     return GIF_OK;
 }
 
 /******************************************************************************
  Get 2 bytes (word) from the given file:
 ******************************************************************************/
-static int
-DGifGetWord(GifFileType *GifFile, GifWord *Word)
-{
+static int DGifGetWord(GifFileType *GifFile, GifWord *Word) {
     unsigned char c[2];
 
     /* coverity[check_return] */
@@ -769,9 +778,7 @@ DGifGetWord(GifFileType *GifFile, GifWord *Word)
  to DGifGetCodeNext, until NULL block is returned.
  The block should NOT be freed by the user (not dynamically allocated).
 ******************************************************************************/
-int
-DGifGetCode(GifFileType *GifFile, int *CodeSize, GifByteType **CodeBlock)
-{
+int DGifGetCode(GifFileType *GifFile, int *CodeSize, GifByteType **CodeBlock) {
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
     if (!IS_READABLE(Private)) {
@@ -790,9 +797,7 @@ DGifGetCode(GifFileType *GifFile, int *CodeSize, GifByteType **CodeBlock)
  called until NULL block is returned.
  The block should NOT be freed by the user (not dynamically allocated).
 ******************************************************************************/
-int
-DGifGetCodeNext(GifFileType *GifFile, GifByteType **CodeBlock)
-{
+int DGifGetCodeNext(GifFileType *GifFile, GifByteType **CodeBlock) {
     GifByteType Buf;
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
@@ -805,17 +810,19 @@ DGifGetCodeNext(GifFileType *GifFile, GifByteType **CodeBlock)
 
     /* coverity[lower_bounds] */
     if (Buf > 0) {
-        *CodeBlock = Private->Buf;    /* Use private unused buffer. */
-        (*CodeBlock)[0] = Buf;  /* Pascal strings notation (pos. 0 is len.). */
-        /* coverity[tainted_data] */
+        *CodeBlock = Private->Buf; /* Use private unused buffer. */
+        (*CodeBlock)[0] =
+            Buf; /* Pascal strings notation (pos. 0 is len.). */
+                 /* coverity[tainted_data] */
         if (InternalRead(GifFile, &((*CodeBlock)[1]), Buf) != Buf) {
             GifFile->Error = D_GIF_ERR_READ_FAILED;
             return GIF_ERROR;
         }
     } else {
         *CodeBlock = NULL;
-        Private->Buf[0] = 0;    /* Make sure the buffer is empty! */
-        Private->PixelCount = 0;    /* And local info. indicate image read. */
+        Private->Buf[0] = 0; /* Make sure the buffer is empty! */
+        Private->PixelCount =
+            0; /* And local info. indicate image read. */
     }
 
     return GIF_OK;
@@ -824,41 +831,43 @@ DGifGetCodeNext(GifFileType *GifFile, GifByteType **CodeBlock)
 /******************************************************************************
  Setup the LZ decompression for this image:
 ******************************************************************************/
-static int
-DGifSetupDecompress(GifFileType *GifFile)
-{
+static int DGifSetupDecompress(GifFileType *GifFile) {
     int i, BitsPerPixel;
     GifByteType CodeSize;
     GifPrefixType *Prefix;
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
     /* coverity[check_return] */
-    if (InternalRead(GifFile, &CodeSize, 1) < 1) {    /* Read Code size from file. */
-        return GIF_ERROR;    /* Failed to read Code size. */
+    if (InternalRead(GifFile, &CodeSize, 1) <
+        1) { /* Read Code size from file. */
+        GifFile->Error = D_GIF_ERR_READ_FAILED;
+        return GIF_ERROR; /* Failed to read Code size. */
     }
     BitsPerPixel = CodeSize;
 
     /* this can only happen on a severely malformed GIF */
     if (BitsPerPixel > 8) {
-        GifFile->Error = D_GIF_ERR_READ_FAILED;    /* somewhat bogus error code */
-        return GIF_ERROR;    /* Failed to read Code size. */
+        GifFile->Error =
+            D_GIF_ERR_READ_FAILED; /* somewhat bogus error code */
+        return GIF_ERROR;          /* Failed to read Code size. */
     }
 
-    Private->Buf[0] = 0;    /* Input Buffer empty. */
+    Private->Buf[0] = 0; /* Input Buffer empty. */
     Private->BitsPerPixel = BitsPerPixel;
     Private->ClearCode = (1 << BitsPerPixel);
     Private->EOFCode = Private->ClearCode + 1;
     Private->RunningCode = Private->EOFCode + 1;
-    Private->RunningBits = BitsPerPixel + 1;    /* Number of bits per code. */
-    Private->MaxCode1 = 1 << Private->RunningBits;    /* Max. code + 1. */
-    Private->StackPtr = 0;    /* No pixels on the pixel stack. */
+    Private->RunningBits = BitsPerPixel + 1; /* Number of bits per code. */
+    Private->MaxCode1 = 1 << Private->RunningBits; /* Max. code + 1. */
+    Private->StackPtr = 0; /* No pixels on the pixel stack. */
     Private->LastCode = NO_SUCH_CODE;
-    Private->CrntShiftState = 0;    /* No information in CrntShiftDWord. */
+    Private->CrntShiftState = 0; /* No information in CrntShiftDWord. */
     Private->CrntShiftDWord = 0;
 
     Prefix = Private->Prefix;
-    for (i = 0; i <= LZ_MAX_CODE; i++)
+    for (i = 0; i <= LZ_MAX_CODE; i++) {
         Prefix[i] = NO_SUCH_CODE;
+    }
 
     return GIF_OK;
 }
@@ -869,14 +878,13 @@ DGifSetupDecompress(GifFileType *GifFile)
  This routine can be called few times (one per scan line, for example), in
  order the complete the whole image.
 ******************************************************************************/
-static int
-DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen)
-{
+static int DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line,
+                              int LineLen) {
     int i = 0;
     int j, CrntCode, EOFCode, ClearCode, CrntPrefix, LastCode, StackPtr;
     GifByteType *Stack, *Suffix;
     GifPrefixType *Prefix;
-    GifFilePrivateType *Private = (GifFilePrivateType *) GifFile->Private;
+    GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
     StackPtr = Private->StackPtr;
     Prefix = Private->Prefix;
@@ -891,72 +899,88 @@ DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen)
     }
 
     if (StackPtr != 0) {
-        /* Let pop the stack off before continueing to read the GIF file: */
-        while (StackPtr != 0 && i < LineLen)
+        /* Let pop the stack off before continueing to read the GIF
+         * file: */
+        while (StackPtr != 0 && i < LineLen) {
             Line[i++] = Stack[--StackPtr];
+        }
     }
 
-    while (i < LineLen) {    /* Decode LineLen items. */
-        if (DGifDecompressInput(GifFile, &CrntCode) == GIF_ERROR)
+    while (i < LineLen) { /* Decode LineLen items. */
+        if (DGifDecompressInput(GifFile, &CrntCode) == GIF_ERROR) {
             return GIF_ERROR;
+        }
 
         if (CrntCode == EOFCode) {
-            /* Note however that usually we will not be here as we will stop
-             * decoding as soon as we got all the pixel, or EOF code will
-             * not be read at all, and DGifGetLine/Pixel clean everything.  */
+            /* Note however that usually we will not be here as we
+             * will stop decoding as soon as we got all the pixel,
+             * or EOF code will not be read at all, and
+             * DGifGetLine/Pixel clean everything.  */
             GifFile->Error = D_GIF_ERR_EOF_TOO_SOON;
             return GIF_ERROR;
         } else if (CrntCode == ClearCode) {
             /* We need to start over again: */
-            for (j = 0; j <= LZ_MAX_CODE; j++)
+            for (j = 0; j <= LZ_MAX_CODE; j++) {
                 Prefix[j] = NO_SUCH_CODE;
+            }
             Private->RunningCode = Private->EOFCode + 1;
             Private->RunningBits = Private->BitsPerPixel + 1;
             Private->MaxCode1 = 1 << Private->RunningBits;
             LastCode = Private->LastCode = NO_SUCH_CODE;
         } else {
-            /* Its regular code - if in pixel range simply add it to output
-             * stream, otherwise trace to codes linked list until the prefix
-             * is in pixel range: */
+            /* Its regular code - if in pixel range simply add it to
+             * output stream, otherwise trace to codes linked list
+             * until the prefix is in pixel range: */
             if (CrntCode < ClearCode) {
-                /* This is simple - its pixel scalar, so add it to output: */
+                /* This is simple - its pixel scalar, so add it
+                 * to output: */
                 Line[i++] = CrntCode;
             } else {
-                /* Its a code to needed to be traced: trace the linked list
-                 * until the prefix is a pixel, while pushing the suffix
-                 * pixels on our stack. If we done, pop the stack in reverse
-                 * (thats what stack is good for!) order to output.  */
+                /* Its a code to needed to be traced: trace the
+                 * linked list until the prefix is a pixel,
+                 * while pushing the suffix pixels on our stack.
+                 * If we done, pop the stack in reverse (thats
+                 * what stack is good for!) order to output.  */
                 if (Prefix[CrntCode] == NO_SUCH_CODE) {
                     CrntPrefix = LastCode;
 
-                    /* Only allowed if CrntCode is exactly the running code:
-                     * In that case CrntCode = XXXCode, CrntCode or the
-                     * prefix code is last code and the suffix char is
-                     * exactly the prefix of last code! */
-                    if (CrntCode == Private->RunningCode - 2) {
-                        Suffix[Private->RunningCode - 2] =
-                           Stack[StackPtr++] = DGifGetPrefixChar(Prefix,
-                                                                 LastCode,
-                                                                 ClearCode);
+                    /* Only allowed if CrntCode is exactly
+                     * the running code: In that case
+                     * CrntCode = XXXCode, CrntCode or the
+                     * prefix code is last code and the
+                     * suffix char is exactly the prefix of
+                     * last code! */
+                    if (CrntCode ==
+                        Private->RunningCode - 2) {
+                        Suffix[Private->RunningCode -
+                               2] = Stack[StackPtr++] =
+                            DGifGetPrefixChar(
+                                Prefix, LastCode,
+                                ClearCode);
                     } else {
-                        Suffix[Private->RunningCode - 2] =
-                           Stack[StackPtr++] = DGifGetPrefixChar(Prefix,
-                                                                 CrntCode,
-                                                                 ClearCode);
+                        Suffix[Private->RunningCode -
+                               2] = Stack[StackPtr++] =
+                            DGifGetPrefixChar(
+                                Prefix, CrntCode,
+                                ClearCode);
                     }
-                } else
+                } else {
                     CrntPrefix = CrntCode;
+                }
 
-                /* Now (if image is O.K.) we should not get a NO_SUCH_CODE
-                 * during the trace. As we might loop forever, in case of
-                 * defective image, we use StackPtr as loop counter and stop
-                 * before overflowing Stack[]. */
+                /* Now (if image is O.K.) we should not get a
+                 * NO_SUCH_CODE during the trace. As we might
+                 * loop forever, in case of defective image, we
+                 * use StackPtr as loop counter and stop before
+                 * overflowing Stack[]. */
                 while (StackPtr < LZ_MAX_CODE &&
-                       CrntPrefix > ClearCode && CrntPrefix <= LZ_MAX_CODE) {
+                       CrntPrefix > ClearCode &&
+                       CrntPrefix <= LZ_MAX_CODE) {
                     Stack[StackPtr++] = Suffix[CrntPrefix];
                     CrntPrefix = Prefix[CrntPrefix];
                 }
-                if (StackPtr >= LZ_MAX_CODE || CrntPrefix > LZ_MAX_CODE) {
+                if (StackPtr >= LZ_MAX_CODE ||
+                    CrntPrefix > LZ_MAX_CODE) {
                     GifFile->Error = D_GIF_ERR_IMAGE_DEFECT;
                     return GIF_ERROR;
                 }
@@ -964,22 +988,29 @@ DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen)
                 Stack[StackPtr++] = CrntPrefix;
 
                 /* Now lets pop all the stack into output: */
-                while (StackPtr != 0 && i < LineLen)
+                while (StackPtr != 0 && i < LineLen) {
                     Line[i++] = Stack[--StackPtr];
+                }
             }
-            if (LastCode != NO_SUCH_CODE && Private->RunningCode - 2 < (LZ_MAX_CODE+1) && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) {
+            if (LastCode != NO_SUCH_CODE &&
+                Private->RunningCode - 2 < (LZ_MAX_CODE + 1) &&
+                Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) {
                 Prefix[Private->RunningCode - 2] = LastCode;
 
                 if (CrntCode == Private->RunningCode - 2) {
-                    /* Only allowed if CrntCode is exactly the running code:
-                     * In that case CrntCode = XXXCode, CrntCode or the
-                     * prefix code is last code and the suffix char is
-                     * exactly the prefix of last code! */
+                    /* Only allowed if CrntCode is exactly
+                     * the running code: In that case
+                     * CrntCode = XXXCode, CrntCode or the
+                     * prefix code is last code and the
+                     * suffix char is exactly the prefix of
+                     * last code! */
                     Suffix[Private->RunningCode - 2] =
-                       DGifGetPrefixChar(Prefix, LastCode, ClearCode);
+                        DGifGetPrefixChar(Prefix, LastCode,
+                                          ClearCode);
                 } else {
                     Suffix[Private->RunningCode - 2] =
-                       DGifGetPrefixChar(Prefix, CrntCode, ClearCode);
+                        DGifGetPrefixChar(Prefix, CrntCode,
+                                          ClearCode);
                 }
             }
             LastCode = CrntCode;
@@ -998,9 +1029,8 @@ DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen)
  If image is defective, we might loop here forever, so we limit the loops to
  the maximum possible if image O.k. - LZ_MAX_CODE times.
 ******************************************************************************/
-static int
-DGifGetPrefixChar(GifPrefixType *Prefix, int Code, int ClearCode)
-{
+static int DGifGetPrefixChar(const GifPrefixType *Prefix, int Code,
+                             int ClearCode) {
     int i = 0;
 
     while (Code > ClearCode && i++ <= LZ_MAX_CODE) {
@@ -1016,9 +1046,7 @@ DGifGetPrefixChar(GifPrefixType *Prefix, int Code, int ClearCode)
  Interface for accessing the LZ codes directly. Set Code to the real code
  (12bits), or to -1 if EOF code is returned.
 ******************************************************************************/
-int
-DGifGetLZCodes(GifFileType *GifFile, int *Code)
-{
+int DGifGetLZCodes(GifFileType *GifFile, int *Code) {
     GifByteType *CodeBlock;
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
@@ -1028,15 +1056,18 @@ DGifGetLZCodes(GifFileType *GifFile, int *Code)
         return GIF_ERROR;
     }
 
-    if (DGifDecompressInput(GifFile, Code) == GIF_ERROR)
+    if (DGifDecompressInput(GifFile, Code) == GIF_ERROR) {
         return GIF_ERROR;
+    }
 
     if (*Code == Private->EOFCode) {
-        /* Skip rest of codes (hopefully only NULL terminating block): */
+        /* Skip rest of codes (hopefully only NULL terminating block):
+         */
         do {
-            if (DGifGetCodeNext(GifFile, &CodeBlock) == GIF_ERROR)
+            if (DGifGetCodeNext(GifFile, &CodeBlock) == GIF_ERROR) {
                 return GIF_ERROR;
-        } while (CodeBlock != NULL) ;
+            }
+        } while (CodeBlock != NULL);
 
         *Code = -1;
     } else if (*Code == Private->ClearCode) {
@@ -1055,15 +1086,10 @@ DGifGetLZCodes(GifFileType *GifFile, int *Code)
  8 bits (bytes) packets, into the real codes.
  Returns GIF_OK if read successfully.
 ******************************************************************************/
-static int
-DGifDecompressInput(GifFileType *GifFile, int *Code)
-{
+static int DGifDecompressInput(GifFileType *GifFile, int *Code) {
     static const unsigned short CodeMasks[] = {
-        0x0000, 0x0001, 0x0003, 0x0007,
-        0x000f, 0x001f, 0x003f, 0x007f,
-        0x00ff, 0x01ff, 0x03ff, 0x07ff,
-        0x0fff
-    };
+        0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f,
+        0x007f, 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff};
 
     GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
 
@@ -1077,11 +1103,12 @@ DGifDecompressInput(GifFileType *GifFile, int *Code)
 
     while (Private->CrntShiftState < Private->RunningBits) {
         /* Needs to get more bytes from input stream for next code: */
-        if (DGifBufferedInput(GifFile, Private->Buf, &NextByte) == GIF_ERROR) {
+        if (DGifBufferedInput(GifFile, Private->Buf, &NextByte) ==
+            GIF_ERROR) {
             return GIF_ERROR;
         }
-        Private->CrntShiftDWord |=
-            ((unsigned long)NextByte) << Private->CrntShiftState;
+        Private->CrntShiftDWord |= ((unsigned long)NextByte)
+                                   << Private->CrntShiftState;
         Private->CrntShiftState += 8;
     }
     *Code = Private->CrntShiftDWord & CodeMasks[Private->RunningBits];
@@ -1109,9 +1136,8 @@ DGifDecompressInput(GifFileType *GifFile, int *Code)
  The routine returns the next byte from its internal buffer (or read next
  block in if buffer empty) and returns GIF_OK if succesful.
 ******************************************************************************/
-static int
-DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf, GifByteType *NextByte)
-{
+static int DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf,
+                             GifByteType *NextByte) {
     if (Buf[0] == 0) {
         /* Needs to read the next buffer - this one is empty: */
         /* coverity[check_return] */
@@ -1120,8 +1146,8 @@ DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf, GifByteType *NextByte)
             return GIF_ERROR;
         }
         /* There shouldn't be any empty data blocks here as the LZW spec
-         * says the LZW termination code should come first.  Therefore we
-         * shouldn't be inside this routine at that point.
+         * says the LZW termination code should come first.  Therefore
+         * we shouldn't be inside this routine at that point.
          */
         if (Buf[0] == 0) {
             GifFile->Error = D_GIF_ERR_IMAGE_DEFECT;
@@ -1132,7 +1158,7 @@ DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf, GifByteType *NextByte)
             return GIF_ERROR;
         }
         *NextByte = Buf[1];
-        Buf[1] = 2;    /* We use now the second place as last char read! */
+        Buf[1] = 2; /* We use now the second place as last char read! */
         Buf[0]--;
     } else {
         *NextByte = Buf[Buf[1]++];
@@ -1142,14 +1168,32 @@ DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf, GifByteType *NextByte)
     return GIF_OK;
 }
 
+/******************************************************************************
+ This routine is called in case of error during parsing image. We need to
+ decrease image counter and reallocate memory for saved images. Not decreasing
+ ImageCount may lead to null pointer dereference, because the last element in
+ SavedImages may point to the spoilt image and null pointer buffers.
+*******************************************************************************/
+void DGifDecreaseImageCounter(GifFileType *GifFile) {
+    GifFile->ImageCount--;
+    if (GifFile->SavedImages[GifFile->ImageCount].RasterBits != NULL) {
+        free(GifFile->SavedImages[GifFile->ImageCount].RasterBits);
+    }
+
+    // Realloc array according to the new image counter.
+    SavedImage *correct_saved_images = (SavedImage *)reallocarray(
+        GifFile->SavedImages, GifFile->ImageCount, sizeof(SavedImage));
+    if (correct_saved_images != NULL) {
+        GifFile->SavedImages = correct_saved_images;
+    }
+}
+
 /******************************************************************************
  This routine reads an entire GIF into core, hanging all its state info off
  the GifFileType pointer.  Call DGifOpenFileName() or DGifOpenFileHandle()
  first to initialize I/O.  Its inverse is EGifSpew().
 *******************************************************************************/
-int
-DGifSlurp(GifFileType *GifFile)
-{
+int DGifSlurp(GifFileType *GifFile) {
     size_t ImageSize;
     GifRecordType RecordType;
     SavedImage *sp;
@@ -1160,103 +1204,130 @@ DGifSlurp(GifFileType *GifFile)
     GifFile->ExtensionBlockCount = 0;
 
     do {
-        if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR)
+        if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
             return (GIF_ERROR);
+        }
 
         switch (RecordType) {
-          case IMAGE_DESC_RECORD_TYPE:
-              if (DGifGetImageDesc(GifFile) == GIF_ERROR)
-                  return (GIF_ERROR);
+        case IMAGE_DESC_RECORD_TYPE:
+            if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
+                return (GIF_ERROR);
+            }
 
-              sp = &GifFile->SavedImages[GifFile->ImageCount - 1];
-              /* Allocate memory for the image */
-              if (sp->ImageDesc.Width <= 0 || sp->ImageDesc.Height <= 0 ||
-                      sp->ImageDesc.Width > (INT_MAX / sp->ImageDesc.Height)) {
-                  return GIF_ERROR;
-              }
-              ImageSize = sp->ImageDesc.Width * sp->ImageDesc.Height;
+            sp = &GifFile->SavedImages[GifFile->ImageCount - 1];
+            /* Allocate memory for the image */
+            if (sp->ImageDesc.Width <= 0 ||
+                sp->ImageDesc.Height <= 0 ||
+                sp->ImageDesc.Width >
+                    (INT_MAX / sp->ImageDesc.Height)) {
+                DGifDecreaseImageCounter(GifFile);
+                return GIF_ERROR;
+            }
+            ImageSize = sp->ImageDesc.Width * sp->ImageDesc.Height;
 
-              if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) {
-                  return GIF_ERROR;
-              }
-              sp->RasterBits = (unsigned char *)reallocarray(NULL, ImageSize,
-                      sizeof(GifPixelType));
+            if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) {
+                DGifDecreaseImageCounter(GifFile);
+                return GIF_ERROR;
+            }
+            sp->RasterBits = (unsigned char *)reallocarray(
+                NULL, ImageSize, sizeof(GifPixelType));
 
-              if (sp->RasterBits == NULL) {
-                  return GIF_ERROR;
-              }
+            if (sp->RasterBits == NULL) {
+                DGifDecreaseImageCounter(GifFile);
+                return GIF_ERROR;
+            }
 
-              if (sp->ImageDesc.Interlace) {
-                  int i, j;
-                   /*
-                    * The way an interlaced image should be read -
-                    * offsets and jumps...
-                    */
-                  int InterlacedOffset[] = { 0, 4, 2, 1 };
-                  int InterlacedJumps[] = { 8, 8, 4, 2 };
-                  /* Need to perform 4 passes on the image */
-                  for (i = 0; i < 4; i++)
-                      for (j = InterlacedOffset[i];
-                       j < sp->ImageDesc.Height;
-                       j += InterlacedJumps[i]) {
-                      if (DGifGetLine(GifFile,
-                              sp->RasterBits+j*sp->ImageDesc.Width,
-                              sp->ImageDesc.Width) == GIF_ERROR)
-                          return GIF_ERROR;
-                      }
-              }
-              else {
-                  if (DGifGetLine(GifFile,sp->RasterBits,ImageSize)==GIF_ERROR)
-                      return (GIF_ERROR);
-              }
+            if (sp->ImageDesc.Interlace) {
+                int i, j;
+                /*
+                 * The way an interlaced image should be read -
+                 * offsets and jumps...
+                 */
+                static const int InterlacedOffset[] = {0, 4, 2,
+                                                       1};
+                static const int InterlacedJumps[] = {8, 8, 4,
+                                                      2};
+                /* Need to perform 4 passes on the image */
+                for (i = 0; i < 4; i++) {
+                    for (j = InterlacedOffset[i];
+                         j < sp->ImageDesc.Height;
+                         j += InterlacedJumps[i]) {
+                        if (DGifGetLine(
+                                GifFile,
+                                sp->RasterBits +
+                                    j * sp->ImageDesc
+                                            .Width,
+                                sp->ImageDesc.Width) ==
+                            GIF_ERROR) {
+                            DGifDecreaseImageCounter(
+                                GifFile);
+                            return GIF_ERROR;
+                        }
+                    }
+                }
+            } else {
+                if (DGifGetLine(GifFile, sp->RasterBits,
+                                ImageSize) == GIF_ERROR) {
+                    DGifDecreaseImageCounter(GifFile);
+                    return GIF_ERROR;
+                }
+            }
 
-              if (GifFile->ExtensionBlocks) {
-                  sp->ExtensionBlocks = GifFile->ExtensionBlocks;
-                  sp->ExtensionBlockCount = GifFile->ExtensionBlockCount;
+            if (GifFile->ExtensionBlocks) {
+                sp->ExtensionBlocks = GifFile->ExtensionBlocks;
+                sp->ExtensionBlockCount =
+                    GifFile->ExtensionBlockCount;
 
-                  GifFile->ExtensionBlocks = NULL;
-                  GifFile->ExtensionBlockCount = 0;
-              }
-              break;
+                GifFile->ExtensionBlocks = NULL;
+                GifFile->ExtensionBlockCount = 0;
+            }
+            break;
 
-          case EXTENSION_RECORD_TYPE:
-              if (DGifGetExtension(GifFile,&ExtFunction,&ExtData) == GIF_ERROR)
-                  return (GIF_ERROR);
-              /* Create an extension block with our data */
-              if (ExtData != NULL) {
-                  if (GifAddExtensionBlock(&GifFile->ExtensionBlockCount,
-                               &GifFile->ExtensionBlocks,
-                               ExtFunction, ExtData[0], &ExtData[1])
-                      == GIF_ERROR)
-                      return (GIF_ERROR);
-              }
-              for (;;) {
-                  if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR)
-                      return (GIF_ERROR);
-                  if (ExtData == NULL)
-                      break;
-                  /* Continue the extension block */
-                  if (ExtData != NULL)
-                      if (GifAddExtensionBlock(&GifFile->ExtensionBlockCount,
-                                   &GifFile->ExtensionBlocks,
-                                   CONTINUE_EXT_FUNC_CODE,
-                                   ExtData[0], &ExtData[1]) == GIF_ERROR)
-                              return (GIF_ERROR);
-              }
-              break;
+        case EXTENSION_RECORD_TYPE:
+            if (DGifGetExtension(GifFile, &ExtFunction, &ExtData) ==
+                GIF_ERROR) {
+                return (GIF_ERROR);
+            }
+            /* Create an extension block with our data */
+            if (ExtData != NULL) {
+                if (GifAddExtensionBlock(
+                        &GifFile->ExtensionBlockCount,
+                        &GifFile->ExtensionBlocks, ExtFunction,
+                        ExtData[0], &ExtData[1]) == GIF_ERROR) {
+                    return (GIF_ERROR);
+                }
+            }
+            for (;;) {
+                if (DGifGetExtensionNext(GifFile, &ExtData) ==
+                    GIF_ERROR) {
+                    return (GIF_ERROR);
+                }
+                if (ExtData == NULL) {
+                    break;
+                }
+                /* Continue the extension block */
+                if (GifAddExtensionBlock(
+                        &GifFile->ExtensionBlockCount,
+                        &GifFile->ExtensionBlocks,
+                        CONTINUE_EXT_FUNC_CODE, ExtData[0],
+                        &ExtData[1]) == GIF_ERROR) {
+                    return (GIF_ERROR);
+                }
+            }
+            break;
 
-          case TERMINATE_RECORD_TYPE:
-              break;
+        case TERMINATE_RECORD_TYPE:
+            break;
 
-          default:    /* Should be trapped by DGifGetRecordType */
-              break;
+        default: /* Should be trapped by DGifGetRecordType */
+            break;
         }
     } while (RecordType != TERMINATE_RECORD_TYPE);
 
     /* Sanity check for corrupted file */
     if (GifFile->ImageCount == 0) {
         GifFile->Error = D_GIF_ERR_NO_IMAG_DSCR;
-        return(GIF_ERROR);
+        return (GIF_ERROR);
     }
 
     return (GIF_OK);
diff --git a/src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c b/src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c
index db08838efff..3b6785f7c63 100644
--- a/src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c
+++ b/src/java.desktop/share/native/libsplashscreen/giflib/gif_err.c
@@ -38,82 +38,80 @@ SPDX-License-Identifier: MIT
 /*****************************************************************************
  Return a string description of  the last GIF error
 *****************************************************************************/
-const char *
-GifErrorString(int ErrorCode)
-{
+const char *GifErrorString(int ErrorCode) {
     const char *Err;
 
     switch (ErrorCode) {
-      case E_GIF_ERR_OPEN_FAILED:
+    case E_GIF_ERR_OPEN_FAILED:
         Err = "Failed to open given file";
         break;
-      case E_GIF_ERR_WRITE_FAILED:
+    case E_GIF_ERR_WRITE_FAILED:
         Err = "Failed to write to given file";
         break;
-      case E_GIF_ERR_HAS_SCRN_DSCR:
+    case E_GIF_ERR_HAS_SCRN_DSCR:
         Err = "Screen descriptor has already been set";
         break;
-      case E_GIF_ERR_HAS_IMAG_DSCR:
+    case E_GIF_ERR_HAS_IMAG_DSCR:
         Err = "Image descriptor is still active";
         break;
-      case E_GIF_ERR_NO_COLOR_MAP:
+    case E_GIF_ERR_NO_COLOR_MAP:
         Err = "Neither global nor local color map";
         break;
-      case E_GIF_ERR_DATA_TOO_BIG:
+    case E_GIF_ERR_DATA_TOO_BIG:
         Err = "Number of pixels bigger than width * height";
         break;
-      case E_GIF_ERR_NOT_ENOUGH_MEM:
+    case E_GIF_ERR_NOT_ENOUGH_MEM:
         Err = "Failed to allocate required memory";
         break;
-      case E_GIF_ERR_DISK_IS_FULL:
+    case E_GIF_ERR_DISK_IS_FULL:
         Err = "Write failed (disk full?)";
         break;
-      case E_GIF_ERR_CLOSE_FAILED:
+    case E_GIF_ERR_CLOSE_FAILED:
         Err = "Failed to close given file";
         break;
-      case E_GIF_ERR_NOT_WRITEABLE:
+    case E_GIF_ERR_NOT_WRITEABLE:
         Err = "Given file was not opened for write";
         break;
-      case D_GIF_ERR_OPEN_FAILED:
+    case D_GIF_ERR_OPEN_FAILED:
         Err = "Failed to open given file";
         break;
-      case D_GIF_ERR_READ_FAILED:
+    case D_GIF_ERR_READ_FAILED:
         Err = "Failed to read from given file";
         break;
-      case D_GIF_ERR_NOT_GIF_FILE:
+    case D_GIF_ERR_NOT_GIF_FILE:
         Err = "Data is not in GIF format";
         break;
-      case D_GIF_ERR_NO_SCRN_DSCR:
+    case D_GIF_ERR_NO_SCRN_DSCR:
         Err = "No screen descriptor detected";
         break;
-      case D_GIF_ERR_NO_IMAG_DSCR:
+    case D_GIF_ERR_NO_IMAG_DSCR:
         Err = "No Image Descriptor detected";
         break;
-      case D_GIF_ERR_NO_COLOR_MAP:
+    case D_GIF_ERR_NO_COLOR_MAP:
         Err = "Neither global nor local color map";
         break;
-      case D_GIF_ERR_WRONG_RECORD:
+    case D_GIF_ERR_WRONG_RECORD:
         Err = "Wrong record type detected";
         break;
-      case D_GIF_ERR_DATA_TOO_BIG:
+    case D_GIF_ERR_DATA_TOO_BIG:
         Err = "Number of pixels bigger than width * height";
         break;
-      case D_GIF_ERR_NOT_ENOUGH_MEM:
+    case D_GIF_ERR_NOT_ENOUGH_MEM:
         Err = "Failed to allocate required memory";
         break;
-      case D_GIF_ERR_CLOSE_FAILED:
+    case D_GIF_ERR_CLOSE_FAILED:
         Err = "Failed to close given file";
         break;
-      case D_GIF_ERR_NOT_READABLE:
+    case D_GIF_ERR_NOT_READABLE:
         Err = "Given file was not opened for read";
         break;
-      case D_GIF_ERR_IMAGE_DEFECT:
+    case D_GIF_ERR_IMAGE_DEFECT:
         Err = "Image is defective, decoding aborted";
         break;
-      case D_GIF_ERR_EOF_TOO_SOON:
+    case D_GIF_ERR_EOF_TOO_SOON:
         Err = "Image EOF detected before image complete";
         break;
-      default:
+    default:
         Err = NULL;
         break;
     }
diff --git a/src/java.desktop/share/native/libsplashscreen/giflib/gif_hash.h b/src/java.desktop/share/native/libsplashscreen/giflib/gif_hash.h
index 6cabd0866ed..bd00af64161 100644
--- a/src/java.desktop/share/native/libsplashscreen/giflib/gif_hash.h
+++ b/src/java.desktop/share/native/libsplashscreen/giflib/gif_hash.h
@@ -33,27 +33,25 @@ SPDX-License-Identifier: MIT
 #ifndef _GIF_HASH_H_
 #define _GIF_HASH_H_
 
-/** Begin JDK modifications to support building on Windows **/
 #ifndef _WIN32
 #include <unistd.h>
-#endif
-/** End JDK modifications to support building on Windows **/
+#endif /* _WIN32 */
 #include <stdint.h>
 
-#define HT_SIZE         8192    /* 12bits = 4096 or twice as big! */
-#define HT_KEY_MASK     0x1FFF  /* 13bits keys */
-#define HT_KEY_NUM_BITS 13      /* 13bits keys */
-#define HT_MAX_KEY      8191    /* 13bits - 1, maximal code possible */
-#define HT_MAX_CODE     4095    /* Biggest code possible in 12 bits. */
+#define HT_SIZE 8192       /* 12bits = 4096 or twice as big! */
+#define HT_KEY_MASK 0x1FFF /* 13bits keys */
+#define HT_KEY_NUM_BITS 13 /* 13bits keys */
+#define HT_MAX_KEY 8191    /* 13bits - 1, maximal code possible */
+#define HT_MAX_CODE 4095   /* Biggest code possible in 12 bits. */
 
 /* The 32 bits of the long are divided into two parts for the key & code:   */
 /* 1. The code is 12 bits as our compression algorithm is limited to 12bits */
-/* 2. The key is 12 bits Prefix code + 8 bit new char or 20 bits.           */
+/* 2. The key is 12 bits Prefix code + 8 bit new char or 20 bits.        */
 /* The key is the upper 20 bits.  The code is the lower 12. */
-#define HT_GET_KEY(l)    (l >> 12)
-#define HT_GET_CODE(l)   (l & 0x0FFF)
-#define HT_PUT_KEY(l)    (l << 12)
-#define HT_PUT_CODE(l)   (l & 0x0FFF)
+#define HT_GET_KEY(l) (l >> 12)
+#define HT_GET_CODE(l) (l & 0x0FFF)
+#define HT_PUT_KEY(l) (l << 12)
+#define HT_PUT_CODE(l) (l & 0x0FFF)
 
 typedef struct GifHashTableType {
     uint32_t HTable[HT_SIZE];
diff --git a/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h b/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
index f739b36adfd..74a2e969c0d 100644
--- a/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
+++ b/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
@@ -39,27 +39,19 @@ extern "C" {
 
 #define GIFLIB_MAJOR 5
 #define GIFLIB_MINOR 2
-#define GIFLIB_RELEASE 1
+#define GIFLIB_RELEASE 2
 
-#define GIF_ERROR   0
-#define GIF_OK      1
+#define GIF_ERROR 0
+#define GIF_OK 1
 
+#include <stdbool.h>
 #include <stddef.h>
-/** Begin JDK modifications to support building using old compilers**/
-//#include <stdbool.h>
-#ifdef bool
-#undef bool
-#endif
-typedef int bool;
-#define false 0
-#define true 1
-/** End JDK modifications to support building using old compilers**/
 
-#define GIF_STAMP "GIFVER"          /* First chars in file - GIF stamp.  */
+#define GIF_STAMP "GIFVER" /* First chars in file - GIF stamp.  */
 #define GIF_STAMP_LEN sizeof(GIF_STAMP) - 1
-#define GIF_VERSION_POS 3           /* Version first character in stamp. */
-#define GIF87_STAMP "GIF87a"        /* First chars in file - GIF stamp.  */
-#define GIF89_STAMP "GIF89a"        /* First chars in file - GIF stamp.  */
+#define GIF_VERSION_POS 3    /* Version first character in stamp. */
+#define GIF87_STAMP "GIF87a" /* First chars in file - GIF stamp.  */
+#define GIF89_STAMP "GIF89a" /* First chars in file - GIF stamp.  */
 
 typedef unsigned char GifPixelType;
 typedef unsigned char *GifRowType;
@@ -75,24 +67,24 @@ typedef struct ColorMapObject {
     int ColorCount;
     int BitsPerPixel;
     bool SortFlag;
-    GifColorType *Colors;    /* on malloc(3) heap */
+    GifColorType *Colors; /* on malloc(3) heap */
 } ColorMapObject;
 
 typedef struct GifImageDesc {
-    GifWord Left, Top, Width, Height;   /* Current image dimensions. */
-    bool Interlace;                     /* Sequential/Interlaced lines. */
-    ColorMapObject *ColorMap;           /* The local color map */
+    GifWord Left, Top, Width, Height; /* Current image dimensions. */
+    bool Interlace;                   /* Sequential/Interlaced lines. */
+    ColorMapObject *ColorMap;         /* The local color map */
 } GifImageDesc;
 
 typedef struct ExtensionBlock {
     int ByteCount;
-    GifByteType *Bytes; /* on malloc(3) heap */
-    int Function;       /* The block function code */
-#define CONTINUE_EXT_FUNC_CODE    0x00    /* continuation subblock */
-#define COMMENT_EXT_FUNC_CODE     0xfe    /* comment */
-#define GRAPHICS_EXT_FUNC_CODE    0xf9    /* graphics control (GIF89) */
-#define PLAINTEXT_EXT_FUNC_CODE   0x01    /* plaintext */
-#define APPLICATION_EXT_FUNC_CODE 0xff    /* application block (GIF89) */
+    GifByteType *Bytes;            /* on malloc(3) heap */
+    int Function;                  /* The block function code */
+#define CONTINUE_EXT_FUNC_CODE 0x00    /* continuation subblock */
+#define COMMENT_EXT_FUNC_CODE 0xfe     /* comment */
+#define GRAPHICS_EXT_FUNC_CODE 0xf9    /* graphics control (GIF89) */
+#define PLAINTEXT_EXT_FUNC_CODE 0x01   /* plaintext */
+#define APPLICATION_EXT_FUNC_CODE 0xff /* application block (GIF89) */
 } ExtensionBlock;
 
 typedef struct SavedImage {
@@ -103,22 +95,22 @@ typedef struct SavedImage {
 } SavedImage;
 
 typedef struct GifFileType {
-    GifWord SWidth, SHeight;         /* Size of virtual canvas */
-    GifWord SColorResolution;        /* How many colors can we generate? */
-    GifWord SBackGroundColor;        /* Background color for virtual canvas */
-    GifByteType AspectByte;          /* Used to compute pixel aspect ratio */
-    ColorMapObject *SColorMap;       /* Global colormap, NULL if nonexistent. */
-    int ImageCount;                  /* Number of current image (both APIs) */
-    GifImageDesc Image;              /* Current image (low-level API) */
-    SavedImage *SavedImages;         /* Image sequence (high-level API) */
-    int ExtensionBlockCount;         /* Count extensions past last image */
+    GifWord SWidth, SHeight;   /* Size of virtual canvas */
+    GifWord SColorResolution;  /* How many colors can we generate? */
+    GifWord SBackGroundColor;  /* Background color for virtual canvas */
+    GifByteType AspectByte;    /* Used to compute pixel aspect ratio */
+    ColorMapObject *SColorMap; /* Global colormap, NULL if nonexistent. */
+    int ImageCount;            /* Number of current image (both APIs) */
+    GifImageDesc Image;        /* Current image (low-level API) */
+    SavedImage *SavedImages;   /* Image sequence (high-level API) */
+    int ExtensionBlockCount;   /* Count extensions past last image */
     ExtensionBlock *ExtensionBlocks; /* Extensions past last image */
     int Error;                       /* Last error condition reported */
     void *UserData;                  /* hook to attach user data (TVT) */
     void *Private;                   /* Don't mess with this! */
 } GifFileType;
 
-#define GIF_ASPECT_RATIO(n)    ((n)+15.0/64.0)
+#define GIF_ASPECT_RATIO(n) ((n) + 15.0 / 64.0)
 
 typedef enum {
     UNDEFINED_RECORD_TYPE,
@@ -129,12 +121,12 @@ typedef enum {
 } GifRecordType;
 
 /* func type to read gif data from arbitrary sources (TVT) */
-typedef int (*InputFunc) (GifFileType *, GifByteType *, int);
+typedef int (*InputFunc)(GifFileType *, GifByteType *, int);
 
 /* func type to write gif data to arbitrary targets.
  * Returns count of bytes written. (MRB)
  */
-typedef int (*OutputFunc) (GifFileType *, const GifByteType *, int);
+typedef int (*OutputFunc)(GifFileType *, const GifByteType *, int);
 
 /******************************************************************************
  GIF89 structures
@@ -142,14 +134,14 @@ typedef int (*OutputFunc) (GifFileType *, const GifByteType *, int);
 
 typedef struct GraphicsControlBlock {
     int DisposalMode;
-#define DISPOSAL_UNSPECIFIED      0       /* No disposal specified. */
-#define DISPOSE_DO_NOT            1       /* Leave image in place */
-#define DISPOSE_BACKGROUND        2       /* Set area too background color */
-#define DISPOSE_PREVIOUS          3       /* Restore to previous content */
-    bool UserInputFlag;      /* User confirmation required before disposal */
-    int DelayTime;           /* pre-display delay in 0.01sec units */
-    int TransparentColor;    /* Palette index for transparency, -1 if none */
-#define NO_TRANSPARENT_COLOR    -1
+#define DISPOSAL_UNSPECIFIED 0 /* No disposal specified. */
+#define DISPOSE_DO_NOT 1       /* Leave image in place */
+#define DISPOSE_BACKGROUND 2   /* Set area too background color */
+#define DISPOSE_PREVIOUS 3     /* Restore to previous content */
+    bool UserInputFlag;    /* User confirmation required before disposal */
+    int DelayTime;         /* pre-display delay in 0.01sec units */
+    int TransparentColor;  /* Palette index for transparency, -1 if none */
+#define NO_TRANSPARENT_COLOR -1
 } GraphicsControlBlock;
 
 /******************************************************************************
@@ -161,49 +153,44 @@ GifFileType *EGifOpenFileName(const char *GifFileName,
                               const bool GifTestExistence, int *Error);
 GifFileType *EGifOpenFileHandle(const int GifFileHandle, int *Error);
 GifFileType *EGifOpen(void *userPtr, OutputFunc writeFunc, int *Error);
-int EGifSpew(GifFileType * GifFile);
+int EGifSpew(GifFileType *GifFile);
 const char *EGifGetGifVersion(GifFileType *GifFile); /* new in 5.x */
 int EGifCloseFile(GifFileType *GifFile, int *ErrorCode);
 
-#define E_GIF_SUCCEEDED          0
-#define E_GIF_ERR_OPEN_FAILED    1    /* And EGif possible errors. */
-#define E_GIF_ERR_WRITE_FAILED   2
-#define E_GIF_ERR_HAS_SCRN_DSCR  3
-#define E_GIF_ERR_HAS_IMAG_DSCR  4
-#define E_GIF_ERR_NO_COLOR_MAP   5
-#define E_GIF_ERR_DATA_TOO_BIG   6
+#define E_GIF_SUCCEEDED 0
+#define E_GIF_ERR_OPEN_FAILED 1 /* And EGif possible errors. */
+#define E_GIF_ERR_WRITE_FAILED 2
+#define E_GIF_ERR_HAS_SCRN_DSCR 3
+#define E_GIF_ERR_HAS_IMAG_DSCR 4
+#define E_GIF_ERR_NO_COLOR_MAP 5
+#define E_GIF_ERR_DATA_TOO_BIG 6
 #define E_GIF_ERR_NOT_ENOUGH_MEM 7
-#define E_GIF_ERR_DISK_IS_FULL   8
-#define E_GIF_ERR_CLOSE_FAILED   9
-#define E_GIF_ERR_NOT_WRITEABLE  10
+#define E_GIF_ERR_DISK_IS_FULL 8
+#define E_GIF_ERR_CLOSE_FAILED 9
+#define E_GIF_ERR_NOT_WRITEABLE 10
 
 /* These are legacy.  You probably do not want to call them directly */
-int EGifPutScreenDesc(GifFileType *GifFile,
-                      const int GifWidth, const int GifHeight,
-                      const int GifColorRes,
+int EGifPutScreenDesc(GifFileType *GifFile, const int GifWidth,
+                      const int GifHeight, const int GifColorRes,
                       const int GifBackGround,
                       const ColorMapObject *GifColorMap);
-int EGifPutImageDesc(GifFileType *GifFile,
-                     const int GifLeft, const int GifTop,
+int EGifPutImageDesc(GifFileType *GifFile, const int GifLeft, const int GifTop,
                      const int GifWidth, const int GifHeight,
                      const bool GifInterlace,
                      const ColorMapObject *GifColorMap);
 void EGifSetGifVersion(GifFileType *GifFile, const bool gif89);
-int EGifPutLine(GifFileType *GifFile, GifPixelType *GifLine,
-                int GifLineLen);
+int EGifPutLine(GifFileType *GifFile, GifPixelType *GifLine, int GifLineLen);
 int EGifPutPixel(GifFileType *GifFile, const GifPixelType GifPixel);
 int EGifPutComment(GifFileType *GifFile, const char *GifComment);
 int EGifPutExtensionLeader(GifFileType *GifFile, const int GifExtCode);
-int EGifPutExtensionBlock(GifFileType *GifFile,
-                         const int GifExtLen, const void *GifExtension);
+int EGifPutExtensionBlock(GifFileType *GifFile, const int GifExtLen,
+                          const void *GifExtension);
 int EGifPutExtensionTrailer(GifFileType *GifFile);
 int EGifPutExtension(GifFileType *GifFile, const int GifExtCode,
-                     const int GifExtLen,
-                     const void *GifExtension);
+                     const int GifExtLen, const void *GifExtension);
 int EGifPutCode(GifFileType *GifFile, int GifCodeSize,
                 const GifByteType *GifCodeBlock);
-int EGifPutCodeNext(GifFileType *GifFile,
-                    const GifByteType *GifCodeBlock);
+int EGifPutCodeNext(GifFileType *GifFile, const GifByteType *GifCodeBlock);
 
 /******************************************************************************
  GIF decoding routines
@@ -212,24 +199,25 @@ int EGifPutCodeNext(GifFileType *GifFile,
 /* Main entry points */
 GifFileType *DGifOpenFileName(const char *GifFileName, int *Error);
 GifFileType *DGifOpenFileHandle(int GifFileHandle, int *Error);
-int DGifSlurp(GifFileType * GifFile);
-GifFileType *DGifOpen(void *userPtr, InputFunc readFunc, int *Error);    /* new one (TVT) */
-    int DGifCloseFile(GifFileType * GifFile, int *ErrorCode);
+int DGifSlurp(GifFileType *GifFile);
+GifFileType *DGifOpen(void *userPtr, InputFunc readFunc,
+                      int *Error); /* new one (TVT) */
+int DGifCloseFile(GifFileType *GifFile, int *ErrorCode);
 
-#define D_GIF_SUCCEEDED          0
-#define D_GIF_ERR_OPEN_FAILED    101    /* And DGif possible errors. */
-#define D_GIF_ERR_READ_FAILED    102
-#define D_GIF_ERR_NOT_GIF_FILE   103
-#define D_GIF_ERR_NO_SCRN_DSCR   104
-#define D_GIF_ERR_NO_IMAG_DSCR   105
-#define D_GIF_ERR_NO_COLOR_MAP   106
-#define D_GIF_ERR_WRONG_RECORD   107
-#define D_GIF_ERR_DATA_TOO_BIG   108
+#define D_GIF_SUCCEEDED 0
+#define D_GIF_ERR_OPEN_FAILED 101 /* And DGif possible errors. */
+#define D_GIF_ERR_READ_FAILED 102
+#define D_GIF_ERR_NOT_GIF_FILE 103
+#define D_GIF_ERR_NO_SCRN_DSCR 104
+#define D_GIF_ERR_NO_IMAG_DSCR 105
+#define D_GIF_ERR_NO_COLOR_MAP 106
+#define D_GIF_ERR_WRONG_RECORD 107
+#define D_GIF_ERR_DATA_TOO_BIG 108
 #define D_GIF_ERR_NOT_ENOUGH_MEM 109
-#define D_GIF_ERR_CLOSE_FAILED   110
-#define D_GIF_ERR_NOT_READABLE   111
-#define D_GIF_ERR_IMAGE_DEFECT   112
-#define D_GIF_ERR_EOF_TOO_SOON   113
+#define D_GIF_ERR_CLOSE_FAILED 110
+#define D_GIF_ERR_NOT_READABLE 111
+#define D_GIF_ERR_IMAGE_DEFECT 112
+#define D_GIF_ERR_EOF_TOO_SOON 113
 
 /* These are legacy.  You probably do not want to call them directly */
 int DGifGetScreenDesc(GifFileType *GifFile);
@@ -247,11 +235,10 @@ int DGifGetCodeNext(GifFileType *GifFile, GifByteType **GifCodeBlock);
 int DGifGetLZCodes(GifFileType *GifFile, int *GifCode);
 const char *DGifGetGifVersion(GifFileType *GifFile);
 
-
 /******************************************************************************
  Error handling and reporting.
 ******************************************************************************/
-extern const char *GifErrorString(int ErrorCode);     /* new in 2012 - ESR */
+extern const char *GifErrorString(int ErrorCode); /* new in 2012 - ESR */
 
 /*****************************************************************************
  Everything below this point is new after version 1.2, supporting `slurp
@@ -263,26 +250,26 @@ extern const char *GifErrorString(int ErrorCode);     /* new in 2012 - ESR */
 ******************************************************************************/
 
 extern ColorMapObject *GifMakeMapObject(int ColorCount,
-                                     const GifColorType *ColorMap);
+                                        const GifColorType *ColorMap);
 extern void GifFreeMapObject(ColorMapObject *Object);
 extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
-                                     const ColorMapObject *ColorIn2,
-                                     GifPixelType ColorTransIn2[]);
+                                        const ColorMapObject *ColorIn2,
+                                        GifPixelType ColorTransIn2[]);
 extern int GifBitSize(int n);
 
 /******************************************************************************
  Support for the in-core structures allocation (slurp mode).
 ******************************************************************************/
 
-extern void GifApplyTranslation(SavedImage *Image, GifPixelType Translation[]);
+extern void GifApplyTranslation(SavedImage *Image,
+                                const GifPixelType Translation[]);
 extern int GifAddExtensionBlock(int *ExtensionBlock_Count,
-                                ExtensionBlock **ExtensionBlocks,
-                                int Function,
+                                ExtensionBlock **ExtensionBlocks, int Function,
                                 unsigned int Len, unsigned char ExtData[]);
 extern void GifFreeExtensions(int *ExtensionBlock_Count,
                               ExtensionBlock **ExtensionBlocks);
 extern SavedImage *GifMakeSavedImage(GifFileType *GifFile,
-                                  const SavedImage *CopyFrom);
+                                     const SavedImage *CopyFrom);
 extern void GifFreeSavedImages(GifFileType *GifFile);
 
 /******************************************************************************
@@ -295,37 +282,31 @@ int DGifExtensionToGCB(const size_t GifExtensionLength,
 size_t EGifGCBToExtension(const GraphicsControlBlock *GCB,
                           GifByteType *GifExtension);
 
-int DGifSavedExtensionToGCB(GifFileType *GifFile,
-                            int ImageIndex,
+int DGifSavedExtensionToGCB(GifFileType *GifFile, int ImageIndex,
                             GraphicsControlBlock *GCB);
 int EGifGCBToSavedExtension(const GraphicsControlBlock *GCB,
-                            GifFileType *GifFile,
-                            int ImageIndex);
+                            GifFileType *GifFile, int ImageIndex);
 
 /******************************************************************************
  The library's internal utility font
 ******************************************************************************/
 
-#define GIF_FONT_WIDTH  8
+#define GIF_FONT_WIDTH 8
 #define GIF_FONT_HEIGHT 8
 extern const unsigned char GifAsciiTable8x8[][GIF_FONT_WIDTH];
 
-extern void GifDrawText8x8(SavedImage *Image,
-                     const int x, const int y,
-                     const char *legend, const int color);
+extern void GifDrawText8x8(SavedImage *Image, const int x, const int y,
+                           const char *legend, const int color);
 
-extern void GifDrawBox(SavedImage *Image,
-                    const int x, const int y,
-                    const int w, const int d, const int color);
+extern void GifDrawBox(SavedImage *Image, const int x, const int y, const int w,
+                       const int d, const int color);
 
-extern void GifDrawRectangle(SavedImage *Image,
-                   const int x, const int y,
-                   const int w, const int d, const int color);
+extern void GifDrawRectangle(SavedImage *Image, const int x, const int y,
+                             const int w, const int d, const int color);
 
-extern void GifDrawBoxedText8x8(SavedImage *Image,
-                          const int x, const int y,
-                          const char *legend,
-                          const int border, const int bg, const int fg);
+extern void GifDrawBoxedText8x8(SavedImage *Image, const int x, const int y,
+                                const char *legend, const int border,
+                                const int bg, const int fg);
 
 #ifdef __cplusplus
 }
diff --git a/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h b/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h
index 4f832676ffc..f905e0d7b48 100644
--- a/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h
+++ b/src/java.desktop/share/native/libsplashscreen/giflib/gif_lib_private.h
@@ -33,52 +33,54 @@ SPDX-License-Identifier: MIT
 #ifndef _GIF_LIB_PRIVATE_H
 #define _GIF_LIB_PRIVATE_H
 
-#include "gif_lib.h"
 #include "gif_hash.h"
+#include "gif_lib.h"
 
 #ifndef SIZE_MAX
-    #define SIZE_MAX     UINTPTR_MAX
+#define SIZE_MAX UINTPTR_MAX
 #endif
 
-#define EXTENSION_INTRODUCER      0x21
-#define DESCRIPTOR_INTRODUCER     0x2c
-#define TERMINATOR_INTRODUCER     0x3b
+#define EXTENSION_INTRODUCER 0x21
+#define DESCRIPTOR_INTRODUCER 0x2c
+#define TERMINATOR_INTRODUCER 0x3b
 
-#define LZ_MAX_CODE         4095    /* Biggest code possible in 12 bits. */
-#define LZ_BITS             12
+#define LZ_MAX_CODE 4095 /* Biggest code possible in 12 bits. */
+#define LZ_BITS 12
 
-#define FLUSH_OUTPUT        4096    /* Impossible code, to signal flush. */
-#define FIRST_CODE          4097    /* Impossible code, to signal first. */
-#define NO_SUCH_CODE        4098    /* Impossible code, to signal empty. */
+#define FLUSH_OUTPUT 4096 /* Impossible code, to signal flush. */
+#define FIRST_CODE 4097   /* Impossible code, to signal first. */
+#define NO_SUCH_CODE 4098 /* Impossible code, to signal empty. */
 
-#define FILE_STATE_WRITE    0x01
-#define FILE_STATE_SCREEN   0x02
-#define FILE_STATE_IMAGE    0x04
-#define FILE_STATE_READ     0x08
+#define FILE_STATE_WRITE 0x01
+#define FILE_STATE_SCREEN 0x02
+#define FILE_STATE_IMAGE 0x04
+#define FILE_STATE_READ 0x08
 
-#define IS_READABLE(Private)    (Private->FileState & FILE_STATE_READ)
-#define IS_WRITEABLE(Private)   (Private->FileState & FILE_STATE_WRITE)
+#define IS_READABLE(Private) (Private->FileState & FILE_STATE_READ)
+#define IS_WRITEABLE(Private) (Private->FileState & FILE_STATE_WRITE)
 
 typedef struct GifFilePrivateType {
-    GifWord FileState, FileHandle,  /* Where all this data goes to! */
-      BitsPerPixel,     /* Bits per pixel (Codes uses at least this + 1). */
-      ClearCode,   /* The CLEAR LZ code. */
-      EOFCode,     /* The EOF LZ code. */
-      RunningCode, /* The next code algorithm can generate. */
-      RunningBits, /* The number of bits required to represent RunningCode. */
-      MaxCode1,    /* 1 bigger than max. possible code, in RunningBits bits. */
-      LastCode,    /* The code before the current code. */
-      CrntCode,    /* Current algorithm code. */
-      StackPtr,    /* For character stack (see below). */
-      CrntShiftState;    /* Number of bits in CrntShiftDWord. */
-    unsigned long CrntShiftDWord;   /* For bytes decomposition into codes. */
-    unsigned long PixelCount;   /* Number of pixels in image. */
-    FILE *File;    /* File as stream. */
-    InputFunc Read;     /* function to read gif input (TVT) */
-    OutputFunc Write;   /* function to write gif output (MRB) */
-    GifByteType Buf[256];   /* Compressed input is buffered here. */
+    GifWord FileState, FileHandle, /* Where all this data goes to! */
+        BitsPerPixel, /* Bits per pixel (Codes uses at least this + 1). */
+        ClearCode,    /* The CLEAR LZ code. */
+        EOFCode,      /* The EOF LZ code. */
+        RunningCode,  /* The next code algorithm can generate. */
+        RunningBits,  /* The number of bits required to represent
+                         RunningCode. */
+        MaxCode1, /* 1 bigger than max. possible code, in RunningBits bits.
+                   */
+        LastCode, /* The code before the current code. */
+        CrntCode, /* Current algorithm code. */
+        StackPtr, /* For character stack (see below). */
+        CrntShiftState;           /* Number of bits in CrntShiftDWord. */
+    unsigned long CrntShiftDWord; /* For bytes decomposition into codes. */
+    unsigned long PixelCount;     /* Number of pixels in image. */
+    FILE *File;                   /* File as stream. */
+    InputFunc Read;               /* function to read gif input (TVT) */
+    OutputFunc Write;             /* function to write gif output (MRB) */
+    GifByteType Buf[256];         /* Compressed input is buffered here. */
     GifByteType Stack[LZ_MAX_CODE]; /* Decoded pixels are stacked here. */
-    GifByteType Suffix[LZ_MAX_CODE + 1];    /* So we can trace the codes. */
+    GifByteType Suffix[LZ_MAX_CODE + 1]; /* So we can trace the codes. */
     GifPrefixType Prefix[LZ_MAX_CODE + 1];
     GifHashTableType *HashTable;
     bool gif89;
diff --git a/src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c b/src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c
index 75b74b4fba0..5aef3044558 100644
--- a/src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c
+++ b/src/java.desktop/share/native/libsplashscreen/giflib/gifalloc.c
@@ -30,59 +30,59 @@ SPDX-License-Identifier: MIT
 
 ****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "gif_lib.h"
 #include "gif_lib_private.h"
 
-#define MAX(x, y)    (((x) > (y)) ? (x) : (y))
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
 
 /******************************************************************************
  Miscellaneous utility functions
 ******************************************************************************/
 
 /* return smallest bitfield size n will fit in */
-int
-GifBitSize(int n)
-{
+int GifBitSize(int n) {
     register int i;
 
-    for (i = 1; i <= 8; i++)
-        if ((1 << i) >= n)
+    for (i = 1; i <= 8; i++) {
+        if ((1 << i) >= n) {
             break;
+        }
+    }
     return (i);
 }
 
 /******************************************************************************
-  Color map object functions
+ Color map object functions
 ******************************************************************************/
 
 /*
  * Allocate a color map of given size; initialize with contents of
  * ColorMap if that pointer is non-NULL.
  */
-ColorMapObject *
-GifMakeMapObject(int ColorCount, const GifColorType *ColorMap)
-{
+ColorMapObject *GifMakeMapObject(int ColorCount, const GifColorType *ColorMap) {
     ColorMapObject *Object;
 
     /*** FIXME: Our ColorCount has to be a power of two.  Is it necessary to
-     * make the user know that or should we automatically round up instead? */
+     * make the user know that or should we automatically round up instead?
+     */
     if (ColorCount != (1 << GifBitSize(ColorCount))) {
-        return ((ColorMapObject *) NULL);
+        return ((ColorMapObject *)NULL);
     }
 
     Object = (ColorMapObject *)malloc(sizeof(ColorMapObject));
-    if (Object == (ColorMapObject *) NULL) {
-        return ((ColorMapObject *) NULL);
+    if (Object == (ColorMapObject *)NULL) {
+        return ((ColorMapObject *)NULL);
     }
 
-    Object->Colors = (GifColorType *)calloc(ColorCount, sizeof(GifColorType));
-    if (Object->Colors == (GifColorType *) NULL) {
+    Object->Colors =
+        (GifColorType *)calloc(ColorCount, sizeof(GifColorType));
+    if (Object->Colors == (GifColorType *)NULL) {
         free(Object);
-        return ((ColorMapObject *) NULL);
+        return ((ColorMapObject *)NULL);
     }
 
     Object->ColorCount = ColorCount;
@@ -90,19 +90,17 @@ GifMakeMapObject(int ColorCount, const GifColorType *ColorMap)
     Object->SortFlag = false;
 
     if (ColorMap != NULL) {
-        memcpy((char *)Object->Colors,
-               (char *)ColorMap, ColorCount * sizeof(GifColorType));
+        memcpy((char *)Object->Colors, (char *)ColorMap,
+               ColorCount * sizeof(GifColorType));
     }
 
     return (Object);
 }
 
 /*******************************************************************************
-Free a color map object
+ Free a color map object
 *******************************************************************************/
-void
-GifFreeMapObject(ColorMapObject *Object)
-{
+void GifFreeMapObject(ColorMapObject *Object) {
     if (Object != NULL) {
         (void)free(Object->Colors);
         (void)free(Object);
@@ -110,17 +108,14 @@ GifFreeMapObject(ColorMapObject *Object)
 }
 
 #ifdef DEBUG
-void
-DumpColorMap(ColorMapObject *Object,
-             FILE * fp)
-{
+void DumpColorMap(ColorMapObject *Object, FILE *fp) {
     if (Object != NULL) {
         int i, j, Len = Object->ColorCount;
 
         for (i = 0; i < Len; i += 4) {
             for (j = 0; j < 4 && j < Len; j++) {
-                (void)fprintf(fp, "%3d: %02x %02x %02x   ", i + j,
-                              Object->Colors[i + j].Red,
+                (void)fprintf(fp, "%3d: %02x %02x %02x   ",
+                              i + j, Object->Colors[i + j].Red,
                               Object->Colors[i + j].Green,
                               Object->Colors[i + j].Blue);
             }
@@ -137,11 +132,9 @@ DumpColorMap(ColorMapObject *Object,
  copied iff they didn't exist before.  ColorTransIn2 maps the old
  ColorIn2 into the ColorUnion color map table./
 *******************************************************************************/
-ColorMapObject *
-GifUnionColorMap(const ColorMapObject *ColorIn1,
-              const ColorMapObject *ColorIn2,
-              GifPixelType ColorTransIn2[])
-{
+ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
+                                 const ColorMapObject *ColorIn2,
+                                 GifPixelType ColorTransIn2[]) {
     int i, j, CrntSlot, RoundUpTo, NewGifBitSize;
     ColorMapObject *ColorUnion;
 
@@ -152,17 +145,19 @@ GifUnionColorMap(const ColorMapObject *ColorIn1,
      */
 
     /* Allocate table which will hold the result for sure. */
-    ColorUnion = GifMakeMapObject(MAX(ColorIn1->ColorCount,
-                               ColorIn2->ColorCount) * 2, NULL);
+    ColorUnion = GifMakeMapObject(
+        MAX(ColorIn1->ColorCount, ColorIn2->ColorCount) * 2, NULL);
 
-    if (ColorUnion == NULL)
+    if (ColorUnion == NULL) {
         return (NULL);
+    }
 
     /*
      * Copy ColorIn1 to ColorUnion.
      */
-    for (i = 0; i < ColorIn1->ColorCount; i++)
+    for (i = 0; i < ColorIn1->ColorCount; i++) {
         ColorUnion->Colors[i] = ColorIn1->Colors[i];
+    }
     CrntSlot = ColorIn1->ColorCount;
 
     /*
@@ -172,22 +167,25 @@ GifUnionColorMap(const ColorMapObject *ColorIn1,
      * of table 1.  This is very useful if your display is limited to
      * 16 colors.
      */
-    while (ColorIn1->Colors[CrntSlot - 1].Red == 0
-           && ColorIn1->Colors[CrntSlot - 1].Green == 0
-           && ColorIn1->Colors[CrntSlot - 1].Blue == 0)
+    while (ColorIn1->Colors[CrntSlot - 1].Red == 0 &&
+           ColorIn1->Colors[CrntSlot - 1].Green == 0 &&
+           ColorIn1->Colors[CrntSlot - 1].Blue == 0) {
         CrntSlot--;
+    }
 
     /* Copy ColorIn2 to ColorUnion (use old colors if they exist): */
     for (i = 0; i < ColorIn2->ColorCount && CrntSlot <= 256; i++) {
         /* Let's see if this color already exists: */
-        for (j = 0; j < ColorIn1->ColorCount; j++)
-            if (memcmp (&ColorIn1->Colors[j], &ColorIn2->Colors[i],
-                        sizeof(GifColorType)) == 0)
+        for (j = 0; j < ColorIn1->ColorCount; j++) {
+            if (memcmp(&ColorIn1->Colors[j], &ColorIn2->Colors[i],
+                       sizeof(GifColorType)) == 0) {
                 break;
+            }
+        }
 
-        if (j < ColorIn1->ColorCount)
-            ColorTransIn2[i] = j;    /* color exists in Color1 */
-        else {
+        if (j < ColorIn1->ColorCount) {
+            ColorTransIn2[i] = j; /* color exists in Color1 */
+        } else {
             /* Color is new - copy it to a new slot: */
             ColorUnion->Colors[CrntSlot] = ColorIn2->Colors[i];
             ColorTransIn2[i] = CrntSlot++;
@@ -196,7 +194,7 @@ GifUnionColorMap(const ColorMapObject *ColorIn1,
 
     if (CrntSlot > 256) {
         GifFreeMapObject(ColorUnion);
-        return ((ColorMapObject *) NULL);
+        return ((ColorMapObject *)NULL);
     }
 
     NewGifBitSize = GifBitSize(CrntSlot);
@@ -210,16 +208,17 @@ GifUnionColorMap(const ColorMapObject *ColorIn1,
          * We know these slots exist because of the way ColorUnion's
          * start dimension was computed.
          */
-        for (j = CrntSlot; j < RoundUpTo; j++)
+        for (j = CrntSlot; j < RoundUpTo; j++) {
             Map[j].Red = Map[j].Green = Map[j].Blue = 0;
+        }
 
         /* perhaps we can shrink the map? */
         if (RoundUpTo < ColorUnion->ColorCount) {
-            GifColorType *new_map = (GifColorType *)reallocarray(Map,
-                                 RoundUpTo, sizeof(GifColorType));
-            if( new_map == NULL ) {
+            GifColorType *new_map = (GifColorType *)reallocarray(
+                Map, RoundUpTo, sizeof(GifColorType));
+            if (new_map == NULL) {
                 GifFreeMapObject(ColorUnion);
-                return ((ColorMapObject *) NULL);
+                return ((ColorMapObject *)NULL);
             }
             ColorUnion->Colors = new_map;
         }
@@ -234,49 +233,49 @@ GifUnionColorMap(const ColorMapObject *ColorIn1,
 /*******************************************************************************
  Apply a given color translation to the raster bits of an image
 *******************************************************************************/
-void
-GifApplyTranslation(SavedImage *Image, GifPixelType Translation[])
-{
+void GifApplyTranslation(SavedImage *Image, const GifPixelType Translation[]) {
     register int i;
-    register int RasterSize = Image->ImageDesc.Height * Image->ImageDesc.Width;
+    register int RasterSize =
+        Image->ImageDesc.Height * Image->ImageDesc.Width;
 
-    for (i = 0; i < RasterSize; i++)
+    for (i = 0; i < RasterSize; i++) {
         Image->RasterBits[i] = Translation[Image->RasterBits[i]];
+    }
 }
 
 /******************************************************************************
  Extension record functions
 ******************************************************************************/
-int
-GifAddExtensionBlock(int *ExtensionBlockCount,
-                     ExtensionBlock **ExtensionBlocks,
-                     int Function,
-                     unsigned int Len,
-                     unsigned char ExtData[])
-{
+int GifAddExtensionBlock(int *ExtensionBlockCount,
+                         ExtensionBlock **ExtensionBlocks, int Function,
+                         unsigned int Len, unsigned char ExtData[]) {
     ExtensionBlock *ep;
 
-    if (*ExtensionBlocks == NULL)
-        *ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock));
-    else {
-        ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray
-                                      (*ExtensionBlocks, (*ExtensionBlockCount + 1),
-                                      sizeof(ExtensionBlock));
-        if( ep_new == NULL )
+    if (*ExtensionBlocks == NULL) {
+        *ExtensionBlocks =
+            (ExtensionBlock *)malloc(sizeof(ExtensionBlock));
+    } else {
+        ExtensionBlock *ep_new = (ExtensionBlock *)reallocarray(
+            *ExtensionBlocks, (*ExtensionBlockCount + 1),
+            sizeof(ExtensionBlock));
+        if (ep_new == NULL) {
             return (GIF_ERROR);
+        }
         *ExtensionBlocks = ep_new;
     }
 
-    if (*ExtensionBlocks == NULL)
+    if (*ExtensionBlocks == NULL) {
         return (GIF_ERROR);
+    }
 
     ep = &(*ExtensionBlocks)[(*ExtensionBlockCount)++];
 
     ep->Function = Function;
-    ep->ByteCount=Len;
+    ep->ByteCount = Len;
     ep->Bytes = (GifByteType *)malloc(ep->ByteCount);
-    if (ep->Bytes == NULL)
+    if (ep->Bytes == NULL) {
         return (GIF_ERROR);
+    }
 
     if (ExtData != NULL) {
         memcpy(ep->Bytes, ExtData, Len);
@@ -285,38 +284,36 @@ GifAddExtensionBlock(int *ExtensionBlockCount,
     return (GIF_OK);
 }
 
-void
-GifFreeExtensions(int *ExtensionBlockCount,
-                  ExtensionBlock **ExtensionBlocks)
-{
+void GifFreeExtensions(int *ExtensionBlockCount,
+                       ExtensionBlock **ExtensionBlocks) {
     ExtensionBlock *ep;
 
-    if (*ExtensionBlocks == NULL)
+    if (*ExtensionBlocks == NULL) {
         return;
+    }
 
     for (ep = *ExtensionBlocks;
-         ep < (*ExtensionBlocks + *ExtensionBlockCount);
-         ep++)
+         ep < (*ExtensionBlocks + *ExtensionBlockCount); ep++) {
         (void)free((char *)ep->Bytes);
+    }
     (void)free((char *)*ExtensionBlocks);
     *ExtensionBlocks = NULL;
     *ExtensionBlockCount = 0;
 }
 
 /******************************************************************************
- Image block allocation functions
+   Image block allocation functions
 ******************************************************************************/
 
 /* Private Function:
  * Frees the last image in the GifFile->SavedImages array
  */
-void
-FreeLastSavedImage(GifFileType *GifFile)
-{
+void FreeLastSavedImage(GifFileType *GifFile) {
     SavedImage *sp;
 
-    if ((GifFile == NULL) || (GifFile->SavedImages == NULL))
+    if ((GifFile == NULL) || (GifFile->SavedImages == NULL)) {
         return;
+    }
 
     /* Remove one SavedImage from the GifFile */
     GifFile->ImageCount--;
@@ -329,54 +326,58 @@ FreeLastSavedImage(GifFileType *GifFile)
     }
 
     /* Deallocate the image data */
-    if (sp->RasterBits != NULL)
+    if (sp->RasterBits != NULL) {
         free((char *)sp->RasterBits);
+    }
 
     /* Deallocate any extensions */
     GifFreeExtensions(&sp->ExtensionBlockCount, &sp->ExtensionBlocks);
 
     /*** FIXME: We could realloc the GifFile->SavedImages structure but is
      * there a point to it? Saves some memory but we'd have to do it every
-     * time.  If this is used in GifFreeSavedImages then it would be inefficient
-     * (The whole array is going to be deallocated.)  If we just use it when
-     * we want to free the last Image it's convenient to do it here.
+     * time.  If this is used in GifFreeSavedImages then it would be
+     * inefficient (The whole array is going to be deallocated.)  If we just
+     * use it when we want to free the last Image it's convenient to do it
+     * here.
      */
 }
 
 /*
  * Append an image block to the SavedImages array
  */
-SavedImage *
-GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
-{
-    if (GifFile->SavedImages == NULL)
+SavedImage *GifMakeSavedImage(GifFileType *GifFile,
+                              const SavedImage *CopyFrom) {
+    // cppcheck-suppress ctunullpointer
+    if (GifFile->SavedImages == NULL) {
         GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage));
-    else {
-        SavedImage* newSavedImages = (SavedImage *)reallocarray(GifFile->SavedImages,
-                               (GifFile->ImageCount + 1), sizeof(SavedImage));
-        if( newSavedImages == NULL)
+    } else {
+        SavedImage *newSavedImages = (SavedImage *)reallocarray(
+            GifFile->SavedImages, (GifFile->ImageCount + 1),
+            sizeof(SavedImage));
+        if (newSavedImages == NULL) {
             return ((SavedImage *)NULL);
+        }
         GifFile->SavedImages = newSavedImages;
     }
-    if (GifFile->SavedImages == NULL)
+    if (GifFile->SavedImages == NULL) {
         return ((SavedImage *)NULL);
-    else {
+    } else {
         SavedImage *sp = &GifFile->SavedImages[GifFile->ImageCount++];
 
         if (CopyFrom != NULL) {
             memcpy((char *)sp, CopyFrom, sizeof(SavedImage));
 
             /*
-             * Make our own allocated copies of the heap fields in the
-             * copied record.  This guards against potential aliasing
-             * problems.
+             * Make our own allocated copies of the heap fields in
+             * the copied record.  This guards against potential
+             * aliasing problems.
              */
 
             /* first, the local color map */
             if (CopyFrom->ImageDesc.ColorMap != NULL) {
                 sp->ImageDesc.ColorMap = GifMakeMapObject(
-                                         CopyFrom->ImageDesc.ColorMap->ColorCount,
-                                         CopyFrom->ImageDesc.ColorMap->Colors);
+                    CopyFrom->ImageDesc.ColorMap->ColorCount,
+                    CopyFrom->ImageDesc.ColorMap->Colors);
                 if (sp->ImageDesc.ColorMap == NULL) {
                     FreeLastSavedImage(GifFile);
                     return (SavedImage *)(NULL);
@@ -384,32 +385,36 @@ GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
             }
 
             /* next, the raster */
-            sp->RasterBits = (unsigned char *)reallocarray(NULL,
-                                                  (CopyFrom->ImageDesc.Height *
-                                                  CopyFrom->ImageDesc.Width),
-                                                  sizeof(GifPixelType));
+            sp->RasterBits = (unsigned char *)reallocarray(
+                NULL,
+                (CopyFrom->ImageDesc.Height *
+                 CopyFrom->ImageDesc.Width),
+                sizeof(GifPixelType));
             if (sp->RasterBits == NULL) {
                 FreeLastSavedImage(GifFile);
                 return (SavedImage *)(NULL);
             }
             memcpy(sp->RasterBits, CopyFrom->RasterBits,
-                   sizeof(GifPixelType) * CopyFrom->ImageDesc.Height *
-                   CopyFrom->ImageDesc.Width);
+                   sizeof(GifPixelType) *
+                       CopyFrom->ImageDesc.Height *
+                       CopyFrom->ImageDesc.Width);
 
             /* finally, the extension blocks */
             if (CopyFrom->ExtensionBlocks != NULL) {
-                sp->ExtensionBlocks = (ExtensionBlock *)reallocarray(NULL,
-                                      CopyFrom->ExtensionBlockCount,
-                                      sizeof(ExtensionBlock));
+                sp->ExtensionBlocks =
+                    (ExtensionBlock *)reallocarray(
+                        NULL, CopyFrom->ExtensionBlockCount,
+                        sizeof(ExtensionBlock));
                 if (sp->ExtensionBlocks == NULL) {
                     FreeLastSavedImage(GifFile);
                     return (SavedImage *)(NULL);
                 }
-                memcpy(sp->ExtensionBlocks, CopyFrom->ExtensionBlocks,
-                       sizeof(ExtensionBlock) * CopyFrom->ExtensionBlockCount);
+                memcpy(sp->ExtensionBlocks,
+                       CopyFrom->ExtensionBlocks,
+                       sizeof(ExtensionBlock) *
+                           CopyFrom->ExtensionBlockCount);
             }
-        }
-        else {
+        } else {
             memset((char *)sp, '\0', sizeof(SavedImage));
         }
 
@@ -417,9 +422,7 @@ GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
     }
 }
 
-void
-GifFreeSavedImages(GifFileType *GifFile)
-{
+void GifFreeSavedImages(GifFileType *GifFile) {
     SavedImage *sp;
 
     if ((GifFile == NULL) || (GifFile->SavedImages == NULL)) {
@@ -432,10 +435,12 @@ GifFreeSavedImages(GifFileType *GifFile)
             sp->ImageDesc.ColorMap = NULL;
         }
 
-        if (sp->RasterBits != NULL)
+        if (sp->RasterBits != NULL) {
             free((char *)sp->RasterBits);
+        }
 
-        GifFreeExtensions(&sp->ExtensionBlockCount, &sp->ExtensionBlocks);
+        GifFreeExtensions(&sp->ExtensionBlockCount,
+                          &sp->ExtensionBlocks);
     }
     free((char *)GifFile->SavedImages);
     GifFile->SavedImages = NULL;
diff --git a/src/java.desktop/share/native/libsplashscreen/giflib/openbsd-reallocarray.c b/src/java.desktop/share/native/libsplashscreen/giflib/openbsd-reallocarray.c
index 452df69d7cd..7420af674c5 100644
--- a/src/java.desktop/share/native/libsplashscreen/giflib/openbsd-reallocarray.c
+++ b/src/java.desktop/share/native/libsplashscreen/giflib/openbsd-reallocarray.c
@@ -28,24 +28,22 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <sys/types.h>
 
 #ifndef SIZE_MAX
-    #define SIZE_MAX     UINTPTR_MAX
+#define SIZE_MAX UINTPTR_MAX
 #endif
 
 /*
  * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
  * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
  */
-#define MUL_NO_OVERFLOW    ((size_t)1 << (sizeof(size_t) * 4))
+#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
 
-void *
-openbsd_reallocarray(void *optr, size_t nmemb, size_t size)
-{
+void *openbsd_reallocarray(void *optr, size_t nmemb, size_t size) {
     if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
         nmemb > 0 && SIZE_MAX / nmemb < size) {
         errno = ENOMEM;
@@ -93,7 +91,8 @@ openbsd_reallocarray(void *optr, size_t nmemb, size_t size)
      * fuzzing on one platform may not detect zero-size allocation
      * problems on other platforms.
      */
-    if (size == 0 || nmemb == 0)
+    if (size == 0 || nmemb == 0) {
         return NULL;
+    }
     return realloc(optr, size * nmemb);
 }

From 6f98d8f58f98827ae454c7ce4839de4071d95767 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Thu, 2 May 2024 16:10:55 +0000
Subject: [PATCH 297/486] 8329692: Add more details to FrameStateTest.java test
 instructions

Reviewed-by: tr, azvegint
---
 .../Frame/FrameStateTest/FrameStateTest.java  | 80 +++++++++----------
 1 file changed, 37 insertions(+), 43 deletions(-)

diff --git a/test/jdk/java/awt/Frame/FrameStateTest/FrameStateTest.java b/test/jdk/java/awt/Frame/FrameStateTest/FrameStateTest.java
index 496be463513..439332e2ce9 100644
--- a/test/jdk/java/awt/Frame/FrameStateTest/FrameStateTest.java
+++ b/test/jdk/java/awt/Frame/FrameStateTest/FrameStateTest.java
@@ -21,15 +21,6 @@
  * questions.
  */
 
-/*
- * FrameStateTest.java
- *
- * summary: Checks that when setState(Frame.ICONIFIED) is called before
- *      setVisible(true) the Frame is shown in the proper iconified state.
- *      The problem was that it did not honor the initial iconic state, but
- *      instead was shown in the NORMAL state.
- */
-
 import java.awt.Button;
 import java.awt.Checkbox;
 import java.awt.CheckboxGroup;
@@ -52,9 +43,9 @@ import javax.swing.Timer;
  * @test
  * @bug 4157271
  * @summary Checks that when a Frame is created it honors the state it
- *       was set to. The bug was that if setState(Frame.ICONIFIED) was
- *       called before setVisible(true) the Frame would be shown in NORMAL
- *       state instead of ICONIFIED.
+ *          was set to. The bug was that if setState(Frame.ICONIFIED) was
+ *          called before setVisible(true) the Frame would be shown in NORMAL
+ *          state instead of ICONIFIED.
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame
  * @run main/manual FrameStateTest
@@ -68,29 +59,33 @@ public class FrameStateTest implements ActionListener {
         setVisible(true) the Frame is shown in the proper iconified state.
         The problem was that it did not honor the initial iconic state, but
         instead was shown in the NORMAL state.
-        </p><hr/><p>
-
+        </p><hr/>
         Steps to try to reproduce this problem:
-        </p><p>
+        <p>
         Select the different options for the Frame:
             <ul>
-                <li><i>{Normal, Non-resizalbe}</i></li>
+                <li><i>{Normal, Non-resizable}</i></li>
                 <li><i>{Normal, Resizable}</i></li>
                 <li><i>{Iconified, Resizable}</i></li>
-                <li><i>{Iconified, Non-resizalbe}</i></li>
+                <li><i>{Iconified, Non-resizable}</i></li>
             </ul>
         After choosing the Frame's state click the
         Create Frame button.<br>
-        After the Frame (Frame State Test (Window2)) comes
-        up make sure the proper behavior occurred<br>
-        (Frame shown in proper state).<br>
+        After the Frame (Frame State Test (Window2)) comes up make sure the
+        proper behavior occurred (Frame shown in proper state).<br>
         Click the Dispose button to close the Frame.<br>
-
         </p><hr/><p>
 
-        Do the above steps for all the different Frame state combinations available.<br>
-        If you observe the proper behavior the test has passed, Press the Pass button.<br>
-        Otherwise the test has failed, Press the Fail button.
+        Do the above steps for all the different Frame state combinations
+        available.<br>
+        For "Hide, Iconify and Show" case, the frame is hidden then iconified
+        hence Window2 is not seen on-screen when shown as the frame is still
+        in the ICONIFIED state. Window2 is visible on-screen when it is restored
+        to NORMAL state as observed with "Hide, Iconify, Show and Restore" case.
+        <br><br>
+
+        If you observe the proper behavior for all the combinations,
+        press PASS else FAIL.<br>
         </p><p>
         Note: In Frame State Test (Window2) you can also chose the different
         buttons to see different Frame behavior.<br>An example of a problem that
@@ -106,9 +101,9 @@ public class FrameStateTest implements ActionListener {
     Button btnDispose = new Button("Dispose Frame");
     CheckboxGroup cbgState = new CheckboxGroup();
     CheckboxGroup cbgResize = new CheckboxGroup();
-    Checkbox cbIconState = new Checkbox("Frame state ICONIFIED", cbgState, true);
-    Checkbox cbNormState = new Checkbox("Frame state NORMAL", cbgState, false);
-    Checkbox cbNonResize = new Checkbox("Frame non-resizable", cbgResize, false);
+    Checkbox cbIconState = new Checkbox("Frame State ICONIFIED", cbgState, true);
+    Checkbox cbNormState = new Checkbox("Frame State NORMAL", cbgState, false);
+    Checkbox cbNonResize = new Checkbox("Frame Non-Resizable", cbgResize, false);
     Checkbox cbResize = new Checkbox("Frame Resizable", cbgResize, true);
 
     CreateFrame icontst;
@@ -116,12 +111,12 @@ public class FrameStateTest implements ActionListener {
     public static void main(String[] args) throws Exception {
         PassFailJFrame
                 .builder()
-                .title("GetBoundsResizeTest Instructions")
+                .title("Frame State and Size Test Instructions")
                 .instructions(INSTRUCTIONS)
                 .testTimeOut(10)
-                .rows(25)
+                .rows(27)
                 .columns(70)
-                .logArea(10)
+                .logArea(6)
                 .splitUIBottom(() -> new FrameStateTest().createPanel())
                 .build()
                 .awaitAndCheck();
@@ -149,7 +144,7 @@ public class FrameStateTest implements ActionListener {
         if (evt.getSource() == btnCreate) {
             btnCreate.setEnabled(false);
             btnDispose.setEnabled(true);
-            icontst =new CreateFrame(cbIconState.getState(), cbResize.getState());
+            icontst = new CreateFrame(cbIconState.getState(), cbResize.getState());
             icontst.setVisible(true);
         } else if (evt.getSource() == btnDispose) {
             btnCreate.setEnabled(true);
@@ -166,7 +161,7 @@ public class FrameStateTest implements ActionListener {
         String name = "Frame State Test";
 
         CreateFrame(boolean iconified, boolean resizable) {
-            setTitle("Frame State Test (Window 2)");
+            setTitle("Test Window (Window 2)");
 
             isResizable = resizable;
 
@@ -175,13 +170,13 @@ public class FrameStateTest implements ActionListener {
                     ((isResizable) ? "RESIZABLE" : "NON-RESIZABLE"));
 
             setLayout(new FlowLayout());
-            add(b1 = new Button("resizable"));
-            add(b2 = new Button("resize"));
-            add(b3 = new Button("iconify"));
-            add(b4 = new Button("iconify and restore"));
-            add(b5 = new Button("hide and show"));
-            add(b6 = new Button("hide, iconify and show"));
-            add(b7 = new Button("hide, iconify, show, and restore"));
+            add(b1 = new Button("Resizable"));
+            add(b2 = new Button("Resize"));
+            add(b3 = new Button("Iconify"));
+            add(b4 = new Button("Iconify and Restore"));
+            add(b5 = new Button("Hide and Show"));
+            add(b6 = new Button("Hide, Iconify and Show"));
+            add(b7 = new Button("Hide, Iconify, Show and Restore"));
             b1.addActionListener(this);
             b2.addActionListener(this);
             b3.addActionListener(this);
@@ -191,10 +186,9 @@ public class FrameStateTest implements ActionListener {
             b7.addActionListener(this);
             addWindowListener(this);
 
-            setBounds(100, 2, 200, 200);
+            setBounds(100, 2, 300, 200);
             setState(iconified ? Frame.ICONIFIED : Frame.NORMAL);
             setResizable(isResizable);
-            pack();
             setVisible(true);
         }
 
@@ -320,11 +314,11 @@ public class FrameStateTest implements ActionListener {
 
         public void stateLog(String message) {
             PassFailJFrame
-                .log("[State=%d] %s %s".formatted(getState(), name, message));
+                .log("[Current State = %d] %s %s".formatted(getState(), name, message));
         }
 
         public void stateLog() {
-            PassFailJFrame.log("[State=" + getState() + "]");
+            PassFailJFrame.log("[Current State = " + getState() + "]");
         }
     }
 }

From e2c0cfef1468e1081d1e68f74caae71266815cb6 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 2 May 2024 18:07:42 +0000
Subject: [PATCH 298/486] 8331320: ClassFile API OutOfMemoryError with certain
 class files

Reviewed-by: psandoz
---
 .../classfile/impl/AbstractInstruction.java   |  6 ++
 test/jdk/jdk/classfile/LimitsTest.java        | 55 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
index 1ee9e1136a5..4e9a55c77ac 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
@@ -262,6 +262,9 @@ public abstract sealed class AbstractInstruction
 
             this.afterPad = pos + 1 + ((4 - ((pos + 1 - code.codeStart) & 3)) & 3);
             this.npairs = code.classReader.readInt(afterPad + 4);
+            if (npairs < 0 || npairs > code.codeLength >> 3) {
+                throw new IllegalArgumentException("Invalid lookupswitch npairs value: " + npairs);
+            }
         }
 
         static int size(CodeImpl code, int codeStart, int pos) {
@@ -314,6 +317,9 @@ public abstract sealed class AbstractInstruction
             int pad = ap - (pos + 1);
             int low = code.classReader.readInt(ap + 4);
             int high = code.classReader.readInt(ap + 8);
+            if (high < low || high - low > code.codeLength >> 2) {
+                throw new IllegalArgumentException("Invalid tableswitch values low: " + low + " high: " + high);
+            }
             int cnt = high - low + 1;
             return 1 + pad + 12 + cnt * 4;
         }
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index 00aaf32385d..5b39c0d4985 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -23,16 +23,22 @@
 
 /*
  * @test
- * @bug 8320360 8330684
+ * @bug 8320360 8330684 8331320
  * @summary Testing ClassFile limits.
  * @run junit LimitsTest
  */
+import java.lang.classfile.Attributes;
+import java.lang.classfile.BufWriter;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.MethodTypeDesc;
 import java.lang.classfile.ClassFile;
+import java.lang.classfile.Opcode;
+import java.lang.classfile.attribute.CodeAttribute;
 import java.lang.classfile.constantpool.ConstantPoolException;
+import jdk.internal.classfile.impl.DirectMethodBuilder;
 import jdk.internal.classfile.impl.LabelContext;
+import jdk.internal.classfile.impl.UnboundAttribute;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -99,4 +105,51 @@ class LimitsTest {
         assertThrows(ConstantPoolException.class, () -> ClassFile.of().parse(new byte[]{(byte)0xCA, (byte)0xFE, (byte)0xBA, (byte)0xBE,
             0, 0, 0, 0, 0, 2, ClassFile.TAG_METHODREF, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}).thisClass());
     }
+
+    @Test
+    void testInvalidLookupSwitch() {
+        assertThrows(IllegalArgumentException.class, () ->
+                ClassFile.of().parse(ClassFile.of().build(ClassDesc.of("LookupSwitchClass"), cb -> cb.withMethod(
+                "lookupSwitchMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, mb ->
+                        ((DirectMethodBuilder)mb).writeAttribute(new UnboundAttribute.AdHocAttribute<CodeAttribute>(Attributes.CODE) {
+                                @Override
+                                public void writeBody(BufWriter b) {
+                                    b.writeU2(-1);//max stack
+                                    b.writeU2(-1);//max locals
+                                    b.writeInt(16);
+                                    b.writeU1(Opcode.NOP.bytecode());
+                                    b.writeU1(Opcode.NOP.bytecode());
+                                    b.writeU1(Opcode.NOP.bytecode());
+                                    b.writeU1(Opcode.NOP.bytecode());
+                                    b.writeU1(Opcode.LOOKUPSWITCH.bytecode());
+                                    b.writeU1(0); //padding
+                                    b.writeU2(0); //padding
+                                    b.writeInt(0); //default
+                                    b.writeInt(-2); //npairs to jump back and cause OOME if not checked
+                                    b.writeU2(0);//exception handlers
+                                    b.writeU2(0);//attributes
+                                }})))).methods().get(0).code().get().elementList());
+    }
+
+    @Test
+    void testInvalidTableSwitch() {
+        assertThrows(IllegalArgumentException.class, () ->
+                ClassFile.of().parse(ClassFile.of().build(ClassDesc.of("TableSwitchClass"), cb -> cb.withMethod(
+                "tableSwitchMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, mb ->
+                        ((DirectMethodBuilder)mb).writeAttribute(new UnboundAttribute.AdHocAttribute<CodeAttribute>(Attributes.CODE) {
+                                @Override
+                                public void writeBody(BufWriter b) {
+                                    b.writeU2(-1);//max stack
+                                    b.writeU2(-1);//max locals
+                                    b.writeInt(16);
+                                    b.writeU1(Opcode.TABLESWITCH.bytecode());
+                                    b.writeU1(0); //padding
+                                    b.writeU2(0); //padding
+                                    b.writeInt(0); //default
+                                    b.writeInt(0); //low
+                                    b.writeInt(-5); //high to jump back and cause OOME if not checked
+                                    b.writeU2(0);//exception handlers
+                                    b.writeU2(0);//attributes
+                                }})))).methods().get(0).code().get().elementList());
+    }
 }

From 73cdc9a070249791f7d228a93fe5b9335c5f72bd Mon Sep 17 00:00:00 2001
From: Swati Sharma <swati.sharma@intel.com>
Date: Thu, 2 May 2024 18:28:50 +0000
Subject: [PATCH 299/486] 8326421: Add jtreg test for large arrayCopy disjoint
 case.

Co-authored-by: Steve Dohrmann <steve.dohrmann@intel.com>
Reviewed-by: kvn, sviswanathan
---
 .../arraycopy/TestArrayCopyDisjointLarge.java | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjointLarge.java

diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjointLarge.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjointLarge.java
new file mode 100644
index 00000000000..70d983e6ccd
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyDisjointLarge.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package compiler.arraycopy;
+import java.util.Random;
+
+/**
+ * @test
+ * @bug 8310159
+ * @summary Test large arrayCopy.
+ *
+ * @run main/timeout=600 compiler.arraycopy.TestArrayCopyDisjointLarge
+ *
+ */
+
+public class TestArrayCopyDisjointLarge {
+
+    public static final int ARRLEN = 4194304;
+    public static int fromPos, toPos;
+    public static byte[] fromByteArr, toByteArr;
+
+    public static void setup() {
+        fromPos = 0;
+        toPos = 0;
+
+        fromByteArr = new byte[ARRLEN];
+        toByteArr = new byte[ARRLEN];
+        for (int i = 0 ; i < ARRLEN ; i++) {
+            fromByteArr[i] = (byte)i;
+        }
+    }
+
+    public static void validate(String msg, byte[] toByteArr, int length, int fromPos, int toPos) {
+        for(int i = 0 ; i < length; i++) {
+            if (fromByteArr[i + fromPos] != toByteArr[i + toPos]) {
+                System.out.println(msg + "[" + toByteArr.getClass() + "] Result mismtach at i = " + i
+                                + " expected = " + fromByteArr[i + fromPos]
+                                + " actual   = " + toByteArr[i + toPos]
+                                + " fromPos = " + fromPos
+                                + " toPos = " + toPos);
+                throw new Error("Fail");
+            }
+        }
+    }
+
+    public static void testByte(int length, int fromPos, int toPos) {
+        System.arraycopy(fromByteArr, fromPos, toByteArr, toPos, length);
+        validate(" Test ByteArr ", toByteArr, length, fromPos, toPos);
+    }
+
+    public static void main(String [] args) {
+        int base_size = 2621440;
+        Random r = new Random(1024);
+        int [] lengths = {base_size - 1, base_size, base_size + 1, base_size + 63, base_size + 64,
+                                base_size + 65, base_size + 255, base_size + 256, base_size + 257,
+                                base_size + r.nextInt(2048)};
+        setup();
+
+        for (int i = 0 ; i < 20 ; i++ ) {
+            testByte(lengths[i % lengths.length], 0, 0);
+            testByte(lengths[i % lengths.length], 0, 9);
+            testByte(lengths[i % lengths.length], 9, 0);
+            testByte(lengths[i % lengths.length], 9, 9);
+            testByte(lengths[i % lengths.length], r.nextInt(2048) , r.nextInt(2048));
+        }
+    }
+}

From cd3a607576bede17f48c3d5ebde2bf05f3b615ba Mon Sep 17 00:00:00 2001
From: Ben Perez <ben.perez@oracle.com>
Date: Thu, 2 May 2024 18:50:38 +0000
Subject: [PATCH 300/486] 8328864: NullPointerException in
 sun.security.jca.ProviderList.getService()

Reviewed-by: weijun
---
 .../sun/security/jca/ProviderList.java        |  8 ++--
 .../sun/security/jca/NullPreferredList.java   | 41 +++++++++++++++++++
 .../sun/security/jca/app-security.properties  |  1 +
 3 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/sun/security/jca/NullPreferredList.java
 create mode 100644 test/jdk/sun/security/jca/app-security.properties

diff --git a/src/java.base/share/classes/sun/security/jca/ProviderList.java b/src/java.base/share/classes/sun/security/jca/ProviderList.java
index c0ed5cc018b..033ad2e9210 100644
--- a/src/java.base/share/classes/sun/security/jca/ProviderList.java
+++ b/src/java.base/share/classes/sun/security/jca/ProviderList.java
@@ -369,17 +369,19 @@ public final class ProviderList {
         int i;
 
         // Preferred provider list
-        if (preferredPropList != null &&
-                (pList = preferredPropList.getAll(type, name)) != null) {
+        if (preferredPropList != null) {
+            pList = preferredPropList.getAll(type, name);
             for (i = 0; i < pList.size(); i++) {
                 Provider p = getProvider(pList.get(i).provider);
+                if (p == null) {
+                    continue;
+                }
                 Service s = p.getService(type, name);
                 if (s != null) {
                     return s;
                 }
             }
         }
-
         for (i = 0; i < configs.length; i++) {
             Provider p = getProvider(i);
             Service s = p.getService(type, name);
diff --git a/test/jdk/sun/security/jca/NullPreferredList.java b/test/jdk/sun/security/jca/NullPreferredList.java
new file mode 100644
index 00000000000..0a8cf73443c
--- /dev/null
+++ b/test/jdk/sun/security/jca/NullPreferredList.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.*;
+
+/**
+ * @test
+ * @bug 8328864
+ * @summary Test that ProviderList.getService checks configs when
+ * ProviderList.getProvider fails for preferred providers.
+ * @run main/othervm
+ *  -Djava.security.properties=${test.src}/app-security.properties NullPreferredList
+ */
+
+public class NullPreferredList {
+
+    public static void main(final String[] args) throws Exception {
+        final KeyStore ks = KeyStore.getInstance("PKCS12");
+        System.out.println("Got keystore " + ks);
+    }
+}
diff --git a/test/jdk/sun/security/jca/app-security.properties b/test/jdk/sun/security/jca/app-security.properties
new file mode 100644
index 00000000000..1f15a7797c2
--- /dev/null
+++ b/test/jdk/sun/security/jca/app-security.properties
@@ -0,0 +1 @@
+jdk.security.provider.preferred=KeyStore.PKCS12:NonExistingProvider

From 99654ec3fb2c2e7c8d5bf5965aaf45aeb4b88c61 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Thu, 2 May 2024 20:18:16 +0000
Subject: [PATCH 301/486] 8331516: Tests should not use the "Classpath"
 exception form of the legal header

Reviewed-by: iris, serb
---
 test/jdk/java/awt/font/GlyphVector/LayoutCompatTest.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/awt/font/GlyphVector/LayoutCompatTest.java b/test/jdk/java/awt/font/GlyphVector/LayoutCompatTest.java
index 35aa90374d5..11d0c2ee3bc 100644
--- a/test/jdk/java/awt/font/GlyphVector/LayoutCompatTest.java
+++ b/test/jdk/java/awt/font/GlyphVector/LayoutCompatTest.java
@@ -1,12 +1,10 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 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.
+ * 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

From f6cdcc6f65f2a436906541bb8266e69ded17e2e3 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 2 May 2024 20:18:25 +0000
Subject: [PATCH 302/486] 8280988: [XWayland] Click on title to request focus
 test failures

Reviewed-by: honkar, serb
---
 test/jdk/java/awt/Focus/6981400/Test1.java    |  57 ++++--
 .../ActualFocusedWindowBlockingTest.java      |  43 +++-
 .../Focus/ModalDialogInFocusEventTest.java    |  38 ++--
 .../HierarchyBoundsListenerMixingTest.java    | 186 +++++++++++-------
 test/lib/jdk/test/lib/Platform.java           |  11 +-
 5 files changed, 213 insertions(+), 122 deletions(-)

diff --git a/test/jdk/java/awt/Focus/6981400/Test1.java b/test/jdk/java/awt/Focus/6981400/Test1.java
index 730e10804fa..ab60129ba94 100644
--- a/test/jdk/java/awt/Focus/6981400/Test1.java
+++ b/test/jdk/java/awt/Focus/6981400/Test1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
  * @bug     6981400
  * @summary Tabbing between textfiled do not work properly when ALT+TAB
  * @author  anton.tarasov
- * @library ../../regtesthelpers
- * @build   Util
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build   Util jdk.test.lib.Platform
  * @run     main Test1
  */
 
@@ -41,12 +41,28 @@
 // The FOCUS_LOST/FOCUS_GAINED events order in the original frame is tracked and should be:
 // b0 -> b1 -> b2 -> b3.
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.AWTEvent;
+import java.awt.AWTException;
+import java.awt.Button;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.event.AWTEventListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+import jdk.test.lib.Platform;
 import test.java.awt.regtesthelpers.Util;
 
 public class Test1 {
@@ -72,7 +88,7 @@ public class Test1 {
 
     static boolean tracking;
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
             public void eventDispatched(AWTEvent e) {
                 System.out.println(e);
@@ -81,6 +97,7 @@ public class Test1 {
 
         try {
             robot = new Robot();
+            robot.setAutoDelay(50);
         } catch (AWTException ex) {
             throw new RuntimeException("Error: can't create Robot");
         }
@@ -90,13 +107,13 @@ public class Test1 {
         f0.add(f0b2);
         f0.add(f0b3);
         f0.setLayout(new FlowLayout());
-        f0.setBounds(0, 100, 400, 200);
+        f0.setBounds(100, 100, 400, 200);
 
         f1.add(f1b0);
-        f1.setBounds(0, 400, 400, 200);
+        f1.setBounds(100, 400, 400, 200);
 
         f2.add(f2b0);
-        f2.setBounds(0, 400, 400, 200);
+        f2.setBounds(100, 400, 400, 200);
 
         f0b0.addFocusListener(new FocusAdapter() {
             @Override
@@ -115,6 +132,7 @@ public class Test1 {
         f0.setVisible(true);
 
         Util.waitForIdle(robot);
+        robot.delay(500);
 
         if (!f0b0.isFocusOwner()) {
             Util.clickOnComp(f0b0, robot);
@@ -152,28 +170,29 @@ public class Test1 {
         System.out.println("\nTest passed.");
     }
 
-    public static void test(Component compToClick) {
+    public static void test(Component compToClick) throws Exception {
         tracking = true;
 
         robot.keyPress(KeyEvent.VK_TAB);
-        robot.delay(50);
         robot.keyRelease(KeyEvent.VK_TAB);
-        robot.delay(50);
+        robot.waitForIdle();
 
         robot.keyPress(KeyEvent.VK_TAB);
-        robot.delay(50);
         robot.keyRelease(KeyEvent.VK_TAB);
-        robot.delay(50);
+        robot.waitForIdle();
 
         robot.keyPress(KeyEvent.VK_TAB);
-        robot.delay(50);
         robot.keyRelease(KeyEvent.VK_TAB);
+        robot.waitForIdle();
 
-        robot.delay(50);
         Util.clickOnComp(compToClick, robot);
 
-        robot.delay(50);
-        Util.clickOnTitle(f0, robot);
+        robot.waitForIdle();
+        SwingUtilities.invokeAndWait(f0::toFront);
+
+        if (!Platform.isOnWayland()) {
+            Util.clickOnTitle(f0, robot);
+        }
 
         Util.waitForIdle(robot);
 
diff --git a/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java b/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java
index 1e5b2789208..35c6b5cdee6 100644
--- a/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java
+++ b/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,27 @@
   @key headful
   @bug       6314575
   @summary   Tests that previosly focused owned window doesn't steal focus when an owner's component requests focus.
-  @library   ../../regtesthelpers
-  @build     Util
+  @library /java/awt/regtesthelpers /test/lib
+  @build   Util jdk.test.lib.Platform
   @run       main ActualFocusedWindowBlockingTest
 */
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.AWTEvent;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.KeyboardFocusManager;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.AWTEventListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.WindowEvent;
+
+import jdk.test.lib.Platform;
 import test.java.awt.regtesthelpers.Util;
 
 public class ActualFocusedWindowBlockingTest {
@@ -44,7 +58,7 @@ public class ActualFocusedWindowBlockingTest {
     Button wButton = new Button("window button") {public String toString() {return "Window_Button";}};
     Button aButton = new Button("auxiliary button") {public String toString() {return "Auxiliary_Button";}};
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         ActualFocusedWindowBlockingTest app = new ActualFocusedWindowBlockingTest();
         app.init();
         app.start();
@@ -68,7 +82,7 @@ public class ActualFocusedWindowBlockingTest {
         tuneAndShowWindows(new Window[] {owner, win, frame});
     }
 
-    public void start() {
+    public void start() throws Exception {
         System.out.println("\nTest started:\n");
 
         // Test 1.
@@ -99,7 +113,12 @@ public class ActualFocusedWindowBlockingTest {
         clickOnCheckFocus(fButton);
         clickOnCheckFocus(aButton);
 
-        Util.clickOnTitle(owner, robot);
+        EventQueue.invokeAndWait(owner::toFront);
+
+        if (!Platform.isOnWayland()) {
+            Util.clickOnTitle(owner, robot);
+        }
+
         if (!testFocused(fButton)) {
             throw new TestFailedException("The owner's component [" + fButton + "] couldn't be focused as the most recent focus owner");
         }
@@ -117,11 +136,15 @@ public class ActualFocusedWindowBlockingTest {
             y += 200;
             Util.waitForIdle(robot);
         }
+        robot.delay(500);
     }
 
-    void clickOnCheckFocus(Component c) {
+    void clickOnCheckFocus(Component c) throws Exception {
         if (c instanceof Frame) {
-            Util.clickOnTitle((Frame)c, robot);
+            EventQueue.invokeAndWait(() -> ((Frame) c).toFront());
+            if (!Platform.isOnWayland()) {
+                Util.clickOnTitle((Frame) c, robot);
+            }
         } else {
             Util.clickOnComp(c, robot);
         }
diff --git a/test/jdk/java/awt/Focus/ModalDialogInFocusEventTest.java b/test/jdk/java/awt/Focus/ModalDialogInFocusEventTest.java
index d4f0d65f071..4c659819c3c 100644
--- a/test/jdk/java/awt/Focus/ModalDialogInFocusEventTest.java
+++ b/test/jdk/java/awt/Focus/ModalDialogInFocusEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4531693 4636269 4681908 4688142 4691646 4721470
   @summary Showing modal dialog during dispatching SequencedEvent
-  @key headful
-  @run main AutomaticAppletTest
+  @run main ModalDialogInFocusEventTest
 */
 
 import java.awt.AWTEvent;
@@ -68,6 +68,8 @@ public class ModalDialogInFocusEventTest
     static final int MAX_STAGE_NUM = stages.length;
     static final Object stageMonitor = new Object();
 
+    static boolean isOnWayland;
+
     Robot robot = null;
     Frame frame;
     Frame oppositeFrame;
@@ -209,18 +211,21 @@ public class ModalDialogInFocusEventTest
 
     void clickOnFrameTitle(Frame frame) throws InterruptedException,
             InvocationTargetException {
-        System.out.println("click on title of " + frame.getName());
-        int[] point = new int[2];
-        EventQueue.invokeAndWait(() -> {
-            Point location = frame.getLocationOnScreen();
-            Insets insets = frame.getInsets();
-            int width = frame.getWidth();
-            point[0] = location.x + width / 2;
-            point[1] = location.y + insets.top / 2;
-        });
-        robot.mouseMove(point[0], point[1]);
-        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
-        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        EventQueue.invokeAndWait(frame::toFront);
+        if (!isOnWayland) {
+            System.out.println("click on title of " + frame.getName());
+            int[] point = new int[2];
+            EventQueue.invokeAndWait(() -> {
+                Point location = frame.getLocationOnScreen();
+                Insets insets = frame.getInsets();
+                int width = frame.getWidth();
+                point[0] = location.x + width / 2;
+                point[1] = location.y + insets.top / 2;
+            });
+            robot.mouseMove(point[0], point[1]);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        }
         EventQueue.invokeAndWait(frame::requestFocusInWindow);
     }
 
@@ -344,6 +349,7 @@ public class ModalDialogInFocusEventTest
 
     public static void main(String[] args) throws InterruptedException,
             InvocationTargetException {
+        isOnWayland = System.getenv("WAYLAND_DISPLAY") != null;
         ModalDialogInFocusEventTest test = new ModalDialogInFocusEventTest();
         test.start();
     }
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java b/test/jdk/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java
index 108cdc99d1f..3dfdfd8b6b8 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,33 @@
  * questions.
  */
 
-
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Button;
+import java.awt.Checkbox;
+import java.awt.Choice;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Label;
+import java.awt.List;
+import java.awt.Panel;
+import java.awt.Robot;
+import java.awt.Scrollbar;
+import java.awt.TextArea;
+import java.awt.TextField;
+import java.awt.event.HierarchyBoundsListener;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.lang.reflect.InvocationTargetException;
 import javax.swing.SwingUtilities;
-import java.io.*;
+
+import jdk.test.lib.Platform;
 
 /**
  * AWT Mixing test for HierarchyBoundsListener ancestors.
@@ -37,7 +58,8 @@ import java.io.*;
  * @key headful
  * @bug 6768230 8221823
  * @summary Mixing test for HierarchyBoundsListener ancestors
- * @build FrameBorderCounter
+ * @library /test/lib
+ * @build FrameBorderCounter jdk.test.lib.Platform
  * @run main HierarchyBoundsListenerMixingTest
  */
 public class HierarchyBoundsListenerMixingTest {
@@ -137,9 +159,9 @@ public class HierarchyBoundsListenerMixingTest {
         robot.mouseMove((int) components[0].getLocationOnScreen().x + components[0].getSize().width / 2,
                         (int) components[0].getLocationOnScreen().y + components[0].getSize().height / 2);
         robot.delay(delay);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
         robot.delay(delay);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
         robot.delay(delay);
 
         resetValues();
@@ -177,45 +199,54 @@ public class HierarchyBoundsListenerMixingTest {
         robot.delay(delay * 5);
 
         resetValues();
-        int x = (int) frame.getLocationOnScreen().x;
-        int y = (int) frame.getLocationOnScreen().y;
-        int w = frame.getSize().width;
-        int h = frame.getSize().height;
 
-        robot.mouseMove(x + w + BORDER_SHIFT, y + h / 2);
-        robot.delay(delay);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
-        robot.delay(delay);
-        for (int i = 0; i < 20; i++) {
-            robot.mouseMove(x + w + i + BORDER_SHIFT, y + h / 2);
-            robot.delay(50);
-        }
-        robot.delay(delay);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        int x;
+        int y;
+        int w;
+        int h;
 
-        if (! resizeTriggered) {
-            synchronized (resizeLock) {
-                try {
-                    resizeLock.wait(delay * 10);
-                } catch (Exception e) {
+        if (!Platform.isOnWayland()) {
+            x = frame.getLocationOnScreen().x;
+            y = frame.getLocationOnScreen().y;
+            w = frame.getSize().width;
+            h = frame.getSize().height;
+
+            robot.mouseMove(x + w + BORDER_SHIFT, y + h / 2);
+            robot.delay(delay);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.delay(delay);
+            for (int i = 0; i < 20; i++) {
+                robot.mouseMove(x + w + i + BORDER_SHIFT, y + h / 2);
+                robot.delay(50);
+            }
+            robot.delay(delay);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+            if (!resizeTriggered) {
+                synchronized (resizeLock) {
+                    try {
+                        resizeLock.wait(delay * 10);
+                    } catch (Exception e) {
+                    }
                 }
             }
-        }
 
-        for (int i = 0; i < components.length; i++) {
-            if (! ancestorResized[i]) {
-                System.err.println("FAIL: Frame resized using mouse action. " +
-                                   "Ancestor resized event did not occur for " +
-                                   components[i].getClass());
+            for (int i = 0; i < components.length; i++) {
+                if (!ancestorResized[i]) {
+                    System.err.println("FAIL: Frame resized using mouse action. " +
+                            "Ancestor resized event did not occur for " +
+                            components[i].getClass());
+                    passed = false;
+                }
+            }
+            if (moveCount > 0) {
+                System.err.println("FAIL: Ancestor moved event occurred when Frame resized using mouse");
                 passed = false;
             }
-        }
-        if (moveCount > 0) {
-            System.err.println("FAIL: Ancestor moved event occured when Frame resized using mouse");
-            passed = false;
+
+            resetValues();
         }
 
-        resetValues();
         try {
             EventQueue.invokeAndWait(new Runnable() {
                 public void run() {
@@ -250,52 +281,55 @@ public class HierarchyBoundsListenerMixingTest {
         robot.delay(delay * 10);
 
         resetValues();
-        x = (int) frame.getLocationOnScreen().x;
-        y = (int) frame.getLocationOnScreen().y;
-        w = frame.getSize().width;
-        h = frame.getSize().height;
 
-        //Click on the dummy frame so that the test frame loses focus. This is to workaround
-        //a bug in Linux AS.
-        robot.mouseMove((int) dummy.getLocationOnScreen().x + dummy.getSize().width / 2,
-                        (int) dummy.getLocationOnScreen().y + dummy.getSize().height / 2);
-        robot.delay(delay);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
-        robot.delay(delay);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
-        robot.delay(delay);
+        if (!Platform.isOnWayland()) {
+            x = frame.getLocationOnScreen().x;
+            y = frame.getLocationOnScreen().y;
+            w = frame.getSize().width;
+            h = frame.getSize().height;
 
-        robot.mouseMove(x + w / 2, y + 10);
-        robot.delay(delay);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
-        robot.delay(delay);
-        for (int i = 1; i <= 20; i++) {
-            robot.mouseMove(x + w / 2 + i, y + 10);
-            robot.delay(50);
-        }
-        robot.delay(delay);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+            //Click on the dummy frame so that the test frame loses focus. This is to workaround
+            //a bug in Linux AS.
+            robot.mouseMove((int) dummy.getLocationOnScreen().x + dummy.getSize().width / 2,
+                            (int) dummy.getLocationOnScreen().y + dummy.getSize().height / 2);
+            robot.delay(delay);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.delay(delay);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.delay(delay);
 
-        if (! moveTriggered) {
-            synchronized (moveLock) {
-                try {
-                    moveLock.wait(delay * 10);
-                } catch (Exception e) {
+            robot.mouseMove(x + w / 2, y + 10);
+            robot.delay(delay);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.delay(delay);
+            for (int i = 1; i <= 20; i++) {
+                robot.mouseMove(x + w / 2 + i, y + 10);
+                robot.delay(50);
+            }
+            robot.delay(delay);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+            if (! moveTriggered) {
+                synchronized (moveLock) {
+                    try {
+                        moveLock.wait(delay * 10);
+                    } catch (Exception e) {
+                    }
                 }
             }
-        }
 
-        for (int i = 0; i < components.length; i++) {
-            if (! ancestorMoved[i]) {
-                System.err.println("FAIL: Frame moved using mouse action. " +
-                                   "Ancestor moved event did not occur for " + components[i].getClass());
+            for (int i = 0; i < components.length; i++) {
+                if (! ancestorMoved[i]) {
+                    System.err.println("FAIL: Frame moved using mouse action. " +
+                                       "Ancestor moved event did not occur for " + components[i].getClass());
+                    passed = false;
+                }
+            }
+            if (resizeCount > 0) {
+                System.err.println("FAIL: Ancestor resized event occured when Frame moved using mouse");
                 passed = false;
             }
         }
-        if (resizeCount > 0) {
-            System.err.println("FAIL: Ancestor resized event occured when Frame moved using mouse");
-            passed = false;
-        }
 
         return passed;
     }
@@ -450,7 +484,7 @@ public class HierarchyBoundsListenerMixingTest {
     //  instantiated in the same VM.  Being static (and using
     //  static vars), it aint gonna work.  Not worrying about
     //  it for now.
-    public static void main(String args[]) throws InterruptedException {
+    public static void main(String[] args) throws InterruptedException {
         mainThread = Thread.currentThread();
         try {
             init();
diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
index 92663c65d0f..e2451fc8366 100644
--- a/test/lib/jdk/test/lib/Platform.java
+++ b/test/lib/jdk/test/lib/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, 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
@@ -473,4 +473,13 @@ public class Platform {
     public static boolean areCustomLoadersSupportedForCDS() {
         return (is64bit() && (isLinux() || isOSX() || isWindows()));
     }
+
+    /**
+     * Checks if the current system is running on Wayland display server on Linux.
+     *
+     * @return {@code true} if the system is running on Wayland display server
+     */
+    public static boolean isOnWayland() {
+        return System.getenv("WAYLAND_DISPLAY") != null;
+    }
 }

From 04271dfe7a262379944e2a2cf83a98a3a1b78a74 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 2 May 2024 21:19:16 +0000
Subject: [PATCH 303/486] 8331331: :tier1 target explanation in doc/testing.md
 is incorrect

Reviewed-by: erikj, dholmes, ihse
---
 doc/testing.html |  5 +++--
 doc/testing.md   | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/testing.html b/doc/testing.html
index 25147580849..f907ef3a838 100644
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -179,8 +179,9 @@ more tab-completion friendly. For more complex test runs, the
 <p>The test specifications given in <code>TEST</code> is parsed into
 fully qualified test descriptors, which clearly and unambigously show
 which tests will be run. As an example, <code>:tier1</code> will expand
-to
-<code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>.
+to include all subcomponent test directories that define `tier1`,
+for example:
+<code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 ...</code>.
 You can always submit a list of fully qualified test descriptors in the
 <code>TEST</code> variable if you want to shortcut the parser.</p>
 <h3 id="common-test-groups">Common Test Groups</h3>
diff --git a/doc/testing.md b/doc/testing.md
index 63a869bfc1c..9a45283a98b 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -103,11 +103,11 @@ test runs, the `test TEST="x"` solution needs to be used.
 
 The test specifications given in `TEST` is parsed into fully qualified test
 descriptors, which clearly and unambigously show which tests will be run. As an
-example, `:tier1` will expand to `jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1
-jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1
-jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1`. You can
-always submit a list of fully qualified test descriptors in the `TEST` variable
-if you want to shortcut the parser.
+example, `:tier1` will expand to include all subcomponent test directories
+that define `tier1`, for example: `jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1
+jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 ...`. You
+can always submit a list of fully qualified test descriptors in the `TEST`
+variable if you want to shortcut the parser.
 
 ### Common Test Groups
 

From 01125fa21b733199d4fe670ecf38b82cd917e242 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 2 May 2024 21:29:27 +0000
Subject: [PATCH 304/486] 8331605:
 jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java test failure

Reviewed-by: prr
---
 .../jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
index f8ce856bddd..e78e200ac24 100644
--- a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
+++ b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ public class TestMutuallyExclusivePlatformPredicates {
         IGNORED("isEmulatedClient", "isDebugBuild", "isFastDebugBuild", "isMusl",
                 "isSlowDebugBuild", "hasSA", "isRoot", "isTieredSupported",
                 "areCustomLoadersSupportedForCDS", "isDefaultCDSArchiveSupported",
-                "isHardenedOSX", "hasOSXPlistEntries", "isOracleLinux7");
+                "isHardenedOSX", "hasOSXPlistEntries", "isOracleLinux7", "isOnWayland");
 
         public final List<String> methodNames;
 

From 6bef0474c8b8773d0d20c0f25c36a2ce9cdbd7e8 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Fri, 3 May 2024 00:28:18 +0000
Subject: [PATCH 305/486] 8272364: Parallel GC adaptive size policy may shrink
 the heap below MinHeapSize

Reviewed-by: ayang, rkennke
---
 src/hotspot/share/gc/shared/genArguments.cpp  |  3 +
 .../gc/arguments/TestParallelGCErgo.java      | 97 +++++++++++++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 test/hotspot/jtreg/gc/arguments/TestParallelGCErgo.java

diff --git a/src/hotspot/share/gc/shared/genArguments.cpp b/src/hotspot/share/gc/shared/genArguments.cpp
index da9fc3f9a85..fa0e675cf73 100644
--- a/src/hotspot/share/gc/shared/genArguments.cpp
+++ b/src/hotspot/share/gc/shared/genArguments.cpp
@@ -264,6 +264,9 @@ void GenArguments::initialize_size_info() {
       // size can be too small.
       initial_young_size =
         clamp(scale_by_NewRatio_aligned(InitialHeapSize, GenAlignment), NewSize, max_young_size);
+
+      // Derive MinNewSize from MinHeapSize
+      MinNewSize = MIN2(scale_by_NewRatio_aligned(MinHeapSize, GenAlignment), initial_young_size);
     }
   }
 
diff --git a/test/hotspot/jtreg/gc/arguments/TestParallelGCErgo.java b/test/hotspot/jtreg/gc/arguments/TestParallelGCErgo.java
new file mode 100644
index 00000000000..a84ebc5fe5c
--- /dev/null
+++ b/test/hotspot/jtreg/gc/arguments/TestParallelGCErgo.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package gc.arguments;
+
+/*
+ * @test TestParallelGCErgo
+ * @bug 8272364
+ * @requires vm.gc.Parallel
+ * @summary Verify ParallelGC minimum young and old ergonomics are setup correctly
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @library /
+ * @run driver gc.arguments.TestParallelGCErgo
+ */
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
+
+public class TestParallelGCErgo {
+    private static final long HEAPWORD_SIZE = Platform.is64bit() ? 8 : 4;
+    // Must be a power of 2
+    private static final long GEN_ALIGNMENT = 64 * 1024 * HEAPWORD_SIZE;
+
+    private static final long MINIMUM_HEAP_SIZE = 256 * 1024 * 1024; // 256M
+    private static final long EXPECTED_MIN_YOUNG = alignDown(MINIMUM_HEAP_SIZE / 3, GEN_ALIGNMENT);
+    private static final long EXPECTED_MIN_OLD = MINIMUM_HEAP_SIZE - EXPECTED_MIN_YOUNG;  // heap size = young size + old size
+
+    // s has to be a power of 2
+    private static long alignDown(long s, long align) {
+        return s & (~(align-1));
+    }
+
+    public static void main(String[] args) throws Exception {
+        ArrayList<String> flagList = new ArrayList<String>();
+        flagList.add("-XX:+UseParallelGC");
+        flagList.add("-Xms256m");
+        flagList.add("-Xmx1g");
+        flagList.add("-Xlog:gc+heap=trace");
+        flagList.add("-version");
+
+        OutputAnalyzer output = GCArguments.executeTestJava(flagList);
+        output.shouldHaveExitValue(0);
+
+        String stdout = output.getStdout();
+        long minimumHeap = getFlagValue("Minimum heap", stdout);
+        if (minimumHeap != MINIMUM_HEAP_SIZE) {
+            throw new RuntimeException("Wrong value for minimum heap. Expected " + MINIMUM_HEAP_SIZE + " but got " + minimumHeap);
+        }
+
+        long minimumYoung = getFlagValue("Minimum young", stdout);
+        if (minimumYoung != EXPECTED_MIN_YOUNG) {
+            throw new RuntimeException("Wrong value for minimum young. Expected " + EXPECTED_MIN_YOUNG + " but got " + minimumYoung);
+        }
+
+        long minimumOld = getFlagValue("Minimum old", stdout);
+        if (minimumOld != EXPECTED_MIN_OLD) {
+            throw new RuntimeException("Wrong value for minimum old. Expected " + EXPECTED_MIN_OLD + " but got " + minimumOld);
+        }
+    }
+
+    private static long getFlagValue(String flag, String where) {
+        Matcher m = Pattern.compile(flag + " \\d+").matcher(where);
+        if (!m.find()) {
+            throw new RuntimeException("Could not find value for flag " + flag + " in output string");
+        }
+        String match = m.group();
+        return Long.parseLong(match.substring(match.lastIndexOf(" ") + 1, match.length()));
+    }
+
+}

From 7c1fad4fb6c387bbfb72b3f96b610e7cbc2ef312 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Fri, 3 May 2024 05:11:52 +0000
Subject: [PATCH 306/486] 8329559: Test javax/swing/JFrame/bug4419914.java
 failed because The End and Start buttons are not placed correctly and Tab
 focus does not move as expected

Reviewed-by: abhiscxk, honkar, dnguyen
---
 test/jdk/javax/swing/JFrame/bug4419914.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/jdk/javax/swing/JFrame/bug4419914.java b/test/jdk/javax/swing/JFrame/bug4419914.java
index 5e15d3c8f91..4574b1ac3d6 100644
--- a/test/jdk/javax/swing/JFrame/bug4419914.java
+++ b/test/jdk/javax/swing/JFrame/bug4419914.java
@@ -53,8 +53,8 @@ public class bug4419914 {
         PassFailJFrame.builder()
                 .title("Tab movement Instructions")
                 .instructions(INSTRUCTIONS)
-                .rows(12)
-                .columns(42)
+                .rows((int) INSTRUCTIONS.lines().count() + 2)
+                .columns(48)
                 .testUI(bug4419914::createTestUI)
                 .build()
                 .awaitAndCheck();
@@ -65,11 +65,12 @@ public class bug4419914 {
         frame.setFocusCycleRoot(true);
         frame.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
         frame.setLocale(Locale.ENGLISH);
-
         frame.enableInputMethods(false);
-        frame.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
-        frame.setLocale(Locale.ENGLISH);
-        frame.setLayout(new BorderLayout());
+
+        frame.getContentPane().setComponentOrientation(
+                               ComponentOrientation.RIGHT_TO_LEFT);
+        frame.getContentPane().setLocale(Locale.ENGLISH);
+        frame.getContentPane().setLayout(new BorderLayout());
         frame.add(new JButton("SOUTH"), BorderLayout.SOUTH);
         frame.add(new JButton("CENTER"), BorderLayout.CENTER);
         frame.add(new JButton("END"), BorderLayout.LINE_END);

From 8bc641ebe75ba4c975a99a8646b89ed10a7029f5 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Fri, 3 May 2024 05:49:39 +0000
Subject: [PATCH 307/486] 8331404: IGV: Show line numbers for callees in
 properties

Reviewed-by: tholenstein, thartmann
---
 src/hotspot/share/opto/idealGraphPrinter.cpp | 47 +++++++++++++-------
 src/hotspot/share/opto/idealGraphPrinter.hpp |  8 ++--
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index d5858b4bb3f..1f0fec8b58a 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -609,23 +609,7 @@ void IdealGraphPrinter::visit_node(Node *n, bool edges, VectorSet* temp_set) {
       }
     }
 
-    if (caller != nullptr) {
-      stringStream bciStream;
-      ciMethod* last = nullptr;
-      int last_bci;
-      while(caller) {
-        if (caller->has_method()) {
-          last = caller->method();
-          last_bci = caller->bci();
-        }
-        bciStream.print("%d ", caller->bci());
-        caller = caller->caller();
-      }
-      print_prop("bci", bciStream.freeze());
-      if (last != nullptr && last->has_linenumber_table() && last_bci >= 0) {
-        print_prop("line", last->line_number_from_bci(last_bci));
-      }
-    }
+    print_bci_and_line_number(caller);
 
 #ifdef ASSERT
     if (node->debug_orig() != nullptr) {
@@ -654,6 +638,35 @@ void IdealGraphPrinter::visit_node(Node *n, bool edges, VectorSet* temp_set) {
   }
 }
 
+void IdealGraphPrinter::print_bci_and_line_number(JVMState* caller) {
+  if (caller != nullptr) {
+    ResourceMark rm;
+    stringStream bciStream;
+    stringStream lineStream;
+
+    // Print line and bci numbers for the callee and all entries in the call stack until we reach the root method.
+    while (caller) {
+      const int bci = caller->bci();
+      bool appended_line = false;
+      if (caller->has_method()) {
+        ciMethod* method = caller->method();
+        if (method->has_linenumber_table() && bci >= 0) {
+          lineStream.print("%d ", method->line_number_from_bci(bci));
+          appended_line = true;
+        }
+      }
+      if (!appended_line) {
+        lineStream.print("%s ", "_");
+      }
+      bciStream.print("%d ", bci);
+      caller = caller->caller();
+    }
+
+    print_prop("bci", bciStream.freeze());
+    print_prop("line", lineStream.freeze());
+  }
+}
+
 void IdealGraphPrinter::print_field(const Node* node) {
   buffer[0] = 0;
   stringStream ss(buffer, sizeof(buffer) - 1);
diff --git a/src/hotspot/share/opto/idealGraphPrinter.hpp b/src/hotspot/share/opto/idealGraphPrinter.hpp
index aff139a82e3..11b0b6e5ea1 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.hpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.hpp
@@ -40,6 +40,7 @@ class Matcher;
 class Node;
 class InlineTree;
 class ciMethod;
+class JVMState;
 
 class IdealGraphPrinter : public CHeapObj<mtCompiler> {
  private:
@@ -96,9 +97,10 @@ class IdealGraphPrinter : public CHeapObj<mtCompiler> {
   Compile *C;
   double _max_freq;
 
-  void print_method(ciMethod *method, int bci, InlineTree *tree);
-  void print_inline_tree(InlineTree *tree);
-  void visit_node(Node *n, bool edges, VectorSet* temp_set);
+  void print_method(ciMethod* method, int bci, InlineTree* tree);
+  void print_inline_tree(InlineTree* tree);
+  void visit_node(Node* n, bool edges, VectorSet* temp_set);
+  void print_bci_and_line_number(JVMState* caller);
   void print_field(const Node* node);
   ciField* get_field(const Node* node);
   ciField* find_source_field_of_array_access(const Node* node, uint& depth);

From a10845b553fc6fe7e06a0f37ce73fe5f704dc7c4 Mon Sep 17 00:00:00 2001
From: Joachim Kern <jkern@openjdk.org>
Date: Fri, 3 May 2024 08:31:42 +0000
Subject: [PATCH 308/486] 8330539: Use #include <alloca.h> instead of
 -Dalloca'(size)'=__builtin_alloca'(size)' for AIX

Reviewed-by: jwaters, mdoerr, kbarrett, ihse
---
 make/autoconf/flags-cflags.m4                         | 2 +-
 src/hotspot/share/utilities/globalDefinitions_gcc.hpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index c96b289084c..97a3ec14ecd 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -459,7 +459,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     CFLAGS_OS_DEF_JVM="-D_ALLBSD_SOURCE -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
   elif test "x$OPENJDK_TARGET_OS" = xaix; then
-    CFLAGS_OS_DEF_JVM="-DAIX -Dalloca'(size)'=__builtin_alloca'(size)' -D_LARGE_FILES"
+    CFLAGS_OS_DEF_JVM="-DAIX -D_LARGE_FILES"
     CFLAGS_OS_DEF_JDK="-D_LARGE_FILES"
   elif test "x$OPENJDK_TARGET_OS" = xbsd; then
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE"
diff --git a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
index 4267cdb2746..e5decbcd536 100644
--- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
@@ -31,6 +31,7 @@
 // globally used constants & types, class (forward)
 // declarations and a few frequently used utility functions.
 
+#include <alloca.h>
 #include <ctype.h>
 #include <inttypes.h>
 #include <string.h>

From f665e07ab223bdabb6cf3f653f799913d874bc55 Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Fri, 3 May 2024 10:17:11 +0000
Subject: [PATCH 309/486] 8331540: [BACKOUT] NMT: add/make a mandatory MEMFLAGS
 argument to family of os::reserve/commit/uncommit memory API

Reviewed-by: jwilhelm
---
 .../cpu/aarch64/compressedKlass_aarch64.cpp   |   4 +-
 src/hotspot/os/aix/os_aix.cpp                 |  10 +-
 .../bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp   |   4 +-
 .../bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp   |   4 +-
 src/hotspot/os/bsd/os_bsd.cpp                 |  16 +--
 src/hotspot/os/linux/os_linux.cpp             |  26 ++--
 src/hotspot/os/posix/os_posix.cpp             |   6 +-
 src/hotspot/os/posix/perfMemory_posix.cpp     |   6 +-
 src/hotspot/os/windows/os_windows.cpp         |  70 +++++------
 src/hotspot/os/windows/perfMemory_windows.cpp |   6 +-
 src/hotspot/share/cds/archiveBuilder.cpp      |   2 +-
 src/hotspot/share/cds/filemap.cpp             |  27 ++---
 src/hotspot/share/cds/metaspaceShared.cpp     |  15 ++-
 .../share/classfile/compactHashtable.cpp      |   4 +-
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |   2 +-
 .../share/gc/g1/g1PageBasedVirtualSpace.cpp   |   8 +-
 .../share/gc/g1/g1RegionToSpaceMapper.cpp     |   6 +-
 .../share/gc/parallel/mutableNUMASpace.cpp    |   4 +-
 .../share/gc/parallel/mutableSpace.cpp        |   4 +-
 .../share/gc/parallel/objectStartArray.cpp    |   3 +-
 .../share/gc/parallel/parMarkBitMap.cpp       |   6 +-
 .../share/gc/parallel/psParallelCompact.cpp   |   4 +-
 .../share/gc/parallel/psVirtualspace.cpp      |   4 +-
 .../gc/serial/serialBlockOffsetTable.cpp      |   4 +-
 src/hotspot/share/gc/shared/cardTable.cpp     |   9 +-
 .../gc/shenandoah/shenandoahCollectionSet.cpp |  10 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  40 +++---
 .../gc/shenandoah/shenandoahHeapRegion.cpp    |   4 +-
 .../share/gc/x/xMarkStackAllocator.cpp        |   6 +-
 src/hotspot/share/gc/x/xPhysicalMemory.cpp    |   6 +-
 src/hotspot/share/gc/x/xVirtualMemory.cpp     |   5 +-
 .../share/gc/z/zMarkStackAllocator.cpp        |   6 +-
 src/hotspot/share/gc/z/zNMT.cpp               |   4 +-
 .../jfr/recorder/storage/jfrVirtualMemory.cpp |   6 +-
 .../share/memory/allocation.inline.hpp        |   6 +-
 src/hotspot/share/memory/heap.cpp             |   6 +-
 src/hotspot/share/memory/metaspace.cpp        |   9 +-
 .../share/memory/metaspace/testHelpers.cpp    |   4 +-
 .../memory/metaspace/virtualSpaceNode.cpp     |   7 +-
 src/hotspot/share/memory/virtualspace.cpp     | 114 +++++++++---------
 src/hotspot/share/memory/virtualspace.hpp     |  38 +++---
 src/hotspot/share/nmt/memTracker.hpp          |  16 +--
 .../share/nmt/virtualMemoryTracker.cpp        |  12 +-
 .../share/nmt/virtualMemoryTracker.hpp        |  13 +-
 src/hotspot/share/oops/compressedKlass.cpp    |   4 +-
 src/hotspot/share/prims/jni.cpp               |   5 +-
 src/hotspot/share/prims/whitebox.cpp          |  16 ++-
 src/hotspot/share/runtime/os.cpp              |  46 +++----
 src/hotspot/share/runtime/os.hpp              |  47 ++++----
 .../share/runtime/safepointMechanism.cpp      |   7 +-
 src/hotspot/share/utilities/debug.cpp         |   5 +-
 .../gtest/gc/g1/test_freeRegionList.cpp       |   2 +-
 .../gtest/gc/g1/test_stressCommitUncommit.cpp |   4 +-
 test/hotspot/gtest/gc/z/test_zForwarding.cpp  |   8 +-
 .../gtest/memory/test_virtualspace.cpp        |  24 ++--
 .../gtest/nmt/test_nmt_locationprinting.cpp   |   2 +-
 .../runtime/test_committed_virtualmemory.cpp  |   6 +-
 test/hotspot/gtest/runtime/test_os.cpp        |  36 +++---
 test/hotspot/gtest/runtime/test_os_linux.cpp  |  16 +--
 .../gtest/runtime/test_os_reserve_between.cpp |   8 +-
 .../hotspot/gtest/runtime/test_os_windows.cpp |   8 +-
 .../runtime/test_virtualMemoryTracker.cpp     |   8 +-
 62 files changed, 420 insertions(+), 398 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
index c918d9bdf0e..54af69ffaba 100644
--- a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
@@ -69,7 +69,7 @@ static char* reserve_at_eor_compatible_address(size_t size, bool aslr) {
     const uint64_t immediate = ((uint64_t)immediates[index]) << 32;
     assert(immediate > 0 && Assembler::operand_valid_for_logical_immediate(/*is32*/false, immediate),
            "Invalid immediate %d " UINT64_FORMAT, index, immediate);
-    result = os::attempt_reserve_memory_at((char*)immediate, size, !ExecMem, mtClass);
+    result = os::attempt_reserve_memory_at((char*)immediate, size, false);
     if (result == nullptr) {
       log_trace(metaspace, map)("Failed to attach at " UINT64_FORMAT_X, immediate);
     }
@@ -112,7 +112,7 @@ char* CompressedKlassPointers::reserve_address_space_for_compressed_classes(size
   if (result == nullptr) {
     constexpr size_t alignment = nth_bit(32);
     log_debug(metaspace, map)("Trying to reserve at a 32-bit-aligned address");
-    result = os::reserve_memory_aligned(size, alignment, !ExecMem, mtClass);
+    result = os::reserve_memory_aligned(size, alignment, false);
   }
 
   return result;
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 862d8e8b0f4..f0a984d3d1f 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -1805,7 +1805,7 @@ bool os::remove_stack_guard_pages(char* addr, size_t size) {
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
 }
 
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) {
+void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
 }
 
 size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
@@ -1847,7 +1847,7 @@ bool os::numa_get_group_ids_for_range(const void** addresses, int* lgrp_ids, siz
 }
 
 // Reserves and attaches a shared memory segment.
-char* os::pd_reserve_memory(size_t bytes, bool exec, MEMFLAGS flag) {
+char* os::pd_reserve_memory(size_t bytes, bool exec) {
   // Always round to os::vm_page_size(), which may be larger than 4K.
   bytes = align_up(bytes, os::vm_page_size());
 
@@ -1996,7 +1996,7 @@ void os::large_page_init() {
   return; // Nothing to do. See query_multipage_support and friends.
 }
 
-char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec, MEMFLAGS flag) {
+char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec) {
   fatal("os::reserve_memory_special should not be called on AIX.");
   return nullptr;
 }
@@ -2015,7 +2015,7 @@ bool os::can_commit_large_page_memory() {
   return false;
 }
 
-char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc, MEMFLAGS flag) {
+char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc) {
   assert(file_desc >= 0, "file_desc is not valid");
   char* result = nullptr;
 
@@ -2033,7 +2033,7 @@ char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, i
 
 // Reserve memory at an arbitrary address, only if that area is
 // available (and not reserved for something else).
-char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec, MEMFLAGS flag) {
+char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec) {
   char* addr = nullptr;
 
   // Always round to os::vm_page_size(), which may be larger than 4K.
diff --git a/src/hotspot/os/bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp b/src/hotspot/os/bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp
index ea7a128cd13..2c64c3788d3 100644
--- a/src/hotspot/os/bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp
+++ b/src/hotspot/os/bsd/gc/x/xPhysicalMemoryBacking_bsd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -78,7 +78,7 @@ XPhysicalMemoryBacking::XPhysicalMemoryBacking(size_t max_capacity) :
     _initialized(false) {
 
   // Reserve address space for backing memory
-  _base = (uintptr_t)os::reserve_memory(max_capacity, !ExecMem, mtJavaHeap);
+  _base = (uintptr_t)os::reserve_memory(max_capacity);
   if (_base == 0) {
     // Failed
     log_error_pd(gc)("Failed to reserve address space for backing memory");
diff --git a/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp b/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
index 5bc901d0c0b..bd1d7174c12 100644
--- a/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
+++ b/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, 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
@@ -79,7 +79,7 @@ ZPhysicalMemoryBacking::ZPhysicalMemoryBacking(size_t max_capacity)
     _initialized(false) {
 
   // Reserve address space for backing memory
-  _base = (uintptr_t)os::reserve_memory(max_capacity, !ExecMem, mtJavaHeap);
+  _base = (uintptr_t)os::reserve_memory(max_capacity);
   if (_base == 0) {
     // Failed
     log_error_pd(gc)("Failed to reserve address space for backing memory");
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 95f8016e2e9..e5b6c74ce2f 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1668,7 +1668,7 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size,
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
 }
 
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) {
+void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
   ::madvise(addr, bytes, MADV_DONTNEED);
 }
 
@@ -1766,13 +1766,13 @@ bool os::pd_uncommit_memory(char* addr, size_t size, bool exec) {
 }
 
 bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
-  return os::commit_memory(addr, size, !ExecMem, mtThreadStack);
+  return os::commit_memory(addr, size, !ExecMem);
 }
 
 // If this is a growable mapping, remove the guard pages entirely by
 // munmap()ping them.  If not, just call uncommit_memory().
 bool os::remove_stack_guard_pages(char* addr, size_t size) {
-  return os::uncommit_memory(addr, size, !ExecMem, mtThreadStack);
+  return os::uncommit_memory(addr, size);
 }
 
 // 'requested_addr' is only treated as a hint, the return value may or
@@ -1809,7 +1809,7 @@ static int anon_munmap(char * addr, size_t size) {
   }
 }
 
-char* os::pd_reserve_memory(size_t bytes, bool exec, MEMFLAGS flag) {
+char* os::pd_reserve_memory(size_t bytes, bool exec) {
   return anon_mmap(nullptr /* addr */, bytes, exec);
 }
 
@@ -1869,7 +1869,7 @@ void os::large_page_init() {
 }
 
 
-char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec, MEMFLAGS flag) {
+char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec) {
   fatal("os::reserve_memory_special should not be called on BSD.");
   return nullptr;
 }
@@ -1888,9 +1888,9 @@ bool os::can_commit_large_page_memory() {
   return false;
 }
 
-char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc, MEMFLAGS flag) {
+char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc) {
   assert(file_desc >= 0, "file_desc is not valid");
-  char* result = pd_attempt_reserve_memory_at(requested_addr, bytes, !ExecMem, flag);
+  char* result = pd_attempt_reserve_memory_at(requested_addr, bytes, !ExecMem);
   if (result != nullptr) {
     if (replace_existing_mapping_with_file_mapping(result, bytes, file_desc) == nullptr) {
       vm_exit_during_initialization(err_msg("Error in mapping Java heap at the given filesystem directory"));
@@ -1902,7 +1902,7 @@ char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, i
 // Reserve memory at an arbitrary address, only if that area is
 // available (and not reserved for something else).
 
-char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec, MEMFLAGS flag) {
+char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec) {
   // Assert only that the size is a multiple of the page size, since
   // that's all that mmap requires, and since that's all we really know
   // about at this low abstraction level.  If we need higher alignment,
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 3181ad82dab..20d3c99cd3e 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -3023,14 +3023,14 @@ void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
   }
 }
 
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) {
+void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
   // This method works by doing an mmap over an existing mmaping and effectively discarding
   // the existing pages. However it won't work for SHM-based large pages that cannot be
   // uncommitted at all. We don't do anything in this case to avoid creating a segment with
   // small pages on top of the SHM segment. This method always works for small pages, so we
   // allow that in any case.
   if (alignment_hint <= os::vm_page_size() || can_commit_large_page_memory()) {
-    commit_memory(addr, bytes, alignment_hint, !ExecMem, flag);
+    commit_memory(addr, bytes, alignment_hint, !ExecMem);
   }
 }
 
@@ -3637,7 +3637,7 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
     }
   }
 
-  return os::commit_memory(addr, size, !ExecMem, mtThreadStack);
+  return os::commit_memory(addr, size, !ExecMem);
 }
 
 // If this is a growable mapping, remove the guard pages entirely by
@@ -3653,7 +3653,7 @@ bool os::remove_stack_guard_pages(char* addr, size_t size) {
     return ::munmap(addr, size) == 0;
   }
 
-  return os::uncommit_memory(addr, size, !ExecMem, mtThreadStack);
+  return os::uncommit_memory(addr, size);
 }
 
 // 'requested_addr' is only treated as a hint, the return value may or
@@ -3757,7 +3757,7 @@ static int anon_munmap(char * addr, size_t size) {
   return 1;
 }
 
-char* os::pd_reserve_memory(size_t bytes, bool exec, MEMFLAGS flag) {
+char* os::pd_reserve_memory(size_t bytes, bool exec) {
   return anon_mmap(nullptr, bytes);
 }
 
@@ -4214,7 +4214,7 @@ static char* reserve_memory_special_huge_tlbfs(size_t bytes,
 }
 
 char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size,
-                                    char* req_addr, bool exec, MEMFLAGS flag) {
+                                    char* req_addr, bool exec) {
   assert(UseLargePages, "only for large pages");
 
   char* const addr = reserve_memory_special_huge_tlbfs(bytes, alignment, page_size, req_addr, exec);
@@ -4249,9 +4249,9 @@ bool os::can_commit_large_page_memory() {
   return UseTransparentHugePages;
 }
 
-char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc, MEMFLAGS flag) {
+char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc) {
   assert(file_desc >= 0, "file_desc is not valid");
-  char* result = pd_attempt_reserve_memory_at(requested_addr, bytes, !ExecMem, flag);
+  char* result = pd_attempt_reserve_memory_at(requested_addr, bytes, !ExecMem);
   if (result != nullptr) {
     if (replace_existing_mapping_with_file_mapping(result, bytes, file_desc) == nullptr) {
       vm_exit_during_initialization(err_msg("Error in mapping Java heap at the given filesystem directory"));
@@ -4263,7 +4263,7 @@ char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, i
 // Reserve memory at an arbitrary address, only if that area is
 // available (and not reserved for something else).
 
-char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec, MEMFLAGS flag) {
+char* os::pd_attempt_reserve_memory_at(char* requested_addr, size_t bytes, bool exec) {
   // Assert only that the size is a multiple of the page size, since
   // that's all that mmap requires, and since that's all we really know
   // about at this low abstraction level.  If we need higher alignment,
@@ -4655,7 +4655,7 @@ static void workaround_expand_exec_shield_cs_limit() {
    */
   char* hint = (char*)(os::Linux::initial_thread_stack_bottom() -
                        (StackOverflow::stack_guard_zone_size() + page_size));
-  char* codebuf = os::attempt_reserve_memory_at(hint, page_size, !ExecMem, mtInternal);
+  char* codebuf = os::attempt_reserve_memory_at(hint, page_size);
 
   if (codebuf == nullptr) {
     // JDK-8197429: There may be a stack gap of one megabyte between
@@ -4663,13 +4663,15 @@ static void workaround_expand_exec_shield_cs_limit() {
     // Linux kernel workaround for CVE-2017-1000364.  If we failed to
     // map our codebuf, try again at an address one megabyte lower.
     hint -= 1 * M;
-    codebuf = os::attempt_reserve_memory_at(hint, page_size, !ExecMem, mtInternal);
+    codebuf = os::attempt_reserve_memory_at(hint, page_size);
   }
 
-  if ((codebuf == nullptr) || (!os::commit_memory(codebuf, page_size, ExecMem, mtInternal))) {
+  if ((codebuf == nullptr) || (!os::commit_memory(codebuf, page_size, true))) {
     return; // No matter, we tried, best effort.
   }
 
+  MemTracker::record_virtual_memory_type((address)codebuf, mtInternal);
+
   log_info(os)("[CS limit NX emulation work-around, exec code at: %p]", codebuf);
 
   // Some code to exec: the 'ret' instruction
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index db3aef14543..a18a633002c 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -395,9 +395,9 @@ static char* chop_extra_memory(size_t size, size_t alignment, char* extra_base,
 // Multiple threads can race in this code, and can remap over each other with MAP_FIXED,
 // so on posix, unmap the section at the start and at the end of the chunk that we mapped
 // rather than unmapping and remapping the whole chunk to get requested alignment.
-char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec, MEMFLAGS flag) {
+char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec) {
   size_t extra_size = calculate_aligned_extra_size(size, alignment);
-  char* extra_base = os::reserve_memory(extra_size, exec, flag);
+  char* extra_base = os::reserve_memory(extra_size, exec);
   if (extra_base == nullptr) {
     return nullptr;
   }
@@ -421,7 +421,7 @@ char* os::map_memory_to_file_aligned(size_t size, size_t alignment, int file_des
   if (replace_existing_mapping_with_file_mapping(aligned_base, size, file_desc) == nullptr) {
     vm_exit_during_initialization(err_msg("Error in mapping Java heap at the given filesystem directory"));
   }
-  MemTracker::record_virtual_memory_commit((address)aligned_base, size, CALLER_PC, flag);
+  MemTracker::record_virtual_memory_commit((address)aligned_base, size, CALLER_PC);
   return aligned_base;
 }
 
diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp
index 2ed33c3fb9c..4339a21ae4e 100644
--- a/src/hotspot/os/posix/perfMemory_posix.cpp
+++ b/src/hotspot/os/posix/perfMemory_posix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -65,14 +65,14 @@ static char* backing_store_file_name = nullptr;  // name of the backing store
 static char* create_standard_memory(size_t size) {
 
   // allocate an aligned chuck of memory
-  char* mapAddress = os::reserve_memory(size, !ExecMem, mtInternal);
+  char* mapAddress = os::reserve_memory(size);
 
   if (mapAddress == nullptr) {
     return nullptr;
   }
 
   // commit memory
-  if (!os::commit_memory(mapAddress, size, !ExecMem, mtInternal)) {
+  if (!os::commit_memory(mapAddress, size, !ExecMem)) {
     if (PrintMiscellaneous && Verbose) {
       warning("Could not commit PerfData memory\n");
     }
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index a99e67d417c..20422e83cb7 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -2755,7 +2755,7 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
           addr = (address)((uintptr_t)addr &
                             (~((uintptr_t)os::vm_page_size() - (uintptr_t)1)));
           os::commit_memory((char *)addr, thread->stack_base() - addr,
-                            !ExecMem, mtThreadStack);
+                            !ExecMem);
           return EXCEPTION_CONTINUE_EXECUTION;
         }
 #endif
@@ -3117,9 +3117,8 @@ static bool numa_interleaving_init() {
 // Reasons for doing this:
 //  * UseLargePagesIndividualAllocation was set (normally only needed on WS2003 but possible to be set otherwise)
 //  * UseNUMAInterleaving requires a separate node for each piece
-static char* allocate_pages_individually(size_t bytes, char* addr, DWORD alloc_type,
+static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
                                          DWORD prot,
-                                         MEMFLAGS flag,
                                          bool should_inject_error = false) {
   char * p_buf;
   // note: at setup time we guaranteed that NUMAInterleaveGranularity was aligned up to a page size
@@ -3143,7 +3142,7 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD alloc_t
                                 PAGE_READWRITE);
   // If reservation failed, return null
   if (p_buf == nullptr) return nullptr;
-  MemTracker::record_virtual_memory_reserve((address)p_buf, size_of_reserve, CALLER_PC, flag);
+  MemTracker::record_virtual_memory_reserve((address)p_buf, size_of_reserve, CALLER_PC);
   os::release_memory(p_buf, bytes + chunk_size);
 
   // we still need to round up to a page boundary (in case we are using large pages)
@@ -3185,13 +3184,13 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD alloc_t
       if (!UseNUMAInterleaving) {
         p_new = (char *) virtualAlloc(next_alloc_addr,
                                       bytes_to_rq,
-                                      alloc_type,
+                                      flags,
                                       prot);
       } else {
         // get the next node to use from the used_node_list
         assert(numa_node_list_holder.get_count() > 0, "Multiple NUMA nodes expected");
         DWORD node = numa_node_list_holder.get_node_list_entry(count % numa_node_list_holder.get_count());
-        p_new = (char *)virtualAllocExNuma(hProc, next_alloc_addr, bytes_to_rq, alloc_type, prot, node);
+        p_new = (char *)virtualAllocExNuma(hProc, next_alloc_addr, bytes_to_rq, flags, prot, node);
       }
     }
 
@@ -3204,7 +3203,7 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD alloc_t
         // need to create a dummy 'reserve' record to match
         // the release.
         MemTracker::record_virtual_memory_reserve((address)p_buf,
-                                                  bytes_to_release, CALLER_PC, flag);
+                                                  bytes_to_release, CALLER_PC);
         os::release_memory(p_buf, bytes_to_release);
       }
 #ifdef ASSERT
@@ -3221,10 +3220,10 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD alloc_t
   }
   // Although the memory is allocated individually, it is returned as one.
   // NMT records it as one block.
-  if ((alloc_type & MEM_COMMIT) != 0) {
-    MemTracker::record_virtual_memory_reserve_and_commit((address)p_buf, bytes, CALLER_PC, flag);
+  if ((flags & MEM_COMMIT) != 0) {
+    MemTracker::record_virtual_memory_reserve_and_commit((address)p_buf, bytes, CALLER_PC);
   } else {
-    MemTracker::record_virtual_memory_reserve((address)p_buf, bytes, CALLER_PC, flag);
+    MemTracker::record_virtual_memory_reserve((address)p_buf, bytes, CALLER_PC);
   }
 
   // made it this far, success
@@ -3352,7 +3351,7 @@ char* os::replace_existing_mapping_with_file_mapping(char* base, size_t size, in
 // Multiple threads can race in this code but it's not possible to unmap small sections of
 // virtual space to get requested alignment, like posix-like os's.
 // Windows prevents multiple thread from remapping over each other so this loop is thread-safe.
-static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int file_desc, MEMFLAGS flag) {
+static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int file_desc, MEMFLAGS flag = mtNone) {
   assert(is_aligned(alignment, os::vm_allocation_granularity()),
       "Alignment must be a multiple of allocation granularity (page size)");
   assert(is_aligned(size, os::vm_allocation_granularity()),
@@ -3366,7 +3365,7 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
 
   for (int attempt = 0; attempt < max_attempts && aligned_base == nullptr; attempt ++) {
     char* extra_base = file_desc != -1 ? os::map_memory_to_file(extra_size, file_desc, flag) :
-                                         os::reserve_memory(extra_size, !ExecMem, flag);
+                                         os::reserve_memory(extra_size, false, flag);
     if (extra_base == nullptr) {
       return nullptr;
     }
@@ -3383,7 +3382,7 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
     // Attempt to map, into the just vacated space, the slightly smaller aligned area.
     // Which may fail, hence the loop.
     aligned_base = file_desc != -1 ? os::attempt_map_memory_to_file_at(aligned_base, size, file_desc, flag) :
-                                     os::attempt_reserve_memory_at(aligned_base, size, !ExecMem, flag);
+                                     os::attempt_reserve_memory_at(aligned_base, size, false, flag);
   }
 
   assert(aligned_base != nullptr, "Did not manage to re-map after %d attempts?", max_attempts);
@@ -3391,22 +3390,22 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
   return aligned_base;
 }
 
-char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec, MEMFLAGS flag) {
+char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec) {
   // exec can be ignored
-  return map_or_reserve_memory_aligned(size, alignment, -1 /* file_desc */, flag);
+  return map_or_reserve_memory_aligned(size, alignment, -1 /* file_desc */);
 }
 
 char* os::map_memory_to_file_aligned(size_t size, size_t alignment, int fd, MEMFLAGS flag) {
   return map_or_reserve_memory_aligned(size, alignment, fd, flag);
 }
 
-char* os::pd_reserve_memory(size_t bytes, bool exec, MEMFLAGS flag) {
-  return pd_attempt_reserve_memory_at(nullptr /* addr */, bytes, exec, flag);
+char* os::pd_reserve_memory(size_t bytes, bool exec) {
+  return pd_attempt_reserve_memory_at(nullptr /* addr */, bytes, exec);
 }
 
 // Reserve memory at an arbitrary address, only if that area is
 // available (and not reserved for something else).
-char* os::pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool exec, MEMFLAGS flag) {
+char* os::pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool exec) {
   assert((size_t)addr % os::vm_allocation_granularity() == 0,
          "reserve alignment");
   assert(bytes % os::vm_page_size() == 0, "reserve page size");
@@ -3421,7 +3420,7 @@ char* os::pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool exec, MEMF
     if (Verbose && PrintMiscellaneous) reserveTimer.start();
     // in numa interleaving, we have to allocate pages individually
     // (well really chunks of NUMAInterleaveGranularity size)
-    res = allocate_pages_individually(bytes, addr, MEM_RESERVE, PAGE_READWRITE, flag);
+    res = allocate_pages_individually(bytes, addr, MEM_RESERVE, PAGE_READWRITE);
     if (res == nullptr) {
       warning("NUMA page allocation failed");
     }
@@ -3442,7 +3441,7 @@ size_t os::vm_min_address() {
   return _vm_min_address_default;
 }
 
-char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc, MEMFLAGS flag) {
+char* os::pd_attempt_map_memory_to_file_at(char* requested_addr, size_t bytes, int file_desc) {
   assert(file_desc >= 0, "file_desc is not valid");
   return map_memory_to_file(requested_addr, bytes, file_desc);
 }
@@ -3458,13 +3457,13 @@ bool os::can_commit_large_page_memory() {
   return false;
 }
 
-static char* reserve_large_pages_individually(size_t size, char* req_addr, bool exec, MEMFLAGS flag) {
+static char* reserve_large_pages_individually(size_t size, char* req_addr, bool exec) {
   log_debug(pagesize)("Reserving large pages individually.");
 
   const DWORD prot = exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
-  const DWORD alloc_type = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
+  const DWORD flags = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
 
-  char * p_buf = allocate_pages_individually(size, req_addr, alloc_type, prot, flag, LargePagesIndividualAllocationInjectError);
+  char * p_buf = allocate_pages_individually(size, req_addr, flags, prot, LargePagesIndividualAllocationInjectError);
   if (p_buf == nullptr) {
     // give an appropriate warning message
     if (UseNUMAInterleaving) {
@@ -3488,12 +3487,12 @@ static char* reserve_large_pages_single_range(size_t size, char* req_addr, bool
   return (char *) virtualAlloc(req_addr, size, flags, prot);
 }
 
-static char* reserve_large_pages(size_t size, char* req_addr, bool exec, MEMFLAGS flag) {
+static char* reserve_large_pages(size_t size, char* req_addr, bool exec) {
   // with large pages, there are two cases where we need to use Individual Allocation
   // 1) the UseLargePagesIndividualAllocation flag is set (set by default on WS2003)
   // 2) NUMA Interleaving is enabled, in which case we use a different node for each page
   if (UseLargePagesIndividualAllocation || UseNUMAInterleaving) {
-    return reserve_large_pages_individually(size, req_addr, exec, flag);
+    return reserve_large_pages_individually(size, req_addr, exec);
   }
   return reserve_large_pages_single_range(size, req_addr, exec);
 }
@@ -3510,7 +3509,7 @@ static char* find_aligned_address(size_t size, size_t alignment) {
   return aligned_addr;
 }
 
-static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exec, MEMFLAGS flag) {
+static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exec) {
   log_debug(pagesize)("Reserving large pages at an aligned address, alignment=" SIZE_FORMAT "%s",
                       byte_size_in_exact_unit(alignment), exact_unit_for_byte_size(alignment));
 
@@ -3523,7 +3522,7 @@ static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exe
     char* aligned_address = find_aligned_address(size, alignment);
 
     // Try to do the large page reservation using the aligned address.
-    aligned_address = reserve_large_pages(size, aligned_address, exec, flag);
+    aligned_address = reserve_large_pages(size, aligned_address, exec);
     if (aligned_address != nullptr) {
       // Reservation at the aligned address succeeded.
       guarantee(is_aligned(aligned_address, alignment), "Must be aligned");
@@ -3536,7 +3535,7 @@ static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exe
 }
 
 char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_size, char* addr,
-                                    bool exec, MEMFLAGS flag) {
+                                    bool exec) {
   assert(UseLargePages, "only for large pages");
   assert(page_size == os::large_page_size(), "Currently only support one large page size on Windows");
   assert(is_aligned(addr, alignment), "Must be");
@@ -3552,11 +3551,11 @@ char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_
   // ensure that the requested alignment is met. When there is a requested address
   // this solves it self, since it must be properly aligned already.
   if (addr == nullptr && alignment > page_size) {
-    return reserve_large_pages_aligned(bytes, alignment, exec, flag);
+    return reserve_large_pages_aligned(bytes, alignment, exec);
   }
 
   // No additional requirements, just reserve the large pages.
-  return reserve_large_pages(bytes, addr, exec, flag);
+  return reserve_large_pages(bytes, addr, exec);
 }
 
 bool os::pd_release_memory_special(char* base, size_t bytes) {
@@ -3722,11 +3721,11 @@ bool os::pd_release_memory(char* addr, size_t bytes) {
 }
 
 bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
-  return os::commit_memory(addr, size, !ExecMem, mtThreadStack);
+  return os::commit_memory(addr, size, !ExecMem);
 }
 
 bool os::remove_stack_guard_pages(char* addr, size_t size) {
-  return os::uncommit_memory(addr, size, !ExecMem, mtThreadStack);
+  return os::uncommit_memory(addr, size);
 }
 
 static bool protect_pages_individually(char* addr, size_t bytes, unsigned int p, DWORD *old_status) {
@@ -3777,7 +3776,7 @@ bool os::protect_memory(char* addr, size_t bytes, ProtType prot,
   // memory, not a big deal anyway, as bytes less or equal than 64K
   if (!is_committed) {
     commit_memory_or_exit(addr, bytes, prot == MEM_PROT_RWX,
-                          mtInternal, "cannot commit protection page");
+                          "cannot commit protection page");
   }
   // One cannot use os::guard_memory() here, as on Win32 guard page
   // have different (one-shot) semantics, from MSDN on PAGE_GUARD:
@@ -3817,7 +3816,7 @@ bool os::unguard_memory(char* addr, size_t bytes) {
 }
 
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) { }
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) { }
+void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) { }
 
 size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
   return page_size;
@@ -5105,6 +5104,9 @@ char* os::pd_map_memory(int fd, const char* file_name, size_t file_offset,
       return nullptr;
     }
 
+    // Record virtual memory allocation
+    MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, CALLER_PC);
+
     DWORD bytes_read;
     OVERLAPPED overlapped;
     overlapped.Offset = (DWORD)file_offset;
diff --git a/src/hotspot/os/windows/perfMemory_windows.cpp b/src/hotspot/os/windows/perfMemory_windows.cpp
index 0e5b5fedbcd..a71101731fb 100644
--- a/src/hotspot/os/windows/perfMemory_windows.cpp
+++ b/src/hotspot/os/windows/perfMemory_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, 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
@@ -55,14 +55,14 @@ typedef BOOL (WINAPI *SetSecurityDescriptorControlFnPtr)(
 static char* create_standard_memory(size_t size) {
 
   // allocate an aligned chuck of memory
-  char* mapAddress = os::reserve_memory(size, !ExecMem, mtInternal);
+  char* mapAddress = os::reserve_memory(size);
 
   if (mapAddress == nullptr) {
     return nullptr;
   }
 
   // commit memory
-  if (!os::commit_memory(mapAddress, size, !ExecMem, mtInternal)) {
+  if (!os::commit_memory(mapAddress, size, !ExecMem)) {
     if (PrintMiscellaneous && Verbose) {
       warning("Could not commit PerfData memory\n");
     }
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index b8004f741ba..51399f03434 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -326,7 +326,7 @@ size_t ArchiveBuilder::estimate_archive_size() {
 
 address ArchiveBuilder::reserve_buffer() {
   size_t buffer_size = estimate_archive_size();
-  ReservedSpace rs(buffer_size, MetaspaceShared::core_region_alignment(), os::vm_page_size(), mtClassShared);
+  ReservedSpace rs(buffer_size, MetaspaceShared::core_region_alignment(), os::vm_page_size());
   if (!rs.is_reserved()) {
     log_error(cds)("Failed to reserve " SIZE_FORMAT " bytes of output buffer.", buffer_size);
     MetaspaceShared::unrecoverable_writing_error();
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 22895bd3261..2182865ebaa 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -1710,9 +1710,9 @@ void FileMapInfo::close() {
 /*
  * Same as os::map_memory() but also pretouches if AlwaysPreTouch is enabled.
  */
-static char* map_and_pretouch_memory(int fd, const char* file_name, size_t file_offset,
-                                     char *addr, size_t bytes, bool read_only,
-                                     bool allow_exec, MEMFLAGS flags) {
+static char* map_memory(int fd, const char* file_name, size_t file_offset,
+                        char *addr, size_t bytes, bool read_only,
+                        bool allow_exec, MEMFLAGS flags = mtNone) {
   char* mem = os::map_memory(fd, file_name, file_offset, addr, bytes,
                              AlwaysPreTouch ? false : read_only,
                              allow_exec, flags);
@@ -1741,7 +1741,7 @@ bool FileMapInfo::remap_shared_readonly_as_readwrite() {
   // Replace old mapping with new one that is writable.
   char *base = os::map_memory(_fd, _full_path, r->file_offset(),
                               addr, size, false /* !read_only */,
-                              r->allow_exec(), mtClassShared);
+                              r->allow_exec());
   close();
   // These have to be errors because the shared region is now unmapped.
   if (base == nullptr) {
@@ -1800,7 +1800,7 @@ bool FileMapInfo::read_region(int i, char* base, size_t size, bool do_commit) {
     log_info(cds)("Commit %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)%s",
                   is_static() ? "static " : "dynamic", i, p2i(base), p2i(base + size),
                   shared_region_name[i], r->allow_exec() ? " exec" : "");
-    if (!os::commit_memory(base, size, r->allow_exec(), mtClassShared)) {
+    if (!os::commit_memory(base, size, r->allow_exec())) {
       log_error(cds)("Failed to commit %s region #%d (%s)", is_static() ? "static " : "dynamic",
                      i, shared_region_name[i]);
       return false;
@@ -1860,9 +1860,9 @@ MapArchiveResult FileMapInfo::map_region(int i, intx addr_delta, char* mapped_ba
     // Note that this may either be a "fresh" mapping into unreserved address
     // space (Windows, first mapping attempt), or a mapping into pre-reserved
     // space (Posix). See also comment in MetaspaceShared::map_archives().
-    char* base = map_and_pretouch_memory(_fd, _full_path, r->file_offset(),
-                                         requested_addr, size, r->read_only(),
-                                         r->allow_exec(), mtClassShared);
+    char* base = map_memory(_fd, _full_path, r->file_offset(),
+                            requested_addr, size, r->read_only(),
+                            r->allow_exec(), mtClassShared);
     if (base != requested_addr) {
       log_info(cds)("Unable to map %s shared space at " INTPTR_FORMAT,
                     shared_region_name[i], p2i(requested_addr));
@@ -1889,8 +1889,8 @@ char* FileMapInfo::map_bitmap_region() {
   }
   bool read_only = true, allow_exec = false;
   char* requested_addr = nullptr; // allow OS to pick any location
-  char* bitmap_base = map_and_pretouch_memory(_fd, _full_path, r->file_offset(),
-                                              requested_addr, r->used_aligned(), read_only, allow_exec, mtClassShared);
+  char* bitmap_base = map_memory(_fd, _full_path, r->file_offset(),
+                                 requested_addr, r->used_aligned(), read_only, allow_exec, mtClassShared);
   if (bitmap_base == nullptr) {
     log_info(cds)("failed to map relocation bitmap");
     return nullptr;
@@ -2176,11 +2176,10 @@ bool FileMapInfo::map_heap_region_impl() {
 
   // Map the archived heap data. No need to call MemTracker::record_virtual_memory_type()
   // for mapped region as it is part of the reserved java heap, which is already recorded.
-  // So we pass the mtJavaHeap to tell MemTracker the type of the already tracked memory.
   char* addr = (char*)_mapped_heap_memregion.start();
-  char* base = map_and_pretouch_memory(_fd, _full_path, r->file_offset(),
-                                       addr, _mapped_heap_memregion.byte_size(), r->read_only(),
-                                       r->allow_exec(), mtJavaHeap);
+  char* base = map_memory(_fd, _full_path, r->file_offset(),
+                          addr, _mapped_heap_memregion.byte_size(), r->read_only(),
+                          r->allow_exec());
   if (base == nullptr || base != addr) {
     dealloc_heap_region();
     log_info(cds)("UseSharedSpaces: Unable to map at required address in java heap. "
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 3f5560ca22a..c7d14f83d03 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -269,7 +269,7 @@ void MetaspaceShared::initialize_for_static_dump() {
   SharedBaseAddress = (size_t)_requested_base_address;
 
   size_t symbol_rs_size = LP64_ONLY(3 * G) NOT_LP64(128 * M);
-  _symbol_rs = ReservedSpace(symbol_rs_size, mtClassShared);
+  _symbol_rs = ReservedSpace(symbol_rs_size);
   if (!_symbol_rs.is_reserved()) {
     log_error(cds)("Unable to reserve memory for symbols: " SIZE_FORMAT " bytes.", symbol_rs_size);
     MetaspaceShared::unrecoverable_writing_error();
@@ -1270,10 +1270,12 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
     // Get the simple case out of the way first:
     // no compressed class space, simple allocation.
     archive_space_rs = ReservedSpace(archive_space_size, archive_space_alignment,
-                                     os::vm_page_size(), mtClassShared, (char*)base_address);
+                                     os::vm_page_size(), (char*)base_address);
     if (archive_space_rs.is_reserved()) {
       assert(base_address == nullptr ||
              (address)archive_space_rs.base() == base_address, "Sanity");
+      // Register archive space with NMT.
+      MemTracker::record_virtual_memory_type(archive_space_rs.base(), mtClassShared);
       return archive_space_rs.base();
     }
     return nullptr;
@@ -1317,18 +1319,21 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
       // via sequential file IO.
       address ccs_base = base_address + archive_space_size + gap_size;
       archive_space_rs = ReservedSpace(archive_space_size, archive_space_alignment,
-                                       os::vm_page_size(), mtClassShared, (char*)base_address);
+                                       os::vm_page_size(), (char*)base_address);
       class_space_rs   = ReservedSpace(class_space_size, class_space_alignment,
-                                       os::vm_page_size(), mtClass, (char*)ccs_base);
+                                       os::vm_page_size(), (char*)ccs_base);
     }
     if (!archive_space_rs.is_reserved() || !class_space_rs.is_reserved()) {
       release_reserved_spaces(total_space_rs, archive_space_rs, class_space_rs);
       return nullptr;
     }
+    // NMT: fix up the space tags
+    MemTracker::record_virtual_memory_type(archive_space_rs.base(), mtClassShared);
+    MemTracker::record_virtual_memory_type(class_space_rs.base(), mtClass);
   } else {
     if (use_archive_base_addr && base_address != nullptr) {
       total_space_rs = ReservedSpace(total_range_size, archive_space_alignment,
-                                     os::vm_page_size(), mtClassShared, (char*) base_address);
+                                     os::vm_page_size(), (char*) base_address);
     } else {
       // We did not manage to reserve at the preferred address, or were instructed to relocate. In that
       // case we reserve wherever possible, but the start address needs to be encodable as narrow Klass
diff --git a/src/hotspot/share/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp
index 890d0e035f8..d4657e35a84 100644
--- a/src/hotspot/share/classfile/compactHashtable.cpp
+++ b/src/hotspot/share/classfile/compactHashtable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, 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
@@ -240,7 +240,7 @@ HashtableTextDump::HashtableTextDump(const char* filename) : _fd(-1) {
   if (_fd < 0) {
     quit("Unable to open hashtable dump file", filename);
   }
-  _base = os::map_memory(_fd, filename, 0, nullptr, _size, true, false, mtClassShared);
+  _base = os::map_memory(_fd, filename, 0, nullptr, _size, true, false);
   if (_base == nullptr) {
     quit("Unable to map hashtable dump file", filename);
   }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 2b890530c4b..1384c30d2be 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -1213,7 +1213,7 @@ G1RegionToSpaceMapper* G1CollectedHeap::create_aux_memory_mapper(const char* des
                                                                  size_t translation_factor) {
   size_t preferred_page_size = os::page_size_for_region_unaligned(size, 1);
   // Allocate a new reserved space, preferring to use large pages.
-  ReservedSpace rs(size, preferred_page_size, mtGC);
+  ReservedSpace rs(size, preferred_page_size);
   size_t page_size = rs.page_size();
   G1RegionToSpaceMapper* result  =
     G1RegionToSpaceMapper::create_mapper(rs,
diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
index c0cf66fb2fd..bdb732f6ebb 100644
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,14 +135,14 @@ void G1PageBasedVirtualSpace::commit_preferred_pages(size_t start, size_t num_pa
   char* start_addr = page_start(start);
   size_t size = num_pages * _page_size;
 
-  os::commit_memory_or_exit(start_addr, size, _page_size, !ExecMem, mtGC, "G1 virtual space");
+  os::commit_memory_or_exit(start_addr, size, _page_size, false, "G1 virtual space");
 }
 
 void G1PageBasedVirtualSpace::commit_tail() {
   vmassert(_tail_size > 0, "The size of the tail area must be > 0 when reaching here");
 
   char* const aligned_end_address = align_down(_high_boundary, _page_size);
-  os::commit_memory_or_exit(aligned_end_address, _tail_size, os::vm_page_size(), !ExecMem, mtGC, "G1 virtual space");
+  os::commit_memory_or_exit(aligned_end_address, _tail_size, os::vm_page_size(), false, "G1 virtual space");
 }
 
 void G1PageBasedVirtualSpace::commit_internal(size_t start_page, size_t end_page) {
@@ -201,7 +201,7 @@ void G1PageBasedVirtualSpace::uncommit_internal(size_t start_page, size_t end_pa
             "Given start page " SIZE_FORMAT " is larger or equal to end page " SIZE_FORMAT, start_page, end_page);
 
   char* start_addr = page_start(start_page);
-  os::uncommit_memory(start_addr, pointer_delta(bounded_end_addr(end_page), start_addr, sizeof(char)), !ExecMem, mtGC);
+  os::uncommit_memory(start_addr, pointer_delta(bounded_end_addr(end_page), start_addr, sizeof(char)));
 }
 
 void G1PageBasedVirtualSpace::uncommit(size_t start_page, size_t size_in_pages) {
diff --git a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
index 104b126c016..5f903960cce 100644
--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,10 +43,12 @@ G1RegionToSpaceMapper::G1RegionToSpaceMapper(ReservedSpace rs,
                                              MEMFLAGS type) :
   _listener(nullptr),
   _storage(rs, used_size, page_size),
-  _region_commit_map(rs.size() * commit_factor / region_granularity, type),
+  _region_commit_map(rs.size() * commit_factor / region_granularity, mtGC),
   _memory_type(type) {
   guarantee(is_power_of_2(page_size), "must be");
   guarantee(is_power_of_2(region_granularity), "must be");
+
+  MemTracker::record_virtual_memory_type((address)rs.base(), type);
 }
 
 // Used to manually signal a mapper to handle a set of regions as committed.
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index c94da377410..2a39ce7b470 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, 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
@@ -227,7 +227,7 @@ void MutableNUMASpace::bias_region(MemRegion mr, uint lgrp_id) {
     // Then we uncommit the pages in the range.
     // The alignment_hint argument must be less than or equal to the small page
     // size if not using large pages or else this function does nothing.
-    os::free_memory((char*)aligned_region.start(), aligned_region.byte_size(), os_align, mtGC);
+    os::free_memory((char*)aligned_region.start(), aligned_region.byte_size(), os_align);
     // And make them local/first-touch biased.
     os::numa_make_local((char*)aligned_region.start(), aligned_region.byte_size(), checked_cast<int>(lgrp_id));
   }
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 019d457f293..4641b4ce5c6 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, 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
@@ -60,7 +60,7 @@ void MutableSpace::numa_setup_pages(MemRegion mr, size_t page_size, bool clear_s
       size_t size = pointer_delta(end, start, sizeof(char));
       if (clear_space) {
         // Prefer page reallocation to migration.
-        os::free_memory((char*)start, size, page_size, mtJavaHeap);
+        os::free_memory((char*)start, size, page_size);
       }
       os::numa_make_global((char*)start, size);
     }
diff --git a/src/hotspot/share/gc/parallel/objectStartArray.cpp b/src/hotspot/share/gc/parallel/objectStartArray.cpp
index 2a0f12ec70e..b1fc956a54a 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.cpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.cpp
@@ -47,10 +47,11 @@ void ObjectStartArray::initialize(MemRegion reserved_region) {
 
   // Do not use large-pages for the backing store. The one large page region
   // will be used for the heap proper.
-  ReservedSpace backing_store(bytes_to_reserve, mtGC);
+  ReservedSpace backing_store(bytes_to_reserve);
   if (!backing_store.is_reserved()) {
     vm_exit_during_initialization("Could not reserve space for ObjectStartArray");
   }
+  MemTracker::record_virtual_memory_type(backing_store.base(), mtGC);
 
   // We do not commit any memory initially
   _virtual_space.initialize(backing_store);
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
index fefc9150945..deffcc019c9 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, 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
@@ -49,11 +49,13 @@ ParMarkBitMap::initialize(MemRegion covered_region)
 
   const size_t rs_align = page_sz == os::vm_page_size() ? 0 :
     MAX2(page_sz, granularity);
-  ReservedSpace rs(_reserved_byte_size, rs_align, page_sz, mtGC);
+  ReservedSpace rs(_reserved_byte_size, rs_align, page_sz);
   const size_t used_page_sz = rs.page_size();
   os::trace_page_sizes("Mark Bitmap", raw_bytes, raw_bytes,
                        rs.base(), rs.size(), used_page_sz);
 
+  MemTracker::record_virtual_memory_type((address)rs.base(), mtGC);
+
   _virtual_space = new PSVirtualSpace(rs, page_sz);
   if (_virtual_space != nullptr && _virtual_space->expand_by(_reserved_byte_size)) {
     _region_start = covered_region.start();
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 165f9d3c05c..8ac16e059b1 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -440,10 +440,12 @@ ParallelCompactData::create_vspace(size_t count, size_t element_size)
 
   const size_t rs_align = page_sz == os::vm_page_size() ? 0 :
     MAX2(page_sz, granularity);
-  ReservedSpace rs(_reserved_byte_size, rs_align, page_sz, mtGC);
+  ReservedSpace rs(_reserved_byte_size, rs_align, page_sz);
   os::trace_page_sizes("Parallel Compact Data", raw_bytes, raw_bytes, rs.base(),
                        rs.size(), page_sz);
 
+  MemTracker::record_virtual_memory_type((address)rs.base(), mtGC);
+
   PSVirtualSpace* vspace = new PSVirtualSpace(rs, page_sz);
   if (vspace != 0) {
     if (vspace->expand_by(_reserved_byte_size)) {
diff --git a/src/hotspot/share/gc/parallel/psVirtualspace.cpp b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
index 8e441ec8061..a4d686d8670 100644
--- a/src/hotspot/share/gc/parallel/psVirtualspace.cpp
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
@@ -78,7 +78,7 @@ bool PSVirtualSpace::expand_by(size_t bytes) {
 
   char* const base_addr = committed_high_addr();
   bool result = special() ||
-         os::commit_memory(base_addr, bytes, alignment(), !ExecMem, mtGC);
+         os::commit_memory(base_addr, bytes, alignment(), !ExecMem);
   if (result) {
     _committed_high_addr += bytes;
   }
@@ -95,7 +95,7 @@ bool PSVirtualSpace::shrink_by(size_t bytes) {
   }
 
   char* const base_addr = committed_high_addr() - bytes;
-  bool result = special() || os::uncommit_memory(base_addr, bytes, !ExecMem, mtGC);
+  bool result = special() || os::uncommit_memory(base_addr, bytes);
   if (result) {
     _committed_high_addr -= bytes;
   }
diff --git a/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
index 7ac0fcc8b53..59b7f130df3 100644
--- a/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
@@ -37,11 +37,13 @@ SerialBlockOffsetTable::SerialBlockOffsetTable(MemRegion reserved,
                                                size_t init_word_size):
   _reserved(reserved) {
   size_t size = compute_size(reserved.word_size());
-  ReservedSpace rs(size, mtGC);
+  ReservedSpace rs(size);
   if (!rs.is_reserved()) {
     vm_exit_during_initialization("Could not reserve enough space for heap offset array");
   }
 
+  MemTracker::record_virtual_memory_type((address)rs.base(), mtGC);
+
   if (!_vs.initialize(rs, 0)) {
     vm_exit_during_initialization("Could not reserve enough space for heap offset array");
   }
diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp
index 243f47eee23..95f7058f4e4 100644
--- a/src/hotspot/share/gc/shared/cardTable.cpp
+++ b/src/hotspot/share/gc/shared/cardTable.cpp
@@ -82,7 +82,9 @@ void CardTable::initialize(void* region0_start, void* region1_start) {
 
   const size_t rs_align = _page_size == os::vm_page_size() ? 0 :
     MAX2(_page_size, os::vm_allocation_granularity());
-  ReservedSpace heap_rs(_byte_map_size, rs_align, _page_size, mtGC);
+  ReservedSpace heap_rs(_byte_map_size, rs_align, _page_size);
+
+  MemTracker::record_virtual_memory_type((address)heap_rs.base(), mtGC);
 
   os::trace_page_sizes("Card Table", num_bytes, num_bytes,
                        heap_rs.base(), heap_rs.size(), _page_size);
@@ -164,7 +166,6 @@ void CardTable::resize_covered_region(MemRegion new_region) {
                               delta.byte_size(),
                               _page_size,
                               !ExecMem,
-                              mtGCCardSet,
                               "card table expansion");
 
     memset(delta.start(), clean_card, delta.byte_size());
@@ -173,9 +174,7 @@ void CardTable::resize_covered_region(MemRegion new_region) {
     MemRegion delta = MemRegion(new_committed.end(),
                                 old_committed.word_size() - new_committed.word_size());
     bool res = os::uncommit_memory((char*)delta.start(),
-                                   delta.byte_size(),
-                                   !ExecMem,
-                                   mtGCCardSet);
+                                   delta.byte_size());
     assert(res, "uncommit should succeed");
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
index 34a66d9f6d9..25062c5317d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
@@ -57,19 +57,21 @@ ShenandoahCollectionSet::ShenandoahCollectionSet(ShenandoahHeap* heap, ReservedS
   // subsystem for mapping not-yet-written-to pages to a single physical backing page,
   // but this is not guaranteed, and would confuse NMT and other memory accounting tools.
 
+  MemTracker::record_virtual_memory_type(_map_space.base(), mtGC);
+
   size_t page_size = os::vm_page_size();
 
   if (!_map_space.special()) {
     // Commit entire pages that cover the heap cset map.
     char* bot_addr = align_down(_cset_map, page_size);
     char* top_addr = align_up(_cset_map + _map_size, page_size);
-    os::commit_memory_or_exit(bot_addr, pointer_delta(top_addr, bot_addr, 1), !ExecMem,
-                              mtGC, "Unable to commit collection set bitmap: heap");
+    os::commit_memory_or_exit(bot_addr, pointer_delta(top_addr, bot_addr, 1), false,
+                              "Unable to commit collection set bitmap: heap");
 
     // Commit the zero page, if not yet covered by heap cset map.
     if (bot_addr != _biased_cset_map) {
-      os::commit_memory_or_exit(_biased_cset_map, page_size, !ExecMem,
-                                mtGC, "Unable to commit collection set bitmap: zero page");
+      os::commit_memory_or_exit(_biased_cset_map, page_size, false,
+                                "Unable to commit collection set bitmap: zero page");
     }
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 09737d68352..c9d3d1d9364 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -213,8 +213,8 @@ jint ShenandoahHeap::initialize() {
 
   ReservedSpace sh_rs = heap_rs.first_part(max_byte_size);
   if (!_heap_region_special) {
-    os::commit_memory_or_exit(sh_rs.base(), _initial_size, heap_alignment, !ExecMem,
-                              mtGC, "Cannot commit heap memory");
+    os::commit_memory_or_exit(sh_rs.base(), _initial_size, heap_alignment, false,
+                              "Cannot commit heap memory");
   }
 
   //
@@ -247,11 +247,12 @@ jint ShenandoahHeap::initialize() {
             "Bitmap slices should be page-granular: bps = " SIZE_FORMAT ", page size = " SIZE_FORMAT,
             _bitmap_bytes_per_slice, bitmap_page_size);
 
-  ReservedSpace bitmap(_bitmap_size, bitmap_page_size, mtGC);
+  ReservedSpace bitmap(_bitmap_size, bitmap_page_size);
   os::trace_page_sizes_for_requested_size("Mark Bitmap",
                                           bitmap_size_orig, bitmap_page_size,
                                           bitmap.base(),
                                           bitmap.size(), bitmap.page_size());
+  MemTracker::record_virtual_memory_type(bitmap.base(), mtGC);
   _bitmap_region = MemRegion((HeapWord*) bitmap.base(), bitmap.size() / HeapWordSize);
   _bitmap_region_special = bitmap.special();
 
@@ -259,22 +260,23 @@ jint ShenandoahHeap::initialize() {
                               align_up(num_committed_regions, _bitmap_regions_per_slice) / _bitmap_regions_per_slice;
   bitmap_init_commit = MIN2(_bitmap_size, bitmap_init_commit);
   if (!_bitmap_region_special) {
-    os::commit_memory_or_exit((char *) _bitmap_region.start(), bitmap_init_commit, bitmap_page_size, !ExecMem,
-                              mtGC, "Cannot commit bitmap memory");
+    os::commit_memory_or_exit((char *) _bitmap_region.start(), bitmap_init_commit, bitmap_page_size, false,
+                              "Cannot commit bitmap memory");
   }
 
   _marking_context = new ShenandoahMarkingContext(_heap_region, _bitmap_region, _num_regions, _max_workers);
 
   if (ShenandoahVerify) {
-    ReservedSpace verify_bitmap(_bitmap_size, bitmap_page_size, mtGC);
+    ReservedSpace verify_bitmap(_bitmap_size, bitmap_page_size);
     os::trace_page_sizes_for_requested_size("Verify Bitmap",
                                             bitmap_size_orig, bitmap_page_size,
                                             verify_bitmap.base(),
                                             verify_bitmap.size(), verify_bitmap.page_size());
     if (!verify_bitmap.special()) {
-      os::commit_memory_or_exit(verify_bitmap.base(), verify_bitmap.size(), bitmap_page_size, !ExecMem,
-                                mtGC, "Cannot commit verification bitmap memory");
+      os::commit_memory_or_exit(verify_bitmap.base(), verify_bitmap.size(), bitmap_page_size, false,
+                                "Cannot commit verification bitmap memory");
     }
+    MemTracker::record_virtual_memory_type(verify_bitmap.base(), mtGC);
     MemRegion verify_bitmap_region = MemRegion((HeapWord *) verify_bitmap.base(), verify_bitmap.size() / HeapWordSize);
     _verification_bit_map.initialize(_heap_region, verify_bitmap_region);
     _verifier = new ShenandoahVerifier(this, &_verification_bit_map);
@@ -290,11 +292,12 @@ jint ShenandoahHeap::initialize() {
     aux_bitmap_page_size = os::vm_page_size();
   }
 #endif
-  ReservedSpace aux_bitmap(_bitmap_size, aux_bitmap_page_size, mtGC);
+  ReservedSpace aux_bitmap(_bitmap_size, aux_bitmap_page_size);
   os::trace_page_sizes_for_requested_size("Aux Bitmap",
                                           bitmap_size_orig, aux_bitmap_page_size,
                                           aux_bitmap.base(),
                                           aux_bitmap.size(), aux_bitmap.page_size());
+  MemTracker::record_virtual_memory_type(aux_bitmap.base(), mtGC);
   _aux_bitmap_region = MemRegion((HeapWord*) aux_bitmap.base(), aux_bitmap.size() / HeapWordSize);
   _aux_bitmap_region_special = aux_bitmap.special();
   _aux_bit_map.initialize(_heap_region, _aux_bitmap_region);
@@ -307,14 +310,15 @@ jint ShenandoahHeap::initialize() {
   size_t region_storage_size = align_up(region_storage_size_orig,
                                         MAX2(region_page_size, os::vm_allocation_granularity()));
 
-  ReservedSpace region_storage(region_storage_size, region_page_size, mtGC);
+  ReservedSpace region_storage(region_storage_size, region_page_size);
   os::trace_page_sizes_for_requested_size("Region Storage",
                                           region_storage_size_orig, region_page_size,
                                           region_storage.base(),
                                           region_storage.size(), region_storage.page_size());
+  MemTracker::record_virtual_memory_type(region_storage.base(), mtGC);
   if (!region_storage.special()) {
-    os::commit_memory_or_exit(region_storage.base(), region_storage_size, region_page_size, !ExecMem,
-                              mtGC, "Cannot commit region memory");
+    os::commit_memory_or_exit(region_storage.base(), region_storage_size, region_page_size, false,
+                              "Cannot commit region memory");
   }
 
   // Try to fit the collection set bitmap at lower addresses. This optimizes code generation for cset checks.
@@ -332,7 +336,7 @@ jint ShenandoahHeap::initialize() {
     for (uintptr_t addr = min; addr <= max; addr <<= 1u) {
       char* req_addr = (char*)addr;
       assert(is_aligned(req_addr, cset_align), "Should be aligned");
-      cset_rs = ReservedSpace(cset_size, cset_align, cset_page_size, mtGC, req_addr);
+      cset_rs = ReservedSpace(cset_size, cset_align, cset_page_size, req_addr);
       if (cset_rs.is_reserved()) {
         assert(cset_rs.base() == req_addr, "Allocated where requested: " PTR_FORMAT ", " PTR_FORMAT, p2i(cset_rs.base()), addr);
         _collection_set = new ShenandoahCollectionSet(this, cset_rs, sh_rs.base());
@@ -341,7 +345,7 @@ jint ShenandoahHeap::initialize() {
     }
 
     if (_collection_set == nullptr) {
-      cset_rs = ReservedSpace(cset_size, cset_align, os::vm_page_size(), mtGC);
+      cset_rs = ReservedSpace(cset_size, cset_align, os::vm_page_size());
       _collection_set = new ShenandoahCollectionSet(this, cset_rs, sh_rs.base());
     }
     os::trace_page_sizes_for_requested_size("Collection Set",
@@ -1410,7 +1414,7 @@ void ShenandoahHeap::object_iterate(ObjectClosure* cl) {
 bool ShenandoahHeap::prepare_aux_bitmap_for_iteration() {
   assert(SafepointSynchronize::is_at_safepoint(), "safe iteration is only available during safepoints");
 
-  if (!_aux_bitmap_region_special && !os::commit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size(), !ExecMem, mtGC)) {
+  if (!_aux_bitmap_region_special && !os::commit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size(), false)) {
     log_warning(gc)("Could not commit native memory for auxiliary marking bitmap for heap iteration");
     return false;
   }
@@ -1430,7 +1434,7 @@ void ShenandoahHeap::scan_roots_for_iteration(ShenandoahScanObjectStack* oop_sta
 }
 
 void ShenandoahHeap::reclaim_aux_bitmap_for_iteration() {
-  if (!_aux_bitmap_region_special && !os::uncommit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size(), !ExecMem, mtGC)) {
+  if (!_aux_bitmap_region_special && !os::uncommit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size())) {
     log_warning(gc)("Could not uncommit native memory for auxiliary marking bitmap for heap iteration");
   }
 }
@@ -2260,7 +2264,7 @@ bool ShenandoahHeap::commit_bitmap_slice(ShenandoahHeapRegion* r) {
   size_t len = _bitmap_bytes_per_slice;
   char* start = (char*) _bitmap_region.start() + off;
 
-  if (!os::commit_memory(start, len, !ExecMem, mtGC)) {
+  if (!os::commit_memory(start, len, false)) {
     return false;
   }
 
@@ -2289,7 +2293,7 @@ bool ShenandoahHeap::uncommit_bitmap_slice(ShenandoahHeapRegion *r) {
   size_t slice = r->index() / _bitmap_regions_per_slice;
   size_t off = _bitmap_bytes_per_slice * slice;
   size_t len = _bitmap_bytes_per_slice;
-  if (!os::uncommit_memory((char*)_bitmap_region.start() + off, len, !ExecMem, mtGC)) {
+  if (!os::uncommit_memory((char*)_bitmap_region.start() + off, len)) {
     return false;
   }
   return true;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index a8386a36c3f..8a94b20670a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -620,7 +620,7 @@ size_t ShenandoahHeapRegion::setup_sizes(size_t max_heap_size) {
 
 void ShenandoahHeapRegion::do_commit() {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
-  if (!heap->is_heap_region_special() && !os::commit_memory((char *) bottom(), RegionSizeBytes, !ExecMem, mtJavaHeap)) {
+  if (!heap->is_heap_region_special() && !os::commit_memory((char *) bottom(), RegionSizeBytes, false)) {
     report_java_out_of_memory("Unable to commit region");
   }
   if (!heap->commit_bitmap_slice(this)) {
@@ -634,7 +634,7 @@ void ShenandoahHeapRegion::do_commit() {
 
 void ShenandoahHeapRegion::do_uncommit() {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
-  if (!heap->is_heap_region_special() && !os::uncommit_memory((char *) bottom(), RegionSizeBytes, !ExecMem, mtJavaHeap)) {
+  if (!heap->is_heap_region_special() && !os::uncommit_memory((char *) bottom(), RegionSizeBytes)) {
     report_java_out_of_memory("Unable to uncommit region");
   }
   if (!heap->uncommit_bitmap_slice(this)) {
diff --git a/src/hotspot/share/gc/x/xMarkStackAllocator.cpp b/src/hotspot/share/gc/x/xMarkStackAllocator.cpp
index 70892879d2b..b5cc3ad641a 100644
--- a/src/hotspot/share/gc/x/xMarkStackAllocator.cpp
+++ b/src/hotspot/share/gc/x/xMarkStackAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, 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
@@ -88,7 +88,7 @@ size_t XMarkStackSpace::expand_space() {
                          old_size / M, new_size / M);
 
   // Expand
-  os::commit_memory_or_exit((char*)_end, expand_size, !ExecMem, mtGC, "Mark stack space");
+  os::commit_memory_or_exit((char*)_end, expand_size, false /* executable */, "Mark stack space");
 
   return expand_size;
 }
@@ -105,7 +105,7 @@ size_t XMarkStackSpace::shrink_space() {
                            old_size / M, new_size / M);
 
     const uintptr_t shrink_start = _end - shrink_size;
-    os::uncommit_memory((char*)shrink_start, shrink_size, !ExecMem, mtGC);
+    os::uncommit_memory((char*)shrink_start, shrink_size, false /* executable */);
   }
 
   return shrink_size;
diff --git a/src/hotspot/share/gc/x/xPhysicalMemory.cpp b/src/hotspot/share/gc/x/xPhysicalMemory.cpp
index 619e41cab9c..0269c64f0f1 100644
--- a/src/hotspot/share/gc/x/xPhysicalMemory.cpp
+++ b/src/hotspot/share/gc/x/xPhysicalMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, 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
@@ -279,13 +279,13 @@ void XPhysicalMemoryManager::try_enable_uncommit(size_t min_capacity, size_t max
 void XPhysicalMemoryManager::nmt_commit(uintptr_t offset, size_t size) const {
   // From an NMT point of view we treat the first heap view (marked0) as committed
   const uintptr_t addr = XAddress::marked0(offset);
-  MemTracker::record_virtual_memory_commit((void*)addr, size, CALLER_PC, mtGC);
+  MemTracker::record_virtual_memory_commit((void*)addr, size, CALLER_PC);
 }
 
 void XPhysicalMemoryManager::nmt_uncommit(uintptr_t offset, size_t size) const {
   const uintptr_t addr = XAddress::marked0(offset);
   ThreadCritical tc;
-  MemTracker::record_virtual_memory_uncommit((address)addr, size, mtGC);
+  MemTracker::record_virtual_memory_uncommit((address)addr, size);
 }
 
 void XPhysicalMemoryManager::alloc(XPhysicalMemory& pmem, size_t size) {
diff --git a/src/hotspot/share/gc/x/xVirtualMemory.cpp b/src/hotspot/share/gc/x/xVirtualMemory.cpp
index 496dcdc2464..1d66cdd069e 100644
--- a/src/hotspot/share/gc/x/xVirtualMemory.cpp
+++ b/src/hotspot/share/gc/x/xVirtualMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -181,7 +181,8 @@ bool XVirtualMemoryManager::reserve(size_t max_capacity) {
 }
 
 void XVirtualMemoryManager::nmt_reserve(uintptr_t start, size_t size) {
-  MemTracker::record_virtual_memory_reserve((void*)start, size, CALLER_PC, mtJavaHeap);
+  MemTracker::record_virtual_memory_reserve((void*)start, size, CALLER_PC);
+  MemTracker::record_virtual_memory_type((void*)start, mtJavaHeap);
 }
 
 bool XVirtualMemoryManager::is_initialized() const {
diff --git a/src/hotspot/share/gc/z/zMarkStackAllocator.cpp b/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
index 866121ce0d3..a9e404a0f55 100644
--- a/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
+++ b/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, 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
@@ -87,7 +87,7 @@ size_t ZMarkStackSpace::expand_space() {
                          old_size / M, new_size / M);
 
   // Expand
-  os::commit_memory_or_exit((char*)_end, expand_size, !ExecMem, mtGC, "Mark stack space");
+  os::commit_memory_or_exit((char*)_end, expand_size, false /* executable */, "Mark stack space");
 
   return expand_size;
 }
@@ -104,7 +104,7 @@ size_t ZMarkStackSpace::shrink_space() {
                            old_size / M, new_size / M);
 
     const uintptr_t shrink_start = _end - shrink_size;
-    os::uncommit_memory((char*)shrink_start, shrink_size, !ExecMem, mtGC);
+    os::uncommit_memory((char*)shrink_start, shrink_size, false /* executable */);
   }
 
   return shrink_size;
diff --git a/src/hotspot/share/gc/z/zNMT.cpp b/src/hotspot/share/gc/z/zNMT.cpp
index 9778ac0c975..9a54c0f5963 100644
--- a/src/hotspot/share/gc/z/zNMT.cpp
+++ b/src/hotspot/share/gc/z/zNMT.cpp
@@ -71,10 +71,10 @@ void ZNMT::process_fake_mapping(zoffset offset, size_t size, bool commit) {
 
     // commit / uncommit memory
     if (commit) {
-      MemTracker::record_virtual_memory_commit((void*)sub_range_addr, sub_range_size, CALLER_PC, mtGC);
+      MemTracker::record_virtual_memory_commit((void*)sub_range_addr, sub_range_size, CALLER_PC);
     } else {
       ThreadCritical tc;
-      MemTracker::record_virtual_memory_uncommit((address)sub_range_addr, sub_range_size, mtGC);
+      MemTracker::record_virtual_memory_uncommit((address)sub_range_addr, sub_range_size);
     }
 
     left_to_process -= sub_range_size;
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
index 31855ee1eb6..78309f00913 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, 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
@@ -104,8 +104,7 @@ bool JfrVirtualMemorySegment::initialize(size_t reservation_size_request_bytes)
   assert(is_aligned(reservation_size_request_bytes, os::vm_allocation_granularity()), "invariant");
   _rs = ReservedSpace(reservation_size_request_bytes,
                       os::vm_allocation_granularity(),
-                      os::vm_page_size(),
-                      mtTracing);
+                      os::vm_page_size());
   if (!_rs.is_reserved()) {
     return false;
   }
@@ -118,6 +117,7 @@ bool JfrVirtualMemorySegment::initialize(size_t reservation_size_request_bytes)
                               _rs.base(),
                               _rs.size(),
                               os::vm_page_size());
+  MemTracker::record_virtual_memory_type((address)_rs.base(), mtTracing);
   assert(is_aligned(_rs.base(), os::vm_page_size()), "invariant");
   assert(is_aligned(_rs.size(), os::vm_page_size()), "invariant");
 
diff --git a/src/hotspot/share/memory/allocation.inline.hpp b/src/hotspot/share/memory/allocation.inline.hpp
index 3b4f163a51d..4a1b0b0c597 100644
--- a/src/hotspot/share/memory/allocation.inline.hpp
+++ b/src/hotspot/share/memory/allocation.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ E* MmapArrayAllocator<E>::allocate_or_null(size_t length, MEMFLAGS flags) {
     return nullptr;
   }
 
-  if (os::commit_memory(addr, size, !ExecMem, flags)) {
+  if (os::commit_memory(addr, size, !ExecMem)) {
     return (E*)addr;
   } else {
     os::release_memory(addr, size);
@@ -80,7 +80,7 @@ E* MmapArrayAllocator<E>::allocate(size_t length, MEMFLAGS flags) {
     vm_exit_out_of_memory(size, OOM_MMAP_ERROR, "Allocator (reserve)");
   }
 
-  os::commit_memory_or_exit(addr, size, !ExecMem, flags, "Allocator (commit)");
+  os::commit_memory_or_exit(addr, size, !ExecMem, "Allocator (commit)");
 
   return (E*)addr;
 }
diff --git a/src/hotspot/share/memory/heap.cpp b/src/hotspot/share/memory/heap.cpp
index 92a376defa5..98e59f58184 100644
--- a/src/hotspot/share/memory/heap.cpp
+++ b/src/hotspot/share/memory/heap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, 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
@@ -227,11 +227,13 @@ bool CodeHeap::reserve(ReservedSpace rs, size_t committed_size, size_t segment_s
   const size_t committed_segments_size = align_to_page_size(_number_of_committed_segments);
 
   // reserve space for _segmap
-  ReservedSpace seg_rs(reserved_segments_size, mtCode);
+  ReservedSpace seg_rs(reserved_segments_size);
   if (!_segmap.initialize(seg_rs, committed_segments_size)) {
     return false;
   }
 
+  MemTracker::record_virtual_memory_type((address)_segmap.low_boundary(), mtCode);
+
   assert(_segmap.committed_size() >= (size_t) _number_of_committed_segments, "could not commit  enough space for segment map");
   assert(_segmap.reserved_size()  >= (size_t) _number_of_reserved_segments , "could not reserve enough space for segment map");
   assert(_segmap.reserved_size()  >= _segmap.committed_size()     , "just checking");
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index 65eeaefe74c..22ec4d942a6 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -589,7 +589,7 @@ ReservedSpace Metaspace::reserve_address_space_for_compressed_classes(size_t siz
   if (result == nullptr) {
     // Fallback: reserve anywhere
     log_debug(metaspace, map)("Trying anywhere...");
-    result = os::reserve_memory_aligned(size, Metaspace::reserve_alignment(), !ExecMem, mtClass);
+    result = os::reserve_memory_aligned(size, Metaspace::reserve_alignment(), false);
   }
 
   // Wrap resulting range in ReservedSpace
@@ -598,7 +598,7 @@ ReservedSpace Metaspace::reserve_address_space_for_compressed_classes(size_t siz
     log_debug(metaspace, map)("Mapped at " PTR_FORMAT, p2i(result));
     assert(is_aligned(result, Metaspace::reserve_alignment()), "Alignment too small for metaspace");
     rs = ReservedSpace::space_for_range(result, size, Metaspace::reserve_alignment(),
-                                                      os::vm_page_size(), false, false, mtClass);
+                                                      os::vm_page_size(), false, false);
   } else {
     log_debug(metaspace, map)("Failed to map.");
     rs = ReservedSpace();
@@ -739,7 +739,7 @@ void Metaspace::global_initialize() {
                     CompressedClassSpaceBaseAddress, Metaspace::reserve_alignment()));
       }
       rs = ReservedSpace(size, Metaspace::reserve_alignment(),
-                         os::vm_page_size() /* large */, mtClass, (char*)base);
+                         os::vm_page_size() /* large */, (char*)base);
       if (rs.is_reserved()) {
         log_info(metaspace)("Successfully forced class space address to " PTR_FORMAT, p2i(base));
       } else {
@@ -767,6 +767,9 @@ void Metaspace::global_initialize() {
                    CompressedClassSpaceSize));
     }
 
+    // Mark class space as such
+    MemTracker::record_virtual_memory_type((address)rs.base(), mtClass);
+
     // Initialize space
     Metaspace::initialize_class_space(rs);
 
diff --git a/src/hotspot/share/memory/metaspace/testHelpers.cpp b/src/hotspot/share/memory/metaspace/testHelpers.cpp
index ecc8af2f7dc..2d1071d77dd 100644
--- a/src/hotspot/share/memory/metaspace/testHelpers.cpp
+++ b/src/hotspot/share/memory/metaspace/testHelpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -78,7 +78,7 @@ MetaspaceTestContext::MetaspaceTestContext(const char* name, size_t commit_limit
                     reserve_limit, Metaspace::reserve_alignment_words());
   if (reserve_limit > 0) {
     // have reserve limit -> non-expandable context
-    _rs = ReservedSpace(reserve_limit * BytesPerWord, Metaspace::reserve_alignment(), os::vm_page_size(), mtMetaspace);
+    _rs = ReservedSpace(reserve_limit * BytesPerWord, Metaspace::reserve_alignment(), os::vm_page_size());
     _context = MetaspaceContext::create_nonexpandable_context(name, _rs, &_commit_limiter);
   } else {
     // no reserve limit -> expandable vslist
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
index 52553b889df..a8afbc130c9 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
@@ -109,7 +109,7 @@ bool VirtualSpaceNode::commit_range(MetaWord* p, size_t word_size) {
   }
 
   // Commit...
-  if (os::commit_memory((char*)p, word_size * BytesPerWord, !ExecMem, _rs.nmt_flag()) == false) {
+  if (os::commit_memory((char*)p, word_size * BytesPerWord, false) == false) {
     vm_exit_out_of_memory(word_size * BytesPerWord, OOM_MMAP_ERROR, "Failed to commit metaspace.");
   }
 
@@ -188,7 +188,7 @@ void VirtualSpaceNode::uncommit_range(MetaWord* p, size_t word_size) {
   }
 
   // Uncommit...
-  if (os::uncommit_memory((char*)p, word_size * BytesPerWord, !ExecMem, _rs.nmt_flag()) == false) {
+  if (os::uncommit_memory((char*)p, word_size * BytesPerWord) == false) {
     // Note: this can actually happen, since uncommit may increase the number of mappings.
     fatal("Failed to uncommit metaspace.");
   }
@@ -255,10 +255,11 @@ VirtualSpaceNode* VirtualSpaceNode::create_node(size_t word_size,
   DEBUG_ONLY(assert_is_aligned(word_size, chunklevel::MAX_CHUNK_WORD_SIZE);)
   ReservedSpace rs(word_size * BytesPerWord,
                    Settings::virtual_space_node_reserve_alignment_words() * BytesPerWord,
-                   os::vm_page_size(), mtMetaspace);
+                   os::vm_page_size());
   if (!rs.is_reserved()) {
     vm_exit_out_of_memory(word_size * BytesPerWord, OOM_MMAP_ERROR, "Failed to reserve memory for metaspace");
   }
+  MemTracker::record_virtual_memory_type(rs.base(), mtMetaspace);
   assert_is_aligned(rs.base(), chunklevel::MAX_CHUNK_BYTE_SIZE);
   InternalStats::inc_num_vsnodes_births();
   return new VirtualSpaceNode(rs, true, limiter, reserve_words_counter, commit_words_counter);
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index 6811d6be846..06775f98032 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -42,19 +42,19 @@
 
 // Dummy constructor
 ReservedSpace::ReservedSpace() : _base(nullptr), _size(0), _noaccess_prefix(0),
-    _alignment(0), _fd_for_heap(-1), _special(false), _executable(false), _flag(mtNone) {
+    _alignment(0), _special(false), _fd_for_heap(-1), _executable(false) {
 }
 
-ReservedSpace::ReservedSpace(size_t size, MEMFLAGS flag) : _fd_for_heap(-1), _flag(flag) {
+ReservedSpace::ReservedSpace(size_t size) : _fd_for_heap(-1) {
   // Want to use large pages where possible. If the size is
   // not large page aligned the mapping will be a mix of
   // large and normal pages.
   size_t page_size = os::page_size_for_region_unaligned(size, 1);
   size_t alignment = os::vm_allocation_granularity();
-  initialize(size, alignment, page_size, nullptr, false, flag);
+  initialize(size, alignment, page_size, nullptr, false);
 }
 
-ReservedSpace::ReservedSpace(size_t size, size_t preferred_page_size, MEMFLAGS flag) : _fd_for_heap(-1), _flag(flag) {
+ReservedSpace::ReservedSpace(size_t size, size_t preferred_page_size) : _fd_for_heap(-1) {
   // When a page size is given we don't want to mix large
   // and normal pages. If the size is not a multiple of the
   // page size it will be aligned up to achieve this.
@@ -63,46 +63,45 @@ ReservedSpace::ReservedSpace(size_t size, size_t preferred_page_size, MEMFLAGS f
     alignment = MAX2(preferred_page_size, alignment);
     size = align_up(size, alignment);
   }
-  initialize(size, alignment, preferred_page_size, nullptr, false, flag);
+  initialize(size, alignment, preferred_page_size, nullptr, false);
 }
 
 ReservedSpace::ReservedSpace(size_t size,
                              size_t alignment,
                              size_t page_size,
-                             MEMFLAGS flag,
-                             char* requested_address) : _fd_for_heap(-1), _flag(flag) {
-  initialize(size, alignment, page_size, requested_address, false, flag);
+                             char* requested_address) : _fd_for_heap(-1) {
+  initialize(size, alignment, page_size, requested_address, false);
 }
 
 ReservedSpace::ReservedSpace(char* base, size_t size, size_t alignment, size_t page_size,
-                             bool special, bool executable, MEMFLAGS flag) : _fd_for_heap(-1), _flag(flag) {
+                             bool special, bool executable) : _fd_for_heap(-1) {
   assert((size % os::vm_allocation_granularity()) == 0,
          "size not allocation aligned");
-  initialize_members(base, size, alignment, page_size, special, executable, flag);
+  initialize_members(base, size, alignment, page_size, special, executable);
 }
 
 // Helper method
-static char* attempt_map_or_reserve_memory_at(char* base, size_t size, int fd, bool executable, MEMFLAGS flag) {
+static char* attempt_map_or_reserve_memory_at(char* base, size_t size, int fd, bool executable) {
   if (fd != -1) {
-    return os::attempt_map_memory_to_file_at(base, size, fd, flag);
+    return os::attempt_map_memory_to_file_at(base, size, fd);
   }
-  return os::attempt_reserve_memory_at(base, size, executable, flag);
+  return os::attempt_reserve_memory_at(base, size, executable);
 }
 
 // Helper method
-static char* map_or_reserve_memory(size_t size, int fd, bool executable, MEMFLAGS flag) {
+static char* map_or_reserve_memory(size_t size, int fd, bool executable) {
   if (fd != -1) {
-    return os::map_memory_to_file(size, fd, flag);
+    return os::map_memory_to_file(size, fd);
   }
-  return os::reserve_memory(size, executable, flag);
+  return os::reserve_memory(size, executable);
 }
 
 // Helper method
-static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fd, bool executable, MEMFLAGS flag) {
+static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fd, bool executable) {
   if (fd != -1) {
-    return os::map_memory_to_file_aligned(size, alignment, fd, flag);
+    return os::map_memory_to_file_aligned(size, alignment, fd);
   }
-  return os::reserve_memory_aligned(size, alignment, executable, flag);
+  return os::reserve_memory_aligned(size, alignment, executable);
 }
 
 // Helper method
@@ -155,7 +154,7 @@ static void log_on_large_pages_failure(char* req_addr, size_t bytes) {
 }
 
 static char* reserve_memory(char* requested_address, const size_t size,
-                            const size_t alignment, int fd, bool exec, MEMFLAGS flag) {
+                            const size_t alignment, int fd, bool exec) {
   char* base;
   // If the memory was requested at a particular address, use
   // os::attempt_reserve_memory_at() to avoid mapping over something
@@ -164,19 +163,19 @@ static char* reserve_memory(char* requested_address, const size_t size,
     assert(is_aligned(requested_address, alignment),
            "Requested address " PTR_FORMAT " must be aligned to " SIZE_FORMAT,
            p2i(requested_address), alignment);
-    base = attempt_map_or_reserve_memory_at(requested_address, size, fd, exec, flag);
+    base = attempt_map_or_reserve_memory_at(requested_address, size, fd, exec);
   } else {
     // Optimistically assume that the OS returns an aligned base pointer.
     // When reserving a large address range, most OSes seem to align to at
     // least 64K.
-    base = map_or_reserve_memory(size, fd, exec, flag);
+    base = map_or_reserve_memory(size, fd, exec);
     // Check alignment constraints. This is only needed when there is
     // no requested address.
     if (!is_aligned(base, alignment)) {
       // Base not aligned, retry.
       unmap_or_release_memory(base, size, fd != -1 /*is_file_mapped*/);
       // Map using the requested alignment.
-      base = map_or_reserve_memory_aligned(size, alignment, fd, exec, flag);
+      base = map_or_reserve_memory_aligned(size, alignment, fd, exec);
     }
   }
 
@@ -184,14 +183,14 @@ static char* reserve_memory(char* requested_address, const size_t size,
 }
 
 static char* reserve_memory_special(char* requested_address, const size_t size,
-                                    const size_t alignment, const size_t page_size, bool exec, MEMFLAGS flag) {
+                                    const size_t alignment, const size_t page_size, bool exec) {
 
   log_trace(pagesize)("Attempt special mapping: size: " SIZE_FORMAT "%s, "
                       "alignment: " SIZE_FORMAT "%s",
                       byte_size_in_exact_unit(size), exact_unit_for_byte_size(size),
                       byte_size_in_exact_unit(alignment), exact_unit_for_byte_size(alignment));
 
-  char* base = os::reserve_memory_special(size, alignment, page_size, requested_address, exec, flag);
+  char* base = os::reserve_memory_special(size, alignment, page_size, requested_address, exec);
   if (base != nullptr) {
     // Check alignment constraints.
     assert(is_aligned(base, alignment),
@@ -203,19 +202,18 @@ static char* reserve_memory_special(char* requested_address, const size_t size,
 }
 
 void ReservedSpace::clear_members() {
-  initialize_members(nullptr, 0, 0, 0, false, false, mtNone);
+  initialize_members(nullptr, 0, 0, 0, false, false);
 }
 
 void ReservedSpace::initialize_members(char* base, size_t size, size_t alignment,
-                                       size_t page_size, bool special, bool executable, MEMFLAGS flag) {
+                                       size_t page_size, bool special, bool executable) {
   _base = base;
   _size = size;
-  _noaccess_prefix = 0;
   _alignment = alignment;
   _page_size = page_size;
   _special = special;
   _executable = executable;
-  _flag = flag;
+  _noaccess_prefix = 0;
 }
 
 void ReservedSpace::reserve(size_t size,
@@ -237,9 +235,9 @@ void ReservedSpace::reserve(size_t size,
     // When there is a backing file directory for this space then whether
     // large pages are allocated is up to the filesystem of the backing file.
     // So UseLargePages is not taken into account for this reservation.
-    char* base = reserve_memory(requested_address, size, alignment, _fd_for_heap, executable, _flag);
+    char* base = reserve_memory(requested_address, size, alignment, _fd_for_heap, executable);
     if (base != nullptr) {
-      initialize_members(base, size, alignment, os::vm_page_size(), true, executable, _flag);
+      initialize_members(base, size, alignment, os::vm_page_size(), true, executable);
     }
     // Always return, not possible to fall back to reservation not using a file.
     return;
@@ -252,10 +250,10 @@ void ReservedSpace::reserve(size_t size,
     // explicit large pages and these have to be committed up front to ensure
     // no reservations are lost.
     do {
-      char* base = reserve_memory_special(requested_address, size, alignment, page_size, executable, _flag);
+      char* base = reserve_memory_special(requested_address, size, alignment, page_size, executable);
       if (base != nullptr) {
         // Successful reservation using large pages.
-        initialize_members(base, size, alignment, page_size, true, executable, _flag);
+        initialize_members(base, size, alignment, page_size, true, executable);
         return;
       }
       page_size = os::page_sizes().next_smaller(page_size);
@@ -268,10 +266,10 @@ void ReservedSpace::reserve(size_t size,
   }
 
   // == Case 3 ==
-  char* base = reserve_memory(requested_address, size, alignment, -1, executable, _flag);
+  char* base = reserve_memory(requested_address, size, alignment, -1, executable);
   if (base != nullptr) {
     // Successful mapping.
-    initialize_members(base, size, alignment, page_size, false, executable, _flag);
+    initialize_members(base, size, alignment, page_size, false, executable);
   }
 }
 
@@ -279,8 +277,7 @@ void ReservedSpace::initialize(size_t size,
                                size_t alignment,
                                size_t page_size,
                                char* requested_address,
-                               bool executable,
-                               MEMFLAGS flag) {
+                               bool executable) {
   const size_t granularity = os::vm_allocation_granularity();
   assert((size & (granularity - 1)) == 0,
          "size not aligned to os::vm_allocation_granularity()");
@@ -293,9 +290,6 @@ void ReservedSpace::initialize(size_t size,
 
   clear_members();
 
-  // _flag is cleared in clear_members in above call
-  _flag = flag;
-
   if (size == 0) {
     return;
   }
@@ -316,14 +310,14 @@ void ReservedSpace::initialize(size_t size,
 
 ReservedSpace ReservedSpace::first_part(size_t partition_size, size_t alignment) {
   assert(partition_size <= size(), "partition failed");
-  ReservedSpace result(base(), partition_size, alignment, page_size(), special(), executable(), nmt_flag());
+  ReservedSpace result(base(), partition_size, alignment, page_size(), special(), executable());
   return result;
 }
 
 ReservedSpace ReservedSpace::last_part(size_t partition_size, size_t alignment) {
   assert(partition_size <= size(), "partition failed");
   ReservedSpace result(base() + partition_size, size() - partition_size,
-                       alignment, page_size(), special(), executable(), nmt_flag());
+                       alignment, page_size(), special(), executable());
   return result;
 }
 
@@ -366,12 +360,12 @@ void ReservedSpace::release() {
 
 // Put a ReservedSpace over an existing range
 ReservedSpace ReservedSpace::space_for_range(char* base, size_t size, size_t alignment,
-                                             size_t page_size, bool special, bool executable, MEMFLAGS flag) {
+                                             size_t page_size, bool special, bool executable) {
   assert(is_aligned(base, os::vm_allocation_granularity()), "Unaligned base");
   assert(is_aligned(size, os::vm_page_size()), "Unaligned size");
   assert(os::page_sizes().contains(page_size), "Invalid pagesize");
   ReservedSpace space;
-  space.initialize_members(base, size, alignment, page_size, special, executable, flag);
+  space.initialize_members(base, size, alignment, page_size, special, executable);
   return space;
 }
 
@@ -613,17 +607,16 @@ void ReservedHeapSpace::initialize_compressed_heap(const size_t size, size_t ali
     // Last, desperate try without any placement.
     if (_base == nullptr) {
       log_trace(gc, heap, coops)("Trying to allocate at address null heap of size " SIZE_FORMAT_X, size + noaccess_prefix);
-      initialize(size + noaccess_prefix, alignment, page_size, nullptr, !ExecMem, nmt_flag());
+      initialize(size + noaccess_prefix, alignment, page_size, nullptr, false);
     }
   }
 }
 
 ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, size_t page_size, const char* heap_allocation_directory) : ReservedSpace() {
+
   if (size == 0) {
     return;
   }
-  // _flag is used internally by initialize_compressed_heap
-  _flag = mtJavaHeap;
 
   if (heap_allocation_directory != nullptr) {
     _fd_for_heap = os::create_file_for_heap(heap_allocation_directory);
@@ -651,7 +644,7 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, size_t page_
       establish_noaccess_prefix();
     }
   } else {
-    initialize(size, alignment, page_size, nullptr, false, nmt_flag());
+    initialize(size, alignment, page_size, nullptr, false);
   }
 
   assert(markWord::encode_pointer_as_mark(_base).decode_pointer() == _base,
@@ -659,6 +652,9 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, size_t page_
   assert(markWord::encode_pointer_as_mark(&_base[size]).decode_pointer() == &_base[size],
          "area must be distinguishable from marks for mark-sweep");
 
+  if (base() != nullptr) {
+    MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
+  }
 
   if (_fd_for_heap != -1) {
     ::close(_fd_for_heap);
@@ -674,7 +670,8 @@ MemRegion ReservedHeapSpace::region() const {
 ReservedCodeSpace::ReservedCodeSpace(size_t r_size,
                                      size_t rs_align,
                                      size_t rs_page_size) : ReservedSpace() {
-  initialize(r_size, rs_align, rs_page_size, /*requested address*/ nullptr, /*executable*/ true, mtCode);
+  initialize(r_size, rs_align, rs_page_size, /*requested address*/ nullptr, /*executable*/ true);
+  MemTracker::record_virtual_memory_type((address)base(), mtCode);
 }
 
 // VirtualSpace
@@ -695,7 +692,6 @@ VirtualSpace::VirtualSpace() {
   _upper_alignment        = 0;
   _special                = false;
   _executable             = false;
-  _flag                   = mtNone;
 }
 
 
@@ -717,7 +713,6 @@ bool VirtualSpace::initialize_with_granularity(ReservedSpace rs, size_t committe
 
   _special = rs.special();
   _executable = rs.executable();
-  _flag = rs.nmt_flag();
 
   // When a VirtualSpace begins life at a large size, make all future expansion
   // and shrinking occur aligned to a granularity of large pages.  This avoids
@@ -776,7 +771,6 @@ void VirtualSpace::release() {
   _upper_alignment        = 0;
   _special                = false;
   _executable             = false;
-  _flag                   = mtNone;
 }
 
 
@@ -842,8 +836,8 @@ static void pretouch_expanded_memory(void* start, void* end) {
   os::pretouch_memory(start, end);
 }
 
-static bool commit_expanded(char* start, size_t size, size_t alignment, bool pre_touch, bool executable, MEMFLAGS flag) {
-  if (os::commit_memory(start, size, alignment, executable, flag)) {
+static bool commit_expanded(char* start, size_t size, size_t alignment, bool pre_touch, bool executable) {
+  if (os::commit_memory(start, size, alignment, executable)) {
     if (pre_touch || AlwaysPreTouch) {
       pretouch_expanded_memory(start, start + size);
     }
@@ -932,7 +926,7 @@ bool VirtualSpace::expand_by(size_t bytes, bool pre_touch) {
   // Commit regions
   if (lower_needs > 0) {
     assert(lower_high() + lower_needs <= lower_high_boundary(), "must not expand beyond region");
-    if (!commit_expanded(lower_high(), lower_needs, _lower_alignment, pre_touch, _executable, _flag)) {
+    if (!commit_expanded(lower_high(), lower_needs, _lower_alignment, pre_touch, _executable)) {
       return false;
     }
     _lower_high += lower_needs;
@@ -940,7 +934,7 @@ bool VirtualSpace::expand_by(size_t bytes, bool pre_touch) {
 
   if (middle_needs > 0) {
     assert(middle_high() + middle_needs <= middle_high_boundary(), "must not expand beyond region");
-    if (!commit_expanded(middle_high(), middle_needs, _middle_alignment, pre_touch, _executable, _flag)) {
+    if (!commit_expanded(middle_high(), middle_needs, _middle_alignment, pre_touch, _executable)) {
       return false;
     }
     _middle_high += middle_needs;
@@ -948,7 +942,7 @@ bool VirtualSpace::expand_by(size_t bytes, bool pre_touch) {
 
   if (upper_needs > 0) {
     assert(upper_high() + upper_needs <= upper_high_boundary(), "must not expand beyond region");
-    if (!commit_expanded(upper_high(), upper_needs, _upper_alignment, pre_touch, _executable, _flag)) {
+    if (!commit_expanded(upper_high(), upper_needs, _upper_alignment, pre_touch, _executable)) {
       return false;
     }
     _upper_high += upper_needs;
@@ -1020,7 +1014,7 @@ void VirtualSpace::shrink_by(size_t size) {
     assert(middle_high_boundary() <= aligned_upper_new_high &&
            aligned_upper_new_high + upper_needs <= upper_high_boundary(),
            "must not shrink beyond region");
-    if (!os::uncommit_memory(aligned_upper_new_high, upper_needs, _executable, _flag)) {
+    if (!os::uncommit_memory(aligned_upper_new_high, upper_needs, _executable)) {
       debug_only(warning("os::uncommit_memory failed"));
       return;
     } else {
@@ -1031,7 +1025,7 @@ void VirtualSpace::shrink_by(size_t size) {
     assert(lower_high_boundary() <= aligned_middle_new_high &&
            aligned_middle_new_high + middle_needs <= middle_high_boundary(),
            "must not shrink beyond region");
-    if (!os::uncommit_memory(aligned_middle_new_high, middle_needs, _executable, _flag)) {
+    if (!os::uncommit_memory(aligned_middle_new_high, middle_needs, _executable)) {
       debug_only(warning("os::uncommit_memory failed"));
       return;
     } else {
@@ -1042,7 +1036,7 @@ void VirtualSpace::shrink_by(size_t size) {
     assert(low_boundary() <= aligned_lower_new_high &&
            aligned_lower_new_high + lower_needs <= lower_high_boundary(),
            "must not shrink beyond region");
-    if (!os::uncommit_memory(aligned_lower_new_high, lower_needs, _executable, _flag)) {
+    if (!os::uncommit_memory(aligned_lower_new_high, lower_needs, _executable)) {
       debug_only(warning("os::uncommit_memory failed"));
       return;
     } else {
diff --git a/src/hotspot/share/memory/virtualspace.hpp b/src/hotspot/share/memory/virtualspace.hpp
index 357c4952c34..046ad0cf7a4 100644
--- a/src/hotspot/share/memory/virtualspace.hpp
+++ b/src/hotspot/share/memory/virtualspace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,20 +35,19 @@ class outputStream;
 class ReservedSpace {
   friend class VMStructs;
  protected:
-  char*    _base;
-  size_t   _size;
-  size_t   _noaccess_prefix;
-  size_t   _alignment;
-  size_t   _page_size;
-  int      _fd_for_heap;
-  bool     _special;
-  bool     _executable;
-  MEMFLAGS _flag;
+  char*  _base;
+  size_t _size;
+  size_t _noaccess_prefix;
+  size_t _alignment;
+  size_t _page_size;
+  bool   _special;
+  int    _fd_for_heap;
  private:
+  bool   _executable;
 
   // ReservedSpace
   ReservedSpace(char* base, size_t size, size_t alignment,
-                size_t page_size, bool special, bool executable, MEMFLAGS flag);
+                size_t page_size, bool special, bool executable);
  protected:
   // Helpers to clear and set members during initialization. Two members
   // require special treatment:
@@ -59,28 +58,25 @@ class ReservedSpace {
   //                       0 during initialization.
   void clear_members();
   void initialize_members(char* base, size_t size, size_t alignment,
-                          size_t page_size, bool special, bool executable, MEMFLAGS flag);
+                          size_t page_size, bool special, bool executable);
 
   void initialize(size_t size, size_t alignment, size_t page_size,
-                  char* requested_address, bool executable, MEMFLAGS flag);
+                  char* requested_address, bool executable);
 
   void reserve(size_t size, size_t alignment, size_t page_size,
                char* requested_address, bool executable);
  public:
-
-  MEMFLAGS nmt_flag() const { return _flag; }
-
   // Constructor
   ReservedSpace();
   // Initialize the reserved space with the given size. Depending on the size
   // a suitable page size and alignment will be used.
-  explicit ReservedSpace(size_t size, MEMFLAGS flag);
+  explicit ReservedSpace(size_t size);
   // Initialize the reserved space with the given size. The preferred_page_size
   // is used as the minimum page size/alignment. This may waste some space if
   // the given size is not aligned to that value, as the reservation will be
   // aligned up to the final alignment in this case.
-  ReservedSpace(size_t size, size_t preferred_page_size, MEMFLAGS flag);
-  ReservedSpace(size_t size, size_t alignment, size_t page_size, MEMFLAGS flag,
+  ReservedSpace(size_t size, size_t preferred_page_size);
+  ReservedSpace(size_t size, size_t alignment, size_t page_size,
                 char* requested_address = nullptr);
 
   // Accessors
@@ -116,7 +112,7 @@ class ReservedSpace {
 
   // Put a ReservedSpace over an existing range
   static ReservedSpace space_for_range(char* base, size_t size, size_t alignment,
-                                       size_t page_size, bool special, bool executable, MEMFLAGS flag);
+                                       size_t page_size, bool special, bool executable);
 };
 
 ReservedSpace ReservedSpace::first_part(size_t partition_size)
@@ -183,8 +179,6 @@ class VirtualSpace {
   // Need to know if commit should be executable.
   bool   _executable;
 
-  MEMFLAGS _flag;
-
   // MPSS Support
   // Each virtualspace region has a lower, middle, and upper region.
   // Each region has an end boundary and a high pointer which is the
diff --git a/src/hotspot/share/nmt/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp
index 83880fc6dcc..41a8f72b527 100644
--- a/src/hotspot/share/nmt/memTracker.hpp
+++ b/src/hotspot/share/nmt/memTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, 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
@@ -120,7 +120,7 @@ class MemTracker : AllStatic {
   //  (we do not do any reservations before that).
 
   static inline void record_virtual_memory_reserve(void* addr, size_t size, const NativeCallStack& stack,
-    MEMFLAGS flag) {
+    MEMFLAGS flag = mtNone) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
@@ -137,32 +137,32 @@ class MemTracker : AllStatic {
     }
   }
 
-  static inline void record_virtual_memory_uncommit(address addr, size_t size, MEMFLAGS flag) {
+  static inline void record_virtual_memory_uncommit(address addr, size_t size) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
-      VirtualMemoryTracker::remove_uncommitted_region((address)addr, size, flag);
+      VirtualMemoryTracker::remove_uncommitted_region((address)addr, size);
     }
   }
 
   static inline void record_virtual_memory_reserve_and_commit(void* addr, size_t size,
-    const NativeCallStack& stack, MEMFLAGS flag) {
+    const NativeCallStack& stack, MEMFLAGS flag = mtNone) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
       ThreadCritical tc;
       VirtualMemoryTracker::add_reserved_region((address)addr, size, stack, flag);
-      VirtualMemoryTracker::add_committed_region((address)addr, size, stack, flag);
+      VirtualMemoryTracker::add_committed_region((address)addr, size, stack);
     }
   }
 
   static inline void record_virtual_memory_commit(void* addr, size_t size,
-    const NativeCallStack& stack, MEMFLAGS flag) {
+    const NativeCallStack& stack) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
       ThreadCritical tc;
-      VirtualMemoryTracker::add_committed_region((address)addr, size, stack, flag);
+      VirtualMemoryTracker::add_committed_region((address)addr, size, stack);
     }
   }
 
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index a96718f59ff..06f9469f25e 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, 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
@@ -424,20 +424,20 @@ void VirtualMemoryTracker::set_reserved_region_type(address addr, MEMFLAGS flag)
   if (reserved_rgn != nullptr) {
     assert(reserved_rgn->contain_address(addr), "Containment");
     if (reserved_rgn->flag() != flag) {
-      assert(reserved_rgn->flag() == mtNone, "Overwrite memory type (should be mtNone, is: \"%s\") wants to change to \"%s\"",
-             NMTUtil::flag_to_name(reserved_rgn->flag()), NMTUtil::flag_to_name(flag));
+      assert(reserved_rgn->flag() == mtNone, "Overwrite memory type (should be mtNone, is: \"%s\")",
+             NMTUtil::flag_to_name(reserved_rgn->flag()));
       reserved_rgn->set_flag(flag);
     }
   }
 }
 
 bool VirtualMemoryTracker::add_committed_region(address addr, size_t size,
-  const NativeCallStack& stack, MEMFLAGS flag) {
+  const NativeCallStack& stack) {
   assert(addr != nullptr, "Invalid address");
   assert(size > 0, "Invalid size");
   assert(_reserved_regions != nullptr, "Sanity check");
 
-  ReservedMemoryRegion  rgn(addr, size, stack, flag);
+  ReservedMemoryRegion  rgn(addr, size);
   ReservedMemoryRegion* reserved_rgn = _reserved_regions->find(rgn);
 
   if (reserved_rgn == nullptr) {
@@ -452,7 +452,7 @@ bool VirtualMemoryTracker::add_committed_region(address addr, size_t size,
   return result;
 }
 
-bool VirtualMemoryTracker::remove_uncommitted_region(address addr, size_t size, MEMFLAGS flag) {
+bool VirtualMemoryTracker::remove_uncommitted_region(address addr, size_t size) {
   assert(addr != nullptr, "Invalid address");
   assert(size > 0, "Invalid size");
   assert(_reserved_regions != nullptr, "Sanity check");
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.hpp b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
index 6404f3fac4b..db49f108c84 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.hpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, 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
@@ -296,16 +296,13 @@ class ReservedMemoryRegion : public VirtualMemoryRegion {
 
  public:
   ReservedMemoryRegion(address base, size_t size, const NativeCallStack& stack,
-    MEMFLAGS flag) :
+    MEMFLAGS flag = mtNone) :
     VirtualMemoryRegion(base, size), _stack(stack), _flag(flag) { }
 
 
   ReservedMemoryRegion(address base, size_t size) :
     VirtualMemoryRegion(base, size), _stack(NativeCallStack::empty_stack()), _flag(mtNone) { }
 
-  ReservedMemoryRegion(address base, size_t size, MEMFLAGS flag) :
-    VirtualMemoryRegion(base, size), _stack(NativeCallStack::empty_stack()), _flag(flag) { }
-
   // Copy constructor
   ReservedMemoryRegion(const ReservedMemoryRegion& rr) :
     VirtualMemoryRegion(rr.base(), rr.size()) {
@@ -382,10 +379,10 @@ class VirtualMemoryTracker : AllStatic {
  public:
   static bool initialize(NMT_TrackingLevel level);
 
-  static bool add_reserved_region (address base_addr, size_t size, const NativeCallStack& stack, MEMFLAGS flag);
+  static bool add_reserved_region (address base_addr, size_t size, const NativeCallStack& stack, MEMFLAGS flag = mtNone);
 
-  static bool add_committed_region      (address base_addr, size_t size, const NativeCallStack& stack, MEMFLAGS flag);
-  static bool remove_uncommitted_region (address base_addr, size_t size, MEMFLAGS flag);
+  static bool add_committed_region      (address base_addr, size_t size, const NativeCallStack& stack);
+  static bool remove_uncommitted_region (address base_addr, size_t size);
   static bool remove_released_region    (address base_addr, size_t size);
   static bool remove_released_region    (ReservedMemoryRegion* rgn);
   static void set_reserved_region_type  (address addr, MEMFLAGS flag);
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
index 98be5dc9781..4a94eb9bde0 100644
--- a/src/hotspot/share/oops/compressedKlass.cpp
+++ b/src/hotspot/share/oops/compressedKlass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t
 
 char* CompressedKlassPointers::reserve_address_space_X(uintptr_t from, uintptr_t to, size_t size, size_t alignment, bool aslr) {
   alignment = MAX2(Metaspace::reserve_alignment(), alignment);
-  return os::attempt_reserve_memory_between((char*)from, (char*)to, size, alignment, aslr, mtMetaspace);
+  return os::attempt_reserve_memory_between((char*)from, (char*)to, size, alignment, aslr);
 }
 
 char* CompressedKlassPointers::reserve_address_space_for_unscaled_encoding(size_t size, bool aslr) {
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index e66daa1db9c..b6a4443a8c7 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 Red Hat, Inc.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2396,10 +2396,11 @@ static char* get_bad_address() {
   static char* bad_address = nullptr;
   if (bad_address == nullptr) {
     size_t size = os::vm_allocation_granularity();
-    bad_address = os::reserve_memory(size, !ExecMem, mtInternal);
+    bad_address = os::reserve_memory(size);
     if (bad_address != nullptr) {
       os::protect_memory(bad_address, size, os::MEM_PROT_READ,
                          /*is_committed*/false);
+      MemTracker::record_virtual_memory_type((void*)bad_address, mtInternal);
     }
   }
   return bad_address;
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 2a99e33eaf8..54fb62180bf 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -697,21 +697,27 @@ WB_END
 
 WB_ENTRY(jlong, WB_NMTReserveMemory(JNIEnv* env, jobject o, jlong size))
   jlong addr = 0;
-  addr = (jlong)(uintptr_t)os::reserve_memory(size, !ExecMem, mtTest);
+
+  addr = (jlong)(uintptr_t)os::reserve_memory(size);
+  MemTracker::record_virtual_memory_type((address)addr, mtTest);
+
   return addr;
 WB_END
 
 WB_ENTRY(jlong, WB_NMTAttemptReserveMemoryAt(JNIEnv* env, jobject o, jlong addr, jlong size))
-  addr = (jlong)(uintptr_t)os::attempt_reserve_memory_at((char*)(uintptr_t)addr, (size_t)size, !ExecMem, mtTest);
+  addr = (jlong)(uintptr_t)os::attempt_reserve_memory_at((char*)(uintptr_t)addr, (size_t)size);
+  MemTracker::record_virtual_memory_type((address)addr, mtTest);
+
   return addr;
 WB_END
 
 WB_ENTRY(void, WB_NMTCommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
-  os::commit_memory((char *)(uintptr_t)addr, size, !ExecMem, mtTest);
+  os::commit_memory((char *)(uintptr_t)addr, size, !ExecMem);
+  MemTracker::record_virtual_memory_type((address)(uintptr_t)addr, mtTest);
 WB_END
 
 WB_ENTRY(void, WB_NMTUncommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
-  os::uncommit_memory((char *)(uintptr_t)addr, size, !ExecMem, mtTest);
+  os::uncommit_memory((char *)(uintptr_t)addr, size);
 WB_END
 
 WB_ENTRY(void, WB_NMTReleaseMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
@@ -1480,7 +1486,7 @@ WB_ENTRY(void, WB_ReadReservedMemory(JNIEnv* env, jobject o))
   static char c;
   static volatile char* p;
 
-  p = os::reserve_memory(os::vm_allocation_granularity(), !ExecMem, mtTest);
+  p = os::reserve_memory(os::vm_allocation_granularity());
   if (p == nullptr) {
     THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(), "Failed to reserve memory");
   }
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 5197abf5b54..53c438cd208 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1821,7 +1821,7 @@ bool os::create_stack_guard_pages(char* addr, size_t bytes) {
 }
 
 char* os::reserve_memory(size_t bytes, bool executable, MEMFLAGS flags) {
-  char* result = pd_reserve_memory(bytes, executable, flags);
+  char* result = pd_reserve_memory(bytes, executable);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve(result, bytes, CALLER_PC, flags);
     log_debug(os, map)("Reserved " RANGEFMT, RANGEFMTARGS(result, bytes));
@@ -1832,7 +1832,7 @@ char* os::reserve_memory(size_t bytes, bool executable, MEMFLAGS flags) {
 }
 
 char* os::attempt_reserve_memory_at(char* addr, size_t bytes, bool executable, MEMFLAGS flag) {
-  char* result = SimulateFullAddressSpace ? nullptr : pd_attempt_reserve_memory_at(addr, bytes, executable, flag);
+  char* result = SimulateFullAddressSpace ? nullptr : pd_attempt_reserve_memory_at(addr, bytes, executable);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC, flag);
     log_debug(os, map)("Reserved " RANGEFMT, RANGEFMTARGS(result, bytes));
@@ -1879,7 +1879,7 @@ static void hemi_split(T* arr, unsigned num) {
 
 // Given an address range [min, max), attempts to reserve memory within this area, with the given alignment.
 // If randomize is true, the location will be randomized.
-char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomize, MEMFLAGS flag) {
+char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomize) {
 
   // Please keep the following constants in sync with the companion gtests:
 
@@ -2017,7 +2017,7 @@ char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, siz
     const unsigned candidate_offset = points[i];
     char* const candidate = lo_att + candidate_offset * alignment_adjusted;
     assert(candidate <= hi_att, "Invalid offset %u (" ARGSFMT ")", candidate_offset, ARGSFMTARGS);
-    result = SimulateFullAddressSpace ? nullptr : os::pd_attempt_reserve_memory_at(candidate, bytes, !ExecMem, flag);
+    result = SimulateFullAddressSpace ? nullptr : os::pd_attempt_reserve_memory_at(candidate, bytes, false);
     if (!result) {
       log_trace(os, map)("Failed to attach at " PTR_FORMAT, p2i(candidate));
     }
@@ -2034,7 +2034,7 @@ char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, siz
     assert(is_aligned(result, alignment), "alignment invalid (" ERRFMT ")", ERRFMTARGS);
     log_trace(os, map)(ERRFMT, ERRFMTARGS);
     log_debug(os, map)("successfully attached at " PTR_FORMAT, p2i(result));
-    MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC, flag);
+    MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
   } else {
     log_debug(os, map)("failed to attach anywhere in [" PTR_FORMAT "-" PTR_FORMAT ")", p2i(min), p2i(max));
   }
@@ -2050,11 +2050,11 @@ static void assert_nonempty_range(const char* addr, size_t bytes) {
          p2i(addr), p2i(addr) + bytes);
 }
 
-bool os::commit_memory(char* addr, size_t bytes, bool executable, MEMFLAGS flag) {
+bool os::commit_memory(char* addr, size_t bytes, bool executable) {
   assert_nonempty_range(addr, bytes);
   bool res = pd_commit_memory(addr, bytes, executable);
   if (res) {
-    MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC, flag);
+    MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC);
     log_debug(os, map)("Committed " RANGEFMT, RANGEFMTARGS(addr, bytes));
   } else {
     log_info(os, map)("Failed to commit " RANGEFMT, RANGEFMTARGS(addr, bytes));
@@ -2063,11 +2063,11 @@ bool os::commit_memory(char* addr, size_t bytes, bool executable, MEMFLAGS flag)
 }
 
 bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
-                              bool executable, MEMFLAGS flag) {
+                              bool executable) {
   assert_nonempty_range(addr, size);
   bool res = os::pd_commit_memory(addr, size, alignment_hint, executable);
   if (res) {
-    MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC, flag);
+    MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC);
     log_debug(os, map)("Committed " RANGEFMT, RANGEFMTARGS(addr, size));
   } else {
     log_info(os, map)("Failed to commit " RANGEFMT, RANGEFMTARGS(addr, size));
@@ -2076,27 +2076,27 @@ bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
 }
 
 void os::commit_memory_or_exit(char* addr, size_t bytes, bool executable,
-                               MEMFLAGS flag, const char* mesg) {
+                               const char* mesg) {
   assert_nonempty_range(addr, bytes);
   pd_commit_memory_or_exit(addr, bytes, executable, mesg);
-  MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC, flag);
+  MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC);
 }
 
 void os::commit_memory_or_exit(char* addr, size_t size, size_t alignment_hint,
-                               bool executable, MEMFLAGS flag, const char* mesg) {
+                               bool executable, const char* mesg) {
   assert_nonempty_range(addr, size);
   os::pd_commit_memory_or_exit(addr, size, alignment_hint, executable, mesg);
-  MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC, flag);
+  MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC);
 }
 
-bool os::uncommit_memory(char* addr, size_t bytes, bool executable, MEMFLAGS flag) {
+bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
   assert_nonempty_range(addr, bytes);
   bool res;
   if (MemTracker::enabled()) {
     ThreadCritical tc;
     res = pd_uncommit_memory(addr, bytes, executable);
     if (res) {
-      MemTracker::record_virtual_memory_uncommit((address)addr, bytes, flag);
+      MemTracker::record_virtual_memory_uncommit((address)addr, bytes);
     }
   } else {
     res = pd_uncommit_memory(addr, bytes, executable);
@@ -2180,7 +2180,7 @@ char* os::map_memory_to_file(size_t bytes, int file_desc, MEMFLAGS flag) {
 }
 
 char* os::attempt_map_memory_to_file_at(char* addr, size_t bytes, int file_desc, MEMFLAGS flag) {
-  char* result = pd_attempt_map_memory_to_file_at(addr, bytes, file_desc, flag);
+  char* result = pd_attempt_map_memory_to_file_at(addr, bytes, file_desc);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve_and_commit((address)result, bytes, CALLER_PC, flag);
   }
@@ -2188,8 +2188,8 @@ char* os::attempt_map_memory_to_file_at(char* addr, size_t bytes, int file_desc,
 }
 
 char* os::map_memory(int fd, const char* file_name, size_t file_offset,
-                     char *addr, size_t bytes, bool read_only,
-                     bool allow_exec, MEMFLAGS flags) {
+                           char *addr, size_t bytes, bool read_only,
+                           bool allow_exec, MEMFLAGS flags) {
   char* result = pd_map_memory(fd, file_name, file_offset, addr, bytes, read_only, allow_exec);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve_and_commit((address)result, bytes, CALLER_PC, flags);
@@ -2211,8 +2211,8 @@ bool os::unmap_memory(char *addr, size_t bytes) {
   return result;
 }
 
-void os::free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag) {
-  pd_free_memory(addr, bytes, alignment_hint, flag);
+void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {
+  pd_free_memory(addr, bytes, alignment_hint);
 }
 
 void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
@@ -2220,14 +2220,14 @@ void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
 }
 
 char* os::reserve_memory_special(size_t size, size_t alignment, size_t page_size,
-                                 char* addr, bool executable, MEMFLAGS flag) {
+                                 char* addr, bool executable) {
 
   assert(is_aligned(addr, alignment), "Unaligned request address");
 
-  char* result = pd_reserve_memory_special(size, alignment, page_size, addr, executable, flag);
+  char* result = pd_reserve_memory_special(size, alignment, page_size, addr, executable);
   if (result != nullptr) {
     // The memory is committed
-    MemTracker::record_virtual_memory_reserve_and_commit((address)result, size, CALLER_PC, flag);
+    MemTracker::record_virtual_memory_reserve_and_commit((address)result, size, CALLER_PC);
     log_debug(os, map)("Reserved and committed " RANGEFMT, RANGEFMTARGS(result, size));
   } else {
     log_info(os, map)("Reserve and commit failed (%zu bytes)", size);
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index 29ef6d5d29d..4bfcd9c2da5 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -208,9 +208,9 @@ class os: AllStatic {
   // low enough to leave most of the valuable low-4gb address space open.
   static constexpr size_t _vm_min_address_default = 16 * M;
 
-  static char*  pd_reserve_memory(size_t bytes, bool executable, MEMFLAGS flag);
+  static char*  pd_reserve_memory(size_t bytes, bool executable);
 
-  static char*  pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool executable, MEMFLAGS flag);
+  static char*  pd_attempt_reserve_memory_at(char* addr, size_t bytes, bool executable);
 
   static bool   pd_commit_memory(char* addr, size_t bytes, bool executable);
   static bool   pd_commit_memory(char* addr, size_t size, size_t alignment_hint,
@@ -225,13 +225,13 @@ class os: AllStatic {
   static bool   pd_uncommit_memory(char* addr, size_t bytes, bool executable);
   static bool   pd_release_memory(char* addr, size_t bytes);
 
-  static char*  pd_attempt_map_memory_to_file_at(char* addr, size_t bytes, int file_desc, MEMFLAGS flag);
+  static char*  pd_attempt_map_memory_to_file_at(char* addr, size_t bytes, int file_desc);
 
   static char*  pd_map_memory(int fd, const char* file_name, size_t file_offset,
-                              char *addr, size_t bytes, bool read_only = false,
-                              bool allow_exec = false);
+                           char *addr, size_t bytes, bool read_only = false,
+                           bool allow_exec = false);
   static bool   pd_unmap_memory(char *addr, size_t bytes);
-  static void   pd_free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag);
+  static void   pd_free_memory(char *addr, size_t bytes, size_t alignment_hint);
   static void   pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint);
 
   // Returns 0 if pretouch is done via platform dependent method, or otherwise
@@ -239,7 +239,8 @@ class os: AllStatic {
   static size_t pd_pretouch_memory(void* first, void* last, size_t page_size);
 
   static char*  pd_reserve_memory_special(size_t size, size_t alignment, size_t page_size,
-                                          char* addr, bool executable, MEMFLAGS flag);
+
+                                          char* addr, bool executable);
   static bool   pd_release_memory_special(char* addr, size_t bytes);
 
   static size_t page_size_for_region(size_t region_size, size_t min_pages, bool must_be_aligned);
@@ -447,30 +448,30 @@ class os: AllStatic {
   inline static size_t cds_core_region_alignment();
 
   // Reserves virtual memory.
-  static char*  reserve_memory(size_t bytes, bool executable, MEMFLAGS flags);
+  static char*  reserve_memory(size_t bytes, bool executable = false, MEMFLAGS flags = mtNone);
 
   // Reserves virtual memory that starts at an address that is aligned to 'alignment'.
-  static char*  reserve_memory_aligned(size_t size, size_t alignment, bool executable, MEMFLAGS flag);
+  static char*  reserve_memory_aligned(size_t size, size_t alignment, bool executable = false);
 
   // Attempts to reserve the virtual memory at [addr, addr + bytes).
   // Does not overwrite existing mappings.
-  static char*  attempt_reserve_memory_at(char* addr, size_t bytes, bool executable, MEMFLAGS flag);
+  static char*  attempt_reserve_memory_at(char* addr, size_t bytes, bool executable = false, MEMFLAGS flag = mtNone);
 
   // Given an address range [min, max), attempts to reserve memory within this area, with the given alignment.
   // If randomize is true, the location will be randomized.
-  static char* attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomize, MEMFLAGS flag);
+  static char* attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomize);
 
-  static bool   commit_memory(char* addr, size_t bytes, bool executable, MEMFLAGS flag);
+  static bool   commit_memory(char* addr, size_t bytes, bool executable);
   static bool   commit_memory(char* addr, size_t size, size_t alignment_hint,
-                              bool executable, MEMFLAGS flag);
+                              bool executable);
   // Same as commit_memory() that either succeeds or calls
   // vm_exit_out_of_memory() with the specified mesg.
   static void   commit_memory_or_exit(char* addr, size_t bytes,
-                                      bool executable, MEMFLAGS flag, const char* mesg);
+                                      bool executable, const char* mesg);
   static void   commit_memory_or_exit(char* addr, size_t size,
                                       size_t alignment_hint,
-                                      bool executable, MEMFLAGS flag, const char* mesg);
-  static bool   uncommit_memory(char* addr, size_t bytes, bool executable, MEMFLAGS flag);
+                                      bool executable, const char* mesg);
+  static bool   uncommit_memory(char* addr, size_t bytes, bool executable = false);
   static bool   release_memory(char* addr, size_t bytes);
 
   // Does the platform support trimming the native heap?
@@ -506,18 +507,18 @@ class os: AllStatic {
   static int create_file_for_heap(const char* dir);
   // Map memory to the file referred by fd. This function is slightly different from map_memory()
   // and is added to be used for implementation of -XX:AllocateHeapAt
-  static char* map_memory_to_file(size_t size, int fd, MEMFLAGS flag);
-  static char* map_memory_to_file_aligned(size_t size, size_t alignment, int fd, MEMFLAGS flag);
+  static char* map_memory_to_file(size_t size, int fd, MEMFLAGS flag = mtNone);
+  static char* map_memory_to_file_aligned(size_t size, size_t alignment, int fd, MEMFLAGS flag = mtNone);
   static char* map_memory_to_file(char* base, size_t size, int fd);
-  static char* attempt_map_memory_to_file_at(char* base, size_t size, int fd, MEMFLAGS flag);
+  static char* attempt_map_memory_to_file_at(char* base, size_t size, int fd, MEMFLAGS flag = mtNone);
   // Replace existing reserved memory with file mapping
   static char* replace_existing_mapping_with_file_mapping(char* base, size_t size, int fd);
 
   static char*  map_memory(int fd, const char* file_name, size_t file_offset,
-                           char *addr, size_t bytes, bool read_only,
-                           bool allow_exec, MEMFLAGS flag);
+                           char *addr, size_t bytes, bool read_only = false,
+                           bool allow_exec = false, MEMFLAGS flags = mtNone);
   static bool   unmap_memory(char *addr, size_t bytes);
-  static void   free_memory(char *addr, size_t bytes, size_t alignment_hint, MEMFLAGS flag);
+  static void   free_memory(char *addr, size_t bytes, size_t alignment_hint);
   static void   realign_memory(char *addr, size_t bytes, size_t alignment_hint);
 
   // NUMA-specific interface
@@ -539,7 +540,7 @@ class os: AllStatic {
   static char*  non_memory_address_word();
   // reserve, commit and pin the entire memory region
   static char*  reserve_memory_special(size_t size, size_t alignment, size_t page_size,
-                                       char* addr, bool executable, MEMFLAGS flag);
+                                       char* addr, bool executable);
   static bool   release_memory_special(char* addr, size_t bytes);
   static void   large_page_init();
   static size_t large_page_size();
diff --git a/src/hotspot/share/runtime/safepointMechanism.cpp b/src/hotspot/share/runtime/safepointMechanism.cpp
index dcad8acb215..624583db3d1 100644
--- a/src/hotspot/share/runtime/safepointMechanism.cpp
+++ b/src/hotspot/share/runtime/safepointMechanism.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,8 +58,9 @@ void SafepointMechanism::default_initialize() {
     // Polling page
     const size_t page_size = os::vm_page_size();
     const size_t allocation_size = 2 * page_size;
-    char* polling_page = os::reserve_memory(allocation_size, !ExecMem, mtSafepoint);
-    os::commit_memory_or_exit(polling_page, allocation_size, !ExecMem, mtSafepoint, "Unable to commit Safepoint polling page");
+    char* polling_page = os::reserve_memory(allocation_size);
+    os::commit_memory_or_exit(polling_page, allocation_size, false, "Unable to commit Safepoint polling page");
+    MemTracker::record_virtual_memory_type((address)polling_page, mtSafepoint);
 
     char* bad_page  = polling_page;
     char* good_page = polling_page + page_size;
diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp
index e12e55e4984..9f839fc1a13 100644
--- a/src/hotspot/share/utilities/debug.cpp
+++ b/src/hotspot/share/utilities/debug.cpp
@@ -709,9 +709,10 @@ struct TestMultipleStaticAssertFormsInClassScope {
 static ucontext_t g_stored_assertion_context;
 
 void initialize_assert_poison() {
-  char* page = os::reserve_memory(os::vm_page_size(), !ExecMem, mtInternal);
+  char* page = os::reserve_memory(os::vm_page_size());
   if (page) {
-    if (os::commit_memory(page, os::vm_page_size(), !ExecMem, mtInternal) &&
+    MemTracker::record_virtual_memory_type(page, mtInternal);
+    if (os::commit_memory(page, os::vm_page_size(), false) &&
         os::protect_memory(page, os::vm_page_size(), os::MEM_PROT_NONE)) {
       g_assert_poison = page;
     }
diff --git a/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp b/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp
index 6dfde68678a..4639f1c9694 100644
--- a/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp
+++ b/test/hotspot/gtest/gc/g1/test_freeRegionList.cpp
@@ -50,7 +50,7 @@ TEST_OTHER_VM(FreeRegionList, length) {
   // the BOT.
   size_t bot_size = G1BlockOffsetTable::compute_size(heap.word_size());
   HeapWord* bot_data = NEW_C_HEAP_ARRAY(HeapWord, bot_size, mtGC);
-  ReservedSpace bot_rs(G1BlockOffsetTable::compute_size(heap.word_size()), mtTest);
+  ReservedSpace bot_rs(G1BlockOffsetTable::compute_size(heap.word_size()));
   G1RegionToSpaceMapper* bot_storage =
     G1RegionToSpaceMapper::create_mapper(bot_rs,
                                          bot_rs.size(),
diff --git a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
index 2285f58d55c..8ce98827ab2 100644
--- a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
+++ b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
@@ -81,7 +81,7 @@ TEST_VM(G1RegionToSpaceMapper, smallStressAdjacent) {
   size_t size = G1BlockOffsetTable::compute_size(num_regions * region_size / HeapWordSize);
   size_t page_size = os::vm_page_size();
 
-  ReservedSpace rs(size, os::vm_page_size(), mtTest);
+  ReservedSpace rs(size, os::vm_page_size());
 
   G1RegionToSpaceMapper* small_mapper  =
     G1RegionToSpaceMapper::create_mapper(rs,
@@ -105,7 +105,7 @@ TEST_VM(G1RegionToSpaceMapper, largeStressAdjacent) {
   size_t size = G1BlockOffsetTable::compute_size(num_regions * region_size / HeapWordSize);
   size_t page_size = os::vm_page_size();
 
-  ReservedSpace rs(size, page_size, mtTest);
+  ReservedSpace rs(size, page_size);
 
   G1RegionToSpaceMapper* large_mapper  =
     G1RegionToSpaceMapper::create_mapper(rs,
diff --git a/test/hotspot/gtest/gc/z/test_zForwarding.cpp b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
index 570e402ccd7..622c6d9d8f4 100644
--- a/test/hotspot/gtest/gc/z/test_zForwarding.cpp
+++ b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, 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
@@ -56,7 +56,7 @@ public:
     const size_t increment = MAX2(align_up(unused / 100, ZGranuleSize), ZGranuleSize);
 
     for (uintptr_t start = 0; start + ZGranuleSize <= ZAddressOffsetMax; start += increment) {
-      char* const reserved = os::attempt_reserve_memory_at((char*)ZAddressHeapBase + start, ZGranuleSize, !ExecMem /* executable */, mtTest);
+      char* const reserved = os::attempt_reserve_memory_at((char*)ZAddressHeapBase + start, ZGranuleSize, false /* executable */);
       if (reserved != nullptr) {
         // Success
         return reserved;
@@ -100,7 +100,7 @@ public:
 
     _reserved = reserved;
 
-    os::commit_memory((char*)_reserved, ZGranuleSize, !ExecMem /* executable */, mtTest);
+    os::commit_memory((char*)_reserved, ZGranuleSize, false /* executable */);
 
     _page_offset = uintptr_t(_reserved) - ZAddressHeapBase;
   }
@@ -111,7 +111,7 @@ public:
     ZGeneration::_old = _old_old;
     ZGeneration::_young = _old_young;
     if (_reserved != nullptr) {
-      os::uncommit_memory((char*)_reserved, ZGranuleSize, !ExecMem, mtTest);
+      os::uncommit_memory((char*)_reserved, ZGranuleSize, false /* executable */);
       os::release_memory((char*)_reserved, ZGranuleSize);
     }
   }
diff --git a/test/hotspot/gtest/memory/test_virtualspace.cpp b/test/hotspot/gtest/memory/test_virtualspace.cpp
index a20f85ba6c5..2240f0f4cb3 100644
--- a/test/hotspot/gtest/memory/test_virtualspace.cpp
+++ b/test/hotspot/gtest/memory/test_virtualspace.cpp
@@ -64,7 +64,7 @@ namespace {
   static void test_reserved_size(size_t size) {
     ASSERT_PRED2(is_size_aligned, size, os::vm_allocation_granularity());
 
-    ReservedSpace rs(size, mtTest);
+    ReservedSpace rs(size);
     MemoryReleaser releaser(&rs);
 
     EXPECT_TRUE(rs.base() != nullptr) << "rs.special: " << rs.special();
@@ -78,7 +78,7 @@ namespace {
   static void test_reserved_size_alignment(size_t size, size_t alignment) {
     ASSERT_PRED2(is_size_aligned, size, alignment) << "Incorrect input parameters";
     size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
-    ReservedSpace rs(size, alignment, page_size, mtTest, (char *) nullptr);
+    ReservedSpace rs(size, alignment, page_size, (char *) nullptr);
 
     ASSERT_TRUE(rs.base() != nullptr) << "rs.special = " << rs.special();
     ASSERT_EQ(size, rs.size()) << "rs.special = " << rs.special();
@@ -106,7 +106,7 @@ namespace {
     bool large = maybe_large && UseLargePages && size >= os::large_page_size();
     size_t page_size = large ? os::large_page_size() : os::vm_page_size();
 
-    ReservedSpace rs(size, alignment, page_size, mtTest);
+    ReservedSpace rs(size, alignment, page_size);
     MemoryReleaser releaser(&rs);
 
     EXPECT_TRUE(rs.base() != nullptr) << "rs.special: " << rs.special();
@@ -215,13 +215,12 @@ namespace {
       default:
       case Default:
       case Reserve:
-        return ReservedSpace(reserve_size_aligned, mtTest);
+        return ReservedSpace(reserve_size_aligned);
       case Disable:
       case Commit:
         return ReservedSpace(reserve_size_aligned,
                              os::vm_allocation_granularity(),
-                             os::vm_page_size(),
-                             mtTest);
+                             os::vm_page_size());
     }
   }
 
@@ -300,7 +299,7 @@ TEST_VM(VirtualSpace, actual_committed_space_one_large_page) {
 
   size_t large_page_size = os::large_page_size();
 
-  ReservedSpace reserved(large_page_size, large_page_size, large_page_size, mtTest);
+  ReservedSpace reserved(large_page_size, large_page_size, large_page_size);
   ReservedSpaceReleaser releaser(&reserved);
   ASSERT_TRUE(reserved.is_reserved());
 
@@ -370,7 +369,6 @@ class TestReservedSpace : AllStatic {
     ReservedSpace rs(size,          // size
                      alignment,     // alignment
                      page_size, // page size
-                     mtTest, // NMT MEM Flag
                      (char *)nullptr); // requested_address
 
     EXPECT_TRUE(rs.base() != nullptr);
@@ -389,7 +387,7 @@ class TestReservedSpace : AllStatic {
   static void test_reserved_space2(size_t size) {
     ASSERT_TRUE(is_aligned(size, os::vm_allocation_granularity())) << "Must be at least AG aligned";
 
-    ReservedSpace rs(size, mtTest);
+    ReservedSpace rs(size);
 
     EXPECT_TRUE(rs.base() != nullptr);
     EXPECT_EQ(rs.size(), size) <<  "rs.size: " << rs.size();
@@ -414,7 +412,7 @@ class TestReservedSpace : AllStatic {
     bool large = maybe_large && UseLargePages && size >= os::large_page_size();
     size_t page_size = large ? os::large_page_size() : os::vm_page_size();
 
-    ReservedSpace rs(size, alignment, page_size, mtTest);
+    ReservedSpace rs(size, alignment, page_size);
 
     EXPECT_TRUE(rs.base() != nullptr);
     EXPECT_EQ(rs.size(), size) <<  "rs.size: " << rs.size();
@@ -518,12 +516,12 @@ class TestVirtualSpace : AllStatic {
     default:
     case Default:
     case Reserve:
-      return ReservedSpace(reserve_size_aligned, mtTest);
+      return ReservedSpace(reserve_size_aligned);
     case Disable:
     case Commit:
       return ReservedSpace(reserve_size_aligned,
                            os::vm_allocation_granularity(),
-                           os::vm_page_size(), mtTest);
+                           os::vm_page_size());
     }
   }
 
@@ -578,7 +576,7 @@ class TestVirtualSpace : AllStatic {
 
     size_t large_page_size = os::large_page_size();
 
-    ReservedSpace reserved(large_page_size, large_page_size, large_page_size, mtTest);
+    ReservedSpace reserved(large_page_size, large_page_size, large_page_size);
 
     EXPECT_TRUE(reserved.is_reserved());
 
diff --git a/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp b/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
index 359c492bb6a..87ad2a798e0 100644
--- a/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
@@ -114,7 +114,7 @@ TEST_VM(NMT, DISABLED_location_printing_cheap_dead_7) { test_for_dead_c_heap_blo
 #endif
 
 static void test_for_mmap(size_t sz, ssize_t offset) {
-  char* addr = os::reserve_memory(sz, !ExecMem, mtTest);
+  char* addr = os::reserve_memory(sz, false, mtTest);
   if (MemTracker::enabled()) {
     test_pointer(addr + offset, true, "in mmap'd memory region");
   } else {
diff --git a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
index 4036c798079..d4959cfa008 100644
--- a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
+++ b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
@@ -93,7 +93,7 @@ public:
     const size_t page_sz = os::vm_page_size();
     const size_t size = num_pages * page_sz;
     char* base = os::reserve_memory(size, !ExecMem, mtThreadStack);
-    bool result = os::commit_memory(base, size, !ExecMem, mtThreadStack);
+    bool result = os::commit_memory(base, size, !ExecMem);
     size_t index;
     ASSERT_NE(base, (char*)nullptr);
     for (index = 0; index < touch_pages; index ++) {
@@ -132,7 +132,7 @@ public:
     }
 
     // Cleanup
-    os::free_memory(base, size, page_sz, mtThreadStack);
+    os::free_memory(base, size, page_sz);
     VirtualMemoryTracker::remove_released_region((address)base, size);
 
     rmr = VirtualMemoryTracker::_reserved_regions->find(ReservedMemoryRegion((address)base, size));
@@ -162,7 +162,7 @@ public:
     const size_t size = num_pages * page_sz;
     char* base = os::reserve_memory(size, !ExecMem, mtTest);
     ASSERT_NE(base, (char*)nullptr);
-    result = os::commit_memory(base, size, !ExecMem, mtTest);
+    result = os::commit_memory(base, size, !ExecMem);
 
     ASSERT_TRUE(result);
     // touch all pages
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 3b7267b5790..55d30349ee5 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -367,7 +367,7 @@ TEST_VM(os, jio_snprintf) {
 static inline bool can_reserve_executable_memory(void) {
   bool executable = true;
   size_t len = 128;
-  char* p = os::reserve_memory(len, executable, mtTest);
+  char* p = os::reserve_memory(len, executable);
   bool exec_supported = (p != nullptr);
   if (exec_supported) {
     os::release_memory(p, len);
@@ -405,7 +405,7 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
   for (int tries = 0; tries < 256 && p == nullptr; tries ++) {
     size_t total_range_len = num_stripes * stripe_len;
     // Reserve a large contiguous area to get the address space...
-    p = (address)os::reserve_memory(total_range_len, !ExecMem, mtTest);
+    p = (address)os::reserve_memory(total_range_len);
     EXPECT_NE(p, (address)nullptr);
     // .. release it...
     EXPECT_TRUE(os::release_memory((char*)p, total_range_len));
@@ -419,14 +419,14 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
 #else
       const bool executable = stripe % 2 == 0;
 #endif
-      q = (address)os::attempt_reserve_memory_at((char*)q, stripe_len, executable, mtTest);
+      q = (address)os::attempt_reserve_memory_at((char*)q, stripe_len, executable);
       if (q == nullptr) {
         // Someone grabbed that area concurrently. Cleanup, then retry.
         tty->print_cr("reserve_multiple: retry (%d)...", stripe);
         carefully_release_multiple(p, stripe, stripe_len);
         p = nullptr;
       } else {
-        EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, executable, mtTest));
+        EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, executable));
       }
     }
   }
@@ -439,12 +439,12 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
 static address reserve_one_commit_multiple(int num_stripes, size_t stripe_len) {
   assert(is_aligned(stripe_len, os::vm_allocation_granularity()), "Sanity");
   size_t total_range_len = num_stripes * stripe_len;
-  address p = (address)os::reserve_memory(total_range_len, !ExecMem, mtTest);
+  address p = (address)os::reserve_memory(total_range_len);
   EXPECT_NE(p, (address)nullptr);
   for (int stripe = 0; stripe < num_stripes; stripe++) {
     address q = p + (stripe * stripe_len);
     if (stripe % 2 == 0) {
-      EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, !ExecMem, mtTest));
+      EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, false));
     }
   }
   return p;
@@ -506,7 +506,7 @@ TEST_VM(os, release_multi_mappings) {
   PRINT_MAPPINGS("B");
 
   // ...re-reserve the middle stripes. This should work unless release silently failed.
-  address p2 = (address)os::attempt_reserve_memory_at((char*)p_middle_stripes, middle_stripe_len, !ExecMem, mtTest);
+  address p2 = (address)os::attempt_reserve_memory_at((char*)p_middle_stripes, middle_stripe_len);
 
   ASSERT_EQ(p2, p_middle_stripes);
 
@@ -529,7 +529,7 @@ TEST_VM_ASSERT_MSG(os, release_bad_ranges, ".*bad release") {
 #else
 TEST_VM(os, release_bad_ranges) {
 #endif
-  char* p = os::reserve_memory(4 * M, !ExecMem, mtTest);
+  char* p = os::reserve_memory(4 * M);
   ASSERT_NE(p, (char*)nullptr);
   // Release part of range
   ASSERT_FALSE(os::release_memory(p, M));
@@ -564,7 +564,7 @@ TEST_VM(os, release_one_mapping_multi_commits) {
 
   // // make things even more difficult by trying to reserve at the border of the region
   address border = p + num_stripes * stripe_len;
-  address p2 = (address)os::attempt_reserve_memory_at((char*)border, stripe_len, !ExecMem, mtTest);
+  address p2 = (address)os::attempt_reserve_memory_at((char*)border, stripe_len);
   PRINT_MAPPINGS("B");
 
   ASSERT_TRUE(p2 == nullptr || p2 == border);
@@ -605,9 +605,9 @@ TEST_VM(os, show_mappings_small_range) {
 TEST_VM(os, show_mappings_full_range) {
   // Reserve a small range and fill it with a marker string, should show up
   // on implementations displaying range snippets
-  char* p = os::reserve_memory(1 * M, !ExecMem, mtInternal);
+  char* p = os::reserve_memory(1 * M, false, mtInternal);
   if (p != nullptr) {
-    if (os::commit_memory(p, 1 * M, !ExecMem, mtTest)) {
+    if (os::commit_memory(p, 1 * M, false)) {
       strcpy(p, "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
     }
   }
@@ -629,7 +629,7 @@ TEST_VM(os, find_mapping_simple) {
 
   // A simple allocation
   {
-    address p = (address)os::reserve_memory(total_range_len, !ExecMem, mtTest);
+    address p = (address)os::reserve_memory(total_range_len);
     ASSERT_NE(p, (address)nullptr);
     PRINT_MAPPINGS("A");
     for (size_t offset = 0; offset < total_range_len; offset += 4711) {
@@ -934,9 +934,9 @@ TEST_VM(os, open_O_CLOEXEC) {
 }
 
 TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_smallpages) {
-  char* p1 = os::reserve_memory(M, !ExecMem, mtTest);
+  char* p1 = os::reserve_memory(M, false, mtTest);
   ASSERT_NE(p1, nullptr);
-  char* p2 = os::attempt_reserve_memory_at(p1, M, !ExecMem, mtTest);
+  char* p2 = os::attempt_reserve_memory_at(p1, M);
   ASSERT_EQ(p2, nullptr); // should have failed
   os::release_memory(p1, M);
 }
@@ -944,9 +944,9 @@ TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_smallpages) {
 TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_largepages) {
   if (UseLargePages && !os::can_commit_large_page_memory()) { // aka special
     const size_t lpsz = os::large_page_size();
-    char* p1 = os::reserve_memory_aligned(lpsz, lpsz, !ExecMem, mtTest);
+    char* p1 = os::reserve_memory_aligned(lpsz, lpsz, false);
     ASSERT_NE(p1, nullptr);
-    char* p2 = os::reserve_memory_special(lpsz, lpsz, lpsz, p1, !ExecMem, mtTest);
+    char* p2 = os::reserve_memory_special(lpsz, lpsz, lpsz, p1, false);
     ASSERT_EQ(p2, nullptr); // should have failed
     os::release_memory(p1, M);
   } else {
@@ -958,9 +958,9 @@ TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_largepages) {
 // On Aix, we should fail attach attempts not aligned to segment boundaries (256m)
 TEST_VM(os, aix_reserve_at_non_shmlba_aligned_address) {
   if (Use64KPages) {
-    char* p = os::attempt_reserve_memory_at((char*)0x1f00000, M, !ExecMem, mtTest);
+    char* p = os::attempt_reserve_memory_at((char*)0x1f00000, M);
     ASSERT_EQ(p, nullptr); // should have failed
-    p = os::attempt_reserve_memory_at((char*)((64 * G) + M), M, !ExecMem, mtTest);
+    p = os::attempt_reserve_memory_at((char*)((64 * G) + M), M);
     ASSERT_EQ(p, nullptr); // should have failed
   }
 }
diff --git a/test/hotspot/gtest/runtime/test_os_linux.cpp b/test/hotspot/gtest/runtime/test_os_linux.cpp
index 582a516465c..69c3d991b2a 100644
--- a/test/hotspot/gtest/runtime/test_os_linux.cpp
+++ b/test/hotspot/gtest/runtime/test_os_linux.cpp
@@ -54,7 +54,7 @@ namespace {
     const size_t _size;
    public:
     static char* reserve_memory_special_huge_tlbfs(size_t bytes, size_t alignment, size_t page_size, char* req_addr, bool exec) {
-      return os::reserve_memory_special(bytes, alignment, page_size, req_addr, exec, mtTest);
+      return os::reserve_memory_special(bytes, alignment, page_size, req_addr, exec);
     }
     HugeTlbfsMemory(char* const ptr, size_t size) : _ptr(ptr), _size(size) { }
     ~HugeTlbfsMemory() {
@@ -224,7 +224,7 @@ class TestReserveMemorySpecial : AllStatic {
     if (!using_explicit_hugepages()) {
       return;
     }
-    char* addr = os::reserve_memory_special(size, alignment, page_size, nullptr, !ExecMem, mtTest);
+    char* addr = os::reserve_memory_special(size, alignment, page_size, nullptr, false);
     if (addr != nullptr) {
       small_page_write(addr, size);
       os::release_memory_special(addr, size);
@@ -281,7 +281,7 @@ class TestReserveMemorySpecial : AllStatic {
     for (int i = 0; i < num_sizes; i++) {
       const size_t size = sizes[i];
       for (size_t alignment = ag; is_aligned(size, alignment); alignment *= 2) {
-        char* p = os::reserve_memory_special(size, alignment, lp, nullptr, !ExecMem, mtTest);
+        char* p = os::reserve_memory_special(size, alignment, lp, nullptr, false);
         if (p != nullptr) {
           EXPECT_TRUE(is_aligned(p, alignment));
           small_page_write(p, size);
@@ -296,7 +296,7 @@ class TestReserveMemorySpecial : AllStatic {
       for (size_t alignment = ag; is_aligned(size, alignment); alignment *= 2) {
         // req_addr must be at least large page aligned.
         char* const req_addr = align_up(mapping1, MAX2(alignment, lp));
-        char* p = os::reserve_memory_special(size, alignment, lp, req_addr, !ExecMem, mtTest);
+        char* p = os::reserve_memory_special(size, alignment, lp, req_addr, false);
         if (p != nullptr) {
           EXPECT_EQ(p, req_addr);
           small_page_write(p, size);
@@ -311,7 +311,7 @@ class TestReserveMemorySpecial : AllStatic {
       for (size_t alignment = ag; is_aligned(size, alignment); alignment *= 2) {
         // req_addr must be at least large page aligned.
         char* const req_addr = align_up(mapping2, MAX2(alignment, lp));
-        char* p = os::reserve_memory_special(size, alignment, lp, req_addr, !ExecMem, mtTest);
+        char* p = os::reserve_memory_special(size, alignment, lp, req_addr, false);
         // as the area around req_addr contains already existing mappings, the API should always
         // return nullptr (as per contract, it cannot return another address)
         EXPECT_TRUE(p == nullptr);
@@ -355,9 +355,9 @@ TEST_VM(os_linux, pretouch_thp_and_use_concurrent) {
   const size_t size = 1 * G;
   const bool useThp = UseTransparentHugePages;
   UseTransparentHugePages = true;
-  char* const heap = os::reserve_memory(size, !ExecMem, mtInternal);
+  char* const heap = os::reserve_memory(size, false, mtInternal);
   EXPECT_NE(heap, nullptr);
-  EXPECT_TRUE(os::commit_memory(heap, size, !ExecMem, mtInternal));
+  EXPECT_TRUE(os::commit_memory(heap, size, false));
 
   {
     auto pretouch = [heap, size](Thread*, int) {
@@ -379,7 +379,7 @@ TEST_VM(os_linux, pretouch_thp_and_use_concurrent) {
   for (int i = 0; i < 1000; i++)
     EXPECT_EQ(*iptr++, i);
 
-  EXPECT_TRUE(os::uncommit_memory(heap, size, !ExecMem, mtInternal));
+  EXPECT_TRUE(os::uncommit_memory(heap, size, false));
   EXPECT_TRUE(os::release_memory(heap, size));
   UseTransparentHugePages = useThp;
 }
diff --git a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
index 1e052ddf65e..aad6acc095a 100644
--- a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
+++ b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
@@ -66,7 +66,7 @@ static size_t allocation_granularity() {
                  << " bytes: " << bytes << " alignment: " << alignment << " randomized: " << randomized
 
 static char* call_attempt_reserve_memory_between(char* min, char* max, size_t bytes, size_t alignment, bool randomized) {
-  char* const  addr = os::attempt_reserve_memory_between(min, max, bytes, alignment, randomized, mtTest);
+  char* const  addr = os::attempt_reserve_memory_between(min, max, bytes, alignment, randomized);
   if (addr != nullptr) {
     EXPECT_TRUE(is_aligned(addr, alignment)) << ERRINFO;
     EXPECT_TRUE(is_aligned(addr, allocation_granularity())) << ERRINFO;
@@ -158,7 +158,7 @@ public:
       // the hole.
       const uintptr_t candidate = nth_bit(i);
       if ((candidate + _len) <= ARMB_constants::absolute_max) {
-        _base = os::attempt_reserve_memory_at((char*)candidate, _len, !ExecMem, mtTest);
+        _base = os::attempt_reserve_memory_at((char*)candidate, _len);
       }
     }
     if (_base == nullptr) {
@@ -166,8 +166,8 @@ public:
     }
     // Release total mapping, remap the individual non-holy parts
     os::release_memory(_base, _len);
-    _p1 = os::attempt_reserve_memory_at(_base + _p1_offset, _p1_size, !ExecMem, mtTest);
-    _p2 = os::attempt_reserve_memory_at(_base + _p2_offset, _p2_size, !ExecMem, mtTest);
+    _p1 = os::attempt_reserve_memory_at(_base + _p1_offset, _p1_size);
+    _p2 = os::attempt_reserve_memory_at(_base + _p2_offset, _p2_size);
     if (_p1 == nullptr || _p2 == nullptr) {
       return false;
     }
diff --git a/test/hotspot/gtest/runtime/test_os_windows.cpp b/test/hotspot/gtest/runtime/test_os_windows.cpp
index 87ae501a08b..8c6f003de6f 100644
--- a/test/hotspot/gtest/runtime/test_os_windows.cpp
+++ b/test/hotspot/gtest/runtime/test_os_windows.cpp
@@ -67,7 +67,7 @@ void TestReserveMemorySpecial_test() {
   FLAG_SET_CMDLINE(UseNUMAInterleaving, false);
 
   const size_t large_allocation_size = os::large_page_size() * 4;
-  char* result = os::reserve_memory_special(large_allocation_size, os::large_page_size(), os::large_page_size(), nullptr, !ExecMem, mtTest);
+  char* result = os::reserve_memory_special(large_allocation_size, os::large_page_size(), os::large_page_size(), nullptr, false);
   if (result == nullptr) {
       // failed to allocate memory, skipping the test
       return;
@@ -77,12 +77,12 @@ void TestReserveMemorySpecial_test() {
   // Reserve another page within the recently allocated memory area. This should fail
   const size_t expected_allocation_size = os::large_page_size();
   char* expected_location = result + os::large_page_size();
-  char* actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), os::large_page_size(), expected_location, !ExecMem, mtTest);
+  char* actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), os::large_page_size(), expected_location, false);
   EXPECT_TRUE(actual_location == nullptr) << "Should not be allowed to reserve within present reservation";
 
   // Instead try reserving after the first reservation.
   expected_location = result + large_allocation_size;
-  actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), os::large_page_size(), expected_location, !ExecMem, mtTest);
+  actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), os::large_page_size(), expected_location, false);
   EXPECT_TRUE(actual_location != nullptr) << "Unexpected reservation failure, can’t verify correct location";
   EXPECT_TRUE(actual_location == expected_location) << "Reservation must be at requested location";
   MemoryReleaser m2(actual_location, os::large_page_size());
@@ -90,7 +90,7 @@ void TestReserveMemorySpecial_test() {
   // Now try to do a reservation with a larger alignment.
   const size_t alignment = os::large_page_size() * 2;
   const size_t new_large_size = alignment * 4;
-  char* aligned_request = os::reserve_memory_special(new_large_size, alignment, os::large_page_size(), nullptr, !ExecMem, mtTest);
+  char* aligned_request = os::reserve_memory_special(new_large_size, alignment, os::large_page_size(), nullptr, false);
   EXPECT_TRUE(aligned_request != nullptr) << "Unexpected reservation failure, can’t verify correct alignment";
   EXPECT_TRUE(is_aligned(aligned_request, alignment)) << "Returned address must be aligned";
   MemoryReleaser m3(aligned_request, new_large_size);
diff --git a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
index f2b3b843c23..b098416456d 100644
--- a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
+++ b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
@@ -93,7 +93,7 @@ public:
   static void test_add_committed_region_adjacent() {
 
     size_t size  = 0x01000000;
-    ReservedSpace rs(size, mtTest);
+    ReservedSpace rs(size);
     address addr = (address)rs.base();
 
     address frame1 = (address)0x1234;
@@ -167,7 +167,7 @@ public:
   static void test_add_committed_region_adjacent_overlapping() {
 
     size_t size  = 0x01000000;
-    ReservedSpace rs(size, mtTest);
+    ReservedSpace rs(size);
     address addr = (address)rs.base();
 
     address frame1 = (address)0x1234;
@@ -254,7 +254,7 @@ public:
   static void test_add_committed_region_overlapping() {
 
     size_t size  = 0x01000000;
-    ReservedSpace rs(size, mtTest);
+    ReservedSpace rs(size);
     address addr = (address)rs.base();
 
     address frame1 = (address)0x1234;
@@ -425,7 +425,7 @@ public:
   static void test_remove_uncommitted_region() {
 
     size_t size  = 0x01000000;
-    ReservedSpace rs(size, mtTest);
+    ReservedSpace rs(size);
     address addr = (address)rs.base();
 
     address frame1 = (address)0x1234;

From f78fa0556d93d8ec98f403694e067611e4501fd4 Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Fri, 3 May 2024 10:17:23 +0000
Subject: [PATCH 310/486] 8331636: [BACKOUT] Build failure after 8330076

Reviewed-by: jwilhelm
---
 src/hotspot/share/memory/virtualspace.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index 06775f98032..a75d9f076ad 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -323,7 +323,7 @@ ReservedSpace ReservedSpace::last_part(size_t partition_size, size_t alignment)
 
 ReservedSpace ReservedSpace::partition(size_t offset, size_t partition_size, size_t alignment) {
   assert(offset + partition_size <= size(), "partition failed");
-  ReservedSpace result(base() + offset, partition_size, alignment, page_size(), special(), executable(), nmt_flag());
+  ReservedSpace result(base() + offset, partition_size, alignment, page_size(), special(), executable());
   return result;
 }
 

From c60474b1229b67265acbd709f6ba081303329be4 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 3 May 2024 11:08:33 +0000
Subject: [PATCH 311/486] 8323707: Adjust Classfile API's type arg model to
 better represent the embodied type

Reviewed-by: asotona
---
 .../java/lang/classfile/Signature.java        | 99 +++++++++++--------
 .../classfile/impl/ClassRemapperImpl.java     | 10 +-
 .../classfile/impl/SignaturesImpl.java        | 27 ++---
 .../com/sun/tools/javap/ClassWriter.java      | 24 +++--
 test/jdk/jdk/classfile/SignaturesTest.java    |  7 +-
 .../javap/classfile/6888367/T6888367.java     | 25 ++---
 6 files changed, 107 insertions(+), 85 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/Signature.java b/src/java.base/share/classes/java/lang/classfile/Signature.java
index ad2528fd713..22ca477f4e6 100644
--- a/src/java.base/share/classes/java/lang/classfile/Signature.java
+++ b/src/java.base/share/classes/java/lang/classfile/Signature.java
@@ -185,88 +185,107 @@ public sealed interface Signature {
     /**
      * Models the type argument.
      *
+     * @sealedGraph
      * @since 22
      */
     @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
-    public sealed interface TypeArg
-            permits SignaturesImpl.TypeArgImpl {
+    public sealed interface TypeArg {
 
         /**
-         * Indicator for whether a wildcard has default bound, no bound,
-         * an upper bound, or a lower bound
-         *
-         * @since 22
+         * Models an unbounded type argument {@code *}.
+         * @since 23
          */
         @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
-        public enum WildcardIndicator {
-
-            /**
-             * default bound wildcard (empty)
-             */
-            DEFAULT,
-
-            /**
-             * unbounded indicator {@code *}
-             */
-            UNBOUNDED,
-
-            /**
-             * upper-bounded indicator {@code +}
-             */
-            EXTENDS,
-
-            /**
-             * lower-bounded indicator {@code -}
-             */
-            SUPER;
+        public sealed interface Unbounded extends TypeArg permits SignaturesImpl.UnboundedTypeArgImpl {
         }
 
-        /** {@return the wildcard indicator} */
-        WildcardIndicator wildcardIndicator();
+        /**
+         * Models a type argument with an explicit bound type.
+         * @since 23
+         */
+        @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
+        public sealed interface Bounded extends TypeArg permits SignaturesImpl.TypeArgImpl {
 
-        /** {@return the signature of the type bound, if any} */
-        Optional<RefTypeSig> boundType();
+            /**
+             * Models a type argument's wildcard indicator.
+             * @since 23
+             */
+            @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
+            public enum WildcardIndicator {
+
+                /**
+                 * No wildcard (empty), an exact type. Also known as
+                 * {@index invariant}.
+                 */
+                NONE,
+
+                /**
+                 * Upper-bound indicator {@code +}. Also known as
+                 * {@index covariant}.
+                 */
+                EXTENDS,
+
+                /**
+                 * Lower-bound indicator {@code -}. Also known as
+                 * {@index contravariant}.
+                 */
+                SUPER;
+            }
+
+            /** {@return the kind of wildcard} */
+            WildcardIndicator wildcardIndicator();
+
+            /** {@return the signature of the type bound} */
+            RefTypeSig boundType();
+        }
 
         /**
          * {@return a bounded type arg}
          * @param boundType the bound
+         * @since 23
          */
-        public static TypeArg of(RefTypeSig boundType) {
+        public static TypeArg.Bounded of(RefTypeSig boundType) {
             requireNonNull(boundType);
-            return of(WildcardIndicator.DEFAULT, Optional.of(boundType));
+            return bounded(Bounded.WildcardIndicator.NONE, boundType);
         }
 
         /**
          * {@return an unbounded type arg}
+         * @since 23
          */
-        public static TypeArg unbounded() {
-            return of(WildcardIndicator.UNBOUNDED, Optional.empty());
+        public static TypeArg.Unbounded unbounded() {
+            return SignaturesImpl.UnboundedTypeArgImpl.INSTANCE;
         }
 
         /**
          * {@return an upper-bounded type arg}
          * @param boundType the upper bound
+         * @since 23
          */
-        public static TypeArg extendsOf(RefTypeSig boundType) {
+        public static TypeArg.Bounded extendsOf(RefTypeSig boundType) {
             requireNonNull(boundType);
-            return of(WildcardIndicator.EXTENDS, Optional.of(boundType));
+            return bounded(Bounded.WildcardIndicator.EXTENDS, boundType);
         }
 
         /**
          * {@return a lower-bounded type arg}
          * @param boundType the lower bound
+         * @since 23
          */
-        public static TypeArg superOf(RefTypeSig boundType) {
+        public static TypeArg.Bounded superOf(RefTypeSig boundType) {
             requireNonNull(boundType);
-            return of(WildcardIndicator.SUPER, Optional.of(boundType));
+            return bounded(Bounded.WildcardIndicator.SUPER, boundType);
         }
 
         /**
          * {@return a bounded type arg}
          * @param wildcard the wild card
          * @param boundType optional bound type
+         * @since 23
          */
-        public static TypeArg of(WildcardIndicator wildcard, Optional<RefTypeSig> boundType) {
+        public static TypeArg.Bounded bounded(Bounded.WildcardIndicator wildcard, RefTypeSig boundType) {
+            requireNonNull(wildcard);
+            requireNonNull(boundType);
             return new SignaturesImpl.TypeArgImpl(wildcard, boundType);
         }
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
index 6e80e289064..de6128a9f7f 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
@@ -369,11 +369,11 @@ public record ClassRemapperImpl(Function<ClassDesc, ClassDesc> mapFunction) impl
                 Signature.ClassTypeSig.of(
                         cts.outerType().map(this::mapSignature).orElse(null),
                         map(cts.classDesc()),
-                        cts.typeArgs().stream()
-                                .map(ta -> Signature.TypeArg.of(
-                                        ta.wildcardIndicator(),
-                                        ta.boundType().map(this::mapSignature)))
-                                .toArray(Signature.TypeArg[]::new));
+                        cts.typeArgs().stream().map(ta -> switch (ta) {
+                            case Signature.TypeArg.Unbounded u -> u;
+                            case Signature.TypeArg.Bounded bta -> Signature.TypeArg.bounded(
+                                    bta.wildcardIndicator(), mapSignature(bta.boundType()));
+                        }).toArray(Signature.TypeArg[]::new));
             default -> signature;
         };
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/SignaturesImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/SignaturesImpl.java
index 3447e40b258..77f6933a0c2 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/SignaturesImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/SignaturesImpl.java
@@ -280,24 +280,29 @@ public final class SignaturesImpl {
             if (!typeArgs.isEmpty()) {
                 var sb = new StringBuilder();
                 sb.append('<');
-                for (var ta : typeArgs)
-                    sb.append(((TypeArgImpl)ta).signatureString());
+                for (var ta : typeArgs) {
+                    switch (ta) {
+                        case TypeArg.Bounded b -> {
+                            switch (b.wildcardIndicator()) {
+                                case SUPER -> sb.append('-');
+                                case EXTENDS -> sb.append('+');
+                            }
+                            sb.append(b.boundType().signatureString());
+                        }
+                        case TypeArg.Unbounded _ -> sb.append('*');
+                    }
+                }
                 suffix = sb.append(">;").toString();
             }
             return prefix + className + suffix;
         }
     }
 
-    public static record TypeArgImpl(WildcardIndicator wildcardIndicator, Optional<RefTypeSig> boundType) implements Signature.TypeArg {
+    public static enum UnboundedTypeArgImpl implements TypeArg.Unbounded {
+        INSTANCE;
+    }
 
-        public String signatureString() {
-            return switch (wildcardIndicator) {
-                case DEFAULT -> boundType.get().signatureString();
-                case EXTENDS -> "+" + boundType.get().signatureString();
-                case SUPER -> "-" + boundType.get().signatureString();
-                case UNBOUNDED -> "*";
-            };
-        }
+    public static record TypeArgImpl(WildcardIndicator wildcardIndicator, RefTypeSig boundType) implements Signature.TypeArg.Bounded {
     }
 
     public static record TypeParamImpl(String identifier, Optional<RefTypeSig> classBound, List<RefTypeSig> interfaceBounds)
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
index 028fc480f58..c5ac15ee7da 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
@@ -366,16 +366,20 @@ public class ClassWriter extends BasicWriter {
         }
 
         private void print(StringBuilder sb, Signature.TypeArg ta) {
-            switch (ta.wildcardIndicator()) {
-                case DEFAULT -> print(sb, ta.boundType().get());
-                case UNBOUNDED -> sb.append('?');
-                case EXTENDS -> {
-                    sb.append("? extends ");
-                    print(sb, ta.boundType().get());
-                }
-                case SUPER -> {
-                    sb.append("? super ");
-                    print(sb, ta.boundType().get());
+            switch (ta) {
+                case Signature.TypeArg.Unbounded _ -> sb.append('?');
+                case Signature.TypeArg.Bounded bta -> {
+                    switch (bta.wildcardIndicator()) {
+                        case NONE -> print(sb, bta.boundType());
+                        case EXTENDS -> {
+                            sb.append("? extends ");
+                            print(sb, bta.boundType());
+                        }
+                        case SUPER -> {
+                            sb.append("? super ");
+                            print(sb, bta.boundType());
+                        }
+                    }
                 }
             }
         }
diff --git a/test/jdk/jdk/classfile/SignaturesTest.java b/test/jdk/jdk/classfile/SignaturesTest.java
index cfd3201c95a..f4da2405dcd 100644
--- a/test/jdk/jdk/classfile/SignaturesTest.java
+++ b/test/jdk/jdk/classfile/SignaturesTest.java
@@ -183,9 +183,10 @@ class SignaturesTest {
     void testClassSignatureClassDesc() throws IOException {
         var observerCf = ClassFile.of().parse(Path.of(System.getProperty("test.classes"), "SignaturesTest$Observer.class"));
         var sig = observerCf.findAttribute(Attributes.SIGNATURE).orElseThrow().asClassSignature();
-        var innerSig = (ClassTypeSig) sig.superclassSignature() // ArrayList
-                .typeArgs().getFirst() // Outer<String>.Inner<Long>
-                .boundType().orElseThrow(); // assert it's exact bound
+        var arrayListSig = sig.superclassSignature(); // ArrayList
+        var arrayListTypeArg = (TypeArg.Bounded) arrayListSig.typeArgs().getFirst(); // Outer<String>.Inner<Long>
+        assertEquals(TypeArg.Bounded.WildcardIndicator.NONE, arrayListTypeArg.wildcardIndicator());
+        var innerSig = (ClassTypeSig) arrayListTypeArg.boundType();
         assertEquals("Inner", innerSig.className(), "simple name in signature");
         assertEquals(Outer.Inner.class.describeConstable().orElseThrow(), innerSig.classDesc(),
                 "ClassDesc derived from signature");
diff --git a/test/langtools/tools/javap/classfile/6888367/T6888367.java b/test/langtools/tools/javap/classfile/6888367/T6888367.java
index 05df08b5948..16bc06321ca 100644
--- a/test/langtools/tools/javap/classfile/6888367/T6888367.java
+++ b/test/langtools/tools/javap/classfile/6888367/T6888367.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, 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
@@ -312,21 +312,14 @@ public class T6888367 {
         }
 
         public String visitWildcardType(Signature.TypeArg type) {
-            switch (type.wildcardIndicator()) {
-                case UNBOUNDED -> {
-                    return "W{?}";
-                }
-                case EXTENDS -> {
-                    return "W{e," + print(type.boundType().get()) + "}";
-                }
-                case SUPER -> {
-                    return "W{s," + print(type.boundType().get()) + "}";
-                }
-                default -> {
-                    if (type.boundType().isPresent()) return print(type.boundType().get());
-                    else throw new AssertionError();
-                }
-            }
+            return switch (type) {
+                case Signature.TypeArg.Unbounded _ -> "W{?}";
+                case Signature.TypeArg.Bounded b -> switch (b.wildcardIndicator()) {
+                    case EXTENDS -> "W{e," + print(b.boundType()) + "}";
+                    case SUPER -> "W{s," + print(b.boundType()) + "}";
+                    case NONE -> print(b.boundType());
+                };
+            };
         }
 
     };

From 1f6d38f7a63c6cb429953c5e9bb0b9f365bfcabe Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 3 May 2024 11:57:10 +0000
Subject: [PATCH 312/486] 8294978: Convert 5 test/jdk/jdk/jfr tests from ASM
 library to Classfile API

Reviewed-by: asotona
---
 .../event/compiler/TestCompilerInlining.java  | 128 ++++++++-------
 .../jdk/jfr/event/io/TestInstrumentation.java | 155 ++++++++----------
 .../javaagent/TestEventInstrumentation.java   |  94 ++++-------
 .../jdk/jfr/jvm/TestLargeJavaEvent512k.java   |   3 +-
 .../jdk/jfr/jvm/TestLargeJavaEvent64k.java    |   3 +-
 5 files changed, 174 insertions(+), 209 deletions(-)

diff --git a/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java b/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java
index cea86e6e997..79b3fe11cb9 100644
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 package jdk.jfr.event.compiler;
 
-import jdk.internal.org.objectweb.asm.*;
 import jdk.jfr.Recording;
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.jfr.consumer.RecordedMethod;
@@ -35,13 +34,24 @@ import jdk.test.lib.jfr.Events;
 import jdk.test.whitebox.WhiteBox;
 
 import java.io.IOException;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.Instruction;
+import java.lang.classfile.instruction.InvokeInstruction;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
-/**
+import static java.lang.constant.ConstantDescs.CD_Object;
+import static java.lang.constant.ConstantDescs.CD_void;
+import static java.lang.constant.ConstantDescs.INIT_NAME;
+
+/*
  * @test CompilerInliningTest
  * @bug 8073607
  * @key jfr
@@ -50,8 +60,8 @@ import java.util.stream.IntStream;
  *
  * @requires vm.opt.Inline == true | vm.opt.Inline == null
  * @library /test/lib
- * @modules java.base/jdk.internal.org.objectweb.asm
- *          jdk.jfr
+ * @modules jdk.jfr
+ * @enablePreview
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
@@ -64,7 +74,7 @@ public class TestCompilerInlining {
     private static final int LEVEL_SIMPLE = 1;
     private static final int LEVEL_FULL_OPTIMIZATION = 4;
     private static final Executable ENTRY_POINT = getConstructor(TestCase.class);
-    private static final String TEST_CASE_CLASS_NAME = TestCase.class.getName().replace('.', '/');
+    private static final ClassDesc CD_TestCase = TestCase.class.describeConstable().orElseThrow();
 
     public static void main(String[] args) throws Exception {
         InlineCalls inlineCalls = new InlineCalls(TestCase.class);
@@ -100,8 +110,8 @@ public class TestCompilerInlining {
             MethodDesc caller = methodToMethodDesc(callerObject);
             MethodDesc callee = ciMethodToMethodDesc(calleeObject);
             // only TestCase.* -> TestCase.* OR TestCase.* -> Object.<init> are tested/filtered
-            if (caller.className.equals(TEST_CASE_CLASS_NAME) && (callee.className.equals(TEST_CASE_CLASS_NAME)
-                    || (callee.className.equals("java/lang/Object") && callee.methodName.equals("<init>")))) {
+            if (caller.className.equals(CD_TestCase) && (callee.className.equals(CD_TestCase)
+                    || (callee.className.equals(CD_Object) && callee.methodName.equals(INIT_NAME)))) {
                 System.out.println(event);
                 boolean succeeded = (boolean) event.getValue("succeeded");
                 int bci = Events.assertField(event, "bci").atLeast(0).getValue();
@@ -132,17 +142,17 @@ public class TestCompilerInlining {
     }
 
     private static MethodDesc methodToMethodDesc(RecordedMethod method) {
-        String internalClassName = method.getType().getName().replace('.', '/');
+        ClassDesc classDesc = ClassDesc.of(method.getType().getName());
         String methodName = method.getValue("name");
-        String methodDescriptor = method.getValue("descriptor");
-        return new MethodDesc(internalClassName, methodName, methodDescriptor);
+        MethodTypeDesc methodDescriptor = MethodTypeDesc.ofDescriptor(method.getValue("descriptor"));
+        return new MethodDesc(classDesc, methodName, methodDescriptor);
     }
 
     private static MethodDesc ciMethodToMethodDesc(RecordedObject ciMethod) {
-        String internalClassName = ciMethod.getValue("type");
+        ClassDesc classDesc = ClassDesc.ofInternalName(ciMethod.getValue("type"));
         String methodName = ciMethod.getValue("name");
-        String methodDescriptor = ciMethod.getValue("descriptor");
-        return new MethodDesc(internalClassName, methodName, methodDescriptor);
+        MethodTypeDesc methodDescriptor = MethodTypeDesc.ofDescriptor(ciMethod.getValue("descriptor"));
+        return new MethodDesc(classDesc, methodName, methodDescriptor);
     }
 
     private static Method getMethod(Class<?> aClass, String name, Class<?>... params) {
@@ -246,35 +256,33 @@ class Call {
  * data structure for method description
  */
 class MethodDesc {
-    public final String className;
+    public final ClassDesc className;
     public final String methodName;
-    public final String descriptor;
+    public final MethodTypeDesc descriptor;
 
-    public MethodDesc(Class<?> aClass, String methodName, String descriptor) {
-        this(aClass.getName().replace('.', '/'), methodName, descriptor);
-    }
-
-    public MethodDesc(String className, String methodName, String descriptor) {
+    public MethodDesc(ClassDesc className, String methodName, MethodTypeDesc descriptor) {
         Objects.requireNonNull(className);
         Objects.requireNonNull(methodName);
         Objects.requireNonNull(descriptor);
-        this.className = className.replace('.', '/');
+        this.className = className;
         this.methodName = methodName;
         this.descriptor = descriptor;
     }
 
     public MethodDesc(Executable executable) {
-        Class<?> aClass = executable.getDeclaringClass();
-        className = Type.getInternalName(aClass).replace('.', '/');
+        className = executable.getDeclaringClass().describeConstable().orElseThrow();
+        ClassDesc retType;
 
-        if (executable instanceof Constructor<?>) {
-            methodName = "<init>";
-            descriptor = Type.getConstructorDescriptor((Constructor<?>) executable);
-        } else {
+        if (executable instanceof Method method) {
             methodName = executable.getName();
-            descriptor = Type.getMethodDescriptor((Method) executable);
+            retType = method.getReturnType().describeConstable().orElseThrow();
+        } else {
+            methodName = INIT_NAME;
+            retType = CD_void;
         }
 
+        descriptor = MethodTypeDesc.of(retType, Stream.of(executable.getParameterTypes())
+                .map(c -> c.describeConstable().orElseThrow()).toArray(ClassDesc[]::new));
     }
 
     @Override
@@ -361,43 +369,41 @@ class InlineCalls {
 
     private static Collection<Call> getCalls(Class<?> aClass) {
         List<Call> calls = new ArrayList<>();
-        ClassWriter cw;
-        ClassReader cr;
+        ClassModel clm;
         try {
-            cr = new ClassReader(aClass.getName());
+            var stream = ClassLoader.getSystemResourceAsStream(aClass.getName()
+                    .replace('.', '/') + ".class");
+            if (stream == null) {
+                throw new IOException("Cannot find class file for " + aClass.getName());
+            }
+            clm = ClassFile.of().parse(stream.readAllBytes());
         } catch (IOException e) {
             throw new Error("TESTBUG : unexpected IOE during class reading", e);
         }
-        cw = new ClassWriter(cr, 0);
-        ClassVisitor cv = new ClassVisitor(Opcodes.ASM7, cw) {
-            @Override
-            public MethodVisitor visitMethod(int access, String name, String desc, String descriptor, String[] exceptions) {
-                System.out.println("Method: " +name);
-                MethodVisitor mv = super.visitMethod(access, name, desc, descriptor, exceptions);
-                return new CallTracer(aClass, name, desc, mv, calls);
-            }
-        };
-        cr.accept(cv, 0);
 
+        clm.methods().forEach(mm -> {
+            System.out.println("Method: " + mm.methodName().stringValue());
+            mm.code().ifPresent(com -> {
+                MethodDesc caller = new MethodDesc(
+                        clm.thisClass().asSymbol(),
+                        mm.methodName().stringValue(),
+                        mm.methodTypeSymbol()
+                );
+                int offset = 0;
+                for (var ce : com.elements()) {
+                    if (ce instanceof Instruction ins) {
+                        if (ins instanceof InvokeInstruction inv) {
+                            calls.add(new Call(caller, new MethodDesc(
+                                    inv.owner().asSymbol(),
+                                    inv.name().stringValue(),
+                                    inv.typeSymbol()
+                            ), offset));
+                        }
+                        offset += ins.sizeInBytes();
+                    }
+                }
+            });
+        });
         return calls;
     }
-
-    private static class CallTracer extends MethodVisitor {
-        private final MethodDesc caller;
-        private Collection<Call> calls;
-
-        public CallTracer(Class<?> aClass, String name, String desc, MethodVisitor mv, Collection<Call> calls) {
-            super(Opcodes.ASM7, mv);
-            caller = new MethodDesc(aClass.getName(), name, desc);
-            this.calls = calls;
-        }
-
-        @Override
-        public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
-            Label label = new Label();
-            visitLabel(label);
-            super.visitMethodInsn(opcode, owner, name, desc, itf);
-            calls.add(new Call(caller, new MethodDesc(owner, name, desc), label.getOffset()));
-        }
-    }
 }
diff --git a/test/jdk/jdk/jfr/event/io/TestInstrumentation.java b/test/jdk/jdk/jfr/event/io/TestInstrumentation.java
index ddbc1206497..5f3885f31bf 100644
--- a/test/jdk/jdk/jfr/event/io/TestInstrumentation.java
+++ b/test/jdk/jdk/jfr/event/io/TestInstrumentation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,14 @@
 
 package jdk.jfr.event.io;
 
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.CodeElement;
+import java.lang.classfile.CodeTransform;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.MethodTransform;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.HashSet;
@@ -31,16 +39,15 @@ import java.security.ProtectionDomain;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
 import java.lang.instrument.IllegalClassFormatException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
+import static java.lang.constant.ConstantDescs.CD_String;
+import static java.lang.constant.ConstantDescs.CD_void;
+
 /*
  * @test
  * @summary Test that will instrument the same classes that JFR will also instrument.
@@ -48,10 +55,11 @@ import jdk.test.lib.process.ProcessTools;
  * @requires vm.hasJFR
  *
  * @library /test/lib /test/jdk
- * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.instrument
+ * @modules java.instrument
  *          jdk.jartool/sun.tools.jar
  *          jdk.jfr
+ * @enablePreview
+ * @comment update --enable-preview in launchTest() too
  *
  * @run main/othervm jdk.jfr.event.io.TestInstrumentation
  */
@@ -90,7 +98,7 @@ public class TestInstrumentation implements ClassFileTransformer {
     private static TestInstrumentation testTransformer = null;
 
     // All methods that will be instrumented.
-    private static final String[] instrMethodKeys = {
+    private static final Set<MethodKey> instrMethodKeys = Stream.of(
         "java/io/RandomAccessFile::seek::(J)V",
         "java/io/RandomAccessFile::read::()I",
         "java/io/RandomAccessFile::read::([B)I",
@@ -116,31 +124,24 @@ public class TestInstrumentation implements ClassFileTransformer {
         "java/nio/channels/SocketChannel::read::([Ljava/nio/ByteBuffer;)J",
         "java/nio/channels/SocketChannel::write::([Ljava/nio/ByteBuffer;)J",
         "sun/nio/ch/FileChannelImpl::read::(Ljava/nio/ByteBuffer;)I",
-        "sun/nio/ch/FileChannelImpl::write::(Ljava/nio/ByteBuffer;)I",
-    };
-
-    private static String getInstrMethodKey(String className, String methodName, String signature) {
-        // This key is used to identify a class and method. It is sent to callback(key)
-        return className + "::" + methodName + "::" + signature;
-    }
-
-    private static String getClassFromMethodKey(String methodKey) {
-        return methodKey.split("::")[0];
-    }
+        "sun/nio/ch/FileChannelImpl::write::(Ljava/nio/ByteBuffer;)I"
+    ).map(s -> {
+        String[] a = s.split("::");
+        return new MethodKey(a[0], a[1], a[2]);
+    }).collect(Collectors.toUnmodifiableSet());
 
     // Set of all classes targeted for instrumentation.
-    private static Set<String> instrClassesTarget = null;
+    private static Set<ClassDesc> instrClassesTarget = null;
 
     // Set of all classes where instrumentation has been completed.
-    private static Set<String> instrClassesDone = null;
+    private static Set<ClassDesc> instrClassesDone = null;
 
     static {
         // Split class names from InstrMethodKeys.
-        instrClassesTarget = new HashSet<String>();
-        instrClassesDone = new HashSet<String>();
-        for (String s : instrMethodKeys) {
-            String className = getClassFromMethodKey(s);
-            instrClassesTarget.add(className);
+        instrClassesTarget = new HashSet<>();
+        instrClassesDone = new HashSet<>();
+        for (MethodKey key : instrMethodKeys) {
+            instrClassesTarget.add(key.owner());
         }
     }
 
@@ -164,9 +165,10 @@ public class TestInstrumentation implements ClassFileTransformer {
             runAllTests(TransformStatus.Transformed);
 
             // Retransform all classes and then repeat tests
-            Set<Class<?>> classes = new HashSet<Class<?>>();
-            for (String className : instrClassesTarget) {
-                Class<?> clazz = Class.forName(className.replaceAll("/", "."));
+            Set<Class<?>> classes = new HashSet<>();
+            for (ClassDesc className : instrClassesTarget) {
+                var desc = className.descriptorString();
+                Class<?> clazz = Class.forName(desc.substring(1, desc.length() - 1).replace('/', '.'));
                 classes.add(clazz);
                 log("Will retransform " + clazz.getName());
             }
@@ -197,10 +199,10 @@ public class TestInstrumentation implements ClassFileTransformer {
 
                 // Verify that all expected callbacks have been called.
                 Set<String> callbackKeys = InstrumentationCallback.getKeysCopy();
-                for (String key : instrMethodKeys) {
-                    boolean gotCallback = callbackKeys.contains(key);
+                for (MethodKey key : instrMethodKeys) {
+                    boolean gotCallback = callbackKeys.contains(key.toString());
                     boolean expectsCallback = isClassInstrumented(status, key);
-                    String msg = String.format("key:%s, expects:%b", key, expectsCallback);
+                    String msg = String.format("status:%s, key:%s, expects:%b", status, key, expectsCallback);
                     if (gotCallback != expectsCallback) {
                         throw new Exception("Wrong callback() for " + msg);
                     } else {
@@ -214,14 +216,14 @@ public class TestInstrumentation implements ClassFileTransformer {
             }
         }
 
-        private static boolean isClassInstrumented(TransformStatus status, String key) throws Throwable {
+        private static boolean isClassInstrumented(TransformStatus status, MethodKey key) throws Throwable {
             switch (status) {
             case Retransformed:
                 return true;
             case Removed:
                 return false;
             case Transformed:
-                String className = getClassFromMethodKey(key);
+                var className = key.owner();
                 return instrClassesDone.contains(className);
             }
             throw new Exception("Test error: Unknown TransformStatus: " + status);
@@ -279,7 +281,7 @@ public class TestInstrumentation implements ClassFileTransformer {
 
         String[] args = {
             "-Xbootclasspath/a:" + testClassDir + "InstrumentationCallback.jar",
-            "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
+            "--enable-preview",
             "-classpath", classpath,
             "-javaagent:" + testClassDir + "TestInstrumentation.jar",
             "jdk.jfr.event.io.TestInstrumentation$TestMain" };
@@ -305,67 +307,52 @@ public class TestInstrumentation implements ClassFileTransformer {
             ClassLoader classLoader, String className, Class<?> classBeingRedefined,
             ProtectionDomain pd, byte[] bytes) throws IllegalClassFormatException {
         // Check if this class should be instrumented.
-        if (!instrClassesTarget.contains(className)) {
+        ClassDesc target = ClassDesc.ofInternalName(className);
+        if (!instrClassesTarget.contains(target)) {
             return null;
         }
 
         boolean isRedefinition = classBeingRedefined != null;
         log("instrument class(" + className + ") " + (isRedefinition ? "redef" : "load"));
 
-        ClassReader reader = new ClassReader(bytes);
-        ClassWriter writer = new ClassWriter(
-                reader, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
-        CallbackClassVisitor classVisitor = new CallbackClassVisitor(writer);
-        reader.accept(classVisitor, 0);
-        instrClassesDone.add(className);
-        return writer.toByteArray();
-    }
+        instrClassesDone.add(target);
+        var cf = ClassFile.of();
+        return cf.transform(cf.parse(bytes), (clb, ce) -> {
+            MethodKey key;
+            if (ce instanceof MethodModel mm && instrMethodKeys.contains(key = new MethodKey(
+                    target, mm.methodName().stringValue(), mm.methodTypeSymbol()))) {
+                clb.transformMethod(mm, MethodTransform.transformingCode(new CodeTransform() {
+                    private static final MethodTypeDesc MTD_callback = MethodTypeDesc.of(CD_void, CD_String);
+                    private static final ClassDesc CD_InstrumentationCallback = InstrumentationCallback.class
+                            .describeConstable().orElseThrow();
 
-    private static class CallbackClassVisitor extends ClassVisitor {
-        private String className;
+                    @Override
+                    public void atStart(CodeBuilder cb) {
+                        cb.loadConstant(key.toString());
+                        cb.invokestatic(CD_InstrumentationCallback, "callback", MTD_callback);
+                        log("instrumented " + key);
+                    }
 
-        public CallbackClassVisitor(ClassVisitor cv) {
-            super(Opcodes.ASM7, cv);
-        }
-
-        @Override
-        public void visit(
-                int version, int access, String name, String signature,
-                String superName, String[] interfaces) {
-            cv.visit(version, access, name, signature, superName, interfaces);
-            className = name;
-        }
-
-        @Override
-        public MethodVisitor visitMethod(
-                int access, String methodName, String desc, String signature, String[] exceptions) {
-            String methodKey = getInstrMethodKey(className, methodName, desc);
-            boolean isInstrumentedMethod = Arrays.asList(instrMethodKeys).contains(methodKey);
-            MethodVisitor mv = cv.visitMethod(access, methodName, desc, signature, exceptions);
-            if (isInstrumentedMethod && mv != null) {
-                mv = new CallbackMethodVisitor(mv, methodKey);
-                log("instrumented " + methodKey);
+                    @Override
+                    public void accept(CodeBuilder cb, CodeElement ce) {
+                        cb.with(ce);
+                    }
+                }));
+            } else {
+                clb.with(ce);
             }
-            return mv;
-        }
+        });
     }
 
-    public static class CallbackMethodVisitor extends MethodVisitor {
-        private String logMessage;
-
-        public CallbackMethodVisitor(MethodVisitor mv, String logMessage) {
-            super(Opcodes.ASM7, mv);
-            this.logMessage = logMessage;
+    public record MethodKey(ClassDesc owner, String name, MethodTypeDesc desc) {
+        public MethodKey(String className, String methodName, String signature) {
+            this(ClassDesc.ofInternalName(className), methodName, MethodTypeDesc.ofDescriptor(signature));
         }
 
         @Override
-        public void visitCode() {
-            mv.visitCode();
-            String methodDescr = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(String.class));
-            String className = InstrumentationCallback.class.getName().replace('.', '/');
-            mv.visitLdcInsn(logMessage);
-            mv.visitMethodInsn(Opcodes.INVOKESTATIC, className, "callback", methodDescr);
+        public String toString() {
+            var ownerDesc = owner.descriptorString();
+            return ownerDesc.substring(1, ownerDesc.length() - 1) + "::" + name + "::" + desc.descriptorString();
         }
     }
-
 }
diff --git a/test/jdk/jdk/jfr/javaagent/TestEventInstrumentation.java b/test/jdk/jdk/jfr/javaagent/TestEventInstrumentation.java
index 6dae08044c3..8a8415dc524 100644
--- a/test/jdk/jdk/jfr/javaagent/TestEventInstrumentation.java
+++ b/test/jdk/jdk/jfr/javaagent/TestEventInstrumentation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,13 @@
  */
 package jdk.jfr.javaagent;
 
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.CodeElement;
+import java.lang.classfile.CodeTransform;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.MethodTransform;
+import java.lang.constant.ClassDesc;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
 import java.lang.instrument.Instrumentation;
@@ -29,18 +36,14 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.ProtectionDomain;
 
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-
 import jdk.jfr.Event;
 import jdk.jfr.Recording;
 import jdk.jfr.consumer.RecordingFile;
 import jdk.test.lib.Asserts;
 
+import static java.lang.constant.ConstantDescs.INIT_NAME;
+import static java.lang.constant.ConstantDescs.MTD_void;
+
 /*
  * @test
  * @summary Verify that a subclass of the JFR Event class
@@ -48,8 +51,8 @@ import jdk.test.lib.Asserts;
  * @key jfr
  * @requires vm.hasJFR
  * @library /test/lib
- * @modules java.base/jdk.internal.org.objectweb.asm
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
+ * @enablePreview
  * @build jdk.jfr.javaagent.InstrumentationEventCallback
  *        jdk.jfr.javaagent.TestEventInstrumentation
  * @run driver jdk.test.lib.util.JavaAgentBuilder
@@ -99,6 +102,9 @@ public class TestEventInstrumentation {
     }
 
     static class Transformer implements ClassFileTransformer {
+        private static final ClassDesc CD_InstrumentationEventCallback = InstrumentationEventCallback.class
+                .describeConstable().orElseThrow();
+
         public byte[] transform(ClassLoader classLoader, String className,
                                 Class<?> classBeingRedefined, ProtectionDomain pd,
                                 byte[] bytes) throws IllegalClassFormatException {
@@ -109,13 +115,25 @@ public class TestEventInstrumentation {
                     return null;
                 }
 
-                ClassReader reader = new ClassReader(bytes);
-                ClassWriter writer = new ClassWriter(reader, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
-                CallbackClassVisitor classVisitor = new CallbackClassVisitor(writer);
+                var cf = ClassFile.of();
+                result = cf.transform(cf.parse(bytes), (clb, ce) -> {
+                    if (ce instanceof MethodModel mm && mm.methodName().equalsString(INIT_NAME)) {
+                        clb.transformMethod(mm, MethodTransform.transformingCode(new CodeTransform() {
+                            @Override
+                            public void atStart(CodeBuilder cb) {
+                                cb.invokestatic(CD_InstrumentationEventCallback, "callback", MTD_void);
+                                log("instrumented <init> in class " + className);
+                            }
 
-                // visit the reader's class by the classVisitor
-                reader.accept(classVisitor, 0);
-                result = writer.toByteArray();
+                            @Override
+                            public void accept(CodeBuilder cb, CodeElement ce) {
+                                cb.accept(ce);
+                            }
+                        }));
+                    } else {
+                        clb.with(ce);
+                    }
+                });
             } catch (Exception e) {
                 log("Exception occured in transform(): " + e.getMessage());
                 e.printStackTrace(System.out);
@@ -123,49 +141,5 @@ public class TestEventInstrumentation {
             }
             return result;
         }
-
-        private static class CallbackClassVisitor extends ClassVisitor {
-            private String className;
-
-            public CallbackClassVisitor(ClassVisitor cv) {
-                super(Opcodes.ASM7, cv);
-            }
-
-            @Override
-            public void visit(int version, int access, String name, String signature,
-                              String superName, String[] interfaces) {
-                // visit the header of the class - called per class header visit
-                cv.visit(version, access, name, signature, superName, interfaces);
-                className = name;
-            }
-
-            @Override
-            public MethodVisitor visitMethod(
-                                             int access, String methodName, String desc,
-                                             String signature, String[] exceptions) {
-                // called for each method in a class
-                boolean isInstrumentedMethod = methodName.contains("<init>");
-                MethodVisitor mv = cv.visitMethod(access, methodName, desc, signature, exceptions);
-                if (isInstrumentedMethod) {
-                    mv = new CallbackMethodVisitor(mv);
-                    log("instrumented <init> in class " + className);
-                }
-                return mv;
-            }
-        }
-
-        public static class CallbackMethodVisitor extends MethodVisitor {
-            public CallbackMethodVisitor(MethodVisitor mv) {
-                super(Opcodes.ASM7, mv);
-            }
-
-            @Override
-            public void visitCode() {
-                mv.visitCode();
-                String methodDescr = Type.getMethodDescriptor(Type.VOID_TYPE, Type.VOID_TYPE);
-                String className = InstrumentationEventCallback.class.getName().replace('.', '/');
-                mv.visitMethodInsn(Opcodes.INVOKESTATIC, className, "callback", "()V", false);
-            }
-        }
     }
 }
diff --git a/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent512k.java b/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent512k.java
index 93ef8f937d4..eacffb7a13b 100644
--- a/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent512k.java
+++ b/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent512k.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,6 @@ import jdk.test.lib.jfr.Stressor;
  * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
- *    java.base/jdk.internal.org.objectweb.asm
  * @run main/othervm jdk.jfr.jvm.TestLargeJavaEvent512k
  */
 public class TestLargeJavaEvent512k {
diff --git a/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent64k.java b/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent64k.java
index d3b535117e5..0de03efb35c 100644
--- a/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent64k.java
+++ b/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent64k.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -47,7 +47,6 @@ import jdk.test.lib.jfr.Stressor;
  * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
- *    java.base/jdk.internal.org.objectweb.asm
  * @run main/othervm jdk.jfr.jvm.TestLargeJavaEvent64k
  */
 public class TestLargeJavaEvent64k {

From 8ed319023e921a980ea197fbffe417f35fc59b94 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 3 May 2024 12:03:28 +0000
Subject: [PATCH 313/486] 8331401: G1: Make G1HRPrinter AllStatic

Reviewed-by: iwalulya, ayang, gli
---
 src/hotspot/share/gc/g1/g1Allocator.cpp       |  3 +-
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 25 ++++++-------
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  5 ---
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  |  3 +-
 src/hotspot/share/gc/g1/g1HRPrinter.hpp       | 35 ++++++++++---------
 .../share/gc/g1/g1HeapRegionManager.cpp       | 12 +++----
 .../share/gc/g1/g1ParScanThreadState.cpp      |  3 +-
 src/hotspot/share/gc/g1/g1YoungCollector.cpp  | 14 ++------
 src/hotspot/share/gc/g1/g1YoungCollector.hpp  |  2 --
 .../gc/g1/g1YoungGCPostEvacuateTasks.cpp      |  5 +--
 10 files changed, 46 insertions(+), 61 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp
index 3964ad8c8af..758d16a89f5 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.cpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.cpp
@@ -31,6 +31,7 @@
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1HeapRegionType.hpp"
+#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1NUMA.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/shared/tlab_globals.hpp"
@@ -118,7 +119,7 @@ void G1Allocator::reuse_retained_old_region(G1EvacInfo* evacuation_info,
     // it's retired again.
     _g1h->old_set_remove(retained_region);
     old->set(retained_region);
-    _g1h->hr_printer()->reuse(retained_region);
+    G1HRPrinter::reuse(retained_region);
     evacuation_info->set_alloc_regions_used_before(retained_region->used());
   }
 }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 1384c30d2be..45f570dcd2b 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -52,6 +52,7 @@
 #include "gc/g1/g1HeapSizingPolicy.hpp"
 #include "gc/g1/g1HeapTransition.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
+#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1InitLogger.hpp"
 #include "gc/g1/g1MemoryPool.hpp"
 #include "gc/g1/g1MonotonicArenaFreeMemoryTask.hpp"
@@ -325,7 +326,7 @@ G1CollectedHeap::humongous_obj_allocate_initialize_regions(HeapRegion* first_hr,
   for (uint i = first; i <= last; ++i) {
     HeapRegion *hr = region_at(i);
     _humongous_set.add(hr);
-    _hr_printer.alloc(hr);
+    G1HRPrinter::alloc(hr);
   }
 
   return new_obj;
@@ -524,7 +525,7 @@ HeapWord* G1CollectedHeap::alloc_archive_region(size_t word_size, HeapWord* pref
     r->set_top(top);
 
     r->set_old();
-    _hr_printer.alloc(r);
+    G1HRPrinter::alloc(r);
     _old_set.add(r);
   };
 
@@ -710,17 +711,12 @@ HeapWord* G1CollectedHeap::attempt_allocation_at_safepoint(size_t word_size,
 }
 
 class PostCompactionPrinterClosure: public HeapRegionClosure {
-private:
-  G1HRPrinter* _hr_printer;
 public:
   bool do_heap_region(HeapRegion* hr) {
     assert(!hr->is_young(), "not expecting to find young regions");
-    _hr_printer->post_compaction(hr);
+    G1HRPrinter::post_compaction(hr);
     return false;
   }
-
-  PostCompactionPrinterClosure(G1HRPrinter* hr_printer)
-    : _hr_printer(hr_printer) { }
 };
 
 void G1CollectedHeap::print_heap_after_full_collection() {
@@ -728,8 +724,8 @@ void G1CollectedHeap::print_heap_after_full_collection() {
   // We should do this after we potentially resize the heap so
   // that all the COMMIT / UNCOMMIT events are generated before
   // the compaction events.
-  if (_hr_printer.is_active()) {
-    PostCompactionPrinterClosure cl(hr_printer());
+  if (G1HRPrinter::is_active()) {
+    PostCompactionPrinterClosure cl;
     heap_region_iterate(&cl);
   }
 }
@@ -1152,7 +1148,6 @@ G1CollectedHeap::G1CollectedHeap() :
   _monitoring_support(nullptr),
   _num_humongous_objects(0),
   _num_humongous_reclaim_candidates(0),
-  _hr_printer(),
   _collector_state(),
   _old_marking_cycles_started(0),
   _old_marking_cycles_completed(0),
@@ -2862,7 +2857,7 @@ HeapRegion* G1CollectedHeap::new_mutator_alloc_region(size_t word_size,
                                               node_index);
     if (new_alloc_region != nullptr) {
       set_region_short_lived_locked(new_alloc_region);
-      _hr_printer.alloc(new_alloc_region, !should_allocate);
+      G1HRPrinter::alloc(new_alloc_region, !should_allocate);
       _policy->remset_tracker()->update_at_allocate(new_alloc_region);
       return new_alloc_region;
     }
@@ -2878,7 +2873,7 @@ void G1CollectedHeap::retire_mutator_alloc_region(HeapRegion* alloc_region,
   collection_set()->add_eden_region(alloc_region);
   increase_used(allocated_bytes);
   _eden.add_used_bytes(allocated_bytes);
-  _hr_printer.retire(alloc_region);
+  G1HRPrinter::retire(alloc_region);
 
   // We update the eden sizes here, when the region is retired,
   // instead of when it's allocated, since this is the point that its
@@ -2925,7 +2920,7 @@ HeapRegion* G1CollectedHeap::new_gc_alloc_region(size_t word_size, G1HeapRegionA
     }
     _policy->remset_tracker()->update_at_allocate(new_alloc_region);
     register_region_with_region_attr(new_alloc_region);
-    _hr_printer.alloc(new_alloc_region);
+    G1HRPrinter::alloc(new_alloc_region);
     return new_alloc_region;
   }
   return nullptr;
@@ -2946,7 +2941,7 @@ void G1CollectedHeap::retire_gc_alloc_region(HeapRegion* alloc_region,
   if (during_im && allocated_bytes > 0) {
     _cm->add_root_region(alloc_region);
   }
-  _hr_printer.retire(alloc_region);
+  G1HRPrinter::retire(alloc_region);
 }
 
 HeapRegion* G1CollectedHeap::alloc_highest_free_region() {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 3ee77786621..6f31122014f 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -40,7 +40,6 @@
 #include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1HeapTransition.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1MonitoringSupport.hpp"
 #include "gc/g1/g1MonotonicArenaFreeMemoryTask.hpp"
 #include "gc/g1/g1MonotonicArenaFreePool.hpp"
@@ -265,8 +264,6 @@ public:
   void update_parallel_gc_threads_cpu_time();
 private:
 
-  G1HRPrinter _hr_printer;
-
   // Return true if an explicit GC should start a concurrent cycle instead
   // of doing a STW full GC. A concurrent cycle should be started if:
   // (a) cause == _g1_humongous_allocation,
@@ -669,8 +666,6 @@ public:
     return _old_marking_cycles_completed;
   }
 
-  G1HRPrinter* hr_printer() { return &_hr_printer; }
-
   // Allocates a new heap region instance.
   HeapRegion* new_heap_region(uint hrs_index, MemRegion mr);
 
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index fdb380ae99f..68b5050ff60 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -40,6 +40,7 @@
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
+#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.inline.hpp"
@@ -1317,7 +1318,7 @@ public:
     if (!_cleanup_list.is_empty()) {
       log_debug(gc)("Reclaimed %u empty regions", _cleanup_list.length());
       // Now print the empty regions list.
-      _g1h->hr_printer()->mark_reclaim(&_cleanup_list);
+      G1HRPrinter::mark_reclaim(&_cleanup_list);
       // And actually make them available.
       _g1h->prepend_to_freelist(&_cleanup_list);
     }
diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
index 5c1736b13ab..05d087932df 100644
--- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp
+++ b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,11 @@
 
 #include "gc/g1/g1HeapRegion.hpp"
 #include "logging/log.hpp"
+#include "memory/allStatic.hpp"
 
 class FreeRegionList;
 
-class G1HRPrinter {
+class G1HRPrinter : public AllStatic {
 
 private:
 
@@ -40,7 +41,7 @@ private:
                           action, hr->get_type_str(), p2i(hr->bottom()), p2i(hr->top()), p2i(hr->end()));
   }
 
-  void mark_reclaim(HeapRegion* hr) {
+  static void mark_reclaim(HeapRegion* hr) {
     print("MARK-RECLAIM", hr);
   }
 
@@ -48,79 +49,79 @@ public:
   // In some places we iterate over a list in order to generate output
   // for the list's elements. By exposing this we can avoid this
   // iteration if the printer is not active.
-  bool is_active() { return log_is_enabled(Trace, gc, region); }
+  static bool is_active() { return log_is_enabled(Trace, gc, region); }
 
   // The methods below are convenient wrappers for the print() method.
 
-  void alloc(HeapRegion* hr, bool force = false) {
+  static void alloc(HeapRegion* hr, bool force = false) {
     if (is_active()) {
       print((force) ? "ALLOC-FORCE" : "ALLOC", hr);
     }
   }
 
-  void retire(HeapRegion* hr) {
+  static void retire(HeapRegion* hr) {
     if (is_active()) {
       print("RETIRE", hr);
     }
   }
 
-  void reuse(HeapRegion* hr) {
+  static void reuse(HeapRegion* hr) {
     if (is_active()) {
       print("REUSE", hr);
     }
   }
 
-  void cset(HeapRegion* hr) {
+  static void cset(HeapRegion* hr) {
     if (is_active()) {
       print("CSET", hr);
     }
   }
 
-  void evac_failure(HeapRegion* hr) {
+  static void evac_failure(HeapRegion* hr) {
     if (is_active()) {
       print("EVAC-FAILURE", hr);
     }
   }
 
-  void mark_reclaim(FreeRegionList* free_list);
+  static void mark_reclaim(FreeRegionList* free_list);
 
-  void eager_reclaim(HeapRegion* hr) {
+  static void eager_reclaim(HeapRegion* hr) {
     if (is_active()) {
       print("EAGER-RECLAIM", hr);
     }
   }
 
-  void evac_reclaim(HeapRegion* hr) {
+  static void evac_reclaim(HeapRegion* hr) {
     if (is_active()) {
       print("EVAC-RECLAIM", hr);
     }
   }
 
-  void post_compaction(HeapRegion* hr) {
+  static void post_compaction(HeapRegion* hr) {
     if (is_active()) {
       print("POST-COMPACTION", hr);
     }
   }
 
-  void commit(HeapRegion* hr) {
+  static void commit(HeapRegion* hr) {
     if (is_active()) {
       print("COMMIT", hr);
     }
   }
 
-  void active(HeapRegion* hr) {
+  static void active(HeapRegion* hr) {
     if (is_active()) {
       print("ACTIVE", hr);
     }
   }
 
-  void inactive(HeapRegion* hr) {
+  static void inactive(HeapRegion* hr) {
     if (is_active()) {
       print("INACTIVE", hr);
     }
   }
 
-  void uncommit(HeapRegion* hr) {
+  static void uncommit(HeapRegion* hr) {
     if (is_active()) {
       print("UNCOMMIT", hr);
     }
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
index 0fb8e7499d6..0d0f8b6b288 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
@@ -30,6 +30,7 @@
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1HeapRegionManager.inline.hpp"
 #include "gc/g1/g1HeapRegionSet.inline.hpp"
+#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1NUMAStats.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "logging/logStream.hpp"
@@ -170,7 +171,7 @@ void HeapRegionManager::expand(uint start, uint num_regions, WorkerThreads* pret
       _regions.set_by_index(i, hr);
       _allocated_heapregions_length = MAX2(_allocated_heapregions_length, i + 1);
     }
-    G1CollectedHeap::heap()->hr_printer()->commit(hr);
+    G1HRPrinter::commit(hr);
   }
   activate_regions(start, num_regions);
 }
@@ -193,13 +194,12 @@ void HeapRegionManager::uncommit_regions(uint start, uint num_regions) {
   guarantee(num_regions > 0, "No point in calling this for zero regions");
 
   uint end = start + num_regions;
-  G1HRPrinter* printer = G1CollectedHeap::heap()->hr_printer();
-  if (printer->is_active()) {
+  if (G1HRPrinter::is_active()) {
     for (uint i = start; i < end; i++) {
       // Can't use at() here since region is no longer marked available.
       HeapRegion* hr = _regions.get_by_index(i);
       assert(hr != nullptr, "Region should still be present");
-      printer->uncommit(hr);
+      G1HRPrinter::uncommit(hr);
     }
   }
 
@@ -223,7 +223,7 @@ void HeapRegionManager::initialize_regions(uint start, uint num_regions) {
     hr->initialize();
     hr->set_node_index(G1NUMA::numa()->index_for_region(hr));
     insert_into_free_list(hr);
-    G1CollectedHeap::heap()->hr_printer()->active(hr);
+    G1HRPrinter::active(hr);
   }
 }
 
@@ -250,7 +250,7 @@ void HeapRegionManager::deactivate_regions(uint start, uint num_regions) {
   for (uint i = start; i < end; i++) {
     HeapRegion* hr = at(i);
     hr->set_node_index(G1NUMA::UnknownNodeIndex);
-    G1CollectedHeap::heap()->hr_printer()->inactive(hr);
+    G1HRPrinter::inactive(hr);
   }
 
   _committed_map.deactivate(start, end);
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index c495889faad..da9a7d9a575 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -27,6 +27,7 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1CollectionSet.hpp"
 #include "gc/g1/g1EvacFailureRegions.inline.hpp"
+#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1ParScanThreadState.inline.hpp"
 #include "gc/g1/g1RootClosures.hpp"
@@ -642,7 +643,7 @@ oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markWord m, siz
     HeapRegion* r = _g1h->heap_region_containing(old);
 
     if (_evac_failure_regions->record(_worker_id, r->hrm_index(), cause_pinned)) {
-      _g1h->hr_printer()->evac_failure(r);
+      G1HRPrinter::evac_failure(r);
     }
 
     // Mark the failing object in the marking bitmap and later use the bitmap to handle
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index 906d9854d8d..f08d6543efd 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -216,10 +216,6 @@ G1GCPhaseTimes* G1YoungCollector::phase_times() const {
   return _g1h->phase_times();
 }
 
-G1HRPrinter* G1YoungCollector::hr_printer() const {
-  return _g1h->hr_printer();
-}
-
 G1MonitoringSupport* G1YoungCollector::monitoring_support() const {
   return _g1h->monitoring_support();
 }
@@ -264,13 +260,9 @@ void G1YoungCollector::wait_for_root_region_scanning() {
 }
 
 class G1PrintCollectionSetClosure : public HeapRegionClosure {
-private:
-  G1HRPrinter* _hr_printer;
 public:
-  G1PrintCollectionSetClosure(G1HRPrinter* hr_printer) : HeapRegionClosure(), _hr_printer(hr_printer) { }
-
   virtual bool do_heap_region(HeapRegion* r) {
-    _hr_printer->cset(r);
+    G1HRPrinter::cset(r);
     return false;
   }
 };
@@ -286,8 +278,8 @@ void G1YoungCollector::calculate_collection_set(G1EvacInfo* evacuation_info, dou
 
   concurrent_mark()->verify_no_collection_set_oops();
 
-  if (hr_printer()->is_active()) {
-    G1PrintCollectionSetClosure cl(hr_printer());
+  if (G1HRPrinter::is_active()) {
+    G1PrintCollectionSetClosure cl;
     collection_set()->iterate(&cl);
     collection_set()->iterate_optional(&cl);
   }
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.hpp b/src/hotspot/share/gc/g1/g1YoungCollector.hpp
index e7f3c51b65c..260880e2d8c 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.hpp
@@ -40,7 +40,6 @@ class G1ConcurrentMark;
 class G1EvacFailureRegions;
 class G1EvacInfo;
 class G1GCPhaseTimes;
-class G1HRPrinter;
 class G1MonitoringSupport;
 class G1MonotonicArenaMemoryStats;
 class G1NewTracer;
@@ -69,7 +68,6 @@ class G1YoungCollector {
   STWGCTimer* gc_timer_stw() const;
   G1NewTracer* gc_tracer_stw() const;
 
-  G1HRPrinter* hr_printer() const;
   G1MonitoringSupport* monitoring_support() const;
   G1GCPhaseTimes* phase_times() const;
   G1Policy* policy() const;
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
index 98f4c43d275..16c617323c8 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
@@ -36,6 +36,7 @@
 #include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
+#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1ParScanThreadState.hpp"
 #include "gc/g1/g1RemSet.hpp"
@@ -412,7 +413,7 @@ public:
       r->set_containing_set(nullptr);
       _humongous_regions_reclaimed++;
       _g1h->free_humongous_region(r, nullptr);
-      _g1h->hr_printer()->eager_reclaim(r);
+      G1HRPrinter::eager_reclaim(r);
     };
 
     _g1h->humongous_obj_regions_iterate(r, free_humongous_region);
@@ -760,7 +761,7 @@ class FreeCSetClosure : public HeapRegionClosure {
 
     // Free the region and its remembered set.
     _g1h->free_region(r, nullptr);
-    _g1h->hr_printer()->evac_reclaim(r);
+    G1HRPrinter::evac_reclaim(r);
   }
 
   void handle_failed_region(HeapRegion* r) {

From 3c77dad007df2329eb653264cb8e0273f09fabfe Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 3 May 2024 12:06:11 +0000
Subject: [PATCH 314/486] 8331507: JFR: Improve example usage in
 -XX:StartFlightRecording:help

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/internal/dcmd/DCmdStart.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
index 0dbd70801d2..d115b9f5b62 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
@@ -321,6 +321,7 @@ final class DCmdStart extends AbstractDCmd {
     public String[] getStartupHelp() {
         Map<String, String> parameters = Map.of(
             "$SYNTAX", "-XX:StartFlightRecording:[options]",
+            "$SOURCE_NO_ARGUMENTS", "-XX:StartFlightRecording",
             "$SOURCE", "-XX:StartFlightRecording:",
             "$DELIMITER", ",",
             "$DELIMITER_NAME", "comma",
@@ -334,6 +335,7 @@ final class DCmdStart extends AbstractDCmd {
     public String[] getHelp() {
         Map<String, String> parameters = Map.of(
            "$SYNTAX", "JFR.start [options]",
+           "$SOURCE_NO_ARGUMENTS", "$ jcmd <pid> JFR.start",
            "$SOURCE", "$ jcmd <pid> JFR.start ",
            "$DELIMITER", " ",
            "$DELIMITER_NAME", "whitespace",
@@ -440,7 +442,7 @@ final class DCmdStart extends AbstractDCmd {
 
                Example usage:
 
-                $SOURCE
+                $SOURCE_NO_ARGUMENTS
                 $SOURCEfilename=dump.jfr
                 $SOURCEfilename=$DIRECTORY
                 $SOURCEdumponexit=true

From 58ef9e4805c0cc78935eb5a1c82ae10411d52e85 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 3 May 2024 12:33:41 +0000
Subject: [PATCH 315/486] 8331402: G1: Remove is_active() calls in G1HRPrinter
 logging

Reviewed-by: iwalulya, ayang, gli
---
 src/hotspot/share/gc/g1/g1HRPrinter.hpp | 74 ++++---------------------
 1 file changed, 12 insertions(+), 62 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
index 05d087932df..035e92fefac 100644
--- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp
+++ b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
@@ -33,8 +33,6 @@ class FreeRegionList;
 
 class G1HRPrinter : public AllStatic {
 
-private:
-
   // Print an action event.
   static void print(const char* action, HeapRegion* hr) {
     log_trace(gc, region)("G1HR %s(%s) [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT "]",
@@ -53,79 +51,31 @@ public:
 
   // The methods below are convenient wrappers for the print() method.
 
-  static void alloc(HeapRegion* hr, bool force = false) {
-    if (is_active()) {
-      print((force) ? "ALLOC-FORCE" : "ALLOC", hr);
-    }
-  }
+  static void alloc(HeapRegion* hr, bool force = false) { print(force ? "ALLOC-FORCE" : "ALLOC", hr); }
 
-  static void retire(HeapRegion* hr) {
-    if (is_active()) {
-      print("RETIRE", hr);
-    }
-  }
+  static void retire(HeapRegion* hr)                    { print("RETIRE", hr); }
 
-  static void reuse(HeapRegion* hr) {
-    if (is_active()) {
-      print("REUSE", hr);
-    }
-  }
+  static void reuse(HeapRegion* hr)                     { print("REUSE", hr); }
 
-  static void cset(HeapRegion* hr) {
-    if (is_active()) {
-      print("CSET", hr);
-    }
-  }
+  static void cset(HeapRegion* hr)                      { print("CSET", hr); }
 
-  static void evac_failure(HeapRegion* hr) {
-    if (is_active()) {
-      print("EVAC-FAILURE", hr);
-    }
-  }
+  static void evac_failure(HeapRegion* hr)              { print("EVAC-FAILURE", hr); }
 
   static void mark_reclaim(FreeRegionList* free_list);
 
-  static void eager_reclaim(HeapRegion* hr) {
-    if (is_active()) {
-      print("EAGER-RECLAIM", hr);
-    }
-  }
+  static void eager_reclaim(HeapRegion* hr)             { print("EAGER-RECLAIM", hr); }
 
-  static void evac_reclaim(HeapRegion* hr) {
-    if (is_active()) {
-      print("EVAC-RECLAIM", hr);
-    }
-  }
+  static void evac_reclaim(HeapRegion* hr)              { print("EVAC-RECLAIM", hr); }
 
-  static void post_compaction(HeapRegion* hr) {
-    if (is_active()) {
-      print("POST-COMPACTION", hr);
-    }
-  }
+  static void post_compaction(HeapRegion* hr)           { print("POST-COMPACTION", hr); }
 
-  static void commit(HeapRegion* hr) {
-    if (is_active()) {
-      print("COMMIT", hr);
-    }
-  }
+  static void commit(HeapRegion* hr)                    { print("COMMIT", hr); }
 
-  static void active(HeapRegion* hr) {
-    if (is_active()) {
-      print("ACTIVE", hr);
-    }
-  }
+  static void active(HeapRegion* hr)                    { print("ACTIVE", hr); }
 
-  static void inactive(HeapRegion* hr) {
-    if (is_active()) {
-      print("INACTIVE", hr);
-    }
-  }
+  static void inactive(HeapRegion* hr)                  { print("INACTIVE", hr); }
 
-  static void uncommit(HeapRegion* hr) {
-    if (is_active()) {
-      print("UNCOMMIT", hr);
-    }
-  }
+  static void uncommit(HeapRegion* hr)                  { print("UNCOMMIT", hr); }
 };
 
 #endif // SHARE_GC_G1_G1HRPRINTER_HPP

From ce73fec882357d749619576a3219516b7391fb3f Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Fri, 3 May 2024 12:35:58 +0000
Subject: [PATCH 316/486] 8331048: G1: Prune rebuild candidates based on
 G1HeapWastePercent early

Reviewed-by: ayang, tschatzl
---
 .../share/gc/g1/g1CollectionSetCandidates.cpp | 40 +++++++++++++++----
 .../share/gc/g1/g1CollectionSetCandidates.hpp |  6 ++-
 .../share/gc/g1/g1CollectionSetChooser.cpp    | 11 +++--
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  |  7 ++++
 src/hotspot/share/gc/g1/g1Policy.cpp          |  2 +-
 src/hotspot/share/gc/g1/g1Policy.hpp          |  3 +-
 6 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
index b4649414b10..36a194bdfb0 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/g1/g1CollectionSetCandidates.hpp"
+#include "gc/g1/g1CollectionSetCandidates.inline.hpp"
 #include "gc/g1/g1CollectionSetChooser.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "utilities/bitMap.inline.hpp"
@@ -44,7 +44,7 @@ void G1CollectionCandidateList::append_unsorted(HeapRegion* r) {
 }
 
 void G1CollectionCandidateList::sort_by_efficiency() {
-  _candidates.sort(compare);
+  _candidates.sort(compare_gc_efficiency);
 }
 
 void G1CollectionCandidateList::remove(G1CollectionCandidateRegionList* other) {
@@ -94,7 +94,22 @@ void G1CollectionCandidateList::verify() {
 }
 #endif
 
-int G1CollectionCandidateList::compare(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2) {
+int G1CollectionCandidateList::compare_gc_efficiency(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2) {
+  assert(ci1->_r != nullptr && ci2->_r != nullptr, "Should not be!");
+
+  double gc_eff1 = ci1->_gc_efficiency;
+  double gc_eff2 = ci2->_gc_efficiency;
+
+  if (gc_eff1 > gc_eff2) {
+    return -1;
+  } else if (gc_eff1 < gc_eff2) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+int G1CollectionCandidateList::compare_reclaimble_bytes(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2) {
   // Make sure that null entries are moved to the end.
   if (ci1->_r == nullptr) {
     if (ci2->_r == nullptr) {
@@ -106,12 +121,12 @@ int G1CollectionCandidateList::compare(G1CollectionSetCandidateInfo* ci1, G1Coll
     return -1;
   }
 
-  double gc_eff1 = ci1->_gc_efficiency;
-  double gc_eff2 = ci2->_gc_efficiency;
+  size_t reclaimable1 = ci1->_r->reclaimable_bytes();
+  size_t reclaimable2 = ci2->_r->reclaimable_bytes();
 
-  if (gc_eff1 > gc_eff2) {
+  if (reclaimable1 > reclaimable2) {
     return -1;
-  } if (gc_eff1 < gc_eff2) {
+  } else if (reclaimable1 < reclaimable2) {
     return 1;
   } else {
     return 0;
@@ -182,6 +197,17 @@ void G1CollectionSetCandidates::clear() {
   _last_marking_candidates_length = 0;
 }
 
+void G1CollectionSetCandidates::sort_marking_by_efficiency() {
+  G1CollectionCandidateListIterator iter = _marking_regions.begin();
+  for (; iter != _marking_regions.end(); ++iter) {
+    HeapRegion* hr = (*iter)->_r;
+    (*iter)->_gc_efficiency = hr->calc_gc_efficiency();
+  }
+  _marking_regions.sort_by_efficiency();
+
+  _marking_regions.verify();
+}
+
 void G1CollectionSetCandidates::set_candidates_from_marking(G1CollectionSetCandidateInfo* candidate_infos,
                                                             uint num_infos) {
   assert(_marking_regions.length() == 0, "must be empty before adding new ones");
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
index 4eb5523d039..dd38d33b5d3 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
@@ -129,7 +129,9 @@ public:
   // Comparison function to order regions in decreasing GC efficiency order. This
   // will cause regions with a lot of live objects and large remembered sets to end
   // up at the end of the list.
-  static int compare(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2);
+  static int compare_gc_efficiency(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2);
+
+  static int compare_reclaimble_bytes(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2);
 
   G1CollectionCandidateListIterator begin() {
     return G1CollectionCandidateListIterator(this, 0);
@@ -213,6 +215,8 @@ public:
 
   void sort_by_efficiency();
 
+  void sort_marking_by_efficiency();
+
   // Add the given region to the set of retained regions without regards to the
   // gc efficiency sorting. The retained regions must be re-sorted manually later.
   void add_retained_region_unsorted(HeapRegion* r);
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
index 92a342ec757..df3e72cb22f 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
@@ -94,17 +94,17 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
     void set(uint idx, HeapRegion* hr) {
       assert(idx < _max_size, "Index %u out of bounds %u", idx, _max_size);
       assert(_data[idx]._r == nullptr, "Value must not have been set.");
-      _data[idx] = CandidateInfo(hr, hr->calc_gc_efficiency());
+      _data[idx] = CandidateInfo(hr, 0.0);
     }
 
-    void sort_by_efficiency() {
+    void sort_by_reclaimable_bytes() {
       if (_cur_claim_idx == 0) {
         return;
       }
       for (uint i = _cur_claim_idx; i < _max_size; i++) {
         assert(_data[i]._r == nullptr, "must be");
       }
-      qsort(_data, _cur_claim_idx, sizeof(_data[0]), (_sort_Fn)G1CollectionCandidateList::compare);
+      qsort(_data, _cur_claim_idx, sizeof(_data[0]), (_sort_Fn)G1CollectionCandidateList::compare_reclaimble_bytes);
       for (uint i = _cur_claim_idx; i < _max_size; i++) {
         assert(_data[i]._r == nullptr, "must be");
       }
@@ -152,8 +152,7 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
       }
 
       // Can not add a region without a remembered set to the candidates.
-      assert(!r->rem_set()->is_updating(), "must be");
-      if (!r->rem_set()->is_complete()) {
+      if (!r->rem_set()->is_tracked()) {
         return false;
       }
 
@@ -249,7 +248,7 @@ public:
   }
 
   void sort_and_prune_into(G1CollectionSetCandidates* candidates) {
-    _result.sort_by_efficiency();
+    _result.sort_by_reclaimable_bytes();
     prune(_result.array());
     candidates->set_candidates_from_marking(_result.array(),
                                             _num_regions_added);
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 68b5050ff60..f2af91d241e 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -1438,7 +1438,14 @@ void G1ConcurrentMark::remark() {
 
       log_debug(gc, remset, tracking)("Remembered Set Tracking update regions total %u, selected %u",
                                         _g1h->num_regions(), cl.total_selected_for_rebuild());
+
       _needs_remembered_set_rebuild = (cl.total_selected_for_rebuild() > 0);
+
+      if (_needs_remembered_set_rebuild) {
+        // Prune rebuild candidates based on G1HeapWastePercent.
+        // Improves rebuild time in addition to remembered set memory usage.
+        G1CollectionSetChooser::build(_g1h->workers(), _g1h->num_regions(), _g1h->policy()->candidates());
+      }
     }
 
     if (log_is_enabled(Trace, gc, liveness)) {
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index dd9d937ad77..b27ddd0a9bb 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -1310,7 +1310,7 @@ void G1Policy::decide_on_concurrent_start_pause() {
 void G1Policy::record_concurrent_mark_cleanup_end(bool has_rebuilt_remembered_sets) {
   bool mixed_gc_pending = false;
   if (has_rebuilt_remembered_sets) {
-    G1CollectionSetChooser::build(_g1h->workers(), _g1h->num_regions(), candidates());
+    candidates()->sort_marking_by_efficiency();
     mixed_gc_pending = next_gc_should_be_mixed();
   }
 
diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index c951909788c..43759dc4767 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -184,9 +184,10 @@ public:
     return _mmu_tracker->max_gc_time() * 1000.0;
   }
 
+  G1CollectionSetCandidates* candidates() const;
+
 private:
   G1CollectionSet* _collection_set;
-  G1CollectionSetCandidates* candidates() const;
 
   double average_time_ms(G1GCPhaseTimes::GCParPhases phase) const;
   double other_time_ms(double pause_time_ms) const;

From 9697bc38586059d9bb020d3ca44a1c6cd7de315c Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 3 May 2024 13:02:37 +0000
Subject: [PATCH 317/486] 8331428: ubsan: JVM flag checking complains about 
 MaxTenuringThresholdConstraintFunc, InitialTenuringThresholdConstraintFunc
 and AllocatePrefetchStepSizeConstraintFunc

Reviewed-by: stefank, aboldtch, tschatzl
---
 src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp        | 6 +++---
 src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp        | 6 +++---
 .../share/runtime/flags/jvmFlagConstraintsCompiler.cpp      | 6 +++---
 .../share/runtime/flags/jvmFlagConstraintsCompiler.hpp      | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
index 6c6f83177d2..cb36962e61e 100644
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -174,7 +174,7 @@ JVMFlag::Error MaxMetaspaceFreeRatioConstraintFunc(uint value, bool verbose) {
   }
 }
 
-JVMFlag::Error InitialTenuringThresholdConstraintFunc(uintx value, bool verbose) {
+JVMFlag::Error InitialTenuringThresholdConstraintFunc(uint value, bool verbose) {
 #if INCLUDE_PARALLELGC
   JVMFlag::Error status = InitialTenuringThresholdConstraintFuncParallel(value, verbose);
   if (status != JVMFlag::SUCCESS) {
@@ -185,7 +185,7 @@ JVMFlag::Error InitialTenuringThresholdConstraintFunc(uintx value, bool verbose)
   return JVMFlag::SUCCESS;
 }
 
-JVMFlag::Error MaxTenuringThresholdConstraintFunc(uintx value, bool verbose) {
+JVMFlag::Error MaxTenuringThresholdConstraintFunc(uint value, bool verbose) {
 #if INCLUDE_PARALLELGC
   JVMFlag::Error status = MaxTenuringThresholdConstraintFuncParallel(value, verbose);
   if (status != JVMFlag::SUCCESS) {
diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
index 591838c0717..a89f42959e1 100644
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -49,8 +49,8 @@
  f(size_t, MarkStackSizeConstraintFunc)                        \
  f(uint,   MinMetaspaceFreeRatioConstraintFunc)                \
  f(uint,   MaxMetaspaceFreeRatioConstraintFunc)                \
- f(uintx,  InitialTenuringThresholdConstraintFunc)             \
- f(uintx,  MaxTenuringThresholdConstraintFunc)                 \
+ f(uint,   InitialTenuringThresholdConstraintFunc)             \
+ f(uint,   MaxTenuringThresholdConstraintFunc)                 \
                                                                \
  f(uintx,  MaxGCPauseMillisConstraintFunc)                     \
  f(uintx,  GCPauseIntervalMillisConstraintFunc)                \
diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
index c32177224a5..2cd7371909d 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -67,11 +67,11 @@ JVMFlag::Error CICompilerCountConstraintFunc(intx value, bool verbose) {
   }
 }
 
-JVMFlag::Error AllocatePrefetchStepSizeConstraintFunc(intx value, bool verbose) {
+JVMFlag::Error AllocatePrefetchStepSizeConstraintFunc(int value, bool verbose) {
   if (AllocatePrefetchStyle == 3) {
     if (value % wordSize != 0) {
       JVMFlag::printError(verbose,
-                          "AllocatePrefetchStepSize (" INTX_FORMAT ") must be multiple of %d\n",
+                          "AllocatePrefetchStepSize (%d) must be multiple of %d\n",
                           value, wordSize);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp
index 8538c836ca9..60adf4903a3 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, 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
@@ -37,7 +37,7 @@
 #define COMPILER_CONSTRAINTS(f)                         \
   f(intx,  CICompilerCountConstraintFunc)               \
   f(intx,  AllocatePrefetchInstrConstraintFunc)         \
-  f(intx,  AllocatePrefetchStepSizeConstraintFunc)      \
+  f(int,   AllocatePrefetchStepSizeConstraintFunc)      \
   f(intx,  CompileThresholdConstraintFunc)              \
   f(intx,  OnStackReplacePercentageConstraintFunc)      \
   f(uintx, CodeCacheSegmentSizeConstraintFunc)          \

From 1d083eb15a653dbfbd262de76c1312207192bda7 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 3 May 2024 13:10:00 +0000
Subject: [PATCH 318/486] 8331562: G1: Remove API to force allocation of new
 regions

Reviewed-by: iwalulya, ayang, gli
---
 src/hotspot/share/gc/g1/g1AllocRegion.cpp      | 14 +++++---------
 src/hotspot/share/gc/g1/g1AllocRegion.hpp      | 18 +++++-------------
 .../share/gc/g1/g1AllocRegion.inline.hpp       | 15 +--------------
 src/hotspot/share/gc/g1/g1Allocator.hpp        |  2 --
 src/hotspot/share/gc/g1/g1Allocator.inline.hpp |  5 -----
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp    |  5 ++---
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp    |  2 +-
 src/hotspot/share/gc/g1/g1HRPrinter.hpp        |  2 +-
 8 files changed, 15 insertions(+), 48 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.cpp b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
index f20f24bcde4..b86fe1099ac 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
@@ -130,13 +130,12 @@ size_t G1AllocRegion::retire(bool fill_up) {
   return waste;
 }
 
-HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size,
-                                                       bool force) {
+HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size) {
   assert_alloc_region(_alloc_region == _dummy_region, "pre-condition");
   assert_alloc_region(_used_bytes_before == 0, "pre-condition");
 
   trace("attempting region allocation");
-  HeapRegion* new_alloc_region = allocate_new_region(word_size, force);
+  HeapRegion* new_alloc_region = allocate_new_region(word_size);
   if (new_alloc_region != nullptr) {
     new_alloc_region->reset_pre_dummy_top();
     // Need to do this before the allocation
@@ -258,9 +257,8 @@ G1AllocRegion::G1AllocRegion(const char* name,
     _node_index(node_index)
  { }
 
-HeapRegion* MutatorAllocRegion::allocate_new_region(size_t word_size,
-                                                    bool force) {
-  return _g1h->new_mutator_alloc_region(word_size, force, _node_index);
+HeapRegion* MutatorAllocRegion::allocate_new_region(size_t word_size) {
+  return _g1h->new_mutator_alloc_region(word_size, _node_index);
 }
 
 void MutatorAllocRegion::retire_region(HeapRegion* alloc_region,
@@ -344,9 +342,7 @@ HeapRegion* MutatorAllocRegion::release() {
   return ret;
 }
 
-HeapRegion* G1GCAllocRegion::allocate_new_region(size_t word_size,
-                                                 bool force) {
-  assert(!force, "not supported for GC alloc regions");
+HeapRegion* G1GCAllocRegion::allocate_new_region(size_t word_size) {
   return _g1h->new_gc_alloc_region(word_size, _purpose, _node_index);
 }
 
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
index b39a717d3b7..9ea20c676f4 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
@@ -83,10 +83,8 @@ private:
   void update_alloc_region(HeapRegion* alloc_region);
 
   // Allocate a new active region and use it to perform a word_size
-  // allocation. The force parameter will be passed on to
-  // G1CollectedHeap::allocate_new_alloc_region() and tells it to try
-  // to allocate a new region even if the max has been reached.
-  HeapWord* new_alloc_region_and_allocate(size_t word_size, bool force);
+  // allocation.
+  HeapWord* new_alloc_region_and_allocate(size_t word_size);
 
   // Perform an allocation out of a new allocation region, retiring the current one.
   inline HeapWord* attempt_allocation_using_new_region(size_t min_word_size,
@@ -132,7 +130,7 @@ protected:
   // For convenience as subclasses use it.
   static G1CollectedHeap* _g1h;
 
-  virtual HeapRegion* allocate_new_region(size_t word_size, bool force) = 0;
+  virtual HeapRegion* allocate_new_region(size_t word_size) = 0;
   virtual void retire_region(HeapRegion* alloc_region,
                              size_t allocated_bytes) = 0;
 
@@ -172,12 +170,6 @@ public:
                                              size_t desired_word_size,
                                              size_t* actual_word_size);
 
-  // Should be called to allocate a new region even if the max of this
-  // type of regions has been reached. Should only be called if other
-  // allocation attempts have failed and we are not holding a valid
-  // active region.
-  inline HeapWord* attempt_allocation_force(size_t word_size);
-
   // Should be called before we start using this object.
   virtual void init();
 
@@ -213,7 +205,7 @@ private:
   // in it and the free size in the currently retained region, if any.
   bool should_retain(HeapRegion* region);
 protected:
-  virtual HeapRegion* allocate_new_region(size_t word_size, bool force);
+  virtual HeapRegion* allocate_new_region(size_t word_size);
   virtual void retire_region(HeapRegion* alloc_region, size_t allocated_bytes);
   virtual size_t retire(bool fill_up);
 public:
@@ -249,7 +241,7 @@ protected:
   G1EvacStats* _stats;
   G1HeapRegionAttr::region_type_t _purpose;
 
-  virtual HeapRegion* allocate_new_region(size_t word_size, bool force);
+  virtual HeapRegion* allocate_new_region(size_t word_size);
   virtual void retire_region(HeapRegion* alloc_region, size_t allocated_bytes);
 
   virtual size_t retire(bool fill_up);
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
index 00ef254e84c..9e702a4f8c9 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
@@ -98,7 +98,7 @@ inline HeapWord* G1AllocRegion::attempt_allocation_using_new_region(size_t min_w
                                                                     size_t desired_word_size,
                                                                     size_t* actual_word_size) {
   retire(true /* fill_up */);
-  HeapWord* result = new_alloc_region_and_allocate(desired_word_size, false /* force */);
+  HeapWord* result = new_alloc_region_and_allocate(desired_word_size);
   if (result != nullptr) {
     *actual_word_size = desired_word_size;
     trace("alloc locked (second attempt)", min_word_size, desired_word_size, *actual_word_size, result);
@@ -108,19 +108,6 @@ inline HeapWord* G1AllocRegion::attempt_allocation_using_new_region(size_t min_w
   return nullptr;
 }
 
-inline HeapWord* G1AllocRegion::attempt_allocation_force(size_t word_size) {
-  assert_alloc_region(_alloc_region != nullptr, "not initialized properly");
-
-  trace("forcing alloc", word_size, word_size);
-  HeapWord* result = new_alloc_region_and_allocate(word_size, true /* force */);
-  if (result != nullptr) {
-    trace("alloc forced", word_size, word_size, word_size, result);
-    return result;
-  }
-  trace("alloc forced failed", word_size, word_size);
-  return nullptr;
-}
-
 inline HeapWord* MutatorAllocRegion::attempt_retained_allocation(size_t min_word_size,
                                                                  size_t desired_word_size,
                                                                  size_t* actual_word_size) {
diff --git a/src/hotspot/share/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp
index 32f37778a18..e273365b12f 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.hpp
@@ -121,8 +121,6 @@ public:
   // current allocation region, and then attempts an allocation using a new region.
   inline HeapWord* attempt_allocation_locked(size_t word_size);
 
-  inline HeapWord* attempt_allocation_force(size_t word_size);
-
   size_t unsafe_max_tlab_alloc();
   size_t used_in_alloc_regions();
 
diff --git a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
index 13ae9b9bbbd..ff84306e74f 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
@@ -71,11 +71,6 @@ inline HeapWord* G1Allocator::attempt_allocation_locked(size_t word_size) {
   return result;
 }
 
-inline HeapWord* G1Allocator::attempt_allocation_force(size_t word_size) {
-  uint node_index = current_node_index();
-  return mutator_alloc_region(node_index)->attempt_allocation_force(word_size);
-}
-
 inline PLAB* G1PLABAllocator::alloc_buffer(G1HeapRegionAttr dest, uint node_index) const {
   assert(dest.is_valid(),
          "Allocation buffer index out of bounds: %s", dest.get_type_str());
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 45f570dcd2b..c411b7a7534 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2846,18 +2846,17 @@ void G1CollectedHeap::rebuild_region_sets(bool free_list_only) {
 // Methods for the mutator alloc region
 
 HeapRegion* G1CollectedHeap::new_mutator_alloc_region(size_t word_size,
-                                                      bool force,
                                                       uint node_index) {
   assert_heap_locked_or_at_safepoint(true /* should_be_vm_thread */);
   bool should_allocate = policy()->should_allocate_mutator_region();
-  if (force || should_allocate) {
+  if (should_allocate) {
     HeapRegion* new_alloc_region = new_region(word_size,
                                               HeapRegionType::Eden,
                                               false /* do_expand */,
                                               node_index);
     if (new_alloc_region != nullptr) {
       set_region_short_lived_locked(new_alloc_region);
-      G1HRPrinter::alloc(new_alloc_region, !should_allocate);
+      G1HRPrinter::alloc(new_alloc_region);
       _policy->remset_tracker()->update_at_allocate(new_alloc_region);
       return new_alloc_region;
     }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 6f31122014f..3aaa6d8b723 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -465,7 +465,7 @@ private:
   // These methods are the "callbacks" from the G1AllocRegion class.
 
   // For mutator alloc regions.
-  HeapRegion* new_mutator_alloc_region(size_t word_size, bool force, uint node_index);
+  HeapRegion* new_mutator_alloc_region(size_t word_size, uint node_index);
   void retire_mutator_alloc_region(HeapRegion* alloc_region,
                                    size_t allocated_bytes);
 
diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
index 035e92fefac..57e451bbb61 100644
--- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp
+++ b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
@@ -51,7 +51,7 @@ public:
 
   // The methods below are convenient wrappers for the print() method.
 
-  static void alloc(HeapRegion* hr, bool force = false) { print(force ? "ALLOC-FORCE" : "ALLOC", hr); }
+  static void alloc(HeapRegion* hr)                     { print("ALLOC", hr); }
 
   static void retire(HeapRegion* hr)                    { print("RETIRE", hr); }
 

From 37c24695390e409aae6df9f7d2ecc86724dd051d Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 3 May 2024 13:27:58 +0000
Subject: [PATCH 319/486] 8331633: Use MIN2 in bound_minus_alignment

Reviewed-by: zgu
---
 src/hotspot/share/gc/shared/genArguments.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shared/genArguments.cpp b/src/hotspot/share/gc/shared/genArguments.cpp
index fa0e675cf73..3c1d1ac6ec1 100644
--- a/src/hotspot/share/gc/shared/genArguments.cpp
+++ b/src/hotspot/share/gc/shared/genArguments.cpp
@@ -58,7 +58,7 @@ static size_t bound_minus_alignment(size_t desired_size,
                                     size_t maximum_size,
                                     size_t alignment) {
   size_t max_minus = maximum_size - alignment;
-  return desired_size < max_minus ? desired_size : max_minus;
+  return MIN2(desired_size, max_minus);
 }
 
 void GenArguments::initialize_alignments() {

From 87bb66cea1b6b70fc4929e7a6e3788883f87e02d Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 3 May 2024 13:39:48 +0000
Subject: [PATCH 320/486] 8331569: G1: Rename G1HRPrinter to
 G1HeapRegionPrinter

Reviewed-by: gli, ayang
---
 src/hotspot/share/gc/g1/g1Allocator.cpp        |  4 ++--
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp    | 18 +++++++++---------
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp   |  4 ++--
 .../share/gc/g1/g1HeapRegionManager.cpp        | 12 ++++++------
 ...g1HRPrinter.cpp => g1HeapRegionPrinter.cpp} |  6 +++---
 ...g1HRPrinter.hpp => g1HeapRegionPrinter.hpp} |  8 ++++----
 .../share/gc/g1/g1ParScanThreadState.cpp       |  4 ++--
 src/hotspot/share/gc/g1/g1YoungCollector.cpp   |  6 +++---
 .../share/gc/g1/g1YoungGCPostEvacuateTasks.cpp |  6 +++---
 9 files changed, 34 insertions(+), 34 deletions(-)
 rename src/hotspot/share/gc/g1/{g1HRPrinter.cpp => g1HeapRegionPrinter.cpp} (86%)
 rename src/hotspot/share/gc/g1/{g1HRPrinter.hpp => g1HeapRegionPrinter.hpp} (94%)

diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp
index 758d16a89f5..2a028f480c0 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.cpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.cpp
@@ -29,9 +29,9 @@
 #include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1HeapRegionType.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1NUMA.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/shared/tlab_globals.hpp"
@@ -119,7 +119,7 @@ void G1Allocator::reuse_retained_old_region(G1EvacInfo* evacuation_info,
     // it's retired again.
     _g1h->old_set_remove(retained_region);
     old->set(retained_region);
-    G1HRPrinter::reuse(retained_region);
+    G1HeapRegionPrinter::reuse(retained_region);
     evacuation_info->set_alloc_regions_used_before(retained_region->used());
   }
 }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index c411b7a7534..f8031c35b9a 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -47,12 +47,12 @@
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1GCPauseType.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1HeapSizingPolicy.hpp"
 #include "gc/g1/g1HeapTransition.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1InitLogger.hpp"
 #include "gc/g1/g1MemoryPool.hpp"
 #include "gc/g1/g1MonotonicArenaFreeMemoryTask.hpp"
@@ -326,7 +326,7 @@ G1CollectedHeap::humongous_obj_allocate_initialize_regions(HeapRegion* first_hr,
   for (uint i = first; i <= last; ++i) {
     HeapRegion *hr = region_at(i);
     _humongous_set.add(hr);
-    G1HRPrinter::alloc(hr);
+    G1HeapRegionPrinter::alloc(hr);
   }
 
   return new_obj;
@@ -525,7 +525,7 @@ HeapWord* G1CollectedHeap::alloc_archive_region(size_t word_size, HeapWord* pref
     r->set_top(top);
 
     r->set_old();
-    G1HRPrinter::alloc(r);
+    G1HeapRegionPrinter::alloc(r);
     _old_set.add(r);
   };
 
@@ -714,7 +714,7 @@ class PostCompactionPrinterClosure: public HeapRegionClosure {
 public:
   bool do_heap_region(HeapRegion* hr) {
     assert(!hr->is_young(), "not expecting to find young regions");
-    G1HRPrinter::post_compaction(hr);
+    G1HeapRegionPrinter::post_compaction(hr);
     return false;
   }
 };
@@ -724,7 +724,7 @@ void G1CollectedHeap::print_heap_after_full_collection() {
   // We should do this after we potentially resize the heap so
   // that all the COMMIT / UNCOMMIT events are generated before
   // the compaction events.
-  if (G1HRPrinter::is_active()) {
+  if (G1HeapRegionPrinter::is_active()) {
     PostCompactionPrinterClosure cl;
     heap_region_iterate(&cl);
   }
@@ -2856,7 +2856,7 @@ HeapRegion* G1CollectedHeap::new_mutator_alloc_region(size_t word_size,
                                               node_index);
     if (new_alloc_region != nullptr) {
       set_region_short_lived_locked(new_alloc_region);
-      G1HRPrinter::alloc(new_alloc_region);
+      G1HeapRegionPrinter::alloc(new_alloc_region);
       _policy->remset_tracker()->update_at_allocate(new_alloc_region);
       return new_alloc_region;
     }
@@ -2872,7 +2872,7 @@ void G1CollectedHeap::retire_mutator_alloc_region(HeapRegion* alloc_region,
   collection_set()->add_eden_region(alloc_region);
   increase_used(allocated_bytes);
   _eden.add_used_bytes(allocated_bytes);
-  G1HRPrinter::retire(alloc_region);
+  G1HeapRegionPrinter::retire(alloc_region);
 
   // We update the eden sizes here, when the region is retired,
   // instead of when it's allocated, since this is the point that its
@@ -2919,7 +2919,7 @@ HeapRegion* G1CollectedHeap::new_gc_alloc_region(size_t word_size, G1HeapRegionA
     }
     _policy->remset_tracker()->update_at_allocate(new_alloc_region);
     register_region_with_region_attr(new_alloc_region);
-    G1HRPrinter::alloc(new_alloc_region);
+    G1HeapRegionPrinter::alloc(new_alloc_region);
     return new_alloc_region;
   }
   return nullptr;
@@ -2940,7 +2940,7 @@ void G1CollectedHeap::retire_gc_alloc_region(HeapRegion* alloc_region,
   if (during_im && allocated_bytes > 0) {
     _cm->add_root_region(alloc_region);
   }
-  G1HRPrinter::retire(alloc_region);
+  G1HeapRegionPrinter::retire(alloc_region);
 }
 
 HeapRegion* G1CollectedHeap::alloc_highest_free_region() {
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index f2af91d241e..804f255217f 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -37,10 +37,10 @@
 #include "gc/g1/g1DirtyCardQueue.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionManager.hpp"
+#include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1HeapRegionSet.inline.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.inline.hpp"
@@ -1318,7 +1318,7 @@ public:
     if (!_cleanup_list.is_empty()) {
       log_debug(gc)("Reclaimed %u empty regions", _cleanup_list.length());
       // Now print the empty regions list.
-      G1HRPrinter::mark_reclaim(&_cleanup_list);
+      G1HeapRegionPrinter::mark_reclaim(&_cleanup_list);
       // And actually make them available.
       _g1h->prepend_to_freelist(&_cleanup_list);
     }
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
index 0d0f8b6b288..81cba2329c8 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
@@ -29,8 +29,8 @@
 #include "gc/g1/g1CommittedRegionMap.inline.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1HeapRegionManager.inline.hpp"
+#include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1HeapRegionSet.inline.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1NUMAStats.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "logging/logStream.hpp"
@@ -171,7 +171,7 @@ void HeapRegionManager::expand(uint start, uint num_regions, WorkerThreads* pret
       _regions.set_by_index(i, hr);
       _allocated_heapregions_length = MAX2(_allocated_heapregions_length, i + 1);
     }
-    G1HRPrinter::commit(hr);
+    G1HeapRegionPrinter::commit(hr);
   }
   activate_regions(start, num_regions);
 }
@@ -194,12 +194,12 @@ void HeapRegionManager::uncommit_regions(uint start, uint num_regions) {
   guarantee(num_regions > 0, "No point in calling this for zero regions");
 
   uint end = start + num_regions;
-  if (G1HRPrinter::is_active()) {
+  if (G1HeapRegionPrinter::is_active()) {
     for (uint i = start; i < end; i++) {
       // Can't use at() here since region is no longer marked available.
       HeapRegion* hr = _regions.get_by_index(i);
       assert(hr != nullptr, "Region should still be present");
-      G1HRPrinter::uncommit(hr);
+      G1HeapRegionPrinter::uncommit(hr);
     }
   }
 
@@ -223,7 +223,7 @@ void HeapRegionManager::initialize_regions(uint start, uint num_regions) {
     hr->initialize();
     hr->set_node_index(G1NUMA::numa()->index_for_region(hr));
     insert_into_free_list(hr);
-    G1HRPrinter::active(hr);
+    G1HeapRegionPrinter::active(hr);
   }
 }
 
@@ -250,7 +250,7 @@ void HeapRegionManager::deactivate_regions(uint start, uint num_regions) {
   for (uint i = start; i < end; i++) {
     HeapRegion* hr = at(i);
     hr->set_node_index(G1NUMA::UnknownNodeIndex);
-    G1HRPrinter::inactive(hr);
+    G1HeapRegionPrinter::inactive(hr);
   }
 
   _committed_map.deactivate(start, end);
diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.cpp b/src/hotspot/share/gc/g1/g1HeapRegionPrinter.cpp
similarity index 86%
rename from src/hotspot/share/gc/g1/g1HRPrinter.cpp
rename to src/hotspot/share/gc/g1/g1HeapRegionPrinter.cpp
index 99769f85390..1c87b800601 100644
--- a/src/hotspot/share/gc/g1/g1HRPrinter.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionPrinter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
 
 #include "precompiled.hpp"
 
+#include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1HeapRegionSet.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
 
-void G1HRPrinter::mark_reclaim(FreeRegionList* cleanup_list) {
+void G1HeapRegionPrinter::mark_reclaim(FreeRegionList* cleanup_list) {
   if (is_active()) {
     FreeRegionListIterator iter(cleanup_list);
     while (iter.more_available()) {
diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HeapRegionPrinter.hpp
similarity index 94%
rename from src/hotspot/share/gc/g1/g1HRPrinter.hpp
rename to src/hotspot/share/gc/g1/g1HeapRegionPrinter.hpp
index 57e451bbb61..20a6e795da0 100644
--- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionPrinter.hpp
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_G1_G1HRPRINTER_HPP
-#define SHARE_GC_G1_G1HRPRINTER_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONPRINTER_HPP
+#define SHARE_GC_G1_G1HEAPREGIONPRINTER_HPP
 
 #include "gc/g1/g1HeapRegion.hpp"
 #include "logging/log.hpp"
@@ -31,7 +31,7 @@
 
 class FreeRegionList;
 
-class G1HRPrinter : public AllStatic {
+class G1HeapRegionPrinter : public AllStatic {
 
   // Print an action event.
   static void print(const char* action, HeapRegion* hr) {
@@ -78,4 +78,4 @@ public:
   static void uncommit(HeapRegion* hr)                  { print("UNCOMMIT", hr); }
 };
 
-#endif // SHARE_GC_G1_G1HRPRINTER_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONPRINTER_HPP
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index da9a7d9a575..bc09a660730 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -27,7 +27,7 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1CollectionSet.hpp"
 #include "gc/g1/g1EvacFailureRegions.inline.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
+#include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1ParScanThreadState.inline.hpp"
 #include "gc/g1/g1RootClosures.hpp"
@@ -643,7 +643,7 @@ oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markWord m, siz
     HeapRegion* r = _g1h->heap_region_containing(old);
 
     if (_evac_failure_regions->record(_worker_id, r->hrm_index(), cause_pinned)) {
-      G1HRPrinter::evac_failure(r);
+      G1HeapRegionPrinter::evac_failure(r);
     }
 
     // Mark the failing object in the marking bitmap and later use the bitmap to handle
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index f08d6543efd..bf1c8b738f8 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -36,7 +36,7 @@
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1EvacFailureRegions.inline.hpp"
 #include "gc/g1/g1EvacInfo.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
+#include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1MonitoringSupport.hpp"
 #include "gc/g1/g1ParScanThreadState.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
@@ -262,7 +262,7 @@ void G1YoungCollector::wait_for_root_region_scanning() {
 class G1PrintCollectionSetClosure : public HeapRegionClosure {
 public:
   virtual bool do_heap_region(HeapRegion* r) {
-    G1HRPrinter::cset(r);
+    G1HeapRegionPrinter::cset(r);
     return false;
   }
 };
@@ -278,7 +278,7 @@ void G1YoungCollector::calculate_collection_set(G1EvacInfo* evacuation_info, dou
 
   concurrent_mark()->verify_no_collection_set_oops();
 
-  if (G1HRPrinter::is_active()) {
+  if (G1HeapRegionPrinter::is_active()) {
     G1PrintCollectionSetClosure cl;
     collection_set()->iterate(&cl);
     collection_set()->iterate_optional(&cl);
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
index 16c617323c8..288abc87be9 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
@@ -35,8 +35,8 @@
 #include "gc/g1/g1EvacInfo.hpp"
 #include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
-#include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1ParScanThreadState.hpp"
 #include "gc/g1/g1RemSet.hpp"
@@ -413,7 +413,7 @@ public:
       r->set_containing_set(nullptr);
       _humongous_regions_reclaimed++;
       _g1h->free_humongous_region(r, nullptr);
-      G1HRPrinter::eager_reclaim(r);
+      G1HeapRegionPrinter::eager_reclaim(r);
     };
 
     _g1h->humongous_obj_regions_iterate(r, free_humongous_region);
@@ -761,7 +761,7 @@ class FreeCSetClosure : public HeapRegionClosure {
 
     // Free the region and its remembered set.
     _g1h->free_region(r, nullptr);
-    G1HRPrinter::evac_reclaim(r);
+    G1HeapRegionPrinter::evac_reclaim(r);
   }
 
   void handle_failed_region(HeapRegion* r) {

From 77b71222a05a5ef3875a71eda26e31b25548cba2 Mon Sep 17 00:00:00 2001
From: Sean Coffey <coffeys@openjdk.org>
Date: Fri, 3 May 2024 15:18:38 +0000
Subject: [PATCH 321/486] 8312104: Update java man pages to include new
 security category in -XshowSettings

Reviewed-by: lancea
---
 src/java.base/share/man/java.1 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/man/java.1 b/src/java.base/share/man/java.1
index 3754408fbde..990fdccf8d5 100644
--- a/src/java.base/share/man/java.1
+++ b/src/java.base/share/man/java.1
@@ -1103,8 +1103,7 @@ following:
 .RS
 .TP
 \f[V]all\f[R]
-Shows all categories of settings.
-This is the default value.
+Shows all categories of settings in \f[B]verbose\f[R] detail.
 .TP
 \f[V]locale\f[R]
 Shows settings related to locale.
@@ -1112,6 +1111,21 @@ Shows settings related to locale.
 \f[V]properties\f[R]
 Shows settings related to system properties.
 .TP
+\f[V]security\f[R]
+Shows all settings related to security.
+.RS
+.PP
+sub-category arguments for \f[V]security\f[R] include the following:
+.IP \[bu] 2
+\f[V]security:all\f[R] : shows all security settings
+.IP \[bu] 2
+\f[V]security:properties\f[R] : shows security properties
+.IP \[bu] 2
+\f[V]security:providers\f[R] : shows static security provider settings
+.IP \[bu] 2
+\f[V]security:tls\f[R] : shows TLS related security settings
+.RE
+.TP
 \f[V]vm\f[R]
 Shows the settings of the JVM.
 .TP

From cf2c80e4fcd74b9d1d60e2358e7883bdd8a4ac80 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Fri, 3 May 2024 16:14:24 +0000
Subject: [PATCH 322/486] 8331582: Incorrect default Console provider comment

Reviewed-by: joehw, jlahoda, jlu, prappo
---
 src/java.base/share/classes/java/io/Console.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java
index a944e8c77fb..bbf2e39eb48 100644
--- a/src/java.base/share/classes/java/io/Console.java
+++ b/src/java.base/share/classes/java/io/Console.java
@@ -406,7 +406,8 @@ public sealed class Console implements Flushable permits ProxyingConsole {
             /*
              * The JdkConsole provider used for Console instantiation can be specified
              * with the system property "jdk.console", whose value designates the module
-             * name of the implementation, and which defaults to "java.base". If no
+             * name of the implementation, and which defaults to the value of
+             * {@code JdkConsoleProvider.DEFAULT_PROVIDER_MODULE_NAME}. If no
              * providers are available, or instantiation failed, java.base built-in
              * Console implementation is used.
              */

From b33096f887108c3d7e1f4e62689c2b10401234fa Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Fri, 3 May 2024 16:58:59 +0000
Subject: [PATCH 323/486] 8295153:
 java/util/Base64/TestEncodingDecodingLength.java ran out of memory

Reviewed-by: lancea, naoto
---
 .../Base64/TestEncodingDecodingLength.java    | 114 ++++++++++++------
 1 file changed, 77 insertions(+), 37 deletions(-)

diff --git a/test/jdk/java/util/Base64/TestEncodingDecodingLength.java b/test/jdk/java/util/Base64/TestEncodingDecodingLength.java
index 3a91cd88b1f..ce6d0db4adc 100644
--- a/test/jdk/java/util/Base64/TestEncodingDecodingLength.java
+++ b/test/jdk/java/util/Base64/TestEncodingDecodingLength.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,55 +21,95 @@
  * questions.
  */
 
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Base64;
 
-/**
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/*
  * @test
- * @bug 8210583 8217969 8218265
- * @summary Tests Base64.Encoder.encode and Base64.Decoder.decode
- *          with the large size of input array/buffer
- * @requires (sun.arch.data.model == "64" & os.maxMemory >= 10g)
- * @run main/othervm -Xms6g -Xmx8g TestEncodingDecodingLength
- *
+ * @bug 8210583 8217969 8218265 8295153
+ * @summary White-box test that effectively checks Base64.Encoder.encode and
+ *          Base64.Decoder.decode behavior with large, (Integer.MAX_VALUE) sized
+ *          input array/buffer. Tests the private methods "encodedOutLength" and
+ *          "decodedOutLength".
+ * @run junit/othervm --add-opens java.base/java.util=ALL-UNNAMED TestEncodingDecodingLength
  */
 
+// We perform a white-box test due to the heavy memory usage that testing
+// the public API would require which has shown to cause intermittent issues
 public class TestEncodingDecodingLength {
 
-    public static void main(String[] args) {
-        int size = Integer.MAX_VALUE - 8;
-        byte[] inputBytes = new byte[size];
-        byte[] outputBytes = new byte[size];
+    // A value large enough to test the desired memory conditions in encode and decode
+    private static final int LARGE_MEM_SIZE = Integer.MAX_VALUE - 8;
+    private static final Base64.Decoder DECODER = Base64.getDecoder();
+    private static final Base64.Encoder ENCODER = Base64.getEncoder();
 
-        // Check encoder with large array length
-        Base64.Encoder encoder = Base64.getEncoder();
-        checkOOM("encode(byte[])", () -> encoder.encode(inputBytes));
-        checkIAE("encode(byte[] byte[])", () -> encoder.encode(inputBytes, outputBytes));
-        checkOOM("encodeToString(byte[])", () -> encoder.encodeToString(inputBytes));
-        checkOOM("encode(ByteBuffer)", () -> encoder.encode(ByteBuffer.wrap(inputBytes)));
-
-        // Check decoder with large array length,
-        // should not throw any exception
-        Arrays.fill(inputBytes, (byte) 86);
-        Base64.Decoder decoder = Base64.getDecoder();
-        decoder.decode(inputBytes);
-        decoder.decode(inputBytes, outputBytes);
-        decoder.decode(ByteBuffer.wrap(inputBytes));
+    // Effectively tests that encode(byte[] src, byte[] dst) throws an
+    // IllegalArgumentException with array sized near Integer.MAX_VALUE. All the
+    // encode() methods call encodedOutLength(), which is where the OOME is expected
+    @Test
+    public void largeEncodeIAETest() throws IllegalAccessException,
+            InvocationTargetException, NoSuchMethodException {
+        Method m = getMethod(ENCODER,
+                "encodedOutLength", int.class, boolean.class);
+        // When throwOOME param is false, encodedOutLength should return -1 in
+        // this situation, which encode() uses to throw IAE
+        assertEquals(-1, m.invoke(ENCODER, LARGE_MEM_SIZE, false));
     }
 
-    private static final void checkOOM(String methodName, Runnable r) {
+    // Effectively tests that the overloaded encode() and encodeToString() methods
+    // throw OutOfMemoryError with array/buffer sized near Integer.MAX_VALUE
+    @Test
+    public void largeEncodeOOMETest() throws IllegalAccessException, NoSuchMethodException {
+        Method m = getMethod(ENCODER,
+                "encodedOutLength", int.class, boolean.class);
         try {
-            r.run();
-            throw new RuntimeException("OutOfMemoryError should have been thrown by: " + methodName);
-        } catch (OutOfMemoryError er) {}
+            m.invoke(ENCODER, LARGE_MEM_SIZE, true);
+        } catch (InvocationTargetException ex) {
+            Throwable rootEx = ex.getCause();
+            assertEquals(OutOfMemoryError.class, rootEx.getClass(),
+                    "OOME should be thrown with Integer.MAX_VALUE input");
+            assertEquals("Encoded size is too large", rootEx.getMessage());
+        }
     }
 
-    private static final void checkIAE(String methodName, Runnable r) {
+    // Effectively tests that the overloaded decode() methods do not throw
+    // OOME nor NASE with array/buffer sized near Integer.MAX_VALUE All the decode
+    // methods call decodedOutLength(), which is where the previously thrown
+    // OOME or NASE would occur at.
+    @Test
+    public void largeDecodeTest() throws IllegalAccessException, NoSuchMethodException {
+        Method m = getMethod(DECODER,
+                "decodedOutLength", byte[].class, int.class, int.class);
+        byte[] src = {1};
         try {
-            r.run();
-            throw new RuntimeException("IllegalArgumentException should have been thrown by: " + methodName);
-        } catch (IllegalArgumentException iae) {}
+            /*
+             decodedOutLength() takes the src array, position, and limit as params.
+             The src array will be indexed at limit-1 to search for padding.
+             To avoid passing an array with Integer.MAX_VALUE memory allocated, we
+             set position param to be -size. Since the initial length
+             is calculated as limit - position. This mocks the potential overflow
+             calculation and still allows the array to be indexed without an AIOBE.
+            */
+            m.invoke(DECODER, src, -LARGE_MEM_SIZE + 1, 1);
+        } catch (InvocationTargetException ex) {
+            // 8210583 - decode no longer throws NASE
+            // 8217969 - decode no longer throws OOME
+            fail("Decode threw an unexpected exception with " +
+                    "Integer.MAX_VALUE sized input: " + ex.getCause());
+        }
+    }
+
+    // Utility to get the private visibility method
+    private static Method getMethod(Object obj, String methodName, Class<?>... params)
+            throws NoSuchMethodException {
+        Method m = obj.getClass().getDeclaredMethod(methodName, params);
+        m.setAccessible(true);
+        return m;
     }
 }
-

From 36c9607f66f91a0c46342543b30b57ac1cf106ec Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Fri, 3 May 2024 19:06:13 +0000
Subject: [PATCH 324/486] 8331591: sun.font.CharSequenceCodePointIterator is
 buggy and unused

Reviewed-by: angorya, honkar
---
 .../classes/sun/font/CodePointIterator.java   | 55 -------------------
 1 file changed, 55 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/font/CodePointIterator.java b/src/java.desktop/share/classes/sun/font/CodePointIterator.java
index 179e049db60..31c4bc5c1d4 100644
--- a/src/java.desktop/share/classes/sun/font/CodePointIterator.java
+++ b/src/java.desktop/share/classes/sun/font/CodePointIterator.java
@@ -56,10 +56,6 @@ public abstract class CodePointIterator {
         return new CharArrayCodePointIterator(text, start, limit);
     }
 
-    public static CodePointIterator create(CharSequence text) {
-        return new CharSequenceCodePointIterator(text);
-    }
-
     public static CodePointIterator create(CharacterIterator iter) {
         return new CharacterIteratorCodePointIterator(iter);
     }
@@ -129,57 +125,6 @@ final class CharArrayCodePointIterator extends CodePointIterator {
     }
 }
 
-final class CharSequenceCodePointIterator extends CodePointIterator {
-    private CharSequence text;
-    private int index;
-
-    public CharSequenceCodePointIterator(CharSequence text) {
-        this.text = text;
-    }
-
-    public void setToStart() {
-        index = 0;
-    }
-
-    public void setToLimit() {
-        index = text.length();
-    }
-
-    public int next() {
-        if (index < text.length()) {
-            char cp1 = text.charAt(index++);
-            if (Character.isHighSurrogate(cp1) && index < text.length()) {
-                char cp2 = text.charAt(index+1);
-                if (Character.isLowSurrogate(cp2)) {
-                    ++index;
-                    return Character.toCodePoint(cp1, cp2);
-                }
-            }
-            return cp1;
-        }
-        return DONE;
-    }
-
-    public int prev() {
-        if (index > 0) {
-            char cp2 = text.charAt(--index);
-            if (Character.isLowSurrogate(cp2) && index > 0) {
-                char cp1 = text.charAt(index - 1);
-                if (Character.isHighSurrogate(cp1)) {
-                    --index;
-                    return Character.toCodePoint(cp1, cp2);
-                }
-            }
-            return cp2;
-        }
-        return DONE;
-    }
-
-    public int charIndex() {
-        return index;
-    }
-}
-
 // note this has different iteration semantics than CharacterIterator
 final class CharacterIteratorCodePointIterator extends CodePointIterator {
     private CharacterIterator iter;

From c1a164528a538d5de78f99c4c92291b1906703f5 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Fri, 3 May 2024 19:15:12 +0000
Subject: [PATCH 325/486] 8331655: ClassFile API ClassCastException with
 verbose output of certain class files

Reviewed-by: psandoz
---
 .../classfile/impl/ClassReaderImpl.java         | 17 +++--------------
 test/jdk/jdk/classfile/LimitsTest.java          | 11 ++++++++++-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
index 2022f8f0154..4878ad56ae8 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
@@ -391,21 +391,10 @@ public final class ClassReaderImpl
 
     @Override
     public AbstractPoolEntry.Utf8EntryImpl utf8EntryByIndex(int index) {
-        if (index <= 0 || index >= constantPoolCount) {
-            throw new ConstantPoolException("Bad CP UTF8 index: " + index);
+        if (entryByIndex(index, TAG_UTF8, TAG_UTF8) instanceof AbstractPoolEntry.Utf8EntryImpl utf8) {
+            return utf8;
         }
-        PoolEntry info = cp[index];
-        if (info == null) {
-            int offset = cpOffset[index];
-            int tag = readU1(offset);
-            final int q = offset + 1;
-            if (tag != TAG_UTF8) throw new ConstantPoolException("Not a UTF8 - index: " + index);
-            AbstractPoolEntry.Utf8EntryImpl uinfo
-                    = new AbstractPoolEntry.Utf8EntryImpl(this, index, buffer, q + 2, readU2(q));
-            cp[index] = uinfo;
-            return uinfo;
-        }
-        return (AbstractPoolEntry.Utf8EntryImpl) info;
+        throw new ConstantPoolException("Not a UTF8 - index: " + index);
     }
 
     @Override
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index 5b39c0d4985..8a8d8bddc35 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8320360 8330684 8331320
+ * @bug 8320360 8330684 8331320 8331655
  * @summary Testing ClassFile limits.
  * @run junit LimitsTest
  */
@@ -36,6 +36,7 @@ import java.lang.classfile.ClassFile;
 import java.lang.classfile.Opcode;
 import java.lang.classfile.attribute.CodeAttribute;
 import java.lang.classfile.constantpool.ConstantPoolException;
+import java.lang.classfile.constantpool.IntegerEntry;
 import jdk.internal.classfile.impl.DirectMethodBuilder;
 import jdk.internal.classfile.impl.LabelContext;
 import jdk.internal.classfile.impl.UnboundAttribute;
@@ -106,6 +107,14 @@ class LimitsTest {
             0, 0, 0, 0, 0, 2, ClassFile.TAG_METHODREF, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}).thisClass());
     }
 
+    @Test
+    void testInvalidUtf8Entry() {
+        var cp = ClassFile.of().parse(new byte[]{(byte)0xCA, (byte)0xFE, (byte)0xBA, (byte)0xBE,
+            0, 0, 0, 0, 0, 3, ClassFile.TAG_INTEGER, 0, 0, 0, 0, ClassFile.TAG_NAMEANDTYPE, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}).constantPool();
+        assertTrue(cp.entryByIndex(1) instanceof IntegerEntry); //parse valid int entry first
+        assertThrows(ConstantPoolException.class, () -> cp.entryByIndex(2));
+    }
+
     @Test
     void testInvalidLookupSwitch() {
         assertThrows(IllegalArgumentException.class, () ->

From b20fa7b48b0f0a64c0760f26188d4c11c3233b61 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Fri, 3 May 2024 19:51:37 +0000
Subject: [PATCH 326/486] 8329982:
 compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
 failed assert(oopDesc::is_oop_or_null(val)) failed: bad oop found

Reviewed-by: never
---
 .../share/gc/shared/barrierSetNMethod.cpp     |   8 +-
 .../share/jvmci/jvmciCodeInstaller.cpp        |  19 +-
 src/hotspot/share/jvmci/jvmciRuntime.cpp      |   1 +
 src/hotspot/share/jvmci/jvmciRuntime.hpp      |  11 +-
 .../InvalidateInstalledCodeTest.java          | 108 -----------
 .../events/JvmciNotifyInstallEventTest.config |   2 -
 .../events/JvmciNotifyInstallEventTest.java   | 179 ------------------
 .../vm/ci/code/test/CodeInstallationTest.java |   7 +-
 .../code/test/RuntimeStubAllocFailTest.java   |  86 +++++++++
 .../code/test/SimpleCodeInstallationTest.java |  23 ++-
 .../jdk/vm/ci/code/test/TestAssembler.java    |  77 ++++++++
 .../vm/ci/code/test/TestHotSpotVMConfig.java  |  28 +++
 .../test/aarch64/AArch64TestAssembler.java    | 107 ++++++++++-
 .../code/test/amd64/AMD64TestAssembler.java   |  93 ++++++++-
 14 files changed, 422 insertions(+), 327 deletions(-)
 delete mode 100644 test/hotspot/jtreg/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java
 delete mode 100644 test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.config
 delete mode 100644 test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java
 create mode 100644 test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/RuntimeStubAllocFailTest.java

diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
index adf0527681b..548e6b671ef 100644
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
@@ -65,16 +65,10 @@ bool BarrierSetNMethod::supports_entry_barrier(nmethod* nm) {
     return false;
   }
 
-  if (nm->is_native_method() || nm->is_compiled_by_c2() || nm->is_compiled_by_c1()) {
+  if (nm->is_native_method() || nm->is_compiled_by_c2() || nm->is_compiled_by_c1() || nm->is_compiled_by_jvmci()) {
     return true;
   }
 
-#if INCLUDE_JVMCI
-  if (nm->is_compiled_by_jvmci() && nm->jvmci_nmethod_data()->has_entry_barrier()) {
-    return true;
-  }
-#endif
-
   return false;
 }
 
diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
index 7dd2840656d..52a060427d5 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
@@ -771,11 +771,8 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
       JVMCI_THROW_MSG_(IllegalArgumentException, "InstalledCode object must be a HotSpotNmethod when installing a HotSpotCompiledNmethod", JVMCI::ok);
     }
 
-    // We would like to be strict about the nmethod entry barrier but there are various test
-    // configurations which generate assembly without being a full compiler. So for now we enforce
-    // that JIT compiled methods must have an nmethod barrier.
-    bool install_default = JVMCIENV->get_HotSpotNmethod_isDefault(installed_code) != 0;
-    if (_nmethod_entry_patch_offset == -1 && install_default) {
+    // Enforce that compiled methods have an nmethod barrier.
+    if (_nmethod_entry_patch_offset == -1) {
       JVMCI_THROW_MSG_(IllegalArgumentException, "nmethod entry barrier is missing", JVMCI::ok);
     }
 
@@ -816,14 +813,12 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
         DirectivesStack::release(directive);
       }
 
-      if (_nmethod_entry_patch_offset != -1) {
-        BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+      BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
 
-        // an empty error buffer for use by the verify_barrier code
-        err_msg msg("");
-        if (!bs_nm->verify_barrier(nm, msg)) {
-          JVMCI_THROW_MSG_(IllegalArgumentException, err_msg("nmethod entry barrier is malformed: %s", msg.buffer()), JVMCI::ok);
-        }
+      // an empty error buffer for use by the verify_barrier code
+      err_msg msg("");
+      if (!bs_nm->verify_barrier(nm, msg)) {
+        JVMCI_THROW_MSG_(IllegalArgumentException, err_msg("nmethod entry barrier is malformed: %s", msg.buffer()), JVMCI::ok);
       }
     }
   }
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 2e588373cdf..3a8a040db46 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -787,6 +787,7 @@ void JVMCINMethodData::initialize(int nmethod_mirror_index,
 {
   _failed_speculations = failed_speculations;
   _nmethod_mirror_index = nmethod_mirror_index;
+  guarantee(nmethod_entry_patch_offset != -1, "missing entry barrier");
   _nmethod_entry_patch_offset = nmethod_entry_patch_offset;
   if (nmethod_mirror_name != nullptr) {
     _has_name = true;
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp
index c12c18abd78..6a920eb8c70 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp
@@ -54,10 +54,8 @@ class JVMCINMethodData : public ResourceObj {
   // This is -1 if there is no mirror in the oops table.
   int _nmethod_mirror_index;
 
-  // This is the offset of the patchable part of the nmethod entry barrier sequence.  The meaning is
-  // somewhat platform dependent as the way patching is done varies by architecture.  Older JVMCI
-  // based compilers didn't emit the entry barrier so having a positive value for this offset
-  // confirms that the installed code supports the entry barrier.
+  // This is the offset of the patchable part of the nmethod entry barrier sequence. The meaning is
+  // somewhat platform dependent as the way patching is done varies by architecture.
   int _nmethod_entry_patch_offset;
 
   // Address of the failed speculations list to which a speculation
@@ -129,12 +127,7 @@ public:
   // Sets the mirror in nm's oops table.
   void set_nmethod_mirror(nmethod* nm, oop mirror);
 
-  bool has_entry_barrier() {
-    return _nmethod_entry_patch_offset != -1;
-  }
-
   int nmethod_entry_patch_offset() {
-    guarantee(_nmethod_entry_patch_offset != -1, "missing entry barrier");
     return _nmethod_entry_patch_offset;
   }
 };
diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java
deleted file mode 100644
index 9307ab8250a..00000000000
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2015, 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 8136421
- * @requires vm.jvmci
- * @library /test/lib /
- * @library ../common/patches
- * @modules java.base/jdk.internal.misc
- * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/jdk.internal.org.objectweb.asm.tree
- *          jdk.internal.vm.ci/jdk.vm.ci.hotspot
- *          jdk.internal.vm.ci/jdk.vm.ci.code
- *          jdk.internal.vm.ci/jdk.vm.ci.code.site
- *          jdk.internal.vm.ci/jdk.vm.ci.meta
- *          jdk.internal.vm.ci/jdk.vm.ci.runtime
- *
- * @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- *        jdk.test.whitebox.WhiteBox jdk.test.whitebox.parser.DiagnosticCommand
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- *                                jdk.test.whitebox.parser.DiagnosticCommand
- * @run junit/othervm -Xbootclasspath/a:.
- *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- *                   compiler.jvmci.compilerToVM.InvalidateInstalledCodeTest
- */
-
-package compiler.jvmci.compilerToVM;
-
-import compiler.jvmci.common.CodeInstallerTest;
-import compiler.jvmci.common.CTVMUtilities;
-import jdk.test.lib.Asserts;
-import jdk.test.lib.Utils;
-import jdk.vm.ci.code.InstalledCode;
-import jdk.vm.ci.code.site.Site;
-import jdk.vm.ci.code.site.DataPatch;
-import jdk.vm.ci.hotspot.CompilerToVMHelper;
-import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
-import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
-import jdk.vm.ci.hotspot.HotSpotCompiledCode.Comment;
-import jdk.vm.ci.hotspot.HotSpotNmethod;
-import jdk.vm.ci.meta.Assumptions.Assumption;
-
-import java.util.List;
-import org.junit.Test;
-
-public class InvalidateInstalledCodeTest extends CodeInstallerTest {
-
-    @Test
-    public void testInvalidation() {
-        List<CompileCodeTestCase> testCases
-                = CompileCodeTestCase.generate(/* bci = */ 0);
-        testCases.addAll(CompileCodeTestCase.generate(/* bci = */ -1));
-        testCases.forEach(t -> check(t));
-        checkNull();
-    }
-
-    private void checkNull() {
-        Utils.runAndCheckException(
-                () -> CompilerToVMHelper.invalidateHotSpotNmethod(null, true),
-                NullPointerException.class);
-    }
-
-    private void check(CompileCodeTestCase testCase) {
-        HotSpotResolvedJavaMethod javaMethod = CTVMUtilities.getResolvedMethod(testCase.executable);
-        HotSpotNmethod nmethod = (HotSpotNmethod) installEmptyCode(new Site[0], new Assumption[0],
-                new Comment[0], 8, new DataPatch[0], null);
-
-        Asserts.assertTrue(nmethod.isValid(), testCase + " : code is invalid even before invalidation");
-
-        Asserts.assertTrue(nmethod.isValid(), testCase + " : code is not valid, i = " + nmethod);
-        Asserts.assertTrue(nmethod.isAlive(), testCase + " : code is not alive, i = " + nmethod);
-        Asserts.assertNotEquals(nmethod.getStart(), 0L);
-
-        // Make nmethod non-entrant but still alive
-        CompilerToVMHelper.invalidateHotSpotNmethod(nmethod, false);
-        Asserts.assertFalse(nmethod.isValid(), testCase + " : code is valid, i = " + nmethod);
-        Asserts.assertTrue(nmethod.isAlive(), testCase + " : code is not alive, i = " + nmethod);
-        Asserts.assertEquals(nmethod.getStart(), 0L);
-
-        // Deoptimize the nmethod and cut the link to it from the HotSpotNmethod
-        CompilerToVMHelper.invalidateHotSpotNmethod(nmethod, true);
-        Asserts.assertFalse(nmethod.isValid(), testCase + " : code is valid, i = " + nmethod);
-        Asserts.assertFalse(nmethod.isAlive(), testCase + " : code is alive, i = " + nmethod);
-        Asserts.assertEquals(nmethod.getStart(), 0L);
-    }
-}
diff --git a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.config b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.config
deleted file mode 100644
index 9e2866167c1..00000000000
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.config
+++ /dev/null
@@ -1,2 +0,0 @@
-compiler.jvmci.events.JvmciNotifyInstallEventTest
-compiler.jvmci.common.JVMCIHelpers
diff --git a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java
deleted file mode 100644
index c5d1b99235a..00000000000
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8136421
- * @requires vm.jvmci & !vm.graal.enabled & vm.compMode == "Xmixed"
- * @library / /test/lib
- * @library ../common/patches
- * @modules java.base/jdk.internal.misc
- * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/jdk.internal.org.objectweb.asm.tree
- *          jdk.internal.vm.ci/jdk.vm.ci.hotspot
- *          jdk.internal.vm.ci/jdk.vm.ci.code
- *          jdk.internal.vm.ci/jdk.vm.ci.code.site
- *          jdk.internal.vm.ci/jdk.vm.ci.meta
- *          jdk.internal.vm.ci/jdk.vm.ci.runtime
- *          jdk.internal.vm.ci/jdk.vm.ci.services
- *
- * @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.common.JVMCIHelpers
- * @run driver jdk.test.lib.FileInstaller ./JvmciNotifyInstallEventTest.config
- *     ./META-INF/services/jdk.vm.ci.services.JVMCIServiceLocator
- * @run driver jdk.test.lib.helpers.ClassFileInstaller
- *      compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler
- *      compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory
- *      compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult
- *      compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener
- * @run main/othervm -XX:+UnlockExperimentalVMOptions
- *     -Djvmci.Compiler=EmptyCompiler -Xbootclasspath/a:.
- *     -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
- *     -XX:-UseJVMCINativeLibrary -XX:JVMCITraceLevel=1
- *     -Dtest.jvmci.forceRuntimeStubAllocFail=test_stub_that_fails_to_be_allocated
- *     compiler.jvmci.events.JvmciNotifyInstallEventTest
- * @run main/othervm -XX:+UnlockExperimentalVMOptions
- *     -Djvmci.Compiler=EmptyCompiler -Xbootclasspath/a:.
- *     -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI -XX:JVMCINMethodSizeLimit=0
- *     -XX:-UseJVMCINativeLibrary
- *     compiler.jvmci.events.JvmciNotifyInstallEventTest
- */
-
-package compiler.jvmci.events;
-
-import compiler.jvmci.common.CTVMUtilities;
-import compiler.jvmci.common.testcases.SimpleClass;
-import jdk.test.lib.Asserts;
-import jdk.test.lib.Platform;
-import jdk.test.lib.Utils;
-import jdk.vm.ci.services.JVMCIServiceLocator;
-import jdk.vm.ci.code.BailoutException;
-import jdk.vm.ci.code.CompiledCode;
-import jdk.vm.ci.code.InstalledCode;
-import jdk.vm.ci.code.site.DataPatch;
-import jdk.vm.ci.code.site.Site;
-import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
-import jdk.vm.ci.hotspot.HotSpotCompiledCode;
-import jdk.vm.ci.hotspot.HotSpotCompiledCode.Comment;
-import jdk.vm.ci.hotspot.HotSpotCompiledNmethod;
-import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
-import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
-import jdk.vm.ci.hotspot.HotSpotVMEventListener;
-import jdk.vm.ci.meta.Assumptions.Assumption;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-import java.lang.reflect.Method;
-
-public class JvmciNotifyInstallEventTest extends JVMCIServiceLocator implements HotSpotVMEventListener {
-    private static final String METHOD_NAME = "testMethod";
-    private static volatile int gotInstallNotification = 0;
-
-    public static void main(String args[]) {
-        new JvmciNotifyInstallEventTest().runTest();
-    }
-
-    @Override
-    public <S> S getProvider(Class<S> service) {
-        if (service == HotSpotVMEventListener.class) {
-            return service.cast(this);
-        }
-        return null;
-    }
-
-    private void runTest() {
-        if (gotInstallNotification != 0) {
-            throw new Error("Got install notification before test actions");
-        }
-        HotSpotCodeCacheProvider codeCache;
-        try {
-            codeCache = (HotSpotCodeCacheProvider) HotSpotJVMCIRuntime.runtime()
-                    .getHostJVMCIBackend().getCodeCache();
-        } catch (InternalError ie) {
-            // passed
-            return;
-        }
-        Method testMethod;
-        try {
-            testMethod = SimpleClass.class.getDeclaredMethod(METHOD_NAME);
-        } catch (NoSuchMethodException e) {
-            throw new Error("TEST BUG: Can't find " + METHOD_NAME, e);
-        }
-        HotSpotResolvedJavaMethod method = CTVMUtilities
-                .getResolvedMethod(SimpleClass.class, testMethod);
-        int dataSectionAlignment = 8; // CodeBuffer::SECT_CONSTS code section alignment
-        HotSpotCompiledCode compiledCode = new HotSpotCompiledNmethod(METHOD_NAME,
-                new byte[0], 0, new Site[0], new Assumption[0],
-                new ResolvedJavaMethod[]{method}, new Comment[0], new byte[0],
-                dataSectionAlignment, new DataPatch[0], false, 0, null,
-                method, 0, 1, 0L, false);
-        codeCache.installCode(method, compiledCode, /* installedCode = */ null,
-                /* speculationLog = */ null, /* isDefault = */ false);
-        Asserts.assertEQ(gotInstallNotification, 1,
-                "Got unexpected event count after 1st install attempt");
-        // since "empty" compilation result is ok, a second attempt should be ok
-        codeCache.installCode(method, compiledCode, /* installedCode = */ null,
-                /* speculationLog = */ null, /* isDefault = */ false);
-        Asserts.assertEQ(gotInstallNotification, 2,
-                "Got unexpected event count after 2nd install attempt");
-        // and an incorrect cases
-        Utils.runAndCheckException(() -> {
-            codeCache.installCode(method, null, null, null, true);
-        }, NullPointerException.class);
-        Asserts.assertEQ(gotInstallNotification, 2,
-                "Got unexpected event count after 3rd install attempt");
-        Utils.runAndCheckException(() -> {
-            codeCache.installCode(null, null, null, null, true);
-        }, NullPointerException.class);
-        Asserts.assertEQ(gotInstallNotification, 2,
-                "Got unexpected event count after 4th install attempt");
-
-        String stubToFail = System.getProperty("test.jvmci.forceRuntimeStubAllocFail");
-        if (Platform.isDebugBuild() && stubToFail != null) {
-            HotSpotCompiledCode stub = new HotSpotCompiledCode(stubToFail,
-                    /* targetCode */ new byte[0],
-                    /* targetCodeSize */ 0,
-                    /* sites */ new Site[0],
-                    /* assumptions */ new Assumption[0],
-                    /* methods */ new ResolvedJavaMethod[0],
-                    /* comments */ new Comment[0],
-                    /* dataSection */ new byte[0],
-                    dataSectionAlignment,
-                    /* dataSectionPatches */ new DataPatch[0],
-                    /* isImmutablePIC */ false,
-                    /* totalFrameSize */ 0,
-                    /* deoptRescueSlot */ null);
-            try {
-                codeCache.installCode(null, stub, null, null, true);
-                throw new AssertionError("Didn't get expected " + BailoutException.class.getName());
-            } catch (BailoutException e) {
-                Asserts.assertEQ(e.getMessage(), "Error installing " + stubToFail + ": code cache is full");
-            }
-        }
-    }
-
-    @Override
-    public void notifyInstall(HotSpotCodeCacheProvider hotSpotCodeCacheProvider,
-            InstalledCode installedCode, CompiledCode compiledCode) {
-        gotInstallNotification++;
-    }
-}
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
index 7483c45a654..97583b45458 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
@@ -35,6 +35,7 @@ import jdk.vm.ci.code.test.riscv64.RISCV64TestAssembler;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotCompiledCode;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+import jdk.vm.ci.hotspot.HotSpotNmethod;
 import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -95,7 +96,7 @@ public class CodeInstallationTest {
         }
     }
 
-    protected void test(TestCompiler compiler, Method method, Object... args) {
+    protected HotSpotNmethod test(TestCompiler compiler, Method method, Object... args) {
         try {
             HotSpotResolvedJavaMethod resolvedMethod = (HotSpotResolvedJavaMethod) metaAccess.lookupJavaMethod(method);
             TestAssembler asm = createAssembler();
@@ -115,9 +116,9 @@ public class CodeInstallationTest {
             Object expected = method.invoke(null, args);
             Object actual = installed.executeVarargs(args);
             Assert.assertEquals(expected, actual);
+            return (HotSpotNmethod) installed;
         } catch (Exception e) {
-            e.printStackTrace();
-            Assert.fail(e.toString());
+            throw new AssertionError(e);
         }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/RuntimeStubAllocFailTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/RuntimeStubAllocFailTest.java
new file mode 100644
index 00000000000..dea523af166
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/RuntimeStubAllocFailTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2024, 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
+ * @requires vm.jvmci & !vm.graal.enabled & vm.compMode == "Xmixed"
+ * @library / /test/lib
+ * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.internal.vm.ci/jdk.vm.ci.code
+ *          jdk.internal.vm.ci/jdk.vm.ci.code.site
+ *          jdk.internal.vm.ci/jdk.vm.ci.meta
+ *          jdk.internal.vm.ci/jdk.vm.ci.runtime
+ *
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions
+ *     -Xbootclasspath/a:.
+ *     -XX:+EnableJVMCI -XX:JVMCITraceLevel=1
+ *     -Dtest.jvmci.forceRuntimeStubAllocFail=test_stub_that_fails_to_be_allocated
+ *     jdk.vm.ci.code.test.RuntimeStubAllocFailTest
+ */
+
+package jdk.vm.ci.code.test;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Platform;
+import jdk.vm.ci.code.BailoutException;
+import jdk.vm.ci.code.site.DataPatch;
+import jdk.vm.ci.code.site.Site;
+import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
+import jdk.vm.ci.hotspot.HotSpotCompiledCode;
+import jdk.vm.ci.hotspot.HotSpotCompiledCode.Comment;
+import jdk.vm.ci.meta.Assumptions.Assumption;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.runtime.JVMCI;
+import jdk.vm.ci.runtime.JVMCIRuntime;
+import jdk.vm.ci.runtime.JVMCIBackend;
+
+public class RuntimeStubAllocFailTest {
+
+    public static void main(String args[]) {
+        JVMCIBackend backend = JVMCI.getRuntime().getHostJVMCIBackend();
+        HotSpotCodeCacheProvider codeCache = (HotSpotCodeCacheProvider) backend.getCodeCache();
+        int dataSectionAlignment = 8; // CodeBuffer::SECT_CONSTS code section alignment
+        String stubToFail = System.getProperty("test.jvmci.forceRuntimeStubAllocFail");
+        if (Platform.isDebugBuild() && stubToFail != null) {
+            HotSpotCompiledCode stub = new HotSpotCompiledCode(stubToFail,
+                    /* targetCode */ new byte[0],
+                    /* targetCodeSize */ 0,
+                    /* sites */ new Site[0],
+                    /* assumptions */ new Assumption[0],
+                    /* methods */ new ResolvedJavaMethod[0],
+                    /* comments */ new Comment[0],
+                    /* dataSection */ new byte[0],
+                    dataSectionAlignment,
+                    /* dataSectionPatches */ new DataPatch[0],
+                    /* isImmutablePIC */ false,
+                    /* totalFrameSize */ 0,
+                    /* deoptRescueSlot */ null);
+            try {
+                codeCache.installCode(null, stub, null, null, true);
+                throw new AssertionError("Didn't get expected " + BailoutException.class.getName());
+            } catch (BailoutException e) {
+                Asserts.assertEQ(e.getMessage(), "Error installing " + stubToFail + ": code cache is full");
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java
index 80c63392b6e..82058ec02cf 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java
@@ -25,7 +25,7 @@
  * @test
  * @requires vm.jvmci
  * @requires vm.simpleArch == "x64" | vm.simpleArch == "aarch64" | vm.simpleArch == "riscv64"
- * @library /
+ * @library /test/lib /
  * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot
  *          jdk.internal.vm.ci/jdk.vm.ci.meta
  *          jdk.internal.vm.ci/jdk.vm.ci.code
@@ -39,8 +39,10 @@
  */
 
 package jdk.vm.ci.code.test;
+import jdk.test.lib.Asserts;
 
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.hotspot.HotSpotNmethod;
 import org.junit.Test;
 
 /**
@@ -61,6 +63,23 @@ public class SimpleCodeInstallationTest extends CodeInstallationTest {
 
     @Test
     public void test() {
-        test(SimpleCodeInstallationTest::compileAdd, getMethod("add", int.class, int.class), 5, 7);
+        HotSpotNmethod nmethod = test(SimpleCodeInstallationTest::compileAdd, getMethod("add", int.class, int.class), 5, 7);
+
+        // Test code invalidation
+        Asserts.assertTrue(nmethod.isValid(), "code is not valid, i = " + nmethod);
+        Asserts.assertTrue(nmethod.isAlive(), "code is not alive, i = " + nmethod);
+        Asserts.assertNotEquals(nmethod.getStart(), 0L);
+
+        // Make nmethod non-entrant but still alive
+        nmethod.invalidate(false);
+        Asserts.assertFalse(nmethod.isValid(), "code is valid, i = " + nmethod);
+        Asserts.assertTrue(nmethod.isAlive(), "code is not alive, i = " + nmethod);
+        Asserts.assertEquals(nmethod.getStart(), 0L);
+
+        // Deoptimize the nmethod and cut the link to it from the HotSpotNmethod
+        nmethod.invalidate(true);
+        Asserts.assertFalse(nmethod.isValid(), "code is valid, i = " + nmethod);
+        Asserts.assertFalse(nmethod.isAlive(), "code is alive, i = " + nmethod);
+        Asserts.assertEquals(nmethod.getStart(), 0L);
     }
 }
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
index f1afef3bae2..6a4f6addd0d 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
@@ -243,6 +243,27 @@ public abstract class TestAssembler {
         this.curStackSlot = initialFrameSize;
     }
 
+    public class Bookmark implements AutoCloseable {
+        private final int registerMark = nextRegister;
+        private final int codePos = code.position();
+        private final int dataPos = data.position();
+
+        @Override
+        public void close() {
+            nextRegister = registerMark;
+            code.data.position(codePos);
+            data.data.position(dataPos);
+        }
+    }
+
+    /**
+     * Enters a scope in which the current register, code and data emitting state
+     * is restored upon leaving the scope.
+     */
+    public Bookmark bookmark() {
+        return new Bookmark();
+    }
+
     public ValueKind<?> getValueKind(JavaKind kind) {
         return new TestValueKind(codeCache.getTarget().arch.getPlatformKind(kind));
     }
@@ -296,6 +317,18 @@ public abstract class TestAssembler {
         dataPatches.add(new DataPatch(data.position(), ref));
     }
 
+    /**
+     * Emits the 32 bit constant `c` into the data section.
+     */
+    public DataSectionReference emitDataItem(int c) {
+        DataSectionReference ref = new DataSectionReference();
+        ref.setOffset(data.position());
+
+        recordDataPatchInCode(ref);
+        data.emitInt(c);
+        return ref;
+    }
+
     public DataSectionReference emitDataItem(HotSpotConstant c) {
         DataSectionReference ref = new DataSectionReference();
         ref.setOffset(data.position());
@@ -321,6 +354,50 @@ public abstract class TestAssembler {
                         finishedDataPatches, false, frameSize, deoptRescue, method, -1, id, 0L, false);
     }
 
+    /**
+     * @param n Number of bits that should be set to 1. Must be between 0 and 32 (inclusive).
+     * @return A number with n bits set to 1.
+     */
+    public static int getNbitNumberInt(int n) {
+        assert n >= 0 && n <= 32 : "0 <= n <= 32; instead: " + n;
+        if (n < 32) {
+            return (1 << n) - 1;
+        } else {
+            return 0xFFFFFFFF;
+        }
+    }
+
+    public static boolean isSignedNbit(int n, int value) {
+        assert n > 0 && n < 32 : n;
+        int min = -(1 << (n - 1));
+        int max = (1 << (n - 1)) - 1;
+        return value >= min && value <= max;
+    }
+
+    public static boolean isUnsignedNbit(int n, int value) {
+        assert n > 0 && n < 32 : n;
+        return 32 - Integer.numberOfLeadingZeros(value) <= n;
+    }
+
+    /**
+     * Determines if `x` is in the range of signed byte values.
+     */
+    public static boolean isByte(int x) {
+        return (byte) x == x;
+    }
+
+    /**
+     * Determines if `l` is in the range of signed int values.
+     */
+    public static boolean isInt(long l) {
+        return (int) l == l;
+    }
+
+    public static void check(boolean condition, String errorMessage, Object... args) {
+        if (!condition) {
+            throw new AssertionError(errorMessage.formatted(args));
+        }
+    }
     protected static class Buffer {
 
         private ByteBuffer data = ByteBuffer.allocate(32).order(ByteOrder.nativeOrder());
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
index 9468027bc85..12664bd433f 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
@@ -32,6 +32,7 @@ public class TestHotSpotVMConfig extends HotSpotVMConfigAccess {
     public TestHotSpotVMConfig(HotSpotVMConfigStore config, Architecture arch) {
         super(config);
         ropProtection = (arch instanceof AArch64) ? getFieldValue("VM_Version::_rop_protection", Boolean.class) : false;
+        nmethodEntryBarrierConcurrentPatch = initNmethodEntryBarrierConcurrentPatch(arch);
     }
 
     public final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
@@ -47,10 +48,37 @@ public class TestHotSpotVMConfig extends HotSpotVMConfigAccess {
 
     // Checkstyle: stop
     public final int MARKID_DEOPT_HANDLER_ENTRY = getConstant("CodeInstaller::DEOPT_HANDLER_ENTRY", Integer.class);
+    public final int MARKID_FRAME_COMPLETE = getConstant("CodeInstaller::FRAME_COMPLETE", Integer.class);
+    public final int MARKID_ENTRY_BARRIER_PATCH = getConstant("CodeInstaller::ENTRY_BARRIER_PATCH", Integer.class);
     public final long handleDeoptStub = getFieldValue("CompilerToVM::Data::SharedRuntime_deopt_blob_unpack", Long.class, "address");
 
     public final int maxOopMapStackOffset = getFieldValue("CompilerToVM::Data::_max_oop_map_stack_offset", Integer.class, "int");
     public final int heapWordSize = getConstant("HeapWordSize", Integer.class);
 
     public final boolean ropProtection;
+
+    private Boolean initNmethodEntryBarrierConcurrentPatch(Architecture arch) {
+        Boolean patchConcurrent = null;
+        if (arch instanceof AArch64 && nmethodEntryBarrier != 0) {
+            Integer patchingType = getFieldValue("CompilerToVM::Data::BarrierSetAssembler_nmethod_patching_type", Integer.class, "int");
+            if (patchingType != null) {
+                // There currently only 2 variants in use that differ only by the presence of a
+                // dmb instruction
+                int stw = getConstant("NMethodPatchingType::stw_instruction_and_data_patch", Integer.class);
+                int conc = getConstant("NMethodPatchingType::conc_data_patch", Integer.class);
+                if (patchingType == stw) {
+                    patchConcurrent = false;
+                } else if (patchingType == conc) {
+                    patchConcurrent = true;
+                } else {
+                    throw new IllegalArgumentException("unsupported barrier sequence " + patchingType);
+                }
+            }
+        }
+        return patchConcurrent;
+    }
+
+    public final int threadDisarmedOffset = getFieldValue("CompilerToVM::Data::thread_disarmed_guard_value_offset", Integer.class, "int");
+    public final long nmethodEntryBarrier = getFieldValue("CompilerToVM::Data::nmethod_entry_barrier", Long.class, "address");
+    public final Boolean nmethodEntryBarrierConcurrentPatch;
 }
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java
index e87944f3ca9..8d6814c5435 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java
@@ -46,8 +46,69 @@ import jdk.vm.ci.meta.VMConstant;
 public class AArch64TestAssembler extends TestAssembler {
 
     private static final Register scratchRegister = AArch64.rscratch1;
+    private static final Register scratchRegister2 = AArch64.rscratch2;
     private static final Register doubleScratch = AArch64.v9;
 
+    /**
+     * Condition Flags for branches. See C1.2.4
+     */
+    public enum ConditionFlag {
+        // Integer | Floating-point meanings
+        /** Equal | Equal. */
+        EQ(0x0),
+
+        /** Not Equal | Not equal or unordered. */
+        NE(0x1),
+
+        /** Unsigned Higher or Same | Greater than, equal or unordered. */
+        HS(0x2),
+
+        /** Unsigned lower | less than. */
+        LO(0x3),
+
+        /** Minus (negative) | less than. */
+        MI(0x4),
+
+        /** Plus (positive or zero) | greater than, equal or unordered. */
+        PL(0x5),
+
+        /** Overflow set | unordered. */
+        VS(0x6),
+
+        /** Overflow clear | ordered. */
+        VC(0x7),
+
+        /** Unsigned higher | greater than or unordered. */
+        HI(0x8),
+
+        /** Unsigned lower or same | less than or equal. */
+        LS(0x9),
+
+        /** Signed greater than or equal | greater than or equal. */
+        GE(0xA),
+
+        /** Signed less than | less than or unordered. */
+        LT(0xB),
+
+        /** Signed greater than | greater than. */
+        GT(0xC),
+
+        /** Signed less than or equal | less than, equal or unordered. */
+        LE(0xD),
+
+        /** Always | always. */
+        AL(0xE),
+
+        /** Always | always (identical to AL, just to have valid 0b1111 encoding). */
+        NV(0xF);
+
+        public final int encoding;
+
+        ConditionFlag(int encoding) {
+            this.encoding = encoding;
+        }
+    }
+
     public AArch64TestAssembler(CodeCacheProvider codeCache, TestHotSpotVMConfig config) {
         super(codeCache, config,
               16 /* initialFrameSize */, 16 /* stackAlignment */,
@@ -215,6 +276,22 @@ public class AArch64TestAssembler extends TestAssembler {
                      | f(0, 4, 0));
     }
 
+    /**
+     * C6.2.25 Branch conditionally.
+     *
+     * @param condition may not be null.
+     * @param imm21 Signed 21-bit offset, has to be 4-byte aligned.
+     */
+    protected void emitBranch(ConditionFlag condition, int imm21) {
+        // B.cond
+        check(isSignedNbit(21, imm21) && (imm21 & 0b11) == 0,
+              "0x%x must be a 21-bit signed number and 4-byte aligned", imm21);
+        int imm19 = (imm21 & getNbitNumberInt(21)) >> 2;
+        code.emitInt(f(0b001010100, 31, 24)
+                     | f(imm19, 23, 4)
+                     | f(condition.encoding, 3, 0));
+    }
+
     private void emitFmov(Register Rd, AArch64Kind kind, Register Rn) {
         // FMOV (general)
         int ftype = 0, sf = 0;
@@ -261,9 +338,25 @@ public class AArch64TestAssembler extends TestAssembler {
         code.emitInt(0xa9bf7bfd);      // stp x29, x30, [sp, #-16]!
         code.emitInt(0x910003fd);      // mov x29, sp
 
+        emitNMethodEntryBarrier();
+
         setDeoptRescueSlot(newStackSlot(AArch64Kind.QWORD));
     }
 
+    private void emitNMethodEntryBarrier() {
+        recordMark(config.MARKID_ENTRY_BARRIER_PATCH);
+        DataSectionReference ref = emitDataItem(0);
+        emitLoadPointer(scratchRegister, AArch64Kind.DWORD, ref);
+        if (config.nmethodEntryBarrierConcurrentPatch) {
+            code.emitInt(0xd50339bf); // dmb ishld
+        }
+        Register thread = AArch64.r28;
+        emitLoadPointer(scratchRegister2, AArch64Kind.DWORD, thread, config.threadDisarmedOffset);
+        code.emitInt(0x6b09011f);             // cmp w8, w9
+        emitBranch(ConditionFlag.EQ, 8);      // jump over slow path, runtime call
+        emitCall(config.nmethodEntryBarrier);
+    }
+
     @Override
     public void emitEpilogue() {
         recordMark(config.MARKID_DEOPT_HANDLER_ENTRY);
@@ -361,8 +454,11 @@ public class AArch64TestAssembler extends TestAssembler {
 
     @Override
     public Register emitLoadPointer(Register b, int offset) {
-        Register ret = newRegister();
-        emitLoadRegister(ret, AArch64Kind.QWORD, b, offset);
+        return emitLoadPointer(newRegister(), AArch64Kind.QWORD, b, offset);
+    }
+
+    public Register emitLoadPointer(Register ret, AArch64Kind kind, Register b, int offset) {
+        emitLoadRegister(ret, kind, b, offset);
         return ret;
     }
 
@@ -377,10 +473,13 @@ public class AArch64TestAssembler extends TestAssembler {
 
     @Override
     public Register emitLoadPointer(DataSectionReference ref) {
+        return emitLoadPointer(newRegister(), AArch64Kind.QWORD, ref);
+    }
+
+    public Register emitLoadPointer(Register ret, AArch64Kind kind, DataSectionReference ref) {
         recordDataPatchInCode(ref);
 
-        Register ret = newRegister();
-        emitLoadRegister(ret, AArch64Kind.QWORD, 0xdead);
+        emitLoadRegister(ret, kind, 0xdead);
         return ret;
     }
 
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
index a0fcdd2b0a9..32b0e66df33 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
@@ -49,6 +49,40 @@ public class AMD64TestAssembler extends TestAssembler {
     private static final Register scratchRegister = AMD64.r12;
     private static final Register doubleScratch = AMD64.xmm15;
 
+    /**
+     * The x86 condition codes used for conditional jumps/moves.
+     */
+    public enum ConditionFlag {
+        Zero(0x4, "|zero|"),
+        NotZero(0x5, "|nzero|"),
+        Equal(0x4, "="),
+        NotEqual(0x5, "!="),
+        Less(0xc, "<"),
+        LessEqual(0xe, "<="),
+        Greater(0xf, ">"),
+        GreaterEqual(0xd, ">="),
+        Below(0x2, "|<|"),
+        BelowEqual(0x6, "|<=|"),
+        Above(0x7, "|>|"),
+        AboveEqual(0x3, "|>=|"),
+        Overflow(0x0, "|of|"),
+        NoOverflow(0x1, "|nof|"),
+        CarrySet(0x2, "|carry|"),
+        CarryClear(0x3, "|ncarry|"),
+        Negative(0x8, "|neg|"),
+        Positive(0x9, "|pos|"),
+        Parity(0xa, "|par|"),
+        NoParity(0xb, "|npar|");
+
+        public final int value;
+        public final String operator;
+
+        ConditionFlag(int value, String operator) {
+            this.value = value;
+            this.operator = operator;
+        }
+    }
+
     public AMD64TestAssembler(CodeCacheProvider codeCache, TestHotSpotVMConfig config) {
         super(codeCache, config, 16, 16, AMD64Kind.DWORD, AMD64.rax, AMD64.rcx, AMD64.rdi, AMD64.r8, AMD64.r9, AMD64.r10);
     }
@@ -63,6 +97,62 @@ public class AMD64TestAssembler extends TestAssembler {
         code.emitByte(0x00);
     }
 
+    /**
+     * Emit the expected patchable code sequence for the nmethod entry barrier. The int sized
+     * payload must be naturally aligned so it can be patched atomically.
+     */
+    private void emitNMethodEntryCompare(int displacement) {
+        // cmp dword ptr [r15 + <displacement>], 0x00000000
+        // 41 81 7f <db> 00 00 00 00
+        code.emitByte(0x41);
+        code.emitByte(0x81);
+        code.emitByte(0x7f);
+        check(isByte(displacement), "expected byte sized displacement: 0x%x", displacement);
+        code.emitByte(displacement & 0xff);
+        check(code.position() % 4 == 0, "must be aligned");
+        code.emitInt(0);
+    }
+
+    /**
+     * Emits a long (i.e. 6 byte) format conditional branch.
+     *
+     * @param offset the offset of the branch target wrt the start of the branch instruction
+     */
+    private void emitBranch(ConditionFlag condition, int offset) {
+        final int longSize = 6;
+        int disp32 = offset - longSize;
+
+        // 0000 1111 1000 tttn #32-bit disp
+        check(isInt(disp32), "must be 32bit disp: %d", disp32);
+        code.emitByte(0x0F);
+        code.emitByte(0x80 | condition.value);
+        code.emitInt(disp32);
+    }
+
+    public void emitAlign(int modulus) {
+        while (code.position() % modulus != 0) {
+            code.emitByte(0x90);
+        }
+    }
+
+    private void emitNMethodEntryBarrier() {
+        // The following code sequence must be emitted in exactly this fashion as HotSpot
+        // will check that the barrier is the expected code sequence.
+        emitAlign(4);
+        recordMark(config.MARKID_FRAME_COMPLETE);
+        recordMark(config.MARKID_ENTRY_BARRIER_PATCH);
+        emitNMethodEntryCompare(config.threadDisarmedOffset);
+        int branchOffset;
+        try (Bookmark bm = bookmark()) {
+            int pos = code.position();
+            emitBranch(ConditionFlag.Equal, 0);
+            emitCall(config.nmethodEntryBarrier);
+            branchOffset = code.position() - pos;
+        }
+        emitBranch(ConditionFlag.Equal, branchOffset);
+        emitCall(config.nmethodEntryBarrier);
+    }
+
     @Override
     public void emitPrologue() {
         // WARNING: Initial instruction MUST be 5 bytes or longer so that
@@ -71,6 +161,7 @@ public class AMD64TestAssembler extends TestAssembler {
         emitFatNop();
         code.emitByte(0x50 | AMD64.rbp.encoding);  // PUSH rbp
         emitMove(true, AMD64.rbp, AMD64.rsp);      // MOV rbp, rsp
+        emitNMethodEntryBarrier();
         setDeoptRescueSlot(newStackSlot(AMD64Kind.QWORD));
     }
 
@@ -414,7 +505,7 @@ public class AMD64TestAssembler extends TestAssembler {
 
     @Override
     public void emitCall(long addr) {
-        Register target = emitLoadLong(addr);
+        Register target = emitLoadLong(AMD64.rax, addr);
         code.emitByte(0xFF); // CALL r/m64
         int enc = target.encoding;
         if (enc >= 8) {

From 9347bb7df845ee465c378c6f511ef8a6caea18ea Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Fri, 3 May 2024 23:41:12 +0000
Subject: [PATCH 327/486] 8330247: C2: CTW fail with
 assert(adr_t->is_known_instance_field()) failed: instance required

Reviewed-by: kvn
---
 src/hotspot/share/opto/macro.cpp              |  3 +
 ...stReduceAllocationAndNonExactAllocate.java | 73 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java

diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 1f6473616dc..38b82e6af93 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -573,6 +573,9 @@ bool PhaseMacroExpand::can_eliminate_allocation(PhaseIterGVN* igvn, AllocateNode
     if (res_type == nullptr) {
       NOT_PRODUCT(fail_eliminate = "Neither instance or array allocation";)
       can_eliminate = false;
+    } else if (!res_type->klass_is_exact()) {
+      NOT_PRODUCT(fail_eliminate = "Not an exact type.";)
+      can_eliminate = false;
     } else if (res_type->isa_aryptr()) {
       int length = alloc->in(AllocateNode::ALength)->find_int_con(-1);
       if (length < 0) {
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
new file mode 100644
index 00000000000..19b641036bd
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2024, 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 8330247
+ * @summary Check that Reduce Allocation Merges doesn't try to reduce non-exact allocations.
+ * @library /test/lib /
+ * @modules java.base/jdk.internal.misc
+ * @requires vm.debug & vm.flagless & vm.compiler2.enabled & vm.opt.final.EliminateAllocations
+ * @run main/othervm -XX:CompileCommand=compileonly,*TestReduceAllocationAndNonExactAllocate*::test
+ *                   -XX:CompileCommand=compileonly,*::allocateInstance
+ *                   -XX:CompileCommand=dontinline,*TestReduceAllocationAndNonExactAllocate*::*
+ *                   -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+TraceReduceAllocationMerges
+ *                   -XX:-TieredCompilation
+ *                   -Xbatch
+ *                   -Xcomp
+ *                   -server
+ *                   compiler.c2.TestReduceAllocationAndNonExactAllocate
+ */
+
+package compiler.c2;
+
+import jdk.internal.misc.Unsafe;
+
+public class TestReduceAllocationAndNonExactAllocate {
+    private static final Unsafe UNSAFE = Unsafe.getUnsafe();
+
+    public static void main(String[] args) {
+        try {
+            if (test(20, Integer.class) != 2032) {
+                throw new RuntimeException("Expected the value to be 2032.");
+            }
+        }
+        catch (InstantiationException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static int test(int val, Class<?> c) throws InstantiationException {
+        Object p = null;
+
+        if (val == 20) {
+            p = UNSAFE.allocateInstance(c);
+        }
+
+        dummy();
+        return p != null ? 2032 : 3242;
+    }
+
+    static int dummy() { return 42; }
+}

From f2c4a41304d4fe984b79792cb3be460d7026e812 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 6 May 2024 05:49:28 +0000
Subject: [PATCH 328/486] 8328481: Implement JEP 476: Module Import
 Declarations (Preview)

Co-authored-by: Jim Laskey <jlaskey@openjdk.org>
Reviewed-by: mcimadamore, vromero
---
 .../jdk/internal/javac/PreviewFeature.java    |   2 +
 .../com/sun/source/tree/ImportTree.java       |  10 +-
 .../com/sun/tools/javac/code/Preview.java     |   3 +-
 .../com/sun/tools/javac/code/Source.java      |   1 +
 .../com/sun/tools/javac/comp/Check.java       |   9 +-
 .../com/sun/tools/javac/comp/TreeDiffer.java  |   9 +-
 .../com/sun/tools/javac/comp/TypeEnter.java   |  75 +-
 .../sun/tools/javac/parser/JavacParser.java   |   7 +
 .../tools/javac/resources/compiler.properties |  15 +
 .../com/sun/tools/javac/tree/JCTree.java      |  60 +-
 .../com/sun/tools/javac/tree/Pretty.java      |  19 +-
 .../com/sun/tools/javac/tree/TreeCopier.java  |  11 +-
 .../com/sun/tools/javac/tree/TreeMaker.java   |  11 +-
 .../jdk/internal/jshell/tool/JShellTool.java  |  21 +-
 .../jdk/internal/jshell/tool/Startup.java     |  39 +-
 .../share/classes/jdk/jshell/Eval.java        |  25 +-
 .../share/classes/jdk/jshell/Snippet.java     |  12 +-
 .../jshell/tool/resources/PREVIEW_DEFAULT.jsh |   1 +
 test/langtools/jdk/jshell/ImportTest.java     |  22 +-
 test/langtools/jdk/jshell/KullaTesting.java   |   3 +-
 .../langtools/jdk/jshell/StartOptionTest.java |  20 +-
 .../jdk/jshell/ToolProviderTest.java          |   8 +
 test/langtools/tools/javac/ImportModule.java  | 722 ++++++++++++++++++
 .../javac/diags/examples/ImportModule.java    |  31 +
 .../ImportModuleDoesNotRead/module-info.java  |  28 +
 .../ImportModuleDoesNotRead/test/Test.java    |  26 +
 .../ImportModuleDoesNotReadUnnamed.java       |  32 +
 .../diags/examples/ImportModuleNotFound.java  |  32 +
 test/langtools/tools/javac/tree/Imports.java  | 137 ++++
 .../tools/jdeps/listdeps/ListModuleDeps.java  |   1 +
 test/langtools/tools/lib/toolbox/ToolBox.java |  29 +-
 31 files changed, 1349 insertions(+), 72 deletions(-)
 create mode 100644 src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh
 create mode 100644 test/langtools/tools/javac/ImportModule.java
 create mode 100644 test/langtools/tools/javac/diags/examples/ImportModule.java
 create mode 100644 test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java
 create mode 100644 test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/test/Test.java
 create mode 100644 test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java
 create mode 100644 test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java
 create mode 100644 test/langtools/tools/javac/tree/Imports.java

diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index cfccff7dd93..43dcf25c263 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -81,6 +81,8 @@ public @interface PreviewFeature {
         CLASSFILE_API,
         @JEP(number=473, title="Stream Gatherers", status="Second Preview")
         STREAM_GATHERERS,
+        @JEP(number=476, title="Module Import Declarations", status="Preview")
+        MODULE_IMPORTS,
         LANGUAGE_MODEL,
         /**
          * A key for testing.
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java
index de8e895e68d..83a6c3eb87b 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package com.sun.source.tree;
 
+import jdk.internal.javac.PreviewFeature;
+
 /**
  * A tree node for an import declaration.
  *
@@ -47,6 +49,12 @@ public interface ImportTree extends Tree {
      * @return true if this is a static import
      */
     boolean isStatic();
+    /**
+     * {@return true if this is an module import declaration.}
+     * @since 23
+     */
+    @PreviewFeature(feature=PreviewFeature.Feature.MODULE_IMPORTS, reflective=true)
+    boolean isModule();
 
     /**
      * Returns the qualified identifier for the declaration(s)
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
index 1572973179b..6af766effa5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -210,6 +210,7 @@ public class Preview {
             case IMPLICIT_CLASSES -> true;
             case SUPER_INIT -> true;
             case PRIMITIVE_PATTERNS -> true;
+            case MODULE_IMPORTS -> true;
             //Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
             //When real preview features will be added, this method can be implemented to return 'true'
             //for those selected features, and 'false' for all the others.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index 479e6891d8f..f1cc1e89272 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -255,6 +255,7 @@ public enum Source {
         UNNAMED_VARIABLES(JDK22, Fragments.FeatureUnnamedVariables, DiagKind.PLURAL),
         PRIMITIVE_PATTERNS(JDK23, Fragments.FeaturePrimitivePatterns, DiagKind.PLURAL),
         SUPER_INIT(JDK22, Fragments.FeatureSuperInit, DiagKind.NORMAL),
+        MODULE_IMPORTS(JDK23, Fragments.FeatureModuleImports, DiagKind.PLURAL),
         ;
 
         enum DiagKind {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index e909afc0bdf..d98aad1e9d8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -4396,7 +4396,9 @@ public class Check {
     }
 
     public void checkImportsResolvable(final JCCompilationUnit toplevel) {
-        for (final JCImport imp : toplevel.getImports()) {
+        for (final JCImportBase impBase : toplevel.getImports()) {
+            if (!(impBase instanceof JCImport imp))
+                continue;
             if (!imp.staticImport || !imp.qualid.hasTag(SELECT))
                 continue;
             final JCFieldAccess select = imp.qualid;
@@ -4420,8 +4422,9 @@ public class Check {
 
     // Check that packages imported are in scope (JLS 7.4.3, 6.3, 6.5.3.1, 6.5.3.2)
     public void checkImportedPackagesObservable(final JCCompilationUnit toplevel) {
-        OUTER: for (JCImport imp : toplevel.getImports()) {
-            if (!imp.staticImport && TreeInfo.name(imp.qualid) == names.asterisk) {
+        OUTER: for (JCImportBase impBase : toplevel.getImports()) {
+            if (impBase instanceof JCImport imp && !imp.staticImport &&
+                TreeInfo.name(imp.qualid) == names.asterisk) {
                 TypeSymbol tsym = imp.qualid.selected.type.tsym;
                 if (tsym.kind == PCK && tsym.members().isEmpty() &&
                     !(Feature.IMPORT_ON_DEMAND_OBSERVABLE_PACKAGES.allowedInSource(source) && tsym.exists())) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java
index 4bcc7937aa9..df14b1859e3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018, Google LLC. All rights reserved.
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -67,6 +67,7 @@ import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
 import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
 import com.sun.tools.javac.tree.JCTree.JCModifiers;
 import com.sun.tools.javac.tree.JCTree.JCModuleDecl;
+import com.sun.tools.javac.tree.JCTree.JCModuleImport;
 import com.sun.tools.javac.tree.JCTree.JCNewArray;
 import com.sun.tools.javac.tree.JCTree.JCNewClass;
 import com.sun.tools.javac.tree.JCTree.JCOpens;
@@ -410,6 +411,12 @@ public class TreeDiffer extends TreeScanner {
         result = tree.staticImport == that.staticImport && scan(tree.qualid, that.qualid);
     }
 
+    @Override
+    public void visitModuleImport(JCModuleImport tree) {
+        JCModuleImport that = (JCModuleImport) parameter;
+        result = scan(tree.module, that.module);
+    }
+
     @Override
     public void visitIndexed(JCArrayAccess tree) {
         JCArrayAccess that = (JCArrayAccess) parameter;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
index 9366e802b16..f36f425283a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
@@ -32,16 +32,15 @@ import java.util.function.BiConsumer;
 import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Directive.ExportsDirective;
+import com.sun.tools.javac.code.Directive.RequiresDirective;
 import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.code.Scope.ImportFilter;
-import com.sun.tools.javac.code.Scope.ImportScope;
 import com.sun.tools.javac.code.Scope.NamedImportScope;
 import com.sun.tools.javac.code.Scope.StarImportScope;
 import com.sun.tools.javac.code.Scope.WriteableScope;
 import com.sun.tools.javac.code.Source.Feature;
 import com.sun.tools.javac.comp.Annotate.AnnotationTypeMetadata;
-import com.sun.tools.javac.parser.Parser;
-import com.sun.tools.javac.parser.ParserFactory;
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.DefinedBy.Api;
@@ -57,7 +56,6 @@ import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE;
 import static com.sun.tools.javac.code.Kinds.Kind.*;
 import static com.sun.tools.javac.code.TypeTag.CLASS;
 import static com.sun.tools.javac.code.TypeTag.ERROR;
-import com.sun.tools.javac.resources.CompilerProperties.Fragments;
 
 import static com.sun.tools.javac.code.TypeTag.*;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
@@ -114,8 +112,6 @@ public class TypeEnter implements Completer {
     private final Lint lint;
     private final TypeEnvs typeEnvs;
     private final Dependencies dependencies;
-    private final ParserFactory parserFactory;
-    private final Preview preview;
 
     public static TypeEnter instance(Context context) {
         TypeEnter instance = context.get(typeEnterKey);
@@ -143,8 +139,6 @@ public class TypeEnter implements Completer {
         lint = Lint.instance(context);
         typeEnvs = TypeEnvs.instance(context);
         dependencies = Dependencies.instance(context);
-        parserFactory = ParserFactory.instance(context);
-        preview = Preview.instance(context);
         Source source = Source.instance(context);
         allowDeprecationOnImport = Feature.DEPRECATION_ON_IMPORT.allowedInSource(source);
     }
@@ -370,9 +364,7 @@ public class TypeEnter implements Completer {
                 if (tree.getPackage() != null && decl == null)
                     checkClassPackageClash(tree.getPackage());
 
-                for (JCImport imp : tree.getImports()) {
-                    doImport(imp);
-                }
+                handleImports(tree.getImports());
 
                 if (decl != null) {
                     DiagnosticPosition prevCheckDeprecatedLintPos = deferredLintHandler.setPos(decl.pos());
@@ -394,6 +386,16 @@ public class TypeEnter implements Completer {
             }
         }
 
+        private void handleImports(List<JCImportBase> imports) {
+            for (JCImportBase imp : imports) {
+                if (imp instanceof JCModuleImport mimp) {
+                    doModuleImport(mimp);
+                } else {
+                    doImport((JCImport) imp);
+                }
+            }
+        }
+
         private void checkClassPackageClash(JCPackageDecl tree) {
             // check that no class exists with same fully qualified name as
             // toplevel package
@@ -445,6 +447,57 @@ public class TypeEnter implements Completer {
             }
         }
 
+        private void doModuleImport(JCModuleImport tree) {
+            Name moduleName = TreeInfo.fullName(tree.module);
+            ModuleSymbol module = syms.getModule(moduleName);
+
+            if (module != null) {
+                if (!env.toplevel.modle.readModules.contains(module)) {
+                    if (env.toplevel.modle.isUnnamed()) {
+                        log.error(tree.pos, Errors.ImportModuleDoesNotReadUnnamed(module));
+                    } else {
+                        log.error(tree.pos, Errors.ImportModuleDoesNotRead(env.toplevel.modle,
+                                                                           module));
+                    }
+                    //error recovery, make sure the module is completed:
+                    module.getDirectives();
+                }
+
+                List<ModuleSymbol> todo = List.of(module);
+                Set<ModuleSymbol> seenModules = new HashSet<>();
+
+                while (!todo.isEmpty()) {
+                    ModuleSymbol currentModule = todo.head;
+
+                    todo = todo.tail;
+
+                    if (!seenModules.add(currentModule)) {
+                        continue;
+                    }
+
+                    for (ExportsDirective export : currentModule.exports) {
+                        if (export.modules != null && !export.modules.contains(env.toplevel.packge.modle)) {
+                            continue;
+                        }
+
+                        PackageSymbol pkg = export.getPackage();
+                        JCImport nestedImport = make.at(tree.pos)
+                                .Import(make.Select(make.QualIdent(pkg), names.asterisk), false);
+
+                        doImport(nestedImport);
+                    }
+
+                    for (RequiresDirective requires : currentModule.requires) {
+                        if (requires.isTransitive()) {
+                            todo = todo.prepend(requires.module);
+                        }
+                    }
+                }
+            } else {
+                log.error(tree.pos, Errors.ImportModuleNotFound(moduleName));
+            }
+        }
+
         Type attribImportType(JCTree tree, Env<AttrContext> env) {
             Assert.check(completionEnabled);
             Lint prevLint = chk.setLint(allowDeprecationOnImport ?
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 4eb7aa7c17d..4278b902fb3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -4252,6 +4252,13 @@ public class JavacParser implements Parser {
         if (token.kind == STATIC) {
             importStatic = true;
             nextToken();
+        } else if (token.kind == IDENTIFIER && token.name() == names.module &&
+                   peekToken(TokenKind.IDENTIFIER)) {
+            checkSourceLevel(Feature.MODULE_IMPORTS);
+            nextToken();
+            JCExpression moduleName = qualident(false);
+            accept(SEMI);
+            return toP(F.at(pos).ModuleImport(moduleName));
         }
         JCExpression pid = toP(F.at(token.pos).Ident(ident()));
         do {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 26c16ebdc2c..a37d9041f43 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -3218,6 +3218,9 @@ compiler.misc.feature.implicit.classes=\
 compiler.misc.feature.super.init=\
     statements before super()
 
+compiler.misc.feature.module.imports=\
+    module imports
+
 compiler.warn.underscore.as.identifier=\
     as of release 9, ''_'' is a keyword, and may not be used as an identifier
 
@@ -3528,6 +3531,18 @@ compiler.err.module.not.found=\
 compiler.warn.module.not.found=\
     module not found: {0}
 
+# 0: name
+compiler.err.import.module.not.found=\
+    imported module not found: {0}
+
+# 0: symbol
+compiler.err.import.module.does.not.read.unnamed=\
+    unnamed module does not read: {0}
+
+# 0: symbol, 1: symbol
+compiler.err.import.module.does.not.read=\
+    module {0} does not read: {1}
+
 compiler.err.too.many.modules=\
     too many module declarations found
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
index 56daece2b2f..5af482516b4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
@@ -105,6 +105,10 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
          */
         IMPORT,
 
+        /** Module import clauses.
+         */
+        MODULEIMPORT,
+
         /** Class definitions, of type ClassDef.
          */
         CLASSDEF,
@@ -585,11 +589,11 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
 
         @DefinedBy(Api.COMPILER_TREE)
-        public List<JCImport> getImports() {
-            ListBuffer<JCImport> imports = new ListBuffer<>();
+        public List<JCImportBase> getImports() {
+            ListBuffer<JCImportBase> imports = new ListBuffer<>();
             for (JCTree tree : defs) {
-                if (tree.hasTag(IMPORT))
-                    imports.append((JCImport)tree);
+                if (tree instanceof JCImportBase imp)
+                    imports.append(imp);
                 else if (!tree.hasTag(PACKAGEDEF) && !tree.hasTag(SKIP))
                     break;
             }
@@ -608,7 +612,9 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             List<JCTree> typeDefs;
             for (typeDefs = defs; !typeDefs.isEmpty(); typeDefs = typeDefs.tail) {
                 if (!typeDefs.head.hasTag(MODULEDEF)
-                        && !typeDefs.head.hasTag(PACKAGEDEF) && !typeDefs.head.hasTag(IMPORT)) {
+                        && !typeDefs.head.hasTag(PACKAGEDEF)
+                        && !typeDefs.head.hasTag(IMPORT)
+                        && !typeDefs.head.hasTag(MODULEIMPORT)) {
                     break;
                 }
             }
@@ -661,10 +667,22 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
     }
 
+    public static abstract class JCImportBase extends JCTree implements ImportTree {
+
+        @DefinedBy(Api.COMPILER_TREE)
+        public Kind getKind() { return Kind.IMPORT; }
+        @Override @DefinedBy(Api.COMPILER_TREE)
+        public <R,D> R accept(TreeVisitor<R,D> v, D d) {
+            return v.visitImport(this, d);
+        }
+
+        public abstract JCTree getQualifiedIdentifier();
+    }
+
     /**
      * An import clause.
      */
-    public static class JCImport extends JCTree implements ImportTree {
+    public static class JCImport extends JCImportBase {
         public boolean staticImport;
         /** The imported class(es). */
         public JCFieldAccess qualid;
@@ -679,8 +697,35 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         @DefinedBy(Api.COMPILER_TREE)
         public boolean isStatic() { return staticImport; }
         @DefinedBy(Api.COMPILER_TREE)
+        public boolean isModule() { return false; }
+        @DefinedBy(Api.COMPILER_TREE)
         public JCFieldAccess getQualifiedIdentifier() { return qualid; }
 
+        @Override
+        public Tag getTag() {
+            return IMPORT;
+        }
+    }
+
+    /**
+     * A module import clause.
+     */
+    public static class JCModuleImport extends JCImportBase {
+        /** The module name. */
+        public JCExpression module;
+        protected JCModuleImport(JCExpression module) {
+            this.module = module;
+        }
+        @Override
+        public void accept(Visitor v) { v.visitModuleImport(this); }
+
+        @DefinedBy(Api.COMPILER_TREE)
+        public boolean isStatic() { return false; }
+        @DefinedBy(Api.COMPILER_TREE)
+        public boolean isModule() { return true; }
+        @DefinedBy(Api.COMPILER_TREE)
+        public JCExpression getQualifiedIdentifier() { return module; }
+
         @DefinedBy(Api.COMPILER_TREE)
         public Kind getKind() { return Kind.IMPORT; }
         @Override @DefinedBy(Api.COMPILER_TREE)
@@ -690,7 +735,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
 
         @Override
         public Tag getTag() {
-            return IMPORT;
+            return MODULEIMPORT;
         }
     }
 
@@ -3480,6 +3525,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public void visitTopLevel(JCCompilationUnit that)    { visitTree(that); }
         public void visitPackageDef(JCPackageDecl that)      { visitTree(that); }
         public void visitImport(JCImport that)               { visitTree(that); }
+        public void visitModuleImport(JCModuleImport that)   { visitTree(that); }
         public void visitClassDef(JCClassDecl that)          { visitTree(that); }
         public void visitMethodDef(JCMethodDecl that)        { visitTree(that); }
         public void visitVarDef(JCVariableDecl that)         { visitTree(that); }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
index 9cc0f6e3b6d..e97d07b1d2b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
@@ -380,12 +380,12 @@ public class Pretty extends JCTree.Visitor {
                  (cdef == null ||
                   l.head.hasTag(IMPORT) || l.head.hasTag(PACKAGEDEF));
              l = l.tail) {
-            if (l.head.hasTag(IMPORT)) {
-                JCImport imp = (JCImport)l.head;
-                Name name = TreeInfo.name(imp.qualid);
+            if (l.head instanceof JCImportBase imp) {
+                Name name = TreeInfo.name(imp.getQualifiedIdentifier());
                 if (name == name.table.names.asterisk ||
                         cdef == null ||
-                        isUsed(TreeInfo.symbol(imp.qualid), cdef)) {
+                        imp instanceof JCModuleImport ||
+                        isUsed(TreeInfo.symbol(imp.getQualifiedIdentifier()), cdef)) {
                     if (firstImport) {
                         firstImport = false;
                         println();
@@ -547,6 +547,17 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
+    public void visitModuleImport(JCModuleImport tree) {
+        try {
+            print("import module ");
+            printExpr(tree.module);
+            print(';');
+            println();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
     public void visitClassDef(JCClassDecl tree) {
         try {
             println(); align();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
index 7c2ef075ccb..9c3ed3bbcd2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
@@ -257,9 +257,14 @@ public class TreeCopier<P> implements TreeVisitor<JCTree,P> {
 
     @DefinedBy(Api.COMPILER_TREE)
     public JCTree visitImport(ImportTree node, P p) {
-        JCImport t = (JCImport) node;
-        JCFieldAccess qualid = copy(t.qualid, p);
-        return M.at(t.pos).Import(qualid, t.staticImport);
+        if (node instanceof JCModuleImport mimp) {
+            JCExpression module = copy(mimp.module, p);
+            return M.at(mimp.pos).ModuleImport(module);
+        } else {
+            JCImport t = (JCImport) node;
+            JCFieldAccess qualid = copy(t.qualid, p);
+            return M.at(t.pos).Import(qualid, t.staticImport);
+        }
     }
 
     @DefinedBy(Api.COMPILER_TREE)
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
index fe6ca849f31..b4c6f804a2f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
@@ -129,6 +129,7 @@ public class TreeMaker implements JCTree.Factory {
             Assert.check(node instanceof JCClassDecl
                 || node instanceof JCPackageDecl
                 || node instanceof JCImport
+                || node instanceof JCModuleImport
                 || node instanceof JCModuleDecl
                 || node instanceof JCSkip
                 || node instanceof JCErroneous
@@ -151,8 +152,14 @@ public class TreeMaker implements JCTree.Factory {
         return tree;
     }
 
-    public JCImport Import(JCFieldAccess qualid, boolean importStatic) {
-        JCImport tree = new JCImport(qualid, importStatic);
+    public JCImport Import(JCFieldAccess qualid, boolean staticImport) {
+        JCImport tree = new JCImport(qualid, staticImport);
+        tree.pos = pos;
+        return tree;
+    }
+
+    public JCModuleImport ModuleImport(JCExpression moduleName) {
+        JCModuleImport tree = new JCModuleImport(moduleName);
         tree.pos = pos;
         return tree;
     }
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
index 0ff0c75efd4..0e9b3bf8bfb 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -338,6 +338,10 @@ public class JShellTool implements MessageHandler {
             return selectOptions(e -> e.getKey().showOption);
         }
 
+        boolean hasOption(OptionKind kind) {
+            return optMap.containsKey(kind);
+        }
+
         void addAll(OptionKind kind, Collection<String> vals) {
             optMap.computeIfAbsent(kind, k -> new ArrayList<>())
                     .addAll(vals);
@@ -470,7 +474,7 @@ public class JShellTool implements MessageHandler {
                     .map(mp -> mp.contains("=") ? mp : mp + "=ALL-UNNAMED")
                     .toList()
             );
-            if (options.has(argEnablePreview)) {
+            if (previewEnabled(options)) {
                 opts.addAll(OptionKind.ENABLE_PREVIEW, List.of(
                         OptionKind.ENABLE_PREVIEW.optionFlag));
                 opts.addAll(OptionKind.SOURCE_RELEASE, List.of(
@@ -490,6 +494,10 @@ public class JShellTool implements MessageHandler {
             }
         }
 
+        boolean previewEnabled(OptionSet options) {
+            return options.has(argEnablePreview);
+        }
+
         void addOptions(OptionKind kind, Collection<String> vals) {
             if (!vals.isEmpty()) {
                 if (kind.onlyOne && vals.size() > 1) {
@@ -627,7 +635,8 @@ public class JShellTool implements MessageHandler {
                 initialStartup = Startup.noStartup();
             } else {
                 String packedStartup = prefs.get(STARTUP_KEY);
-                initialStartup = Startup.unpack(packedStartup, new InitMessageHandler());
+                boolean preview = previewEnabled(options);
+                initialStartup = Startup.unpack(packedStartup, preview, new InitMessageHandler());
             }
             if (options.has(argExecution)) {
                 executionControlSpec = options.valueOf(argExecution);
@@ -2285,7 +2294,8 @@ public class JShellTool implements MessageHandler {
                 return false;
             }
         } else if (defaultOption) {
-            startup = Startup.defaultStartup(this);
+            boolean preview = options.hasOption(OptionKind.ENABLE_PREVIEW);
+            startup = Startup.defaultStartup(preview, this);
         } else if (noneOption) {
             startup = Startup.noStartup();
         }
@@ -2302,7 +2312,8 @@ public class JShellTool implements MessageHandler {
         StringBuilder sb = new StringBuilder();
         String retained = prefs.get(STARTUP_KEY);
         if (retained != null) {
-            Startup retainedStart = Startup.unpack(retained, this);
+            boolean preview = options.hasOption(OptionKind.ENABLE_PREVIEW);
+            Startup retainedStart = Startup.unpack(retained, preview, this);
             boolean currentDifferent = !startup.equals(retainedStart);
             sb.append(retainedStart.show(true));
             if (currentDifferent) {
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
index 372faf9f08a..53c31c3568d 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,9 +118,13 @@ class Startup {
     }
 
     private static final String DEFAULT_STARTUP_NAME = "DEFAULT";
+    private static final String PREVIEW_DEFAULT_STARTUP_NAME = "PREVIEW_DEFAULT";
 
     // cached DEFAULT start-up
-    private static Startup defaultStartup = null;
+    private static Startup[] defaultStartup = new Startup[] {
+        null, //standard startup
+        null  //preview  startup
+    };
 
     // the list of entries
     private List<StartupEntry> entries;
@@ -166,7 +170,8 @@ class Startup {
     boolean isDefault() {
         if (entries.size() == 1) {
             StartupEntry sue = entries.get(0);
-            if (sue.isBuiltIn && sue.name.equals(DEFAULT_STARTUP_NAME)) {
+            if (sue.isBuiltIn && (sue.name.equals(DEFAULT_STARTUP_NAME) ||
+                                  sue.name.equals(PREVIEW_DEFAULT_STARTUP_NAME))) {
                 return true;
             }
         }
@@ -217,7 +222,7 @@ class Startup {
      * @param mh handler for error messages
      * @return Startup, or default startup when error (message has been printed)
      */
-    static Startup unpack(String storedForm, MessageHandler mh) {
+    static Startup unpack(String storedForm, boolean preview, MessageHandler mh) {
         if (storedForm != null) {
             if (storedForm.isEmpty()) {
                 return noStartup();
@@ -255,7 +260,7 @@ class Startup {
                 mh.errormsg("jshell.err.corrupted.stored.startup", ex.getMessage());
             }
         }
-        return defaultStartup(mh);
+        return defaultStartup(preview, mh);
     }
 
     /**
@@ -324,22 +329,26 @@ class Startup {
      * @param mh handler for error messages
      * @return The default Startup, or empty startup when error (message has been printed)
      */
-    static Startup defaultStartup(MessageHandler mh) {
-        if (defaultStartup != null) {
-            return defaultStartup;
+    static Startup defaultStartup(boolean preview, MessageHandler mh) {
+        int idx = preview ? 1 : 0;
+
+        if (defaultStartup[idx] != null) {
+            return defaultStartup[idx];
         }
+        String resourceName = preview ? PREVIEW_DEFAULT_STARTUP_NAME
+                                      : DEFAULT_STARTUP_NAME;
         try {
-            String content = readResource(DEFAULT_STARTUP_NAME);
-            return defaultStartup = new Startup(
-                    new StartupEntry(true, DEFAULT_STARTUP_NAME, content));
+            String content = readResource(resourceName);
+            return defaultStartup[idx] = new Startup(
+                    new StartupEntry(true, resourceName, content));
         } catch (AccessDeniedException e) {
-            mh.errormsg("jshell.err.file.not.accessible", "jshell", DEFAULT_STARTUP_NAME, e.getMessage());
+            mh.errormsg("jshell.err.file.not.accessible", "jshell", resourceName, e.getMessage());
         } catch (NoSuchFileException e) {
-            mh.errormsg("jshell.err.file.not.found", "jshell", DEFAULT_STARTUP_NAME);
+            mh.errormsg("jshell.err.file.not.found", "jshell", resourceName);
         } catch (Exception e) {
-            mh.errormsg("jshell.err.file.exception", "jshell", DEFAULT_STARTUP_NAME, e);
+            mh.errormsg("jshell.err.file.exception", "jshell", resourceName, e);
         }
-        return defaultStartup = noStartup();
+        return defaultStartup[idx] = noStartup();
     }
 
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Eval.java b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
index 3c45fbdbd14..0ee6a926b41 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -83,6 +83,7 @@ import static jdk.jshell.Snippet.Status.VALID;
 import static jdk.jshell.Util.DOIT_METHOD_NAME;
 import static jdk.jshell.Util.PREFIX_PATTERN;
 import static jdk.jshell.Util.expunge;
+import static jdk.jshell.Snippet.SubKind.MODULE_IMPORT_SUBKIND;
 import static jdk.jshell.Snippet.SubKind.SINGLE_TYPE_IMPORT_SUBKIND;
 import static jdk.jshell.Snippet.SubKind.SINGLE_STATIC_IMPORT_SUBKIND;
 import static jdk.jshell.Snippet.SubKind.TYPE_IMPORT_ON_DEMAND_SUBKIND;
@@ -96,7 +97,7 @@ import static jdk.jshell.Snippet.SubKind.STATIC_IMPORT_ON_DEMAND_SUBKIND;
  */
 class Eval {
 
-    private static final Pattern IMPORT_PATTERN = Pattern.compile("import\\p{javaWhitespace}+(?<static>static\\p{javaWhitespace}+)?(?<fullname>[\\p{L}\\p{N}_\\$\\.]+\\.(?<name>[\\p{L}\\p{N}_\\$]+|\\*))");
+    private static final Pattern IMPORT_PATTERN = Pattern.compile("import\\p{javaWhitespace}+(?<module>module\\p{javaWhitespace}+)?(?<static>static\\p{javaWhitespace}+)?(?<fullname>[\\p{L}\\p{N}_\\$\\.]+\\.(?<name>[\\p{L}\\p{N}_\\$]+|\\*))");
     private static final Pattern DEFAULT_PREFIX = Pattern.compile("\\p{javaWhitespace}*(default)\\p{javaWhitespace}+");
 
     // for uses that should not change state -- non-evaluations
@@ -244,13 +245,20 @@ class Eval {
         Matcher mat = IMPORT_PATTERN.matcher(compileSource);
         String fullname;
         String name;
+        boolean isModule;
         boolean isStatic;
         if (mat.find()) {
+            isModule = mat.group("module") != null;
             isStatic = mat.group("static") != null;
-            name = mat.group("name");
             fullname = mat.group("fullname");
+            if (isModule) {
+                name = fullname;
+            } else {
+                name = mat.group("name");
+            }
         } else {
             // bad import -- fake it
+            isModule = compileSource.contains(" module ");
             isStatic = compileSource.contains("static");
             name = fullname = compileSource;
         }
@@ -259,9 +267,14 @@ class Eval {
         String keyName = isStar
                 ? fullname
                 : name;
-        SubKind snippetKind = isStar
-                ? (isStatic ? STATIC_IMPORT_ON_DEMAND_SUBKIND : TYPE_IMPORT_ON_DEMAND_SUBKIND)
-                : (isStatic ? SINGLE_STATIC_IMPORT_SUBKIND : SINGLE_TYPE_IMPORT_SUBKIND);
+        SubKind snippetKind;
+        if (isModule) {
+            snippetKind = MODULE_IMPORT_SUBKIND;
+        } else if (isStar) {
+            snippetKind = isStatic ? STATIC_IMPORT_ON_DEMAND_SUBKIND : TYPE_IMPORT_ON_DEMAND_SUBKIND;
+        } else {
+            snippetKind = isStatic ? SINGLE_STATIC_IMPORT_SUBKIND : SINGLE_TYPE_IMPORT_SUBKIND;
+        }
         Snippet snip = new ImportSnippet(state.keyMap.keyForImport(keyName, snippetKind),
                 userSource, guts, fullname, name, snippetKind, fullkey, isStatic, isStar);
         return singletonList(snip);
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
index 2b4d817a588..a86ea2a863d 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@ package jdk.jshell;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import jdk.internal.javac.PreviewFeature;
 
 /**
  * A Snippet represents a snippet of Java source code as passed to
@@ -214,6 +215,15 @@ public abstract class Snippet {
          */
         STATIC_IMPORT_ON_DEMAND_SUBKIND(Kind.IMPORT),
 
+        /**
+         * Import Module Declaration.
+         * An import declaration of a module.
+         * @jls 7.5.5 Import Module Declarations
+         * @since 23
+         */
+        @PreviewFeature(feature=PreviewFeature.Feature.MODULE_IMPORTS, reflective=true)
+        MODULE_IMPORT_SUBKIND(Kind.IMPORT),
+
         /**
          * A class declaration.
          * A {@code SubKind} of {@link Kind#TYPE_DECL}.
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh
new file mode 100644
index 00000000000..4644ac86386
--- /dev/null
+++ b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh
@@ -0,0 +1 @@
+import module java.base;
diff --git a/test/langtools/jdk/jshell/ImportTest.java b/test/langtools/jdk/jshell/ImportTest.java
index e09490052cf..b8f3f1ee5d0 100644
--- a/test/langtools/jdk/jshell/ImportTest.java
+++ b/test/langtools/jdk/jshell/ImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -33,16 +33,20 @@
  * @run testng ImportTest
  */
 
+import java.lang.reflect.Method;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.function.Consumer;
 
 import javax.tools.Diagnostic;
+import jdk.jshell.JShell;
 
 import jdk.jshell.Snippet;
 import org.testng.annotations.Test;
 
 import static jdk.jshell.Snippet.Status.VALID;
 import static jdk.jshell.Snippet.Status.OVERWRITTEN;
+import static jdk.jshell.Snippet.SubKind.MODULE_IMPORT_SUBKIND;
 import static jdk.jshell.Snippet.SubKind.SINGLE_TYPE_IMPORT_SUBKIND;
 import static jdk.jshell.Snippet.SubKind.SINGLE_STATIC_IMPORT_SUBKIND;
 import static jdk.jshell.Snippet.SubKind.TYPE_IMPORT_ON_DEMAND_SUBKIND;
@@ -168,4 +172,20 @@ public class ImportTest extends KullaTesting {
         assertImportKeyMatch("import java.util.List;//comment", "List", SINGLE_TYPE_IMPORT_SUBKIND, added(VALID));
         assertEval("List l = null;");
     }
+
+    public void testImportModule() {
+        assertImportKeyMatch("import module java.base;", "java.base", MODULE_IMPORT_SUBKIND, added(VALID));
+        assertEval("MethodHandle m;");
+    }
+
+    @org.testng.annotations.BeforeMethod
+    public void setUp(Method m) {
+        switch (m.getName()) {
+            case "testImportModule" ->
+                super.setUp(bc -> bc.compilerOptions("--source", System.getProperty("java.specification.version"), "--enable-preview").remoteVMOptions("--enable-preview"));
+            default ->
+                super.setUp(bc -> {});
+        }
+    }
+
 }
diff --git a/test/langtools/jdk/jshell/KullaTesting.java b/test/langtools/jdk/jshell/KullaTesting.java
index d74f3484f4b..e3eb6ef2823 100644
--- a/test/langtools/jdk/jshell/KullaTesting.java
+++ b/test/langtools/jdk/jshell/KullaTesting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -268,6 +268,7 @@ public class KullaTesting {
         SubKind expectedSubKind = key.subKind();
         Kind expectedKind;
         switch (expectedSubKind) {
+            case MODULE_IMPORT_SUBKIND:
             case SINGLE_TYPE_IMPORT_SUBKIND:
             case SINGLE_STATIC_IMPORT_SUBKIND:
             case TYPE_IMPORT_ON_DEMAND_SUBKIND:
diff --git a/test/langtools/jdk/jshell/StartOptionTest.java b/test/langtools/jdk/jshell/StartOptionTest.java
index aa8d9be03a9..60926e69843 100644
--- a/test/langtools/jdk/jshell/StartOptionTest.java
+++ b/test/langtools/jdk/jshell/StartOptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -126,6 +126,13 @@ public class StartOptionTest {
         check(usererr, null, "usererr");
     }
 
+    protected void startCheckUserOutput(Consumer<String> checkUserOutput,
+            String... args) {
+        runShell(args);
+        check(userout, checkUserOutput, "userout");
+        check(usererr, null, "usererr");
+    }
+
     // Start with an exit code and command error check
     protected void startExCe(int eec, Consumer<String> checkError, String... args) {
         StartOptionTest.this.startExCoUoCeCn(
@@ -358,6 +365,17 @@ public class StartOptionTest {
                 "--show-version");
     }
 
+    public void testPreviewEnabled() {
+        String fn = writeToFile("System.out.println(\"prefix\");\n" +
+                "System.out.println(MethodHandle.class.getName());\n" +
+                "System.out.println(\"suffix\");\n" +
+                "/exit\n");
+        startCheckUserOutput(s -> assertEquals(s, "prefix\nsuffix\n"),
+                             fn);
+        startCheckUserOutput(s -> assertEquals(s, "prefix\njava.lang.invoke.MethodHandle\nsuffix\n"),
+                             "--enable-preview", fn);
+    }
+
     @AfterMethod
     public void tearDown() {
         cmdout = null;
diff --git a/test/langtools/jdk/jshell/ToolProviderTest.java b/test/langtools/jdk/jshell/ToolProviderTest.java
index be8ba23f7c4..e27ed410d52 100644
--- a/test/langtools/jdk/jshell/ToolProviderTest.java
+++ b/test/langtools/jdk/jshell/ToolProviderTest.java
@@ -22,6 +22,7 @@
  */
 
 import java.util.ServiceLoader;
+import java.util.function.Consumer;
 import javax.tools.Tool;
 import org.testng.annotations.Test;
 import static org.testng.Assert.assertTrue;
@@ -58,6 +59,13 @@ public class ToolProviderTest extends StartOptionTest {
                 null, expectedError, null, args);
     }
 
+    @Override
+    protected void startCheckUserOutput(Consumer<String> checkUserOutput, String... args) {
+        runShell(args);
+        check(cmdout, checkUserOutput, "userout");
+        check(usererr, null, "usererr");
+    }
+
     @Override
     protected int runShell(String... args) {
         ServiceLoader<Tool> sl = ServiceLoader.load(Tool.class);
diff --git a/test/langtools/tools/javac/ImportModule.java b/test/langtools/tools/javac/ImportModule.java
new file mode 100644
index 00000000000..767288d4d2f
--- /dev/null
+++ b/test/langtools/tools/javac/ImportModule.java
@@ -0,0 +1,722 @@
+/*
+ * Copyright (c) 2024, 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 8328481
+ * @summary Check behavior of module imports.
+ * @library /tools/lib
+ * @modules java.logging
+ *          java.sql
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main ImportModule
+*/
+
+import com.sun.source.tree.Tree;
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskEvent.Kind;
+import com.sun.source.util.TaskListener;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import toolbox.TestRunner;
+import toolbox.JavacTask;
+import toolbox.JavaTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class ImportModule extends TestRunner {
+
+    private static final String SOURCE_VERSION = System.getProperty("java.specification.version");
+    private ToolBox tb;
+
+    public static void main(String... args) throws Exception {
+        new ImportModule().runTests();
+    }
+
+    ImportModule() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public void runTests() throws Exception {
+        runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    @Test
+    public void testImportJavaBase(Path base) throws Exception {
+        Path current = base.resolve(".");
+        Path src = current.resolve("src");
+        Path classes = current.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.base;
+                          public class Test {
+                              public static void main(String... args) {
+                                  List<String> l = new ArrayList<>();
+                                  System.out.println(l.getClass().getName());
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        {//with --release:
+            new JavacTask(tb)
+                .options("--enable-preview", "--release", SOURCE_VERSION)
+                .outdir(classes)
+                .files(tb.findJavaFiles(src))
+                .run(Task.Expect.SUCCESS)
+                .writeAll();
+
+            var out = new JavaTask(tb)
+                    .classpath(classes.toString())
+                    .className("test.Test")
+                    .vmOptions("--enable-preview")
+                    .run()
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.STDOUT);
+
+            var expectedOut = List.of("java.util.ArrayList");
+
+            if (!Objects.equals(expectedOut, out)) {
+                throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                          ", actual: " + out);
+
+            }
+        }
+
+        {//with --source:
+            new JavacTask(tb)
+                .options("--enable-preview", "--source", SOURCE_VERSION)
+                .outdir(classes)
+                .files(tb.findJavaFiles(src))
+                .run(Task.Expect.SUCCESS)
+                .writeAll();
+
+            var out = new JavaTask(tb)
+                    .classpath(classes.toString())
+                    .className("test.Test")
+                    .vmOptions("--enable-preview")
+                    .run()
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.STDOUT);
+
+            var expectedOut = List.of("java.util.ArrayList");
+
+            if (!Objects.equals(expectedOut, out)) {
+                throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                          ", actual: " + out);
+
+            }
+        }
+    }
+
+    @Test
+    public void testVerifySourceLevelCheck(Path base) throws Exception {
+        Path current = base.resolve(".");
+        Path src = current.resolve("src");
+        Path classes = current.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.base;
+                          public class Test {
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        List<String> actualErrors;
+        List<String> expectedErrors;
+
+        actualErrors =
+                new JavacTask(tb)
+                    .options("--release", "21", "-XDrawDiagnostics")
+                    .outdir(classes)
+                    .files(tb.findJavaFiles(src))
+                    .run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.DIRECT);
+
+        expectedErrors = List.of(
+                "Test.java:2:8: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.module.imports)",
+                "1 error"
+        );
+
+        if (!Objects.equals(expectedErrors, actualErrors)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
+                                      ", actual: " + out);
+
+        }
+        actualErrors =
+                new JavacTask(tb)
+                    .options("-XDrawDiagnostics")
+                    .outdir(classes)
+                    .files(tb.findJavaFiles(src))
+                    .run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.DIRECT);
+
+        expectedErrors = List.of(
+                "Test.java:2:8: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.module.imports)",
+                "1 error"
+        );
+
+        if (!Objects.equals(expectedErrors, actualErrors)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
+                                      ", actual: " + out);
+
+        }
+    }
+
+    @Test
+    public void testConflicts(Path base) throws Exception {
+        Path current = base.resolve(".");
+        Path src = current.resolve("src");
+        Path classes = current.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.logging;
+                          import java.lang.System.*;
+                          public class Test {
+                              Logger l;
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        List<String> actualErrors;
+        List<String> expectedErrors;
+
+        actualErrors =
+                new JavacTask(tb)
+                    .options("--enable-preview", "--release", SOURCE_VERSION,
+                             "-XDrawDiagnostics")
+                    .outdir(classes)
+                    .files(tb.findJavaFiles(src))
+                    .run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.DIRECT);
+
+        expectedErrors = List.of(
+                "Test.java:5:5: compiler.err.ref.ambiguous: Logger, kindname.interface, java.lang.System.Logger, java.lang.System, kindname.class, java.util.logging.Logger, java.util.logging",
+                "- compiler.note.preview.filename: Test.java, DEFAULT",
+                "- compiler.note.preview.recompile",
+                "1 error"
+        );
+
+        if (!Objects.equals(expectedErrors, actualErrors)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
+                                      ", actual: " + out);
+
+        }
+
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.logging;
+                          import java.lang.System.*;
+                          import java.lang.System.Logger;
+                          public class Test {
+                              Logger l;
+                          }
+                          """);
+
+        new JavacTask(tb)
+            .options("--enable-preview", "--release", SOURCE_VERSION)
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run()
+            .writeAll();
+
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.logging;
+                          import java.lang.System.*;
+                          import java.util.logging.Logger;
+                          public class Test {
+                              Logger l;
+                          }
+                          """);
+
+        new JavacTask(tb)
+            .options("--enable-preview", "--release", SOURCE_VERSION)
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run()
+            .writeAll();
+
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.logging;
+                          import java.lang.System.*;
+                          public class Test {
+                          }
+                          """);
+
+        new JavacTask(tb)
+            .options("--enable-preview", "--release", SOURCE_VERSION)
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run()
+            .writeAll();
+
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.base;
+                          import module java.sql;
+                          public class Test {
+                              Date d;
+                          }
+                          """);
+
+        actualErrors =
+                new JavacTask(tb)
+                    .options("--enable-preview", "--release", SOURCE_VERSION,
+                             "-XDrawDiagnostics")
+                    .outdir(classes)
+                    .files(tb.findJavaFiles(src))
+                    .run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.DIRECT);
+
+        expectedErrors = List.of(
+                "Test.java:5:5: compiler.err.ref.ambiguous: Date, kindname.class, java.sql.Date, java.sql, kindname.class, java.util.Date, java.util",
+                "- compiler.note.preview.filename: Test.java, DEFAULT",
+                "- compiler.note.preview.recompile",
+                "1 error"
+        );
+
+        if (!Objects.equals(expectedErrors, actualErrors)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
+                                      ", actual: " + out);
+
+        }
+
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.base;
+                          import module java.sql;
+                          import java.util.Date;
+                          public class Test {
+                              Date d;
+                          }
+                          """);
+
+        new JavacTask(tb)
+            .options("--enable-preview", "--release", SOURCE_VERSION)
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run()
+            .writeAll();
+    }
+
+    @Test
+    public void testNoQualifiedExports(Path base) throws Exception {
+        Path current = base.resolve(".");
+
+        Path lib = current.resolve("lib");
+        Path libSrc = lib.resolve("src");
+        Path libClasses = lib.resolve("classes");
+        tb.writeJavaFiles(libSrc,
+                          """
+                          module lib {
+                              exports api;
+                              exports impl to use;
+                          }
+                          """,
+                          """
+                          package api;
+                          public class Api {
+                          }
+                          """,
+                          """
+                          package impl;
+                          public class Impl {
+                          }
+                          """);
+
+        Files.createDirectories(libClasses);
+
+        new JavacTask(tb)
+            .outdir(libClasses)
+            .files(tb.findJavaFiles(libSrc))
+            .run()
+            .writeAll();
+
+        Path src = current.resolve("src");
+        Path classes = current.resolve("classes");
+
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module lib;
+                          public class Test {
+                              public static void main(String... args) {
+                                  Api a;
+                                  Impl i;
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        List<String> actualErrors;
+        List<String> expectedErrors;
+
+        actualErrors =
+                new JavacTask(tb)
+                    .options("--enable-preview", "--release", SOURCE_VERSION,
+                             "-p", libClasses.toString(),
+                             "--add-modules", "lib",
+                             "-XDrawDiagnostics")
+                    .outdir(classes)
+                    .files(tb.findJavaFiles(src))
+                    .run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.DIRECT);
+
+        expectedErrors = List.of(
+                "Test.java:6:9: compiler.err.cant.resolve.location: kindname.class, Impl, , , (compiler.misc.location: kindname.class, test.Test, null)",
+                "- compiler.note.preview.filename: Test.java, DEFAULT",
+                "- compiler.note.preview.recompile",
+                "1 error"
+        );
+
+        if (!Objects.equals(expectedErrors, actualErrors)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
+                                      ", actual: " + out);
+
+        }
+
+        actualErrors =
+                new JavacTask(tb)
+                    .options("--enable-preview", "--release", SOURCE_VERSION,
+                             "-p", libClasses.toString(),
+                             "-XDdev",
+                             "-XDrawDiagnostics")
+                    .outdir(classes)
+                    .files(tb.findJavaFiles(src))
+                    .run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.DIRECT);
+
+        expectedErrors = List.of(
+                "Test.java:2:1: compiler.err.import.module.does.not.read.unnamed: lib",
+                "Test.java:6:9: compiler.err.cant.resolve.location: kindname.class, Impl, , , (compiler.misc.location: kindname.class, test.Test, null)",
+                "- compiler.note.preview.filename: Test.java, DEFAULT",
+                "- compiler.note.preview.recompile",
+                "2 errors"
+        );
+
+        if (!Objects.equals(expectedErrors, actualErrors)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
+                                      ", actual: " + out);
+
+        }
+
+        tb.writeJavaFiles(src,
+                          """
+                          module test.module {
+                          }
+                          """);
+
+        actualErrors =
+                new JavacTask(tb)
+                    .options("--enable-preview", "--release", SOURCE_VERSION,
+                             "-p", libClasses.toString(),
+                             "-XDdev",
+                             "-XDrawDiagnostics")
+                    .outdir(classes)
+                    .files(tb.findJavaFiles(src))
+                    .run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.DIRECT);
+
+        expectedErrors = List.of(
+                "Test.java:2:1: compiler.err.import.module.does.not.read: test.module, lib",
+                "Test.java:6:9: compiler.err.cant.resolve.location: kindname.class, Impl, , , (compiler.misc.location: kindname.class, test.Test, null)",
+                "- compiler.note.preview.filename: Test.java, DEFAULT",
+                "- compiler.note.preview.recompile",
+                "2 errors"
+        );
+
+        if (!Objects.equals(expectedErrors, actualErrors)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
+                                      ", actual: " + out);
+
+        }
+    }
+
+    @Test
+    public void testTransitiveDependencies(Path base) throws Exception {
+        Path current = base.resolve(".");
+        Path lib = current.resolve("lib");
+        Path libSrc = lib.resolve("src");
+        Path libM1 = libSrc.resolve("m1");
+        tb.writeJavaFiles(libM1,
+                          """
+                          module m1 {
+                              requires transitive m2;
+                              exports api1;
+                              exports api2 to test;
+                              exports api3 to m3;
+                          }
+                          """,
+                          """
+                          package api1;
+                          public class Api1 {
+                          }
+                          """,
+                          """
+                          package api2;
+                          public class Api2 {
+                          }
+                          """,
+                          """
+                          package api3;
+                          public class Api3 {
+                          }
+                          """,
+                          """
+                          package impl1;
+                          public class Impl1 {
+                          }
+                          """);
+
+        Path libM2 = libSrc.resolve("m2");
+        tb.writeJavaFiles(libM2,
+                          """
+                          module m2 {
+                              exports api4;
+                              exports api5 to test;
+                              exports api6 to m3;
+                          }
+                          """,
+                          """
+                          package api4;
+                          public class Api4 {
+                          }
+                          """,
+                          """
+                          package api5;
+                          public class Api5 {
+                          }
+                          """,
+                          """
+                          package api6;
+                          public class Api6 {
+                          }
+                          """,
+                          """
+                          package impl2;
+                          public class Impl2 {
+                          }
+                          """);
+
+        Path libClasses = lib.resolve("classes");
+        Files.createDirectories(libClasses);
+
+        new JavacTask(tb)
+            .options("--enable-preview", "--release", SOURCE_VERSION,
+                     "--module-source-path", libSrc.toString(),
+                     "-XDrawDiagnostics")
+            .outdir(libClasses)
+            .files(tb.findJavaFiles(libSrc))
+            .run()
+            .writeAll();
+
+        Path src = current.resolve("src");
+        tb.writeJavaFiles(src,
+                          """
+                          module test {
+                              requires m1;
+                          }
+                          """,
+                          """
+                          package test;
+                          import module m1;
+                          public class Test1 {
+                              Api1 a1;
+                              Api2 a2;
+                              Api3 a3;
+                              Impl1 i1;
+                              Api4 a4;
+                              Api5 a5;
+                              Api6 a6;
+                              Impl2 i2;
+                          }
+                          """,
+                          """
+                          package test;
+                          import module m2;
+                          public class Test2 {
+                              Api1 a1;
+                              Api2 a2;
+                              Api3 a3;
+                              Impl1 i1;
+                              Api4 a4;
+                              Api5 a5;
+                              Api6 a6;
+                              Impl2 i2;
+                          }
+                          """);
+
+        Path classes = current.resolve("classes");
+        Files.createDirectories(classes);
+
+        List<String> actualErrors;
+        List<String> expectedErrors;
+
+        actualErrors =
+                new JavacTask(tb)
+                    .options("--enable-preview", "--release", SOURCE_VERSION,
+                             "--module-path", libClasses.toString(),
+                             "-XDrawDiagnostics")
+                    .outdir(classes)
+                    .files(tb.findJavaFiles(src))
+                    .run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.DIRECT);
+
+        expectedErrors = List.of(
+                "Test1.java:6:5: compiler.err.cant.resolve.location: kindname.class, Api3, , , (compiler.misc.location: kindname.class, test.Test1, null)",
+                "Test1.java:7:5: compiler.err.cant.resolve.location: kindname.class, Impl1, , , (compiler.misc.location: kindname.class, test.Test1, null)",
+                "Test1.java:10:5: compiler.err.cant.resolve.location: kindname.class, Api6, , , (compiler.misc.location: kindname.class, test.Test1, null)",
+                "Test1.java:11:5: compiler.err.cant.resolve.location: kindname.class, Impl2, , , (compiler.misc.location: kindname.class, test.Test1, null)",
+                "Test2.java:4:5: compiler.err.cant.resolve.location: kindname.class, Api1, , , (compiler.misc.location: kindname.class, test.Test2, null)",
+                "Test2.java:5:5: compiler.err.cant.resolve.location: kindname.class, Api2, , , (compiler.misc.location: kindname.class, test.Test2, null)",
+                "Test2.java:6:5: compiler.err.cant.resolve.location: kindname.class, Api3, , , (compiler.misc.location: kindname.class, test.Test2, null)",
+                "Test2.java:7:5: compiler.err.cant.resolve.location: kindname.class, Impl1, , , (compiler.misc.location: kindname.class, test.Test2, null)",
+                "Test2.java:10:5: compiler.err.cant.resolve.location: kindname.class, Api6, , , (compiler.misc.location: kindname.class, test.Test2, null)",
+                "Test2.java:11:5: compiler.err.cant.resolve.location: kindname.class, Impl2, , , (compiler.misc.location: kindname.class, test.Test2, null)",
+                "- compiler.note.preview.plural: DEFAULT",
+                "- compiler.note.preview.recompile",
+                "10 errors"
+        );
+
+        if (!Objects.equals(expectedErrors, actualErrors)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
+                                      ", actual: " + out);
+
+        }
+    }
+
+    @Test
+    public void testModel(Path base) throws Exception {
+        Path current = base.resolve(".");
+        Path src = current.resolve("src");
+        Path classes = current.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.base;
+                          public class Test {
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+        List<String> kinds = new ArrayList<>();
+
+        new JavacTask(tb)
+            .options("--enable-preview", "--release", SOURCE_VERSION)
+            .outdir(classes)
+            .callback(task -> {
+                task.addTaskListener(new TaskListener() {
+                    @Override
+                    public void finished(TaskEvent e) {
+                        if (e.getKind() == Kind.ANALYZE) {
+                            for (Tree t : e.getCompilationUnit().getTypeDecls()) {
+                                kinds.add(t.getKind().name());
+                            }
+                        }
+                    }
+                });
+            })
+            .files(tb.findJavaFiles(src))
+            .run(Task.Expect.SUCCESS)
+            .writeAll();
+
+        List<String> expectedKinds = List.of(
+            "CLASS"
+        );
+
+        if (!Objects.equals(expectedKinds, kinds)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedKinds +
+                                      ", actual: " + kinds);
+
+        }
+    }
+
+    @Test
+    public void testModelDisambiguation(Path base) throws Exception {
+        Path current = base.resolve(".");
+        Path src = current.resolve("src");
+        Path classes = current.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module.*;
+                          import module.ModuleClass;
+                          import module.module.*;
+                          import module.module.ModuleModuleClass;
+                          public class Test {
+                          }
+                          """,
+                          """
+                          package module;
+                          public class ModuleClass{
+                          }
+                          """,
+                          """
+                          package module.module;
+                          public class ModuleModuleClass {
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+        List<String> kinds = new ArrayList<>();
+
+        new JavacTask(tb)
+            .options("--enable-preview", "--release", SOURCE_VERSION)
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run(Task.Expect.SUCCESS)
+            .writeAll();
+    }
+
+}
diff --git a/test/langtools/tools/javac/diags/examples/ImportModule.java b/test/langtools/tools/javac/diags/examples/ImportModule.java
new file mode 100644
index 00000000000..2a0a39f5fad
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/ImportModule.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+ // key: compiler.misc.feature.module.imports
+ // key: compiler.warn.preview.feature.use.plural
+ // options: --release ${jdk.version} --enable-preview -Xlint:preview
+
+import module java.base;
+
+public class ImportModule {
+}
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java
new file mode 100644
index 00000000000..e8f9c952fbc
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+// key: compiler.err.import.module.does.not.read
+// key: compiler.note.preview.filename
+// key: compiler.note.preview.recompile
+// options: --release ${jdk.version} --enable-preview
+module m {}
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/test/Test.java b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/test/Test.java
new file mode 100644
index 00000000000..a23fe670401
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/test/Test.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import module java.compiler;
+
+public class Test {}
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java
new file mode 100644
index 00000000000..37ae9673cc8
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+// key: compiler.err.import.module.does.not.read.unnamed
+// key: compiler.note.preview.filename
+// key: compiler.note.preview.recompile
+// options: --release ${jdk.version} --enable-preview --limit-modules java.base
+
+import module java.compiler;
+
+public class ImportModuleDoesNotReadUnnamed {
+}
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java b/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java
new file mode 100644
index 00000000000..8a12fc0bd03
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+ // key: compiler.err.import.module.not.found
+ // key: compiler.note.preview.filename
+ // key: compiler.note.preview.recompile
+ // options: --release ${jdk.version} --enable-preview
+
+import module unknown;
+
+public class ImportModuleNotFound {
+}
diff --git a/test/langtools/tools/javac/tree/Imports.java b/test/langtools/tools/javac/tree/Imports.java
new file mode 100644
index 00000000000..8ab59d280f6
--- /dev/null
+++ b/test/langtools/tools/javac/tree/Imports.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2024, 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 8328481
+ * @summary Verify the Trees model for module imports
+ * @library /tools/lib
+ * @modules java.logging
+ *          java.sql
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main Imports
+*/
+
+import com.sun.source.tree.ImportTree;
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskEvent.Kind;
+import com.sun.source.util.TaskListener;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import toolbox.TestRunner;
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class Imports extends TestRunner {
+
+    private static final String SOURCE_VERSION = System.getProperty("java.specification.version");
+    private ToolBox tb;
+
+    public static void main(String... args) throws Exception {
+        new Imports().runTests();
+    }
+
+    Imports() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public void runTests() throws Exception {
+        runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    @Test
+    public void testModuleImport(Path base) throws Exception {
+        Path current = base.resolve(".");
+        Path src = current.resolve("src");
+        Path classes = current.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package test;
+                          import module java.base;
+                          public class Test {
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        AtomicInteger seenImports = new AtomicInteger(-1);
+
+        new JavacTask(tb)
+            .options("--enable-preview", "--release", SOURCE_VERSION)
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .callback(task -> {
+                task.addTaskListener(new TaskListener() {
+                    @Override
+                    public void finished(TaskEvent e) {
+                        if (e.getKind() != Kind.PARSE) {
+                            return ;
+                        }
+
+                        var imports = e.getCompilationUnit().getImports();
+
+                        seenImports.set(imports.size());
+
+                        if (imports.size() != 1) {
+                            throw new AssertionError("Exception 1 import, " +
+                                                     "but got: " + imports.size());
+                        }
+
+                        ImportTree it = imports.get(0);
+
+                        if (!it.isModule()) {
+                            throw new AssertionError("Expected module import, but got ordinary one.");
+                        }
+
+                        if (!"java.base".equals(it.getQualifiedIdentifier().toString())) {
+                            throw new AssertionError("Expected module import for java.base, " +
+                                                     "but got: " + it.getQualifiedIdentifier());
+                        }
+
+                        String expectedImportToString = "import module java.base;\n";
+                        String actualImportToString = it.toString()
+                                                        .replaceAll("\\R", "\n");
+
+                        if (!expectedImportToString.equals(actualImportToString)) {
+                            throw new AssertionError("Expected '" + expectedImportToString + "', " +
+                                                     "but got: '" + it + "'");
+                        }
+                    }
+                });
+            })
+            .run(Task.Expect.SUCCESS);
+
+        if (seenImports.get() == (-1)) {
+            throw new AssertionError("Did not verify any imports!");
+        }
+    }
+
+}
diff --git a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
index aa30682e1bc..63814220c03 100644
--- a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
+++ b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
@@ -92,6 +92,7 @@ public class ListModuleDeps {
     public Object[][] jdkModules() {
         return new Object[][]{
             {"jdk.compiler", new String[]{
+                                "java.base/jdk.internal.javac",
                                 "java.base/jdk.internal.jmod",
                                 "java.base/jdk.internal.misc",
                                 "java.base/jdk.internal.module",
diff --git a/test/langtools/tools/lib/toolbox/ToolBox.java b/test/langtools/tools/lib/toolbox/ToolBox.java
index 89dd7229016..8f1f8d3ce4a 100644
--- a/test/langtools/tools/lib/toolbox/ToolBox.java
+++ b/test/langtools/tools/lib/toolbox/ToolBox.java
@@ -747,6 +747,8 @@ public class ToolBox {
 
         private final static Pattern commentPattern =
                 Pattern.compile("(?s)(\\s+//.*?\n|/\\*.*?\\*/)");
+        private final static Pattern importModulePattern =
+                Pattern.compile("import\\s+module\\s+(((?:\\w+\\.)*)\\w+);");
         private final static Pattern modulePattern =
                 Pattern.compile("module\\s+((?:\\w+\\.)*)");
         private final static Pattern packagePattern =
@@ -761,15 +763,10 @@ public class ToolBox {
          * declarations from which the name is derived.
          */
         static String getJavaFileNameFromSource(String source) {
-            StringBuilder sb = new StringBuilder();
-            Matcher matcher = commentPattern.matcher(source);
-            int start = 0;
-            while (matcher.find()) {
-                sb.append(source, start, matcher.start());
-                start = matcher.end();
-            }
-            sb.append(source.substring(start));
-            source = sb.toString();
+            source = removeMatchingSpans(source, commentPattern);
+            source = removeMatchingSpans(source, importModulePattern);
+
+            Matcher matcher;
 
             String packageName = null;
 
@@ -795,6 +792,20 @@ public class ToolBox {
                         "name from the provided source");
             }
         }
+
+        static String removeMatchingSpans(String source, Pattern toRemove) {
+            StringBuilder sb = new StringBuilder();
+            Matcher matcher = toRemove.matcher(source);
+            int start = 0;
+
+            while (matcher.find()) {
+                sb.append(source, start, matcher.start());
+                start = matcher.end();
+            }
+
+            sb.append(source.substring(start));
+            return sb.toString();
+        }
     }
 
     /**

From f1509e007d1538acfb1749f7fafc56be2affd2e6 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 6 May 2024 06:01:42 +0000
Subject: [PATCH 329/486] 8330998: System.console() writes to stderr when
 stdout is redirected

Reviewed-by: naoto
---
 .../org/jline/JdkConsoleProviderImpl.java     |   7 +-
 .../org/jline/terminal/TerminalBuilder.java   |   3 +-
 .../jdk/internal/jline/RedirectedStdOut.java  | 176 ++++++++++++++++++
 3 files changed, 183 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/jdk/internal/jline/RedirectedStdOut.java

diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
index 3621a9efea8..d876cffb377 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -38,6 +38,7 @@ import jdk.internal.org.jline.reader.LineReader;
 import jdk.internal.org.jline.reader.LineReaderBuilder;
 import jdk.internal.org.jline.terminal.Terminal;
 import jdk.internal.org.jline.terminal.TerminalBuilder;
+import jdk.internal.org.jline.terminal.TerminalBuilder.SystemOutput;
 
 /**
  * JdkConsole/Provider implementations for jline
@@ -51,7 +52,9 @@ public class JdkConsoleProviderImpl implements JdkConsoleProvider {
     public JdkConsole console(boolean isTTY, Charset charset) {
         try {
             Terminal terminal = TerminalBuilder.builder().encoding(charset)
-                                               .exec(false).build();
+                                               .exec(false)
+                                               .systemOutput(SystemOutput.SysOut)
+                                               .build();
             return new JdkConsoleImpl(terminal);
         } catch (IllegalStateException ise) {
             //cannot create a non-dumb, non-exec terminal,
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
index 8c047e37342..014ad78b794 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
@@ -506,7 +506,8 @@ public final class TerminalBuilder {
                 }
                 terminal = new DumbTerminal(name, color ? Terminal.TYPE_DUMB_COLOR : Terminal.TYPE_DUMB,
                         new FileInputStream(FileDescriptor.in),
-                        new FileOutputStream(console == TerminalProvider.Stream.Output ? FileDescriptor.out : FileDescriptor.err),
+                        //JDK change: always write into stdout:
+                        new FileOutputStream(FileDescriptor.out),
                         encoding, signalHandler);
             }
         } else {
diff --git a/test/jdk/jdk/internal/jline/RedirectedStdOut.java b/test/jdk/jdk/internal/jline/RedirectedStdOut.java
new file mode 100644
index 00000000000..7cbf913219a
--- /dev/null
+++ b/test/jdk/jdk/internal/jline/RedirectedStdOut.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2024, 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 8330998
+ * @summary Verify that even if the stdout is redirected java.io.Console will
+ *          use it for writing.
+ * @modules jdk.internal.le
+ * @library /test/lib
+ * @run main RedirectedStdOut runRedirectAllTest
+ * @run main/othervm RedirectedStdOut runRedirectOutOnly
+ */
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SymbolLookup;
+import java.lang.foreign.ValueLayout;
+import java.lang.invoke.MethodHandle;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class RedirectedStdOut {
+    private static final String OUTPUT = "Hello!";
+
+    public static void main(String... args) throws Throwable {
+        RedirectedStdOut.class.getDeclaredMethod(args[0])
+                              .invoke(new RedirectedStdOut());
+    }
+
+    //verify the case where neither stdin/out/err is attached to a terminal,
+    //this test is weaker, but more reliable:
+    void runRedirectAllTest() throws Exception {
+        if (true) return ;
+        ProcessBuilder builder =
+                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName());
+        OutputAnalyzer output = ProcessTools.executeProcess(builder);
+
+        output.waitFor();
+
+        if (output.getExitValue() != 0) {
+            throw new AssertionError("Unexpected return value: " + output.getExitValue() +
+                                     ", actualOut: " + output.getStdout() +
+                                     ", actualErr: " + output.getStderr());
+        }
+
+        String expectedOut = OUTPUT;
+        String actualOut = output.getStdout();
+
+        if (!Objects.equals(expectedOut, actualOut)) {
+            throw new AssertionError("Unexpected stdout content. " +
+                                     "Expected: '" + expectedOut + "'" +
+                                     ", got: '" + actualOut + "'");
+        }
+
+        String expectedErr = "";
+        String actualErr = output.getStderr();
+
+        if (!Objects.equals(expectedErr, actualErr)) {
+            throw new AssertionError("Unexpected stderr content. " +
+                                     "Expected: '" + expectedErr + "'" +
+                                     ", got: '" + actualErr + "'");
+        }
+    }
+
+    //verify the case where stdin is attached to a terminal,
+    //this test allocates pty, and it might be skipped, if the appropriate
+    //native functions cannot be found
+    //it also leaves the VM in a broken state (with a pty attached), and so
+    //should run in a separate VM instance
+    void runRedirectOutOnly() throws Throwable {
+        Path stdout = Path.of(".", "stdout.txt").toAbsolutePath();
+
+        Files.deleteIfExists(stdout);
+
+        Linker linker = Linker.nativeLinker();
+        SymbolLookup stdlib = linker.defaultLookup();
+        MemorySegment parent = Arena.global().allocate(ValueLayout.ADDRESS);
+        MemorySegment child = Arena.global().allocate(ValueLayout.ADDRESS);
+        Optional<MemorySegment> openptyAddress = stdlib.find("openpty");
+
+        if (openptyAddress.isEmpty()) {
+            System.out.println("Cannot lookup openpty.");
+            //does not have forkpty, ignore
+            return ;
+        }
+
+        Optional<MemorySegment> loginttyAddress = stdlib.find("login_tty");
+
+        if (loginttyAddress.isEmpty()) {
+            System.out.println("Cannot lookup login_tty.");
+            //does not have forkpty, ignore
+            return ;
+        }
+
+        FunctionDescriptor openttyDescriptor =
+                FunctionDescriptor.of(ValueLayout.JAVA_INT,
+                                      ValueLayout.ADDRESS,
+                                      ValueLayout.ADDRESS,
+                                      ValueLayout.ADDRESS,
+                                      ValueLayout.ADDRESS,
+                                      ValueLayout.ADDRESS);
+        MethodHandle forkpty = linker.downcallHandle(openptyAddress.get(),
+                                                     openttyDescriptor);
+        int res = (int) forkpty.invoke(parent,
+                                       child,
+                                       MemorySegment.NULL,
+                                       MemorySegment.NULL,
+                                       MemorySegment.NULL);
+
+        if (res != 0) {
+            throw new AssertionError();
+        }
+
+        //set the current VM's in/out to the terminal:
+        FunctionDescriptor loginttyDescriptor =
+                FunctionDescriptor.of(ValueLayout.JAVA_INT,
+                                      ValueLayout.JAVA_INT);
+        MethodHandle logintty = linker.downcallHandle(loginttyAddress.get(),
+                                                      loginttyDescriptor);
+        logintty.invoke(child.get(ValueLayout.JAVA_INT, 0));
+
+        ProcessBuilder builder =
+            ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName());
+
+        builder.inheritIO();
+        builder.redirectOutput(stdout.toFile());
+
+        OutputAnalyzer output = ProcessTools.executeProcess(builder);
+
+        output.waitFor();
+
+        String expectedOut = OUTPUT;
+        String actualOut = Files.readString(stdout);
+
+        if (!Objects.equals(expectedOut, actualOut)) {
+            throw new AssertionError("Unexpected stdout content. " +
+                                     "Expected: '" + expectedOut + "'" +
+                                     ", got: '" + actualOut + "'");
+        }
+    }
+
+    public static class ConsoleTest {
+        public static void main(String... args) {
+            System.console().printf(OUTPUT);
+            System.exit(0);
+        }
+    }
+}

From 4bbd972cbb114b99e856aa7904c0240049052b6a Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 6 May 2024 07:48:22 +0000
Subject: [PATCH 330/486] 8305638: Renaming and small clean-ups around
 predicates

Reviewed-by: roland, epeter
---
 src/hotspot/share/opto/cfgnode.hpp       |   5 +
 src/hotspot/share/opto/loopPredicate.cpp | 115 ++++++++++++-----------
 src/hotspot/share/opto/loopTransform.cpp |   2 +-
 src/hotspot/share/opto/loopnode.cpp      |   4 +-
 src/hotspot/share/opto/loopnode.hpp      |   4 +-
 5 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index 869ac68bd9e..de37f4cdd65 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -493,6 +493,11 @@ class ParsePredicateNode : public IfNode {
     _useless = false;
   }
 
+  // Return the uncommon trap If projection of this Parse Predicate.
+  ParsePredicateUncommonProj* uncommon_proj() const {
+    return proj_out(0)->as_IfFalse();
+  }
+
   Node* uncommon_trap() const;
 
   Node* Ideal(PhaseGVN* phase, bool can_reshape) {
diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index 278f636d9c7..9fcfbaf5e64 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -99,40 +99,38 @@ void PhaseIdealLoop::register_control(Node* n, IdealLoopTree *loop, Node* pred,
 // We will create a region to guard the uct call if there is no one there.
 // The continuation projection (if_cont) of the new_iff is returned which
 // is an IfTrue projection. This code is also used to clone predicates to cloned loops.
-IfProjNode* PhaseIdealLoop::create_new_if_for_predicate(ParsePredicateSuccessProj* parse_predicate_proj, Node* new_entry,
-                                                        Deoptimization::DeoptReason reason,
+IfTrueNode* PhaseIdealLoop::create_new_if_for_predicate(ParsePredicateSuccessProj* parse_predicate_success_proj,
+                                                        Node* new_entry, const Deoptimization::DeoptReason reason,
                                                         const int opcode, const bool rewire_uncommon_proj_phi_inputs) {
-  assert(parse_predicate_proj->is_uncommon_trap_if_pattern(reason), "must be a uct if pattern!");
-  ParsePredicateNode* parse_predicate = parse_predicate_proj->in(0)->as_ParsePredicate();
-
-  ProjNode* uncommon_proj = parse_predicate->proj_out(false);
-  Node* uct_region = uncommon_proj->unique_ctrl_out();
-  assert(uct_region->is_Region() || uct_region->is_Call(), "must be a region or call uct");
+  assert(parse_predicate_success_proj->is_uncommon_trap_if_pattern(reason), "must be a uct if pattern!");
+  ParsePredicateNode* parse_predicate = parse_predicate_success_proj->in(0)->as_ParsePredicate();
+  ParsePredicateUncommonProj* uncommon_proj = parse_predicate->uncommon_proj();
+  Node* uncommon_trap = parse_predicate->uncommon_trap();
 
   uint proj_index = 1; // region's edge corresponding to uncommon_proj
-  if (!uct_region->is_Region()) { // create a region to guard the call
-    assert(uct_region->is_Call(), "must be call uct");
-    CallNode* call = uct_region->as_Call();
+  if (!uncommon_trap->is_Region()) { // create a region to guard the call
+    assert(uncommon_trap->is_Call(), "must be call uct");
+    CallNode* call = uncommon_trap->as_Call();
     IdealLoopTree* loop = get_loop(call);
-    uct_region = new RegionNode(1);
+    uncommon_trap = new RegionNode(1);
     Node* uncommon_proj_orig = uncommon_proj;
-    uncommon_proj = uncommon_proj->clone()->as_Proj();
+    uncommon_proj = uncommon_proj->clone()->as_IfFalse();
     register_control(uncommon_proj, loop, parse_predicate);
-    uct_region->add_req(uncommon_proj);
-    register_control(uct_region, loop, uncommon_proj);
-    _igvn.replace_input_of(call, 0, uct_region);
+    uncommon_trap->add_req(uncommon_proj);
+    register_control(uncommon_trap, loop, uncommon_proj);
+    _igvn.replace_input_of(call, 0, uncommon_trap);
     // When called from beautify_loops() idom is not constructed yet.
     if (_idom != nullptr) {
-      set_idom(call, uct_region, dom_depth(uct_region));
+      set_idom(call, uncommon_trap, dom_depth(uncommon_trap));
     }
     // Move nodes pinned on the projection or whose control is set to
     // the projection to the region.
-    lazy_replace(uncommon_proj_orig, uct_region);
+    lazy_replace(uncommon_proj_orig, uncommon_trap);
   } else {
     // Find region's edge corresponding to uncommon_proj
-    for (; proj_index < uct_region->req(); proj_index++)
-      if (uct_region->in(proj_index) == uncommon_proj) break;
-    assert(proj_index < uct_region->req(), "sanity");
+    for (; proj_index < uncommon_trap->req(); proj_index++)
+      if (uncommon_trap->in(proj_index) == uncommon_proj) break;
+    assert(proj_index < uncommon_trap->req(), "sanity");
   }
 
   Node* entry = parse_predicate->in(0);
@@ -157,22 +155,23 @@ IfProjNode* PhaseIdealLoop::create_new_if_for_predicate(ParsePredicateSuccessPro
       fatal("no other If variant here");
   }
   register_control(new_iff, lp, entry);
-  IfProjNode* if_cont = new IfTrueNode(new_iff);
-  IfProjNode* if_uct  = new IfFalseNode(new_iff);
+
+  IfTrueNode* if_cont = new IfTrueNode(new_iff);
+  IfFalseNode* if_uct = new IfFalseNode(new_iff);
 
   register_control(if_cont, lp, new_iff);
-  register_control(if_uct, get_loop(uct_region), new_iff);
+  register_control(if_uct, get_loop(uncommon_trap), new_iff);
 
-  _igvn.add_input_to(uct_region, if_uct);
+  _igvn.add_input_to(uncommon_trap, if_uct);
 
   // If rgn has phis add new edges which has the same
   // value as on original uncommon_proj pass.
-  assert(uct_region->in(uct_region->req() - 1) == if_uct, "new edge should be last");
+  assert(uncommon_trap->in(uncommon_trap->req() - 1) == if_uct, "new edge should be last");
   bool has_phi = false;
-  for (DUIterator_Fast imax, i = uct_region->fast_outs(imax); i < imax; i++) {
-    Node* use = uct_region->fast_out(i);
+  for (DUIterator_Fast imax, i = uncommon_trap->fast_outs(imax); i < imax; i++) {
+    Node* use = uncommon_trap->fast_out(i);
     if (use->is_Phi() && use->outcnt() > 0) {
-      assert(use->in(0) == uct_region, "");
+      assert(use->in(0) == uncommon_trap, "");
       _igvn.rehash_node_delayed(use);
       Node* phi_input = use->in(proj_index);
 
@@ -193,7 +192,7 @@ IfProjNode* PhaseIdealLoop::create_new_if_for_predicate(ParsePredicateSuccessPro
       has_phi = true;
     }
   }
-  assert(!has_phi || uct_region->req() > 3, "no phis when region is created");
+  assert(!has_phi || uncommon_trap->req() > 3, "no phis when region is created");
 
   if (new_entry == nullptr) {
     // Attach if_cont to iff
@@ -205,12 +204,12 @@ IfProjNode* PhaseIdealLoop::create_new_if_for_predicate(ParsePredicateSuccessPro
 
   // When called from beautify_loops() idom is not constructed yet.
   if (_idom != nullptr) {
-    Node* ridom = idom(uct_region);
+    Node* ridom = idom(uncommon_trap);
     Node* nrdom = dom_lca_internal(ridom, new_iff);
-    set_idom(uct_region, nrdom, dom_depth(uct_region));
+    set_idom(uncommon_trap, nrdom, dom_depth(uncommon_trap));
   }
 
-  return if_cont->as_IfProj();
+  return if_cont;
 }
 
 // Update ctrl and control inputs of all data nodes starting from 'node' to 'new_ctrl' which have 'old_ctrl' as
@@ -757,8 +756,8 @@ bool IdealLoopTree::is_range_check_if(IfProjNode* if_success_proj, PhaseIdealLoo
 //   max(scale*i + offset) = scale*(limit-stride) + offset
 // (2) stride*scale < 0
 //   max(scale*i + offset) = scale*init + offset
-BoolNode* PhaseIdealLoop::rc_predicate(IdealLoopTree* loop, Node* ctrl, int scale, Node* offset, Node* init,
-                                       Node* limit, jint stride, Node* range, bool upper, bool& overflow) {
+BoolNode* PhaseIdealLoop::rc_predicate(Node* ctrl, const int scale, Node* offset, Node* init, Node* limit,
+                                       const jint stride, Node* range, const bool upper, bool& overflow) {
   jint con_limit  = (limit != nullptr && limit->is_Con())  ? limit->get_int()  : 0;
   jint con_init   = init->is_Con()   ? init->get_int()   : 0;
   jint con_offset = offset->is_Con() ? offset->get_int() : 0;
@@ -1165,18 +1164,19 @@ bool PhaseIdealLoop::loop_predication_impl_helper(IdealLoopTree* loop, IfProjNod
                                                      reason,
                                                      iff->Opcode());
     Node* ctrl = new_predicate_proj->in(0)->as_If()->in(0);
-    BoolNode* new_predicate_bol = invar.clone(bol, ctrl)->as_Bool();
+    BoolNode* hoisted_check_predicate_bool = invar.clone(bol, ctrl)->as_Bool();
 
     // Negate test if necessary (Parse Predicates always have IfTrue as success projection and IfFalse as uncommon trap)
     bool negated = false;
     if (if_success_proj->is_IfFalse()) {
-      new_predicate_bol = new BoolNode(new_predicate_bol->in(1), new_predicate_bol->_test.negate());
-      register_new_node(new_predicate_bol, ctrl);
+      hoisted_check_predicate_bool = new BoolNode(hoisted_check_predicate_bool->in(1),
+                                                  hoisted_check_predicate_bool->_test.negate());
+      register_new_node(hoisted_check_predicate_bool, ctrl);
       negated = true;
     }
     IfNode* new_predicate_iff = new_predicate_proj->in(0)->as_If();
     _igvn.hash_delete(new_predicate_iff);
-    new_predicate_iff->set_req(1, new_predicate_bol);
+    new_predicate_iff->set_req(1, hoisted_check_predicate_bool);
 
     C->print_method(PHASE_AFTER_LOOP_PREDICATION_IC, 4, new_predicate_proj->in(0));
 
@@ -1220,7 +1220,8 @@ bool PhaseIdealLoop::loop_predication_impl_helper(IdealLoopTree* loop, IfProjNod
 
     // Perform cloning to keep Invariance state correct since the
     // late schedule will place invariant things in the loop.
-    Node* ctrl = parse_predicate_proj->in(0)->as_If()->in(0);
+    ParsePredicateNode* parse_predicate = parse_predicate_proj->in(0)->as_ParsePredicate();
+    Node* ctrl = parse_predicate->in(0);
     rng = invar.clone(rng, ctrl);
     if (offset && offset != zero) {
       assert(invar.is_invariant(offset), "offset must be loop invariant");
@@ -1229,25 +1230,28 @@ bool PhaseIdealLoop::loop_predication_impl_helper(IdealLoopTree* loop, IfProjNod
     // If predicate expressions may overflow in the integer range, longs are used.
     bool overflow = false;
     // Test the lower bound
-    BoolNode* lower_bound_bol = rc_predicate(loop, ctrl, scale, offset, init, limit, stride, rng, false, overflow);
+    BoolNode* lower_bound_bol = rc_predicate(ctrl, scale, offset, init, limit, stride, rng, false, overflow);
 
     const int if_opcode = iff->Opcode();
     IfProjNode* lower_bound_proj = create_new_if_for_predicate(parse_predicate_proj, nullptr, reason, overflow ? Op_If : if_opcode);
     IfNode* lower_bound_iff = lower_bound_proj->in(0)->as_If();
     _igvn.hash_delete(lower_bound_iff);
     lower_bound_iff->set_req(1, lower_bound_bol);
-    if (TraceLoopPredicate) tty->print_cr("lower bound check if: %d", lower_bound_iff->_idx);
+    if (TraceLoopPredicate) {
+      tty->print_cr("lower bound check if: %d", lower_bound_iff->_idx);
+    }
 
     // Test the upper bound
-    BoolNode* upper_bound_bol = rc_predicate(loop, lower_bound_proj, scale, offset, init, limit, stride, rng, true,
-                                             overflow);
+    BoolNode* upper_bound_bol = rc_predicate(lower_bound_proj, scale, offset, init, limit, stride, rng, true, overflow);
 
     IfProjNode* upper_bound_proj = create_new_if_for_predicate(parse_predicate_proj, nullptr, reason, overflow ? Op_If : if_opcode);
     assert(upper_bound_proj->in(0)->as_If()->in(0) == lower_bound_proj, "should dominate");
     IfNode* upper_bound_iff = upper_bound_proj->in(0)->as_If();
     _igvn.hash_delete(upper_bound_iff);
     upper_bound_iff->set_req(1, upper_bound_bol);
-    if (TraceLoopPredicate) tty->print_cr("upper bound check if: %d", upper_bound_iff->_idx);
+    if (TraceLoopPredicate) {
+      tty->print_cr("upper bound check if: %d", upper_bound_iff->_idx);
+    }
 
     // Fall through into rest of the cleanup code which will move any dependent nodes to the skeleton predicates of the
     // upper bound test. We always need to create skeleton predicates in order to properly remove dead loops when later
@@ -1294,7 +1298,7 @@ IfProjNode* PhaseIdealLoop::add_template_assertion_predicate(IfNode* iff, IdealL
   Node* opaque_init = new OpaqueLoopInitNode(C, init);
   register_new_node(opaque_init, upper_bound_proj);
   bool negate = (if_proj->_con != parse_predicate_proj->_con);
-  BoolNode* bol = rc_predicate(loop, upper_bound_proj, scale, offset, opaque_init, limit, stride, rng,
+  BoolNode* bol = rc_predicate(upper_bound_proj, scale, offset, opaque_init, limit, stride, rng,
                                (stride > 0) != (scale > 0), overflow);
   Node* opaque_bol = new Opaque4Node(C, bol, _igvn.intcon(1)); // This will go away once loop opts are over
   C->add_template_assertion_predicate_opaq(opaque_bol);
@@ -1317,7 +1321,7 @@ IfProjNode* PhaseIdealLoop::add_template_assertion_predicate(IfNode* iff, IdealL
   max_value = new CastIINode(max_value, loop->_head->as_CountedLoop()->phi()->bottom_type());
   register_new_node(max_value, parse_predicate_proj);
 
-  bol = rc_predicate(loop, new_proj, scale, offset, max_value, limit, stride, rng, (stride > 0) != (scale > 0),
+  bol = rc_predicate(new_proj, scale, offset, max_value, limit, stride, rng, (stride > 0) != (scale > 0),
                      overflow);
   opaque_bol = new Opaque4Node(C, bol, _igvn.intcon(1));
   C->add_template_assertion_predicate_opaq(opaque_bol);
@@ -1340,10 +1344,6 @@ bool PhaseIdealLoop::loop_predication_impl(IdealLoopTree* loop) {
     return false;
   }
 
-  if (head->is_OuterStripMinedLoop()) {
-    return false;
-  }
-
   CountedLoopNode *cl = nullptr;
   if (head->is_valid_counted_loop(T_INT)) {
     cl = head->as_CountedLoop();
@@ -1514,19 +1514,20 @@ bool PhaseIdealLoop::can_create_loop_predicates(const PredicateBlock* profiled_l
 
 //------------------------------loop_predication--------------------------------
 // driver routine for loop predication optimization
-bool IdealLoopTree::loop_predication( PhaseIdealLoop *phase) {
+bool IdealLoopTree::loop_predication(PhaseIdealLoop* phase) {
   bool hoisted = false;
   // Recursively promote predicates
   if (_child) {
     hoisted = _child->loop_predication( phase);
   }
 
-  // self
+  // Self
   if (can_apply_loop_predication()) {
     hoisted |= phase->loop_predication_impl(this);
   }
 
-  if (_next) { //sibling
+  // Sibling
+  if (_next) {
     hoisted |= _next->loop_predication( phase);
   }
 
@@ -1534,5 +1535,9 @@ bool IdealLoopTree::loop_predication( PhaseIdealLoop *phase) {
 }
 
 bool IdealLoopTree::can_apply_loop_predication() {
-  return _head->is_Loop() && !_irreducible && !tail()->is_top();
+  return !_head->is_Root() &&
+         _head->is_Loop() &&
+         !_head->is_OuterStripMinedLoop() &&
+         !_irreducible &&
+         !tail()->is_top();
 }
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 24861cf2725..f2022d35cf6 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -2772,7 +2772,7 @@ Node* PhaseIdealLoop::add_range_check_elimination_assertion_predicate(IdealLoopT
                                                                       Node* offset, Node* limit, jint stride_con,
                                                                       Node* value) {
   bool overflow = false;
-  BoolNode* bol = rc_predicate(loop, ctrl, scale_con, offset, value, nullptr, stride_con,
+  BoolNode* bol = rc_predicate(ctrl, scale_con, offset, value, nullptr, stride_con,
                                limit, (stride_con > 0) != (scale_con > 0), overflow);
   Node* opaque_bol = new Opaque4Node(C, bol, _igvn.intcon(1));
   register_new_node(opaque_bol, ctrl);
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index fcd0e1a4df2..fac7cf32f60 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -4320,7 +4320,7 @@ void PhaseIdealLoop::mark_loop_associated_parse_predicates_useful() {
 }
 
 void PhaseIdealLoop::mark_useful_parse_predicates_for_loop(IdealLoopTree* loop) {
-  Node* entry = loop->_head->in(LoopNode::EntryControl);
+  Node* entry = loop->_head->as_Loop()->skip_strip_mined()->in(LoopNode::EntryControl);
   const Predicates predicates(entry);
   ParsePredicateIterator iterator(predicates);
   while (iterator.has_next()) {
@@ -4359,7 +4359,7 @@ void PhaseIdealLoop::collect_useful_template_assertion_predicates(Unique_Node_Li
 
 void PhaseIdealLoop::collect_useful_template_assertion_predicates_for_loop(IdealLoopTree* loop,
                                                                            Unique_Node_List &useful_predicates) {
-  Node* entry = loop->_head->in(LoopNode::EntryControl);
+  Node* entry = loop->_head->as_Loop()->skip_strip_mined()->in(LoopNode::EntryControl);
   const Predicates predicates(entry);
   if (UseProfiledLoopPredicate) {
     const PredicateBlock* profiled_loop_predicate_block = predicates.profiled_loop_predicate_block();
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 75276aae36d..f7ba4578a51 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1337,7 +1337,7 @@ public:
                                       bool* p_short_scale, int depth);
 
   // Create a new if above the uncommon_trap_if_pattern for the predicate to be promoted
-  IfProjNode* create_new_if_for_predicate(ParsePredicateSuccessProj* parse_predicate_proj, Node* new_entry,
+  IfTrueNode* create_new_if_for_predicate(ParsePredicateSuccessProj* parse_predicate_proj, Node* new_entry,
                                           Deoptimization::DeoptReason reason, int opcode,
                                           bool rewire_uncommon_proj_phi_inputs = false);
 
@@ -1360,7 +1360,7 @@ public:
   }
 
   // Construct a range check for a predicate if
-  BoolNode* rc_predicate(IdealLoopTree* loop, Node* ctrl, int scale, Node* offset, Node* init, Node* limit,
+  BoolNode* rc_predicate(Node* ctrl, int scale, Node* offset, Node* init, Node* limit,
                          jint stride, Node* range, bool upper, bool& overflow);
 
   // Implementation of the loop predication to promote checks outside the loop

From 15862a2f116331b7f439619c3aa1b5965e737044 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 6 May 2024 08:48:46 +0000
Subject: [PATCH 331/486] 8331708: jdk/internal/jline/RedirectedStdOut.java
 times-out on macosx-aarch64

Reviewed-by: asotona
---
 test/jdk/jdk/internal/jline/RedirectedStdOut.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/jdk/jdk/internal/jline/RedirectedStdOut.java b/test/jdk/jdk/internal/jline/RedirectedStdOut.java
index 7cbf913219a..fb614e3d754 100644
--- a/test/jdk/jdk/internal/jline/RedirectedStdOut.java
+++ b/test/jdk/jdk/internal/jline/RedirectedStdOut.java
@@ -29,9 +29,11 @@
  * @modules jdk.internal.le
  * @library /test/lib
  * @run main RedirectedStdOut runRedirectAllTest
- * @run main/othervm RedirectedStdOut runRedirectOutOnly
+ * @run main/othervm --enable-native-access=ALL-UNNAMED RedirectedStdOut runRedirectOutOnly
  */
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.lang.foreign.Arena;
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.Linker;
@@ -58,7 +60,6 @@ public class RedirectedStdOut {
     //verify the case where neither stdin/out/err is attached to a terminal,
     //this test is weaker, but more reliable:
     void runRedirectAllTest() throws Exception {
-        if (true) return ;
         ProcessBuilder builder =
                 ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName());
         OutputAnalyzer output = ProcessTools.executeProcess(builder);
@@ -147,6 +148,10 @@ public class RedirectedStdOut {
                                                       loginttyDescriptor);
         logintty.invoke(child.get(ValueLayout.JAVA_INT, 0));
 
+        //createTestJavaProcessBuilder logs to (current process') System.out, but
+        //that may not work since the redirect. Setting System.out to a scratch value:
+        System.setOut(new PrintStream(new ByteArrayOutputStream()));
+
         ProcessBuilder builder =
             ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName());
 

From 6c7764118ef1a684edddb302a4eaff36d80c783f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Mon, 6 May 2024 09:26:53 +0000
Subject: [PATCH 332/486] 8331418: ZGC: generalize barrier liveness logic

Reviewed-by: mdoerr, aboldtch, fyang, eosterlund
---
 .../gc/shared/barrierSetAssembler_aarch64.cpp | 12 ++---
 .../ppc/gc/shared/barrierSetAssembler_ppc.cpp |  7 +--
 .../ppc/gc/shared/barrierSetAssembler_ppc.hpp |  1 -
 .../gc/shared/barrierSetAssembler_riscv.cpp   | 10 ++--
 .../x86/gc/shared/barrierSetAssembler_x86.cpp |  9 +---
 .../share/gc/shared/c2/barrierSetC2.cpp       | 51 +++++++++++++++----
 .../share/gc/shared/c2/barrierSetC2.hpp       | 19 ++++++-
 src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp   | 15 +++---
 src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp   |  3 --
 9 files changed, 75 insertions(+), 52 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
index 62414611cce..6c2b12fc7a8 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
@@ -476,7 +476,7 @@ void SaveLiveRegisters::initialize(BarrierStubC2* stub) {
   GrowableArray<RegisterData> registers;
   VMReg prev_vm_reg = VMRegImpl::Bad();
 
-  RegMaskIterator rmi(stub->live());
+  RegMaskIterator rmi(stub->preserve_set());
   while (rmi.has_next()) {
     OptoReg::Name opto_reg = rmi.next();
     VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
@@ -491,7 +491,7 @@ void SaveLiveRegisters::initialize(BarrierStubC2* stub) {
         index = registers.append(reg_data);
       }
     } else if (vm_reg->is_FloatRegister()) {
-      // We have size encoding in OptoReg of stub->live()
+      // We have size encoding in OptoReg of stub->preserve_set()
       // After encoding, float/neon/sve register has only one slot in regmask
       // Decode it to get the actual size
       VMReg vm_reg_base = vm_reg->as_FloatRegister()->as_VMReg();
@@ -532,12 +532,8 @@ void SaveLiveRegisters::initialize(BarrierStubC2* stub) {
     }
   }
 
-  // Remove C-ABI SOE registers, scratch regs and _ref register that will be updated
-  if (stub->result() != noreg) {
-    _gp_regs -= RegSet::range(r19, r30) + RegSet::of(r8, r9, stub->result());
-  } else {
-    _gp_regs -= RegSet::range(r19, r30) + RegSet::of(r8, r9);
-  }
+  // Remove C-ABI SOE registers and scratch regs
+  _gp_regs -= RegSet::range(r19, r30) + RegSet::of(r8, r9);
 
   // Remove C-ABI SOE fp registers
   _fp_regs -= FloatRegSet::range(v8, v15);
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
index 3bb205d659f..16de0b6a7dd 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
@@ -282,7 +282,7 @@ OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Na
 #define __ _masm->
 
 SaveLiveRegisters::SaveLiveRegisters(MacroAssembler *masm, BarrierStubC2 *stub)
-  : _masm(masm), _reg_mask(stub->live()), _result_reg(stub->result()) {
+  : _masm(masm), _reg_mask(stub->preserve_set()) {
 
   const int register_save_size = iterate_over_register_mask(ACTION_COUNT_ONLY) * BytesPerWord;
   _frame_size = align_up(register_save_size, frame::alignment_in_bytes)
@@ -317,11 +317,6 @@ int SaveLiveRegisters::iterate_over_register_mask(IterationAction action, int of
     if (vm_reg->is_Register()) {
       Register std_reg = vm_reg->as_Register();
 
-      // '_result_reg' will hold the end result of the operation. Its content must thus not be preserved.
-      if (std_reg == _result_reg) {
-        continue;
-      }
-
       if (std_reg->encoding() >= R2->encoding() && std_reg->encoding() <= R12->encoding()) {
         reg_save_index++;
 
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
index d70fce77acc..9c1cef5eea4 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
@@ -98,7 +98,6 @@ public:
 class SaveLiveRegisters {
   MacroAssembler* _masm;
   RegMask _reg_mask;
-  Register _result_reg;
   int _frame_size;
 
  public:
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
index f411a5572c7..cbf8de7341d 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
@@ -396,7 +396,7 @@ OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Na
 
 void SaveLiveRegisters::initialize(BarrierStubC2* stub) {
   // Record registers that needs to be saved/restored
-  RegMaskIterator rmi(stub->live());
+  RegMaskIterator rmi(stub->preserve_set());
   while (rmi.has_next()) {
     const OptoReg::Name opto_reg = rmi.next();
     if (OptoReg::is_reg(opto_reg)) {
@@ -414,12 +414,8 @@ void SaveLiveRegisters::initialize(BarrierStubC2* stub) {
     }
   }
 
-  // Remove C-ABI SOE registers, tmp regs and _ref register that will be updated
-  if (stub->result() != noreg) {
-    _gp_regs -= RegSet::range(x18, x27) + RegSet::of(x2) + RegSet::of(x8, x9) + RegSet::of(x5, stub->result());
-  } else {
-    _gp_regs -= RegSet::range(x18, x27) + RegSet::of(x2, x5) + RegSet::of(x8, x9);
-  }
+  // Remove C-ABI SOE registers and tmp regs
+  _gp_regs -= RegSet::range(x18, x27) + RegSet::of(x2, x5) + RegSet::of(x8, x9);
 }
 
 SaveLiveRegisters::SaveLiveRegisters(MacroAssembler* masm, BarrierStubC2* stub)
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
index a06fde061f8..a6801f594bd 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
@@ -613,19 +613,12 @@ void SaveLiveRegisters::initialize(BarrierStubC2* stub) {
   caller_saved.Insert(OptoReg::as_OptoReg(r10->as_VMReg()));
   caller_saved.Insert(OptoReg::as_OptoReg(r11->as_VMReg()));
 
-  if (stub->result() != noreg) {
-    caller_saved.Remove(OptoReg::as_OptoReg(stub->result()->as_VMReg()));
-  }
-
-  // Create mask of live registers
-  RegMask live = stub->live();
-
   int gp_spill_size = 0;
   int opmask_spill_size = 0;
   int xmm_spill_size = 0;
 
   // Record registers that needs to be saved/restored
-  RegMaskIterator rmi(live);
+  RegMaskIterator rmi(stub->preserve_set());
   while (rmi.has_next()) {
     const OptoReg::Name opto_reg = rmi.next();
     const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
index 3f712c9d391..53e4d7fdf8f 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
@@ -87,15 +87,16 @@ static BarrierSetC2State* barrier_set_state() {
   return reinterpret_cast<BarrierSetC2State*>(Compile::current()->barrier_set_state());
 }
 
-BarrierStubC2::BarrierStubC2(const MachNode* node)
-  : _node(node),
-    _entry(),
-    _continuation() {}
-
 RegMask& BarrierStubC2::live() const {
   return *barrier_set_state()->live(_node);
 }
 
+BarrierStubC2::BarrierStubC2(const MachNode* node)
+  : _node(node),
+    _entry(),
+    _continuation(),
+    _preserve(live()) {}
+
 Label* BarrierStubC2::entry() {
   // The _entry will never be bound when in_scratch_emit_size() is true.
   // However, we still need to return a label that is not bound now, but
@@ -108,6 +109,27 @@ Label* BarrierStubC2::continuation() {
   return &_continuation;
 }
 
+void BarrierStubC2::preserve(Register r) {
+  const VMReg vm_reg = r->as_VMReg();
+  assert(vm_reg->is_Register(), "r must be a general-purpose register");
+  _preserve.Insert(OptoReg::as_OptoReg(vm_reg));
+}
+
+void BarrierStubC2::dont_preserve(Register r) {
+  VMReg vm_reg = r->as_VMReg();
+  assert(vm_reg->is_Register(), "r must be a general-purpose register");
+  // Subtract the given register and all its sub-registers (e.g. {R11, R11_H}
+  // for r11 in aarch64).
+  do {
+    _preserve.Remove(OptoReg::as_OptoReg(vm_reg));
+    vm_reg = vm_reg->next();
+  } while (vm_reg->is_Register() && !vm_reg->is_concrete());
+}
+
+const RegMask& BarrierStubC2::preserve_set() const {
+  return _preserve;
+}
+
 Node* BarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& val) const {
   DecoratorSet decorators = access.decorators();
 
@@ -828,6 +850,7 @@ void BarrierSetC2::compute_liveness_at_stubs() const {
   PhaseRegAlloc* const regalloc = C->regalloc();
   RegMask* const live = NEW_ARENA_ARRAY(A, RegMask, cfg->number_of_blocks() * sizeof(RegMask));
   BarrierSetAssembler* const bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  BarrierSetC2State* bs_state = barrier_set_state();
   Block_List worklist;
 
   for (uint i = 0; i < cfg->number_of_blocks(); ++i) {
@@ -850,6 +873,14 @@ void BarrierSetC2::compute_liveness_at_stubs() const {
     for (int i = block->number_of_nodes() - 1; i >= 0; --i) {
       const Node* const node = block->get_node(i);
 
+      // If this node tracks out-liveness, update it
+      if (!bs_state->needs_livein_data()) {
+        RegMask* const regs = bs_state->live(node);
+        if (regs != nullptr) {
+          regs->OR(new_live);
+        }
+      }
+
       // Remove def bits
       const OptoReg::Name first = bs->refine_register(node, regalloc->get_reg_first(node));
       const OptoReg::Name second = bs->refine_register(node, regalloc->get_reg_second(node));
@@ -873,10 +904,12 @@ void BarrierSetC2::compute_liveness_at_stubs() const {
         }
       }
 
-       // If this node tracks liveness, update it
-      RegMask* const regs = barrier_set_state()->live(node);
-      if (regs != NULL) {
-        regs->OR(new_live);
+      // If this node tracks in-liveness, update it
+      if (bs_state->needs_livein_data()) {
+        RegMask* const regs = bs_state->live(node);
+        if (regs != nullptr) {
+          regs->OR(new_live);
+        }
       }
     }
 
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
index aa2df96412d..8787fe83d14 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
@@ -227,6 +227,7 @@ public:
   }
 
   virtual bool needs_liveness_data(const MachNode* mach) const = 0;
+  virtual bool needs_livein_data() const = 0;
 };
 
 // This class represents the slow path in a C2 barrier. It is defined by a
@@ -238,14 +239,28 @@ protected:
   const MachNode* _node;
   Label           _entry;
   Label           _continuation;
+  RegMask         _preserve;
+
+  // Registers that are live-in/live-out of the entire memory access
+  // implementation (possibly including multiple barriers). Whether live-in or
+  // live-out registers are returned depends on
+  // BarrierSetC2State::needs_livein_data().
+  RegMask& live() const;
 
 public:
   BarrierStubC2(const MachNode* node);
-  RegMask& live() const;
+
+  // Entry point to the stub.
   Label* entry();
+  // Return point from the stub (typically end of barrier).
   Label* continuation();
 
-  virtual Register result() const = 0;
+  // Preserve the value in reg across runtime calls in this barrier.
+  void preserve(Register reg);
+  // Do not preserve the value in reg across runtime calls in this barrier.
+  void dont_preserve(Register reg);
+  // Set of registers whose value needs to be preserved across runtime calls in this barrier.
+  const RegMask& preserve_set() const;
 };
 
 // This is the top-level class for the backend of the Access API in C2.
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
index 85d45553202..4b79b568241 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
@@ -142,6 +142,10 @@ public:
     return mach->barrier_data() != ZBarrierElided;
   }
 
+  bool needs_livein_data() const {
+    return true;
+  }
+
   void inc_trampoline_stubs_count() {
     assert(_trampoline_stubs_count != INT_MAX, "Overflow");
     ++_trampoline_stubs_count;
@@ -200,6 +204,9 @@ ZLoadBarrierStubC2::ZLoadBarrierStubC2(const MachNode* node, Address ref_addr, R
     _ref(ref) {
   assert_different_registers(ref, ref_addr.base());
   assert_different_registers(ref, ref_addr.index());
+  // The runtime call updates the value of ref, so we should not spill and
+  // reload its outdated value.
+  dont_preserve(ref);
 }
 
 Address ZLoadBarrierStubC2::ref_addr() const {
@@ -210,10 +217,6 @@ Register ZLoadBarrierStubC2::ref() const {
   return _ref;
 }
 
-Register ZLoadBarrierStubC2::result() const {
-  return ref();
-}
-
 address ZLoadBarrierStubC2::slow_path() const {
   const uint8_t barrier_data = _node->barrier_data();
   DecoratorSet decorators = DECORATORS_NONE;
@@ -272,10 +275,6 @@ bool ZStoreBarrierStubC2::is_atomic() const {
   return _is_atomic;
 }
 
-Register ZStoreBarrierStubC2::result() const {
-  return noreg;
-}
-
 void ZStoreBarrierStubC2::emit_code(MacroAssembler& masm) {
   ZBarrierSet::assembler()->generate_c2_store_barrier_stub(&masm, static_cast<ZStoreBarrierStubC2*>(this));
 }
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
index f8892defcff..bf46780226e 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
@@ -51,7 +51,6 @@ static int stubs_start_offset();
   ZBarrierStubC2(const MachNode* node);
 
 public:
-  virtual Register result() const = 0;
   virtual void emit_code(MacroAssembler& masm) = 0;
 };
 
@@ -70,7 +69,6 @@ public:
   Register ref() const;
   address slow_path() const;
 
-  virtual Register result() const;
   virtual void emit_code(MacroAssembler& masm);
 };
 
@@ -94,7 +92,6 @@ public:
   bool is_native() const;
   bool is_atomic() const;
 
-  virtual Register result() const;
   virtual void emit_code(MacroAssembler& masm);
 };
 

From 9b0bb03366642dd787b02809b3759ed714da9b81 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 6 May 2024 09:41:07 +0000
Subject: [PATCH 333/486] 8331285: Deprecate and obsolete OldSize

Reviewed-by: dholmes, eosterlund
---
 src/hotspot/share/gc/shared/gc_globals.hpp | 2 +-
 src/hotspot/share/runtime/arguments.cpp    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index 13583874d84..42d9e028b5e 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -541,7 +541,7 @@
           constraint(SoftMaxHeapSizeConstraintFunc,AfterMemoryInit)         \
                                                                             \
   product(size_t, OldSize, ScaleForWordSize(4*M),                           \
-          "Initial tenured generation size (in bytes)")                     \
+          "(Deprecated) Initial tenured generation size (in bytes)")        \
           range(0, max_uintx)                                               \
                                                                             \
   product(size_t, NewSize, ScaleForWordSize(1*M),                           \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index f2b37003731..ee8c7b24541 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -502,6 +502,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "UseSharedSpaces",              JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "RegisterFinalizersAtInit",     JDK_Version::jdk(22), JDK_Version::jdk(23), JDK_Version::jdk(24) },
   { "DontYieldALot",                JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
+  { "OldSize",                      JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "PreserveAllAnnotations",       JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseNotificationThread",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseEmptySlotsInSupers",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },

From e8a2d5669cda59d0f9a10e5a8035c20b8678d3d8 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 6 May 2024 11:01:55 +0000
Subject: [PATCH 334/486] 8331653: JFR: Improve logging for
 jdk/jfr/api/consumer/recordingstream;TestStop.java

Reviewed-by: mgronlun
---
 .../consumer/recordingstream/TestStop.java    | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestStop.java b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestStop.java
index 5cabd9e6884..58dcbbcbe20 100644
--- a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestStop.java
+++ b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestStop.java
@@ -24,9 +24,10 @@
 package jdk.jfr.api.consumer.recordingstream;
 
 import java.nio.file.Path;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.Collections;
 
 import jdk.jfr.Event;
 import jdk.jfr.consumer.RecordedEvent;
@@ -106,10 +107,10 @@ public class TestStop {
     }
 
     private static void testNestedStop() throws Exception {
-        AtomicLong outerCount = new AtomicLong();
-        AtomicLong innerCount = new AtomicLong();
+        List<String> outerStream = Collections.synchronizedList(new ArrayList<>());
+        List<String> innerStream = Collections.synchronizedList(new ArrayList<>());
         try (RecordingStream outer = new RecordingStream()) {
-            outer.onEvent(e -> outerCount.incrementAndGet());
+            outer.onEvent(e -> outerStream.add(eventToText(e)));
             outer.setMaxSize(100_000_000);
             outer.startAsync();
 
@@ -119,7 +120,7 @@ public class TestStop {
 
             try (RecordingStream inner = new RecordingStream()) {
                 inner.setMaxSize(100_000_000);
-                inner.onEvent(e -> innerCount.incrementAndGet());
+                inner.onEvent(e -> innerStream.add(eventToText(e)));
                 inner.startAsync();
 
                 MarkEvent b = new MarkEvent();
@@ -138,30 +139,49 @@ public class TestStop {
                 Path fileInner = Path.of("inner.jfr");
                 inner.dump(fileInner);
                 outer.dump(fileOuter);
-                System.out.println("RecordingStream outer:");
+                System.out.println("Outer dump:");
                 var dumpOuter = RecordingFile.readAllEvents(fileOuter);
-                System.out.println(dumpOuter);
-                System.out.println("RecordingStream inner:");
+                for (RecordedEvent e : dumpOuter) {
+                    System.out.println(eventToText(e));
+                }
+                System.out.println("Inner dump:");
                 var dumpInner = RecordingFile.readAllEvents(fileInner);
-                System.out.println(dumpInner);
-                System.out.println("Outer count: " + outerCount);
-                System.out.println("Inner count: " + innerCount);
+                for (RecordedEvent e : dumpInner) {
+                    System.out.println(eventToText(e));
+                }
+                System.out.println();
+                System.out.println("Outer stream:");
+                for (String s : outerStream) {
+                    System.out.println(s);
+                }
+                System.out.println("Inner stream:");
+                for (String s : innerStream) {
+                    System.out.println(s);
+                }
                 if (dumpOuter.size() != 3) {
                     throw new AssertionError("Expected outer dump to have 3 events");
                 }
-                if (outerCount.get() != 3) {
+                if (outerStream.size() != 3) {
                     throw new AssertionError("Expected outer stream to have 3 events");
                 }
                 if (dumpInner.size() != 1) {
                     throw new AssertionError("Expected inner dump to have 1 event");
                 }
-                if (innerCount.get() != 1) {
+                if (innerStream.size() != 1) {
                     throw new AssertionError("Expected inner stream to have 1 event");
                 }
             }
         }
     }
 
+    private static String eventToText(RecordedEvent event) {
+        Instant timestamp = event.getEndTime();
+        long s = timestamp.getEpochSecond();
+        int n = timestamp.getNano();
+        String id = event.getString("id");
+        return id + ": n=" + n + " s=" + s + " t=" + timestamp;
+    }
+
     static void testStopClosed() {
         try (RecordingStream rs = new RecordingStream()) {
             rs.close();

From 1eec30a6c03b7f4028405dc9bdb4d2a663b3987d Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 6 May 2024 11:17:39 +0000
Subject: [PATCH 335/486] 8331573: Rename CollectedHeap::is_gc_active to be
 explicitly about STW GCs

Reviewed-by: stefank, zgu, tschatzl, gli
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  4 +--
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  2 +-
 .../share/gc/g1/g1CollectedHeap.inline.hpp    |  4 +--
 src/hotspot/share/gc/g1/g1FullGCScope.hpp     |  2 +-
 src/hotspot/share/gc/g1/g1RemSet.cpp          |  2 +-
 src/hotspot/share/gc/g1/g1VMOperations.cpp    |  2 +-
 .../gc/parallel/parallelScavengeHeap.cpp      |  2 +-
 .../share/gc/parallel/psParallelCompact.cpp   | 10 +++----
 src/hotspot/share/gc/parallel/psScavenge.cpp  | 10 +++----
 src/hotspot/share/gc/serial/serialHeap.cpp    |  4 +--
 src/hotspot/share/gc/shared/collectedHeap.cpp |  2 +-
 src/hotspot/share/gc/shared/collectedHeap.hpp | 12 ++++-----
 .../share/gc/shared/isGCActiveMark.cpp        | 26 +++++++++----------
 .../share/gc/shared/isGCActiveMark.hpp        | 14 +++++-----
 src/hotspot/share/gc/shared/memAllocator.cpp  |  2 +-
 src/hotspot/share/gc/shared/vmStructs_gc.hpp  |  2 +-
 .../share/gc/shenandoah/shenandoahUtils.hpp   |  2 +-
 src/hotspot/share/gc/x/xDriver.cpp            |  2 +-
 src/hotspot/share/gc/z/zGeneration.cpp        |  2 +-
 src/hotspot/share/gc/z/zVerify.cpp            |  2 +-
 src/hotspot/share/jvmci/jvmciRuntime.cpp      |  2 +-
 src/hotspot/share/memory/universe.cpp         |  4 +--
 src/hotspot/share/memory/universe.hpp         |  2 +-
 src/hotspot/share/oops/method.cpp             |  2 +-
 src/hotspot/share/oops/oop.cpp                |  2 +-
 src/hotspot/share/prims/forte.cpp             |  2 +-
 src/hotspot/share/runtime/jniHandles.cpp      |  4 +--
 27 files changed, 62 insertions(+), 64 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index f8031c35b9a..a7b9852f551 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2399,7 +2399,7 @@ void G1CollectedHeap::expand_heap_after_young_collection(){
 
 bool G1CollectedHeap::do_collection_pause_at_safepoint() {
   assert_at_safepoint_on_vm_thread();
-  guarantee(!is_gc_active(), "collection is not reentrant");
+  guarantee(!is_stw_gc_active(), "collection is not reentrant");
 
   do_collection_pause_at_safepoint_helper();
   return true;
@@ -2469,7 +2469,7 @@ void G1CollectedHeap::flush_region_pin_cache() {
 void G1CollectedHeap::do_collection_pause_at_safepoint_helper() {
   ResourceMark rm;
 
-  IsGCActiveMark active_gc_mark;
+  IsSTWGCActiveMark active_gc_mark;
   GCIdMark gc_id_mark;
   SvcGCMarker sgcm(SvcGCMarker::MINOR);
 
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 3aaa6d8b723..4695d12b435 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -749,7 +749,7 @@ private:
   // false if unable to do the collection due to the GC locker being
   // active, true otherwise.
   // precondition: at safepoint on VM thread
-  // precondition: !is_gc_active()
+  // precondition: !is_stw_gc_active()
   bool do_collection_pause_at_safepoint();
 
   // Helper for do_collection_pause_at_safepoint, containing the guts
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
index 30ca270e1b5..0a4ee053548 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
@@ -265,7 +265,7 @@ inline bool G1CollectedHeap::is_obj_dead(const oop obj, const HeapRegion* hr) co
 
 inline void G1CollectedHeap::pin_object(JavaThread* thread, oop obj) {
   assert(obj != nullptr, "obj must not be null");
-  assert(!is_gc_active(), "must not pin objects during a GC");
+  assert(!is_stw_gc_active(), "must not pin objects during a GC pause");
   assert(obj->is_typeArray(), "must be typeArray");
 
   uint obj_region_idx = heap_region_containing(obj)->hrm_index();
@@ -274,7 +274,7 @@ inline void G1CollectedHeap::pin_object(JavaThread* thread, oop obj) {
 
 inline void G1CollectedHeap::unpin_object(JavaThread* thread, oop obj) {
   assert(obj != nullptr, "obj must not be null");
-  assert(!is_gc_active(), "must not unpin objects during a GC");
+  assert(!is_stw_gc_active(), "must not unpin objects during a GC pause");
 
   uint obj_region_idx = heap_region_containing(obj)->hrm_index();
   G1ThreadLocalData::pin_count_cache(thread).dec_count(obj_region_idx);
diff --git a/src/hotspot/share/gc/g1/g1FullGCScope.hpp b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
index f3d89c7646f..ab3b99fea04 100644
--- a/src/hotspot/share/gc/g1/g1FullGCScope.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
@@ -52,7 +52,7 @@ class G1FullGCScope : public StackObj {
   SvcGCMarker             _svc_marker;
   STWGCTimer              _timer;
   G1FullGCTracer*         _tracer;
-  IsGCActiveMark          _active;
+  IsSTWGCActiveMark       _active;
   G1FullGCJFRTracerMark   _tracer_mark;
   ClearedAllSoftRefs      _soft_refs;
   G1FullGCMonitoringScope _monitoring_scope;
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index 65aa0ff18ab..a47fd379a70 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -1564,7 +1564,7 @@ bool G1RemSet::clean_card_before_refine(CardValue** const card_ptr_addr) {
 
 void G1RemSet::refine_card_concurrently(CardValue* const card_ptr,
                                         const uint worker_id) {
-  assert(!_g1h->is_gc_active(), "Only call concurrently");
+  assert(!_g1h->is_stw_gc_active(), "Only call concurrently");
   check_card_ptr(card_ptr, _ct);
 
   // Construct the MemRegion representing the card.
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.cpp b/src/hotspot/share/gc/g1/g1VMOperations.cpp
index c2254e4287f..11702c98416 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.cpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.cpp
@@ -146,7 +146,7 @@ void VM_G1PauseConcurrent::doit() {
 
   G1ConcGCMonitoringScope monitoring_scope(g1h->monitoring_support());
   SvcGCMarker sgcm(SvcGCMarker::CONCURRENT);
-  IsGCActiveMark x;
+  IsSTWGCActiveMark x;
 
   work();
 }
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 0ced8ed9336..f4df7c57bfc 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -459,7 +459,7 @@ void ParallelScavengeHeap::do_full_collection(bool clear_all_soft_refs) {
 HeapWord* ParallelScavengeHeap::failed_mem_allocate(size_t size) {
   assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
   assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
-  assert(!is_gc_active(), "not reentrant");
+  assert(!is_stw_gc_active(), "not reentrant");
   assert(!Heap_lock->owned_by_self(), "this thread should not own the Heap_lock");
 
   // We assume that allocation in eden will fail unless we collect.
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 8ac16e059b1..4f5c0e1603f 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -1269,9 +1269,9 @@ bool PSParallelCompact::invoke(bool maximum_heap_compaction) {
          "should be in vm thread");
 
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
-  assert(!heap->is_gc_active(), "not reentrant");
+  assert(!heap->is_stw_gc_active(), "not reentrant");
 
-  IsGCActiveMark mark;
+  IsSTWGCActiveMark mark;
 
   const bool clear_all_soft_refs =
     heap->soft_ref_policy()->should_clear_all_soft_refs();
@@ -1492,7 +1492,7 @@ private:
 public:
   PCAddThreadRootsMarkingTaskClosure(uint worker_id) : _worker_id(worker_id) { }
   void do_thread(Thread* thread) {
-    assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
+    assert(ParallelScavengeHeap::heap()->is_stw_gc_active(), "called outside gc");
 
     ResourceMark rm;
 
@@ -1509,7 +1509,7 @@ public:
 };
 
 void steal_marking_work(TaskTerminator& terminator, uint worker_id) {
-  assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
+  assert(ParallelScavengeHeap::heap()->is_stw_gc_active(), "called outside gc");
 
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(worker_id);
@@ -1986,7 +1986,7 @@ void PSParallelCompact::write_block_fill_histogram()
 #endif // #ifdef ASSERT
 
 static void compaction_with_stealing_work(TaskTerminator* terminator, uint worker_id) {
-  assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
+  assert(ParallelScavengeHeap::heap()->is_stw_gc_active(), "called outside gc");
 
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(worker_id);
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index ac7ca1bb8b7..c39cf96645d 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -84,7 +84,7 @@ ParallelScavengeTracer        PSScavenge::_gc_tracer;
 CollectorCounters*            PSScavenge::_counters = nullptr;
 
 static void scavenge_roots_work(ParallelRootType::Value root_type, uint worker_id) {
-  assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
+  assert(ParallelScavengeHeap::heap()->is_stw_gc_active(), "called outside gc");
 
   PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(worker_id);
   PSPromoteRootsClosure  roots_to_old_closure(pm);
@@ -115,7 +115,7 @@ static void scavenge_roots_work(ParallelRootType::Value root_type, uint worker_i
 }
 
 static void steal_work(TaskTerminator& terminator, uint worker_id) {
-  assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
+  assert(ParallelScavengeHeap::heap()->is_stw_gc_active(), "called outside gc");
 
   PSPromotionManager* pm =
     PSPromotionManager::gc_thread_promotion_manager(worker_id);
@@ -232,11 +232,11 @@ public:
 bool PSScavenge::invoke() {
   assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
   assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
-  assert(!ParallelScavengeHeap::heap()->is_gc_active(), "not reentrant");
+  assert(!ParallelScavengeHeap::heap()->is_stw_gc_active(), "not reentrant");
 
   ParallelScavengeHeap* const heap = ParallelScavengeHeap::heap();
   PSAdaptiveSizePolicy* policy = heap->size_policy();
-  IsGCActiveMark mark;
+  IsSTWGCActiveMark mark;
 
   const bool scavenge_done = PSScavenge::invoke_no_policy();
   const bool need_full_gc = !scavenge_done;
@@ -264,7 +264,7 @@ class PSThreadRootsTaskClosure : public ThreadClosure {
 public:
   PSThreadRootsTaskClosure(uint worker_id) : _worker_id(worker_id) { }
   virtual void do_thread(Thread* thread) {
-    assert(ParallelScavengeHeap::heap()->is_gc_active(), "called outside gc");
+    assert(ParallelScavengeHeap::heap()->is_stw_gc_active(), "called outside gc");
 
     PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(_worker_id);
     PSScavengeRootsClosure roots_closure(pm);
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index efcc5307e9f..b5bcd949c94 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -484,7 +484,7 @@ void SerialHeap::do_collection(bool full,
   assert(my_thread->is_VM_thread(), "only VM thread");
   assert(Heap_lock->is_locked(),
          "the requesting thread should have the Heap_lock");
-  guarantee(!is_gc_active(), "collection is not reentrant");
+  guarantee(!is_stw_gc_active(), "collection is not reentrant");
 
   if (GCLocker::check_active_before_gc()) {
     return; // GC is disabled (e.g. JNI GetXXXCritical operation)
@@ -495,7 +495,7 @@ void SerialHeap::do_collection(bool full,
 
   ClearedAllSoftRefs casr(do_clear_all_soft_refs, soft_ref_policy());
 
-  IsGCActiveMark active_gc_mark;
+  IsSTWGCActiveMark active_gc_mark;
 
   bool complete = full && (max_generation == OldGen);
   bool old_collects_young = complete;
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 2e79d6c567c..82eaaf9a396 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -243,7 +243,7 @@ CollectedHeap::CollectedHeap() :
   _capacity_at_last_gc(0),
   _used_at_last_gc(0),
   _soft_ref_policy(),
-  _is_gc_active(false),
+  _is_stw_gc_active(false),
   _last_whole_heap_examined_time_ns(os::javaTimeNanos()),
   _total_collections(0),
   _total_full_collections(0),
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index b2ec4b67325..6fbe6d70897 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -90,8 +90,8 @@ public:
 class CollectedHeap : public CHeapObj<mtGC> {
   friend class VMStructs;
   friend class JVMCIVMStructs;
-  friend class IsGCActiveMark; // Block structured external access to _is_gc_active
-  friend class DisableIsGCActiveMark; // Disable current IsGCActiveMark
+  friend class IsSTWGCActiveMark; // Block structured external access to _is_stw_gc_active
+  friend class DisableIsSTWGCActiveMark; // Disable current IsSTWGCActiveMark
   friend class MemAllocator;
   friend class ParallelObjectIterator;
 
@@ -112,7 +112,7 @@ class CollectedHeap : public CHeapObj<mtGC> {
   // Not used by all GCs
   MemRegion _reserved;
 
-  bool _is_gc_active;
+  bool _is_stw_gc_active;
 
   // (Minimum) Alignment reserve for TLABs and PLABs.
   static size_t _lab_alignment_reserve;
@@ -374,10 +374,8 @@ protected:
   // allocated object.
   virtual bool requires_barriers(stackChunkOop obj) const = 0;
 
-  // Returns "true" iff there is a stop-world GC in progress.  (I assume
-  // that it should answer "false" for the concurrent part of a concurrent
-  // collector -- dld).
-  bool is_gc_active() const { return _is_gc_active; }
+  // Returns "true" iff there is a stop-world GC in progress.
+  bool is_stw_gc_active() const { return _is_stw_gc_active; }
 
   // Total number of GC collections (started)
   unsigned int total_collections() const { return _total_collections; }
diff --git a/src/hotspot/share/gc/shared/isGCActiveMark.cpp b/src/hotspot/share/gc/shared/isGCActiveMark.cpp
index c797ff43e5a..add6acaa01a 100644
--- a/src/hotspot/share/gc/shared/isGCActiveMark.cpp
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.cpp
@@ -29,28 +29,28 @@
 #include "utilities/debug.hpp"
 
 // This class provides a method for block structured setting of the
-// _is_gc_active state without requiring accessors in CollectedHeap
+// _is_stw_gc_active state without requiring accessors in CollectedHeap
 
-IsGCActiveMark::IsGCActiveMark() {
+IsSTWGCActiveMark::IsSTWGCActiveMark() {
   CollectedHeap* heap = Universe::heap();
-  assert(!heap->is_gc_active(), "Not reentrant");
-  heap->_is_gc_active = true;
+  assert(!heap->is_stw_gc_active(), "Not reentrant");
+  heap->_is_stw_gc_active = true;
 }
 
-IsGCActiveMark::~IsGCActiveMark() {
+IsSTWGCActiveMark::~IsSTWGCActiveMark() {
   CollectedHeap* heap = Universe::heap();
-  assert(heap->is_gc_active(), "Sanity");
-  heap->_is_gc_active = false;
+  assert(heap->is_stw_gc_active(), "Sanity");
+  heap->_is_stw_gc_active = false;
 }
 
-DisableIsGCActiveMark::DisableIsGCActiveMark() {
+DisableIsSTWGCActiveMark::DisableIsSTWGCActiveMark() {
   CollectedHeap* heap = Universe::heap();
-  assert(heap->is_gc_active(), "Not reentrant");
-  heap->_is_gc_active = false;
+  assert(heap->is_stw_gc_active(), "Not reentrant");
+  heap->_is_stw_gc_active = false;
 }
 
-DisableIsGCActiveMark::~DisableIsGCActiveMark() {
+DisableIsSTWGCActiveMark::~DisableIsSTWGCActiveMark() {
   CollectedHeap* heap = Universe::heap();
-  assert(!heap->is_gc_active(), "Sanity");
-  heap->_is_gc_active = true;
+  assert(!heap->is_stw_gc_active(), "Sanity");
+  heap->_is_stw_gc_active = true;
 }
diff --git a/src/hotspot/share/gc/shared/isGCActiveMark.hpp b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
index c6d95d8a634..c65c7ebe56a 100644
--- a/src/hotspot/share/gc/shared/isGCActiveMark.hpp
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
@@ -28,18 +28,18 @@
 #include "memory/allocation.hpp"
 
 // This class provides a method for block structured setting of the
-// _is_gc_active state without requiring accessors in CollectedHeap
+// _is_stw_gc_active state without requiring accessors in CollectedHeap
 
-class IsGCActiveMark : public StackObj {
+class IsSTWGCActiveMark : public StackObj {
  public:
-  IsGCActiveMark();
-  ~IsGCActiveMark();
+  IsSTWGCActiveMark();
+  ~IsSTWGCActiveMark();
 };
 
-class DisableIsGCActiveMark : public StackObj {
+class DisableIsSTWGCActiveMark : public StackObj {
  public:
-  DisableIsGCActiveMark();
-  ~DisableIsGCActiveMark();
+  DisableIsSTWGCActiveMark();
+  ~DisableIsSTWGCActiveMark();
 };
 
 #endif // SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index ed38c448590..ddd33d8f43a 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -147,7 +147,7 @@ void MemAllocator::Allocation::verify_before() {
   JavaThread* THREAD = _thread; // For exception macros.
   assert(!HAS_PENDING_EXCEPTION, "Should not allocate with exception pending");
   debug_only(check_for_valid_allocation_state());
-  assert(!Universe::heap()->is_gc_active(), "Allocation during gc not allowed");
+  assert(!Universe::heap()->is_stw_gc_active(), "Allocation during GC pause not allowed");
 }
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
index 786f7b635e7..c4acb0b1ed6 100644
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
@@ -92,7 +92,7 @@
   nonstatic_field(CardTableBarrierSet,         _card_table,                                   CardTable*)                            \
                                                                                                                                      \
   nonstatic_field(CollectedHeap,               _reserved,                                     MemRegion)                             \
-  nonstatic_field(CollectedHeap,               _is_gc_active,                                 bool)                                  \
+  nonstatic_field(CollectedHeap,               _is_stw_gc_active,                             bool)                                  \
   nonstatic_field(CollectedHeap,               _total_collections,                            unsigned int)                          \
                                                                                                                                      \
   nonstatic_field(ContiguousSpace,             _bottom,                                       HeapWord*)                             \
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
index af32a20013a..15f0ee61407 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
@@ -132,7 +132,7 @@ private:
   ShenandoahHeap* const _heap;
   const GCIdMark                _gc_id_mark;
   const SvcGCMarker             _svc_gc_mark;
-  const IsGCActiveMark          _is_gc_active_mark;
+  const IsSTWGCActiveMark       _is_gc_active_mark;
   TraceMemoryManagerStats       _trace_pause;
 
 public:
diff --git a/src/hotspot/share/gc/x/xDriver.cpp b/src/hotspot/share/gc/x/xDriver.cpp
index f76d9f4e586..b78e155d3a7 100644
--- a/src/hotspot/share/gc/x/xDriver.cpp
+++ b/src/hotspot/share/gc/x/xDriver.cpp
@@ -116,7 +116,7 @@ public:
 
     // Setup GC id and active marker
     GCIdMark gc_id_mark(_gc_id);
-    IsGCActiveMark gc_active_mark;
+    IsSTWGCActiveMark gc_active_mark;
 
     // Verify before operation
     XVerify::before_zoperation();
diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index 50973f25621..049edc802cc 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -438,7 +438,7 @@ public:
   virtual void doit() {
     // Setup GC id and active marker
     GCIdMark gc_id_mark(_gc_id);
-    IsGCActiveMark gc_active_mark;
+    IsSTWGCActiveMark gc_active_mark;
 
     // Verify before operation
     ZVerify::before_zoperation();
diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index f7c373903db..d8f78eb26e2 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -484,7 +484,7 @@ void ZVerify::after_mark() {
   }
   if (ZVerifyObjects) {
     // Workaround OopMapCacheAlloc_lock reordering with the StackWatermark_lock
-    DisableIsGCActiveMark mark;
+    DisableIsSTWGCActiveMark mark;
 
     objects(false /* verify_weaks */);
     guarantee(zverify_broken_object == zaddress::null, "Verification failed");
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 3a8a040db46..fc4bb5a6a06 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -879,7 +879,7 @@ static OopStorage* object_handles() {
 }
 
 jlong JVMCIRuntime::make_oop_handle(const Handle& obj) {
-  assert(!Universe::heap()->is_gc_active(), "can't extend the root set during GC");
+  assert(!Universe::heap()->is_stw_gc_active(), "can't extend the root set during GC pause");
   assert(oopDesc::is_oop(obj()), "not an oop");
 
   oop* ptr = OopHandle(object_handles(), obj()).ptr_raw();
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index e640482aa04..187bdf25af8 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -1342,8 +1342,8 @@ bool Universe::release_fullgc_alot_dummy() {
   return true;
 }
 
-bool Universe::is_gc_active() {
-  return heap()->is_gc_active();
+bool Universe::is_stw_gc_active() {
+  return heap()->is_stw_gc_active();
 }
 
 bool Universe::is_in_heap(const void* p) {
diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
index 19acbdc09b2..d5a38658e48 100644
--- a/src/hotspot/share/memory/universe.hpp
+++ b/src/hotspot/share/memory/universe.hpp
@@ -295,7 +295,7 @@ class Universe: AllStatic {
   // The particular choice of collected heap.
   static CollectedHeap* heap() { return _collectedHeap; }
 
-  DEBUG_ONLY(static bool is_gc_active();)
+  DEBUG_ONLY(static bool is_stw_gc_active();)
   DEBUG_ONLY(static bool is_in_heap(const void* p);)
   DEBUG_ONLY(static bool is_in_heap_or_null(const void* p) { return p == nullptr || is_in_heap(p); })
 
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index f5c35abb683..929c8b87d39 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -312,7 +312,7 @@ void Method::mask_for(int bci, InterpreterOopMap* mask) {
   methodHandle h_this(Thread::current(), this);
   // Only GC uses the OopMapCache during thread stack root scanning
   // any other uses generate an oopmap but do not save it in the cache.
-  if (Universe::heap()->is_gc_active()) {
+  if (Universe::heap()->is_stw_gc_active()) {
     method_holder()->mask_for(h_this, bci, mask);
   } else {
     OopMapCache::compute_one_oop_map(h_this, bci, mask);
diff --git a/src/hotspot/share/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp
index 7d4492ea21a..fde91969ea5 100644
--- a/src/hotspot/share/oops/oop.cpp
+++ b/src/hotspot/share/oops/oop.cpp
@@ -226,6 +226,6 @@ bool oopDesc::size_might_change() {
   // the grey portion of an already copied array. This will cause the first
   // disjunct below to fail if the two comparands are computed across such
   // a concurrent change.
-  return Universe::heap()->is_gc_active() && is_objArray() && is_forwarded() && (UseParallelGC || UseG1GC);
+  return Universe::heap()->is_stw_gc_active() && is_objArray() && is_forwarded() && (UseParallelGC || UseG1GC);
 }
 #endif
diff --git a/src/hotspot/share/prims/forte.cpp b/src/hotspot/share/prims/forte.cpp
index b5973d4ad02..2edaae66158 100644
--- a/src/hotspot/share/prims/forte.cpp
+++ b/src/hotspot/share/prims/forte.cpp
@@ -602,7 +602,7 @@ void AsyncGetCallTrace(ASGCT_CallTrace *trace, jint depth, void* ucontext) {
     return;
   }
 
-  if (Universe::heap()->is_gc_active()) {
+  if (Universe::heap()->is_stw_gc_active()) {
     trace->num_frames = ticks_GC_active; // -2
     return;
   }
diff --git a/src/hotspot/share/runtime/jniHandles.cpp b/src/hotspot/share/runtime/jniHandles.cpp
index 25c8aa8b10b..a74b56063dc 100644
--- a/src/hotspot/share/runtime/jniHandles.cpp
+++ b/src/hotspot/share/runtime/jniHandles.cpp
@@ -83,7 +83,7 @@ static void report_handle_allocation_failure(AllocFailType alloc_failmode,
 }
 
 jobject JNIHandles::make_global(Handle obj, AllocFailType alloc_failmode) {
-  assert(!Universe::heap()->is_gc_active(), "can't extend the root set during GC");
+  assert(!Universe::heap()->is_stw_gc_active(), "can't extend the root set during GC pause");
   assert(!current_thread_in_native(), "must not be in native");
   jobject res = nullptr;
   if (!obj.is_null()) {
@@ -105,7 +105,7 @@ jobject JNIHandles::make_global(Handle obj, AllocFailType alloc_failmode) {
 }
 
 jweak JNIHandles::make_weak_global(Handle obj, AllocFailType alloc_failmode) {
-  assert(!Universe::heap()->is_gc_active(), "can't extend the root set during GC");
+  assert(!Universe::heap()->is_stw_gc_active(), "can't extend the root set during GC pause");
   assert(!current_thread_in_native(), "must not be in native");
   jweak res = nullptr;
   if (!obj.is_null()) {

From a8e62af733cb1acc1370561c9dd374b3f9c2c294 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Mon, 6 May 2024 11:43:07 +0000
Subject: [PATCH 336/486] 8331389: runtime/ErrorHandling/TestDwarf.java fails
 with "Crash JVM should not exit gracefully"

Reviewed-by: chagedorn
---
 test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java
index 8c0c23e2a8b..80ded6f898d 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -108,13 +108,12 @@ public class TestDwarf {
     // Crash the VM in different ways in order to verify that DWARF parsing is able to print the source information
     // in the hs_err_files for each VM and C stack frame.
     private static void test() throws Exception {
-        runAndCheck(new Flags("-Xcomp", "-XX:CICrashAt=1", "--version"));
+        runAndCheck(new Flags("-Xcomp", "-XX:+CICountNative", "-XX:CICrashAt=1", "--version"));
         runAndCheck(new Flags("-Xmx100M", "-XX:ErrorHandlerTest=15", "-XX:TestCrashInErrorHandler=14", "--version"));
         runAndCheck(new Flags("-XX:+CrashGCForDumpingJavaThread", "--version"));
         runAndCheck(new Flags("-Xmx10m", "-XX:+CrashOnOutOfMemoryError", TestDwarf.class.getCanonicalName(), "outOfMemory"));
-        // Use -XX:-TieredCompilation as C1 is currently not aborting the VM (JDK-8264899).
         runAndCheck(new Flags(TestDwarf.class.getCanonicalName(), "unsafeAccess"));
-        runAndCheck(new Flags("-XX:-TieredCompilation", "-XX:+UnlockDiagnosticVMOptions", "-XX:AbortVMOnException=MyException",
+        runAndCheck(new Flags("-XX:+UnlockDiagnosticVMOptions", "-XX:AbortVMOnException=MyException",
                               TestDwarf.class.getCanonicalName(), "abortVMOnException"));
         if (Platform.isX64() || Platform.isX86()) {
             // Not all platforms raise SIGFPE but x86_32 and x86_64 do.

From fa02667d838f08cac7d41dfb4c3e8056ae6165cc Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Mon, 6 May 2024 12:21:15 +0000
Subject: [PATCH 337/486] 8322726: C2: Unloaded signature class kills argument
 value

Reviewed-by: kvn, dlong, thartmann
---
 src/hotspot/share/opto/callGenerator.cpp      |  28 ++---
 src/hotspot/share/opto/graphKit.cpp           |  11 ++
 src/hotspot/share/opto/graphKit.hpp           |   2 +
 .../runtime/unloaded/TestMHUnloaded.java      |  50 +++++++++
 .../unloaded/TestMHUnloadedHelper.java        | 103 ++++++++++++++++++
 5 files changed, 181 insertions(+), 13 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java
 create mode 100644 test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java

diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp
index c8bb39c8cde..433d0316b9d 100644
--- a/src/hotspot/share/opto/callGenerator.cpp
+++ b/src/hotspot/share/opto/callGenerator.cpp
@@ -1089,13 +1089,14 @@ CallGenerator* CallGenerator::for_method_handle_inline(JVMState* jvms, ciMethod*
         const int receiver_skip = target->is_static() ? 0 : 1;
         // Cast receiver to its type.
         if (!target->is_static()) {
-          Node* arg = kit.argument(0);
-          const TypeOopPtr* arg_type = arg->bottom_type()->isa_oopptr();
-          const Type*       sig_type = TypeOopPtr::make_from_klass(signature->accessing_klass());
-          if (arg_type != nullptr && !arg_type->higher_equal(sig_type)) {
-            const Type* recv_type = arg_type->filter_speculative(sig_type); // keep speculative part
-            Node* cast_obj = gvn.transform(new CheckCastPPNode(kit.control(), arg, recv_type));
-            kit.set_argument(0, cast_obj);
+          Node* recv = kit.argument(0);
+          Node* casted_recv = kit.maybe_narrow_object_type(recv, signature->accessing_klass());
+          if (casted_recv->is_top()) {
+            print_inlining_failure(C, callee, jvms->depth() - 1, jvms->bci(),
+                                   "argument types mismatch");
+            return nullptr; // FIXME: effectively dead; issue a halt node instead
+          } else if (casted_recv != recv) {
+            kit.set_argument(0, casted_recv);
           }
         }
         // Cast reference arguments to its type.
@@ -1103,12 +1104,13 @@ CallGenerator* CallGenerator::for_method_handle_inline(JVMState* jvms, ciMethod*
           ciType* t = signature->type_at(i);
           if (t->is_klass()) {
             Node* arg = kit.argument(receiver_skip + j);
-            const TypeOopPtr* arg_type = arg->bottom_type()->isa_oopptr();
-            const Type*       sig_type = TypeOopPtr::make_from_klass(t->as_klass());
-            if (arg_type != nullptr && !arg_type->higher_equal(sig_type)) {
-              const Type* narrowed_arg_type = arg_type->filter_speculative(sig_type); // keep speculative part
-              Node* cast_obj = gvn.transform(new CheckCastPPNode(kit.control(), arg, narrowed_arg_type));
-              kit.set_argument(receiver_skip + j, cast_obj);
+            Node* casted_arg = kit.maybe_narrow_object_type(arg, t->as_klass());
+            if (casted_arg->is_top()) {
+              print_inlining_failure(C, callee, jvms->depth() - 1, jvms->bci(),
+                                     "argument types mismatch");
+              return nullptr; // FIXME: effectively dead; issue a halt node instead
+            } else if (casted_arg != arg) {
+              kit.set_argument(receiver_skip + j, casted_arg);
             }
           }
           j += t->size();  // long and double take two slots
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 6bfdae1cf5c..794403611e5 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -4271,3 +4271,14 @@ Node* GraphKit::make_constant_from_field(ciField* field, Node* obj) {
   }
   return nullptr;
 }
+
+Node* GraphKit::maybe_narrow_object_type(Node* obj, ciKlass* type) {
+  const TypeOopPtr* obj_type = obj->bottom_type()->isa_oopptr();
+  const TypeOopPtr* sig_type = TypeOopPtr::make_from_klass(type);
+  if (obj_type != nullptr && sig_type->is_loaded() && !obj_type->higher_equal(sig_type)) {
+    const Type* narrow_obj_type = obj_type->filter_speculative(sig_type); // keep speculative part
+    Node* casted_obj = gvn().transform(new CheckCastPPNode(control(), obj, narrow_obj_type));
+    return casted_obj;
+  }
+  return obj;
+}
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
index 3f917ec882b..e7f17c72a1b 100644
--- a/src/hotspot/share/opto/graphKit.hpp
+++ b/src/hotspot/share/opto/graphKit.hpp
@@ -441,6 +441,8 @@ class GraphKit : public Phase {
   // Replace all occurrences of one node by another.
   void replace_in_map(Node* old, Node* neww);
 
+  Node* maybe_narrow_object_type(Node* obj, ciKlass* type);
+
   void  push(Node* n)     { map_not_null();        _map->set_stack(_map->_jvms,   _sp++        , n); }
   Node* pop()             { map_not_null(); return _map->stack(    _map->_jvms, --_sp             ); }
   Node* peek(int off = 0) { map_not_null(); return _map->stack(    _map->_jvms,   _sp - off - 1   ); }
diff --git a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java
new file mode 100644
index 00000000000..23c6e83a6c5
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+/*
+ * @test
+ * @bug 8322726
+ * @library /test/lib
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ *
+ * @compile TestMHUnloaded.java TestMHUnloadedHelper.java
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller compiler.runtime.unloaded.TestMHUnloadedHelper
+ * @run main/othervm -Xbootclasspath/a:.
+ *                   -Xbatch -XX:-TieredCompilation -XX:CompileCommand=exclude,*::test
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+PrintCompilation -XX:+PrintInlining
+ *                      compiler.runtime.unloaded.TestMHUnloaded
+ */
+
+package compiler.runtime.unloaded;
+
+import java.lang.invoke.MethodHandles;
+
+public class TestMHUnloaded {
+    public static void main(String[] args) {
+        TestMHUnloadedHelper.test(MethodHandles.lookup()); // launch test in bootstrap loader context
+        TestMHUnloadedHelper.testConstant(MethodHandles.lookup()); // launch test in bootstrap loader context
+        System.out.println("TEST PASSED");
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java
new file mode 100644
index 00000000000..176945572e8
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2024, 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 compiler.runtime.unloaded;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.function.BiPredicate;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
+
+// Operates in bootstrap loader context.
+public class TestMHUnloadedHelper {
+    private static final MethodType METHOD_TYPE = MethodType.methodType(BiPredicate.class,
+                                                                        BiPredicate.class, BiPredicate.class);
+
+    static byte[] generateClassFile(Class<?> caller) {
+        var cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+        String name = caller.getName().replace('.', '/');
+        cw.visit(V19, ACC_PUBLIC | ACC_SUPER, name, null, "java/lang/Object", null);
+        {
+            var mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "test", METHOD_TYPE.toMethodDescriptorString(), null, null);
+            mv.visitCode();
+            mv.visitIntInsn(ALOAD, 1);
+            mv.visitInsn(ARETURN);
+            mv.visitMaxs(0, 0);
+        }
+        return cw.toByteArray();
+    }
+
+    public static MethodHandle generateTest(MethodHandles.Lookup caller) {
+        // Loaded in the caller context.
+        byte[] classBytes = generateClassFile(caller.lookupClass());
+        try {
+            MethodHandles.Lookup lookup = caller.defineHiddenClass(classBytes, true);
+            MethodHandle test = lookup.findStatic(lookup.lookupClass(), "test", METHOD_TYPE);
+            test = MethodHandles.permuteArguments(test, test.type(), 1, 0); // mix arguments
+            return test;
+        } catch (Throwable e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    static BiPredicate[] ps = new BiPredicate[] { (a, b) -> false,
+                                                  (a, b) -> true };
+
+    public static void test(MethodHandles.Lookup caller) {
+        MethodHandle test = generateTest(caller);
+
+        for (int i = 0; i < 20_000; i++) {
+            try {
+                BiPredicate pr = (BiPredicate)test.invokeExact(ps[1], ps[0]);
+                if (pr != ps[1]) {
+                    throw new AssertionError("mismatch");
+                }
+            } catch (Throwable e) {
+                throw new AssertionError(e);
+            }
+        }
+    }
+
+    public static void testConstant(MethodHandles.Lookup caller) {
+        MethodHandle test = generateTest(caller);
+
+        // testMH() { return test(ps2, ps1); } where test(a, b) { return b; }.
+        test = test.bindTo(ps[1]).bindTo(ps[0]); // make argument concrete types visible to the JIT-compiler
+
+        for (int i = 0; i < 20_000; i++) {
+            try {
+                BiPredicate pr = (BiPredicate)test.invokeExact();
+                if (pr != ps[1]) {
+                    throw new AssertionError("mismatch");
+                }
+            } catch (Throwable e) {
+                throw new AssertionError(e);
+            }
+        }
+    }
+}

From 7a35f922f06c4649f9ea8a1fb1782b2a670311ce Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Mon, 6 May 2024 13:25:36 +0000
Subject: [PATCH 338/486] 8331660: Parallel: Cleanup includes in
 parallelScavangeHeap files

Reviewed-by: gli, ayang
---
 src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp     | 2 --
 src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp     | 7 +------
 .../share/gc/parallel/parallelScavengeHeap.inline.hpp      | 3 +--
 src/hotspot/share/gc/parallel/psParallelCompact.cpp        | 1 +
 src/hotspot/share/gc/parallel/psParallelCompact.hpp        | 3 ++-
 src/hotspot/share/gc/parallel/psScavenge.cpp               | 1 +
 src/hotspot/share/gc/parallel/psScavenge.hpp               | 3 ++-
 src/hotspot/share/gc/parallel/psVMOperations.cpp           | 1 +
 8 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index f4df7c57bfc..318b5b5e137 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "code/codeCache.hpp"
 #include "gc/parallel/objectStartArray.inline.hpp"
 #include "gc/parallel/parallelArguments.hpp"
 #include "gc/parallel/parallelInitLogger.hpp"
@@ -35,7 +34,6 @@
 #include "gc/parallel/psScavenge.hpp"
 #include "gc/parallel/psVMOperations.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
-#include "gc/shared/gcInitLogger.hpp"
 #include "gc/shared/gcLocker.inline.hpp"
 #include "gc/shared/gcWhen.hpp"
 #include "gc/shared/genArguments.hpp"
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index 48dce98b55b..38a1f2acc4b 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 #ifndef SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
 #define SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
 
-#include "gc/parallel/objectStartArray.hpp"
 #include "gc/parallel/psGCAdaptivePolicyCounters.hpp"
 #include "gc/parallel/psOldGen.hpp"
 #include "gc/parallel/psYoungGen.hpp"
@@ -34,13 +33,9 @@
 #include "gc/shared/gcPolicyCounters.hpp"
 #include "gc/shared/gcWhen.hpp"
 #include "gc/shared/preGCValues.hpp"
-#include "gc/shared/referenceProcessor.hpp"
-#include "gc/shared/softRefPolicy.hpp"
-#include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "logging/log.hpp"
 #include "utilities/growableArray.hpp"
-#include "utilities/ostream.hpp"
 
 class GCHeapSummary;
 class HeapBlockClaimer;
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
index ef5f6dedd29..93a90b3d0b5 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 
 #include "gc/parallel/parallelScavengeHeap.hpp"
 
-#include "gc/parallel/psParallelCompact.inline.hpp"
 #include "gc/parallel/psScavenge.hpp"
 
 inline bool ParallelScavengeHeap::should_alloc_in_eden(const size_t size) const {
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 4f5c0e1603f..b85457c0156 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -58,6 +58,7 @@
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/spaceDecorator.inline.hpp"
+#include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
 #include "gc/shared/workerPolicy.hpp"
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index 6ca23947ca4..a36acc72a9b 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "gc/parallel/parMarkBitMap.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectorCounters.hpp"
+#include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "oops/oop.hpp"
 #include "runtime/atomic.hpp"
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index c39cf96645d..3e90529a534 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -51,6 +51,7 @@
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/scavengableNMethods.hpp"
 #include "gc/shared/spaceDecorator.inline.hpp"
+#include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
 #include "gc/shared/workerPolicy.hpp"
diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp
index 0c61bc9c30e..c99034e04b5 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.hpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "gc/parallel/psCardTable.hpp"
 #include "gc/parallel/psVirtualspace.hpp"
 #include "gc/shared/collectorCounters.hpp"
+#include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "memory/allStatic.hpp"
 #include "oops/oop.hpp"
diff --git a/src/hotspot/share/gc/parallel/psVMOperations.cpp b/src/hotspot/share/gc/parallel/psVMOperations.cpp
index 47eeffb34a5..db4d9a36606 100644
--- a/src/hotspot/share/gc/parallel/psVMOperations.cpp
+++ b/src/hotspot/share/gc/parallel/psVMOperations.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/parallel/psParallelCompact.inline.hpp"
 #include "gc/parallel/parallelScavengeHeap.inline.hpp"
 #include "gc/parallel/psScavenge.hpp"
 #include "gc/parallel/psVMOperations.hpp"

From ae60d845007c7137895e3a5f86623d0731fee81f Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Mon, 6 May 2024 15:54:40 +0000
Subject: [PATCH 339/486] 8328501: Incorrect `@since` tags for java security
 interfaces

Reviewed-by: mullan
---
 .../share/classes/java/security/interfaces/DSAPrivateKey.java | 3 +--
 .../share/classes/java/security/interfaces/DSAPublicKey.java  | 3 +--
 .../share/classes/java/security/interfaces/ECPrivateKey.java  | 3 +--
 .../share/classes/java/security/interfaces/ECPublicKey.java   | 3 +--
 .../classes/java/security/interfaces/EdECPrivateKey.java      | 3 +--
 .../share/classes/java/security/interfaces/EdECPublicKey.java | 3 +--
 .../share/classes/java/security/interfaces/RSAPrivateKey.java | 4 ++--
 .../share/classes/java/security/interfaces/RSAPublicKey.java  | 4 ++--
 .../share/classes/java/security/interfaces/XECPrivateKey.java | 3 +--
 .../share/classes/java/security/interfaces/XECPublicKey.java  | 3 +--
 .../share/classes/javax/crypto/interfaces/DHPrivateKey.java   | 3 +--
 .../share/classes/javax/crypto/interfaces/DHPublicKey.java    | 3 +--
 12 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
index ea842b6e12e..efef7daca29 100644
--- a/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -70,7 +70,6 @@ public interface DSAPrivateKey extends DSAKey, java.security.PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default DSAParams getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
index 9ddf6d8406f..a58333b38ba 100644
--- a/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
@@ -70,7 +70,6 @@ public interface DSAPublicKey extends DSAKey, java.security.PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default DSAParams getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
index 1694f46d4ab..53c1f358d52 100644
--- a/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -65,7 +65,6 @@ public interface ECPrivateKey extends PrivateKey, ECKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default ECParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
index 5e8efb90db5..d78f863cc76 100644
--- a/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -67,7 +67,6 @@ public interface ECPublicKey extends PublicKey, ECKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default ECParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java
index b3522fec4fe..2a1b194a90a 100644
--- a/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -61,7 +61,6 @@ public interface EdECPrivateKey extends EdECKey, PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default NamedParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java
index 664e76b6971..f5a0f3c3194 100644
--- a/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -56,7 +56,6 @@ public interface EdECPublicKey extends EdECKey, PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default NamedParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
index 6e4ea536e32..8f74b476f99 100644
--- a/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -68,7 +68,7 @@ public interface RSAPrivateKey extends java.security.PrivateKey, RSAKey
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
+     * @since 11
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
index 2e1d89723e4..a02b454abb2 100644
--- a/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -65,7 +65,7 @@ public interface RSAPublicKey extends java.security.PublicKey, RSAKey
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
+     * @since 11
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java
index b555f587fb6..6bd45c4f219 100644
--- a/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -62,7 +62,6 @@ public interface XECPrivateKey extends XECKey, PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java
index 6b1806df0eb..dbeaf938107 100644
--- a/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -60,7 +60,6 @@ public interface XECPublicKey extends XECKey, PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
index fb7d2f83108..49a93c02b42 100644
--- a/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
+++ b/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -65,7 +65,6 @@ public interface DHPrivateKey extends DHKey, java.security.PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default DHParameterSpec getParams() {
diff --git a/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
index 8785b8dfec8..631d8a20e66 100644
--- a/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
+++ b/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -65,7 +65,6 @@ public interface DHPublicKey extends DHKey, java.security.PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default DHParameterSpec getParams() {

From a8b3f194e811eed6b20bce71c752705c7cd50d24 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Mon, 6 May 2024 17:01:11 +0000
Subject: [PATCH 340/486] 8330077: Allow max number of events to be buffered to
 be configurable to avoid OVERFLOW_EVENT

Reviewed-by: bpb, alanb
---
 .../classes/java/nio/file/WatchService.java   |  16 ++-
 .../classes/sun/nio/fs/AbstractWatchKey.java  |  28 +++-
 .../nio/file/WatchService/LotsOfEntries.java  | 120 ++++++++++++++++++
 3 files changed, 160 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/java/nio/file/WatchService/LotsOfEntries.java

diff --git a/src/java.base/share/classes/java/nio/file/WatchService.java b/src/java.base/share/classes/java/nio/file/WatchService.java
index 1975dd2693a..2490d14823f 100644
--- a/src/java.base/share/classes/java/nio/file/WatchService.java
+++ b/src/java.base/share/classes/java/nio/file/WatchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -98,6 +98,20 @@ import java.util.concurrent.TimeUnit;
  * it is not required that changes to files carried out on remote systems be
  * detected.
  *
+ * @implNote
+ * The JDK's {@code WatchService} implementations buffer up to 512 pending
+ * events for each registered watchable object. If this limit is exceeded,
+ * pending events are discarded and the special
+ * {@link StandardWatchEventKinds#OVERFLOW OVERFLOW} event is queued. This
+ * special event is the trigger to re-examine the state of the object, e.g.
+ * scan a watched directory to get an updated list of the files in the
+ * directory. The limit for the pending events can be changed from its default
+ * with the system property
+ * {@systemProperty jdk.nio.file.WatchService.maxEventsPerPoll}
+ * set to a value that parses as a positive integer. This may be useful in
+ * environments where there is a high volume of changes and where the impact
+ * of discarded events is high.
+ *
  * @since 1.7
  *
  * @see FileSystem#newWatchService
diff --git a/src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java b/src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java
index 710e38fc607..bdb7920b20a 100644
--- a/src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java
+++ b/src/java.base/share/classes/sun/nio/fs/AbstractWatchKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,16 +28,38 @@ package sun.nio.fs;
 import java.nio.file.*;
 import java.util.*;
 
+import jdk.internal.util.ArraysSupport;
+import sun.security.action.GetPropertyAction;
+
 /**
  * Base implementation class for watch keys.
  */
 
 abstract class AbstractWatchKey implements WatchKey {
 
+    private static final int DEFAULT_MAX_EVENT_LIST_SIZE = 512;
+
     /**
-     * Maximum size of event list (in the future this may be tunable)
+     * Maximum size of event list before dropping events and signalling OVERFLOW
      */
-    static final int MAX_EVENT_LIST_SIZE    = 512;
+    static final int MAX_EVENT_LIST_SIZE;
+    static {
+        String rawValue = GetPropertyAction.privilegedGetProperty(
+            "jdk.nio.file.WatchService.maxEventsPerPoll",
+            String.valueOf(DEFAULT_MAX_EVENT_LIST_SIZE));
+        int intValue;
+        try {
+            // Clamp to max array length to signal OVERFLOW and drop events
+            // before OOMing.
+            intValue = Math.clamp(
+                Long.decode(rawValue),
+                1,
+                ArraysSupport.SOFT_MAX_ARRAY_LENGTH);
+        } catch (NumberFormatException e) {
+            intValue = DEFAULT_MAX_EVENT_LIST_SIZE;
+        }
+        MAX_EVENT_LIST_SIZE = intValue;
+    }
 
     /**
      * Special event to signal overflow
diff --git a/test/jdk/java/nio/file/WatchService/LotsOfEntries.java b/test/jdk/java/nio/file/WatchService/LotsOfEntries.java
new file mode 100644
index 00000000000..b12daac9f27
--- /dev/null
+++ b/test/jdk/java/nio/file/WatchService/LotsOfEntries.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2024, 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 8330077
+ * @summary Tests WatchService behavior with more entries in a watched directory
+ *     than the default event limit
+ * @library ..
+ * @run main/othervm LotsOfEntries 600 fail
+ * @run main/othervm -Djdk.nio.file.WatchService.maxEventsPerPoll=invalid LotsOfEntries 600 fail
+ * @run main/othervm -Djdk.nio.file.WatchService.maxEventsPerPoll=-5 LotsOfEntries 5 fail
+ * @run main/othervm -Djdk.nio.file.WatchService.maxEventsPerPoll=5 LotsOfEntries 5 pass
+ * @run main/othervm -Djdk.nio.file.WatchService.maxEventsPerPoll=5 LotsOfEntries 6 fail
+ * @run main/othervm -Djdk.nio.file.WatchService.maxEventsPerPoll=700 LotsOfEntries 600 pass
+ * @run main/othervm -Djdk.nio.file.WatchService.maxEventsPerPoll=3000000000 LotsOfEntries 600 pass
+ */
+
+import java.nio.file.*;
+import static java.nio.file.StandardWatchEventKinds.*;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+public class LotsOfEntries {
+
+    static void testCreateLotsOfEntries(Path dir, int numEvents, boolean fail) throws Exception {
+        try (WatchService watcher = FileSystems.getDefault().newWatchService()) {
+            System.out.format("register %s for events\n", dir);
+            WatchKey key = dir.register(watcher, ENTRY_CREATE);
+
+            System.out.format("create %d entries\n", numEvents);
+            Set<Path> entries = new HashSet<>();
+            for (int i = 0; i < numEvents; i++) {
+                Path entry = dir.resolve("entry" + i);
+                entries.add(entry);
+                Files.createFile(entry);
+            }
+
+            // Wait for all events to be signalled - the timeout is long to
+            // allow for polling implementations. Since we specifically want to
+            // test the maximum number of events buffered for a single
+            // WatchKey#pollEvents call, we need to poll on the WatchService
+            // repeatedly until all (not just some) events have been signalled.
+            System.out.println("poll watcher...");
+            WatchKey signalledKey;
+            do {
+              signalledKey = watcher.poll(10, TimeUnit.SECONDS);
+              if (signalledKey != null && signalledKey != key) {
+                throw new RuntimeException("Unexpected key returned from poll");
+              }
+            } while (signalledKey != null);
+
+            if (fail) {
+                System.out.println("poll expecting overflow...");
+                var events = key.pollEvents();
+                if (events.size() != 1) {
+                    throw new RuntimeException(
+                        "Expected overflow event, got: " + toString(events));
+                }
+                if (!events.getFirst().kind().equals(OVERFLOW)) {
+                    throw new RuntimeException(
+                        "Expected overflow event, got: " + toString(events));
+                }
+            } else {
+                System.out.println("poll not expecting overflow...");
+                List<WatchEvent<?>> events = key.pollEvents();
+                Set<Path> contexts = events.stream()
+                    .map(WatchEvent::context)
+                    .map(Path.class::cast)
+                    .map(entry -> dir.resolve(entry))
+                    .collect(Collectors.toSet());
+                if (!entries.equals(contexts)) {
+                    throw new RuntimeException(
+                        "Expected events on: " + entries + ", got: " + toString(events));
+                }
+            }
+        }
+    }
+
+    static String toString(List<WatchEvent<?>> events) {
+        return events.stream()
+            .map(LotsOfEntries::toString)
+            .collect(Collectors.joining(", "));
+    }
+
+    static String toString(WatchEvent event) {
+        return String.format("%s(%d): %s", event.kind(), event.count(), event.context());
+    }
+
+    public static void main(String[] args) throws Exception {
+        Path dir = TestUtil.createTemporaryDirectory();
+        int numEvents = Integer.parseInt(args[0]);
+        boolean fail = args[1].equals("fail");
+        try {
+            testCreateLotsOfEntries(dir, numEvents, fail);
+        } finally {
+            TestUtil.removeAll(dir);
+        }
+    }
+}

From f308e107ce8b993641ee3d0a0d5d52bf5cd3b94e Mon Sep 17 00:00:00 2001
From: Bhavana Kilambi <bkilambi@openjdk.org>
Date: Mon, 6 May 2024 22:59:14 +0000
Subject: [PATCH 341/486] 8331400: AArch64: Sync aarch64_vector.ad with
 aarch64_vector_ad.m4

Reviewed-by: aph, kvn, eliu
---
 src/hotspot/cpu/aarch64/aarch64_vector.ad    |  2 +-
 src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index 4e8eb47ee5f..b14295ca15c 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
+// Copyright (c) 2020, 2024, Arm Limited. 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
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index d31a4e05799..060bb4a11d4 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
+// Copyright (c) 2020, 2024, Arm Limited. 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
@@ -159,9 +159,7 @@ source %{
       case Op_VectorMaskGen:
       case Op_LoadVectorMasked:
       case Op_StoreVectorMasked:
-      case Op_LoadVectorGather:
       case Op_StoreVectorScatter:
-      case Op_LoadVectorGatherMasked:
       case Op_StoreVectorScatterMasked:
       case Op_PopulateIndex:
       case Op_CompressM:
@@ -170,6 +168,12 @@ source %{
           return false;
         }
         break;
+      case Op_LoadVectorGather:
+      case Op_LoadVectorGatherMasked:
+        if (UseSVE == 0 || is_subword_type(bt)) {
+          return false;
+        }
+        break;
       case Op_MulAddVS2VI:
         if (length_in_bytes != 16) {
           return false;

From 3b8227ba24c7bc05a8ea23801e3816e8fc80de4e Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Tue, 7 May 2024 05:28:45 +0000
Subject: [PATCH 342/486] 8326836: Incorrect `@since` tags for ClassSignature
 methods

Reviewed-by: asotona
---
 .../share/classes/java/lang/classfile/ClassSignature.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/java.base/share/classes/java/lang/classfile/ClassSignature.java b/src/java.base/share/classes/java/lang/classfile/ClassSignature.java
index 57d899eb590..b3050b78a85 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassSignature.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassSignature.java
@@ -54,6 +54,7 @@ public sealed interface ClassSignature
      * {@return a class signature}
      * @param superclassSignature the superclass
      * @param superinterfaceSignatures the interfaces
+     * @since 23
      */
     public static ClassSignature of(Signature.ClassTypeSig superclassSignature,
                                     Signature.ClassTypeSig... superinterfaceSignatures) {
@@ -65,6 +66,7 @@ public sealed interface ClassSignature
      * @param typeParameters the type parameters
      * @param superclassSignature the superclass
      * @param superinterfaceSignatures the interfaces
+     * @since 23
      */
     public static ClassSignature of(List<Signature.TypeParam> typeParameters,
                                     Signature.ClassTypeSig superclassSignature,

From df1ff056f19ce569e05b0b87584e289840fc5d5c Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 7 May 2024 07:08:32 +0000
Subject: [PATCH 343/486] 8331085: Crash in
 MergePrimitiveArrayStores::is_compatible_store()

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/memnode.cpp            |  7 ++-
 .../c2/TestMergeStoresNullAdrType.java        | 58 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestMergeStoresNullAdrType.java

diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index e0eed9e3f57..fa26825e19f 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -2971,7 +2971,11 @@ StoreNode* MergePrimitiveArrayStores::run() {
   }
 
   // Only merge stores on arrays, and the stores must have the same size as the elements.
-  const TypeAryPtr* aryptr_t = _store->adr_type()->isa_aryptr();
+  const TypePtr* ptr_t = _store->adr_type();
+  if (ptr_t == nullptr) {
+    return nullptr;
+  }
+  const TypeAryPtr* aryptr_t = ptr_t->isa_aryptr();
   if (aryptr_t == nullptr) {
     return nullptr;
   }
@@ -3016,6 +3020,7 @@ bool MergePrimitiveArrayStores::is_compatible_store(const StoreNode* other_store
 
   if (other_store == nullptr ||
       _store->Opcode() != other_store->Opcode() ||
+      other_store->adr_type() == nullptr ||
       other_store->adr_type()->isa_aryptr() == nullptr) {
     return false;
   }
diff --git a/test/hotspot/jtreg/compiler/c2/TestMergeStoresNullAdrType.java b/test/hotspot/jtreg/compiler/c2/TestMergeStoresNullAdrType.java
new file mode 100644
index 00000000000..d96eae33df2
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestMergeStoresNullAdrType.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package compiler.c2;
+
+/*
+ * @test
+ * @bug 8318446 8331085
+ * @summary Test merge stores, when "adr_type() == nullptr" because of TOP somewhere in the address.
+ * @run main/othervm -XX:CompileCommand=compileonly,compiler.c2.TestMergeStoresNullAdrType::test
+ *                   -XX:-TieredCompilation -Xcomp
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:+StressCCP
+ *                   -XX:RepeatCompilation=1000
+ *                   compiler.c2.TestMergeStoresNullAdrType
+ * @run main compiler.c2.TestMergeStoresNullAdrType
+ */
+
+public class TestMergeStoresNullAdrType {
+    static int arr[] = new int[100];
+
+    static void test() {
+        boolean b = false;
+        for (int k = 269; k > 10; --k) {
+            b = b;
+            int j = 6;
+            while ((j -= 3) > 0) {
+                if (b) {
+                } else {
+                    arr[j] >>= 2;
+                }
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        test();
+    }
+}

From a2584a8341b2dc9c102abd373a890b2108d3f57e Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 7 May 2024 08:30:26 +0000
Subject: [PATCH 344/486] 8331714: Make OopMapCache installation lock-free

Reviewed-by: zgu, coleenp
---
 src/hotspot/share/oops/instanceKlass.cpp  | 17 +++++++++--------
 src/hotspot/share/runtime/mutexLocker.cpp |  2 --
 src/hotspot/share/runtime/mutexLocker.hpp |  1 -
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 0069f336e88..3b3a4ac10a6 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -1634,16 +1634,17 @@ void InstanceKlass::call_class_initializer(TRAPS) {
 
 void InstanceKlass::mask_for(const methodHandle& method, int bci,
   InterpreterOopMap* entry_for) {
-  // Lazily create the _oop_map_cache at first request
-  // Lock-free access requires load_acquire.
+  // Lazily create the _oop_map_cache at first request.
+  // Load_acquire is needed to safely get instance published with CAS by another thread.
   OopMapCache* oop_map_cache = Atomic::load_acquire(&_oop_map_cache);
   if (oop_map_cache == nullptr) {
-    MutexLocker x(OopMapCacheAlloc_lock);
-    // Check if _oop_map_cache was allocated while we were waiting for this lock
-    if ((oop_map_cache = _oop_map_cache) == nullptr) {
-      oop_map_cache = new OopMapCache();
-      // Ensure _oop_map_cache is stable, since it is examined without a lock
-      Atomic::release_store(&_oop_map_cache, oop_map_cache);
+    // Try to install new instance atomically.
+    oop_map_cache = new OopMapCache();
+    OopMapCache* other = Atomic::cmpxchg(&_oop_map_cache, (OopMapCache*)nullptr, oop_map_cache);
+    if (other != nullptr) {
+      // Someone else managed to install before us, ditch local copy and use the existing one.
+      delete oop_map_cache;
+      oop_map_cache = other;
     }
   }
   // _oop_map_cache is constant after init; lookup below does its own locking.
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index d945037324e..dec40136336 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -100,7 +100,6 @@ Mutex*   tty_lock                     = nullptr;
 Mutex*   RawMonitor_lock              = nullptr;
 Mutex*   PerfDataMemAlloc_lock        = nullptr;
 Mutex*   PerfDataManager_lock         = nullptr;
-Mutex*   OopMapCacheAlloc_lock        = nullptr;
 
 Mutex*   FreeList_lock                = nullptr;
 Mutex*   OldSets_lock                 = nullptr;
@@ -349,7 +348,6 @@ void mutex_init() {
     MUTEX_DEFL(PSOldGenExpand_lock          , PaddedMutex  , Heap_lock, true);
   }
 #endif
-  MUTEX_DEFL(OopMapCacheAlloc_lock          , PaddedMutex  ,  Threads_lock, true);
   MUTEX_DEFL(Module_lock                    , PaddedMutex  ,  ClassLoaderDataGraph_lock);
   MUTEX_DEFL(SystemDictionary_lock          , PaddedMonitor, Module_lock);
   MUTEX_DEFL(JNICritical_lock               , PaddedMonitor, AdapterHandlerLibrary_lock); // used for JNI critical regions
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index 8b71a097812..91310364b8f 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -96,7 +96,6 @@ extern Mutex*   FullGCALot_lock;                 // a lock to make FullGCALot MT
 extern Mutex*   RawMonitor_lock;
 extern Mutex*   PerfDataMemAlloc_lock;           // a lock on the allocator for PerfData memory for performance data
 extern Mutex*   PerfDataManager_lock;            // a long on access to PerfDataManager resources
-extern Mutex*   OopMapCacheAlloc_lock;           // protects allocation of oop_map caches
 
 extern Mutex*   FreeList_lock;                   // protects the free region list during safepoints
 extern Mutex*   OldSets_lock;                    // protects the old region sets

From 23a72a1f2f651d5e8e9a0eb1e75e2b44572a13da Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Tue, 7 May 2024 08:32:48 +0000
Subject: [PATCH 345/486] 8331626: unsafe.cpp:162:38: runtime error in
 index_oop_from_field_offset_long - applying non-zero offset 4563897424 to
 null pointer

Reviewed-by: mbaesken, stefank
---
 src/hotspot/share/prims/unsafe.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp
index 88672fe16b9..880f1f6ab5d 100644
--- a/src/hotspot/share/prims/unsafe.cpp
+++ b/src/hotspot/share/prims/unsafe.cpp
@@ -154,13 +154,9 @@ static inline void assert_field_offset_sane(oop p, jlong field_offset) {
 
 static inline void* index_oop_from_field_offset_long(oop p, jlong field_offset) {
   assert_field_offset_sane(p, field_offset);
-  jlong byte_offset = field_offset_to_byte_offset(field_offset);
-
-  if (sizeof(char*) == sizeof(jint)) {   // (this constant folds!)
-    return cast_from_oop<address>(p) + (jint) byte_offset;
-  } else {
-    return cast_from_oop<address>(p) +        byte_offset;
-  }
+  uintptr_t base_address = cast_from_oop<uintptr_t>(p);
+  uintptr_t byte_offset  = (uintptr_t)field_offset_to_byte_offset(field_offset);
+  return (void*)(base_address + byte_offset);
 }
 
 // Externally callable versions:

From 02a799c05576a52b03b74a4ece901e7811dfda76 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Tue, 7 May 2024 12:41:28 +0000
Subject: [PATCH 346/486] 8331695: Serial: DefNewGeneration:_promotion_failed
 used without being initialized

Reviewed-by: gli, stefank
---
 src/hotspot/share/gc/serial/defNewGeneration.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 43c8be36148..ff65a6dd450 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -226,6 +226,7 @@ DefNewGeneration::DefNewGeneration(ReservedSpace rs,
                                    size_t max_size,
                                    const char* policy)
   : Generation(rs, initial_size),
+    _promotion_failed(false),
     _preserved_marks_set(false /* in_c_heap */),
     _promo_failure_drain_in_progress(false),
     _should_allocate_from_space(false),

From 02c95a6d7eb77ed17ae64d0f585197e87a67cc4a Mon Sep 17 00:00:00 2001
From: robertengels <robaho@me.com>
Date: Tue, 7 May 2024 13:18:24 +0000
Subject: [PATCH 347/486] 6968351: httpserver clashes with delayed TCP ACKs for
 low Content-Length

Reviewed-by: dfuchs, djelinski, michaelm, jpai
---
 .../net/httpserver/ChunkedOutputStream.java   |  10 +-
 .../sun/net/httpserver/ExchangeImpl.java      |   8 +-
 .../sun/net/httpserver/ServerImpl.java        |   4 +-
 .../net/httpserver/TcpNoDelayNotRequired.java | 144 ++++++++++++++++++
 .../simpleserver/StressDirListings.java       |   2 +-
 test/jdk/java/net/Authenticator/B4769350.java |   4 +-
 .../net/www/http/KeepAliveCache/B8293562.java |   3 +-
 7 files changed, 164 insertions(+), 11 deletions(-)
 create mode 100644 test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java

diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
index 11ad6c3eaaa..aefb9b5d1fc 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -137,8 +137,14 @@ class ChunkedOutputStream extends FilterOutputStream
         if (closed) {
             return;
         }
-        flush();
         try {
+            /*
+            * write any pending chunk data. manually write chunk rather than
+            * calling flush to avoid sending small packets
+            */
+            if (count > 0) {
+                writeChunk();
+            }
             /* write an empty chunk */
             writeChunk();
             out.flush();
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
index 770642fda11..1119d1e386b 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -207,7 +207,7 @@ class ExchangeImpl {
         }
         this.rcode = rCode;
         String statusLine = "HTTP/1.1 "+rCode+Code.msg(rCode)+"\r\n";
-        OutputStream tmpout = new BufferedOutputStream (ros);
+        ByteArrayOutputStream tmpout = new ByteArrayOutputStream();
         PlaceholderOutputStream o = getPlaceholderResponseBody();
         tmpout.write (bytes(statusLine, 0), 0, statusLine.length());
         boolean noContentToSend = false; // assume there is content
@@ -278,11 +278,11 @@ class ExchangeImpl {
 
         write (rspHdrs, tmpout);
         this.rspContentLen = contentLen;
-        tmpout.flush() ;
-        tmpout = null;
+        tmpout.writeTo(ros);
         sentHeaders = true;
         logger.log(Level.TRACE, "Sent headers: noContentToSend=" + noContentToSend);
         if (noContentToSend) {
+            ros.flush();
             close();
         }
         server.logReply (rCode, req.requestLine(), null);
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
index add50920336..49377475719 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -37,6 +37,7 @@ import sun.net.httpserver.HttpConnection.State;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -686,6 +687,7 @@ class ServerImpl {
                             ServerImpl.this, chan
                         );
                     }
+                    rawout = new BufferedOutputStream(rawout);
                     connection.raw = rawin;
                     connection.rawout = rawout;
                 }
diff --git a/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java b/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java
new file mode 100644
index 00000000000..b7366188821
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2024, 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 6968351
+ * @summary  tcp no delay not required for small payloads
+ * @library /test/lib
+ * @run main/othervm/timeout=5 -Dsun.net.httpserver.nodelay=false  TcpNoDelayNotRequired
+ */
+
+import com.sun.net.httpserver.Headers;
+import com.sun.net.httpserver.HttpContext;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+import java.util.logging.StreamHandler;
+
+public class TcpNoDelayNotRequired {
+
+    public static final Logger LOGGER = Logger.getLogger("sun.net.www.protocol.http");
+
+    public static void main (String[] args) throws Exception {
+
+        java.util.logging.Handler outHandler = new StreamHandler(System.out,
+                new SimpleFormatter());
+        outHandler.setLevel(Level.FINEST);
+        LOGGER.setLevel(Level.FINEST);
+        LOGGER.addHandler(outHandler);
+
+        InetAddress loopback = InetAddress.getLoopbackAddress();
+        InetSocketAddress addr = new InetSocketAddress (loopback, 0);
+
+        SSLContext sslContext = new SimpleSSLContext().get();
+
+        HttpServer httpServer = HttpServer.create (addr, 0);
+        testHttpServer("http",httpServer,sslContext);
+
+        HttpsServer httpsServer = HttpsServer.create (addr, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+
+        testHttpServer("https",httpsServer,sslContext);
+    }
+
+    private static void testHttpServer(String scheme,HttpServer server,SSLContext sslContext) throws Exception {
+        HttpContext ctx = server.createContext ("/test", new Handler());
+        HttpContext ctx2 = server.createContext ("/chunked", new ChunkedHandler());
+        ExecutorService executor = Executors.newCachedThreadPool();
+        server.setExecutor (executor);
+        server.start ();
+        try {
+            try (HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build()) {
+                long start = System.currentTimeMillis();
+                for (int i = 0; i < 1000; i++) {
+                    var uri = URIBuilder.newBuilder().scheme(scheme).loopback().port(server.getAddress().getPort()).path("/test").build();
+                    var response = client.send(HttpRequest.newBuilder(uri).build(), HttpResponse.BodyHandlers.ofString());
+                    if (!response.body().equals("hello"))
+                        throw new IllegalStateException("incorrect body " + response.body());
+                }
+                for (int i = 0; i < 1000; i++) {
+                    var uri = URIBuilder.newBuilder().scheme(scheme).loopback().port(server.getAddress().getPort()).path("/chunked").build();
+                    var response = client.send(HttpRequest.newBuilder(uri).build(), HttpResponse.BodyHandlers.ofString());
+                    if (!response.body().equals("hello"))
+                        throw new IllegalStateException("incorrect body " + response.body());
+                }
+                long time = System.currentTimeMillis() - start;
+                System.out.println("time " + time);
+            }
+        } finally {
+            server.stop(0);
+        }
+        executor.shutdown();
+    }
+
+    static class Handler implements HttpHandler {
+        public void handle (HttpExchange t)
+                throws IOException
+        {
+            Headers rmap = t.getResponseHeaders();
+            try (var is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            rmap.add("content-type","text/plain");
+            t.sendResponseHeaders(200,5);
+            try (var os = t.getResponseBody()) {
+                os.write("hello".getBytes(StandardCharsets.ISO_8859_1));
+            }
+        }
+    }
+    static class ChunkedHandler implements HttpHandler {
+        public void handle (HttpExchange t)
+                throws IOException
+        {
+            Headers rmap = t.getResponseHeaders();
+            try (var is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            rmap.add("content-type","text/plain");
+            t.sendResponseHeaders(200,0);
+            try (var os = t.getResponseBody()) {
+                os.write("hello".getBytes(StandardCharsets.ISO_8859_1));
+            }
+        }
+    }
+}
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java b/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java
index 8197fd436e7..18a1f060c48 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java
@@ -25,7 +25,7 @@
  * @test
  * @summary Test to stress directory listings
  * @library /test/lib
- * @run testng/othervm/timeout=180 -Dsun.net.httpserver.nodelay=true StressDirListings
+ * @run testng/othervm/timeout=180 StressDirListings
  */
 
 import java.io.IOException;
diff --git a/test/jdk/java/net/Authenticator/B4769350.java b/test/jdk/java/net/Authenticator/B4769350.java
index aba41d222ea..813bf02de93 100644
--- a/test/jdk/java/net/Authenticator/B4769350.java
+++ b/test/jdk/java/net/Authenticator/B4769350.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -355,7 +355,7 @@ public class B4769350 {
                 throws IOException
         {
             exchange.getResponseHeaders().add("Proxy-Authenticate", reply);
-            exchange.sendResponseHeaders(407, 0);
+            exchange.sendResponseHeaders(407, -1);
         }
 
         static void okReply (HttpExchange exchange) throws IOException {
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java b/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
index 2e6dbb84e2d..0a6e7ef1416 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -244,6 +244,7 @@ public class B8293562 {
         public void handle(HttpExchange t) throws IOException {
             t.sendResponseHeaders(404, 3);
             t.getResponseBody().write("abc".getBytes(StandardCharsets.UTF_8));
+            t.getResponseBody().close();
         }
     }
 }

From 5746137e8a46e1eb964fe8c4de015a62dc17a745 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 7 May 2024 14:23:39 +0000
Subject: [PATCH 348/486] 8331771: ZGC: Remove OopMapCacheAlloc_lock ordering
 workaround

Reviewed-by: eosterlund, stefank, zgu
---
 src/hotspot/share/gc/shared/collectedHeap.hpp  |  1 -
 src/hotspot/share/gc/shared/isGCActiveMark.cpp | 12 ------------
 src/hotspot/share/gc/shared/isGCActiveMark.hpp |  6 ------
 src/hotspot/share/gc/z/zVerify.cpp             |  3 ---
 4 files changed, 22 deletions(-)

diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 6fbe6d70897..0a586e71ac9 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -91,7 +91,6 @@ class CollectedHeap : public CHeapObj<mtGC> {
   friend class VMStructs;
   friend class JVMCIVMStructs;
   friend class IsSTWGCActiveMark; // Block structured external access to _is_stw_gc_active
-  friend class DisableIsSTWGCActiveMark; // Disable current IsSTWGCActiveMark
   friend class MemAllocator;
   friend class ParallelObjectIterator;
 
diff --git a/src/hotspot/share/gc/shared/isGCActiveMark.cpp b/src/hotspot/share/gc/shared/isGCActiveMark.cpp
index add6acaa01a..7c400f2acc0 100644
--- a/src/hotspot/share/gc/shared/isGCActiveMark.cpp
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.cpp
@@ -42,15 +42,3 @@ IsSTWGCActiveMark::~IsSTWGCActiveMark() {
   assert(heap->is_stw_gc_active(), "Sanity");
   heap->_is_stw_gc_active = false;
 }
-
-DisableIsSTWGCActiveMark::DisableIsSTWGCActiveMark() {
-  CollectedHeap* heap = Universe::heap();
-  assert(heap->is_stw_gc_active(), "Not reentrant");
-  heap->_is_stw_gc_active = false;
-}
-
-DisableIsSTWGCActiveMark::~DisableIsSTWGCActiveMark() {
-  CollectedHeap* heap = Universe::heap();
-  assert(!heap->is_stw_gc_active(), "Sanity");
-  heap->_is_stw_gc_active = true;
-}
diff --git a/src/hotspot/share/gc/shared/isGCActiveMark.hpp b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
index c65c7ebe56a..e523c600ace 100644
--- a/src/hotspot/share/gc/shared/isGCActiveMark.hpp
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
@@ -36,10 +36,4 @@ class IsSTWGCActiveMark : public StackObj {
   ~IsSTWGCActiveMark();
 };
 
-class DisableIsSTWGCActiveMark : public StackObj {
- public:
-  DisableIsSTWGCActiveMark();
-  ~DisableIsSTWGCActiveMark();
-};
-
 #endif // SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index d8f78eb26e2..fba8adfb3c1 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -483,9 +483,6 @@ void ZVerify::after_mark() {
     roots_strong(true /* verify_after_old_mark */);
   }
   if (ZVerifyObjects) {
-    // Workaround OopMapCacheAlloc_lock reordering with the StackWatermark_lock
-    DisableIsSTWGCActiveMark mark;
-
     objects(false /* verify_weaks */);
     guarantee(zverify_broken_object == zaddress::null, "Verification failed");
   }

From 95d2f8072e91e8df80e49e341f4fdb4464a2616e Mon Sep 17 00:00:00 2001
From: Daniel Skantz <daniel.skantz@oracle.com>
Date: Tue, 7 May 2024 15:50:15 +0000
Subject: [PATCH 349/486] 8330016: Stress seed should be initialized for
 runtime stub compilation

Reviewed-by: rcastanedalo, chagedorn
---
 src/hotspot/share/opto/compile.cpp | 29 ++++++++++++++++++-----------
 src/hotspot/share/opto/compile.hpp |  3 +++
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index d5ed95187a8..25c7ced8aeb 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -844,19 +844,9 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci,
   if (failing())  return;
   NOT_PRODUCT( verify_graph_edges(); )
 
-  // If any phase is randomized for stress testing, seed random number
-  // generation and log the seed for repeatability.
   if (StressLCM || StressGCM || StressIGVN || StressCCP ||
       StressIncrementalInlining || StressMacroExpansion) {
-    if (FLAG_IS_DEFAULT(StressSeed) || (FLAG_IS_ERGO(StressSeed) && directive->RepeatCompilationOption)) {
-      _stress_seed = static_cast<uint>(Ticks::now().nanoseconds());
-      FLAG_SET_ERGO(StressSeed, _stress_seed);
-    } else {
-      _stress_seed = StressSeed;
-    }
-    if (_log != nullptr) {
-      _log->elem("stress_test seed='%u'", _stress_seed);
-    }
+    initialize_stress_seed(directive);
   }
 
   // Now optimize
@@ -983,6 +973,11 @@ Compile::Compile( ciEnv* ci_env,
   _igvn_worklist = new (comp_arena()) Unique_Node_List(comp_arena());
   _types = new (comp_arena()) Type_Array(comp_arena());
   _node_hash = new (comp_arena()) NodeHash(comp_arena(), 255);
+
+  if (StressLCM || StressGCM) {
+    initialize_stress_seed(directive);
+  }
+
   {
     PhaseGVN gvn;
     set_initial_gvn(&gvn);    // not significant, but GraphKit guys use it pervasively
@@ -5068,6 +5063,18 @@ void Compile::remove_speculative_types(PhaseIterGVN &igvn) {
 
 // Auxiliary methods to support randomized stressing/fuzzing.
 
+void Compile::initialize_stress_seed(const DirectiveSet* directive) {
+  if (FLAG_IS_DEFAULT(StressSeed) || (FLAG_IS_ERGO(StressSeed) && directive->RepeatCompilationOption)) {
+    _stress_seed = static_cast<uint>(Ticks::now().nanoseconds());
+    FLAG_SET_ERGO(StressSeed, _stress_seed);
+  } else {
+    _stress_seed = StressSeed;
+  }
+  if (_log != nullptr) {
+    _log->elem("stress_test seed='%u'", _stress_seed);
+  }
+}
+
 int Compile::random() {
   _stress_seed = os::next_random(_stress_seed);
   return static_cast<int>(_stress_seed);
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index df93b388daa..e1d9b61f7f8 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -1278,6 +1278,9 @@ private:
   int random();
   bool randomized_select(int count);
 
+  // seed random number generation and log the seed for repeatability.
+  void initialize_stress_seed(const DirectiveSet* directive);
+
   // supporting clone_map
   CloneMap&     clone_map();
   void          set_clone_map(Dict* d);

From 524aaad98317b1a50453e5a9a44922f481fb3b1e Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Tue, 7 May 2024 15:59:44 +0000
Subject: [PATCH 350/486] 8319957: PhaseOutput::code_size is unused and should
 be removed

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/output.cpp | 1 -
 src/hotspot/share/opto/output.hpp | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 4d623144a84..3f48567c093 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -1280,7 +1280,6 @@ void PhaseOutput::estimate_buffer_size(int& const_req) {
   }
 
   // Compute prolog code size
-  _method_size = 0;
   _frame_slots = OptoReg::reg2stack(C->matcher()->_old_SP) + C->regalloc()->_framesize;
   assert(_frame_slots >= 0 && _frame_slots < 1000000, "sanity check");
 
diff --git a/src/hotspot/share/opto/output.hpp b/src/hotspot/share/opto/output.hpp
index b58b97e7745..17179553602 100644
--- a/src/hotspot/share/opto/output.hpp
+++ b/src/hotspot/share/opto/output.hpp
@@ -77,7 +77,6 @@ public:
 class PhaseOutput : public Phase {
 private:
   // Instruction bits passed off to the VM
-  int                    _method_size;           // Size of nmethod code segment in bytes
   CodeBuffer             _code_buffer;           // Where the code is assembled
   int                    _first_block_size;      // Size of unvalidated entry point code / OSR poison code
   ExceptionHandlerTable  _handler_table;         // Table of native-code exception handlers
@@ -166,7 +165,6 @@ public:
   void install();
 
   // Instruction bits passed off to the VM
-  int               code_size()                 { return _method_size; }
   CodeBuffer*       code_buffer()               { return &_code_buffer; }
   int               first_block_size()          { return _first_block_size; }
   void              set_frame_complete(int off) { if (!in_scratch_emit_size()) { _code_offsets.set_value(CodeOffsets::Frame_Complete, off); } }

From 8d78e8cadcc06aea7179ec97d3bf8b7cee63b447 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 7 May 2024 18:59:41 +0000
Subject: [PATCH 351/486] 8319997: JFR: Reduce use of dynamic proxies

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/EventType.java      | 11 ++---
 .../jdk/jfr/internal/AnnotationConstruct.java | 33 +++++++------
 .../jdk/jfr/internal/EventControl.java        | 46 +++++--------------
 .../jdk/jfr/internal/MetadataRepository.java  |  8 ++--
 .../share/classes/jdk/jfr/internal/Type.java  |  8 ++++
 5 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/EventType.java b/src/jdk.jfr/share/classes/jdk/jfr/EventType.java
index 07c82d5bf53..d9b4e50fca8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/EventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/EventType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -50,7 +50,7 @@ import jdk.jfr.internal.util.Utils;
  */
 public final class EventType {
     private static final String UNKNOWN = new String();
-    private static final List<String> UNCATEGORIZED = List.of("Uncategorized");
+    private static final String[] UNCATEGORIZED = { "Uncategorized" };
     private final PlatformEventType platformEventType;
     private Map<String, ValueDescriptor> cache; // create lazy to avoid memory overhead
     private String label = UNKNOWN;
@@ -235,11 +235,8 @@ public final class EventType {
      * @see Category
      */
     public List<String> getCategoryNames() {
-        Category c = platformEventType.getAnnotation(Category.class);
-        if (c == null) {
-            return UNCATEGORIZED;
-        }
-        return List.of(c.value());
+        String[] categories = platformEventType.getAnnotationValue(Category.class, UNCATEGORIZED);
+        return List.of(categories);
     }
 
     // package private
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/AnnotationConstruct.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/AnnotationConstruct.java
index 8b5b45fb223..9a203ff3725 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/AnnotationConstruct.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/AnnotationConstruct.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -72,19 +72,11 @@ public final class AnnotationConstruct {
     }
 
     public String getLabel() {
-        Label label = getAnnotation(Label.class);
-        if (label == null) {
-            return null;
-        }
-        return label.value();
+        return getAnnotationValue(Label.class, null);
     }
 
     public String getDescription() {
-        Description description = getAnnotation(Description.class);
-        if (description == null) {
-            return null;
-        }
-        return description.value();
+        return getAnnotationValue(Description.class, null);
     }
 
     @SuppressWarnings("unchecked")
@@ -100,7 +92,20 @@ public final class AnnotationConstruct {
         return annotationElements;
     }
 
-    private AnnotationElement getAnnotationElement(Class<? extends Annotation> clazz) {
+    /**
+     * Convenience method that returns the annotation value, or a default value
+     * if the type lacks the annotation.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T getAnnotationValue(Class<? extends java.lang.annotation.Annotation> clazz, T defaultValue) {
+        AnnotationElement ae = getAnnotationElement(clazz);
+        if (ae == null) {
+            return defaultValue;
+        }
+        return (T) ae.getValues().get(0);
+    }
+
+    AnnotationElement getAnnotationElement(Class<? extends Annotation> clazz) {
         // if multiple annotation elements with the same name exists, prioritize
         // the one with the same id. Note, id alone is not a guarantee, since it
         // may differ between JVM instances.
@@ -123,8 +128,8 @@ public final class AnnotationConstruct {
         // Must be initialized lazily since some annotation elements
         // are added after construction
         if (unsignedFlag < 0) {
-            Unsigned unsigned = getAnnotation(Unsigned.class);
-            unsignedFlag = (byte) (unsigned == null ? 0 :1);
+            AnnotationElement ae = getAnnotationElement(Unsigned.class);
+            unsignedFlag = (byte) (ae == null ? 0 :1);
         }
         return unsignedFlag == (byte)1 ? true : false;
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index 68aa3eb8478..2a758aa8add 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -290,72 +290,48 @@ public final class EventControl {
     }
 
     private static Control defineEnabled(PlatformEventType type) {
-        Enabled enabled = type.getAnnotation(Enabled.class);
         // Java events are enabled by default,
         // JVM events are not, maybe they should be? Would lower learning curve
         // there too.
-        String def = type.isJVM() ? "false" : "true";
-        if (enabled != null) {
-            def = Boolean.toString(enabled.value());
-        }
+        Boolean defaultValue = Boolean.valueOf(!type.isJVM());
+        String def = type.getAnnotationValue(Enabled.class, defaultValue).toString();
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_ENABLED, Enabled.NAME, def, Collections.emptyList()));
         return new Control(new EnabledSetting(type, def), def);
     }
 
     private static Control defineThreshold(PlatformEventType type) {
-        Threshold threshold = type.getAnnotation(Threshold.class);
-        String def = "0 ns";
-        if (threshold != null) {
-            def = threshold.value();
-        }
+        String def = type.getAnnotationValue(Threshold.class, "0 ns");
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THRESHOLD, Threshold.NAME, def, Collections.emptyList()));
         return new Control(new ThresholdSetting(type), def);
     }
 
     private static Control defineStackTrace(PlatformEventType type) {
-        StackTrace stackTrace = type.getAnnotation(StackTrace.class);
-        String def = "true";
-        if (stackTrace != null) {
-            def = Boolean.toString(stackTrace.value());
-        }
+        String def = type.getAnnotationValue(StackTrace.class, Boolean.TRUE).toString();
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_STACK_TRACE, StackTrace.NAME, def, Collections.emptyList()));
         return new Control(new StackTraceSetting(type, def), def);
     }
 
     private static Control defineCutoff(PlatformEventType type) {
-        Cutoff cutoff = type.getAnnotation(Cutoff.class);
-        String def = Cutoff.INFINITY;
-        if (cutoff != null) {
-            def = cutoff.value();
-        }
+        String def = type.getAnnotationValue(Cutoff.class, Cutoff.INFINITY);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_CUTOFF, Cutoff.NAME, def, Collections.emptyList()));
         return new Control(new CutoffSetting(type), def);
     }
 
     private static Control defineThrottle(PlatformEventType type) {
-        Throttle throttle = type.getAnnotation(Throttle.class);
-        String def = Throttle.DEFAULT;
-        if (throttle != null) {
-            def = throttle.value();
-        }
+        String def = type.getAnnotationValue(Throttle.class, Throttle.DEFAULT);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THROTTLE, Throttle.NAME, def, Collections.emptyList()));
         return new Control(new ThrottleSetting(type), def);
     }
 
     private static Control defineLevel(PlatformEventType type) {
-        Level level = type.getAnnotation(Level.class);
-        String[] values = level.value();
-        String def = values[0];
+        String[] levels = type.getAnnotationValue(Level.class, new String[0]);
+        String def = levels[0]; // Level value always exists
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_LEVEL, Level.NAME, def, Collections.emptyList()));
-        return new Control(new LevelSetting(type, values), def);
+        return new Control(new LevelSetting(type, levels), def);
     }
 
     private static Control definePeriod(PlatformEventType type) {
-        Period period = type.getAnnotation(Period.class);
-        String def = "everyChunk";
-        if (period != null) {
-            def = period.value();
-        }
+        String def = type.getAnnotationValue(Period.class, "everyChunk");
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_PERIOD, PeriodSetting.NAME, def, Collections.emptyList()));
         return new Control(new PeriodSetting(type), def);
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
index 7d61d3c984f..9a2bbfe4c63 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -73,10 +73,10 @@ public final class MetadataRepository {
         for (Type type : TypeLibrary.getTypes()) {
             if (type instanceof PlatformEventType pEventType) {
                 EventType eventType = PrivateAccess.getInstance().newEventType(pEventType);
-                pEventType.setHasCutoff(eventType.getAnnotation(Cutoff.class) != null);
-                pEventType.setHasThrottle(eventType.getAnnotation(Throttle.class) != null);
-                pEventType.setHasLevel(eventType.getAnnotation(Level.class) != null);
-                pEventType.setHasPeriod(eventType.getAnnotation(Period.class) != null);
+                pEventType.setHasCutoff(type.hasAnnotation(Cutoff.class));
+                pEventType.setHasThrottle(type.hasAnnotation(Throttle.class));
+                pEventType.setHasLevel(type.hasAnnotation(Level.class));
+                pEventType.setHasPeriod(type.hasAnnotation(Period.class));
                 // Must add hook before EventControl is created as it removes
                 // annotations, such as Period and Threshold.
                 if (pEventType.hasPeriod()) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java
index bc949b8c7ff..0306541b4f7 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java
@@ -264,6 +264,10 @@ public class Type implements Comparable<Type> {
         return annos.getUnmodifiableAnnotationElements();
     }
 
+    public <T> T getAnnotationValue(Class<? extends java.lang.annotation.Annotation> clazz, T defaultValue) {
+       return annos.getAnnotationValue(clazz, defaultValue);
+    }
+
     public <T> T getAnnotation(Class<? extends java.lang.annotation.Annotation> clazz) {
         return annos.getAnnotation(clazz);
     }
@@ -359,4 +363,8 @@ public class Type implements Comparable<Type> {
     public boolean isInternal() {
         return internal;
     }
+
+    public boolean hasAnnotation(Class<? extends java.lang.annotation.Annotation> clazz) {
+        return annos.getAnnotationElement(clazz) != null;
+    }
 }

From f12ed061ae3fa9d5620a7c6c7ea441f9f33bb745 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Tue, 7 May 2024 19:06:36 +0000
Subject: [PATCH 352/486] 8048691: Spliterator.SORTED characteristics gets
 cleared for BaseStream.spliterator

Reviewed-by: psandoz, alanb
---
 .../java/util/stream/StreamSpliterators.java  |  7 +++++-
 .../util/stream/StreamSpliteratorTest.java    | 23 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/util/stream/StreamSpliterators.java b/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
index a098bb2f2ac..196cd76c8f8 100644
--- a/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
+++ b/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -248,6 +248,11 @@ class StreamSpliterators {
                 c |= (spliterator.characteristics() & (Spliterator.SIZED | Spliterator.SUBSIZED));
             }
 
+            // It's not allowed for a Spliterator to report SORTED if not also ORDERED
+            if ((c & Spliterator.SORTED) != 0 && (c & Spliterator.ORDERED) == 0) {
+                c &= ~(Spliterator.SORTED);
+            }
+
             return c;
         }
 
diff --git a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java
index d3b0d254c41..1a281885b31 100644
--- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java
+++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -605,6 +605,27 @@ public class StreamSpliteratorTest extends OpTestCase {
         }
     }
 
+    @Test
+    public void testCharacteristicsForSortedUnorderedStreamSpliterators() {
+        assertValidCombinationOfSortedAndOrdered(
+            DoubleStream.of(3d,2d,4d,1d,5d).sorted().unordered().spliterator()
+        );
+        assertValidCombinationOfSortedAndOrdered(
+            IntStream.of(3,2,4,1,5).sorted().unordered().spliterator()
+        );
+        assertValidCombinationOfSortedAndOrdered(
+            LongStream.of(3L,2L,4L,1L,5L).sorted().unordered().spliterator()
+        );
+        assertValidCombinationOfSortedAndOrdered(
+            Stream.of(3,2,4,1,5).sorted().unordered().spliterator()
+        );
+    }
+
+    void assertValidCombinationOfSortedAndOrdered(Spliterator<?> s) {
+        if (s.hasCharacteristics(Spliterator.SORTED))
+            Assert.assertTrue(s.hasCharacteristics(Spliterator.ORDERED));
+    }
+
     private List<Function<DoubleStream, DoubleStream>> doubleStreamFunctions;
 
     List<Function<DoubleStream, DoubleStream>> doubleStreamFunctions() {

From b91083341aba952befadd79020079920f9540999 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Tue, 7 May 2024 23:46:04 +0000
Subject: [PATCH 353/486] 8331864: Update Public Suffix List to 1cbd6e7

Reviewed-by: mullan
---
 .../share/data/publicsuffixlist/VERSION       |   4 +-
 .../publicsuffixlist/public_suffix_list.dat   | 605 +++++++++++++-----
 src/java.base/share/legal/public_suffix.md    |   2 +-
 .../util/RegisteredDomain/ParseNames.java     |   2 +-
 .../security/util/RegisteredDomain/tests.dat  |  11 +
 5 files changed, 464 insertions(+), 160 deletions(-)

diff --git a/src/java.base/share/data/publicsuffixlist/VERSION b/src/java.base/share/data/publicsuffixlist/VERSION
index f86d2df03ca..24f4407cc89 100644
--- a/src/java.base/share/data/publicsuffixlist/VERSION
+++ b/src/java.base/share/data/publicsuffixlist/VERSION
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/b5bf572c52988dbe9d865b8f090ea819024a9936/public_suffix_list.dat
-Date: 2023-11-09
+Github: https://raw.githubusercontent.com/publicsuffix/list/1cbd6e71a9b83620b1d0b11e49d3d9ff48c27e22/public_suffix_list.dat
+Date: 2024-05-07
diff --git a/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat b/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
index fff6e9a494d..34733674ea0 100644
--- a/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
+++ b/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
@@ -6710,7 +6710,7 @@ org.zw
 
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-11-03T15:13:18Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2024-05-04T15:12:50Z
 // This list is auto-generated, don't edit it manually.
 // aaa : American Automobile Association, Inc.
 // https://www.iana.org/domains/root/db/aaa.html
@@ -6896,7 +6896,7 @@ anquan
 // https://www.iana.org/domains/root/db/anz.html
 anz
 
-// aol : Oath Inc.
+// aol : Yahoo Inc.
 // https://www.iana.org/domains/root/db/aol.html
 aol
 
@@ -6988,10 +6988,6 @@ auto
 // https://www.iana.org/domains/root/db/autos.html
 autos
 
-// avianca : Avianca Inc.
-// https://www.iana.org/domains/root/db/avianca.html
-avianca
-
 // aws : AWS Registry LLC
 // https://www.iana.org/domains/root/db/aws.html
 aws
@@ -7016,10 +7012,6 @@ baidu
 // https://www.iana.org/domains/root/db/banamex.html
 banamex
 
-// bananarepublic : The Gap, Inc.
-// https://www.iana.org/domains/root/db/bananarepublic.html
-bananarepublic
-
 // band : Dog Beach, LLC
 // https://www.iana.org/domains/root/db/band.html
 band
@@ -7544,10 +7536,6 @@ college
 // https://www.iana.org/domains/root/db/cologne.html
 cologne
 
-// comcast : Comcast IP Holdings I, LLC
-// https://www.iana.org/domains/root/db/comcast.html
-comcast
-
 // commbank : COMMONWEALTH BANK OF AUSTRALIA
 // https://www.iana.org/domains/root/db/commbank.html
 commbank
@@ -7752,6 +7740,10 @@ dental
 // https://www.iana.org/domains/root/db/dentist.html
 dentist
 
+// desi
+// https://www.iana.org/domains/root/db/desi.html
+desi
+
 // design : Registry Services, LLC
 // https://www.iana.org/domains/root/db/design.html
 design
@@ -7796,7 +7788,7 @@ discover
 // https://www.iana.org/domains/root/db/dish.html
 dish
 
-// diy : Lifestyle Domain Holdings, Inc.
+// diy : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/diy.html
 diy
 
@@ -7928,10 +7920,6 @@ esq
 // https://www.iana.org/domains/root/db/estate.html
 estate
 
-// etisalat : Emirates Telecommunications Corporation (trading as Etisalat)
-// https://www.iana.org/domains/root/db/etisalat.html
-etisalat
-
 // eurovision : European Broadcasting Union (EBU)
 // https://www.iana.org/domains/root/db/eurovision.html
 eurovision
@@ -8104,7 +8092,7 @@ fly
 // https://www.iana.org/domains/root/db/foo.html
 foo
 
-// food : Lifestyle Domain Holdings, Inc.
+// food : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/food.html
 food
 
@@ -8164,7 +8152,7 @@ ftr
 // https://www.iana.org/domains/root/db/fujitsu.html
 fujitsu
 
-// fun : Radix FZC DMCC
+// fun : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/fun.html
 fun
 
@@ -8312,7 +8300,7 @@ goldpoint
 // https://www.iana.org/domains/root/db/golf.html
 golf
 
-// goo : NTT Resonant Inc.
+// goo : NTT DOCOMO, INC.
 // https://www.iana.org/domains/root/db/goo.html
 goo
 
@@ -8364,10 +8352,6 @@ grocery
 // https://www.iana.org/domains/root/db/group.html
 group
 
-// guardian : The Guardian Life Insurance Company of America
-// https://www.iana.org/domains/root/db/guardian.html
-guardian
-
 // gucci : Guccio Gucci S.p.a.
 // https://www.iana.org/domains/root/db/gucci.html
 gucci
@@ -8500,7 +8484,7 @@ horse
 // https://www.iana.org/domains/root/db/hospital.html
 hospital
 
-// host : Radix FZC DMCC
+// host : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/host.html
 host
 
@@ -8720,7 +8704,7 @@ jpmorgan
 // https://www.iana.org/domains/root/db/jprs.html
 jprs
 
-// juegos : Internet Naming Company LLC
+// juegos : Dog Beach, LLC
 // https://www.iana.org/domains/root/db/juegos.html
 juegos
 
@@ -8908,7 +8892,7 @@ life
 // https://www.iana.org/domains/root/db/lifeinsurance.html
 lifeinsurance
 
-// lifestyle : Lifestyle Domain Holdings, Inc.
+// lifestyle : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/lifestyle.html
 lifestyle
 
@@ -8948,7 +8932,7 @@ lipsy
 // https://www.iana.org/domains/root/db/live.html
 live
 
-// living : Lifestyle Domain Holdings, Inc.
+// living : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/living.html
 living
 
@@ -9392,10 +9376,6 @@ olayan
 // https://www.iana.org/domains/root/db/olayangroup.html
 olayangroup
 
-// oldnavy : The Gap, Inc.
-// https://www.iana.org/domains/root/db/oldnavy.html
-oldnavy
-
 // ollo : Dish DBS Corporation
 // https://www.iana.org/domains/root/db/ollo.html
 ollo
@@ -9416,7 +9396,7 @@ ong
 // https://www.iana.org/domains/root/db/onl.html
 onl
 
-// online : Radix FZC DMCC
+// online : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/online.html
 online
 
@@ -9620,7 +9600,7 @@ pramerica
 // https://www.iana.org/domains/root/db/praxi.html
 praxi
 
-// press : Radix FZC DMCC
+// press : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/press.html
 press
 
@@ -9928,10 +9908,6 @@ sbi
 // https://www.iana.org/domains/root/db/sbs.html
 sbs
 
-// sca : SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ)
-// https://www.iana.org/domains/root/db/sca.html
-sca
-
 // scb : The Siam Commercial Bank Public Company Limited ("SCB")
 // https://www.iana.org/domains/root/db/scb.html
 scb
@@ -10076,7 +10052,7 @@ sina
 // https://www.iana.org/domains/root/db/singles.html
 singles
 
-// site : Radix FZC DMCC
+// site : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/site.html
 site
 
@@ -10156,7 +10132,7 @@ soy
 // https://www.iana.org/domains/root/db/spa.html
 spa
 
-// space : Radix FZC DMCC
+// space : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/space.html
 space
 
@@ -10208,7 +10184,7 @@ stockholm
 // https://www.iana.org/domains/root/db/storage.html
 storage
 
-// store : Radix FZC DMCC
+// store : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/store.html
 store
 
@@ -10324,7 +10300,7 @@ tdk
 // https://www.iana.org/domains/root/db/team.html
 team
 
-// tech : Radix FZC DMCC
+// tech : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/tech.html
 tech
 
@@ -10508,7 +10484,7 @@ unicom
 // https://www.iana.org/domains/root/db/university.html
 university
 
-// uno : Radix FZC DMCC
+// uno : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/uno.html
 uno
 
@@ -10524,7 +10500,7 @@ ups
 // https://www.iana.org/domains/root/db/vacations.html
 vacations
 
-// vana : Lifestyle Domain Holdings, Inc.
+// vana : Internet Naming Company LLC
 // https://www.iana.org/domains/root/db/vana.html
 vana
 
@@ -10608,10 +10584,6 @@ vlaanderen
 // https://www.iana.org/domains/root/db/vodka.html
 vodka
 
-// volkswagen : Volkswagen Group of America Inc.
-// https://www.iana.org/domains/root/db/volkswagen.html
-volkswagen
-
 // volvo : Volvo Holding Sverige Aktiebolag
 // https://www.iana.org/domains/root/db/volvo.html
 volvo
@@ -10676,10 +10648,14 @@ webcam
 // https://www.iana.org/domains/root/db/weber.html
 weber
 
-// website : Radix FZC DMCC
+// website : Radix Technologies Inc.
 // https://www.iana.org/domains/root/db/website.html
 website
 
+// wed
+// https://www.iana.org/domains/root/db/wed.html
+wed
+
 // wedding : Registry Services, LLC
 // https://www.iana.org/domains/root/db/wedding.html
 wedding
@@ -10768,10 +10744,6 @@ xbox
 // https://www.iana.org/domains/root/db/xerox.html
 xerox
 
-// xfinity : Comcast IP Holdings I, LLC
-// https://www.iana.org/domains/root/db/xfinity.html
-xfinity
-
 // xihuan : Beijing Qihu Keji Co., Ltd.
 // https://www.iana.org/domains/root/db/xihuan.html
 xihuan
@@ -11012,10 +10984,6 @@ xin
 // https://www.iana.org/domains/root/db/xn--mgba7c0bbn0a.html
 العليان
 
-// xn--mgbaakc7dvf : Emirates Telecommunications Corporation (trading as Etisalat)
-// https://www.iana.org/domains/root/db/xn--mgbaakc7dvf.html
-اتصالات
-
 // xn--mgbab2bd : CORE Association
 // https://www.iana.org/domains/root/db/xn--mgbab2bd.html
 بازار
@@ -11152,7 +11120,7 @@ xyz
 // https://www.iana.org/domains/root/db/yachts.html
 yachts
 
-// yahoo : Oath Inc.
+// yahoo : Yahoo Inc.
 // https://www.iana.org/domains/root/db/yahoo.html
 yahoo
 
@@ -11217,6 +11185,12 @@ zuerich
 // ===BEGIN PRIVATE DOMAINS===
 // (Note: these are in alphabetical order by company name)
 
+// 12CHARS: https://12chars.com
+// Submitted by Kenny Niehage <psl@12chars.com>
+12chars.dev
+12chars.it
+12chars.pro
+
 // 1GB LLC : https://www.1gb.ua/
 // Submitted by 1GB LLC <noc@1gb.com.ua>
 cc.ua
@@ -11226,6 +11200,15 @@ ltd.ua
 // 611coin : https://611project.org/
 611.to
 
+// AAA workspace : https://aaa.vodka
+// Submitted by Kirill Rezraf <admin@aaa.vodka>
+aaa.vodka
+
+// A2 Hosting
+// Submitted by Tyler Hall <sysadmin@a2hosting.com>
+a2hosted.com
+cpserver.com
+
 // Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
 // Submitted by Aaron Marais <its_me@aaronleem.co.za>
 graphox.us
@@ -11242,12 +11225,18 @@ graphox.us
 // Submitted by Ofer Kalaora <postmaster@activetrail.com>
 activetrail.biz
 
+// Adaptable.io : https://adaptable.io
+// Submitted by Mark Terrel <support@adaptable.io>
+adaptable.app
+
 // Adobe : https://www.adobe.com/
 // Submitted by Ian Boston <boston@adobe.com> and Lars Trieloff <trieloff@adobe.com>
 adobeaemcloud.com
 *.dev.adobeaemcloud.com
+aem.live
 hlx.live
 adobeaemcloud.net
+aem.page
 hlx.page
 hlx3.page
 
@@ -11319,7 +11308,7 @@ myamaze.net
 
 // Amazon API Gateway
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 4d863337-ff98-4501-a6f2-361eba8445d6
+// Reference: 9e37648f-a66c-4655-9ab1-5981f8737197
 execute-api.cn-north-1.amazonaws.com.cn
 execute-api.cn-northwest-1.amazonaws.com.cn
 execute-api.af-south-1.amazonaws.com
@@ -11334,6 +11323,7 @@ execute-api.ap-southeast-2.amazonaws.com
 execute-api.ap-southeast-3.amazonaws.com
 execute-api.ap-southeast-4.amazonaws.com
 execute-api.ca-central-1.amazonaws.com
+execute-api.ca-west-1.amazonaws.com
 execute-api.eu-central-1.amazonaws.com
 execute-api.eu-central-2.amazonaws.com
 execute-api.eu-north-1.amazonaws.com
@@ -11360,23 +11350,28 @@ cloudfront.net
 
 // Amazon Cognito
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 7bee1013-f456-47df-bfe8-03c78d946d61
+// Reference: 09588633-91fe-49d8-b4e7-ec36496d11f3
 auth.af-south-1.amazoncognito.com
 auth.ap-northeast-1.amazoncognito.com
 auth.ap-northeast-2.amazoncognito.com
 auth.ap-northeast-3.amazoncognito.com
 auth.ap-south-1.amazoncognito.com
+auth.ap-south-2.amazoncognito.com
 auth.ap-southeast-1.amazoncognito.com
 auth.ap-southeast-2.amazoncognito.com
 auth.ap-southeast-3.amazoncognito.com
+auth.ap-southeast-4.amazoncognito.com
 auth.ca-central-1.amazoncognito.com
 auth.eu-central-1.amazoncognito.com
+auth.eu-central-2.amazoncognito.com
 auth.eu-north-1.amazoncognito.com
 auth.eu-south-1.amazoncognito.com
+auth.eu-south-2.amazoncognito.com
 auth.eu-west-1.amazoncognito.com
 auth.eu-west-2.amazoncognito.com
 auth.eu-west-3.amazoncognito.com
 auth.il-central-1.amazoncognito.com
+auth.me-central-1.amazoncognito.com
 auth.me-south-1.amazoncognito.com
 auth.sa-east-1.amazoncognito.com
 auth.us-east-1.amazoncognito.com
@@ -11399,7 +11394,7 @@ us-east-1.amazonaws.com
 
 // Amazon EMR
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 597f3f8e-9283-4e48-8e32-7ee25a1ff6ab
+// Reference: 82f43f9f-bbb8-400e-8349-854f5a62f20d
 emrappui-prod.cn-north-1.amazonaws.com.cn
 emrnotebooks-prod.cn-north-1.amazonaws.com.cn
 emrstudio-prod.cn-north-1.amazonaws.com.cn
@@ -11424,6 +11419,9 @@ emrstudio-prod.ap-northeast-3.amazonaws.com
 emrappui-prod.ap-south-1.amazonaws.com
 emrnotebooks-prod.ap-south-1.amazonaws.com
 emrstudio-prod.ap-south-1.amazonaws.com
+emrappui-prod.ap-south-2.amazonaws.com
+emrnotebooks-prod.ap-south-2.amazonaws.com
+emrstudio-prod.ap-south-2.amazonaws.com
 emrappui-prod.ap-southeast-1.amazonaws.com
 emrnotebooks-prod.ap-southeast-1.amazonaws.com
 emrstudio-prod.ap-southeast-1.amazonaws.com
@@ -11433,18 +11431,30 @@ emrstudio-prod.ap-southeast-2.amazonaws.com
 emrappui-prod.ap-southeast-3.amazonaws.com
 emrnotebooks-prod.ap-southeast-3.amazonaws.com
 emrstudio-prod.ap-southeast-3.amazonaws.com
+emrappui-prod.ap-southeast-4.amazonaws.com
+emrnotebooks-prod.ap-southeast-4.amazonaws.com
+emrstudio-prod.ap-southeast-4.amazonaws.com
 emrappui-prod.ca-central-1.amazonaws.com
 emrnotebooks-prod.ca-central-1.amazonaws.com
 emrstudio-prod.ca-central-1.amazonaws.com
+emrappui-prod.ca-west-1.amazonaws.com
+emrnotebooks-prod.ca-west-1.amazonaws.com
+emrstudio-prod.ca-west-1.amazonaws.com
 emrappui-prod.eu-central-1.amazonaws.com
 emrnotebooks-prod.eu-central-1.amazonaws.com
 emrstudio-prod.eu-central-1.amazonaws.com
+emrappui-prod.eu-central-2.amazonaws.com
+emrnotebooks-prod.eu-central-2.amazonaws.com
+emrstudio-prod.eu-central-2.amazonaws.com
 emrappui-prod.eu-north-1.amazonaws.com
 emrnotebooks-prod.eu-north-1.amazonaws.com
 emrstudio-prod.eu-north-1.amazonaws.com
 emrappui-prod.eu-south-1.amazonaws.com
 emrnotebooks-prod.eu-south-1.amazonaws.com
 emrstudio-prod.eu-south-1.amazonaws.com
+emrappui-prod.eu-south-2.amazonaws.com
+emrnotebooks-prod.eu-south-2.amazonaws.com
+emrstudio-prod.eu-south-2.amazonaws.com
 emrappui-prod.eu-west-1.amazonaws.com
 emrnotebooks-prod.eu-west-1.amazonaws.com
 emrstudio-prod.eu-west-1.amazonaws.com
@@ -11454,6 +11464,9 @@ emrstudio-prod.eu-west-2.amazonaws.com
 emrappui-prod.eu-west-3.amazonaws.com
 emrnotebooks-prod.eu-west-3.amazonaws.com
 emrstudio-prod.eu-west-3.amazonaws.com
+emrappui-prod.il-central-1.amazonaws.com
+emrnotebooks-prod.il-central-1.amazonaws.com
+emrstudio-prod.il-central-1.amazonaws.com
 emrappui-prod.me-central-1.amazonaws.com
 emrnotebooks-prod.me-central-1.amazonaws.com
 emrstudio-prod.me-central-1.amazonaws.com
@@ -11484,9 +11497,11 @@ emrstudio-prod.us-west-2.amazonaws.com
 
 // Amazon Managed Workflows for Apache Airflow
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 4ab55e6f-90c0-4a8d-b6a0-52ca5dbb1c2e
+// Reference: 87f24ece-a77e-40e8-bb4a-f6b74fe9f975
 *.cn-north-1.airflow.amazonaws.com.cn
 *.cn-northwest-1.airflow.amazonaws.com.cn
+*.af-south-1.airflow.amazonaws.com
+*.ap-east-1.airflow.amazonaws.com
 *.ap-northeast-1.airflow.amazonaws.com
 *.ap-northeast-2.airflow.amazonaws.com
 *.ap-south-1.airflow.amazonaws.com
@@ -11495,17 +11510,20 @@ emrstudio-prod.us-west-2.amazonaws.com
 *.ca-central-1.airflow.amazonaws.com
 *.eu-central-1.airflow.amazonaws.com
 *.eu-north-1.airflow.amazonaws.com
+*.eu-south-1.airflow.amazonaws.com
 *.eu-west-1.airflow.amazonaws.com
 *.eu-west-2.airflow.amazonaws.com
 *.eu-west-3.airflow.amazonaws.com
+*.me-south-1.airflow.amazonaws.com
 *.sa-east-1.airflow.amazonaws.com
 *.us-east-1.airflow.amazonaws.com
 *.us-east-2.airflow.amazonaws.com
+*.us-west-1.airflow.amazonaws.com
 *.us-west-2.airflow.amazonaws.com
 
 // Amazon S3
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 0e801048-08f2-4064-9cb8-e7373e0b57f4
+// Reference: cd5c8b3a-67b7-4b40-9236-c87ce81a3d10
 s3.dualstack.cn-north-1.amazonaws.com.cn
 s3-accesspoint.dualstack.cn-north-1.amazonaws.com.cn
 s3-website.dualstack.cn-north-1.amazonaws.com.cn
@@ -11604,6 +11622,16 @@ s3-accesspoint-fips.ca-central-1.amazonaws.com
 s3-fips.ca-central-1.amazonaws.com
 s3-object-lambda.ca-central-1.amazonaws.com
 s3-website.ca-central-1.amazonaws.com
+s3.dualstack.ca-west-1.amazonaws.com
+s3-accesspoint.dualstack.ca-west-1.amazonaws.com
+s3-accesspoint-fips.dualstack.ca-west-1.amazonaws.com
+s3-fips.dualstack.ca-west-1.amazonaws.com
+s3-website.dualstack.ca-west-1.amazonaws.com
+s3.ca-west-1.amazonaws.com
+s3-accesspoint.ca-west-1.amazonaws.com
+s3-accesspoint-fips.ca-west-1.amazonaws.com
+s3-fips.ca-west-1.amazonaws.com
+s3-website.ca-west-1.amazonaws.com
 s3.dualstack.eu-central-1.amazonaws.com
 s3-accesspoint.dualstack.eu-central-1.amazonaws.com
 s3-website.dualstack.eu-central-1.amazonaws.com
@@ -11784,9 +11812,25 @@ s3-fips.us-west-2.amazonaws.com
 s3-object-lambda.us-west-2.amazonaws.com
 s3-website.us-west-2.amazonaws.com
 
+// Amazon SageMaker Ground Truth
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 98dbfde4-7802-48c3-8751-b60f204e0d9c
+labeling.ap-northeast-1.sagemaker.aws
+labeling.ap-northeast-2.sagemaker.aws
+labeling.ap-south-1.sagemaker.aws
+labeling.ap-southeast-1.sagemaker.aws
+labeling.ap-southeast-2.sagemaker.aws
+labeling.ca-central-1.sagemaker.aws
+labeling.eu-central-1.sagemaker.aws
+labeling.eu-west-1.sagemaker.aws
+labeling.eu-west-2.sagemaker.aws
+labeling.us-east-1.sagemaker.aws
+labeling.us-east-2.sagemaker.aws
+labeling.us-west-2.sagemaker.aws
+
 // Amazon SageMaker Notebook Instances
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: fe8c9e94-5a22-486d-8750-991a3a9b13c6
+// Reference: b5ea56df-669e-43cc-9537-14aa172f5dfc
 notebook.af-south-1.sagemaker.aws
 notebook.ap-east-1.sagemaker.aws
 notebook.ap-northeast-1.sagemaker.aws
@@ -11799,6 +11843,9 @@ notebook.ap-southeast-2.sagemaker.aws
 notebook.ap-southeast-3.sagemaker.aws
 notebook.ap-southeast-4.sagemaker.aws
 notebook.ca-central-1.sagemaker.aws
+notebook-fips.ca-central-1.sagemaker.aws
+notebook.ca-west-1.sagemaker.aws
+notebook-fips.ca-west-1.sagemaker.aws
 notebook.eu-central-1.sagemaker.aws
 notebook.eu-central-2.sagemaker.aws
 notebook.eu-north-1.sagemaker.aws
@@ -11820,6 +11867,7 @@ notebook-fips.us-gov-east-1.sagemaker.aws
 notebook.us-gov-west-1.sagemaker.aws
 notebook-fips.us-gov-west-1.sagemaker.aws
 notebook.us-west-1.sagemaker.aws
+notebook-fips.us-west-1.sagemaker.aws
 notebook.us-west-2.sagemaker.aws
 notebook-fips.us-west-2.sagemaker.aws
 notebook.cn-north-1.sagemaker.com.cn
@@ -11827,7 +11875,7 @@ notebook.cn-northwest-1.sagemaker.com.cn
 
 // Amazon SageMaker Studio
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 057ee397-6bf8-4f20-b807-d7bc145ac980
+// Reference: 69c723d9-6e1a-4bff-a203-48eecd203183
 studio.af-south-1.sagemaker.aws
 studio.ap-east-1.sagemaker.aws
 studio.ap-northeast-1.sagemaker.aws
@@ -11841,6 +11889,7 @@ studio.ca-central-1.sagemaker.aws
 studio.eu-central-1.sagemaker.aws
 studio.eu-north-1.sagemaker.aws
 studio.eu-south-1.sagemaker.aws
+studio.eu-south-2.sagemaker.aws
 studio.eu-west-1.sagemaker.aws
 studio.eu-west-2.sagemaker.aws
 studio.eu-west-3.sagemaker.aws
@@ -11885,7 +11934,7 @@ analytics-gateway.us-west-2.amazonaws.com
 
 // AWS Cloud9
 // Submitted by: AWS Security <psl-maintainers@amazon.com>
-// Reference: 05c44955-977c-4b57-938a-f2af92733f9f
+// Reference: 30717f72-4007-4f0f-8ed4-864c6f2efec9
 webview-assets.aws-cloud9.af-south-1.amazonaws.com
 vfs.cloud9.af-south-1.amazonaws.com
 webview-assets.cloud9.af-south-1.amazonaws.com
@@ -11931,6 +11980,8 @@ webview-assets.cloud9.eu-west-2.amazonaws.com
 webview-assets.aws-cloud9.eu-west-3.amazonaws.com
 vfs.cloud9.eu-west-3.amazonaws.com
 webview-assets.cloud9.eu-west-3.amazonaws.com
+webview-assets.aws-cloud9.il-central-1.amazonaws.com
+vfs.cloud9.il-central-1.amazonaws.com
 webview-assets.aws-cloud9.me-south-1.amazonaws.com
 vfs.cloud9.me-south-1.amazonaws.com
 webview-assets.cloud9.me-south-1.amazonaws.com
@@ -11950,6 +12001,11 @@ webview-assets.aws-cloud9.us-west-2.amazonaws.com
 vfs.cloud9.us-west-2.amazonaws.com
 webview-assets.cloud9.us-west-2.amazonaws.com
 
+// AWS Directory Service
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: a13203e8-42dc-4045-a0d2-2ee67bed1068
+awsapps.com
+
 // AWS Elastic Beanstalk
 // Submitted by AWS Security <psl-maintainers@amazon.com>
 // Reference: bb5a965c-dec3-4967-aa22-e306ad064797
@@ -11993,6 +12049,11 @@ us-west-2.elasticbeanstalk.com
 // Reference: d916759d-a08b-4241-b536-4db887383a6a
 awsglobalaccelerator.com
 
+// AWS re:Post Private
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 83385945-225f-416e-9aa0-ad0632bfdcee
+*.private.repost.aws
+
 // eero
 // Submitted by Yue Kang <eero-dynamic-dns@amazon.com>
 // Reference: 264afe70-f62c-4c02-8ab9-b5281ed24461
@@ -12010,6 +12071,10 @@ tele.amune.org
 // Submitted by Apigee Security Team <security@apigee.com>
 apigee.io
 
+// Apis Networks: https://apisnetworks.com
+// Submitted by Matt Saladna <matt@apisnetworks.com>
+panel.dev
+
 // Apphud : https://apphud.com
 // Submitted by Alexander Selivanov <alex@apphud.com>
 siiites.com
@@ -12027,6 +12092,10 @@ appudo.net
 // Submitted by Thomas Orozco <thomas@aptible.com>
 on-aptible.com
 
+// Aquapal : https://aquapal.net/
+// Submitted by Aki Ueno <admin@aquapal.net>
+f5.si
+
 // ASEINet : https://www.aseinet.com/
 // Submitted by Asei SEKIGUCHI <mail@aseinet.com>
 user.aseinet.ne.jp
@@ -12062,6 +12131,7 @@ autocode.dev
 
 // AVM : https://avm.de
 // Submitted by Andreas Weise <a.weise@avm.de>
+myfritz.link
 myfritz.net
 
 // AVStack Pte. Ltd. : https://avstack.io
@@ -12121,10 +12191,18 @@ beagleboard.io
 // Submitted by Lev Nekrasov <lnekrasov@beget.com>
 *.beget.app
 
+// Besties : https://besties.house
+// Submitted by Hazel Cora <hazy@besties.house>
+pages.gay
+
 // BetaInABox
 // Submitted by Adrian <adrian@betainabox.com>
 betainabox.com
 
+// University of Bielsko-Biala regional domain: http://dns.bielsko.pl/
+// Submitted by Marcin <dns@ath.bielsko.pl>
+bielsko.pl
+
 // BinaryLane : http://www.binarylane.com
 // Submitted by Nathan O'Sullivan <nathan@mammoth.com.au>
 bnr.la
@@ -12166,8 +12244,13 @@ square7.de
 bplaced.net
 square7.net
 
+// Brave : https://brave.com
+// Submitted by Andrea Brancaleoni <abrancaleoni@brave.com>
+*.s.brave.io
+
 // Brendly : https://brendly.rs
-// Submitted by Dusan Radovanovic <dusan.radovanovic@brendly.rs>
+// Submitted by Dusan Radovanovic <administracija@brendly.rs>
+shop.brendly.hr
 shop.brendly.rs
 
 // BrowserSafetyMark
@@ -12191,7 +12274,9 @@ mycd.eu
 // Canva Pty Ltd : https://canva.com/
 // Submitted by Joel Aquilina <publicsuffixlist@canva.com>
 canva-apps.cn
+*.my.canvasite.cn
 canva-apps.com
+*.my.canva.site
 
 // Carrd : https://carrd.co
 // Submitted by AJ <aj@carrd.co>
@@ -12329,6 +12414,12 @@ pages.dev
 r2.dev
 workers.dev
 
+// cloudscale.ch AG : https://www.cloudscale.ch/
+// Submitted by Gaudenz Steinlin <support@cloudscale.ch>
+cust.cloudscale.ch
+objects.lpg.cloudscale.ch
+objects.rma.cloudscale.ch
+
 // Clovyr : https://clovyr.io
 // Submitted by Patrick Nielsen <patrick@clovyr.io>
 wnext.app
@@ -12346,22 +12437,33 @@ co.cz
 
 // CDN77.com : http://www.cdn77.com
 // Submitted by Jan Krpes <jan.krpes@cdn77.com>
-c.cdn77.org
+cdn77-storage.com
+rsc.contentproxy9.cz
 cdn77-ssl.net
 r.cdn77.net
-rsc.cdn77.org
 ssl.origin.cdn77-secure.org
+c.cdn77.org
+rsc.cdn77.org
 
 // Cloud DNS Ltd : http://www.cloudns.net
-// Submitted by Aleksander Hristov <noc@cloudns.net>
+// Submitted by Aleksander Hristov <noc@cloudns.net> & Boyan Peychev <boyan@cloudns.net>
 cloudns.asia
+cloudns.be
 cloudns.biz
-cloudns.club
 cloudns.cc
+cloudns.ch
+cloudns.cl
+cloudns.club
+dnsabr.com
+cloudns.cx
 cloudns.eu
 cloudns.in
 cloudns.info
+dns-cloud.net
+dns-dynamic.net
+cloudns.nz
 cloudns.org
+cloudns.ph
 cloudns.pro
 cloudns.pw
 cloudns.us
@@ -12374,6 +12476,11 @@ cnpy.gdn
 // Submitted by Moritz Marquardt <git@momar.de>
 codeberg.page
 
+// CodeSandbox B.V. : https://codesandbox.io
+// Submitted by Ives van Hoorne <abuse@codesandbox.io>
+csb.app
+preview.csb.app
+
 // CoDNS B.V.
 co.nl
 co.no
@@ -12383,6 +12490,10 @@ co.no
 webhosting.be
 hosting-cluster.nl
 
+// Convex : https://convex.dev/
+// Submitted by James Cowling <security@convex.dev>
+convex.site
+
 // Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/
 // Submitted by George Georgievsky <gug@cctld.ru>
 ac.ru
@@ -12404,10 +12515,18 @@ feste-ip.net
 knx-server.net
 static-access.net
 
+// cPanel L.L.C. : https://www.cpanel.net/
+// Submitted by Dustin Scherer <public.suffix@cpanel.net>
+*.cprapid.com
+
 // Craynic, s.r.o. : http://www.craynic.com/
 // Submitted by Ales Krajnik <ales.krajnik@craynic.com>
 realm.cz
 
+// Crisp IM SAS : https://crisp.chat/
+// Submitted by Baptiste Jamin <hostmaster@crisp.chat>
+on.crisp.email
+
 // Cryptonomic : https://cryptonomic.net/
 // Submitted by Andrew Cady <public-suffix-list@cryptonomic.net>
 *.cryptonomic.net
@@ -12428,6 +12547,13 @@ curv.dev
 *.ocp.customer-oci.com
 *.ocs.customer-oci.com
 
+// Cyclic Software : https://www.cyclic.sh
+// Submitted by Kam Lasater <dns-admin@cyclic.sh>
+cyclic.app
+cyclic.cloud
+cyclic-app.com
+cyclic.co.in
+
 // cyon GmbH : https://www.cyon.ch/
 // Submitted by Dominic Luechinger <dol@cyon.ch>
 cyon.link
@@ -12473,6 +12599,7 @@ dyndns.dappnode.io
 // Dark, Inc. : https://darklang.com
 // Submitted by Paul Biggar <ops@darklang.com>
 builtwithdark.com
+darklang.io
 
 // DataDetect, LLC. : https://datadetect.com
 // Submitted by Andrew Banchich <abanchich@sceven.com>
@@ -12871,6 +12998,10 @@ ondigitalocean.app
 // Submitted by Robin H. Johnson <psl-maintainers@digitalocean.com>
 *.digitaloceanspaces.com
 
+// DigitalPlat : https://www.digitalplat.org/
+// Submitted by Edward Hsing <contact@digitalplat.org>
+us.kg
+
 // dnstrace.pro : https://dnstrace.pro/
 // Submitted by Chris Partridge <chris@partridge.tech>
 bci.dnstrace.pro
@@ -12908,6 +13039,18 @@ e4.cz
 easypanel.app
 easypanel.host
 
+// EasyWP : https://www.easywp.com
+// Submitted by <infracloudteam@namecheap.com>
+*.ewp.live
+
+// Electromagnetic Field : https://www.emfcamp.org
+// Submitted by <noc@emfcamp.org>
+at.emf.camp
+
+// Elefunc, Inc. : https://elefunc.com
+// Submitted by Cetin Sert <domains@elefunc.com>
+rt.ht
+
 // Elementor : Elementor Ltd.
 // Submitted by Anton Barkan <antonb@elementor.com>
 elementor.cloud
@@ -13022,10 +13165,6 @@ url.tw
 // Submitted by Eric Jiang <eric@fabrica.dev>
 onfabrica.com
 
-// Facebook, Inc.
-// Submitted by Peter Ruibal <public-suffix@fb.com>
-apps.fbsbx.com
-
 // FAITID : https://faitid.org/
 // Submitted by Maxim Alzoba <tech.contact@faitid.org>
 // https://www.flexireg.net/stat_info
@@ -13183,6 +13322,10 @@ flap.id
 onflashdrive.app
 fldrv.com
 
+// FlutterFlow : https://flutterflow.io
+// Submitted by Anton Emelyanov <anton@flutterflow.io>
+flutterflow.app
+
 // fly.io: https://fly.io
 // Submitted by Kurt Mackey <kurt@fly.io>
 fly.dev
@@ -13193,13 +13336,14 @@ shw.io
 // Submitted by Jonathan Rudenberg <jonathan@flynn.io>
 flynnhosting.net
 
-// Forgerock : https://www.forgerock.com
+// Forgerock : https://www.forgerock.com
 // Submitted by Roderick Parr <roderick.parr@forgerock.com>
 forgeblocks.com
 id.forgerock.io
 
 // Framer : https://www.framer.com
-// Submitted by Koen Rouwhorst <koenrh@framer.com>
+// Submitted by Koen Rouwhorst <security@framer.com>
+framer.ai
 framer.app
 framercanvas.com
 framer.media
@@ -13240,6 +13384,24 @@ freemyip.com
 // Submitted by Daniel A. Maierhofer <vorstand@funkfeuer.at>
 wien.funkfeuer.at
 
+// Future Versatile Group. ：https://www.fvg-on.net/
+// T.Kabu <webmaster@fvg-on.net>
+daemon.asia
+dix.asia
+mydns.bz
+0am.jp
+0g0.jp
+0j0.jp
+0t0.jp
+mydns.jp
+pgw.jp
+wjg.jp
+keyword-on.net
+live-on.net
+server-on.net
+mydns.tw
+mydns.vc
+
 // Futureweb GmbH : https://www.futureweb.at
 // Submitted by Andreas Schnederle-Wagner <schnederle@futureweb.at>
 *.futurecms.at
@@ -13251,6 +13413,10 @@ futuremailing.at
 *.kunden.ortsinfo.at
 *.statics.cloud
 
+// GCom Internet : https://www.gcom.net.au
+// Submitted by Leo Julius <support@gcom.net.au>
+aliases121.com
+
 // GDS : https://www.gov.uk/service-manual/technology/managing-domain-names
 // Submitted by Stephen Ford <hostmaster@digital.cabinet-office.gov.uk>
 independent-commission.uk
@@ -13279,9 +13445,11 @@ gentlentapis.com
 lab.ms
 cdn-edges.net
 
-// Ghost Foundation : https://ghost.org
-// Submitted by Matt Hanley <security@ghost.org>
-ghost.io
+// Getlocalcert: https://www.getlocalcert.net
+// Submitted by Robert Alexander <support@getlocalcert.net>
+localcert.net
+localhostcert.net
+corpnet.work
 
 // GignoSystemJapan: http://gsj.bz
 // Submitted by GignoSystemJapan <kakutou-ec@gsj.bz>
@@ -13425,6 +13593,10 @@ whitesnow.jp
 zombie.jp
 heteml.net
 
+// GoDaddy Registry : https://registry.godaddy
+// Submitted by Rohan Durrant <tldns@registry.godaddy>
+graphic.design
+
 // GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
 // Submitted by Tom Whitwell <gov-uk-paas-support@digital.cabinet-office.gov.uk>
 cloudapps.digital
@@ -13434,10 +13606,6 @@ london.cloudapps.digital
 // Submitted by Richard Baker <richard.baker@digital.cabinet-office.gov.uk>
 pymnt.uk
 
-// UKHomeOffice : https://www.gov.uk/government/organisations/home-office
-// Submitted by Jon Shanks <jon.shanks@digital.homeoffice.gov.uk>
-homeoffice.gov.uk
-
 // GlobeHosting, Inc.
 // Submitted by Zoltan Egresi <egresi@globehosting.com>
 ro.im
@@ -13448,8 +13616,7 @@ goip.de
 
 // Google, Inc.
 // Submitted by Eduardo Vela <evn@google.com>
-run.app
-a.run.app
+*.run.app
 web.app
 *.0emm.com
 appspot.com
@@ -13549,6 +13716,10 @@ goupile.fr
 // Submitted by <domeinnaam@minaz.nl>
 gov.nl
 
+// GrayJay Web Solutions Inc. : https://grayjaysports.ca
+// Submitted by Matt Yamkowy <info@grayjaysports.ca>
+grayjayleagues.com
+
 // Group 53, LLC : https://www.group53.com
 // Submitted by Tyler Todd <noc@nova53.net>
 awsmppl.com
@@ -13583,6 +13754,11 @@ hasura-app.io
 // Submitted by Richard Zowalla <mi-admin@hs-heilbronn.de>
 pages.it.hs-heilbronn.de
 
+// Helio Networks : https://heliohost.org
+// Submitted by Ben Frede <admin@heliohost.org>
+helioho.st
+heliohost.us
+
 // Hepforge : https://www.hepforge.org
 // Submitted by David Grellscheid <admin@hepforge.org>
 hepforge.org
@@ -13596,7 +13772,6 @@ herokussl.com
 // Submitted by Oren Eini <oren@ravendb.net>
 ravendb.cloud
 ravendb.community
-ravendb.me
 development.run
 ravendb.run
 
@@ -13604,6 +13779,12 @@ ravendb.run
 // Submitted by Krzysztof Wolski <krzysztof.wolski@home.eu>
 homesklep.pl
 
+// Homebase : https://homebase.id/
+// Submitted by Jason Babo <info@homebase.id>
+*.kin.one
+*.id.pub
+*.kin.pub
+
 // Hong Kong Productivity Council: https://www.hkpc.org/
 // Submitted by SECaaS Team <summchan@hkpc.org>
 secaas.hk
@@ -13681,7 +13862,7 @@ biz.at
 info.at
 
 // info.cx : http://info.cx
-// Submitted by Jacob Slater <whois@igloo.to>
+// Submitted by June Slater <whois@igloo.to>
 info.cx
 
 // Interlegis : http://www.interlegis.leg.br
@@ -13730,6 +13911,14 @@ iopsys.se
 // Submitted by Matthew Hardeman <mhardeman@ipifony.com>
 ipifony.net
 
+// is-a.dev : https://www.is-a.dev
+// Submitted by William Harrison <admin@maintainers.is-a.dev>
+is-a.dev
+
+// ir.md : https://nic.ir.md
+// Submitted by Ali Soizi <info@nic.ir.md>
+ir.md
+
 // IServ GmbH : https://iserv.de
 // Submitted by Mario Hoberg <info@iserv.de>
 iservschule.de
@@ -13838,6 +14027,11 @@ myjino.ru
 // Submitted by Daniel Fariña <ingenieria@jotelulu.com>
 jotelulu.cloud
 
+// JouwWeb B.V. : https://www.jouwweb.nl
+// Submitted by Camilo Sperberg <tech@webador.com>
+jouwweb.site
+webadorsite.com
+
 // Joyent : https://www.joyent.com/
 // Submitted by Brian Bennett <brian.bennett@joyent.com>
 *.triton.zone
@@ -13911,6 +14105,10 @@ lpusercontent.com
 // Submitted by Lelux Admin <publisuffix@lelux.site>
 lelux.site
 
+// Libre IT Ltd : https://libre.nz
+// Submitted by Tomas Maggio <support@libre.nz>
+runcontainers.dev
+
 // Lifetime Hosting : https://Lifetime.Hosting/
 // Submitted by Mike Fillator <support@lifetime.hosting>
 co.business
@@ -13921,10 +14119,6 @@ co.network
 co.place
 co.technology
 
-// Lightmaker Property Manager, Inc. : https://app.lmpm.com/
-// Submitted by Greg Holland <greg.holland@lmpm.com>
-app.lmpm.com
-
 // linkyard ldt: https://www.linkyard.ch/
 // Submitted by Mario Siegenthaler <mario.siegenthaler@linkyard.ch>
 linkyard.cloud
@@ -14057,6 +14251,11 @@ memset.net
 // Submitted by Ruben Schmidmeister <psl-maintainers@messerli.ch>
 messerli.app
 
+// Meta Platforms, Inc. : https://meta.com/
+// Submitted by Jacob Cordero <public-suffix@meta.com>
+atmeta.com
+apps.fbsbx.com
+
 // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
 // Submitted by Zdeněk Šustr <zdenek.sustr@cesnet.cz>
 *.cloud.metacentrum.cz
@@ -14077,10 +14276,14 @@ co.pl
 
 // Microsoft Corporation : http://microsoft.com
 // Submitted by Public Suffix List Admin <msftpsladmin@microsoft.com>
+// Managed by Corporate Domains
+// Microsoft Azure : https://home.azure
 *.azurecontainer.io
+azure-api.net
+azureedge.net
+azurefd.net
 azurewebsites.net
 azure-mobile.net
-cloudapp.net
 azurestaticapps.net
 1.azurestaticapps.net
 2.azurestaticapps.net
@@ -14094,6 +14297,10 @@ eastasia.azurestaticapps.net
 eastus2.azurestaticapps.net
 westeurope.azurestaticapps.net
 westus2.azurestaticapps.net
+cloudapp.net
+trafficmanager.net
+blob.core.windows.net
+servicebus.windows.net
 
 // minion.systems : http://minion.systems
 // Submitted by Robert Böttinger <r@minion.systems>
@@ -14107,6 +14314,10 @@ mintere.site
 // Submitted by Grayson Martin <grayson.martin@mobileeducation.us>
 forte.id
 
+// MODX Systems LLC : https://modx.com
+// Submitted by Elizabeth Southwell <elizabeth@modx.com>
+modx.dev
+
 // Mozilla Corporation : https://mozilla.com
 // Submitted by Ben Francis <bfrancis@mozilla.com>
 mozilla-iot.org
@@ -14153,6 +14364,10 @@ netlify.app
 // Submitted by Trung Tran <Trung.Tran@neustar.biz>
 4u.com
 
+// NGO.US Registry : https://nic.ngo.us
+// Submitted by Alstra Solutions Ltd. Networking Team <admin@alstra.org>
+ngo.us
+
 // ngrok : https://ngrok.com/
 // Submitted by Alan Shreve <alan@ngrok.com>
 ngrok.app
@@ -14168,18 +14383,24 @@ jp.ngrok.io
 sa.ngrok.io
 us.ngrok.io
 ngrok.pizza
+ngrok.pro
 
 // Nicolaus Copernicus University in Torun - MSK TORMAN (https://www.man.torun.pl)
 torun.pl
 
 // Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/
-// Submitted by Nicholas Ford <nick@nimbushosting.co.uk>
+// Submitted by Nicholas Ford <dev@nimbushosting.co.uk>
 nh-serv.co.uk
+nimsite.uk
 
 // NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
 // Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
 nfshost.com
 
+// NFT.Storage : https://nft.storage/
+// Submitted by Vasco Santos <vasco.santos@protocol.ai> or <support@nft.storage>
+ipfs.nftstorage.link
+
 // Noop : https://noop.app
 // Submitted by Nathaniel Schweinberg <noop@rearc.io>
 *.developer.app
@@ -14330,6 +14551,10 @@ pcloud.host
 // Submitted by Matthew Brown <mattbrown@nyc.mn>
 nyc.mn
 
+// O3O.Foundation : https://o3o.foundation/
+// Submitted by the prvcy.page Registry Team <psl@registry.prvcy.page>
+prvcy.page
+
 // Observable, Inc. : https://observablehq.com
 // Submitted by Mike Bostock <dns@observablehq.com>
 static.observableusercontent.com
@@ -14359,7 +14584,6 @@ omniwe.site
 123minsida.se
 123miweb.es
 123paginaweb.pt
-123sait.ru
 123siteweb.fr
 123webseite.at
 123webseite.de
@@ -14377,6 +14601,13 @@ simplesite.pl
 // Submitted by Eddie Jones <eddie@onefoldmedia.com>
 nid.io
 
+// Open Domains : https://open-domains.net
+// Submitted by William Harrison <admin@open-domains.net>
+is-cool.dev
+is-not-a.dev
+localplayer.dev
+is-local.org
+
 // Open Social : https://www.getopensocial.com/
 // Submitted by Alexander Varwijk <security@getopensocial.com>
 opensocial.site
@@ -14397,6 +14628,11 @@ operaunite.com
 // Submitted by Alexandre Linte <alexandre.linte@orange.com>
 tech.orange
 
+// OsSav Technology Ltd. : https://ossav.com/
+// TLD Nic: http://nic.can.re - TLD Whois Server: whois.can.re
+// Submitted by OsSav Technology Ltd. <support@ossav.com>
+can.re
+
 // Oursky Limited : https://authgear.com/, https://skygear.io/
 // Submitted by Authgear Team <hello@authgear.com>, Skygear Developer <hello@skygear.io>
 authgear-staging.com
@@ -14447,10 +14683,11 @@ pagexl.com
 
 // pcarrier.ca Software Inc: https://pcarrier.ca/
 // Submitted by Pierre Carrier <pc@rrier.ca>
-bar0.net
-bar1.net
-bar2.net
-rdv.to
+*.xmit.co
+xmit.dev
+srv.us
+gh.srv.us
+gl.srv.us
 
 // .pl domains (grandfathered)
 art.pl
@@ -14483,7 +14720,8 @@ on-web.fr
 
 // Platform.sh : https://platform.sh
 // Submitted by Nikola Kotur <nikola@platform.sh>
-bc.platform.sh
+*.upsun.app
+upsunapp.com
 ent.platform.sh
 eu.platform.sh
 us.platform.sh
@@ -14502,6 +14740,10 @@ pdns.page
 plesk.page
 pleskns.com
 
+// Pley AB : https://www.pley.com/
+// Submitted by Henning Pohl <infra@pley.com>
+pley.games
+
 // Port53 : https://port53.io/
 // Submitted by Maximilian Schieder <maxi@zeug.co>
 dyn53.io
@@ -14533,10 +14775,6 @@ xen.prgmr.com
 // Submitted by registry <lendl@nic.at>
 priv.at
 
-// privacytools.io : https://www.privacytools.io/
-// Submitted by Jonah Aragon <jonah@privacytools.io>
-prvcy.page
-
 // Protocol Labs : https://protocol.ai/
 // Submitted by Michael Burns <noc@protocol.ai>
 *.dweb.link
@@ -14578,6 +14816,8 @@ qbuser.com
 // Rad Web Hosting: https://radwebhosting.com
 // Submitted by Scott Claeys <s.claeys@radwebhosting.com>
 cloudsite.builders
+myradweb.net
+servername.us
 
 // Redgate Software: https://red-gate.com
 // Submitted by Andrew Farries <andrew.farries@red-gate.com>
@@ -14601,9 +14841,12 @@ qcx.io
 *.sys.qcx.io
 
 // QNAP System Inc : https://www.qnap.com
-// Submitted by Nick Chang <nickchang@qnap.com>
-dev-myqnapcloud.com
+// Submitted by Nick Chang <cloudadmin@qnap.com>
+myqnapcloud.cn
 alpha-myqnapcloud.com
+dev-myqnapcloud.com
+mycloudnas.com
+mynascloud.com
 myqnapcloud.com
 
 // Quip : https://quip.com
@@ -14644,11 +14887,40 @@ app.render.com
 onrender.com
 
 // Repl.it : https://repl.it
-// Submitted by Lincoln Bergeson <lincoln@replit.com>
+// Submitted by Lincoln Bergeson <psl@repl.it>
+replit.app
+id.replit.app
 firewalledreplit.co
 id.firewalledreplit.co
 repl.co
 id.repl.co
+replit.dev
+archer.replit.dev
+bones.replit.dev
+canary.replit.dev
+global.replit.dev
+hacker.replit.dev
+id.replit.dev
+janeway.replit.dev
+kim.replit.dev
+kira.replit.dev
+kirk.replit.dev
+odo.replit.dev
+paris.replit.dev
+picard.replit.dev
+pike.replit.dev
+prerelease.replit.dev
+reed.replit.dev
+riker.replit.dev
+sisko.replit.dev
+spock.replit.dev
+staging.replit.dev
+sulu.replit.dev
+tarpit.replit.dev
+teams.replit.dev
+tucker.replit.dev
+wesley.replit.dev
+worf.replit.dev
 repl.run
 
 // Resin.io : https://resin.io
@@ -14745,10 +15017,11 @@ from.tv
 sakura.tv
 
 // Salesforce.com, Inc. https://salesforce.com/
-// Submitted by Michael Biven <mbiven@salesforce.com>
+// Submitted by Michael Biven <mbiven@salesforce.com> and Aaron Romeo <aaron.romeo@salesforce.com>
 *.builder.code.com
 *.dev-builder.code.com
 *.stg-builder.code.com
+*.001.test.code-builder-stg.platform.salesforce.com
 
 // Sandstorm Development Group, Inc. : https://sandcats.io/
 // Submitted by Asheesh Laroia <asheesh@sandstorm.io>
@@ -14764,6 +15037,7 @@ logoip.com
 fr-par-1.baremetal.scw.cloud
 fr-par-2.baremetal.scw.cloud
 nl-ams-1.baremetal.scw.cloud
+cockpit.fr-par.scw.cloud
 fnc.fr-par.scw.cloud
 functions.fnc.fr-par.scw.cloud
 k8s.fr-par.scw.cloud
@@ -14774,11 +15048,13 @@ whm.fr-par.scw.cloud
 priv.instances.scw.cloud
 pub.instances.scw.cloud
 k8s.scw.cloud
+cockpit.nl-ams.scw.cloud
 k8s.nl-ams.scw.cloud
 nodes.k8s.nl-ams.scw.cloud
 s3.nl-ams.scw.cloud
 s3-website.nl-ams.scw.cloud
 whm.nl-ams.scw.cloud
+cockpit.pl-waw.scw.cloud
 k8s.pl-waw.scw.cloud
 nodes.k8s.pl-waw.scw.cloud
 s3.pl-waw.scw.cloud
@@ -14800,6 +15076,10 @@ service.gov.scot
 // Submitted by Shante Adam <shante@skyhat.io>
 scrysec.com
 
+// Scrypted : https://scrypted.app
+// Submitted by Koushik Dutta <public-suffix-list@scrypted.app>
+client.scrypted.io
+
 // Securepoint GmbH : https://www.securepoint.de
 // Submitted by Erik Anders <erik.anders@securepoint.de>
 firewall-gateway.com
@@ -14839,6 +15119,10 @@ biz.ua
 co.ua
 pp.ua
 
+// Sheezy.Art : https://sheezy.art
+// Submitted by Nyoom <admin@sheezy.art>
+sheezy.games
+
 // Shift Crypto AG : https://shiftcrypto.ch
 // Submitted by alex <alex@shiftcrypto.ch>
 shiftcrypto.dev
@@ -14887,7 +15171,7 @@ alpha.bounty-full.com
 beta.bounty-full.com
 
 // Smallregistry by Promopixel SARL: https://www.smallregistry.net
-// Former AFNIC's SLDs 
+// Former AFNIC's SLDs
 // Submitted by Jérôme Lipowicz <support@promopixel.com>
 aeroport.fr
 avocat.fr
@@ -14909,9 +15193,9 @@ small-web.org
 vp4.me
 
 // Snowflake Inc : https://www.snowflake.com/
-// Submitted by Faith Olapade <faith.olapade@snowflake.com>
-snowflake.app
-privatelink.snowflake.app
+// Submitted by Sam Haar <psl@snowflake.com>
+*.snowflake.app
+*.privatelink.snowflake.app
 streamlit.app
 streamlitapp.com
 
@@ -14923,10 +15207,24 @@ try-snowplow.com
 // Submitted by Drew DeVault <sir@cmpwn.com>
 srht.site
 
+// StackBlitz : https://stackblitz.com
+// Submitted by Dominic Elm <hello@stackblitz.com>
+w-corp-staticblitz.com
+w-credentialless-staticblitz.com
+w-staticblitz.com
+
 // Stackhero : https://www.stackhero.io
 // Submitted by Adrien Gillon <adrien+public-suffix-list@stackhero.io>
 stackhero-network.com
 
+// STACKIT : https://www.stackit.de/en/
+// Submitted by STACKIT-DNS Team (Simon Stier) <stackit-dns@mail.schwarz>
+runs.onstackit.cloud
+stackit.gg
+stackit.rocks
+stackit.run
+stackit.zone
+
 // Staclar : https://staclar.com
 // Submitted by Q Misell <q@staclar.com>
 musician.io
@@ -14993,6 +15291,19 @@ myspreadshop.co.uk
 // Submitted by Jacob Lee <jacob@stdlib.com>
 api.stdlib.com
 
+// stereosense GmbH : https://www.involve.me
+// Submitted by Florian Burmann <publicsuffix@involve.me>
+feedback.ac
+forms.ac
+assessments.cx
+calculators.cx
+funnels.cx
+paynow.cx
+quizzes.cx
+researched.cx
+tests.cx
+surveys.so
+
 // Storipress : https://storipress.com
 // Submitted by Benno Liu <benno@storipress.com>
 storipress.app
@@ -15001,6 +15312,12 @@ storipress.app
 // Submitted by Philip Hutchins <hostmaster@storj.io>
 storj.farm
 
+// Streak : https://streak.com
+// Submitted by Blake Kadatz <eng@streak.com>
+streak-link.com
+streaklinks.com
+streakusercontent.com
+
 // Studenten Net Twente : http://www.snt.utwente.nl/
 // Submitted by Silke Hofstra <syscom@snt.utwente.nl>
 utwente.io
@@ -15063,6 +15380,7 @@ taifun-dns.de
 // Submitted by David Anderson <danderson@tailscale.com>
 beta.tailscale.net
 ts.net
+*.c.ts.net
 
 // TASK geographical domains (www.task.gda.pl/uslugi/dns)
 gda.pl
@@ -15196,6 +15514,10 @@ inc.hk
 // Submitted by ITComdomains <to@it.com>
 it.com
 
+// Unison Computing, PBC : https://unison.cloud
+// Submitted by Simon Højberg <security@unison.cloud>
+unison-services.cloud
+
 // UNIVERSAL DOMAIN REGISTRY : https://www.udr.org.yt/
 // see also: whois -h whois.udr.org.yt help
 // Submitted by Atanunu Igbunuroghene <publicsuffixlist@udr.org.yt>
@@ -15245,48 +15567,6 @@ v-info.info
 // Submitted by Nathan van Bakel <info@voorloper.com>
 voorloper.cloud
 
-// Voxel.sh DNS : https://voxel.sh/dns/
-// Submitted by Mia Rehlinger <dns@voxel.sh>
-neko.am
-nyaa.am
-be.ax
-cat.ax
-es.ax
-eu.ax
-gg.ax
-mc.ax
-us.ax
-xy.ax
-nl.ci
-xx.gl
-app.gp
-blog.gt
-de.gt
-to.gt
-be.gy
-cc.hn
-blog.kg
-io.kg
-jp.kg
-tv.kg
-uk.kg
-us.kg
-de.ls
-at.md
-de.md
-jp.md
-to.md
-indie.porn
-vxl.sh
-ch.tc
-me.tc
-we.tc
-nyan.to
-at.vg
-blog.vu
-dev.vu
-me.vu
-
 // V.UA Domain Administrator : https://domain.v.ua/
 // Submitted by Serhii Rostilo <sergey@rostilo.kiev.ua>
 v.ua
@@ -15299,6 +15579,11 @@ v.ua
 // Submitted by Masayuki Note <masa@blade.wafflecell.com>
 wafflecell.com
 
+// Webflow, Inc. : https://www.webflow.com
+// Submitted by Webflow Security Team <security@webflow.com>
+webflow.io
+webflowtest.io
+
 // WebHare bv: https://www.webhare.com/
 // Submitted by Arnold Hendriks <info@webhare.com>
 *.webhare.dev
@@ -15310,6 +15595,10 @@ reserve-online.com
 bookonline.app
 hotelwithflight.com
 
+// WebWaddle Ltd: https://webwaddle.com/
+// Submitted by Merlin Glander <hostmaster@webwaddle.com>
+*.wadl.top
+
 // WeDeploy by Liferay, Inc. : https://www.wedeploy.com
 // Submitted by Henrique Vicente <security@wedeploy.com>
 wedeploy.io
@@ -15418,6 +15707,10 @@ noho.st
 za.net
 za.org
 
+// ZAP-Hosting GmbH & Co. KG : https://zap-hosting.com
+// Submitted by Julian Alker <security@zap-hosting.com>
+zap.cloud
+
 // Zine EOOD : https://zine.bg/
 // Submitted by Martin Angelov <martin@zine.bg>
 bss.design
diff --git a/src/java.base/share/legal/public_suffix.md b/src/java.base/share/legal/public_suffix.md
index 493f3b1680d..02481558af6 100644
--- a/src/java.base/share/legal/public_suffix.md
+++ b/src/java.base/share/legal/public_suffix.md
@@ -11,7 +11,7 @@ If you do not wish to use the Public Suffix List, you may remove the
 
 The Source Code of this file is available under the
 Mozilla Public License, v. 2.0 and is located at
-https://raw.githubusercontent.com/publicsuffix/list/b5bf572c52988dbe9d865b8f090ea819024a9936/public_suffix_list.dat.
+https://raw.githubusercontent.com/publicsuffix/list/1cbd6e71a9b83620b1d0b11e49d3d9ff48c27e22/public_suffix_list.dat.
 If a copy of the MPL was not distributed with this file, you can obtain one
 at https://mozilla.org/MPL/2.0/.
 
diff --git a/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
index 74045b533c2..904f672ba40 100644
--- a/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
+++ b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8228969 8244087 8255266 8302182
+ * @bug 8228969 8244087 8255266 8302182 8331864
  * @modules java.base/sun.security.util
  * @summary unit test for RegisteredDomain
  */
diff --git a/test/jdk/sun/security/util/RegisteredDomain/tests.dat b/test/jdk/sun/security/util/RegisteredDomain/tests.dat
index 280e66ff93b..7fe95c979ea 100644
--- a/test/jdk/sun/security/util/RegisteredDomain/tests.dat
+++ b/test/jdk/sun/security/util/RegisteredDomain/tests.dat
@@ -161,6 +161,17 @@ site.ai.vn              ai.vn           site.ai.vn
 foo.السعودية            السعودية        foo.السعودية
 w.foo.السعودية          السعودية        foo.السعودية
 
+# newGTLDs
+
+# This is not a GTLD
+www.site.unknown        www.site.unknown    null
+
+# GTLD added in 1cbd6e7
+www.site.wed            wed                 site.wed
+
+# GTLD removed in 1cbd6e7
+www.site.oldnavy        www.site.oldnavy    null
+
 # Microsoft
 1.azurestaticapps.net         1.azurestaticapps.net       null
 app.1.azurestaticapps.net     1.azurestaticapps.net       app.1.azurestaticapps.net

From 8af606fb8cdb3a6ecdfe4cddd79f228b64d5fc80 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 8 May 2024 01:12:17 +0000
Subject: [PATCH 354/486] 8331334:
 com/sun/net/httpserver/HttpsParametersClientAuthTest.java fails in
 testServerNeedClientAuth(false)

Reviewed-by: dfuchs
---
 .../httpserver/HttpsParametersClientAuthTest.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
index ded0474071b..291b74f2669 100644
--- a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
+++ b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
@@ -50,6 +50,7 @@ import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsParameters;
 import com.sun.net.httpserver.HttpsServer;
+import jdk.internal.util.OperatingSystem;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
 import org.junit.jupiter.api.Test;
@@ -68,12 +69,14 @@ import static org.junit.jupiter.api.Assertions.fail;
  * @bug 8326381
  * @summary verifies that the setNeedClientAuth() and setWantClientAuth()
  *          methods on HttpsParameters class work as expected
+ * @modules java.base/jdk.internal.util
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.test.lib.net.URIBuilder
  * @run junit HttpsParametersClientAuthTest
  */
 public class HttpsParametersClientAuthTest {
 
+    private static final boolean IS_WINDOWS = OperatingSystem.isWindows();
     private static final AtomicInteger TID = new AtomicInteger();
     private static final ThreadFactory SRV_THREAD_FACTORY = (r) -> {
         final Thread t = new Thread(r);
@@ -220,9 +223,11 @@ public class HttpsParametersClientAuthTest {
                             throw ioe;
                         }
                         // verify it failed due to right reason
-                        Throwable cause = ioe;
+                        Throwable cause = ioe.getCause();
                         while (cause != null) {
-                            // either of SocketException or SSLHandshakeException are OK
+                            // either of SocketException or SSLHandshakeException are OK.
+                            // additionally on Windows we accept even IOException
+                            // (caused by WSAECONNABORTED)
                             if (cause instanceof SocketException se) {
                                 final String msg = se.getMessage();
                                 assertTrue(msg != null && msg.contains("Connection reset"),
@@ -235,6 +240,12 @@ public class HttpsParametersClientAuthTest {
                                         "unexpected message in SSLHandshakeException: " + msg);
                                 System.out.println("received the expected exception: " + she);
                                 break;
+                            } else if (IS_WINDOWS && cause instanceof IOException winIOE) {
+                                // on Windows we sometimes receive this exception, which is
+                                // acceptable
+                                System.out.println("(windows) received the expected exception: "
+                                        + winIOE);
+                                break;
                             }
                             cause = cause.getCause();
                         }

From 466a21d8646c05d91f29d607c6347afd34c75629 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Wed, 8 May 2024 05:03:06 +0000
Subject: [PATCH 355/486] 8331863: DUIterator_Fast used before it is
 constructed

Reviewed-by: kvn, shade
---
 src/hotspot/share/opto/node.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index bb58c2ff8ce..04631dcbae2 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1569,8 +1569,8 @@ Node* Node::last_out(DUIterator_Last& i) const {
 class SimpleDUIterator : public StackObj {
  private:
   Node* node;
-  DUIterator_Fast i;
   DUIterator_Fast imax;
+  DUIterator_Fast i;
  public:
   SimpleDUIterator(Node* n): node(n), i(n->fast_outs(imax)) {}
   bool has_next() { return i < imax; }

From 7b79426a1da5896b0f00cf6e5fb4d2e754149e54 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Wed, 8 May 2024 05:48:07 +0000
Subject: [PATCH 356/486] 8278353: Provide Duke as default favicon in Simple
 Web Server

Reviewed-by: dfuchs
---
 make/modules/jdk.httpserver/Java.gmk          |   4 +-
 .../simpleserver/FileServerHandler.java       |  41 +++++++++++-
 .../simpleserver/resources/favicon.ico        | Bin 0 -> 15086 bytes
 .../simpleserver/SimpleFileServerTest.java    |  63 +++++++++++++++++-
 4 files changed, 104 insertions(+), 4 deletions(-)
 create mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/favicon.ico

diff --git a/make/modules/jdk.httpserver/Java.gmk b/make/modules/jdk.httpserver/Java.gmk
index d7b2b2f70ca..799ff8695a7 100644
--- a/make/modules/jdk.httpserver/Java.gmk
+++ b/make/modules/jdk.httpserver/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,3 +24,5 @@
 #
 
 DISABLED_WARNINGS_java += missing-explicit-ctor this-escape
+
+COPY += .ico
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
index 6d217174fdd..81ddb58eecf 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,9 @@ public final class FileServerHandler implements HttpHandler {
     private static final List<String> SUPPORTED_METHODS = List.of("HEAD", "GET");
     private static final List<String> UNSUPPORTED_METHODS =
             List.of("CONNECT", "DELETE", "OPTIONS", "PATCH", "POST", "PUT", "TRACE");
+    private static final String FAVICON_RESOURCE_PATH =
+            "/sun/net/httpserver/simpleserver/resources/favicon.ico";
+    private static final String FAVICON_LAST_MODIFIED = "Mon, 23 May 1995 11:11:11 GMT";
 
     private final Path root;
     private final UnaryOperator<String> mimeTable;
@@ -250,6 +253,31 @@ public final class FileServerHandler implements HttpHandler {
         return Files.exists(html) ? html : Files.exists(htm) ? htm : null;
     }
 
+    private static boolean isFavIconRequest(HttpExchange exchange) {
+        return "/favicon.ico".equals(exchange.getRequestURI().getPath());
+    }
+
+    private void serveDefaultFavIcon(HttpExchange exchange, boolean writeBody)
+            throws IOException
+    {
+        var respHdrs = exchange.getResponseHeaders();
+        try (var stream = getClass().getModule().getResourceAsStream(FAVICON_RESOURCE_PATH)) {
+            var bytes = stream.readAllBytes();
+            respHdrs.set("Content-Type", "image/x-icon");
+            respHdrs.set("Last-Modified", FAVICON_LAST_MODIFIED);
+            if (writeBody) {
+                exchange.sendResponseHeaders(200, bytes.length);
+                try (OutputStream os = exchange.getResponseBody()) {
+                    os.write(bytes);
+                }
+            } else {
+                respHdrs.set("Content-Length", Integer.toString(bytes.length));
+                exchange.sendResponseHeaders(200, -1);
+            }
+        }
+    }
+
+
     private void serveFile(HttpExchange exchange, Path path, boolean writeBody)
         throws IOException
     {
@@ -371,17 +399,26 @@ public final class FileServerHandler implements HttpHandler {
         assert List.of("GET", "HEAD").contains(exchange.getRequestMethod());
         try (exchange) {
             discardRequestBody(exchange);
+            boolean isHeadRequest = exchange.getRequestMethod().equals("HEAD");
             Path path = mapToPath(exchange, root);
             if (path != null) {
                 exchange.setAttribute("request-path", path.toString());  // store for OutputFilter
                 if (!Files.exists(path) || !Files.isReadable(path) || isHiddenOrSymLink(path)) {
                     handleNotFound(exchange);
-                } else if (exchange.getRequestMethod().equals("HEAD")) {
+                } else if (isHeadRequest) {
                     handleHEAD(exchange, path);
                 } else {
                     handleGET(exchange, path);
                 }
             } else {
+                if (isFavIconRequest(exchange)) {
+                    try {
+                        serveDefaultFavIcon(exchange, !isHeadRequest);
+                        return;
+                    } catch (IOException ignore) {
+                        // fall through to send the not-found response
+                    }
+                }
                 exchange.setAttribute("request-path", "could not resolve request URI path");
                 handleNotFound(exchange);
             }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/favicon.ico b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f24905abf621fae487224136f14656387d19fc7a
GIT binary patch
literal 15086
zcmeHO33OED6@D=ZAz(7u$vQLH_hhn>gsdXFh=K-bi4+lw5kz*iSXKpTK$ap9tWrP<
z3W7vdA%Le;fl?@>wy6Y2SQ;P(hAjk=%<XsI%o`_@$z)~-r|mg?=X`VD``>?;e|i6M
z?>~ZIC)f)rl>n*~HiZj9cR>)8O5L-YAe=**8z{ej)j<&EAwv}MfJGPyaJqPfY03Y8
z|MzMjSQ%#T?d==p<=HLT-!G_hN0b0E9sGO)d;4|^cquSY;nfi`+mfM>hYZQ;kz4&_
z&)!!<g2Puqr*B(%Elm&bmydkvsX^CYe)$!Oh=?xn@%D4Fl-Ig^k2xkLByanA?>?%j
zsiE1k=V~G&V)j5^qIGh9%I)Lh_hg^m{Vtc6|Bck@n^agh;s)9_=cgPUcjsX5<c4}b
ze&NCe;_KeM23qsU?<q4g`>d~Tz-!%n{4si1exclH-P1D4_wU;;%HtoFhc=#RxfIKD
zIy!Xr?ALd|X|8+e(r7ev;x8v?%$TAFQBkpFu<2Qp<8gCR@!pB^rKM*4{fjMIiDgLF
zpZ|QEl9N)mgWu7djP~9s6`}S(7r;)+i~9HI-K*cp%a<=p>h$#P-Mdt}y_ALx8-5pk
zYA<Yj#nZzl&cof?8*m2#@SKYNGCDLQV(W853T_=ZaIl5#EbP*yOVqnp-&36&ojoPJ
zwousJ57-SvO8j<$L)V<_yu+21m3q64Z`5iv?cA}GCQg{t+_&$5Yv>=}rzEGH?2(ys
zX3*2m-k3CTO7rH;Td20S)|gd%zIpQ&4J{aUv5T`yh@{sR3cCvd4KUh(-(HoNyyfW8
zV<vSQCN?!S(Y0&WsNx?LR9;?AXV0Fc8#iuHb91v{wpRBI4Gn~GsLthaH><}4*lNdM
zdqMjEjlkOm_6unH;;mb^wbI*B30&^i$Bn-wbM?qH)Z5-Y?92l`0#*XyKrV0}n8m!H
zj)1?PU*Lof7A^kigX<{6b#l0UCQX`h*G=Y`+n&va?_t}k0NYEzx4=5x{bo>C;8(!;
zzyQVHUMm{c*won6!Io>q@mMrv^3-~FH?Mp{``WvQZ8G3p;0nNHkWi2NGN6vr<UzsI
zw@-hntE+n?_H+GDcw^EX)PHt+HXFZ(eV)Js$yT=40QYcz1anJ;Dlz5CsZ*yPiT$>I
zzp!l)a00jq@VH}W`vW}B1KeQ0Kh`~qH-En6k=TFz`gIyS__^~KKjp^tYwj7g-2wgu
zYzImKwpl8}KHR%X{Fpn3&6z#-k$eD^XDTTtJO5h;`_3+sK1(R<>jgvt4uA)+7T_{*
z8MXk}5os@17x(zW;UliyxpSw(+u$JP<d~TF_0XiB_a(j7P}uu8z-4F#rWx`&b?Pe1
z&B;I7);!E(_!-nA&l5|RE~EG7FQ6q$meOaNKBp5WPSCAex7sZCs+A=?M*Imn{S9^6
zat|54z&F5rV}7i0R`1@myOkX^HCK3DP3hg!DL6Qc<bmNN4~PVfKs$z0TwFXA6bz+p
z+rA|JRt+yM_qegIQ&6CS+kA?#PFtQKhv&1effjo$-Yd<Yzo5lD_T!H~(x_3RVQUyg
z_zs{1&uNq_TSO_Y%Ymho<n}Jbc@<HJZyrU2$5L_eLb`wdzP<=ouU;jr&&4rXr&DH&
z&4xUXGXl5>BpIe-d{zy6;per6ePQK_Riu<h!R|?v?)(L1cHXJOju!XnT|T2Y&+!x;
zkwkm;>=Es6Y-|+!TU2Ch6Lj$y_(xzOU~j0`+I#Txx4anm5-0*f0auKp#nI7m4;C)`
zfX<(<68BDn2M?i0@1d08yqz*Se`N+c@UE01Jzu0(M!!P4&<~4V9ZLxbNgBvq2>EG%
zAFu)#Vy(@_`5}YHq&R@>p98!Ps1=G3Vq|CKVa@dhsS;C3<u+HWYxDMhCFV(%6;ni5
z9Qsle`n;0&UA2&_Z)e=AfUkgfW1DP!hAb{i0Pq&D0Z_~3!J__P^qmyhVy*p7rIZe|
zRSxc3DY7NRJWA97<S-5ZT@7u+^J@T)-yVkP9dQqt&cF^pr$3xj?sG)@dv)7Qy?u96
zMjK^d`x8Chmh6`3uZ-=2Y#zrq0mXo)JV@yn;2*?w7z1RZ%{m$LSn~`SzXY`F4P`Jz
z`3$3{L-*3LvRbM*sit{Fr>IAl*55+9^A?Kqe~Ogg0YBq9kZwvh(vyH6fbyuwm>mi6
zs#4f}0poKm_9Is96O83UW(ZITzy|b#pcu*vdykIn)9w#XeOE`^7E(K8cIIz)JH>mw
zLBR^16Qs5a<uyu+z9Z>EI`6}I9wN*;^hAD7%F4{9oUEMY=&0EDy}W#F_7_2>9k85b
zYY{@hK?#%}_a;pnzK?#<;}B&!v(0D&=dG0LQbMslBVl`se$Tw)C3}r2-gO4{v;6R|
zNXkghq}Z5v3JZ;7z6(IKF^@IR;LiorfW8b0IqrSCQ-sg66yx(E#dP~Q`b&Qb2~r`C
z{(IHs54~j02E5}s`k3WMghyk2mrLkF6c?Mo<tfG3WtHE_xNMNi-!ZRQC42Pc5c@ax
zaS5$$=e+!Vn)UbK{XpP0_aE*%@DWjJavDWP#mzOg$ChWv9tKGJPor`em#f7y&$or`
z=|mp>2ELArh^AgWdr=DPkBN@sHP(mi@mlg8vU%^u`(|rw=e#_wDB9D3Jlu!Y1Kjs3
zhdeuY&Wpnfi&9h4IxLz2**unVeOglnULUr*)<+&5^LcN@vOA>Cjq40@y#QW!S!(}X
z<n3=P$J8_OxdX>_vbh{)zZX+7EJ=ghp#b|VEGffx$medMTwc?OJ`m7(mhjk;2eNrA
z+6Y);f2;LETRI^x9@qu&nk%@id>xSv`6&R;E9S~jgZBy6=tF*<#~y0EW2rvqnF5&m
zmfIckE!FiX^1*gDz+i3KqAhryD0mclJ5nZW<ZrGTFz!d}C-dn@U5`o@?0gkq-=kp}
zW;`l=9W57j^LSKZU_bl#tom*{+9qq|!Cu~P9@Ld#EvVj?XRWONRDRf;3>*b4ns5J8
zcAC=*+rt2pdn|K&|9|)2Ujtevq#(4S7l{;v^lwNb(nHjwrFji9PCq28V%m5}5KPgM
zDsB4gSy~Dr=0mbbg^@a{)>5^O-q+D4i8cs=6ZB{#IzbQuME!!0!xZVcOq&E@#!OI+
zAk4JaQLN7SnV51OiO%NdS#~5*c&UjF+0kN=+G}Z*M4f02r>mVr8Pp(AnfAF!M^R0z
zgR4uVs6H({sH0?x@;NOfkPqn3X}RIyf9UGk#nlhz4uW9vW7e4M?d2N<e|iSaIH1LB
zyC5SFF`Yk-e|<t_Y)ryvNU><0iCC5j@!aya-<p0Ee$<|}X%_^Xq3VTr%ROAQdi6(l
zva@oRAqE$0PM(ufmtfd@@Z7m`@L`{)X9f*kWiG$DckoL*y=V8H2k2bHagf7@|D+i=
zcKqMt;}R!2b#hjKSE^fX8+V-d>W{NVhyVK5Q_O<1K=)|MlxausP9Ntprw{W0`xC|h
zVw?yu&EDI;ENu~x;j<h&ckXJMJb7y6z=6+vo}d5ZhXeW#+%S6dFORQWS#tZr1q?0*
z*TUjO=W)hFZceZC4tjZg%=^D*I1OiGRG)mj#$-^N<3txPUZjeO3aYBArrWn~w>me&
zW}w}!AvPE*=`cm1uMhAVz;hw{t6v1{aNZ*cajP?2_qJYZ*RJQYU&*HQN@>tF3*i0n
zG2j}&YrA*gLpxva{0k`BZClmT`gNbG@g1c|x=c~%@&?`oq&<2g?r$RoP?3?5b>-~Y
zb2jV$X!Y-Eaqc9}lwK(fx;PeB0o($3P0sPr1vr=C6&sr{rfh$iO%1^377))n13dwf
zE>je`rU5;HQ2_6O*>9T4d2wbVv7}_R>4QzE71m*R*37V?I2Ju_-1u)G#-jBVbh1C}
z7XbTY`1|I|ZR*rFkMXxGT`YIkuAMYv#ta%eb{tKfJeih%xSUR&JV6|@ldkIOYRb#&
zS&8v5Mk}iQU+CriJo_W`F@Pb1pI=p7tvz3O^X5&OI%OI~EAuJRV+6&>5HoZeOOakL
zP)b~1TDJ7J`uJyA*#XfvjCj~P?Q8xi2Xu3L%mu`AtBAc%m(E9R+_aIR{GX<@t~ld}
zxPcVUWM6zrm*0^pxPbQV-Ak2~X9@F0J>uSnAm;-BC#NmDkk<tm1n@rbCB#L};9Mb1
zpZ;rlp`efwUFK1y)2>!=FiuNyT}b)4ec{jVfqooP2K_vy`2aHjsZA|11o<5Se_%M5
zBPd9T*jfywxGblPPCKZ3r<U<JG5+TITf|$U5jPZLK+`2fkiqc)u2ZouqD&4LUo4tW
zSqAui24GwWqeRcQ5rZnHPv-wX1LS-4F+tWJ?>T|LU&aj}!$3dx?KgqXFqgj*9u~C*
zv5sO;i{dok<9aCPI7L`M51Ko%lumtnoknIJrtXf~_))TK0fh#oa=o+uGN8qoQ9M6^
zzF5z33XZoVCM4DH9530}9tA&-k)r%Cc?zY5j3SlSG%>aw-EAm^$P*;ptRJh{mKV~J
zpuZ0DHzlc3IBs<t`k!x^tL-Q7s{kIKL_G=xw=v49Wa#d-b<h5QR&yTGx}e>+s}hnZ
zEj68EH5Wre!p)A&hSq@J0aycY`OIMp-ka=ODE~CXE1L6i^Y><F<;;RT;x}%n$J{;S
zazB=QzNTzo|KNzWWZ>N#Kn=aBw(^)u2QSybD!`O(PUCsZ<a!6`%=-m!1+Y232i{nq
z5-?@MvbO9;ejZOo1BJjt`CGt04tM|<+Q9So6K(15$aLu8F`DbrP(Oe3R-G|>7@MFg
z0r){@g9fzdVdUAu3!OYJ-vQ15N?T++3=ed2pXT-JyoZtVFuc&+73lD@BoAYgHN4V#
zO*8X8JPc~m$f`uw#&x(H82C_W7Qn8L8sMG|jkAQAB-p{-VSk<u*<S^!>5x-3Rf)Js
zYFUj4cy-vrBSMo0brNuki~SVrmQVtEKSevELuhD(8^&^zV>e>C-k9Ueo;92|@BJC;
z)_r;a|9Rju#nL`jz#7N1WYy}8D^{#phxAr+2--Oi=`QQnf4Z92!N-sP<?50p%T^W@
zjr|$Uh>zK@;SYQ2>aNp~BS(M0{MNz-@FoIpz$cNlU_tR>{(lBvOfOx!+>En&ng<WW
z?KYi0U0&0tPyYz$(qG_R4qSkZ`|<7s&Na3;D<}%n{V+eyWE=DI8t^FQo{c@9=+)=@
z@4x?%vuiZXR9}AwXCLeNNtA%S{y(uk@Y5^D4R{{|xC~?9mvK9A;NY?P`n$Ap**Yp5
zG?PXZ%%u%$w^76W1}gr|!dmQI^y@E44tRME=!^fNWW6-<<!_fRUO{Qz^C|hUEtKlG
znR)~i)AYAy(^CTmuE&3{1|n}Oj}_AFmC8_eoO>z?k;m5$i20a?CmqIlp52t}vXm5o
z(Q1GHfDEi{x&b3`CgC}pF>193#@fY09u)Fje&$db(XWJ5viB&$zaPf)kOR;mj^jAX
zup|-dwU}t}{H;_BJw?8Wyw+6&h2#89IP>y+Fj>j~{ll=%yO@-iJV{D3q{u4=P6N_B
z!s{#j**e@8zz_27l10VrV=;Ll&&xmqz%n)g`Zzl76%3P%x<tI^@r(CdyzjOt1_-`L
zfY&A6%;{?D9r$>C?#i^SJnZAVcTy0l;Y+QOAs4U&Q0vfuQa1PsLKFV!#?a&eGci~(
HND%%FA}!mI

literal 0
HcmV?d00001

diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
index b3134640925..3206b62188a 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,6 +76,8 @@ public class SimpleFileServerTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
+    static final String EXPECTED_LAST_MODIFIED_OF_FAVICON = "Mon, 23 May 1995 11:11:11 GMT";
+
     @BeforeTest
     public void setup() throws IOException {
         if (ENABLE_LOGGING) {
@@ -142,6 +144,65 @@ public class SimpleFileServerTest {
         }
     }
 
+    @Test
+    public void testFavIconGET() throws Exception {
+        var root = Files.createDirectory(TEST_DIR.resolve("testFavIconGET"));
+
+        var server = SimpleFileServer.createFileServer(LOOPBACK_ADDR, root, OutputLevel.VERBOSE);
+        server.start();
+        try {
+            // expect built-in icon
+            var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
+            var request = HttpRequest.newBuilder(uri(server, "favicon.ico")).build();
+            var response = client.send(request, BodyHandlers.ofString());
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.headers().firstValue("content-type").get(), "image/x-icon");
+            assertEquals(response.headers().firstValue("last-modified").get(), EXPECTED_LAST_MODIFIED_OF_FAVICON);
+
+            // expect custom (and broken) icon
+            var file = Files.writeString(root.resolve("favicon.ico"), "broken icon", CREATE);
+            try {
+                var lastModified = getLastModified(file);
+                var expectedLength = Long.toString(Files.size(file));
+                response = client.send(request, BodyHandlers.ofString());
+                assertEquals(response.statusCode(), 200);
+                assertEquals(response.headers().firstValue("content-type").get(), "application/octet-stream");
+                assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
+                assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
+            } finally {
+                Files.delete(file);
+            }
+
+            // expect built-in icon
+            response = client.send(request, BodyHandlers.ofString());
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.headers().firstValue("content-type").get(), "image/x-icon");
+            assertEquals(response.headers().firstValue("last-modified").get(), EXPECTED_LAST_MODIFIED_OF_FAVICON);
+        } finally {
+            server.stop(0);
+        }
+    }
+
+    @Test
+    public void testFavIconHEAD() throws Exception {
+        var root = Files.createDirectory(TEST_DIR.resolve("testFavIconHEAD"));
+
+        var server = SimpleFileServer.createFileServer(LOOPBACK_ADDR, root, OutputLevel.VERBOSE);
+        server.start();
+        try {
+            var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
+            var request = HttpRequest.newBuilder(uri(server, "favicon.ico"))
+                    .method("HEAD", BodyPublishers.noBody()).build();
+            var response = client.send(request, BodyHandlers.ofString());
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.headers().firstValue("content-type").get(), "image/x-icon");
+            assertEquals(response.headers().firstValue("last-modified").get(), EXPECTED_LAST_MODIFIED_OF_FAVICON);
+            assertEquals(response.body(), "");
+        } finally {
+            server.stop(0);
+        }
+    }
+
     @Test
     public void testFileHEAD() throws Exception {
         var root = Files.createDirectory(TEST_DIR.resolve("testFileHEAD"));

From 2baacfc16916220846743c6e49a99a6c41cac510 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 8 May 2024 07:05:27 +0000
Subject: [PATCH 357/486] 8331789: ubsan: deoptimization.cpp:403:29: runtime
 error: load of value 208, which is not a valid value for type 'bool'

Reviewed-by: stefank, aboldtch
---
 src/hotspot/share/runtime/deoptimization.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 7a4a59a8553..0c78242c4ad 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -535,7 +535,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
 #if COMPILER2_OR_JVMCI
   if ((jvmci_enabled COMPILER2_PRESENT( || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateLocks) ))
       && !EscapeBarrier::objs_are_deoptimized(current, deoptee.id())) {
-    bool unused;
+    bool unused = false;
     restore_eliminated_locks(current, chunk, realloc_failures, deoptee, exec_mode, unused);
   }
 #endif // COMPILER2_OR_JVMCI

From 7f299043a99406dbd666d4f7f30445d26f3eae82 Mon Sep 17 00:00:00 2001
From: Raffaello Giulietti <rgiulietti@openjdk.org>
Date: Wed, 8 May 2024 08:27:13 +0000
Subject: [PATCH 358/486] 8330005: RandomGeneratorFactory.getDefault() throws
 exception when the runtime image only has java.base module

Reviewed-by: jpai, alanb
---
 .../util/random/RandomGeneratorFactory.java   | 15 ++---
 .../java/util/random/package-info.java        |  7 +--
 .../internal}/random/L128X1024MixRandom.java  |  4 +-
 .../internal}/random/L128X128MixRandom.java   |  4 +-
 .../internal}/random/L128X256MixRandom.java   |  4 +-
 .../jdk/internal}/random/L32X64MixRandom.java |  4 +-
 .../internal}/random/L64X1024MixRandom.java   |  4 +-
 .../internal}/random/L64X128MixRandom.java    |  4 +-
 .../random/L64X128StarStarRandom.java         |  4 +-
 .../internal}/random/L64X256MixRandom.java    |  4 +-
 .../random/Xoroshiro128PlusPlus.java          |  4 +-
 .../internal}/random/Xoshiro256PlusPlus.java  |  4 +-
 src/java.base/share/classes/module-info.java  | 17 +++--
 src/jdk.random/share/classes/module-info.java | 63 -------------------
 14 files changed, 38 insertions(+), 104 deletions(-)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/L128X1024MixRandom.java (99%)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/L128X128MixRandom.java (99%)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/L128X256MixRandom.java (99%)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/L32X64MixRandom.java (98%)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/L64X1024MixRandom.java (99%)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/L64X128MixRandom.java (98%)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/L64X128StarStarRandom.java (98%)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/L64X256MixRandom.java (99%)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/Xoroshiro128PlusPlus.java (99%)
 rename src/{jdk.random/share/classes/jdk => java.base/share/classes/jdk/internal}/random/Xoshiro256PlusPlus.java (99%)
 delete mode 100644 src/jdk.random/share/classes/module-info.java

diff --git a/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java b/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java
index 7b7339e2772..a7c06371368 100644
--- a/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java
+++ b/src/java.base/share/classes/java/util/random/RandomGeneratorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -142,8 +142,9 @@ public final class RandomGeneratorFactory<T extends RandomGenerator> {
          * @return Map of RandomGeneratorFactory classes.
          */
         private static Map<String, Provider<? extends RandomGenerator>> createFactoryMap() {
+            FactoryMapHolder.class.getModule().addUses(RandomGenerator.class);
             return ServiceLoader
-                .load(RandomGenerator.class)
+                .load(RandomGenerator.class, ClassLoader.getPlatformClassLoader())
                 .stream()
                 .filter(p -> !p.type().isInterface())
                 .collect(Collectors.toMap(p -> p.type().getSimpleName(), Function.identity()));
@@ -341,9 +342,6 @@ public final class RandomGeneratorFactory<T extends RandomGenerator> {
      * {@link RandomGenerator} that utilize the {@code name}
      * <a href="package-summary.html#algorithms">algorithm</a>.
      *
-     * @implSpec Availability is determined by RandomGeneratorFactory using the
-     * service provider API to locate implementations of the RandomGenerator interface.
-     *
      * @param name  Name of random number generator
      * <a href="package-summary.html#algorithms">algorithm</a>
      * @param <T> Sub-interface of {@link RandomGenerator} to produce
@@ -376,12 +374,9 @@ public final class RandomGeneratorFactory<T extends RandomGenerator> {
 
     /**
      * Returns a non-empty stream of available {@link RandomGeneratorFactory RandomGeneratorFactory(s)}.
-     *
+     * <p>
      * RandomGenerators that are marked as deprecated are not included in the result.
      *
-     * @implSpec Availability is determined by RandomGeneratorFactory using the service provider API
-     * to locate implementations of the RandomGenerator interface.
-     *
      * @return a non-empty stream of all available {@link RandomGeneratorFactory RandomGeneratorFactory(s)}.
      */
     public static Stream<RandomGeneratorFactory<RandomGenerator>> all() {
@@ -615,5 +610,3 @@ public final class RandomGeneratorFactory<T extends RandomGenerator> {
     }
 
 }
-
-
diff --git a/src/java.base/share/classes/java/util/random/package-info.java b/src/java.base/share/classes/java/util/random/package-info.java
index b4dfe28f796..2e16b319f44 100644
--- a/src/java.base/share/classes/java/util/random/package-info.java
+++ b/src/java.base/share/classes/java/util/random/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, 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
@@ -50,9 +50,7 @@
  * <p> The principal supporting class is {@link RandomGeneratorFactory}. This
  * can be used to generate multiple random number generators for a specific
  * algorithm. {@link RandomGeneratorFactory} also provides methods for
- * selecting random number generator algorithms. RandomGeneratorFactory
- * registers implementations of {@link RandomGenerator} interface using the
- * service provider API.
+ * selecting random number generator algorithms.
  *
  * <p> An important subsidiary interface is
  * {@link RandomGenerator.StreamableGenerator}, which provides methods for
@@ -636,4 +634,3 @@
  * @since   17
  */
 package java.util.random;
-
diff --git a/src/jdk.random/share/classes/jdk/random/L128X1024MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L128X1024MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java
index 46f8a642d54..e6f4f896dc0 100644
--- a/src/jdk.random/share/classes/jdk/random/L128X1024MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L128X1024MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L128X128MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L128X128MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java
index ac12b96b4d2..d03fcfc0864 100644
--- a/src/jdk.random/share/classes/jdk/random/L128X128MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L128X128MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L128X256MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L128X256MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java
index f34956e40a1..81440d7316a 100644
--- a/src/jdk.random/share/classes/jdk/random/L128X256MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L128X256MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L32X64MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java
similarity index 98%
rename from src/jdk.random/share/classes/jdk/random/L32X64MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java
index 1b64a4b28cd..0f6beea7bc7 100644
--- a/src/jdk.random/share/classes/jdk/random/L32X64MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L32X64MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L64X1024MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L64X1024MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java
index 9ec81997bde..e4eb82d450e 100644
--- a/src/jdk.random/share/classes/jdk/random/L64X1024MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X1024MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L64X128MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java
similarity index 98%
rename from src/jdk.random/share/classes/jdk/random/L64X128MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java
index 4188e85e89f..7dd757f312b 100644
--- a/src/jdk.random/share/classes/jdk/random/L64X128MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X128MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L64X128StarStarRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java
similarity index 98%
rename from src/jdk.random/share/classes/jdk/random/L64X128StarStarRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java
index 139b27223b6..15b9bc312da 100644
--- a/src/jdk.random/share/classes/jdk/random/L64X128StarStarRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X128StarStarRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/L64X256MixRandom.java b/src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/L64X256MixRandom.java
rename to src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java
index 0c0cbb43687..bb605df5fdc 100644
--- a/src/jdk.random/share/classes/jdk/random/L64X256MixRandom.java
+++ b/src/java.base/share/classes/jdk/internal/random/L64X256MixRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/Xoroshiro128PlusPlus.java b/src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/Xoroshiro128PlusPlus.java
rename to src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java
index ba8daaf7246..d20b3cf9e6a 100644
--- a/src/jdk.random/share/classes/jdk/random/Xoroshiro128PlusPlus.java
+++ b/src/java.base/share/classes/jdk/internal/random/Xoroshiro128PlusPlus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/jdk.random/share/classes/jdk/random/Xoshiro256PlusPlus.java b/src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java
similarity index 99%
rename from src/jdk.random/share/classes/jdk/random/Xoshiro256PlusPlus.java
rename to src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java
index 5c9cc606597..fdefe02dd03 100644
--- a/src/jdk.random/share/classes/jdk/random/Xoshiro256PlusPlus.java
+++ b/src/java.base/share/classes/jdk/internal/random/Xoshiro256PlusPlus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.random;
+package jdk.internal.random;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.random.RandomGenerator;
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 17a66b856a1..edbbad78c9d 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -268,8 +268,6 @@ module java.base {
         jdk.jfr;
     exports jdk.internal.util.xml.impl to
         jdk.jfr;
-    exports jdk.internal.util.random to
-        jdk.random;
     exports jdk.internal.util to
         java.desktop,
         java.prefs,
@@ -396,7 +394,6 @@ module java.base {
     uses java.time.chrono.AbstractChronology;
     uses java.time.chrono.Chronology;
     uses java.time.zone.ZoneRulesProvider;
-    uses java.util.random.RandomGenerator;
     uses java.util.spi.CalendarDataProvider;
     uses java.util.spi.CalendarNameProvider;
     uses java.util.spi.CurrencyNameProvider;
@@ -425,6 +422,16 @@ module java.base {
     provides java.util.random.RandomGenerator with
         java.security.SecureRandom,
         java.util.Random,
-        java.util.SplittableRandom;
+        java.util.SplittableRandom,
+        jdk.internal.random.L32X64MixRandom,
+        jdk.internal.random.L64X128MixRandom,
+        jdk.internal.random.L64X128StarStarRandom,
+        jdk.internal.random.L64X256MixRandom,
+        jdk.internal.random.L64X1024MixRandom,
+        jdk.internal.random.L128X128MixRandom,
+        jdk.internal.random.L128X256MixRandom,
+        jdk.internal.random.L128X1024MixRandom,
+        jdk.internal.random.Xoroshiro128PlusPlus,
+        jdk.internal.random.Xoshiro256PlusPlus;
 
 }
diff --git a/src/jdk.random/share/classes/module-info.java b/src/jdk.random/share/classes/module-info.java
deleted file mode 100644
index 3d82090f313..00000000000
--- a/src/jdk.random/share/classes/module-info.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import jdk.internal.util.random.RandomSupport;
-
-/**
- * Defines implementations of the
- * {@linkplain java.util.random.RandomGenerator RandomGenerator Interface}.
- *
- * @provides jdk.random.L128X1024MixRandom
- * @provides jdk.random.L128X128MixRandom
- * @provides jdk.random.L128X256MixRandom
- * @provides jdk.random.L32X64MixRandom
- * @provides jdk.random.L64X1024MixRandom
- * @provides jdk.random.L64X128MixRandom
- * @provides jdk.random.L64X128StarStarRandom
- * @provides jdk.random.L64X256MixRandom
- * @provides jdk.random.Xoroshiro128PlusPlus
- * @provides jdk.random.Xoshiro256PlusPlus
- *
- * @uses java.util.random.RandomGenerator
- *
- * @moduleGraph
- * @since 16
- */
-module jdk.random {
-    exports jdk.random to
-            java.base;
-
-    provides java.util.random.RandomGenerator with
-        jdk.random.L32X64MixRandom,
-        jdk.random.L64X128MixRandom,
-        jdk.random.L64X128StarStarRandom,
-        jdk.random.L64X256MixRandom,
-        jdk.random.L64X1024MixRandom,
-        jdk.random.L128X128MixRandom,
-        jdk.random.L128X256MixRandom,
-        jdk.random.L128X1024MixRandom,
-        jdk.random.Xoroshiro128PlusPlus,
-        jdk.random.Xoshiro256PlusPlus;
-}

From 0e1dca75ef1f145bcf1ad76a2bf21d647ddaf76b Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 8 May 2024 08:45:27 +0000
Subject: [PATCH 359/486] 8331715: Remove virtual specifiers in ContiguousSpace

Reviewed-by: gli, tschatzl
---
 src/hotspot/share/gc/shared/space.hpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 2a831ddad89..8dcd954dcf4 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -73,8 +73,11 @@ public:
   // Accessors
   HeapWord* bottom() const         { return _bottom; }
   HeapWord* end() const            { return _end;    }
+  HeapWord* top() const            { return _top;    }
+
   void set_bottom(HeapWord* value) { _bottom = value; }
   void set_end(HeapWord* value)    { _end = value; }
+  void set_top(HeapWord* value)    { _top = value; }
 
   // Testers
   bool is_empty() const              { return used() == 0; }
@@ -112,10 +115,6 @@ public:
   // had allocation performed in it, but is now to be considered empty.
   void clear(bool mangle_space);
 
-  // Accessors
-  HeapWord* top() const            { return _top;    }
-  void set_top(HeapWord* value)    { _top = value; }
-
   // Used to save the space's current top for later use during mangling.
   void set_top_for_allocations() PRODUCT_RETURN;
 
@@ -139,9 +138,9 @@ public:
 
   // Allocation (return null if full).  Assumes the caller has established
   // mutually exclusive access to the space.
-  virtual HeapWord* allocate(size_t word_size);
+  HeapWord* allocate(size_t word_size);
   // Allocation (return null if full).  Enforces mutual exclusion internally.
-  virtual HeapWord* par_allocate(size_t word_size);
+  HeapWord* par_allocate(size_t word_size);
 
   // Iteration
   void object_iterate(ObjectClosure* blk);

From c6f611cfe0f3d6807b450be19ec00713229dbf42 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 8 May 2024 08:48:11 +0000
Subject: [PATCH 360/486] 8331798: Remove unused arg of checkErgonomics() in
 TestMaxHeapSizeTools.java

Reviewed-by: tschatzl
---
 .../gc/arguments/TestMaxHeapSizeTools.java    | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java b/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java
index 5af005063c1..fd784861663 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java
@@ -71,42 +71,42 @@ class TestMaxHeapSizeTools {
     long maxHeapSize = largeValue + (2 * 1024 * 1024);
 
     // -Xms is not set
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue }, values, smallValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + largeValue }, values, largeValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=0" }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=" + smallValue }, values, -1, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=" + largeValue }, values, -1, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=0" }, values, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue }, smallValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + largeValue }, largeValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=0" }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=" + smallValue }, -1, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=" + largeValue }, -1, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:InitialHeapSize=0" }, -1, -1);
     // Some extra checks when both are set.
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + smallValue }, values, smallValue, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + largeValue }, values, smallValue, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + largeValue, "-XX:InitialHeapSize=" + largeValue }, values, largeValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + smallValue }, smallValue, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + largeValue }, smallValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-XX:MinHeapSize=" + largeValue, "-XX:InitialHeapSize=" + largeValue }, largeValue, largeValue);
 
     // -Xms is set to zero
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0" }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue }, values, smallValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + largeValue }, values, largeValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=0" }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=" + smallValue }, values, -1, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=" + largeValue }, values, -1, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=0" }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + smallValue }, values, smallValue, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + largeValue }, values, smallValue, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + largeValue, "-XX:InitialHeapSize=" + largeValue }, values, largeValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0" }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue }, smallValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + largeValue }, largeValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=0" }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=" + smallValue }, -1, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=" + largeValue }, -1, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:InitialHeapSize=0" }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + smallValue }, smallValue, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + smallValue, "-XX:InitialHeapSize=" + largeValue }, smallValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms0", "-XX:MinHeapSize=" + largeValue, "-XX:InitialHeapSize=" + largeValue }, largeValue, largeValue);
 
     // -Xms is set to small value
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue }, values, -1, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:MinHeapSize=" + smallValue }, values, smallValue, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:MinHeapSize=0" }, values, -1, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=" + smallValue }, values, smallValue, smallValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=" + largeValue }, values, smallValue, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=0" }, values, smallValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue }, -1, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:MinHeapSize=" + smallValue }, smallValue, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:MinHeapSize=0" }, -1, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=" + smallValue }, smallValue, smallValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=" + largeValue }, smallValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + smallValue, "-XX:InitialHeapSize=0" }, smallValue, -1);
 
     // -Xms is set to large value
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue }, values, largeValue, largeValue);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue, "-XX:InitialHeapSize=0" }, values, largeValue, -1);
-    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue, "-XX:MinHeapSize=0" }, values, -1, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue }, largeValue, largeValue);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue, "-XX:InitialHeapSize=0" }, largeValue, -1);
+    checkErgonomics(new String[] { gcflag, "-Xmx" + maxHeapSize, "-Xms" + largeValue, "-XX:MinHeapSize=0" }, -1, largeValue);
   }
 
   private static long align_up(long value, long alignment) {
@@ -244,7 +244,7 @@ class TestMaxHeapSizeTools {
    * Verify whether the VM automatically synchronizes minimum and initial heap size if only
    * one is given for the GC specified.
    */
-  public static void checkErgonomics(String[] args, long[] newoldsize,
+  public static void checkErgonomics(String[] args,
     long expectedMin, long expectedInitial) throws Exception {
 
     MinInitialMaxValues v = new MinInitialMaxValues();

From 0eff492e4107abc5624f0c3445877bf38629a980 Mon Sep 17 00:00:00 2001
From: Sean Coffey <coffeys@openjdk.org>
Date: Wed, 8 May 2024 09:30:23 +0000
Subject: [PATCH 361/486] 8330278: Have SSLSocketTemplate.doClientSide use
 loopback address

Reviewed-by: ssahoo, rhalade
---
 test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java | 4 ++--
 test/jdk/javax/net/ssl/templates/TLSBase.java           | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
index 3515ca9c2ff..b67f8978304 100644
--- a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -273,7 +273,7 @@ public class SSLSocketTemplate extends SSLContextTemplate {
                 configureClientSocket(sslSocket);
                 InetAddress serverAddress = this.serverAddress;
                 InetSocketAddress connectAddress = serverAddress == null
-                        ? new InetSocketAddress("localhost", serverPort)
+                        ? new InetSocketAddress(InetAddress.getLoopbackAddress(), serverPort)
                         : new InetSocketAddress(serverAddress, serverPort);
                 sslSocket.connect(connectAddress, 15000);
             } catch (IOException ioe) {
diff --git a/test/jdk/javax/net/ssl/templates/TLSBase.java b/test/jdk/javax/net/ssl/templates/TLSBase.java
index 414e7e106b3..812aea09fea 100644
--- a/test/jdk/javax/net/ssl/templates/TLSBase.java
+++ b/test/jdk/javax/net/ssl/templates/TLSBase.java
@@ -23,6 +23,7 @@
 
 import javax.net.ssl.*;
 import java.io.*;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.security.KeyStore;
 import java.security.cert.PKIXBuilderParameters;
@@ -334,7 +335,7 @@ abstract public class TLSBase {
                 sslContext = SSLContext.getInstance("TLS");
                 sslContext.init(TLSBase.getKeyManager(km), TLSBase.getTrustManager(tm), null);
                 sock = (SSLSocket)sslContext.getSocketFactory().createSocket();
-                sock.connect(new InetSocketAddress("localhost", serverPort));
+                sock.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), serverPort));
                 System.err.println("Client connected using port " +
                         sock.getLocalPort());
                 name = "client(" + sock.toString() + ")";

From 1aebab780c5b84a85b6f10884d05bb29bae3c3bf Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Wed, 8 May 2024 09:37:42 +0000
Subject: [PATCH 362/486] 8320995: RISC-V: C2 PopCountVI 8320996: RISC-V: C2
 PopCountVL

Reviewed-by: luhenry, fyang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     | 10 ++++++
 src/hotspot/cpu/riscv/globals_riscv.hpp       |  1 +
 src/hotspot/cpu/riscv/riscv_v.ad              | 34 +++++++++++++++++++
 src/hotspot/cpu/riscv/vm_version_riscv.cpp    |  6 ++++
 src/hotspot/cpu/riscv/vm_version_riscv.hpp    |  1 +
 .../ir_framework/test/IREncodingPrinter.java  |  4 ++-
 .../superword/TestGeneralizedReductions.java  |  7 +++-
 .../vectorization/TestPopCountVector.java     | 18 +++++++---
 .../vectorization/TestPopCountVectorLong.java | 18 +++++++---
 9 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 388e7f9eb94..0fe91d99066 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1904,6 +1904,16 @@ enum Nf {
 
 #undef INSN
 
+#define INSN(NAME, op, funct3, Vs1, funct6)                                    \
+  void NAME(VectorRegister Vd, VectorRegister Vs2, VectorMask vm = unmasked) { \
+    patch_VArith(op, Vd, funct3, Vs1, Vs2, vm, funct6);                        \
+  }
+
+  // Vector Basic Bit-manipulation (Zvbb) Extension
+  INSN(vcpop_v,  0b1010111, 0b010, 0b01110, 0b010010);
+
+#undef INSN
+
 #undef patch_VArith
 
 // ====================================
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index e22456cacc6..c39b29f6ee4 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -115,6 +115,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(bool, UseZtso, false, EXPERIMENTAL, "Assume Ztso memory model")        \
   product(bool, UseZihintpause, false, EXPERIMENTAL,                             \
           "Use Zihintpause instructions")                                        \
+  product(bool, UseZvbb, false, EXPERIMENTAL, "Use Zvbb instructions")           \
   product(bool, UseZvfh, false, EXPERIMENTAL, "Use Zvfh instructions")           \
   product(bool, UseZvkn, false, EXPERIMENTAL,                                    \
           "Use Zvkn group extension, Zvkned, Zvknhb, Zvkb, Zvkt")                \
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 7869d6156e5..0879f62600e 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -73,6 +73,9 @@ source %{
           return false;
         }
         break;
+      case Op_PopCountVL:
+      case Op_PopCountVI:
+        return UseZvbb;
       case Op_LoadVectorGather:
       case Op_LoadVectorGatherMasked:
         if (is_subword_type(bt)) {
@@ -3784,6 +3787,37 @@ instruct vconvF2HF(vReg dst, vReg src, vReg vtmp, vRegMask_V0 v0, iRegINoSp tmp)
   ins_pipe(pipe_slow);
 %}
 
+
+// ------------------------------ Popcount vector ------------------------------
+
+instruct vpopcount_mask(vReg dst, vReg src, vRegMask_V0 v0) %{
+  match(Set dst (PopCountVI src v0));
+  match(Set dst (PopCountVL src v0));
+  ins_cost(VEC_COST);
+  format %{ "vcpop_v $dst, $src, $v0\t# vcpop_v with mask" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vcpop_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vpopcount(vReg dst, vReg src) %{
+  match(Set dst (PopCountVI src));
+  match(Set dst (PopCountVL src));
+  ins_cost(VEC_COST);
+  format %{ "vcpop_v $dst, $src\t# vcpop_v without mask" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vcpop_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector Load Gather ---------------------------
 
 instruct gather_load(vReg dst, indirect mem, vReg idx) %{
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 848ffe709d8..995e8b72248 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -245,6 +245,12 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseChaCha20Intrinsics, false);
   }
 
+  // UseZvbb (depends on RVV).
+  if (UseZvbb && !UseRVV) {
+    FLAG_SET_DEFAULT(UseZvbb, false);
+    warning("Cannot enable UseZvbb on cpu without RVV support.");
+  }
+
   // SHA's
   if (FLAG_IS_DEFAULT(UseSHA)) {
     FLAG_SET_DEFAULT(UseSHA, true);
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index d26b16941db..f3a834b7237 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -161,6 +161,7 @@ class VM_Version : public Abstract_VM_Version {
   decl(ext_Ztso        , "Ztso"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZtso))        \
   decl(ext_Zihintpause , "Zihintpause" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZihintpause)) \
   decl(ext_Zacas       , "Zacas"       , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZacas))       \
+  decl(ext_Zvbb        , "Zvbb"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvbb))        \
   decl(ext_Zvfh        , "Zvfh"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvfh))        \
   decl(ext_Zvkn        , "Zvkn"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvkn))        \
   decl(mvendorid       , "VendorId"    , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)              \
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
index 939267234bd..47cec9f5e13 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -102,7 +102,9 @@ public class IREncodingPrinter {
         // AArch64
         "sha3",
         "asimd",
-        "sve"
+        "sve",
+        // Riscv64
+        "zvbb"
     ));
 
     public IREncodingPrinter() {
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
index 60ecaf0e4c8..2a27aad8d5a 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -144,6 +144,11 @@ public class TestGeneralizedReductions {
         applyIfAnd = {"SuperWordReductions", "true","UsePopCountInstruction", "true"},
         counts = {IRNode.ADD_REDUCTION_VI, ">= 1",
                   IRNode.POPCOUNT_VL, ">= 1"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"zvbb", "true"},
+        applyIfAnd = {"SuperWordReductions", "true","UsePopCountInstruction", "true"},
+        counts = {IRNode.ADD_REDUCTION_VI, ">= 1",
+                  IRNode.POPCOUNT_VL, ">= 1"})
     private static long testMapReductionOnGlobalAccumulator(long[] array) {
         acc = 0;
         for (int i = 0; i < array.length; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVector.java b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVector.java
index a6daa5bce06..4a4370fd2d1 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVector.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -40,18 +40,22 @@ public class TestPopCountVector {
 
     public static void main(String args[]) {
         TestPopCountVector test = new TestPopCountVector();
+        int err = 0;
 
         for (int i = 0; i < 10_000; ++i) {
           test.vectorizeBitCount();
         }
         System.out.println("Checking popcount result");
-        test.checkResult();
+        err += test.checkResult();
 
         for (int i = 0; i < 10_000; ++i) {
           test.vectorizeBitCount();
         }
         System.out.println("Checking popcount result");
-        test.checkResult();
+        err += test.checkResult();
+        if (err > 0) {
+            throw new RuntimeException("Error!");
+        }
     }
 
     public TestPopCountVector() {
@@ -68,13 +72,17 @@ public class TestPopCountVector {
         }
     }
 
-    public void checkResult() {
+    public int checkResult() {
+        int err = 0;
         for (int i = 0; i < LEN; ++i) {
             int expected = Integer.bitCount(input[i]);
             if (output[i] != expected) {
-                throw new RuntimeException("Invalid result: output[" + i + "] = " + output[i] + " != " + expected);
+                err++;
+                System.err.println("Invalid result: output[" + i + "] = " + output[i] + " != " + expected +
+                                   ", input[" + i + "] == " + Integer.toBinaryString(input[i]));
             }
         }
+        return err;
     }
 }
 
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
index 20912582b7f..e382e828790 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,14 @@
 * @summary Test vectorization of popcount for Long
 * @requires vm.compiler2.enabled
 * @requires ((os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64") & vm.cpu.features ~= ".*avx512bw.*") |
-*           os.simpleArch == "aarch64"
+*           os.simpleArch == "aarch64" |
+*           (os.arch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
 * @library /test/lib /
 * @run driver compiler.vectorization.TestPopCountVectorLong
 */
 
 package compiler.vectorization;
+
 import compiler.lib.ir_framework.*;
 import java.util.Random;
 
@@ -62,16 +64,22 @@ public class TestPopCountVectorLong {
         for (int i = 0; i < LEN; ++i) {
             output[i] = Long.bitCount(input[i]);
         }
-        checkResult();
+        if (checkResult() > 0) {
+            throw new RuntimeException("Error!");
+        }
     }
 
-    public void checkResult() {
+    public int checkResult() {
+        int err = 0;
         for (int i = 0; i < LEN; ++i) {
             int expected = Long.bitCount(input[i]);
             if (output[i] != expected) {
-                throw new RuntimeException("Invalid result: output[" + i + "] = " + output[i] + " != " + expected);
+                err++;
+                System.err.println("Invalid result: output[" + i + "] = " + output[i] + " != " + expected +
+                                   ", input[" + i + "] == " + Long.toBinaryString(input[i]));
             }
         }
+        return err;
     }
 }
 

From edd47c10ebfdc021368820dec6a109251554e8b0 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 8 May 2024 10:11:01 +0000
Subject: [PATCH 363/486] 8308033: The jcmd thread dump related tests should
 test virtual threads

Reviewed-by: cjplummer, sspitsyn
---
 test/hotspot/jtreg/ProblemList-Virtual.txt    |  6 +--
 .../serviceability/dcmd/thread/PrintTest.java |  6 ++-
 .../tmtools/jstack/DaemonThreadTest.java      |  3 +-
 test/jdk/ProblemList-Virtual.txt              |  3 --
 .../tools/jcmd/JcmdOutputEncodingTest.java    | 41 +++++++++++++++++--
 .../jdk/sun/tools/jstack/BasicJStackTest.java | 13 +++++-
 6 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-Virtual.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt
index 7615e103d1a..e7627be7b8c 100644
--- a/test/hotspot/jtreg/ProblemList-Virtual.txt
+++ b/test/hotspot/jtreg/ProblemList-Virtual.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,6 @@
 serviceability/AsyncGetCallTrace/MyPackage/ASGCTBaseTest.java 8308026 generic-all
 serviceability/jvmti/GetThreadListStackTraces/OneGetThreadListStackTraces.java 8308027 generic-all
 serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java 8264699 generic-all
-serviceability/dcmd/thread/PrintConcurrentLocksTest.java 8308033 generic-all
-serviceability/dcmd/thread/PrintTest.java 8308033 generic-all
-serviceability/dcmd/thread/ThreadDumpToFileTest.java 8308033 generic-all
-serviceability/tmtools/jstack/DaemonThreadTest.java 8308033 generic-all
 
 ####
 ## Classes not unloaded as expected (TODO, need to check if FJ keeps a reference)
diff --git a/test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java b/test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java
index e4af11c3261..29c462a56b3 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/thread/PrintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import org.testng.SkipException;
 import org.testng.annotations.Test;
 import org.testng.Assert;
 
@@ -171,6 +172,9 @@ public class PrintTest {
 
     @Test
     public void jmx() {
+        if (Thread.currentThread().isVirtual()) {
+            throw new SkipException("skipping test since current thread is virtual thread");
+        }
         run(new JMXExecutor());
     }
 }
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java
index d7915e8901a..23e9474ad4a 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstack/DaemonThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -38,6 +38,7 @@ public class DaemonThreadTest {
     static class NormalThread extends Thread {
 
         NormalThread() {
+            setDaemon(false);
         }
 
         @Override
diff --git a/test/jdk/ProblemList-Virtual.txt b/test/jdk/ProblemList-Virtual.txt
index c352e8a95c1..e3b0a922857 100644
--- a/test/jdk/ProblemList-Virtual.txt
+++ b/test/jdk/ProblemList-Virtual.txt
@@ -33,9 +33,6 @@ com/sun/jdi/cds/CDSBreakpointTest.java 8307778 generic-all
 com/sun/jdi/cds/CDSDeleteAllBkptsTest.java 8307778 generic-all
 com/sun/jdi/cds/CDSFieldWatchpoints.java 8307778 generic-all
 
-sun/tools/jcmd/JcmdOutputEncodingTest.java 8308033 generic-all
-sun/tools/jstack/BasicJStackTest.java 8308033 generic-all
-
 javax/management/remote/mandatory/connection/BrokenConnectionTest.java 8308035 windows-x64
 
 javax/management/remote/mandatory/loading/MissingClassTest.java 8145413 windows-x64
diff --git a/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java b/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java
index 14f5a2be167..01797a6a82a 100644
--- a/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java
+++ b/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 import jdk.test.lib.Utils;
 import jdk.test.lib.process.OutputAnalyzer;
@@ -31,7 +33,7 @@ import jdk.test.lib.JDKToolLauncher;
 
 /*
  * @test
- * @bug 8222491 8273187
+ * @bug 8222491 8273187 8308033
  * @summary Tests if we handle the encoding of jcmd output correctly.
  * @library /test/lib
  * @run main JcmdOutputEncodingTest
@@ -52,12 +54,43 @@ public class JcmdOutputEncodingTest {
         launcher.addVMArg("-Dfile.encoding=" + cs);
         launcher.addVMArg("-Dsun.stdout.encoding=" + cs);
         launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
-        launcher.addToolArg("Thread.print");
+        boolean isVirtualThread = Thread.currentThread().isVirtual();
+        Path threadDumpFile = null;
+        if (isVirtualThread) {
+            // "jcmd Thread.print" will not print thread dumps of virtual threads.
+            // So we use "Thread.dump_to_file" command instead and dump the thread
+            // stacktraces in a file
+            threadDumpFile = Files.createTempFile(Path.of("."), "jcmd", ".tdump").toAbsolutePath();
+            launcher.addToolArg("Thread.dump_to_file");
+            launcher.addToolArg("-overwrite");
+            launcher.addToolArg(threadDumpFile.toString());
+        } else {
+            launcher.addToolArg("Thread.print");
+        }
 
         ProcessBuilder processBuilder = new ProcessBuilder();
         processBuilder.command(launcher.getCommand());
         OutputAnalyzer output = ProcessTools.executeProcess(processBuilder, null, cs);
         output.shouldHaveExitValue(0);
-        output.shouldContain(marker);
+        if (isVirtualThread) {
+            // verify the file containing the thread dump has the expected text
+            try (var br = Files.newBufferedReader(threadDumpFile, cs)) {
+                String line = null;
+                boolean found = false;
+                while ((line = br.readLine()) != null) {
+                    if (line.contains(marker)) {
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found) {
+                    output.reportDiagnosticSummary();
+                    throw new RuntimeException("'" + marker + "' missing in thread dump in file "
+                            + threadDumpFile);
+                }
+            }
+        } else {
+            output.shouldContain(marker);
+        }
     }
 }
diff --git a/test/jdk/sun/tools/jstack/BasicJStackTest.java b/test/jdk/sun/tools/jstack/BasicJStackTest.java
index e0a9c96d6ad..ec0a80e8d78 100644
--- a/test/jdk/sun/tools/jstack/BasicJStackTest.java
+++ b/test/jdk/sun/tools/jstack/BasicJStackTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,11 @@ import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.JDKToolLauncher;
 
+import jtreg.SkippedException;
+
 /*
  * @test
- * @bug 8273187
+ * @bug 8273187 8308033
  * @summary Unit test for jstack utility
  * @library /test/lib
  * @run main BasicJStackTest
@@ -42,6 +44,13 @@ public class BasicJStackTest {
     private static ProcessBuilder processBuilder = new ProcessBuilder();
 
     public static void main(String[] args) throws Exception {
+        if (Thread.currentThread().isVirtual()) {
+            // This test runs jstack against the current process and then asserts the
+            // presence of current thread in the stacktraces. We skip this test
+            // when the current thread is a virtual thread since "jstack" command doesn't
+            // print the stacktraces of virtual threads.
+            throw new SkippedException("skipping test since current thread is a virtual thread");
+        }
         testJstackNoArgs();
         testJstack_l();
         testJstackUTF8Encoding();

From aafa15fc173af07ebf5361a8c6a09c2a28981c38 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Wed, 8 May 2024 10:18:33 +0000
Subject: [PATCH 364/486] 8331208: Memory stress test that checks
 OutOfMemoryError stack trace fails

Reviewed-by: dholmes, never
---
 src/hotspot/share/compiler/compileBroker.cpp |  2 ++
 src/hotspot/share/gc/shared/memAllocator.cpp |  6 ++--
 src/hotspot/share/gc/shared/memAllocator.hpp | 33 ++++++++++++++++++
 src/hotspot/share/jvmci/jvmciRuntime.cpp     | 35 ++++++--------------
 src/hotspot/share/memory/universe.cpp        | 11 +++---
 src/hotspot/share/memory/universe.hpp        |  3 +-
 src/hotspot/share/oops/klass.cpp             |  4 +--
 src/hotspot/share/runtime/deoptimization.cpp |  4 +++
 src/hotspot/share/runtime/javaThread.cpp     |  2 +-
 src/hotspot/share/runtime/javaThread.hpp     | 14 ++++----
 src/hotspot/share/runtime/thread.hpp         |  8 -----
 11 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index 0935ea6a8e1..ddd5b2f0eb7 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -38,6 +38,7 @@
 #include "compiler/compilerEvent.hpp"
 #include "compiler/compilerOracle.hpp"
 #include "compiler/directivesParser.hpp"
+#include "gc/shared/memAllocator.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "jvm.h"
 #include "jfr/jfrEvents.hpp"
@@ -1396,6 +1397,7 @@ nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
   assert(!HAS_PENDING_EXCEPTION, "No exception should be present");
   // some prerequisites that are compiler specific
   if (comp->is_c2() || comp->is_jvmci()) {
+    InternalOOMEMark iom(THREAD);
     method->constants()->resolve_string_constants(CHECK_AND_CLEAR_NONASYNC_NULL);
     // Resolve all classes seen in the signature of the method
     // we are compiling.
diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index ddd33d8f43a..156b55c1046 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -123,21 +123,21 @@ bool MemAllocator::Allocation::check_out_of_memory() {
   }
 
   const char* message = _overhead_limit_exceeded ? "GC overhead limit exceeded" : "Java heap space";
-  if (!_thread->in_retryable_allocation()) {
+  if (!_thread->is_in_internal_oome_mark()) {
     // -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError support
     report_java_out_of_memory(message);
-
     if (JvmtiExport::should_post_resource_exhausted()) {
       JvmtiExport::post_resource_exhausted(
         JVMTI_RESOURCE_EXHAUSTED_OOM_ERROR | JVMTI_RESOURCE_EXHAUSTED_JAVA_HEAP,
         message);
     }
+
     oop exception = _overhead_limit_exceeded ?
         Universe::out_of_memory_error_gc_overhead_limit() :
         Universe::out_of_memory_error_java_heap();
     THROW_OOP_(exception, true);
   } else {
-    THROW_OOP_(Universe::out_of_memory_error_retry(), true);
+    THROW_OOP_(Universe::out_of_memory_error_java_heap_without_backtrace(), true);
   }
 }
 
diff --git a/src/hotspot/share/gc/shared/memAllocator.hpp b/src/hotspot/share/gc/shared/memAllocator.hpp
index 5d3f892ca14..f299dd633e5 100644
--- a/src/hotspot/share/gc/shared/memAllocator.hpp
+++ b/src/hotspot/share/gc/shared/memAllocator.hpp
@@ -114,4 +114,37 @@ public:
   virtual oop initialize(HeapWord* mem) const;
 };
 
+// Manages a scope where a failed heap allocation results in
+// suppression of JVMTI "resource exhausted" events and
+// throwing a shared, backtrace-less OOME instance.
+// Used for OOMEs that will not be propagated to user code.
+class InternalOOMEMark: public StackObj {
+ private:
+  bool _outer;
+  JavaThread* _thread;
+
+ public:
+  explicit InternalOOMEMark(JavaThread* thread) {
+    if (thread != nullptr) {
+      _outer = thread->is_in_internal_oome_mark();
+      thread->set_is_in_internal_oome_mark(true);
+      _thread = thread;
+    } else {
+      _outer = false;
+      _thread = nullptr;
+    }
+  }
+
+  ~InternalOOMEMark() {
+    if (_thread != nullptr) {
+      // Check that only InternalOOMEMark sets
+      // JavaThread::_is_in_internal_oome_mark
+      assert(_thread->is_in_internal_oome_mark(), "must be");
+      _thread->set_is_in_internal_oome_mark(_outer);
+    }
+  }
+
+  JavaThread* thread() const  { return _thread; }
+};
+
 #endif // SHARE_GC_SHARED_MEMALLOCATOR_HPP
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index fc4bb5a6a06..99f427ee168 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -28,6 +28,7 @@
 #include "classfile/vmClasses.hpp"
 #include "compiler/compileBroker.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/memAllocator.hpp"
 #include "gc/shared/oopStorage.inline.hpp"
 #include "jvmci/jniAccessMark.inline.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
@@ -92,39 +93,25 @@ static void deopt_caller() {
 }
 
 // Manages a scope for a JVMCI runtime call that attempts a heap allocation.
-// If there is a pending nonasync exception upon closing the scope and the runtime
+// If there is a pending OutOfMemoryError upon closing the scope and the runtime
 // call is of the variety where allocation failure returns null without an
 // exception, the following action is taken:
-//   1. The pending nonasync exception is cleared
+//   1. The pending OutOfMemoryError is cleared
 //   2. null is written to JavaThread::_vm_result
-//   3. Checks that an OutOfMemoryError is Universe::out_of_memory_error_retry().
-class RetryableAllocationMark: public StackObj {
+class RetryableAllocationMark {
  private:
-  JavaThread* _thread;
+   InternalOOMEMark _iom;
  public:
-  RetryableAllocationMark(JavaThread* thread, bool activate) {
-    if (activate) {
-      assert(!thread->in_retryable_allocation(), "retryable allocation scope is non-reentrant");
-      _thread = thread;
-      _thread->set_in_retryable_allocation(true);
-    } else {
-      _thread = nullptr;
-    }
-  }
+  RetryableAllocationMark(JavaThread* thread, bool activate) : _iom(activate ? thread : nullptr) {}
   ~RetryableAllocationMark() {
-    if (_thread != nullptr) {
-      _thread->set_in_retryable_allocation(false);
-      JavaThread* THREAD = _thread; // For exception macros.
+    JavaThread* THREAD = _iom.thread(); // For exception macros.
+    if (THREAD != nullptr) {
       if (HAS_PENDING_EXCEPTION) {
         oop ex = PENDING_EXCEPTION;
-        // Do not clear probable async exceptions.
-        CLEAR_PENDING_NONASYNC_EXCEPTION;
-        oop retry_oome = Universe::out_of_memory_error_retry();
-        if (ex->is_a(retry_oome->klass()) && retry_oome != ex) {
-          ResourceMark rm;
-          fatal("Unexpected exception in scope of retryable allocation: " INTPTR_FORMAT " of type %s", p2i(ex), ex->klass()->external_name());
+        THREAD->set_vm_result(nullptr);
+        if (ex->is_a(vmClasses::OutOfMemoryError_klass())) {
+          CLEAR_PENDING_EXCEPTION;
         }
-        _thread->set_vm_result(nullptr);
       }
     }
   }
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 187bdf25af8..4a16b3d89a8 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -135,7 +135,6 @@ enum OutOfMemoryInstance { _oom_java_heap,
                            _oom_array_size,
                            _oom_gc_overhead_limit,
                            _oom_realloc_objects,
-                           _oom_retry,
                            _oom_count };
 
 OopHandle Universe::_out_of_memory_errors;
@@ -655,6 +654,10 @@ oop Universe::out_of_memory_error_java_heap() {
   return gen_out_of_memory_error(out_of_memory_errors()->obj_at(_oom_java_heap));
 }
 
+oop Universe::out_of_memory_error_java_heap_without_backtrace() {
+  return out_of_memory_errors()->obj_at(_oom_java_heap);
+}
+
 oop Universe::out_of_memory_error_c_heap() {
   return gen_out_of_memory_error(out_of_memory_errors()->obj_at(_oom_c_heap));
 }
@@ -679,9 +682,6 @@ oop Universe::out_of_memory_error_realloc_objects() {
   return gen_out_of_memory_error(out_of_memory_errors()->obj_at(_oom_realloc_objects));
 }
 
-// Throw default _out_of_memory_error_retry object as it will never propagate out of the VM
-oop Universe::out_of_memory_error_retry()              { return out_of_memory_errors()->obj_at(_oom_retry);  }
-
 oop Universe::class_init_out_of_memory_error()         { return out_of_memory_errors()->obj_at(_oom_java_heap); }
 oop Universe::class_init_stack_overflow_error()        { return _class_init_stack_overflow_error.resolve(); }
 oop Universe::delayed_stack_overflow_error_message()   { return _delayed_stack_overflow_error_message.resolve(); }
@@ -785,9 +785,6 @@ void Universe::create_preallocated_out_of_memory_errors(TRAPS) {
   msg = java_lang_String::create_from_str("Java heap space: failed reallocation of scalar replaced objects", CHECK);
   java_lang_Throwable::set_message(oom_array->obj_at(_oom_realloc_objects), msg());
 
-  msg = java_lang_String::create_from_str("Java heap space: failed retryable allocation", CHECK);
-  java_lang_Throwable::set_message(oom_array->obj_at(_oom_retry), msg());
-
   // Setup the array of errors that have preallocated backtrace
   int len = (StackTraceInThrowable) ? (int)PreallocatedOutOfMemoryErrorCount : 0;
   objArrayOop instance = oopFactory::new_objArray(ik, len, CHECK);
diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
index d5a38658e48..c7bdb8f2339 100644
--- a/src/hotspot/share/memory/universe.hpp
+++ b/src/hotspot/share/memory/universe.hpp
@@ -272,6 +272,7 @@ class Universe: AllStatic {
   // may or may not have a backtrace. If error has a backtrace then the stack trace is already
   // filled in.
   static oop out_of_memory_error_java_heap();
+  static oop out_of_memory_error_java_heap_without_backtrace();
   static oop out_of_memory_error_c_heap();
   static oop out_of_memory_error_metaspace();
   static oop out_of_memory_error_class_metaspace();
@@ -279,8 +280,6 @@ class Universe: AllStatic {
   static oop out_of_memory_error_gc_overhead_limit();
   static oop out_of_memory_error_realloc_objects();
 
-  // Throw default _out_of_memory_error_retry object as it will never propagate out of the VM
-  static oop out_of_memory_error_retry();
   static oop delayed_stack_overflow_error_message();
 
   // Saved StackOverflowError and OutOfMemoryError for use when
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 23a6770251a..ea3b5e756d0 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -873,12 +873,12 @@ void Klass::set_archived_java_mirror(int mirror_index) {
 
 void Klass::check_array_allocation_length(int length, int max_length, TRAPS) {
   if (length > max_length) {
-    if (!THREAD->in_retryable_allocation()) {
+    if (!THREAD->is_in_internal_oome_mark()) {
       report_java_out_of_memory("Requested array size exceeds VM limit");
       JvmtiExport::post_array_size_exhausted();
       THROW_OOP(Universe::out_of_memory_error_array_size());
     } else {
-      THROW_OOP(Universe::out_of_memory_error_retry());
+      THROW_OOP(Universe::out_of_memory_error_java_heap_without_backtrace());
     }
   } else if (length < 0) {
     THROW_MSG(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length));
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 0c78242c4ad..03e62075808 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -35,6 +35,7 @@
 #include "compiler/compilationPolicy.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/memAllocator.hpp"
 #include "interpreter/bytecode.hpp"
 #include "interpreter/bytecodeStream.hpp"
 #include "interpreter/interpreter.hpp"
@@ -1237,6 +1238,7 @@ bool Deoptimization::realloc_objects(JavaThread* thread, frame* fr, RegisterMap*
 
       InstanceKlass* ik = InstanceKlass::cast(k);
       if (obj == nullptr && !cache_init_error) {
+        InternalOOMEMark iom(THREAD);
 #if COMPILER2_OR_JVMCI
         if (EnableVectorSupport && VectorSupport::is_vector(ik)) {
           obj = VectorSupport::allocate_vector(ik, fr, reg_map, sv, THREAD);
@@ -1251,9 +1253,11 @@ bool Deoptimization::realloc_objects(JavaThread* thread, frame* fr, RegisterMap*
       TypeArrayKlass* ak = TypeArrayKlass::cast(k);
       assert(sv->field_size() % type2size[ak->element_type()] == 0, "non-integral array length");
       int len = sv->field_size() / type2size[ak->element_type()];
+      InternalOOMEMark iom(THREAD);
       obj = ak->allocate(len, THREAD);
     } else if (k->is_objArray_klass()) {
       ObjArrayKlass* ak = ObjArrayKlass::cast(k);
+      InternalOOMEMark iom(THREAD);
       obj = ak->allocate(sv->field_size(), THREAD);
     }
 
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 2e40c99455c..7ed67c4616b 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -456,11 +456,11 @@ JavaThread::JavaThread() :
 #endif
 #endif
   _jni_attach_state(_not_attaching_via_jni),
+  _is_in_internal_oome_mark(false),
 #if INCLUDE_JVMCI
   _pending_deoptimization(-1),
   _pending_monitorenter(false),
   _pending_transfer_to_interpreter(false),
-  _in_retryable_allocation(false),
   _pending_failed_speculation(0),
   _jvmci{nullptr},
   _libjvmci_runtime(nullptr),
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index 6b6c9139b78..37fd8981acd 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -52,6 +52,7 @@
 class AsyncExceptionHandshake;
 class ContinuationEntry;
 class DeoptResourceMark;
+class InternalOOMEMark;
 class JNIHandleBlock;
 class JVMCIRuntime;
 
@@ -335,6 +336,8 @@ class JavaThread: public Thread {
   // of _attaching_via_jni and transitions to _attached_via_jni.
   volatile JNIAttachStates _jni_attach_state;
 
+  // In scope of an InternalOOMEMark?
+  bool _is_in_internal_oome_mark;
 
 #if INCLUDE_JVMCI
   // The _pending_* fields below are used to communicate extra information
@@ -350,10 +353,6 @@ class JavaThread: public Thread {
   // Specifies if the DeoptReason for the last uncommon trap was Reason_transfer_to_interpreter
   bool      _pending_transfer_to_interpreter;
 
-  // True if in a runtime call from compiled code that will deoptimize
-  // and re-execute a failed heap allocation in the interpreter.
-  bool      _in_retryable_allocation;
-
   // An id of a speculation that JVMCI compiled code can use to further describe and
   // uniquely identify the speculative optimization guarded by an uncommon trap.
   // See JVMCINMethodData::SPECULATION_LENGTH_BITS for further details.
@@ -718,6 +717,10 @@ private:
   MemRegion deferred_card_mark() const           { return _deferred_card_mark; }
   void set_deferred_card_mark(MemRegion mr)      { _deferred_card_mark = mr;   }
 
+  // Is thread in scope of an InternalOOMEMark?
+  bool is_in_internal_oome_mark() const          { return _is_in_internal_oome_mark; }
+  void set_is_in_internal_oome_mark(bool b)      { _is_in_internal_oome_mark = b;    }
+
 #if INCLUDE_JVMCI
   jlong pending_failed_speculation() const        { return _pending_failed_speculation; }
   void set_pending_monitorenter(bool b)           { _pending_monitorenter = b; }
@@ -727,9 +730,6 @@ private:
   void set_jvmci_alternate_call_target(address a) { assert(_jvmci._alternate_call_target == nullptr, "must be"); _jvmci._alternate_call_target = a; }
   void set_jvmci_implicit_exception_pc(address a) { assert(_jvmci._implicit_exception_pc == nullptr, "must be"); _jvmci._implicit_exception_pc = a; }
 
-  virtual bool in_retryable_allocation() const    { return _in_retryable_allocation; }
-  void set_in_retryable_allocation(bool b)        { _in_retryable_allocation = b; }
-
   JVMCIRuntime* libjvmci_runtime() const          { return _libjvmci_runtime; }
   void set_libjvmci_runtime(JVMCIRuntime* rt) {
     assert((_libjvmci_runtime == nullptr && rt != nullptr) || (_libjvmci_runtime != nullptr && rt == nullptr), "must be");
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index a3d6e091d28..ebf1b590ebd 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -210,14 +210,6 @@ class Thread: public ThreadShadow {
   DEBUG_ONLY(bool _indirectly_safepoint_thread;)
 
  public:
-  // Determines if a heap allocation failure will be retried
-  // (e.g., by deoptimizing and re-executing in the interpreter).
-  // In this case, the failed allocation must raise
-  // Universe::out_of_memory_error_retry() and omit side effects
-  // such as JVMTI events and handling -XX:+HeapDumpOnOutOfMemoryError
-  // and -XX:OnOutOfMemoryError.
-  virtual bool in_retryable_allocation() const { return false; }
-
 #ifdef ASSERT
   void set_suspendible_thread()   { _suspendible_thread = true; }
   void clear_suspendible_thread() { _suspendible_thread = false; }

From ad78b7fa67ba30cab2e8f496e4c765be15deeca6 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Wed, 8 May 2024 10:38:09 +0000
Subject: [PATCH 365/486] 8331185: Enable compiler memory limits in debug
 builds

Reviewed-by: asmehra, kvn
---
 .../compiler/compilationMemoryStatistic.cpp   | 34 +++++--
 src/hotspot/share/compiler/compilerOracle.cpp | 33 +++++++
 src/hotspot/share/compiler/compilerOracle.hpp |  1 +
 .../jtreg/compiler/c2/TestFindNode.java       |  5 +-
 .../TestDeepGraphVerifyIterativeGVN.java      |  5 +-
 .../print/CompileCommandMemLimit.java         | 98 ++++++++++++-------
 .../print/CompileCommandPrintMemStat.java     | 29 ++++--
 7 files changed, 154 insertions(+), 51 deletions(-)

diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 585d55febb8..196a11fd065 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -181,10 +181,16 @@ class MemStatEntry : public CHeapObj<mtInternal> {
   int _num_recomp;
   // Compiling thread. Only for diagnostic purposes. Thread may not be alive anymore.
   const Thread* _thread;
+  // active limit for this compilation, if any
+  size_t _limit;
 
+  // peak usage, bytes, over all arenas
   size_t _total;
+  // usage in node arena when total peaked
   size_t _na_at_peak;
+  // usage in resource area when total peaked
   size_t _ra_at_peak;
+  // number of nodes (c2 only) when total peaked
   unsigned _live_nodes_at_peak;
   const char* _result;
 
@@ -192,7 +198,7 @@ public:
 
   MemStatEntry(FullMethodName method)
     : _method(method), _comptype(compiler_c1),
-      _time(0), _num_recomp(0), _thread(nullptr),
+      _time(0), _num_recomp(0), _thread(nullptr), _limit(0),
       _total(0), _na_at_peak(0), _ra_at_peak(0), _live_nodes_at_peak(0),
       _result(nullptr) {
   }
@@ -200,6 +206,7 @@ public:
   void set_comptype(CompilerType comptype) { _comptype = comptype; }
   void set_current_time() { _time = os::elapsedTime(); }
   void set_current_thread() { _thread = Thread::current(); }
+  void set_limit(size_t limit) { _limit = limit; }
   void inc_recompilation() { _num_recomp++; }
 
   void set_total(size_t n) { _total = n; }
@@ -218,6 +225,7 @@ public:
     st->print_cr("  RA     : ...how much in resource areas");
     st->print_cr("  result : Result: 'ok' finished successfully, 'oom' hit memory limit, 'err' compilation failed");
     st->print_cr("  #nodes : ...how many nodes (c2 only)");
+    st->print_cr("  limit  : memory limit, if set");
     st->print_cr("  time   : time of last compilation (sec)");
     st->print_cr("  type   : compiler type");
     st->print_cr("  #rc    : how often recompiled");
@@ -225,7 +233,7 @@ public:
   }
 
   static void print_header(outputStream* st) {
-    st->print_cr("total     NA        RA        result  #nodes  time    type  #rc thread              method");
+    st->print_cr("total     NA        RA        result  #nodes  limit   time    type  #rc thread              method");
   }
 
   void print_on(outputStream* st, bool human_readable) const {
@@ -260,7 +268,19 @@ public:
     col += 8; st->fill_to(col);
 
     // Number of Nodes when memory peaked
-    st->print("%u ", _live_nodes_at_peak);
+    if (_live_nodes_at_peak > 0) {
+      st->print("%u ", _live_nodes_at_peak);
+    } else {
+      st->print("-");
+    }
+    col += 8; st->fill_to(col);
+
+    // Limit
+    if (_limit > 0) {
+      st->print(PROPERFMT " ", PROPERFMTARGS(_limit));
+    } else {
+      st->print("-");
+    }
     col += 8; st->fill_to(col);
 
     // TimeStamp
@@ -322,7 +342,7 @@ public:
 
   void add(const FullMethodName& fmn, CompilerType comptype,
            size_t total, size_t na_at_peak, size_t ra_at_peak,
-           unsigned live_nodes_at_peak, const char* result) {
+           unsigned live_nodes_at_peak, size_t limit, const char* result) {
     assert_lock_strong(NMTCompilationCostHistory_lock);
     MemStatTableKey key(fmn, comptype);
     MemStatEntry** pe = get(key);
@@ -343,6 +363,7 @@ public:
     e->set_na_at_peak(na_at_peak);
     e->set_ra_at_peak(ra_at_peak);
     e->set_live_nodes_at_peak(live_nodes_at_peak);
+    e->set_limit(limit);
     e->set_result(result);
   }
 
@@ -430,6 +451,7 @@ void CompilationMemoryStatistic::on_end_compilation() {
                     arena_stat->na_at_peak(),
                     arena_stat->ra_at_peak(),
                     arena_stat->live_nodes_at_peak(),
+                    arena_stat->limit(),
                     result);
   }
   if (print) {
@@ -521,8 +543,8 @@ void CompilationMemoryStatistic::on_arena_change(ssize_t diff, const Arena* aren
         if (ct != compiler_none && name[0] != '\0') {
           ss.print("%s %s: ", compilertype2name(ct), name);
         }
-        ss.print("Hit MemLimit %s (limit: %zu now: %zu)",
-                 (hit_limit_before ? "again" : ""),
+        ss.print("Hit MemLimit %s(limit: %zu now: %zu)",
+                 (hit_limit_before ? "again " : ""),
                  arena_stat->limit(), arena_stat->peak_since_start());
       }
 
diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index ea09e3ebb7f..87d879feac0 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -42,6 +42,23 @@
 #include "runtime/os.hpp"
 #include "utilities/parseInteger.hpp"
 
+// Default compile commands, if defined, are parsed before any of the
+// explicitly defined compile commands. Thus, explicitly defined compile
+// commands take precedence over default compile commands. The effect is
+// as if the default compile commands had been specified at the start of
+// the command line.
+static const char* const default_compile_commands[] = {
+#ifdef ASSERT
+    // In debug builds, impose a (generous) per-compilation memory limit
+    // to catch pathological compilations during testing. The suboption
+    // "crash" will cause the JVM to assert.
+    //
+    // Note: to disable the default limit at the command line,
+    // set a limit of 0 (e.g. -XX:CompileCommand=MemLimit,*.*,0).
+    "MemLimit,*.*,1G~crash",
+#endif
+    nullptr };
+
 static const char* optiontype_names[] = {
 #define enum_of_types(type, name) name,
         OPTION_TYPES(enum_of_types)
@@ -905,6 +922,14 @@ public:
     }
 };
 
+bool CompilerOracle::parse_from_line_quietly(char* line) {
+  const bool quiet0 = _quiet;
+  _quiet = true;
+  const bool result = parse_from_line(line);
+  _quiet = quiet0;
+  return result;
+}
+
 bool CompilerOracle::parse_from_line(char* line) {
   if ((line[0] == '\0') || (line[0] == '#')) {
     return true;
@@ -1107,6 +1132,14 @@ bool CompilerOracle::parse_from_string(const char* str, bool (*parse_line)(char*
 
 bool compilerOracle_init() {
   bool success = true;
+  // Register default compile commands first - any commands specified via CompileCommand will
+  // supersede these default commands.
+  for (int i = 0; default_compile_commands[i] != nullptr; i ++) {
+    char* s = os::strdup(default_compile_commands[i]);
+    success = CompilerOracle::parse_from_line_quietly(s);
+    os::free(s);
+    assert(success, "default compile command \"%s\" failed to parse", default_compile_commands[i]);
+  }
   if (!CompilerOracle::parse_from_string(CompileCommand, CompilerOracle::parse_from_line)) {
     success = false;
   }
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index 43a30b30fac..f330b3b6075 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.hpp
@@ -179,6 +179,7 @@ class CompilerOracle : AllStatic {
   // Reads from string instead of file
   static bool parse_from_string(const char* option_string, bool (*parser)(char*));
   static bool parse_from_line(char* line);
+  static bool parse_from_line_quietly(char* line);
   static bool parse_compile_only(char* line);
 
   // Fast check if there is any option set that compile control needs to know about
diff --git a/test/hotspot/jtreg/compiler/c2/TestFindNode.java b/test/hotspot/jtreg/compiler/c2/TestFindNode.java
index 91a4cdb8d16..ea7649c713a 100644
--- a/test/hotspot/jtreg/compiler/c2/TestFindNode.java
+++ b/test/hotspot/jtreg/compiler/c2/TestFindNode.java
@@ -27,10 +27,13 @@
  * @requires vm.debug == true & vm.flavor == "server"
  * @summary Test which uses some special flags in order to test Node::find() in debug builds which could result in an endless loop or a stack overflow crash.
  *
- * @run main/othervm -Xbatch -XX:CompileCommand=option,*::*,bool,Vectorize,true -XX:+PrintOpto -XX:+TraceLoopOpts compiler.c2.TestFindNode
+ * @run main/othervm -Xbatch -XX:CompileCommand=option,*::*,bool,Vectorize,true -XX:CompileCommand=memlimit,compiler.c2.TestFindNode::*,0
+ *                   -XX:+PrintOpto -XX:+TraceLoopOpts compiler.c2.TestFindNode
  */
 package compiler.c2;
 
+// Note; we disable the implicit memory limit of 1G in debug JVMs until JDK-8331283 is fixed
+
 public class TestFindNode {
     static volatile int[] iArr;
     static volatile int x;
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestDeepGraphVerifyIterativeGVN.java b/test/hotspot/jtreg/compiler/loopopts/TestDeepGraphVerifyIterativeGVN.java
index 87cbd8620d4..bcb4a211368 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestDeepGraphVerifyIterativeGVN.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestDeepGraphVerifyIterativeGVN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,14 @@
  * @summary Test which causes a stack overflow segmentation fault with -XX:VerifyIterativeGVN=1 due to a too deep recursion in Node::verify_recur().
  *
  * @run main/othervm/timeout=600 -Xcomp -XX:VerifyIterativeGVN=1 -XX:CompileCommand=compileonly,compiler.loopopts.TestDeepGraphVerifyIterativeGVN::*
+ *                               -XX:CompileCommand=memlimit,compiler.loopopts.TestDeepGraphVerifyIterativeGVN::*,0
  *                               compiler.loopopts.TestDeepGraphVerifyIterativeGVN
  */
 
 package compiler.loopopts;
 
+// Note; we disable the implicit memory limit of 1G in debug JVMs until JDK-8331295 is fixed
+
 public class TestDeepGraphVerifyIterativeGVN
 {
     static volatile int[] iArr;
diff --git a/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java b/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
index c3ac0ae9c81..f1565db47d9 100644
--- a/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
+++ b/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -55,6 +56,7 @@
 
 package compiler.print;
 
+import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
@@ -64,8 +66,12 @@ import java.util.List;
 
 public class CompileCommandMemLimit {
 
+    // Method we don't specify; default memlimit should apply
     final static String METHOD1 = "method1";
+    // Method we explicitly limit to 4K limit
     final static String METHOD2 = "method2";
+    // Method for which we explicitly disable a limit on the command line.
+    final static String METHOD3 = "method3";
 
     static boolean c2;
     static boolean test_crash;
@@ -77,27 +83,22 @@ public class CompileCommandMemLimit {
             default: throw new RuntimeException("invalid argument");
         }
         c2 = Boolean.parseBoolean(args[1]);
-        test(METHOD1, METHOD2);
-        test(METHOD2, METHOD1);
-    }
-
-    private static void test(String include, String exclude) throws Exception {
-
-        // A method that is known to cost compilers a bit of memory to compile
 
         List<String> options = new ArrayList<String>();
         options.add("-Xcomp");
         options.add("-XX:-Inline");
         options.add("-Xmx100m");
+        options.add("-XX:-CreateCoredumpOnCrash");
         options.add("-XX:CompileCommand=compileonly," + getTestClass() + "::*");
-        // We pass a very small size to guarantee the crash
-        options.add("-XX:CompileCommand=MemStat," + getTestMethod(include) + ",print");
-        if (test_crash) {
-            options.add("-XX:CompileCommand=MemLimit," + getTestMethod(include) + ",4k~crash");
-            options.add("-XX:-CreateCoredumpOnCrash");
-        } else {
-            options.add("-XX:CompileCommand=MemLimit," + getTestMethod(include) + ",4k");
-        }
+
+        // We want a final report
+        options.add("-XX:CompileCommand=MemStat,*.*,print");
+
+        // We limit method 2 to a very small limit that is guaranteed to trigger
+        options.add("-XX:CompileCommand=MemLimit," + getTestMethod(METHOD2) + ",4k" + (test_crash ? "~crash" : ""));
+
+        // We disable any limit set on method 3
+        options.add("-XX:CompileCommand=MemLimit," + getTestMethod(METHOD3) + ",0");
 
         if (c2) {
             options.add("-XX:-TieredCompilation");
@@ -110,20 +111,22 @@ public class CompileCommandMemLimit {
 
         oa.reportDiagnosticSummary();
 
-        String expectedNameIncl = getTestMethod(include)
-                .replace('.', '/')
-                .replace("$", "\\$");
-        String expectedNameExcl = getTestMethod(exclude)
-                .replace('.', '/')
-                .replace("$", "\\$");
-
+        String method1regex = testMethodNameForRegex(getTestMethod(METHOD1));
+        String method2regex = testMethodNameForRegex(getTestMethod(METHOD2));
+        String method3regex = testMethodNameForRegex(getTestMethod(METHOD3));
         String ct = c2 ? "c2" : "c1";
 
         if (test_crash) {
             oa.shouldNotHaveExitValue(0);
             oa.shouldMatch("# *Internal Error.*");
-            oa.shouldMatch("# *fatal error: " + ct + " *" + expectedNameIncl + ".*: Hit MemLimit .*limit: 4096.*");
-            oa.shouldNotMatch(".*" + expectedNameExcl + ".*");
+
+            // method 2 should have hit its tiny limit
+            oa.shouldMatch("# *fatal error: " + ct + " *" + method2regex + ".*: Hit MemLimit .*limit: 4096.*");
+
+            // none of the other ones should have hit a limit
+            oa.shouldNotMatch(method1regex + ".*Hit MemLimit");
+            oa.shouldNotMatch(method3regex + ".*Hit MemLimit");
+
             // Make sure we get a non-zero-sized replay file (JDK-8331314)
             oa.shouldContain("# Compiler replay data is saved as:");
             String replayfile = oa.firstMatch("# (\\S+replay_pid\\d+\\.log)", 1);
@@ -137,18 +140,38 @@ public class CompileCommandMemLimit {
             if (f.length() == 0) {
                 throw new RuntimeException("Replayfile " + replayfile + " has size 0");
             }
-
         } else {
-            // Should see trace output when methods are compiled
-            oa.shouldHaveExitValue(0)
-                    .shouldMatch(".*" + expectedNameIncl + ".*")
-                    .shouldNotMatch(".*" + expectedNameExcl + ".*");
+            oa.shouldHaveExitValue(0);
 
-            // Expect this log line
-            oa.shouldMatch(".*" + expectedNameIncl + ".*Hit MemLimit.*");
+            // In debug builds we have an inbuilt MemLimit. It is very high, so we don't expect it to fire in this test.
+            // But it will still show up in the final report.
+            String implicitMemoryLimit = Platform.isDebugBuild() ? "1024M" : "-";
 
-            // Expect final output to contain "oom"
-            oa.shouldMatch(".*oom.*" + expectedNameIncl + ".*");
+            // With C2, we print number of nodes, with C1 we don't
+            String numberNodesRegex = c2 ? "\\d+" : "-";
+
+            // method 2 should have hit its tiny limit
+            oa.shouldMatch(ct + " " + method2regex + ".*: Hit MemLimit \\(limit: 4096 now: \\d+\\)");
+
+            // neither of the other ones should have hit a limit
+            oa.shouldNotMatch(method1regex + ".*Hit MemLimit");
+            oa.shouldNotMatch(method3regex + ".*Hit MemLimit");
+
+            // Final report:
+            // Method 1 should show up as "ok" and with the default limit, e.g.
+            // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
+            // 32728     0         32728     ok     -       1024M   0.045   c1    1   0x000000011b019c10  compiler/print/CompileCommandMemLimit$TestMain::method1(()J)
+            oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +" + numberNodesRegex + " +" + implicitMemoryLimit + " +.* +" + method1regex);
+
+            // Method 2 should show up as "oom" and with its tiny limit, e.g.
+            // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
+            // 32728     0         32728     oom     -       4096B   0.045   c1    1   0x000000011b019c10  compiler/print/CompileCommandMemLimit$TestMain::method1(()J)
+            oa.shouldMatch("\\d+ +\\d+ +\\d+ +oom +" + numberNodesRegex + " +4096B +.* +" + method2regex);
+
+            // Method 3 should show up as "ok", and with no limit, even in debug builds, e.g.
+            // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
+            // 32728     0         32728     ok     -       -        0.045   c1    1   0x000000011b019c10  compiler/print/CompileCommandMemLimit$TestMain::method1(()J)
+            oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +" + numberNodesRegex + " +- +.* +" + method3regex);
         }
     }
 
@@ -161,16 +184,23 @@ public class CompileCommandMemLimit {
         return getTestClass() + "::" + method;
     }
 
+    private static String testMethodNameForRegex(String m) {
+        return m.replace('.', '/')
+                .replace("$", "\\$");
+    }
+
     public static class TestMain {
         public static void main(String[] args) {
             method1();
             method2();
+            method3();
         }
 
         static long method1() {
             return System.currentTimeMillis();
         }
         static void method2() {}
+        static void method3() {}
     }
 }
 
diff --git a/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java b/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
index c0a99863fbf..c2689d88372 100644
--- a/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
+++ b/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +32,7 @@
 
 package compiler.print;
 
+import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
@@ -68,17 +70,26 @@ public class CompileCommandPrintMemStat {
                 .replace("$", "\\$");
 
         // Should see trace output when methods are compiled
-        oa.shouldHaveExitValue(0)
-          .shouldMatch(".*" + expectedNameIncl + ".*")
-          .shouldNotMatch(".*" + expectedNameExcl + ".*");
+        oa.shouldHaveExitValue(0).
+                shouldMatch("Arena usage.*" + expectedNameIncl + ".*").
+                shouldNotMatch("Arena usage.*" + expectedNameExcl + ".*");
+
 
         // Should see final report
         // Looks like this:
-        // total     NA        RA        result  #nodes  time    type  #rc thread              method
-        // 211488    66440     77624     ok      13      0.057   c2    2   0x00007fb49428db70  compiler/print/CompileCommandPrintMemStat$TestMain::method1(()V)
-        oa.shouldMatch("total.*method");
-        oa.shouldMatch("\\d+ +\\d+ +\\d+ +\\S+ +\\d+.*" + expectedNameIncl + ".*");
-        oa.shouldNotMatch("\\d+ +\\d+ +\\d+ +\\S+ +\\d+.*" + expectedNameExcl + ".*");
+        // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
+        // 2149912   0         1986272   ok      -       -       0.101   c1    1   0x000000015180a600  jdk/internal/org/objectweb/asm/Frame::execute((IILjdk/internal/org/objectweb/asm/Symbol;Ljdk/internal/org/objectweb/asm/SymbolTable;)V)        oa.shouldMatch("total.*method");
+        // or
+        // 537784    98184     208536    ok      267     -       0.096   c2    1   0x0000000153019c00  jdk/internal/classfile/impl/BufWriterImpl::writeU1((I)V) 4521912   0         1986272   ok      -       -       0.101   c1    1   0x000000015180a600  jdk/internal/org/objectweb/asm/Frame::execute((IILjdk/internal/org/objectweb/asm/Symbol;Ljdk/internal/org/objectweb/asm/SymbolTable;)V)        oa.shouldMatch("total.*method");
+        oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +(\\d+|-) +.*" + expectedNameIncl + ".*");
+
+        // In debug builds, we have a default memory limit enabled. That implies MemStat. Therefore we
+        // expect to see all methods, not just the one we specified on the command line.
+        if (Platform.isDebugBuild()) {
+            oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +(\\d+|-) +.*" + expectedNameExcl + ".*");
+        } else {
+            oa.shouldNotMatch(".*" + expectedNameExcl + ".*");
+        }
     }
 
     // Test class that is invoked by the sub process

From c8452615b1f3c4e03caf70e2c72928d49cb816a7 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 8 May 2024 17:56:28 +0000
Subject: [PATCH 366/486] 8331924: Parallel: Remove unused
 MutableSpace::mangle_unused_area_complete

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/parallel/mutableNUMASpace.cpp | 5 +----
 src/hotspot/share/gc/parallel/mutableNUMASpace.hpp | 2 +-
 src/hotspot/share/gc/parallel/mutableSpace.cpp     | 4 ----
 src/hotspot/share/gc/parallel/mutableSpace.hpp     | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index 2a39ce7b470..b4ea1955182 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -79,10 +79,7 @@ void MutableNUMASpace::mangle_unused_area() {
   // This method should do nothing.
   // It can be called on a numa space during a full compaction.
 }
-void MutableNUMASpace::mangle_unused_area_complete() {
-  // This method should do nothing.
-  // It can be called on a numa space during a full compaction.
-}
+
 void MutableNUMASpace::mangle_region(MemRegion mr) {
   // This method should do nothing because numa spaces are not mangled.
 }
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
index 18271fabd05..9a6cf420c0d 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
@@ -173,7 +173,7 @@ public:
 
   virtual void clear(bool mangle_space);
   virtual void mangle_unused_area() PRODUCT_RETURN;
-  virtual void mangle_unused_area_complete() PRODUCT_RETURN;
+
   virtual void mangle_region(MemRegion mr) PRODUCT_RETURN;
   virtual void check_mangled_unused_area(HeapWord* limit) PRODUCT_RETURN;
   virtual void check_mangled_unused_area_complete() PRODUCT_RETURN;
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 4641b4ce5c6..7d881f73dbf 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -167,10 +167,6 @@ void MutableSpace::mangle_unused_area() {
   mangler()->mangle_unused_area();
 }
 
-void MutableSpace::mangle_unused_area_complete() {
-  mangler()->mangle_unused_area_complete();
-}
-
 void MutableSpace::mangle_region(MemRegion mr) {
   SpaceMangler::mangle_region(mr);
 }
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index b77c1d80332..1cf0d306dc0 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -109,7 +109,7 @@ class MutableSpace: public CHeapObj<mtGC> {
 
   // Methods used in mangling.  See descriptions under SpaceMangler.
   virtual void mangle_unused_area() PRODUCT_RETURN;
-  virtual void mangle_unused_area_complete() PRODUCT_RETURN;
+
   virtual void check_mangled_unused_area(HeapWord* limit) PRODUCT_RETURN;
   virtual void check_mangled_unused_area_complete() PRODUCT_RETURN;
   virtual void set_top_for_allocations(HeapWord* v) PRODUCT_RETURN;

From 230fac80f25e9608006c8928a8a7708bf13a818c Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 8 May 2024 17:57:46 +0000
Subject: [PATCH 367/486] 8331941: Make CollectedHeap::parallel_object_iterator
 public

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/shared/collectedHeap.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 0a586e71ac9..b413e3dfb43 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -92,7 +92,6 @@ class CollectedHeap : public CHeapObj<mtGC> {
   friend class JVMCIVMStructs;
   friend class IsSTWGCActiveMark; // Block structured external access to _is_stw_gc_active
   friend class MemAllocator;
-  friend class ParallelObjectIterator;
 
  private:
   GCHeapLog* _gc_heap_log;
@@ -400,12 +399,10 @@ protected:
   // Iterate over all objects, calling "cl.do_object" on each.
   virtual void object_iterate(ObjectClosure* cl) = 0;
 
- protected:
   virtual ParallelObjectIteratorImpl* parallel_object_iterator(uint thread_num) {
     return nullptr;
   }
 
- public:
   // Keep alive an object that was loaded with AS_NO_KEEPALIVE.
   virtual void keep_alive(oop obj) {}
 

From 42b1d858d15fd06de9ce41b08b430b12724652e9 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Wed, 8 May 2024 20:26:02 +0000
Subject: [PATCH 368/486] 8330275: Crash in XMark::follow_array

Reviewed-by: stefank, stuefe
---
 src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp | 8 +++++---
 src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp
index 6204f212703..a9c53da3d01 100644
--- a/src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp
@@ -142,9 +142,11 @@
 //  * 63-48 Fixed (16-bits, always zero)
 //
 
-// Default value if probing is not implemented for a certain platform: 128TB
-static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
-// Minimum value returned, if probing fails: 64GB
+// Default value if probing is not implemented for a certain platform
+// Max address bit is restricted by implicit assumptions in the code, for instance
+// the bit layout of XForwardingEntry or Partial array entry (see XMarkStackEntry) in mark stack
+static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
+// Minimum value returned, if probing fails
 static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
 
 static size_t probe_valid_max_address_bit() {
diff --git a/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
index 6c3cea73d1a..e140525bcbc 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
@@ -36,9 +36,11 @@
 #include <sys/mman.h>
 #endif // LINUX
 
-// Default value if probing is not implemented for a certain platform: 128TB
-static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
-// Minimum value returned, if probing fails: 64GB
+// Default value if probing is not implemented for a certain platform
+// Max address bit is restricted by implicit assumptions in the code, for instance
+// the bit layout of XForwardingEntry or Partial array entry (see XMarkStackEntry) in mark stack
+static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
+// Minimum value returned, if probing fail
 static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
 
 static size_t probe_valid_max_address_bit() {

From 0d1216c7a1dc215550ac769afc21dea91c638215 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 8 May 2024 21:57:44 +0000
Subject: [PATCH 369/486] 8331939: Add custom hook for TestImage

Reviewed-by: mikael
---
 make/TestImage.gmk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/make/TestImage.gmk b/make/TestImage.gmk
index b719d6824da..f6d680fb690 100644
--- a/make/TestImage.gmk
+++ b/make/TestImage.gmk
@@ -28,6 +28,9 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, TestImage-pre.gmk))
+
 ############################################################################
 
 BUILD_INFO_PROPERTIES := $(TEST_IMAGE_DIR)/build-info.properties

From 588e314e4b96f2a48d46ab8a088a7b8d26be318d Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 8 May 2024 21:57:55 +0000
Subject: [PATCH 370/486] 8331886: Allow markdown src file overrides

Reviewed-by: ihse
---
 make/Docs.gmk                   | 41 ++++++++--------
 make/common/ProcessMarkdown.gmk | 86 ++++++++++++++++++---------------
 2 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 2977f6f66f9..192843de9cd 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -681,28 +681,25 @@ ifeq ($(ENABLE_PANDOC), true)
       $(TOPDIR)/make/jdk/src/classes/build/tools/pandocfilter)
 
   $(foreach m, $(ALL_MODULES), \
-    $(eval MAN_$m := $(call FindModuleManDirs, $m)) \
-    $(foreach d, $(MAN_$m), \
-      $(foreach f, $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, $d))), \
-        $(eval $m_$f_NAME := MAN_TO_HTML_$m_$(strip $(call RelativePath, $f, $(TOPDIR)))) \
-        $(eval $(call SetupProcessMarkdown, $($m_$f_NAME), \
-            SRC := $d, \
-            FILES := $f, \
-            DEST := $(DOCS_OUTPUTDIR)/specs/man, \
-            FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \
-            CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
-            REPLACEMENTS := \
-		@@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
-		@@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
-		@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
-            OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
-            POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \
-                --nav-subdirs 1 --nav-link-guides, \
-            EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
-                $(PANDOC_HTML_MANPAGE_FILTER_SOURCE), \
-        )) \
-        $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \
-      ) \
+    $(eval MAN_$m := $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, \
+          $(call FindModuleManDirs, $m))))) \
+    $(if $(MAN_$m), \
+      $(eval $(call SetupProcessMarkdown, MAN_TO_HTML_$m, \
+        FILES := $(MAN_$m), \
+        DEST := $(DOCS_OUTPUTDIR)/specs/man, \
+        FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \
+        CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
+        REPLACEMENTS := \
+            @@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
+            @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
+            @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
+        OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
+        POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \
+            --nav-subdirs 1 --nav-link-guides, \
+        EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
+            $(PANDOC_HTML_MANPAGE_FILTER_SOURCE), \
+      )) \
+      $(eval JDK_SPECS_TARGETS += $(MAN_TO_HTML_$m)) \
     ) \
   )
 
diff --git a/make/common/ProcessMarkdown.gmk b/make/common/ProcessMarkdown.gmk
index e78c026a89c..125892504f9 100644
--- a/make/common/ProcessMarkdown.gmk
+++ b/make/common/ProcessMarkdown.gmk
@@ -38,48 +38,53 @@ define ProcessMarkdown
   $1_$2_INPUT_FILE := $3/$2
   $1_$2_MARKER := $$(subst /,_,$1_$2)
 
-  ifneq ($$($1_REPLACEMENTS), )
-    $1_$2_PANDOC_INPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_pre.tmp
+  # Only continue if this target file hasn't been processed already. This lets
+  # the first found source file override any other with the same name.
+  ifeq ($$($1_$2_OUTPUT_FILE_PROCESSED), )
+    $1_$2_OUTPUT_FILE_PROCESSED := true
 
-    $$(eval $$(call SetupTextFileProcessing, $1_$2_PREPROCESSED, \
-        SOURCE_FILES := $$($1_$2_INPUT_FILE), \
-        OUTPUT_FILE := $$($1_$2_PANDOC_INPUT), \
-        REPLACEMENTS := $$($1_REPLACEMENTS), \
-    ))
-  else
-    $1_$2_PANDOC_INPUT := $$($1_$2_INPUT_FILE)
-  endif
+    ifneq ($$($1_REPLACEMENTS), )
+      $1_$2_PANDOC_INPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_pre.tmp
 
-  ifneq ($$($1_POST_PROCESS), )
-    $1_$2_PANDOC_OUTPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post.tmp
-  else
-    $1_$2_PANDOC_OUTPUT := $$($1_$2_OUTPUT_FILE)
-  endif
-
-  ifneq ($$($1_CSS), )
-    ifneq ($$(findstring https:/, $$($1_CSS)), )
-      $1_$2_CSS_OPTION := --css '$$($1_CSS)'
+      $$(eval $$(call SetupTextFileProcessing, $1_$2_PREPROCESSED, \
+          SOURCE_FILES := $$($1_$2_INPUT_FILE), \
+          OUTPUT_FILE := $$($1_$2_PANDOC_INPUT), \
+          REPLACEMENTS := $$($1_REPLACEMENTS), \
+      ))
     else
-      $1_$2_CSS := $$(strip $$(call RelativePath, $$($1_CSS), $$($1_$2_TARGET_DIR)))
-      $1_$2_CSS_OPTION := --css '$$($1_$2_CSS)'
+      $1_$2_PANDOC_INPUT := $$($1_$2_INPUT_FILE)
     endif
-  endif
 
-  # This does not need to be included in VARDEPS since it's from the actual
-  # source file. Only run the shell if the recipe gets executed below.
-  $1_$2_OPTIONS_FROM_SRC = \
-      $$(shell $$(GREP) _pandoc-options_: $3/$2 | $$(CUT) -d : -f 2-)
+    ifneq ($$($1_POST_PROCESS), )
+      $1_$2_PANDOC_OUTPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post.tmp
+    else
+      $1_$2_PANDOC_OUTPUT := $$($1_$2_OUTPUT_FILE)
+    endif
 
-  ifneq ($$($1_FILTER), )
-    $1_$2_OPTIONS := --filter $$($1_FILTER)
-  endif
+    ifneq ($$($1_CSS), )
+      ifneq ($$(findstring https:/, $$($1_CSS)), )
+        $1_$2_CSS_OPTION := --css '$$($1_CSS)'
+      else
+        $1_$2_CSS := $$(strip $$(call RelativePath, $$($1_CSS), $$($1_$2_TARGET_DIR)))
+        $1_$2_CSS_OPTION := --css '$$($1_$2_CSS)'
+      endif
+    endif
 
-  $1_$2_VARDEPS := $$($1_OPTIONS) $$($1_$2_OPTIONS) $$($1_CSS) \
-      $$($1_REPLACEMENTS) $$($1_POST_PROCESS)
-  $1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, \
-      $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER).vardeps)
+    # This does not need to be included in VARDEPS since it's from the actual
+    # source file. Only run the shell if the recipe gets executed below.
+    $1_$2_OPTIONS_FROM_SRC = \
+        $$(shell $$(GREP) _pandoc-options_: $3/$2 | $$(CUT) -d : -f 2-)
 
-  $$($1_$2_PANDOC_OUTPUT): $$($1_$2_PANDOC_INPUT) $$($1_$2_VARDEPS_FILE) $$($1_EXTRA_DEPS)
+    ifneq ($$($1_FILTER), )
+      $1_$2_OPTIONS := --filter $$($1_FILTER)
+    endif
+
+    $1_$2_VARDEPS := $$($1_OPTIONS) $$($1_$2_OPTIONS) $$($1_CSS) \
+        $$($1_REPLACEMENTS) $$($1_POST_PROCESS)
+    $1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, \
+        $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER).vardeps)
+
+    $$($1_$2_PANDOC_OUTPUT): $$($1_$2_PANDOC_INPUT) $$($1_$2_VARDEPS_FILE) $$($1_EXTRA_DEPS)
 	$$(call LogInfo, Converting $2 to $$($1_FORMAT))
 	$$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$(dir $$($1_$2_PANDOC_OUTPUT)))
 	$$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER), \
@@ -96,17 +101,18 @@ define ProcessMarkdown
 	  fi
         endif
 
-  # If we have no post processing, PANDOC_OUTPUT is set to OUTPUT_FILE. Otherwise
-  # PANDOC_OUTPUT is a temporary file, and we must now create the real OUTPUT_FILE.
-  ifneq ($$($1_POST_PROCESS), )
-    $$($1_$2_OUTPUT_FILE): $$($1_$2_PANDOC_OUTPUT)
+    # If we have no post processing, PANDOC_OUTPUT is set to OUTPUT_FILE. Otherwise
+    # PANDOC_OUTPUT is a temporary file, and we must now create the real OUTPUT_FILE.
+    ifneq ($$($1_POST_PROCESS), )
+      $$($1_$2_OUTPUT_FILE): $$($1_$2_PANDOC_OUTPUT)
 	$$(call LogInfo, Post-processing markdown file $2)
 	$$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$($1_$2_TARGET_DIR))
 	$$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post, \
 	    ( $$($1_POST_PROCESS) $$($1_$2_PANDOC_OUTPUT) > $$($1_$2_OUTPUT_FILE) ) )
-  endif
+    endif
 
-  $1 += $$($1_$2_OUTPUT_FILE)
+    $1 += $$($1_$2_OUTPUT_FILE)
+  endif
 endef
 
 ################################################################################

From 2d622152b07bba0aba8fd5b1e24293e28d6e69f5 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vpetko@openjdk.org>
Date: Wed, 8 May 2024 22:36:25 +0000
Subject: [PATCH 371/486] 8331541: [i386] linking with libjvm.so fails after
 JDK-8283326

Reviewed-by: djelinski, ihse
---
 make/autoconf/flags-ldflags.m4                        | 1 -
 src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index acb815515a2..c4a75fb89c3 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -118,7 +118,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Setup LDFLAGS for linking executables
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -Wl,--allow-shlib-undefined"
     # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
     # java heap.
     if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
diff --git a/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S b/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S
index 54775cb7e8e..a0f8577d8d1 100644
--- a/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S
+++ b/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S
@@ -36,7 +36,7 @@
     #  8(%esp) : default value
     #  4(%esp) : crash address
     #  0(%esp) : return pc
-    .type _SafeFetch32_impl,@function
+    .type SafeFetch32_impl,@function
 SafeFetch32_impl:
     movl 4(%esp),%ecx         # load address from stack
 _SafeFetch32_fault:

From 964d60892eec5e64942b49182a4c6d4105620acd Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Thu, 9 May 2024 07:05:18 +0000
Subject: [PATCH 372/486] 8322753: RISC-V: C2 ReverseBytesV

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |  5 ++--
 src/hotspot/cpu/riscv/riscv_v.ad              | 29 ++++++++++++++++++-
 .../vectorapi/VectorReverseBytesTest.java     |  3 +-
 .../vectorization/TestReverseBytes.java       |  3 +-
 .../vectorization/runner/BasicCharOpTest.java |  3 ++
 .../runner/BasicShortOpTest.java              |  3 ++
 6 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 0fe91d99066..614e4ee3d18 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1887,8 +1887,9 @@ enum Nf {
   }
 
   // Vector Bit-manipulation used in Cryptography (Zvkb) Extension
-  INSN(vbrev8_v, 0b1010111, 0b010, 0b01000, 0b010010);
-  INSN(vrev8_v,  0b1010111, 0b010, 0b01001, 0b010010);
+  INSN(vbrev_v,  0b1010111, 0b010, 0b01010, 0b010010); // reverse bits in every element
+  INSN(vbrev8_v, 0b1010111, 0b010, 0b01000, 0b010010); // reverse bits in every byte of element
+  INSN(vrev8_v,  0b1010111, 0b010, 0b01001, 0b010010); // reverse bytes in every elememt
 
 #undef INSN
 
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 0879f62600e..863d3772379 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -73,6 +73,7 @@ source %{
           return false;
         }
         break;
+      case Op_ReverseBytesV:
       case Op_PopCountVL:
       case Op_PopCountVI:
         return UseZvbb;
@@ -3756,6 +3757,32 @@ instruct vsignum_reg(vReg dst, vReg zero, vReg one, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// -------------------------------- Reverse Bytes Vector Operations ------------------------
+
+instruct vreverse_bytes_masked(vReg dst, vReg src, vRegMask_V0 v0) %{
+  match(Set dst (ReverseBytesV src v0));
+  format %{ "vreverse_bytes_masked $dst, $src, v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vrev8_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreverse_bytes(vReg dst, vReg src) %{
+  match(Set dst (ReverseBytesV src));
+  format %{ "vreverse_bytes $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vrev8_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ---------------- Convert Half Floating to Floating Vector Operations ----------------
 
 // half precision -> single
@@ -3790,7 +3817,7 @@ instruct vconvF2HF(vReg dst, vReg src, vReg vtmp, vRegMask_V0 v0, iRegINoSp tmp)
 
 // ------------------------------ Popcount vector ------------------------------
 
-instruct vpopcount_mask(vReg dst, vReg src, vRegMask_V0 v0) %{
+instruct vpopcount_masked(vReg dst, vReg src, vRegMask_V0 v0) %{
   match(Set dst (PopCountVI src v0));
   match(Set dst (PopCountVL src v0));
   ins_cost(VEC_COST);
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorReverseBytesTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorReverseBytesTest.java
index 154567922bd..bfb95c0651c 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorReverseBytesTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorReverseBytesTest.java
@@ -42,7 +42,8 @@ import jdk.test.lib.Utils;
  * @library /test/lib /
  * @summary [vectorapi] REVERSE_BYTES for byte type should not emit any instructions
  * @requires vm.compiler2.enabled
- * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.arch == "aarch64"
+ * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.arch == "aarch64" |
+ *           (os.arch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
  * @modules jdk.incubator.vector
  *
  * @run driver compiler.vectorapi.VectorReverseBytesTest
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java b/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
index 47813e2790e..71c9114121c 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestReverseBytes.java
@@ -25,7 +25,8 @@
  * @bug 8288112
  * @summary Auto-vectorization of ReverseBytes operations.
  * @requires vm.compiler2.enabled
- * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.simpleArch == "AArch64"
+ * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.simpleArch == "AArch64" |
+ *           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
  * @library /test/lib /
  * @run driver compiler.vectorization.TestReverseBytes
  */
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
index d851af1ff59..6131e58d156 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
@@ -227,6 +227,9 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
         counts = {IRNode.REVERSE_BYTES_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"zvbb", "true"},
+        counts = {IRNode.REVERSE_BYTES_VS, ">0"})
     public char[] reverseBytesWithChar() {
         char[] res = new char[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
index c9a06c11360..363daf3a115 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
@@ -250,6 +250,9 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
         counts = {IRNode.REVERSE_BYTES_VS, ">0"})
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"zvbb", "true"},
+        counts = {IRNode.REVERSE_BYTES_VS, ">0"})
     public short[] reverseBytesWithShort() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {

From ac86f59e4f5382d5c3e8984532dd210611db7dcb Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 9 May 2024 07:43:03 +0000
Subject: [PATCH 373/486] 8330532: Improve line-oriented text parsing in
 HotSpot

Co-authored-by: John R Rose <jrose@openjdk.org>
Reviewed-by: matsaave, jsjolen
---
 src/hotspot/share/cds/classListParser.cpp     | 131 +++---
 src/hotspot/share/cds/classListParser.hpp     |  22 +-
 src/hotspot/share/compiler/compilerOracle.cpp |  57 +--
 src/hotspot/share/compiler/compilerOracle.hpp |  11 +-
 src/hotspot/share/utilities/istream.cpp       | 368 +++++++++++++++++
 src/hotspot/share/utilities/istream.hpp       | 386 ++++++++++++++++++
 src/hotspot/share/utilities/ostream.cpp       |  19 +-
 src/hotspot/share/utilities/ostream.hpp       |  19 +-
 test/hotspot/gtest/utilities/test_istream.cpp | 322 +++++++++++++++
 .../runtime/cds/appcds/LongClassListPath.java |   3 +-
 .../appcds/customLoader/ClassListFormatA.java |  89 ++--
 11 files changed, 1268 insertions(+), 159 deletions(-)
 create mode 100644 src/hotspot/share/utilities/istream.cpp
 create mode 100644 src/hotspot/share/utilities/istream.hpp
 create mode 100644 test/hotspot/gtest/utilities/test_istream.cpp

diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index b17da725deb..4e49cd3d881 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -50,30 +50,24 @@
 #include "runtime/javaCalls.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/utf8.hpp"
 
 volatile Thread* ClassListParser::_parsing_thread = nullptr;
 ClassListParser* ClassListParser::_instance = nullptr;
 
-ClassListParser::ClassListParser(const char* file, ParseMode parse_mode) : _id2klass_table(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE) {
+ClassListParser::ClassListParser(const char* file, ParseMode parse_mode) :
+    _classlist_file(file),
+    _id2klass_table(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE),
+    _file_input(do_open(file), /* need_close=*/true),
+    _input_stream(&_file_input) {
   log_info(cds)("Parsing %s%s", file,
                 (parse_mode == _parse_lambda_forms_invokers_only) ? " (lambda form invokers only)" : "");
-  _classlist_file = file;
-  _file = nullptr;
-  // Use os::open() because neither fopen() nor os::fopen()
-  // can handle long path name on Windows.
-  int fd = os::open(file, O_RDONLY, S_IREAD);
-  if (fd != -1) {
-    // Obtain a File* from the file descriptor so that fgets()
-    // can be used in parse_one_line()
-    _file = os::fdopen(fd, "r");
-  }
-  if (_file == nullptr) {
+  if (!_file_input.is_open()) {
     char errmsg[JVM_MAXPATHLEN];
     os::lasterror(errmsg, JVM_MAXPATHLEN);
     vm_exit_during_initialization("Loading classlist failed", errmsg);
   }
-  _line_no = 0;
-  _token = _line;
+  _token = _line = nullptr;
   _interfaces = new (mtClass) GrowableArray<int>(10, mtClass);
   _indy_items = new (mtClass) GrowableArray<const char*>(9, mtClass);
   _parse_mode = parse_mode;
@@ -84,14 +78,24 @@ ClassListParser::ClassListParser(const char* file, ParseMode parse_mode) : _id2k
   Atomic::store(&_parsing_thread, Thread::current());
 }
 
+FILE* ClassListParser::do_open(const char* file) {
+  // Use os::open() because neither fopen() nor os::fopen()
+  // can handle long path name on Windows. (See JDK-8216184)
+  int fd = os::open(file, O_RDONLY, S_IREAD);
+  FILE* fp = nullptr;
+  if (fd != -1) {
+    // Obtain a FILE* from the file descriptor so that _input_stream
+    // can be used in ClassListParser::parse()
+    fp = os::fdopen(fd, "r");
+  }
+  return fp;
+}
+
 bool ClassListParser::is_parsing_thread() {
   return Atomic::load(&_parsing_thread) == Thread::current();
 }
 
 ClassListParser::~ClassListParser() {
-  if (_file != nullptr) {
-    fclose(_file);
-  }
   Atomic::store(&_parsing_thread, (Thread*)nullptr);
   delete _indy_items;
   delete _interfaces;
@@ -101,7 +105,15 @@ ClassListParser::~ClassListParser() {
 int ClassListParser::parse(TRAPS) {
   int class_count = 0;
 
-  while (parse_one_line()) {
+  for (; !_input_stream.done(); _input_stream.next()) {
+    _line = _input_stream.current_line();
+    if (*_line == '#') { // comment
+      continue;
+    }
+    if (!parse_one_line()) {
+      break;
+    }
+
     if (lambda_form_line()) {
       // The current line is "@lambda-form-invoker ...". It has been recorded in LambdaFormInvokers,
       // and will be processed later.
@@ -112,6 +124,7 @@ int ClassListParser::parse(TRAPS) {
       continue;
     }
 
+    check_class_name(_class_name);
     TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name);
     if (_indy_items->length() > 0) {
       // The current line is "@lambda-proxy class_name". Load the proxy class.
@@ -165,43 +178,26 @@ int ClassListParser::parse(TRAPS) {
 }
 
 bool ClassListParser::parse_one_line() {
-  for (;;) {
-    if (fgets(_line, sizeof(_line), _file) == nullptr) {
-      return false;
-    }
-    ++ _line_no;
-    _line_len = (int)strlen(_line);
-    if (_line_len > _max_allowed_line_len) {
-      error("input line too long (must be no longer than %d chars)", _max_allowed_line_len);
-    }
-    if (*_line == '#') { // comment
-      continue;
-    }
-
-    {
-      int len = (int)strlen(_line);
-      int i;
-      // Replace \t\r\n\f with ' '
-      for (i=0; i<len; i++) {
-        if (_line[i] == '\t' || _line[i] == '\r' || _line[i] == '\n' || _line[i] == '\f') {
-          _line[i] = ' ';
-        }
+  {
+    int len = (int)strlen(_line);
+    int i;
+    // Replace \t\r\n\f with ' '
+    for (i=0; i<len; i++) {
+      if (_line[i] == '\t' || _line[i] == '\r' || _line[i] == '\n' || _line[i] == '\f') {
+        _line[i] = ' ';
       }
-
-      // Remove trailing newline/space
-      while (len > 0) {
-        if (_line[len-1] == ' ') {
-          _line[len-1] = '\0';
-          len --;
-        } else {
-          break;
-        }
-      }
-      _line_len = len;
     }
 
-    // valid line
-    break;
+    // Remove trailing newline/space
+    while (len > 0) {
+      if (_line[len-1] == ' ') {
+        _line[len-1] = '\0';
+        len --;
+      } else {
+        break;
+      }
+    }
+    _line_len = len;
   }
 
   _class_name = _line;
@@ -286,7 +282,7 @@ int ClassListParser::split_at_tag_from_line() {
   _token = _line;
   char* ptr;
   if ((ptr = strchr(_line, ' ')) == nullptr) {
-    error("Too few items following the @ tag \"%s\" line #%d", _line, _line_no);
+    error("Too few items following the @ tag \"%s\" line #%zu", _line, lineno());
     return 0;
   }
   *ptr++ = '\0';
@@ -304,7 +300,7 @@ bool ClassListParser::parse_at_tags() {
   if (strcmp(_token, LAMBDA_PROXY_TAG) == 0) {
     split_tokens_by_whitespace(offset);
     if (_indy_items->length() < 2) {
-      error("Line with @ tag has too few items \"%s\" line #%d", _token, _line_no);
+      error("Line with @ tag has too few items \"%s\" line #%zu", _token, lineno());
       return false;
     }
     // set the class name
@@ -315,7 +311,7 @@ bool ClassListParser::parse_at_tags() {
     _lambda_form_line = true;
     return true;
   } else {
-    error("Invalid @ tag at the beginning of line \"%s\" line #%d", _token, _line_no);
+    error("Invalid @ tag at the beginning of line \"%s\" line #%zu", _token, lineno());
     return false;
   }
 }
@@ -423,8 +419,8 @@ void ClassListParser::error(const char* msg, ...) {
   }
 
   jio_fprintf(defaultStream::error_stream(),
-              "An error has occurred while processing class list file %s %d:%d.\n",
-              _classlist_file, _line_no, (error_index + 1));
+              "An error has occurred while processing class list file %s %zu:%d.\n",
+              _classlist_file, lineno(), (error_index + 1));
   jio_vfprintf(defaultStream::error_stream(), msg, ap);
 
   if (_line_len <= 0) {
@@ -450,6 +446,25 @@ void ClassListParser::error(const char* msg, ...) {
   va_end(ap);
 }
 
+void ClassListParser::check_class_name(const char* class_name) {
+  const char* err = nullptr;
+  size_t len = strlen(class_name);
+  if (len > (size_t)Symbol::max_length()) {
+    err = "class name too long";
+  } else {
+    assert(Symbol::max_length() < INT_MAX && len < INT_MAX, "must be");
+    if (!UTF8::is_legal_utf8((const unsigned char*)class_name, (int)len, /*version_leq_47*/false)) {
+      err = "class name is not valid UTF8";
+    }
+  }
+  if (err != nullptr) {
+    jio_fprintf(defaultStream::error_stream(),
+              "An error has occurred while processing class list file %s:%zu %s\n",
+              _classlist_file, lineno(), err);
+    vm_exit_during_initialization("class list format error.", nullptr);
+  }
+}
+
 // This function is used for loading classes for customized class loaders
 // during archive dumping.
 InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS) {
diff --git a/src/hotspot/share/cds/classListParser.hpp b/src/hotspot/share/cds/classListParser.hpp
index 74a2ff10515..a383e04d8e6 100644
--- a/src/hotspot/share/cds/classListParser.hpp
+++ b/src/hotspot/share/cds/classListParser.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/istream.hpp"
 #include "utilities/resizeableResourceHash.hpp"
 
 #define LAMBDA_PROXY_TAG "@lambda-proxy"
@@ -80,14 +81,6 @@ private:
 
   enum {
     _unspecified      = -999,
-
-    // Max number of bytes allowed per line in the classlist.
-    // Theoretically Java class names could be 65535 bytes in length. Also, an input line
-    // could have a very long path name up to JVM_MAXPATHLEN bytes in length. In reality,
-    // 4K bytes is more than enough.
-    _max_allowed_line_len = 4096,
-    _line_buf_extra       = 10, // for detecting input too long
-    _line_buf_size        = _max_allowed_line_len + _line_buf_extra
   };
 
   // Use a small initial size in debug build to test resizing logic
@@ -96,16 +89,14 @@ private:
   static volatile Thread* _parsing_thread; // the thread that created _instance
   static ClassListParser* _instance; // the singleton.
   const char* _classlist_file;
-  FILE* _file;
 
   ID2KlassTable _id2klass_table;
 
-  // The following field contains information from the *current* line being
-  // parsed.
-  char                _line[_line_buf_size];  // The buffer that holds the current line. Some characters in
+  FileInput           _file_input;
+  inputStream         _input_stream;
+  char*               _line;                  // The buffer that holds the current line. Some characters in
                                               // the buffer may be overwritten by '\0' during parsing.
   int                 _line_len;              // Original length of the input line.
-  int                 _line_no;               // Line number for current line being parsed
   const char*         _class_name;
   GrowableArray<const char*>* _indy_items;    // items related to invoke dynamic for archiving lambda proxy classes
   int                 _id;
@@ -132,6 +123,8 @@ private:
   bool parse_one_line();
   Klass* load_current_class(Symbol* class_name_symbol, TRAPS);
 
+  size_t lineno() { return _input_stream.lineno(); }
+  FILE* do_open(const char* file);
   ClassListParser(const char* file, ParseMode _parse_mode);
   ~ClassListParser();
 
@@ -183,6 +176,7 @@ public:
       error("%s id %d is not yet loaded", which, id);
     }
   }
+  void check_class_name(const char* class_name);
 
   const char* current_class_name() {
     return _class_name;
diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index 87d879feac0..a81d60c9fc4 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -40,6 +40,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/os.hpp"
+#include "utilities/istream.hpp"
 #include "utilities/parseInteger.hpp"
 
 // Default compile commands, if defined, are parsed before any of the
@@ -1081,53 +1082,27 @@ bool CompilerOracle::parse_from_file() {
     return true;
   }
 
-  char token[1024];
-  int  pos = 0;
-  int  c = getc(stream);
+  FileInput input(stream, /*need_close=*/ true);
+  return parse_from_input(&input, parse_from_line);
+}
+
+bool CompilerOracle::parse_from_input(inputStream::Input* input,
+                                      CompilerOracle::
+                                      parse_from_line_fn_t* parse_from_line) {
   bool success = true;
-  while(c != EOF && pos < (int)(sizeof(token)-1)) {
-    if (c == '\n') {
-      token[pos++] = '\0';
-      if (!parse_from_line(token)) {
-        success = false;
-      }
-      pos = 0;
-    } else {
-      token[pos++] = c;
+  for (inputStream in(input); !in.done(); in.next()) {
+    if (!parse_from_line(in.current_line())) {
+      success = false;
     }
-    c = getc(stream);
   }
-  token[pos++] = '\0';
-  if (!parse_from_line(token)) {
-    success = false;
-  }
-  fclose(stream);
   return success;
 }
 
-bool CompilerOracle::parse_from_string(const char* str, bool (*parse_line)(char*)) {
-  char token[1024];
-  int  pos = 0;
-  const char* sp = str;
-  int  c = *sp++;
-  bool success = true;
-  while (c != '\0' && pos < (int)(sizeof(token)-1)) {
-    if (c == '\n') {
-      token[pos++] = '\0';
-      if (!parse_line(token)) {
-        success = false;
-      }
-      pos = 0;
-    } else {
-      token[pos++] = c;
-    }
-    c = *sp++;
-  }
-  token[pos++] = '\0';
-  if (!parse_line(token)) {
-    success = false;
-  }
-  return success;
+bool CompilerOracle::parse_from_string(const char* str,
+                                       CompilerOracle::
+                                       parse_from_line_fn_t* parse_from_line) {
+  MemoryInput input(str, strlen(str));
+  return parse_from_input(&input, parse_from_line);
 }
 
 bool compilerOracle_init() {
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index f330b3b6075..1a85e0629f9 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.hpp
@@ -27,6 +27,7 @@
 
 #include "memory/allStatic.hpp"
 #include "oops/oopsHierarchy.hpp"
+#include "utilities/istream.hpp"
 
 class methodHandle;
 
@@ -120,11 +121,18 @@ enum class MemStatAction {
 };
 
 class CompilerOracle : AllStatic {
+ public:
+  typedef bool parse_from_line_fn_t(char*);
+
  private:
   static bool _quiet;
   static void print_parse_error(char* error_msg, char* original_line);
   static void print_command(CompileCommandEnum option, const char* name, enum OptionType type);
 
+  // The core parser.
+  static bool parse_from_input(inputStream::Input* input,
+                               parse_from_line_fn_t* parse_from_line);
+
  public:
   // True if the command file has been specified or is implicit
   static bool has_command_file();
@@ -177,7 +185,8 @@ class CompilerOracle : AllStatic {
   static bool option_matches_type(CompileCommandEnum option, T& value);
 
   // Reads from string instead of file
-  static bool parse_from_string(const char* option_string, bool (*parser)(char*));
+  static bool parse_from_string(const char* option_string,
+                                parse_from_line_fn_t* parser);
   static bool parse_from_line(char* line);
   static bool parse_from_line_quietly(char* line);
   static bool parse_compile_only(char* line);
diff --git a/src/hotspot/share/utilities/istream.cpp b/src/hotspot/share/utilities/istream.cpp
new file mode 100644
index 00000000000..cb082128c62
--- /dev/null
+++ b/src/hotspot/share/utilities/istream.cpp
@@ -0,0 +1,368 @@
+/*
+ * Copyright (c) 2024, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "memory/allocation.inline.hpp"
+#include "runtime/orderAccess.hpp"
+#include "utilities/istream.hpp"
+#include "utilities/ostream.hpp"
+#include "utilities/xmlstream.hpp"
+
+#ifndef ASSERT
+#define COV(casen) {}
+#else //ASSERT
+// Support for coverage testing.  Used by the gtest.
+/* $ sed < istream.cpp '/^.* COV(\([A-Z][^)]*\)).*$/!d;s//COV_FN(\1)/' |
+     tr '\12' ' ' | fold -sw72 | sed 's| $||;s|.*|  & \\|'
+  */
+#define DO_COV_CASES(COV_FN) \
+  COV_FN(NXT_L) COV_FN(NXT_N) COV_FN(FIB_P) COV_FN(FIB_E) COV_FN(FIB_N) \
+  COV_FN(FIB_L) COV_FN(PFB_C) COV_FN(PFB_P) COV_FN(PFB_A) \
+  COV_FN(PFB_G) COV_FN(PFB_H) COV_FN(SBC_C) COV_FN(SBC_B) COV_FN(SBC_N) \
+  COV_FN(SBC_L) COV_FN(EXB_R) COV_FN(EXB_A)
+  /**/
+#define COV_COUNT(casename) coverage_case_##casename
+#define DECLARE_COV_CASE(casename) static int COV_COUNT(casename);
+DO_COV_CASES(DECLARE_COV_CASE)
+#undef DECLARE_COV_CASE
+
+static int current_coverage_mode = 0;
+#define COV(casename) {                                 \
+    if (current_coverage_mode != 0) {                   \
+      COV_COUNT(casename)++;                            \
+    }                                                  }
+#endif //ASSERT
+
+bool inputStream::next() {
+  // We have to look at the current line first, just in case nobody
+  // actually called current_line() or done().
+  preload();
+  if (definitely_done()) {
+    return false;         // OK to call this->next() after done is true
+  }
+  // current line is at buffer[beg..end]; now skip past its '\0'
+  assert(have_current_line(), "");
+
+  set_buffer_content(_next, _content_end);
+  if (!need_to_read()) {  // any next line was already in the buffer
+    COV(NXT_L);
+    assert(have_current_line(), "");
+    return true;
+  } else {                // go back to the source for more
+    COV(NXT_N);
+    return fill_buffer();
+  }
+}
+
+void inputStream::set_done() {
+  size_t end = _beg = _end = _content_end;
+  _next = end + NEXT_PHANTOM;
+  _line_ending = 0;
+  assert(definitely_done(), "");
+}
+
+void inputStream::set_error(bool error_condition) {
+  if (error_condition) {
+    set_done();
+    _input_state = IState::ERR_STATE;
+    assert(error(), "");
+  } else if (error()) {
+    _input_state = definitely_done() ? IState::EOF_STATE : IState::NTR_STATE;
+  }
+}
+
+void inputStream::clear_buffer() {
+  _content_end = _beg = _end = _next = 0;
+  _line_ending = 0;
+}
+
+const char* inputStream::next_content(size_t& next_content_length) const {
+  assert(is_sane(), "");
+  size_t len = buffered_content_length(false);
+  next_content_length = len;
+  return len == 0 ? "" : &_buffer[_next];
+}
+
+void inputStream::set_input(inputStream::Input* input) {
+  clear_buffer();
+  _input = input;
+  _input_state = IState::NTR_STATE;
+}
+
+bool inputStream::fill_buffer() {
+  size_t fill_offset, fill_length;
+  assert(!definitely_done(), "");  // caller responsibility
+  while (need_to_read()) {
+    prepare_to_fill_buffer(fill_offset, fill_length);
+    if (error())  return false;
+    assert(fill_length > 0, "");
+    assert(fill_offset < _buffer_size, "");
+    assert(fill_offset + fill_length <= _buffer_size, "");
+    size_t nr = 0;
+    if (_input != nullptr && _input_state == IState::NTR_STATE) {
+      nr = _input->read(&_buffer[fill_offset], fill_length);
+      if (nr == 0)  _input_state = IState::EOF_STATE;  // do not get EOF twice
+    }
+    bool last_partial = false;
+    if (nr > 0) {
+      fill_offset += nr;
+    } else if (_beg == _end) {  // no partial line, so end it now
+      // we hit the end of the file (or there was never anything there)
+      COV(FIB_P);
+      assert(!definitely_done(), "");
+      set_done();
+      assert(definitely_done(), "");
+      return false;
+    } else {
+      // pretend to read a newline, to complete the last partial line
+      COV(FIB_E);
+      _buffer[fill_offset++] = '\n';  // insert phantom newline
+      last_partial = true;
+    }
+    set_buffer_content(_beg, fill_offset);
+    assert(!definitely_done(), "");
+    if (need_to_read()) { COV(FIB_N); }
+    else                { COV(FIB_L); }
+    if (last_partial) {
+      assert(have_current_line(), "");
+      _line_ending = 0;
+      _content_end -= 1;  // reverse insertion of phantom newline
+      assert(_next == _content_end + NEXT_PHANTOM, "");
+      assert(have_current_line(), "");
+    }
+  }
+  return true;
+}
+
+// Find some space in the buffer for reading.  If there is already a
+// partial line in the buffer, new space must follow it immediately.
+// The partial line is between _beg and _end, and no other parts of
+// the buffer are in use.
+void inputStream::prepare_to_fill_buffer(size_t& fill_offset,
+                                         size_t& fill_length) {
+  assert(need_to_read(), "");  // _next pointer out of the way
+  size_t end = _content_end;
+  if (_beg == end) { // if no partial line present...
+    COV(PFB_C);
+    clear_buffer();
+    fill_offset = 0;
+    fill_length = _buffer_size;
+    return;   // use the whole buffer
+  }
+  // at this point we have a pending line that needs more input
+  if (_beg > 0 && (_input != nullptr || end == _buffer_size)) {
+    COV(PFB_P);
+    // compact the buffer by overwriting characters from previous lines
+    size_t shift_left = _beg;
+    ::memmove(_buffer, _buffer + shift_left, _content_end - _beg);
+    _beg -= shift_left;
+    _end -= shift_left;
+    _next -= shift_left;
+    _content_end -= shift_left;
+    end = _content_end;
+  }
+  if (end < _buffer_size) {
+    COV(PFB_A);
+    fill_offset = end;
+    fill_length = _buffer_size - end;
+    return;   // use the whole buffer except partial line at the beginning
+  }
+  // the whole buffer contains a partial line, which means we must expand
+  COV(PFB_G);
+  size_t new_size = (_buffer_size < BIG_SIZE ? BIG_SIZE
+                     : _buffer_size + _buffer_size / 2);
+  assert(new_size > _buffer_size, "");
+  if (expand_buffer(new_size)) {
+    COV(PFB_H);
+    fill_offset = end;
+    fill_length = _buffer_size - end;
+    return;   // use the expanded buffer, except the partial line
+  }
+  // no recovery from failed allocation; just set the error state and bail
+  set_error();
+}
+
+// The only buffer content is between the given offsets.
+// Set _beg, _end, _next, and _content_end appropriately.
+void inputStream::set_buffer_content(size_t content_start,
+                                     size_t content_end) {
+  assert(content_end <= _buffer_size, "");
+  assert(content_start <= content_end + NEXT_PHANTOM, "");
+  if (content_start >= content_end) {   // empty content; clear buffer
+    COV(SBC_C);
+    clear_buffer();
+    return;
+  }
+  COV(SBC_B);
+  size_t content_len = content_end - content_start;
+  _beg = content_start;
+  _content_end = content_end;
+
+  // this is where we scan for newlines
+  char* nl = (char*) memchr(&_buffer[content_start], '\n', content_len);
+  if (nl == nullptr) {
+    COV(SBC_N);
+    _next = _end = content_end;
+    _line_ending = 0;
+    assert(need_to_read(), "");
+  } else {
+    COV(SBC_L);
+    *nl = '\0';  // so that this->current_line() will work
+    ++_line_count;
+    size_t end = nl - &_buffer[0];
+    _next = end + 1;
+    assert(_next != _content_end + NEXT_PHANTOM, "");
+    if (end > content_start && nl[-1] == '\r') { // yuck
+      // again, for this->current_line(), remove '\r' before '\n'
+      nl[-1] = '\0';
+      --end;
+      // Note: we could treat '\r' alone as a line ending on some
+      // platforms, but that is way too much work.  Newline '\n' is
+      // supported everywhere, and some tools insist on accompanying
+      // it with return as well, so we remove that.  But return '\r'
+      // by itself is an obsolete format, and also inconsistent with
+      // outputStream, which standarizes on '\n' and never emits '\r'.
+      // Postel's law suggests that we write '\n' only and grudgingly
+      // accept '\r' before '\n'.
+    }
+    _end = end;  // now this->current_line() points to buf[beg..end]
+    _line_ending = (int)(_next - end);
+    assert(have_current_line(), "");
+    assert(current_line() == &_buffer[_beg], "");
+    assert(current_line_length() == _end - _beg, "");
+  }
+}
+
+// Return true iff we expanded the buffer to the given length.
+bool inputStream::expand_buffer(size_t new_length) {
+  assert(new_length > _buffer_size, "");
+  char* new_buf = nullptr;
+  assert(new_length > sizeof(_small_buffer), "");
+  if (_buffer == &_small_buffer[0]) {
+    // fresh alloc from c-heap
+    COV(EXB_A);
+    new_buf = NEW_C_HEAP_ARRAY(char, new_length, mtInternal);
+    assert(new_buf != nullptr, "would have exited VM if OOM");
+    if (_content_end > 0) {
+      assert(_content_end <= _buffer_size, "");
+      ::memcpy(new_buf, _buffer, _content_end);  // copy only the active content
+    }
+  } else {
+    // realloc
+    COV(EXB_R);
+    new_buf = REALLOC_C_HEAP_ARRAY(char, _buffer, new_length, mtInternal);
+    assert(new_buf != nullptr, "would have exited VM if OOM");
+  }
+
+  if (new_buf == nullptr) {
+    return false;   // do not further update _buffer etc.
+  }
+  _buffer = new_buf;
+  _buffer_size = new_length;
+  return true;
+}
+
+inputStream::~inputStream() {
+  if (has_c_heap_buffer()) {
+    FreeHeap(_buffer);
+    DEBUG_ONLY(_buffer = (char*)((uintptr_t)0xdeadbeef)); // sanity
+  }
+}
+
+#ifdef ASSERT
+void inputStream::dump(const char* what) {
+  int diff = (int)(_end - _beg);
+  if (!_buffer || _beg > _buffer_size || _end > _buffer_size)
+    diff = 0;
+
+  bool ntr = (_next == _end),
+       hcl = (_beg < _content_end && _end < _next),
+       ddn = (_beg == _content_end && _next > _content_end);
+  tty->print_cr("%s%sistream %s%s%s%s%s [%d<%.*s>%d/%d..%d] LE=%d,"
+                " B=%llx%s[%d], LN=%d, CH=%d",
+                what ? what : "", what ? ": " : "",
+                _buffer == nullptr ? "U" : "",
+                ntr ? "R" : "",
+                hcl ? "L" : "",
+                ddn ? "D" : "",
+                (_next < _content_end ? "" :
+                 _next == _content_end ? "N" : "P"),
+                (int)_beg,
+                diff < 0 ? 0 : diff > 10 ? 10 : diff,
+                _buffer ? &_buffer[_beg] : "",
+                (int)_end, (int)_next, (int)_content_end,
+                _line_ending,
+                (unsigned long long)(intptr_t)_buffer,
+                _buffer == _small_buffer ? "(SB)" : "",
+                (int)_buffer_size,
+                (int)_line_count,
+                has_c_heap_buffer());
+  assert(is_sane(), "");
+}
+#endif
+
+#ifdef ASSERT
+// More support for coverage testing.
+int inputStream::coverage_mode(int start,
+                               int& cases, int& total, int& zeroes) {
+  int old_mode = current_coverage_mode;
+  current_coverage_mode = start;
+  int num_cases = 0, zero_count = 0, case_count = 0;
+#define COUNT_COV_CASE(casename) {              \
+    int tem = COV_COUNT(casename);              \
+    case_count += tem;                          \
+    if (tem == 0)  ++zero_count;                \
+    num_cases++;                                \
+  }
+  DO_COV_CASES(COUNT_COV_CASE)
+#undef COUNT_COV_CASE
+  if (start < 0) {
+    tty->print("istream coverage:");
+    #define PRINT_COV_CASE(casename) \
+      tty->print(" %s:%d", #casename, COV_COUNT(casename));
+    DO_COV_CASES(PRINT_COV_CASE)
+    tty->cr();
+    #undef PRINT_COV_CASE
+    if (zero_count != 0) {
+      case_count = -case_count;
+      #define ZERO_COV_CASE(casename)                  \
+        if (COV_COUNT(casename) == 0)                  \
+          tty->print_cr("%s: no coverage for %s",      \
+                        __FILE__, #casename);          \
+      DO_COV_CASES(ZERO_COV_CASE)
+      #undef ZERO_COV_CASE
+    }
+  }
+  if (start >= 2 || start < 0) {
+    #define CLEAR_COV_CASE(casename) \
+       COV_COUNT(casename) = 0;
+    DO_COV_CASES(CLEAR_COV_CASE)
+    #undef CLEAR_COV_CASE
+  }
+  cases  = num_cases;
+  total  = case_count;
+  zeroes = zero_count;
+  return old_mode;
+}
+#endif //ASSERT
diff --git a/src/hotspot/share/utilities/istream.hpp b/src/hotspot/share/utilities/istream.hpp
new file mode 100644
index 00000000000..b6a58055b93
--- /dev/null
+++ b/src/hotspot/share/utilities/istream.hpp
@@ -0,0 +1,386 @@
+/*
+ * Copyright (c) 2024, 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.
+ *
+ */
+
+#ifndef SHARE_UTILITIES_ISTREAM_HPP
+#define SHARE_UTILITIES_ISTREAM_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+#include "utilities/ostream.hpp"
+
+// Input streams for reading line-oriented textual data. These streams
+// treat newline '\n' very differently from all other bytes.  Carriage
+// return '\r' is just another bit of whitespace, although it is
+// removed just before newline.
+//
+// Null '\0' is just a data byte, although it also terminates C
+// strings; the `current_line` function adds a null after removing any
+// line terminator but does not specially process any nulls embedded
+// in the line.
+//
+// There are sizing access functions which allow lines to contain
+// null, but the simpler function assumes null termination, and thus
+// lines containing null will "look" shorter when viewed as C strings.
+// Use the sizing access functions if you care about this.
+//
+// Formatting guidelines:
+//
+// Configuration data should be line-oriented.  It should be readable
+// by humans (though perhaps with difficulty).  It should be easily
+// processed by text editors and by widely available text processing
+// tools such as grep, sed, and awk.
+//
+// Configuration data should not require "compilers" to generate, if
+// possible.  It should be editable by hand, if possible.  In cases
+// where binary data is strongly required, pick a binary format
+// already native to Hotspot, such as classfile, jar, or jmod.
+//
+// Each line should be separately parseable; the parsing can be ad
+// hoc.  For constructs inherently larger than single lines (such as
+// complex method configuration information), try to use a structuring
+// principle that allows "leaf" data to be line-oriented, and delimits
+// that data with markup lines of some sort.  Try to pick a
+// line-friendly version of a standard format like XML or Markdown.
+// JSON is somewhat problematic because there is no line-friendly leaf
+// syntax: everything at the leaves must be a quoted string in JSON.
+//
+// Use simple parsing via scanf-like formats for simple applications.
+// But, keep in mind that these formats may lose data when applied to
+// unusual strings, such as class names that contain spaces, or method
+// names that contain punctuation.  For more robust transmission of
+// potentially unusual names, consider wrapping them in XML-flavored
+// lines like <tag attr='pay load'/>.
+//
+// Note: Input streams are never MT-safe.
+
+class inputStream : public CHeapObjBase {
+ public:
+  class Input;
+
+ private:
+  NONCOPYABLE(inputStream);
+
+  static constexpr size_t SMALL_SIZE =  240 DEBUG_ONLY(*0 + 10);
+  static constexpr size_t BIG_SIZE   = 2048 DEBUG_ONLY(*0 + 20);
+
+ protected:
+  // Values for _input_state, to distinguish some phases of history:
+  // Do we need to read more input (NTR)?  Did we see EOF already?
+  // Was there an error getting input or allocating buffer space?
+  enum class IState : int { NTR_STATE, EOF_STATE, ERR_STATE };
+
+  // Named offset for _next relative to _content_end, of phantom '\n'.
+  static const int NEXT_PHANTOM = 1;
+
+  Input* _input;   // where the input comes from or else nullptr
+  IState _input_state;  // one of {NTR,EOF,ERR}_STATE
+  char   _line_ending;  // one of {0,1,2} for "", "\n", "\r\n"
+  char*  _buffer;       // scratch buffer holding at least the current line
+  size_t _buffer_size;  // allocated size of buffer
+  size_t _content_end;  // offset to end of valid contents of buffer
+  size_t _beg;          // offset in buffer to start of current line
+  size_t _end;          // offset to end of known current line (else content_end)
+  size_t _next;         // offset to known start of next line (else =end)
+  size_t _line_count;   // increasing non-resettable count of lines read
+  char   _small_buffer[SMALL_SIZE];  // stack-allocated buffer for holding lines;
+                                     // will switch to C_HEAP allocation when necessary.
+
+  bool has_c_heap_buffer() {
+    return _buffer != &_small_buffer[0];
+  }
+
+  // Buffer states
+  //
+  // The current line (less any line ending) is always [beg..end).
+  // It is always the case that 0 <= beg <= end <= con_end <= buffer_size.
+  // When there is a current line buffered, end < next <= 1+con_end.
+  // In that case, the value of next is end + max(1, strlen(lend)),
+  // where lend is "\n", "\r\n", or (for a last partial line) "".
+  // But if next == end, we need to read more input, or observe an EOF.
+  //
+  //   beg ==end ==next ==  con_end => nothing buffered, we need to read
+  //   beg <=end < next <=  con_end => have current line, with terminator
+  //   beg < end < next ==1+con_end => have partial current line (saw EOF)
+  //   beg < end ==next ==  con_end => partial line, we need to read
+  //   beg ==end < next ==1+con_end => definitely done; no more I/O
+  //
+  // These states are in three mutually exclusive groups:
+  //   need_to_read()      <= nothing or partial line in buffer
+  //   have_current_line() <= beg/end point to valid line (partial only if EOF)
+  //   definitely_done()   <= consumed all lines && (hit EOF || hit error)
+  // These states are internal; the user can only look at next/done/error.
+  //
+  // Relative to these states, everything already read from the input
+  // before the first byte of the current line is logically present
+  // (but not accessible) before _beg, while everything not yet read
+  // from the input is after _content_end.  The difference between
+  // these two pointers is constant, except when characters change
+  // from being in the current line to being (logically) before it,
+  // when next is called.
+
+  bool is_sane() const {
+    assert(_buffer != nullptr, "");
+    assert(_content_end <= _buffer_size, "");
+    assert(_beg <= _end && _end <= _content_end, "");
+    assert(_end <= _next && _next <= _content_end + NEXT_PHANTOM, "");
+    assert(_buffer_size == 0 || _next <= _buffer_size, "");
+    return true;
+  }
+
+  bool need_to_read() const {
+    assert(is_sane(), "");
+    return _next == _end;
+  }
+  bool have_current_line() const {
+    assert(is_sane(), "");
+    // _beg < _content_end because there is an \0 (was \n) at _end,
+    // or else it is a non-empty partial line and the \0 is at
+    // _content_end.  In either case, if _end == _next we are
+    // still searching for more input.
+    return (_beg < _content_end && _end < _next);
+  }
+  bool definitely_done() const {
+    assert(is_sane(), "");
+    // If _beg < _content_end we still have a line of some sort.
+    // Otherwise, if _next > _content_end, we have seen EOF or error.
+    return (_beg == _content_end && _next > _content_end);
+  }
+
+  // Reset indexes within the buffer to point to no content.
+  void clear_buffer();
+
+  // Reset indexes within the buffer to point to the given content.
+  // This is where we scan for newlines as well.
+  void set_buffer_content(size_t content_start, size_t content_end);
+
+  // Try to make the buffer bigger.  This may be necessary in order to
+  // buffer a very long line.  Returns false if there was an
+  // allocation failure.
+  //
+  // On allocation failure, just make do with whatever buffer there
+  // was to start with; the caller must check for this condition and
+  // avoid buffering more data in the non-expanded buffer.  However,
+  // the buffer will always be non-null, so at least one line can be
+  // buffered, if it is of normal size.
+  bool expand_buffer(size_t new_length);
+
+  // Make sure there is at least one line in the buffer, and set
+  // _beg/_end to indicate where it is.  Any content before _beg can
+  // be overwritten to make more room in the buffer.  If there is no
+  // more input, set the state up to indicate we are done.
+  bool fill_buffer();
+
+  // Find some room in the buffer so we can call read on it.
+  // This might call expand_buffer but will try not to.
+  // The assumption is that read already buffers slow I/O calls.
+  // The purpose for the small buffer managed here is to store whole lines,
+  // and perhaps edit them in-place.
+  void prepare_to_fill_buffer(size_t& fill_offset, size_t& fill_length);
+
+  // Quick check for an initially incomplete buffer...
+  void preload() const {
+    if (need_to_read()) {
+      const_cast<inputStream*>(this)->fill_buffer();
+    }
+  }
+
+  // How much content is buffered (if any) after the current line?
+  size_t buffered_content_length(bool include_current) const {
+    return (include_current       ? _content_end - _beg :
+            _content_end >= _next ? _content_end - _next : 0);
+  }
+
+  // Returns a pointer and count to characters buffered after the
+  // current line, but not yet read from my input source.  Only useful
+  // if you are trying to stack input streams on top of each other
+  // somehow.  You can also ask the input source if it thinks it has
+  // more bytes.
+  const char* next_content(size_t& next_content_length) const;
+
+ public:
+  // Create an empty input stream.
+  // Call push_back_input or set_input to configure.
+  inputStream() :
+    _input(nullptr),
+    _input_state(IState::NTR_STATE),
+    _line_ending(0),
+    _buffer(&_small_buffer[0]),
+    _buffer_size(sizeof(_small_buffer)),
+    _content_end(0),
+    _beg(0),
+    _end(0),
+    _next(0),
+    _line_count(0) {}
+
+  // Take input from the given source.  Buffer only a modest amount.
+  inputStream(Input* input)
+    : inputStream()
+  {
+    set_input(input);
+  }
+
+  virtual ~inputStream();
+
+  // Discards any previous input and sets the given input source.
+  void set_input(Input* input);
+
+  // Returns a pointer to a null terminated mutable copy of the current line.
+  // Note that embedded nulls may make the line appear shorter than it really is.
+  // This may trigger input activity if there is not enough data buffered.
+  // If there are no more lines, return an empty line, statically allocated.
+  char* current_line() const {
+    preload();
+    if (definitely_done())
+      return (char*)"";
+    return &_buffer[_beg];
+  }
+
+  // Return the size of the current line, exclusive of any line terminator.
+  // If no lines have been read yet, or there are none remaining, return zero.
+  size_t current_line_length() const {
+    preload();
+    return _end - _beg;
+  }
+
+  // Reports my current input source, if any, else a null pointer.
+  Input* input() const { return _input; }
+
+  // Discards the current line, gets ready to report the next line.
+  // Returns true if there is one, which is always the opposite of done().
+  // Fetches input if necessary.
+  bool next();
+
+  // Reports if there are no more lines.  Fetches input if necessary.
+  bool done() const  {
+    preload();
+    return definitely_done();
+  }
+
+  // Discard pending input and do not read any more.
+  // Takes no action if already done, whether in an error state or not.
+  void set_done();
+
+  // Reports if this stream has had an error was reported on it.
+  bool error() const {
+    return _input_state == IState::ERR_STATE;
+  }
+
+  // Set this stream done with an error, if the argument is true.
+  // If it is false but there is an error condition, clear the error.
+  // Otherwise do nothing.
+  void set_error(bool error_condition = true);
+
+  // lineno is the 1-based ordinal of the current line; it starts at one
+  size_t lineno() const         { preload(); return _line_count; }
+
+  // Copy the current line to the given output stream.
+  void print_on(outputStream* out);
+
+  // Copy the current line to the given output stream, and also call cr().
+  void print_cr_on(outputStream* out) {
+    print_on(out); out->cr();
+  }
+
+#ifdef ASSERT
+  void dump(const char* what = nullptr);
+  static int coverage_mode(int mode, int& cases, int& total, int& zeroes);
+#else
+  void dump(const char* what = nullptr) { }
+#endif
+
+
+  // Block-oriented input, which treats all bytes equally.
+  class Input : public CHeapObjBase {
+  public:
+    // Read some characters from an external source into the line buffer.
+    // If there are no more, return zero, otherwise return non-zero.
+    // It must be OK to call read even after it returns zero.
+    virtual size_t read(char* buf, size_t size) = 0;
+    // Example: read(b,s) { return fread(b, 1, s, _my_fp); }
+    // Example: read(b,s) { return 0; } // never more than the initial buffer
+  };
+};
+
+// for reading lines from files
+class FileInput : public inputStream::Input {
+  NONCOPYABLE(FileInput);
+
+ protected:
+  fileStream& _fs;
+  fileStream _private_fs;
+
+  // it does not seem likely there are such file streams around
+  FileInput(fileStream& fs)
+    : _fs(fs)
+  { }
+
+ public:
+  // just forward all the constructor arguments to the wrapped line-input class
+  template<typename... Arg>
+  FileInput(Arg... arg)
+    : _fs(_private_fs), _private_fs(arg...)
+  { }
+
+  FileInput(const char* file_name)
+    : FileInput(file_name, "rt")
+  { }
+
+  bool is_open() const { return _fs.is_open(); }
+
+ protected:
+  size_t read(char* buf, size_t size) override {
+    return _fs.read(buf, size);
+  }
+};
+
+class MemoryInput : public inputStream::Input {
+  const void* _base;
+  const size_t _limit;
+  size_t      _offset;
+
+ public:
+  MemoryInput(const void* base, size_t size,
+              size_t offset = 0)
+    : _base(base), _limit(size), _offset(offset) {}
+
+  MemoryInput(const char* start)
+    : MemoryInput(start, 0, strlen(start))
+  { }
+
+ protected:
+  size_t read(char* buf, size_t size) override {
+    size_t nr = size;
+    if (nr > _limit - _offset) {
+      nr = _limit - _offset;
+    }
+    if (nr > 0) {
+      ::memcpy(buf, (char*)_base + _offset, nr);
+      _offset += nr;
+    }
+    return nr;
+  }
+};
+
+#endif // SHARE_UTILITIES_ISTREAM_HPP
diff --git a/src/hotspot/share/utilities/ostream.cpp b/src/hotspot/share/utilities/ostream.cpp
index a1575b3d2c6..89335f9cf4c 100644
--- a/src/hotspot/share/utilities/ostream.cpp
+++ b/src/hotspot/share/utilities/ostream.cpp
@@ -397,7 +397,7 @@ char* stringStream::as_string(bool c_heap) const {
   char* copy = c_heap ?
     NEW_C_HEAP_ARRAY(char, _written + 1, mtInternal) : NEW_RESOURCE_ARRAY(char, _written + 1);
   ::memcpy(copy, _buffer, _written);
-  copy[_written] = 0;  // terminating null
+  copy[_written] = '\0';  // terminating null
   if (c_heap) {
     // Need to ensure our content is written to memory before we return
     // the pointer to it.
@@ -590,23 +590,10 @@ long fileStream::fileSize() {
   return size;
 }
 
-char* fileStream::readln(char *data, int count ) {
-  char * ret = nullptr;
-  if (_file != nullptr) {
-    ret = ::fgets(data, count, _file);
-    // Get rid of annoying \n char only if it is present.
-    size_t len = ::strlen(data);
-    if (len > 0 && data[len - 1] == '\n') {
-      data[len - 1] = '\0';
-    }
-  }
-  return ret;
-}
-
 fileStream::~fileStream() {
   if (_file != nullptr) {
-    if (_need_close) fclose(_file);
-    _file      = nullptr;
+    close();
+    _file = nullptr;
   }
 }
 
diff --git a/src/hotspot/share/utilities/ostream.hpp b/src/hotspot/share/utilities/ostream.hpp
index 72cf804ed64..d39fca29ba4 100644
--- a/src/hotspot/share/utilities/ostream.hpp
+++ b/src/hotspot/share/utilities/ostream.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -242,11 +242,20 @@ class fileStream : public outputStream {
   ~fileStream();
   bool is_open() const { return _file != nullptr; }
   virtual void write(const char* c, size_t len);
-  size_t read(void *data, size_t size, size_t count) { return _file != nullptr ? ::fread(data, size, count, _file) : 0; }
-  char* readln(char *data, int count);
-  int eof() { return _file != nullptr ? feof(_file) : -1; }
+  // unlike other classes in this file, fileStream can perform input as well as output
+  size_t read(void* data, size_t size) {
+    if (_file == nullptr)  return 0;
+    return ::fread(data, 1, size, _file);
+  }
+  size_t read(void *data, size_t size, size_t count) {
+    return read(data, size * count);
+  }
+  void close() {
+    if (_file == nullptr || !_need_close)  return;
+    fclose(_file);
+    _need_close = false;
+  }
   long fileSize();
-  void rewind() { if (_file != nullptr) ::rewind(_file); }
   void flush();
 };
 
diff --git a/test/hotspot/gtest/utilities/test_istream.cpp b/test/hotspot/gtest/utilities/test_istream.cpp
new file mode 100644
index 00000000000..8dd3c6b00b4
--- /dev/null
+++ b/test/hotspot/gtest/utilities/test_istream.cpp
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2023, 2024, 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.
+ */
+
+#include "precompiled.hpp"
+#include "jvm.h"
+#include "memory/allocation.inline.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/os.hpp"
+#include "utilities/istream.hpp"
+#include "unittest.hpp"
+
+template<typename BlockClass>
+class BlockInputStream : public inputStream {
+  BlockClass _input;
+ public:
+  template<typename... Arg>
+  BlockInputStream(Arg... arg)
+    : _input(arg...) {
+    set_input(&_input);
+  }
+};
+
+#define EXPECT_MEMEQ(s1, s2, len) \
+  EXPECT_PRED_FORMAT3(CmpHelperMEMEQ, s1, s2, len)
+// cf. ::testing::internal::CmpHelperSTREQ
+
+testing::AssertionResult CmpHelperMEMEQ(const char* s1_expression,
+                                        const char* s2_expression,
+                                        const char* len_expression,
+                                        const char* s1, const char* s2,
+                                        size_t len) {
+  if (s1 == nullptr || s2 == nullptr) {
+    return testing::internal::CmpHelperEQ(s1_expression, s2_expression,
+                                          s1, s2);
+  }
+  int c = ::memcmp(s1, s2, len);
+  if (c == 0) {
+    return testing::AssertionSuccess();
+  }
+  ::std::string str1, str2;
+  for (auto which = 0; which <= 1; which++) {
+    auto  s   = which ? s1   : s2;
+    auto &str = which ? str1 : str2;
+    std::stringstream buf;
+    buf << "{";
+    for (size_t i = 0; i < len; i++) {
+      char c = s[i];
+      switch (c) {
+      case '\0':  buf << "\\0"; break;
+      case '\n':  buf << "\\n"; break;
+      case '\\':  buf << "\\\\"; break;
+      default:    buf << c; break;
+      }
+    }
+    buf << "}[" << len_expression << "=" << len << "]";
+    str = buf.str();
+  }
+  return testing::internal::CmpHelperSTREQ(s1_expression, s2_expression,
+                                           str1.c_str(), str2.c_str());
+}
+
+static int firstdiff(char* b1, char* b2, int blen) {
+  for (int i = 0; i < blen; i++) {
+    if (b1[i] != b2[i])  return i;
+  }
+  return -1;
+}
+
+static char* get_temp_file(bool VERBOSE, const char* filename) {
+  const char* tmp_dir = os::get_temp_directory();
+  const char* file_sep = os::file_separator();
+  size_t temp_file_len = strlen(tmp_dir) + strlen(file_sep) + strlen(filename) + 28;
+  char* temp_file = NEW_C_HEAP_ARRAY(char, temp_file_len, mtInternal);
+  int ret = jio_snprintf(temp_file, temp_file_len, "%s%spid%d.%s",
+                         tmp_dir, file_sep,
+                         os::current_process_id(), filename);
+  if (VERBOSE)  tty->print_cr("temp_file = %s", temp_file);
+  return temp_file;
+}
+
+static const char* get_temp_file(bool VERBOSE) {
+  static const char* temp_file = get_temp_file(VERBOSE, "test_istream");
+  return temp_file;
+}
+
+#define EIGHTY 80
+#define LC0(x)     ('/' + (((unsigned)(x)+1) % EIGHTY))
+#define LC(line,col)  LC0((col) * (line))
+
+#define COLS 30
+
+static int cases, total, zeroes;
+#ifdef ASSERT
+#define istream_coverage_mode(mode, a,b,c) \
+  inputStream::coverage_mode(mode, a,b,c)
+#else
+#define istream_coverage_mode(mode, a,b,c)
+#endif
+
+// Fill in a test pattern of ascii characters.
+// Each line is ncols long, plus a line termination of lelen (1 or 2).
+// Each character is a fixed, static function of the line and column.
+// This enables test logic to predict exactly what will be read in each line.
+static void fill_pattern(bool VERBOSE,
+                         char* pat, int patlen, int ncols, int lelen,
+                         int& full_lines, int& partial_line,
+                         const char* &line_end,
+                         const char* &partial_line_end) {
+  full_lines = partial_line = 0;
+  for (int i = 0; i < patlen; i++) {
+    int line = (i / (ncols+lelen)) + 1;  // 1-based line number
+    int col  = (i % (ncols+lelen)) + 1;  // 1-based column number
+    if (col <= ncols) {
+      pat[i] = LC(line, col);
+      partial_line = 1;
+    } else if (col < ncols+lelen) {
+      pat[i] = i == patlen - 1 ? '!' : '%';
+      partial_line = 1;
+    } else {
+      assert(col == ncols+lelen, "");
+      pat[i] = '!';
+      full_lines++;
+      partial_line = 0;
+    }
+  }
+  pat[patlen] = '\0';
+  if (VERBOSE)  tty->print_cr("PATTERN=%d+%d[%s]",
+                              full_lines, partial_line, pat);
+  for (int i = 0; i < patlen; i++) {
+    assert(pat[i] != '%' || (i+1 < patlen && pat[i+1] == '!'), "");
+    if (pat[i] == '!')  pat[i] = '\n';
+    if (pat[i] == '%')  pat[i] = '\r';
+  }
+  assert(pat[patlen-1] != '\r', "");
+
+  line_end = (lelen == 2 ? "\r\n" : "\n");
+  int partial_line_bytes = patlen - (full_lines * (ncols + lelen));
+  assert(partial_line_bytes < ncols + lelen, "");
+  partial_line_end = (partial_line_bytes == ncols + 1) ? "\n" : "";
+}
+
+static const int MAX_PATLEN = COLS * (COLS-1);
+
+static void istream_test_driver(const bool VERBOSE,
+                                const int patlen,
+                                const int ncols,
+                                const int lelen,
+                                const bool TEST_SET_POSITION,
+                                const bool TEST_PUSH_BACK,
+                                const bool TEST_EXPAND_REDUCE) {
+  DEBUG_ONLY( istream_coverage_mode(VERBOSE ? 2 : 1, cases, total, zeroes) );
+  const char* temp_file = get_temp_file(VERBOSE);
+  unlink(temp_file);
+  char pat[MAX_PATLEN+1];
+  int full_lines = 0, partial_line = 0;
+  const char* line_end = "\n";
+  const char* partial_line_end = "";
+  fill_pattern(VERBOSE, pat, patlen, ncols, lelen,
+               full_lines, partial_line,
+               line_end, partial_line_end);
+
+  char pat2[sizeof(pat)];  // copy of pat to help detect scribbling
+  memcpy(pat2, pat, sizeof(pat));
+  // Make three kinds of stream and test them all.
+  MemoryInput _min(pat2, patlen);
+  inputStream sin(&_min);
+  if (VERBOSE) {
+    tty->print("at %llx ", (unsigned long long)(intptr_t)&sin);
+    sin.dump("sin");
+  }
+  {
+    fileStream tfs(temp_file);
+    guarantee(tfs.is_open(), "cannot open temp file");
+    tfs.write(pat, patlen);
+  }
+  BlockInputStream<FileInput> fin(temp_file);
+  if (VERBOSE) {
+    tty->print("at %llx ", (unsigned long long)(intptr_t)&fin);
+    fin.dump("fin");
+  }
+  BlockInputStream<MemoryInput> min(&pat2[0], patlen);
+  if (VERBOSE) {
+    tty->print("at %llx ", (unsigned long long)(intptr_t)&min);
+    sin.dump("min");
+  }
+  inputStream* ins[] = { &sin, &fin, &min };
+  const char* in_names[] = { "sin", "fin", "min" };
+  const char* test_mode = (TEST_SET_POSITION
+                           ? (!TEST_PUSH_BACK ? "(seek)" : "(seek/push)")
+                           : TEST_EXPAND_REDUCE
+                           ? (!TEST_PUSH_BACK ? "(exp/red)" : "(exp/red/push)")
+                           : (!TEST_PUSH_BACK ? "(plain)" : "(push)"));
+  for (int which = 0; which < 3; which++) {
+    inputStream& in = *ins[which];
+    const char* in_name = in_names[which];
+    int lineno;
+    char* lp = (char*)"--";
+#define LPEQ                                                    \
+    in_name << test_mode                                        \
+            << " ncols=" << ncols << " lelen=" << lelen         \
+            << " full=" << full_lines << " lineno=" << lineno   \
+            << " [" << lp << "]" << (in.dump("expect"), "")
+    if (VERBOSE)
+      tty->print_cr("testing %s%s patlen=%d ncols=%d full_lines=%d partial_line=%d",
+                    in_name, test_mode,
+                    patlen, ncols, full_lines, partial_line);
+    int pos_to_set = 0, line_to_set = 1;  // for TEST_SET_POSITION only
+    for (int phase = 0; phase <= (TEST_SET_POSITION ? 1 : 0); phase++) {
+      lineno = 1;
+      for (; lineno <= full_lines + partial_line; lineno++) {
+        EXPECT_EQ(-1, firstdiff(pat, pat2, patlen + 1));
+        if (VERBOSE)  in.dump("!done?");
+        bool done = in.done();
+        EXPECT_TRUE(!done)  <<LPEQ;
+        if (done)  break;
+        lp = in.current_line();
+        const char* expect_endl =
+          (lineno <= full_lines) ? line_end : partial_line_end;
+
+        bool verify_lp = true;
+        if (verify_lp) {
+          int actual_lineno = (int) in.lineno();
+          if (VERBOSE)  in.dump("CL    ");
+          EXPECT_EQ(actual_lineno, lineno)  <<LPEQ;
+          int len = (int) in.current_line_length();
+          EXPECT_EQ(len, (int) strlen(lp))  <<LPEQ;
+          int expect_len = ncols;
+          if (lineno > full_lines)
+            expect_len = MIN2(ncols, patlen % (ncols+lelen));
+          EXPECT_EQ(len, expect_len)  <<LPEQ;
+          for (int j = 0; j < len; j++) {
+            int lc = LC(lineno, j+1);   // 1-based column
+            EXPECT_EQ(lc, lp[j])  <<LPEQ;
+          }
+          if (len != expect_len || len != (int)strlen(lp)) {
+            return;  // no error cascades please
+          }
+        }
+        if (VERBOSE)  in.dump("next  ");
+        in.next();
+      }
+
+      for (int done_test = 0; done_test <= 3; done_test++) {
+        if (done_test == 2)  in.set_done();
+        lp = in.current_line();  // should be empty line
+        if (VERBOSE)  in.dump("done!!");
+        EXPECT_TRUE(lp != nullptr);
+        EXPECT_TRUE(in.done())  <<LPEQ;
+        if (!in.done())  break;
+        EXPECT_EQ((int)in.current_line_length(), 0)   <<LPEQ;
+        EXPECT_EQ(strlen(lp), in.current_line_length())  <<LPEQ;
+        bool extra_next = in.next();
+        EXPECT_TRUE(!extra_next)  <<LPEQ;
+      }
+
+      // no memory side effects
+      EXPECT_EQ(-1, firstdiff(pat, pat2, patlen + 1));
+    }
+  }
+  unlink(temp_file);
+}
+
+static void istream_test_driver(const bool VERBOSE,
+                                const bool TEST_SET_POSITION,
+                                const bool TEST_PUSH_BACK,
+                                const bool TEST_EXPAND_REDUCE) {
+  ResourceMark rm;
+  int patlen = MAX_PATLEN;
+  const bool SHORT_TEST = false;
+  const int SHORT_NCOLS = 1, SHORT_PATLEN = 37;
+  if (SHORT_TEST)  patlen = SHORT_PATLEN;
+  for (int ncols = 0; ncols <= patlen; ncols++) {
+    if (SHORT_TEST) {
+      if (ncols < SHORT_NCOLS)  ncols = SHORT_NCOLS;
+      if (ncols > SHORT_NCOLS)  break;
+    } else if (ncols > COLS && ncols < patlen - COLS) {
+      ncols += ncols / 7;
+      if (ncols > patlen - COLS)  ncols = (patlen - COLS);
+    }
+    for (int lelen = 1; lelen <= 2; lelen++) {  // try both kinds of newline
+      istream_test_driver(VERBOSE,
+                          patlen, ncols, lelen,
+                          TEST_SET_POSITION, TEST_PUSH_BACK, TEST_EXPAND_REDUCE);
+    }
+  }
+}
+
+TEST_VM(istream, basic) {
+  const bool VERBOSE = false;
+  istream_test_driver(VERBOSE, false, false, false);
+}
+
+TEST_VM(istream, coverage) {
+  const bool VERBOSE = false;
+#ifdef ASSERT
+  istream_coverage_mode(0, cases, total, zeroes);
+  if (cases == 0)  return;
+  if (VERBOSE || zeroes != 0)
+    istream_coverage_mode(-1, cases, total, zeroes);
+  EXPECT_EQ(zeroes, 0) << "zeroes: " << zeroes << "/" << cases;
+#endif //ASSERT
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java
index b50b0ad47d9..6aa5964d8a6 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @bug 8216184
  * @summary Test the handling of long path to the classlist file.
  * @requires vm.cds
  * @library /test/lib
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java
index 1275f752c05..37c59a0d0a3 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,12 @@
  *
  */
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import jdk.test.lib.cds.CDSOptions;
+import jdk.test.lib.cds.CDSTestUtils;
+
 /*
  * @test
  * @summary Tests the format checking of class list format.
@@ -94,39 +100,76 @@ public class ClassListFormatA extends ClassListFormatBase {
 
         // Good input:
         dumpShouldPass(
-            "TESTCASE A6: extraneous spaces, tab characters and trailing new line characters",
+            "TESTCASE A6: extraneous spaces, tab characters, trailing new line characters, and trailing comment line",
             appJar, classlist(
                 "Hello   ",                   // trailing spaces
                 "java/lang/Object\tid:\t1",   // \t instead of ' '
                 "CustomLoadee id: 2 super: 1 source: " + customJarPath,
                 "CustomInterface2_ia id: 3 super: 1 source: " + customJarPath + " ",
                 "CustomInterface2_ib id: 4 super: 1 source: " + customJarPath + "\t\t\r" ,
-                "CustomLoadee2 id: 5 super: 1 interfaces: 3 4 source: " + customJarPath      // preceding spaces
+                "CustomLoadee2 id: 5 super: 1 interfaces: 3 4 source: " + customJarPath,      // preceding spaces
+                "#last line is a comment"
             ));
 
-        int _max_allowed_line = 4096; // Must match ClassListParser::_max_allowed_line in C code.
-        int _line_buf_extra = 10;     // Must match ClassListParser::_line_buf_extra in C code.
-        StringBuffer sbuf = new StringBuffer();
-        for (int i=0; i<_max_allowed_line+1; i++) {
-          sbuf.append("x");
+        // Tests for corner cases in the C++ class LineReader, or invalid UTF8. These can't
+        // be tested with dumpShouldPass/dumpShouldFail as we need to prepare a special class
+        // list file.
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 6500; i++) {
+            sb.append("X123456789");
         }
 
-        dumpShouldFail(
-            "TESTCASE A7: bad input - line too long",
-            appJar, classlist(
-                sbuf.toString()
-            ),
-            "input line too long (must be no longer than " + _max_allowed_line + " chars");
-
-        for (int i=0; i<_line_buf_extra + 1000; i++) {
-          sbuf.append("X");
+        {
+            System.out.println("TESTCASE A7.1: Long line (65000 chars)");
+            String longName = sb.toString(); // 65000 chars long
+            String classList = "LongLine.classlist";
+            try (FileWriter fw = new FileWriter(classList)) {
+                fw.write(longName + "\n");
+            }
+            CDSOptions opts = (new CDSOptions())
+                .addPrefix("-XX:ExtraSharedClassListFile=" + classList, "-Xlog:cds");
+            CDSTestUtils.createArchiveAndCheck(opts)
+                .shouldContain("Preload Warning: Cannot find " + longName);
         }
 
-        dumpShouldFail(
-            "TESTCASE A8: bad input - line too long: try to overflow C buffer",
-            appJar, classlist(
-                sbuf.toString()
-            ),
-            "input line too long (must be no longer than " + _max_allowed_line + " chars");
+        {
+            System.out.println("TESTCASE A7.2: Name Length > Symbol::max_length()");
+            String tooLongName = sb.toString() + sb.toString();
+            String classList = "TooLongLine.classlist";
+            try (FileWriter fw = new FileWriter(classList)) {
+                fw.write("java/lang/Object\n");
+                fw.write(tooLongName + "\n");
+            }
+            CDSOptions opts = (new CDSOptions())
+                .addPrefix("-XX:ExtraSharedClassListFile=" + classList, "-Xlog:cds");
+            CDSTestUtils.createArchive(opts)
+                .shouldContain(classList + ":2 class name too long") // test line number as well.
+                .shouldHaveExitValue(1);
+        }
+
+        {
+            System.out.println("TESTCASE A7.3: File doesn't end with newline");
+            String classList = "NoTrailingNewLine.classlist";
+            try (FileWriter fw = new FileWriter(classList)) {
+                fw.write("No/Such/ClassABCD");
+            }
+            CDSOptions opts = (new CDSOptions())
+                .addPrefix("-XX:ExtraSharedClassListFile=" + classList, "-Xlog:cds");
+            CDSTestUtils.createArchiveAndCheck(opts)
+                .shouldContain("Preload Warning: Cannot find No/Such/ClassABCD");
+        }
+        {
+            System.out.println("TESTCASE A7.4: invalid UTF8 character");
+            String classList = "BadUTF8.classlist";
+            try (FileOutputStream fos = new FileOutputStream(classList)) {
+                byte chars[] = new byte[] { (byte)0xa0, (byte)0xa1, '\n'};
+                fos.write(chars);
+            }
+            CDSOptions opts = (new CDSOptions())
+                .addPrefix("-XX:ExtraSharedClassListFile=" + classList, "-Xlog:cds");
+            CDSTestUtils.createArchive(opts)
+                .shouldContain(classList + ":1 class name is not valid UTF8") // test line number as well.
+                .shouldHaveExitValue(1);
+        }
     }
 }

From ad0b54d429fdbd806c09aa06bb42f1ed4a0297e8 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 9 May 2024 11:47:45 +0000
Subject: [PATCH 374/486] 8314225: SIGSEGV in JavaThread::is_lock_owned

Reviewed-by: dlong, dholmes
---
 .../leakprofiler/checkpoint/rootResolver.cpp  |  8 +----
 src/hotspot/share/runtime/deoptimization.cpp  |  2 +-
 src/hotspot/share/runtime/javaThread.cpp      | 33 +------------------
 src/hotspot/share/runtime/javaThread.hpp      | 12 +------
 src/hotspot/share/runtime/monitorChunk.cpp    |  3 +-
 src/hotspot/share/runtime/monitorChunk.hpp    |  8 +----
 src/hotspot/share/runtime/synchronizer.cpp    |  4 ++-
 src/hotspot/share/runtime/thread.cpp          | 10 ------
 src/hotspot/share/runtime/thread.hpp          |  3 --
 src/hotspot/share/runtime/vframeArray.cpp     | 25 +++++++++-----
 src/hotspot/share/runtime/vframeArray.hpp     |  4 +--
 11 files changed, 28 insertions(+), 84 deletions(-)

diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp
index 9627259e264..57b29a09d01 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -248,12 +248,6 @@ bool ReferenceToThreadRootClosure::do_thread_stack_detailed(JavaThread* jt) {
   ReferenceLocateClosure rcl(_callback, OldObjectRoot::_threads, OldObjectRoot::_stack_variable, jt);
 
   if (jt->has_last_Java_frame()) {
-    // Traverse the monitor chunks
-    MonitorChunk* chunk = jt->monitor_chunks();
-    for (; chunk != nullptr; chunk = chunk->next()) {
-      chunk->oops_do(&rcl);
-    }
-
     if (rcl.complete()) {
       return true;
     }
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 03e62075808..53a0f2e9c3b 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -1736,7 +1736,7 @@ void Deoptimization::pop_frames_failed_reallocs(JavaThread* thread, vframeArray*
           ObjectSynchronizer::exit(src->obj(), src->lock(), thread);
         }
       }
-      array->element(i)->free_monitors(thread);
+      array->element(i)->free_monitors();
 #ifdef ASSERT
       array->element(i)->set_removed_monitors();
 #endif
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 7ed67c4616b..97be5333413 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -430,8 +430,6 @@ JavaThread::JavaThread() :
   _active_handles(nullptr),
   _free_handle_block(nullptr),
 
-  _monitor_chunks(nullptr),
-
   _suspend_flags(0),
 
   _thread_state(_thread_new),
@@ -1050,13 +1048,7 @@ JavaThread* JavaThread::active() {
 
 bool JavaThread::is_lock_owned(address adr) const {
   assert(LockingMode != LM_LIGHTWEIGHT, "should not be called with new lightweight locking");
-  if (Thread::is_lock_owned(adr)) return true;
-
-  for (MonitorChunk* chunk = monitor_chunks(); chunk != nullptr; chunk = chunk->next()) {
-    if (chunk->contains(adr)) return true;
-  }
-
-  return false;
+  return is_in_full_stack(adr);
 }
 
 oop JavaThread::exception_oop() const {
@@ -1067,22 +1059,6 @@ void JavaThread::set_exception_oop(oop o) {
   Atomic::store(&_exception_oop, o);
 }
 
-void JavaThread::add_monitor_chunk(MonitorChunk* chunk) {
-  chunk->set_next(monitor_chunks());
-  set_monitor_chunks(chunk);
-}
-
-void JavaThread::remove_monitor_chunk(MonitorChunk* chunk) {
-  guarantee(monitor_chunks() != nullptr, "must be non empty");
-  if (monitor_chunks() == chunk) {
-    set_monitor_chunks(chunk->next());
-  } else {
-    MonitorChunk* prev = monitor_chunks();
-    while (prev->next() != chunk) prev = prev->next();
-    prev->set_next(chunk->next());
-  }
-}
-
 void JavaThread::handle_special_runtime_exit_condition() {
   if (is_obj_deopt_suspend()) {
     frame_anchor()->make_walkable();
@@ -1408,13 +1384,6 @@ void JavaThread::oops_do_no_frames(OopClosure* f, NMethodClosure* cf) {
 
   DEBUG_ONLY(verify_frame_info();)
 
-  if (has_last_Java_frame()) {
-    // Traverse the monitor chunks
-    for (MonitorChunk* chunk = monitor_chunks(); chunk != nullptr; chunk = chunk->next()) {
-      chunk->oops_do(f);
-    }
-  }
-
   assert(vframe_array_head() == nullptr, "deopt in progress at a safepoint!");
   // If we have deferred set_locals there might be oops waiting to be
   // written
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index 37fd8981acd..2541aaded00 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -193,10 +193,6 @@ class JavaThread: public Thread {
   void pop_jni_handle_block();
 
  private:
-  MonitorChunk* _monitor_chunks;              // Contains the off stack monitors
-                                              // allocated during deoptimization
-                                              // and by JNI_MonitorEnter/Exit
-
   enum SuspendFlags {
     // NOTE: avoid using the sign-bit as cc generates different test code
     //       when the sign-bit is used, and sometimes incorrectly - see CR 6398077
@@ -679,7 +675,7 @@ private:
     return (_suspend_flags & (_obj_deopt JFR_ONLY(| _trace_flag))) != 0;
   }
 
-  // Fast-locking support
+  // Stack-locking support (not for LM_LIGHTWEIGHT)
   bool is_lock_owned(address adr) const;
 
   // Accessors for vframe array top
@@ -881,13 +877,7 @@ private:
   int depth_first_number() { return _depth_first_number; }
   void set_depth_first_number(int dfn) { _depth_first_number = dfn; }
 
- private:
-  void set_monitor_chunks(MonitorChunk* monitor_chunks) { _monitor_chunks = monitor_chunks; }
-
  public:
-  MonitorChunk* monitor_chunks() const           { return _monitor_chunks; }
-  void add_monitor_chunk(MonitorChunk* chunk);
-  void remove_monitor_chunk(MonitorChunk* chunk);
   bool in_deopt_handler() const                  { return _in_deopt_handler > 0; }
   void inc_in_deopt_handler()                    { _in_deopt_handler++; }
   void dec_in_deopt_handler() {
diff --git a/src/hotspot/share/runtime/monitorChunk.cpp b/src/hotspot/share/runtime/monitorChunk.cpp
index c54ad685cdb..d18fc21d78d 100644
--- a/src/hotspot/share/runtime/monitorChunk.cpp
+++ b/src/hotspot/share/runtime/monitorChunk.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 MonitorChunk::MonitorChunk(int number_on_monitors) {
   _number_of_monitors = number_on_monitors;
   _monitors           = NEW_C_HEAP_ARRAY(BasicObjectLock, number_on_monitors, mtSynchronizer);
-  _next               = nullptr;
 }
 
 
diff --git a/src/hotspot/share/runtime/monitorChunk.hpp b/src/hotspot/share/runtime/monitorChunk.hpp
index f16aa46fa64..5c804b5c595 100644
--- a/src/hotspot/share/runtime/monitorChunk.hpp
+++ b/src/hotspot/share/runtime/monitorChunk.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -38,23 +38,17 @@ class MonitorChunk: public CHeapObj<mtSynchronizer> {
   int              _number_of_monitors;
   BasicObjectLock* _monitors;
   BasicObjectLock* monitors() const { return _monitors; }
-  MonitorChunk*    _next;
  public:
   // Constructor
   MonitorChunk(int number_on_monitors);
   ~MonitorChunk();
 
-  // link operations
-  MonitorChunk* next() const                { return _next; }
-  void set_next(MonitorChunk* next)         { _next = next; }
-
   // Returns the number of monitors
   int number_of_monitors() const { return _number_of_monitors; }
 
   // Returns the index'th monitor
   BasicObjectLock* at(int index)            { assert(index >= 0 && index < number_of_monitors(), "out of bounds check"); return &monitors()[index]; }
 
-
   // Memory management
   void oops_do(OopClosure* f);
 
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index f8d4b323156..27b4163238a 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -1056,7 +1056,9 @@ intptr_t ObjectSynchronizer::FastHashCode(Thread* current, oop obj) {
       }
       // Fall thru so we only have one place that installs the hash in
       // the ObjectMonitor.
-    } else if (LockingMode == LM_LEGACY && mark.has_locker() && current->is_lock_owned((address)mark.locker())) {
+    } else if (LockingMode == LM_LEGACY && mark.has_locker()
+               && current->is_Java_thread()
+               && JavaThread::cast(current)->is_lock_owned((address)mark.locker())) {
       // This is a stack-lock owned by the calling thread so fetch the
       // displaced markWord from the BasicLock on the stack.
       temp = mark.displaced_mark_helper();
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 396f349a885..bbfeaefb1fe 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -527,16 +527,6 @@ void Thread::print_owned_locks_on(outputStream* st) const {
 }
 #endif // ASSERT
 
-// We had to move these methods here, because vm threads get into ObjectSynchronizer::enter
-// However, there is a note in JavaThread::is_lock_owned() about the VM threads not being
-// used for compilation in the future. If that change is made, the need for these methods
-// should be revisited, and they should be removed if possible.
-
-bool Thread::is_lock_owned(address adr) const {
-  assert(LockingMode != LM_LIGHTWEIGHT, "should not be called with new lightweight locking");
-  return is_in_full_stack(adr);
-}
-
 bool Thread::set_as_starting_thread() {
   assert(_starting_thread == nullptr, "already initialized: "
          "_starting_thread=" INTPTR_FORMAT, p2i(_starting_thread));
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index ebf1b590ebd..d0749b8101d 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -475,9 +475,6 @@ class Thread: public ThreadShadow {
   }
 
  public:
-  // Used by fast lock support
-  virtual bool is_lock_owned(address adr) const;
-
   // Check if address is within the given range of this thread's
   // stack:  stack_base() > adr >= limit
   bool is_in_stack_range_incl(address adr, address limit) const {
diff --git a/src/hotspot/share/runtime/vframeArray.cpp b/src/hotspot/share/runtime/vframeArray.cpp
index cf7b087887f..d3bbbc28399 100644
--- a/src/hotspot/share/runtime/vframeArray.cpp
+++ b/src/hotspot/share/runtime/vframeArray.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -37,6 +37,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/monitorChunk.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "runtime/synchronizer.hpp"
 #include "runtime/vframe.hpp"
 #include "runtime/vframeArray.hpp"
 #include "runtime/vframe_hp.hpp"
@@ -48,11 +49,10 @@
 
 int vframeArrayElement:: bci(void) const { return (_bci == SynchronizationEntryBCI ? 0 : _bci); }
 
-void vframeArrayElement::free_monitors(JavaThread* jt) {
+void vframeArrayElement::free_monitors() {
   if (_monitors != nullptr) {
      MonitorChunk* chunk = _monitors;
      _monitors = nullptr;
-     jt->remove_monitor_chunk(chunk);
      delete chunk;
   }
 }
@@ -72,7 +72,7 @@ void vframeArrayElement::fill_in(compiledVFrame* vf, bool realloc_failures) {
   int index;
 
   {
-    Thread* current_thread = Thread::current();
+    JavaThread* current_thread = JavaThread::current();
     ResourceMark rm(current_thread);
     HandleMark hm(current_thread);
 
@@ -85,7 +85,6 @@ void vframeArrayElement::fill_in(compiledVFrame* vf, bool realloc_failures) {
 
       // Allocate monitor chunk
       _monitors = new MonitorChunk(list->length());
-      vf->thread()->add_monitor_chunk(_monitors);
 
       // Migrate the BasicLocks from the stack to the monitor chunk
       for (index = 0; index < list->length(); index++) {
@@ -95,9 +94,16 @@ void vframeArrayElement::fill_in(compiledVFrame* vf, bool realloc_failures) {
         if (monitor->owner_is_scalar_replaced()) {
           dest->set_obj(nullptr);
         } else {
-          assert(monitor->owner() == nullptr || !monitor->owner()->is_unlocked(), "object must be null or locked");
+          assert(monitor->owner() != nullptr, "monitor owner must not be null");
+          assert(!monitor->owner()->is_unlocked(), "monitor must be locked");
           dest->set_obj(monitor->owner());
+          assert(ObjectSynchronizer::current_thread_holds_lock(current_thread, Handle(current_thread, dest->obj())),
+                 "should be held, before move_to");
+
           monitor->lock()->move_to(monitor->owner(), dest->lock());
+
+          assert(ObjectSynchronizer::current_thread_holds_lock(current_thread, Handle(current_thread, dest->obj())),
+                 "should be held, after move_to");
         }
       }
     }
@@ -308,7 +314,11 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters,
     top = iframe()->previous_monitor_in_interpreter_frame(top);
     BasicObjectLock* src = _monitors->at(index);
     top->set_obj(src->obj());
+    assert(src->obj() != nullptr || ObjectSynchronizer::current_thread_holds_lock(thread, Handle(thread, src->obj())),
+           "should be held, before move_to");
     src->lock()->move_to(src->obj(), top->lock());
+    assert(src->obj() != nullptr || ObjectSynchronizer::current_thread_holds_lock(thread, Handle(thread, src->obj())),
+           "should be held, after move_to");
   }
   if (ProfileInterpreter) {
     iframe()->interpreter_frame_set_mdp(0); // clear out the mdp.
@@ -649,9 +659,8 @@ void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller
 }
 
 void vframeArray::deallocate_monitor_chunks() {
-  JavaThread* jt = JavaThread::current();
   for (int index = 0; index < frames(); index++ ) {
-     element(index)->free_monitors(jt);
+     element(index)->free_monitors();
   }
 }
 
diff --git a/src/hotspot/share/runtime/vframeArray.hpp b/src/hotspot/share/runtime/vframeArray.hpp
index 734703a94ae..b270046252d 100644
--- a/src/hotspot/share/runtime/vframeArray.hpp
+++ b/src/hotspot/share/runtime/vframeArray.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,7 @@ class vframeArrayElement {
 
   MonitorChunk* monitors(void) const { return _monitors; }
 
-  void free_monitors(JavaThread* jt);
+  void free_monitors();
 
   StackValueCollection* locals(void) const             { return _locals; }
 

From 0a4eeeaa3c63585244be959386dd94882398e87f Mon Sep 17 00:00:00 2001
From: Scott Gibbons <sgibbons@openjdk.org>
Date: Thu, 9 May 2024 11:57:44 +0000
Subject: [PATCH 375/486] 8331033: EA fails with "EA unexpected CallLeaf
 unsafe_setmemory" after JDK-8329331

Co-authored-by: Jatin Bhateja <jbhateja@openjdk.org>
Reviewed-by: kvn
---
 src/hotspot/share/opto/escape.cpp             |   3 +-
 .../compiler/escapeAnalysis/Test8331033.java  | 106 ++++++++++++++++++
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/escapeAnalysis/Test8331033.java

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index c82eaad50e1..71051ee7bd1 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -2184,7 +2184,8 @@ void ConnectionGraph::process_call_arguments(CallNode *call) {
                   strcmp(call->as_CallLeaf()->_name, "vectorizedMismatch") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "arraysort_stub") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "array_partition_stub") == 0 ||
-                  strcmp(call->as_CallLeaf()->_name, "get_class_id_intrinsic") == 0)
+                  strcmp(call->as_CallLeaf()->_name, "get_class_id_intrinsic") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "unsafe_setmemory") == 0)
                  ))) {
             call->dump();
             fatal("EA unexpected CallLeaf %s", call->as_CallLeaf()->_name);
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/Test8331033.java b/test/hotspot/jtreg/compiler/escapeAnalysis/Test8331033.java
new file mode 100644
index 00000000000..68bedd48c8f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/Test8331033.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2024, 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 8331033
+ * @summary EA fails with "EA unexpected CallLeaf unsafe_setmemory" after JDK-8329331
+ * @requires vm.compMode != "Xint"
+ *
+ * @run main/othervm -Xbatch -XX:-TieredCompilation  Test8331033
+ *
+ */
+import java.lang.foreign.*;
+
+class MyClass {
+  public int field1;
+  public int field2;
+  public int field3;
+  public int field4;
+
+  public MyClass(int field1, int field2, int field3, int field4) {
+    this.field1 = field1;
+    this.field2 = field2;
+    this.field3 = field3;
+    this.field4 = field4;
+  }
+}
+
+public class Test8331033 {
+
+  public static int micro1(int ctr) {
+    // non-escaping object, EA sweepable, values are forwarded to users, additional
+    // bookeeping (SafepointScalarObjectNode) for eliminated objects at SafePoints
+    // With -XX:-Inline, constructor will not be inlined and hence AllocateNode are
+    // considered escapable.
+    MyClass obj = new MyClass(10, 20, 30, 40);
+    return obj.field1 * ctr + obj.field2 + obj.field3 + obj.field4;
+  }
+
+  public static int micro2(int ctr) {
+    // small known length arrays of size less than
+    // -XX:+EliminateAllocationArraySizeLimit are eliminatable if non-escaping.
+    int[] arr = new int[5];
+    arr[0] = 10;
+    arr[1] = 10;
+    arr[2] = 10;
+    arr[3] = 10;
+    arr[4] = 10;
+    // value forwarding will forward constants to expressions.
+    return ctr * arr[0] + arr[1] + arr[2] + arr[3] + arr[4];
+  }
+
+  public static int micro3(int ctr) {
+    int[] arr = new int[8];
+    MemorySegment ms = MemorySegment.ofArray(arr);
+    ms.fill((byte) 10);
+    return ctr * ms.get(ValueLayout.JAVA_INT, 12) +
+        ms.get(ValueLayout.JAVA_INT, 16) +
+        ms.get(ValueLayout.JAVA_INT, 20) +
+        ms.get(ValueLayout.JAVA_INT, 24);
+  }
+
+  public static void main(String[] args) {
+    {
+      int res = 0;
+      for (int i = 0; i < 100000; i++) {
+        res += micro1(i);
+      }
+      System.out.println("[res] " + res);
+    }
+    {
+      int res = 0;
+      for (int i = 0; i < 100000; i++) {
+        res += micro2(i);
+      }
+      System.out.println("[res] " + res);
+    }
+    {
+      int res = 0;
+      for (int i = 0; i < 100000; i++) {
+        res += micro3(i);
+      }
+      System.out.println("[res] " + res);
+    }
+  }
+}

From aaa90b3005c85852971203ce6feb88e7091e167b Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 9 May 2024 13:54:04 +0000
Subject: [PATCH 376/486] 8327476: Upgrade JLine to 3.26.1

Reviewed-by: ihse, vromero
---
 make/conf/module-loader-map.conf              |    1 +
 make/modules/jdk.internal.le/Lib.gmk          |   45 -
 .../jline/terminal/impl/jna/JDKNativePty.java |   50 -
 .../jline/terminal/impl/jna/JDKNativePty.java |   51 -
 .../terminal/impl/jna/linux/CLibrary.java     |  389 ------
 .../terminal/impl/jna/linux/CLibraryImpl.java |   61 -
 .../impl/jna/linux/LinuxNativePty.java        |  122 --
 .../impl/jna/linux/UtilLibraryImpl.java       |   37 -
 .../linux/native/lible/CLibrary.cpp           |  207 ---
 .../jline/terminal/impl/jna/JDKNativePty.java |   51 -
 .../jline/terminal/impl/jna/osx/CLibrary.java |  394 ------
 .../terminal/impl/jna/osx/CLibraryImpl.java   |   66 -
 .../terminal/impl/jna/osx/NativeLong.java     |   43 -
 .../terminal/impl/jna/osx/OsXNativePty.java   |  106 --
 .../macosx/native/lible/CLibrary.cpp          |  211 ---
 .../org/jline/keymap/BindingReader.java       |    8 +-
 .../jdk/internal/org/jline/keymap/KeyMap.java |   11 +-
 .../internal/org/jline/reader/Binding.java    |    7 +-
 .../jdk/internal/org/jline/reader/Buffer.java |   10 +-
 .../internal/org/jline/reader/Candidate.java  |   20 +-
 .../internal/org/jline/reader/Completer.java  |    5 +-
 .../jline/reader/CompletingParsedLine.java    |    5 +-
 .../org/jline/reader/CompletionMatcher.java   |   12 +-
 .../internal/org/jline/reader/EOFError.java   |   20 +-
 .../jdk/internal/org/jline/reader/Editor.java |    4 +-
 .../org/jline/reader/EndOfFileException.java  |    5 +-
 .../internal/org/jline/reader/Expander.java   |    3 +-
 .../org/jline/reader/Highlighter.java         |    2 +-
 .../internal/org/jline/reader/History.java    |   12 +-
 .../internal/org/jline/reader/LineReader.java |   53 +-
 .../org/jline/reader/LineReaderBuilder.java   |   11 +-
 .../jdk/internal/org/jline/reader/Macro.java  |    5 +-
 .../org/jline/reader/MaskingCallback.java     |    3 +-
 .../internal/org/jline/reader/ParsedLine.java |    3 +-
 .../jdk/internal/org/jline/reader/Parser.java |    6 +-
 .../org/jline/reader/PrintAboveWriter.java    |    2 +-
 .../internal/org/jline/reader/Reference.java  |    5 +-
 .../org/jline/reader/SyntaxError.java         |   18 +-
 .../jline/reader/UserInterruptException.java  |   12 +-
 .../jdk/internal/org/jline/reader/Widget.java |    3 +-
 .../org/jline/reader/impl/BufferImpl.java     |   15 +-
 .../reader/impl/CompletionMatcherImpl.java    |   83 +-
 .../jline/reader/impl/DefaultExpander.java    |   33 +-
 .../jline/reader/impl/DefaultHighlighter.java |    8 +-
 .../org/jline/reader/impl/DefaultParser.java  |  144 +-
 .../org/jline/reader/impl/InputRC.java        |  394 ++++++
 .../org/jline/reader/impl/KillRing.java       |    2 +-
 .../org/jline/reader/impl/LineReaderImpl.java | 1200 ++++++++++-------
 .../org/jline/reader/impl/ReaderUtils.java    |    8 +-
 .../reader/impl/SimpleMaskingCallback.java    |    9 +-
 .../org/jline/reader/impl/UndoTree.java       |    4 +-
 .../impl/completer/AggregateCompleter.java    |   11 +-
 .../impl/completer/ArgumentCompleter.java     |   11 +-
 .../reader/impl/completer/EnumCompleter.java  |    5 +-
 .../impl/completer/FileNameCompleter.java     |   20 +-
 .../reader/impl/completer/NullCompleter.java  |    9 +-
 .../impl/completer/StringsCompleter.java      |    7 +-
 .../impl/completer/SystemCompleter.java       |   27 +-
 .../reader/impl/history/DefaultHistory.java   |   77 +-
 .../org/jline/terminal/Attributes.java        |  146 +-
 .../internal/org/jline/terminal/Cursor.java   |    2 +-
 .../org/jline/terminal/MouseEvent.java        |   15 +-
 .../jdk/internal/org/jline/terminal/Size.java |    8 +-
 .../internal/org/jline/terminal/Terminal.java |   59 +-
 .../org/jline/terminal/TerminalBuilder.java   |  608 ++++++---
 .../terminal/impl/AbstractPosixTerminal.java  |   16 +-
 .../org/jline/terminal/impl/AbstractPty.java  |  164 ++-
 .../jline/terminal/impl/AbstractTerminal.java |   39 +-
 .../impl/AbstractWindowsConsoleWriter.java    |    9 +-
 .../impl/AbstractWindowsTerminal.java         |  158 ++-
 .../jline/terminal/impl/CursorSupport.java    |   13 +-
 .../org/jline/terminal/impl/Diag.java         |   64 +-
 .../org/jline/terminal/impl/DumbTerminal.java |   69 +-
 .../terminal/impl/DumbTerminalProvider.java   |   92 ++
 .../jline/terminal/impl/ExternalTerminal.java |   81 +-
 .../terminal/impl/LineDisciplineTerminal.java |  132 +-
 .../org/jline/terminal/impl/MouseSupport.java |   22 +-
 .../terminal/impl/NativeSignalHandler.java    |    5 +-
 .../jline/terminal/impl/PosixPtyTerminal.java |   34 +-
 .../jline/terminal/impl/PosixSysTerminal.java |   16 +-
 .../terminal/impl/{ => exec}/ExecPty.java     |  111 +-
 .../impl/exec/ExecTerminalProvider.java       |  228 +++-
 .../org/jline/terminal/impl/ffm/CLibrary.java | 1170 ++++++++++++++++
 .../jline/terminal/impl/ffm/FfmNativePty.java |  175 +++
 .../impl/ffm/FfmTerminalProvider.java         |  133 ++
 .../org/jline/terminal/impl/ffm/Kernel32.java |  927 +++++++++++++
 .../impl/ffm/NativeWinConsoleWriter.java      |   35 +
 .../impl/ffm/NativeWinSysTerminal.java        |  302 +++++
 .../terminal/impl/ffm/WindowsAnsiWriter.java  |  407 ++++++
 .../terminal/impl/jna/LastErrorException.java |   36 -
 .../internal/org/jline/terminal/spi/Pty.java  |    5 +-
 .../org/jline/terminal/spi/SystemStream.java  |   15 +
 .../org/jline/terminal/spi/TerminalExt.java   |   31 +
 .../jline/terminal/spi/TerminalProvider.java  |   67 +-
 .../internal/org/jline/utils/AnsiWriter.java  |  155 +--
 .../jline/utils/AttributedCharSequence.java   |   40 +-
 .../org/jline/utils/AttributedString.java     |   33 +-
 .../jline/utils/AttributedStringBuilder.java  |  129 +-
 .../org/jline/utils/AttributedStyle.java      |   88 +-
 .../org/jline/utils/ClosedException.java      |    5 +-
 .../org/jline/utils/ColorPalette.java         |   25 +-
 .../jdk/internal/org/jline/utils/Colors.java  |  165 ++-
 .../jdk/internal/org/jline/utils/Curses.java  |   33 +-
 .../internal/org/jline/utils/DiffHelper.java  |   39 +-
 .../jdk/internal/org/jline/utils/Display.java |   98 +-
 .../internal/org/jline/utils/ExecHelper.java  |    8 +-
 .../jline/utils/FastBufferedOutputStream.java |   61 +
 .../jdk/internal/org/jline/utils/InfoCmp.java |  968 ++++++-------
 .../org/jline/utils/InputStreamReader.java    |   32 +-
 .../internal/org/jline/utils/Levenshtein.java |    8 +-
 .../jdk/internal/org/jline/utils/Log.java     |   11 +-
 .../internal/org/jline/utils/NonBlocking.java |   21 +-
 .../jline/utils/NonBlockingInputStream.java   |    8 +-
 .../utils/NonBlockingInputStreamImpl.java     |   40 +-
 .../utils/NonBlockingPumpInputStream.java     |   12 +-
 .../jline/utils/NonBlockingPumpReader.java    |    9 +-
 .../org/jline/utils/NonBlockingReader.java    |    6 +-
 .../jline/utils/NonBlockingReaderImpl.java    |   47 +-
 .../jdk/internal/org/jline/utils/OSUtils.java |  122 +-
 .../internal/org/jline/utils/PumpReader.java  |    5 +-
 .../org/jline/utils/ShutdownHooks.java        |   17 +-
 .../jdk/internal/org/jline/utils/Signals.java |   13 +-
 .../jdk/internal/org/jline/utils/Status.java  |  295 ++--
 .../org/jline/utils/StyleResolver.java        |   14 +-
 .../jdk/internal/org/jline/utils/Timeout.java |    3 +-
 .../jdk/internal/org/jline/utils/WCWidth.java |  159 ++-
 .../org/jline/utils/WriterOutputStream.java   |   12 +-
 .../org/jline/utils/windows-conemu.caps       |    3 +
 src/jdk.internal.le/share/legal/jline.md      |    4 +-
 .../jline/terminal/impl/jna/JnaNativePty.java |  204 ---
 .../impl/jna/JnaTerminalProvider.java         |  105 --
 .../impl/jna/JnaTerminalProvider.java         |  106 --
 .../terminal/impl/jna/win/IntByReference.java |   35 -
 .../impl/jna/win/JnaWinConsoleWriter.java     |   37 -
 .../impl/jna/win/JnaWinSysTerminal.java       |  228 ----
 .../jline/terminal/impl/jna/win/Kernel32.java |  634 ---------
 .../terminal/impl/jna/win/Kernel32Impl.java   |   85 --
 .../jline/terminal/impl/jna/win/Pointer.java  |   34 -
 .../impl/jna/win/WindowsAnsiWriter.java       |  353 -----
 .../windows/native/lible/Kernel32.cpp         |  710 ----------
 .../jline/AbstractWindowsTerminalTest.java    |   14 +-
 .../jdk/internal/jline/KeyConversionTest.java |   13 +-
 .../jdk/jshell/ExecPtyGetFlagsToSetTest.java  |   11 +-
 143 files changed, 7616 insertions(+), 7181 deletions(-)
 delete mode 100644 make/modules/jdk.internal.le/Lib.gmk
 delete mode 100644 src/jdk.internal.le/aix/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
 delete mode 100644 src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
 delete mode 100644 src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary.java
 delete mode 100644 src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibraryImpl.java
 delete mode 100644 src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/LinuxNativePty.java
 delete mode 100644 src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/UtilLibraryImpl.java
 delete mode 100644 src/jdk.internal.le/linux/native/lible/CLibrary.cpp
 delete mode 100644 src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
 delete mode 100644 src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary.java
 delete mode 100644 src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibraryImpl.java
 delete mode 100644 src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/NativeLong.java
 delete mode 100644 src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/OsXNativePty.java
 delete mode 100644 src/jdk.internal.le/macosx/native/lible/CLibrary.cpp
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/InputRC.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminalProvider.java
 rename src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/{ => exec}/ExecPty.java (71%)
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmNativePty.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmTerminalProvider.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinConsoleWriter.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/WindowsAnsiWriter.java
 delete mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/jna/LastErrorException.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/SystemStream.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalExt.java
 create mode 100644 src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/FastBufferedOutputStream.java
 delete mode 100644 src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaNativePty.java
 delete mode 100644 src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
 delete mode 100644 src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
 delete mode 100644 src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/IntByReference.java
 delete mode 100644 src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java
 delete mode 100644 src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java
 delete mode 100644 src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32.java
 delete mode 100644 src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32Impl.java
 delete mode 100644 src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Pointer.java
 delete mode 100644 src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java
 delete mode 100644 src/jdk.internal.le/windows/native/lible/Kernel32.cpp

diff --git a/make/conf/module-loader-map.conf b/make/conf/module-loader-map.conf
index 5b72bf78aa0..e904031186d 100644
--- a/make/conf/module-loader-map.conf
+++ b/make/conf/module-loader-map.conf
@@ -120,6 +120,7 @@ NATIVE_ACCESS_MODULES= \
     jdk.dynalink \
     jdk.httpserver \
     jdk.incubator.vector \
+    jdk.internal.le \
     jdk.internal.vm.ci \
     jdk.jfr \
     jdk.jsobject \
diff --git a/make/modules/jdk.internal.le/Lib.gmk b/make/modules/jdk.internal.le/Lib.gmk
deleted file mode 100644
index e81137e0d53..00000000000
--- a/make/modules/jdk.internal.le/Lib.gmk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2015, 2024, 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.
-#
-
-include LibCommon.gmk
-
-ifeq ($(call isTargetOs, aix), false)
-  ##############################################################################
-  ## Build lible
-  ##############################################################################
-
-  $(eval $(call SetupJdkLibrary, BUILD_LIBLE, \
-      NAME := le, \
-      LINK_TYPE := C++, \
-      OPTIMIZATION := LOW, \
-      EXTRA_HEADER_DIRS := \
-          java.base:libjava \
-          java.base:libjvm, \
-      LD_SET_ORIGIN := false, \
-      LIBS_windows := user32.lib, \
-  ))
-
-  TARGETS += $(BUILD_LIBLE)
-endif
diff --git a/src/jdk.internal.le/aix/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java b/src/jdk.internal.le/aix/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
deleted file mode 100644
index fe5e10e7e5d..00000000000
--- a/src/jdk.internal.le/aix/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2023, 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.org.jline.terminal.impl.jna;
-
-import java.io.IOException;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-class JDKNativePty {
-
-    static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    static JnaNativePty open(Attributes attr, Size size) throws IOException {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    static int isatty(int fd) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    static String ttyname(int fd) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
deleted file mode 100644
index 199e80d9dde..00000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2023, 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.org.jline.terminal.impl.jna;
-
-import java.io.IOException;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.linux.LinuxNativePty;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-class JDKNativePty {
-
-    static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-        return LinuxNativePty.current(console);
-    }
-
-    static JnaNativePty open(Attributes attr, Size size) throws IOException {
-        return LinuxNativePty.open(attr, size);
-    }
-
-    static int isatty(int fd) {
-        return LinuxNativePty.isatty(fd);
-    }
-
-    static String ttyname(int fd) {
-        return LinuxNativePty.ttyname(fd);
-    }
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary.java
deleted file mode 100644
index 5a3a43c6f5e..00000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.linux;
-
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.List;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Platform;
-//import com.sun.jna.Structure;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Attributes.ControlChar;
-import jdk.internal.org.jline.terminal.Attributes.ControlFlag;
-import jdk.internal.org.jline.terminal.Attributes.InputFlag;
-import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
-import jdk.internal.org.jline.terminal.Attributes.OutputFlag;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-public interface CLibrary {//extends com.sun.jna.Library {
-
-    void tcgetattr(int fd, termios termios) throws LastErrorException;
-
-    void tcsetattr(int fd, int cmd, termios termios) throws LastErrorException;
-
-    void ioctl(int fd, int cmd, winsize data) throws LastErrorException;
-
-    int isatty(int fd);
-
-    void ttyname_r(int fd, byte[] buf, int len) throws LastErrorException;
-
-    class winsize { //extends Structure {
-        public short ws_row;
-        public short ws_col;
-        public short ws_xpixel;
-        public short ws_ypixel;
-
-        public winsize() {
-        }
-
-        public winsize(Size ws) {
-            ws_row = (short) ws.getRows();
-            ws_col = (short) ws.getColumns();
-        }
-
-        public Size toSize() {
-            return new Size(ws_col, ws_row);
-        }
-
-//        @Override
-//        protected List<String> getFieldOrder() {
-//            return Arrays.asList(//
-//                    "ws_row",//
-//                    "ws_col",//
-//                    "ws_xpixel",//
-//                    "ws_ypixel"//
-//            );
-//        }
-
-    }
-
-    class termios {// extends Structure {
-
-        public int c_iflag;
-        public int c_oflag;
-        public int c_cflag;
-        public int c_lflag;
-        public byte c_line;
-        public byte[] c_cc = new byte[32];
-        public int c_ispeed;
-        public int c_ospeed;
-
-//        @Override
-//        protected List<String> getFieldOrder() {
-//            return Arrays.asList(//
-//                    "c_iflag",//
-//                    "c_oflag",//
-//                    "c_cflag",//
-//                    "c_lflag",//
-//                    "c_line",//
-//                    "c_cc",//
-//                    "c_ispeed",//
-//                    "c_ospeed"//
-//            );
-//        }
-
-        public termios() {
-        }
-
-        public termios(Attributes t) {
-            // Input flags
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IGNBRK),           IGNBRK,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.BRKINT),           BRKINT,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IGNPAR),           IGNPAR,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.PARMRK),           PARMRK,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.INPCK),            INPCK,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.ISTRIP),           ISTRIP,     c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.INLCR),            INLCR,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IGNCR),            IGNCR,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.ICRNL),            ICRNL,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IXON),             IXON,       c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IXOFF),            IXOFF,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IXANY),            IXANY,      c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IMAXBEL),          IMAXBEL,    c_iflag);
-            c_iflag = setFlag(t.getInputFlag(InputFlag.IUTF8),            IUTF8,      c_iflag);
-            // Output flags
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.OPOST),          OPOST,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.ONLCR),          ONLCR,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.OCRNL),          OCRNL,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.ONOCR),          ONOCR,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.ONLRET),         ONLRET,     c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.OFILL),          OFILL,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.NLDLY),          NLDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.TABDLY),         TABDLY,     c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.CRDLY),          CRDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.FFDLY),          FFDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.BSDLY),          BSDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.VTDLY),          VTDLY,      c_oflag);
-            c_oflag = setFlag(t.getOutputFlag(OutputFlag.OFDEL),          OFDEL,      c_oflag);
-            // Control flags
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CS5),          CS5,        c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CS6),          CS6,        c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CS7),          CS7,        c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CS8),          CS8,        c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CSTOPB),       CSTOPB,     c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CREAD),        CREAD,      c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.PARENB),       PARENB,     c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.PARODD),       PARODD,     c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.HUPCL),        HUPCL,      c_cflag);
-            c_cflag = setFlag(t.getControlFlag(ControlFlag.CLOCAL),       CLOCAL,     c_cflag);
-            // Local flags
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOKE),           ECHOKE,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOE),            ECHOE,      c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOK),            ECHOK,      c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHO),             ECHO,       c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHONL),           ECHONL,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOPRT),          ECHOPRT,    c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ECHOCTL),          ECHOCTL,    c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ISIG),             ISIG,       c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.ICANON),           ICANON,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.EXTPROC),          EXTPROC,    c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.TOSTOP),           TOSTOP,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.FLUSHO),           FLUSHO,     c_lflag);
-            c_lflag = setFlag(t.getLocalFlag(LocalFlag.NOFLSH),           NOFLSH,     c_lflag);
-            // Control chars
-            c_cc[VEOF]      = (byte) t.getControlChar(ControlChar.VEOF);
-            c_cc[VEOL]      = (byte) t.getControlChar(ControlChar.VEOL);
-            c_cc[VEOL2]     = (byte) t.getControlChar(ControlChar.VEOL2);
-            c_cc[VERASE]    = (byte) t.getControlChar(ControlChar.VERASE);
-            c_cc[VWERASE]   = (byte) t.getControlChar(ControlChar.VWERASE);
-            c_cc[VKILL]     = (byte) t.getControlChar(ControlChar.VKILL);
-            c_cc[VREPRINT]  = (byte) t.getControlChar(ControlChar.VREPRINT);
-            c_cc[VINTR]     = (byte) t.getControlChar(ControlChar.VINTR);
-            c_cc[VQUIT]     = (byte) t.getControlChar(ControlChar.VQUIT);
-            c_cc[VSUSP]     = (byte) t.getControlChar(ControlChar.VSUSP);
-            c_cc[VSTART]    = (byte) t.getControlChar(ControlChar.VSTART);
-            c_cc[VSTOP]     = (byte) t.getControlChar(ControlChar.VSTOP);
-            c_cc[VLNEXT]    = (byte) t.getControlChar(ControlChar.VLNEXT);
-            c_cc[VDISCARD]  = (byte) t.getControlChar(ControlChar.VDISCARD);
-            c_cc[VMIN]      = (byte) t.getControlChar(ControlChar.VMIN);
-            c_cc[VTIME]     = (byte) t.getControlChar(ControlChar.VTIME);
-        }
-
-        private int setFlag(boolean flag, int value, int org) {
-            return flag ? (org | value) : org;
-        }
-
-        public Attributes toAttributes() {
-            Attributes attr = new Attributes();
-            // Input flags
-            EnumSet<InputFlag> iflag = attr.getInputFlags();
-            addFlag(c_iflag, iflag, InputFlag.IGNBRK,   IGNBRK);
-            addFlag(c_iflag, iflag, InputFlag.IGNBRK, IGNBRK);
-            addFlag(c_iflag, iflag, InputFlag.BRKINT, BRKINT);
-            addFlag(c_iflag, iflag, InputFlag.IGNPAR, IGNPAR);
-            addFlag(c_iflag, iflag, InputFlag.PARMRK, PARMRK);
-            addFlag(c_iflag, iflag, InputFlag.INPCK, INPCK);
-            addFlag(c_iflag, iflag, InputFlag.ISTRIP, ISTRIP);
-            addFlag(c_iflag, iflag, InputFlag.INLCR, INLCR);
-            addFlag(c_iflag, iflag, InputFlag.IGNCR, IGNCR);
-            addFlag(c_iflag, iflag, InputFlag.ICRNL, ICRNL);
-            addFlag(c_iflag, iflag, InputFlag.IXON, IXON);
-            addFlag(c_iflag, iflag, InputFlag.IXOFF, IXOFF);
-            addFlag(c_iflag, iflag, InputFlag.IXANY, IXANY);
-            addFlag(c_iflag, iflag, InputFlag.IMAXBEL, IMAXBEL);
-            addFlag(c_iflag, iflag, InputFlag.IUTF8, IUTF8);
-            // Output flags
-            EnumSet<OutputFlag> oflag = attr.getOutputFlags();
-            addFlag(c_oflag, oflag, OutputFlag.OPOST, OPOST);
-            addFlag(c_oflag, oflag, OutputFlag.ONLCR, ONLCR);
-            addFlag(c_oflag, oflag, OutputFlag.OCRNL, OCRNL);
-            addFlag(c_oflag, oflag, OutputFlag.ONOCR, ONOCR);
-            addFlag(c_oflag, oflag, OutputFlag.ONLRET, ONLRET);
-            addFlag(c_oflag, oflag, OutputFlag.OFILL, OFILL);
-            addFlag(c_oflag, oflag, OutputFlag.NLDLY, NLDLY);
-            addFlag(c_oflag, oflag, OutputFlag.TABDLY, TABDLY);
-            addFlag(c_oflag, oflag, OutputFlag.CRDLY, CRDLY);
-            addFlag(c_oflag, oflag, OutputFlag.FFDLY, FFDLY);
-            addFlag(c_oflag, oflag, OutputFlag.BSDLY, BSDLY);
-            addFlag(c_oflag, oflag, OutputFlag.VTDLY, VTDLY);
-            addFlag(c_oflag, oflag, OutputFlag.OFDEL, OFDEL);
-            // Control flags
-            EnumSet<ControlFlag> cflag = attr.getControlFlags();
-            addFlag(c_cflag, cflag, ControlFlag.CS5, CS5);
-            addFlag(c_cflag, cflag, ControlFlag.CS6, CS6);
-            addFlag(c_cflag, cflag, ControlFlag.CS7, CS7);
-            addFlag(c_cflag, cflag, ControlFlag.CS8, CS8);
-            addFlag(c_cflag, cflag, ControlFlag.CSTOPB, CSTOPB);
-            addFlag(c_cflag, cflag, ControlFlag.CREAD, CREAD);
-            addFlag(c_cflag, cflag, ControlFlag.PARENB, PARENB);
-            addFlag(c_cflag, cflag, ControlFlag.PARODD, PARODD);
-            addFlag(c_cflag, cflag, ControlFlag.HUPCL, HUPCL);
-            addFlag(c_cflag, cflag, ControlFlag.CLOCAL, CLOCAL);
-            // Local flags
-            EnumSet<LocalFlag> lflag = attr.getLocalFlags();
-            addFlag(c_lflag, lflag, LocalFlag.ECHOKE, ECHOKE);
-            addFlag(c_lflag, lflag, LocalFlag.ECHOE, ECHOE);
-            addFlag(c_lflag, lflag, LocalFlag.ECHOK, ECHOK);
-            addFlag(c_lflag, lflag, LocalFlag.ECHO, ECHO);
-            addFlag(c_lflag, lflag, LocalFlag.ECHONL, ECHONL);
-            addFlag(c_lflag, lflag, LocalFlag.ECHOPRT, ECHOPRT);
-            addFlag(c_lflag, lflag, LocalFlag.ECHOCTL, ECHOCTL);
-            addFlag(c_lflag, lflag, LocalFlag.ISIG, ISIG);
-            addFlag(c_lflag, lflag, LocalFlag.ICANON, ICANON);
-            addFlag(c_lflag, lflag, LocalFlag.EXTPROC, EXTPROC);
-            addFlag(c_lflag, lflag, LocalFlag.TOSTOP, TOSTOP);
-            addFlag(c_lflag, lflag, LocalFlag.FLUSHO, FLUSHO);
-            addFlag(c_lflag, lflag, LocalFlag.NOFLSH, NOFLSH);
-            // Control chars
-            EnumMap<ControlChar, Integer> cc = attr.getControlChars();
-            cc.put(ControlChar.VEOF,        (int) c_cc[VEOF]);
-            cc.put(ControlChar.VEOL,        (int) c_cc[VEOL]);
-            cc.put(ControlChar.VEOL2,       (int) c_cc[VEOL2]);
-            cc.put(ControlChar.VERASE,      (int) c_cc[VERASE]);
-            cc.put(ControlChar.VWERASE,     (int) c_cc[VWERASE]);
-            cc.put(ControlChar.VKILL,       (int) c_cc[VKILL]);
-            cc.put(ControlChar.VREPRINT,    (int) c_cc[VREPRINT]);
-            cc.put(ControlChar.VINTR,       (int) c_cc[VINTR]);
-            cc.put(ControlChar.VQUIT,       (int) c_cc[VQUIT]);
-            cc.put(ControlChar.VSUSP,       (int) c_cc[VSUSP]);
-            cc.put(ControlChar.VSTART,      (int) c_cc[VSTART]);
-            cc.put(ControlChar.VSTOP,       (int) c_cc[VSTOP]);
-            cc.put(ControlChar.VLNEXT,      (int) c_cc[VLNEXT]);
-            cc.put(ControlChar.VDISCARD,    (int) c_cc[VDISCARD]);
-            cc.put(ControlChar.VMIN,        (int) c_cc[VMIN]);
-            cc.put(ControlChar.VTIME,       (int) c_cc[VTIME]);
-            // Return
-            return attr;
-        }
-
-        private <T extends Enum<T>> void addFlag(int value, EnumSet<T> flags, T flag, int v) {
-            if ((value & v) != 0) {
-                flags.add(flag);
-            }
-        }
-    }
-
-    // CONSTANTS
-
-    int TIOCGWINSZ = /*Platform.isMIPS() || Platform.isPPC() || Platform.isSPARC() ? 0x40087468 : */0x00005413;
-    int TIOCSWINSZ = /*Platform.isMIPS() || Platform.isPPC() || Platform.isSPARC() ? 0x80087467 : */0x00005414;
-
-    int VINTR       = 0;
-    int VQUIT       = 1;
-    int VERASE      = 2;
-    int VKILL       = 3;
-    int VEOF        = 4;
-    int VTIME       = 5;
-    int VMIN        = 6;
-    int VSWTC       = 7;
-    int VSTART      = 8;
-    int VSTOP       = 9;
-    int VSUSP       = 10;
-    int VEOL        = 11;
-    int VREPRINT    = 12;
-    int VDISCARD    = 13;
-    int VWERASE     = 14;
-    int VLNEXT      = 15;
-    int VEOL2       = 16;
-
-    int IGNBRK =   0x0000001;
-    int BRKINT =   0x0000002;
-    int IGNPAR =   0x0000004;
-    int PARMRK =   0x0000008;
-    int INPCK =    0x0000010;
-    int ISTRIP =   0x0000020;
-    int INLCR =    0x0000040;
-    int IGNCR =    0x0000080;
-    int ICRNL =    0x0000100;
-    int IUCLC =    0x0000200;
-    int IXON =     0x0000400;
-    int IXANY =    0x0000800;
-    int IXOFF =    0x0001000;
-    int IMAXBEL =  0x0002000;
-    int IUTF8 =    0x0004000;
-
-    int OPOST =    0x0000001;
-    int OLCUC =    0x0000002;
-    int ONLCR =    0x0000004;
-    int OCRNL =    0x0000008;
-    int ONOCR =    0x0000010;
-    int ONLRET =   0x0000020;
-    int OFILL =    0x0000040;
-    int OFDEL =    0x0000080;
-    int NLDLY =    0x0000100;
-      int NL0 =    0x0000000;
-      int NL1 =    0x0000100;
-    int CRDLY =    0x0000600;
-      int CR0 =    0x0000000;
-      int CR1 =    0x0000200;
-      int CR2 =    0x0000400;
-      int CR3 =    0x0000600;
-    int TABDLY =   0x0001800;
-      int TAB0 =   0x0000000;
-      int TAB1 =   0x0000800;
-      int TAB2 =   0x0001000;
-      int TAB3 =   0x0001800;
-      int XTABS =  0x0001800;
-    int BSDLY =    0x0002000;
-      int BS0 =    0x0000000;
-      int BS1 =    0x0002000;
-    int VTDLY =    0x0004000;
-      int VT0 =    0x0000000;
-      int VT1 =    0x0004000;
-    int FFDLY =    0x0008000;
-      int FF0 =    0x0000000;
-      int FF1 =    0x0008000;
-
-    int CBAUD =    0x000100f;
-     int B0 =      0x0000000;
-     int B50 =     0x0000001;
-     int B75 =     0x0000002;
-     int B110 =    0x0000003;
-     int B134 =    0x0000004;
-     int B150 =    0x0000005;
-     int B200 =    0x0000006;
-     int B300 =    0x0000007;
-     int B600 =    0x0000008;
-     int B1200 =   0x0000009;
-     int B1800 =   0x000000a;
-     int B2400 =   0x000000b;
-     int B4800 =   0x000000c;
-     int B9600 =   0x000000d;
-     int B19200 =  0x000000e;
-     int B38400 =  0x000000f;
-    int EXTA =  B19200;
-    int EXTB =  B38400;
-    int CSIZE =    0x0000030;
-      int CS5 =    0x0000000;
-      int CS6 =    0x0000010;
-      int CS7 =    0x0000020;
-      int CS8 =    0x0000030;
-    int CSTOPB =   0x0000040;
-    int CREAD =    0x0000080;
-    int PARENB =   0x0000100;
-    int PARODD =   0x0000200;
-    int HUPCL =    0x0000400;
-    int CLOCAL =   0x0000800;
-
-    int ISIG =     0x0000001;
-    int ICANON =   0x0000002;
-    int XCASE =    0x0000004;
-    int ECHO =     0x0000008;
-    int ECHOE =    0x0000010;
-    int ECHOK =    0x0000020;
-    int ECHONL =   0x0000040;
-    int NOFLSH =   0x0000080;
-    int TOSTOP =   0x0000100;
-    int ECHOCTL =  0x0000200;
-    int ECHOPRT =  0x0000400;
-    int ECHOKE =   0x0000800;
-    int FLUSHO =   0x0001000;
-    int PENDIN =   0x0002000;
-    int IEXTEN =   0x0008000;
-    int EXTPROC =  0x0010000;
-
-    int TCSANOW =          0x0;
-    int TCSADRAIN =        0x1;
-    int TCSAFLUSH =        0x2;
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibraryImpl.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibraryImpl.java
deleted file mode 100644
index 732f2d15d1e..00000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibraryImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2023, 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.org.jline.terminal.impl.jna.linux;
-
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-public final class CLibraryImpl implements CLibrary {
-
-    static {
-        System.loadLibrary("le");
-        initIDs();
-    }
-
-    private static native void initIDs();
-
-    @Override
-    public native void tcgetattr(int fd, termios termios) throws LastErrorException;
-
-    @Override
-    public native void tcsetattr(int fd, int cmd, termios termios) throws LastErrorException;
-
-    @Override
-    public void ioctl(int fd, int cmd, winsize data) throws LastErrorException {
-        if (cmd == CLibrary.TIOCGWINSZ || cmd == CLibrary.TIOCSWINSZ) {
-            ioctl0(fd, cmd, data);
-        } else {
-            throw new UnsupportedOperationException("Command: " + cmd + ", not supported.");
-        }
-    }
-
-    private native void ioctl0(int fd, int cmd, winsize data) throws LastErrorException;
-
-    @Override
-    public native int isatty(int fd);
-
-    @Override
-    public native void ttyname_r(int fd, byte[] buf, int len) throws LastErrorException;
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/LinuxNativePty.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/LinuxNativePty.java
deleted file mode 100644
index b2cd60c08e7..00000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/LinuxNativePty.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.linux;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Native;
-//import com.sun.jna.Platform;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.JnaNativePty;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.TCSADRAIN;
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.TIOCGWINSZ;
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.TIOCSWINSZ;
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.termios;
-import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.winsize;
-
-public class LinuxNativePty extends JnaNativePty {
-
-//    private static final CLibrary C_LIBRARY = Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
-    private static final CLibrary C_LIBRARY = new CLibraryImpl();
-
-    public interface UtilLibrary {// extends com.sun.jna.Library {
-
-        void openpty(int[] master, int[] slave, byte[] name, CLibrary.termios t, CLibrary.winsize s) throws LastErrorException;
-
-//        UtilLibrary INSTANCE = Native.load("util", UtilLibrary.class);
-        UtilLibrary INSTANCE = new UtilLibraryImpl();
-    }
-
-    public static LinuxNativePty current(TerminalProvider.Stream consoleStream) throws IOException {
-        switch (consoleStream) {
-            case Output:
-                return new LinuxNativePty(-1, null, 0, FileDescriptor.in, 1, FileDescriptor.out, ttyname(0));
-            case Error:
-                return new LinuxNativePty(-1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
-            default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + consoleStream);
-        }
-    }
-
-    public static LinuxNativePty open(Attributes attr, Size size) throws IOException {
-        int[] master = new int[1];
-        int[] slave = new int[1];
-        byte[] buf = new byte[64];
-        UtilLibrary.INSTANCE.openpty(master, slave, buf,
-                attr != null ? new termios(attr) : null,
-                size != null ? new winsize(size) : null);
-        int len = 0;
-        while (buf[len] != 0) {
-            len++;
-        }
-        String name = new String(buf, 0, len);
-        return new LinuxNativePty(master[0], newDescriptor(master[0]), slave[0], newDescriptor(slave[0]), name);
-    }
-
-    public LinuxNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, String name) {
-        super(master, masterFD, slave, slaveFD, name);
-    }
-
-    public LinuxNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, int slaveOut, FileDescriptor slaveOutFD, String name) {
-        super(master, masterFD, slave, slaveFD, slaveOut, slaveOutFD, name);
-    }
-
-    @Override
-    public Attributes getAttr() throws IOException {
-        termios termios = new termios();
-        C_LIBRARY.tcgetattr(getSlave(), termios);
-        return termios.toAttributes();
-    }
-
-    @Override
-    protected void doSetAttr(Attributes attr) throws IOException {
-        termios termios = new termios(attr);
-        termios org = new termios();
-        C_LIBRARY.tcgetattr(getSlave(), org);
-        org.c_iflag = termios.c_iflag;
-        org.c_oflag = termios.c_oflag;
-        org.c_lflag = termios.c_lflag;
-        System.arraycopy(termios.c_cc, 0, org.c_cc, 0, termios.c_cc.length);
-        C_LIBRARY.tcsetattr(getSlave(), TCSADRAIN, org);
-    }
-
-    @Override
-    public Size getSize() throws IOException {
-        winsize sz = new winsize();
-        C_LIBRARY.ioctl(getSlave(), TIOCGWINSZ, sz);
-        return sz.toSize();
-    }
-
-    @Override
-    public void setSize(Size size) throws IOException {
-        winsize sz = new winsize(size);
-        C_LIBRARY.ioctl(getSlave(), TIOCSWINSZ, sz);
-    }
-
-    public static int isatty(int fd) {
-        return C_LIBRARY.isatty(fd);
-    }
-
-    public static String ttyname(int slave) {
-        byte[] buf = new byte[64];
-        C_LIBRARY.ttyname_r(slave, buf, buf.length);
-        int len = 0;
-        while (buf[len] != 0) {
-            len++;
-        }
-        return new String(buf, 0, len);
-    }
-
-}
diff --git a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/UtilLibraryImpl.java b/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/UtilLibraryImpl.java
deleted file mode 100644
index 0bc8fa3994e..00000000000
--- a/src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/UtilLibraryImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2023, 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.org.jline.terminal.impl.jna.linux;
-
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-import jdk.internal.org.jline.terminal.impl.jna.linux.LinuxNativePty.UtilLibrary;
-
-public final class UtilLibraryImpl implements UtilLibrary {
-
-    @Override
-    public void openpty(int[] master, int[] slave, byte[] name, CLibrary.termios t, CLibrary.winsize s) throws LastErrorException {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/src/jdk.internal.le/linux/native/lible/CLibrary.cpp b/src/jdk.internal.le/linux/native/lible/CLibrary.cpp
deleted file mode 100644
index 3215e1f5013..00000000000
--- a/src/jdk.internal.le/linux/native/lible/CLibrary.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-#include "jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-
-static jclass lastErrorExceptionClass;
-static jmethodID lastErrorExceptionConstructor;
-
-static jclass termios_j;
-static jfieldID c_iflag;
-static jfieldID c_oflag;
-static jfieldID c_cflag;
-static jfieldID c_lflag;
-static jfieldID c_line;
-static jfieldID c_cc;
-static jfieldID c_ispeed;
-static jfieldID c_ospeed;
-
-static jclass winsize_j;
-static jfieldID ws_row;
-static jfieldID ws_col;
-static jfieldID ws_xpixel;
-static jfieldID ws_ypixel;
-
-static void throw_errno(JNIEnv *env);
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_initIDs
-  (JNIEnv *env, jclass unused) {
-    jclass cls;
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/LastErrorException");
-    CHECK_NULL(cls);
-    lastErrorExceptionClass = (jclass) env->NewGlobalRef(cls);
-    lastErrorExceptionConstructor = env->GetMethodID(lastErrorExceptionClass, "<init>", "(J)V");
-    CHECK_NULL(lastErrorExceptionConstructor);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary$termios");
-    CHECK_NULL(cls);
-    termios_j = (jclass) env->NewGlobalRef(cls);
-    c_iflag = env->GetFieldID(termios_j, "c_iflag", "I");
-    CHECK_NULL(c_iflag);
-    c_oflag = env->GetFieldID(termios_j, "c_oflag", "I");
-    CHECK_NULL(c_oflag);
-    c_cflag = env->GetFieldID(termios_j, "c_cflag", "I");
-    CHECK_NULL(c_cflag);
-    c_lflag = env->GetFieldID(termios_j, "c_lflag", "I");
-    CHECK_NULL(c_lflag);
-    c_line = env->GetFieldID(termios_j, "c_line", "B");
-    CHECK_NULL(c_line);
-    c_cc = env->GetFieldID(termios_j, "c_cc", "[B");
-    CHECK_NULL(c_cc);
-    c_ispeed = env->GetFieldID(termios_j, "c_ispeed", "I");
-    CHECK_NULL(c_ispeed);
-    c_ospeed = env->GetFieldID(termios_j, "c_ospeed", "I");
-    CHECK_NULL(c_ospeed);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary$winsize");
-    CHECK_NULL(cls);
-    winsize_j = (jclass) env->NewGlobalRef(cls);
-    ws_row = env->GetFieldID(winsize_j, "ws_row", "S");
-    CHECK_NULL(ws_row);
-    ws_col = env->GetFieldID(winsize_j, "ws_col", "S");
-    CHECK_NULL(ws_col);
-    ws_xpixel= env->GetFieldID(winsize_j, "ws_xpixel", "S");
-    CHECK_NULL(ws_xpixel);
-    ws_ypixel= env->GetFieldID(winsize_j, "ws_ypixel", "S");
-    CHECK_NULL(ws_ypixel);
-}
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_tcgetattr
-  (JNIEnv *env, jobject, jint fd, jobject result) {
-    termios data;
-
-    if (tcgetattr(fd, &data) != 0) {
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetIntField(result, c_iflag, data.c_iflag);
-    env->SetIntField(result, c_oflag, data.c_oflag);
-    env->SetIntField(result, c_cflag, data.c_cflag);
-    env->SetIntField(result, c_lflag, data.c_lflag);
-    env->SetIntField(result, c_line, data.c_line);
-    jbyteArray c_ccValue = (jbyteArray) env->GetObjectField(result, c_cc);
-    env->SetByteArrayRegion(c_ccValue, 0, NCCS, (signed char *) data.c_cc);//TODO: cast?
-    env->SetIntField(result, c_ispeed, cfgetispeed(&data));
-    env->SetIntField(result, c_ospeed, cfgetospeed(&data));
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl
- * Method:    tcsetattr
- * Signature: (IILjdk/internal/org/jline/terminal/impl/jna/linux/CLibrary/termios;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_tcsetattr
-  (JNIEnv *env, jobject, jint fd, jint cmd, jobject input) {
-    termios data;
-
-    data.c_iflag = env->GetIntField(input, c_iflag);
-    data.c_oflag = env->GetIntField(input, c_oflag);
-    data.c_cflag = env->GetIntField(input, c_cflag);
-    data.c_lflag = env->GetIntField(input, c_lflag);
-    data.c_line = env->GetIntField(input, c_line);
-    jbyteArray c_ccValue = (jbyteArray) env->GetObjectField(input, c_cc);
-    env->GetByteArrayRegion(c_ccValue, 0, NCCS, (jbyte *) data.c_cc);
-    cfsetispeed(&data, env->GetIntField(input, c_ispeed));
-    cfsetospeed(&data, env->GetIntField(input, c_ospeed));
-
-    if (tcsetattr(fd, cmd, &data) != 0) {
-        throw_errno(env);
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl
- * Method:    ioctl0
- * Signature: (IILjdk/internal/org/jline/terminal/impl/jna/linux/CLibrary/winsize;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0
-  (JNIEnv *env, jobject, jint fd, jint cmd, jobject data) {
-    winsize ws;
-
-    ws.ws_row = env->GetShortField(data, ws_row);
-    ws.ws_col = env->GetShortField(data, ws_col);
-    ws.ws_xpixel = env->GetShortField(data, ws_xpixel);
-    ws.ws_ypixel = env->GetShortField(data, ws_ypixel);
-
-    if (ioctl(fd, cmd, &ws) != 0) {
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetShortField(data, ws_row, ws.ws_row);
-    env->SetShortField(data, ws_col, ws.ws_col);
-    env->SetShortField(data, ws_xpixel, ws.ws_xpixel);
-    env->SetShortField(data, ws_ypixel, ws.ws_ypixel);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl
- * Method:    isatty
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_isatty
-  (JNIEnv *, jobject, jint fd) {
-    return isatty(fd);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl
- * Method:    ttyname_r
- * Signature: (I[BI)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ttyname_1r
-  (JNIEnv *env, jobject, jint fd, jbyteArray buf, jint len) {
-    char *data = new char[len];
-    int error = ttyname_r(fd, data, len);
-
-    if (error != 0) {
-        delete[] data;
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetByteArrayRegion(buf, 0, len, (jbyte *) data);
-    delete[] data;
-}
-
-/*
- * Throws LastErrorException based on the errno:
- */
-static void throw_errno(JNIEnv *env) {
-    jobject exc = env->NewObject(lastErrorExceptionClass,
-                                 lastErrorExceptionConstructor,
-                                 errno);
-    env->Throw((jthrowable) exc);
-}
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java b/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
deleted file mode 100644
index 24b6213ca89..00000000000
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2023, 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.org.jline.terminal.impl.jna;
-
-import java.io.IOException;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.osx.OsXNativePty;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-class JDKNativePty {
-
-    static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-        return OsXNativePty.current(console);
-    }
-
-    static JnaNativePty open(Attributes attr, Size size) throws IOException {
-        return OsXNativePty.open(attr, size);
-    }
-
-    static int isatty(int fd) {
-        return OsXNativePty.isatty(fd);
-    }
-
-    static String ttyname(int fd) {
-        return OsXNativePty.ttyname(fd);
-    }
-
-}
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary.java b/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary.java
deleted file mode 100644
index 02c2b9224e4..00000000000
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.osx;
-
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.List;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.NativeLong;
-//import com.sun.jna.Structure;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Attributes.ControlChar;
-import jdk.internal.org.jline.terminal.Attributes.ControlFlag;
-import jdk.internal.org.jline.terminal.Attributes.InputFlag;
-import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
-import jdk.internal.org.jline.terminal.Attributes.OutputFlag;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-public interface CLibrary {//extends com.sun.jna.Library {
-
-    void tcgetattr(int fd, termios termios) throws LastErrorException;
-
-    void tcsetattr(int fd, int cmd, termios termios) throws LastErrorException;
-
-    void ioctl(int fd, NativeLong cmd, winsize data) throws LastErrorException;
-
-    int isatty(int fd);
-
-    void ttyname_r(int fd, byte[] buf, int len) throws LastErrorException;
-
-    void openpty(int[] master, int[] slave, byte[] name, termios t, winsize s) throws LastErrorException;
-
-    class winsize { //extends Structure {
-        public short ws_row;
-        public short ws_col;
-        public short ws_xpixel;
-        public short ws_ypixel;
-
-        public winsize() {
-        }
-
-        public winsize(Size ws) {
-            ws_row = (short) ws.getRows();
-            ws_col = (short) ws.getColumns();
-        }
-
-        public Size toSize() {
-            return new Size(ws_col, ws_row);
-        }
-
-//        @Override
-//        protected List<String> getFieldOrder() {
-//            return Arrays.asList(//
-//                    "ws_row",//
-//                    "ws_col",//
-//                    "ws_xpixel",//
-//                    "ws_ypixel"//
-//            );
-//        }
-
-    }
-
-    class termios { //extends Structure {
-
-        public NativeLong c_iflag;
-        public NativeLong c_oflag;
-        public NativeLong c_cflag;
-        public NativeLong c_lflag;
-        public byte[] c_cc = new byte[20];
-        public NativeLong c_ispeed;
-        public NativeLong c_ospeed;
-
-//        @Override
-//        protected List<String> getFieldOrder() {
-//            return Arrays.asList(//
-//                    "c_iflag",//
-//                    "c_oflag",//
-//                    "c_cflag",//
-//                    "c_lflag",//
-//                    "c_cc",//
-//                    "c_ispeed",//
-//                    "c_ospeed"//
-//            );
-//        }
-
-        {
-            c_iflag  = new NativeLong(0);
-            c_oflag  = new NativeLong(0);
-            c_cflag  = new NativeLong(0);
-            c_lflag  = new NativeLong(0);
-            c_ispeed = new NativeLong(0);
-            c_ospeed = new NativeLong(0);
-        }
-
-        public termios() {
-        }
-
-        public termios(Attributes t) {
-            // Input flags
-            setFlag(t.getInputFlag(InputFlag.IGNBRK),           IGNBRK,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.BRKINT),           BRKINT,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IGNPAR),           IGNPAR,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.PARMRK),           PARMRK,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.INPCK),            INPCK,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.ISTRIP),           ISTRIP,     c_iflag);
-            setFlag(t.getInputFlag(InputFlag.INLCR),            INLCR,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IGNCR),            IGNCR,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.ICRNL),            ICRNL,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IXON),             IXON,       c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IXOFF),            IXOFF,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IXANY),            IXANY,      c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IMAXBEL),          IMAXBEL,    c_iflag);
-            setFlag(t.getInputFlag(InputFlag.IUTF8),            IUTF8,      c_iflag);
-            // Output flags
-            setFlag(t.getOutputFlag(OutputFlag.OPOST),          OPOST,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.ONLCR),          ONLCR,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.OXTABS),         OXTABS,     c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.ONOEOT),         ONOEOT,     c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.OCRNL),          OCRNL,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.ONOCR),          ONOCR,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.ONLRET),         ONLRET,     c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.OFILL),          OFILL,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.NLDLY),          NLDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.TABDLY),         TABDLY,     c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.CRDLY),          CRDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.FFDLY),          FFDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.BSDLY),          BSDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.VTDLY),          VTDLY,      c_oflag);
-            setFlag(t.getOutputFlag(OutputFlag.OFDEL),          OFDEL,      c_oflag);
-            // Control flags
-            setFlag(t.getControlFlag(ControlFlag.CIGNORE),      CIGNORE,    c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CS5),          CS5,        c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CS6),          CS6,        c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CS7),          CS7,        c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CS8),          CS8,        c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CSTOPB),       CSTOPB,     c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CREAD),        CREAD,      c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.PARENB),       PARENB,     c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.PARODD),       PARODD,     c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.HUPCL),        HUPCL,      c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CLOCAL),       CLOCAL,     c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CCTS_OFLOW),   CCTS_OFLOW, c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CRTS_IFLOW),   CRTS_IFLOW, c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CDTR_IFLOW),   CDTR_IFLOW, c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CDSR_OFLOW),   CDSR_OFLOW, c_cflag);
-            setFlag(t.getControlFlag(ControlFlag.CCAR_OFLOW),   CCAR_OFLOW, c_cflag);
-            // Local flags
-            setFlag(t.getLocalFlag(LocalFlag.ECHOKE),           ECHOKE,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHOE),            ECHOE,      c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHOK),            ECHOK,      c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHO),             ECHO,       c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHONL),           ECHONL,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHOPRT),          ECHOPRT,    c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ECHOCTL),          ECHOCTL,    c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ISIG),             ISIG,       c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ICANON),           ICANON,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.ALTWERASE),        ALTWERASE,  c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.IEXTEN),           IEXTEN,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.EXTPROC),          EXTPROC,    c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.TOSTOP),           TOSTOP,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.FLUSHO),           FLUSHO,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.NOKERNINFO),       NOKERNINFO, c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.PENDIN),           PENDIN,     c_lflag);
-            setFlag(t.getLocalFlag(LocalFlag.NOFLSH),           NOFLSH,     c_lflag);
-            // Control chars
-            c_cc[VEOF]      = (byte) t.getControlChar(ControlChar.VEOF);
-            c_cc[VEOL]      = (byte) t.getControlChar(ControlChar.VEOL);
-            c_cc[VEOL2]     = (byte) t.getControlChar(ControlChar.VEOL2);
-            c_cc[VERASE]    = (byte) t.getControlChar(ControlChar.VERASE);
-            c_cc[VWERASE]   = (byte) t.getControlChar(ControlChar.VWERASE);
-            c_cc[VKILL]     = (byte) t.getControlChar(ControlChar.VKILL);
-            c_cc[VREPRINT]  = (byte) t.getControlChar(ControlChar.VREPRINT);
-            c_cc[VINTR]     = (byte) t.getControlChar(ControlChar.VINTR);
-            c_cc[VQUIT]     = (byte) t.getControlChar(ControlChar.VQUIT);
-            c_cc[VSUSP]     = (byte) t.getControlChar(ControlChar.VSUSP);
-            c_cc[VDSUSP]    = (byte) t.getControlChar(ControlChar.VDSUSP);
-            c_cc[VSTART]    = (byte) t.getControlChar(ControlChar.VSTART);
-            c_cc[VSTOP]     = (byte) t.getControlChar(ControlChar.VSTOP);
-            c_cc[VLNEXT]    = (byte) t.getControlChar(ControlChar.VLNEXT);
-            c_cc[VDISCARD]  = (byte) t.getControlChar(ControlChar.VDISCARD);
-            c_cc[VMIN]      = (byte) t.getControlChar(ControlChar.VMIN);
-            c_cc[VTIME]     = (byte) t.getControlChar(ControlChar.VTIME);
-            c_cc[VSTATUS]   = (byte) t.getControlChar(ControlChar.VSTATUS);
-        }
-
-        private void setFlag(boolean flag, long value, NativeLong org) {
-            org.setValue(flag ? org.longValue() | value : org.longValue());
-        }
-
-        public Attributes toAttributes() {
-            Attributes attr = new Attributes();
-            // Input flags
-            EnumSet<InputFlag> iflag = attr.getInputFlags();
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IGNBRK,   IGNBRK);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IGNBRK, IGNBRK);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.BRKINT, BRKINT);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IGNPAR, IGNPAR);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.PARMRK, PARMRK);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.INPCK, INPCK);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.ISTRIP, ISTRIP);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.INLCR, INLCR);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IGNCR, IGNCR);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.ICRNL, ICRNL);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IXON, IXON);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IXOFF, IXOFF);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IXANY, IXANY);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IMAXBEL, IMAXBEL);
-            addFlag(c_iflag.longValue(), iflag, InputFlag.IUTF8, IUTF8);
-            // Output flags
-            EnumSet<OutputFlag> oflag = attr.getOutputFlags();
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OPOST, OPOST);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.ONLCR, ONLCR);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OXTABS, OXTABS);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.ONOEOT, ONOEOT);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OCRNL, OCRNL);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.ONOCR, ONOCR);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.ONLRET, ONLRET);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OFILL, OFILL);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.NLDLY, NLDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.TABDLY, TABDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.CRDLY, CRDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.FFDLY, FFDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.BSDLY, BSDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.VTDLY, VTDLY);
-            addFlag(c_oflag.longValue(), oflag, OutputFlag.OFDEL, OFDEL);
-            // Control flags
-            EnumSet<ControlFlag> cflag = attr.getControlFlags();
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CIGNORE, CIGNORE);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CS5, CS5);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CS6, CS6);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CS7, CS7);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CS8, CS8);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CSTOPB, CSTOPB);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CREAD, CREAD);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.PARENB, PARENB);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.PARODD, PARODD);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.HUPCL, HUPCL);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CLOCAL, CLOCAL);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CCTS_OFLOW, CCTS_OFLOW);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CRTS_IFLOW, CRTS_IFLOW);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CDSR_OFLOW, CDSR_OFLOW);
-            addFlag(c_cflag.longValue(), cflag, ControlFlag.CCAR_OFLOW, CCAR_OFLOW);
-            // Local flags
-            EnumSet<LocalFlag> lflag = attr.getLocalFlags();
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOKE, ECHOKE);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOE, ECHOE);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOK, ECHOK);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHO, ECHO);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHONL, ECHONL);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOPRT, ECHOPRT);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ECHOCTL, ECHOCTL);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ISIG, ISIG);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ICANON, ICANON);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.ALTWERASE, ALTWERASE);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.IEXTEN, IEXTEN);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.EXTPROC, EXTPROC);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.TOSTOP, TOSTOP);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.FLUSHO, FLUSHO);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.NOKERNINFO, NOKERNINFO);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.PENDIN, PENDIN);
-            addFlag(c_lflag.longValue(), lflag, LocalFlag.NOFLSH, NOFLSH);
-            // Control chars
-            EnumMap<ControlChar, Integer> cc = attr.getControlChars();
-            cc.put(ControlChar.VEOF,        (int) c_cc[VEOF]);
-            cc.put(ControlChar.VEOL,        (int) c_cc[VEOL]);
-            cc.put(ControlChar.VEOL2,       (int) c_cc[VEOL2]);
-            cc.put(ControlChar.VERASE,      (int) c_cc[VERASE]);
-            cc.put(ControlChar.VWERASE,     (int) c_cc[VWERASE]);
-            cc.put(ControlChar.VKILL,       (int) c_cc[VKILL]);
-            cc.put(ControlChar.VREPRINT,    (int) c_cc[VREPRINT]);
-            cc.put(ControlChar.VINTR,       (int) c_cc[VINTR]);
-            cc.put(ControlChar.VQUIT,       (int) c_cc[VQUIT]);
-            cc.put(ControlChar.VSUSP,       (int) c_cc[VSUSP]);
-            cc.put(ControlChar.VDSUSP,      (int) c_cc[VDSUSP]);
-            cc.put(ControlChar.VSTART,      (int) c_cc[VSTART]);
-            cc.put(ControlChar.VSTOP,       (int) c_cc[VSTOP]);
-            cc.put(ControlChar.VLNEXT,      (int) c_cc[VLNEXT]);
-            cc.put(ControlChar.VDISCARD,    (int) c_cc[VDISCARD]);
-            cc.put(ControlChar.VMIN,        (int) c_cc[VMIN]);
-            cc.put(ControlChar.VTIME,       (int) c_cc[VTIME]);
-            cc.put(ControlChar.VSTATUS,     (int) c_cc[VSTATUS]);
-            // Return
-            return attr;
-        }
-
-        private <T extends Enum<T>> void addFlag(long value, EnumSet<T> flags, T flag, int v) {
-            if ((value & v) != 0) {
-                flags.add(flag);
-            }
-        }
-    }
-
-    // CONSTANTS
-
-     long TIOCGWINSZ = 0x40087468L;
-     long TIOCSWINSZ = 0x80087467L;
-
-     int TCSANOW     = 0x00000000;
-
-     int VEOF        = 0;
-     int VEOL        = 1;
-     int VEOL2       = 2;
-     int VERASE      = 3;
-     int VWERASE     = 4;
-     int VKILL       = 5;
-     int VREPRINT    = 6;
-     int VINTR       = 8;
-     int VQUIT       = 9;
-     int VSUSP       = 10;
-     int VDSUSP      = 11;
-     int VSTART      = 12;
-     int VSTOP       = 13;
-     int VLNEXT      = 14;
-     int VDISCARD    = 15;
-     int VMIN        = 16;
-     int VTIME       = 17;
-     int VSTATUS     = 18;
-
-     int IGNBRK      = 0x00000001;
-     int BRKINT      = 0x00000002;
-     int IGNPAR      = 0x00000004;
-     int PARMRK      = 0x00000008;
-     int INPCK       = 0x00000010;
-     int ISTRIP      = 0x00000020;
-     int INLCR       = 0x00000040;
-     int IGNCR       = 0x00000080;
-     int ICRNL       = 0x00000100;
-     int IXON        = 0x00000200;
-     int IXOFF       = 0x00000400;
-     int IXANY       = 0x00000800;
-     int IMAXBEL     = 0x00002000;
-     int IUTF8       = 0x00004000;
-
-     int OPOST       = 0x00000001;
-     int ONLCR       = 0x00000002;
-     int OXTABS      = 0x00000004;
-     int ONOEOT      = 0x00000008;
-     int OCRNL       = 0x00000010;
-     int ONOCR       = 0x00000020;
-     int ONLRET      = 0x00000040;
-     int OFILL       = 0x00000080;
-     int NLDLY       = 0x00000300;
-     int TABDLY      = 0x00000c04;
-     int CRDLY       = 0x00003000;
-     int FFDLY       = 0x00004000;
-     int BSDLY       = 0x00008000;
-     int VTDLY       = 0x00010000;
-     int OFDEL       = 0x00020000;
-
-     int CIGNORE     = 0x00000001;
-     int CS5         = 0x00000000;
-     int CS6         = 0x00000100;
-     int CS7         = 0x00000200;
-     int CS8         = 0x00000300;
-     int CSTOPB      = 0x00000400;
-     int CREAD       = 0x00000800;
-     int PARENB      = 0x00001000;
-     int PARODD      = 0x00002000;
-     int HUPCL       = 0x00004000;
-     int CLOCAL      = 0x00008000;
-     int CCTS_OFLOW  = 0x00010000;
-     int CRTS_IFLOW  = 0x00020000;
-     int CDTR_IFLOW  = 0x00040000;
-     int CDSR_OFLOW  = 0x00080000;
-     int CCAR_OFLOW  = 0x00100000;
-
-     int ECHOKE      = 0x00000001;
-     int ECHOE       = 0x00000002;
-     int ECHOK       = 0x00000004;
-     int ECHO        = 0x00000008;
-     int ECHONL      = 0x00000010;
-     int ECHOPRT     = 0x00000020;
-     int ECHOCTL     = 0x00000040;
-     int ISIG        = 0x00000080;
-     int ICANON      = 0x00000100;
-     int ALTWERASE   = 0x00000200;
-     int IEXTEN      = 0x00000400;
-     int EXTPROC     = 0x00000800;
-     int TOSTOP      = 0x00400000;
-     int FLUSHO      = 0x00800000;
-     int NOKERNINFO  = 0x02000000;
-     int PENDIN      = 0x20000000;
-     int NOFLSH      = 0x80000000;
-
-}
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibraryImpl.java b/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibraryImpl.java
deleted file mode 100644
index da3099bb984..00000000000
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/CLibraryImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2023, 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.org.jline.terminal.impl.jna.osx;
-
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-public final class CLibraryImpl implements CLibrary {
-
-    static {
-        System.loadLibrary("le");
-        initIDs();
-    }
-
-    private static native void initIDs();
-
-    @Override
-    public native void tcgetattr(int fd, termios termios) throws LastErrorException;
-
-    @Override
-    public native void tcsetattr(int fd, int cmd, termios termios) throws LastErrorException;
-
-    @Override
-    public void ioctl(int fd, NativeLong cmd, winsize data) throws LastErrorException {
-        if (cmd.longValue() == CLibrary.TIOCGWINSZ || cmd.longValue() == CLibrary.TIOCSWINSZ) {
-            ioctl0(fd, cmd.longValue(), data);
-        } else {
-            throw new UnsupportedOperationException("Command: " + cmd + ", not supported.");
-        }
-    }
-
-    private native void ioctl0(int fd, long cmd, winsize data) throws LastErrorException;
-
-    @Override
-    public native int isatty(int fd);
-
-    @Override
-    public native void ttyname_r(int fd, byte[] buf, int len) throws LastErrorException;
-
-    @Override
-    public void openpty(int[] master, int[] slave, byte[] name, termios t, winsize s) throws LastErrorException {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/NativeLong.java b/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/NativeLong.java
deleted file mode 100644
index 7d9ab39bc33..00000000000
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/NativeLong.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2023, 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.org.jline.terminal.impl.jna.osx;
-
-class NativeLong {
-
-    public long value;
-
-    public NativeLong(long value) {
-        this.value = value;
-    }
-
-    public void setValue(long value) {
-        this.value = value;
-    }
-
-    public long longValue() {
-        return value;
-    }
-
-}
diff --git a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/OsXNativePty.java b/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/OsXNativePty.java
deleted file mode 100644
index 12aaff4f1f1..00000000000
--- a/src/jdk.internal.le/macosx/classes/jdk/internal/org/jline/terminal/impl/jna/osx/OsXNativePty.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.osx;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-
-//import com.sun.jna.Native;
-//import com.sun.jna.NativeLong;
-//import com.sun.jna.Platform;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.jna.JnaNativePty;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.TCSANOW;
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.TIOCGWINSZ;
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.TIOCSWINSZ;
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.termios;
-import static jdk.internal.org.jline.terminal.impl.jna.osx.CLibrary.winsize;
-
-public class OsXNativePty extends JnaNativePty {
-
-//    private static final CLibrary C_LIBRARY = Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
-    private static final CLibrary C_LIBRARY = new CLibraryImpl();//Native.load(Platform.C_LIBRARY_NAME, CLibrary.class);
-
-    public static OsXNativePty current(TerminalProvider.Stream consoleStream) throws IOException {
-        switch (consoleStream) {
-            case Output:
-                return new OsXNativePty(-1, null, 0, FileDescriptor.in, 1, FileDescriptor.out, ttyname(0));
-            case Error:
-                return new OsXNativePty(-1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
-            default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + consoleStream);
-        }
-    }
-
-    public static OsXNativePty open(Attributes attr, Size size) throws IOException {
-        int[] master = new int[1];
-        int[] slave = new int[1];
-        byte[] buf = new byte[64];
-        C_LIBRARY.openpty(master, slave, buf,
-                attr != null ? new termios(attr) : null,
-                size != null ? new winsize(size) : null);
-        int len = 0;
-        while (buf[len] != 0) {
-            len++;
-        }
-        String name = new String(buf, 0, len);
-        return new OsXNativePty(master[0], newDescriptor(master[0]), slave[0], newDescriptor(slave[0]), name);
-    }
-
-    public OsXNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, String name) {
-        super(master, masterFD, slave, slaveFD, name);
-    }
-
-    public OsXNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, int slaveOut, FileDescriptor slaveOutFD, String name) {
-        super(master, masterFD, slave, slaveFD, slaveOut, slaveOutFD, name);
-    }
-
-    @Override
-    public Attributes getAttr() throws IOException {
-        termios termios = new termios();
-        C_LIBRARY.tcgetattr(getSlave(), termios);
-        return termios.toAttributes();
-    }
-
-    @Override
-    protected void doSetAttr(Attributes attr) throws IOException {
-        termios termios = new termios(attr);
-        C_LIBRARY.tcsetattr(getSlave(), TCSANOW, termios);
-    }
-
-    @Override
-    public Size getSize() throws IOException {
-        winsize sz = new winsize();
-        C_LIBRARY.ioctl(getSlave(), new NativeLong(TIOCGWINSZ), sz);
-        return sz.toSize();
-    }
-
-    @Override
-    public void setSize(Size size) throws IOException {
-        winsize sz = new winsize(size);
-        C_LIBRARY.ioctl(getSlave(), new NativeLong(TIOCSWINSZ), sz);
-    }
-
-    public static int isatty(int fd) {
-        return C_LIBRARY.isatty(fd);
-    }
-
-    public static String ttyname(int fd) {
-        byte[] buf = new byte[64];
-        C_LIBRARY.ttyname_r(fd, buf, buf.length);
-        int len = 0;
-        while (buf[len] != 0) {
-            len++;
-        }
-        return new String(buf, 0, len);
-    }
-}
diff --git a/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp b/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp
deleted file mode 100644
index 3bc481f4afa..00000000000
--- a/src/jdk.internal.le/macosx/native/lible/CLibrary.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-#include "jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-
-static jclass lastErrorExceptionClass;
-static jmethodID lastErrorExceptionConstructor;
-
-static jclass termios_j;
-static jfieldID c_iflag;
-static jfieldID c_oflag;
-static jfieldID c_cflag;
-static jfieldID c_lflag;
-static jfieldID c_cc;
-static jfieldID c_ispeed;
-static jfieldID c_ospeed;
-
-static jclass winsize_j;
-static jfieldID ws_row;
-static jfieldID ws_col;
-static jfieldID ws_xpixel;
-static jfieldID ws_ypixel;
-
-static jclass nativelong_j;
-static jfieldID nativelong_value;
-
-static void throw_errno(JNIEnv *env);
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_initIDs
-  (JNIEnv *env, jclass) {
-    jclass cls;
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/LastErrorException");
-    CHECK_NULL(cls);
-    lastErrorExceptionClass = (jclass) env->NewGlobalRef(cls);
-    lastErrorExceptionConstructor = env->GetMethodID(lastErrorExceptionClass, "<init>", "(J)V");
-    CHECK_NULL(lastErrorExceptionConstructor);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary$termios");
-    CHECK_NULL(cls);
-    termios_j = (jclass) env->NewGlobalRef(cls);
-    CHECK_NULL(termios_j);
-    c_iflag = env->GetFieldID(termios_j, "c_iflag", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_iflag);
-    c_oflag = env->GetFieldID(termios_j, "c_oflag", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_oflag);
-    c_cflag = env->GetFieldID(termios_j, "c_cflag", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_cflag);
-    c_lflag = env->GetFieldID(termios_j, "c_lflag", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_lflag);
-    c_cc = env->GetFieldID(termios_j, "c_cc", "[B");
-    CHECK_NULL(c_cc);
-    c_ispeed = env->GetFieldID(termios_j, "c_ispeed", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_ispeed);
-    c_ospeed = env->GetFieldID(termios_j, "c_ospeed", "Ljdk/internal/org/jline/terminal/impl/jna/osx/NativeLong;");
-    CHECK_NULL(c_ospeed);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/osx/CLibrary$winsize");
-    CHECK_NULL(cls);
-    winsize_j = (jclass) env->NewGlobalRef(cls);
-    ws_row = env->GetFieldID(winsize_j, "ws_row", "S");
-    CHECK_NULL(ws_row);
-    ws_col = env->GetFieldID(winsize_j, "ws_col", "S");
-    CHECK_NULL(ws_col);
-    ws_xpixel= env->GetFieldID(winsize_j, "ws_xpixel", "S");
-    CHECK_NULL(ws_xpixel);
-    ws_ypixel= env->GetFieldID(winsize_j, "ws_ypixel", "S");
-    CHECK_NULL(ws_ypixel);
-
-    nativelong_j = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/osx/NativeLong");
-    CHECK_NULL(nativelong_j);
-    nativelong_value = env->GetFieldID(nativelong_j, "value", "J");
-    CHECK_NULL(nativelong_value);
-}
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_tcgetattr
-  (JNIEnv *env, jobject, jint fd, jobject result) {
-    termios data;
-
-    if (tcgetattr(fd, &data) != 0) {
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetLongField(env->GetObjectField(result, c_iflag), nativelong_value, data.c_iflag);
-    env->SetLongField(env->GetObjectField(result, c_oflag), nativelong_value, data.c_oflag);
-    env->SetLongField(env->GetObjectField(result, c_cflag), nativelong_value, data.c_cflag);
-    env->SetLongField(env->GetObjectField(result, c_lflag), nativelong_value, data.c_lflag);
-    jbyteArray c_ccValue = (jbyteArray) env->GetObjectField(result, c_cc);
-    env->SetByteArrayRegion(c_ccValue, 0, NCCS, (signed char *) data.c_cc);
-    env->SetLongField(env->GetObjectField(result, c_ispeed), nativelong_value, data.c_ispeed);
-    env->SetLongField(env->GetObjectField(result, c_ospeed), nativelong_value, data.c_ospeed);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl
- * Method:    tcsetattr
- * Signature: (IILjdk/internal/org/jline/terminal/impl/jna/osx/CLibrary/termios;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_tcsetattr
-  (JNIEnv *env, jobject, jint fd, jint cmd, jobject input) {
-    termios data;
-
-    data.c_iflag = env->GetLongField(env->GetObjectField(input, c_iflag), nativelong_value);
-    data.c_oflag = env->GetLongField(env->GetObjectField(input, c_oflag), nativelong_value);
-    data.c_cflag = env->GetLongField(env->GetObjectField(input, c_cflag), nativelong_value);
-    data.c_lflag = env->GetLongField(env->GetObjectField(input, c_lflag), nativelong_value);
-    jbyteArray c_ccValue = (jbyteArray) env->GetObjectField(input, c_cc);
-    env->GetByteArrayRegion(c_ccValue, 0, NCCS, (jbyte *) data.c_cc);
-    data.c_ispeed = env->GetLongField(env->GetObjectField(input, c_ispeed), nativelong_value);
-    data.c_ospeed = env->GetLongField(env->GetObjectField(input, c_ospeed), nativelong_value);
-
-    if (tcsetattr(fd, cmd, &data) != 0) {
-        throw_errno(env);
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl
- * Method:    ioctl0
- * Signature: (IILjdk/internal/org/jline/terminal/impl/jna/osx/CLibrary/winsize;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_ioctl0
-  (JNIEnv *env, jobject, jint fd, jlong cmd, jobject data) {
-    winsize ws;
-
-    ws.ws_row = env->GetShortField(data, ws_row);
-    ws.ws_col = env->GetShortField(data, ws_col);
-    ws.ws_xpixel = env->GetShortField(data, ws_xpixel);
-    ws.ws_ypixel = env->GetShortField(data, ws_ypixel);
-
-    if (ioctl(fd, cmd, &ws) != 0) {
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetShortField(data, ws_row, ws.ws_row);
-    env->SetShortField(data, ws_col, ws.ws_col);
-    env->SetShortField(data, ws_xpixel, ws.ws_xpixel);
-    env->SetShortField(data, ws_ypixel, ws.ws_ypixel);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl
- * Method:    isatty
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_isatty
-  (JNIEnv *, jobject, jint fd) {
-    return isatty(fd);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl
- * Method:    ttyname_r
- * Signature: (I[BI)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_osx_CLibraryImpl_ttyname_1r
-  (JNIEnv *env, jobject, jint fd, jbyteArray buf, jint len) {
-    char *data = new char[len];
-    int error = ttyname_r(fd, data, len);
-
-    if (error != 0) {
-        delete[] data;
-        throw_errno(env);
-        return ;
-    }
-
-    env->SetByteArrayRegion(buf, 0, len, (jbyte *) data);
-    delete[] data;
-}
-
-/*
- * Throws LastErrorException based on the errno:
- */
-static void throw_errno(JNIEnv *env) {
-    jobject exc = env->NewObject(lastErrorExceptionClass,
-                                 lastErrorExceptionConstructor,
-                                 errno);
-    env->Throw((jthrowable) exc);
-}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/BindingReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/BindingReader.java
index 46a45ae396d..74d3a46ecf2 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/BindingReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/BindingReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -66,7 +66,7 @@ public class BindingReader {
         T o = null;
         int[] remaining = new int[1];
         boolean hasRead = false;
-        for (;;) {
+        for (; ; ) {
             if (local != null) {
                 o = local.getBound(opBuffer, remaining);
             }
@@ -78,8 +78,7 @@ public class BindingReader {
                 if (remaining[0] >= 0) {
                     runMacro(opBuffer.substring(opBuffer.length() - remaining[0]));
                     opBuffer.setLength(opBuffer.length() - remaining[0]);
-                }
-                else {
+                } else {
                     long ambiguousTimeout = keys.getAmbiguousTimeout();
                     if (ambiguousTimeout > 0 && peekCharacter(ambiguousTimeout) != NonBlockingReader.READ_EXPIRED) {
                         o = null;
@@ -234,5 +233,4 @@ public class BindingReader {
     public String getLastBinding() {
         return lastBinding;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/KeyMap.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/KeyMap.java
index 43c3a1b4fd1..a8a90ea5e0d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/KeyMap.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/keymap/KeyMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,8 +8,6 @@
  */
 package jdk.internal.org.jline.keymap;
 
-import java.io.IOException;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -218,7 +216,6 @@ public class KeyMap<T> {
         return seqs;
     }
 
-
     public static String esc() {
         return "\033";
     }
@@ -264,7 +261,6 @@ public class KeyMap<T> {
     // Methods
     //
 
-
     public T getUnicode() {
         return unicode;
     }
@@ -306,9 +302,7 @@ public class KeyMap<T> {
         }
         for (int c = 0; c < keyMap.mapping.length; c++) {
             if (keyMap.mapping[c] instanceof KeyMap) {
-                doGetBoundKeys((KeyMap<T>) keyMap.mapping[c],
-                        prefix + (char) (c),
-                        bound);
+                doGetBoundKeys((KeyMap<T>) keyMap.mapping[c], prefix + (char) (c), bound);
             } else if (keyMap.mapping[c] != null) {
                 bound.put(prefix + (char) (c), (T) keyMap.mapping[c]);
             }
@@ -456,5 +450,4 @@ public class KeyMap<T> {
             }
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Binding.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Binding.java
index 0070b55c22d..15e7a49a643 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Binding.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Binding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,9 +14,8 @@ package jdk.internal.org.jline.reader;
  * @see Macro
  * @see Reference
  * @see Widget
- * @see jdk.internal.org.jline.keymap.KeyMap
+ * @see org.jline.keymap.KeyMap
  *
  * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
  */
-public interface Binding {
-}
+public interface Binding {}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Buffer.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Buffer.java
index c47746f566c..8d65891d9d9 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Buffer.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Buffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -84,8 +84,8 @@ public interface Buffer {
 
     void copyFrom(Buffer buffer);
 
-    // JDK specific modification
-    default void zeroOut() {
-        throw new UnsupportedOperationException();
-    }
+    /**
+     * Clear any internal buffer.
+     */
+    void zeroOut();
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Candidate.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Candidate.java
index 0e95538492d..e28e72ffb23 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Candidate.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Candidate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -47,7 +47,15 @@ public class Candidate implements Comparable<Candidate> {
      * @param complete the complete flag
      * @param sort the sort flag
      */
-    public Candidate(String value, String displ, String group, String descr, String suffix, String key, boolean complete, int sort) {
+    public Candidate(
+            String value,
+            String displ,
+            String group,
+            String descr,
+            String suffix,
+            String key,
+            boolean complete,
+            int sort) {
         this.value = Objects.requireNonNull(value);
         this.displ = Objects.requireNonNull(displ);
         this.group = group;
@@ -69,7 +77,8 @@ public class Candidate implements Comparable<Candidate> {
      * @param key the key
      * @param complete the complete flag
      */
-    public Candidate(String value, String displ, String group, String descr, String suffix, String key, boolean complete) {
+    public Candidate(
+            String value, String displ, String group, String descr, String suffix, String key, boolean complete) {
         this(value, displ, group, descr, suffix, key, complete, 0);
     }
 
@@ -159,11 +168,10 @@ public class Candidate implements Comparable<Candidate> {
         return sort;
     }
 
-
     @Override
     public int compareTo(Candidate o) {
         // If both candidates have same sort, use default behavior
-        if( sort == o.sort() ) {
+        if (sort == o.sort()) {
             return value.compareTo(o.value);
         } else {
             return Integer.compare(sort, o.sort());
@@ -180,7 +188,7 @@ public class Candidate implements Comparable<Candidate> {
 
     @Override
     public int hashCode() {
-        return Objects.hash(value);
+        return Objects.hashCode(value);
     }
 
     @Override
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Completer.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Completer.java
index b87db7afbf0..7a5937460d8 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Completer.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Completer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,8 +18,7 @@ import java.util.List;
  * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
  * @since 2.3
  */
-public interface Completer
-{
+public interface Completer {
     /**
      * Populates <i>candidates</i> with a list of possible completions for the <i>command line</i>.
      *
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletingParsedLine.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletingParsedLine.java
index 52a36b83896..93558001af1 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletingParsedLine.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletingParsedLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -10,7 +10,7 @@ package jdk.internal.org.jline.reader;
 
 /**
  * An extension of {@link ParsedLine} that, being aware of the quoting and escaping rules
- * of the {@link jdk.internal.org.jline.reader.Parser} that produced it, knows if and how a completion candidate
+ * of the {@link org.jline.reader.Parser} that produced it, knows if and how a completion candidate
  * should be escaped/quoted.
  *
  * @author Eric Bottard
@@ -22,5 +22,4 @@ public interface CompletingParsedLine extends ParsedLine {
     int rawWordCursor();
 
     int rawWordLength();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletionMatcher.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletionMatcher.java
index 58117c8f213..4a2334642ca 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletionMatcher.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/CompletionMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -23,8 +23,13 @@ public interface CompletionMatcher {
      * @param errors number of errors accepted in matching
      * @param originalGroupName value of JLineReader variable original-group-name
      */
-    void compile(Map<LineReader.Option, Boolean> options, boolean prefix, CompletingParsedLine line
-            , boolean caseInsensitive, int errors, String originalGroupName);
+    void compile(
+            Map<LineReader.Option, Boolean> options,
+            boolean prefix,
+            CompletingParsedLine line,
+            boolean caseInsensitive,
+            int errors,
+            String originalGroupName);
 
     /**
      *
@@ -44,5 +49,4 @@ public interface CompletionMatcher {
      * @return a common prefix of matched candidates
      */
     String getCommonPrefix();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EOFError.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EOFError.java
index 382db8bc49f..8a4f516174e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EOFError.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EOFError.java
@@ -1,20 +1,10 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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
+ * Copyright (c) 2023, the original author(s).
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
  *
- * 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.
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package jdk.internal.org.jline.reader;
 
@@ -45,7 +35,7 @@ public class EOFError extends SyntaxError {
         return missing;
     }
 
-    public int getOpenBrackets(){
+    public int getOpenBrackets() {
         return openBrackets;
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Editor.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Editor.java
index e99706ed5d5..b2fadd3bd52 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Editor.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Editor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -13,6 +13,8 @@ import java.util.List;
 
 public interface Editor {
     public void open(List<String> files) throws IOException;
+
     public void run() throws IOException;
+
     public void setRestricted(boolean restricted);
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EndOfFileException.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EndOfFileException.java
index 9f70420d9df..1e50a7ea1ae 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EndOfFileException.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/EndOfFileException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -17,8 +17,7 @@ public class EndOfFileException extends RuntimeException {
     private static final long serialVersionUID = 528485360925144689L;
     private String partialLine;
 
-    public EndOfFileException() {
-    }
+    public EndOfFileException() {}
 
     public EndOfFileException(String message) {
         super(message);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Expander.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Expander.java
index 0562e92ed96..614c89b3e61 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Expander.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Expander.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -13,5 +13,4 @@ public interface Expander {
     String expandHistory(History history, String line);
 
     String expandVar(String word);
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Highlighter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Highlighter.java
index 136fb20324b..dad62551ee0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Highlighter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Highlighter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/History.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/History.java
index 7a669edddb5..0cb46a1ee9d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/History.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/History.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,8 +21,7 @@ import java.util.ListIterator;
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public interface History extends Iterable<History.Entry>
-{
+public interface History extends Iterable<History.Entry> {
 
     /**
      * Initialize the history for the given reader.
@@ -75,7 +74,6 @@ public interface History extends Iterable<History.Entry>
      */
     void purge() throws IOException;
 
-
     int size();
 
     default boolean isEmpty() {
@@ -110,8 +108,7 @@ public interface History extends Iterable<History.Entry>
     // Entries
     //
 
-    interface Entry
-    {
+    interface Entry {
         int index();
 
         Instant time();
@@ -132,14 +129,17 @@ public interface History extends Iterable<History.Entry>
     default Iterator<Entry> reverseIterator(int index) {
         return new Iterator<Entry>() {
             private final ListIterator<Entry> it = iterator(index + 1);
+
             @Override
             public boolean hasNext() {
                 return it.hasPrevious();
             }
+
             @Override
             public Entry next() {
                 return it.previous();
             }
+
             @Override
             public void remove() {
                 it.remove();
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
index bc719e9b46a..bc513f5f636 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2023, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,7 +21,7 @@ import jdk.internal.org.jline.utils.AttributedString;
 
 /** Read lines from the console, with input editing.
  *
- * <h3>Thread safety</h3>
+ * <h2>Thread safety</h2>
  * The <code>LineReader</code> implementations are not thread safe,
  * thus you should not attempt to use a single reader in several threads.
  * Any attempt to call one of the <code>readLine</code> call while one is
@@ -31,7 +31,7 @@ import jdk.internal.org.jline.utils.AttributedString;
  * {@link #printAbove(String)} or {@link #printAbove(AttributedString)} at
  * any time to allow text to be printed above the current prompt.
  *
- * <h3>Prompt strings</h3>
+ * <h2>Prompt strings</h2>
  * It is traditional for an interactive console-based program
  * to print a short prompt string to signal that the user is expected
  * to type a command.  JLine supports 3 kinds of prompt string:
@@ -81,7 +81,6 @@ import jdk.internal.org.jline.utils.AttributedString;
  * </dd>
  * </dl>
  */
-
 public interface LineReader {
 
     /**
@@ -284,6 +283,7 @@ public interface LineReader {
     String MAIN = "main";
     String EMACS = "emacs";
     String SAFE = ".safe";
+    String DUMB = "dumb";
     String MENU = "menu";
 
     //
@@ -301,6 +301,7 @@ public interface LineReader {
      * they are displayed in a list below the field to be completed
      */
     String MENU_LIST_MAX = "menu-list-max";
+
     String DISABLE_HISTORY = "disable-history";
     String DISABLE_COMPLETION = "disable-completion";
     String EDITING_MODE = "editing-mode";
@@ -317,18 +318,23 @@ public interface LineReader {
     String ORIGINAL_GROUP_NAME = "ORIGINAL_GROUP_NAME";
     /** Completion style for displaying groups name */
     String COMPLETION_STYLE_GROUP = "COMPLETION_STYLE_GROUP";
+
     String COMPLETION_STYLE_LIST_GROUP = "COMPLETION_STYLE_LIST_GROUP";
     /** Completion style for displaying the current selected item */
     String COMPLETION_STYLE_SELECTION = "COMPLETION_STYLE_SELECTION";
+
     String COMPLETION_STYLE_LIST_SELECTION = "COMPLETION_STYLE_LIST_SELECTION";
     /** Completion style for displaying the candidate description */
     String COMPLETION_STYLE_DESCRIPTION = "COMPLETION_STYLE_DESCRIPTION";
+
     String COMPLETION_STYLE_LIST_DESCRIPTION = "COMPLETION_STYLE_LIST_DESCRIPTION";
     /** Completion style for displaying the matching part of candidates */
     String COMPLETION_STYLE_STARTING = "COMPLETION_STYLE_STARTING";
+
     String COMPLETION_STYLE_LIST_STARTING = "COMPLETION_STYLE_LIST_STARTING";
     /** Completion style for displaying the list */
     String COMPLETION_STYLE_BACKGROUND = "COMPLETION_STYLE_BACKGROUND";
+
     String COMPLETION_STYLE_LIST_BACKGROUND = "COMPLETION_STYLE_LIST_BACKGROUND";
     /**
      * Set the template for prompts for secondary (continuation) lines.
@@ -390,6 +396,26 @@ public interface LineReader {
      */
     String SUGGESTIONS_MIN_BUFFER_SIZE = "suggestions-min-buffer-size";
 
+    /**
+     * Max number of times a command can be repeated.
+     */
+    String MAX_REPEAT_COUNT = "max-repeat-count";
+
+    /**
+     * Number of spaces to display a tabulation, the default is 4.
+     */
+    String TAB_WIDTH = "tab-width";
+
+    /**
+     * Name of inputrc to read at line reader creation time.
+     */
+    String INPUT_RC_FILE_NAME = "input-rc-file-name";
+
+    /**
+     * Prefix to automatically delegate variables to system properties
+     */
+    String SYSTEM_PROPERTY_PREFIX = "system-property-prefix";
+
     Map<String, KeyMap<Binding>> defaultKeyMaps();
 
     enum Option {
@@ -469,8 +495,7 @@ public interface LineReader {
         EMPTY_WORD_OPTIONS(true),
 
         /** Disable the undo feature */
-        DISABLE_UNDO
-        ;
+        DISABLE_UNDO;
 
         private final boolean def;
 
@@ -611,7 +636,8 @@ public interface LineReader {
      * @throws EndOfFileException if an EOF has been found (using Ctrl-D for example)
      * @throws java.io.IOError in case of other i/o errors
      */
-    String readLine(String prompt, String rightPrompt, Character mask, String buffer) throws UserInterruptException, EndOfFileException;
+    String readLine(String prompt, String rightPrompt, Character mask, String buffer)
+            throws UserInterruptException, EndOfFileException;
 
     /**
      * Read a line from the <i>in</i> {@link InputStream}, and return the line
@@ -631,7 +657,8 @@ public interface LineReader {
      * @throws EndOfFileException if an EOF has been found (using Ctrl-D for example)
      * @throws java.io.IOError in case of other i/o errors
      */
-    String readLine(String prompt, String rightPrompt, MaskingCallback maskingCallback, String buffer) throws UserInterruptException, EndOfFileException;
+    String readLine(String prompt, String rightPrompt, MaskingCallback maskingCallback, String buffer)
+            throws UserInterruptException, EndOfFileException;
 
     /**
      * Prints a line above the prompt and redraw everything.
@@ -702,7 +729,7 @@ public interface LineReader {
     void runMacro(String macro);
 
     /**
-     * Read a mouse event when the {@link jdk.internal.org.jline.utils.InfoCmp.Capability#key_mouse} sequence
+     * Read a mouse event when the {@link org.jline.utils.InfoCmp.Capability#key_mouse} sequence
      * has just been read on the input stream.
      * Compared to {@link Terminal#readMouseEvent()}, this method takes into account keys
      * that have been pushed back using {@link #runMacro(String)}.
@@ -751,8 +778,8 @@ public interface LineReader {
 
     SuggestionType getAutosuggestion();
 
-    // JDK specific modification
-    default void zeroOut() {
-        throw new UnsupportedOperationException();
-    }
+    /**
+     * Clear any internal buffers.
+     */
+    void zeroOut();
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReaderBuilder.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReaderBuilder.java
index 14d5a0e8b1c..942bba3605d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReaderBuilder.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReaderBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -38,8 +38,7 @@ public final class LineReaderBuilder {
     Expander expander;
     CompletionMatcher completionMatcher;
 
-    private LineReaderBuilder() {
-    }
+    private LineReaderBuilder() {}
 
     public LineReaderBuilder terminal(Terminal terminal) {
         this.terminal = terminal;
@@ -88,8 +87,9 @@ public final class LineReaderBuilder {
             try {
                 if (!Boolean.getBoolean(LineReader.PROP_SUPPORT_PARSEDLINE)
                         && !(parser.parse("", 0) instanceof CompletingParsedLine)) {
-                    Log.warn("The Parser of class " + parser.getClass().getName() + " does not support the CompletingParsedLine interface. " +
-                            "Completion with escaped or quoted words won't work correctly.");
+                    Log.warn("The Parser of class " + parser.getClass().getName()
+                            + " does not support the CompletingParsedLine interface. "
+                            + "Completion with escaped or quoted words won't work correctly.");
                 }
             } catch (Throwable t) {
                 // Ignore
@@ -153,5 +153,4 @@ public final class LineReaderBuilder {
         }
         return reader;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Macro.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Macro.java
index e66efcc5f92..b00769aff52 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Macro.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Macro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -35,7 +35,6 @@ public class Macro implements Binding {
 
     @Override
     public String toString() {
-        return "Macro[" +
-                sequence + ']';
+        return "Macro[" + sequence + ']';
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/MaskingCallback.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/MaskingCallback.java
index 03501aaf07c..3b624e306f2 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/MaskingCallback.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/MaskingCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -31,5 +31,4 @@ public interface MaskingCallback {
      * @return the modified line
      */
     String history(String line);
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/ParsedLine.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/ParsedLine.java
index 683c4b48d77..3d87e6b80b2 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/ParsedLine.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/ParsedLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -64,5 +64,4 @@ public interface ParsedLine {
      * @return the cursor position within the line
      */
     int cursor();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Parser.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Parser.java
index 1f7df67d573..5db53818f67 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Parser.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -35,7 +35,7 @@ public interface Parser {
 
     default String getCommand(final String line) {
         String out;
-        Pattern  patternCommand = Pattern.compile("^\\s*" + REGEX_VARIABLE + "=(" + REGEX_COMMAND + ")(\\s+|$)");
+        Pattern patternCommand = Pattern.compile("^\\s*" + REGEX_VARIABLE + "=(" + REGEX_COMMAND + ")(\\s+|$)");
         Matcher matcher = patternCommand.matcher(line);
         if (matcher.find()) {
             out = matcher.group(1);
@@ -50,7 +50,7 @@ public interface Parser {
 
     default String getVariable(final String line) {
         String out = null;
-        Pattern  patternCommand = Pattern.compile("^\\s*(" + REGEX_VARIABLE + ")\\s*=[^=~].*");
+        Pattern patternCommand = Pattern.compile("^\\s*(" + REGEX_VARIABLE + ")\\s*=[^=~].*");
         Matcher matcher = patternCommand.matcher(line);
         if (matcher.find()) {
             out = matcher.group(1);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/PrintAboveWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/PrintAboveWriter.java
index 63c9decd194..e23988310a5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/PrintAboveWriter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/PrintAboveWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Reference.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Reference.java
index f799a3da220..2fb1aaa671b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Reference.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Reference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -38,7 +38,6 @@ public class Reference implements Binding {
 
     @Override
     public String toString() {
-        return "Reference[" +
-                name + ']';
+        return "Reference[" + name + ']';
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/SyntaxError.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/SyntaxError.java
index e46143e4c39..eaf3e1d7580 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/SyntaxError.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/SyntaxError.java
@@ -1,20 +1,10 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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
+ * Copyright (c) 2023, the original author(s).
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
  *
- * 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.
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package jdk.internal.org.jline.reader;
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java
index b5510cab5c9..68bec8041fa 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,23 +14,19 @@ package jdk.internal.org.jline.reader;
  * interrupt character (ctrl-C). The partially entered line is
  * available via the {@link #getPartialLine()} method.
  */
-public class UserInterruptException
-    extends RuntimeException
-{
+public class UserInterruptException extends RuntimeException {
     private static final long serialVersionUID = 6172232572140736750L;
 
     private final String partialLine;
 
-    public UserInterruptException(String partialLine)
-    {
+    public UserInterruptException(String partialLine) {
         this.partialLine = partialLine;
     }
 
     /**
      * @return the partially entered line when ctrl-C was pressed
      */
-    public String getPartialLine()
-    {
+    public String getPartialLine() {
         return partialLine;
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Widget.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Widget.java
index d5add7fb1a7..ae831c5eaad 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Widget.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/Widget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -15,5 +15,4 @@ package jdk.internal.org.jline.reader;
 public interface Widget extends Binding {
 
     boolean apply();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/BufferImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/BufferImpl.java
index d0c4c2cb7ae..a6295dbb487 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/BufferImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/BufferImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -20,8 +20,7 @@ import jdk.internal.org.jline.reader.Buffer;
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.0
  */
-public class BufferImpl implements Buffer
-{
+public class BufferImpl implements Buffer {
     private int cursor = 0;
     private int cursorCol = -1;
     private int[] buffer;
@@ -46,7 +45,7 @@ public class BufferImpl implements Buffer
         this.g1 = buffer.g1;
     }
 
-    public BufferImpl copy () {
+    public BufferImpl copy() {
         return new BufferImpl(this);
     }
 
@@ -107,7 +106,7 @@ public class BufferImpl implements Buffer
      * @param c the character to insert
      */
     public void write(int c) {
-        write(new int[] { c });
+        write(new int[] {c});
     }
 
     /**
@@ -121,7 +120,7 @@ public class BufferImpl implements Buffer
         if (overTyping) {
             delete(1);
         }
-        write(new int[] { c });
+        write(new int[] {c});
     }
 
     /**
@@ -224,8 +223,7 @@ public class BufferImpl implements Buffer
 
         if ((cursor + where) < 0) {
             where = -cursor;
-        }
-        else if ((cursor + where) > length()) {
+        } else if ((cursor + where) > length()) {
             where = length() - cursor;
         }
 
@@ -371,7 +369,6 @@ public class BufferImpl implements Buffer
         }
     }
 
-    // JDK specific modification
     @Override
     public void zeroOut() {
         Arrays.fill(buffer, 0);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/CompletionMatcherImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/CompletionMatcherImpl.java
index f829f13d51b..761ee1815c3 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/CompletionMatcherImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/CompletionMatcherImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,26 +8,25 @@
  */
 package jdk.internal.org.jline.reader.impl;
 
-import jdk.internal.org.jline.reader.Candidate;
-import jdk.internal.org.jline.reader.CompletingParsedLine;
-import jdk.internal.org.jline.reader.CompletionMatcher;
-import jdk.internal.org.jline.reader.LineReader;
-import jdk.internal.org.jline.utils.AttributedString;
-
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import jdk.internal.org.jline.reader.Candidate;
+import jdk.internal.org.jline.reader.CompletingParsedLine;
+import jdk.internal.org.jline.reader.CompletionMatcher;
+import jdk.internal.org.jline.reader.LineReader;
+import jdk.internal.org.jline.utils.AttributedString;
+
 public class CompletionMatcherImpl implements CompletionMatcher {
     protected Predicate<String> exact;
     protected List<Function<Map<String, List<Candidate>>, Map<String, List<Candidate>>>> matchers;
     private Map<String, List<Candidate>> matching;
     private boolean caseInsensitive;
 
-    public CompletionMatcherImpl() {
-    }
+    public CompletionMatcherImpl() {}
 
     protected void reset(boolean caseInsensitive) {
         this.caseInsensitive = caseInsensitive;
@@ -37,8 +36,13 @@ public class CompletionMatcherImpl implements CompletionMatcher {
     }
 
     @Override
-    public void compile(Map<LineReader.Option, Boolean> options, boolean prefix, CompletingParsedLine line
-            , boolean caseInsensitive, int errors, String originalGroupName) {
+    public void compile(
+            Map<LineReader.Option, Boolean> options,
+            boolean prefix,
+            CompletingParsedLine line,
+            boolean caseInsensitive,
+            int errors,
+            String originalGroupName) {
         reset(caseInsensitive);
         defaultMatchers(options, prefix, line, caseInsensitive, errors, originalGroupName);
     }
@@ -47,15 +51,18 @@ public class CompletionMatcherImpl implements CompletionMatcher {
     public List<Candidate> matches(List<Candidate> candidates) {
         matching = Collections.emptyMap();
         Map<String, List<Candidate>> sortedCandidates = sort(candidates);
-        for (Function<Map<String, List<Candidate>>,
-                Map<String, List<Candidate>>> matcher : matchers) {
+        for (Function<Map<String, List<Candidate>>, Map<String, List<Candidate>>> matcher : matchers) {
             matching = matcher.apply(sortedCandidates);
             if (!matching.isEmpty()) {
                 break;
             }
         }
-        return !matching.isEmpty() ? matching.entrySet().stream().flatMap(e -> e.getValue().stream()).distinct().collect(Collectors.toList())
-                                   : new ArrayList<>();
+        return !matching.isEmpty()
+                ? matching.entrySet().stream()
+                        .flatMap(e -> e.getValue().stream())
+                        .distinct()
+                        .collect(Collectors.toList())
+                : new ArrayList<>();
     }
 
     @Override
@@ -63,10 +70,12 @@ public class CompletionMatcherImpl implements CompletionMatcher {
         if (matching == null) {
             throw new IllegalStateException();
         }
-        return matching.values().stream().flatMap(Collection::stream)
+        return matching.values().stream()
+                .flatMap(Collection::stream)
                 .filter(Candidate::complete)
                 .filter(c -> exact.test(c.value()))
-                .findFirst().orElse(null);
+                .findFirst()
+                .orElse(null);
     }
 
     @Override
@@ -84,8 +93,13 @@ public class CompletionMatcherImpl implements CompletionMatcher {
     /**
      * Default JLine matchers
      */
-    protected void defaultMatchers(Map<LineReader.Option, Boolean> options, boolean prefix, CompletingParsedLine line
-            , boolean caseInsensitive, int errors, String originalGroupName) {
+    protected void defaultMatchers(
+            Map<LineReader.Option, Boolean> options,
+            boolean prefix,
+            CompletingParsedLine line,
+            boolean caseInsensitive,
+            int errors,
+            String originalGroupName) {
         // Find matchers
         // TODO: glob completion
         String wd = line.word();
@@ -94,8 +108,7 @@ public class CompletionMatcherImpl implements CompletionMatcher {
         if (prefix) {
             matchers = new ArrayList<>(Arrays.asList(
                     simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).startsWith(wp)),
-                    simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).contains(wp))
-            ));
+                    simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).contains(wp))));
             if (LineReader.Option.COMPLETE_MATCHER_TYPO.isSet(options)) {
                 matchers.add(typoMatcher(wp, errors, caseInsensitive, originalGroupName));
             }
@@ -109,14 +122,14 @@ public class CompletionMatcherImpl implements CompletionMatcher {
                 Pattern p1 = Pattern.compile(Pattern.quote(wp) + ".*" + Pattern.quote(ws) + ".*");
                 Pattern p2 = Pattern.compile(".*" + Pattern.quote(wp) + ".*" + Pattern.quote(ws) + ".*");
                 matchers = new ArrayList<>(Arrays.asList(
-                        simpleMatcher(s -> p1.matcher(caseInsensitive ? s.toLowerCase() : s).matches()),
-                        simpleMatcher(s -> p2.matcher(caseInsensitive ? s.toLowerCase() : s).matches())
-                ));
+                        simpleMatcher(s -> p1.matcher(caseInsensitive ? s.toLowerCase() : s)
+                                .matches()),
+                        simpleMatcher(s -> p2.matcher(caseInsensitive ? s.toLowerCase() : s)
+                                .matches())));
             } else {
                 matchers = new ArrayList<>(Arrays.asList(
                         simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).startsWith(wdi)),
-                        simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).contains(wdi))
-                ));
+                        simpleMatcher(s -> (caseInsensitive ? s.toLowerCase() : s).contains(wdi))));
             }
             if (LineReader.Option.COMPLETE_MATCHER_CAMELCASE.isSet(options)) {
                 matchers.add(simpleMatcher(s -> camelMatch(wd, 0, s, 0)));
@@ -128,18 +141,20 @@ public class CompletionMatcherImpl implements CompletionMatcher {
         }
     }
 
-    protected Function<Map<String, List<Candidate>>,
-            Map<String, List<Candidate>>> simpleMatcher(Predicate<String> predicate) {
+    protected Function<Map<String, List<Candidate>>, Map<String, List<Candidate>>> simpleMatcher(
+            Predicate<String> predicate) {
         return m -> m.entrySet().stream()
                 .filter(e -> predicate.test(e.getKey()))
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
-    protected Function<Map<String, List<Candidate>>,
-            Map<String, List<Candidate>>> typoMatcher(String word, int errors, boolean caseInsensitive, String originalGroupName) {
+    protected Function<Map<String, List<Candidate>>, Map<String, List<Candidate>>> typoMatcher(
+            String word, int errors, boolean caseInsensitive, String originalGroupName) {
         return m -> {
             Map<String, List<Candidate>> map = m.entrySet().stream()
-                    .filter(e -> ReaderUtils.distance(word, caseInsensitive ? e.getKey().toLowerCase() : e.getKey()) < errors)
+                    .filter(e -> ReaderUtils.distance(
+                                    word, caseInsensitive ? e.getKey().toLowerCase() : e.getKey())
+                            < errors)
                     .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
             if (map.size() > 1) {
                 map.computeIfAbsent(word, w -> new ArrayList<>())
@@ -178,7 +193,8 @@ public class CompletionMatcherImpl implements CompletionMatcher {
         Map<String, List<Candidate>> sortedCandidates = new HashMap<>();
         for (Candidate candidate : candidates) {
             sortedCandidates
-                    .computeIfAbsent(AttributedString.fromAnsi(candidate.value()).toString(), s -> new ArrayList<>())
+                    .computeIfAbsent(
+                            AttributedString.fromAnsi(candidate.value()).toString(), s -> new ArrayList<>())
                     .add(candidate);
         }
         return sortedCandidates;
@@ -206,5 +222,4 @@ public class CompletionMatcherImpl implements CompletionMatcher {
         }
         return new String(s1, 0, len);
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultExpander.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultExpander.java
index b534b96ff2f..e5e7735a384 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultExpander.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultExpander.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -32,27 +32,25 @@ public class DefaultExpander implements Expander {
             if (unicode > 0) {
                 escaped = (--unicode >= 0);
                 sb.append(c);
-            }
-            else if (escaped) {
+            } else if (escaped) {
                 if (c == 'u') {
                     unicode = 4;
                 } else {
                     escaped = false;
                 }
                 sb.append(c);
-            }
-            else if (c == '\'') {
+            } else if (c == '\'') {
                 inQuote = !inQuote;
                 sb.append(c);
-            }
-            else if (inQuote) {
+            } else if (inQuote) {
                 sb.append(c);
-            }
-            else {
+            } else {
                 switch (c) {
                     case '\\':
-                        // any '\!' should be considered an expansion escape, so skip expansion and strip the escape character
-                        // a leading '\^' should be considered an expansion escape, so skip expansion and strip the escape character
+                        // any '\!' should be considered an expansion escape, so skip expansion and strip the escape
+                        // character
+                        // a leading '\^' should be considered an expansion escape, so skip expansion and strip the
+                        // escape character
                         // otherwise, add the escape
                         escaped = true;
                         sb.append(c);
@@ -91,7 +89,8 @@ public class DefaultExpander implements Expander {
                                     if (history.size() == 0) {
                                         throw new IllegalArgumentException("!$: event not found");
                                     }
-                                    String previous = history.get(history.index() - 1).trim();
+                                    String previous =
+                                            history.get(history.index() - 1).trim();
                                     int lastSpace = previous.lastIndexOf(' ');
                                     if (lastSpace != -1) {
                                         rep = previous.substring(lastSpace + 1);
@@ -128,14 +127,18 @@ public class DefaultExpander implements Expander {
                                     try {
                                         idx = Integer.parseInt(line.substring(i1, i));
                                     } catch (NumberFormatException e) {
-                                        throw new IllegalArgumentException((neg ? "!-" : "!") + line.substring(i1, i) + ": event not found");
+                                        throw new IllegalArgumentException(
+                                                (neg ? "!-" : "!") + line.substring(i1, i) + ": event not found");
                                     }
                                     if (neg && idx > 0 && idx <= history.size()) {
                                         rep = history.get(history.index() - idx);
-                                    } else if (!neg && idx > history.index() - history.size() && idx <= history.index()) {
+                                    } else if (!neg
+                                            && idx > history.index() - history.size()
+                                            && idx <= history.index()) {
                                         rep = history.get(idx - 1);
                                     } else {
-                                        throw new IllegalArgumentException((neg ? "!-" : "!") + line.substring(i1, i) + ": event not found");
+                                        throw new IllegalArgumentException(
+                                                (neg ? "!-" : "!") + line.substring(i1, i) + ": event not found");
                                     }
                                     break;
                                 default:
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java
index ac286ad734f..55d39efde27 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -10,9 +10,9 @@ package jdk.internal.org.jline.reader.impl;
 
 import java.util.regex.Pattern;
 
+import jdk.internal.org.jline.reader.Highlighter;
 import jdk.internal.org.jline.reader.LineReader;
 import jdk.internal.org.jline.reader.LineReader.RegionType;
-import jdk.internal.org.jline.reader.Highlighter;
 import jdk.internal.org.jline.utils.AttributedString;
 import jdk.internal.org.jline.utils.AttributedStringBuilder;
 import jdk.internal.org.jline.utils.AttributedStyle;
@@ -57,7 +57,8 @@ public class DefaultHighlighter implements Highlighter {
                 while (negativeStart > 0 && reader.getBuffer().atChar(negativeStart - 1) != '\n') {
                     negativeStart--;
                 }
-                while (negativeEnd < reader.getBuffer().length() - 1 && reader.getBuffer().atChar(negativeEnd + 1) != '\n') {
+                while (negativeEnd < reader.getBuffer().length() - 1
+                        && reader.getBuffer().atChar(negativeEnd + 1) != '\n') {
                     negativeEnd++;
                 }
             }
@@ -104,5 +105,4 @@ public class DefaultHighlighter implements Highlighter {
         }
         return sb.toAttributedString();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultParser.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultParser.java
index d9b3a9948d5..26cdf6abc51 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultParser.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,18 +21,18 @@ import jdk.internal.org.jline.reader.Parser;
 public class DefaultParser implements Parser {
 
     public enum Bracket {
-        ROUND,   // ()
-        CURLY,   // {}
-        SQUARE,  // []
-        ANGLE    // <>
+        ROUND, // ()
+        CURLY, // {}
+        SQUARE, // []
+        ANGLE // <>
     }
 
     public static class BlockCommentDelims {
         private final String start;
         private final String end;
+
         public BlockCommentDelims(String start, String end) {
-            if (start == null || end == null
-              || start.isEmpty() || end.isEmpty() || start.equals(end)) {
+            if (start == null || end == null || start.isEmpty() || end.isEmpty() || start.equals(end)) {
                 throw new IllegalArgumentException("Bad block comment delimiter!");
             }
             this.start = start;
@@ -185,22 +185,22 @@ public class DefaultParser implements Parser {
             int i = 0;
             for (Bracket b : bs) {
                 switch (b) {
-                case ROUND:
-                    openingBrackets[i] = '(';
-                    closingBrackets[i] = ')';
-                    break;
-                case CURLY:
-                    openingBrackets[i] = '{';
-                    closingBrackets[i] = '}';
-                    break;
-                case SQUARE:
-                    openingBrackets[i] = '[';
-                    closingBrackets[i] = ']';
-                    break;
-                case ANGLE:
-                    openingBrackets[i] = '<';
-                    closingBrackets[i] = '>';
-                    break;
+                    case ROUND:
+                        openingBrackets[i] = '(';
+                        closingBrackets[i] = ')';
+                        break;
+                    case CURLY:
+                        openingBrackets[i] = '{';
+                        closingBrackets[i] = '}';
+                        break;
+                    case SQUARE:
+                        openingBrackets[i] = '[';
+                        closingBrackets[i] = ']';
+                        break;
+                    case ANGLE:
+                        openingBrackets[i] = '<';
+                        closingBrackets[i] = '>';
+                        break;
                 }
                 i++;
             }
@@ -229,7 +229,6 @@ public class DefaultParser implements Parser {
         return name != null && regexVariable != null && name.matches(regexVariable);
     }
 
-
     @Override
     public String getCommand(final String line) {
         String out = "";
@@ -296,7 +295,7 @@ public class DefaultParser implements Parser {
             if (quoteStart < 0 && isQuoteChar(line, i) && !lineCommented && !blockCommented) {
                 // Start a quote block
                 quoteStart = i;
-                if (current.length()==0) {
+                if (current.length() == 0) {
                     quotedWord = true;
                     if (context == ParseContext.SPLIT_LINE) {
                         current.append(line.charAt(i));
@@ -324,13 +323,15 @@ public class DefaultParser implements Parser {
                     }
                 } else {
                     // Delimiter
-                    rawWordLength = handleDelimiterAndGetRawWordLength(current, words, rawWordStart, rawWordCursor, rawWordLength, i);
+                    rawWordLength = handleDelimiterAndGetRawWordLength(
+                            current, words, rawWordStart, rawWordCursor, rawWordLength, i);
                     rawWordStart = i + 1;
                 }
             } else {
                 if (quoteStart < 0 && !blockCommented && (lineCommented || isLineCommentStarted(line, i))) {
                     lineCommented = true;
-                } else if (quoteStart < 0 && !lineCommented
+                } else if (quoteStart < 0
+                        && !lineCommented
                         && (blockCommented || isCommentDelim(line, i, blockCommentStart))) {
                     if (blockCommented) {
                         if (blockCommentEnd != null && isCommentDelim(line, i, blockCommentEnd)) {
@@ -339,12 +340,12 @@ public class DefaultParser implements Parser {
                         }
                     } else {
                         blockCommented = true;
-                        rawWordLength = handleDelimiterAndGetRawWordLength(current, words, rawWordStart, rawWordCursor, rawWordLength, i);
+                        rawWordLength = handleDelimiterAndGetRawWordLength(
+                                current, words, rawWordStart, rawWordCursor, rawWordLength, i);
                         i += blockCommentStart == null ? 0 : blockCommentStart.length() - 1;
                         rawWordStart = i + 1;
                     }
-                } else if (quoteStart < 0 && !lineCommented
-                        && isCommentDelim(line, i, blockCommentEnd)) {
+                } else if (quoteStart < 0 && !lineCommented && isCommentDelim(line, i, blockCommentEnd)) {
                     current.append(line.charAt(i));
                     blockCommentInRightOrder = false;
                 } else if (!isEscapeChar(line, i)) {
@@ -377,16 +378,14 @@ public class DefaultParser implements Parser {
                 throw new EOFError(-1, -1, "Escaped new line", "newline");
             }
             if (eofOnUnclosedQuote && quoteStart >= 0) {
-                throw new EOFError(-1, -1, "Missing closing quote", line.charAt(quoteStart) == '\''
-                        ? "quote" : "dquote");
+                throw new EOFError(
+                        -1, -1, "Missing closing quote", line.charAt(quoteStart) == '\'' ? "quote" : "dquote");
             }
             if (blockCommented) {
-                throw new EOFError(-1, -1, "Missing closing block comment delimiter",
-                        "add: " + blockCommentEnd);
+                throw new EOFError(-1, -1, "Missing closing block comment delimiter", "add: " + blockCommentEnd);
             }
             if (!blockCommentInRightOrder) {
-                throw new EOFError(-1, -1, "Missing opening block comment delimiter",
-                        "missing: " + blockCommentStart);
+                throw new EOFError(-1, -1, "Missing opening block comment delimiter", "missing: " + blockCommentStart);
             }
             if (bracketChecker.isClosingBracketMissing() || bracketChecker.isOpeningBracketMissing()) {
                 String message = null;
@@ -398,8 +397,13 @@ public class DefaultParser implements Parser {
                     message = "Missing opening bracket";
                     missing = "missing: " + bracketChecker.getMissingOpeningBracket();
                 }
-                throw new EOFError(-1, -1, message, missing,
-                        bracketChecker.getOpenBrackets(), bracketChecker.getNextClosingBracket());
+                throw new EOFError(
+                        -1,
+                        -1,
+                        message,
+                        missing,
+                        bracketChecker.getOpenBrackets(),
+                        bracketChecker.getNextClosingBracket());
             }
         }
 
@@ -420,7 +424,13 @@ public class DefaultParser implements Parser {
         return !isQuoted(buffer, pos) && !isEscaped(buffer, pos) && isDelimiterChar(buffer, pos);
     }
 
-    private int handleDelimiterAndGetRawWordLength(StringBuilder current, List<String> words, int rawWordStart, int rawWordCursor, int rawWordLength, int pos) {
+    private int handleDelimiterAndGetRawWordLength(
+            StringBuilder current,
+            List<String> words,
+            int rawWordStart,
+            int rawWordCursor,
+            int rawWordLength,
+            int pos) {
         if (current.length() > 0) {
             words.add(current.toString());
             current.setLength(0); // reset the arg
@@ -470,7 +480,7 @@ public class DefaultParser implements Parser {
 
     public boolean isLineCommentStarted(final CharSequence buffer, final int pos) {
         if (lineCommentDelims != null) {
-            for (String comment: lineCommentDelims) {
+            for (String comment : lineCommentDelims) {
                 if (isCommentDelim(buffer, pos, comment)) {
                     return true;
                 }
@@ -584,8 +594,8 @@ public class DefaultParser implements Parser {
             } else {
                 bid = bracketId(closingBrackets, buffer, pos);
                 if (bid >= 0) {
-                    if (!nested.isEmpty() && bid == nested.get(nested.size()-1)) {
-                        nested.remove(nested.size()-1);
+                    if (!nested.isEmpty() && bid == nested.get(nested.size() - 1)) {
+                        nested.remove(nested.size() - 1);
                     } else {
                         missingOpeningBracket = bid;
                     }
@@ -634,7 +644,7 @@ public class DefaultParser implements Parser {
         }
 
         private int bracketId(final char[] brackets, final CharSequence buffer, final int pos) {
-            for (int i=0; i < brackets.length; i++) {
+            for (int i = 0; i < brackets.length; i++) {
                 if (buffer.charAt(pos) == brackets[i]) {
                     return i;
                 }
@@ -648,8 +658,7 @@ public class DefaultParser implements Parser {
      *
      * @author <a href="mailto:mwp1@cornell.edu">Marc Prud'hommeaux</a>
      */
-    public class ArgumentList implements ParsedLine, CompletingParsedLine
-    {
+    public class ArgumentList implements ParsedLine, CompletingParsedLine {
         private final String line;
 
         private final List<String> words;
@@ -667,11 +676,21 @@ public class DefaultParser implements Parser {
         private final int rawWordLength;
 
         @Deprecated
-        public ArgumentList(final String line, final List<String> words,
-                            final int wordIndex, final int wordCursor,
-                            final int cursor) {
-            this(line, words, wordIndex, wordCursor, cursor,
-                    null, wordCursor, words.get(wordIndex).length());
+        public ArgumentList(
+                final String line,
+                final List<String> words,
+                final int wordIndex,
+                final int wordCursor,
+                final int cursor) {
+            this(
+                    line,
+                    words,
+                    wordIndex,
+                    wordCursor,
+                    cursor,
+                    null,
+                    wordCursor,
+                    words.get(wordIndex).length());
         }
 
         /**
@@ -685,10 +704,15 @@ public class DefaultParser implements Parser {
          * @param rawWordCursor the cursor position inside the raw word (i.e. including quotes and escape characters)
          * @param rawWordLength the raw word length, including quotes and escape characters
          */
-        public ArgumentList(final String line, final List<String> words,
-                            final int wordIndex, final int wordCursor,
-                            final int cursor, final String openingQuote,
-                            final int rawWordCursor, final int rawWordLength) {
+        public ArgumentList(
+                final String line,
+                final List<String> words,
+                final int wordIndex,
+                final int wordCursor,
+                final int cursor,
+                final String openingQuote,
+                final int rawWordCursor,
+                final int rawWordLength) {
             this.line = line;
             this.words = Collections.unmodifiableList(Objects.requireNonNull(words));
             this.wordIndex = wordIndex;
@@ -732,8 +756,8 @@ public class DefaultParser implements Parser {
             Predicate<Integer> needToBeEscaped;
             String quote = openingQuote;
             boolean middleQuotes = false;
-            if (openingQuote==null) {
-                for (int i=0; i < sb.length(); i++) {
+            if (openingQuote == null) {
+                for (int i = 0; i < sb.length(); i++) {
                     if (isQuoteChar(sb, i)) {
                         middleQuotes = true;
                         break;
@@ -746,7 +770,8 @@ public class DefaultParser implements Parser {
                     // Delimiters (spaces) don't need to be escaped, nor do other quotes, but everything else does.
                     // Also, close the quote at the end
                     if (openingQuote != null) {
-                        needToBeEscaped = i -> isRawEscapeChar(sb.charAt(i)) || String.valueOf(sb.charAt(i)).equals(openingQuote);
+                        needToBeEscaped = i -> isRawEscapeChar(sb.charAt(i))
+                                || String.valueOf(sb.charAt(i)).equals(openingQuote);
                     }
                     // Completion is protected by middle quotes:
                     // Delimiters (spaces) don't need to be escaped, nor do quotes, but everything else does.
@@ -756,8 +781,8 @@ public class DefaultParser implements Parser {
                     // No quote protection, need to escape everything: delimiter chars (spaces), quote chars
                     // and escapes themselves
                     else {
-                        needToBeEscaped = i -> isDelimiterChar(sb, i) || isRawEscapeChar(sb.charAt(i))
-                                || isRawQuoteChar(sb.charAt(i));
+                        needToBeEscaped = i ->
+                                isDelimiterChar(sb, i) || isRawEscapeChar(sb.charAt(i)) || isRawQuoteChar(sb.charAt(i));
                     }
                     for (int i = 0; i < sb.length(); i++) {
                         if (needToBeEscaped.test(i)) {
@@ -792,5 +817,4 @@ public class DefaultParser implements Parser {
             return rawWordLength;
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/InputRC.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/InputRC.java
new file mode 100644
index 00000000000..0c3aee057a4
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/InputRC.java
@@ -0,0 +1,394 @@
+/*
+ * Copyright (c) 2002-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.reader.impl;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import jdk.internal.org.jline.reader.LineReader;
+import jdk.internal.org.jline.reader.Macro;
+import jdk.internal.org.jline.reader.Reference;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.utils.Log;
+
+public final class InputRC {
+
+    public static void configure(LineReader reader, URL url) throws IOException {
+        try (InputStream is = url.openStream()) {
+            configure(reader, is);
+        }
+    }
+
+    public static void configure(LineReader reader, InputStream is) throws IOException {
+        try (InputStreamReader r = new InputStreamReader(is)) {
+            configure(reader, r);
+        }
+    }
+
+    public static void configure(LineReader reader, Reader r) throws IOException {
+        BufferedReader br;
+        if (r instanceof BufferedReader) {
+            br = (BufferedReader) r;
+        } else {
+            br = new BufferedReader(r);
+        }
+
+        Terminal terminal = reader.getTerminal();
+
+        if (Terminal.TYPE_DUMB.equals(terminal.getType()) || Terminal.TYPE_DUMB_COLOR.equals(terminal.getType())) {
+            reader.getVariables().putIfAbsent(LineReader.EDITING_MODE, "dumb");
+        } else {
+            reader.getVariables().putIfAbsent(LineReader.EDITING_MODE, "emacs");
+        }
+
+        reader.setKeyMap(LineReader.MAIN);
+        new InputRC(reader).parse(br);
+        if ("vi".equals(reader.getVariable(LineReader.EDITING_MODE))) {
+            reader.getKeyMaps().put(LineReader.MAIN, reader.getKeyMaps().get(LineReader.VIINS));
+        } else if ("emacs".equals(reader.getVariable(LineReader.EDITING_MODE))) {
+            reader.getKeyMaps().put(LineReader.MAIN, reader.getKeyMaps().get(LineReader.EMACS));
+        } else if ("dumb".equals(reader.getVariable(LineReader.EDITING_MODE))) {
+            reader.getKeyMaps().put(LineReader.MAIN, reader.getKeyMaps().get(LineReader.DUMB));
+        }
+    }
+
+    private final LineReader reader;
+
+    private InputRC(LineReader reader) {
+        this.reader = reader;
+    }
+
+    private void parse(BufferedReader br) throws IOException, IllegalArgumentException {
+        String line;
+        boolean parsing = true;
+        List<Boolean> ifsStack = new ArrayList<>();
+        while ((line = br.readLine()) != null) {
+            try {
+                line = line.trim();
+                if (line.length() == 0) {
+                    continue;
+                }
+                if (line.charAt(0) == '#') {
+                    continue;
+                }
+                int i = 0;
+                if (line.charAt(i) == '$') {
+                    String cmd;
+                    String args;
+                    ++i;
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    int s = i;
+                    while (i < line.length() && (line.charAt(i) != ' ' && line.charAt(i) != '\t')) {
+                        i++;
+                    }
+                    cmd = line.substring(s, i);
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    s = i;
+                    while (i < line.length() && (line.charAt(i) != ' ' && line.charAt(i) != '\t')) {
+                        i++;
+                    }
+                    args = line.substring(s, i);
+                    if ("if".equalsIgnoreCase(cmd)) {
+                        ifsStack.add(parsing);
+                        if (!parsing) {
+                            continue;
+                        }
+                        if (args.startsWith("term=")) {
+                            // TODO
+                        } else if (args.startsWith("mode=")) {
+                            String mode = (String) reader.getVariable(LineReader.EDITING_MODE);
+                            parsing = args.substring("mode=".length()).equalsIgnoreCase(mode);
+                        } else {
+                            parsing = args.equalsIgnoreCase(reader.getAppName());
+                        }
+                    } else if ("else".equalsIgnoreCase(cmd)) {
+                        if (ifsStack.isEmpty()) {
+                            throw new IllegalArgumentException("$else found without matching $if");
+                        }
+                        boolean invert = true;
+                        for (boolean b : ifsStack) {
+                            if (!b) {
+                                invert = false;
+                                break;
+                            }
+                        }
+                        if (invert) {
+                            parsing = !parsing;
+                        }
+                    } else if ("endif".equalsIgnoreCase(cmd)) {
+                        if (ifsStack.isEmpty()) {
+                            throw new IllegalArgumentException("endif found without matching $if");
+                        }
+                        parsing = ifsStack.remove(ifsStack.size() - 1);
+                    } else if ("include".equalsIgnoreCase(cmd)) {
+                        // TODO
+                    }
+                    continue;
+                }
+                if (!parsing) {
+                    continue;
+                }
+                if (line.charAt(i++) == '"') {
+                    boolean esc = false;
+                    for (; ; i++) {
+                        if (i >= line.length()) {
+                            throw new IllegalArgumentException("Missing closing quote on line '" + line + "'");
+                        }
+                        if (esc) {
+                            esc = false;
+                        } else if (line.charAt(i) == '\\') {
+                            esc = true;
+                        } else if (line.charAt(i) == '"') {
+                            break;
+                        }
+                    }
+                }
+                while (i < line.length() && line.charAt(i) != ':' && line.charAt(i) != ' ' && line.charAt(i) != '\t') {
+                    i++;
+                }
+                String keySeq = line.substring(0, i);
+                boolean equivalency = i + 1 < line.length() && line.charAt(i) == ':' && line.charAt(i + 1) == '=';
+                i++;
+                if (equivalency) {
+                    i++;
+                }
+                if (keySeq.equalsIgnoreCase("set")) {
+                    String key;
+                    String val;
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    int s = i;
+                    while (i < line.length() && (line.charAt(i) != ' ' && line.charAt(i) != '\t')) {
+                        i++;
+                    }
+                    key = line.substring(s, i);
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    s = i;
+                    while (i < line.length() && (line.charAt(i) != ' ' && line.charAt(i) != '\t')) {
+                        i++;
+                    }
+                    val = line.substring(s, i);
+                    setVar(reader, key, val);
+                } else {
+                    while (i < line.length() && (line.charAt(i) == ' ' || line.charAt(i) == '\t')) {
+                        i++;
+                    }
+                    int start = i;
+                    if (i < line.length() && (line.charAt(i) == '\'' || line.charAt(i) == '\"')) {
+                        char delim = line.charAt(i++);
+                        boolean esc = false;
+                        for (; ; i++) {
+                            if (i >= line.length()) {
+                                break;
+                            }
+                            if (esc) {
+                                esc = false;
+                            } else if (line.charAt(i) == '\\') {
+                                esc = true;
+                            } else if (line.charAt(i) == delim) {
+                                break;
+                            }
+                        }
+                    }
+                    for (; i < line.length() && line.charAt(i) != ' ' && line.charAt(i) != '\t'; i++)
+                        ;
+                    String val = line.substring(Math.min(start, line.length()), Math.min(i, line.length()));
+                    if (keySeq.charAt(0) == '"') {
+                        keySeq = translateQuoted(keySeq);
+                    } else {
+                        // Bind key name
+                        String keyName =
+                                keySeq.lastIndexOf('-') > 0 ? keySeq.substring(keySeq.lastIndexOf('-') + 1) : keySeq;
+                        char key = getKeyFromName(keyName);
+                        keyName = keySeq.toLowerCase();
+                        keySeq = "";
+                        if (keyName.contains("meta-") || keyName.contains("m-")) {
+                            keySeq += "\u001b";
+                        }
+                        if (keyName.contains("control-") || keyName.contains("c-") || keyName.contains("ctrl-")) {
+                            key = (char) (Character.toUpperCase(key) & 0x1f);
+                        }
+                        keySeq += key;
+                    }
+                    if (val.length() > 0 && (val.charAt(0) == '\'' || val.charAt(0) == '\"')) {
+                        reader.getKeys().bind(new Macro(translateQuoted(val)), keySeq);
+                    } else {
+                        reader.getKeys().bind(new Reference(val), keySeq);
+                    }
+                }
+            } catch (IllegalArgumentException e) {
+                Log.warn("Unable to parse user configuration: ", e);
+            }
+        }
+    }
+
+    private static String translateQuoted(String keySeq) {
+        int i;
+        String str = keySeq.substring(1, keySeq.length() - 1);
+        StringBuilder sb = new StringBuilder();
+        for (i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (c == '\\') {
+                boolean ctrl = str.regionMatches(i, "\\C-", 0, 3) || str.regionMatches(i, "\\M-\\C-", 0, 6);
+                boolean meta = str.regionMatches(i, "\\M-", 0, 3) || str.regionMatches(i, "\\C-\\M-", 0, 6);
+                i += (meta ? 3 : 0) + (ctrl ? 3 : 0) + (!meta && !ctrl ? 1 : 0);
+                if (i >= str.length()) {
+                    break;
+                }
+                c = str.charAt(i);
+                if (meta) {
+                    sb.append("\u001b");
+                }
+                if (ctrl) {
+                    c = c == '?' ? 0x7f : (char) (Character.toUpperCase(c) & 0x1f);
+                }
+                if (!meta && !ctrl) {
+                    switch (c) {
+                        case 'a':
+                            c = 0x07;
+                            break;
+                        case 'b':
+                            c = '\b';
+                            break;
+                        case 'd':
+                            c = 0x7f;
+                            break;
+                        case 'e':
+                            c = 0x1b;
+                            break;
+                        case 'f':
+                            c = '\f';
+                            break;
+                        case 'n':
+                            c = '\n';
+                            break;
+                        case 'r':
+                            c = '\r';
+                            break;
+                        case 't':
+                            c = '\t';
+                            break;
+                        case 'v':
+                            c = 0x0b;
+                            break;
+                        case '\\':
+                            c = '\\';
+                            break;
+                        case '0':
+                        case '1':
+                        case '2':
+                        case '3':
+                        case '4':
+                        case '5':
+                        case '6':
+                        case '7':
+                            c = 0;
+                            for (int j = 0; j < 3; j++, i++) {
+                                if (i >= str.length()) {
+                                    break;
+                                }
+                                int k = Character.digit(str.charAt(i), 8);
+                                if (k < 0) {
+                                    break;
+                                }
+                                c = (char) (c * 8 + k);
+                            }
+                            c &= 0xFF;
+                            break;
+                        case 'x':
+                            i++;
+                            c = 0;
+                            for (int j = 0; j < 2; j++, i++) {
+                                if (i >= str.length()) {
+                                    break;
+                                }
+                                int k = Character.digit(str.charAt(i), 16);
+                                if (k < 0) {
+                                    break;
+                                }
+                                c = (char) (c * 16 + k);
+                            }
+                            c &= 0xFF;
+                            break;
+                        case 'u':
+                            i++;
+                            c = 0;
+                            for (int j = 0; j < 4; j++, i++) {
+                                if (i >= str.length()) {
+                                    break;
+                                }
+                                int k = Character.digit(str.charAt(i), 16);
+                                if (k < 0) {
+                                    break;
+                                }
+                                c = (char) (c * 16 + k);
+                            }
+                            break;
+                    }
+                }
+                sb.append(c);
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    private static char getKeyFromName(String name) {
+        if ("DEL".equalsIgnoreCase(name) || "Rubout".equalsIgnoreCase(name)) {
+            return 0x7f;
+        } else if ("ESC".equalsIgnoreCase(name) || "Escape".equalsIgnoreCase(name)) {
+            return '\033';
+        } else if ("LFD".equalsIgnoreCase(name) || "NewLine".equalsIgnoreCase(name)) {
+            return '\n';
+        } else if ("RET".equalsIgnoreCase(name) || "Return".equalsIgnoreCase(name)) {
+            return '\r';
+        } else if ("SPC".equalsIgnoreCase(name) || "Space".equalsIgnoreCase(name)) {
+            return ' ';
+        } else if ("Tab".equalsIgnoreCase(name)) {
+            return '\t';
+        } else {
+            return name.charAt(0);
+        }
+    }
+
+    static void setVar(LineReader reader, String key, String val) {
+        if (LineReader.KEYMAP.equalsIgnoreCase(key)) {
+            reader.setKeyMap(val);
+            return;
+        }
+
+        for (LineReader.Option option : LineReader.Option.values()) {
+            if (option.name().toLowerCase(Locale.ENGLISH).replace('_', '-').equals(val)) {
+                if ("on".equalsIgnoreCase(val)) {
+                    reader.setOpt(option);
+                } else if ("off".equalsIgnoreCase(val)) {
+                    reader.unsetOpt(option);
+                }
+                return;
+            }
+        }
+
+        reader.setVariable(key, val);
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/KillRing.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/KillRing.java
index f89ed35d04e..2510fd9e320 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/KillRing.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/KillRing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
index a41f7d19bf8..da69d08b23c 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, the original author or authors.
+ * Copyright (c) 2002-2023, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,6 +18,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.lang.reflect.Constructor;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -56,6 +59,7 @@ import static jdk.internal.org.jline.keymap.KeyMap.del;
 import static jdk.internal.org.jline.keymap.KeyMap.esc;
 import static jdk.internal.org.jline.keymap.KeyMap.range;
 import static jdk.internal.org.jline.keymap.KeyMap.translate;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_DISABLE_ALTERNATE_CHARSET;
 
 /**
  * A reader for terminal applications. It supports custom tab-completion,
@@ -66,23 +70,27 @@ import static jdk.internal.org.jline.keymap.KeyMap.translate;
  * @author <a href="mailto:gnodet@gmail.com">Guillaume Nodet</a>
  */
 @SuppressWarnings("StatementWithEmptyBody")
-public class LineReaderImpl implements LineReader, Flushable
-{
+public class LineReaderImpl implements LineReader, Flushable {
     public static final char NULL_MASK = 0;
 
+    /**
+     * @deprecated use {@link #DEFAULT_TAB_WIDTH} and {@link #getTabWidth()}
+     */
+    @Deprecated
     public static final int TAB_WIDTH = 4;
 
+    public static final int DEFAULT_TAB_WIDTH = 4;
 
     public static final String DEFAULT_WORDCHARS = "*?_-.[]~=/&;!#$%^(){}<>";
     public static final String DEFAULT_REMOVE_SUFFIX_CHARS = " \t\n;&|";
     public static final String DEFAULT_COMMENT_BEGIN = "#";
     public static final String DEFAULT_SEARCH_TERMINATORS = "\033\012";
     public static final String DEFAULT_BELL_STYLE = "";
-    public static final int    DEFAULT_LIST_MAX = 100;
-    public static final int    DEFAULT_MENU_LIST_MAX = Integer.MAX_VALUE;
-    public static final int    DEFAULT_ERRORS = 2;
-    public static final long   DEFAULT_BLINK_MATCHING_PAREN = 500L;
-    public static final long   DEFAULT_AMBIGUOUS_BINDING = 1000L;
+    public static final int DEFAULT_LIST_MAX = 100;
+    public static final int DEFAULT_MENU_LIST_MAX = Integer.MAX_VALUE;
+    public static final int DEFAULT_ERRORS = 2;
+    public static final long DEFAULT_BLINK_MATCHING_PAREN = 500L;
+    public static final long DEFAULT_AMBIGUOUS_BINDING = 1000L;
     public static final String DEFAULT_SECONDARY_PROMPT_PATTERN = "%M> ";
     public static final String DEFAULT_OTHERS_GROUP_NAME = "others";
     public static final String DEFAULT_ORIGINAL_GROUP_NAME = "original";
@@ -96,9 +104,10 @@ public class LineReaderImpl implements LineReader, Flushable
     public static final String DEFAULT_COMPLETION_STYLE_LIST_GROUP = "fg:black,bold";
     public static final String DEFAULT_COMPLETION_STYLE_LIST_SELECTION = DEFAULT_COMPLETION_STYLE_SELECTION;
     public static final String DEFAULT_COMPLETION_STYLE_LIST_BACKGROUND = "bg:bright-magenta";
-    public static final int    DEFAULT_INDENTATION = 0;
-    public static final int    DEFAULT_FEATURES_MAX_BUFFER_SIZE = 1000;
-    public static final int    DEFAULT_SUGGESTIONS_MIN_BUFFER_SIZE = 1;
+    public static final int DEFAULT_INDENTATION = 0;
+    public static final int DEFAULT_FEATURES_MAX_BUFFER_SIZE = 1000;
+    public static final int DEFAULT_SUGGESTIONS_MIN_BUFFER_SIZE = 1;
+    public static final String DEFAULT_SYSTEM_PROPERTY_PREFIX = "org.jline.reader.props.";
 
     private static final int MIN_ROWS = 3;
 
@@ -109,6 +118,7 @@ public class LineReaderImpl implements LineReader, Flushable
 
     public static final String FOCUS_IN_SEQ = "\033[I";
     public static final String FOCUS_OUT_SEQ = "\033[O";
+    public static final int DEFAULT_MAX_REPEAT_COUNT = 9999;
 
     /**
      * Possible states in which the current readline operation may be in.
@@ -197,27 +207,28 @@ public class LineReaderImpl implements LineReader, Flushable
     protected int searchIndex = -1;
     protected boolean doAutosuggestion;
 
-
     // Reading buffers
     protected final BindingReader bindingReader;
 
-
     /**
      * VI character find
      */
     protected int findChar;
+
     protected int findDir;
     protected int findTailAdd;
     /**
      * VI history string search
      */
     private int searchDir;
+
     private String searchString;
 
     /**
      * Region state
      */
     protected int regionMark;
+
     protected RegionType regionActive;
 
     private boolean forceChar;
@@ -232,7 +243,7 @@ public class LineReaderImpl implements LineReader, Flushable
 
     protected KillRing killRing = new KillRing();
 
-    protected UndoTree<Buffer> undo = new UndoTree<>(this::setBuffer);
+    protected UndoTree<Buffer> undo;
     protected boolean isUndo;
 
     /**
@@ -242,7 +253,7 @@ public class LineReaderImpl implements LineReader, Flushable
     /*
      * Current internal state of the line reader
      */
-    protected State   state = State.DONE;
+    protected State state = State.DONE;
     protected final AtomicBoolean startedReading = new AtomicBoolean();
     protected boolean reading;
 
@@ -278,7 +289,10 @@ public class LineReaderImpl implements LineReader, Flushable
      */
     protected List<String> commandsBuffer = new ArrayList<>();
 
-    int candidateStartPosition = 0;
+    protected int candidateStartPosition = 0;
+
+    protected String alternateIn;
+    protected String alternateOut;
 
     public LineReaderImpl(Terminal terminal) throws IOException {
         this(terminal, terminal.getName(), null);
@@ -288,6 +302,7 @@ public class LineReaderImpl implements LineReader, Flushable
         this(terminal, appName, null);
     }
 
+    @SuppressWarnings("this-escape")
     public LineReaderImpl(Terminal terminal, String appName, Map<String, Object> variables) {
         Objects.requireNonNull(terminal, "terminal can not be null");
         this.terminal = terminal;
@@ -300,11 +315,40 @@ public class LineReaderImpl implements LineReader, Flushable
         } else {
             this.variables = new HashMap<>();
         }
-        this.keyMaps = defaultKeyMaps();
+        String prefix = getString(SYSTEM_PROPERTY_PREFIX, DEFAULT_SYSTEM_PROPERTY_PREFIX);
+        if (prefix != null) {
+            Properties sysProps = System.getProperties();
+            for (String s : sysProps.stringPropertyNames()) {
+                if (s.startsWith(prefix)) {
+                    String key = s.substring(prefix.length());
+                    InputRC.setVar(this, key, sysProps.getProperty(s));
+                }
+            }
+        }
 
+        this.keyMaps = defaultKeyMaps();
+        if (!Boolean.getBoolean(PROP_DISABLE_ALTERNATE_CHARSET)) {
+            this.alternateIn = Curses.tputs(terminal.getStringCapability(Capability.enter_alt_charset_mode));
+            this.alternateOut = Curses.tputs(terminal.getStringCapability(Capability.exit_alt_charset_mode));
+        }
+
+        undo = new UndoTree<>(this::setBuffer);
         builtinWidgets = builtinWidgets();
         widgets = new HashMap<>(builtinWidgets);
         bindingReader = new BindingReader(terminal.reader());
+
+        String inputRc = getString(INPUT_RC_FILE_NAME, null);
+        if (inputRc != null) {
+            Path inputRcPath = Paths.get(inputRc);
+            if (Files.exists(inputRcPath)) {
+                try (InputStream is = Files.newInputStream(inputRcPath)) {
+                    InputRC.configure(this, is);
+                } catch (Exception e) {
+                    Log.debug("Error reading inputRc config file: ", inputRc, e);
+                }
+            }
+        }
+
         doDisplay();
     }
 
@@ -489,7 +533,8 @@ public class LineReaderImpl implements LineReader, Flushable
      * @param buffer    A string that will be set for editing.
      * @return          A line that is read from the terminal, can never be null.
      */
-    public String readLine(String prompt, Character mask, String buffer) throws UserInterruptException, EndOfFileException {
+    public String readLine(String prompt, Character mask, String buffer)
+            throws UserInterruptException, EndOfFileException {
         return readLine(prompt, null, mask, buffer);
     }
 
@@ -503,7 +548,8 @@ public class LineReaderImpl implements LineReader, Flushable
      * @param buffer      A string that will be set for editing.
      * @return            A line that is read from the terminal, can never be null.
      */
-    public String readLine(String prompt, String rightPrompt, Character mask, String buffer) throws UserInterruptException, EndOfFileException {
+    public String readLine(String prompt, String rightPrompt, Character mask, String buffer)
+            throws UserInterruptException, EndOfFileException {
         return readLine(prompt, rightPrompt, mask != null ? new SimpleMaskingCallback(mask) : null, buffer);
     }
 
@@ -517,7 +563,8 @@ public class LineReaderImpl implements LineReader, Flushable
      * @param buffer          A string that will be set for editing.
      * @return                A line that is read from the terminal, can never be null.
      */
-    public String readLine(String prompt, String rightPrompt, MaskingCallback maskingCallback, String buffer) throws UserInterruptException, EndOfFileException {
+    public String readLine(String prompt, String rightPrompt, MaskingCallback maskingCallback, String buffer)
+            throws UserInterruptException, EndOfFileException {
         // prompt may be null
         // maskingCallback may be null
         // buffer may be null
@@ -618,23 +665,14 @@ public class LineReaderImpl implements LineReader, Flushable
                 // Move into application mode
                 if (!dumb) {
                     terminal.puts(Capability.keypad_xmit);
-                    if (isSet(Option.AUTO_FRESH_LINE))
-                        callWidget(FRESH_LINE);
-                    if (isSet(Option.MOUSE))
-                        terminal.trackMouse(Terminal.MouseTracking.Normal);
-                    if (isSet(Option.BRACKETED_PASTE))
-                        terminal.writer().write(BRACKETED_PASTE_ON);
-                } else {
-                    // For dumb terminals, we need to make sure that CR are ignored
-                    Attributes attr = new Attributes(originalAttributes);
-                    attr.setInputFlag(Attributes.InputFlag.IGNCR, true);
-                    terminal.setAttributes(attr);
+                    if (isSet(Option.AUTO_FRESH_LINE)) callWidget(FRESH_LINE);
+                    if (isSet(Option.MOUSE)) terminal.trackMouse(Terminal.MouseTracking.Normal);
+                    if (isSet(Option.BRACKETED_PASTE)) terminal.writer().write(BRACKETED_PASTE_ON);
                 }
 
                 callWidget(CALLBACK_INIT);
 
-                if (!isSet(Option.DISABLE_UNDO))
-                    undo.newState(buf.copy());
+                if (!isSet(Option.DISABLE_UNDO)) undo.newState(buf.copy());
 
                 // Draw initial prompt
                 redrawLine();
@@ -654,7 +692,8 @@ public class LineReaderImpl implements LineReader, Flushable
                     throw new EndOfFileException().partialLine(buf.length() > 0 ? buf.toString() : null);
                 }
                 Log.trace("Binding: ", o);
-                if (buf.length() == 0 && getLastBinding().charAt(0) == originalAttributes.getControlChar(ControlChar.VEOF)) {
+                if (buf.length() == 0
+                        && getLastBinding().charAt(0) == originalAttributes.getControlChar(ControlChar.VEOF)) {
                     throw new EndOfFileException();
                 }
 
@@ -675,12 +714,17 @@ public class LineReaderImpl implements LineReader, Flushable
                 try {
                     lock.lock();
                     // Get executable widget
-                    Buffer copy = buf.length() <= getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE) ? buf.copy() : null;
+                    Buffer copy = buf.length() <= getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE)
+                            ? buf.copy()
+                            : null;
                     Widget w = getWidget(o);
                     if (!w.apply()) {
                         beep();
                     }
-                    if (!isSet(Option.DISABLE_UNDO) && !isUndo && copy != null && buf.length() <= getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE)
+                    if (!isSet(Option.DISABLE_UNDO)
+                            && !isUndo
+                            && copy != null
+                            && buf.length() <= getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE)
                             && !copy.toString().equals(buf.toString())) {
                         undo.newState(buf.copy());
                     }
@@ -718,13 +762,18 @@ public class LineReaderImpl implements LineReader, Flushable
             } else {
                 throw e;
             }
-        }
-        finally {
+        } finally {
+            AtomicBoolean interrupted = new AtomicBoolean(Thread.interrupted());
             try {
                 lock.lock();
 
                 this.reading = false;
 
+                Terminal.SignalHandler tmpHandler = terminal.handle(Signal.INT, s -> interrupted.set(true));
+                if (previousIntrHandler == null) {
+                    previousIntrHandler = tmpHandler;
+                }
+
                 cleanup();
                 if (originalAttributes != null) {
                     terminal.setAttributes(originalAttributes);
@@ -741,13 +790,15 @@ public class LineReaderImpl implements LineReader, Flushable
             } finally {
                 lock.unlock();
                 startedReading.set(false);
+                if (interrupted.get()) {
+                    Thread.currentThread().interrupt();
+                }
             }
         }
     }
 
     private boolean isTerminalDumb() {
-        return Terminal.TYPE_DUMB.equals(terminal.getType())
-                || Terminal.TYPE_DUMB_COLOR.equals(terminal.getType());
+        return Terminal.TYPE_DUMB.equals(terminal.getType()) || Terminal.TYPE_DUMB_COLOR.equals(terminal.getType());
     }
 
     private void doDisplay() {
@@ -757,8 +808,7 @@ public class LineReaderImpl implements LineReader, Flushable
 
         display = new Display(terminal, false);
         display.resize(size.getRows(), size.getColumns());
-        if (isSet(Option.DELAY_LINE_WRAP))
-            display.setDelayLineWrap(true);
+        if (isSet(Option.DELAY_LINE_WRAP)) display.setDelayLineWrap(true);
     }
 
     @Override
@@ -965,8 +1015,10 @@ public class LineReaderImpl implements LineReader, Flushable
             if (!YANK_POP.equals(ref) && !YANK.equals(ref)) {
                 killRing.resetLastYank();
             }
-            if (!KILL_LINE.equals(ref) && !KILL_WHOLE_LINE.equals(ref)
-                    && !BACKWARD_KILL_WORD.equals(ref) && !KILL_WORD.equals(ref)) {
+            if (!KILL_LINE.equals(ref)
+                    && !KILL_WHOLE_LINE.equals(ref)
+                    && !BACKWARD_KILL_WORD.equals(ref)
+                    && !KILL_WORD.equals(ref)) {
                 killRing.resetLastKill();
             }
         }
@@ -1083,7 +1135,7 @@ public class LineReaderImpl implements LineReader, Flushable
         if (isSet(Option.BRACKETED_PASTE)) {
             terminal.writer().write(BRACKETED_PASTE_OFF);
         }
-        Constructor<?> ctor = Class.forName("jdk.internal.org.jline.builtins.Nano").getConstructor(Terminal.class, File.class);
+        Constructor<?> ctor = Class.forName("org.jline.builtins.Nano").getConstructor(Terminal.class, File.class);
         Editor editor = (Editor) ctor.newInstance(terminal, new File(file.getParent()));
         editor.setRestricted(true);
         editor.open(Collections.singletonList(file.getName()));
@@ -1097,6 +1149,10 @@ public class LineReaderImpl implements LineReader, Flushable
         }
     }
 
+    protected int getTabWidth() {
+        return getInt(LineReader.TAB_WIDTH, DEFAULT_TAB_WIDTH);
+    }
+
     //
     // Widget implementation
     //
@@ -1137,26 +1193,27 @@ public class LineReaderImpl implements LineReader, Flushable
         }
 
         // we only add it to the history if the buffer is not empty
-        if (historyLine != null && historyLine.length() > 0 ) {
+        if (historyLine != null && historyLine.length() > 0) {
             history.add(Instant.now(), historyLine);
         }
         return str;
     }
 
-    protected void handleSignal(Signal signal) {
+    protected synchronized void handleSignal(Signal signal) {
         doAutosuggestion = false;
         if (signal == Signal.WINCH) {
-            Status status = Status.getStatus(terminal, false);
-            if (status != null) {
-                status.hardReset();
-            }
             size.copy(terminal.getBufferSize());
             display.resize(size.getRows(), size.getColumns());
-            // restores prompt but also prevents scrolling in consoleZ, see #492
-            // redrawLine();
+            Status status = Status.getStatus(terminal, false);
+            if (status != null) {
+                status.resize(size);
+                status.reset();
+            }
+            terminal.puts(Capability.carriage_return);
+            terminal.puts(Capability.clr_eos);
+            redrawLine();
             redisplay();
-        }
-        else if (signal == Signal.CONT) {
+        } else if (signal == Signal.CONT) {
             terminal.enterRawMode();
             size.copy(terminal.getBufferSize());
             display.resize(size.getRows(), size.getColumns());
@@ -1200,13 +1257,11 @@ public class LineReaderImpl implements LineReader, Flushable
     //
 
     public void setPrompt(final String prompt) {
-        this.prompt = (prompt == null ? AttributedString.EMPTY
-                       : expandPromptPattern(prompt, 0, "", 0));
+        this.prompt = (prompt == null ? AttributedString.EMPTY : expandPromptPattern(prompt, 0, "", 0));
     }
 
     public void setRightPrompt(final String rightPrompt) {
-        this.rightPrompt = (rightPrompt == null ? AttributedString.EMPTY
-                            : expandPromptPattern(rightPrompt, 0, "", 0));
+        this.rightPrompt = (rightPrompt == null ? AttributedString.EMPTY : expandPromptPattern(rightPrompt, 0, "", 0));
     }
 
     protected void setBuffer(Buffer buffer) {
@@ -1233,7 +1288,7 @@ public class LineReaderImpl implements LineReader, Flushable
      * @param op The incoming operation to remap
      * @return The remaped operation
      */
-    protected String viDeleteChangeYankToRemap (String op) {
+    protected String viDeleteChangeYankToRemap(String op) {
         switch (op) {
             case SEND_BREAK:
             case BACKWARD_CHAR:
@@ -1292,7 +1347,6 @@ public class LineReaderImpl implements LineReader, Flushable
         return VICMD.equals(keyMap);
     }
 
-
     //
     // Movement
     //
@@ -1332,7 +1386,6 @@ public class LineReaderImpl implements LineReader, Flushable
         return true;
     }
 
-
     //
     // Word movement
     //
@@ -1365,9 +1418,7 @@ public class LineReaderImpl implements LineReader, Flushable
                     buf.move(1);
                 }
             } else {
-                while (buf.cursor() < buf.length()
-                        && !isViAlphaNum(buf.currChar())
-                        && !isWhitespace(buf.currChar())) {
+                while (buf.cursor() < buf.length() && !isViAlphaNum(buf.currChar()) && !isWhitespace(buf.currChar())) {
                     buf.move(1);
                 }
             }
@@ -1375,9 +1426,7 @@ public class LineReaderImpl implements LineReader, Flushable
                 return true;
             }
             int nl = buf.currChar() == '\n' ? 1 : 0;
-            while (buf.cursor() < buf.length()
-                    && nl < 2
-                    && isWhitespace(buf.currChar())) {
+            while (buf.cursor() < buf.length() && nl < 2 && isWhitespace(buf.currChar())) {
                 buf.move(1);
                 nl += buf.currChar() == '\n' ? 1 : 0;
             }
@@ -1397,9 +1446,7 @@ public class LineReaderImpl implements LineReader, Flushable
                 return true;
             }
             int nl = buf.currChar() == '\n' ? 1 : 0;
-            while (buf.cursor() < buf.length()
-                    && nl < 2
-                    && isWhitespace(buf.currChar())) {
+            while (buf.cursor() < buf.length() && nl < 2 && isWhitespace(buf.currChar())) {
                 buf.move(1);
                 nl += buf.currChar() == '\n' ? 1 : 0;
             }
@@ -1451,7 +1498,9 @@ public class LineReaderImpl implements LineReader, Flushable
                     }
                 } else {
                     buf.move(1);
-                    while (buf.cursor() < buf.length() && !isViAlphaNum(buf.nextChar()) && !isWhitespace(buf.nextChar())) {
+                    while (buf.cursor() < buf.length()
+                            && !isViAlphaNum(buf.nextChar())
+                            && !isWhitespace(buf.nextChar())) {
                         buf.move(1);
                     }
                 }
@@ -1720,9 +1769,7 @@ public class LineReaderImpl implements LineReader, Flushable
                 buf.move(1);
             }
             while (buf.cursor() < buf.length() && isWord(buf.currChar())) {
-                buf.currChar(first
-                        ? Character.toUpperCase(buf.currChar())
-                        : Character.toLowerCase(buf.currChar()));
+                buf.currChar(first ? Character.toUpperCase(buf.currChar()) : Character.toLowerCase(buf.currChar()));
                 buf.move(1);
                 first = false;
             }
@@ -1810,7 +1857,8 @@ public class LineReaderImpl implements LineReader, Flushable
                 sta1--;
             }
             end1 = sta1;
-            while (end1 < lend && !isDelimiter(buf.atChar(++end1)));
+            while (end1 < lend && !isDelimiter(buf.atChar(++end1)))
+                ;
             if (neg) {
                 end2 = sta1 - 1;
                 while (end2 > lstart && isDelimiter(buf.atChar(end2 - 1))) {
@@ -1819,9 +1867,11 @@ public class LineReaderImpl implements LineReader, Flushable
                 if (end2 < lstart) {
                     // No word before, use the word after
                     sta2 = end1;
-                    while (isDelimiter(buf.atChar(++sta2)));
+                    while (isDelimiter(buf.atChar(++sta2)))
+                        ;
                     end2 = sta2;
-                    while (end2 < lend && !isDelimiter(buf.atChar(++end2)));
+                    while (end2 < lend && !isDelimiter(buf.atChar(++end2)))
+                        ;
                 } else {
                     sta2 = end2;
                     while (sta2 > lstart && !isDelimiter(buf.atChar(sta2 - 1))) {
@@ -1830,7 +1880,8 @@ public class LineReaderImpl implements LineReader, Flushable
                 }
             } else {
                 sta2 = end1;
-                while (sta2 < lend && isDelimiter(buf.atChar(++sta2)));
+                while (sta2 < lend && isDelimiter(buf.atChar(++sta2)))
+                    ;
                 if (sta2 == lend) {
                     // No word after, use the word before
                     end2 = sta1;
@@ -1843,19 +1894,24 @@ public class LineReaderImpl implements LineReader, Flushable
                     }
                 } else {
                     end2 = sta2;
-                    while (end2 < lend && !isDelimiter(buf.atChar(++end2))) ;
+                    while (end2 < lend && !isDelimiter(buf.atChar(++end2)))
+                        ;
                 }
             }
             if (sta1 < sta2) {
-                String res = buf.substring(0, sta1) + buf.substring(sta2, end2)
-                        + buf.substring(end1, sta2) + buf.substring(sta1, end1)
+                String res = buf.substring(0, sta1)
+                        + buf.substring(sta2, end2)
+                        + buf.substring(end1, sta2)
+                        + buf.substring(sta1, end1)
                         + buf.substring(end2);
                 buf.clear();
                 buf.write(res);
                 buf.cursor(neg ? end1 : end2);
             } else {
-                String res = buf.substring(0, sta2) + buf.substring(sta1, end1)
-                        + buf.substring(end2, sta1) + buf.substring(sta2, end2)
+                String res = buf.substring(0, sta2)
+                        + buf.substring(sta1, end1)
+                        + buf.substring(end2, sta1)
+                        + buf.substring(sta2, end2)
                         + buf.substring(end1);
                 buf.clear();
                 buf.write(res);
@@ -1988,11 +2044,11 @@ public class LineReaderImpl implements LineReader, Flushable
         while (count-- > 0) {
             do {
                 buf.move(findDir);
-            } while (buf.cursor() > 0 && buf.cursor() < buf.length()
+            } while (buf.cursor() > 0
+                    && buf.cursor() < buf.length()
                     && buf.currChar() != findChar
                     && buf.currChar() != '\n');
-            if (buf.cursor() <= 0 || buf.cursor() >= buf.length()
-                    || buf.currChar() == '\n') {
+            if (buf.cursor() <= 0 || buf.cursor() >= buf.length() || buf.currChar() == '\n') {
                 buf.cursor(cursor);
                 return false;
             }
@@ -2211,18 +2267,17 @@ public class LineReaderImpl implements LineReader, Flushable
      *   character or if there was no matching bracket.
      */
     protected boolean doViMatchBracket() {
-        int pos        = buf.cursor();
+        int pos = buf.cursor();
 
         if (pos == buf.length()) {
             return false;
         }
 
-        int type       = getBracketType(buf.atChar(pos));
-        int move       = (type < 0) ? -1 : 1;
-        int count      = 1;
+        int type = getBracketType(buf.atChar(pos));
+        int move = (type < 0) ? -1 : 1;
+        int count = 1;
 
-        if (type == 0)
-            return false;
+        if (type == 0) return false;
 
         while (count > 0) {
             pos += move;
@@ -2235,8 +2290,7 @@ public class LineReaderImpl implements LineReader, Flushable
             int curType = getBracketType(buf.atChar(pos));
             if (curType == type) {
                 ++count;
-            }
-            else if (curType == -type) {
+            } else if (curType == -type) {
                 --count;
             }
         }
@@ -2245,8 +2299,7 @@ public class LineReaderImpl implements LineReader, Flushable
          * Slight adjustment for delete-to, yank-to, change-to to ensure
          * that the matching paren is consumed
          */
-        if (move > 0 && isInViMoveOperation())
-            ++pos;
+        if (move > 0 && isInViMoveOperation()) ++pos;
 
         buf.cursor(pos);
         return true;
@@ -2259,14 +2312,20 @@ public class LineReaderImpl implements LineReader, Flushable
      * @return 1 is square, 2 curly, 3 parent, or zero for none.  The value
      *   will be negated if it is the closing form of the bracket.
      */
-    protected int getBracketType (int ch) {
+    protected int getBracketType(int ch) {
         switch (ch) {
-            case '[': return  1;
-            case ']': return -1;
-            case '{': return  2;
-            case '}': return -2;
-            case '(': return  3;
-            case ')': return -3;
+            case '[':
+                return 1;
+            case ']':
+                return -1;
+            case '{':
+                return 2;
+            case '}':
+                return -2;
+            case '(':
+                return 3;
+            case ')':
+                return -3;
             default:
                 return 0;
         }
@@ -2331,7 +2390,7 @@ public class LineReaderImpl implements LineReader, Flushable
             buf.clear();
             println();
             redrawLine();
-//            state = State.INTERRUPT;
+            //            state = State.INTERRUPT;
             return false;
         }
         return true;
@@ -2378,6 +2437,10 @@ public class LineReaderImpl implements LineReader, Flushable
     protected boolean digitArgument() {
         String s = getLastBinding();
         repeatCount = (repeatCount * 10) + s.charAt(s.length() - 1) - '0';
+        int maxRepeatCount = getInt(MAX_REPEAT_COUNT, DEFAULT_MAX_REPEAT_COUNT);
+        if (repeatCount > maxRepeatCount) {
+            throw new IllegalArgumentException("digit argument should be less than " + maxRepeatCount);
+        }
         isArgDigit = true;
         return true;
     }
@@ -2438,10 +2501,12 @@ public class LineReaderImpl implements LineReader, Flushable
     protected boolean viYankWholeLine() {
         int s, e;
         int p = buf.cursor();
-        while (buf.move(-1) == -1 && buf.prevChar() != '\n') ;
+        while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+            ;
         s = buf.cursor();
         for (int i = 0; i < repeatCount; i++) {
-            while (buf.move(1) == 1 && buf.prevChar() != '\n') ;
+            while (buf.move(1) == 1 && buf.prevChar() != '\n')
+                ;
         }
         e = buf.cursor();
         yankBuffer = buf.substring(s, e);
@@ -2554,15 +2619,19 @@ public class LineReaderImpl implements LineReader, Flushable
         return doSearchHistory(true);
     }
 
-    static class Pair<U,V> {
-        final U u; final V v;
+    static class Pair<U, V> {
+        final U u;
+        final V v;
+
         public Pair(U u, V v) {
             this.u = u;
             this.v = v;
         }
+
         public U getU() {
             return u;
         }
+
         public V getV() {
             return v;
         }
@@ -2575,7 +2644,8 @@ public class LineReaderImpl implements LineReader, Flushable
 
         KeyMap<Binding> terminators = new KeyMap<>();
         getString(SEARCH_TERMINATORS, DEFAULT_SEARCH_TERMINATORS)
-                .codePoints().forEach(c -> bind(terminators, ACCEPT_LINE, new String(Character.toChars(c))));
+                .codePoints()
+                .forEach(c -> bind(terminators, ACCEPT_LINE, new String(Character.toChars(c))));
 
         Buffer originalBuffer = buf.copy();
         searchIndex = -1;
@@ -2583,8 +2653,8 @@ public class LineReaderImpl implements LineReader, Flushable
         searchBackward = backward;
         searchFailing = false;
         post = () -> new AttributedString((searchFailing ? "failing" + " " : "")
-                        + (searchBackward ? "bck-i-search" : "fwd-i-search")
-                        + ": " + searchTerm + "_");
+                + (searchBackward ? "bck-i-search" : "fwd-i-search")
+                + ": " + searchTerm + "_");
 
         redisplay();
         try {
@@ -2630,8 +2700,9 @@ public class LineReaderImpl implements LineReader, Flushable
                     searchFailing = false;
                 } else {
                     boolean caseInsensitive = isSet(Option.CASE_INSENSITIVE_SEARCH);
-                    Pattern pat = Pattern.compile(pattern, caseInsensitive ? Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-                                                                           : Pattern.UNICODE_CASE);
+                    Pattern pat = Pattern.compile(
+                            pattern,
+                            caseInsensitive ? Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE : Pattern.UNICODE_CASE);
                     Pair<Integer, Integer> pair = null;
                     if (searchBackward) {
                         boolean nextOnly = next;
@@ -2641,7 +2712,11 @@ public class LineReaderImpl implements LineReader, Flushable
                                 .orElse(null);
                         if (pair == null) {
                             pair = StreamSupport.stream(
-                                    Spliterators.spliteratorUnknownSize(history.reverseIterator(searchIndex < 0 ? history.last() : searchIndex - 1), Spliterator.ORDERED), false)
+                                            Spliterators.spliteratorUnknownSize(
+                                                    history.reverseIterator(
+                                                            searchIndex < 0 ? history.last() : searchIndex - 1),
+                                                    Spliterator.ORDERED),
+                                            false)
                                     .flatMap(e -> matches(pat, e.line(), e.index()).stream())
                                     .findFirst()
                                     .orElse(null);
@@ -2654,7 +2729,11 @@ public class LineReaderImpl implements LineReader, Flushable
                                 .orElse(null);
                         if (pair == null) {
                             pair = StreamSupport.stream(
-                                    Spliterators.spliteratorUnknownSize(history.iterator((searchIndex < 0 ? history.last() : searchIndex) + 1), Spliterator.ORDERED), false)
+                                            Spliterators.spliteratorUnknownSize(
+                                                    history.iterator(
+                                                            (searchIndex < 0 ? history.last() : searchIndex) + 1),
+                                                    Spliterator.ORDERED),
+                                            false)
                                     .flatMap(e -> matches(pat, e.line(), e.index()).stream())
                                     .findFirst()
                                     .orElse(null);
@@ -2714,7 +2793,10 @@ public class LineReaderImpl implements LineReader, Flushable
                     sb.append("\\E");
                     inQuote = false;
                 }
-                sb.append("[").append(Character.toLowerCase(c)).append(Character.toUpperCase(c)).append("]");
+                sb.append("[")
+                        .append(Character.toLowerCase(c))
+                        .append(Character.toUpperCase(c))
+                        .append("]");
             } else {
                 if (!inQuote) {
                     sb.append("\\Q");
@@ -2742,8 +2824,7 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     protected boolean historySearchForward() {
-        if (historyBuffer == null || buf.length() == 0
-                || !buf.toString().equals(history.current())) {
+        if (historyBuffer == null || buf.length() == 0 || !buf.toString().equals(history.current())) {
             historyBuffer = buf.copy();
             searchBuffer = getFirstWord();
         }
@@ -2791,8 +2872,7 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     protected boolean historySearchBackward() {
-        if (historyBuffer == null || buf.length() == 0
-                || !buf.toString().equals(history.current())) {
+        if (historyBuffer == null || buf.length() == 0 || !buf.toString().equals(history.current())) {
             historyBuffer = buf.copy();
             searchBuffer = getFirstWord();
         }
@@ -2984,7 +3064,7 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     void indention(int nb, StringBuilder sb) {
-        int indent = getInt(INDENTATION, DEFAULT_INDENTATION)*nb;
+        int indent = getInt(INDENTATION, DEFAULT_INDENTATION) * nb;
         for (int i = 0; i < indent; i++) {
             sb.append(' ');
         }
@@ -3017,7 +3097,6 @@ public class LineReaderImpl implements LineReader, Flushable
         return true;
     }
 
-
     //
     // History Control
     //
@@ -3108,13 +3187,11 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     protected boolean viUpLineOrHistory() {
-        return upLine()
-                || upHistory() && viFirstNonBlank();
+        return upLine() || upHistory() && viFirstNonBlank();
     }
 
     protected boolean viDownLineOrHistory() {
-        return downLine()
-                || downHistory() && viFirstNonBlank();
+        return downLine() || downHistory() && viFirstNonBlank();
     }
 
     protected boolean upLine() {
@@ -3175,8 +3252,7 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     protected boolean viChangeEol() {
-        return viChange(buf.cursor(), buf.length())
-                && setKeyMap(VIINS);
+        return viChange(buf.cursor(), buf.length()) && setKeyMap(VIINS);
     }
 
     protected boolean viKillEol() {
@@ -3199,7 +3275,8 @@ public class LineReaderImpl implements LineReader, Flushable
 
     protected boolean viJoin() {
         if (buf.down()) {
-            while (buf.move(-1) == -1 && buf.prevChar() != '\n') ;
+            while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+                ;
             buf.backspace();
             buf.write(' ');
             buf.move(-1);
@@ -3253,14 +3330,16 @@ public class LineReaderImpl implements LineReader, Flushable
 
     protected boolean beginningOfLine() {
         while (count-- > 0) {
-            while (buf.move(-1) == -1 && buf.prevChar() != '\n') ;
+            while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+                ;
         }
         return true;
     }
 
     protected boolean endOfLine() {
         while (count-- > 0) {
-            while (buf.move(1) == 1 && buf.currChar() != '\n') ;
+            while (buf.move(1) == 1 && buf.currChar() != '\n')
+                ;
         }
         return true;
     }
@@ -3384,7 +3463,7 @@ public class LineReaderImpl implements LineReader, Flushable
         // what is really happening is that if we are in "move-mode" then the
         // cursor can't be moved off the end of the line, but in "edit-mode" it
         // is ok, but I have no easy way of knowing which mode we are in.
-        if (! isChange && startPos > 0 && startPos == buf.length()) {
+        if (!isChange && startPos > 0 && startPos == buf.length()) {
             buf.move(-1);
         }
         return true;
@@ -3424,14 +3503,16 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     protected boolean viOpenLineAbove() {
-        while (buf.move(-1) == -1 && buf.prevChar() != '\n') ;
+        while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+            ;
         buf.write('\n');
         buf.move(-1);
         return setKeyMap(VIINS);
     }
 
     protected boolean viOpenLineBelow() {
-        while (buf.move(1) == 1 && buf.currChar() != '\n') ;
+        while (buf.move(1) == 1 && buf.currChar() != '\n')
+            ;
         buf.write('\n');
         return setKeyMap(VIINS);
     }
@@ -3443,11 +3524,12 @@ public class LineReaderImpl implements LineReader, Flushable
      */
     protected boolean viPutAfter() {
         if (yankBuffer.indexOf('\n') >= 0) {
-            while (buf.move(1) == 1 && buf.currChar() != '\n');
+            while (buf.move(1) == 1 && buf.currChar() != '\n')
+                ;
             buf.move(1);
             putString(yankBuffer);
-            buf.move(- yankBuffer.length());
-        } else if (yankBuffer.length () != 0) {
+            buf.move(-yankBuffer.length());
+        } else if (yankBuffer.length() != 0) {
             if (buf.cursor() < buf.length()) {
                 buf.move(1);
             }
@@ -3461,10 +3543,11 @@ public class LineReaderImpl implements LineReader, Flushable
 
     protected boolean viPutBefore() {
         if (yankBuffer.indexOf('\n') >= 0) {
-            while (buf.move(-1) == -1 && buf.prevChar() != '\n');
+            while (buf.move(-1) == -1 && buf.prevChar() != '\n')
+                ;
             putString(yankBuffer);
-            buf.move(- yankBuffer.length());
-        } else if (yankBuffer.length () != 0) {
+            buf.move(-yankBuffer.length());
+        } else if (yankBuffer.length() != 0) {
             if (buf.cursor() > 0) {
                 buf.move(-1);
             }
@@ -3681,7 +3764,7 @@ public class LineReaderImpl implements LineReader, Flushable
         addBuiltinWidget(widgets, MENU_EXPAND_OR_COMPLETE, this::menuExpandOrComplete);
         addBuiltinWidget(widgets, NEG_ARGUMENT, this::negArgument);
         addBuiltinWidget(widgets, OVERWRITE_MODE, this::overwriteMode);
-//        addBuiltinWidget(widgets, QUIT, this::quit);
+        //        addBuiltinWidget(widgets, QUIT, this::quit);
         addBuiltinWidget(widgets, QUOTED_INSERT, this::quotedInsert);
         addBuiltinWidget(widgets, REDISPLAY, this::redisplay);
         addBuiltinWidget(widgets, REDRAW_LINE, this::redrawLine);
@@ -3774,6 +3857,7 @@ public class LineReaderImpl implements LineReader, Flushable
             public String toString() {
                 return name;
             }
+
             @Override
             public boolean apply() {
                 return widget.apply();
@@ -3797,14 +3881,11 @@ public class LineReaderImpl implements LineReader, Flushable
 
             Status status = Status.getStatus(terminal, false);
             if (status != null) {
-                if (terminal.getType().startsWith(AbstractWindowsTerminal.TYPE_WINDOWS)) {
-                    status.resize();
-                }
                 status.redraw();
             }
 
             if (size.getRows() > 0 && size.getRows() < MIN_ROWS) {
-                AttributedStringBuilder sb = new AttributedStringBuilder().tabs(TAB_WIDTH);
+                AttributedStringBuilder sb = new AttributedStringBuilder().tabs(getTabWidth());
 
                 sb.append(prompt);
                 concat(getHighlightedBuffer(buf.toString()).columnSplitLength(Integer.MAX_VALUE), sb);
@@ -3877,14 +3958,15 @@ public class LineReaderImpl implements LineReader, Flushable
             int cursorNewLinesId = -1;
             int cursorColPos = -1;
             if (size.getColumns() > 0) {
-                AttributedStringBuilder sb = new AttributedStringBuilder().tabs(TAB_WIDTH);
+                AttributedStringBuilder sb = new AttributedStringBuilder().tabs(getTabWidth());
                 sb.append(prompt);
                 String buffer = buf.upToCursor();
                 if (maskingCallback != null) {
                     buffer = maskingCallback.display(buffer);
                 }
                 sb.append(insertSecondaryPrompts(new AttributedString(buffer), secondaryPrompts, false));
-                List<AttributedString> promptLines = sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
+                List<AttributedString> promptLines =
+                        sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
                 if (!promptLines.isEmpty()) {
                     cursorNewLinesId = promptLines.size() - 1;
                     cursorColPos = promptLines.get(promptLines.size() - 1).columnLength();
@@ -3904,7 +3986,7 @@ public class LineReaderImpl implements LineReader, Flushable
                 int lineId = newLines.size() - displaySize + 1;
                 int endId = displaySize;
                 int startId = 1;
-                if (lineId  > cursorNewLinesId) {
+                if (lineId > cursorNewLinesId) {
                     lineId = cursorNewLinesId;
                     endId = displaySize - 1;
                     startId = 0;
@@ -3949,10 +4031,9 @@ public class LineReaderImpl implements LineReader, Flushable
         }
         History history = getHistory();
         StringBuilder sb = new StringBuilder();
-        for (char c: buffer.replace("\\", "\\\\").toCharArray()) {
-            if (c == '(' || c == ')' || c == '[' || c == ']' || c == '{' || c == '}' || c == '^' || c == '*'
-                     || c == '$' || c == '.' || c == '?' || c == '+' || c == '|' || c == '<' || c == '>' || c == '!'
-                     || c == '-') {
+        for (char c : buffer.replace("\\", "\\\\").toCharArray()) {
+            if (c == '(' || c == ')' || c == '[' || c == ']' || c == '{' || c == '}' || c == '^' || c == '*' || c == '$'
+                    || c == '.' || c == '?' || c == '+' || c == '|' || c == '<' || c == '>' || c == '!' || c == '-') {
                 sb.append('\\');
             }
             sb.append(c);
@@ -3984,7 +4065,7 @@ public class LineReaderImpl implements LineReader, Flushable
         AttributedString attBuf = getHighlightedBuffer(buf.toString());
 
         AttributedString tNewBuf = insertSecondaryPrompts(attBuf, secondaryPrompts);
-        AttributedStringBuilder full = new AttributedStringBuilder().tabs(TAB_WIDTH);
+        AttributedStringBuilder full = new AttributedStringBuilder().tabs(getTabWidth());
         full.append(prompt);
         full.append(tNewBuf);
         if (doAutosuggestion && !isTerminalDumb()) {
@@ -4040,15 +4121,15 @@ public class LineReaderImpl implements LineReader, Flushable
         if (maskingCallback != null) {
             buffer = maskingCallback.display(buffer);
         }
-        if (highlighter != null && !isSet(Option.DISABLE_HIGHLIGHTER)
+        if (highlighter != null
+                && !isSet(Option.DISABLE_HIGHLIGHTER)
                 && buffer.length() < getInt(FEATURES_MAX_BUFFER_SIZE, DEFAULT_FEATURES_MAX_BUFFER_SIZE)) {
             return highlighter.highlight(this, buffer);
         }
         return new AttributedString(buffer);
     }
 
-    private AttributedString expandPromptPattern(String pattern, int padToWidth,
-                                                 String message, int line) {
+    private AttributedString expandPromptPattern(String pattern, int padToWidth, String message, int line) {
         ArrayList<AttributedString> parts = new ArrayList<>();
         boolean isHidden = false;
         int padPartIndex = -1;
@@ -4065,7 +4146,8 @@ public class LineReaderImpl implements LineReader, Flushable
             if (ch == '%' && i < plen) {
                 int count = 0;
                 boolean countSeen = false;
-                decode: while (true) {
+                decode:
+                while (true) {
                     ch = pattern.charAt(i++);
                     switch (ch) {
                         case '{':
@@ -4073,7 +4155,7 @@ public class LineReaderImpl implements LineReader, Flushable
                             String str = sb.toString();
                             AttributedString astr;
                             if (!isHidden) {
-                                astr = AttributedString.fromAnsi(str);
+                                astr = fromAnsi(str);
                                 cols += astr.columnLength();
                             } else {
                                 astr = new AttributedString(str, AttributedStyle.HIDDEN);
@@ -4096,12 +4178,10 @@ public class LineReaderImpl implements LineReader, Flushable
                             sb.append(getInt(LINE_OFFSET, 0) + line);
                             break decode;
                         case 'M':
-                            if (message != null)
-                                sb.append(message);
+                            if (message != null) sb.append(message);
                             break decode;
                         case 'P':
-                            if (countSeen && count >= 0)
-                                padToWidth = count;
+                            if (countSeen && count >= 0) padToWidth = count;
                             if (i < plen) {
                                 padChar = pattern.charAt(i++);
                                 // FIXME check surrogate
@@ -4140,25 +4220,28 @@ public class LineReaderImpl implements LineReader, Flushable
                             break decode;
                     }
                 }
-            } else
-                sb.append(ch);
+            } else sb.append(ch);
         }
         if (padToWidth > cols && padToWidth > 0) {
             int padCharCols = WCWidth.wcwidth(padChar);
             int padCount = (padToWidth - cols) / padCharCols;
             sb = padPartString;
-            while (--padCount >= 0)
-                sb.insert(padPos, (char) padChar); // FIXME if wide
-            parts.set(padPartIndex, AttributedString.fromAnsi(sb.toString()));
+            while (--padCount >= 0) sb.insert(padPos, (char) padChar); // FIXME if wide
+            parts.set(padPartIndex, fromAnsi(sb.toString()));
         }
         return AttributedString.join(null, parts);
     }
 
+    private AttributedString fromAnsi(String str) {
+        return AttributedString.fromAnsi(str, Collections.singletonList(0), alternateIn, alternateOut);
+    }
+
     private AttributedString insertSecondaryPrompts(AttributedString str, List<AttributedString> prompts) {
         return insertSecondaryPrompts(str, prompts, true);
     }
 
-    private AttributedString insertSecondaryPrompts(AttributedString strAtt, List<AttributedString> prompts, boolean computePrompts) {
+    private AttributedString insertSecondaryPrompts(
+            AttributedString strAtt, List<AttributedString> prompts, boolean computePrompts) {
         Objects.requireNonNull(prompts);
         List<AttributedString> lines = strAtt.columnSplitLength(Integer.MAX_VALUE);
         AttributedStringBuilder sb = new AttributedStringBuilder();
@@ -4171,7 +4254,9 @@ public class LineReaderImpl implements LineReader, Flushable
         if (computePrompts && secondaryPromptPattern.contains("%P")) {
             width = prompt.columnLength();
             if (width > size.getColumns() || prompt.contains('\n')) {
-                width = new TerminalLine(prompt.toString(), 0, size.getColumns()).getEndLine().length();
+                width = new TerminalLine(prompt.toString(), 0, size.getColumns())
+                        .getEndLine()
+                        .length();
             }
             for (int line = 0; line < lines.size() - 1; line++) {
                 AttributedString prompt;
@@ -4227,11 +4312,9 @@ public class LineReaderImpl implements LineReader, Flushable
 
     private AttributedString addRightPrompt(AttributedString prompt, AttributedString line) {
         int width = prompt.columnLength();
-        boolean endsWithNl = line.length() > 0
-            && line.charAt(line.length() - 1) == '\n';
+        boolean endsWithNl = line.length() > 0 && line.charAt(line.length() - 1) == '\n';
         // columnLength counts -1 for the final newline; adjust for that
-        int nb = size.getColumns() - width
-            - (line.columnLength() + (endsWithNl ? 1 : 0));
+        int nb = size.getColumns() - width - (line.columnLength() + (endsWithNl ? 1 : 0));
         if (nb >= 3) {
             AttributedStringBuilder sb = new AttributedStringBuilder(size.getColumns());
             sb.append(line, 0, endsWithNl ? line.length() - 1 : line.length());
@@ -4253,8 +4336,8 @@ public class LineReaderImpl implements LineReader, Flushable
 
     protected boolean insertTab() {
         return isSet(Option.INSERT_TAB)
-                    && getLastBinding().equals("\t")
-                    && buf.toString().matches("(^|[\\s\\S]*\n)[\r\n\t ]*");
+                && getLastBinding().equals("\t")
+                && buf.toString().matches("(^|[\\s\\S]*\n)[\r\n\t ]*");
     }
 
     protected boolean expandHistory() {
@@ -4465,7 +4548,8 @@ public class LineReaderImpl implements LineReader, Flushable
                     if (op != null) {
                         String chars = getString(REMOVE_SUFFIX_CHARS, DEFAULT_REMOVE_SUFFIX_CHARS);
                         String ref = op instanceof Reference ? ((Reference) op).name() : null;
-                        if (SELF_INSERT.equals(ref) && chars.indexOf(getLastBinding().charAt(0)) >= 0
+                        if (SELF_INSERT.equals(ref)
+                                        && chars.indexOf(getLastBinding().charAt(0)) >= 0
                                 || ACCEPT_LINE.equals(ref)) {
                             buf.backspace(completion.suffix().length());
                             if (getLastBinding().charAt(0) != ' ') {
@@ -4533,27 +4617,35 @@ public class LineReaderImpl implements LineReader, Flushable
                 public String word() {
                     return line.word();
                 }
+
                 public int wordCursor() {
                     return line.wordCursor();
                 }
+
                 public int wordIndex() {
                     return line.wordIndex();
                 }
+
                 public List<String> words() {
                     return line.words();
                 }
+
                 public String line() {
                     return line.line();
                 }
+
                 public int cursor() {
                     return line.cursor();
                 }
+
                 public CharSequence escape(CharSequence candidate, boolean complete) {
                     return candidate;
                 }
+
                 public int rawWordCursor() {
                     return wordCursor();
                 }
+
                 public int rawWordLength() {
                     return word().length();
                 }
@@ -4564,8 +4656,7 @@ public class LineReaderImpl implements LineReader, Flushable
     protected Comparator<Candidate> getCandidateComparator(boolean caseInsensitive, String word) {
         String wdi = caseInsensitive ? word.toLowerCase() : word;
         ToIntFunction<String> wordDistance = w -> ReaderUtils.distance(wdi, caseInsensitive ? w.toLowerCase() : w);
-        return Comparator
-                .comparing(Candidate::value, Comparator.comparingInt(wordDistance))
+        return Comparator.comparing(Candidate::value, Comparator.comparingInt(wordDistance))
                 .thenComparing(Comparator.naturalOrder());
     }
 
@@ -4577,9 +4668,10 @@ public class LineReaderImpl implements LineReader, Flushable
         return getString(ORIGINAL_GROUP_NAME, DEFAULT_ORIGINAL_GROUP_NAME);
     }
 
-
     protected Comparator<String> getGroupComparator() {
-        return Comparator.<String>comparingInt(s -> getOthersGroupName().equals(s) ? 1 : getOriginalGroupName().equals(s) ? -1 : 0)
+        return Comparator.<String>comparingInt(s -> getOthersGroupName().equals(s)
+                        ? 1
+                        : getOriginalGroupName().equals(s) ? -1 : 0)
                 .thenComparing(String::toLowerCase, Comparator.naturalOrder());
     }
 
@@ -4600,11 +4692,9 @@ public class LineReaderImpl implements LineReader, Flushable
                     // the same description
                     candidates.sort(Comparator.comparing(Candidate::value));
                     Candidate first = candidates.get(0);
-                    String disp = candidates.stream()
-                            .map(Candidate::displ)
-                            .collect(Collectors.joining(" "));
-                    possible.add(new Candidate(first.value(), disp, first.group(),
-                            first.descr(), first.suffix(), null, first.complete()));
+                    String disp = candidates.stream().map(Candidate::displ).collect(Collectors.joining(" "));
+                    possible.add(new Candidate(
+                            first.value(), disp, first.group(), first.descr(), first.suffix(), null, first.complete()));
                 }
             }
         }
@@ -4636,8 +4726,10 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     private int promptLines() {
-        AttributedString text = insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
-        return text.columnSplitLength(size.getColumns(), false, display.delayLineWrap()).size();
+        AttributedString text =
+                insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
+        return text.columnSplitLength(size.getColumns(), false, display.delayLineWrap())
+                .size();
     }
 
     private class MenuSupport implements Supplier<AttributedString> {
@@ -4651,7 +4743,8 @@ public class LineReaderImpl implements LineReader, Flushable
         int columns;
         String completed;
 
-        public MenuSupport(List<Candidate> original, String completed, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
+        public MenuSupport(
+                List<Candidate> original, String completed, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
             this.possible = new ArrayList<>();
             this.escaper = escaper;
             this.selection = -1;
@@ -4714,7 +4807,7 @@ public class LineReaderImpl implements LineReader, Flushable
             if (selection - row + axis > options) {
                 // selection is the last row/column
                 // so there are fewer options than other rows
-                axis = options%axis;
+                axis = options % axis;
             }
             selection = selection - row + ((axis + row + step) % axis);
             update();
@@ -4772,7 +4865,9 @@ public class LineReaderImpl implements LineReader, Flushable
                 AttributedString post = pr.post;
                 if (post.length() > 0 && post.charAt(post.length() - 1) != '\n') {
                     post = new AttributedStringBuilder(post.length() + 1)
-                            .append(post).append("\n").toAttributedString();
+                            .append(post)
+                            .append("\n")
+                            .toAttributedString();
                 }
                 List<AttributedString> lines = post.columnSplitLength(size.getColumns(), true, display.delayLineWrap());
                 List<AttributedString> sub = new ArrayList<>(lines.subList(topLine, topLine + displayed));
@@ -4785,7 +4880,8 @@ public class LineReaderImpl implements LineReader, Flushable
                         .append(" of ")
                         .append(Integer.toString(lines.size()))
                         .append("\n")
-                        .style(AttributedStyle.DEFAULT).toAttributedString());
+                        .style(AttributedStyle.DEFAULT)
+                        .toAttributedString());
                 computed = AttributedString.join(AttributedString.EMPTY, sub);
             } else {
                 computed = pr.post;
@@ -4798,10 +4894,10 @@ public class LineReaderImpl implements LineReader, Flushable
         public AttributedString get() {
             return computed;
         }
-
     }
 
-    protected boolean doMenu(List<Candidate> original, String completed, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
+    protected boolean doMenu(
+            List<Candidate> original, String completed, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
         // Reorder candidates according to display order
         final List<Candidate> possible = new ArrayList<>();
         boolean caseInsensitive = isSet(Option.CASE_INSENSITIVE);
@@ -4854,7 +4950,7 @@ public class LineReaderImpl implements LineReader, Flushable
                     if (completion.suffix() != null) {
                         String chars = getString(REMOVE_SUFFIX_CHARS, DEFAULT_REMOVE_SUFFIX_CHARS);
                         if (SELF_INSERT.equals(ref)
-                                && chars.indexOf(getLastBinding().charAt(0)) >= 0
+                                        && chars.indexOf(getLastBinding().charAt(0)) >= 0
                                 || BACKWARD_DELETE_CHAR.equals(ref)) {
                             buf.backspace(completion.suffix().length());
                         }
@@ -4866,8 +4962,8 @@ public class LineReaderImpl implements LineReader, Flushable
                     }
                     if (!ACCEPT_LINE.equals(ref)
                             && !(SELF_INSERT.equals(ref)
-                                && completion.suffix() != null
-                                && completion.suffix().startsWith(getLastBinding()))) {
+                                    && completion.suffix() != null
+                                    && completion.suffix().startsWith(getLastBinding()))) {
                         pushBackBinding(true);
                     }
                     post = null;
@@ -4888,29 +4984,40 @@ public class LineReaderImpl implements LineReader, Flushable
         return doList(new ArrayList<>(), "", false, null, false);
     }
 
-    protected boolean doList(List<Candidate> possible
-                           , String completed, boolean runLoop, BiFunction<CharSequence, Boolean, CharSequence> escaper) {
+    protected boolean doList(
+            List<Candidate> possible,
+            String completed,
+            boolean runLoop,
+            BiFunction<CharSequence, Boolean, CharSequence> escaper) {
         return doList(possible, completed, runLoop, escaper, false);
     }
 
-    protected boolean doList(List<Candidate> possible
-                           , String completed
-                           , boolean runLoop, BiFunction<CharSequence, Boolean, CharSequence> escaper, boolean forSuggestion) {
+    protected boolean doList(
+            List<Candidate> possible,
+            String completed,
+            boolean runLoop,
+            BiFunction<CharSequence, Boolean, CharSequence> escaper,
+            boolean forSuggestion) {
         // If we list only and if there's a big
         // number of items, we should ask the user
         // for confirmation, display the list
         // and redraw the line at the bottom
         mergeCandidates(possible);
-        AttributedString text = insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
-        int promptLines = text.columnSplitLength(size.getColumns(), false, display.delayLineWrap()).size();
+        AttributedString text =
+                insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
+        int promptLines = text.columnSplitLength(size.getColumns(), false, display.delayLineWrap())
+                .size();
         PostResult postResult = computePost(possible, null, null, completed);
         int lines = postResult.lines;
         int listMax = getInt(LIST_MAX, DEFAULT_LIST_MAX);
-        if (listMax > 0 && possible.size() >= listMax
-                || lines >= size.getRows() - promptLines) {
+        int possibleSize = possible.size();
+        if (possibleSize == 0 || size.getRows() == 0) {
+            return false;
+        }
+        if (listMax > 0 && possibleSize >= listMax || lines >= size.getRows() - promptLines) {
             if (!forSuggestion) {
                 // prompt
-                post = () -> new AttributedString(getAppName() + ": do you wish to see all " + possible.size()
+                post = () -> new AttributedString(getAppName() + ": do you wish to see all " + possibleSize
                         + " possibilities (" + lines + " lines)?");
                 redisplay(true);
                 int c = readCharacter();
@@ -4930,8 +5037,7 @@ public class LineReaderImpl implements LineReader, Flushable
             String current = completed + sb.toString();
             List<Candidate> cands;
             if (sb.length() > 0) {
-                completionMatcher.compile(options, false, new CompletingWord(current), caseInsensitive, 0
-                        , null);
+                completionMatcher.compile(options, false, new CompletingWord(current), caseInsensitive, 0, null);
                 cands = completionMatcher.matches(possible).stream()
                         .sorted(getCandidateComparator(caseInsensitive, current))
                         .collect(Collectors.toList());
@@ -4944,8 +5050,10 @@ public class LineReaderImpl implements LineReader, Flushable
                 candidateStartPosition = candidateStartPosition(cands);
             }
             post = () -> {
-                AttributedString t = insertSecondaryPrompts(AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
-                int pl = t.columnSplitLength(size.getColumns(), false, display.delayLineWrap()).size();
+                AttributedString t = insertSecondaryPrompts(
+                        AttributedStringBuilder.append(prompt, buf.toString()), new ArrayList<>());
+                int pl = t.columnSplitLength(size.getColumns(), false, display.delayLineWrap())
+                        .size();
                 PostResult pr = computePost(cands, null, null, current);
                 if (pr.lines >= size.getRows() - pl) {
                     post = null;
@@ -4954,7 +5062,8 @@ public class LineReaderImpl implements LineReader, Flushable
                     redisplay(false);
                     buf.cursor(oldCursor);
                     println();
-                    List<AttributedString> ls = pr.post.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
+                    List<AttributedString> ls =
+                            pr.post.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
                     Display d = new Display(terminal, false);
                     d.resize(size.getRows(), size.getColumns());
                     d.update(ls, -1);
@@ -5074,25 +5183,41 @@ public class LineReaderImpl implements LineReader, Flushable
         }
     }
 
-    protected PostResult computePost(List<Candidate> possible, Candidate selection, List<Candidate> ordered, String completed) {
-        return computePost(possible, selection, ordered, completed, display::wcwidth, size.getColumns(), isSet(Option.AUTO_GROUP), isSet(Option.GROUP), isSet(Option.LIST_ROWS_FIRST));
+    protected PostResult computePost(
+            List<Candidate> possible, Candidate selection, List<Candidate> ordered, String completed) {
+        return computePost(
+                possible,
+                selection,
+                ordered,
+                completed,
+                display::wcwidth,
+                size.getColumns(),
+                isSet(Option.AUTO_GROUP),
+                isSet(Option.GROUP),
+                isSet(Option.LIST_ROWS_FIRST));
     }
 
-    protected PostResult computePost(List<Candidate> possible, Candidate selection, List<Candidate> ordered, String completed, Function<String, Integer> wcwidth, int width, boolean autoGroup, boolean groupName, boolean rowsFirst) {
+    protected PostResult computePost(
+            List<Candidate> possible,
+            Candidate selection,
+            List<Candidate> ordered,
+            String completed,
+            Function<String, Integer> wcwidth,
+            int width,
+            boolean autoGroup,
+            boolean groupName,
+            boolean rowsFirst) {
         List<Object> strings = new ArrayList<>();
-        boolean customOrder = possible.stream().anyMatch(c -> c.sort() != 0);
         if (groupName) {
             Comparator<String> groupComparator = getGroupComparator();
-            Map<String, Map<Object, Candidate>> sorted;
-            sorted = groupComparator != null
-                        ? new TreeMap<>(groupComparator)
-                        : new LinkedHashMap<>();
+            Map<String, List<Candidate>> sorted;
+            sorted = groupComparator != null ? new TreeMap<>(groupComparator) : new LinkedHashMap<>();
             for (Candidate cand : possible) {
                 String group = cand.group();
-                sorted.computeIfAbsent(group != null ? group : "", s -> new LinkedHashMap<>())
-                        .put((customOrder ? cand.sort() : cand.value()), cand);
+                sorted.computeIfAbsent(group != null ? group : "", s -> new ArrayList<>())
+                        .add(cand);
             }
-            for (Map.Entry<String, Map<Object, Candidate>> entry : sorted.entrySet()) {
+            for (Map.Entry<String, List<Candidate>> entry : sorted.entrySet()) {
                 String group = entry.getKey();
                 if (group.isEmpty() && sorted.size() > 1) {
                     group = getOthersGroupName();
@@ -5100,27 +5225,30 @@ public class LineReaderImpl implements LineReader, Flushable
                 if (!group.isEmpty() && autoGroup) {
                     strings.add(group);
                 }
-                strings.add(new ArrayList<>(entry.getValue().values()));
+                List<Candidate> candidates = entry.getValue();
+                Collections.sort(candidates);
+                strings.add(candidates);
                 if (ordered != null) {
-                    ordered.addAll(entry.getValue().values());
+                    ordered.addAll(candidates);
                 }
             }
         } else {
             Set<String> groups = new LinkedHashSet<>();
-            TreeMap<Object, Candidate> sorted = new TreeMap<>();
+            List<Candidate> sorted = new ArrayList<>();
             for (Candidate cand : possible) {
                 String group = cand.group();
                 if (group != null) {
                     groups.add(group);
                 }
-                sorted.put((customOrder ? cand.sort() : cand.value()), cand);
+                sorted.add(cand);
             }
             if (autoGroup) {
                 strings.addAll(groups);
             }
-            strings.add(new ArrayList<>(sorted.values()));
+            Collections.sort(sorted);
+            strings.add(sorted);
             if (ordered != null) {
-                ordered.addAll(sorted.values());
+                ordered.addAll(sorted);
             }
         }
         return toColumns(strings, selection, completed, wcwidth, width, rowsFirst);
@@ -5163,12 +5291,15 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     private int candidateStartPosition(List<Candidate> cands) {
-        List<String> values = cands.stream().map(c -> AttributedString.stripAnsi(c.displ()))
-                .filter(c -> !c.matches("\\w+") && c.length() > 1).collect(Collectors.toList());
+        List<String> values = cands.stream()
+                .map(c -> AttributedString.stripAnsi(c.displ()))
+                .filter(c -> !c.matches("\\w+") && c.length() > 1)
+                .collect(Collectors.toList());
         Set<String> notDelimiters = new HashSet<>();
-        values.forEach(v -> v.substring(0, v.length() - 1).chars()
+        values.forEach(v -> v.substring(0, v.length() - 1)
+                .chars()
                 .filter(c -> !Character.isDigit(c) && !Character.isAlphabetic(c))
-                .forEach(c -> notDelimiters.add(Character.toString((char)c))));
+                .forEach(c -> notDelimiters.add(Character.toString((char) c))));
         int width = size.getColumns();
         int promptLength = prompt != null ? prompt.length() : 0;
         if (promptLength > 0) {
@@ -5179,8 +5310,7 @@ public class LineReaderImpl implements LineReader, Flushable
         int out = tl.getStartPos();
         String buffer = tl.getEndLine();
         for (int i = buffer.length(); i > 0; i--) {
-            if (buffer.substring(0, i).matches(".*\\W")
-                    && !notDelimiters.contains(buffer.substring(i - 1, i))) {
+            if (buffer.substring(0, i).matches(".*\\W") && !notDelimiters.contains(buffer.substring(i - 1, i))) {
                 out += i;
                 break;
             }
@@ -5189,7 +5319,13 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     @SuppressWarnings("unchecked")
-    protected PostResult toColumns(List<Object> items, Candidate selection, String completed, Function<String, Integer> wcwidth, int width, boolean rowsFirst) {
+    protected PostResult toColumns(
+            List<Object> items,
+            Candidate selection,
+            String completed,
+            Function<String, Integer> wcwidth,
+            int width,
+            boolean rowsFirst) {
         int[] out = new int[2];
         // TODO: support Option.LIST_PACKED
         // Compute column width
@@ -5199,8 +5335,7 @@ public class LineReaderImpl implements LineReader, Flushable
             if (item instanceof String) {
                 int len = wcwidth.apply((String) item);
                 maxWidth = Math.max(maxWidth, len);
-            }
-            else if (item instanceof List) {
+            } else if (item instanceof List) {
                 for (Candidate cand : (List<Candidate>) item) {
                     listSize++;
                     int len = wcwidth.apply(cand.displ());
@@ -5218,7 +5353,10 @@ public class LineReaderImpl implements LineReader, Flushable
         AttributedStringBuilder sb = new AttributedStringBuilder();
         if (listSize > 0) {
             if (isSet(Option.AUTO_MENU_LIST)
-                    && listSize < Math.min(getInt(MENU_LIST_MAX, DEFAULT_MENU_LIST_MAX), visibleDisplayRows() - promptLines())) {
+                    && listSize
+                            < Math.min(
+                                    getInt(MENU_LIST_MAX, DEFAULT_MENU_LIST_MAX),
+                                    visibleDisplayRows() - promptLines())) {
                 maxWidth = Math.max(maxWidth, MENU_LIST_WIDTH);
                 sb.tabs(Math.max(Math.min(candidateStartPosition, width - maxWidth - 1), 1));
                 width = maxWidth + 2;
@@ -5251,8 +5389,16 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     @SuppressWarnings("unchecked")
-    protected void toColumns(Object items, int width, int maxWidth, AttributedStringBuilder sb, Candidate selection, String completed
-                           , boolean rowsFirst, boolean doMenuList, int[] out) {
+    protected void toColumns(
+            Object items,
+            int width,
+            int maxWidth,
+            AttributedStringBuilder sb,
+            Candidate selection,
+            String completed,
+            boolean rowsFirst,
+            boolean doMenuList,
+            int[] out) {
         if (maxWidth <= 0 || width <= 0) {
             return;
         }
@@ -5305,18 +5451,20 @@ public class LineReaderImpl implements LineReader, Flushable
                     if (idx < candidates.size()) {
                         Candidate cand = candidates.get(idx);
                         boolean hasRightItem = j < columns - 1 && index.applyAsInt(i, j + 1) < candidates.size();
-                        AttributedString left = AttributedString.fromAnsi(cand.displ());
-                        AttributedString right = AttributedString.fromAnsi(cand.descr());
+                        AttributedString left = fromAnsi(cand.displ());
+                        AttributedString right = fromAnsi(cand.descr());
                         int lw = left.columnLength();
                         int rw = 0;
                         if (right != null) {
-                            int rem = maxWidth - (lw + MARGIN_BETWEEN_DISPLAY_AND_DESC
-                                    + DESC_PREFIX.length() + DESC_SUFFIX.length());
+                            int rem = maxWidth
+                                    - (lw
+                                            + MARGIN_BETWEEN_DISPLAY_AND_DESC
+                                            + DESC_PREFIX.length()
+                                            + DESC_SUFFIX.length());
                             rw = right.columnLength();
                             if (rw > rem) {
                                 right = AttributedStringBuilder.append(
-                                            right.columnSubSequence(0, rem - WCWidth.wcwidth('\u2026')),
-                                            "\u2026");
+                                        right.columnSubSequence(0, rem - WCWidth.wcwidth('\u2026')), "\u2026");
                                 rw = right.columnLength();
                             }
                             right = AttributedStringBuilder.append(DESC_PREFIX, right, DESC_SUFFIX);
@@ -5325,8 +5473,9 @@ public class LineReaderImpl implements LineReader, Flushable
                         if (cand == selection) {
                             out[1] = i;
                             asb.style(getCompletionStyleSelection(doMenuList));
-                            if (left.toString().regionMatches(
-                                    isSet(Option.CASE_INSENSITIVE), 0, completed, 0, completed.length())) {
+                            if (left.toString()
+                                    .regionMatches(
+                                            isSet(Option.CASE_INSENSITIVE), 0, completed, 0, completed.length())) {
                                 asb.append(left.toString(), 0, completed.length());
                                 asb.append(left.toString(), completed.length(), left.length());
                             } else {
@@ -5340,8 +5489,9 @@ public class LineReaderImpl implements LineReader, Flushable
                             }
                             asb.style(AttributedStyle.DEFAULT);
                         } else {
-                            if (left.toString().regionMatches(
-                                    isSet(Option.CASE_INSENSITIVE), 0, completed, 0, completed.length())) {
+                            if (left.toString()
+                                    .regionMatches(
+                                            isSet(Option.CASE_INSENSITIVE), 0, completed, 0, completed.length())) {
                                 asb.style(getCompletionStyleStarting(doMenuList));
                                 asb.append(left, 0, completed.length());
                                 asb.style(AttributedStyle.DEFAULT);
@@ -5447,7 +5597,7 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     protected AttributedStyle buildStyle(String str) {
-        return AttributedString.fromAnsi("\u001b[" + str + "m ").styleAt(0);
+        return fromAnsi("\u001b[" + str + "m ").styleAt(0);
     }
 
     /**
@@ -5477,14 +5627,14 @@ public class LineReaderImpl implements LineReader, Flushable
         }
         if (next && !history.next()) {
             return false;
-        }
-        else if (!next && !history.previous()) {
+        } else if (!next && !history.previous()) {
             return false;
         }
 
-        setBuffer(modifiedHistory.containsKey(history.index())
-                    ? modifiedHistory.get(history.index())
-                    : history.current());
+        setBuffer(
+                modifiedHistory.containsKey(history.index())
+                        ? modifiedHistory.get(history.index())
+                        : history.current());
 
         return true;
     }
@@ -5515,7 +5665,6 @@ public class LineReaderImpl implements LineReader, Flushable
         redrawLine();
     }
 
-
     //
     // Actions
     //
@@ -5725,8 +5874,7 @@ public class LineReaderImpl implements LineReader, Flushable
 
     public boolean mouse() {
         MouseEvent event = readMouseEvent();
-        if (event.getType() == MouseEvent.Type.Released
-                && event.getButton() == MouseEvent.Button.Button1) {
+        if (event.getType() == MouseEvent.Type.Released && event.getButton() == MouseEvent.Button.Button1) {
             StringBuilder tsb = new StringBuilder();
             Cursor cursor = terminal.getCursorPosition(c -> tsb.append((char) c));
             bindingReader.runMacro(tsb.toString());
@@ -5734,15 +5882,20 @@ public class LineReaderImpl implements LineReader, Flushable
             List<AttributedString> secondaryPrompts = new ArrayList<>();
             getDisplayedBufferWithPrompts(secondaryPrompts);
 
-            AttributedStringBuilder sb = new AttributedStringBuilder().tabs(TAB_WIDTH);
+            AttributedStringBuilder sb = new AttributedStringBuilder().tabs(getTabWidth());
             sb.append(prompt);
             sb.append(insertSecondaryPrompts(new AttributedString(buf.upToCursor()), secondaryPrompts, false));
-            List<AttributedString> promptLines = sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
+            List<AttributedString> promptLines =
+                    sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
 
             int currentLine = promptLines.size() - 1;
             int wantedLine = Math.max(0, Math.min(currentLine + event.getY() - cursor.getY(), secondaryPrompts.size()));
-            int pl0 = currentLine == 0 ? prompt.columnLength() : secondaryPrompts.get(currentLine - 1).columnLength();
-            int pl1 = wantedLine == 0 ? prompt.columnLength() : secondaryPrompts.get(wantedLine - 1).columnLength();
+            int pl0 = currentLine == 0
+                    ? prompt.columnLength()
+                    : secondaryPrompts.get(currentLine - 1).columnLength();
+            int pl1 = wantedLine == 0
+                    ? prompt.columnLength()
+                    : secondaryPrompts.get(wantedLine - 1).columnLength();
             int adjust = pl1 - pl0;
             buf.moveXY(event.getX() - cursor.getX() - adjust, event.getY() - cursor.getY());
         }
@@ -5814,13 +5967,11 @@ public class LineReaderImpl implements LineReader, Flushable
                 bell_preference = BellType.VISIBLE;
                 break;
             case "on":
-                bell_preference = getBoolean(PREFER_VISIBLE_BELL, false)
-                        ? BellType.VISIBLE : BellType.AUDIBLE;
+                bell_preference = getBoolean(PREFER_VISIBLE_BELL, false) ? BellType.VISIBLE : BellType.AUDIBLE;
                 break;
         }
         if (bell_preference == BellType.VISIBLE) {
-            if (terminal.puts(Capability.flash_screen)
-                    || terminal.puts(Capability.bell)) {
+            if (terminal.puts(Capability.flash_screen) || terminal.puts(Capability.bell)) {
                 flush();
             }
         } else if (bell_preference == BellType.AUDIBLE) {
@@ -5869,8 +6020,7 @@ public class LineReaderImpl implements LineReader, Flushable
 
     protected boolean isWord(int c) {
         String wordchars = getString(WORDCHARS, DEFAULT_WORDCHARS);
-        return Character.isLetterOrDigit(c)
-                || (c < 128 && wordchars.indexOf((char) c) >= 0);
+        return Character.isLetterOrDigit(c) || (c < 128 && wordchars.indexOf((char) c) >= 0);
     }
 
     String getString(String name, String def) {
@@ -5899,6 +6049,8 @@ public class LineReaderImpl implements LineReader, Flushable
         keyMaps.put(VIOPP, viOpp());
         keyMaps.put(VISUAL, visual());
         keyMaps.put(SAFE, safe());
+        keyMaps.put(DUMB, dumb());
+
         if (getBoolean(BIND_TTY_SPECIAL_CHARS, true)) {
             Attributes attr = terminal.getAttributes();
             bindConsoleChars(keyMaps.get(EMACS), attr);
@@ -5909,240 +6061,241 @@ public class LineReaderImpl implements LineReader, Flushable
             keyMap.setUnicode(new Reference(SELF_INSERT));
             keyMap.setAmbiguousTimeout(getLong(AMBIGUOUS_BINDING, DEFAULT_AMBIGUOUS_BINDING));
         }
-        // By default, link main to emacs
-        keyMaps.put(MAIN, keyMaps.get(EMACS));
+        // By default, link main to emacs unless the temrinal is dumb
+        keyMaps.put(MAIN, keyMaps.get(isTerminalDumb() ? DUMB : EMACS));
+
         return keyMaps;
     }
 
     public KeyMap<Binding> emacs() {
         KeyMap<Binding> emacs = new KeyMap<>();
         bindKeys(emacs);
-        bind(emacs, SET_MARK_COMMAND,                       ctrl('@'));
-        bind(emacs, BEGINNING_OF_LINE,                      ctrl('A'));
-        bind(emacs, BACKWARD_CHAR,                          ctrl('B'));
-        bind(emacs, DELETE_CHAR_OR_LIST,                    ctrl('D'));
-        bind(emacs, END_OF_LINE,                            ctrl('E'));
-        bind(emacs, FORWARD_CHAR,                           ctrl('F'));
-        bind(emacs, SEND_BREAK,                             ctrl('G'));
-        bind(emacs, BACKWARD_DELETE_CHAR,                   ctrl('H'));
-        bind(emacs, EXPAND_OR_COMPLETE,                     ctrl('I'));
-        bind(emacs, ACCEPT_LINE,                            ctrl('J'));
-        bind(emacs, KILL_LINE,                              ctrl('K'));
-        bind(emacs, CLEAR_SCREEN,                           ctrl('L'));
-        bind(emacs, ACCEPT_LINE,                            ctrl('M'));
-        bind(emacs, DOWN_LINE_OR_HISTORY,                   ctrl('N'));
-        bind(emacs, ACCEPT_LINE_AND_DOWN_HISTORY,           ctrl('O'));
-        bind(emacs, UP_LINE_OR_HISTORY,                     ctrl('P'));
-        bind(emacs, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('R'));
-        bind(emacs, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('S'));
-        bind(emacs, TRANSPOSE_CHARS,                        ctrl('T'));
-        bind(emacs, KILL_WHOLE_LINE,                        ctrl('U'));
-        bind(emacs, QUOTED_INSERT,                          ctrl('V'));
-        bind(emacs, BACKWARD_KILL_WORD,                     ctrl('W'));
-        bind(emacs, YANK,                                   ctrl('Y'));
-        bind(emacs, CHARACTER_SEARCH,                       ctrl(']'));
-        bind(emacs, UNDO,                                   ctrl('_'));
-        bind(emacs, SELF_INSERT,                            range(" -~"));
-        bind(emacs, INSERT_CLOSE_PAREN,                     ")");
-        bind(emacs, INSERT_CLOSE_SQUARE,                    "]");
-        bind(emacs, INSERT_CLOSE_CURLY,                     "}");
-        bind(emacs, BACKWARD_DELETE_CHAR,                   del());
-        bind(emacs, VI_MATCH_BRACKET,                       translate("^X^B"));
-        bind(emacs, SEND_BREAK,                             translate("^X^G"));
-        bind(emacs, EDIT_AND_EXECUTE_COMMAND,               translate("^X^E"));
-        bind(emacs, VI_FIND_NEXT_CHAR,                      translate("^X^F"));
-        bind(emacs, VI_JOIN,                                translate("^X^J"));
-        bind(emacs, KILL_BUFFER,                            translate("^X^K"));
-        bind(emacs, INFER_NEXT_HISTORY,                     translate("^X^N"));
-        bind(emacs, OVERWRITE_MODE,                         translate("^X^O"));
-        bind(emacs, REDO,                                   translate("^X^R"));
-        bind(emacs, UNDO,                                   translate("^X^U"));
-        bind(emacs, VI_CMD_MODE,                            translate("^X^V"));
-        bind(emacs, EXCHANGE_POINT_AND_MARK,                translate("^X^X"));
-        bind(emacs, DO_LOWERCASE_VERSION,                   translate("^XA-^XZ"));
-        bind(emacs, WHAT_CURSOR_POSITION,                   translate("^X="));
-        bind(emacs, KILL_LINE,                              translate("^X^?"));
-        bind(emacs, SEND_BREAK,                             alt(ctrl('G')));
-        bind(emacs, BACKWARD_KILL_WORD,                     alt(ctrl('H')));
-        bind(emacs, SELF_INSERT_UNMETA,                     alt(ctrl('M')));
-        bind(emacs, COMPLETE_WORD,                          alt(esc()));
-        bind(emacs, CHARACTER_SEARCH_BACKWARD,              alt(ctrl(']')));
-        bind(emacs, COPY_PREV_WORD,                         alt(ctrl('_')));
-        bind(emacs, SET_MARK_COMMAND,                       alt(' '));
-        bind(emacs, NEG_ARGUMENT,                           alt('-'));
-        bind(emacs, DIGIT_ARGUMENT,                         range("\\E0-\\E9"));
-        bind(emacs, BEGINNING_OF_HISTORY,                   alt('<'));
-        bind(emacs, LIST_CHOICES,                           alt('='));
-        bind(emacs, END_OF_HISTORY,                         alt('>'));
-        bind(emacs, LIST_CHOICES,                           alt('?'));
-        bind(emacs, DO_LOWERCASE_VERSION,                   range("^[A-^[Z"));
-        bind(emacs, ACCEPT_AND_HOLD,                        alt('a'));
-        bind(emacs, BACKWARD_WORD,                          alt('b'));
-        bind(emacs, CAPITALIZE_WORD,                        alt('c'));
-        bind(emacs, KILL_WORD,                              alt('d'));
-        bind(emacs, KILL_WORD,                              translate("^[[3;5~")); // ctrl-delete
-        bind(emacs, FORWARD_WORD,                           alt('f'));
-        bind(emacs, DOWN_CASE_WORD,                         alt('l'));
-        bind(emacs, HISTORY_SEARCH_FORWARD,                 alt('n'));
-        bind(emacs, HISTORY_SEARCH_BACKWARD,                alt('p'));
-        bind(emacs, TRANSPOSE_WORDS,                        alt('t'));
-        bind(emacs, UP_CASE_WORD,                           alt('u'));
-        bind(emacs, YANK_POP,                               alt('y'));
-        bind(emacs, BACKWARD_KILL_WORD,                     alt(del()));
+        bind(emacs, SET_MARK_COMMAND, ctrl('@'));
+        bind(emacs, BEGINNING_OF_LINE, ctrl('A'));
+        bind(emacs, BACKWARD_CHAR, ctrl('B'));
+        bind(emacs, DELETE_CHAR_OR_LIST, ctrl('D'));
+        bind(emacs, END_OF_LINE, ctrl('E'));
+        bind(emacs, FORWARD_CHAR, ctrl('F'));
+        bind(emacs, SEND_BREAK, ctrl('G'));
+        bind(emacs, BACKWARD_DELETE_CHAR, ctrl('H'));
+        bind(emacs, EXPAND_OR_COMPLETE, ctrl('I'));
+        bind(emacs, ACCEPT_LINE, ctrl('J'));
+        bind(emacs, KILL_LINE, ctrl('K'));
+        bind(emacs, CLEAR_SCREEN, ctrl('L'));
+        bind(emacs, ACCEPT_LINE, ctrl('M'));
+        bind(emacs, DOWN_LINE_OR_HISTORY, ctrl('N'));
+        bind(emacs, ACCEPT_LINE_AND_DOWN_HISTORY, ctrl('O'));
+        bind(emacs, UP_LINE_OR_HISTORY, ctrl('P'));
+        bind(emacs, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('R'));
+        bind(emacs, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('S'));
+        bind(emacs, TRANSPOSE_CHARS, ctrl('T'));
+        bind(emacs, KILL_WHOLE_LINE, ctrl('U'));
+        bind(emacs, QUOTED_INSERT, ctrl('V'));
+        bind(emacs, BACKWARD_KILL_WORD, ctrl('W'));
+        bind(emacs, YANK, ctrl('Y'));
+        bind(emacs, CHARACTER_SEARCH, ctrl(']'));
+        bind(emacs, UNDO, ctrl('_'));
+        bind(emacs, SELF_INSERT, range(" -~"));
+        bind(emacs, INSERT_CLOSE_PAREN, ")");
+        bind(emacs, INSERT_CLOSE_SQUARE, "]");
+        bind(emacs, INSERT_CLOSE_CURLY, "}");
+        bind(emacs, BACKWARD_DELETE_CHAR, del());
+        bind(emacs, VI_MATCH_BRACKET, translate("^X^B"));
+        bind(emacs, SEND_BREAK, translate("^X^G"));
+        bind(emacs, EDIT_AND_EXECUTE_COMMAND, translate("^X^E"));
+        bind(emacs, VI_FIND_NEXT_CHAR, translate("^X^F"));
+        bind(emacs, VI_JOIN, translate("^X^J"));
+        bind(emacs, KILL_BUFFER, translate("^X^K"));
+        bind(emacs, INFER_NEXT_HISTORY, translate("^X^N"));
+        bind(emacs, OVERWRITE_MODE, translate("^X^O"));
+        bind(emacs, REDO, translate("^X^R"));
+        bind(emacs, UNDO, translate("^X^U"));
+        bind(emacs, VI_CMD_MODE, translate("^X^V"));
+        bind(emacs, EXCHANGE_POINT_AND_MARK, translate("^X^X"));
+        bind(emacs, DO_LOWERCASE_VERSION, translate("^XA-^XZ"));
+        bind(emacs, WHAT_CURSOR_POSITION, translate("^X="));
+        bind(emacs, KILL_LINE, translate("^X^?"));
+        bind(emacs, SEND_BREAK, alt(ctrl('G')));
+        bind(emacs, BACKWARD_KILL_WORD, alt(ctrl('H')));
+        bind(emacs, SELF_INSERT_UNMETA, alt(ctrl('M')));
+        bind(emacs, COMPLETE_WORD, alt(esc()));
+        bind(emacs, CHARACTER_SEARCH_BACKWARD, alt(ctrl(']')));
+        bind(emacs, COPY_PREV_WORD, alt(ctrl('_')));
+        bind(emacs, SET_MARK_COMMAND, alt(' '));
+        bind(emacs, NEG_ARGUMENT, alt('-'));
+        bind(emacs, DIGIT_ARGUMENT, range("\\E0-\\E9"));
+        bind(emacs, BEGINNING_OF_HISTORY, alt('<'));
+        bind(emacs, LIST_CHOICES, alt('='));
+        bind(emacs, END_OF_HISTORY, alt('>'));
+        bind(emacs, LIST_CHOICES, alt('?'));
+        bind(emacs, DO_LOWERCASE_VERSION, range("^[A-^[Z"));
+        bind(emacs, ACCEPT_AND_HOLD, alt('a'));
+        bind(emacs, BACKWARD_WORD, alt('b'));
+        bind(emacs, CAPITALIZE_WORD, alt('c'));
+        bind(emacs, KILL_WORD, alt('d'));
+        bind(emacs, KILL_WORD, translate("^[[3;5~")); // ctrl-delete
+        bind(emacs, FORWARD_WORD, alt('f'));
+        bind(emacs, DOWN_CASE_WORD, alt('l'));
+        bind(emacs, HISTORY_SEARCH_FORWARD, alt('n'));
+        bind(emacs, HISTORY_SEARCH_BACKWARD, alt('p'));
+        bind(emacs, TRANSPOSE_WORDS, alt('t'));
+        bind(emacs, UP_CASE_WORD, alt('u'));
+        bind(emacs, YANK_POP, alt('y'));
+        bind(emacs, BACKWARD_KILL_WORD, alt(del()));
         bindArrowKeys(emacs);
-        bind(emacs, FORWARD_WORD,                           translate("^[[1;5C")); // ctrl-left
-        bind(emacs, BACKWARD_WORD,                          translate("^[[1;5D")); // ctrl-right
-        bind(emacs, FORWARD_WORD,                           alt(key(Capability.key_right)));
-        bind(emacs, BACKWARD_WORD,                          alt(key(Capability.key_left)));
-        bind(emacs, FORWARD_WORD,                           alt(translate("^[[C")));
-        bind(emacs, BACKWARD_WORD,                          alt(translate("^[[D")));
+        bind(emacs, FORWARD_WORD, translate("^[[1;5C")); // ctrl-left
+        bind(emacs, BACKWARD_WORD, translate("^[[1;5D")); // ctrl-right
+        bind(emacs, FORWARD_WORD, alt(key(Capability.key_right)));
+        bind(emacs, BACKWARD_WORD, alt(key(Capability.key_left)));
+        bind(emacs, FORWARD_WORD, alt(translate("^[[C")));
+        bind(emacs, BACKWARD_WORD, alt(translate("^[[D")));
         return emacs;
     }
 
     public KeyMap<Binding> viInsertion() {
         KeyMap<Binding> viins = new KeyMap<>();
         bindKeys(viins);
-        bind(viins, SELF_INSERT,                            range("^@-^_"));
-        bind(viins, LIST_CHOICES,                           ctrl('D'));
-        bind(viins, SEND_BREAK,                             ctrl('G'));
-        bind(viins, BACKWARD_DELETE_CHAR,                   ctrl('H'));
-        bind(viins, EXPAND_OR_COMPLETE,                     ctrl('I'));
-        bind(viins, ACCEPT_LINE,                            ctrl('J'));
-        bind(viins, CLEAR_SCREEN,                           ctrl('L'));
-        bind(viins, ACCEPT_LINE,                            ctrl('M'));
-        bind(viins, MENU_COMPLETE,                          ctrl('N'));
-        bind(viins, REVERSE_MENU_COMPLETE,                  ctrl('P'));
-        bind(viins, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('R'));
-        bind(viins, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('S'));
-        bind(viins, TRANSPOSE_CHARS,                        ctrl('T'));
-        bind(viins, KILL_WHOLE_LINE,                        ctrl('U'));
-        bind(viins, QUOTED_INSERT,                          ctrl('V'));
-        bind(viins, BACKWARD_KILL_WORD,                     ctrl('W'));
-        bind(viins, YANK,                                   ctrl('Y'));
-        bind(viins, VI_CMD_MODE,                            ctrl('['));
-        bind(viins, UNDO,                                   ctrl('_'));
-        bind(viins, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('X') + "r");
-        bind(viins, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('X') + "s");
-        bind(viins, SELF_INSERT,                            range(" -~"));
-        bind(viins, INSERT_CLOSE_PAREN,                     ")");
-        bind(viins, INSERT_CLOSE_SQUARE,                    "]");
-        bind(viins, INSERT_CLOSE_CURLY,                     "}");
-        bind(viins, BACKWARD_DELETE_CHAR,                   del());
+        bind(viins, SELF_INSERT, range("^@-^_"));
+        bind(viins, LIST_CHOICES, ctrl('D'));
+        bind(viins, SEND_BREAK, ctrl('G'));
+        bind(viins, BACKWARD_DELETE_CHAR, ctrl('H'));
+        bind(viins, EXPAND_OR_COMPLETE, ctrl('I'));
+        bind(viins, ACCEPT_LINE, ctrl('J'));
+        bind(viins, CLEAR_SCREEN, ctrl('L'));
+        bind(viins, ACCEPT_LINE, ctrl('M'));
+        bind(viins, MENU_COMPLETE, ctrl('N'));
+        bind(viins, REVERSE_MENU_COMPLETE, ctrl('P'));
+        bind(viins, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('R'));
+        bind(viins, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('S'));
+        bind(viins, TRANSPOSE_CHARS, ctrl('T'));
+        bind(viins, KILL_WHOLE_LINE, ctrl('U'));
+        bind(viins, QUOTED_INSERT, ctrl('V'));
+        bind(viins, BACKWARD_KILL_WORD, ctrl('W'));
+        bind(viins, YANK, ctrl('Y'));
+        bind(viins, VI_CMD_MODE, ctrl('['));
+        bind(viins, UNDO, ctrl('_'));
+        bind(viins, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('X') + "r");
+        bind(viins, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('X') + "s");
+        bind(viins, SELF_INSERT, range(" -~"));
+        bind(viins, INSERT_CLOSE_PAREN, ")");
+        bind(viins, INSERT_CLOSE_SQUARE, "]");
+        bind(viins, INSERT_CLOSE_CURLY, "}");
+        bind(viins, BACKWARD_DELETE_CHAR, del());
         bindArrowKeys(viins);
         return viins;
     }
 
     public KeyMap<Binding> viCmd() {
         KeyMap<Binding> vicmd = new KeyMap<>();
-        bind(vicmd, LIST_CHOICES,                           ctrl('D'));
-        bind(vicmd, EMACS_EDITING_MODE,                     ctrl('E'));
-        bind(vicmd, SEND_BREAK,                             ctrl('G'));
-        bind(vicmd, VI_BACKWARD_CHAR,                       ctrl('H'));
-        bind(vicmd, ACCEPT_LINE,                            ctrl('J'));
-        bind(vicmd, KILL_LINE,                              ctrl('K'));
-        bind(vicmd, CLEAR_SCREEN,                           ctrl('L'));
-        bind(vicmd, ACCEPT_LINE,                            ctrl('M'));
-        bind(vicmd, VI_DOWN_LINE_OR_HISTORY,                ctrl('N'));
-        bind(vicmd, VI_UP_LINE_OR_HISTORY,                  ctrl('P'));
-        bind(vicmd, QUOTED_INSERT,                          ctrl('Q'));
-        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('R'));
-        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('S'));
-        bind(vicmd, TRANSPOSE_CHARS,                        ctrl('T'));
-        bind(vicmd, KILL_WHOLE_LINE,                        ctrl('U'));
-        bind(vicmd, QUOTED_INSERT,                          ctrl('V'));
-        bind(vicmd, BACKWARD_KILL_WORD,                     ctrl('W'));
-        bind(vicmd, YANK,                                   ctrl('Y'));
-        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_BACKWARD,    ctrl('X') + "r");
-        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_FORWARD,     ctrl('X') + "s");
-        bind(vicmd, SEND_BREAK,                             alt(ctrl('G')));
-        bind(vicmd, BACKWARD_KILL_WORD,                     alt(ctrl('H')));
-        bind(vicmd, SELF_INSERT_UNMETA,                     alt(ctrl('M')));
-        bind(vicmd, COMPLETE_WORD,                          alt(esc()));
-        bind(vicmd, CHARACTER_SEARCH_BACKWARD,              alt(ctrl(']')));
-        bind(vicmd, SET_MARK_COMMAND,                       alt(' '));
-//        bind(vicmd, INSERT_COMMENT,                         alt('#'));
-//        bind(vicmd, INSERT_COMPLETIONS,                     alt('*'));
-        bind(vicmd, DIGIT_ARGUMENT,                         alt('-'));
-        bind(vicmd, BEGINNING_OF_HISTORY,                   alt('<'));
-        bind(vicmd, LIST_CHOICES,                           alt('='));
-        bind(vicmd, END_OF_HISTORY,                         alt('>'));
-        bind(vicmd, LIST_CHOICES,                           alt('?'));
-        bind(vicmd, DO_LOWERCASE_VERSION,                   range("^[A-^[Z"));
-        bind(vicmd, BACKWARD_WORD,                          alt('b'));
-        bind(vicmd, CAPITALIZE_WORD,                        alt('c'));
-        bind(vicmd, KILL_WORD,                              alt('d'));
-        bind(vicmd, FORWARD_WORD,                           alt('f'));
-        bind(vicmd, DOWN_CASE_WORD,                         alt('l'));
-        bind(vicmd, HISTORY_SEARCH_FORWARD,                 alt('n'));
-        bind(vicmd, HISTORY_SEARCH_BACKWARD,                alt('p'));
-        bind(vicmd, TRANSPOSE_WORDS,                        alt('t'));
-        bind(vicmd, UP_CASE_WORD,                           alt('u'));
-        bind(vicmd, YANK_POP,                               alt('y'));
-        bind(vicmd, BACKWARD_KILL_WORD,                     alt(del()));
+        bind(vicmd, LIST_CHOICES, ctrl('D'));
+        bind(vicmd, EMACS_EDITING_MODE, ctrl('E'));
+        bind(vicmd, SEND_BREAK, ctrl('G'));
+        bind(vicmd, VI_BACKWARD_CHAR, ctrl('H'));
+        bind(vicmd, ACCEPT_LINE, ctrl('J'));
+        bind(vicmd, KILL_LINE, ctrl('K'));
+        bind(vicmd, CLEAR_SCREEN, ctrl('L'));
+        bind(vicmd, ACCEPT_LINE, ctrl('M'));
+        bind(vicmd, VI_DOWN_LINE_OR_HISTORY, ctrl('N'));
+        bind(vicmd, VI_UP_LINE_OR_HISTORY, ctrl('P'));
+        bind(vicmd, QUOTED_INSERT, ctrl('Q'));
+        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('R'));
+        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('S'));
+        bind(vicmd, TRANSPOSE_CHARS, ctrl('T'));
+        bind(vicmd, KILL_WHOLE_LINE, ctrl('U'));
+        bind(vicmd, QUOTED_INSERT, ctrl('V'));
+        bind(vicmd, BACKWARD_KILL_WORD, ctrl('W'));
+        bind(vicmd, YANK, ctrl('Y'));
+        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_BACKWARD, ctrl('X') + "r");
+        bind(vicmd, HISTORY_INCREMENTAL_SEARCH_FORWARD, ctrl('X') + "s");
+        bind(vicmd, SEND_BREAK, alt(ctrl('G')));
+        bind(vicmd, BACKWARD_KILL_WORD, alt(ctrl('H')));
+        bind(vicmd, SELF_INSERT_UNMETA, alt(ctrl('M')));
+        bind(vicmd, COMPLETE_WORD, alt(esc()));
+        bind(vicmd, CHARACTER_SEARCH_BACKWARD, alt(ctrl(']')));
+        bind(vicmd, SET_MARK_COMMAND, alt(' '));
+        //        bind(vicmd, INSERT_COMMENT,                         alt('#'));
+        //        bind(vicmd, INSERT_COMPLETIONS,                     alt('*'));
+        bind(vicmd, DIGIT_ARGUMENT, alt('-'));
+        bind(vicmd, BEGINNING_OF_HISTORY, alt('<'));
+        bind(vicmd, LIST_CHOICES, alt('='));
+        bind(vicmd, END_OF_HISTORY, alt('>'));
+        bind(vicmd, LIST_CHOICES, alt('?'));
+        bind(vicmd, DO_LOWERCASE_VERSION, range("^[A-^[Z"));
+        bind(vicmd, BACKWARD_WORD, alt('b'));
+        bind(vicmd, CAPITALIZE_WORD, alt('c'));
+        bind(vicmd, KILL_WORD, alt('d'));
+        bind(vicmd, FORWARD_WORD, alt('f'));
+        bind(vicmd, DOWN_CASE_WORD, alt('l'));
+        bind(vicmd, HISTORY_SEARCH_FORWARD, alt('n'));
+        bind(vicmd, HISTORY_SEARCH_BACKWARD, alt('p'));
+        bind(vicmd, TRANSPOSE_WORDS, alt('t'));
+        bind(vicmd, UP_CASE_WORD, alt('u'));
+        bind(vicmd, YANK_POP, alt('y'));
+        bind(vicmd, BACKWARD_KILL_WORD, alt(del()));
 
-        bind(vicmd, FORWARD_CHAR,                           " ");
-        bind(vicmd, VI_INSERT_COMMENT,                      "#");
-        bind(vicmd, END_OF_LINE,                            "$");
-        bind(vicmd, VI_MATCH_BRACKET,                       "%");
-        bind(vicmd, VI_DOWN_LINE_OR_HISTORY,                "+");
-        bind(vicmd, VI_REV_REPEAT_FIND,                     ",");
-        bind(vicmd, VI_UP_LINE_OR_HISTORY,                  "-");
-        bind(vicmd, VI_REPEAT_CHANGE,                       ".");
-        bind(vicmd, VI_HISTORY_SEARCH_BACKWARD,             "/");
-        bind(vicmd, VI_DIGIT_OR_BEGINNING_OF_LINE,          "0");
-        bind(vicmd, DIGIT_ARGUMENT,                         range("1-9"));
-        bind(vicmd, VI_REPEAT_FIND,                         ";");
-        bind(vicmd, LIST_CHOICES,                           "=");
-        bind(vicmd, VI_HISTORY_SEARCH_FORWARD,              "?");
-        bind(vicmd, VI_ADD_EOL,                             "A");
-        bind(vicmd, VI_BACKWARD_BLANK_WORD,                 "B");
-        bind(vicmd, VI_CHANGE_EOL,                          "C");
-        bind(vicmd, VI_KILL_EOL,                            "D");
-        bind(vicmd, VI_FORWARD_BLANK_WORD_END,              "E");
-        bind(vicmd, VI_FIND_PREV_CHAR,                      "F");
-        bind(vicmd, VI_FETCH_HISTORY,                       "G");
-        bind(vicmd, VI_INSERT_BOL,                          "I");
-        bind(vicmd, VI_JOIN,                                "J");
-        bind(vicmd, VI_REV_REPEAT_SEARCH,                   "N");
-        bind(vicmd, VI_OPEN_LINE_ABOVE,                     "O");
-        bind(vicmd, VI_PUT_BEFORE,                          "P");
-        bind(vicmd, VI_REPLACE,                             "R");
-        bind(vicmd, VI_KILL_LINE,                           "S");
-        bind(vicmd, VI_FIND_PREV_CHAR_SKIP,                 "T");
-        bind(vicmd, REDO,                                   "U");
-        bind(vicmd, VISUAL_LINE_MODE,                       "V");
-        bind(vicmd, VI_FORWARD_BLANK_WORD,                  "W");
-        bind(vicmd, VI_BACKWARD_DELETE_CHAR,                "X");
-        bind(vicmd, VI_YANK_WHOLE_LINE,                     "Y");
-        bind(vicmd, VI_FIRST_NON_BLANK,                     "^");
-        bind(vicmd, VI_ADD_NEXT,                            "a");
-        bind(vicmd, VI_BACKWARD_WORD,                       "b");
-        bind(vicmd, VI_CHANGE,                              "c");
-        bind(vicmd, VI_DELETE,                              "d");
-        bind(vicmd, VI_FORWARD_WORD_END,                    "e");
-        bind(vicmd, VI_FIND_NEXT_CHAR,                      "f");
-        bind(vicmd, WHAT_CURSOR_POSITION,                   "ga");
-        bind(vicmd, VI_BACKWARD_BLANK_WORD_END,             "gE");
-        bind(vicmd, VI_BACKWARD_WORD_END,                   "ge");
-        bind(vicmd, VI_BACKWARD_CHAR,                       "h");
-        bind(vicmd, VI_INSERT,                              "i");
-        bind(vicmd, DOWN_LINE_OR_HISTORY,                   "j");
-        bind(vicmd, UP_LINE_OR_HISTORY,                     "k");
-        bind(vicmd, VI_FORWARD_CHAR,                        "l");
-        bind(vicmd, VI_REPEAT_SEARCH,                       "n");
-        bind(vicmd, VI_OPEN_LINE_BELOW,                     "o");
-        bind(vicmd, VI_PUT_AFTER,                           "p");
-        bind(vicmd, VI_REPLACE_CHARS,                       "r");
-        bind(vicmd, VI_SUBSTITUTE,                          "s");
-        bind(vicmd, VI_FIND_NEXT_CHAR_SKIP,                 "t");
-        bind(vicmd, UNDO,                                   "u");
-        bind(vicmd, VISUAL_MODE,                            "v");
-        bind(vicmd, VI_FORWARD_WORD,                        "w");
-        bind(vicmd, VI_DELETE_CHAR,                         "x");
-        bind(vicmd, VI_YANK,                                "y");
-        bind(vicmd, VI_GOTO_COLUMN,                         "|");
-        bind(vicmd, VI_SWAP_CASE,                           "~");
-        bind(vicmd, VI_BACKWARD_CHAR,                       del());
+        bind(vicmd, FORWARD_CHAR, " ");
+        bind(vicmd, VI_INSERT_COMMENT, "#");
+        bind(vicmd, END_OF_LINE, "$");
+        bind(vicmd, VI_MATCH_BRACKET, "%");
+        bind(vicmd, VI_DOWN_LINE_OR_HISTORY, "+");
+        bind(vicmd, VI_REV_REPEAT_FIND, ",");
+        bind(vicmd, VI_UP_LINE_OR_HISTORY, "-");
+        bind(vicmd, VI_REPEAT_CHANGE, ".");
+        bind(vicmd, VI_HISTORY_SEARCH_BACKWARD, "/");
+        bind(vicmd, VI_DIGIT_OR_BEGINNING_OF_LINE, "0");
+        bind(vicmd, DIGIT_ARGUMENT, range("1-9"));
+        bind(vicmd, VI_REPEAT_FIND, ";");
+        bind(vicmd, LIST_CHOICES, "=");
+        bind(vicmd, VI_HISTORY_SEARCH_FORWARD, "?");
+        bind(vicmd, VI_ADD_EOL, "A");
+        bind(vicmd, VI_BACKWARD_BLANK_WORD, "B");
+        bind(vicmd, VI_CHANGE_EOL, "C");
+        bind(vicmd, VI_KILL_EOL, "D");
+        bind(vicmd, VI_FORWARD_BLANK_WORD_END, "E");
+        bind(vicmd, VI_FIND_PREV_CHAR, "F");
+        bind(vicmd, VI_FETCH_HISTORY, "G");
+        bind(vicmd, VI_INSERT_BOL, "I");
+        bind(vicmd, VI_JOIN, "J");
+        bind(vicmd, VI_REV_REPEAT_SEARCH, "N");
+        bind(vicmd, VI_OPEN_LINE_ABOVE, "O");
+        bind(vicmd, VI_PUT_BEFORE, "P");
+        bind(vicmd, VI_REPLACE, "R");
+        bind(vicmd, VI_KILL_LINE, "S");
+        bind(vicmd, VI_FIND_PREV_CHAR_SKIP, "T");
+        bind(vicmd, REDO, "U");
+        bind(vicmd, VISUAL_LINE_MODE, "V");
+        bind(vicmd, VI_FORWARD_BLANK_WORD, "W");
+        bind(vicmd, VI_BACKWARD_DELETE_CHAR, "X");
+        bind(vicmd, VI_YANK_WHOLE_LINE, "Y");
+        bind(vicmd, VI_FIRST_NON_BLANK, "^");
+        bind(vicmd, VI_ADD_NEXT, "a");
+        bind(vicmd, VI_BACKWARD_WORD, "b");
+        bind(vicmd, VI_CHANGE, "c");
+        bind(vicmd, VI_DELETE, "d");
+        bind(vicmd, VI_FORWARD_WORD_END, "e");
+        bind(vicmd, VI_FIND_NEXT_CHAR, "f");
+        bind(vicmd, WHAT_CURSOR_POSITION, "ga");
+        bind(vicmd, VI_BACKWARD_BLANK_WORD_END, "gE");
+        bind(vicmd, VI_BACKWARD_WORD_END, "ge");
+        bind(vicmd, VI_BACKWARD_CHAR, "h");
+        bind(vicmd, VI_INSERT, "i");
+        bind(vicmd, DOWN_LINE_OR_HISTORY, "j");
+        bind(vicmd, UP_LINE_OR_HISTORY, "k");
+        bind(vicmd, VI_FORWARD_CHAR, "l");
+        bind(vicmd, VI_REPEAT_SEARCH, "n");
+        bind(vicmd, VI_OPEN_LINE_BELOW, "o");
+        bind(vicmd, VI_PUT_AFTER, "p");
+        bind(vicmd, VI_REPLACE_CHARS, "r");
+        bind(vicmd, VI_SUBSTITUTE, "s");
+        bind(vicmd, VI_FIND_NEXT_CHAR_SKIP, "t");
+        bind(vicmd, UNDO, "u");
+        bind(vicmd, VISUAL_MODE, "v");
+        bind(vicmd, VI_FORWARD_WORD, "w");
+        bind(vicmd, VI_DELETE_CHAR, "x");
+        bind(vicmd, VI_YANK, "y");
+        bind(vicmd, VI_GOTO_COLUMN, "|");
+        bind(vicmd, VI_SWAP_CASE, "~");
+        bind(vicmd, VI_BACKWARD_CHAR, del());
 
         bindArrowKeys(vicmd);
         return vicmd;
@@ -6150,38 +6303,46 @@ public class LineReaderImpl implements LineReader, Flushable
 
     public KeyMap<Binding> menu() {
         KeyMap<Binding> menu = new KeyMap<>();
-        bind(menu, MENU_COMPLETE,                     "\t");
-        bind(menu, REVERSE_MENU_COMPLETE,             key(Capability.back_tab));
-        bind(menu, ACCEPT_LINE,                       "\r", "\n");
+        bind(menu, MENU_COMPLETE, "\t");
+        bind(menu, REVERSE_MENU_COMPLETE, key(Capability.back_tab));
+        bind(menu, ACCEPT_LINE, "\r", "\n");
         bindArrowKeys(menu);
         return menu;
     }
 
     public KeyMap<Binding> safe() {
         KeyMap<Binding> safe = new KeyMap<>();
-        bind(safe, SELF_INSERT,                 range("^@-^?"));
-        bind(safe, ACCEPT_LINE,                 "\r", "\n");
-        bind(safe, SEND_BREAK,                  ctrl('G'));
+        bind(safe, SELF_INSERT, range("^@-^?"));
+        bind(safe, ACCEPT_LINE, "\r", "\n");
+        bind(safe, SEND_BREAK, ctrl('G'));
         return safe;
     }
 
+    public KeyMap<Binding> dumb() {
+        KeyMap<Binding> dumb = new KeyMap<>();
+        bind(dumb, SELF_INSERT, range("^@-^?"));
+        bind(dumb, ACCEPT_LINE, "\r", "\n");
+        bind(dumb, BEEP, ctrl('G'));
+        return dumb;
+    }
+
     public KeyMap<Binding> visual() {
         KeyMap<Binding> visual = new KeyMap<>();
-        bind(visual, UP_LINE,                   key(Capability.key_up),     "k");
-        bind(visual, DOWN_LINE,                 key(Capability.key_down),   "j");
-        bind(visual, this::deactivateRegion,    esc());
-        bind(visual, EXCHANGE_POINT_AND_MARK,   "o");
-        bind(visual, PUT_REPLACE_SELECTION,     "p");
-        bind(visual, VI_DELETE,                 "x");
-        bind(visual, VI_OPER_SWAP_CASE,         "~");
+        bind(visual, UP_LINE, key(Capability.key_up), "k");
+        bind(visual, DOWN_LINE, key(Capability.key_down), "j");
+        bind(visual, this::deactivateRegion, esc());
+        bind(visual, EXCHANGE_POINT_AND_MARK, "o");
+        bind(visual, PUT_REPLACE_SELECTION, "p");
+        bind(visual, VI_DELETE, "x");
+        bind(visual, VI_OPER_SWAP_CASE, "~");
         return visual;
     }
 
     public KeyMap<Binding> viOpp() {
         KeyMap<Binding> viOpp = new KeyMap<>();
-        bind(viOpp, UP_LINE,                    key(Capability.key_up),     "k");
-        bind(viOpp, DOWN_LINE,                  key(Capability.key_down),   "j");
-        bind(viOpp, VI_CMD_MODE,                esc());
+        bind(viOpp, UP_LINE, key(Capability.key_up), "k");
+        bind(viOpp, DOWN_LINE, key(Capability.key_down), "j");
+        bind(viOpp, VI_CMD_MODE, esc());
         return viOpp;
     }
 
@@ -6210,19 +6371,19 @@ public class LineReaderImpl implements LineReader, Flushable
     }
 
     private void bindArrowKeys(KeyMap<Binding> map) {
-        bind(map, UP_LINE_OR_SEARCH,    key(Capability.key_up));
-        bind(map, DOWN_LINE_OR_SEARCH,  key(Capability.key_down));
-        bind(map, BACKWARD_CHAR,        key(Capability.key_left));
-        bind(map, FORWARD_CHAR,         key(Capability.key_right));
-        bind(map, BEGINNING_OF_LINE,    key(Capability.key_home));
-        bind(map, END_OF_LINE,          key(Capability.key_end));
-        bind(map, DELETE_CHAR,          key(Capability.key_dc));
-        bind(map, KILL_WHOLE_LINE,      key(Capability.key_dl));
-        bind(map, OVERWRITE_MODE,       key(Capability.key_ic));
-        bind(map, MOUSE,                key(Capability.key_mouse));
-        bind(map, BEGIN_PASTE,          BRACKETED_PASTE_BEGIN);
-        bind(map, FOCUS_IN,             FOCUS_IN_SEQ);
-        bind(map, FOCUS_OUT,            FOCUS_OUT_SEQ);
+        bind(map, UP_LINE_OR_SEARCH, key(Capability.key_up));
+        bind(map, DOWN_LINE_OR_SEARCH, key(Capability.key_down));
+        bind(map, BACKWARD_CHAR, key(Capability.key_left));
+        bind(map, FORWARD_CHAR, key(Capability.key_right));
+        bind(map, BEGINNING_OF_LINE, key(Capability.key_home));
+        bind(map, END_OF_LINE, key(Capability.key_end));
+        bind(map, DELETE_CHAR, key(Capability.key_dc));
+        bind(map, KILL_WHOLE_LINE, key(Capability.key_dl));
+        bind(map, OVERWRITE_MODE, key(Capability.key_ic));
+        bind(map, MOUSE, key(Capability.key_mouse));
+        bind(map, BEGIN_PASTE, BRACKETED_PASTE_BEGIN);
+        bind(map, FOCUS_IN, FOCUS_IN_SEQ);
+        bind(map, FOCUS_OUT, FOCUS_OUT_SEQ);
     }
 
     /**
@@ -6231,14 +6392,10 @@ public class LineReaderImpl implements LineReader, Flushable
      */
     private void bindConsoleChars(KeyMap<Binding> keyMap, Attributes attr) {
         if (attr != null) {
-            rebind(keyMap, BACKWARD_DELETE_CHAR,
-                    del(), (char) attr.getControlChar(ControlChar.VERASE));
-            rebind(keyMap, BACKWARD_KILL_WORD,
-                    ctrl('W'),  (char) attr.getControlChar(ControlChar.VWERASE));
-            rebind(keyMap, KILL_WHOLE_LINE,
-                    ctrl('U'), (char) attr.getControlChar(ControlChar.VKILL));
-            rebind(keyMap, QUOTED_INSERT,
-                    ctrl('V'), (char) attr.getControlChar(ControlChar.VLNEXT));
+            rebind(keyMap, BACKWARD_DELETE_CHAR, del(), (char) attr.getControlChar(ControlChar.VERASE));
+            rebind(keyMap, BACKWARD_KILL_WORD, ctrl('W'), (char) attr.getControlChar(ControlChar.VWERASE));
+            rebind(keyMap, KILL_WHOLE_LINE, ctrl('U'), (char) attr.getControlChar(ControlChar.VKILL));
+            rebind(keyMap, QUOTED_INSERT, ctrl('V'), (char) attr.getControlChar(ControlChar.VLNEXT));
         }
     }
 
@@ -6250,7 +6407,6 @@ public class LineReaderImpl implements LineReader, Flushable
         }
     }
 
-    // JDK specific modification
     @Override
     public void zeroOut() {
         buf.zeroOut();
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/ReaderUtils.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/ReaderUtils.java
index 0ae9475bd57..cdc60dccccf 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/ReaderUtils.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/ReaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -13,7 +13,7 @@ import jdk.internal.org.jline.utils.Levenshtein;
 
 public class ReaderUtils {
 
-    private ReaderUtils() { }
+    private ReaderUtils() {}
 
     public static boolean isSet(LineReader reader, LineReader.Option option) {
         return reader != null && reader.isSet(option);
@@ -30,8 +30,7 @@ public class ReaderUtils {
             return (Boolean) v;
         } else if (v != null) {
             String s = v.toString();
-            return s.isEmpty() || s.equalsIgnoreCase("on")
-                    || s.equalsIgnoreCase("1") || s.equalsIgnoreCase("true");
+            return s.isEmpty() || s.equalsIgnoreCase("on") || s.equalsIgnoreCase("1") || s.equalsIgnoreCase("true");
         }
         return def;
     }
@@ -77,5 +76,4 @@ public class ReaderUtils {
             return Levenshtein.distance(word, cand);
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/SimpleMaskingCallback.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/SimpleMaskingCallback.java
index fd6c2663c05..423497f3dc4 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/SimpleMaskingCallback.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/SimpleMaskingCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,10 +8,10 @@
  */
 package jdk.internal.org.jline.reader.impl;
 
-import jdk.internal.org.jline.reader.MaskingCallback;
-
 import java.util.Objects;
 
+import jdk.internal.org.jline.reader.MaskingCallback;
+
 /**
  * Simple {@link MaskingCallback} that will replace all the characters in the line with the given mask.
  * If the given mask is equal to {@link LineReaderImpl#NULL_MASK} then the line will be replaced with an empty String.
@@ -29,7 +29,7 @@ public final class SimpleMaskingCallback implements MaskingCallback {
             return "";
         } else {
             StringBuilder sb = new StringBuilder(line.length());
-            for (int i = line.length(); i-- > 0;) {
+            for (int i = line.length(); i-- > 0; ) {
                 sb.append((char) mask);
             }
             return sb.toString();
@@ -40,5 +40,4 @@ public final class SimpleMaskingCallback implements MaskingCallback {
     public String history(String line) {
         return null;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/UndoTree.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/UndoTree.java
index 0a467f9d7ba..3b193f9eb65 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/UndoTree.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/UndoTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -20,6 +20,7 @@ public class UndoTree<T> {
     private final Node parent;
     private Node current;
 
+    @SuppressWarnings("this-escape")
     public UndoTree(Consumer<T> s) {
         state = s;
         parent = new Node(null);
@@ -71,5 +72,4 @@ public class UndoTree<T> {
             state = s;
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/AggregateCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/AggregateCompleter.java
index e8e41088c59..145823c53ce 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/AggregateCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/AggregateCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -24,9 +24,7 @@ import jdk.internal.org.jline.reader.ParsedLine;
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public class AggregateCompleter
-    implements Completer
-{
+public class AggregateCompleter implements Completer {
     private final Collection<Completer> completers;
 
     /**
@@ -78,9 +76,6 @@ public class AggregateCompleter
      */
     @Override
     public String toString() {
-        return getClass().getSimpleName() + "{" +
-            "completers=" + completers +
-            '}';
+        return getClass().getSimpleName() + "{" + "completers=" + completers + '}';
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/ArgumentCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/ArgumentCompleter.java
index f84c8a9002a..f0efa292252 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/ArgumentCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/ArgumentCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -29,8 +29,7 @@ import jdk.internal.org.jline.reader.ParsedLine;
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public class ArgumentCompleter implements Completer
-{
+public class ArgumentCompleter implements Completer {
     private final List<Completer> completers = new ArrayList<>();
 
     private boolean strict = true;
@@ -108,12 +107,12 @@ public class ArgumentCompleter implements Completer
         // if we are beyond the end of the completers, just use the last one
         if (line.wordIndex() >= completers.size()) {
             completer = completers.get(completers.size() - 1);
-        }
-        else {
+        } else {
             completer = completers.get(line.wordIndex());
         }
 
-        // ensure that all the previous completers are successful before allowing this completer to pass (only if strict).
+        // ensure that all the previous completers are successful before allowing this completer to pass (only if
+        // strict).
         for (int i = strictCommand ? 0 : 1; isStrict() && (i < line.wordIndex()); i++) {
             int idx = i >= completers.size() ? (completers.size() - 1) : i;
             if (idx == 0 && !strictCommand) {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/EnumCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/EnumCompleter.java
index 6a18d3cfd93..a701f2e3560 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/EnumCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/EnumCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -19,8 +19,7 @@ import jdk.internal.org.jline.reader.Completer;
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public class EnumCompleter extends StringsCompleter
-{
+public class EnumCompleter extends StringsCompleter {
     public EnumCompleter(Class<? extends Enum<?>> source) {
         Objects.requireNonNull(source);
         for (Enum<?> n : source.getEnumConstants()) {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/FileNameCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/FileNameCompleter.java
index 3d173f72ec7..32bf6e3493e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/FileNameCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/FileNameCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -9,6 +9,7 @@
 package jdk.internal.org.jline.reader.impl.completer;
 
 import java.io.IOException;
+import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -41,11 +42,10 @@ import jdk.internal.org.jline.utils.AttributedStyle;
  * @author <a href="mailto:mwp1@cornell.edu">Marc Prud'hommeaux</a>
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
- * @deprecated use <code>jdk.internal.org.jline.builtins.Completers$FileNameCompleter</code> instead
+ * @deprecated use <code>org.jline.builtins.Completers$FileNameCompleter</code> instead
  */
 @Deprecated
-public class FileNameCompleter implements Completer
-{
+public class FileNameCompleter implements Completer {
 
     public void complete(LineReader reader, ParsedLine commandLine, final List<Candidate> candidates) {
         assert commandLine != null;
@@ -72,20 +72,21 @@ public class FileNameCompleter implements Completer
             curBuf = "";
             current = getUserDir();
         }
-        try {
-            Files.newDirectoryStream(current, this::accept).forEach(p -> {
+        try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(current, this::accept)) {
+            directoryStream.forEach(p -> {
                 String value = curBuf + p.getFileName().toString();
                 if (Files.isDirectory(p)) {
                     candidates.add(new Candidate(
                             value + (reader.isSet(Option.AUTO_PARAM_SLASH) ? sep : ""),
                             getDisplay(reader.getTerminal(), p),
-                            null, null,
+                            null,
+                            null,
                             reader.isSet(Option.AUTO_REMOVE_SLASH) ? sep : null,
                             null,
                             false));
                 } else {
-                    candidates.add(new Candidate(value, getDisplay(reader.getTerminal(), p),
-                            null, null, null, null, true));
+                    candidates.add(
+                            new Candidate(value, getDisplay(reader.getTerminal(), p), null, null, null, null, true));
                 }
             });
         } catch (IOException e) {
@@ -125,5 +126,4 @@ public class FileNameCompleter implements Completer
         }
         return name;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/NullCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/NullCompleter.java
index f3efefdc929..21ce836a32f 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/NullCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/NullCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -22,11 +22,8 @@ import jdk.internal.org.jline.reader.ParsedLine;
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public final class NullCompleter
-    implements Completer
-{
+public final class NullCompleter implements Completer {
     public static final NullCompleter INSTANCE = new NullCompleter();
 
-    public void complete(LineReader reader, final ParsedLine line, final List<Candidate> candidates) {
-    }
+    public void complete(LineReader reader, final ParsedLine line, final List<Candidate> candidates) {}
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/StringsCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/StringsCompleter.java
index 8baac657b93..c791ef68e72 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/StringsCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/StringsCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -27,8 +27,7 @@ import jdk.internal.org.jline.utils.AttributedString;
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.3
  */
-public class StringsCompleter implements Completer
-{
+public class StringsCompleter implements Completer {
     protected Collection<Candidate> candidates;
     protected Supplier<Collection<String>> stringsSupplier;
 
@@ -54,7 +53,7 @@ public class StringsCompleter implements Completer
         }
     }
 
-    public StringsCompleter(Candidate ... candidates) {
+    public StringsCompleter(Candidate... candidates) {
         this(Arrays.asList(candidates));
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java
index a17a356bf0e..2fe6f8df492 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -22,8 +22,8 @@ import jdk.internal.org.jline.utils.AttributedString;
  * @author <a href="mailto:matti.rintanikkola@gmail.com">Matti Rinta-Nikkola</a>
  */
 public class SystemCompleter implements Completer {
-    private Map<String,List<Completer>> completers = new HashMap<>();
-    private Map<String,String> aliasCommand = new HashMap<>();
+    private Map<String, List<Completer>> completers = new HashMap<>();
+    private Map<String, String> aliasCommand = new HashMap<>();
     private StringsCompleter commands;
     private boolean compiled = false;
 
@@ -44,9 +44,9 @@ public class SystemCompleter implements Completer {
                     commands.complete(reader, commandLine, candidates);
                 } else if (reader.getParser().validVariableName(buffer.substring(0, eq))) {
                     String curBuf = buffer.substring(0, eq + 1);
-                    for (String c: completers.keySet()) {
-                        candidates.add(new Candidate(AttributedString.stripAnsi(curBuf+c)
-                                    , c, null, null, null, null, true));
+                    for (String c : completers.keySet()) {
+                        candidates.add(
+                                new Candidate(AttributedString.stripAnsi(curBuf + c), c, null, null, null, null, true));
                     }
                 }
             } else {
@@ -81,7 +81,7 @@ public class SystemCompleter implements Completer {
     }
 
     public void add(List<String> commands, Completer completer) {
-        for (String c: commands) {
+        for (String c : commands) {
             add(c, completer);
         }
     }
@@ -104,22 +104,22 @@ public class SystemCompleter implements Completer {
         if (other.isCompiled()) {
             throw new IllegalStateException();
         }
-        for (Map.Entry<String, List<Completer>> entry: other.getCompleters().entrySet()) {
-            for (Completer c: entry.getValue()) {
+        for (Map.Entry<String, List<Completer>> entry : other.getCompleters().entrySet()) {
+            for (Completer c : entry.getValue()) {
                 add(entry.getKey(), c);
             }
         }
         addAliases(other.getAliases());
     }
 
-    public void addAliases(Map<String,String> aliasCommand) {
+    public void addAliases(Map<String, String> aliasCommand) {
         if (compiled) {
             throw new IllegalStateException();
         }
         this.aliasCommand.putAll(aliasCommand);
     }
 
-    private Map<String,String> getAliases() {
+    private Map<String, String> getAliases() {
         return aliasCommand;
     }
 
@@ -128,7 +128,7 @@ public class SystemCompleter implements Completer {
             return;
         }
         Map<String, List<Completer>> compiledCompleters = new HashMap<>();
-        for (Map.Entry<String, List<Completer>> entry: completers.entrySet()) {
+        for (Map.Entry<String, List<Completer>> entry : completers.entrySet()) {
             if (entry.getValue().size() == 1) {
                 compiledCompleters.put(entry.getKey(), entry.getValue());
             } else {
@@ -143,8 +143,7 @@ public class SystemCompleter implements Completer {
         compiled = true;
     }
 
-    public Map<String,List<Completer>> getCompleters() {
+    public Map<String, List<Completer>> getCompleters() {
         return completers;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java
index cdd1bc520dd..c696b33ba9e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -41,9 +41,9 @@ public class DefaultHistory implements History {
     private int offset = 0;
     private int index = 0;
 
-    public DefaultHistory() {
-    }
+    public DefaultHistory() {}
 
+    @SuppressWarnings("this-escape")
     public DefaultHistory(LineReader reader) {
         attach(reader);
     }
@@ -67,8 +67,7 @@ public class DefaultHistory implements History {
             this.reader = reader;
             try {
                 load();
-            }
-            catch (IllegalArgumentException | IOException e) {
+            } catch (IllegalArgumentException | IOException e) {
                 Log.warn("Failed to load history", e);
             }
         }
@@ -117,13 +116,13 @@ public class DefaultHistory implements History {
         }
     }
 
-    private String doHistoryFileDataKey (Path path){
+    private String doHistoryFileDataKey(Path path) {
         return path != null ? path.toAbsolutePath().toString() : null;
     }
 
     private HistoryFileData getHistoryFileData(Path path) {
         String key = doHistoryFileDataKey(path);
-        if (!historyFiles.containsKey(key)){
+        if (!historyFiles.containsKey(key)) {
             historyFiles.put(key, new HistoryFileData());
         }
         return historyFiles.get(key);
@@ -133,7 +132,7 @@ public class DefaultHistory implements History {
         historyFiles.put(doHistoryFileDataKey(path), historyFileData);
     }
 
-    private boolean isLineReaderHistory (Path path) throws IOException {
+    private boolean isLineReaderHistory(Path path) throws IOException {
         Path lrp = getPath();
         if (lrp == null) {
             return path == null;
@@ -141,23 +140,23 @@ public class DefaultHistory implements History {
         return Files.isSameFile(lrp, path);
     }
 
-    private void setLastLoaded(Path path, int lastloaded){
+    private void setLastLoaded(Path path, int lastloaded) {
         getHistoryFileData(path).setLastLoaded(lastloaded);
     }
 
-    private void setEntriesInFile(Path path, int entriesInFile){
+    private void setEntriesInFile(Path path, int entriesInFile) {
         getHistoryFileData(path).setEntriesInFile(entriesInFile);
     }
 
-    private void incEntriesInFile(Path path, int amount){
+    private void incEntriesInFile(Path path, int amount) {
         getHistoryFileData(path).incEntriesInFile(amount);
     }
 
-    private int getLastLoaded(Path path){
+    private int getLastLoaded(Path path) {
         return getHistoryFileData(path).getLastLoaded();
     }
 
-    private int getEntriesInFile(Path path){
+    private int getEntriesInFile(Path path) {
         return getHistoryFileData(path).getEntriesInFile();
     }
 
@@ -168,9 +167,8 @@ public class DefaultHistory implements History {
     protected void addHistoryLine(Path path, String line, boolean checkDuplicates) {
         if (reader.isSet(LineReader.Option.HISTORY_TIMESTAMPED)) {
             int idx = line.indexOf(':');
-            final String badHistoryFileSyntax = "Bad history file syntax! " +
-                "The history file `" + path + "` may be an older history: " +
-                "please remove it or use a different history file.";
+            final String badHistoryFileSyntax = "Bad history file syntax! " + "The history file `" + path
+                    + "` may be an older history: " + "please remove it or use a different history file.";
             if (idx < 0) {
                 throw new IllegalArgumentException(badHistoryFileSyntax);
             }
@@ -183,8 +181,7 @@ public class DefaultHistory implements History {
 
             String unescaped = unescape(line.substring(idx + 1));
             internalAdd(time, unescaped, checkDuplicates);
-        }
-        else {
+        } else {
             internalAdd(Instant.now(), unescape(line), checkDuplicates);
         }
     }
@@ -210,8 +207,7 @@ public class DefaultHistory implements History {
 
     @Override
     public void append(Path file, boolean incremental) throws IOException {
-        internalWrite(file != null ? file : getPath(),
-                      incremental ? getLastLoaded(file) : 0);
+        internalWrite(file != null ? file : getPath(), incremental ? getLastLoaded(file) : 0);
     }
 
     @Override
@@ -227,8 +223,11 @@ public class DefaultHistory implements History {
                 Files.createDirectories(parent);
             }
             // Append new items to the history file
-            try (BufferedWriter writer = Files.newBufferedWriter(path.toAbsolutePath(),
-              StandardOpenOption.WRITE, StandardOpenOption.APPEND, StandardOpenOption.CREATE)) {
+            try (BufferedWriter writer = Files.newBufferedWriter(
+                    path.toAbsolutePath(),
+                    StandardOpenOption.WRITE,
+                    StandardOpenOption.APPEND,
+                    StandardOpenOption.CREATE)) {
                 for (Entry entry : items.subList(from, items.size())) {
                     if (isPersistable(entry)) {
                         writer.append(format(entry));
@@ -248,18 +247,23 @@ public class DefaultHistory implements History {
         Log.trace("Trimming history path: ", path);
         // Load all history entries
         LinkedList<Entry> allItems = new LinkedList<>();
-        try (BufferedReader reader = Files.newBufferedReader(path)) {
-            reader.lines().forEach(l -> {
-                int idx = l.indexOf(':');
-                Instant time = Instant.ofEpochMilli(Long.parseLong(l.substring(0, idx)));
-                String line = unescape(l.substring(idx + 1));
-                allItems.add(createEntry(allItems.size(), time, line));
+        try (BufferedReader historyFileReader = Files.newBufferedReader(path)) {
+            historyFileReader.lines().forEach(l -> {
+                if (reader.isSet(LineReader.Option.HISTORY_TIMESTAMPED)) {
+                    int idx = l.indexOf(':');
+                    Instant time = Instant.ofEpochMilli(Long.parseLong(l.substring(0, idx)));
+                    String line = unescape(l.substring(idx + 1));
+                    allItems.add(createEntry(allItems.size(), time, line));
+                } else {
+                    allItems.add(createEntry(allItems.size(), Instant.now(), unescape(l)));
+                }
             });
         }
         // Remove duplicates
         List<Entry> trimmedItems = doTrimHistory(allItems, max);
         // Write history
-        Path temp = Files.createTempFile(path.toAbsolutePath().getParent(), path.getFileName().toString(), ".tmp");
+        Path temp = Files.createTempFile(
+                path.toAbsolutePath().getParent(), path.getFileName().toString(), ".tmp");
         try (BufferedWriter writer = Files.newBufferedWriter(temp, StandardOpenOption.WRITE)) {
             for (Entry entry : trimmedItems) {
                 writer.append(format(entry));
@@ -351,7 +355,7 @@ public class DefaultHistory implements History {
     public String get(final int index) {
         int idx = index - offset;
         if (idx >= items.size() || idx < 0) {
-            throw new IllegalArgumentException("IndexOutOfBounds: Index:" + idx +", Size:" + items.size());
+            throw new IllegalArgumentException("IndexOutOfBounds: Index:" + idx + ", Size:" + items.size());
         }
         return items.get(idx).line();
     }
@@ -382,8 +386,7 @@ public class DefaultHistory implements History {
         if (isSet(reader, LineReader.Option.HISTORY_INCREMENTAL)) {
             try {
                 save();
-            }
-            catch (IOException e) {
+            } catch (IOException e) {
                 Log.warn("Failed to save history", e);
             }
         }
@@ -417,7 +420,7 @@ public class DefaultHistory implements History {
     protected void internalAdd(Instant time, String line, boolean checkDuplicates) {
         Entry entry = new EntryImpl(offset + items.size(), time, line);
         if (checkDuplicates) {
-            for (Entry e: items) {
+            for (Entry e : items) {
                 if (e.line().trim().equals(line.trim())) {
                     return;
                 }
@@ -430,7 +433,7 @@ public class DefaultHistory implements History {
     private void maybeResize() {
         while (size() > getInt(reader, LineReader.HISTORY_SIZE, DEFAULT_HISTORY_SIZE)) {
             items.removeFirst();
-            for (HistoryFileData hfd: historyFiles.values()) {
+            for (HistoryFileData hfd : historyFiles.values()) {
                 hfd.decLastLoaded();
             }
             offset++;
@@ -633,8 +636,7 @@ public class DefaultHistory implements History {
         private int lastLoaded = 0;
         private int entriesInFile = 0;
 
-        public HistoryFileData() {
-        }
+        public HistoryFileData() {}
 
         public HistoryFileData(int lastLoaded, int entriesInFile) {
             this.lastLoaded = lastLoaded;
@@ -667,8 +669,5 @@ public class DefaultHistory implements History {
         public void incEntriesInFile(int amount) {
             entriesInFile = entriesInFile + amount;
         }
-
     }
-
 }
-
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Attributes.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Attributes.java
index b1bab287e79..04959488cf1 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Attributes.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Attributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -43,63 +43,65 @@ public class Attributes {
      * Input flags - software input processing
      */
     public enum InputFlag {
-        IGNBRK,       /* ignore BREAK condition */
-        BRKINT,       /* map BREAK to SIGINTR */
-        IGNPAR,       /* ignore (discard) parity errors */
-        PARMRK,       /* mark parity and framing errors */
-        INPCK,        /* enable checking of parity errors */
-        ISTRIP,       /* strip 8th bit off chars */
-        INLCR,        /* map NL into CR */
-        IGNCR,        /* ignore CR */
-        ICRNL,        /* map CR to NL (ala CRMOD) */
-        IXON,         /* enable output flow control */
-        IXOFF,        /* enable input flow control */
-        IXANY,        /* any char will restart after stop */
-        IMAXBEL,      /* ring bell on input queue full */
-        IUTF8         /* maintain state for UTF-8 VERASE */
+        IGNBRK, /* ignore BREAK condition */
+        BRKINT, /* map BREAK to SIGINTR */
+        IGNPAR, /* ignore (discard) parity errors */
+        PARMRK, /* mark parity and framing errors */
+        INPCK, /* enable checking of parity errors */
+        ISTRIP, /* strip 8th bit off chars */
+        INLCR, /* map NL into CR */
+        IGNCR, /* ignore CR */
+        ICRNL, /* map CR to NL (ala CRMOD) */
+        IXON, /* enable output flow control */
+        IXOFF, /* enable input flow control */
+        IXANY, /* any char will restart after stop */
+        IMAXBEL, /* ring bell on input queue full */
+        IUTF8, /* maintain state for UTF-8 VERASE */
+
+        INORMEOL /* normalize end-of-line */
     }
 
     /*
      * Output flags - software output processing
      */
     public enum OutputFlag {
-        OPOST,       /* enable following output processing */
-        ONLCR,       /* map NL to CR-NL (ala CRMOD) */
-        OXTABS,      /* expand tabs to spaces */
-        ONOEOT,      /* discard EOT's (^D) on output) */
-        OCRNL,       /* map CR to NL on output */
-        ONOCR,       /* no CR output at column 0 */
-        ONLRET,      /* NL performs CR function */
-        OFILL,       /* use fill characters for delay */
-        NLDLY,       /* \n delay */
-        TABDLY,      /* horizontal tab delay */
-        CRDLY,       /* \r delay */
-        FFDLY,       /* form feed delay */
-        BSDLY,       /* \b delay */
-        VTDLY,       /* vertical tab delay */
-        OFDEL        /* fill is DEL, else NUL */
+        OPOST, /* enable following output processing */
+        ONLCR, /* map NL to CR-NL (ala CRMOD) */
+        OXTABS, /* expand tabs to spaces */
+        ONOEOT, /* discard EOT's (^D) on output) */
+        OCRNL, /* map CR to NL on output */
+        ONOCR, /* no CR output at column 0 */
+        ONLRET, /* NL performs CR function */
+        OFILL, /* use fill characters for delay */
+        NLDLY, /* \n delay */
+        TABDLY, /* horizontal tab delay */
+        CRDLY, /* \r delay */
+        FFDLY, /* form feed delay */
+        BSDLY, /* \b delay */
+        VTDLY, /* vertical tab delay */
+        OFDEL /* fill is DEL, else NUL */
     }
 
     /*
      * Control flags - hardware control of terminal
      */
     public enum ControlFlag {
-        CIGNORE,          /* ignore control flags */
-        CS5,              /* 5 bits    (pseudo) */
-        CS6,              /* 6 bits */
-        CS7,              /* 7 bits */
-        CS8,              /* 8 bits */
-        CSTOPB,           /* send 2 stop bits */
-        CREAD,            /* enable receiver */
-        PARENB,           /* parity enable */
-        PARODD,           /* odd parity, else even */
-        HUPCL,            /* hang up on last close */
-        CLOCAL,           /* ignore modem status lines */
-        CCTS_OFLOW,       /* CTS flow control of output */
-        CRTS_IFLOW,       /* RTS flow control of input */
-        CDTR_IFLOW,       /* DTR flow control of input */
-        CDSR_OFLOW,       /* DSR flow control of output */
-        CCAR_OFLOW        /* DCD flow control of output */
+        CIGNORE, /* ignore control flags */
+        CS5, /* 5 bits    (pseudo) */
+        CS6, /* 6 bits */
+        CS7, /* 7 bits */
+        CS8, /* 8 bits */
+        CSTOPB, /* send 2 stop bits */
+        CREAD, /* enable receiver */
+        PARENB, /* parity enable */
+        PARODD, /* odd parity, else even */
+        HUPCL, /* hang up on last close */
+        CLOCAL, /* ignore modem status lines */
+        CCTS_OFLOW, /* CTS flow control of output */
+        CRTS_IFLOW, /* RTS flow control of input */
+        CDTR_IFLOW, /* DTR flow control of input */
+        CDSR_OFLOW, /* DSR flow control of output */
+        CCAR_OFLOW /* DCD flow control of output */
     }
 
     /*
@@ -110,23 +112,23 @@ public class Attributes {
      * input flag.
      */
     public enum LocalFlag {
-        ECHOKE,           /* visual erase for line kill */
-        ECHOE,            /* visually erase chars */
-        ECHOK,            /* echo NL after line kill */
-        ECHO,             /* enable echoing */
-        ECHONL,           /* echo NL even if ECHO is off */
-        ECHOPRT,          /* visual erase mode for hardcopy */
-        ECHOCTL,          /* echo control chars as ^(Char) */
-        ISIG,             /* enable signals INTR, QUIT, [D]SUSP */
-        ICANON,           /* canonicalize input lines */
-        ALTWERASE,        /* use alternate WERASE algorithm */
-        IEXTEN,           /* enable DISCARD and LNEXT */
-        EXTPROC,          /* external processing */
-        TOSTOP,           /* stop background jobs from output */
-        FLUSHO,           /* output being flushed (state) */
-        NOKERNINFO,       /* no kernel output from VSTATUS */
-        PENDIN,           /* XXX retype pending input (state) */
-        NOFLSH            /* don't flush after interrupt */
+        ECHOKE, /* visual erase for line kill */
+        ECHOE, /* visually erase chars */
+        ECHOK, /* echo NL after line kill */
+        ECHO, /* enable echoing */
+        ECHONL, /* echo NL even if ECHO is off */
+        ECHOPRT, /* visual erase mode for hardcopy */
+        ECHOCTL, /* echo control chars as ^(Char) */
+        ISIG, /* enable signals INTR, QUIT, [D]SUSP */
+        ICANON, /* canonicalize input lines */
+        ALTWERASE, /* use alternate WERASE algorithm */
+        IEXTEN, /* enable DISCARD and LNEXT */
+        EXTPROC, /* external processing */
+        TOSTOP, /* stop background jobs from output */
+        FLUSHO, /* output being flushed (state) */
+        NOKERNINFO, /* no kernel output from VSTATUS */
+        PENDIN, /* XXX retype pending input (state) */
+        NOFLSH /* don't flush after interrupt */
     }
 
     final EnumSet<InputFlag> iflag = EnumSet.noneOf(InputFlag.class);
@@ -135,9 +137,9 @@ public class Attributes {
     final EnumSet<LocalFlag> lflag = EnumSet.noneOf(LocalFlag.class);
     final EnumMap<ControlChar, Integer> cchars = new EnumMap<>(ControlChar.class);
 
-    public Attributes() {
-    }
+    public Attributes() {}
 
+    @SuppressWarnings("this-escape")
     public Attributes(Attributes attr) {
         copy(attr);
     }
@@ -310,13 +312,12 @@ public class Attributes {
 
     @Override
     public String toString() {
-        return "Attributes[" +
-                "lflags: " + append(lflag) + ", " +
-                "iflags: " + append(iflag) + ", " +
-                "oflags: " + append(oflag) + ", " +
-                "cflags: " + append(cflag) + ", " +
-                "cchars: " + append(EnumSet.allOf(ControlChar.class), this::display) +
-                "]";
+        return "Attributes[" + "lflags: "
+                + append(lflag) + ", " + "iflags: "
+                + append(iflag) + ", " + "oflags: "
+                + append(oflag) + ", " + "cflags: "
+                + append(cflag) + ", " + "cchars: "
+                + append(EnumSet.allOf(ControlChar.class), this::display) + "]";
     }
 
     private String display(ControlChar c) {
@@ -345,5 +346,4 @@ public class Attributes {
     private <T extends Enum<T>> String append(EnumSet<T> set, Function<T, String> toString) {
         return set.stream().map(toString).collect(Collectors.joining(" "));
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Cursor.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Cursor.java
index c561349cb0f..9bc3d902849 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Cursor.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Cursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/MouseEvent.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/MouseEvent.java
index df59e3f41b2..059b43c51ae 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/MouseEvent.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/MouseEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -71,12 +71,11 @@ public class MouseEvent {
 
     @Override
     public String toString() {
-        return "MouseEvent[" +
-                "type=" + type +
-                ", button=" + button +
-                ", modifiers=" + modifiers +
-                ", x=" + x +
-                ", y=" + y +
-                ']';
+        return "MouseEvent[" + "type="
+                + type + ", button="
+                + button + ", modifiers="
+                + modifiers + ", x="
+                + x + ", y="
+                + y + ']';
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Size.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Size.java
index 29870ad626c..fde3bf35959 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Size.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Size.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -13,9 +13,9 @@ public class Size {
     private int rows;
     private int cols;
 
-    public Size() {
-    }
+    public Size() {}
 
+    @SuppressWarnings("this-escape")
     public Size(int columns, int rows) {
         this();
         setColumns(columns);
@@ -50,7 +50,7 @@ public class Size {
      * @return the cursor position
      */
     public int cursorPos(int row, int col) {
-        return row * (cols+1) + col;
+        return row * (cols + 1) + col;
     }
 
     public void copy(Size size) {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Terminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Terminal.java
index 38ffb029f60..054915e133d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Terminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/Terminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -34,6 +34,7 @@ public interface Terminal extends Closeable, Flushable {
      * Type used for dumb terminals.
      */
     String TYPE_DUMB = "dumb";
+
     String TYPE_DUMB_COLOR = "dumb-color";
 
     String getName();
@@ -42,6 +43,9 @@ public interface Terminal extends Closeable, Flushable {
     // Signal support
     //
 
+    /**
+     * Types of signals.
+     */
     enum Signal {
         INT,
         QUIT,
@@ -51,16 +55,55 @@ public interface Terminal extends Closeable, Flushable {
         WINCH
     }
 
+    /**
+     * The SignalHandler defines the interface used to trap signals and perform specific behaviors.
+     * @see Terminal.Signal
+     * @see Terminal#handle(Signal, SignalHandler)
+     */
     interface SignalHandler {
 
+        /**
+         * The {@code SIG_DFL} value can be used to specify that the JVM default behavior
+         * should be used to handle this signal.
+         */
         SignalHandler SIG_DFL = NativeSignalHandler.SIG_DFL;
+
+        /**
+         * The {@code SIG_IGN} value can be used to ignore this signal and not perform
+         * any special processing.
+         */
         SignalHandler SIG_IGN = NativeSignalHandler.SIG_IGN;
 
+        /**
+         * Handle the signal.
+         * @param signal the signal
+         */
         void handle(Signal signal);
     }
 
+    /**
+     * Registers a handler for the given {@link Signal}.
+     * <p>
+     * Note that the JVM does not easily allow catching the {@link Signal#QUIT} signal, which causes a thread dump
+     * to be displayed.  This signal is mainly used when connecting through an SSH socket to a virtual terminal.
+     *
+     * @param signal the signal to register a handler for
+     * @param handler the handler
+     * @return the previous signal handler
+     */
     SignalHandler handle(Signal signal, SignalHandler handler);
 
+    /**
+     * Raise the specific signal.
+     * This is not method usually called by non system terminals.
+     * When accessing a terminal through a SSH or Telnet connection, signals may be
+     * conveyed by the protocol and thus need to be raised when reaching the terminal code.
+     * The terminals do that automatically when the terminal input stream has a character
+     * mapped to {@link Attributes.ControlChar#VINTR}, {@link Attributes.ControlChar#VQUIT},
+     * or {@link Attributes.ControlChar#VSUSP}.
+     *
+     * @param signal the signal to raise
+     */
     void raise(Signal signal);
 
     //
@@ -180,8 +223,21 @@ public interface Terminal extends Closeable, Flushable {
 
     boolean echo(boolean echo);
 
+    /**
+     * Returns the terminal attributes.
+     * The returned object can be safely modified
+     * further used in a call to {@link #setAttributes(Attributes)}.
+     *
+     * @return the terminal attributes.
+     */
     Attributes getAttributes();
 
+    /**
+     * Set the terminal attributes.
+     * The terminal will perform a copy of the given attributes.
+     *
+     * @param attr the new attributes
+     */
     void setAttributes(Attributes attr);
 
     /**
@@ -334,5 +390,4 @@ public interface Terminal extends Closeable, Flushable {
      * Color support
      */
     ColorPalette getPalette();
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
index 014ad78b794..3b02ec2d8d8 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,9 +8,6 @@
  */
 package jdk.internal.org.jline.terminal;
 
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -19,11 +16,16 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -31,8 +33,10 @@ import java.util.stream.Stream;
 
 import jdk.internal.org.jline.terminal.impl.AbstractPosixTerminal;
 import jdk.internal.org.jline.terminal.impl.AbstractTerminal;
-import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
 import jdk.internal.org.jline.terminal.impl.DumbTerminal;
+import jdk.internal.org.jline.terminal.impl.DumbTerminalProvider;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalExt;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.Log;
 import jdk.internal.org.jline.utils.OSUtils;
@@ -49,16 +53,30 @@ public final class TerminalBuilder {
     public static final String PROP_ENCODING = "org.jline.terminal.encoding";
     public static final String PROP_CODEPAGE = "org.jline.terminal.codepage";
     public static final String PROP_TYPE = "org.jline.terminal.type";
-    public static final String PROP_JNA = "org.jline.terminal.jna";
-    public static final String PROP_JANSI = "org.jline.terminal.jansi";
-    public static final String PROP_EXEC = "org.jline.terminal.exec";
-    public static final String PROP_DUMB = "org.jline.terminal.dumb";
+    public static final String PROP_PROVIDER = "org.jline.terminal.provider";
+    public static final String PROP_PROVIDERS = "org.jline.terminal.providers";
+    public static final String PROP_PROVIDER_FFM = "ffm";
+    public static final String PROP_PROVIDER_JNI = "jni";
+    public static final String PROP_PROVIDER_JANSI = "jansi";
+    public static final String PROP_PROVIDER_JNA = "jna";
+    public static final String PROP_PROVIDER_EXEC = "exec";
+    public static final String PROP_PROVIDER_DUMB = "dumb";
+    public static final String PROP_PROVIDERS_DEFAULT = String.join(
+            ",", PROP_PROVIDER_FFM, PROP_PROVIDER_JNI, PROP_PROVIDER_JANSI, PROP_PROVIDER_JNA, PROP_PROVIDER_EXEC);
+    public static final String PROP_FFM = "org.jline.terminal." + PROP_PROVIDER_FFM;
+    public static final String PROP_JNI = "org.jline.terminal." + PROP_PROVIDER_JNI;
+    public static final String PROP_JANSI = "org.jline.terminal." + PROP_PROVIDER_JANSI;
+    public static final String PROP_JNA = "org.jline.terminal." + PROP_PROVIDER_JNA;
+    public static final String PROP_EXEC = "org.jline.terminal." + PROP_PROVIDER_EXEC;
+    public static final String PROP_DUMB = "org.jline.terminal." + PROP_PROVIDER_DUMB;
     public static final String PROP_DUMB_COLOR = "org.jline.terminal.dumb.color";
     public static final String PROP_OUTPUT = "org.jline.terminal.output";
     public static final String PROP_OUTPUT_OUT = "out";
     public static final String PROP_OUTPUT_ERR = "err";
     public static final String PROP_OUTPUT_OUT_ERR = "out-err";
     public static final String PROP_OUTPUT_ERR_OUT = "err-out";
+    public static final String PROP_OUTPUT_FORCED_OUT = "forced-out";
+    public static final String PROP_OUTPUT_FORCED_ERR = "forced-err";
 
     //
     // Other system properties controlling various jline parts
@@ -68,6 +86,32 @@ public final class TerminalBuilder {
     public static final String PROP_COLOR_DISTANCE = "org.jline.utils.colorDistance";
     public static final String PROP_DISABLE_ALTERNATE_CHARSET = "org.jline.utils.disableAlternateCharset";
 
+    //
+    // System properties controlling how FileDescriptor are create.
+    // The value can be a comma separated list of defined mechanisms.
+    //
+    public static final String PROP_FILE_DESCRIPTOR_CREATION_MODE = "org.jline.terminal.pty.fileDescriptorCreationMode";
+    public static final String PROP_FILE_DESCRIPTOR_CREATION_MODE_NATIVE = "native";
+    public static final String PROP_FILE_DESCRIPTOR_CREATION_MODE_REFLECTION = "reflection";
+    public static final String PROP_FILE_DESCRIPTOR_CREATION_MODE_DEFAULT =
+            String.join(",", PROP_FILE_DESCRIPTOR_CREATION_MODE_REFLECTION, PROP_FILE_DESCRIPTOR_CREATION_MODE_NATIVE);
+
+    //
+    // System properties controlling how RedirectPipe are created.
+    // The value can be a comma separated list of defined mechanisms.
+    //
+    public static final String PROP_REDIRECT_PIPE_CREATION_MODE = "org.jline.terminal.exec.redirectPipeCreationMode";
+    public static final String PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE = "native";
+    public static final String PROP_REDIRECT_PIPE_CREATION_MODE_REFLECTION = "reflection";
+    public static final String PROP_REDIRECT_PIPE_CREATION_MODE_DEFAULT =
+            String.join(",", PROP_REDIRECT_PIPE_CREATION_MODE_REFLECTION, PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE);
+
+    public static final Set<String> DEPRECATED_PROVIDERS =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList(PROP_PROVIDER_JNA, PROP_PROVIDER_JANSI)));
+
+    public static final String PROP_DISABLE_DEPRECATED_PROVIDER_WARNING =
+            "org.jline.terminal.disableDeprecatedProviderWarning";
+
     //
     // Terminal output control
     //
@@ -75,7 +119,9 @@ public final class TerminalBuilder {
         SysOut,
         SysErr,
         SysOutOrSysErr,
-        SysErrOrSysOut
+        SysErrOrSysOut,
+        ForcedSysOut,
+        ForcedSysErr
     }
 
     /**
@@ -115,20 +161,23 @@ public final class TerminalBuilder {
     private int codepage;
     private Boolean system;
     private SystemOutput systemOutput;
+    private String provider;
+    private String providers;
     private Boolean jna;
     private Boolean jansi;
+    private Boolean jni;
     private Boolean exec;
+    private Boolean ffm;
     private Boolean dumb;
     private Boolean color;
     private Attributes attributes;
     private Size size;
-    private boolean nativeSignals = false;
+    private boolean nativeSignals = true;
     private Function<InputStream, InputStream> inputStreamWrapper = in -> in;
     private Terminal.SignalHandler signalHandler = Terminal.SignalHandler.SIG_DFL;
     private boolean paused = false;
 
-    private TerminalBuilder() {
-    }
+    private TerminalBuilder() {}
 
     public TerminalBuilder name(String name) {
         this.name = name;
@@ -160,6 +209,16 @@ public final class TerminalBuilder {
         return this;
     }
 
+    public TerminalBuilder provider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    public TerminalBuilder providers(String providers) {
+        this.providers = providers;
+        return this;
+    }
+
     public TerminalBuilder jna(boolean jna) {
         this.jna = jna;
         return this;
@@ -170,11 +229,21 @@ public final class TerminalBuilder {
         return this;
     }
 
+    public TerminalBuilder jni(boolean jni) {
+        this.jni = jni;
+        return this;
+    }
+
     public TerminalBuilder exec(boolean exec) {
         this.exec = exec;
         return this;
     }
 
+    public TerminalBuilder ffm(boolean ffm) {
+        this.ffm = ffm;
+        return this;
+    }
+
     public TerminalBuilder dumb(boolean dumb) {
         this.dumb = dumb;
         return this;
@@ -280,6 +349,12 @@ public final class TerminalBuilder {
         return this;
     }
 
+    /**
+     * Determines the default value for signal handlers.
+     * All signals will be mapped to the given handler.
+     * @param signalHandler the default signal handler
+     * @return The builder
+     */
     public TerminalBuilder signalHandler(Terminal.SignalHandler signalHandler) {
         this.signalHandler = signalHandler;
         return this;
@@ -305,6 +380,11 @@ public final class TerminalBuilder {
         return this;
     }
 
+    /**
+     * Builds the terminal.
+     * @return the newly created terminal, never {@code null}
+     * @throws IOException if an error occurs
+     */
     public Terminal build() throws IOException {
         Terminal override = TERMINAL_OVERRIDE.get();
         Terminal terminal = override != null ? override : doBuild();
@@ -313,7 +393,8 @@ public final class TerminalBuilder {
         }
         Log.debug(() -> "Using terminal " + terminal.getClass().getSimpleName());
         if (terminal instanceof AbstractPosixTerminal) {
-            Log.debug(() -> "Using pty " + ((AbstractPosixTerminal) terminal).getPty().getClass().getSimpleName());
+            Log.debug(() -> "Using pty "
+                    + ((AbstractPosixTerminal) terminal).getPty().getClass().getSimpleName());
         }
         return terminal;
     }
@@ -323,6 +404,242 @@ public final class TerminalBuilder {
         if (name == null) {
             name = "JLine terminal";
         }
+        Charset encoding = computeEncoding();
+        String type = computeType();
+
+        String provider = this.provider;
+        if (provider == null) {
+            provider = System.getProperty(PROP_PROVIDER, null);
+        }
+
+        boolean forceDumb =
+                (DumbTerminal.TYPE_DUMB.equals(type) || type != null && type.startsWith(DumbTerminal.TYPE_DUMB_COLOR))
+                        || (provider != null && provider.equals(PROP_PROVIDER_DUMB));
+        Boolean dumb = this.dumb;
+        if (dumb == null) {
+            dumb = getBoolean(PROP_DUMB, null);
+        }
+        IllegalStateException exception = new IllegalStateException("Unable to create a terminal");
+        List<TerminalProvider> providers = getProviders(provider, exception);
+        Terminal terminal = null;
+        if ((system != null && system) || (system == null && in == null && out == null)) {
+            if (system != null
+                    && ((in != null && !in.equals(System.in))
+                            || (out != null && !out.equals(System.out) && !out.equals(System.err)))) {
+                throw new IllegalArgumentException("Cannot create a system terminal using non System streams");
+            }
+            if (attributes != null || size != null) {
+                Log.warn("Attributes and size fields are ignored when creating a system terminal");
+            }
+            SystemOutput systemOutput = computeSystemOutput();
+            Map<SystemStream, Boolean> system = Stream.of(SystemStream.values())
+                    .collect(Collectors.toMap(
+                            stream -> stream, stream -> providers.stream().anyMatch(p -> p.isSystemStream(stream))));
+            SystemStream systemStream = select(system, systemOutput);
+
+            if (!forceDumb && system.get(SystemStream.Input) && systemStream != null) {
+                if (attributes != null || size != null) {
+                    Log.warn("Attributes and size fields are ignored when creating a system terminal");
+                }
+                boolean ansiPassThrough = OSUtils.IS_CONEMU;
+                // Cygwin defaults to XTERM, but actually supports 256 colors,
+                // so if the value comes from the environment, change it to xterm-256color
+                if ((OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM)
+                        && "xterm".equals(type)
+                        && this.type == null
+                        && System.getProperty(PROP_TYPE) == null) {
+                    type = "xterm-256color";
+                }
+                for (TerminalProvider prov : providers) {
+                    if (terminal == null) {
+                        try {
+                            terminal = prov.sysTerminal(
+                                    name,
+                                    type,
+                                    ansiPassThrough,
+                                    encoding,
+                                    nativeSignals,
+                                    signalHandler,
+                                    paused,
+                                    systemStream,
+                                    inputStreamWrapper);
+                        } catch (Throwable t) {
+                            Log.debug("Error creating " + prov.name() + " based terminal: ", t.getMessage(), t);
+                            exception.addSuppressed(t);
+                        }
+                    }
+                }
+                if (terminal == null && OSUtils.IS_WINDOWS && providers.isEmpty() && (dumb == null || !dumb)) {
+                    throw new IllegalStateException(
+                            "Unable to create a system terminal. On Windows, either JLine's native libraries, JNA "
+                                    + "or Jansi library is required.  Make sure to add one of those in the classpath.",
+                            exception);
+                }
+            }
+            if (terminal instanceof AbstractTerminal) {
+                AbstractTerminal t = (AbstractTerminal) terminal;
+                if (SYSTEM_TERMINAL.compareAndSet(null, t)) {
+                    t.setOnClose(() -> SYSTEM_TERMINAL.compareAndSet(t, null));
+                } else {
+                    exception.addSuppressed(new IllegalStateException("A system terminal is already running. "
+                            + "Make sure to use the created system Terminal on the LineReaderBuilder if you're using one "
+                            + "or that previously created system Terminals have been correctly closed."));
+                    terminal.close();
+                    terminal = null;
+                }
+            }
+            if (terminal == null && (forceDumb || dumb == null || dumb)) {
+                if (!forceDumb && dumb == null) {
+                    if (Log.isDebugEnabled()) {
+                        Log.warn("input is tty: " + system.get(SystemStream.Input));
+                        Log.warn("output is tty: " + system.get(SystemStream.Output));
+                        Log.warn("error is tty: " + system.get(SystemStream.Error));
+                        Log.warn("Creating a dumb terminal", exception);
+                    } else {
+                        Log.warn(
+                                "Unable to create a system terminal, creating a dumb terminal (enable debug logging for more information)");
+                    }
+                }
+                type = getDumbTerminalType(dumb, systemStream);
+                terminal = new DumbTerminalProvider()
+                        .sysTerminal(name, type, false, encoding, nativeSignals, signalHandler, paused, systemStream, inputStreamWrapper);
+                if (OSUtils.IS_WINDOWS) {
+                    Attributes attr = terminal.getAttributes();
+                    attr.setInputFlag(Attributes.InputFlag.IGNCR, true);
+                    terminal.setAttributes(attr);
+                }
+            }
+        } else {
+            for (TerminalProvider prov : providers) {
+                if (terminal == null) {
+                    try {
+                        terminal = prov.newTerminal(
+                                name, type, in, out, encoding, signalHandler, paused, attributes, size);
+                    } catch (Throwable t) {
+                        Log.debug("Error creating " + prov.name() + " based terminal: ", t.getMessage(), t);
+                        exception.addSuppressed(t);
+                    }
+                }
+            }
+        }
+        if (terminal == null) {
+            throw exception;
+        }
+        if (terminal instanceof TerminalExt) {
+            TerminalExt te = (TerminalExt) terminal;
+            if (DEPRECATED_PROVIDERS.contains(te.getProvider().name())
+                    && !getBoolean(PROP_DISABLE_DEPRECATED_PROVIDER_WARNING, false)) {
+                Log.warn("The terminal provider " + te.getProvider().name()
+                        + " has been deprecated, check your configuration. This warning can be disabled by setting the system property "
+                        + PROP_DISABLE_DEPRECATED_PROVIDER_WARNING + " to true.");
+            }
+        }
+        return terminal;
+    }
+
+    private String getDumbTerminalType(Boolean dumb, SystemStream systemStream) {
+        // forced colored dumb terminal
+        Boolean color = this.color;
+        if (color == null) {
+            color = getBoolean(PROP_DUMB_COLOR, null);
+        }
+        if (dumb == null) {
+            // detect emacs using the env variable
+            if (color == null) {
+                String emacs = System.getenv("INSIDE_EMACS");
+                if (emacs != null && emacs.contains("comint")) {
+                    color = true;
+                }
+            }
+            // detect Intellij Idea
+            if (color == null) {
+                // using the env variable on windows
+                String ideHome = System.getenv("IDE_HOME");
+                if (ideHome != null) {
+                    color = true;
+                } else {
+                    // using the parent process command on unix/mac
+                    String command = getParentProcessCommand();
+                    if (command != null && command.endsWith("/idea")) {
+                        color = true;
+                    }
+                }
+            }
+            if (color == null) {
+                color = systemStream != null && System.getenv("TERM") != null;
+            }
+        } else {
+            if (color == null) {
+                color = false;
+            }
+        }
+        return color ? Terminal.TYPE_DUMB_COLOR : Terminal.TYPE_DUMB;
+    }
+
+    public SystemOutput computeSystemOutput() {
+        SystemOutput systemOutput = null;
+        if (out != null) {
+            if (out.equals(System.out)) {
+                systemOutput = SystemOutput.SysOut;
+            } else if (out.equals(System.err)) {
+                systemOutput = SystemOutput.SysErr;
+            }
+        }
+        if (systemOutput == null) {
+            systemOutput = this.systemOutput;
+        }
+        if (systemOutput == null) {
+            String str = System.getProperty(PROP_OUTPUT);
+            if (str != null) {
+                switch (str.trim().toLowerCase(Locale.ROOT)) {
+                    case PROP_OUTPUT_OUT:
+                        systemOutput = SystemOutput.SysOut;
+                        break;
+                    case PROP_OUTPUT_ERR:
+                        systemOutput = SystemOutput.SysErr;
+                        break;
+                    case PROP_OUTPUT_OUT_ERR:
+                        systemOutput = SystemOutput.SysOutOrSysErr;
+                        break;
+                    case PROP_OUTPUT_ERR_OUT:
+                        systemOutput = SystemOutput.SysErrOrSysOut;
+                        break;
+                    case PROP_OUTPUT_FORCED_OUT:
+                        systemOutput = SystemOutput.ForcedSysOut;
+                        break;
+                    case PROP_OUTPUT_FORCED_ERR:
+                        systemOutput = SystemOutput.ForcedSysErr;
+                        break;
+                    default:
+                        Log.debug("Unsupported value for " + PROP_OUTPUT + ": " + str + ". Supported values are: "
+                                + String.join(
+                                        ", ",
+                                        PROP_OUTPUT_OUT,
+                                        PROP_OUTPUT_ERR,
+                                        PROP_OUTPUT_OUT_ERR,
+                                        PROP_OUTPUT_ERR_OUT)
+                                + ".");
+                }
+            }
+        }
+        if (systemOutput == null) {
+            systemOutput = SystemOutput.SysOutOrSysErr;
+        }
+        return systemOutput;
+    }
+
+    public String computeType() {
+        String type = this.type;
+        if (type == null) {
+            type = System.getProperty(PROP_TYPE);
+        }
+        if (type == null) {
+            type = System.getenv("TERM");
+        }
+        return type;
+    }
+
+    public Charset computeEncoding() {
         Charset encoding = this.encoding;
         if (encoding == null) {
             String charsetName = System.getProperty(PROP_ENCODING);
@@ -344,206 +661,84 @@ public final class TerminalBuilder {
                 encoding = StandardCharsets.UTF_8;
             }
         }
-        String type = this.type;
-        if (type == null) {
-            type = System.getProperty(PROP_TYPE);
-        }
-        if (type == null) {
-            type = System.getenv("TERM");
-        }
-        Boolean jna = this.jna;
-        if (jna == null) {
-            jna = getBoolean(PROP_JNA, true);
-        }
-        Boolean jansi = this.jansi;
-        if (jansi == null) {
-            jansi = getBoolean(PROP_JANSI, true);
-        }
-        Boolean exec = this.exec;
-        if (exec == null) {
-            exec = getBoolean(PROP_EXEC, true);
-        }
-        Boolean dumb = this.dumb;
-        if (dumb == null) {
-            dumb = getBoolean(PROP_DUMB, null);
-        }
-        IllegalStateException exception = new IllegalStateException("Unable to create a terminal");
-        List<TerminalProvider> providers = new ArrayList<>();
-        if (jna) {
-            try {
-                TerminalProvider provider = TerminalProvider.load("jna");
-                providers.add(provider);
-            }  catch (Throwable t) {
-                Log.debug("Unable to load JNA support: ", t);
-                exception.addSuppressed(t);
-            }
-        }
-        if (jansi) {
-            try {
-                TerminalProvider provider = TerminalProvider.load("jansi");
-                providers.add(provider);
-            }  catch (Throwable t) {
-                Log.debug("Unable to load JANSI support: ", t);
-                exception.addSuppressed(t);
-            }
-        }
-        if (exec)
-        {
-            try {
-                TerminalProvider provider = TerminalProvider.load("exec");
-                providers.add(provider);
-            }  catch (Throwable t) {
-                Log.debug("Unable to load EXEC support: ", t);
-                exception.addSuppressed(t);
-            }
-        }
-
-        Terminal terminal = null;
-        if ((system != null && system) || (system == null && in == null && out == null)) {
-            if (system != null && ((in != null && !in.equals(System.in)) ||
-                    (out != null && !out.equals(System.out) && !out.equals(System.err)))) {
-                throw new IllegalArgumentException("Cannot create a system terminal using non System streams");
-            }
-            if (attributes != null || size != null) {
-                Log.warn("Attributes and size fields are ignored when creating a system terminal");
-            }
-            if (out != null) {
-                if (out.equals(System.out)) {
-                    systemOutput = SystemOutput.SysOut;
-                } else if (out.equals(System.err)) {
-                    systemOutput = SystemOutput.SysErr;
-                }
-            }
-            if (systemOutput == null) {
-                String str = System.getProperty(PROP_OUTPUT);
-                if (str != null) {
-                    switch (str.trim().toLowerCase(Locale.ROOT)) {
-                        case PROP_OUTPUT_OUT: systemOutput = SystemOutput.SysOut; break;
-                        case PROP_OUTPUT_ERR: systemOutput = SystemOutput.SysErr; break;
-                        case PROP_OUTPUT_OUT_ERR: systemOutput = SystemOutput.SysOutOrSysErr; break;
-                        case PROP_OUTPUT_ERR_OUT: systemOutput = SystemOutput.SysErrOrSysOut; break;
-                        default:
-                            Log.debug("Unsupported value for " + PROP_OUTPUT + ": " + str + ". Supported values are: "
-                                    + String.join(", ", PROP_OUTPUT_OUT, PROP_OUTPUT_ERR, PROP_OUTPUT_OUT_ERR,PROP_OUTPUT_ERR_OUT)
-                                    + ".");
-                    }
-                }
-            }
-            if (systemOutput == null) {
-                systemOutput = SystemOutput.SysOutOrSysErr;
-            }
-            Map<TerminalProvider.Stream, Boolean> system = Stream.of(TerminalProvider.Stream.values())
-                    .collect(Collectors.toMap(stream -> stream, stream -> providers.stream().anyMatch(p -> p.isSystemStream(stream))));
-            TerminalProvider.Stream console = select(system, systemOutput);
-
-            if (system.get(TerminalProvider.Stream.Input) && console != null) {
-                if (attributes != null || size != null) {
-                    Log.warn("Attributes and size fields are ignored when creating a system terminal");
-                }
-                boolean ansiPassThrough = OSUtils.IS_CONEMU;
-                // Cygwin defaults to XTERM, but actually supports 256 colors,
-                // so if the value comes from the environment, change it to xterm-256color
-                if ((OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM)  && "xterm".equals(type)
-                        && this.type == null && System.getProperty(PROP_TYPE) == null) {
-                    type = "xterm-256color";
-                }
-                for ( TerminalProvider provider : providers) {
-                    if (terminal == null) {
-                        try {
-                            terminal = provider.sysTerminal(name, type, ansiPassThrough, encoding,
-                                    nativeSignals, signalHandler, paused, console, inputStreamWrapper);
-                        } catch (Throwable t) {
-                            Log.debug("Error creating " + provider.name() + " based terminal: ", t.getMessage(), t);
-                            exception.addSuppressed(t);
-                        }
-                    }
-                }
-                if (terminal == null && OSUtils.IS_WINDOWS &&  !jna && !jansi && (dumb == null || !dumb)) {
-                    throw new IllegalStateException("Unable to create a system terminal. On windows, either "
-                            + "JNA or JANSI library is required.  Make sure to add one of those in the classpath.");
-                }
-            }
-            if (terminal instanceof AbstractTerminal) {
-                AbstractTerminal t = (AbstractTerminal) terminal;
-                if (SYSTEM_TERMINAL.compareAndSet(null, t)) {
-                    t.setOnClose(() -> SYSTEM_TERMINAL.compareAndSet(t, null));
-                } else {
-                    exception.addSuppressed(new IllegalStateException("A system terminal is already running. " +
-                            "Make sure to use the created system Terminal on the LineReaderBuilder if you're using one " +
-                            "or that previously created system Terminals have been correctly closed."));
-                    terminal.close();
-                    terminal = null;
-                }
-            }
-            if (terminal == null && (dumb == null || dumb)) {
-                // forced colored dumb terminal
-                Boolean color = this.color;
-                if (color == null) {
-                    color = getBoolean(PROP_DUMB_COLOR, false);
-                    // detect emacs using the env variable
-                    if (!color) {
-                        String emacs = System.getenv("INSIDE_EMACS");
-                        color = emacs != null && emacs.contains("comint");
-                    }
-                    // detect Intellij Idea
-                    if (!color) {
-                        String command = getParentProcessCommand();
-                        color = command != null && command.contains("idea");
-                    }
-                    if (!color) {
-                        color = system.get(TerminalProvider.Stream.Output) && System.getenv("TERM") != null;
-                    }
-                    if (!color && dumb == null) {
-                        if (Log.isDebugEnabled()) {
-                            Log.warn("input is tty: {}", system.get(TerminalProvider.Stream.Input));
-                            Log.warn("output is tty: {}", system.get(TerminalProvider.Stream.Output));
-                            Log.warn("error is tty: {}", system.get(TerminalProvider.Stream.Error));
-                            Log.warn("Creating a dumb terminal", exception);
-                        } else {
-                            Log.warn("Unable to create a system terminal, creating a dumb terminal (enable debug logging for more information)");
-                        }
-                    }
-                }
-                terminal = new DumbTerminal(name, color ? Terminal.TYPE_DUMB_COLOR : Terminal.TYPE_DUMB,
-                        new FileInputStream(FileDescriptor.in),
-                        //JDK change: always write into stdout:
-                        new FileOutputStream(FileDescriptor.out),
-                        encoding, signalHandler);
-            }
-        } else {
-            for ( TerminalProvider provider : providers) {
-                if (terminal == null) {
-                    try {
-                        terminal = provider.newTerminal(name, type, inputStreamWrapper.apply(in), out, encoding, signalHandler, paused, attributes, size);
-                    } catch (Throwable t) {
-                        Log.debug("Error creating " + provider.name() + " based terminal: ", t.getMessage(), t);
-                        exception.addSuppressed(t);
-                    }
-                }
-            }
-        }
-        if (terminal == null) {
-            throw exception;
-        }
-        return terminal;
+        return encoding;
     }
 
-    private TerminalProvider.Stream select(Map<TerminalProvider.Stream, Boolean> system, SystemOutput systemOutput) {
+    /**
+     * Get the list of available terminal providers.
+     * This list is sorted according to the {@link #PROP_PROVIDERS} system property.
+     * @param provider if not {@code null}, only this provider will be checked
+     * @param exception if a provider throws an exception, it will be added to this exception as a suppressed exception
+     * @return a list of terminal providers
+     */
+    public List<TerminalProvider> getProviders(String provider, IllegalStateException exception) {
+        List<TerminalProvider> providers = new ArrayList<>();
+        // Check ffm provider
+        checkProvider(provider, exception, providers, ffm, PROP_FFM, PROP_PROVIDER_FFM);
+        // Check jni provider
+        checkProvider(provider, exception, providers, jni, PROP_JNI, PROP_PROVIDER_JNI);
+        // Check jansi provider
+        checkProvider(provider, exception, providers, jansi, PROP_JANSI, PROP_PROVIDER_JANSI);
+        // Check jna provider
+        checkProvider(provider, exception, providers, jna, PROP_JNA, PROP_PROVIDER_JNA);
+        // Check exec provider
+        checkProvider(provider, exception, providers, exec, PROP_EXEC, PROP_PROVIDER_EXEC);
+        // Order providers
+        List<String> order = Arrays.asList(
+                (this.providers != null ? this.providers : System.getProperty(PROP_PROVIDERS, PROP_PROVIDERS_DEFAULT))
+                        .split(","));
+        providers.sort(Comparator.comparing(l -> {
+            int idx = order.indexOf(l.name());
+            return idx >= 0 ? idx : Integer.MAX_VALUE;
+        }));
+        String names = providers.stream().map(TerminalProvider::name).collect(Collectors.joining(", "));
+        Log.debug("Available providers: " + names);
+        return providers;
+    }
+
+    private void checkProvider(
+            String provider,
+            IllegalStateException exception,
+            List<TerminalProvider> providers,
+            Boolean load,
+            String property,
+            String name) {
+        Boolean doLoad = provider != null ? (Boolean) name.equals(provider) : load;
+        if (doLoad == null) {
+            doLoad = getBoolean(property, true);
+        }
+        if (doLoad) {
+            try {
+                TerminalProvider prov = TerminalProvider.load(name);
+                prov.isSystemStream(SystemStream.Output);
+                providers.add(prov);
+            } catch (Throwable t) {
+                Log.debug("Unable to load " + name + " provider: ", t);
+                exception.addSuppressed(t);
+            }
+        }
+    }
+
+    private SystemStream select(Map<SystemStream, Boolean> system, SystemOutput systemOutput) {
         switch (systemOutput) {
             case SysOut:
-                return select(system, TerminalProvider.Stream.Output);
+                return select(system, SystemStream.Output);
             case SysErr:
-                return select(system, TerminalProvider.Stream.Error);
+                return select(system, SystemStream.Error);
             case SysOutOrSysErr:
-                return select(system, TerminalProvider.Stream.Output, TerminalProvider.Stream.Error);
+                return select(system, SystemStream.Output, SystemStream.Error);
             case SysErrOrSysOut:
-                return select(system, TerminalProvider.Stream.Error, TerminalProvider.Stream.Output);
+                return select(system, SystemStream.Error, SystemStream.Output);
+            case ForcedSysOut:
+                return SystemStream.Output;
+            case ForcedSysErr:
+                return SystemStream.Error;
         }
         return null;
     }
 
-    private static TerminalProvider.Stream select(Map<TerminalProvider.Stream, Boolean> system, TerminalProvider.Stream... streams) {
-        for (TerminalProvider.Stream s : streams) {
+    private static SystemStream select(Map<SystemStream, Boolean> system, SystemStream... streams) {
+        for (SystemStream s : streams) {
             if (system.get(s)) {
                 return s;
             }
@@ -558,7 +753,9 @@ public final class TerminalBuilder {
             Object parent = ((Optional<?>) phClass.getMethod("parent").invoke(current)).orElse(null);
             Method infoMethod = phClass.getMethod("info");
             Object info = infoMethod.invoke(parent);
-            Object command = ((Optional<?>) infoMethod.getReturnType().getMethod("command").invoke(info)).orElse(null);
+            Object command = ((Optional<?>)
+                            infoMethod.getReturnType().getMethod("command").invoke(info))
+                    .orElse(null);
             return (String) command;
         } catch (Throwable t) {
             return null;
@@ -583,7 +780,7 @@ public final class TerminalBuilder {
     private static final int UTF8_CODE_PAGE = 65001;
 
     private static Charset getCodepageCharset(int codepage) {
-        //http://docs.oracle.com/javase/6/docs/technotes/guides/intl/encoding.doc.html
+        // http://docs.oracle.com/javase/6/docs/technotes/guides/intl/encoding.doc.html
         if (codepage == UTF8_CODE_PAGE) {
             return StandardCharsets.UTF_8;
         }
@@ -630,5 +827,4 @@ public final class TerminalBuilder {
     public static void setTerminalOverride(final Terminal terminal) {
         TERMINAL_OVERRIDE.set(terminal);
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java
index b5f55b80f1e..5d000d07083 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,6 +18,8 @@ import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Cursor;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 
 public abstract class AbstractPosixTerminal extends AbstractTerminal {
 
@@ -28,7 +30,8 @@ public abstract class AbstractPosixTerminal extends AbstractTerminal {
         this(name, type, pty, null, SignalHandler.SIG_DFL);
     }
 
-    public AbstractPosixTerminal(String name, String type, Pty pty, Charset encoding, SignalHandler signalHandler) throws IOException {
+    public AbstractPosixTerminal(String name, String type, Pty pty, Charset encoding, SignalHandler signalHandler)
+            throws IOException {
         super(name, type, encoding, signalHandler);
         Objects.requireNonNull(pty);
         this.pty = pty;
@@ -82,4 +85,13 @@ public abstract class AbstractPosixTerminal extends AbstractTerminal {
         return CursorSupport.getCursorPosition(this, discarded);
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return getPty().getProvider();
+    }
+
+    @Override
+    public SystemStream getSystemStream() {
+        return getPty().getSystemStream();
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPty.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPty.java
index 0feab84fc7e..3fbe63f3c5d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPty.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,20 +8,39 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.spi.Pty;
-import jdk.internal.org.jline.utils.NonBlockingInputStream;
-
+import java.io.FileDescriptor;
+import java.io.FilterInputStream;
 import java.io.IOError;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
+import java.lang.reflect.Field;
 
+//import jdk.internal.org.jline.nativ.JLineLibrary;
+//import jdk.internal.org.jline.nativ.JLineNativeLoader;
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.utils.NonBlockingInputStream;
+
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_FILE_DESCRIPTOR_CREATION_MODE;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_FILE_DESCRIPTOR_CREATION_MODE_DEFAULT;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_FILE_DESCRIPTOR_CREATION_MODE_NATIVE;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_FILE_DESCRIPTOR_CREATION_MODE_REFLECTION;
 import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_NON_BLOCKING_READS;
 
 public abstract class AbstractPty implements Pty {
 
+    protected final TerminalProvider provider;
+    protected final SystemStream systemStream;
     private Attributes current;
+    private boolean skipNextLf;
+
+    public AbstractPty(TerminalProvider provider, SystemStream systemStream) {
+        this.provider = provider;
+        this.systemStream = systemStream;
+    }
 
     @Override
     public void setAttr(Attributes attr) throws IOException {
@@ -32,10 +51,32 @@ public abstract class AbstractPty implements Pty {
     @Override
     public InputStream getSlaveInput() throws IOException {
         InputStream si = doGetSlaveInput();
+        InputStream nsi = new FilterInputStream(si) {
+            @Override
+            public int read() throws IOException {
+                for (; ; ) {
+                    int c = super.read();
+                    if (current.getInputFlag(Attributes.InputFlag.INORMEOL)) {
+                        if (c == '\r') {
+                            skipNextLf = true;
+                            c = '\n';
+                        } else if (c == '\n') {
+                            if (skipNextLf) {
+                                skipNextLf = false;
+                                continue;
+                            }
+                        } else {
+                            skipNextLf = false;
+                        }
+                    }
+                    return c;
+                }
+            }
+        };
         if (Boolean.parseBoolean(System.getProperty(PROP_NON_BLOCKING_READS, "true"))) {
-            return new PtyInputStream(si);
+            return new PtyInputStream(nsi);
         } else {
-            return si;
+            return nsi;
         }
     }
 
@@ -49,6 +90,16 @@ public abstract class AbstractPty implements Pty {
         }
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return provider;
+    }
+
+    @Override
+    public SystemStream getSystemStream() {
+        return systemStream;
+    }
+
     class PtyInputStream extends NonBlockingInputStream {
         final InputStream in;
         int c = 0;
@@ -102,4 +153,103 @@ public abstract class AbstractPty implements Pty {
         }
     }
 
+    private static FileDescriptorCreator fileDescriptorCreator;
+
+    protected static FileDescriptor newDescriptor(int fd) {
+        if (fileDescriptorCreator == null) {
+            String str =
+                    System.getProperty(PROP_FILE_DESCRIPTOR_CREATION_MODE, PROP_FILE_DESCRIPTOR_CREATION_MODE_DEFAULT);
+            String[] modes = str.split(",");
+            IllegalStateException ise = new IllegalStateException("Unable to create FileDescriptor");
+            for (String mode : modes) {
+                try {
+                    switch (mode) {
+                        case PROP_FILE_DESCRIPTOR_CREATION_MODE_NATIVE:
+                            fileDescriptorCreator = null;//new NativeFileDescriptorCreator();
+                            break;
+                        case PROP_FILE_DESCRIPTOR_CREATION_MODE_REFLECTION:
+                            fileDescriptorCreator = new ReflectionFileDescriptorCreator();
+                            break;
+                    }
+                } catch (Throwable t) {
+                    // ignore
+                    ise.addSuppressed(t);
+                }
+                if (fileDescriptorCreator != null) {
+                    break;
+                }
+            }
+            if (fileDescriptorCreator == null) {
+                throw ise;
+            }
+        }
+        return fileDescriptorCreator.newDescriptor(fd);
+    }
+
+    interface FileDescriptorCreator {
+        FileDescriptor newDescriptor(int fd);
+    }
+
+    /*
+     * Class that could be used on OpenJDK 17.  However, it requires the following JVM option
+     *   --add-exports java.base/jdk.internal.access=ALL-UNNAMED
+     * so the benefit does not seem important enough to warrant the problems caused
+     * by access the jdk.internal.access package at compile time, which itself requires
+     * custom compiler options and a different maven module, or at least a different compile
+     * phase with a JDK 17 compiler.
+     * So, just keep the ReflectionFileDescriptorCreator for now.
+     *
+    static class Jdk17FileDescriptorCreator implements FileDescriptorCreator {
+        private final jdk.internal.access.JavaIOFileDescriptorAccess fdAccess;
+        Jdk17FileDescriptorCreator() {
+            fdAccess = jdk.internal.access.SharedSecrets.getJavaIOFileDescriptorAccess();
+        }
+
+        @Override
+        public FileDescriptor newDescriptor(int fd) {
+            FileDescriptor descriptor = new FileDescriptor();
+            fdAccess.set(descriptor, fd);
+            return descriptor;
+        }
+    }
+     */
+
+    /**
+     * Reflection based file descriptor creator.
+     * This requires the following option
+     *   --add-opens java.base/java.io=ALL-UNNAMED
+     */
+    static class ReflectionFileDescriptorCreator implements FileDescriptorCreator {
+        private final Field fileDescriptorField;
+
+        ReflectionFileDescriptorCreator() throws Exception {
+            Field field = FileDescriptor.class.getDeclaredField("fd");
+            field.setAccessible(true);
+            fileDescriptorField = field;
+        }
+
+        @Override
+        public FileDescriptor newDescriptor(int fd) {
+            FileDescriptor descriptor = new FileDescriptor();
+            try {
+                fileDescriptorField.set(descriptor, fd);
+            } catch (IllegalAccessException e) {
+                // This should not happen as the field has been set accessible
+                throw new IllegalStateException(e);
+            }
+            return descriptor;
+        }
+    }
+
+//    static class NativeFileDescriptorCreator implements FileDescriptorCreator {
+//        NativeFileDescriptorCreator() {
+//            // Force load the library
+//            JLineNativeLoader.initialize();
+//        }
+//
+//        @Override
+//        public FileDescriptor newDescriptor(int fd) {
+//            return JLineLibrary.newFileDescriptor(fd);
+//        }
+//    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java
index 8a464a67265..2608e2e5f37 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -27,7 +27,7 @@ import jdk.internal.org.jline.terminal.Attributes.InputFlag;
 import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
 import jdk.internal.org.jline.terminal.Cursor;
 import jdk.internal.org.jline.terminal.MouseEvent;
-import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.spi.TerminalExt;
 import jdk.internal.org.jline.utils.ColorPalette;
 import jdk.internal.org.jline.utils.Curses;
 import jdk.internal.org.jline.utils.InfoCmp;
@@ -35,7 +35,7 @@ import jdk.internal.org.jline.utils.InfoCmp.Capability;
 import jdk.internal.org.jline.utils.Log;
 import jdk.internal.org.jline.utils.Status;
 
-public abstract class AbstractTerminal implements Terminal {
+public abstract class AbstractTerminal implements TerminalExt {
 
     protected final String name;
     protected final String type;
@@ -44,7 +44,7 @@ public abstract class AbstractTerminal implements Terminal {
     protected final Set<Capability> bools = new HashSet<>();
     protected final Map<Capability, Integer> ints = new HashMap<>();
     protected final Map<Capability, String> strings = new HashMap<>();
-    protected final ColorPalette palette = new ColorPalette(this);
+    protected final ColorPalette palette;
     protected Status status;
     protected Runnable onClose;
 
@@ -52,10 +52,13 @@ public abstract class AbstractTerminal implements Terminal {
         this(name, type, null, SignalHandler.SIG_DFL);
     }
 
-    public AbstractTerminal(String name, String type, Charset encoding, SignalHandler signalHandler) throws IOException {
+    @SuppressWarnings("this-escape")
+    public AbstractTerminal(String name, String type, Charset encoding, SignalHandler signalHandler)
+            throws IOException {
         this.name = name;
         this.type = type != null ? type : "ansi";
         this.encoding = encoding != null ? encoding : System.out.charset();
+        this.palette = new ColorPalette(this);
         for (Signal signal : Signal.values()) {
             handlers.put(signal, signalHandler);
         }
@@ -85,12 +88,13 @@ public abstract class AbstractTerminal implements Terminal {
     public void raise(Signal signal) {
         Objects.requireNonNull(signal);
         SignalHandler handler = handlers.get(signal);
-        if (handler != SignalHandler.SIG_DFL && handler != SignalHandler.SIG_IGN) {
+        if (handler == SignalHandler.SIG_DFL) {
+            if (status != null && signal == Signal.WINCH) {
+                status.resize();
+            }
+        } else if (handler != SignalHandler.SIG_IGN) {
             handler.handle(signal);
         }
-        if (status != null && signal == Signal.WINCH) {
-            status.resize();
-        }
     }
 
     public final void close() throws IOException {
@@ -105,8 +109,7 @@ public abstract class AbstractTerminal implements Terminal {
 
     protected void doClose() throws IOException {
         if (status != null) {
-            status.update(null);
-            flush();
+            status.close();
         }
     }
 
@@ -126,7 +129,7 @@ public abstract class AbstractTerminal implements Terminal {
         if (cc != null) {
             int vcc = getAttributes().getControlChar(cc);
             if (vcc > 0 && vcc < 32) {
-                writer().write(new char[]{'^', (char) (vcc + '@')}, 0, 2);
+                writer().write(new char[] {'^', (char) (vcc + '@')}, 0, 2);
             }
         }
     }
@@ -217,8 +220,7 @@ public abstract class AbstractTerminal implements Terminal {
     }
 
     private MouseEvent lastMouseEvent = new MouseEvent(
-                MouseEvent.Type.Moved, MouseEvent.Button.NoButton,
-                EnumSet.noneOf(MouseEvent.Modifier.class), 0, 0);
+            MouseEvent.Type.Moved, MouseEvent.Button.NoButton, EnumSet.noneOf(MouseEvent.Modifier.class), 0, 0);
 
     @Override
     public boolean hasMouseSupport() {
@@ -268,16 +270,13 @@ public abstract class AbstractTerminal implements Terminal {
     }
 
     @Override
-    public void pause() {
-    }
+    public void pause() {}
 
     @Override
-    public void pause(boolean wait) throws InterruptedException {
-    }
+    public void pause(boolean wait) throws InterruptedException {}
 
     @Override
-    public void resume() {
-    }
+    public void resume() {}
 
     @Override
     public boolean paused() {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java
index 0c36902a1a7..301b89eb796 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -29,11 +29,8 @@ public abstract class AbstractWindowsConsoleWriter extends Writer {
     }
 
     @Override
-    public void flush() {
-    }
+    public void flush() {}
 
     @Override
-    public void close() {
-    }
-
+    public void close() {}
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java
index 57cfb5d50b4..03c42fb19f7 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2023, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,8 +8,20 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.Curses;
 import jdk.internal.org.jline.utils.InfoCmp;
 import jdk.internal.org.jline.utils.Log;
@@ -21,17 +33,6 @@ import jdk.internal.org.jline.utils.ShutdownHooks;
 import jdk.internal.org.jline.utils.Signals;
 import jdk.internal.org.jline.utils.WriterOutputStream;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
 /**
  * The AbstractWindowsTerminal is used as the base class for windows terminal.
  * Due to windows limitations, mostly the missing support for ansi sequences,
@@ -44,7 +45,7 @@ import java.util.function.Function;
  * the writer() becomes the primary output, while the output() is bridged
  * to the writer() using a WriterOutputStream wrapper.
  */
-public abstract class AbstractWindowsTerminal extends AbstractTerminal {
+public abstract class AbstractWindowsTerminal<Console> extends AbstractTerminal {
 
     public static final String TYPE_WINDOWS = "windows";
     public static final String TYPE_WINDOWS_256_COLOR = "windows-256color";
@@ -56,12 +57,13 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
     private static final int UTF8_CODE_PAGE = 65001;
 
     protected static final int ENABLE_PROCESSED_INPUT = 0x0001;
-    protected static final int ENABLE_LINE_INPUT      = 0x0002;
-    protected static final int ENABLE_ECHO_INPUT      = 0x0004;
-    protected static final int ENABLE_WINDOW_INPUT    = 0x0008;
-    protected static final int ENABLE_MOUSE_INPUT     = 0x0010;
-    protected static final int ENABLE_INSERT_MODE     = 0x0020;
+    protected static final int ENABLE_LINE_INPUT = 0x0002;
+    protected static final int ENABLE_ECHO_INPUT = 0x0004;
+    protected static final int ENABLE_WINDOW_INPUT = 0x0008;
+    protected static final int ENABLE_MOUSE_INPUT = 0x0010;
+    protected static final int ENABLE_INSERT_MODE = 0x0020;
     protected static final int ENABLE_QUICK_EDIT_MODE = 0x0040;
+    protected static final int ENABLE_EXTENDED_FLAGS = 0x0080;
 
     protected final Writer slaveInputPipe;
     protected final InputStream input;
@@ -71,7 +73,12 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
     protected final Map<Signal, Object> nativeHandlers = new HashMap<>();
     protected final ShutdownHooks.Task closer;
     protected final Attributes attributes = new Attributes();
-    protected final int originalConsoleMode;
+    protected final Console inConsole;
+    protected final Console outConsole;
+    protected final int originalInConsoleMode;
+    protected final int originalOutConsoleMode;
+    private final TerminalProvider provider;
+    private final SystemStream systemStream;
 
     protected final Object lock = new Object();
     protected boolean paused = true;
@@ -80,21 +87,42 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
     protected MouseTracking tracking = MouseTracking.Off;
     protected boolean focusTracking = false;
     private volatile boolean closing;
+    protected boolean skipNextLf;
 
-    public AbstractWindowsTerminal(Writer writer, String name, String type, Charset encoding, boolean nativeSignals, SignalHandler signalHandler, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
+    @SuppressWarnings("this-escape")
+    public AbstractWindowsTerminal(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            Writer writer,
+            String name,
+            String type,
+            Charset encoding,
+            boolean nativeSignals,
+            SignalHandler signalHandler,
+            Console inConsole,
+            int inConsoleMode,
+            Console outConsole,
+            int outConsoleMode,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         super(name, type, encoding, signalHandler);
+        this.provider = provider;
+        this.systemStream = systemStream;
         NonBlockingPumpReader reader = NonBlocking.nonBlockingPumpReader();
         this.slaveInputPipe = reader.getWriter();
         this.input = inputStreamWrapper.apply(NonBlocking.nonBlockingStream(reader, encoding()));
         this.reader = NonBlocking.nonBlocking(name, input, encoding());
         this.writer = new PrintWriter(writer);
         this.output = new WriterOutputStream(writer, encoding());
+        this.inConsole = inConsole;
+        this.outConsole = outConsole;
         parseInfoCmp();
         // Attributes
-        originalConsoleMode = getConsoleMode();
+        this.originalInConsoleMode = inConsoleMode;
+        this.originalOutConsoleMode = outConsoleMode;
         attributes.setLocalFlag(Attributes.LocalFlag.ISIG, true);
         attributes.setControlChar(Attributes.ControlChar.VINTR, ctrl('C'));
-        attributes.setControlChar(Attributes.ControlChar.VEOF,  ctrl('D'));
+        attributes.setControlChar(Attributes.ControlChar.VEOF, ctrl('D'));
         attributes.setControlChar(Attributes.ControlChar.VSUSP, ctrl('Z'));
         // Handle signals
         if (nativeSignals) {
@@ -148,7 +176,7 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
     }
 
     public Attributes getAttributes() {
-        int mode = getConsoleMode();
+        int mode = getConsoleMode(inConsole);
         if ((mode & ENABLE_ECHO_INPUT) != 0) {
             attributes.setLocalFlag(Attributes.LocalFlag.ECHO, true);
         }
@@ -173,8 +201,11 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
         }
         if (tracking != MouseTracking.Off) {
             mode |= ENABLE_MOUSE_INPUT;
+            // mouse events not send with quick edit mode
+            // to disable ENABLE_QUICK_EDIT_MODE just set extended flag
+            mode |= ENABLE_EXTENDED_FLAGS;
         }
-        setConsoleMode(mode);
+        setConsoleMode(inConsole, mode);
     }
 
     protected int ctrl(char key) {
@@ -197,23 +228,26 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
         }
         reader.close();
         writer.close();
-        setConsoleMode(originalConsoleMode);
+        setConsoleMode(inConsole, originalInConsoleMode);
+        setConsoleMode(outConsole, originalOutConsoleMode);
     }
 
     static final int SHIFT_FLAG = 0x01;
-    static final int ALT_FLAG =   0x02;
-    static final int CTRL_FLAG =  0x04;
+    static final int ALT_FLAG = 0x02;
+    static final int CTRL_FLAG = 0x04;
 
-    static final int RIGHT_ALT_PRESSED =   0x0001;
-    static final int LEFT_ALT_PRESSED =    0x0002;
-    static final int RIGHT_CTRL_PRESSED =  0x0004;
-    static final int LEFT_CTRL_PRESSED =   0x0008;
-    static final int SHIFT_PRESSED =       0x0010;
-    static final int NUMLOCK_ON =          0x0020;
-    static final int SCROLLLOCK_ON =       0x0040;
-    static final int CAPSLOCK_ON =         0x0080;
+    static final int RIGHT_ALT_PRESSED = 0x0001;
+    static final int LEFT_ALT_PRESSED = 0x0002;
+    static final int RIGHT_CTRL_PRESSED = 0x0004;
+    static final int LEFT_CTRL_PRESSED = 0x0008;
+    static final int SHIFT_PRESSED = 0x0010;
+    static final int NUMLOCK_ON = 0x0020;
+    static final int SCROLLLOCK_ON = 0x0040;
+    static final int CAPSLOCK_ON = 0x0080;
 
-    protected void processKeyEvent(final boolean isKeyDown, final short virtualKeyCode, char ch, final int controlKeyState) throws IOException {
+    protected void processKeyEvent(
+            final boolean isKeyDown, final short virtualKeyCode, char ch, final int controlKeyState)
+            throws IOException {
         final boolean isCtrl = (controlKeyState & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) > 0;
         final boolean isAlt = (controlKeyState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) > 0;
         final boolean isShift = (controlKeyState & SHIFT_PRESSED) > 0;
@@ -222,11 +256,13 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
             // Pressing "Alt Gr" is translated to Alt-Ctrl, hence it has to be checked that Ctrl is _not_ pressed,
             // otherwise inserting of "Alt Gr" codes on non-US keyboards would yield errors
             if (ch != 0
-                    && (controlKeyState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED | RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED | SHIFT_PRESSED))
-                        == (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED)) {
+                    && (controlKeyState
+                                    & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED | RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED))
+                            == (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED)) {
                 processInputChar(ch);
             } else {
-                final String keySeq = getEscapeSequence(virtualKeyCode, (isCtrl ? CTRL_FLAG : 0) + (isAlt ? ALT_FLAG : 0) + (isShift ? SHIFT_FLAG : 0));
+                final String keySeq = getEscapeSequence(
+                        virtualKeyCode, (isCtrl ? CTRL_FLAG : 0) + (isAlt ? ALT_FLAG : 0) + (isShift ? SHIFT_FLAG : 0));
                 if (keySeq != null) {
                     for (char c : keySeq.toCharArray()) {
                         processInputChar(c);
@@ -240,7 +276,7 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
                  * 4). Ctrl + Space(0x20)          : uchar=0x20
                  * 5). Ctrl + <Other key>          : uchar=0
                  * 6). Ctrl + Alt + <Any key>      : uchar=0
-                */
+                 */
                 if (ch > 0) {
                     if (isAlt) {
                         processInputChar('\033');
@@ -254,10 +290,10 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
                     } else {
                         processInputChar(ch);
                     }
-                } else if (isCtrl) { //Handles the ctrl key events(uchar=0)
+                } else if (isCtrl) { // Handles the ctrl key events(uchar=0)
                     if (virtualKeyCode >= 'A' && virtualKeyCode <= 'Z') {
                         ch = (char) (virtualKeyCode - 0x40);
-                    } else if (virtualKeyCode == 191) { //?
+                    } else if (virtualKeyCode == 191) { // ?
                         ch = 127;
                     }
                     if (ch > 0) {
@@ -275,7 +311,7 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
         else {
             // support ALT+NumPad input method
             if (virtualKeyCode == 0x12 /*VK_MENU ALT key*/ && ch > 0) {
-                processInputChar(ch);  // no such combination in Windows
+                processInputChar(ch); // no such combination in Windows
             }
         }
     }
@@ -468,7 +504,19 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
                 raise(Signal.INFO);
             }
         }
-        if (c == '\r') {
+        if (attributes.getInputFlag(Attributes.InputFlag.INORMEOL)) {
+            if (c == '\r') {
+                skipNextLf = true;
+                c = '\n';
+            } else if (c == '\n') {
+                if (skipNextLf) {
+                    skipNextLf = false;
+                    return;
+                }
+            } else {
+                skipNextLf = false;
+            }
+        } else if (c == '\r') {
             if (attributes.getInputFlag(Attributes.InputFlag.IGNCR)) {
                 return;
             }
@@ -478,10 +526,10 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
         } else if (c == '\n' && attributes.getInputFlag(Attributes.InputFlag.INLCR)) {
             c = '\r';
         }
-//        if (attributes.getLocalFlag(Attributes.LocalFlag.ECHO)) {
-//            processOutputByte(c);
-//            masterOutput.flush();
-//        }
+        //        if (attributes.getLocalFlag(Attributes.LocalFlag.ECHO)) {
+        //            processOutputByte(c);
+        //            masterOutput.flush();
+        //        }
         slaveInputPipe.write(c);
     }
 
@@ -492,9 +540,9 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
         return true;
     }
 
-    protected abstract int getConsoleMode();
+    protected abstract int getConsoleMode(Console console);
 
-    protected abstract void setConsoleMode(int mode);
+    protected abstract void setConsoleMode(Console console, int mode);
 
     /**
      * Read a single input event from the input buffer and process it.
@@ -504,5 +552,13 @@ public abstract class AbstractWindowsTerminal extends AbstractTerminal {
      */
     protected abstract boolean processConsoleInput() throws IOException;
 
-}
+    @Override
+    public TerminalProvider getProvider() {
+        return provider;
+    }
 
+    @Override
+    public SystemStream getSystemStream() {
+        return systemStream;
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/CursorSupport.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/CursorSupport.java
index ef22cd0a7d8..14253d8c1d1 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/CursorSupport.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/CursorSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,17 +8,17 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
-import jdk.internal.org.jline.terminal.Cursor;
-import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.utils.Curses;
-import jdk.internal.org.jline.utils.InfoCmp;
-
 import java.io.IOError;
 import java.io.IOException;
 import java.util.function.IntConsumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import jdk.internal.org.jline.terminal.Cursor;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.utils.Curses;
+import jdk.internal.org.jline.utils.InfoCmp;
+
 public class CursorSupport {
 
     public static Cursor getCursorPosition(Terminal terminal, IntConsumer discarded) {
@@ -105,5 +105,4 @@ public class CursorSupport {
             throw new IOError(e);
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java
index dfa784c29f3..dc54ea2157d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, the original author or authors.
+ * Copyright (c) 2022, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -17,6 +17,7 @@ import java.util.concurrent.TimeUnit;
 
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.OSUtils;
 
@@ -26,7 +27,7 @@ public class Diag {
         diag(System.out);
     }
 
-    static void diag(PrintStream out) {
+    public static void diag(PrintStream out) {
         out.println("System properties");
         out.println("=================");
         out.println("os.name =         " + System.getProperty("os.name"));
@@ -50,6 +51,17 @@ public class Diag {
         out.println("IS_OSX =     " + OSUtils.IS_OSX);
         out.println();
 
+        // FFM
+        out.println("FFM Support");
+        out.println("=================");
+        try {
+            TerminalProvider provider = TerminalProvider.load("ffm");
+            testProvider(out, provider);
+        } catch (Throwable t) {
+            out.println("FFM support not available: " + t);
+        }
+        out.println();
+
         out.println("JnaSupport");
         out.println("=================");
         try {
@@ -60,13 +72,23 @@ public class Diag {
         }
         out.println();
 
-        out.println("JansiSupport");
+        out.println("Jansi2Support");
         out.println("=================");
         try {
             TerminalProvider provider = TerminalProvider.load("jansi");
             testProvider(out, provider);
         } catch (Throwable t) {
-            out.println("Jansi support not available: " + t);
+            out.println("Jansi 2 support not available: " + t);
+        }
+        out.println();
+
+        out.println("JniSupport");
+        out.println("=================");
+        try {
+            TerminalProvider provider = TerminalProvider.load("jni");
+            testProvider(out, provider);
+        } catch (Throwable t) {
+            out.println("JNI support not available: " + t);
         }
         out.println();
 
@@ -83,32 +105,45 @@ public class Diag {
 
     private static void testProvider(PrintStream out, TerminalProvider provider) {
         try {
-            out.println("StdIn stream =    " + provider.isSystemStream(TerminalProvider.Stream.Input));
-            out.println("StdOut stream =   " + provider.isSystemStream(TerminalProvider.Stream.Output));
-            out.println("StdErr stream =   " + provider.isSystemStream(TerminalProvider.Stream.Error));
+            out.println("StdIn stream =    " + provider.isSystemStream(SystemStream.Input));
+            out.println("StdOut stream =   " + provider.isSystemStream(SystemStream.Output));
+            out.println("StdErr stream =   " + provider.isSystemStream(SystemStream.Error));
         } catch (Throwable t2) {
             out.println("Unable to check stream: " + t2);
         }
         try {
-            out.println("StdIn stream name =     " + provider.systemStreamName(TerminalProvider.Stream.Input));
-            out.println("StdOut stream name =    " + provider.systemStreamName(TerminalProvider.Stream.Output));
-            out.println("StdErr stream name =    " + provider.systemStreamName(TerminalProvider.Stream.Error));
+            out.println("StdIn stream name =     " + provider.systemStreamName(SystemStream.Input));
+            out.println("StdOut stream name =    " + provider.systemStreamName(SystemStream.Output));
+            out.println("StdErr stream name =    " + provider.systemStreamName(SystemStream.Error));
         } catch (Throwable t2) {
             out.println("Unable to check stream names: " + t2);
         }
-        try (Terminal terminal = provider.sysTerminal("diag", "xterm", false, StandardCharsets.UTF_8,
-                false, Terminal.SignalHandler.SIG_DFL, false, TerminalProvider.Stream.Output, input -> input) ) {
+        try (Terminal terminal = provider.sysTerminal(
+                "diag",
+                "xterm",
+                false,
+                StandardCharsets.UTF_8,
+                false,
+                Terminal.SignalHandler.SIG_DFL,
+                false,
+                SystemStream.Output,
+                input -> input)) {
             if (terminal != null) {
                 Attributes attr = terminal.enterRawMode();
                 try {
                     out.println("Terminal size: " + terminal.getSize());
-                    ForkJoinTask<Integer> t = new ForkJoinPool(1).submit(() -> terminal.reader().read(1) );
+                    ForkJoinTask<Integer> t =
+                            new ForkJoinPool(1).submit(() -> terminal.reader().read(1));
                     int r = t.get(1000, TimeUnit.MILLISECONDS);
                     StringBuilder sb = new StringBuilder();
                     sb.append("The terminal seems to work: ");
                     sb.append("terminal ").append(terminal.getClass().getName());
                     if (terminal instanceof AbstractPosixTerminal) {
-                        sb.append(" with pty ").append(((AbstractPosixTerminal) terminal).getPty().getClass().getName());
+                        sb.append(" with pty ")
+                                .append(((AbstractPosixTerminal) terminal)
+                                        .getPty()
+                                        .getClass()
+                                        .getName());
                     }
                     out.println(sb);
                 } catch (Throwable t3) {
@@ -129,5 +164,4 @@ public class Diag {
     static <S> S load(Class<S> clazz) {
         return ServiceLoader.load(clazz, clazz.getClassLoader()).iterator().next();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminal.java
index 0b8cb57cbbf..2922132c1bf 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,38 +14,58 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
+import java.util.function.Function;
 
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Attributes.ControlChar;
 import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.NonBlocking;
 import jdk.internal.org.jline.utils.NonBlockingInputStream;
 import jdk.internal.org.jline.utils.NonBlockingReader;
 
 public class DumbTerminal extends AbstractTerminal {
 
+    private final TerminalProvider provider;
+    private final SystemStream systemStream;
     private final NonBlockingInputStream input;
     private final OutputStream output;
     private final NonBlockingReader reader;
     private final PrintWriter writer;
     private final Attributes attributes;
     private final Size size;
+    private boolean skipNextLf;
 
-    public DumbTerminal(InputStream in, OutputStream out) throws IOException {
-        this(TYPE_DUMB, TYPE_DUMB, in, out, null);
+    public DumbTerminal(InputStream in, OutputStream out, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
+        this(TYPE_DUMB, TYPE_DUMB, in, out, null, inputStreamWrapper);
     }
 
-    public DumbTerminal(String name, String type, InputStream in, OutputStream out, Charset encoding) throws IOException {
-        this(name, type, in, out, encoding, SignalHandler.SIG_DFL);
+    public DumbTerminal(String name, String type, InputStream in, OutputStream out, Charset encoding, Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        this(null, null, name, type, in, out, encoding, SignalHandler.SIG_DFL, inputStreamWrapper);
     }
 
-    public DumbTerminal(String name, String type, InputStream in, OutputStream out, Charset encoding, SignalHandler signalHandler) throws IOException {
+    @SuppressWarnings("this-escape")
+    public DumbTerminal(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            String name,
+            String type,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            SignalHandler signalHandler,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         super(name, type, encoding, signalHandler);
-        NonBlockingInputStream nbis = NonBlocking.nonBlocking(getName(), in);
+        this.provider = provider;
+        this.systemStream = systemStream;
+        NonBlockingInputStream nbis = NonBlocking.nonBlocking(getName(), inputStreamWrapper.apply(in));
         this.input = new NonBlockingInputStream() {
             @Override
             public int read(long timeout, boolean isPeek) throws IOException {
-                for (;;) {
+                for (; ; ) {
                     int c = nbis.read(timeout, isPeek);
                     if (attributes.getLocalFlag(Attributes.LocalFlag.ISIG)) {
                         if (c == attributes.getControlChar(ControlChar.VINTR)) {
@@ -62,7 +82,19 @@ public class DumbTerminal extends AbstractTerminal {
                             continue;
                         }
                     }
-                    if (c == '\r') {
+                    if (attributes.getInputFlag(Attributes.InputFlag.INORMEOL)) {
+                        if (c == '\r') {
+                            skipNextLf = true;
+                            c = '\n';
+                        } else if (c == '\n') {
+                            if (skipNextLf) {
+                                skipNextLf = false;
+                                continue;
+                            }
+                        } else {
+                            skipNextLf = false;
+                        }
+                    } else if (c == '\r') {
                         if (attributes.getInputFlag(Attributes.InputFlag.IGNCR)) {
                             continue;
                         }
@@ -80,10 +112,10 @@ public class DumbTerminal extends AbstractTerminal {
         this.reader = NonBlocking.nonBlocking(getName(), input, encoding());
         this.writer = new PrintWriter(new OutputStreamWriter(output, encoding()));
         this.attributes = new Attributes();
-        this.attributes.setControlChar(ControlChar.VERASE,  (char) 127);
+        this.attributes.setControlChar(ControlChar.VERASE, (char) 127);
         this.attributes.setControlChar(ControlChar.VWERASE, (char) 23);
-        this.attributes.setControlChar(ControlChar.VKILL,   (char) 21);
-        this.attributes.setControlChar(ControlChar.VLNEXT,  (char) 22);
+        this.attributes.setControlChar(ControlChar.VKILL, (char) 21);
+        this.attributes.setControlChar(ControlChar.VLNEXT, (char) 22);
         this.size = new Size();
         parseInfoCmp();
     }
@@ -107,9 +139,7 @@ public class DumbTerminal extends AbstractTerminal {
     }
 
     public Attributes getAttributes() {
-        Attributes attr = new Attributes();
-        attr.copy(attributes);
-        return attr;
+        return new Attributes(attributes);
     }
 
     public void setAttributes(Attributes attr) {
@@ -126,4 +156,13 @@ public class DumbTerminal extends AbstractTerminal {
         size.copy(sz);
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return provider;
+    }
+
+    @Override
+    public SystemStream getSystemStream() {
+        return systemStream;
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminalProvider.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminalProvider.java
new file mode 100644
index 00000000000..8ff97353065
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/DumbTerminalProvider.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl;
+
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.util.function.Function;
+
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.TerminalBuilder;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+
+public class DumbTerminalProvider implements TerminalProvider {
+
+    @Override
+    public String name() {
+        return TerminalBuilder.PROP_PROVIDER_DUMB;
+    }
+
+    @Override
+    public Terminal sysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        return new DumbTerminal(
+                this,
+                systemStream,
+                name,
+                type,
+                new FileInputStream(FileDescriptor.in),
+                new FileOutputStream(systemStream == SystemStream.Error ? FileDescriptor.err : FileDescriptor.out),
+                encoding,
+                signalHandler,
+                inputStreamWrapper);
+    }
+
+    @Override
+    public Terminal newTerminal(
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isSystemStream(SystemStream stream) {
+        return false;
+    }
+
+    @Override
+    public String systemStreamName(SystemStream stream) {
+        return null;
+    }
+
+    @Override
+    public int systemStreamWidth(SystemStream stream) {
+        return 0;
+    }
+
+    @Override
+    public String toString() {
+        return "TerminalProvider[" + name() + "]";
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExternalTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExternalTerminal.java
index 2814b52c7cc..5033fd61279 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExternalTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExternalTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,10 +8,6 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Cursor;
-import jdk.internal.org.jline.terminal.Size;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -19,6 +15,11 @@ import java.nio.charset.Charset;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.IntConsumer;
 
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Cursor;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+
 /**
  * Console implementation with embedded line disciplined.
  *
@@ -32,45 +33,59 @@ import java.util.function.IntConsumer;
  */
 public class ExternalTerminal extends LineDisciplineTerminal {
 
+    private final TerminalProvider provider;
     protected final AtomicBoolean closed = new AtomicBoolean();
     protected final InputStream masterInput;
     protected final Object lock = new Object();
     protected boolean paused = true;
     protected Thread pumpThread;
 
-    public ExternalTerminal(String name, String type,
-                            InputStream masterInput,
-                            OutputStream masterOutput,
-                            Charset encoding) throws IOException {
-        this(name, type, masterInput, masterOutput, encoding, SignalHandler.SIG_DFL);
+    public ExternalTerminal(
+            String name, String type, InputStream masterInput, OutputStream masterOutput, Charset encoding)
+            throws IOException {
+        this(null, name, type, masterInput, masterOutput, encoding, SignalHandler.SIG_DFL);
     }
 
-    public ExternalTerminal(String name, String type,
-                            InputStream masterInput,
-                            OutputStream masterOutput,
-                            Charset encoding,
-                            SignalHandler signalHandler) throws IOException {
-        this(name, type, masterInput, masterOutput, encoding, signalHandler, false);
+    public ExternalTerminal(
+            TerminalProvider provider,
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            SignalHandler signalHandler)
+            throws IOException {
+        this(provider, name, type, masterInput, masterOutput, encoding, signalHandler, false);
     }
 
-    public ExternalTerminal(String name, String type,
-                            InputStream masterInput,
-                            OutputStream masterOutput,
-                            Charset encoding,
-                            SignalHandler signalHandler,
-                            boolean paused) throws IOException {
-        this(name, type, masterInput, masterOutput, encoding, signalHandler, paused, null, null);
+    public ExternalTerminal(
+            TerminalProvider provider,
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            SignalHandler signalHandler,
+            boolean paused)
+            throws IOException {
+        this(provider, name, type, masterInput, masterOutput, encoding, signalHandler, paused, null, null);
     }
 
-    public ExternalTerminal(String name, String type,
-                            InputStream masterInput,
-                            OutputStream masterOutput,
-                            Charset encoding,
-                            SignalHandler signalHandler,
-                            boolean paused,
-                            Attributes attributes,
-                            Size size) throws IOException {
+    @SuppressWarnings("this-escape")
+    public ExternalTerminal(
+            TerminalProvider provider,
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException {
         super(name, type, masterOutput, encoding, signalHandler);
+        this.provider = provider;
         this.masterInput = masterInput;
         if (attributes != null) {
             setAttributes(attributes);
@@ -171,4 +186,8 @@ public class ExternalTerminal extends LineDisciplineTerminal {
         return CursorSupport.getCursorPosition(this, discarded);
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return provider;
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/LineDisciplineTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/LineDisciplineTerminal.java
index 0f290379bbf..4e7a396bbc3 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/LineDisciplineTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/LineDisciplineTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,6 +14,7 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
+import java.util.EnumSet;
 import java.util.Objects;
 
 import jdk.internal.org.jline.terminal.Attributes;
@@ -23,6 +24,8 @@ import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
 import jdk.internal.org.jline.terminal.Attributes.OutputFlag;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.NonBlocking;
 import jdk.internal.org.jline.utils.NonBlockingPumpInputStream;
 import jdk.internal.org.jline.utils.NonBlockingReader;
@@ -45,21 +48,6 @@ import jdk.internal.org.jline.utils.NonBlockingReader;
  */
 public class LineDisciplineTerminal extends AbstractTerminal {
 
-    private static final String DEFAULT_TERMINAL_ATTRIBUTES =
-                    "speed 9600 baud; 24 rows; 80 columns;\n" +
-                    "lflags: icanon isig iexten echo echoe -echok echoke -echonl echoctl\n" +
-                    "\t-echoprt -altwerase -noflsh -tostop -flusho pendin -nokerninfo\n" +
-                    "\t-extproc\n" +
-                    "iflags: -istrip icrnl -inlcr -igncr ixon -ixoff ixany imaxbel iutf8\n" +
-                    "\t-ignbrk brkint -inpck -ignpar -parmrk\n" +
-                    "oflags: opost onlcr -oxtabs -onocr -onlret\n" +
-                    "cflags: cread cs8 -parenb -parodd hupcl -clocal -cstopb -crtscts -dsrflow\n" +
-                    "\t-dtrflow -mdmbuf\n" +
-                    "cchars: discard = ^O; dsusp = ^Y; eof = ^D; eol = <undef>;\n" +
-                    "\teol2 = <undef>; erase = ^?; intr = ^C; kill = ^U; lnext = ^V;\n" +
-                    "\tmin = 1; quit = ^\\; reprint = ^R; start = ^Q; status = ^T;\n" +
-                    "\tstop = ^S; susp = ^Z; time = 0; werase = ^W;\n";
-
     private static final int PIPE_SIZE = 1024;
 
     /*
@@ -84,20 +72,20 @@ public class LineDisciplineTerminal extends AbstractTerminal {
      * Console data
      */
     protected final Attributes attributes;
+
     protected final Size size;
 
-    public LineDisciplineTerminal(String name,
-                                  String type,
-                                  OutputStream masterOutput,
-                                  Charset encoding) throws IOException {
+    protected boolean skipNextLf;
+
+    public LineDisciplineTerminal(String name, String type, OutputStream masterOutput, Charset encoding)
+            throws IOException {
         this(name, type, masterOutput, encoding, SignalHandler.SIG_DFL);
     }
 
-    public LineDisciplineTerminal(String name,
-                                  String type,
-                                  OutputStream masterOutput,
-                                  Charset encoding,
-                                  SignalHandler signalHandler) throws IOException {
+    @SuppressWarnings("this-escape")
+    public LineDisciplineTerminal(
+            String name, String type, OutputStream masterOutput, Charset encoding, SignalHandler signalHandler)
+            throws IOException {
         super(name, type, encoding, signalHandler);
         NonBlockingPumpInputStream input = NonBlocking.nonBlockingPumpInputStream(PIPE_SIZE);
         this.slaveInputPipe = input.getOutputStream();
@@ -106,11 +94,66 @@ public class LineDisciplineTerminal extends AbstractTerminal {
         this.slaveOutput = new FilteringOutputStream();
         this.slaveWriter = new PrintWriter(new OutputStreamWriter(slaveOutput, encoding()));
         this.masterOutput = masterOutput;
-        this.attributes = ExecPty.doGetAttr(DEFAULT_TERMINAL_ATTRIBUTES);
+        this.attributes = getDefaultTerminalAttributes();
         this.size = new Size(160, 50);
         parseInfoCmp();
     }
 
+    private static Attributes getDefaultTerminalAttributes() {
+        // speed 9600 baud; 24 rows; 80 columns;
+        // lflags: icanon isig iexten echo echoe -echok echoke -echonl echoctl
+        //     -echoprt -altwerase -noflsh -tostop -flusho pendin -nokerninfo
+        //     -extproc
+        // iflags: -istrip icrnl -inlcr -igncr ixon -ixoff ixany imaxbel iutf8
+        //     -ignbrk brkint -inpck -ignpar -parmrk
+        // oflags: opost onlcr -oxtabs -onocr -onlret
+        // cflags: cread cs8 -parenb -parodd hupcl -clocal -cstopb -crtscts -dsrflow
+        //     -dtrflow -mdmbuf
+        // cchars: discard = ^O; dsusp = ^Y; eof = ^D; eol = <undef>;
+        //     eol2 = <undef>; erase = ^?; intr = ^C; kill = ^U; lnext = ^V;
+        //     min = 1; quit = ^\\; reprint = ^R; start = ^Q; status = ^T;
+        //     stop = ^S; susp = ^Z; time = 0; werase = ^W;
+        Attributes attr = new Attributes();
+        attr.setLocalFlags(EnumSet.of(
+                LocalFlag.ICANON,
+                LocalFlag.ISIG,
+                LocalFlag.IEXTEN,
+                LocalFlag.ECHO,
+                LocalFlag.ECHOE,
+                LocalFlag.ECHOKE,
+                LocalFlag.ECHOCTL,
+                LocalFlag.PENDIN));
+        attr.setInputFlags(EnumSet.of(
+                InputFlag.ICRNL,
+                InputFlag.IXON,
+                InputFlag.IXANY,
+                InputFlag.IMAXBEL,
+                InputFlag.IUTF8,
+                InputFlag.BRKINT));
+        attr.setOutputFlags(EnumSet.of(OutputFlag.OPOST, OutputFlag.ONLCR));
+        attr.setControlChar(ControlChar.VDISCARD, ctrl('O'));
+        attr.setControlChar(ControlChar.VDSUSP, ctrl('Y'));
+        attr.setControlChar(ControlChar.VEOF, ctrl('D'));
+        attr.setControlChar(ControlChar.VERASE, ctrl('?'));
+        attr.setControlChar(ControlChar.VINTR, ctrl('C'));
+        attr.setControlChar(ControlChar.VKILL, ctrl('U'));
+        attr.setControlChar(ControlChar.VLNEXT, ctrl('V'));
+        attr.setControlChar(ControlChar.VMIN, 1);
+        attr.setControlChar(ControlChar.VQUIT, ctrl('\\'));
+        attr.setControlChar(ControlChar.VREPRINT, ctrl('R'));
+        attr.setControlChar(ControlChar.VSTART, ctrl('Q'));
+        attr.setControlChar(ControlChar.VSTATUS, ctrl('T'));
+        attr.setControlChar(ControlChar.VSTOP, ctrl('S'));
+        attr.setControlChar(ControlChar.VSUSP, ctrl('Z'));
+        attr.setControlChar(ControlChar.VTIME, 0);
+        attr.setControlChar(ControlChar.VWERASE, ctrl('W'));
+        return attr;
+    }
+
+    private static int ctrl(char c) {
+        return c == '?' ? 177 : c - 64;
+    }
+
     public NonBlockingReader reader() {
         return slaveReader;
     }
@@ -130,9 +173,7 @@ public class LineDisciplineTerminal extends AbstractTerminal {
     }
 
     public Attributes getAttributes() {
-        Attributes attr = new Attributes();
-        attr.copy(attributes);
-        return attr;
+        return new Attributes(attributes);
     }
 
     public void setAttributes(Attributes attr) {
@@ -149,9 +190,9 @@ public class LineDisciplineTerminal extends AbstractTerminal {
         size.copy(sz);
     }
 
-   @Override
+    @Override
     public void raise(Signal signal) {
-       Objects.requireNonNull(signal);
+        Objects.requireNonNull(signal);
         // Do not call clear() atm as this can cause
         // deadlock between reading / writing threads
         // TODO: any way to fix that ?
@@ -214,7 +255,19 @@ public class LineDisciplineTerminal extends AbstractTerminal {
                 raise(Signal.INFO);
             }
         }
-        if (c == '\r') {
+        if (attributes.getInputFlag(InputFlag.INORMEOL)) {
+            if (c == '\r') {
+                skipNextLf = true;
+                c = '\n';
+            } else if (c == '\n') {
+                if (skipNextLf) {
+                    skipNextLf = false;
+                    return false;
+                }
+            } else {
+                skipNextLf = false;
+            }
+        } else if (c == '\r') {
             if (attributes.getInputFlag(InputFlag.IGNCR)) {
                 return false;
             }
@@ -273,6 +326,16 @@ public class LineDisciplineTerminal extends AbstractTerminal {
         }
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return null;
+    }
+
+    @Override
+    public SystemStream getSystemStream() {
+        return null;
+    }
+
     private class FilteringOutputStream extends OutputStream {
         @Override
         public void write(int b) throws IOException {
@@ -284,13 +347,12 @@ public class LineDisciplineTerminal extends AbstractTerminal {
         public void write(byte[] b, int off, int len) throws IOException {
             if (b == null) {
                 throw new NullPointerException();
-            } else if ((off < 0) || (off > b.length) || (len < 0) ||
-                    ((off + len) > b.length) || ((off + len) < 0)) {
+            } else if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0)) {
                 throw new IndexOutOfBoundsException();
             } else if (len == 0) {
                 return;
             }
-            for (int i = 0 ; i < len ; i++) {
+            for (int i = 0; i < len; i++) {
                 processOutputByte(b[off + i]);
             }
             flush();
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/MouseSupport.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/MouseSupport.java
index 89ae6e5b74a..eef25c90d8f 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/MouseSupport.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/MouseSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,11 +8,6 @@
  */
 package jdk.internal.org.jline.terminal.impl;
 
-import jdk.internal.org.jline.terminal.MouseEvent;
-import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.utils.InfoCmp;
-import jdk.internal.org.jline.utils.InputStreamReader;
-
 import java.io.EOFException;
 import java.io.IOError;
 import java.io.IOException;
@@ -20,6 +15,11 @@ import java.nio.charset.StandardCharsets;
 import java.util.EnumSet;
 import java.util.function.IntSupplier;
 
+import jdk.internal.org.jline.terminal.MouseEvent;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.utils.InfoCmp;
+import jdk.internal.org.jline.utils.InputStreamReader;
+
 public class MouseSupport {
 
     public static boolean hasMouseSupport(Terminal terminal) {
@@ -78,7 +78,8 @@ public class MouseSupport {
                 case 0:
                     button = MouseEvent.Button.Button1;
                     if (last.getButton() == button
-                            && (last.getType() == MouseEvent.Type.Pressed || last.getType() == MouseEvent.Type.Dragged)) {
+                            && (last.getType() == MouseEvent.Type.Pressed
+                                    || last.getType() == MouseEvent.Type.Dragged)) {
                         type = MouseEvent.Type.Dragged;
                     } else {
                         type = MouseEvent.Type.Pressed;
@@ -87,7 +88,8 @@ public class MouseSupport {
                 case 1:
                     button = MouseEvent.Button.Button2;
                     if (last.getButton() == button
-                            && (last.getType() == MouseEvent.Type.Pressed || last.getType() == MouseEvent.Type.Dragged)) {
+                            && (last.getType() == MouseEvent.Type.Pressed
+                                    || last.getType() == MouseEvent.Type.Dragged)) {
                         type = MouseEvent.Type.Dragged;
                     } else {
                         type = MouseEvent.Type.Pressed;
@@ -96,7 +98,8 @@ public class MouseSupport {
                 case 2:
                     button = MouseEvent.Button.Button3;
                     if (last.getButton() == button
-                            && (last.getType() == MouseEvent.Type.Pressed || last.getType() == MouseEvent.Type.Dragged)) {
+                            && (last.getType() == MouseEvent.Type.Pressed
+                                    || last.getType() == MouseEvent.Type.Dragged)) {
                         type = MouseEvent.Type.Dragged;
                     } else {
                         type = MouseEvent.Type.Pressed;
@@ -134,5 +137,4 @@ public class MouseSupport {
             throw new IOError(e);
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/NativeSignalHandler.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/NativeSignalHandler.java
index 00c584c6cb9..bba177794a5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/NativeSignalHandler.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/NativeSignalHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -17,8 +17,7 @@ public final class NativeSignalHandler implements SignalHandler {
 
     public static final NativeSignalHandler SIG_IGN = new NativeSignalHandler();
 
-    private NativeSignalHandler() {
-    }
+    private NativeSignalHandler() {}
 
     public void handle(Signal signal) {
         throw new UnsupportedOperationException();
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixPtyTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixPtyTerminal.java
index f85e3fe0b0c..d34103e4d5e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixPtyTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixPtyTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -38,15 +38,34 @@ public class PosixPtyTerminal extends AbstractPosixTerminal {
     private Thread outputPumpThread;
     private boolean paused = true;
 
-    public PosixPtyTerminal(String name, String type, Pty pty, InputStream in, OutputStream out, Charset encoding) throws IOException {
+    public PosixPtyTerminal(String name, String type, Pty pty, InputStream in, OutputStream out, Charset encoding)
+            throws IOException {
         this(name, type, pty, in, out, encoding, SignalHandler.SIG_DFL);
     }
 
-    public PosixPtyTerminal(String name, String type, Pty pty, InputStream in, OutputStream out, Charset encoding, SignalHandler signalHandler) throws IOException {
+    public PosixPtyTerminal(
+            String name,
+            String type,
+            Pty pty,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            SignalHandler signalHandler)
+            throws IOException {
         this(name, type, pty, in, out, encoding, signalHandler, false);
     }
 
-    public PosixPtyTerminal(String name, String type, Pty pty, InputStream in, OutputStream out, Charset encoding, SignalHandler signalHandler, boolean paused) throws IOException {
+    @SuppressWarnings("this-escape")
+    public PosixPtyTerminal(
+            String name,
+            String type,
+            Pty pty,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            SignalHandler signalHandler,
+            boolean paused)
+            throws IOException {
         super(name, type, pty, encoding, signalHandler);
         this.in = Objects.requireNonNull(in);
         this.out = Objects.requireNonNull(out);
@@ -113,7 +132,7 @@ public class PosixPtyTerminal extends AbstractPosixTerminal {
         if (p1 != null) {
             p1.join();
         }
-        if (p2 !=null) {
+        if (p2 != null) {
             p2.join();
         }
     }
@@ -167,7 +186,7 @@ public class PosixPtyTerminal extends AbstractPosixTerminal {
 
     private void pumpIn() {
         try {
-            for (;;) {
+            for (; ; ) {
                 synchronized (lock) {
                     if (paused) {
                         inputPumpThread = null;
@@ -193,7 +212,7 @@ public class PosixPtyTerminal extends AbstractPosixTerminal {
 
     private void pumpOut() {
         try {
-            for (;;) {
+            for (; ; ) {
                 synchronized (lock) {
                     if (paused) {
                         outputPumpThread = null;
@@ -221,5 +240,4 @@ public class PosixPtyTerminal extends AbstractPosixTerminal {
             // Ignore
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixSysTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixSysTerminal.java
index a55f3d4a748..135ed0bb0c0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixSysTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/PosixSysTerminal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,8 +18,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
 
-import jdk.internal.org.jline.utils.NonBlocking;
 import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.utils.FastBufferedOutputStream;
+import jdk.internal.org.jline.utils.NonBlocking;
 import jdk.internal.org.jline.utils.NonBlockingInputStream;
 import jdk.internal.org.jline.utils.NonBlockingReader;
 import jdk.internal.org.jline.utils.ShutdownHooks;
@@ -35,12 +36,14 @@ public class PosixSysTerminal extends AbstractPosixTerminal {
     protected final Map<Signal, Object> nativeHandlers = new HashMap<>();
     protected final Task closer;
 
-    public PosixSysTerminal(String name, String type, Pty pty, Charset encoding,
-                            boolean nativeSignals, SignalHandler signalHandler,
-                            Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
+    @SuppressWarnings("this-escape")
+    public PosixSysTerminal(
+            String name, String type, Pty pty, Charset encoding, boolean nativeSignals, SignalHandler signalHandler,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         super(name, type, pty, encoding, signalHandler);
         this.input = NonBlocking.nonBlocking(getName(), inputStreamWrapper.apply(pty.getSlaveInput()));
-        this.output = pty.getSlaveOutput();
+        this.output = new FastBufferedOutputStream(pty.getSlaveOutput());
         this.reader = NonBlocking.nonBlocking(getName(), input, encoding());
         this.writer = new PrintWriter(new OutputStreamWriter(output, encoding()));
         parseInfoCmp();
@@ -98,5 +101,4 @@ public class PosixSysTerminal extends AbstractPosixTerminal {
         // Do not call reader.close()
         reader.shutdown();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExecPty.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java
similarity index 71%
rename from src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExecPty.java
rename to src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java
index 5377b4acdb8..c0a35cbd6a2 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ExecPty.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java
@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
  * https://opensource.org/licenses/BSD-3-Clause
  */
-package jdk.internal.org.jline.terminal.impl;
+package jdk.internal.org.jline.terminal.impl.exec;
 
+import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.FileDescriptor;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,8 +26,10 @@ import jdk.internal.org.jline.terminal.Attributes.InputFlag;
 import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
 import jdk.internal.org.jline.terminal.Attributes.OutputFlag;
 import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.terminal.impl.AbstractPty;
 import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.OSUtils;
 
 import static jdk.internal.org.jline.utils.ExecHelper.exec;
@@ -35,28 +37,26 @@ import static jdk.internal.org.jline.utils.ExecHelper.exec;
 public class ExecPty extends AbstractPty implements Pty {
 
     private final String name;
-    private final TerminalProvider.Stream console;
 
-    public static Pty current(TerminalProvider.Stream console) throws IOException {
+    public static Pty current(TerminalProvider provider, SystemStream systemStream) throws IOException {
         try {
             String result = exec(true, OSUtils.TTY_COMMAND);
-            if (console != TerminalProvider.Stream.Output && console != TerminalProvider.Stream.Error) {
-                throw new IllegalArgumentException("console should be Output or Error: " + console);
+            if (systemStream != SystemStream.Output && systemStream != SystemStream.Error) {
+                throw new IllegalArgumentException("systemStream should be Output or Error: " + systemStream);
             }
-            return new ExecPty(result.trim(), console);
+            return new ExecPty(provider, systemStream, result.trim());
         } catch (IOException e) {
             throw new IOException("Not a tty", e);
         }
     }
 
-    protected ExecPty(String name, TerminalProvider.Stream console) {
+    protected ExecPty(TerminalProvider provider, SystemStream systemStream, String name) {
+        super(provider, systemStream);
         this.name = name;
-        this.console = console;
     }
 
     @Override
-    public void close() throws IOException {
-    }
+    public void close() throws IOException {}
 
     public String getName() {
         return name;
@@ -74,18 +74,16 @@ public class ExecPty extends AbstractPty implements Pty {
 
     @Override
     protected InputStream doGetSlaveInput() throws IOException {
-        return console != null
-                ? new FileInputStream(FileDescriptor.in)
-                : new FileInputStream(getName());
+        return systemStream != null ? new FileInputStream(FileDescriptor.in) : new FileInputStream(getName());
     }
 
     @Override
     public OutputStream getSlaveOutput() throws IOException {
-        return console == TerminalProvider.Stream.Output
+        return systemStream == SystemStream.Output
                 ? new FileOutputStream(FileDescriptor.out)
-                : console == TerminalProvider.Stream.Error
-                    ? new FileOutputStream(FileDescriptor.err)
-                    : new FileOutputStream(getName());
+                : systemStream == SystemStream.Error
+                        ? new FileOutputStream(FileDescriptor.err)
+                        : new FileOutputStream(getName());
     }
 
     @Override
@@ -99,18 +97,30 @@ public class ExecPty extends AbstractPty implements Pty {
         List<String> commands = getFlagsToSet(attr, getAttr());
         if (!commands.isEmpty()) {
             commands.add(0, OSUtils.STTY_COMMAND);
-            if (console == null) {
+            if (systemStream == null) {
                 commands.add(1, OSUtils.STTY_F_OPTION);
                 commands.add(2, getName());
             }
-            exec(console != null, commands.toArray(new String[0]));
+            try {
+                exec(systemStream != null, commands.toArray(new String[0]));
+            } catch (IOException e) {
+                // Handle partial failures with GNU stty, see #97
+                if (e.toString().contains("unable to perform all requested operations")) {
+                    commands = getFlagsToSet(attr, getAttr());
+                    if (!commands.isEmpty()) {
+                        throw new IOException("Could not set the following flags: " + String.join(", ", commands), e);
+                    }
+                } else {
+                    throw e;
+                }
+            }
         }
     }
 
     protected List<String> getFlagsToSet(Attributes attr, Attributes current) {
         List<String> commands = new ArrayList<>();
         for (InputFlag flag : InputFlag.values()) {
-            if (attr.getInputFlag(flag) != current.getInputFlag(flag)) {
+            if (attr.getInputFlag(flag) != current.getInputFlag(flag) && flag != InputFlag.INORMEOL) {
                 commands.add((attr.getInputFlag(flag) ? flag.name() : "-" + flag.name()).toLowerCase());
             }
         }
@@ -137,11 +147,9 @@ public class ExecPty extends AbstractPty implements Pty {
                 commands.add(cchar.name().toLowerCase().substring(1));
                 if (cchar == ControlChar.VMIN || cchar == ControlChar.VTIME) {
                     commands.add(Integer.toString(v));
-                }
-                else if (v == 0) {
+                } else if (v == 0) {
                     commands.add(undef);
-                }
-                else {
+                } else {
                     if (v >= 128) {
                         v -= 128;
                         str += "M-";
@@ -165,12 +173,12 @@ public class ExecPty extends AbstractPty implements Pty {
     }
 
     protected String doGetConfig() throws IOException {
-        return console != null
-                ? exec(true,  OSUtils.STTY_COMMAND, "-a")
+        return systemStream != null
+                ? exec(true, OSUtils.STTY_COMMAND, "-a")
                 : exec(false, OSUtils.STTY_COMMAND, OSUtils.STTY_F_OPTION, getName(), "-a");
     }
 
-    static Attributes doGetAttr(String cfg) throws IOException {
+    public static Attributes doGetAttr(String cfg) throws IOException {
         Attributes attributes = new Attributes();
         for (InputFlag flag : InputFlag.values()) {
             Boolean value = doGetFlag(cfg, flag);
@@ -201,16 +209,19 @@ public class ExecPty extends AbstractPty implements Pty {
             if ("reprint".endsWith(name)) {
                 name = "(?:reprint|rprnt)";
             }
-            Matcher matcher = Pattern.compile("[\\s;]" + name + "\\s*=\\s*(.+?)[\\s;]").matcher(cfg);
+            Matcher matcher =
+                    Pattern.compile("[\\s;]" + name + "\\s*=\\s*(.+?)[\\s;]").matcher(cfg);
             if (matcher.find()) {
-                attributes.setControlChar(cchar, parseControlChar(matcher.group(1).toUpperCase()));
+                attributes.setControlChar(
+                        cchar, parseControlChar(matcher.group(1).toUpperCase()));
             }
         }
         return attributes;
     }
 
     private static Boolean doGetFlag(String cfg, Enum<?> flag) {
-        Matcher matcher = Pattern.compile("(?:^|[\\s;])(\\-?" + flag.name().toLowerCase() + ")(?:[\\s;]|$)").matcher(cfg);
+        Matcher matcher = Pattern.compile("(?:^|[\\s;])(\\-?" + flag.name().toLowerCase() + ")(?:[\\s;]|$)")
+                .matcher(cfg);
         return matcher.find() ? !matcher.group(1).startsWith("-") : null;
     }
 
@@ -259,9 +270,7 @@ public class ExecPty extends AbstractPty implements Pty {
 
     static int doGetInt(String name, String cfg) throws IOException {
         String[] patterns = new String[] {
-                "\\b([0-9]+)\\s+" + name + "\\b",
-                "\\b" + name + "\\s+([0-9]+)\\b",
-                "\\b" + name + "\\s*=\\s*([0-9]+)\\b"
+            "\\b([0-9]+)\\s+" + name + "\\b", "\\b" + name + "\\s+([0-9]+)\\b", "\\b" + name + "\\s*=\\s*([0-9]+)\\b"
         };
         for (String pattern : patterns) {
             Matcher matcher = Pattern.compile(pattern).matcher(cfg);
@@ -274,23 +283,29 @@ public class ExecPty extends AbstractPty implements Pty {
 
     @Override
     public void setSize(Size size) throws IOException {
-        if (console != null) {
-            exec(true,
-                 OSUtils.STTY_COMMAND,
-                 "columns", Integer.toString(size.getColumns()),
-                 "rows", Integer.toString(size.getRows()));
+        if (systemStream != null) {
+            exec(
+                    true,
+                    OSUtils.STTY_COMMAND,
+                    "columns",
+                    Integer.toString(size.getColumns()),
+                    "rows",
+                    Integer.toString(size.getRows()));
         } else {
-            exec(false,
-                 OSUtils.STTY_COMMAND,
-                 OSUtils.STTY_F_OPTION, getName(),
-                 "columns", Integer.toString(size.getColumns()),
-                 "rows", Integer.toString(size.getRows()));
+            exec(
+                    false,
+                    OSUtils.STTY_COMMAND,
+                    OSUtils.STTY_F_OPTION,
+                    getName(),
+                    "columns",
+                    Integer.toString(size.getColumns()),
+                    "rows",
+                    Integer.toString(size.getRows()));
         }
     }
 
     @Override
     public String toString() {
-        return "ExecPty[" + getName() + (console != null ? ", system]" : "]");
+        return "ExecPty[" + getName() + (systemStream != null ? ", system]" : "]");
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java
index 8bdeede2e1b..418d3452d4a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, the original author or authors.
+ * Copyright (c) 2022, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -17,117 +17,249 @@ import java.lang.reflect.Field;
 import java.nio.charset.Charset;
 import java.util.function.Function;
 
+//import jdk.internal.org.jline.nativ.JLineLibrary;
+//import jdk.internal.org.jline.nativ.JLineNativeLoader;
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.terminal.impl.ExecPty;
+import jdk.internal.org.jline.terminal.TerminalBuilder;
 import jdk.internal.org.jline.terminal.impl.ExternalTerminal;
 import jdk.internal.org.jline.terminal.impl.PosixSysTerminal;
 import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 import jdk.internal.org.jline.utils.ExecHelper;
+import jdk.internal.org.jline.utils.Log;
 import jdk.internal.org.jline.utils.OSUtils;
 
-public class ExecTerminalProvider implements TerminalProvider
-{
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE_DEFAULT;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE;
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE_REFLECTION;
+
+public class ExecTerminalProvider implements TerminalProvider {
+
+    private static boolean warned;
 
     public String name() {
-        return "exec";
+        return TerminalBuilder.PROP_PROVIDER_EXEC;
     }
 
-    public Pty current(Stream consoleStream) throws IOException {
-        return ExecPty.current(consoleStream);
+    public Pty current(SystemStream systemStream) throws IOException {
+        return ExecPty.current(this, systemStream);
     }
 
     @Override
-    public Terminal sysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
+    public Terminal sysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         if (OSUtils.IS_WINDOWS) {
-            return winSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream, inputStreamWrapper );
+            return winSysTerminal(
+                    name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, systemStream, inputStreamWrapper);
         } else {
-            return posixSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream, inputStreamWrapper );
+            return posixSysTerminal(
+                    name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, systemStream, inputStreamWrapper);
         }
     }
 
-    public Terminal winSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                    boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                    Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper ) throws IOException {
+    public Terminal winSysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
         if (OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM) {
-            Pty pty = current(consoleStream);
+            Pty pty = current(systemStream);
             return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler, inputStreamWrapper);
         } else {
             return null;
         }
     }
 
-    public Terminal posixSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                     boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                     Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        Pty pty = current(consoleStream);
+    public Terminal posixSysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        Pty pty = current(systemStream);
         return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler, inputStreamWrapper);
     }
 
     @Override
-    public Terminal newTerminal(String name, String type, InputStream in, OutputStream out,
-                                Charset encoding, Terminal.SignalHandler signalHandler, boolean paused,
-                                Attributes attributes, Size size) throws IOException
-    {
-        return new ExternalTerminal(name, type, in, out, encoding, signalHandler, paused, attributes, size);
+    public Terminal newTerminal(
+            String name,
+            String type,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException {
+        return new ExternalTerminal(this, name, type, in, out, encoding, signalHandler, paused, attributes, size);
     }
 
     @Override
-    public boolean isSystemStream(Stream stream) {
+    public boolean isSystemStream(SystemStream stream) {
         try {
-            return isWindowsSystemStream(stream) || isPosixSystemStream(stream);
+            return isPosixSystemStream(stream) || isWindowsSystemStream(stream);
         } catch (Throwable t) {
             return false;
         }
     }
 
-    public boolean isWindowsSystemStream(Stream stream) {
-        return systemStreamName( stream ) != null;
+    public boolean isWindowsSystemStream(SystemStream stream) {
+        return systemStreamName(stream) != null;
     }
 
-    public boolean isPosixSystemStream(Stream stream) {
+    public boolean isPosixSystemStream(SystemStream stream) {
         try {
             Process p = new ProcessBuilder(OSUtils.TEST_COMMAND, "-t", Integer.toString(stream.ordinal()))
-                    .inheritIO().start();
+                    .inheritIO()
+                    .start();
             return p.waitFor() == 0;
         } catch (Throwable t) {
+            Log.debug("ExecTerminalProvider failed 'test -t' for " + stream, t);
             // ignore
         }
         return false;
     }
 
     @Override
-    public String systemStreamName(Stream stream) {
+    public String systemStreamName(SystemStream stream) {
         try {
-            ProcessBuilder.Redirect input = stream == Stream.Input
-                                ? ProcessBuilder.Redirect.INHERIT
-                                : getRedirect(stream == Stream.Output ? FileDescriptor.out : FileDescriptor.err);
-            Process p = new ProcessBuilder(OSUtils.TTY_COMMAND).redirectInput(input).start();
+            ProcessBuilder.Redirect input = stream == SystemStream.Input
+                    ? ProcessBuilder.Redirect.INHERIT
+                    : newDescriptor(stream == SystemStream.Output ? FileDescriptor.out : FileDescriptor.err);
+            Process p =
+                    new ProcessBuilder(OSUtils.TTY_COMMAND).redirectInput(input).start();
             String result = ExecHelper.waitAndCapture(p);
             if (p.exitValue() == 0) {
                 return result.trim();
             }
         } catch (Throwable t) {
+            if ("java.lang.reflect.InaccessibleObjectException"
+                            .equals(t.getClass().getName())
+                    && !warned) {
+                Log.warn(
+                        "The ExecTerminalProvider requires the JVM options: '--add-opens java.base/java.lang=ALL-UNNAMED'");
+                warned = true;
+            }
             // ignore
         }
         return null;
     }
 
-    private ProcessBuilder.Redirect getRedirect(FileDescriptor fd) throws ReflectiveOperationException {
-        // This is not really allowed, but this is the only way to redirect the output or error stream
-        // to the input.  This is definitely not something you'd usually want to do, but in the case of
-        // the `tty` utility, it provides a way to get
-        Class<?> rpi = Class.forName("java.lang.ProcessBuilder$RedirectPipeImpl");
-        Constructor<?> cns = rpi.getDeclaredConstructor();
-        cns.setAccessible(true);
-        ProcessBuilder.Redirect input = (ProcessBuilder.Redirect) cns.newInstance();
-        Field f = rpi.getDeclaredField("fd");
-        f.setAccessible(true);
-        f.set(input, fd);
-        return input;
+    @Override
+    public int systemStreamWidth(SystemStream stream) {
+        try (ExecPty pty = new ExecPty(this, stream, null)) {
+            return pty.getSize().getColumns();
+        } catch (Throwable t) {
+            return -1;
+        }
+    }
+
+    private static RedirectPipeCreator redirectPipeCreator;
+
+    protected static ProcessBuilder.Redirect newDescriptor(FileDescriptor fd) {
+        if (redirectPipeCreator == null) {
+            String str = System.getProperty(PROP_REDIRECT_PIPE_CREATION_MODE, PROP_REDIRECT_PIPE_CREATION_MODE_DEFAULT);
+            String[] modes = str.split(",");
+            IllegalStateException ise = new IllegalStateException("Unable to create RedirectPipe");
+            for (String mode : modes) {
+                try {
+                    switch (mode) {
+                        case PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE:
+                            redirectPipeCreator = null;//new NativeRedirectPipeCreator();
+                            break;
+                        case PROP_REDIRECT_PIPE_CREATION_MODE_REFLECTION:
+                            redirectPipeCreator = new ReflectionRedirectPipeCreator();
+                            break;
+                    }
+                } catch (Throwable t) {
+                    // ignore
+                    ise.addSuppressed(t);
+                }
+                if (redirectPipeCreator != null) {
+                    break;
+                }
+            }
+            if (redirectPipeCreator == null) {
+                throw ise;
+            }
+        }
+        return redirectPipeCreator.newRedirectPipe(fd);
+    }
+
+    interface RedirectPipeCreator {
+        ProcessBuilder.Redirect newRedirectPipe(FileDescriptor fd);
+    }
+
+    /**
+     * Reflection based file descriptor creator.
+     * This requires the following option
+     *   --add-opens java.base/java.lang=ALL-UNNAMED
+     */
+    static class ReflectionRedirectPipeCreator implements RedirectPipeCreator {
+        private final Constructor<ProcessBuilder.Redirect> constructor;
+        private final Field fdField;
+
+        @SuppressWarnings("unchecked")
+        ReflectionRedirectPipeCreator() throws Exception {
+            Class<?> rpi = Class.forName("java.lang.ProcessBuilder$RedirectPipeImpl");
+            constructor = (Constructor<ProcessBuilder.Redirect>) rpi.getDeclaredConstructor();
+            constructor.setAccessible(true);
+            fdField = rpi.getDeclaredField("fd");
+            fdField.setAccessible(true);
+        }
+
+        @Override
+        public ProcessBuilder.Redirect newRedirectPipe(FileDescriptor fd) {
+            try {
+                ProcessBuilder.Redirect input = constructor.newInstance();
+                fdField.set(input, fd);
+                return input;
+            } catch (ReflectiveOperationException e) {
+                // This should not happen as the field has been set accessible
+                throw new IllegalStateException(e);
+            }
+        }
+    }
+
+//    static class NativeRedirectPipeCreator implements RedirectPipeCreator {
+//        public NativeRedirectPipeCreator() {
+//            // Force load the library
+//            JLineNativeLoader.initialize();
+//        }
+//
+//        @Override
+//        public ProcessBuilder.Redirect newRedirectPipe(FileDescriptor fd) {
+//            return JLineLibrary.newRedirectPipe(fd);
+//        }
+//    }
+
+    @Override
+    public String toString() {
+        return "TerminalProvider[" + name() + "]";
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java
new file mode 100644
index 00000000000..453ce290d3c
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java
@@ -0,0 +1,1170 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.foreign.*;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.VarHandle;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.utils.OSUtils;
+
+@SuppressWarnings("restricted")
+class CLibrary {
+
+//    private static final Logger logger = Logger.getLogger("org.jline");
+
+    // Window sizes.
+    // @see <a href="http://man7.org/linux/man-pages/man4/tty_ioctl.4.html">IOCTL_TTY(2) man-page</a>
+    static class winsize {
+        static final GroupLayout LAYOUT;
+        private static final VarHandle ws_col;
+        private static final VarHandle ws_row;
+
+        static {
+            LAYOUT = MemoryLayout.structLayout(
+                    ValueLayout.JAVA_SHORT.withName("ws_row"),
+                    ValueLayout.JAVA_SHORT.withName("ws_col"),
+                    ValueLayout.JAVA_SHORT,
+                    ValueLayout.JAVA_SHORT);
+            ws_row = FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("ws_row"));
+            ws_col = FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("ws_col"));
+        }
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        winsize() {
+            seg = java.lang.foreign.Arena.ofAuto().allocate(LAYOUT);
+        }
+
+        winsize(short ws_col, short ws_row) {
+            this();
+            ws_col(ws_col);
+            ws_row(ws_row);
+        }
+
+        java.lang.foreign.MemorySegment segment() {
+            return seg;
+        }
+
+        short ws_col() {
+            return (short) ws_col.get(seg);
+        }
+
+        void ws_col(short col) {
+            ws_col.set(seg, col);
+        }
+
+        short ws_row() {
+            return (short) ws_row.get(seg);
+        }
+
+        void ws_row(short row) {
+            ws_row.set(seg, row);
+        }
+    }
+
+    // termios structure for termios functions, describing a general terminal interface that is
+    // provided to control asynchronous communications ports
+    // @see <a href="http://man7.org/linux/man-pages/man3/termios.3.html">TERMIOS(3) man-page</a>
+    static class termios {
+        static final GroupLayout LAYOUT;
+        private static final VarHandle c_iflag;
+        private static final VarHandle c_oflag;
+        private static final VarHandle c_cflag;
+        private static final VarHandle c_lflag;
+        private static final long c_cc_offset;
+        private static final VarHandle c_ispeed;
+        private static final VarHandle c_ospeed;
+
+        static {
+            if (OSUtils.IS_OSX) {
+                LAYOUT = MemoryLayout.structLayout(
+                        ValueLayout.JAVA_LONG.withName("c_iflag"),
+                        ValueLayout.JAVA_LONG.withName("c_oflag"),
+                        ValueLayout.JAVA_LONG.withName("c_cflag"),
+                        ValueLayout.JAVA_LONG.withName("c_lflag"),
+                        MemoryLayout.sequenceLayout(32, ValueLayout.JAVA_BYTE).withName("c_cc"),
+                        ValueLayout.JAVA_LONG.withName("c_ispeed"),
+                        ValueLayout.JAVA_LONG.withName("c_ospeed"));
+            } else if (OSUtils.IS_LINUX) {
+                LAYOUT = MemoryLayout.structLayout(
+                        ValueLayout.JAVA_INT.withName("c_iflag"),
+                        ValueLayout.JAVA_INT.withName("c_oflag"),
+                        ValueLayout.JAVA_INT.withName("c_cflag"),
+                        ValueLayout.JAVA_INT.withName("c_lflag"),
+                        ValueLayout.JAVA_BYTE.withName("c_line"),
+                        MemoryLayout.sequenceLayout(32, ValueLayout.JAVA_BYTE).withName("c_cc"),
+                        MemoryLayout.paddingLayout(3),
+                        ValueLayout.JAVA_INT.withName("c_ispeed"),
+                        ValueLayout.JAVA_INT.withName("c_ospeed"));
+            } else {
+                throw new IllegalStateException("Unsupported system!");
+            }
+            c_iflag = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_iflag")));
+            c_oflag = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_oflag")));
+            c_cflag = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_cflag")));
+            c_lflag = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_lflag")));
+            c_cc_offset = LAYOUT.byteOffset(MemoryLayout.PathElement.groupElement("c_cc"));
+            c_ispeed = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_ispeed")));
+            c_ospeed = adjust2LinuxHandle(
+                    FfmTerminalProvider.lookupVarHandle(LAYOUT, MemoryLayout.PathElement.groupElement("c_ospeed")));
+        }
+
+        private static VarHandle adjust2LinuxHandle(VarHandle v) {
+            if (OSUtils.IS_LINUX) {
+                MethodHandle id = MethodHandles.identity(int.class);
+                v = MethodHandles.filterValue(
+                        v,
+                        MethodHandles.explicitCastArguments(id, MethodType.methodType(int.class, long.class)),
+                        MethodHandles.explicitCastArguments(id, MethodType.methodType(long.class, int.class)));
+            }
+
+            return v;
+        }
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        termios() {
+            seg = java.lang.foreign.Arena.ofAuto().allocate(LAYOUT);
+        }
+
+        termios(Attributes t) {
+            this();
+            // Input flags
+            long c_iflag = 0;
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IGNBRK), IGNBRK, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.BRKINT), BRKINT, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IGNPAR), IGNPAR, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.PARMRK), PARMRK, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.INPCK), INPCK, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.ISTRIP), ISTRIP, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.INLCR), INLCR, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IGNCR), IGNCR, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.ICRNL), ICRNL, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IXON), IXON, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IXOFF), IXOFF, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IXANY), IXANY, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IMAXBEL), IMAXBEL, c_iflag);
+            c_iflag = setFlag(t.getInputFlag(Attributes.InputFlag.IUTF8), IUTF8, c_iflag);
+            c_iflag(c_iflag);
+            // Output flags
+            long c_oflag = 0;
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OPOST), OPOST, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.ONLCR), ONLCR, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OXTABS), OXTABS, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.ONOEOT), ONOEOT, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OCRNL), OCRNL, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.ONOCR), ONOCR, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.ONLRET), ONLRET, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OFILL), OFILL, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.NLDLY), NLDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.TABDLY), TABDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.CRDLY), CRDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.FFDLY), FFDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.BSDLY), BSDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.VTDLY), VTDLY, c_oflag);
+            c_oflag = setFlag(t.getOutputFlag(Attributes.OutputFlag.OFDEL), OFDEL, c_oflag);
+            c_oflag(c_oflag);
+            // Control flags
+            long c_cflag = 0;
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CIGNORE), CIGNORE, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CS5), CS5, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CS6), CS6, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CS7), CS7, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CS8), CS8, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CSTOPB), CSTOPB, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CREAD), CREAD, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.PARENB), PARENB, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.PARODD), PARODD, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.HUPCL), HUPCL, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CLOCAL), CLOCAL, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CCTS_OFLOW), CCTS_OFLOW, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CRTS_IFLOW), CRTS_IFLOW, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CDTR_IFLOW), CDTR_IFLOW, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CDSR_OFLOW), CDSR_OFLOW, c_cflag);
+            c_cflag = setFlag(t.getControlFlag(Attributes.ControlFlag.CCAR_OFLOW), CCAR_OFLOW, c_cflag);
+            c_cflag(c_cflag);
+            // Local flags
+            long c_lflag = 0;
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOKE), ECHOKE, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOE), ECHOE, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOK), ECHOK, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHO), ECHO, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHONL), ECHONL, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOPRT), ECHOPRT, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ECHOCTL), ECHOCTL, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ISIG), ISIG, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ICANON), ICANON, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.ALTWERASE), ALTWERASE, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.IEXTEN), IEXTEN, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.EXTPROC), EXTPROC, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.TOSTOP), TOSTOP, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.FLUSHO), FLUSHO, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.NOKERNINFO), NOKERNINFO, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.PENDIN), PENDIN, c_lflag);
+            c_lflag = setFlag(t.getLocalFlag(Attributes.LocalFlag.NOFLSH), NOFLSH, c_lflag);
+            c_lflag(c_lflag);
+            // Control chars
+            byte[] c_cc = new byte[20];
+            c_cc[VEOF] = (byte) t.getControlChar(Attributes.ControlChar.VEOF);
+            c_cc[VEOL] = (byte) t.getControlChar(Attributes.ControlChar.VEOL);
+            c_cc[VEOL2] = (byte) t.getControlChar(Attributes.ControlChar.VEOL2);
+            c_cc[VERASE] = (byte) t.getControlChar(Attributes.ControlChar.VERASE);
+            c_cc[VWERASE] = (byte) t.getControlChar(Attributes.ControlChar.VWERASE);
+            c_cc[VKILL] = (byte) t.getControlChar(Attributes.ControlChar.VKILL);
+            c_cc[VREPRINT] = (byte) t.getControlChar(Attributes.ControlChar.VREPRINT);
+            c_cc[VINTR] = (byte) t.getControlChar(Attributes.ControlChar.VINTR);
+            c_cc[VQUIT] = (byte) t.getControlChar(Attributes.ControlChar.VQUIT);
+            c_cc[VSUSP] = (byte) t.getControlChar(Attributes.ControlChar.VSUSP);
+            if (VDSUSP != (-1)) {
+                c_cc[VDSUSP] = (byte) t.getControlChar(Attributes.ControlChar.VDSUSP);
+            }
+            c_cc[VSTART] = (byte) t.getControlChar(Attributes.ControlChar.VSTART);
+            c_cc[VSTOP] = (byte) t.getControlChar(Attributes.ControlChar.VSTOP);
+            c_cc[VLNEXT] = (byte) t.getControlChar(Attributes.ControlChar.VLNEXT);
+            c_cc[VDISCARD] = (byte) t.getControlChar(Attributes.ControlChar.VDISCARD);
+            c_cc[VMIN] = (byte) t.getControlChar(Attributes.ControlChar.VMIN);
+            c_cc[VTIME] = (byte) t.getControlChar(Attributes.ControlChar.VTIME);
+            if (VSTATUS != (-1)) {
+                c_cc[VSTATUS] = (byte) t.getControlChar(Attributes.ControlChar.VSTATUS);
+            }
+            c_cc().copyFrom(java.lang.foreign.MemorySegment.ofArray(c_cc));
+        }
+
+        java.lang.foreign.MemorySegment segment() {
+            return seg;
+        }
+
+        long c_iflag() {
+            return (long) c_iflag.get(seg);
+        }
+
+        void c_iflag(long f) {
+            c_iflag.set(seg, f);
+        }
+
+        long c_oflag() {
+            return (long) c_oflag.get(seg);
+        }
+
+        void c_oflag(long f) {
+            c_oflag.set(seg, f);
+        }
+
+        long c_cflag() {
+            return (long) c_cflag.get(seg);
+        }
+
+        void c_cflag(long f) {
+            c_cflag.set(seg, f);
+        }
+
+        long c_lflag() {
+            return (long) c_lflag.get(seg);
+        }
+
+        void c_lflag(long f) {
+            c_lflag.set(seg, f);
+        }
+
+        java.lang.foreign.MemorySegment c_cc() {
+            return seg.asSlice(c_cc_offset, 20);
+        }
+
+        long c_ispeed() {
+            return (long) c_ispeed.get(seg);
+        }
+
+        void c_ispeed(long f) {
+            c_ispeed.set(seg, f);
+        }
+
+        long c_ospeed() {
+            return (long) c_ospeed.get(seg);
+        }
+
+        void c_ospeed(long f) {
+            c_ospeed.set(seg, f);
+        }
+
+        private static long setFlag(boolean flag, long value, long org) {
+            return flag ? org | value : org;
+        }
+
+        private static <T extends Enum<T>> void addFlag(long value, EnumSet<T> flags, T flag, int v) {
+            if ((value & v) != 0) {
+                flags.add(flag);
+            }
+        }
+
+        public Attributes asAttributes() {
+            Attributes attr = new Attributes();
+            // Input flags
+            long c_iflag = c_iflag();
+            EnumSet<Attributes.InputFlag> iflag = attr.getInputFlags();
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IGNBRK, IGNBRK);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IGNBRK, IGNBRK);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.BRKINT, BRKINT);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IGNPAR, IGNPAR);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.PARMRK, PARMRK);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.INPCK, INPCK);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.ISTRIP, ISTRIP);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.INLCR, INLCR);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IGNCR, IGNCR);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.ICRNL, ICRNL);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IXON, IXON);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IXOFF, IXOFF);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IXANY, IXANY);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IMAXBEL, IMAXBEL);
+            addFlag(c_iflag, iflag, Attributes.InputFlag.IUTF8, IUTF8);
+            // Output flags
+            long c_oflag = c_oflag();
+            EnumSet<Attributes.OutputFlag> oflag = attr.getOutputFlags();
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OPOST, OPOST);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.ONLCR, ONLCR);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OXTABS, OXTABS);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.ONOEOT, ONOEOT);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OCRNL, OCRNL);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.ONOCR, ONOCR);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.ONLRET, ONLRET);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OFILL, OFILL);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.NLDLY, NLDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.TABDLY, TABDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.CRDLY, CRDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.FFDLY, FFDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.BSDLY, BSDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.VTDLY, VTDLY);
+            addFlag(c_oflag, oflag, Attributes.OutputFlag.OFDEL, OFDEL);
+            // Control flags
+            long c_cflag = c_cflag();
+            EnumSet<Attributes.ControlFlag> cflag = attr.getControlFlags();
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CIGNORE, CIGNORE);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CS5, CS5);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CS6, CS6);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CS7, CS7);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CS8, CS8);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CSTOPB, CSTOPB);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CREAD, CREAD);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.PARENB, PARENB);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.PARODD, PARODD);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.HUPCL, HUPCL);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CLOCAL, CLOCAL);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CCTS_OFLOW, CCTS_OFLOW);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CRTS_IFLOW, CRTS_IFLOW);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CDSR_OFLOW, CDSR_OFLOW);
+            addFlag(c_cflag, cflag, Attributes.ControlFlag.CCAR_OFLOW, CCAR_OFLOW);
+            // Local flags
+            long c_lflag = c_lflag();
+            EnumSet<Attributes.LocalFlag> lflag = attr.getLocalFlags();
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOKE, ECHOKE);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOE, ECHOE);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOK, ECHOK);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHO, ECHO);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHONL, ECHONL);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOPRT, ECHOPRT);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ECHOCTL, ECHOCTL);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ISIG, ISIG);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ICANON, ICANON);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.ALTWERASE, ALTWERASE);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.IEXTEN, IEXTEN);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.EXTPROC, EXTPROC);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.TOSTOP, TOSTOP);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.FLUSHO, FLUSHO);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.NOKERNINFO, NOKERNINFO);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.PENDIN, PENDIN);
+            addFlag(c_lflag, lflag, Attributes.LocalFlag.NOFLSH, NOFLSH);
+            // Control chars
+            byte[] c_cc = c_cc().toArray(ValueLayout.JAVA_BYTE);
+            EnumMap<Attributes.ControlChar, Integer> cc = attr.getControlChars();
+            cc.put(Attributes.ControlChar.VEOF, (int) c_cc[VEOF]);
+            cc.put(Attributes.ControlChar.VEOL, (int) c_cc[VEOL]);
+            cc.put(Attributes.ControlChar.VEOL2, (int) c_cc[VEOL2]);
+            cc.put(Attributes.ControlChar.VERASE, (int) c_cc[VERASE]);
+            cc.put(Attributes.ControlChar.VWERASE, (int) c_cc[VWERASE]);
+            cc.put(Attributes.ControlChar.VKILL, (int) c_cc[VKILL]);
+            cc.put(Attributes.ControlChar.VREPRINT, (int) c_cc[VREPRINT]);
+            cc.put(Attributes.ControlChar.VINTR, (int) c_cc[VINTR]);
+            cc.put(Attributes.ControlChar.VQUIT, (int) c_cc[VQUIT]);
+            cc.put(Attributes.ControlChar.VSUSP, (int) c_cc[VSUSP]);
+            if (VDSUSP != (-1)) {
+                cc.put(Attributes.ControlChar.VDSUSP, (int) c_cc[VDSUSP]);
+            }
+            cc.put(Attributes.ControlChar.VSTART, (int) c_cc[VSTART]);
+            cc.put(Attributes.ControlChar.VSTOP, (int) c_cc[VSTOP]);
+            cc.put(Attributes.ControlChar.VLNEXT, (int) c_cc[VLNEXT]);
+            cc.put(Attributes.ControlChar.VDISCARD, (int) c_cc[VDISCARD]);
+            cc.put(Attributes.ControlChar.VMIN, (int) c_cc[VMIN]);
+            cc.put(Attributes.ControlChar.VTIME, (int) c_cc[VTIME]);
+            if (VSTATUS != (-1)) {
+                cc.put(Attributes.ControlChar.VSTATUS, (int) c_cc[VSTATUS]);
+            }
+            // Return
+            return attr;
+        }
+    }
+
+    static MethodHandle ioctl;
+    static MethodHandle isatty;
+    static MethodHandle openpty;
+    static MethodHandle tcsetattr;
+    static MethodHandle tcgetattr;
+    static MethodHandle ttyname_r;
+    static LinkageError openptyError;
+
+    static {
+        // methods
+        Linker linker = Linker.nativeLinker();
+        SymbolLookup lookup = SymbolLookup.loaderLookup().or(linker.defaultLookup());
+        // https://man7.org/linux/man-pages/man2/ioctl.2.html
+        ioctl = linker.downcallHandle(
+                lookup.find("ioctl").get(),
+                FunctionDescriptor.of(
+                        ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.JAVA_LONG, ValueLayout.ADDRESS),
+                Linker.Option.firstVariadicArg(2));
+        // https://www.man7.org/linux/man-pages/man3/isatty.3.html
+        isatty = linker.downcallHandle(
+                lookup.find("isatty").get(), FunctionDescriptor.of(ValueLayout.JAVA_INT, ValueLayout.JAVA_INT));
+        // https://man7.org/linux/man-pages/man3/tcsetattr.3p.html
+        tcsetattr = linker.downcallHandle(
+                lookup.find("tcsetattr").get(),
+                FunctionDescriptor.of(
+                        ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.ADDRESS));
+        // https://man7.org/linux/man-pages/man3/tcgetattr.3p.html
+        tcgetattr = linker.downcallHandle(
+                lookup.find("tcgetattr").get(),
+                FunctionDescriptor.of(ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.ADDRESS));
+        // https://man7.org/linux/man-pages/man3/ttyname.3.html
+        ttyname_r = linker.downcallHandle(
+                lookup.find("ttyname_r").get(),
+                FunctionDescriptor.of(
+                        ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.ADDRESS, ValueLayout.JAVA_LONG));
+        // https://man7.org/linux/man-pages/man3/openpty.3.html
+        LinkageError error = null;
+        Optional<MemorySegment> openPtyAddr = lookup.find("openpty");
+        if (openPtyAddr.isPresent()) {
+            openpty = linker.downcallHandle(
+                    openPtyAddr.get(),
+                    FunctionDescriptor.of(
+                            ValueLayout.JAVA_INT,
+                            ValueLayout.ADDRESS,
+                            ValueLayout.ADDRESS,
+                            ValueLayout.ADDRESS,
+                            ValueLayout.ADDRESS,
+                            ValueLayout.ADDRESS));
+            openptyError = null;
+        } else {
+            openpty = null;
+            openptyError = error;
+        }
+    }
+
+    private static String readFully(InputStream in) throws IOException {
+        int readLen = 0;
+        ByteArrayOutputStream b = new ByteArrayOutputStream();
+        byte[] buf = new byte[32];
+        while ((readLen = in.read(buf, 0, buf.length)) >= 0) {
+            b.write(buf, 0, readLen);
+        }
+        return b.toString();
+    }
+
+    static Size getTerminalSize(int fd) {
+        try {
+            winsize ws = new winsize();
+            int res = (int) ioctl.invoke(fd, (long) TIOCGWINSZ, ws.segment());
+            return new Size(ws.ws_col(), ws.ws_row());
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call ioctl(TIOCGWINSZ)", e);
+        }
+    }
+
+    static void setTerminalSize(int fd, Size size) {
+        try {
+            winsize ws = new winsize();
+            ws.ws_row((short) size.getRows());
+            ws.ws_col((short) size.getColumns());
+            int res = (int) ioctl.invoke(fd, TIOCSWINSZ, ws.segment());
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call ioctl(TIOCSWINSZ)", e);
+        }
+    }
+
+    static Attributes getAttributes(int fd) {
+        try {
+            termios t = new termios();
+            int res = (int) tcgetattr.invoke(fd, t.segment());
+            return t.asAttributes();
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call tcgetattr()", e);
+        }
+    }
+
+    static void setAttributes(int fd, Attributes attr) {
+        try {
+            termios t = new termios(attr);
+            int res = (int) tcsetattr.invoke(fd, TCSANOW, t.segment());
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call tcsetattr()", e);
+        }
+    }
+
+    static boolean isTty(int fd) {
+        try {
+            return (int) isatty.invoke(fd) == 1;
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call isatty()", e);
+        }
+    }
+
+    static String ttyName(int fd) {
+        try {
+            java.lang.foreign.MemorySegment buf =
+                    java.lang.foreign.Arena.ofAuto().allocate(64);
+            int res = (int) ttyname_r.invoke(fd, buf, buf.byteSize());
+            byte[] data = buf.toArray(ValueLayout.JAVA_BYTE);
+            int len = 0;
+            while (data[len] != 0) {
+                len++;
+            }
+            return new String(data, 0, len);
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call ttyname_r()", e);
+        }
+    }
+
+    static Pty openpty(TerminalProvider provider, Attributes attr, Size size) {
+        if (openptyError != null) {
+            throw openptyError;
+        }
+        try {
+            java.lang.foreign.MemorySegment buf =
+                    java.lang.foreign.Arena.ofAuto().allocate(64);
+            java.lang.foreign.MemorySegment master =
+                    java.lang.foreign.Arena.ofAuto().allocate(ValueLayout.JAVA_INT);
+            java.lang.foreign.MemorySegment slave =
+                    java.lang.foreign.Arena.ofAuto().allocate(ValueLayout.JAVA_INT);
+            int res = (int) openpty.invoke(
+                    master,
+                    slave,
+                    buf,
+                    attr != null ? new termios(attr).segment() : java.lang.foreign.MemorySegment.NULL,
+                    size != null
+                            ? new winsize((short) size.getRows(), (short) size.getColumns()).segment()
+                            : java.lang.foreign.MemorySegment.NULL);
+            byte[] str = buf.toArray(ValueLayout.JAVA_BYTE);
+            int len = 0;
+            while (str[len] != 0) {
+                len++;
+            }
+            String device = new String(str, 0, len);
+            return new FfmNativePty(
+                    provider, null, master.get(ValueLayout.JAVA_INT, 0), slave.get(ValueLayout.JAVA_INT, 0), device);
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to call openpty()", e);
+        }
+    }
+
+    // CONSTANTS
+
+    private static final int TIOCGWINSZ;
+    private static final int TIOCSWINSZ;
+
+    private static final int TCSANOW;
+    private static int TCSADRAIN;
+    private static int TCSAFLUSH;
+
+    private static final int VEOF;
+    private static final int VEOL;
+    private static final int VEOL2;
+    private static final int VERASE;
+    private static final int VWERASE;
+    private static final int VKILL;
+    private static final int VREPRINT;
+    private static final int VERASE2;
+    private static final int VINTR;
+    private static final int VQUIT;
+    private static final int VSUSP;
+    private static final int VDSUSP;
+    private static final int VSTART;
+    private static final int VSTOP;
+    private static final int VLNEXT;
+    private static final int VDISCARD;
+    private static final int VMIN;
+    private static final int VSWTC;
+    private static final int VTIME;
+    private static final int VSTATUS;
+
+    private static final int IGNBRK;
+    private static final int BRKINT;
+    private static final int IGNPAR;
+    private static final int PARMRK;
+    private static final int INPCK;
+    private static final int ISTRIP;
+    private static final int INLCR;
+    private static final int IGNCR;
+    private static final int ICRNL;
+    private static int IUCLC;
+    private static final int IXON;
+    private static final int IXOFF;
+    private static final int IXANY;
+    private static final int IMAXBEL;
+    private static int IUTF8;
+
+    private static final int OPOST;
+    private static int OLCUC;
+    private static final int ONLCR;
+    private static int OXTABS;
+    private static int NLDLY;
+    private static int NL0;
+    private static int NL1;
+    private static final int TABDLY;
+    private static int TAB0;
+    private static int TAB1;
+    private static int TAB2;
+    private static int TAB3;
+    private static int CRDLY;
+    private static int CR0;
+    private static int CR1;
+    private static int CR2;
+    private static int CR3;
+    private static int FFDLY;
+    private static int FF0;
+    private static int FF1;
+    private static int XTABS;
+    private static int BSDLY;
+    private static int BS0;
+    private static int BS1;
+    private static int VTDLY;
+    private static int VT0;
+    private static int VT1;
+    private static int CBAUD;
+    private static int B0;
+    private static int B50;
+    private static int B75;
+    private static int B110;
+    private static int B134;
+    private static int B150;
+    private static int B200;
+    private static int B300;
+    private static int B600;
+    private static int B1200;
+    private static int B1800;
+    private static int B2400;
+    private static int B4800;
+    private static int B9600;
+    private static int B19200;
+    private static int B38400;
+    private static int EXTA;
+    private static int EXTB;
+    private static int OFDEL;
+    private static int ONOEOT;
+    private static final int OCRNL;
+    private static int ONOCR;
+    private static final int ONLRET;
+    private static int OFILL;
+
+    private static int CIGNORE;
+    private static int CSIZE;
+    private static final int CS5;
+    private static final int CS6;
+    private static final int CS7;
+    private static final int CS8;
+    private static final int CSTOPB;
+    private static final int CREAD;
+    private static final int PARENB;
+    private static final int PARODD;
+    private static final int HUPCL;
+    private static final int CLOCAL;
+    private static int CCTS_OFLOW;
+    private static int CRTS_IFLOW;
+    private static int CDTR_IFLOW;
+    private static int CDSR_OFLOW;
+    private static int CCAR_OFLOW;
+
+    private static final int ECHOKE;
+    private static final int ECHOE;
+    private static final int ECHOK;
+    private static final int ECHO;
+    private static final int ECHONL;
+    private static final int ECHOPRT;
+    private static final int ECHOCTL;
+    private static final int ISIG;
+    private static final int ICANON;
+    private static int XCASE;
+    private static int ALTWERASE;
+    private static final int IEXTEN;
+    private static final int EXTPROC;
+    private static final int TOSTOP;
+    private static final int FLUSHO;
+    private static int NOKERNINFO;
+    private static final int PENDIN;
+    private static final int NOFLSH;
+
+    static {
+        String osName = System.getProperty("os.name");
+        if (osName.startsWith("Linux")) {
+            String arch = System.getProperty("os.arch");
+            boolean isMipsPpcOrSparc = arch.equals("mips")
+                    || arch.equals("mips64")
+                    || arch.equals("mipsel")
+                    || arch.equals("mips64el")
+                    || arch.startsWith("ppc")
+                    || arch.startsWith("sparc");
+            TIOCGWINSZ = isMipsPpcOrSparc ? 0x40087468 : 0x00005413;
+            TIOCSWINSZ = isMipsPpcOrSparc ? 0x80087467 : 0x00005414;
+
+            TCSANOW = 0x0;
+            TCSADRAIN = 0x1;
+            TCSAFLUSH = 0x2;
+
+            VINTR = 0;
+            VQUIT = 1;
+            VERASE = 2;
+            VKILL = 3;
+            VEOF = 4;
+            VTIME = 5;
+            VMIN = 6;
+            VSWTC = 7;
+            VSTART = 8;
+            VSTOP = 9;
+            VSUSP = 10;
+            VEOL = 11;
+            VREPRINT = 12;
+            VDISCARD = 13;
+            VWERASE = 14;
+            VLNEXT = 15;
+            VEOL2 = 16;
+            VERASE2 = -1;
+            VDSUSP = -1;
+            VSTATUS = -1;
+
+            IGNBRK = 0x0000001;
+            BRKINT = 0x0000002;
+            IGNPAR = 0x0000004;
+            PARMRK = 0x0000008;
+            INPCK = 0x0000010;
+            ISTRIP = 0x0000020;
+            INLCR = 0x0000040;
+            IGNCR = 0x0000080;
+            ICRNL = 0x0000100;
+            IUCLC = 0x0000200;
+            IXON = 0x0000400;
+            IXANY = 0x0000800;
+            IXOFF = 0x0001000;
+            IMAXBEL = 0x0002000;
+            IUTF8 = 0x0004000;
+
+            OPOST = 0x0000001;
+            OLCUC = 0x0000002;
+            ONLCR = 0x0000004;
+            OCRNL = 0x0000008;
+            ONOCR = 0x0000010;
+            ONLRET = 0x0000020;
+            OFILL = 0x0000040;
+            OFDEL = 0x0000080;
+            NLDLY = 0x0000100;
+            NL0 = 0x0000000;
+            NL1 = 0x0000100;
+            CRDLY = 0x0000600;
+            CR0 = 0x0000000;
+            CR1 = 0x0000200;
+            CR2 = 0x0000400;
+            CR3 = 0x0000600;
+            TABDLY = 0x0001800;
+            TAB0 = 0x0000000;
+            TAB1 = 0x0000800;
+            TAB2 = 0x0001000;
+            TAB3 = 0x0001800;
+            XTABS = 0x0001800;
+            BSDLY = 0x0002000;
+            BS0 = 0x0000000;
+            BS1 = 0x0002000;
+            VTDLY = 0x0004000;
+            VT0 = 0x0000000;
+            VT1 = 0x0004000;
+            FFDLY = 0x0008000;
+            FF0 = 0x0000000;
+            FF1 = 0x0008000;
+
+            CBAUD = 0x000100f;
+            B0 = 0x0000000;
+            B50 = 0x0000001;
+            B75 = 0x0000002;
+            B110 = 0x0000003;
+            B134 = 0x0000004;
+            B150 = 0x0000005;
+            B200 = 0x0000006;
+            B300 = 0x0000007;
+            B600 = 0x0000008;
+            B1200 = 0x0000009;
+            B1800 = 0x000000a;
+            B2400 = 0x000000b;
+            B4800 = 0x000000c;
+            B9600 = 0x000000d;
+            B19200 = 0x000000e;
+            B38400 = 0x000000f;
+            EXTA = B19200;
+            EXTB = B38400;
+            CSIZE = 0x0000030;
+            CS5 = 0x0000000;
+            CS6 = 0x0000010;
+            CS7 = 0x0000020;
+            CS8 = 0x0000030;
+            CSTOPB = 0x0000040;
+            CREAD = 0x0000080;
+            PARENB = 0x0000100;
+            PARODD = 0x0000200;
+            HUPCL = 0x0000400;
+            CLOCAL = 0x0000800;
+
+            ISIG = 0x0000001;
+            ICANON = 0x0000002;
+            XCASE = 0x0000004;
+            ECHO = 0x0000008;
+            ECHOE = 0x0000010;
+            ECHOK = 0x0000020;
+            ECHONL = 0x0000040;
+            NOFLSH = 0x0000080;
+            TOSTOP = 0x0000100;
+            ECHOCTL = 0x0000200;
+            ECHOPRT = 0x0000400;
+            ECHOKE = 0x0000800;
+            FLUSHO = 0x0001000;
+            PENDIN = 0x0002000;
+            IEXTEN = 0x0008000;
+            EXTPROC = 0x0010000;
+        } else if (osName.startsWith("Solaris") || osName.startsWith("SunOS")) {
+            int _TIOC = ('T' << 8);
+            TIOCGWINSZ = (_TIOC | 104);
+            TIOCSWINSZ = (_TIOC | 103);
+
+            TCSANOW = 0x0;
+            TCSADRAIN = 0x1;
+            TCSAFLUSH = 0x2;
+
+            VINTR = 0;
+            VQUIT = 1;
+            VERASE = 2;
+            VKILL = 3;
+            VEOF = 4;
+            VTIME = 5;
+            VMIN = 6;
+            VSWTC = 7;
+            VSTART = 8;
+            VSTOP = 9;
+            VSUSP = 10;
+            VEOL = 11;
+            VREPRINT = 12;
+            VDISCARD = 13;
+            VWERASE = 14;
+            VLNEXT = 15;
+            VEOL2 = 16;
+            VERASE2 = -1;
+            VDSUSP = -1;
+            VSTATUS = -1;
+
+            IGNBRK = 0x0000001;
+            BRKINT = 0x0000002;
+            IGNPAR = 0x0000004;
+            PARMRK = 0x0000010;
+            INPCK = 0x0000020;
+            ISTRIP = 0x0000040;
+            INLCR = 0x0000100;
+            IGNCR = 0x0000200;
+            ICRNL = 0x0000400;
+            IUCLC = 0x0001000;
+            IXON = 0x0002000;
+            IXANY = 0x0004000;
+            IXOFF = 0x0010000;
+            IMAXBEL = 0x0020000;
+            IUTF8 = 0x0040000;
+
+            OPOST = 0x0000001;
+            OLCUC = 0x0000002;
+            ONLCR = 0x0000004;
+            OCRNL = 0x0000010;
+            ONOCR = 0x0000020;
+            ONLRET = 0x0000040;
+            OFILL = 0x0000100;
+            OFDEL = 0x0000200;
+            NLDLY = 0x0000400;
+            NL0 = 0x0000000;
+            NL1 = 0x0000400;
+            CRDLY = 0x0003000;
+            CR0 = 0x0000000;
+            CR1 = 0x0001000;
+            CR2 = 0x0002000;
+            CR3 = 0x0003000;
+            TABDLY = 0x0014000;
+            TAB0 = 0x0000000;
+            TAB1 = 0x0004000;
+            TAB2 = 0x0010000;
+            TAB3 = 0x0014000;
+            XTABS = 0x0014000;
+            BSDLY = 0x0020000;
+            BS0 = 0x0000000;
+            BS1 = 0x0020000;
+            VTDLY = 0x0040000;
+            VT0 = 0x0000000;
+            VT1 = 0x0040000;
+            FFDLY = 0x0100000;
+            FF0 = 0x0000000;
+            FF1 = 0x0100000;
+
+            CBAUD = 0x0010017;
+            B0 = 0x0000000;
+            B50 = 0x0000001;
+            B75 = 0x0000002;
+            B110 = 0x0000003;
+            B134 = 0x0000004;
+            B150 = 0x0000005;
+            B200 = 0x0000006;
+            B300 = 0x0000007;
+            B600 = 0x0000010;
+            B1200 = 0x0000011;
+            B1800 = 0x0000012;
+            B2400 = 0x0000013;
+            B4800 = 0x0000014;
+            B9600 = 0x0000015;
+            B19200 = 0x0000016;
+            B38400 = 0x0000017;
+            EXTA = 0xB19200;
+            EXTB = 0xB38400;
+            CSIZE = 0x0000060;
+            CS5 = 0x0000000;
+            CS6 = 0x0000020;
+            CS7 = 0x0000040;
+            CS8 = 0x0000060;
+            CSTOPB = 0x0000100;
+            CREAD = 0x0000200;
+            PARENB = 0x0000400;
+            PARODD = 0x0001000;
+            HUPCL = 0x0002000;
+            CLOCAL = 0x0004000;
+
+            ISIG = 0x0000001;
+            ICANON = 0x0000002;
+            XCASE = 0x0000004;
+            ECHO = 0x0000010;
+            ECHOE = 0x0000020;
+            ECHOK = 0x0000040;
+            ECHONL = 0x0000100;
+            NOFLSH = 0x0000200;
+            TOSTOP = 0x0000400;
+            ECHOCTL = 0x0001000;
+            ECHOPRT = 0x0002000;
+            ECHOKE = 0x0004000;
+            FLUSHO = 0x0010000;
+            PENDIN = 0x0040000;
+            IEXTEN = 0x0100000;
+            EXTPROC = 0x0200000;
+        } else if (osName.startsWith("Mac") || osName.startsWith("Darwin")) {
+            TIOCGWINSZ = 0x40087468;
+            TIOCSWINSZ = 0x80087467;
+
+            TCSANOW = 0x00000000;
+
+            VEOF = 0;
+            VEOL = 1;
+            VEOL2 = 2;
+            VERASE = 3;
+            VWERASE = 4;
+            VKILL = 5;
+            VREPRINT = 6;
+            VINTR = 8;
+            VQUIT = 9;
+            VSUSP = 10;
+            VDSUSP = 11;
+            VSTART = 12;
+            VSTOP = 13;
+            VLNEXT = 14;
+            VDISCARD = 15;
+            VMIN = 16;
+            VTIME = 17;
+            VSTATUS = 18;
+            VERASE2 = -1;
+            VSWTC = -1;
+
+            IGNBRK = 0x00000001;
+            BRKINT = 0x00000002;
+            IGNPAR = 0x00000004;
+            PARMRK = 0x00000008;
+            INPCK = 0x00000010;
+            ISTRIP = 0x00000020;
+            INLCR = 0x00000040;
+            IGNCR = 0x00000080;
+            ICRNL = 0x00000100;
+            IXON = 0x00000200;
+            IXOFF = 0x00000400;
+            IXANY = 0x00000800;
+            IMAXBEL = 0x00002000;
+            IUTF8 = 0x00004000;
+
+            OPOST = 0x00000001;
+            ONLCR = 0x00000002;
+            OXTABS = 0x00000004;
+            ONOEOT = 0x00000008;
+            OCRNL = 0x00000010;
+            ONOCR = 0x00000020;
+            ONLRET = 0x00000040;
+            OFILL = 0x00000080;
+            NLDLY = 0x00000300;
+            TABDLY = 0x00000c04;
+            CRDLY = 0x00003000;
+            FFDLY = 0x00004000;
+            BSDLY = 0x00008000;
+            VTDLY = 0x00010000;
+            OFDEL = 0x00020000;
+
+            CIGNORE = 0x00000001;
+            CS5 = 0x00000000;
+            CS6 = 0x00000100;
+            CS7 = 0x00000200;
+            CS8 = 0x00000300;
+            CSTOPB = 0x00000400;
+            CREAD = 0x00000800;
+            PARENB = 0x00001000;
+            PARODD = 0x00002000;
+            HUPCL = 0x00004000;
+            CLOCAL = 0x00008000;
+            CCTS_OFLOW = 0x00010000;
+            CRTS_IFLOW = 0x00020000;
+            CDTR_IFLOW = 0x00040000;
+            CDSR_OFLOW = 0x00080000;
+            CCAR_OFLOW = 0x00100000;
+
+            ECHOKE = 0x00000001;
+            ECHOE = 0x00000002;
+            ECHOK = 0x00000004;
+            ECHO = 0x00000008;
+            ECHONL = 0x00000010;
+            ECHOPRT = 0x00000020;
+            ECHOCTL = 0x00000040;
+            ISIG = 0x00000080;
+            ICANON = 0x00000100;
+            ALTWERASE = 0x00000200;
+            IEXTEN = 0x00000400;
+            EXTPROC = 0x00000800;
+            TOSTOP = 0x00400000;
+            FLUSHO = 0x00800000;
+            NOKERNINFO = 0x02000000;
+            PENDIN = 0x20000000;
+            NOFLSH = 0x80000000;
+        } else if (osName.startsWith("FreeBSD")) {
+            TIOCGWINSZ = 0x40087468;
+            TIOCSWINSZ = 0x80087467;
+
+            TCSANOW = 0x0;
+            TCSADRAIN = 0x1;
+            TCSAFLUSH = 0x2;
+
+            VEOF = 0;
+            VEOL = 1;
+            VEOL2 = 2;
+            VERASE = 3;
+            VWERASE = 4;
+            VKILL = 5;
+            VREPRINT = 6;
+            VERASE2 = 7;
+            VINTR = 8;
+            VQUIT = 9;
+            VSUSP = 10;
+            VDSUSP = 11;
+            VSTART = 12;
+            VSTOP = 13;
+            VLNEXT = 14;
+            VDISCARD = 15;
+            VMIN = 16;
+            VTIME = 17;
+            VSTATUS = 18;
+            VSWTC = -1;
+
+            IGNBRK = 0x0000001;
+            BRKINT = 0x0000002;
+            IGNPAR = 0x0000004;
+            PARMRK = 0x0000008;
+            INPCK = 0x0000010;
+            ISTRIP = 0x0000020;
+            INLCR = 0x0000040;
+            IGNCR = 0x0000080;
+            ICRNL = 0x0000100;
+            IXON = 0x0000200;
+            IXOFF = 0x0000400;
+            IXANY = 0x0000800;
+            IMAXBEL = 0x0002000;
+
+            OPOST = 0x0000001;
+            ONLCR = 0x0000002;
+            TABDLY = 0x0000004;
+            TAB0 = 0x0000000;
+            TAB3 = 0x0000004;
+            ONOEOT = 0x0000008;
+            OCRNL = 0x0000010;
+            ONLRET = 0x0000040;
+
+            CIGNORE = 0x0000001;
+            CSIZE = 0x0000300;
+            CS5 = 0x0000000;
+            CS6 = 0x0000100;
+            CS7 = 0x0000200;
+            CS8 = 0x0000300;
+            CSTOPB = 0x0000400;
+            CREAD = 0x0000800;
+            PARENB = 0x0001000;
+            PARODD = 0x0002000;
+            HUPCL = 0x0004000;
+            CLOCAL = 0x0008000;
+
+            ECHOKE = 0x0000001;
+            ECHOE = 0x0000002;
+            ECHOK = 0x0000004;
+            ECHO = 0x0000008;
+            ECHONL = 0x0000010;
+            ECHOPRT = 0x0000020;
+            ECHOCTL = 0x0000040;
+            ISIG = 0x0000080;
+            ICANON = 0x0000100;
+            ALTWERASE = 0x000200;
+            IEXTEN = 0x0000400;
+            EXTPROC = 0x0000800;
+            TOSTOP = 0x0400000;
+            FLUSHO = 0x0800000;
+            PENDIN = 0x2000000;
+            NOFLSH = 0x8000000;
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmNativePty.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmNativePty.java
new file mode 100644
index 00000000000..1f8b668115a
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmNativePty.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.impl.AbstractPty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+
+class FfmNativePty extends AbstractPty {
+    private final int master;
+    private final int slave;
+    private final int slaveOut;
+    private final String name;
+    private final FileDescriptor masterFD;
+    private final FileDescriptor slaveFD;
+    private final FileDescriptor slaveOutFD;
+
+    public FfmNativePty(TerminalProvider provider, SystemStream systemStream, int master, int slave, String name) {
+        this(
+                provider,
+                systemStream,
+                master,
+                newDescriptor(master),
+                slave,
+                newDescriptor(slave),
+                slave,
+                newDescriptor(slave),
+                name);
+    }
+
+    public FfmNativePty(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            int master,
+            FileDescriptor masterFD,
+            int slave,
+            FileDescriptor slaveFD,
+            int slaveOut,
+            FileDescriptor slaveOutFD,
+            String name) {
+        super(provider, systemStream);
+        this.master = master;
+        this.slave = slave;
+        this.slaveOut = slaveOut;
+        this.name = name;
+        this.masterFD = masterFD;
+        this.slaveFD = slaveFD;
+        this.slaveOutFD = slaveOutFD;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (master > 0) {
+            getMasterInput().close();
+        }
+        if (slave > 0) {
+            getSlaveInput().close();
+        }
+    }
+
+    public int getMaster() {
+        return master;
+    }
+
+    public int getSlave() {
+        return slave;
+    }
+
+    public int getSlaveOut() {
+        return slaveOut;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public FileDescriptor getMasterFD() {
+        return masterFD;
+    }
+
+    public FileDescriptor getSlaveFD() {
+        return slaveFD;
+    }
+
+    public FileDescriptor getSlaveOutFD() {
+        return slaveOutFD;
+    }
+
+    public InputStream getMasterInput() {
+        return new FileInputStream(getMasterFD());
+    }
+
+    public OutputStream getMasterOutput() {
+        return new FileOutputStream(getMasterFD());
+    }
+
+    protected InputStream doGetSlaveInput() {
+        return new FileInputStream(getSlaveFD());
+    }
+
+    public OutputStream getSlaveOutput() {
+        return new FileOutputStream(getSlaveOutFD());
+    }
+
+    @Override
+    public Attributes getAttr() throws IOException {
+        return CLibrary.getAttributes(slave);
+    }
+
+    @Override
+    protected void doSetAttr(Attributes attr) throws IOException {
+        CLibrary.setAttributes(slave, attr);
+    }
+
+    @Override
+    public Size getSize() throws IOException {
+        return CLibrary.getTerminalSize(slave);
+    }
+
+    @Override
+    public void setSize(Size size) throws IOException {
+        CLibrary.setTerminalSize(slave, size);
+    }
+
+    @Override
+    public String toString() {
+        return "FfmNativePty[" + getName() + "]";
+    }
+
+    public static boolean isPosixSystemStream(SystemStream stream) {
+        switch (stream) {
+            case Input:
+                return CLibrary.isTty(0);
+            case Output:
+                return CLibrary.isTty(1);
+            case Error:
+                return CLibrary.isTty(2);
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    public static String posixSystemStreamName(SystemStream stream) {
+        switch (stream) {
+            case Input:
+                return CLibrary.ttyName(0);
+            case Output:
+                return CLibrary.ttyName(1);
+            case Error:
+                return CLibrary.ttyName(2);
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    public static int systemStreamWidth(SystemStream systemStream) {
+        int fd = systemStream == SystemStream.Output ? 1 : 2;
+        return CLibrary.getTerminalSize(fd).getColumns();
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmTerminalProvider.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmTerminalProvider.java
new file mode 100644
index 00000000000..76f07926b12
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/FfmTerminalProvider.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemoryLayout.PathElement;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.charset.Charset;
+import java.util.function.Function;
+
+import jdk.internal.org.jline.terminal.Attributes;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.Terminal;
+import jdk.internal.org.jline.terminal.TerminalBuilder;
+import jdk.internal.org.jline.terminal.impl.PosixPtyTerminal;
+import jdk.internal.org.jline.terminal.impl.PosixSysTerminal;
+import jdk.internal.org.jline.terminal.spi.Pty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.utils.OSUtils;
+
+public class FfmTerminalProvider implements TerminalProvider {
+
+    public FfmTerminalProvider() {
+        if (!FfmTerminalProvider.class.getModule().isNativeAccessEnabled()) {
+            throw new UnsupportedOperationException(
+                    "Native access is not enabled for the current module: " + FfmTerminalProvider.class.getModule());
+        }
+    }
+
+    @Override
+    public String name() {
+        return TerminalBuilder.PROP_PROVIDER_FFM;
+    }
+
+    @Override
+    public Terminal sysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        if (OSUtils.IS_WINDOWS) {
+            return NativeWinSysTerminal.createTerminal(
+                    this, systemStream, name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, inputStreamWrapper);
+        } else {
+            Pty pty = new FfmNativePty(
+                    this,
+                    systemStream,
+                    -1,
+                    null,
+                    0,
+                    FileDescriptor.in,
+                    systemStream == SystemStream.Output ? 1 : 2,
+                    systemStream == SystemStream.Output ? FileDescriptor.out : FileDescriptor.err,
+                    CLibrary.ttyName(0));
+            return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler, inputStreamWrapper);
+        }
+    }
+
+    @Override
+    public Terminal newTerminal(
+            String name,
+            String type,
+            InputStream in,
+            OutputStream out,
+            Charset encoding,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException {
+        Pty pty = CLibrary.openpty(this, attributes, size);
+        return new PosixPtyTerminal(name, type, pty, in, out, encoding, signalHandler, paused);
+    }
+
+    @Override
+    public boolean isSystemStream(SystemStream stream) {
+        if (OSUtils.IS_WINDOWS) {
+            return isWindowsSystemStream(stream);
+        } else {
+            return isPosixSystemStream(stream);
+        }
+    }
+
+    public boolean isWindowsSystemStream(SystemStream stream) {
+        return NativeWinSysTerminal.isWindowsSystemStream(stream);
+    }
+
+    public boolean isPosixSystemStream(SystemStream stream) {
+        return FfmNativePty.isPosixSystemStream(stream);
+    }
+
+    @Override
+    public String systemStreamName(SystemStream stream) {
+        return FfmNativePty.posixSystemStreamName(stream);
+    }
+
+    @Override
+    public int systemStreamWidth(SystemStream stream) {
+        return FfmNativePty.systemStreamWidth(stream);
+    }
+
+    @Override
+    public String toString() {
+        return "TerminalProvider[" + name() + "]";
+    }
+
+    static VarHandle lookupVarHandle(MemoryLayout layout, PathElement... element) {
+        VarHandle h = layout.varHandle(element);
+
+        // the last parameter of the VarHandle is additional offset, hardcode zero:
+        h = MethodHandles.insertCoordinates(h, h.coordinateTypes().size() - 1, 0L);
+
+        return h;
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
new file mode 100644
index 00000000000..0c485819f57
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
@@ -0,0 +1,927 @@
+/*
+ * Copyright (c) 2009-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.IOException;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.VarHandle;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+@SuppressWarnings({"unused", "restricted"})
+final class Kernel32 {
+
+    public static final int FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000;
+
+    public static final int INVALID_HANDLE_VALUE = -1;
+    public static final int STD_INPUT_HANDLE = -10;
+    public static final int STD_OUTPUT_HANDLE = -11;
+    public static final int STD_ERROR_HANDLE = -12;
+
+    public static final int ENABLE_PROCESSED_INPUT = 0x0001;
+    public static final int ENABLE_LINE_INPUT = 0x0002;
+    public static final int ENABLE_ECHO_INPUT = 0x0004;
+    public static final int ENABLE_WINDOW_INPUT = 0x0008;
+    public static final int ENABLE_MOUSE_INPUT = 0x0010;
+    public static final int ENABLE_INSERT_MODE = 0x0020;
+    public static final int ENABLE_QUICK_EDIT_MODE = 0x0040;
+    public static final int ENABLE_EXTENDED_FLAGS = 0x0080;
+
+    public static final int RIGHT_ALT_PRESSED = 0x0001;
+    public static final int LEFT_ALT_PRESSED = 0x0002;
+    public static final int RIGHT_CTRL_PRESSED = 0x0004;
+    public static final int LEFT_CTRL_PRESSED = 0x0008;
+    public static final int SHIFT_PRESSED = 0x0010;
+
+    public static final int FOREGROUND_BLUE = 0x0001;
+    public static final int FOREGROUND_GREEN = 0x0002;
+    public static final int FOREGROUND_RED = 0x0004;
+    public static final int FOREGROUND_INTENSITY = 0x0008;
+    public static final int BACKGROUND_BLUE = 0x0010;
+    public static final int BACKGROUND_GREEN = 0x0020;
+    public static final int BACKGROUND_RED = 0x0040;
+    public static final int BACKGROUND_INTENSITY = 0x0080;
+
+    // Button state
+    public static final int FROM_LEFT_1ST_BUTTON_PRESSED = 0x0001;
+    public static final int RIGHTMOST_BUTTON_PRESSED = 0x0002;
+    public static final int FROM_LEFT_2ND_BUTTON_PRESSED = 0x0004;
+    public static final int FROM_LEFT_3RD_BUTTON_PRESSED = 0x0008;
+    public static final int FROM_LEFT_4TH_BUTTON_PRESSED = 0x0010;
+
+    // Event flags
+    public static final int MOUSE_MOVED = 0x0001;
+    public static final int DOUBLE_CLICK = 0x0002;
+    public static final int MOUSE_WHEELED = 0x0004;
+    public static final int MOUSE_HWHEELED = 0x0008;
+
+    // Event types
+    public static final short KEY_EVENT = 0x0001;
+    public static final short MOUSE_EVENT = 0x0002;
+    public static final short WINDOW_BUFFER_SIZE_EVENT = 0x0004;
+    public static final short MENU_EVENT = 0x0008;
+    public static final short FOCUS_EVENT = 0x0010;
+
+    public static int WaitForSingleObject(java.lang.foreign.MemorySegment hHandle, int dwMilliseconds) {
+        MethodHandle mh$ = requireNonNull(WaitForSingleObject$MH, "WaitForSingleObject");
+        try {
+            return (int) mh$.invokeExact(hHandle, dwMilliseconds);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static java.lang.foreign.MemorySegment GetStdHandle(int nStdHandle) {
+        MethodHandle mh$ = requireNonNull(GetStdHandle$MH, "GetStdHandle");
+        try {
+            return (java.lang.foreign.MemorySegment) mh$.invokeExact(nStdHandle);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int FormatMessageW(
+            int dwFlags,
+            java.lang.foreign.MemorySegment lpSource,
+            int dwMessageId,
+            int dwLanguageId,
+            java.lang.foreign.MemorySegment lpBuffer,
+            int nSize,
+            java.lang.foreign.MemorySegment Arguments) {
+        MethodHandle mh$ = requireNonNull(FormatMessageW$MH, "FormatMessageW");
+        try {
+            return (int) mh$.invokeExact(dwFlags, lpSource, dwMessageId, dwLanguageId, lpBuffer, nSize, Arguments);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int SetConsoleTextAttribute(java.lang.foreign.MemorySegment hConsoleOutput, short wAttributes) {
+        MethodHandle mh$ = requireNonNull(SetConsoleTextAttribute$MH, "SetConsoleTextAttribute");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, wAttributes);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int SetConsoleMode(java.lang.foreign.MemorySegment hConsoleHandle, int dwMode) {
+        MethodHandle mh$ = requireNonNull(SetConsoleMode$MH, "SetConsoleMode");
+        try {
+            return (int) mh$.invokeExact(hConsoleHandle, dwMode);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int GetConsoleMode(
+            java.lang.foreign.MemorySegment hConsoleHandle, java.lang.foreign.MemorySegment lpMode) {
+        MethodHandle mh$ = requireNonNull(GetConsoleMode$MH, "GetConsoleMode");
+        try {
+            return (int) mh$.invokeExact(hConsoleHandle, lpMode);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int SetConsoleTitleW(java.lang.foreign.MemorySegment lpConsoleTitle) {
+        MethodHandle mh$ = requireNonNull(SetConsoleTitleW$MH, "SetConsoleTitleW");
+        try {
+            return (int) mh$.invokeExact(lpConsoleTitle);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int SetConsoleCursorPosition(java.lang.foreign.MemorySegment hConsoleOutput, COORD dwCursorPosition) {
+        MethodHandle mh$ = requireNonNull(SetConsoleCursorPosition$MH, "SetConsoleCursorPosition");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, dwCursorPosition.seg);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int FillConsoleOutputCharacterW(
+            java.lang.foreign.MemorySegment hConsoleOutput,
+            char cCharacter,
+            int nLength,
+            COORD dwWriteCoord,
+            java.lang.foreign.MemorySegment lpNumberOfCharsWritten) {
+        MethodHandle mh$ = requireNonNull(FillConsoleOutputCharacterW$MH, "FillConsoleOutputCharacterW");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, cCharacter, nLength, dwWriteCoord.seg, lpNumberOfCharsWritten);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int FillConsoleOutputAttribute(
+            java.lang.foreign.MemorySegment hConsoleOutput,
+            short wAttribute,
+            int nLength,
+            COORD dwWriteCoord,
+            java.lang.foreign.MemorySegment lpNumberOfAttrsWritten) {
+        MethodHandle mh$ = requireNonNull(FillConsoleOutputAttribute$MH, "FillConsoleOutputAttribute");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, wAttribute, nLength, dwWriteCoord.seg, lpNumberOfAttrsWritten);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int WriteConsoleW(
+            java.lang.foreign.MemorySegment hConsoleOutput,
+            java.lang.foreign.MemorySegment lpBuffer,
+            int nNumberOfCharsToWrite,
+            java.lang.foreign.MemorySegment lpNumberOfCharsWritten,
+            java.lang.foreign.MemorySegment lpReserved) {
+        MethodHandle mh$ = requireNonNull(WriteConsoleW$MH, "WriteConsoleW");
+        try {
+            return (int) mh$.invokeExact(
+                    hConsoleOutput, lpBuffer, nNumberOfCharsToWrite, lpNumberOfCharsWritten, lpReserved);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int ReadConsoleInputW(
+            java.lang.foreign.MemorySegment hConsoleInput,
+            java.lang.foreign.MemorySegment lpBuffer,
+            int nLength,
+            java.lang.foreign.MemorySegment lpNumberOfEventsRead) {
+        MethodHandle mh$ = requireNonNull(ReadConsoleInputW$MH, "ReadConsoleInputW");
+        try {
+            return (int) mh$.invokeExact(hConsoleInput, lpBuffer, nLength, lpNumberOfEventsRead);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int PeekConsoleInputW(
+            java.lang.foreign.MemorySegment hConsoleInput,
+            java.lang.foreign.MemorySegment lpBuffer,
+            int nLength,
+            java.lang.foreign.MemorySegment lpNumberOfEventsRead) {
+        MethodHandle mh$ = requireNonNull(PeekConsoleInputW$MH, "PeekConsoleInputW");
+        try {
+            return (int) mh$.invokeExact(hConsoleInput, lpBuffer, nLength, lpNumberOfEventsRead);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int GetConsoleScreenBufferInfo(
+            java.lang.foreign.MemorySegment hConsoleOutput, CONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo) {
+        MethodHandle mh$ = requireNonNull(GetConsoleScreenBufferInfo$MH, "GetConsoleScreenBufferInfo");
+        try {
+            return (int) mh$.invokeExact(hConsoleOutput, lpConsoleScreenBufferInfo.seg);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int ScrollConsoleScreenBuffer(
+            java.lang.foreign.MemorySegment hConsoleOutput,
+            SMALL_RECT lpScrollRectangle,
+            SMALL_RECT lpClipRectangle,
+            COORD dwDestinationOrigin,
+            CHAR_INFO lpFill) {
+        MethodHandle mh$ = requireNonNull(ScrollConsoleScreenBufferW$MH, "ScrollConsoleScreenBuffer");
+        try {
+            return (int)
+                    mh$.invokeExact(hConsoleOutput, lpScrollRectangle, lpClipRectangle, dwDestinationOrigin, lpFill);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int GetLastError() {
+        MethodHandle mh$ = requireNonNull(GetLastError$MH, "GetLastError");
+        try {
+            return (int) mh$.invokeExact();
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static int GetFileType(java.lang.foreign.MemorySegment hFile) {
+        MethodHandle mh$ = requireNonNull(GetFileType$MH, "GetFileType");
+        try {
+            return (int) mh$.invokeExact(hFile);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static java.lang.foreign.MemorySegment _get_osfhandle(int fd) {
+        MethodHandle mh$ = requireNonNull(_get_osfhandle$MH, "_get_osfhandle");
+        try {
+            return (java.lang.foreign.MemorySegment) mh$.invokeExact(fd);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+
+    public static INPUT_RECORD[] readConsoleInputHelper(java.lang.foreign.MemorySegment handle, int count, boolean peek)
+            throws IOException {
+        return readConsoleInputHelper(java.lang.foreign.Arena.ofAuto(), handle, count, peek);
+    }
+
+    public static INPUT_RECORD[] readConsoleInputHelper(
+            java.lang.foreign.Arena arena, java.lang.foreign.MemorySegment handle, int count, boolean peek)
+            throws IOException {
+        java.lang.foreign.MemorySegment inputRecordPtr = arena.allocate(INPUT_RECORD.LAYOUT, count);
+        java.lang.foreign.MemorySegment length = arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT, 1);
+        int res = peek
+                ? PeekConsoleInputW(handle, inputRecordPtr, count, length)
+                : ReadConsoleInputW(handle, inputRecordPtr, count, length);
+        if (res == 0) {
+            throw new IOException("ReadConsoleInputW failed: " + getLastErrorMessage());
+        }
+        int len = length.get(java.lang.foreign.ValueLayout.JAVA_INT, 0);
+        return inputRecordPtr
+                .elements(INPUT_RECORD.LAYOUT)
+                .map(INPUT_RECORD::new)
+                .limit(len)
+                .toArray(INPUT_RECORD[]::new);
+    }
+
+    public static String getLastErrorMessage() {
+        int errorCode = GetLastError();
+        return getErrorMessage(errorCode);
+    }
+
+    public static String getErrorMessage(int errorCode) {
+        int bufferSize = 160;
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment data = arena.allocate(bufferSize);
+            FormatMessageW(
+                    FORMAT_MESSAGE_FROM_SYSTEM,
+                    java.lang.foreign.MemorySegment.NULL,
+                    errorCode,
+                    0,
+                    data,
+                    bufferSize,
+                    java.lang.foreign.MemorySegment.NULL);
+            return new String(data.toArray(java.lang.foreign.ValueLayout.JAVA_BYTE), StandardCharsets.UTF_16LE).trim();
+        }
+    }
+
+    private static final java.lang.foreign.SymbolLookup SYMBOL_LOOKUP;
+
+    static {
+        System.loadLibrary("msvcrt");
+        System.loadLibrary("Kernel32");
+        SYMBOL_LOOKUP = java.lang.foreign.SymbolLookup.loaderLookup();
+    }
+
+    static MethodHandle downcallHandle(String name, java.lang.foreign.FunctionDescriptor fdesc) {
+        return SYMBOL_LOOKUP
+                .find(name)
+                .map(addr -> java.lang.foreign.Linker.nativeLinker().downcallHandle(addr, fdesc))
+                .orElse(null);
+    }
+
+    static final java.lang.foreign.ValueLayout.OfBoolean C_BOOL$LAYOUT = java.lang.foreign.ValueLayout.JAVA_BOOLEAN;
+    static final java.lang.foreign.ValueLayout.OfByte C_CHAR$LAYOUT = java.lang.foreign.ValueLayout.JAVA_BYTE;
+    static final java.lang.foreign.ValueLayout.OfChar C_WCHAR$LAYOUT = java.lang.foreign.ValueLayout.JAVA_CHAR;
+    static final java.lang.foreign.ValueLayout.OfShort C_SHORT$LAYOUT = java.lang.foreign.ValueLayout.JAVA_SHORT;
+    static final java.lang.foreign.ValueLayout.OfShort C_WORD$LAYOUT = java.lang.foreign.ValueLayout.JAVA_SHORT;
+    static final java.lang.foreign.ValueLayout.OfInt C_DWORD$LAYOUT = java.lang.foreign.ValueLayout.JAVA_INT;
+    static final java.lang.foreign.ValueLayout.OfInt C_INT$LAYOUT = java.lang.foreign.ValueLayout.JAVA_INT;
+    static final java.lang.foreign.ValueLayout.OfLong C_LONG$LAYOUT = java.lang.foreign.ValueLayout.JAVA_LONG;
+    static final java.lang.foreign.ValueLayout.OfLong C_LONG_LONG$LAYOUT = java.lang.foreign.ValueLayout.JAVA_LONG;
+    static final java.lang.foreign.ValueLayout.OfFloat C_FLOAT$LAYOUT = java.lang.foreign.ValueLayout.JAVA_FLOAT;
+    static final java.lang.foreign.ValueLayout.OfDouble C_DOUBLE$LAYOUT = java.lang.foreign.ValueLayout.JAVA_DOUBLE;
+    static final java.lang.foreign.AddressLayout C_POINTER$LAYOUT = java.lang.foreign.ValueLayout.ADDRESS;
+
+    static final MethodHandle WaitForSingleObject$MH = downcallHandle(
+            "WaitForSingleObject",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_INT$LAYOUT));
+    static final MethodHandle GetStdHandle$MH =
+            downcallHandle("GetStdHandle", java.lang.foreign.FunctionDescriptor.of(C_POINTER$LAYOUT, C_INT$LAYOUT));
+    static final MethodHandle FormatMessageW$MH = downcallHandle(
+            "FormatMessageW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT));
+    static final MethodHandle SetConsoleTextAttribute$MH = downcallHandle(
+            "SetConsoleTextAttribute",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_SHORT$LAYOUT));
+    static final MethodHandle SetConsoleMode$MH = downcallHandle(
+            "SetConsoleMode", java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_INT$LAYOUT));
+    static final MethodHandle GetConsoleMode$MH = downcallHandle(
+            "GetConsoleMode",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_POINTER$LAYOUT));
+
+    static final MethodHandle SetConsoleTitleW$MH =
+            downcallHandle("SetConsoleTitleW", java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle SetConsoleCursorPosition$MH = downcallHandle(
+            "SetConsoleCursorPosition",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, COORD.LAYOUT));
+    static final MethodHandle FillConsoleOutputCharacterW$MH = downcallHandle(
+            "FillConsoleOutputCharacterW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT, C_POINTER$LAYOUT, C_WCHAR$LAYOUT, C_INT$LAYOUT, COORD.LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle FillConsoleOutputAttribute$MH = downcallHandle(
+            "FillConsoleOutputAttribute",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT, C_POINTER$LAYOUT, C_SHORT$LAYOUT, C_INT$LAYOUT, COORD.LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle WriteConsoleW$MH = downcallHandle(
+            "WriteConsoleW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_POINTER$LAYOUT));
+
+    static final MethodHandle ReadConsoleInputW$MH = downcallHandle(
+            "ReadConsoleInputW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT, C_POINTER$LAYOUT, C_POINTER$LAYOUT, C_INT$LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle PeekConsoleInputW$MH = downcallHandle(
+            "PeekConsoleInputW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT, C_POINTER$LAYOUT, C_POINTER$LAYOUT, C_INT$LAYOUT, C_POINTER$LAYOUT));
+
+    static final MethodHandle GetConsoleScreenBufferInfo$MH = downcallHandle(
+            "GetConsoleScreenBufferInfo",
+            java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT, C_POINTER$LAYOUT));
+
+    static final MethodHandle ScrollConsoleScreenBufferW$MH = downcallHandle(
+            "ScrollConsoleScreenBufferW",
+            java.lang.foreign.FunctionDescriptor.of(
+                    C_INT$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    C_POINTER$LAYOUT,
+                    COORD.LAYOUT,
+                    C_POINTER$LAYOUT));
+    static final MethodHandle GetLastError$MH =
+            downcallHandle("GetLastError", java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT));
+    static final MethodHandle GetFileType$MH =
+            downcallHandle("GetFileType", java.lang.foreign.FunctionDescriptor.of(C_INT$LAYOUT, C_POINTER$LAYOUT));
+    static final MethodHandle _get_osfhandle$MH =
+            downcallHandle("_get_osfhandle", java.lang.foreign.FunctionDescriptor.of(C_POINTER$LAYOUT, C_INT$LAYOUT));
+
+    public static final class INPUT_RECORD {
+        static final java.lang.foreign.MemoryLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                java.lang.foreign.ValueLayout.JAVA_SHORT.withName("EventType"),
+                java.lang.foreign.ValueLayout.JAVA_SHORT, // padding
+                java.lang.foreign.MemoryLayout.unionLayout(
+                                KEY_EVENT_RECORD.LAYOUT.withName("KeyEvent"),
+                                MOUSE_EVENT_RECORD.LAYOUT.withName("MouseEvent"),
+                                WINDOW_BUFFER_SIZE_RECORD.LAYOUT.withName("WindowBufferSizeEvent"),
+                                MENU_EVENT_RECORD.LAYOUT.withName("MenuEvent"),
+                                FOCUS_EVENT_RECORD.LAYOUT.withName("FocusEvent"))
+                        .withName("Event"));
+        static final VarHandle EventType$VH = varHandle(LAYOUT, "EventType");
+        static final long Event$OFFSET = byteOffset(LAYOUT, "Event");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public INPUT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public INPUT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public INPUT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public short eventType() {
+            return (short) EventType$VH.get(seg);
+        }
+
+        public KEY_EVENT_RECORD keyEvent() {
+            return new KEY_EVENT_RECORD(seg, Event$OFFSET);
+        }
+
+        public MOUSE_EVENT_RECORD mouseEvent() {
+            return new MOUSE_EVENT_RECORD(seg, Event$OFFSET);
+        }
+
+        public FOCUS_EVENT_RECORD focusEvent() {
+            return new FOCUS_EVENT_RECORD(seg, Event$OFFSET);
+        }
+    }
+
+    public static final class MENU_EVENT_RECORD {
+
+        static final java.lang.foreign.GroupLayout LAYOUT =
+                java.lang.foreign.MemoryLayout.structLayout(C_DWORD$LAYOUT.withName("dwCommandId"));
+        static final VarHandle COMMAND_ID = varHandle(LAYOUT, "dwCommandId");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public MENU_EVENT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public MENU_EVENT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public MENU_EVENT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public int commandId() {
+            return (int) MENU_EVENT_RECORD.COMMAND_ID.get(seg);
+        }
+
+        public void commandId(int commandId) {
+            MENU_EVENT_RECORD.COMMAND_ID.set(seg, commandId);
+        }
+    }
+
+    public static final class FOCUS_EVENT_RECORD {
+
+        static final java.lang.foreign.GroupLayout LAYOUT =
+                java.lang.foreign.MemoryLayout.structLayout(C_INT$LAYOUT.withName("bSetFocus"));
+        static final VarHandle SET_FOCUS = varHandle(LAYOUT, "bSetFocus");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public FOCUS_EVENT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public FOCUS_EVENT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public FOCUS_EVENT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = Objects.requireNonNull(seg);
+        }
+
+        public FOCUS_EVENT_RECORD(java.lang.foreign.MemorySegment seg, long offset) {
+            this.seg = Objects.requireNonNull(seg).asSlice(offset, LAYOUT.byteSize());
+        }
+
+        public boolean setFocus() {
+            return ((int) FOCUS_EVENT_RECORD.SET_FOCUS.get(seg) != 0);
+        }
+
+        public void setFocus(boolean setFocus) {
+            FOCUS_EVENT_RECORD.SET_FOCUS.set(seg, setFocus ? 1 : 0);
+        }
+    }
+
+    public static final class WINDOW_BUFFER_SIZE_RECORD {
+
+        static final java.lang.foreign.GroupLayout LAYOUT =
+                java.lang.foreign.MemoryLayout.structLayout(COORD.LAYOUT.withName("size"));
+        static final long SIZE_OFFSET = byteOffset(LAYOUT, "size");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public WINDOW_BUFFER_SIZE_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public WINDOW_BUFFER_SIZE_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public WINDOW_BUFFER_SIZE_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public COORD size() {
+            return new COORD(seg, SIZE_OFFSET);
+        }
+
+        public String toString() {
+            return "WINDOW_BUFFER_SIZE_RECORD{size=" + this.size() + '}';
+        }
+    }
+
+    public static final class MOUSE_EVENT_RECORD {
+
+        static final java.lang.foreign.MemoryLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                COORD.LAYOUT.withName("dwMousePosition"),
+                C_DWORD$LAYOUT.withName("dwButtonState"),
+                C_DWORD$LAYOUT.withName("dwControlKeyState"),
+                C_DWORD$LAYOUT.withName("dwEventFlags"));
+        static final long MOUSE_POSITION_OFFSET = byteOffset(LAYOUT, "dwMousePosition");
+        static final VarHandle BUTTON_STATE = varHandle(LAYOUT, "dwButtonState");
+        static final VarHandle CONTROL_KEY_STATE = varHandle(LAYOUT, "dwControlKeyState");
+        static final VarHandle EVENT_FLAGS = varHandle(LAYOUT, "dwEventFlags");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public MOUSE_EVENT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public MOUSE_EVENT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public MOUSE_EVENT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = Objects.requireNonNull(seg);
+        }
+
+        public MOUSE_EVENT_RECORD(java.lang.foreign.MemorySegment seg, long offset) {
+            this.seg = Objects.requireNonNull(seg).asSlice(offset, LAYOUT.byteSize());
+        }
+
+        public COORD mousePosition() {
+            return new COORD(seg, MOUSE_POSITION_OFFSET);
+        }
+
+        public int buttonState() {
+            return (int) BUTTON_STATE.get(seg);
+        }
+
+        public int controlKeyState() {
+            return (int) CONTROL_KEY_STATE.get(seg);
+        }
+
+        public int eventFlags() {
+            return (int) EVENT_FLAGS.get(seg);
+        }
+
+        public String toString() {
+            return "MOUSE_EVENT_RECORD{mousePosition=" + mousePosition() + ", buttonState=" + buttonState()
+                    + ", controlKeyState=" + controlKeyState() + ", eventFlags=" + eventFlags() + '}';
+        }
+    }
+
+    public static final class KEY_EVENT_RECORD {
+
+        static final java.lang.foreign.MemoryLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                java.lang.foreign.ValueLayout.JAVA_INT.withName("bKeyDown"),
+                java.lang.foreign.ValueLayout.JAVA_SHORT.withName("wRepeatCount"),
+                java.lang.foreign.ValueLayout.JAVA_SHORT.withName("wVirtualKeyCode"),
+                java.lang.foreign.ValueLayout.JAVA_SHORT.withName("wVirtualScanCode"),
+                java.lang.foreign.MemoryLayout.unionLayout(
+                                java.lang.foreign.ValueLayout.JAVA_CHAR.withName("UnicodeChar"),
+                                java.lang.foreign.ValueLayout.JAVA_BYTE.withName("AsciiChar"))
+                        .withName("uChar"),
+                java.lang.foreign.ValueLayout.JAVA_INT.withName("dwControlKeyState"));
+        static final VarHandle bKeyDown$VH = varHandle(LAYOUT, "bKeyDown");
+        static final VarHandle wRepeatCount$VH = varHandle(LAYOUT, "wRepeatCount");
+        static final VarHandle wVirtualKeyCode$VH = varHandle(LAYOUT, "wVirtualKeyCode");
+        static final VarHandle wVirtualScanCode$VH = varHandle(LAYOUT, "wVirtualScanCode");
+        static final VarHandle UnicodeChar$VH = varHandle(LAYOUT, "uChar", "UnicodeChar");
+        static final VarHandle AsciiChar$VH = varHandle(LAYOUT, "uChar", "AsciiChar");
+        static final VarHandle dwControlKeyState$VH = varHandle(LAYOUT, "dwControlKeyState");
+
+        final java.lang.foreign.MemorySegment seg;
+
+        public KEY_EVENT_RECORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public KEY_EVENT_RECORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public KEY_EVENT_RECORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public KEY_EVENT_RECORD(java.lang.foreign.MemorySegment seg, long offset) {
+            this.seg = Objects.requireNonNull(seg).asSlice(offset, LAYOUT.byteSize());
+        }
+
+        public boolean keyDown() {
+            return ((int) bKeyDown$VH.get(seg)) != 0;
+        }
+
+        public int repeatCount() {
+            return (int) wRepeatCount$VH.get(seg);
+        }
+
+        public short keyCode() {
+            return (short) wVirtualKeyCode$VH.get(seg);
+        }
+
+        public short scanCode() {
+            return (short) wVirtualScanCode$VH.get(seg);
+        }
+
+        public char uchar() {
+            return (char) UnicodeChar$VH.get(seg);
+        }
+
+        public int controlKeyState() {
+            return (int) dwControlKeyState$VH.get(seg);
+        }
+
+        public String toString() {
+            return "KEY_EVENT_RECORD{keyDown=" + this.keyDown() + ", repeatCount=" + this.repeatCount() + ", keyCode="
+                    + this.keyCode() + ", scanCode=" + this.scanCode() + ", uchar=" + this.uchar()
+                    + ", controlKeyState="
+                    + this.controlKeyState() + '}';
+        }
+    }
+
+    public static final class CHAR_INFO {
+
+        static final java.lang.foreign.GroupLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                java.lang.foreign.MemoryLayout.unionLayout(
+                                C_WCHAR$LAYOUT.withName("UnicodeChar"), C_CHAR$LAYOUT.withName("AsciiChar"))
+                        .withName("Char"),
+                C_WORD$LAYOUT.withName("Attributes"));
+        static final VarHandle UnicodeChar$VH = varHandle(LAYOUT, "Char", "UnicodeChar");
+        static final VarHandle Attributes$VH = varHandle(LAYOUT, "Attributes");
+
+        final java.lang.foreign.MemorySegment seg;
+
+        public CHAR_INFO() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public CHAR_INFO(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public CHAR_INFO(java.lang.foreign.Arena arena, char c, short a) {
+            this(arena);
+            UnicodeChar$VH.set(seg, c);
+            Attributes$VH.set(seg, a);
+        }
+
+        public CHAR_INFO(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public char unicodeChar() {
+            return (char) UnicodeChar$VH.get(seg);
+        }
+    }
+
+    public static final class CONSOLE_SCREEN_BUFFER_INFO {
+        static final java.lang.foreign.GroupLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                COORD.LAYOUT.withName("dwSize"),
+                COORD.LAYOUT.withName("dwCursorPosition"),
+                C_WORD$LAYOUT.withName("wAttributes"),
+                SMALL_RECT.LAYOUT.withName("srWindow"),
+                COORD.LAYOUT.withName("dwMaximumWindowSize"));
+        static final long dwSize$OFFSET = byteOffset(LAYOUT, "dwSize");
+        static final long dwCursorPosition$OFFSET = byteOffset(LAYOUT, "dwCursorPosition");
+        static final VarHandle wAttributes$VH = varHandle(LAYOUT, "wAttributes");
+        static final long srWindow$OFFSET = byteOffset(LAYOUT, "srWindow");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public CONSOLE_SCREEN_BUFFER_INFO() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public CONSOLE_SCREEN_BUFFER_INFO(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public CONSOLE_SCREEN_BUFFER_INFO(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public COORD size() {
+            return new COORD(seg, dwSize$OFFSET);
+        }
+
+        public COORD cursorPosition() {
+            return new COORD(seg, dwCursorPosition$OFFSET);
+        }
+
+        public short attributes() {
+            return (short) wAttributes$VH.get(seg);
+        }
+
+        public SMALL_RECT window() {
+            return new SMALL_RECT(seg, srWindow$OFFSET);
+        }
+
+        public int windowWidth() {
+            return this.window().width() + 1;
+        }
+
+        public int windowHeight() {
+            return this.window().height() + 1;
+        }
+
+        public void attributes(short attr) {
+            wAttributes$VH.set(seg, attr);
+        }
+    }
+
+    public static final class COORD {
+
+        static final java.lang.foreign.GroupLayout LAYOUT =
+                java.lang.foreign.MemoryLayout.structLayout(C_SHORT$LAYOUT.withName("x"), C_SHORT$LAYOUT.withName("y"));
+        static final VarHandle x$VH = varHandle(LAYOUT, "x");
+        static final VarHandle y$VH = varHandle(LAYOUT, "y");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public COORD() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public COORD(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public COORD(java.lang.foreign.Arena arena, short x, short y) {
+            this(arena.allocate(LAYOUT));
+            x(x);
+            y(y);
+        }
+
+        public COORD(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public COORD(java.lang.foreign.MemorySegment seg, long offset) {
+            this.seg = Objects.requireNonNull(seg).asSlice(offset, LAYOUT.byteSize());
+        }
+
+        public short x() {
+            return (short) COORD.x$VH.get(seg);
+        }
+
+        public void x(short x) {
+            COORD.x$VH.set(seg, x);
+        }
+
+        public short y() {
+            return (short) COORD.y$VH.get(seg);
+        }
+
+        public void y(short y) {
+            COORD.y$VH.set(seg, y);
+        }
+
+        public COORD copy(java.lang.foreign.Arena arena) {
+            return new COORD(arena.allocate(LAYOUT).copyFrom(seg));
+        }
+    }
+
+    public static final class SMALL_RECT {
+
+        static final java.lang.foreign.GroupLayout LAYOUT = java.lang.foreign.MemoryLayout.structLayout(
+                C_SHORT$LAYOUT.withName("Left"),
+                C_SHORT$LAYOUT.withName("Top"),
+                C_SHORT$LAYOUT.withName("Right"),
+                C_SHORT$LAYOUT.withName("Bottom"));
+        static final VarHandle Left$VH = varHandle(LAYOUT, "Left");
+        static final VarHandle Top$VH = varHandle(LAYOUT, "Top");
+        static final VarHandle Right$VH = varHandle(LAYOUT, "Right");
+        static final VarHandle Bottom$VH = varHandle(LAYOUT, "Bottom");
+
+        private final java.lang.foreign.MemorySegment seg;
+
+        public SMALL_RECT() {
+            this(java.lang.foreign.Arena.ofAuto());
+        }
+
+        public SMALL_RECT(java.lang.foreign.Arena arena) {
+            this(arena.allocate(LAYOUT));
+        }
+
+        public SMALL_RECT(java.lang.foreign.Arena arena, SMALL_RECT rect) {
+            this(arena);
+            left(rect.left());
+            right(rect.right());
+            top(rect.top());
+            bottom(rect.bottom());
+        }
+
+        public SMALL_RECT(java.lang.foreign.MemorySegment seg, long offset) {
+            this(seg.asSlice(offset, LAYOUT.byteSize()));
+        }
+
+        public SMALL_RECT(java.lang.foreign.MemorySegment seg) {
+            this.seg = seg;
+        }
+
+        public short left() {
+            return (short) Left$VH.get(seg);
+        }
+
+        public short top() {
+            return (short) Top$VH.get(seg);
+        }
+
+        public short right() {
+            return (short) Right$VH.get(seg);
+        }
+
+        public short bottom() {
+            return (short) Bottom$VH.get(seg);
+        }
+
+        public short width() {
+            return (short) (this.right() - this.left());
+        }
+
+        public short height() {
+            return (short) (this.bottom() - this.top());
+        }
+
+        public void left(short l) {
+            Left$VH.set(seg, l);
+        }
+
+        public void top(short t) {
+            Top$VH.set(seg, t);
+        }
+
+        public void right(short r) {
+            Right$VH.set(seg, r);
+        }
+
+        public void bottom(short b) {
+            Bottom$VH.set(seg, b);
+        }
+
+        public SMALL_RECT copy(java.lang.foreign.Arena arena) {
+            return new SMALL_RECT(arena.allocate(LAYOUT).copyFrom(seg));
+        }
+    }
+
+    static <T> T requireNonNull(T obj, String symbolName) {
+        if (obj == null) {
+            throw new UnsatisfiedLinkError("unresolved symbol: " + symbolName);
+        }
+        return obj;
+    }
+
+    static VarHandle varHandle(java.lang.foreign.MemoryLayout layout, String name) {
+        return FfmTerminalProvider.lookupVarHandle(
+                layout, java.lang.foreign.MemoryLayout.PathElement.groupElement(name));
+    }
+
+    static VarHandle varHandle(java.lang.foreign.MemoryLayout layout, String e1, String name) {
+        return FfmTerminalProvider.lookupVarHandle(
+                layout,
+                java.lang.foreign.MemoryLayout.PathElement.groupElement(e1),
+                java.lang.foreign.MemoryLayout.PathElement.groupElement(name));
+    }
+
+    static long byteOffset(java.lang.foreign.MemoryLayout layout, String name) {
+        return layout.byteOffset(java.lang.foreign.MemoryLayout.PathElement.groupElement(name));
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinConsoleWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinConsoleWriter.java
new file mode 100644
index 00000000000..55a2ec65055
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinConsoleWriter.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.IOException;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+
+import jdk.internal.org.jline.terminal.impl.AbstractWindowsConsoleWriter;
+
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetStdHandle;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_OUTPUT_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.WriteConsoleW;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.getLastErrorMessage;
+
+class NativeWinConsoleWriter extends AbstractWindowsConsoleWriter {
+
+    private final java.lang.foreign.MemorySegment console = GetStdHandle(STD_OUTPUT_HANDLE);
+
+    @Override
+    protected void writeConsole(char[] text, int len) throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment txt = arena.allocateFrom(ValueLayout.JAVA_CHAR, text);
+            if (WriteConsoleW(console, txt, len, MemorySegment.NULL, MemorySegment.NULL) == 0) {
+                throw new IOException("Failed to write to console: " + getLastErrorMessage());
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java
new file mode 100644
index 00000000000..189fc2808d9
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.BufferedWriter;
+import java.io.IOError;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.util.function.Function;
+import java.util.function.IntConsumer;
+
+import jdk.internal.org.jline.terminal.Cursor;
+import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
+import jdk.internal.org.jline.terminal.spi.TerminalProvider;
+import jdk.internal.org.jline.utils.OSUtils;
+
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.*;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetConsoleMode;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetConsoleScreenBufferInfo;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetStdHandle;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.INPUT_RECORD;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.INVALID_HANDLE_VALUE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.KEY_EVENT_RECORD;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.MOUSE_EVENT_RECORD;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_ERROR_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_INPUT_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_OUTPUT_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SetConsoleMode;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.WaitForSingleObject;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.getLastErrorMessage;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.readConsoleInputHelper;
+
+public class NativeWinSysTerminal extends AbstractWindowsTerminal<java.lang.foreign.MemorySegment> {
+
+    public static NativeWinSysTerminal createTerminal(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            SignalHandler signalHandler,
+            boolean paused,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            // Get input console mode
+            java.lang.foreign.MemorySegment consoleIn = GetStdHandle(STD_INPUT_HANDLE);
+            java.lang.foreign.MemorySegment inMode = allocateInt(arena);
+            if (GetConsoleMode(consoleIn, inMode) == 0) {
+                throw new IOException("Failed to get console mode: " + getLastErrorMessage());
+            }
+            // Get output console and mode
+            java.lang.foreign.MemorySegment console;
+            switch (systemStream) {
+                case Output:
+                    console = GetStdHandle(STD_OUTPUT_HANDLE);
+                    break;
+                case Error:
+                    console = GetStdHandle(STD_ERROR_HANDLE);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
+            }
+            java.lang.foreign.MemorySegment outMode = allocateInt(arena);
+            if (GetConsoleMode(console, outMode) == 0) {
+                throw new IOException("Failed to get console mode: " + getLastErrorMessage());
+            }
+            // Create writer
+            Writer writer;
+            if (ansiPassThrough) {
+                type = type != null ? type : OSUtils.IS_CONEMU ? TYPE_WINDOWS_CONEMU : TYPE_WINDOWS;
+                writer = new NativeWinConsoleWriter();
+            } else {
+                int m = inMode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0);
+                if (enableVtp(console, m)) {
+                    type = type != null ? type : TYPE_WINDOWS_VTP;
+                    writer = new NativeWinConsoleWriter();
+                } else if (OSUtils.IS_CONEMU) {
+                    type = type != null ? type : TYPE_WINDOWS_CONEMU;
+                    writer = new NativeWinConsoleWriter();
+                } else {
+                    type = type != null ? type : TYPE_WINDOWS;
+                    writer = new WindowsAnsiWriter(new BufferedWriter(new NativeWinConsoleWriter()));
+                }
+            }
+            // Create terminal
+            NativeWinSysTerminal terminal = new NativeWinSysTerminal(
+                    provider,
+                    systemStream,
+                    writer,
+                    name,
+                    type,
+                    encoding,
+                    nativeSignals,
+                    signalHandler,
+                    consoleIn,
+                    inMode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0),
+                    console,
+                    outMode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0),
+                    inputStreamWrapper);
+            // Start input pump thread
+            if (!paused) {
+                terminal.resume();
+            }
+            return terminal;
+        }
+    }
+
+    private static boolean enableVtp(java.lang.foreign.MemorySegment console, int m) {
+        return SetConsoleMode(console, m | AbstractWindowsTerminal.ENABLE_VIRTUAL_TERMINAL_PROCESSING) != 0;
+    }
+
+    public static boolean isWindowsSystemStream(SystemStream stream) {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment console;
+            java.lang.foreign.MemorySegment mode = allocateInt(arena);
+            switch (stream) {
+                case Input:
+                    console = GetStdHandle(STD_INPUT_HANDLE);
+                    break;
+                case Output:
+                    console = GetStdHandle(STD_OUTPUT_HANDLE);
+                    break;
+                case Error:
+                    console = GetStdHandle(STD_ERROR_HANDLE);
+                    break;
+                default:
+                    return false;
+            }
+            return GetConsoleMode(console, mode) != 0;
+        }
+    }
+
+    private static java.lang.foreign.MemorySegment allocateInt(java.lang.foreign.Arena arena) {
+        return arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT);
+    }
+
+    NativeWinSysTerminal(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            Writer writer,
+            String name,
+            String type,
+            Charset encoding,
+            boolean nativeSignals,
+            SignalHandler signalHandler,
+            java.lang.foreign.MemorySegment inConsole,
+            int inConsoleMode,
+            java.lang.foreign.MemorySegment outConsole,
+            int outConsoleMode,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException {
+        super(
+                provider,
+                systemStream,
+                writer,
+                name,
+                type,
+                encoding,
+                nativeSignals,
+                signalHandler,
+                inConsole,
+                inConsoleMode,
+                outConsole,
+                outConsoleMode,
+                inputStreamWrapper);
+    }
+
+    @Override
+    protected int getConsoleMode(java.lang.foreign.MemorySegment console) {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment mode = arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT);
+            if (GetConsoleMode(console, mode) == 0) {
+                return -1;
+            }
+            return mode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0);
+        }
+    }
+
+    @Override
+    protected void setConsoleMode(java.lang.foreign.MemorySegment console, int mode) {
+        SetConsoleMode(console, mode);
+    }
+
+    public Size getSize() {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            CONSOLE_SCREEN_BUFFER_INFO info = new CONSOLE_SCREEN_BUFFER_INFO(arena);
+            GetConsoleScreenBufferInfo(outConsole, info);
+            return new Size(info.windowWidth(), info.windowHeight());
+        }
+    }
+
+    @Override
+    public Size getBufferSize() {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            CONSOLE_SCREEN_BUFFER_INFO info = new CONSOLE_SCREEN_BUFFER_INFO(arena);
+            GetConsoleScreenBufferInfo(outConsole, info);
+            return new Size(info.size().x(), info.size().y());
+        }
+    }
+
+    protected boolean processConsoleInput() throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            INPUT_RECORD[] events;
+            if (inConsole != null
+                    && inConsole.address() != INVALID_HANDLE_VALUE
+                    && WaitForSingleObject(inConsole, 100) == 0) {
+                events = readConsoleInputHelper(arena, inConsole, 1, false);
+            } else {
+                return false;
+            }
+
+            boolean flush = false;
+            for (INPUT_RECORD event : events) {
+                int eventType = event.eventType();
+                if (eventType == KEY_EVENT) {
+                    KEY_EVENT_RECORD keyEvent = event.keyEvent();
+                    processKeyEvent(
+                            keyEvent.keyDown(), keyEvent.keyCode(), keyEvent.uchar(), keyEvent.controlKeyState());
+                    flush = true;
+                } else if (eventType == WINDOW_BUFFER_SIZE_EVENT) {
+                    raise(Signal.WINCH);
+                } else if (eventType == MOUSE_EVENT) {
+                    processMouseEvent(event.mouseEvent());
+                    flush = true;
+                } else if (eventType == FOCUS_EVENT) {
+                    processFocusEvent(event.focusEvent().setFocus());
+                }
+            }
+
+            return flush;
+        }
+    }
+
+    private final char[] focus = new char[] {'\033', '[', ' '};
+
+    private void processFocusEvent(boolean hasFocus) throws IOException {
+        if (focusTracking) {
+            focus[2] = hasFocus ? 'I' : 'O';
+            slaveInputPipe.write(focus);
+        }
+    }
+
+    private final char[] mouse = new char[] {'\033', '[', 'M', ' ', ' ', ' '};
+
+    private void processMouseEvent(MOUSE_EVENT_RECORD mouseEvent) throws IOException {
+        int dwEventFlags = mouseEvent.eventFlags();
+        int dwButtonState = mouseEvent.buttonState();
+        if (tracking == MouseTracking.Off
+                || tracking == MouseTracking.Normal && dwEventFlags == MOUSE_MOVED
+                || tracking == MouseTracking.Button && dwEventFlags == MOUSE_MOVED && dwButtonState == 0) {
+            return;
+        }
+        int cb = 0;
+        dwEventFlags &= ~DOUBLE_CLICK; // Treat double-clicks as normal
+        if (dwEventFlags == MOUSE_WHEELED) {
+            cb |= 64;
+            if ((dwButtonState >> 16) < 0) {
+                cb |= 1;
+            }
+        } else if (dwEventFlags == MOUSE_HWHEELED) {
+            return;
+        } else if ((dwButtonState & FROM_LEFT_1ST_BUTTON_PRESSED) != 0) {
+            cb |= 0x00;
+        } else if ((dwButtonState & RIGHTMOST_BUTTON_PRESSED) != 0) {
+            cb |= 0x01;
+        } else if ((dwButtonState & FROM_LEFT_2ND_BUTTON_PRESSED) != 0) {
+            cb |= 0x02;
+        } else {
+            cb |= 0x03;
+        }
+        int cx = mouseEvent.mousePosition().x();
+        int cy = mouseEvent.mousePosition().y();
+        mouse[3] = (char) (' ' + cb);
+        mouse[4] = (char) (' ' + cx + 1);
+        mouse[5] = (char) (' ' + cy + 1);
+        slaveInputPipe.write(mouse);
+    }
+
+    @Override
+    public Cursor getCursorPosition(IntConsumer discarded) {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            CONSOLE_SCREEN_BUFFER_INFO info = new CONSOLE_SCREEN_BUFFER_INFO(arena);
+            if (GetConsoleScreenBufferInfo(outConsole, info) == 0) {
+                throw new IOError(new IOException("Could not get the cursor position: " + getLastErrorMessage()));
+            }
+            return new Cursor(info.cursorPosition().x(), info.cursorPosition().y());
+        }
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/WindowsAnsiWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/WindowsAnsiWriter.java
new file mode 100644
index 00000000000..6330e975952
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/WindowsAnsiWriter.java
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 2022-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.impl.ffm;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import jdk.internal.org.jline.utils.AnsiWriter;
+import jdk.internal.org.jline.utils.Colors;
+
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.BACKGROUND_BLUE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.BACKGROUND_GREEN;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.BACKGROUND_INTENSITY;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.BACKGROUND_RED;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.CHAR_INFO;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.CONSOLE_SCREEN_BUFFER_INFO;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.COORD;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FOREGROUND_BLUE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FOREGROUND_GREEN;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FOREGROUND_INTENSITY;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FOREGROUND_RED;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FillConsoleOutputAttribute;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.FillConsoleOutputCharacterW;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetConsoleScreenBufferInfo;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.GetStdHandle;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SMALL_RECT;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.STD_OUTPUT_HANDLE;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.ScrollConsoleScreenBuffer;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SetConsoleCursorPosition;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SetConsoleTextAttribute;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.SetConsoleTitleW;
+import static jdk.internal.org.jline.terminal.impl.ffm.Kernel32.getLastErrorMessage;
+
+class WindowsAnsiWriter extends AnsiWriter {
+
+    private static final java.lang.foreign.MemorySegment console = GetStdHandle(STD_OUTPUT_HANDLE);
+
+    private static final short FOREGROUND_BLACK = 0;
+    private static final short FOREGROUND_YELLOW = (short) (FOREGROUND_RED | FOREGROUND_GREEN);
+    private static final short FOREGROUND_MAGENTA = (short) (FOREGROUND_BLUE | FOREGROUND_RED);
+    private static final short FOREGROUND_CYAN = (short) (FOREGROUND_BLUE | FOREGROUND_GREEN);
+    private static final short FOREGROUND_WHITE = (short) (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
+
+    private static final short BACKGROUND_BLACK = 0;
+    private static final short BACKGROUND_YELLOW = (short) (BACKGROUND_RED | BACKGROUND_GREEN);
+    private static final short BACKGROUND_MAGENTA = (short) (BACKGROUND_BLUE | BACKGROUND_RED);
+    private static final short BACKGROUND_CYAN = (short) (BACKGROUND_BLUE | BACKGROUND_GREEN);
+    private static final short BACKGROUND_WHITE = (short) (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE);
+
+    private static final short[] ANSI_FOREGROUND_COLOR_MAP = {
+        FOREGROUND_BLACK,
+        FOREGROUND_RED,
+        FOREGROUND_GREEN,
+        FOREGROUND_YELLOW,
+        FOREGROUND_BLUE,
+        FOREGROUND_MAGENTA,
+        FOREGROUND_CYAN,
+        FOREGROUND_WHITE,
+    };
+
+    private static final short[] ANSI_BACKGROUND_COLOR_MAP = {
+        BACKGROUND_BLACK,
+        BACKGROUND_RED,
+        BACKGROUND_GREEN,
+        BACKGROUND_YELLOW,
+        BACKGROUND_BLUE,
+        BACKGROUND_MAGENTA,
+        BACKGROUND_CYAN,
+        BACKGROUND_WHITE,
+    };
+
+    private final CONSOLE_SCREEN_BUFFER_INFO info = new CONSOLE_SCREEN_BUFFER_INFO(java.lang.foreign.Arena.ofAuto());
+    private final short originalColors;
+
+    private boolean negative;
+    private boolean bold;
+    private boolean underline;
+    private short savedX = -1;
+    private short savedY = -1;
+
+    public WindowsAnsiWriter(Writer out) throws IOException {
+        super(out);
+        getConsoleInfo();
+        originalColors = info.attributes();
+    }
+
+    private void getConsoleInfo() throws IOException {
+        out.flush();
+        if (GetConsoleScreenBufferInfo(console, info) == 0) {
+            throw new IOException("Could not get the screen info: " + getLastErrorMessage());
+        }
+        if (negative) {
+            info.attributes(invertAttributeColors(info.attributes()));
+        }
+    }
+
+    private void applyAttribute() throws IOException {
+        out.flush();
+        short attributes = info.attributes();
+        // bold is simulated by high foreground intensity
+        if (bold) {
+            attributes |= FOREGROUND_INTENSITY;
+        }
+        // underline is simulated by high foreground intensity
+        if (underline) {
+            attributes |= BACKGROUND_INTENSITY;
+        }
+        if (negative) {
+            attributes = invertAttributeColors(attributes);
+        }
+        if (SetConsoleTextAttribute(console, attributes) == 0) {
+            throw new IOException(getLastErrorMessage());
+        }
+    }
+
+    private short invertAttributeColors(short attributes) {
+        // Swap the the Foreground and Background bits.
+        int fg = 0x000F & attributes;
+        fg <<= 4;
+        int bg = 0X00F0 & attributes;
+        bg >>= 4;
+        attributes = (short) ((attributes & 0xFF00) | fg | bg);
+        return attributes;
+    }
+
+    private void applyCursorPosition() throws IOException {
+        info.cursorPosition().x((short)
+                Math.max(0, Math.min(info.size().x() - 1, info.cursorPosition().x())));
+        info.cursorPosition().y((short)
+                Math.max(0, Math.min(info.size().y() - 1, info.cursorPosition().y())));
+        if (SetConsoleCursorPosition(console, info.cursorPosition()) == 0) {
+            throw new IOException(getLastErrorMessage());
+        }
+    }
+
+    @Override
+    protected void processEraseScreen(int eraseOption) throws IOException {
+        getConsoleInfo();
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment written = arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT);
+            switch (eraseOption) {
+                case ERASE_SCREEN -> {
+                    COORD topLeft = new COORD(arena, (short) 0, info.window().top());
+                    int screenLength = info.window().height() * info.size().x();
+                    FillConsoleOutputAttribute(console, originalColors, screenLength, topLeft, written);
+                    FillConsoleOutputCharacterW(console, ' ', screenLength, topLeft, written);
+                }
+                case ERASE_SCREEN_TO_BEGINING -> {
+                    COORD topLeft2 = new COORD(arena, (short) 0, info.window().top());
+                    int lengthToCursor =
+                            (info.cursorPosition().y() - info.window().top())
+                                            * info.size().x()
+                                    + info.cursorPosition().x();
+                    FillConsoleOutputAttribute(console, originalColors, lengthToCursor, topLeft2, written);
+                    FillConsoleOutputCharacterW(console, ' ', lengthToCursor, topLeft2, written);
+                }
+                case ERASE_SCREEN_TO_END -> {
+                    int lengthToEnd =
+                            (info.window().bottom() - info.cursorPosition().y())
+                                            * info.size().x()
+                                    + (info.size().x() - info.cursorPosition().x());
+                    FillConsoleOutputAttribute(console, originalColors, lengthToEnd, info.cursorPosition(), written);
+                    FillConsoleOutputCharacterW(console, ' ', lengthToEnd, info.cursorPosition(), written);
+                }
+                default -> {}
+            }
+        }
+    }
+
+    @Override
+    protected void processEraseLine(int eraseOption) throws IOException {
+        getConsoleInfo();
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment written = arena.allocate(java.lang.foreign.ValueLayout.JAVA_INT);
+            switch (eraseOption) {
+                case ERASE_LINE -> {
+                    COORD leftColCurrRow =
+                            new COORD(arena, (short) 0, info.cursorPosition().y());
+                    FillConsoleOutputAttribute(
+                            console, originalColors, info.size().x(), leftColCurrRow, written);
+                    FillConsoleOutputCharacterW(console, ' ', info.size().x(), leftColCurrRow, written);
+                }
+                case ERASE_LINE_TO_BEGINING -> {
+                    COORD leftColCurrRow2 =
+                            new COORD(arena, (short) 0, info.cursorPosition().y());
+                    FillConsoleOutputAttribute(
+                            console, originalColors, info.cursorPosition().x(), leftColCurrRow2, written);
+                    FillConsoleOutputCharacterW(
+                            console, ' ', info.cursorPosition().x(), leftColCurrRow2, written);
+                }
+                case ERASE_LINE_TO_END -> {
+                    int lengthToLastCol =
+                            info.size().x() - info.cursorPosition().x();
+                    FillConsoleOutputAttribute(
+                            console, originalColors, lengthToLastCol, info.cursorPosition(), written);
+                    FillConsoleOutputCharacterW(console, ' ', lengthToLastCol, info.cursorPosition(), written);
+                }
+                default -> {}
+            }
+        }
+    }
+
+    protected void processCursorUpLine(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) 0);
+        info.cursorPosition().y((short) (info.cursorPosition().y() - count));
+        applyCursorPosition();
+    }
+
+    protected void processCursorDownLine(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) 0);
+        info.cursorPosition().y((short) (info.cursorPosition().y() + count));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorLeft(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) (info.cursorPosition().x() - count));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorRight(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) (info.cursorPosition().x() + count));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorDown(int count) throws IOException {
+        getConsoleInfo();
+        int nb = Math.max(0, info.cursorPosition().y() + count - info.size().y() + 1);
+        if (nb != count) {
+            info.cursorPosition().y((short) (info.cursorPosition().y() + count));
+            applyCursorPosition();
+        }
+        if (nb > 0) {
+            try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+                SMALL_RECT scroll = new SMALL_RECT(arena, info.window());
+                scroll.top((short) 0);
+                COORD org = new COORD(arena);
+                org.x((short) 0);
+                org.y((short) (-nb));
+                CHAR_INFO info = new CHAR_INFO(arena, ' ', originalColors);
+                ScrollConsoleScreenBuffer(console, scroll, scroll, org, info);
+            }
+        }
+    }
+
+    @Override
+    protected void processCursorUp(int count) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().y((short) (info.cursorPosition().y() - count));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorTo(int row, int col) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().y((short) (info.window().top() + row - 1));
+        info.cursorPosition().x((short) (col - 1));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processCursorToColumn(int x) throws IOException {
+        getConsoleInfo();
+        info.cursorPosition().x((short) (x - 1));
+        applyCursorPosition();
+    }
+
+    @Override
+    protected void processSetForegroundColorExt(int paletteIndex) throws IOException {
+        int color = Colors.roundColor(paletteIndex, 16);
+        info.attributes((short) ((info.attributes() & ~0x0007) | ANSI_FOREGROUND_COLOR_MAP[color & 0x07]));
+        info.attributes(
+                (short) ((info.attributes() & ~FOREGROUND_INTENSITY) | (color >= 8 ? FOREGROUND_INTENSITY : 0)));
+        applyAttribute();
+    }
+
+    @Override
+    protected void processSetBackgroundColorExt(int paletteIndex) throws IOException {
+        int color = Colors.roundColor(paletteIndex, 16);
+        info.attributes((short) ((info.attributes() & ~0x0070) | ANSI_BACKGROUND_COLOR_MAP[color & 0x07]));
+        info.attributes(
+                (short) ((info.attributes() & ~BACKGROUND_INTENSITY) | (color >= 8 ? BACKGROUND_INTENSITY : 0)));
+        applyAttribute();
+    }
+
+    @Override
+    protected void processDefaultTextColor() throws IOException {
+        info.attributes((short) ((info.attributes() & ~0x000F) | (originalColors & 0xF)));
+        info.attributes((short) (info.attributes() & ~FOREGROUND_INTENSITY));
+        applyAttribute();
+    }
+
+    @Override
+    protected void processDefaultBackgroundColor() throws IOException {
+        info.attributes((short) ((info.attributes() & ~0x00F0) | (originalColors & 0xF0)));
+        info.attributes((short) (info.attributes() & ~BACKGROUND_INTENSITY));
+        applyAttribute();
+    }
+
+    @Override
+    protected void processAttributeRest() throws IOException {
+        info.attributes((short) ((info.attributes() & ~0x00FF) | originalColors));
+        this.negative = false;
+        this.bold = false;
+        this.underline = false;
+        applyAttribute();
+    }
+
+    @Override
+    protected void processSetAttribute(int attribute) throws IOException {
+        switch (attribute) {
+            case ATTRIBUTE_INTENSITY_BOLD -> {
+                bold = true;
+                applyAttribute();
+            }
+            case ATTRIBUTE_INTENSITY_NORMAL -> {
+                bold = false;
+                applyAttribute();
+            }
+            case ATTRIBUTE_UNDERLINE -> {
+                underline = true;
+                applyAttribute();
+            }
+            case ATTRIBUTE_UNDERLINE_OFF -> {
+                underline = false;
+                applyAttribute();
+            }
+            case ATTRIBUTE_NEGATIVE_ON -> {
+                negative = true;
+                applyAttribute();
+            }
+            case ATTRIBUTE_NEGATIVE_OFF -> {
+                negative = false;
+                applyAttribute();
+            }
+            default -> {}
+        }
+    }
+
+    @Override
+    protected void processSaveCursorPosition() throws IOException {
+        getConsoleInfo();
+        savedX = info.cursorPosition().x();
+        savedY = info.cursorPosition().y();
+    }
+
+    @Override
+    protected void processRestoreCursorPosition() throws IOException {
+        // restore only if there was a save operation first
+        if (savedX != -1 && savedY != -1) {
+            out.flush();
+            info.cursorPosition().x(savedX);
+            info.cursorPosition().y(savedY);
+            applyCursorPosition();
+        }
+    }
+
+    @Override
+    protected void processInsertLine(int optionInt) throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            getConsoleInfo();
+            SMALL_RECT scroll = info.window().copy(arena);
+            scroll.top(info.cursorPosition().y());
+            COORD org =
+                    new COORD(arena, (short) 0, (short) (info.cursorPosition().y() + optionInt));
+            CHAR_INFO info = new CHAR_INFO(arena, ' ', originalColors);
+            if (ScrollConsoleScreenBuffer(console, scroll, scroll, org, info) == 0) {
+                throw new IOException(getLastErrorMessage());
+            }
+        }
+    }
+
+    @Override
+    protected void processDeleteLine(int optionInt) throws IOException {
+        try (java.lang.foreign.Arena arena = java.lang.foreign.Arena.ofConfined()) {
+            getConsoleInfo();
+            SMALL_RECT scroll = info.window().copy(arena);
+            scroll.top(info.cursorPosition().y());
+            COORD org =
+                    new COORD(arena, (short) 0, (short) (info.cursorPosition().y() - optionInt));
+            CHAR_INFO info = new CHAR_INFO(arena, ' ', originalColors);
+            if (ScrollConsoleScreenBuffer(console, scroll, scroll, org, info) == 0) {
+                throw new IOException(getLastErrorMessage());
+            }
+        }
+    }
+
+    @Override
+    protected void processChangeWindowTitle(String title) {
+        try (java.lang.foreign.Arena session = java.lang.foreign.Arena.ofConfined()) {
+            java.lang.foreign.MemorySegment str = session.allocateFrom(title);
+            SetConsoleTitleW(str);
+        }
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/jna/LastErrorException.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/jna/LastErrorException.java
deleted file mode 100644
index 63795664dfc..00000000000
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/jna/LastErrorException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2018, 2023, 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.org.jline.terminal.impl.jna;
-
-@SuppressWarnings("serial")
-public class LastErrorException extends RuntimeException{
-
-    public final long lastError;
-
-    public LastErrorException(long lastError) {
-        this.lastError = lastError;
-    }
-
-}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/Pty.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/Pty.java
index b1e22056702..d72e0e669d1 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/Pty.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/Pty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -34,4 +34,7 @@ public interface Pty extends Closeable {
 
     void setSize(Size size) throws IOException;
 
+    SystemStream getSystemStream();
+
+    TerminalProvider getProvider();
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/SystemStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/SystemStream.java
new file mode 100644
index 00000000000..5f950248295
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/SystemStream.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.spi;
+
+public enum SystemStream {
+    Input,
+    Output,
+    Error
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalExt.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalExt.java
new file mode 100644
index 00000000000..00cfb2e9d47
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalExt.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.terminal.spi;
+
+import jdk.internal.org.jline.terminal.Terminal;
+
+/**
+ * The {@code TerminalExt} interface is implemented by {@code Terminal}s
+ * and provides access to the Terminal's internals.
+ */
+public interface TerminalExt extends Terminal {
+
+    /**
+     * Returns the {@code TerminalProvider} that created this terminal
+     * or {@code null} if the terminal was created with no provider.
+     */
+    TerminalProvider getProvider();
+
+    /**
+     * The underlying system stream, may be {@link SystemStream#Output},
+     * {@link SystemStream#Error}, or {@code null} if this terminal is not bound
+     * to a system stream.
+     */
+    SystemStream getSystemStream();
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalProvider.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalProvider.java
index 69f353c5719..055bf224fc5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalProvider.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/spi/TerminalProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, the original author or authors.
+ * Copyright (c) 2022, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -11,58 +11,60 @@ package jdk.internal.org.jline.terminal.spi;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Properties;
-import java.util.ServiceLoader;
 import java.util.function.Function;
 
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal;
 import jdk.internal.org.jline.terminal.impl.exec.ExecTerminalProvider;
+import jdk.internal.org.jline.terminal.impl.ffm.FfmTerminalProvider;
 
-public interface TerminalProvider
-{
-
-    enum Stream {
-        Input,
-        Output,
-        Error
-    }
+public interface TerminalProvider {
 
     String name();
 
-    Terminal sysTerminal(String name, String type, boolean ansiPassThrough,
-                         Charset encoding, boolean nativeSignals,
-                         Terminal.SignalHandler signalHandler, boolean paused,
-                         Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException;
+    Terminal sysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream,
+            Function<InputStream, InputStream> inputStreamWrapper)
+            throws IOException;
 
-    Terminal newTerminal(String name, String type,
-                         InputStream masterInput, OutputStream masterOutput,
-                         Charset encoding, Terminal.SignalHandler signalHandler,
-                         boolean paused, Attributes attributes, Size size) throws IOException;
+    Terminal newTerminal(
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException;
 
-    boolean isSystemStream(Stream stream);
+    boolean isSystemStream(SystemStream stream);
 
-    String systemStreamName(Stream stream);
+    String systemStreamName(SystemStream stream);
+
+    int systemStreamWidth(SystemStream stream);
 
     static TerminalProvider load(String name) throws IOException {
         switch (name) {
             case "exec": return new ExecTerminalProvider();
-            case "jna": {
-                try {
-                    return (TerminalProvider) Class.forName("jdk.internal.org.jline.terminal.impl.jna.JnaTerminalProvider").getConstructor().newInstance();
-                } catch (ReflectiveOperationException t) {
-                    throw new IOException(t);
-                }
-            }
+            case "ffm": return new FfmTerminalProvider();
         }
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         if (cl == null) {
             cl = ClassLoader.getSystemClassLoader();
         }
-        InputStream is = cl.getResourceAsStream( "META-INF/services/org/jline/terminal/provider/" + name);
+        InputStream is = cl.getResourceAsStream("META-INF/services/org/jline/terminal/provider/" + name);
         if (is != null) {
             Properties props = new Properties();
             try {
@@ -71,14 +73,13 @@ public interface TerminalProvider
                 if (className == null) {
                     throw new IOException("No class defined in terminal provider file " + name);
                 }
-                Class<?> clazz = cl.loadClass( className );
+                Class<?> clazz = cl.loadClass(className);
                 return (TerminalProvider) clazz.getConstructor().newInstance();
-            } catch ( Exception e ) {
-                throw new IOException("Unable to load terminal provider " + name, e);
+            } catch (Exception e) {
+                throw new IOException("Unable to load terminal provider " + name + ": " + e.getMessage(), e);
             }
         } else {
             throw new IOException("Unable to find terminal provider " + name);
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java
index 081665a2d46..32d8282d4c0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AnsiWriter.java
@@ -1,17 +1,10 @@
 /*
- * Copyright (C) 2009-2018 the original author(s).
+ * Copyright (c) 2009-2018, the original author(s).
  *
- * 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
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
  *
- * 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.
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package jdk.internal.org.jline.utils;
 
@@ -252,12 +245,10 @@ public class AnsiWriter extends FilterWriter {
      * @throws IOException      if no more non-null values left
      */
     private int getNextOptionInt(Iterator<Object> optionsIterator) throws IOException {
-        for (;;) {
-            if (!optionsIterator.hasNext())
-                throw new IllegalArgumentException();
+        for (; ; ) {
+            if (!optionsIterator.hasNext()) throw new IllegalArgumentException();
             Object arg = optionsIterator.next();
-            if (arg != null)
-                return (Integer) arg;
+            if (arg != null) return (Integer) arg;
         }
     }
 
@@ -346,27 +337,21 @@ public class AnsiWriter extends FilterWriter {
                                     int g = getNextOptionInt(optionsIterator);
                                     int b = getNextOptionInt(optionsIterator);
                                     if (r >= 0 && r <= 255 && g >= 0 && g <= 255 && b >= 0 && b <= 255) {
-                                        if (value == 38)
-                                            processSetForegroundColorExt(r, g, b);
-                                        else
-                                            processSetBackgroundColorExt(r, g, b);
+                                        if (value == 38) processSetForegroundColorExt(r, g, b);
+                                        else processSetBackgroundColorExt(r, g, b);
                                     } else {
                                         throw new IllegalArgumentException();
                                     }
-                                }
-                                else if (arg2or5 == 5) {
+                                } else if (arg2or5 == 5) {
                                     // 256 color style like `esc[38;5;<index>m`
                                     int paletteIndex = getNextOptionInt(optionsIterator);
                                     if (paletteIndex >= 0 && paletteIndex <= 255) {
-                                        if (value == 38)
-                                            processSetForegroundColorExt(paletteIndex);
-                                        else
-                                            processSetBackgroundColorExt(paletteIndex);
+                                        if (value == 38) processSetForegroundColorExt(paletteIndex);
+                                        else processSetBackgroundColorExt(paletteIndex);
                                     } else {
                                         throw new IllegalArgumentException();
                                     }
-                                }
-                                else {
+                                } else {
                                     throw new IllegalArgumentException();
                                 }
                             } else {
@@ -449,47 +434,41 @@ public class AnsiWriter extends FilterWriter {
      * Process <code>CSI u</code> ANSI code, corresponding to <code>RCP \u2013 Restore Cursor Position</code>
      * @throws IOException if an error occurs
      */
-    protected void processRestoreCursorPosition() throws IOException {
-    }
+    protected void processRestoreCursorPosition() throws IOException {}
 
     /**
      * Process <code>CSI s</code> ANSI code, corresponding to <code>SCP \u2013 Save Cursor Position</code>
      * @throws IOException if an error occurs
      */
-    protected void processSaveCursorPosition() throws IOException {
-    }
+    protected void processSaveCursorPosition() throws IOException {}
 
     /**
      * Process <code>CSI s</code> ANSI code, corresponding to <code>IL \u2013 Insert Line</code>
      * @param optionInt the option
      * @throws IOException if an error occurs
      */
-    protected void processInsertLine(int optionInt) throws IOException {
-    }
+    protected void processInsertLine(int optionInt) throws IOException {}
 
     /**
      * Process <code>CSI s</code> ANSI code, corresponding to <code>DL \u2013 Delete Line</code>
      * @param optionInt the option
      * @throws IOException if an error occurs
      */
-    protected void processDeleteLine(int optionInt) throws IOException {
-    }
+    protected void processDeleteLine(int optionInt) throws IOException {}
 
     /**
      * Process <code>CSI n T</code> ANSI code, corresponding to <code>SD \u2013 Scroll Down</code>
      * @param optionInt the option
      * @throws IOException if an error occurs
      */
-    protected void processScrollDown(int optionInt) throws IOException {
-    }
+    protected void processScrollDown(int optionInt) throws IOException {}
 
     /**
      * Process <code>CSI n U</code> ANSI code, corresponding to <code>SU \u2013 Scroll Up</code>
      * @param optionInt the option
      * @throws IOException if an error occurs
      */
-    protected void processScrollUp(int optionInt) throws IOException {
-    }
+    protected void processScrollUp(int optionInt) throws IOException {}
 
     protected static final int ERASE_SCREEN_TO_END = 0;
     protected static final int ERASE_SCREEN_TO_BEGINING = 1;
@@ -500,8 +479,7 @@ public class AnsiWriter extends FilterWriter {
      * @param eraseOption the erase option
      * @throws IOException if an error occurs
      */
-    protected void processEraseScreen(int eraseOption) throws IOException {
-    }
+    protected void processEraseScreen(int eraseOption) throws IOException {}
 
     protected static final int ERASE_LINE_TO_END = 0;
     protected static final int ERASE_LINE_TO_BEGINING = 1;
@@ -512,25 +490,27 @@ public class AnsiWriter extends FilterWriter {
      * @param eraseOption the erase option
      * @throws IOException if an error occurs
      */
-    protected void processEraseLine(int eraseOption) throws IOException {
-    }
+    protected void processEraseLine(int eraseOption) throws IOException {}
+
+    protected static final int ATTRIBUTE_INTENSITY_BOLD = 1; //  Intensity: Bold
+    protected static final int ATTRIBUTE_INTENSITY_FAINT = 2; //  Intensity; Faint  not widely supported
+    protected static final int ATTRIBUTE_ITALIC = 3; //  Italic; on  not widely supported. Sometimes treated as inverse.
+    protected static final int ATTRIBUTE_UNDERLINE = 4; //  Underline; Single
+    protected static final int ATTRIBUTE_BLINK_SLOW = 5; //  Blink; Slow  less than 150 per minute
+    protected static final int ATTRIBUTE_BLINK_FAST = 6; //  Blink; Rapid  MS-DOS ANSI.SYS; 150 per minute or more
+    protected static final int ATTRIBUTE_NEGATIVE_ON =
+            7; //  Image; Negative  inverse or reverse; swap foreground and background
+    protected static final int ATTRIBUTE_CONCEAL_ON = 8; //  Conceal on
+    protected static final int ATTRIBUTE_UNDERLINE_DOUBLE = 21; //  Underline; Double  not widely supported
+    protected static final int ATTRIBUTE_INTENSITY_NORMAL = 22; //  Intensity; Normal  not bold and not faint
+    protected static final int ATTRIBUTE_UNDERLINE_OFF = 24; //  Underline; None
+    protected static final int ATTRIBUTE_BLINK_OFF = 25; //  Blink; off
 
-    protected static final int ATTRIBUTE_INTENSITY_BOLD = 1; //         Intensity: Bold
-    protected static final int ATTRIBUTE_INTENSITY_FAINT = 2; //        Intensity; Faint        not widely supported
-    protected static final int ATTRIBUTE_ITALIC = 3; //         Italic; on      not widely supported. Sometimes treated as inverse.
-    protected static final int ATTRIBUTE_UNDERLINE = 4; //      Underline; Single
-    protected static final int ATTRIBUTE_BLINK_SLOW = 5; //     Blink; Slow     less than 150 per minute
-    protected static final int ATTRIBUTE_BLINK_FAST = 6; //     Blink; Rapid    MS-DOS ANSI.SYS; 150 per minute or more
-    protected static final int ATTRIBUTE_NEGATIVE_ON = 7; //    Image; Negative         inverse or reverse; swap foreground and background
-    protected static final int ATTRIBUTE_CONCEAL_ON = 8; //     Conceal on
-    protected static final int ATTRIBUTE_UNDERLINE_DOUBLE = 21; //      Underline; Double       not widely supported
-    protected static final int ATTRIBUTE_INTENSITY_NORMAL = 22; //      Intensity; Normal       not bold and not faint
-    protected static final int ATTRIBUTE_UNDERLINE_OFF = 24; //         Underline; None
-    protected static final int ATTRIBUTE_BLINK_OFF = 25; //     Blink; off
     @Deprecated
     protected static final int ATTRIBUTE_NEGATIVE_Off = 27; //  Image; Positive
+
     protected static final int ATTRIBUTE_NEGATIVE_OFF = 27; //  Image; Positive
-    protected static final int ATTRIBUTE_CONCEAL_OFF = 28; //   Reveal  conceal off
+    protected static final int ATTRIBUTE_CONCEAL_OFF = 28; //  Reveal  conceal off
 
     /**
      * process <code>SGR</code> other than <code>0</code> (reset), <code>30-39</code> (foreground),
@@ -546,8 +526,7 @@ public class AnsiWriter extends FilterWriter {
      * @see #processDefaultTextColor()
      * @see #processDefaultBackgroundColor()
      */
-    protected void processSetAttribute(int attribute) throws IOException {
-    }
+    protected void processSetAttribute(int attribute) throws IOException {}
 
     protected static final int BLACK = 0;
     protected static final int RED = 1;
@@ -584,8 +563,7 @@ public class AnsiWriter extends FilterWriter {
      * @param paletteIndex the text color in the palette
      * @throws IOException if an error occurs
      */
-    protected void processSetForegroundColorExt(int paletteIndex) throws IOException {
-    }
+    protected void processSetForegroundColorExt(int paletteIndex) throws IOException {}
 
     /**
      * process <code>SGR 38</code> corresponding to <code>extended set text color (foreground)</code>
@@ -625,8 +603,7 @@ public class AnsiWriter extends FilterWriter {
      * @param paletteIndex the background color in the palette
      * @throws IOException if an error occurs
      */
-    protected void processSetBackgroundColorExt(int paletteIndex) throws IOException {
-    }
+    protected void processSetBackgroundColorExt(int paletteIndex) throws IOException {}
 
     /**
      * process <code>SGR 48</code> corresponding to <code>extended set background color</code>
@@ -644,22 +621,19 @@ public class AnsiWriter extends FilterWriter {
      * process <code>SGR 39</code> corresponding to <code>Default text color (foreground)</code>
      * @throws IOException if an error occurs
      */
-    protected void processDefaultTextColor() throws IOException {
-    }
+    protected void processDefaultTextColor() throws IOException {}
 
     /**
      * process <code>SGR 49</code> corresponding to <code>Default background color</code>
      * @throws IOException if an error occurs
      */
-    protected void processDefaultBackgroundColor() throws IOException {
-    }
+    protected void processDefaultBackgroundColor() throws IOException {}
 
     /**
      * process <code>SGR 0</code> corresponding to <code>Reset / Normal</code>
      * @throws IOException if an error occurs
      */
-    protected void processAttributeRest() throws IOException {
-    }
+    protected void processAttributeRest() throws IOException {}
 
     /**
      * process <code>CSI n ; m H</code> corresponding to <code>CUP \u2013 Cursor Position</code> or
@@ -668,24 +642,21 @@ public class AnsiWriter extends FilterWriter {
      * @param col the column
      * @throws IOException if an error occurs
      */
-    protected void processCursorTo(int row, int col) throws IOException {
-    }
+    protected void processCursorTo(int row, int col) throws IOException {}
 
     /**
      * process <code>CSI n G</code> corresponding to <code>CHA \u2013 Cursor Horizontal Absolute</code>
      * @param x the column
      * @throws IOException if an error occurs
      */
-    protected void processCursorToColumn(int x) throws IOException {
-    }
+    protected void processCursorToColumn(int x) throws IOException {}
 
     /**
      * process <code>CSI n F</code> corresponding to <code>CPL \u2013 Cursor Previous Line</code>
      * @param count line count
      * @throws IOException if an error occurs
      */
-    protected void processCursorUpLine(int count) throws IOException {
-    }
+    protected void processCursorUpLine(int count) throws IOException {}
 
     /**
      * process <code>CSI n E</code> corresponding to <code>CNL \u2013 Cursor Next Line</code>
@@ -704,8 +675,7 @@ public class AnsiWriter extends FilterWriter {
      * @param count the count
      * @throws IOException if an error occurs
      */
-    protected void processCursorLeft(int count) throws IOException {
-    }
+    protected void processCursorLeft(int count) throws IOException {}
 
     /**
      * process <code>CSI n C</code> corresponding to <code>CUF \u2013 Cursor Forward</code>
@@ -724,19 +694,16 @@ public class AnsiWriter extends FilterWriter {
      * @param count the count
      * @throws IOException if an error occurs
      */
-    protected void processCursorDown(int count) throws IOException {
-    }
+    protected void processCursorDown(int count) throws IOException {}
 
     /**
      * process <code>CSI n A</code> corresponding to <code>CUU \u2013 Cursor Up</code>
      * @param count the count
      * @throws IOException if an error occurs
      */
-    protected void processCursorUp(int count) throws IOException {
-    }
+    protected void processCursorUp(int count) throws IOException {}
 
-    protected void processUnknownExtension(ArrayList<Object> options, int command) {
-    }
+    protected void processUnknownExtension(ArrayList<Object> options, int command) {}
 
     /**
      * process <code>OSC 0;text BEL</code> corresponding to <code>Change Window and Icon label</code>
@@ -751,23 +718,20 @@ public class AnsiWriter extends FilterWriter {
      * process <code>OSC 1;text BEL</code> corresponding to <code>Change Icon label</code>
      * @param name the icon name
      */
-    protected void processChangeIconName(String name) {
-    }
+    protected void processChangeIconName(String name) {}
 
     /**
      * process <code>OSC 2;text BEL</code> corresponding to <code>Change Window title</code>
      * @param title the title
      */
-    protected void processChangeWindowTitle(String title) {
-    }
+    protected void processChangeWindowTitle(String title) {}
 
     /**
      * Process unknown <code>OSC</code> command.
      * @param command the command
      * @param param the param
      */
-    protected void processUnknownOperatingSystemCommand(int command, String param) {
-    }
+    protected void processUnknownOperatingSystemCommand(int command, String param) {}
 
     /**
      * Process character set sequence.
@@ -781,17 +745,13 @@ public class AnsiWriter extends FilterWriter {
         return true;
     }
 
-    protected void processCharsetSelect(int set, char seq) {
-    }
+    protected void processCharsetSelect(int set, char seq) {}
 
     private int optionInt(ArrayList<Object> options, int index) {
-        if (options.size() <= index)
-            throw new IllegalArgumentException();
+        if (options.size() <= index) throw new IllegalArgumentException();
         Object value = options.get(index);
-        if (value == null)
-            throw new IllegalArgumentException();
-        if (!value.getClass().equals(Integer.class))
-            throw new IllegalArgumentException();
+        if (value == null) throw new IllegalArgumentException();
+        if (!value.getClass().equals(Integer.class)) throw new IllegalArgumentException();
         return (Integer) value;
     }
 
@@ -828,5 +788,4 @@ public class AnsiWriter extends FilterWriter {
         flush();
         super.close();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedCharSequence.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedCharSequence.java
index ccb0aaf689b..6386f5bba39 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedCharSequence.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedCharSequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -15,6 +15,7 @@ import jdk.internal.org.jline.terminal.Terminal;
 import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
 import jdk.internal.org.jline.utils.InfoCmp.Capability;
 
+import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_DISABLE_ALTERNATE_CHARSET;
 import static jdk.internal.org.jline.utils.AttributedStyle.BG_COLOR;
 import static jdk.internal.org.jline.utils.AttributedStyle.BG_COLOR_EXP;
 import static jdk.internal.org.jline.utils.AttributedStyle.FG_COLOR;
@@ -30,12 +31,11 @@ import static jdk.internal.org.jline.utils.AttributedStyle.F_FAINT;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_FOREGROUND;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_FOREGROUND_IND;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_FOREGROUND_RGB;
+import static jdk.internal.org.jline.utils.AttributedStyle.F_HIDDEN;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_INVERSE;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_ITALIC;
 import static jdk.internal.org.jline.utils.AttributedStyle.F_UNDERLINE;
-import static jdk.internal.org.jline.utils.AttributedStyle.F_HIDDEN;
 import static jdk.internal.org.jline.utils.AttributedStyle.MASK;
-import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_DISABLE_ALTERNATE_CHARSET;
 
 public abstract class AttributedCharSequence implements CharSequence {
 
@@ -120,6 +120,7 @@ public abstract class AttributedCharSequence implements CharSequence {
             char c = charAt(i);
             if (altIn != null && altOut != null) {
                 char pc = c;
+                // @spotless:off
                 switch (c) {
                     case '\u2518': c = 'j'; break;
                     case '\u2510': c = 'k'; break;
@@ -133,15 +134,16 @@ public abstract class AttributedCharSequence implements CharSequence {
                     case '\u252C': c = 'w'; break;
                     case '\u2502': c = 'x'; break;
                 }
+                // @spotless:on
                 boolean oldalt = alt;
                 alt = c != pc;
                 if (oldalt ^ alt) {
                     sb.append(alt ? altIn : altOut);
                 }
             }
-            long  s = styleCodeAt(i) & ~F_HIDDEN; // The hidden flag does not change the ansi styles
+            long s = styleCodeAt(i) & ~F_HIDDEN; // The hidden flag does not change the ansi styles
             if (style != s) {
-                long  d = (style ^ s) & MASK;
+                long d = (style ^ s) & MASK;
                 long fg = (s & F_FOREGROUND) != 0 ? s & (FG_COLOR | F_FOREGROUND) : 0;
                 long bg = (s & F_BACKGROUND) != 0 ? s & (BG_COLOR | F_BACKGROUND) : 0;
                 if (s == 0) {
@@ -172,16 +174,16 @@ public abstract class AttributedCharSequence implements CharSequence {
                         if (fg > 0) {
                             int rounded = -1;
                             if ((fg & F_FOREGROUND_RGB) != 0) {
-                                int r = (int)(fg >> (FG_COLOR_EXP + 16)) & 0xFF;
-                                int g = (int)(fg >> (FG_COLOR_EXP + 8)) & 0xFF;
-                                int b = (int)(fg >> FG_COLOR_EXP) & 0xFF;
+                                int r = (int) (fg >> (FG_COLOR_EXP + 16)) & 0xFF;
+                                int g = (int) (fg >> (FG_COLOR_EXP + 8)) & 0xFF;
+                                int b = (int) (fg >> FG_COLOR_EXP) & 0xFF;
                                 if (colors >= HIGH_COLORS) {
                                     first = attr(sb, "38;2;" + r + ";" + g + ";" + b, first);
                                 } else {
                                     rounded = palette.round(r, g, b);
                                 }
                             } else if ((fg & F_FOREGROUND_IND) != 0) {
-                                rounded = palette.round((int)(fg >> FG_COLOR_EXP) & 0xFF);
+                                rounded = palette.round((int) (fg >> FG_COLOR_EXP) & 0xFF);
                             }
                             if (rounded >= 0) {
                                 if (colors >= HIGH_COLORS && force == ForceMode.ForceTrueColors) {
@@ -211,16 +213,16 @@ public abstract class AttributedCharSequence implements CharSequence {
                         if (bg > 0) {
                             int rounded = -1;
                             if ((bg & F_BACKGROUND_RGB) != 0) {
-                                int r = (int)(bg >> (BG_COLOR_EXP + 16)) & 0xFF;
-                                int g = (int)(bg >> (BG_COLOR_EXP + 8)) & 0xFF;
-                                int b = (int)(bg >> BG_COLOR_EXP) & 0xFF;
+                                int r = (int) (bg >> (BG_COLOR_EXP + 16)) & 0xFF;
+                                int g = (int) (bg >> (BG_COLOR_EXP + 8)) & 0xFF;
+                                int b = (int) (bg >> BG_COLOR_EXP) & 0xFF;
                                 if (colors >= HIGH_COLORS) {
                                     first = attr(sb, "48;2;" + r + ";" + g + ";" + b, first);
                                 } else {
                                     rounded = palette.round(r, g, b);
                                 }
                             } else if ((bg & F_BACKGROUND_IND) != 0) {
-                                rounded = palette.round((int)(bg >> BG_COLOR_EXP) & 0xFF);
+                                rounded = palette.round((int) (bg >> BG_COLOR_EXP) & 0xFF);
                             }
                             if (rounded >= 0) {
                                 if (colors >= HIGH_COLORS && force == ForceMode.ForceTrueColors) {
@@ -243,8 +245,7 @@ public abstract class AttributedCharSequence implements CharSequence {
                         background = bg;
                     }
                     if ((d & (F_BOLD | F_FAINT)) != 0) {
-                        if (    (d & F_BOLD)  != 0 && (s & F_BOLD)  == 0
-                                || (d & F_FAINT) != 0 && (s & F_FAINT) == 0) {
+                        if ((d & F_BOLD) != 0 && (s & F_BOLD) == 0 || (d & F_FAINT) != 0 && (s & F_FAINT) == 0) {
                             first = attr(sb, "22", first);
                         }
                         if ((d & F_BOLD) != 0 && (s & F_BOLD) != 0) {
@@ -360,8 +361,7 @@ public abstract class AttributedCharSequence implements CharSequence {
         int len = length();
         for (int cur = 0; cur < len; ) {
             int cp = codePointAt(cur);
-            if (!isHidden(cur))
-                cols += WCWidth.wcwidth(cp);
+            if (!isHidden(cur)) cols += WCWidth.wcwidth(cp);
             cur += Character.charCount(cp);
         }
         return cols;
@@ -382,8 +382,7 @@ public abstract class AttributedCharSequence implements CharSequence {
         int end = begin;
         while (end < this.length()) {
             int cp = codePointAt(end);
-            if (cp == '\n')
-                break;
+            if (cp == '\n') break;
             int w = isHidden(end) ? 0 : WCWidth.wcwidth(cp);
             if (col + w > stop) {
                 break;
@@ -407,7 +406,7 @@ public abstract class AttributedCharSequence implements CharSequence {
             int cp = codePointAt(cur);
             int w = isHidden(cur) ? 0 : WCWidth.wcwidth(cp);
             if (cp == '\n') {
-                strings.add(subSequence(beg, includeNewlines ? cur+1 : cur));
+                strings.add(subSequence(beg, includeNewlines ? cur + 1 : cur));
                 beg = cur + 1;
                 col = 0;
             } else if ((col += w) > columns) {
@@ -429,5 +428,4 @@ public abstract class AttributedCharSequence implements CharSequence {
     public AttributedString toAttributedString() {
         return substring(0, length());
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedString.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedString.java
index 47492b72e76..3c70a6d0e7b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedString.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -15,6 +15,8 @@ import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import jdk.internal.org.jline.terminal.Terminal;
+
 /**
  * Attributed string.
  * Instances of this class are immutables.
@@ -103,11 +105,28 @@ public class AttributedString extends AttributedCharSequence {
     }
 
     public static AttributedString fromAnsi(String ansi, List<Integer> tabs) {
+        return fromAnsi(ansi, tabs, null, null);
+    }
+
+    public static AttributedString fromAnsi(String ansi, Terminal terminal) {
+        String alternateIn, alternateOut;
+        if (!DISABLE_ALTERNATE_CHARSET) {
+            alternateIn = Curses.tputs(terminal.getStringCapability(InfoCmp.Capability.enter_alt_charset_mode));
+            alternateOut = Curses.tputs(terminal.getStringCapability(InfoCmp.Capability.exit_alt_charset_mode));
+        } else {
+            alternateIn = null;
+            alternateOut = null;
+        }
+        return fromAnsi(ansi, Arrays.asList(0), alternateIn, alternateOut);
+    }
+
+    public static AttributedString fromAnsi(String ansi, List<Integer> tabs, String altIn, String altOut) {
         if (ansi == null) {
             return null;
         }
         return new AttributedStringBuilder(ansi.length())
                 .tabs(tabs)
+                .altCharset(altIn, altOut)
                 .ansiAppend(ansi)
                 .toAttributedString();
     }
@@ -116,9 +135,7 @@ public class AttributedString extends AttributedCharSequence {
         if (ansi == null) {
             return null;
         }
-        return new AttributedStringBuilder(ansi.length())
-                .ansiAppend(ansi)
-                .toString();
+        return new AttributedStringBuilder(ansi.length()).ansiAppend(ansi).toString();
     }
 
     @Override
@@ -162,7 +179,7 @@ public class AttributedString extends AttributedCharSequence {
                 }
                 result = matcher.find();
             } while (result);
-            return new AttributedString(buffer, newstyle, start , end);
+            return new AttributedString(buffer, newstyle, start, end);
         }
         return this;
     }
@@ -179,15 +196,16 @@ public class AttributedString extends AttributedCharSequence {
 
     private boolean arrEq(char[] a1, char[] a2, int s1, int s2, int l) {
         for (int i = 0; i < l; i++) {
-            if (a1[s1+i] != a2[s2+i]) {
+            if (a1[s1 + i] != a2[s2 + i]) {
                 return false;
             }
         }
         return true;
     }
+
     private boolean arrEq(long[] a1, long[] a2, int s1, int s2, int l) {
         for (int i = 0; i < l; i++) {
-            if (a1[s1+i] != a2[s2+i]) {
+            if (a1[s1 + i] != a2[s2 + i]) {
                 return false;
             }
         }
@@ -221,5 +239,4 @@ public class AttributedString extends AttributedCharSequence {
         }
         return sb.toAttributedString();
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStringBuilder.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStringBuilder.java
index 779675348c9..554381d367d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStringBuilder.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStringBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -27,6 +27,9 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
     private long[] style;
     private int length;
     private TabStops tabs = new TabStops(0);
+    private char[] altIn;
+    private char[] altOut;
+    private boolean inAltCharset;
     private int lastLineLength = 0;
     private AttributedStyle current = AttributedStyle.DEFAULT;
 
@@ -81,10 +84,7 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
     @Override
     public AttributedString subSequence(int start, int end) {
         return new AttributedString(
-                Arrays.copyOfRange(buffer, start, end),
-                Arrays.copyOfRange(style, start, end),
-                0,
-                end - start);
+                Arrays.copyOfRange(buffer, start, end), Arrays.copyOfRange(style, start, end), 0, end - start);
     }
 
     @Override
@@ -108,6 +108,14 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
         return append(Character.toString(c));
     }
 
+    public AttributedStringBuilder append(char c, int repeat) {
+        AttributedString s = new AttributedString(Character.toString(c), current);
+        while (repeat-- > 0) {
+            append(s);
+        }
+        return this;
+    }
+
     public AttributedStringBuilder append(CharSequence csq, AttributedStyle style) {
         return append(new AttributedString(csq, style));
     }
@@ -117,12 +125,12 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
         return this;
     }
 
-    public AttributedStringBuilder style(Function<AttributedStyle,AttributedStyle> style) {
+    public AttributedStringBuilder style(Function<AttributedStyle, AttributedStyle> style) {
         current = style.apply(current);
         return this;
     }
 
-    public AttributedStringBuilder styled(Function<AttributedStyle,AttributedStyle> style, CharSequence cs) {
+    public AttributedStringBuilder styled(Function<AttributedStyle, AttributedStyle> style, CharSequence cs) {
         return styled(style, sb -> sb.append(cs));
     }
 
@@ -130,7 +138,8 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
         return styled(s -> style, sb -> sb.append(cs));
     }
 
-    public AttributedStringBuilder styled(Function<AttributedStyle,AttributedStyle> style, Consumer<AttributedStringBuilder> consumer) {
+    public AttributedStringBuilder styled(
+            Function<AttributedStyle, AttributedStyle> style, Consumer<AttributedStringBuilder> consumer) {
         AttributedStyle prev = current;
         current = style.apply(prev);
         consumer.accept(this);
@@ -338,23 +347,90 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
                     // This is not a SGR code, so ignore
                     ansiState = 0;
                 }
-            } else if (c == '\t' && tabs.defined()) {
-                insertTab(current);
             } else {
-                ensureCapacity(length + 1);
-                buffer[length] = c;
-                style[length] = this.current.getStyle();
-                if (c == '\n') {
-                    lastLineLength = 0;
-                } else {
-                    lastLineLength++;
+                if (ansiState >= 1) {
+                    ensureCapacity(length + 1);
+                    buffer[length++] = 27;
+                    if (ansiState >= 2) {
+                        ensureCapacity(length + 1);
+                        buffer[length++] = '[';
+                    }
+                    ansiState = 0;
+                }
+                if (c == '\t' && tabs.defined()) {
+                    insertTab(current);
+                } else {
+                    ensureCapacity(length + 1);
+                    if (inAltCharset) {
+                        switch (c) {
+                            case 'j':
+                                c = '\u2518';
+                                break;
+                            case 'k':
+                                c = '\u2510';
+                                break;
+                            case 'l':
+                                c = '\u250C';
+                                break;
+                            case 'm':
+                                c = '\u2514';
+                                break;
+                            case 'n':
+                                c = '\u253C';
+                                break;
+                            case 'q':
+                                c = '\u2500';
+                                break;
+                            case 't':
+                                c = '\u251C';
+                                break;
+                            case 'u':
+                                c = '\u2524';
+                                break;
+                            case 'v':
+                                c = '\u2534';
+                                break;
+                            case 'w':
+                                c = '\u252C';
+                                break;
+                            case 'x':
+                                c = '\u2502';
+                                break;
+                        }
+                    }
+                    buffer[length] = c;
+                    style[length] = this.current.getStyle();
+                    if (c == '\n') {
+                        lastLineLength = 0;
+                    } else {
+                        lastLineLength++;
+                    }
+                    length++;
+                    if (altIn != null && altOut != null) {
+                        char[] alt = inAltCharset ? altOut : altIn;
+                        if (equals(buffer, length - alt.length, alt, 0, alt.length)) {
+                            inAltCharset = !inAltCharset;
+                            length -= alt.length;
+                        }
+                    }
                 }
-                length++;
             }
         }
         return this;
     }
 
+    private static boolean equals(char[] a, int aFromIndex, char[] b, int bFromIndex, int length) {
+        if (aFromIndex < 0 || bFromIndex < 0 || aFromIndex + length > a.length || bFromIndex + length > b.length) {
+            return false;
+        }
+        for (int i = 0; i < length; i++) {
+            if (a[aFromIndex + i] != b[bFromIndex + i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     protected void insertTab(AttributedStyle s) {
         int nb = tabs.spaces(lastLineLength);
         ensureCapacity(length + nb);
@@ -393,6 +469,15 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
         return this;
     }
 
+    public AttributedStringBuilder altCharset(String altIn, String altOut) {
+        if (length > 0) {
+            throw new IllegalStateException("Cannot change alternative charset after appending text");
+        }
+        this.altIn = altIn != null ? altIn.toCharArray() : null;
+        this.altOut = altOut != null ? altOut.toCharArray() : null;
+        return this;
+    }
+
     public AttributedStringBuilder styleMatches(Pattern pattern, AttributedStyle s) {
         Matcher matcher = pattern.matcher(this);
         while (matcher.find()) {
@@ -416,7 +501,7 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
         return this;
     }
 
-    private class TabStops {
+    private static class TabStops {
         private List<Integer> tabs = new ArrayList<>();
         private int lastStop = 0;
         private int lastSize = 0;
@@ -428,7 +513,7 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
         public TabStops(List<Integer> tabs) {
             this.tabs = tabs;
             int p = 0;
-            for (int s: tabs) {
+            for (int s : tabs) {
                 if (s <= p) {
                     continue;
                 }
@@ -447,7 +532,7 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
             if (lastLineLength >= lastStop) {
                 out = lastSize - (lastLineLength - lastStop) % lastSize;
             } else {
-                for (int s: tabs) {
+                for (int s : tabs) {
                     if (s > lastLineLength) {
                         out = s - lastLineLength;
                         break;
@@ -456,7 +541,5 @@ public class AttributedStringBuilder extends AttributedCharSequence implements A
             }
             return out;
         }
-
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStyle.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStyle.java
index 902e2e1f3b8..7845e99e0b0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStyle.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2021, the original author or authors.
+ * Copyright (c) 2002-2021, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -15,39 +15,39 @@ package jdk.internal.org.jline.utils;
  */
 public class AttributedStyle {
 
-    public static final int BLACK =     0;
-    public static final int RED =       1;
-    public static final int GREEN =     2;
-    public static final int YELLOW =    3;
-    public static final int BLUE =      4;
-    public static final int MAGENTA =   5;
-    public static final int CYAN =      6;
-    public static final int WHITE =     7;
+    public static final int BLACK = 0;
+    public static final int RED = 1;
+    public static final int GREEN = 2;
+    public static final int YELLOW = 3;
+    public static final int BLUE = 4;
+    public static final int MAGENTA = 5;
+    public static final int CYAN = 6;
+    public static final int WHITE = 7;
 
-    public static final int BRIGHT =    8;
+    public static final int BRIGHT = 8;
 
-    static final long F_BOLD            = 0x00000001;
-    static final long F_FAINT           = 0x00000002;
-    static final long F_ITALIC          = 0x00000004;
-    static final long F_UNDERLINE       = 0x00000008;
-    static final long F_BLINK           = 0x00000010;
-    static final long F_INVERSE         = 0x00000020;
-    static final long F_CONCEAL         = 0x00000040;
-    static final long F_CROSSED_OUT     = 0x00000080;
-    static final long F_FOREGROUND_IND  = 0x00000100;
-    static final long F_FOREGROUND_RGB  = 0x00000200;
-    static final long F_FOREGROUND      = F_FOREGROUND_IND | F_FOREGROUND_RGB;
-    static final long F_BACKGROUND_IND  = 0x00000400;
-    static final long F_BACKGROUND_RGB  = 0x00000800;
-    static final long F_BACKGROUND      = F_BACKGROUND_IND | F_BACKGROUND_RGB;
-    static final long F_HIDDEN          = 0x00001000;
+    static final long F_BOLD = 0x00000001;
+    static final long F_FAINT = 0x00000002;
+    static final long F_ITALIC = 0x00000004;
+    static final long F_UNDERLINE = 0x00000008;
+    static final long F_BLINK = 0x00000010;
+    static final long F_INVERSE = 0x00000020;
+    static final long F_CONCEAL = 0x00000040;
+    static final long F_CROSSED_OUT = 0x00000080;
+    static final long F_FOREGROUND_IND = 0x00000100;
+    static final long F_FOREGROUND_RGB = 0x00000200;
+    static final long F_FOREGROUND = F_FOREGROUND_IND | F_FOREGROUND_RGB;
+    static final long F_BACKGROUND_IND = 0x00000400;
+    static final long F_BACKGROUND_RGB = 0x00000800;
+    static final long F_BACKGROUND = F_BACKGROUND_IND | F_BACKGROUND_RGB;
+    static final long F_HIDDEN = 0x00001000;
 
-    static final long MASK           = 0x00001FFF;
+    static final long MASK = 0x00001FFF;
 
-    static final int FG_COLOR_EXP    = 15;
-    static final int BG_COLOR_EXP    = 39;
-    static final long FG_COLOR        = 0xFFFFFFL << FG_COLOR_EXP;
-    static final long BG_COLOR        = 0xFFFFFFL << BG_COLOR_EXP;
+    static final int FG_COLOR_EXP = 15;
+    static final int BG_COLOR_EXP = 39;
+    static final long FG_COLOR = 0xFFFFFFL << FG_COLOR_EXP;
+    static final long BG_COLOR = 0xFFFFFFL << BG_COLOR_EXP;
 
     public static final AttributedStyle DEFAULT = new AttributedStyle();
     public static final AttributedStyle BOLD = DEFAULT.bold();
@@ -70,8 +70,9 @@ public class AttributedStyle {
 
     public AttributedStyle(long style, long mask) {
         this.style = style;
-        this.mask = mask & MASK | ((style & F_FOREGROUND) != 0 ? FG_COLOR : 0)
-                                | ((style & F_BACKGROUND) != 0 ? BG_COLOR : 0);
+        this.mask = mask & MASK
+                | ((style & F_FOREGROUND) != 0 ? FG_COLOR : 0)
+                | ((style & F_BACKGROUND) != 0 ? BG_COLOR : 0);
     }
 
     public AttributedStyle bold() {
@@ -176,7 +177,9 @@ public class AttributedStyle {
     }
 
     public AttributedStyle foreground(int color) {
-        return new AttributedStyle(style & ~FG_COLOR | F_FOREGROUND_IND | (((long) color << FG_COLOR_EXP) & FG_COLOR), mask | F_FOREGROUND_IND);
+        return new AttributedStyle(
+                style & ~FG_COLOR | F_FOREGROUND_IND | (((long) color << FG_COLOR_EXP) & FG_COLOR),
+                mask | F_FOREGROUND_IND);
     }
 
     public AttributedStyle foreground(int r, int g, int b) {
@@ -184,7 +187,9 @@ public class AttributedStyle {
     }
 
     public AttributedStyle foregroundRgb(int color) {
-        return new AttributedStyle(style & ~FG_COLOR | F_FOREGROUND_RGB | ((((long) color & 0xFFFFFF) << FG_COLOR_EXP) & FG_COLOR), mask | F_FOREGROUND_RGB);
+        return new AttributedStyle(
+                style & ~FG_COLOR | F_FOREGROUND_RGB | ((((long) color & 0xFFFFFF) << FG_COLOR_EXP) & FG_COLOR),
+                mask | F_FOREGROUND_RGB);
     }
 
     public AttributedStyle foregroundOff() {
@@ -196,7 +201,9 @@ public class AttributedStyle {
     }
 
     public AttributedStyle background(int color) {
-        return new AttributedStyle(style & ~BG_COLOR | F_BACKGROUND_IND | (((long) color << BG_COLOR_EXP) & BG_COLOR), mask | F_BACKGROUND_IND);
+        return new AttributedStyle(
+                style & ~BG_COLOR | F_BACKGROUND_IND | (((long) color << BG_COLOR_EXP) & BG_COLOR),
+                mask | F_BACKGROUND_IND);
     }
 
     public AttributedStyle background(int r, int g, int b) {
@@ -204,7 +211,9 @@ public class AttributedStyle {
     }
 
     public AttributedStyle backgroundRgb(int color) {
-        return new AttributedStyle(style & ~BG_COLOR | F_BACKGROUND_RGB | ((((long) color & 0xFFFFFF) << BG_COLOR_EXP) & BG_COLOR), mask | F_BACKGROUND_RGB);
+        return new AttributedStyle(
+                style & ~BG_COLOR | F_BACKGROUND_RGB | ((((long) color & 0xFFFFFF) << BG_COLOR_EXP) & BG_COLOR),
+                mask | F_BACKGROUND_RGB);
     }
 
     public AttributedStyle backgroundOff() {
@@ -249,7 +258,6 @@ public class AttributedStyle {
         AttributedStyle that = (AttributedStyle) o;
         if (style != that.style) return false;
         return mask == that.mask;
-
     }
 
     @Override
@@ -266,10 +274,6 @@ public class AttributedStyle {
 
     @Override
     public String toString() {
-        return "AttributedStyle{" +
-                "style=" + style +
-                ", mask=" + mask +
-                ", ansi=" + toAnsi() +
-                '}';
+        return "AttributedStyle{" + "style=" + style + ", mask=" + mask + ", ansi=" + toAnsi() + '}';
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ClosedException.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ClosedException.java
index f2adb0878c7..a6f5bfb5b54 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ClosedException.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ClosedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -14,8 +14,7 @@ public class ClosedException extends IOException {
 
     private static final long serialVersionUID = 3085420657077696L;
 
-    public ClosedException() {
-    }
+    public ClosedException() {}
 
     public ClosedException(String message) {
         super(message);
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ColorPalette.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ColorPalette.java
index 6f55273a7b9..b4175fe13ce 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ColorPalette.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ColorPalette.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,7 +21,8 @@ import jdk.internal.org.jline.terminal.Terminal;
  */
 public class ColorPalette {
 
-    public static final String XTERM_INITC = "\\E]4;%p1%d;rgb\\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\\E\\\\";
+    public static final String XTERM_INITC =
+            "\\E]4;%p1%d;rgb\\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\\E\\\\";
 
     public static final ColorPalette DEFAULT = new ColorPalette();
 
@@ -41,6 +42,7 @@ public class ColorPalette {
         this(terminal, null);
     }
 
+    @SuppressWarnings("this-escape")
     public ColorPalette(Terminal terminal, String distance) throws IOException {
         this.terminal = terminal;
         this.distanceName = distance;
@@ -245,10 +247,13 @@ public class ColorPalette {
                 if (rgb.size() != 3) {
                     return null;
                 }
-                double r = Integer.parseInt(rgb.get(0), 16) / ((1 << (4 * rgb.get(0).length())) - 1.0);
-                double g = Integer.parseInt(rgb.get(1), 16) / ((1 << (4 * rgb.get(1).length())) - 1.0);
-                double b = Integer.parseInt(rgb.get(2), 16) / ((1 << (4 * rgb.get(2).length())) - 1.0);
-                palette[idx] = (int)((Math.round(r * 255) << 16) + (Math.round(g * 255) << 8) + Math.round(b * 255));
+                double r = Integer.parseInt(rgb.get(0), 16)
+                        / ((1 << (4 * rgb.get(0).length())) - 1.0);
+                double g = Integer.parseInt(rgb.get(1), 16)
+                        / ((1 << (4 * rgb.get(1).length())) - 1.0);
+                double b = Integer.parseInt(rgb.get(2), 16)
+                        / ((1 << (4 * rgb.get(2).length())) - 1.0);
+                palette[idx] = (int) ((Math.round(r * 255) << 16) + (Math.round(g * 255) << 8) + Math.round(b * 255));
                 black &= palette[idx] == 0;
             }
             if (black) {
@@ -256,7 +261,13 @@ public class ColorPalette {
             }
         }
         int max = 256;
-        while (max > 0 && palette[--max] == 0);
+        while (max > 0 && palette[--max] == 0)
+            ;
         return Arrays.copyOfRange(palette, 0, max + 1);
     }
+
+    @Override
+    public String toString() {
+        return "ColorPalette[" + "length=" + getLength() + ", " + "distance='" + getDist() + "\']";
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Colors.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Colors.java
index dc452e10364..d5e7644d3cb 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Colors.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Colors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,6 +21,8 @@ import static jdk.internal.org.jline.terminal.TerminalBuilder.PROP_COLOR_DISTANC
 
 public class Colors {
 
+    // @spotless:off
+
     /**
      * Default 256 colors palette
      */
@@ -111,24 +113,26 @@ public class Colors {
             0x2e2e2e, 0x5c5c5c, 0x737373, 0x8b8b8b, 0xa2a2a2, 0xb9b9b9, 0xd0d0d0, 0xe7e7e7,
     };
 
+    // @spotless:on
+
     /** D50 illuminant for CAM color spaces */
-    public static final double[] D50 = new double[] { 96.422f, 100.0f,  82.521f };
+    public static final double[] D50 = new double[] {96.422f, 100.0f, 82.521f};
     /** D65 illuminant for CAM color spaces */
-    public static final double[] D65 = new double[] { 95.047, 100.0, 108.883 };
+    public static final double[] D65 = new double[] {95.047, 100.0, 108.883};
 
     /** Average surrounding for CAM color spaces */
-    public static final double[] averageSurrounding = new double[] { 1.0, 0.690, 1.0 };
+    public static final double[] averageSurrounding = new double[] {1.0, 0.690, 1.0};
     /** Dim surrounding for CAM color spaces */
-    public static final double[] dimSurrounding =     new double[] { 0.9, 0.590, 0.9 };
+    public static final double[] dimSurrounding = new double[] {0.9, 0.590, 0.9};
     /** Dark surrounding for CAM color spaces */
-    public static final double[] darkSurrounding =    new double[] { 0.8, 0.525, 0.8 };
+    public static final double[] darkSurrounding = new double[] {0.8, 0.525, 0.8};
 
     /** sRGB encoding environment */
-    public static final double[] sRGB_encoding_environment = vc(D50,  64.0,  64.0/5, dimSurrounding);
+    public static final double[] sRGB_encoding_environment = vc(D50, 64.0, 64.0 / 5, dimSurrounding);
     /** sRGB typical environment */
-    public static final double[] sRGB_typical_environment  = vc(D50, 200.0, 200.0/5, averageSurrounding);
+    public static final double[] sRGB_typical_environment = vc(D50, 200.0, 200.0 / 5, averageSurrounding);
     /** Adobe RGB environment */
-    public static final double[] AdobeRGB_environment      = vc(D65, 160.0, 160.0/5, averageSurrounding);
+    public static final double[] AdobeRGB_environment = vc(D65, 160.0, 160.0 / 5, averageSurrounding);
 
     private static int[] COLORS_256 = DEFAULT_COLORS_256;
 
@@ -149,8 +153,9 @@ public class Colors {
         if (COLOR_NAMES == null) {
             Map<String, Integer> colors = new LinkedHashMap<>();
             try (InputStream is = InfoCmp.class.getResourceAsStream("colors.txt");
-                 BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-                br.lines().map(String::trim)
+                    BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+                br.lines()
+                        .map(String::trim)
                         .filter(s -> !s.startsWith("#"))
                         .filter(s -> !s.isEmpty())
                         .forEachOrdered(s -> {
@@ -206,7 +211,7 @@ public class Colors {
         if (dist == null) {
             dist = System.getProperty(PROP_COLOR_DISTANCE, "cie76");
         }
-        return doGetDistance(dist);
+        return new NamedDistance(dist, doGetDistance(dist));
     }
 
     private static Distance doGetDistance(String dist) {
@@ -216,7 +221,7 @@ public class Colors {
                 double[] c1 = rgb(p1);
                 double[] c2 = rgb(p2);
                 double rmean = (c1[0] + c2[0]) / 2.0;
-                double[] w = { 2.0 + rmean, 4.0, 3.0 - rmean };
+                double[] w = {2.0 + rmean, 4.0, 3.0 - rmean};
                 return scalar(c1, c2, w);
             };
         }
@@ -228,7 +233,7 @@ public class Colors {
         }
         if (dist.matches("lab\\(([0-9]+(\\.[0-9]+)?),([0-9]+(\\.[0-9]+)?)\\)")) {
             double[] w = getWeights(dist);
-            return (p1, p2) -> scalar(rgb2cielab(p1), rgb2cielab(p2), new double[] { w[0], w[1], w[1] });
+            return (p1, p2) -> scalar(rgb2cielab(p1), rgb2cielab(p2), new double[] {w[0], w[1], w[1]});
         }
         if (dist.equals("cie94")) {
             return (p1, p2) -> cie94(rgb2cielab(p1), rgb2cielab(p2));
@@ -251,7 +256,7 @@ public class Colors {
                 double[] c1 = camlab(p1, sRGB_typical_environment);
                 double[] c2 = camlab(p2, sRGB_typical_environment);
                 double[] w = getWeights(dist);
-                return scalar(c1, c2, new double[] { w[0], w[1], w[1] });
+                return scalar(c1, c2, new double[] {w[0], w[1], w[1]});
             };
         }
         if (dist.matches("camlch")) {
@@ -273,20 +278,37 @@ public class Colors {
     }
 
     private static double[] getWeights(String dist) {
-        String[] weights = dist.substring(dist.indexOf('(') + 1, dist.length() - 1).split(",");
+        String[] weights =
+                dist.substring(dist.indexOf('(') + 1, dist.length() - 1).split(",");
         return Stream.of(weights).mapToDouble(Double::parseDouble).toArray();
     }
 
     private static double scalar(double[] c1, double[] c2, double[] w) {
-        return sqr((c1[0] - c2[0]) * w[0])
-             + sqr((c1[1] - c2[1]) * w[1])
-             + sqr((c1[2] - c2[2]) * w[2]);
+        return sqr((c1[0] - c2[0]) * w[0]) + sqr((c1[1] - c2[1]) * w[1]) + sqr((c1[2] - c2[2]) * w[2]);
     }
 
     private static double scalar(double[] c1, double[] c2) {
-        return sqr(c1[0] - c2[0])
-             + sqr(c1[1] - c2[1])
-             + sqr(c1[2] - c2[2]);
+        return sqr(c1[0] - c2[0]) + sqr(c1[1] - c2[1]) + sqr(c1[2] - c2[2]);
+    }
+
+    private static class NamedDistance implements Distance {
+        private final String name;
+        private final Distance delegate;
+
+        public NamedDistance(String name, Distance delegate) {
+            this.name = name;
+            this.delegate = delegate;
+        }
+
+        @Override
+        public double compute(int c1, int c2) {
+            return delegate.compute(c1, c2);
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
     }
 
     private static final int L = 0;
@@ -325,7 +347,7 @@ public class Colors {
         double c_star_average_ab = (c_star_1_ab + c_star_2_ab) / 2.0;
         double c_star_average_ab_pot_3 = c_star_average_ab * c_star_average_ab * c_star_average_ab;
         double c_star_average_ab_pot_7 = c_star_average_ab_pot_3 * c_star_average_ab_pot_3 * c_star_average_ab;
-        double G = 0.5 * (1.0 - Math.sqrt(c_star_average_ab_pot_7 / (c_star_average_ab_pot_7 + 6103515625.0))); //25^7
+        double G = 0.5 * (1.0 - Math.sqrt(c_star_average_ab_pot_7 / (c_star_average_ab_pot_7 + 6103515625.0))); // 25^7
         double a1_prime = (1.0 + G) * lab1[A];
         double a2_prime = (1.0 + G) * lab2[A];
         double C_prime_1 = Math.sqrt(a1_prime * a1_prime + lab1[B] * lab1[B]);
@@ -365,16 +387,18 @@ public class Colors {
                 + 0.24 * Math.cos(Math.toRadians(h_prime_average * 2.0))
                 + 0.32 * Math.cos(Math.toRadians(h_prime_average * 3.0 + 6.0))
                 - 0.20 * Math.cos(Math.toRadians(h_prime_average * 4.0 - 63.0));
-        double S_L = 1.0 + ((0.015 * L_prime_average_minus_50_square) / Math.sqrt(20.0 + L_prime_average_minus_50_square));
+        double S_L =
+                1.0 + ((0.015 * L_prime_average_minus_50_square) / Math.sqrt(20.0 + L_prime_average_minus_50_square));
         double S_C = 1.0 + 0.045 * C_prime_average;
         double S_H = 1.0 + 0.015 * T * C_prime_average;
         double h_prime_average_minus_275_div_25 = (h_prime_average - 275.0) / (25.0);
-        double h_prime_average_minus_275_div_25_square = h_prime_average_minus_275_div_25 * h_prime_average_minus_275_div_25;
+        double h_prime_average_minus_275_div_25_square =
+                h_prime_average_minus_275_div_25 * h_prime_average_minus_275_div_25;
         double delta_theta = 30.0 * Math.exp(-h_prime_average_minus_275_div_25_square);
         double C_prime_average_pot_3 = C_prime_average * C_prime_average * C_prime_average;
         double C_prime_average_pot_7 = C_prime_average_pot_3 * C_prime_average_pot_3 * C_prime_average;
-        double R_C = 2.0 * Math.sqrt(C_prime_average_pot_7 / (C_prime_average_pot_7 + 6103515625.0)); //25^7
-        double R_T = - Math.sin(Math.toRadians(2.0 * delta_theta)) * R_C;
+        double R_C = 2.0 * Math.sqrt(C_prime_average_pot_7 / (C_prime_average_pot_7 + 6103515625.0)); // 25^7
+        double R_T = -Math.sin(Math.toRadians(2.0 * delta_theta)) * R_C;
         double dLKlsl = delta_L_prime / (kl * S_L);
         double dCkcsc = delta_C_prime / (kc * S_C);
         double dHkhsh = delta_H_prime / (kh * S_H);
@@ -392,11 +416,11 @@ public class Colors {
         double sM = ((1.0 / 0.0228) * Math.log(1.0 + 0.0228 * lch[1]));
         double a = sM * Math.cos(Math.toRadians(lch[2]));
         double b = sM * Math.sin(Math.toRadians(lch[2]));
-        return new double[] {sJ, a, b };
+        return new double[] {sJ, a, b};
     }
 
     static double camlch(double[] c1, double[] c2) {
-        return camlch(c1, c2, new double[] { 1.0, 1.0, 1.0 });
+        return camlch(c1, c2, new double[] {1.0, 1.0, 1.0});
     }
 
     static double camlch(double[] c1, double[] c2, double[] w) {
@@ -414,18 +438,16 @@ public class Colors {
     private static double hueDifference(double hue1, double hue2, double c) {
         double difference = (hue2 - hue1) % c;
         double ch = c / 2;
-        if (difference > ch)
-            difference -= c;
-        if (difference < -ch)
-            difference += c;
+        if (difference > ch) difference -= c;
+        if (difference < -ch) difference += c;
         return difference;
     }
 
     private static double[] rgb(int color) {
         int r = (color >> 16) & 0xFF;
-        int g = (color >>  8) & 0xFF;
-        int b = (color >>  0) & 0xFF;
-        return new double[] { r / 255.0, g / 255.0, b / 255.0 };
+        int g = (color >> 8) & 0xFF;
+        int b = (color >> 0) & 0xFF;
+        return new double[] {r / 255.0, g / 255.0, b / 255.0};
     }
 
     static double[] rgb2xyz(int color) {
@@ -454,13 +476,13 @@ public class Colors {
 
     static double[] lch2lab(double[] lch) {
         double toRad = Math.PI / 180;
-        return new double[] { lch[0], lch[1] * Math.cos(lch[2] * toRad), lch[1] * Math.sin(lch[2] * toRad) };
+        return new double[] {lch[0], lch[1] * Math.cos(lch[2] * toRad), lch[1] * Math.sin(lch[2] * toRad)};
     }
 
     private static double[] xyz2camlch(double[] xyz, double[] vc) {
         double[] XYZ = new double[] {xyz[0] * 100.0, xyz[1] * 100.0, xyz[2] * 100.0};
         double[] cam = forwardTransform(XYZ, vc);
-        return new double[] { cam[J], cam[M], cam[h] };
+        return new double[] {cam[J], cam[M], cam[h]};
     }
 
     /** Lightness */
@@ -478,12 +500,12 @@ public class Colors {
     /** Hue */
     public static final int h = 6;
 
-
     /** CIECAM02 appearance correlates */
     private static double[] forwardTransform(double[] XYZ, double[] vc) {
         // calculate sharpened cone response
         double[] RGB = forwardPreAdaptationConeResponse(XYZ);
-        // calculate corresponding (sharpened) cone response considering various luminance level and surround conditions in D
+        // calculate corresponding (sharpened) cone response considering various luminance level and surround conditions
+        // in D
         double[] RGB_c = forwardPostAdaptationConeResponse(RGB, vc);
         // calculate HPE equal area cone fundamentals
         double[] RGBPrime = CAT02toHPE(RGB_c);
@@ -501,37 +523,40 @@ public class Colors {
         // calculate eccentricity
         double e = ((12500.0 / 13.0) * vc[VC_N_C] * vc[VC_N_CB]) * (Math.cos(Math.toRadians(h) + 2.0) + 3.8);
         // get t
-        double t = e * Math.sqrt(Math.pow(a, 2.0) + Math.pow(b, 2.0)) / (RGBPrime_a[0] + RGBPrime_a[1] + 1.05 * RGBPrime_a[2]);
+        double t = e
+                * Math.sqrt(Math.pow(a, 2.0) + Math.pow(b, 2.0))
+                / (RGBPrime_a[0] + RGBPrime_a[1] + 1.05 * RGBPrime_a[2]);
         // calculate brightness
         double Q = (4.0 / vc[VC_C]) * Math.sqrt(J / 100.0) * (vc[VC_A_W] + 4.0) * Math.pow(vc[VC_F_L], 0.25);
         // calculate the correlates of chroma, colorfulness, and saturation
-        double C = Math.signum(t) * Math.pow(Math.abs(t), 0.9) * Math.sqrt(J / 100.0) * Math.pow(1.64- Math.pow(0.29, vc[VC_N]), 0.73);
+        double C = Math.signum(t)
+                * Math.pow(Math.abs(t), 0.9)
+                * Math.sqrt(J / 100.0)
+                * Math.pow(1.64 - Math.pow(0.29, vc[VC_N]), 0.73);
         double M = C * Math.pow(vc[VC_F_L], 0.25);
         double s = 100.0 * Math.sqrt(M / Q);
         // calculate hue composition
         double H = calculateH(h);
-        return new double[] { J, Q, C, M, s, H, h };
+        return new double[] {J, Q, C, M, s, H, h};
     }
 
     private static double calculateH(double h) {
-        if (h < 20.14)
-            h = h + 360;
+        if (h < 20.14) h = h + 360;
         double i;
-        if (h >= 20.14 && h < 90.0) {  // index i = 1
+        if (h >= 20.14 && h < 90.0) { // index i = 1
             i = (h - 20.14) / 0.8;
             return 100.0 * i / (i + (90 - h) / 0.7);
         } else if (h < 164.25) { // index i = 2
             i = (h - 90) / 0.7;
             return 100.0 + 100.0 * i / (i + (164.25 - h) / 1);
-        } else if (h < 237.53) {  // index i = 3
+        } else if (h < 237.53) { // index i = 3
             i = (h - 164.25) / 1.0;
             return 200.0 + 100.0 * i / (i + (237.53 - h) / 1.2);
-        } else if (h <= 380.14) {  // index i = 4
+        } else if (h <= 380.14) { // index i = 4
             i = (h - 237.53) / 1.2;
             double H = 300.0 + 100.0 * i / (i + (380.14 - h) / 0.8);
             // don't use 400 if we can use 0
-            if (H <= 400.0 && H >= 399.999)
-                H = 0;
+            if (H <= 400.0 && H >= 399.999) H = 0;
             return H;
         } else {
             throw new IllegalArgumentException("h outside assumed range 0..360: " + h);
@@ -540,8 +565,8 @@ public class Colors {
 
     private static double[] forwardResponseCompression(double[] RGB, double[] vc) {
         double[] result = new double[3];
-        for(int channel = 0; channel < RGB.length; channel++) {
-            if(RGB[channel] >= 0) {
+        for (int channel = 0; channel < RGB.length; channel++) {
+            if (RGB[channel] >= 0) {
                 double n = Math.pow(vc[VC_F_L] * RGB[channel] / 100.0, 0.42);
                 result[channel] = 400.0 * n / (n + 27.13) + 0.1;
             } else {
@@ -553,22 +578,22 @@ public class Colors {
     }
 
     private static double[] forwardPostAdaptationConeResponse(double[] RGB, double[] vc) {
-        return new double[] { vc[VC_D_RGB_R] * RGB[0], vc[VC_D_RGB_G] * RGB[1], vc[VC_D_RGB_B] * RGB[2] };
+        return new double[] {vc[VC_D_RGB_R] * RGB[0], vc[VC_D_RGB_G] * RGB[1], vc[VC_D_RGB_B] * RGB[2]};
     }
 
     public static double[] CAT02toHPE(double[] RGB) {
         double[] RGBPrime = new double[3];
-        RGBPrime[0] =  0.7409792 * RGB[0] + 0.2180250 * RGB[1] + 0.0410058 * RGB[2];
-        RGBPrime[1] =  0.2853532 * RGB[0] + 0.6242014 * RGB[1] + 0.0904454 * RGB[2];
+        RGBPrime[0] = 0.7409792 * RGB[0] + 0.2180250 * RGB[1] + 0.0410058 * RGB[2];
+        RGBPrime[1] = 0.2853532 * RGB[0] + 0.6242014 * RGB[1] + 0.0904454 * RGB[2];
         RGBPrime[2] = -0.0096280 * RGB[0] - 0.0056980 * RGB[1] + 1.0153260 * RGB[2];
         return RGBPrime;
     }
 
     private static double[] forwardPreAdaptationConeResponse(double[] XYZ) {
         double[] RGB = new double[3];
-        RGB[0] =  0.7328 * XYZ[0] + 0.4296 * XYZ[1] - 0.1624 * XYZ[2];
+        RGB[0] = 0.7328 * XYZ[0] + 0.4296 * XYZ[1] - 0.1624 * XYZ[2];
         RGB[1] = -0.7036 * XYZ[0] + 1.6975 * XYZ[1] + 0.0061 * XYZ[2];
-        RGB[2] =  0.0030 * XYZ[0] + 0.0136 * XYZ[1] + 0.9834 * XYZ[2];
+        RGB[2] = 0.0030 * XYZ[0] + 0.0136 * XYZ[1] + 0.9834 * XYZ[2];
         return RGB;
     }
 
@@ -581,8 +606,8 @@ public class Colors {
     static final int VC_Z_W = 2;
     static final int VC_L_A = 3;
     static final int VC_Y_B = 4;
-    static final int VC_F =   5;
-    static final int VC_C =   6;
+    static final int VC_F = 5;
+    static final int VC_C = 6;
     static final int VC_N_C = 7;
 
     static final int VC_Z = 8;
@@ -607,33 +632,33 @@ public class Colors {
         vc[VC_N_C] = surrounding[SUR_N_C];
 
         double[] RGB_w = forwardPreAdaptationConeResponse(xyz_w);
-        double D = Math.max(0.0, Math.min(1.0, vc[VC_F] * (1.0 - (1.0 / 3.6) * Math.pow(Math.E, (-L_A - 42.0) / 92.0))));
+        double D =
+                Math.max(0.0, Math.min(1.0, vc[VC_F] * (1.0 - (1.0 / 3.6) * Math.pow(Math.E, (-L_A - 42.0) / 92.0))));
         double Yw = xyz_w[1];
         double[] RGB_c = new double[] {
-                (D * Yw / RGB_w[0]) + (1.0 - D),
-                (D * Yw / RGB_w[1]) + (1.0 - D),
-                (D * Yw / RGB_w[2]) + (1.0 - D),
+            (D * Yw / RGB_w[0]) + (1.0 - D), (D * Yw / RGB_w[1]) + (1.0 - D), (D * Yw / RGB_w[2]) + (1.0 - D),
         };
 
         // calculate increase in brightness and colorfulness caused by brighter viewing environments
         double L_Ax5 = 5.0 * L_A;
         double k = 1.0 / (L_Ax5 + 1.0);
         double kpow4 = Math.pow(k, 4.0);
-        vc[VC_F_L] = 0.2 * kpow4 * (L_Ax5) + 0.1 * Math.pow(1.0 - kpow4, 2.0) * Math.pow(L_Ax5, 1.0/3.0);
+        vc[VC_F_L] = 0.2 * kpow4 * (L_Ax5) + 0.1 * Math.pow(1.0 - kpow4, 2.0) * Math.pow(L_Ax5, 1.0 / 3.0);
 
         // calculate response compression on J and C caused by background lightness.
         vc[VC_N] = Y_b / Yw;
         vc[VC_Z] = 1.48 + Math.sqrt(vc[VC_N]);
 
         vc[VC_N_BB] = 0.725 * Math.pow(1.0 / vc[VC_N], 0.2);
-        vc[VC_N_CB] = vc[VC_N_BB]; // chromatic contrast factors (calculate increase in J, Q, and C caused by dark backgrounds)
+        vc[VC_N_CB] = vc[
+                VC_N_BB]; // chromatic contrast factors (calculate increase in J, Q, and C caused by dark backgrounds)
 
         // calculate achromatic response to white
         double[] RGB_wc = new double[] {RGB_c[0] * RGB_w[0], RGB_c[1] * RGB_w[1], RGB_c[2] * RGB_w[2]};
         double[] RGBPrime_w = CAT02toHPE(RGB_wc);
         double[] RGBPrime_aw = new double[3];
-        for(int channel = 0; channel < RGBPrime_w.length; channel++) {
-            if(RGBPrime_w[channel] >= 0) {
+        for (int channel = 0; channel < RGBPrime_w.length; channel++) {
+            if (RGBPrime_w[channel] >= 0) {
                 double n = Math.pow(vc[VC_F_L] * RGBPrime_w[channel] / 100.0, 0.42);
                 RGBPrime_aw[channel] = 400.0 * n / (n + 27.13) + 0.1;
             } else {
@@ -660,7 +685,7 @@ public class Colors {
         double x = vr * 0.4124564 + vg * 0.3575761 + vb * 0.1804375;
         double y = vr * 0.2126729 + vg * 0.7151522 + vb * 0.0721750;
         double z = vr * 0.0193339 + vg * 0.1191920 + vb * 0.9503041;
-        return new double[] { x, y, z };
+        return new double[] {x, y, z};
     }
 
     private static double pivotRgb(double n) {
@@ -674,11 +699,12 @@ public class Colors {
         double l = 116.0 * fy - 16.0;
         double a = 500.0 * (fx - fy);
         double b = 200.0 * (fy - fz);
-        return new double[] { l, a, b };
+        return new double[] {l, a, b};
     }
 
     private static final double epsilon = 216.0 / 24389.0;
     private static final double kappa = 24389.0 / 27.0;
+
     private static double pivotXyz(double n) {
         return n > epsilon ? Math.cbrt(n) : (kappa * n + 16) / 116;
     }
@@ -686,5 +712,4 @@ public class Colors {
     private static double sqr(double n) {
         return n * n;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Curses.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Curses.java
index bdfd4c37bc2..b9ada270705 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Curses.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Curses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -29,8 +29,7 @@ public final class Curses {
     private static final int IFTE_THEN = 2;
     private static final int IFTE_ELSE = 3;
 
-    private Curses() {
-    }
+    private Curses() {}
 
     /**
      * Print the given terminal capabilities
@@ -95,9 +94,9 @@ public final class Curses {
                             case 'n':
                                 out.append('\n');
                                 break;
-//                        case 'l':
-//                            rawPrint('\l');
-//                            break;
+                                //                        case 'l':
+                                //                            rawPrint('\l');
+                                //                            break;
                             case 'r':
                                 if (exec) {
                                     out.append('\r');
@@ -138,7 +137,7 @@ public final class Curses {
                 case '^':
                     ch = str.charAt(index++);
                     if (exec) {
-                        out.append((char)(ch - '@'));
+                        out.append((char) (ch - '@'));
                     }
                     break;
                 case '%':
@@ -195,7 +194,8 @@ public final class Curses {
                             break;
                         case '{':
                             int start = index;
-                            while (str.charAt(index++) != '}') ;
+                            while (str.charAt(index++) != '}')
+                                ;
                             if (exec) {
                                 int v = Integer.parseInt(str.substring(start, index - 1));
                                 stack.push(v);
@@ -364,10 +364,18 @@ public final class Curses {
                             int cnv;
                             while ("-+# ".indexOf(ch) >= 0) {
                                 switch (ch) {
-                                    case '-': left = true; break;
-                                    case '+': plus = true; break;
-                                    case '#': alternate = true; break;
-                                    case ' ': space = true; break;
+                                    case '-':
+                                        left = true;
+                                        break;
+                                    case '+':
+                                        plus = true;
+                                        break;
+                                    case '#':
+                                        alternate = true;
+                                        break;
+                                    case ' ':
+                                        space = true;
+                                        break;
                                 }
                                 ch = str.charAt(index++);
                             }
@@ -473,5 +481,4 @@ public final class Curses {
             return Integer.parseInt(pop.toString());
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/DiffHelper.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/DiffHelper.java
index 3852f572746..93b065395de 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/DiffHelper.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/DiffHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -25,7 +25,9 @@ public class DiffHelper {
      * which means: delete "Hello", add "Goodbye" and keep " world."
      */
     public enum Operation {
-        DELETE, INSERT, EQUAL
+        DELETE,
+        INSERT,
+        EQUAL
     }
 
     /**
@@ -86,16 +88,13 @@ public class DiffHelper {
                 && text1.charAt(commonStart) == text2.charAt(commonStart)
                 && text1.styleAt(commonStart).equals(text2.styleAt(commonStart))) {
             if (text1.isHidden(commonStart)) {
-                if (startHiddenRange < 0)
-                    startHiddenRange = commonStart;
-            } else
-                startHiddenRange = -1;
+                if (startHiddenRange < 0) startHiddenRange = commonStart;
+            } else startHiddenRange = -1;
             commonStart++;
         }
         if (startHiddenRange >= 0
-            && ((l1 > commonStart && text1.isHidden(commonStart))
-                || (l2 > commonStart && text2.isHidden(commonStart))))
-            commonStart = startHiddenRange;
+                && ((l1 > commonStart && text1.isHidden(commonStart))
+                        || (l2 > commonStart && text2.isHidden(commonStart)))) commonStart = startHiddenRange;
 
         startHiddenRange = -1;
         int commonEnd = 0;
@@ -103,32 +102,24 @@ public class DiffHelper {
                 && text1.charAt(l1 - commonEnd - 1) == text2.charAt(l2 - commonEnd - 1)
                 && text1.styleAt(l1 - commonEnd - 1).equals(text2.styleAt(l2 - commonEnd - 1))) {
             if (text1.isHidden(l1 - commonEnd - 1)) {
-                if (startHiddenRange < 0)
-                    startHiddenRange = commonEnd;
-            } else
-                startHiddenRange = -1;
+                if (startHiddenRange < 0) startHiddenRange = commonEnd;
+            } else startHiddenRange = -1;
             commonEnd++;
         }
-        if (startHiddenRange >= 0)
-            commonEnd = startHiddenRange;
+        if (startHiddenRange >= 0) commonEnd = startHiddenRange;
         LinkedList<Diff> diffs = new LinkedList<>();
         if (commonStart > 0) {
-            diffs.add(new Diff(DiffHelper.Operation.EQUAL,
-                    text1.subSequence(0, commonStart)));
+            diffs.add(new Diff(DiffHelper.Operation.EQUAL, text1.subSequence(0, commonStart)));
         }
         if (l2 > commonStart + commonEnd) {
-            diffs.add(new Diff(DiffHelper.Operation.INSERT,
-                    text2.subSequence(commonStart, l2 - commonEnd)));
+            diffs.add(new Diff(DiffHelper.Operation.INSERT, text2.subSequence(commonStart, l2 - commonEnd)));
         }
         if (l1 > commonStart + commonEnd) {
-            diffs.add(new Diff(DiffHelper.Operation.DELETE,
-                    text1.subSequence(commonStart, l1 - commonEnd)));
+            diffs.add(new Diff(DiffHelper.Operation.DELETE, text1.subSequence(commonStart, l1 - commonEnd)));
         }
         if (commonEnd > 0) {
-            diffs.add(new Diff(DiffHelper.Operation.EQUAL,
-                    text1.subSequence(l1 - commonEnd, l1)));
+            diffs.add(new Diff(DiffHelper.Operation.EQUAL, text1.subSequence(l1 - commonEnd, l1)));
         }
         return diffs;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
index aaeab9b71ff..557024a121e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -37,8 +37,8 @@ public class Display {
     protected final boolean fullScreen;
     protected List<AttributedString> oldLines = Collections.emptyList();
     protected int cursorPos;
-    private int columns;
-    private int columns1; // columns+1
+    protected int columns;
+    protected int columns1; // columns+1
     protected int rows;
     protected boolean reset;
     protected boolean delayLineWrap;
@@ -49,15 +49,15 @@ public class Display {
     protected final boolean delayedWrapAtEol;
     protected final boolean cursorDownIsNewLine;
 
+    @SuppressWarnings("this-escape")
     public Display(Terminal terminal, boolean fullscreen) {
         this.terminal = terminal;
         this.fullScreen = fullscreen;
 
         this.canScroll = can(Capability.insert_line, Capability.parm_insert_line)
-                            && can(Capability.delete_line, Capability.parm_delete_line);
+                && can(Capability.delete_line, Capability.parm_delete_line);
         this.wrapAtEol = terminal.getBooleanCapability(Capability.auto_right_margin);
-        this.delayedWrapAtEol = this.wrapAtEol
-            && terminal.getBooleanCapability(Capability.eat_newline_glitch);
+        this.delayedWrapAtEol = this.wrapAtEol && terminal.getBooleanCapability(Capability.eat_newline_glitch);
         this.cursorDownIsNewLine = "\n".equals(Curses.tputs(terminal.getStringCapability(Capability.cursor_down)));
     }
 
@@ -69,18 +69,22 @@ public class Display {
     public boolean delayLineWrap() {
         return delayLineWrap;
     }
-    public void setDelayLineWrap(boolean v) { delayLineWrap = v; }
+
+    public void setDelayLineWrap(boolean v) {
+        delayLineWrap = v;
+    }
 
     public void resize(int rows, int columns) {
         if (rows == 0 || columns == 0) {
-            columns = Integer.MAX_VALUE - 1;
+            columns = 1;
             rows = 1;
         }
         if (this.rows != rows || this.columns != columns) {
             this.rows = rows;
             this.columns = columns;
             this.columns1 = columns + 1;
-            oldLines = AttributedString.join(AttributedString.EMPTY, oldLines).columnSplitLength(columns, true, delayLineWrap());
+            oldLines = AttributedString.join(AttributedString.EMPTY, oldLines)
+                    .columnSplitLength(columns, true, delayLineWrap());
         }
     }
 
@@ -128,7 +132,8 @@ public class Display {
         // If dumb display, get rid of ansi sequences now
         Integer cols = terminal.getNumericCapability(Capability.max_colors);
         if (cols == null || cols < 8) {
-            newLines = newLines.stream().map(s -> new AttributedString(s.toString()))
+            newLines = newLines.stream()
+                    .map(s -> new AttributedString(s.toString()))
                     .collect(Collectors.toList());
         }
 
@@ -138,12 +143,13 @@ public class Display {
             int nbFooters = 0;
             // Find common headers and footers
             int l = newLines.size();
-            while (nbHeaders < l
-                   && Objects.equals(newLines.get(nbHeaders), oldLines.get(nbHeaders))) {
+            while (nbHeaders < l && Objects.equals(newLines.get(nbHeaders), oldLines.get(nbHeaders))) {
                 nbHeaders++;
             }
             while (nbFooters < l - nbHeaders - 1
-                    && Objects.equals(newLines.get(newLines.size() - nbFooters - 1), oldLines.get(oldLines.size() - nbFooters - 1))) {
+                    && Objects.equals(
+                            newLines.get(newLines.size() - nbFooters - 1),
+                            oldLines.get(oldLines.size() - nbFooters - 1))) {
                 nbFooters++;
             }
             List<AttributedString> o1 = newLines.subList(nbHeaders, newLines.size() - nbFooters);
@@ -190,18 +196,14 @@ public class Display {
         int numLines = Math.min(rows, Math.max(oldLines.size(), newLines.size()));
         boolean wrapNeeded = false;
         while (lineIndex < numLines) {
-            AttributedString oldLine =
-                lineIndex < oldLines.size() ? oldLines.get(lineIndex)
-                : AttributedString.NEWLINE;
-            AttributedString newLine =
-                 lineIndex < newLines.size() ? newLines.get(lineIndex)
-                : AttributedString.NEWLINE;
+            AttributedString oldLine = lineIndex < oldLines.size() ? oldLines.get(lineIndex) : AttributedString.NEWLINE;
+            AttributedString newLine = lineIndex < newLines.size() ? newLines.get(lineIndex) : AttributedString.NEWLINE;
             currentPos = lineIndex * columns1;
             int curCol = currentPos;
             int oldLength = oldLine.length();
             int newLength = newLine.length();
-            boolean oldNL = oldLength > 0 && oldLine.charAt(oldLength-1)=='\n';
-            boolean newNL = newLength > 0 && newLine.charAt(newLength-1)=='\n';
+            boolean oldNL = oldLength > 0 && oldLine.charAt(oldLength - 1) == '\n';
+            boolean newNL = newLength > 0 && newLine.charAt(newLength - 1) == '\n';
             if (oldNL) {
                 oldLength--;
                 oldLine = oldLine.substring(0, oldLength);
@@ -210,9 +212,7 @@ public class Display {
                 newLength--;
                 newLine = newLine.substring(0, newLength);
             }
-            if (wrapNeeded
-                && lineIndex == (cursorPos + 1) / columns1
-                && lineIndex < newLines.size()) {
+            if (wrapNeeded && lineIndex == (cursorPos + 1) / columns1 && lineIndex < newLines.size()) {
                 // move from right margin to next line's left margin
                 cursorPos++;
                 if (newLength == 0 || newLine.isHidden(0)) {
@@ -250,8 +250,7 @@ public class Display {
                         }
                         break;
                     case INSERT:
-                        if (i <= diffs.size() - 2
-                                && diffs.get(i + 1).operation == DiffHelper.Operation.EQUAL) {
+                        if (i <= diffs.size() - 2 && diffs.get(i + 1).operation == DiffHelper.Operation.EQUAL) {
                             cursorPos = moveVisualCursorTo(currentPos);
                             if (insertChars(width)) {
                                 rawPrint(diff.text);
@@ -282,8 +281,7 @@ public class Display {
                         if (currentPos - curCol >= columns) {
                             continue;
                         }
-                        if (i <= diffs.size() - 2
-                                && diffs.get(i + 1).operation == DiffHelper.Operation.EQUAL) {
+                        if (i <= diffs.size() - 2 && diffs.get(i + 1).operation == DiffHelper.Operation.EQUAL) {
                             if (currentPos + diffs.get(i + 1).text.columnLength() < columns) {
                                 moveVisualCursorTo(currentPos);
                                 if (deleteChars(width)) {
@@ -305,25 +303,23 @@ public class Display {
                 }
             }
             lineIndex++;
-            boolean newWrap = ! newNL && lineIndex < newLines.size();
-            if (targetCursorPos + 1 == lineIndex * columns1
-                && (newWrap || ! delayLineWrap))
-                targetCursorPos++;
+            boolean newWrap = !newNL && lineIndex < newLines.size();
+            if (targetCursorPos + 1 == lineIndex * columns1 && (newWrap || !delayLineWrap)) targetCursorPos++;
             boolean atRight = (cursorPos - curCol) % columns1 == columns;
             wrapNeeded = false;
             if (this.delayedWrapAtEol) {
-                boolean oldWrap = ! oldNL && lineIndex < oldLines.size();
-                if (newWrap != oldWrap && ! (oldWrap && cleared)) {
-                    moveVisualCursorTo(lineIndex*columns1-1, newLines);
-                    if (newWrap)
-                        wrapNeeded = true;
-                    else
-                        terminal.puts(Capability.clr_eol);
+                boolean oldWrap = !oldNL && lineIndex < oldLines.size();
+                if (newWrap != oldWrap && !(oldWrap && cleared)) {
+                    moveVisualCursorTo(lineIndex * columns1 - 1, newLines);
+                    if (newWrap) wrapNeeded = true;
+                    else terminal.puts(Capability.clr_eol);
                 }
             } else if (atRight) {
                 if (this.wrapAtEol) {
-                    terminal.writer().write(" \b");
-                    cursorPos++;
+                    if (!fullScreen || (fullScreen && lineIndex < numLines)) {
+                        terminal.writer().write(" \b");
+                        cursorPos++;
+                    }
                 } else {
                     terminal.puts(Capability.carriage_return); // CR / not newline.
                     cursorPos = curCol;
@@ -358,8 +354,7 @@ public class Display {
     }
 
     protected boolean can(Capability single, Capability multi) {
-        return terminal.getStringCapability(single) != null
-                || terminal.getStringCapability(multi) != null;
+        return terminal.getStringCapability(single) != null || terminal.getStringCapability(multi) != null;
     }
 
     protected boolean perform(Capability single, Capability multi, int nb) {
@@ -405,7 +400,7 @@ public class Display {
                 }
             }
         }
-        return max != 0 ? new int[] { start1, start2, max } : null;
+        return max != 0 ? new int[] {start1, start2, max} : null;
     }
 
     /*
@@ -413,8 +408,7 @@ public class Display {
      * We're at the right margin if {@code (cursorPos % columns1) == columns}.
      * This method knows how to move both *from* and *to* the right margin.
      */
-    protected void moveVisualCursorTo(int targetPos,
-                                      List<AttributedString> newLines) {
+    protected void moveVisualCursorTo(int targetPos, List<AttributedString> newLines) {
         if (cursorPos != targetPos) {
             boolean atRight = (targetPos % columns1) == columns;
             moveVisualCursorTo(targetPos - (atRight ? 1 : 0));
@@ -422,12 +416,11 @@ public class Display {
                 // There is no portable way to move to the right margin
                 // except by writing a character in the right-most column.
                 int row = targetPos / columns1;
-                AttributedString lastChar = row >= newLines.size() ? AttributedString.EMPTY
-                    : newLines.get(row).columnSubSequence(columns-1, columns);
-                if (lastChar.length() == 0)
-                    rawPrint((int) ' ');
-                else
-                    rawPrint(lastChar);
+                AttributedString lastChar = row >= newLines.size()
+                        ? AttributedString.EMPTY
+                        : newLines.get(row).columnSubSequence(columns - 1, columns);
+                if (lastChar.length() == 0) rawPrint((int) ' ');
+                else rawPrint(lastChar);
                 cursorPos++;
             }
         }
@@ -499,5 +492,4 @@ public class Display {
     public int wcwidth(String str) {
         return str != null ? AttributedString.fromAnsi(str).columnLength() : 0;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ExecHelper.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ExecHelper.java
index 9fce26fcf35..5d3c235661b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ExecHelper.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ExecHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -22,8 +22,7 @@ import java.util.Objects;
  */
 public final class ExecHelper {
 
-    private ExecHelper() {
-    }
+    private ExecHelper() {}
 
     public static String exec(boolean redirectInput, final String... cmd) throws IOException {
         Objects.requireNonNull(cmd);
@@ -31,7 +30,7 @@ public final class ExecHelper {
             Log.trace("Running: ", cmd);
             ProcessBuilder pb = new ProcessBuilder(cmd);
             if (OSUtils.IS_AIX) {
-                Map<String,String> env = pb.environment();
+                Map<String, String> env = pb.environment();
                 env.put("PATH", "/opt/freeware/bin:" + env.get("PATH"));
                 env.put("LANG", "C");
                 env.put("LC_ALL", "C");
@@ -90,4 +89,3 @@ public final class ExecHelper {
         }
     }
 }
-
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/FastBufferedOutputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/FastBufferedOutputStream.java
new file mode 100644
index 00000000000..62c29c17f78
--- /dev/null
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/FastBufferedOutputStream.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2009-2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package jdk.internal.org.jline.utils;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * A simple buffering output stream with no synchronization.
+ */
+public class FastBufferedOutputStream extends FilterOutputStream {
+
+    protected final byte[] buf = new byte[8192];
+    protected int count;
+
+    public FastBufferedOutputStream(OutputStream out) {
+        super(out);
+    }
+
+    @Override
+    public void write(int b) throws IOException {
+        if (count >= buf.length) {
+            flushBuffer();
+        }
+        buf[count++] = (byte) b;
+    }
+
+    @Override
+    public void write(byte b[], int off, int len) throws IOException {
+        if (len >= buf.length) {
+            flushBuffer();
+            out.write(b, off, len);
+            return;
+        }
+        if (len > buf.length - count) {
+            flushBuffer();
+        }
+        System.arraycopy(b, off, buf, count, len);
+        count += len;
+    }
+
+    private void flushBuffer() throws IOException {
+        if (count > 0) {
+            out.write(buf, 0, count);
+            count = 0;
+        }
+    }
+
+    @Override
+    public void flush() throws IOException {
+        flushBuffer();
+        out.flush();
+    }
+}
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InfoCmp.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InfoCmp.java
index 23a76071486..32cf3f56318 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InfoCmp.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InfoCmp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -28,476 +28,474 @@ public final class InfoCmp {
 
     private static final Map<String, Object> CAPS = new HashMap<>();
 
-    private InfoCmp() {
-    }
+    private InfoCmp() {}
 
     @SuppressWarnings("unused")
     public enum Capability {
-
-        auto_left_margin,           // auto_left_margin, bw, bw
-        auto_right_margin,          // auto_right_margin, am, am
-        back_color_erase,           // back_color_erase, bce, ut
-        can_change,                 // can_change, ccc, cc
-        ceol_standout_glitch,       // ceol_standout_glitch, xhp, xs
-        col_addr_glitch,            // col_addr_glitch, xhpa, YA
-        cpi_changes_res,            // cpi_changes_res, cpix, YF
-        cr_cancels_micro_mode,      // cr_cancels_micro_mode, crxm, YB
-        dest_tabs_magic_smso,       // dest_tabs_magic_smso, xt, xt
-        eat_newline_glitch,         // eat_newline_glitch, xenl, xn
-        erase_overstrike,           // erase_overstrike, eo, eo
-        generic_type,               // generic_type, gn, gn
-        hard_copy,                  // hard_copy, hc, hc
-        hard_cursor,                // hard_cursor, chts, HC
-        has_meta_key,               // has_meta_key, km, km
-        has_print_wheel,            // has_print_wheel, daisy, YC
-        has_status_line,            // has_status_line, hs, hs
-        hue_lightness_saturation,   // hue_lightness_saturation, hls, hl
-        insert_null_glitch,         // insert_null_glitch, in, in
-        lpi_changes_res,            // lpi_changes_res, lpix, YG
-        memory_above,               // memory_above, da, da
-        memory_below,               // memory_below, db, db
-        move_insert_mode,           // move_insert_mode, mir, mi
-        move_standout_mode,         // move_standout_mode, msgr, ms
-        needs_xon_xoff,             // needs_xon_xoff, nxon, nx
-        no_esc_ctlc,                // no_esc_ctlc, xsb, xb
-        no_pad_char,                // no_pad_char, npc, NP
-        non_dest_scroll_region,     // non_dest_scroll_region, ndscr, ND
-        non_rev_rmcup,              // non_rev_rmcup, nrrmc, NR
-        over_strike,                // over_strike, os, os
-        prtr_silent,                // prtr_silent, mc5i, 5i
-        row_addr_glitch,            // row_addr_glitch, xvpa, YD
-        semi_auto_right_margin,     // semi_auto_right_margin, sam, YE
-        status_line_esc_ok,         // status_line_esc_ok, eslok, es
-        tilde_glitch,               // tilde_glitch, hz, hz
-        transparent_underline,      // transparent_underline, ul, ul
-        xon_xoff,                   // xon_xoff, xon, xo
-        columns,                    // columns, cols, co
-        init_tabs,                  // init_tabs, it, it
-        label_height,               // label_height, lh, lh
-        label_width,                // label_width, lw, lw
-        lines,                      // lines, lines, li
-        lines_of_memory,            // lines_of_memory, lm, lm
-        magic_cookie_glitch,        // magic_cookie_glitch, xmc, sg
-        max_attributes,             // max_attributes, ma, ma
-        max_colors,                 // max_colors, colors, Co
-        max_pairs,                  // max_pairs, pairs, pa
-        maximum_windows,            // maximum_windows, wnum, MW
-        no_color_video,             // no_color_video, ncv, NC
-        num_labels,                 // num_labels, nlab, Nl
-        padding_baud_rate,          // padding_baud_rate, pb, pb
-        virtual_terminal,           // virtual_terminal, vt, vt
-        width_status_line,          // width_status_line, wsl, ws
-        bit_image_entwining,        // bit_image_entwining, bitwin, Yo
-        bit_image_type,             // bit_image_type, bitype, Yp
-        buffer_capacity,            // buffer_capacity, bufsz, Ya
-        buttons,                    // buttons, btns, BT
-        dot_horz_spacing,           // dot_horz_spacing, spinh, Yc
-        dot_vert_spacing,           // dot_vert_spacing, spinv, Yb
-        max_micro_address,          // max_micro_address, maddr, Yd
-        max_micro_jump,             // max_micro_jump, mjump, Ye
-        micro_col_size,             // micro_col_size, mcs, Yf
-        micro_line_size,            // micro_line_size, mls, Yg
-        number_of_pins,             // number_of_pins, npins, Yh
-        output_res_char,            // output_res_char, orc, Yi
-        output_res_horz_inch,       // output_res_horz_inch, orhi, Yk
-        output_res_line,            // output_res_line, orl, Yj
-        output_res_vert_inch,       // output_res_vert_inch, orvi, Yl
-        print_rate,                 // print_rate, cps, Ym
-        wide_char_size,             // wide_char_size, widcs, Yn
-        acs_chars,                  // acs_chars, acsc, ac
-        back_tab,                   // back_tab, cbt, bt
-        bell,                       // bell, bel, bl
-        carriage_return,            // carriage_return, cr, cr
-        change_char_pitch,          // change_char_pitch, cpi, ZA
-        change_line_pitch,          // change_line_pitch, lpi, ZB
-        change_res_horz,            // change_res_horz, chr, ZC
-        change_res_vert,            // change_res_vert, cvr, ZD
-        change_scroll_region,       // change_scroll_region, csr, cs
-        char_padding,               // char_padding, rmp, rP
-        clear_all_tabs,             // clear_all_tabs, tbc, ct
-        clear_margins,              // clear_margins, mgc, MC
-        clear_screen,               // clear_screen, clear, cl
-        clr_bol,                    // clr_bol, el1, cb
-        clr_eol,                    // clr_eol, el, ce
-        clr_eos,                    // clr_eos, ed, cd
-        column_address,             // column_address, hpa, ch
-        command_character,          // command_character, cmdch, CC
-        create_window,              // create_window, cwin, CW
-        cursor_address,             // cursor_address, cup, cm
-        cursor_down,                // cursor_down, cud1, do
-        cursor_home,                // cursor_home, home, ho
-        cursor_invisible,           // cursor_invisible, civis, vi
-        cursor_left,                // cursor_left, cub1, le
-        cursor_mem_address,         // cursor_mem_address, mrcup, CM
-        cursor_normal,              // cursor_normal, cnorm, ve
-        cursor_right,               // cursor_right, cuf1, nd
-        cursor_to_ll,               // cursor_to_ll, ll, ll
-        cursor_up,                  // cursor_up, cuu1, up
-        cursor_visible,             // cursor_visible, cvvis, vs
-        define_char,                // define_char, defc, ZE
-        delete_character,           // delete_character, dch1, dc
-        delete_line,                // delete_line, dl1, dl
-        dial_phone,                 // dial_phone, dial, DI
-        dis_status_line,            // dis_status_line, dsl, ds
-        display_clock,              // display_clock, dclk, DK
-        down_half_line,             // down_half_line, hd, hd
-        ena_acs,                    // ena_acs, enacs, eA
-        enter_alt_charset_mode,     // enter_alt_charset_mode, smacs, as
-        enter_am_mode,              // enter_am_mode, smam, SA
-        enter_blink_mode,           // enter_blink_mode, blink, mb
-        enter_bold_mode,            // enter_bold_mode, bold, md
-        enter_ca_mode,              // enter_ca_mode, smcup, ti
-        enter_delete_mode,          // enter_delete_mode, smdc, dm
-        enter_dim_mode,             // enter_dim_mode, dim, mh
-        enter_doublewide_mode,      // enter_doublewide_mode, swidm, ZF
-        enter_draft_quality,        // enter_draft_quality, sdrfq, ZG
-        enter_insert_mode,          // enter_insert_mode, smir, im
-        enter_italics_mode,         // enter_italics_mode, sitm, ZH
-        enter_leftward_mode,        // enter_leftward_mode, slm, ZI
-        enter_micro_mode,           // enter_micro_mode, smicm, ZJ
-        enter_near_letter_quality,  // enter_near_letter_quality, snlq, ZK
-        enter_normal_quality,       // enter_normal_quality, snrmq, ZL
-        enter_protected_mode,       // enter_protected_mode, prot, mp
-        enter_reverse_mode,         // enter_reverse_mode, rev, mr
-        enter_secure_mode,          // enter_secure_mode, invis, mk
-        enter_shadow_mode,          // enter_shadow_mode, sshm, ZM
-        enter_standout_mode,        // enter_standout_mode, smso, so
-        enter_subscript_mode,       // enter_subscript_mode, ssubm, ZN
-        enter_superscript_mode,     // enter_superscript_mode, ssupm, ZO
-        enter_underline_mode,       // enter_underline_mode, smul, us
-        enter_upward_mode,          // enter_upward_mode, sum, ZP
-        enter_xon_mode,             // enter_xon_mode, smxon, SX
-        erase_chars,                // erase_chars, ech, ec
-        exit_alt_charset_mode,      // exit_alt_charset_mode, rmacs, ae
-        exit_am_mode,               // exit_am_mode, rmam, RA
-        exit_attribute_mode,        // exit_attribute_mode, sgr0, me
-        exit_ca_mode,               // exit_ca_mode, rmcup, te
-        exit_delete_mode,           // exit_delete_mode, rmdc, ed
-        exit_doublewide_mode,       // exit_doublewide_mode, rwidm, ZQ
-        exit_insert_mode,           // exit_insert_mode, rmir, ei
-        exit_italics_mode,          // exit_italics_mode, ritm, ZR
-        exit_leftward_mode,         // exit_leftward_mode, rlm, ZS
-        exit_micro_mode,            // exit_micro_mode, rmicm, ZT
-        exit_shadow_mode,           // exit_shadow_mode, rshm, ZU
-        exit_standout_mode,         // exit_standout_mode, rmso, se
-        exit_subscript_mode,        // exit_subscript_mode, rsubm, ZV
-        exit_superscript_mode,      // exit_superscript_mode, rsupm, ZW
-        exit_underline_mode,        // exit_underline_mode, rmul, ue
-        exit_upward_mode,           // exit_upward_mode, rum, ZX
-        exit_xon_mode,              // exit_xon_mode, rmxon, RX
-        fixed_pause,                // fixed_pause, pause, PA
-        flash_hook,                 // flash_hook, hook, fh
-        flash_screen,               // flash_screen, flash, vb
-        form_feed,                  // form_feed, ff, ff
-        from_status_line,           // from_status_line, fsl, fs
-        goto_window,                // goto_window, wingo, WG
-        hangup,                     // hangup, hup, HU
-        init_1string,               // init_1string, is1, i1
-        init_2string,               // init_2string, is2, is
-        init_3string,               // init_3string, is3, i3
-        init_file,                  // init_file, if, if
-        init_prog,                  // init_prog, iprog, iP
-        initialize_color,           // initialize_color, initc, Ic
-        initialize_pair,            // initialize_pair, initp, Ip
-        insert_character,           // insert_character, ich1, ic
-        insert_line,                // insert_line, il1, al
-        insert_padding,             // insert_padding, ip, ip
-        key_a1,                     // key_a1, ka1, K1
-        key_a3,                     // key_a3, ka3, K3
-        key_b2,                     // key_b2, kb2, K2
-        key_backspace,              // key_backspace, kbs, kb
-        key_beg,                    // key_beg, kbeg, @1
-        key_btab,                   // key_btab, kcbt, kB
-        key_c1,                     // key_c1, kc1, K4
-        key_c3,                     // key_c3, kc3, K5
-        key_cancel,                 // key_cancel, kcan, @2
-        key_catab,                  // key_catab, ktbc, ka
-        key_clear,                  // key_clear, kclr, kC
-        key_close,                  // key_close, kclo, @3
-        key_command,                // key_command, kcmd, @4
-        key_copy,                   // key_copy, kcpy, @5
-        key_create,                 // key_create, kcrt, @6
-        key_ctab,                   // key_ctab, kctab, kt
-        key_dc,                     // key_dc, kdch1, kD
-        key_dl,                     // key_dl, kdl1, kL
-        key_down,                   // key_down, kcud1, kd
-        key_eic,                    // key_eic, krmir, kM
-        key_end,                    // key_end, kend, @7
-        key_enter,                  // key_enter, kent, @8
-        key_eol,                    // key_eol, kel, kE
-        key_eos,                    // key_eos, ked, kS
-        key_exit,                   // key_exit, kext, @9
-        key_f0,                     // key_f0, kf0, k0
-        key_f1,                     // key_f1, kf1, k1
-        key_f10,                    // key_f10, kf10, k;
-        key_f11,                    // key_f11, kf11, F1
-        key_f12,                    // key_f12, kf12, F2
-        key_f13,                    // key_f13, kf13, F3
-        key_f14,                    // key_f14, kf14, F4
-        key_f15,                    // key_f15, kf15, F5
-        key_f16,                    // key_f16, kf16, F6
-        key_f17,                    // key_f17, kf17, F7
-        key_f18,                    // key_f18, kf18, F8
-        key_f19,                    // key_f19, kf19, F9
-        key_f2,                     // key_f2, kf2, k2
-        key_f20,                    // key_f20, kf20, FA
-        key_f21,                    // key_f21, kf21, FB
-        key_f22,                    // key_f22, kf22, FC
-        key_f23,                    // key_f23, kf23, FD
-        key_f24,                    // key_f24, kf24, FE
-        key_f25,                    // key_f25, kf25, FF
-        key_f26,                    // key_f26, kf26, FG
-        key_f27,                    // key_f27, kf27, FH
-        key_f28,                    // key_f28, kf28, FI
-        key_f29,                    // key_f29, kf29, FJ
-        key_f3,                     // key_f3, kf3, k3
-        key_f30,                    // key_f30, kf30, FK
-        key_f31,                    // key_f31, kf31, FL
-        key_f32,                    // key_f32, kf32, FM
-        key_f33,                    // key_f33, kf33, FN
-        key_f34,                    // key_f34, kf34, FO
-        key_f35,                    // key_f35, kf35, FP
-        key_f36,                    // key_f36, kf36, FQ
-        key_f37,                    // key_f37, kf37, FR
-        key_f38,                    // key_f38, kf38, FS
-        key_f39,                    // key_f39, kf39, FT
-        key_f4,                     // key_f4, kf4, k4
-        key_f40,                    // key_f40, kf40, FU
-        key_f41,                    // key_f41, kf41, FV
-        key_f42,                    // key_f42, kf42, FW
-        key_f43,                    // key_f43, kf43, FX
-        key_f44,                    // key_f44, kf44, FY
-        key_f45,                    // key_f45, kf45, FZ
-        key_f46,                    // key_f46, kf46, Fa
-        key_f47,                    // key_f47, kf47, Fb
-        key_f48,                    // key_f48, kf48, Fc
-        key_f49,                    // key_f49, kf49, Fd
-        key_f5,                     // key_f5, kf5, k5
-        key_f50,                    // key_f50, kf50, Fe
-        key_f51,                    // key_f51, kf51, Ff
-        key_f52,                    // key_f52, kf52, Fg
-        key_f53,                    // key_f53, kf53, Fh
-        key_f54,                    // key_f54, kf54, Fi
-        key_f55,                    // key_f55, kf55, Fj
-        key_f56,                    // key_f56, kf56, Fk
-        key_f57,                    // key_f57, kf57, Fl
-        key_f58,                    // key_f58, kf58, Fm
-        key_f59,                    // key_f59, kf59, Fn
-        key_f6,                     // key_f6, kf6, k6
-        key_f60,                    // key_f60, kf60, Fo
-        key_f61,                    // key_f61, kf61, Fp
-        key_f62,                    // key_f62, kf62, Fq
-        key_f63,                    // key_f63, kf63, Fr
-        key_f7,                     // key_f7, kf7, k7
-        key_f8,                     // key_f8, kf8, k8
-        key_f9,                     // key_f9, kf9, k9
-        key_find,                   // key_find, kfnd, @0
-        key_help,                   // key_help, khlp, %1
-        key_home,                   // key_home, khome, kh
-        key_ic,                     // key_ic, kich1, kI
-        key_il,                     // key_il, kil1, kA
-        key_left,                   // key_left, kcub1, kl
-        key_ll,                     // key_ll, kll, kH
-        key_mark,                   // key_mark, kmrk, %2
-        key_message,                // key_message, kmsg, %3
-        key_move,                   // key_move, kmov, %4
-        key_next,                   // key_next, knxt, %5
-        key_npage,                  // key_npage, knp, kN
-        key_open,                   // key_open, kopn, %6
-        key_options,                // key_options, kopt, %7
-        key_ppage,                  // key_ppage, kpp, kP
-        key_previous,               // key_previous, kprv, %8
-        key_print,                  // key_print, kprt, %9
-        key_redo,                   // key_redo, krdo, %0
-        key_reference,              // key_reference, kref, &1
-        key_refresh,                // key_refresh, krfr, &2
-        key_replace,                // key_replace, krpl, &3
-        key_restart,                // key_restart, krst, &4
-        key_resume,                 // key_resume, kres, &5
-        key_right,                  // key_right, kcuf1, kr
-        key_save,                   // key_save, ksav, &6
-        key_sbeg,                   // key_sbeg, kBEG, &9
-        key_scancel,                // key_scancel, kCAN, &0
-        key_scommand,               // key_scommand, kCMD, *1
-        key_scopy,                  // key_scopy, kCPY, *2
-        key_screate,                // key_screate, kCRT, *3
-        key_sdc,                    // key_sdc, kDC, *4
-        key_sdl,                    // key_sdl, kDL, *5
-        key_select,                 // key_select, kslt, *6
-        key_send,                   // key_send, kEND, *7
-        key_seol,                   // key_seol, kEOL, *8
-        key_sexit,                  // key_sexit, kEXT, *9
-        key_sf,                     // key_sf, kind, kF
-        key_sfind,                  // key_sfind, kFND, *0
-        key_shelp,                  // key_shelp, kHLP, #1
-        key_shome,                  // key_shome, kHOM, #2
-        key_sic,                    // key_sic, kIC, #3
-        key_sleft,                  // key_sleft, kLFT, #4
-        key_smessage,               // key_smessage, kMSG, %a
-        key_smove,                  // key_smove, kMOV, %b
-        key_snext,                  // key_snext, kNXT, %c
-        key_soptions,               // key_soptions, kOPT, %d
-        key_sprevious,              // key_sprevious, kPRV, %e
-        key_sprint,                 // key_sprint, kPRT, %f
-        key_sr,                     // key_sr, kri, kR
-        key_sredo,                  // key_sredo, kRDO, %g
-        key_sreplace,               // key_sreplace, kRPL, %h
-        key_sright,                 // key_sright, kRIT, %i
-        key_srsume,                 // key_srsume, kRES, %j
-        key_ssave,                  // key_ssave, kSAV, !1
-        key_ssuspend,               // key_ssuspend, kSPD, !2
-        key_stab,                   // key_stab, khts, kT
-        key_sundo,                  // key_sundo, kUND, !3
-        key_suspend,                // key_suspend, kspd, &7
-        key_undo,                   // key_undo, kund, &8
-        key_up,                     // key_up, kcuu1, ku
-        keypad_local,               // keypad_local, rmkx, ke
-        keypad_xmit,                // keypad_xmit, smkx, ks
-        lab_f0,                     // lab_f0, lf0, l0
-        lab_f1,                     // lab_f1, lf1, l1
-        lab_f10,                    // lab_f10, lf10, la
-        lab_f2,                     // lab_f2, lf2, l2
-        lab_f3,                     // lab_f3, lf3, l3
-        lab_f4,                     // lab_f4, lf4, l4
-        lab_f5,                     // lab_f5, lf5, l5
-        lab_f6,                     // lab_f6, lf6, l6
-        lab_f7,                     // lab_f7, lf7, l7
-        lab_f8,                     // lab_f8, lf8, l8
-        lab_f9,                     // lab_f9, lf9, l9
-        label_format,               // label_format, fln, Lf
-        label_off,                  // label_off, rmln, LF
-        label_on,                   // label_on, smln, LO
-        meta_off,                   // meta_off, rmm, mo
-        meta_on,                    // meta_on, smm, mm
-        micro_column_address,       // micro_column_address, mhpa, ZY
-        micro_down,                 // micro_down, mcud1, ZZ
-        micro_left,                 // micro_left, mcub1, Za
-        micro_right,                // micro_right, mcuf1, Zb
-        micro_row_address,          // micro_row_address, mvpa, Zc
-        micro_up,                   // micro_up, mcuu1, Zd
-        newline,                    // newline, nel, nw
-        order_of_pins,              // order_of_pins, porder, Ze
-        orig_colors,                // orig_colors, oc, oc
-        orig_pair,                  // orig_pair, op, op
-        pad_char,                   // pad_char, pad, pc
-        parm_dch,                   // parm_dch, dch, DC
-        parm_delete_line,           // parm_delete_line, dl, DL
-        parm_down_cursor,           // parm_down_cursor, cud, DO
-        parm_down_micro,            // parm_down_micro, mcud, Zf
-        parm_ich,                   // parm_ich, ich, IC
-        parm_index,                 // parm_index, indn, SF
-        parm_insert_line,           // parm_insert_line, il, AL
-        parm_left_cursor,           // parm_left_cursor, cub, LE
-        parm_left_micro,            // parm_left_micro, mcub, Zg
-        parm_right_cursor,          // parm_right_cursor, cuf, RI
-        parm_right_micro,           // parm_right_micro, mcuf, Zh
-        parm_rindex,                // parm_rindex, rin, SR
-        parm_up_cursor,             // parm_up_cursor, cuu, UP
-        parm_up_micro,              // parm_up_micro, mcuu, Zi
-        pkey_key,                   // pkey_key, pfkey, pk
-        pkey_local,                 // pkey_local, pfloc, pl
-        pkey_xmit,                  // pkey_xmit, pfx, px
-        plab_norm,                  // plab_norm, pln, pn
-        print_screen,               // print_screen, mc0, ps
-        prtr_non,                   // prtr_non, mc5p, pO
-        prtr_off,                   // prtr_off, mc4, pf
-        prtr_on,                    // prtr_on, mc5, po
-        pulse,                      // pulse, pulse, PU
-        quick_dial,                 // quick_dial, qdial, QD
-        remove_clock,               // remove_clock, rmclk, RC
-        repeat_char,                // repeat_char, rep, rp
-        req_for_input,              // req_for_input, rfi, RF
-        reset_1string,              // reset_1string, rs1, r1
-        reset_2string,              // reset_2string, rs2, r2
-        reset_3string,              // reset_3string, rs3, r3
-        reset_file,                 // reset_file, rf, rf
-        restore_cursor,             // restore_cursor, rc, rc
-        row_address,                // row_address, vpa, cv
-        save_cursor,                // save_cursor, sc, sc
-        scroll_forward,             // scroll_forward, ind, sf
-        scroll_reverse,             // scroll_reverse, ri, sr
-        select_char_set,            // select_char_set, scs, Zj
-        set_attributes,             // set_attributes, sgr, sa
-        set_background,             // set_background, setb, Sb
-        set_bottom_margin,          // set_bottom_margin, smgb, Zk
-        set_bottom_margin_parm,     // set_bottom_margin_parm, smgbp, Zl
-        set_clock,                  // set_clock, sclk, SC
-        set_color_pair,             // set_color_pair, scp, sp
-        set_foreground,             // set_foreground, setf, Sf
-        set_left_margin,            // set_left_margin, smgl, ML
-        set_left_margin_parm,       // set_left_margin_parm, smglp, Zm
-        set_right_margin,           // set_right_margin, smgr, MR
-        set_right_margin_parm,      // set_right_margin_parm, smgrp, Zn
-        set_tab,                    // set_tab, hts, st
-        set_top_margin,             // set_top_margin, smgt, Zo
-        set_top_margin_parm,        // set_top_margin_parm, smgtp, Zp
-        set_window,                 // set_window, wind, wi
-        start_bit_image,            // start_bit_image, sbim, Zq
-        start_char_set_def,         // start_char_set_def, scsd, Zr
-        stop_bit_image,             // stop_bit_image, rbim, Zs
-        stop_char_set_def,          // stop_char_set_def, rcsd, Zt
-        subscript_characters,       // subscript_characters, subcs, Zu
-        superscript_characters,     // superscript_characters, supcs, Zv
-        tab,                        // tab, ht, ta
-        these_cause_cr,             // these_cause_cr, docr, Zw
-        to_status_line,             // to_status_line, tsl, ts
-        tone,                       // tone, tone, TO
-        underline_char,             // underline_char, uc, uc
-        up_half_line,               // up_half_line, hu, hu
-        user0,                      // user0, u0, u0
-        user1,                      // user1, u1, u1
-        user2,                      // user2, u2, u2
-        user3,                      // user3, u3, u3
-        user4,                      // user4, u4, u4
-        user5,                      // user5, u5, u5
-        user6,                      // user6, u6, u6
-        user7,                      // user7, u7, u7
-        user8,                      // user8, u8, u8
-        user9,                      // user9, u9, u9
-        wait_tone,                  // wait_tone, wait, WA
-        xoff_character,             // xoff_character, xoffc, XF
-        xon_character,              // xon_character, xonc, XN
-        zero_motion,                // zero_motion, zerom, Zx
-        alt_scancode_esc,           // alt_scancode_esc, scesa, S8
-        bit_image_carriage_return,  // bit_image_carriage_return, bicr, Yv
-        bit_image_newline,          // bit_image_newline, binel, Zz
-        bit_image_repeat,           // bit_image_repeat, birep, Xy
-        char_set_names,             // char_set_names, csnm, Zy
-        code_set_init,              // code_set_init, csin, ci
-        color_names,                // color_names, colornm, Yw
-        define_bit_image_region,    // define_bit_image_region, defbi, Yx
-        device_type,                // device_type, devt, dv
-        display_pc_char,            // display_pc_char, dispc, S1
-        end_bit_image_region,       // end_bit_image_region, endbi, Yy
-        enter_pc_charset_mode,      // enter_pc_charset_mode, smpch, S2
-        enter_scancode_mode,        // enter_scancode_mode, smsc, S4
-        exit_pc_charset_mode,       // exit_pc_charset_mode, rmpch, S3
-        exit_scancode_mode,         // exit_scancode_mode, rmsc, S5
-        get_mouse,                  // get_mouse, getm, Gm
-        key_mouse,                  // key_mouse, kmous, Km
-        mouse_info,                 // mouse_info, minfo, Mi
-        pc_term_options,            // pc_term_options, pctrm, S6
-        pkey_plab,                  // pkey_plab, pfxl, xl
-        req_mouse_pos,              // req_mouse_pos, reqmp, RQ
-        scancode_escape,            // scancode_escape, scesc, S7
-        set0_des_seq,               // set0_des_seq, s0ds, s0
-        set1_des_seq,               // set1_des_seq, s1ds, s1
-        set2_des_seq,               // set2_des_seq, s2ds, s2
-        set3_des_seq,               // set3_des_seq, s3ds, s3
-        set_a_background,           // set_a_background, setab, AB
-        set_a_foreground,           // set_a_foreground, setaf, AF
-        set_color_band,             // set_color_band, setcolor, Yz
-        set_lr_margin,              // set_lr_margin, smglr, ML
-        set_page_length,            // set_page_length, slines, YZ
-        set_tb_margin,              // set_tb_margin, smgtb, MT
-        enter_horizontal_hl_mode,   // enter_horizontal_hl_mode, ehhlm, Xh
-        enter_left_hl_mode,         // enter_left_hl_mode, elhlm, Xl
-        enter_low_hl_mode,          // enter_low_hl_mode, elohlm, Xo
-        enter_right_hl_mode,        // enter_right_hl_mode, erhlm, Xr
-        enter_top_hl_mode,          // enter_top_hl_mode, ethlm, Xt
-        enter_vertical_hl_mode,     // enter_vertical_hl_mode, evhlm, Xv
-        set_a_attributes,           // set_a_attributes, sgr1, sA
-        set_pglen_inch,             // set_pglen_inch, slength, sL)
+        auto_left_margin, // auto_left_margin, bw, bw
+        auto_right_margin, // auto_right_margin, am, am
+        back_color_erase, // back_color_erase, bce, ut
+        can_change, // can_change, ccc, cc
+        ceol_standout_glitch, // ceol_standout_glitch, xhp, xs
+        col_addr_glitch, // col_addr_glitch, xhpa, YA
+        cpi_changes_res, // cpi_changes_res, cpix, YF
+        cr_cancels_micro_mode, // cr_cancels_micro_mode, crxm, YB
+        dest_tabs_magic_smso, // dest_tabs_magic_smso, xt, xt
+        eat_newline_glitch, // eat_newline_glitch, xenl, xn
+        erase_overstrike, // erase_overstrike, eo, eo
+        generic_type, // generic_type, gn, gn
+        hard_copy, // hard_copy, hc, hc
+        hard_cursor, // hard_cursor, chts, HC
+        has_meta_key, // has_meta_key, km, km
+        has_print_wheel, // has_print_wheel, daisy, YC
+        has_status_line, // has_status_line, hs, hs
+        hue_lightness_saturation, // hue_lightness_saturation, hls, hl
+        insert_null_glitch, // insert_null_glitch, in, in
+        lpi_changes_res, // lpi_changes_res, lpix, YG
+        memory_above, // memory_above, da, da
+        memory_below, // memory_below, db, db
+        move_insert_mode, // move_insert_mode, mir, mi
+        move_standout_mode, // move_standout_mode, msgr, ms
+        needs_xon_xoff, // needs_xon_xoff, nxon, nx
+        no_esc_ctlc, // no_esc_ctlc, xsb, xb
+        no_pad_char, // no_pad_char, npc, NP
+        non_dest_scroll_region, // non_dest_scroll_region, ndscr, ND
+        non_rev_rmcup, // non_rev_rmcup, nrrmc, NR
+        over_strike, // over_strike, os, os
+        prtr_silent, // prtr_silent, mc5i, 5i
+        row_addr_glitch, // row_addr_glitch, xvpa, YD
+        semi_auto_right_margin, // semi_auto_right_margin, sam, YE
+        status_line_esc_ok, // status_line_esc_ok, eslok, es
+        tilde_glitch, // tilde_glitch, hz, hz
+        transparent_underline, // transparent_underline, ul, ul
+        xon_xoff, // xon_xoff, xon, xo
+        columns, // columns, cols, co
+        init_tabs, // init_tabs, it, it
+        label_height, // label_height, lh, lh
+        label_width, // label_width, lw, lw
+        lines, // lines, lines, li
+        lines_of_memory, // lines_of_memory, lm, lm
+        magic_cookie_glitch, // magic_cookie_glitch, xmc, sg
+        max_attributes, // max_attributes, ma, ma
+        max_colors, // max_colors, colors, Co
+        max_pairs, // max_pairs, pairs, pa
+        maximum_windows, // maximum_windows, wnum, MW
+        no_color_video, // no_color_video, ncv, NC
+        num_labels, // num_labels, nlab, Nl
+        padding_baud_rate, // padding_baud_rate, pb, pb
+        virtual_terminal, // virtual_terminal, vt, vt
+        width_status_line, // width_status_line, wsl, ws
+        bit_image_entwining, // bit_image_entwining, bitwin, Yo
+        bit_image_type, // bit_image_type, bitype, Yp
+        buffer_capacity, // buffer_capacity, bufsz, Ya
+        buttons, // buttons, btns, BT
+        dot_horz_spacing, // dot_horz_spacing, spinh, Yc
+        dot_vert_spacing, // dot_vert_spacing, spinv, Yb
+        max_micro_address, // max_micro_address, maddr, Yd
+        max_micro_jump, // max_micro_jump, mjump, Ye
+        micro_col_size, // micro_col_size, mcs, Yf
+        micro_line_size, // micro_line_size, mls, Yg
+        number_of_pins, // number_of_pins, npins, Yh
+        output_res_char, // output_res_char, orc, Yi
+        output_res_horz_inch, // output_res_horz_inch, orhi, Yk
+        output_res_line, // output_res_line, orl, Yj
+        output_res_vert_inch, // output_res_vert_inch, orvi, Yl
+        print_rate, // print_rate, cps, Ym
+        wide_char_size, // wide_char_size, widcs, Yn
+        acs_chars, // acs_chars, acsc, ac
+        back_tab, // back_tab, cbt, bt
+        bell, // bell, bel, bl
+        carriage_return, // carriage_return, cr, cr
+        change_char_pitch, // change_char_pitch, cpi, ZA
+        change_line_pitch, // change_line_pitch, lpi, ZB
+        change_res_horz, // change_res_horz, chr, ZC
+        change_res_vert, // change_res_vert, cvr, ZD
+        change_scroll_region, // change_scroll_region, csr, cs
+        char_padding, // char_padding, rmp, rP
+        clear_all_tabs, // clear_all_tabs, tbc, ct
+        clear_margins, // clear_margins, mgc, MC
+        clear_screen, // clear_screen, clear, cl
+        clr_bol, // clr_bol, el1, cb
+        clr_eol, // clr_eol, el, ce
+        clr_eos, // clr_eos, ed, cd
+        column_address, // column_address, hpa, ch
+        command_character, // command_character, cmdch, CC
+        create_window, // create_window, cwin, CW
+        cursor_address, // cursor_address, cup, cm
+        cursor_down, // cursor_down, cud1, do
+        cursor_home, // cursor_home, home, ho
+        cursor_invisible, // cursor_invisible, civis, vi
+        cursor_left, // cursor_left, cub1, le
+        cursor_mem_address, // cursor_mem_address, mrcup, CM
+        cursor_normal, // cursor_normal, cnorm, ve
+        cursor_right, // cursor_right, cuf1, nd
+        cursor_to_ll, // cursor_to_ll, ll, ll
+        cursor_up, // cursor_up, cuu1, up
+        cursor_visible, // cursor_visible, cvvis, vs
+        define_char, // define_char, defc, ZE
+        delete_character, // delete_character, dch1, dc
+        delete_line, // delete_line, dl1, dl
+        dial_phone, // dial_phone, dial, DI
+        dis_status_line, // dis_status_line, dsl, ds
+        display_clock, // display_clock, dclk, DK
+        down_half_line, // down_half_line, hd, hd
+        ena_acs, // ena_acs, enacs, eA
+        enter_alt_charset_mode, // enter_alt_charset_mode, smacs, as
+        enter_am_mode, // enter_am_mode, smam, SA
+        enter_blink_mode, // enter_blink_mode, blink, mb
+        enter_bold_mode, // enter_bold_mode, bold, md
+        enter_ca_mode, // enter_ca_mode, smcup, ti
+        enter_delete_mode, // enter_delete_mode, smdc, dm
+        enter_dim_mode, // enter_dim_mode, dim, mh
+        enter_doublewide_mode, // enter_doublewide_mode, swidm, ZF
+        enter_draft_quality, // enter_draft_quality, sdrfq, ZG
+        enter_insert_mode, // enter_insert_mode, smir, im
+        enter_italics_mode, // enter_italics_mode, sitm, ZH
+        enter_leftward_mode, // enter_leftward_mode, slm, ZI
+        enter_micro_mode, // enter_micro_mode, smicm, ZJ
+        enter_near_letter_quality, // enter_near_letter_quality, snlq, ZK
+        enter_normal_quality, // enter_normal_quality, snrmq, ZL
+        enter_protected_mode, // enter_protected_mode, prot, mp
+        enter_reverse_mode, // enter_reverse_mode, rev, mr
+        enter_secure_mode, // enter_secure_mode, invis, mk
+        enter_shadow_mode, // enter_shadow_mode, sshm, ZM
+        enter_standout_mode, // enter_standout_mode, smso, so
+        enter_subscript_mode, // enter_subscript_mode, ssubm, ZN
+        enter_superscript_mode, // enter_superscript_mode, ssupm, ZO
+        enter_underline_mode, // enter_underline_mode, smul, us
+        enter_upward_mode, // enter_upward_mode, sum, ZP
+        enter_xon_mode, // enter_xon_mode, smxon, SX
+        erase_chars, // erase_chars, ech, ec
+        exit_alt_charset_mode, // exit_alt_charset_mode, rmacs, ae
+        exit_am_mode, // exit_am_mode, rmam, RA
+        exit_attribute_mode, // exit_attribute_mode, sgr0, me
+        exit_ca_mode, // exit_ca_mode, rmcup, te
+        exit_delete_mode, // exit_delete_mode, rmdc, ed
+        exit_doublewide_mode, // exit_doublewide_mode, rwidm, ZQ
+        exit_insert_mode, // exit_insert_mode, rmir, ei
+        exit_italics_mode, // exit_italics_mode, ritm, ZR
+        exit_leftward_mode, // exit_leftward_mode, rlm, ZS
+        exit_micro_mode, // exit_micro_mode, rmicm, ZT
+        exit_shadow_mode, // exit_shadow_mode, rshm, ZU
+        exit_standout_mode, // exit_standout_mode, rmso, se
+        exit_subscript_mode, // exit_subscript_mode, rsubm, ZV
+        exit_superscript_mode, // exit_superscript_mode, rsupm, ZW
+        exit_underline_mode, // exit_underline_mode, rmul, ue
+        exit_upward_mode, // exit_upward_mode, rum, ZX
+        exit_xon_mode, // exit_xon_mode, rmxon, RX
+        fixed_pause, // fixed_pause, pause, PA
+        flash_hook, // flash_hook, hook, fh
+        flash_screen, // flash_screen, flash, vb
+        form_feed, // form_feed, ff, ff
+        from_status_line, // from_status_line, fsl, fs
+        goto_window, // goto_window, wingo, WG
+        hangup, // hangup, hup, HU
+        init_1string, // init_1string, is1, i1
+        init_2string, // init_2string, is2, is
+        init_3string, // init_3string, is3, i3
+        init_file, // init_file, if, if
+        init_prog, // init_prog, iprog, iP
+        initialize_color, // initialize_color, initc, Ic
+        initialize_pair, // initialize_pair, initp, Ip
+        insert_character, // insert_character, ich1, ic
+        insert_line, // insert_line, il1, al
+        insert_padding, // insert_padding, ip, ip
+        key_a1, // key_a1, ka1, K1
+        key_a3, // key_a3, ka3, K3
+        key_b2, // key_b2, kb2, K2
+        key_backspace, // key_backspace, kbs, kb
+        key_beg, // key_beg, kbeg, @1
+        key_btab, // key_btab, kcbt, kB
+        key_c1, // key_c1, kc1, K4
+        key_c3, // key_c3, kc3, K5
+        key_cancel, // key_cancel, kcan, @2
+        key_catab, // key_catab, ktbc, ka
+        key_clear, // key_clear, kclr, kC
+        key_close, // key_close, kclo, @3
+        key_command, // key_command, kcmd, @4
+        key_copy, // key_copy, kcpy, @5
+        key_create, // key_create, kcrt, @6
+        key_ctab, // key_ctab, kctab, kt
+        key_dc, // key_dc, kdch1, kD
+        key_dl, // key_dl, kdl1, kL
+        key_down, // key_down, kcud1, kd
+        key_eic, // key_eic, krmir, kM
+        key_end, // key_end, kend, @7
+        key_enter, // key_enter, kent, @8
+        key_eol, // key_eol, kel, kE
+        key_eos, // key_eos, ked, kS
+        key_exit, // key_exit, kext, @9
+        key_f0, // key_f0, kf0, k0
+        key_f1, // key_f1, kf1, k1
+        key_f10, // key_f10, kf10, k;
+        key_f11, // key_f11, kf11, F1
+        key_f12, // key_f12, kf12, F2
+        key_f13, // key_f13, kf13, F3
+        key_f14, // key_f14, kf14, F4
+        key_f15, // key_f15, kf15, F5
+        key_f16, // key_f16, kf16, F6
+        key_f17, // key_f17, kf17, F7
+        key_f18, // key_f18, kf18, F8
+        key_f19, // key_f19, kf19, F9
+        key_f2, // key_f2, kf2, k2
+        key_f20, // key_f20, kf20, FA
+        key_f21, // key_f21, kf21, FB
+        key_f22, // key_f22, kf22, FC
+        key_f23, // key_f23, kf23, FD
+        key_f24, // key_f24, kf24, FE
+        key_f25, // key_f25, kf25, FF
+        key_f26, // key_f26, kf26, FG
+        key_f27, // key_f27, kf27, FH
+        key_f28, // key_f28, kf28, FI
+        key_f29, // key_f29, kf29, FJ
+        key_f3, // key_f3, kf3, k3
+        key_f30, // key_f30, kf30, FK
+        key_f31, // key_f31, kf31, FL
+        key_f32, // key_f32, kf32, FM
+        key_f33, // key_f33, kf33, FN
+        key_f34, // key_f34, kf34, FO
+        key_f35, // key_f35, kf35, FP
+        key_f36, // key_f36, kf36, FQ
+        key_f37, // key_f37, kf37, FR
+        key_f38, // key_f38, kf38, FS
+        key_f39, // key_f39, kf39, FT
+        key_f4, // key_f4, kf4, k4
+        key_f40, // key_f40, kf40, FU
+        key_f41, // key_f41, kf41, FV
+        key_f42, // key_f42, kf42, FW
+        key_f43, // key_f43, kf43, FX
+        key_f44, // key_f44, kf44, FY
+        key_f45, // key_f45, kf45, FZ
+        key_f46, // key_f46, kf46, Fa
+        key_f47, // key_f47, kf47, Fb
+        key_f48, // key_f48, kf48, Fc
+        key_f49, // key_f49, kf49, Fd
+        key_f5, // key_f5, kf5, k5
+        key_f50, // key_f50, kf50, Fe
+        key_f51, // key_f51, kf51, Ff
+        key_f52, // key_f52, kf52, Fg
+        key_f53, // key_f53, kf53, Fh
+        key_f54, // key_f54, kf54, Fi
+        key_f55, // key_f55, kf55, Fj
+        key_f56, // key_f56, kf56, Fk
+        key_f57, // key_f57, kf57, Fl
+        key_f58, // key_f58, kf58, Fm
+        key_f59, // key_f59, kf59, Fn
+        key_f6, // key_f6, kf6, k6
+        key_f60, // key_f60, kf60, Fo
+        key_f61, // key_f61, kf61, Fp
+        key_f62, // key_f62, kf62, Fq
+        key_f63, // key_f63, kf63, Fr
+        key_f7, // key_f7, kf7, k7
+        key_f8, // key_f8, kf8, k8
+        key_f9, // key_f9, kf9, k9
+        key_find, // key_find, kfnd, @0
+        key_help, // key_help, khlp, %1
+        key_home, // key_home, khome, kh
+        key_ic, // key_ic, kich1, kI
+        key_il, // key_il, kil1, kA
+        key_left, // key_left, kcub1, kl
+        key_ll, // key_ll, kll, kH
+        key_mark, // key_mark, kmrk, %2
+        key_message, // key_message, kmsg, %3
+        key_move, // key_move, kmov, %4
+        key_next, // key_next, knxt, %5
+        key_npage, // key_npage, knp, kN
+        key_open, // key_open, kopn, %6
+        key_options, // key_options, kopt, %7
+        key_ppage, // key_ppage, kpp, kP
+        key_previous, // key_previous, kprv, %8
+        key_print, // key_print, kprt, %9
+        key_redo, // key_redo, krdo, %0
+        key_reference, // key_reference, kref, &1
+        key_refresh, // key_refresh, krfr, &2
+        key_replace, // key_replace, krpl, &3
+        key_restart, // key_restart, krst, &4
+        key_resume, // key_resume, kres, &5
+        key_right, // key_right, kcuf1, kr
+        key_save, // key_save, ksav, &6
+        key_sbeg, // key_sbeg, kBEG, &9
+        key_scancel, // key_scancel, kCAN, &0
+        key_scommand, // key_scommand, kCMD, *1
+        key_scopy, // key_scopy, kCPY, *2
+        key_screate, // key_screate, kCRT, *3
+        key_sdc, // key_sdc, kDC, *4
+        key_sdl, // key_sdl, kDL, *5
+        key_select, // key_select, kslt, *6
+        key_send, // key_send, kEND, *7
+        key_seol, // key_seol, kEOL, *8
+        key_sexit, // key_sexit, kEXT, *9
+        key_sf, // key_sf, kind, kF
+        key_sfind, // key_sfind, kFND, *0
+        key_shelp, // key_shelp, kHLP, #1
+        key_shome, // key_shome, kHOM, #2
+        key_sic, // key_sic, kIC, #3
+        key_sleft, // key_sleft, kLFT, #4
+        key_smessage, // key_smessage, kMSG, %a
+        key_smove, // key_smove, kMOV, %b
+        key_snext, // key_snext, kNXT, %c
+        key_soptions, // key_soptions, kOPT, %d
+        key_sprevious, // key_sprevious, kPRV, %e
+        key_sprint, // key_sprint, kPRT, %f
+        key_sr, // key_sr, kri, kR
+        key_sredo, // key_sredo, kRDO, %g
+        key_sreplace, // key_sreplace, kRPL, %h
+        key_sright, // key_sright, kRIT, %i
+        key_srsume, // key_srsume, kRES, %j
+        key_ssave, // key_ssave, kSAV, !1
+        key_ssuspend, // key_ssuspend, kSPD, !2
+        key_stab, // key_stab, khts, kT
+        key_sundo, // key_sundo, kUND, !3
+        key_suspend, // key_suspend, kspd, &7
+        key_undo, // key_undo, kund, &8
+        key_up, // key_up, kcuu1, ku
+        keypad_local, // keypad_local, rmkx, ke
+        keypad_xmit, // keypad_xmit, smkx, ks
+        lab_f0, // lab_f0, lf0, l0
+        lab_f1, // lab_f1, lf1, l1
+        lab_f10, // lab_f10, lf10, la
+        lab_f2, // lab_f2, lf2, l2
+        lab_f3, // lab_f3, lf3, l3
+        lab_f4, // lab_f4, lf4, l4
+        lab_f5, // lab_f5, lf5, l5
+        lab_f6, // lab_f6, lf6, l6
+        lab_f7, // lab_f7, lf7, l7
+        lab_f8, // lab_f8, lf8, l8
+        lab_f9, // lab_f9, lf9, l9
+        label_format, // label_format, fln, Lf
+        label_off, // label_off, rmln, LF
+        label_on, // label_on, smln, LO
+        meta_off, // meta_off, rmm, mo
+        meta_on, // meta_on, smm, mm
+        micro_column_address, // micro_column_address, mhpa, ZY
+        micro_down, // micro_down, mcud1, ZZ
+        micro_left, // micro_left, mcub1, Za
+        micro_right, // micro_right, mcuf1, Zb
+        micro_row_address, // micro_row_address, mvpa, Zc
+        micro_up, // micro_up, mcuu1, Zd
+        newline, // newline, nel, nw
+        order_of_pins, // order_of_pins, porder, Ze
+        orig_colors, // orig_colors, oc, oc
+        orig_pair, // orig_pair, op, op
+        pad_char, // pad_char, pad, pc
+        parm_dch, // parm_dch, dch, DC
+        parm_delete_line, // parm_delete_line, dl, DL
+        parm_down_cursor, // parm_down_cursor, cud, DO
+        parm_down_micro, // parm_down_micro, mcud, Zf
+        parm_ich, // parm_ich, ich, IC
+        parm_index, // parm_index, indn, SF
+        parm_insert_line, // parm_insert_line, il, AL
+        parm_left_cursor, // parm_left_cursor, cub, LE
+        parm_left_micro, // parm_left_micro, mcub, Zg
+        parm_right_cursor, // parm_right_cursor, cuf, RI
+        parm_right_micro, // parm_right_micro, mcuf, Zh
+        parm_rindex, // parm_rindex, rin, SR
+        parm_up_cursor, // parm_up_cursor, cuu, UP
+        parm_up_micro, // parm_up_micro, mcuu, Zi
+        pkey_key, // pkey_key, pfkey, pk
+        pkey_local, // pkey_local, pfloc, pl
+        pkey_xmit, // pkey_xmit, pfx, px
+        plab_norm, // plab_norm, pln, pn
+        print_screen, // print_screen, mc0, ps
+        prtr_non, // prtr_non, mc5p, pO
+        prtr_off, // prtr_off, mc4, pf
+        prtr_on, // prtr_on, mc5, po
+        pulse, // pulse, pulse, PU
+        quick_dial, // quick_dial, qdial, QD
+        remove_clock, // remove_clock, rmclk, RC
+        repeat_char, // repeat_char, rep, rp
+        req_for_input, // req_for_input, rfi, RF
+        reset_1string, // reset_1string, rs1, r1
+        reset_2string, // reset_2string, rs2, r2
+        reset_3string, // reset_3string, rs3, r3
+        reset_file, // reset_file, rf, rf
+        restore_cursor, // restore_cursor, rc, rc
+        row_address, // row_address, vpa, cv
+        save_cursor, // save_cursor, sc, sc
+        scroll_forward, // scroll_forward, ind, sf
+        scroll_reverse, // scroll_reverse, ri, sr
+        select_char_set, // select_char_set, scs, Zj
+        set_attributes, // set_attributes, sgr, sa
+        set_background, // set_background, setb, Sb
+        set_bottom_margin, // set_bottom_margin, smgb, Zk
+        set_bottom_margin_parm, // set_bottom_margin_parm, smgbp, Zl
+        set_clock, // set_clock, sclk, SC
+        set_color_pair, // set_color_pair, scp, sp
+        set_foreground, // set_foreground, setf, Sf
+        set_left_margin, // set_left_margin, smgl, ML
+        set_left_margin_parm, // set_left_margin_parm, smglp, Zm
+        set_right_margin, // set_right_margin, smgr, MR
+        set_right_margin_parm, // set_right_margin_parm, smgrp, Zn
+        set_tab, // set_tab, hts, st
+        set_top_margin, // set_top_margin, smgt, Zo
+        set_top_margin_parm, // set_top_margin_parm, smgtp, Zp
+        set_window, // set_window, wind, wi
+        start_bit_image, // start_bit_image, sbim, Zq
+        start_char_set_def, // start_char_set_def, scsd, Zr
+        stop_bit_image, // stop_bit_image, rbim, Zs
+        stop_char_set_def, // stop_char_set_def, rcsd, Zt
+        subscript_characters, // subscript_characters, subcs, Zu
+        superscript_characters, // superscript_characters, supcs, Zv
+        tab, // tab, ht, ta
+        these_cause_cr, // these_cause_cr, docr, Zw
+        to_status_line, // to_status_line, tsl, ts
+        tone, // tone, tone, TO
+        underline_char, // underline_char, uc, uc
+        up_half_line, // up_half_line, hu, hu
+        user0, // user0, u0, u0
+        user1, // user1, u1, u1
+        user2, // user2, u2, u2
+        user3, // user3, u3, u3
+        user4, // user4, u4, u4
+        user5, // user5, u5, u5
+        user6, // user6, u6, u6
+        user7, // user7, u7, u7
+        user8, // user8, u8, u8
+        user9, // user9, u9, u9
+        wait_tone, // wait_tone, wait, WA
+        xoff_character, // xoff_character, xoffc, XF
+        xon_character, // xon_character, xonc, XN
+        zero_motion, // zero_motion, zerom, Zx
+        alt_scancode_esc, // alt_scancode_esc, scesa, S8
+        bit_image_carriage_return, // bit_image_carriage_return, bicr, Yv
+        bit_image_newline, // bit_image_newline, binel, Zz
+        bit_image_repeat, // bit_image_repeat, birep, Xy
+        char_set_names, // char_set_names, csnm, Zy
+        code_set_init, // code_set_init, csin, ci
+        color_names, // color_names, colornm, Yw
+        define_bit_image_region, // define_bit_image_region, defbi, Yx
+        device_type, // device_type, devt, dv
+        display_pc_char, // display_pc_char, dispc, S1
+        end_bit_image_region, // end_bit_image_region, endbi, Yy
+        enter_pc_charset_mode, // enter_pc_charset_mode, smpch, S2
+        enter_scancode_mode, // enter_scancode_mode, smsc, S4
+        exit_pc_charset_mode, // exit_pc_charset_mode, rmpch, S3
+        exit_scancode_mode, // exit_scancode_mode, rmsc, S5
+        get_mouse, // get_mouse, getm, Gm
+        key_mouse, // key_mouse, kmous, Km
+        mouse_info, // mouse_info, minfo, Mi
+        pc_term_options, // pc_term_options, pctrm, S6
+        pkey_plab, // pkey_plab, pfxl, xl
+        req_mouse_pos, // req_mouse_pos, reqmp, RQ
+        scancode_escape, // scancode_escape, scesc, S7
+        set0_des_seq, // set0_des_seq, s0ds, s0
+        set1_des_seq, // set1_des_seq, s1ds, s1
+        set2_des_seq, // set2_des_seq, s2ds, s2
+        set3_des_seq, // set3_des_seq, s3ds, s3
+        set_a_background, // set_a_background, setab, AB
+        set_a_foreground, // set_a_foreground, setaf, AF
+        set_color_band, // set_color_band, setcolor, Yz
+        set_lr_margin, // set_lr_margin, smglr, ML
+        set_page_length, // set_page_length, slines, YZ
+        set_tb_margin, // set_tb_margin, smgtb, MT
+        enter_horizontal_hl_mode, // enter_horizontal_hl_mode, ehhlm, Xh
+        enter_left_hl_mode, // enter_left_hl_mode, elhlm, Xl
+        enter_low_hl_mode, // enter_low_hl_mode, elohlm, Xo
+        enter_right_hl_mode, // enter_right_hl_mode, erhlm, Xr
+        enter_top_hl_mode, // enter_top_hl_mode, ethlm, Xt
+        enter_vertical_hl_mode, // enter_vertical_hl_mode, evhlm, Xv
+        set_a_attributes, // set_a_attributes, sgr1, sA
+        set_pglen_inch, // set_pglen_inch, slength, sL)
         ;
 
         public String[] getNames() {
@@ -515,8 +513,9 @@ public final class InfoCmp {
     public static Map<String, Capability> getCapabilitiesByName() {
         Map<String, Capability> capabilities = new LinkedHashMap<>();
         try (InputStream is = InfoCmp.class.getResourceAsStream("capabilities.txt");
-             BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-            br.lines().map(String::trim)
+                BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+            br.lines()
+                    .map(String::trim)
                     .filter(s -> !s.startsWith("#"))
                     .filter(s -> !s.isEmpty())
                     .forEach(s -> {
@@ -539,9 +538,7 @@ public final class InfoCmp {
         CAPS.putIfAbsent(terminal, caps);
     }
 
-    public static String getInfoCmp(
-            String terminal
-    ) throws IOException, InterruptedException {
+    public static String getInfoCmp(String terminal) throws IOException, InterruptedException {
         String caps = getLoadedInfoCmp(terminal);
         if (caps == null) {
             Process p = new ProcessBuilder(OSUtils.INFOCMP_COMMAND, terminal).start();
@@ -563,8 +560,7 @@ public final class InfoCmp {
             String capabilities,
             Set<Capability> bools,
             Map<Capability, Integer> ints,
-            Map<Capability, String> strings
-    ) {
+            Map<Capability, String> strings) {
         Map<String, Capability> capsByName = getCapabilitiesByName();
         String[] lines = capabilities.split("\n");
         for (int i = 1; i < lines.length; i++) {
@@ -609,7 +605,7 @@ public final class InfoCmp {
 
     static String loadDefaultInfoCmp(String name) {
         try (InputStream is = InfoCmp.class.getResourceAsStream(name + ".caps");
-             BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
             return br.lines().collect(Collectors.joining("\n", "", "\n"));
         } catch (IOException e) {
             throw new IOError(e);
@@ -617,11 +613,23 @@ public final class InfoCmp {
     }
 
     static {
-        for (String s : Arrays.asList("dumb", "dumb-color", "ansi", "xterm", "xterm-256color",
-                "windows", "windows-256color", "windows-conemu", "windows-vtp",
-                "screen", "screen-256color", "rxvt-unicode", "rxvt-unicode-256color", "rxvt-basic", "rxvt")) {
+        for (String s : Arrays.asList(
+                "dumb",
+                "dumb-color",
+                "ansi",
+                "xterm",
+                "xterm-256color",
+                "windows",
+                "windows-256color",
+                "windows-conemu",
+                "windows-vtp",
+                "screen",
+                "screen-256color",
+                "rxvt-unicode",
+                "rxvt-unicode-256color",
+                "rxvt-basic",
+                "rxvt")) {
             setDefaultInfoCmp(s, () -> loadDefaultInfoCmp(s));
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java
index fda314fb9b4..449d6aa69c8 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -22,7 +22,6 @@ import java.nio.charset.CodingErrorAction;
 import java.nio.charset.MalformedInputException;
 import java.nio.charset.UnmappableCharacterException;
 
-
 /**
  *
  * NOTE for JLine: the default InputStreamReader that comes from the JRE
@@ -66,9 +65,10 @@ public class InputStreamReader extends Reader {
     public InputStreamReader(InputStream in) {
         super(in);
         this.in = in;
-        decoder = Charset.defaultCharset().newDecoder().onMalformedInput(
-                CodingErrorAction.REPLACE).onUnmappableCharacter(
-                CodingErrorAction.REPLACE);
+        decoder = Charset.defaultCharset()
+                .newDecoder()
+                .onMalformedInput(CodingErrorAction.REPLACE)
+                .onUnmappableCharacter(CodingErrorAction.REPLACE);
         bytes.limit(0);
     }
 
@@ -87,20 +87,19 @@ public class InputStreamReader extends Reader {
      * @throws UnsupportedEncodingException
      *             if the encoding specified by {@code enc} cannot be found.
      */
-    public InputStreamReader(InputStream in, final String enc)
-            throws UnsupportedEncodingException {
+    public InputStreamReader(InputStream in, final String enc) throws UnsupportedEncodingException {
         super(in);
         if (enc == null) {
             throw new NullPointerException();
         }
         this.in = in;
         try {
-            decoder = Charset.forName(enc).newDecoder().onMalformedInput(
-                    CodingErrorAction.REPLACE).onUnmappableCharacter(
-                    CodingErrorAction.REPLACE);
+            decoder = Charset.forName(enc)
+                    .newDecoder()
+                    .onMalformedInput(CodingErrorAction.REPLACE)
+                    .onUnmappableCharacter(CodingErrorAction.REPLACE);
         } catch (IllegalArgumentException e) {
-            throw (UnsupportedEncodingException)
-                    new UnsupportedEncodingException(enc).initCause(e);
+            throw (UnsupportedEncodingException) new UnsupportedEncodingException(enc).initCause(e);
         }
         bytes.limit(0);
     }
@@ -134,9 +133,9 @@ public class InputStreamReader extends Reader {
     public InputStreamReader(InputStream in, Charset charset) {
         super(in);
         this.in = in;
-        decoder = charset.newDecoder().onMalformedInput(
-                CodingErrorAction.REPLACE).onUnmappableCharacter(
-                CodingErrorAction.REPLACE);
+        decoder = charset.newDecoder()
+                .onMalformedInput(CodingErrorAction.REPLACE)
+                .onUnmappableCharacter(CodingErrorAction.REPLACE);
         bytes.limit(0);
     }
 
@@ -257,8 +256,7 @@ public class InputStreamReader extends Reader {
                 // fill the buffer if needed
                 if (needInput) {
                     try {
-                        if ((in.available() == 0)
-                            && (out.position() > offset)) {
+                        if ((in.available() == 0) && (out.position() > offset)) {
                             // we could return the result without blocking read
                             break;
                         }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Levenshtein.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Levenshtein.java
index cc95593ed80..015515f7d07 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Levenshtein.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Levenshtein.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -49,9 +49,8 @@ public class Levenshtein {
         return distance(lhs, rhs, 1, 1, 1, 1);
     }
 
-    public static int distance(CharSequence source, CharSequence target,
-                               int deleteCost, int insertCost,
-                               int replaceCost, int swapCost) {
+    public static int distance(
+            CharSequence source, CharSequence target, int deleteCost, int insertCost, int replaceCost, int swapCost) {
         /*
          * Required to facilitate the premise to the algorithm that two swaps of the
          * same character are never required for optimality.
@@ -115,5 +114,4 @@ public class Levenshtein {
         }
         return table[source.length() - 1][target.length() - 1];
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Log.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Log.java
index 91f18755e25..254173d5bd9 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Log.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -73,8 +73,7 @@ public final class Log {
                 }
             }
             out.print("]");
-        }
-        else {
+        } else {
             out.print(message);
         }
     }
@@ -84,11 +83,10 @@ public final class Log {
 //        ByteArrayOutputStream baos = new ByteArrayOutputStream();
 //        PrintStream ps = new PrintStream(baos);
 //        for (int i = 0; i < messages.length; i++) {
-//            // Special handling for the last message if its a throwable, render its stack on the next line
+//            // Special handling for the last message if it's a throwable, render its stack on the next line
 //            if (i + 1 == messages.length && messages[i] instanceof Throwable) {
 //                cause = (Throwable) messages[i];
-//            }
-//            else {
+//            } else {
 //                render(ps, messages[i]);
 //            }
 //        }
@@ -122,5 +120,4 @@ public final class Log {
 //    static boolean isEnabled(Level level) {
 //        return logger.isLoggable(level);
 //    }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlocking.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlocking.java
index f8cb53489f9..4130634ca4b 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlocking.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -84,8 +84,7 @@ public class NonBlocking {
 
         @Override
         public int available() {
-            return (int) (reader.available() * this.encoder.averageBytesPerChar())
-                    + bytes.remaining();
+            return (int) (reader.available() * this.encoder.averageBytesPerChar()) + bytes.remaining();
         }
 
         @Override
@@ -124,7 +123,6 @@ public class NonBlocking {
                 return READ_EXPIRED;
             }
         }
-
     }
 
     private static class NonBlockingInputStreamReader extends NonBlockingReader {
@@ -135,10 +133,12 @@ public class NonBlocking {
         private final CharBuffer chars;
 
         public NonBlockingInputStreamReader(NonBlockingInputStream inputStream, Charset encoding) {
-            this(inputStream,
-                (encoding != null ? encoding : Charset.defaultCharset()).newDecoder()
-                    .onMalformedInput(CodingErrorAction.REPLACE)
-                    .onUnmappableCharacter(CodingErrorAction.REPLACE));
+            this(
+                    inputStream,
+                    (encoding != null ? encoding : Charset.defaultCharset())
+                            .newDecoder()
+                            .onMalformedInput(CodingErrorAction.REPLACE)
+                            .onUnmappableCharacter(CodingErrorAction.REPLACE));
         }
 
         public NonBlockingInputStreamReader(NonBlockingInputStream input, CharsetDecoder decoder) {
@@ -201,8 +201,8 @@ public class NonBlocking {
                         bytes.position(0);
                         bytes.limit(0);
                     }
-                    int nb = input.readBuffered(bytes.array(), bytes.limit(),
-                                            bytes.capacity() - bytes.limit(), t.timeout());
+                    int nb = input.readBuffered(
+                            bytes.array(), bytes.limit(), bytes.capacity() - bytes.limit(), t.timeout());
                     if (nb < 0) {
                         return nb;
                     }
@@ -227,5 +227,4 @@ public class NonBlocking {
             input.close();
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStream.java
index a4283eb7006..10ab68cfd28 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStream.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -74,7 +74,7 @@ public abstract class NonBlockingInputStream extends InputStream {
         if (c == EOF) {
             return EOF;
         }
-        b[off] = (byte)c;
+        b[off] = (byte) c;
         return 1;
     }
 
@@ -115,9 +115,7 @@ public abstract class NonBlockingInputStream extends InputStream {
      * thread is currently blocked waiting for I/O it may not actually
      * shut down until the I/O is received.
      */
-    public void shutdown() {
-    }
+    public void shutdown() {}
 
     public abstract int read(long timeout, boolean isPeek) throws IOException;
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStreamImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStreamImpl.java
index 680047fbe60..24cf13a0ee5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStreamImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingInputStreamImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -26,17 +26,15 @@ import java.io.InterruptedIOException;
  *          the thread that handles blocking I/O.
  * </ul>
  */
-public class NonBlockingInputStreamImpl
-    extends NonBlockingInputStream
-{
-    private InputStream in;                  // The actual input stream
-    private int         b = READ_EXPIRED;    // Recently read byte
+public class NonBlockingInputStreamImpl extends NonBlockingInputStream {
+    private InputStream in; // The actual input stream
+    private int b = READ_EXPIRED; // Recently read byte
 
-    private String      name;
-    private boolean     threadIsReading      = false;
-    private IOException exception            = null;
-    private long        threadDelay          = 60 * 1000;
-    private Thread      thread;
+    private String name;
+    private boolean threadIsReading = false;
+    private IOException exception = null;
+    private long threadDelay = 60 * 1000;
+    private Thread thread;
 
     /**
      * Creates a <code>NonBlockingReader</code> out of a normal blocking
@@ -97,8 +95,7 @@ public class NonBlockingInputStreamImpl
         if (exception != null) {
             assert b == READ_EXPIRED;
             IOException toBeThrown = exception;
-            if (!isPeek)
-                exception = null;
+            if (!isPeek) exception = null;
             throw toBeThrown;
         }
 
@@ -109,11 +106,9 @@ public class NonBlockingInputStreamImpl
          */
         if (b >= -1) {
             assert exception == null;
-        }
-        else if (!isPeek && timeout <= 0L && !threadIsReading) {
+        } else if (!isPeek && timeout <= 0L && !threadIsReading) {
             b = in.read();
-        }
-        else {
+        } else {
             /*
              * If the thread isn't reading already, then ask it to do so.
              */
@@ -128,14 +123,13 @@ public class NonBlockingInputStreamImpl
              * now we play the waiting game.
              */
             Timeout t = new Timeout(timeout);
-            while (!t.elapsed())  {
+            while (!t.elapsed()) {
                 try {
                     if (Thread.interrupted()) {
                         throw new InterruptedException();
                     }
                     wait(t.timeout());
-                }
-                catch (InterruptedException e) {
+                } catch (InterruptedException e) {
                     exception = (IOException) new InterruptedIOException().initCause(e);
                 }
 
@@ -143,8 +137,7 @@ public class NonBlockingInputStreamImpl
                     assert b == READ_EXPIRED;
 
                     IOException toBeThrown = exception;
-                    if (!isPeek)
-                        exception = null;
+                    if (!isPeek) exception = null;
                     throw toBeThrown;
                 }
 
@@ -168,7 +161,7 @@ public class NonBlockingInputStreamImpl
         return ret;
     }
 
-    private void run () {
+    private void run() {
         Log.debug("NonBlockingInputStream start");
         boolean needToRead;
 
@@ -236,5 +229,4 @@ public class NonBlockingInputStreamImpl
             }
         }
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpInputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpInputStream.java
index 5a361344350..aad6e3d0f5a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpInputStream.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -57,11 +57,7 @@ public class NonBlockingPumpInputStream extends NonBlockingInputStream {
                 throw new InterruptedIOException();
             }
         }
-        return buffer.hasRemaining()
-                ? 0
-                : closed
-                    ? EOF
-                    : READ_EXPIRED;
+        return buffer.hasRemaining() ? 0 : closed ? EOF : READ_EXPIRED;
     }
 
     private static boolean rewind(ByteBuffer buffer, ByteBuffer other) {
@@ -167,7 +163,7 @@ public class NonBlockingPumpInputStream extends NonBlockingInputStream {
 
         @Override
         public void write(int b) throws IOException {
-            NonBlockingPumpInputStream.this.write(new byte[] { (byte) b }, 0, 1);
+            NonBlockingPumpInputStream.this.write(new byte[] {(byte) b}, 0, 1);
         }
 
         @Override
@@ -184,7 +180,5 @@ public class NonBlockingPumpInputStream extends NonBlockingInputStream {
         public void close() throws IOException {
             NonBlockingPumpInputStream.this.close();
         }
-
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpReader.java
index f36423f03b8..63db6e5f5bf 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingPumpReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -121,7 +121,7 @@ public class NonBlockingPumpReader extends NonBlockingReader {
                     try {
                         if (timeout > 0) {
                             if (!notEmpty.await(timeout, TimeUnit.MILLISECONDS)) {
-                                throw new IOException( "Timeout reading" );
+                                throw new IOException("Timeout reading");
                             }
                         } else {
                             notEmpty.await();
@@ -207,14 +207,11 @@ public class NonBlockingPumpReader extends NonBlockingReader {
         }
 
         @Override
-        public void flush() throws IOException {
-        }
+        public void flush() throws IOException {}
 
         @Override
         public void close() throws IOException {
             NonBlockingPumpReader.this.close();
         }
-
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReader.java
index e2f664f2999..460f548b506 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -23,8 +23,7 @@ public abstract class NonBlockingReader extends Reader {
      * thread is currently blocked waiting for I/O it will not actually
      * shut down until the I/O is received.
      */
-    public void shutdown() {
-    }
+    public void shutdown() {}
 
     @Override
     public int read() throws IOException {
@@ -109,5 +108,4 @@ public abstract class NonBlockingReader extends Reader {
      * @throws IOException if anything wrong happens
      */
     protected abstract int read(long timeout, boolean isPeek) throws IOException;
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReaderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReaderImpl.java
index d384cc9a0dc..5aaabd1d3c0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReaderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlockingReaderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -28,19 +28,17 @@ import java.io.Reader;
  * @since 2.7
  * @author Scott C. Gray &lt;scottgray1@gmail.com&gt;
  */
-public class NonBlockingReaderImpl
-    extends NonBlockingReader
-{
+public class NonBlockingReaderImpl extends NonBlockingReader {
     public static final int READ_EXPIRED = -2;
 
-    private Reader in;                  // The actual input stream
-    private int    ch   = READ_EXPIRED; // Recently read character
+    private Reader in; // The actual input stream
+    private int ch = READ_EXPIRED; // Recently read character
 
-    private String      name;
-    private boolean     threadIsReading      = false;
-    private IOException exception            = null;
-    private long        threadDelay          = 60 * 1000;
-    private Thread      thread;
+    private String name;
+    private boolean threadIsReading = false;
+    private IOException exception = null;
+    private long threadDelay = 60 * 1000;
+    private Thread thread;
 
     /**
      * Creates a <code>NonBlockingReader</code> out of a normal blocking
@@ -135,8 +133,7 @@ public class NonBlockingReaderImpl
         if (exception != null) {
             assert ch == READ_EXPIRED;
             IOException toBeThrown = exception;
-            if (!isPeek)
-                exception = null;
+            if (!isPeek) exception = null;
             throw toBeThrown;
         }
 
@@ -147,11 +144,9 @@ public class NonBlockingReaderImpl
          */
         if (ch >= -1) {
             assert exception == null;
-        }
-        else if (!isPeek && timeout <= 0L && !threadIsReading) {
+        } else if (!isPeek && timeout <= 0L && !threadIsReading) {
             ch = in.read();
-        }
-        else {
+        } else {
             /*
              * If the thread isn't reading already, then ask it to do so.
              */
@@ -166,14 +161,13 @@ public class NonBlockingReaderImpl
              * now we play the waiting game.
              */
             Timeout t = new Timeout(timeout);
-            while (!t.elapsed())  {
+            while (!t.elapsed()) {
                 try {
                     if (Thread.interrupted()) {
                         throw new InterruptedException();
                     }
                     wait(t.timeout());
-                }
-                catch (InterruptedException e) {
+                } catch (InterruptedException e) {
                     exception = (IOException) new InterruptedIOException().initCause(e);
                 }
 
@@ -181,8 +175,7 @@ public class NonBlockingReaderImpl
                     assert ch == READ_EXPIRED;
 
                     IOException toBeThrown = exception;
-                    if (!isPeek)
-                        exception = null;
+                    if (!isPeek) exception = null;
                     throw toBeThrown;
                 }
 
@@ -206,7 +199,7 @@ public class NonBlockingReaderImpl
         return ret;
     }
 
-    private void run () {
+    private void run() {
         Log.debug("NonBlockingReader start");
         boolean needToRead;
 
@@ -245,12 +238,12 @@ public class NonBlockingReaderImpl
                 IOException failure = null;
                 try {
                     charRead = in.read();
-//                    if (charRead < 0) {
-//                        continue;
-//                    }
+                    //                    if (charRead < 0) {
+                    //                        continue;
+                    //                    }
                 } catch (IOException e) {
                     failure = e;
-//                    charRead = -1;
+                    //                    charRead = -1;
                 }
 
                 /*
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java
index 97487731852..344d081c124 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -9,16 +9,23 @@
 package jdk.internal.org.jline.utils;
 
 import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 public class OSUtils {
 
-    public static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase().contains("win");
+    public static final boolean IS_LINUX =
+            System.getProperty("os.name").toLowerCase().contains("linux");
 
-    public static final boolean IS_CYGWIN = IS_WINDOWS
-            && System.getenv("PWD") != null
-            && System.getenv("PWD").startsWith("/");
+    public static final boolean IS_WINDOWS =
+            System.getProperty("os.name").toLowerCase().contains("win");
+
+    public static final boolean IS_OSX =
+            System.getProperty("os.name").toLowerCase().contains("mac");
+
+    public static final boolean IS_AIX =
+            System.getProperty("os.name").toLowerCase().contains("aix");
+
+    public static final boolean IS_CYGWIN =
+            IS_WINDOWS && System.getenv("PWD") != null && System.getenv("PWD").startsWith("/");
 
     @Deprecated
     public static final boolean IS_MINGW = IS_WINDOWS
@@ -28,7 +35,7 @@ public class OSUtils {
     public static final boolean IS_MSYSTEM = IS_WINDOWS
             && System.getenv("MSYSTEM") != null
             && (System.getenv("MSYSTEM").startsWith("MINGW")
-                || System.getenv("MSYSTEM").equals("MSYS"));
+                    || System.getenv("MSYSTEM").equals("MSYS"));
 
     public static final boolean IS_WSL = System.getenv("WSL_DISTRO_NAME") != null;
 
@@ -36,11 +43,7 @@ public class OSUtils {
 
     public static final boolean IS_WSL2 = IS_WSL && !IS_WSL1;
 
-    public static final boolean IS_CONEMU = IS_WINDOWS
-            && System.getenv("ConEmuPID") != null;
-
-    public static final boolean IS_OSX = System.getProperty("os.name").toLowerCase().contains("mac");
-    public static final boolean IS_AIX = System.getProperty("os.name").equals("AIX");
+    public static final boolean IS_CONEMU = IS_WINDOWS && System.getenv("ConEmuPID") != null;
 
     public static String TTY_COMMAND;
     public static String STTY_COMMAND;
@@ -48,64 +51,57 @@ public class OSUtils {
     public static String INFOCMP_COMMAND;
     public static String TEST_COMMAND;
 
+    private static boolean isExecutable(File f) {
+        return f.canExecute() && !f.isDirectory();
+    }
+
     static {
-        String tty;
-        String stty;
-        String sttyfopt;
-        String infocmp;
-        String test;
-        if (OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM) {
-            tty = null;
-            stty = null;
-            sttyfopt = null;
-            infocmp = null;
-            test = null;
-            String path = System.getenv("PATH");
-            if (path != null) {
-                String[] paths = path.split(";");
-                for (String p : paths) {
-                    if (tty == null && new File(p, "tty.exe").exists()) {
-                        tty = new File(p, "tty.exe").getAbsolutePath();
-                    }
-                    if (stty == null && new File(p, "stty.exe").exists()) {
-                        stty = new File(p, "stty.exe").getAbsolutePath();
-                    }
-                    if (infocmp == null && new File(p, "infocmp.exe").exists()) {
-                        infocmp = new File(p, "infocmp.exe").getAbsolutePath();
-                    }
-                    if (test == null && new File(p, "test.exe").exists()) {
-                        test = new File(p, "test.exe").getAbsolutePath();
-                    }
+        boolean cygwinOrMsys = OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM;
+        String suffix = cygwinOrMsys ? ".exe" : "";
+        String tty = null;
+        String stty = null;
+        String sttyfopt = null;
+        String infocmp = null;
+        String test = null;
+        String path = System.getenv("PATH");
+        if (path != null) {
+            String[] paths = path.split(File.pathSeparator);
+            for (String p : paths) {
+                File ttyFile = new File(p, "tty" + suffix);
+                if (tty == null && isExecutable(ttyFile)) {
+                    tty = ttyFile.getAbsolutePath();
+                }
+                File sttyFile = new File(p, "stty" + suffix);
+                if (stty == null && isExecutable(sttyFile)) {
+                    stty = sttyFile.getAbsolutePath();
+                }
+                File infocmpFile = new File(p, "infocmp" + suffix);
+                if (infocmp == null && isExecutable(infocmpFile)) {
+                    infocmp = infocmpFile.getAbsolutePath();
+                }
+                File testFile = new File(p, "test" + suffix);
+                if (test == null && isExecutable(testFile)) {
+                    test = testFile.getAbsolutePath();
                 }
             }
-            if (tty == null) {
-                tty = "tty.exe";
-            }
-            if (stty == null) {
-                stty = "stty.exe";
-            }
-            if (infocmp == null) {
-                infocmp = "infocmp.exe";
-            }
-            if (test == null) {
-                test = "test.exe";
-            }
-        } else {
-            tty = "tty";
-            stty = IS_OSX ? "/bin/stty" : "stty";
-            sttyfopt = IS_OSX ? "-f" : "-F";
-            infocmp = "infocmp";
-            test = isTestCommandValid("/usr/bin/test") ? "/usr/bin/test"
-                                                       : "/bin/test";
         }
+        if (tty == null) {
+            tty = "tty" + suffix;
+        }
+        if (stty == null) {
+            stty = "stty" + suffix;
+        }
+        if (infocmp == null) {
+            infocmp = "infocmp" + suffix;
+        }
+        if (test == null) {
+            test = "test" + suffix;
+        }
+        sttyfopt = IS_OSX ? "-f" : "-F";
         TTY_COMMAND = tty;
         STTY_COMMAND = stty;
         STTY_F_OPTION = sttyfopt;
         INFOCMP_COMMAND = infocmp;
         TEST_COMMAND = test;
     }
-
-    private static boolean isTestCommandValid(String command) {
-        return Files.isExecutable(Paths.get(command));
-    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/PumpReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/PumpReader.java
index e80a18b6f3c..12e9795c6f5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/PumpReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/PumpReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -378,7 +378,6 @@ public class PumpReader extends Reader {
         public void close() throws IOException {
             reader.close();
         }
-
     }
 
     private static class InputStream extends java.io.InputStream {
@@ -464,7 +463,5 @@ public class PumpReader extends Reader {
         public void close() throws IOException {
             reader.close();
         }
-
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ShutdownHooks.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ShutdownHooks.java
index 8089de321cc..d5456df03d3 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ShutdownHooks.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/ShutdownHooks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -18,8 +18,7 @@ import java.util.Objects;
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  * @since 2.7
  */
-public final class ShutdownHooks
-{
+public final class ShutdownHooks {
     private static final List<Task> tasks = new ArrayList<>();
 
     private static Thread hook;
@@ -29,8 +28,7 @@ public final class ShutdownHooks
 
         // Install the hook thread if needed
         if (hook == null) {
-            hook = addHook(new Thread("JLine Shutdown Hook")
-            {
+            hook = addHook(new Thread("JLine Shutdown Hook") {
                 @Override
                 public void run() {
                     runTasks();
@@ -53,8 +51,7 @@ public final class ShutdownHooks
             Log.debug("Running task: ", task);
             try {
                 task.run();
-            }
-            catch (Throwable e) {
+            } catch (Throwable e) {
                 Log.warn("Task failed", e);
             }
         }
@@ -91,8 +88,7 @@ public final class ShutdownHooks
 
         try {
             Runtime.getRuntime().removeShutdownHook(thread);
-        }
-        catch (IllegalStateException e) {
+        } catch (IllegalStateException e) {
             // The VM is shutting down, not a big deal; ignore
         }
     }
@@ -100,8 +96,7 @@ public final class ShutdownHooks
     /**
      * Essentially a {@link Runnable} which allows running to throw an exception.
      */
-    public interface Task
-    {
+    public interface Task {
         void run() throws Exception;
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Signals.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Signals.java
index b94f1fa318e..9b25a804735 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Signals.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Signals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -21,8 +21,7 @@ import java.util.Objects;
  */
 public final class Signals {
 
-    private Signals() {
-    }
+    private Signals() {}
 
     /**
      *
@@ -41,8 +40,8 @@ public final class Signals {
         try {
             Class<?> signalHandlerClass = Class.forName("sun.misc.SignalHandler");
             // Implement signal handler
-            Object signalHandler = Proxy.newProxyInstance(loader,
-                    new Class<?>[]{signalHandlerClass}, (proxy, method, args) -> {
+            Object signalHandler =
+                    Proxy.newProxyInstance(loader, new Class<?>[] {signalHandlerClass}, (proxy, method, args) -> {
                         // only method we are proxying is handle()
                         if (method.getDeclaringClass() == Object.class) {
                             if ("toString".equals(method.getName())) {
@@ -101,8 +100,7 @@ public final class Signals {
             return null;
         }
         Class<?> signalHandlerClass = Class.forName("sun.misc.SignalHandler");
-        return signalClass.getMethod("handle", signalClass, signalHandlerClass)
-                .invoke(null, signal, handler);
+        return signalClass.getMethod("handle", signalClass, signalHandlerClass).invoke(null, signal, handler);
     }
 
     @SuppressWarnings("")
@@ -120,5 +118,4 @@ public final class Signals {
         }
         return handler != null ? handler.toString() : "null";
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java
index e8d9e49e8b3..7348b1ea1c5 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2019, the original author or authors.
+ * Copyright (c) 2002-2019, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,187 +8,266 @@
  */
 package jdk.internal.org.jline.utils;
 
-import java.util.Objects;
-import java.util.Collections;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal;
 import jdk.internal.org.jline.terminal.impl.AbstractTerminal;
 import jdk.internal.org.jline.utils.InfoCmp.Capability;
-import jdk.internal.org.jline.terminal.Size;
 
 public class Status {
 
-    protected final AbstractTerminal terminal;
+    protected final Terminal terminal;
     protected final boolean supported;
-    protected List<AttributedString> oldLines = Collections.emptyList();
-    protected List<AttributedString> linesToRestore = Collections.emptyList();
-    protected int rows;
-    protected int columns;
-    protected boolean force;
     protected boolean suspended = false;
     protected AttributedString borderString;
     protected int border = 0;
+    protected Display display;
+    protected List<AttributedString> lines = Collections.emptyList();
+    protected int scrollRegion;
 
     public static Status getStatus(Terminal terminal) {
         return getStatus(terminal, true);
     }
 
-    public static Status getStatus(Terminal terminal, boolean create) {
-        return terminal instanceof AbstractTerminal
-                ? ((AbstractTerminal) terminal).getStatus(create)
-                : null;
+    public static Optional<Status> getExistingStatus(Terminal terminal) {
+        return Optional.ofNullable(getStatus(terminal, false));
     }
 
+    public static Status getStatus(Terminal terminal, boolean create) {
+        return terminal instanceof AbstractTerminal ? ((AbstractTerminal) terminal).getStatus(create) : null;
+    }
 
-    public Status(AbstractTerminal terminal) {
+    @SuppressWarnings("this-escape")
+    public Status(Terminal terminal) {
         this.terminal = Objects.requireNonNull(terminal, "terminal can not be null");
         this.supported = terminal.getStringCapability(Capability.change_scroll_region) != null
-            && terminal.getStringCapability(Capability.save_cursor) != null
-            && terminal.getStringCapability(Capability.restore_cursor) != null
-            && terminal.getStringCapability(Capability.cursor_address) != null;
+                && terminal.getStringCapability(Capability.save_cursor) != null
+                && terminal.getStringCapability(Capability.restore_cursor) != null
+                && terminal.getStringCapability(Capability.cursor_address) != null;
         if (supported) {
-            char borderChar = '\u2700';
-            AttributedStringBuilder bb = new AttributedStringBuilder();
-            for (int i = 0; i < 200; i++) {
-                bb.append(borderChar);
-            }
-            borderString = bb.toAttributedString();
+            display = new MovingCursorDisplay(terminal);
             resize();
+            display.reset();
+            scrollRegion = display.rows - 1;
         }
     }
 
+    public void close() {
+        terminal.puts(Capability.save_cursor);
+        terminal.puts(Capability.change_scroll_region, 0, display.rows - 1);
+        terminal.puts(Capability.restore_cursor);
+        terminal.flush();
+    }
+
     public void setBorder(boolean border) {
         this.border = border ? 1 : 0;
     }
 
     public void resize() {
-        Size size = terminal.getSize();
-        this.rows = size.getRows();
-        this.columns = size.getColumns();
-        this.force = true;
+        resize(terminal.getSize());
+    }
+
+    public void resize(Size size) {
+        display.resize(size.getRows(), size.getColumns());
     }
 
     public void reset() {
-        this.force = true;
-    }
-
-    public void hardReset() {
-        if (suspended) {
-            return;
+        if (supported) {
+            display.reset();
+            scrollRegion = display.rows;
+            terminal.puts(Capability.change_scroll_region, 0, scrollRegion);
         }
-        List<AttributedString> lines = new ArrayList<>(oldLines);
-        int b = border;
-        update(null);
-        border = b;
-        update(lines);
     }
 
     public void redraw() {
         if (suspended) {
             return;
         }
-        update(oldLines);
+        update(lines);
     }
 
-    public void clear() {
-        privateClear(oldLines.size());
-    }
-
-    private void clearAll() {
-        int b = border;
-        border = 0;
-        privateClear(oldLines.size() + b);
-    }
-
-    private void privateClear(int statusSize) {
-        List<AttributedString> as = new ArrayList<>();
-        for (int i = 0; i < statusSize; i++) {
-            as.add(new AttributedString(""));
-        }
-        if (!as.isEmpty()) {
-            update(as);
-        }
+    public void hide() {
+        update(Collections.emptyList());
     }
 
     public void update(List<AttributedString> lines) {
+        update(lines, true);
+    }
+
+    private final AttributedString ellipsis =
+            new AttributedStringBuilder().append("\u2026", AttributedStyle.INVERSE).toAttributedString();
+
+    /**
+     * Returns <code>true</code> if the cursor may be misplaced and should
+     * be updated.
+     */
+    public void update(List<AttributedString> lines, boolean flush) {
         if (!supported) {
             return;
         }
-        if (lines == null) {
-            lines = Collections.emptyList();
-        }
+        this.lines = new ArrayList<>(lines);
         if (suspended) {
-            linesToRestore = new ArrayList<>(lines);
             return;
         }
-        if (lines.isEmpty()) {
-            clearAll();
+
+        lines = new ArrayList<>(lines);
+        // add border
+        int rows = display.rows;
+        int columns = display.columns;
+        if (border == 1 && !lines.isEmpty() && rows > 1) {
+            lines.add(0, getBorderString(columns));
         }
-        if (oldLines.equals(lines) && !force) {
-            return;
+        // trim or complete lines to the full width
+        for (int i = 0; i < lines.size(); i++) {
+            AttributedString str = lines.get(i);
+            if (str.columnLength() > columns) {
+                str = new AttributedStringBuilder(columns)
+                        .append(lines.get(i).columnSubSequence(0, columns - ellipsis.columnLength()))
+                        .append(ellipsis)
+                        .toAttributedString();
+            } else if (str.columnLength() < columns) {
+                str = new AttributedStringBuilder(columns)
+                        .append(str)
+                        .append(' ', columns - str.columnLength())
+                        .toAttributedString();
+            }
+            lines.set(i, str);
         }
-        int statusSize = lines.size() + (lines.size() == 0 ? 0 : border);
-        int nb = statusSize - oldLines.size() - (oldLines.size() == 0 ? 0 : border);
-        if (nb > 0) {
-            for (int i = 0; i < nb; i++) {
+
+        List<AttributedString> oldLines = this.display.oldLines;
+
+        int newScrollRegion = display.rows - 1 - lines.size();
+        // Update the scroll region if needed.
+        // Note that settings the scroll region usually moves the cursor, so we need to get ready for that.
+        if (newScrollRegion < scrollRegion) {
+            // We need to scroll up to grow the status bar
+            terminal.puts(Capability.save_cursor);
+            for (int i = newScrollRegion; i < scrollRegion; i++) {
                 terminal.puts(Capability.cursor_down);
             }
-            for (int i = 0; i < nb; i++) {
+            terminal.puts(Capability.change_scroll_region, 0, newScrollRegion);
+            terminal.puts(Capability.restore_cursor);
+            for (int i = newScrollRegion; i < scrollRegion; i++) {
                 terminal.puts(Capability.cursor_up);
             }
+            scrollRegion = newScrollRegion;
+        } else if (newScrollRegion > scrollRegion) {
+            terminal.puts(Capability.save_cursor);
+            terminal.puts(Capability.change_scroll_region, 0, newScrollRegion);
+            terminal.puts(Capability.restore_cursor);
+            scrollRegion = newScrollRegion;
         }
-        terminal.puts(Capability.save_cursor);
-        terminal.puts(Capability.cursor_address, rows - statusSize, 0);
-        if (!terminal.puts(Capability.clr_eos)) {
-            for (int i = rows - statusSize; i < rows; i++) {
-                terminal.puts(Capability.cursor_address, i, 0);
+
+        // if the display has more lines, we need to add empty ones to make sure they will be erased
+        List<AttributedString> toDraw = new ArrayList<>(lines);
+        int nbToDraw = toDraw.size();
+        int nbOldLines = oldLines.size();
+        if (nbOldLines > nbToDraw) {
+            terminal.puts(Capability.save_cursor);
+            terminal.puts(Capability.cursor_address, display.rows - nbOldLines, 0);
+            for (int i = 0; i < nbOldLines - nbToDraw; i++) {
                 terminal.puts(Capability.clr_eol);
+                if (i < nbOldLines - nbToDraw - 1) {
+                    terminal.puts(Capability.cursor_down);
+                }
+                oldLines.remove(0);
             }
+            terminal.puts(Capability.restore_cursor);
         }
-        if (border == 1 && lines.size() > 0) {
-            terminal.puts(Capability.cursor_address, rows - statusSize, 0);
-            borderString.columnSubSequence(0, columns).print(terminal);
-        }
-        for (int i = 0; i < lines.size(); i++) {
-            terminal.puts(Capability.cursor_address, rows - lines.size() + i, 0);
-            if (lines.get(i).length() > columns) {
-                AttributedStringBuilder asb = new AttributedStringBuilder();
-                asb.append(lines.get(i).substring(0, columns - 3)).append("...", new AttributedStyle(AttributedStyle.INVERSE));
-                asb.toAttributedString().columnSubSequence(0, columns).print(terminal);
-            } else {
-                lines.get(i).columnSubSequence(0, columns).print(terminal);
-            }
-        }
-        terminal.puts(Capability.change_scroll_region, 0, rows - 1 - statusSize);
-        terminal.puts(Capability.restore_cursor);
-        terminal.flush();
-        oldLines = new ArrayList<>(lines);
-        force = false;
+        // update display
+        display.update(lines, -1, flush);
     }
 
+    private AttributedString getBorderString(int columns) {
+        if (borderString == null || borderString.length() != columns) {
+            char borderChar = '\u2700';
+            AttributedStringBuilder bb = new AttributedStringBuilder();
+            for (int i = 0; i < columns; i++) {
+                bb.append(borderChar);
+            }
+            borderString = bb.toAttributedString();
+        }
+        return borderString;
+    }
+
+    /**
+     * The {@code suspend} method is used when a full-screen.
+     * If the status was not already suspended, the lines
+     * used by the status are cleared during this call.
+     */
     public void suspend() {
-        if (suspended) {
-            return;
+        if (!suspended) {
+            suspended = true;
         }
-        linesToRestore = new ArrayList<>(oldLines);
-        int b = border;
-        update(null);
-        border = b;
-        suspended = true;
     }
 
+    /**
+     * The {@code restore()} call is the opposite of {@code suspend()} and
+     * will make the status bar be updated again.
+     * If the status was suspended, the lines
+     * used by the status will be drawn during this call.
+     */
     public void restore() {
-        if (!suspended) {
-            return;
+        if (suspended) {
+            suspended = false;
+            update(this.lines);
         }
-        suspended = false;
-        update(linesToRestore);
-        linesToRestore = Collections.emptyList();
     }
 
     public int size() {
-        return oldLines.size() + border;
+        return size(this.lines);
     }
 
+    private int size(List<?> lines) {
+        int l = lines.size();
+        return l > 0 ? l + border : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "Status[" + "supported=" + supported + ']';
+    }
+
+    static class MovingCursorDisplay extends Display {
+        protected int firstLine;
+
+        public MovingCursorDisplay(Terminal terminal) {
+            super(terminal, false);
+        }
+
+        @Override
+        public void update(List<AttributedString> newLines, int targetCursorPos, boolean flush) {
+            cursorPos = -1;
+            firstLine = rows - newLines.size();
+            super.update(newLines, targetCursorPos, flush);
+            if (cursorPos != -1) {
+                terminal.puts(Capability.restore_cursor);
+            }
+        }
+
+        @Override
+        protected void moveVisualCursorTo(int targetPos, List<AttributedString> newLines) {
+            initCursor();
+            super.moveVisualCursorTo(targetPos, newLines);
+        }
+
+        @Override
+        protected int moveVisualCursorTo(int i1) {
+            initCursor();
+            return super.moveVisualCursorTo(i1);
+        }
+
+        void initCursor() {
+            if (cursorPos == -1) {
+                terminal.puts(Capability.save_cursor);
+                terminal.puts(Capability.cursor_address, firstLine, 0);
+                cursorPos = 0;
+            }
+        }
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/StyleResolver.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/StyleResolver.java
index be1659957b4..29d87cbc3c8 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/StyleResolver.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/StyleResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -55,12 +55,12 @@ public class StyleResolver {
                 return null;
             }
         } else {
-           // load indexed color
-           Integer color = color(name);
-           if (color != null && color != -1) {
-               color = Colors.DEFAULT_COLORS_256[color];
-           }
-           return color;
+            // load indexed color
+            Integer color = color(name);
+            if (color != null && color != -1) {
+                color = Colors.DEFAULT_COLORS_256[color];
+            }
+            return color;
         }
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Timeout.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Timeout.java
index edea89cf2d9..1e3091e19a1 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Timeout.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2018, the original author or authors.
+ * Copyright (c) 2002-2018, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -44,5 +44,4 @@ public class Timeout {
     public long timeout() {
         return timeout > 0 ? Math.max(1, end - cur) : timeout;
     }
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WCWidth.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WCWidth.java
index db3a8d3d990..7b0caf91c25 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WCWidth.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WCWidth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2016, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -10,8 +10,7 @@ package jdk.internal.org.jline.utils;
 
 public final class WCWidth {
 
-    private WCWidth() {
-    }
+    private WCWidth() {}
 
     /* The following two functions define the column width of an ISO 10646
      * character as follows:
@@ -44,88 +43,86 @@ public final class WCWidth {
      * This implementation assumes that wchar_t characters are encoded
      * in ISO 10646.
      */
-    public static int wcwidth(int ucs)
-    {
+    public static int wcwidth(int ucs) {
 
         /* test for 8-bit control characters */
-        if (ucs == 0)
-            return 0;
-        if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
-            return -1;
+        if (ucs == 0) return 0;
+        if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) return -1;
 
         /* binary search in table of non-spacing characters */
-        if (bisearch(ucs, combining, combining.length - 1))
-            return 0;
+        if (bisearch(ucs, combining, combining.length - 1)) return 0;
 
         /* if we arrive here, ucs is not a combining or C0/C1 control character */
-        return 1 +
-                ((ucs >= 0x1100 &&
-                        (ucs <= 0x115f ||                           /* Hangul Jamo init. consonants */
-                                ucs == 0x2329 || ucs == 0x232a ||
-                                (ucs >= 0x2e80 && ucs <= 0xa4cf &&
-                                        ucs != 0x303f) ||           /* CJK ... Yi */
-                                (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
-                                (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
-                                (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
-                                (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
-                                (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
-                                (ucs >= 0xffe0 && ucs <= 0xffe6) ||
-                                (ucs >= 0x1f000 && ucs <= 0x1feee) ||
-                                (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-                                (ucs >= 0x30000 && ucs <= 0x3fffd))) ? 1 : 0);
+        return 1
+                + ((ucs >= 0x1100
+                                && (ucs <= 0x115f
+                                        || /* Hangul Jamo init. consonants */ ucs == 0x2329
+                                        || ucs == 0x232a
+                                        || (ucs >= 0x2e80 && ucs <= 0xa4cf && ucs != 0x303f)
+                                        || /* CJK ... Yi */ (ucs >= 0xac00 && ucs <= 0xd7a3)
+                                        || /* Hangul Syllables */ (ucs >= 0xf900 && ucs <= 0xfaff)
+                                        || /* CJK Compatibility Ideographs */ (ucs >= 0xfe10 && ucs <= 0xfe19)
+                                        || /* Vertical forms */ (ucs >= 0xfe30 && ucs <= 0xfe6f)
+                                        || /* CJK Compatibility Forms */ (ucs >= 0xff00 && ucs <= 0xff60)
+                                        || /* Fullwidth Forms */ (ucs >= 0xffe0 && ucs <= 0xffe6)
+                                        || (ucs >= 0x1f000 && ucs <= 0x1feee)
+                                        || (ucs >= 0x20000 && ucs <= 0x2fffd)
+                                        || (ucs >= 0x30000 && ucs <= 0x3fffd)))
+                        ? 1
+                        : 0);
     }
 
     /* sorted list of non-overlapping intervals of non-spacing characters */
     /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
     static Interval[] combining = {
-            new Interval( 0x0300, 0x036F ), new Interval( 0x0483, 0x0486 ), new Interval( 0x0488, 0x0489 ),
-            new Interval( 0x0591, 0x05BD ), new Interval( 0x05BF, 0x05BF ), new Interval( 0x05C1, 0x05C2 ),
-            new Interval( 0x05C4, 0x05C5 ), new Interval( 0x05C7, 0x05C7 ), new Interval( 0x0600, 0x0603 ),
-            new Interval( 0x0610, 0x0615 ), new Interval( 0x064B, 0x065E ), new Interval( 0x0670, 0x0670 ),
-            new Interval( 0x06D6, 0x06E4 ), new Interval( 0x06E7, 0x06E8 ), new Interval( 0x06EA, 0x06ED ),
-            new Interval( 0x070F, 0x070F ), new Interval( 0x0711, 0x0711 ), new Interval( 0x0730, 0x074A ),
-            new Interval( 0x07A6, 0x07B0 ), new Interval( 0x07EB, 0x07F3 ), new Interval( 0x0901, 0x0902 ),
-            new Interval( 0x093C, 0x093C ), new Interval( 0x0941, 0x0948 ), new Interval( 0x094D, 0x094D ),
-            new Interval( 0x0951, 0x0954 ), new Interval( 0x0962, 0x0963 ), new Interval( 0x0981, 0x0981 ),
-            new Interval( 0x09BC, 0x09BC ), new Interval( 0x09C1, 0x09C4 ), new Interval( 0x09CD, 0x09CD ),
-            new Interval( 0x09E2, 0x09E3 ), new Interval( 0x0A01, 0x0A02 ), new Interval( 0x0A3C, 0x0A3C ),
-            new Interval( 0x0A41, 0x0A42 ), new Interval( 0x0A47, 0x0A48 ), new Interval( 0x0A4B, 0x0A4D ),
-            new Interval( 0x0A70, 0x0A71 ), new Interval( 0x0A81, 0x0A82 ), new Interval( 0x0ABC, 0x0ABC ),
-            new Interval( 0x0AC1, 0x0AC5 ), new Interval( 0x0AC7, 0x0AC8 ), new Interval( 0x0ACD, 0x0ACD ),
-            new Interval( 0x0AE2, 0x0AE3 ), new Interval( 0x0B01, 0x0B01 ), new Interval( 0x0B3C, 0x0B3C ),
-            new Interval( 0x0B3F, 0x0B3F ), new Interval( 0x0B41, 0x0B43 ), new Interval( 0x0B4D, 0x0B4D ),
-            new Interval( 0x0B56, 0x0B56 ), new Interval( 0x0B82, 0x0B82 ), new Interval( 0x0BC0, 0x0BC0 ),
-            new Interval( 0x0BCD, 0x0BCD ), new Interval( 0x0C3E, 0x0C40 ), new Interval( 0x0C46, 0x0C48 ),
-            new Interval( 0x0C4A, 0x0C4D ), new Interval( 0x0C55, 0x0C56 ), new Interval( 0x0CBC, 0x0CBC ),
-            new Interval( 0x0CBF, 0x0CBF ), new Interval( 0x0CC6, 0x0CC6 ), new Interval( 0x0CCC, 0x0CCD ),
-            new Interval( 0x0CE2, 0x0CE3 ), new Interval( 0x0D41, 0x0D43 ), new Interval( 0x0D4D, 0x0D4D ),
-            new Interval( 0x0DCA, 0x0DCA ), new Interval( 0x0DD2, 0x0DD4 ), new Interval( 0x0DD6, 0x0DD6 ),
-            new Interval( 0x0E31, 0x0E31 ), new Interval( 0x0E34, 0x0E3A ), new Interval( 0x0E47, 0x0E4E ),
-            new Interval( 0x0EB1, 0x0EB1 ), new Interval( 0x0EB4, 0x0EB9 ), new Interval( 0x0EBB, 0x0EBC ),
-            new Interval( 0x0EC8, 0x0ECD ), new Interval( 0x0F18, 0x0F19 ), new Interval( 0x0F35, 0x0F35 ),
-            new Interval( 0x0F37, 0x0F37 ), new Interval( 0x0F39, 0x0F39 ), new Interval( 0x0F71, 0x0F7E ),
-            new Interval( 0x0F80, 0x0F84 ), new Interval( 0x0F86, 0x0F87 ), new Interval( 0x0F90, 0x0F97 ),
-            new Interval( 0x0F99, 0x0FBC ), new Interval( 0x0FC6, 0x0FC6 ), new Interval( 0x102D, 0x1030 ),
-            new Interval( 0x1032, 0x1032 ), new Interval( 0x1036, 0x1037 ), new Interval( 0x1039, 0x1039 ),
-            new Interval( 0x1058, 0x1059 ), new Interval( 0x1160, 0x11FF ), new Interval( 0x135F, 0x135F ),
-            new Interval( 0x1712, 0x1714 ), new Interval( 0x1732, 0x1734 ), new Interval( 0x1752, 0x1753 ),
-            new Interval( 0x1772, 0x1773 ), new Interval( 0x17B4, 0x17B5 ), new Interval( 0x17B7, 0x17BD ),
-            new Interval( 0x17C6, 0x17C6 ), new Interval( 0x17C9, 0x17D3 ), new Interval( 0x17DD, 0x17DD ),
-            new Interval( 0x180B, 0x180D ), new Interval( 0x18A9, 0x18A9 ), new Interval( 0x1920, 0x1922 ),
-            new Interval( 0x1927, 0x1928 ), new Interval( 0x1932, 0x1932 ), new Interval( 0x1939, 0x193B ),
-            new Interval( 0x1A17, 0x1A18 ), new Interval( 0x1B00, 0x1B03 ), new Interval( 0x1B34, 0x1B34 ),
-            new Interval( 0x1B36, 0x1B3A ), new Interval( 0x1B3C, 0x1B3C ), new Interval( 0x1B42, 0x1B42 ),
-            new Interval( 0x1B6B, 0x1B73 ), new Interval( 0x1DC0, 0x1DCA ), new Interval( 0x1DFE, 0x1DFF ),
-            new Interval( 0x200B, 0x200F ), new Interval( 0x202A, 0x202E ), new Interval( 0x2060, 0x2063 ),
-            new Interval( 0x206A, 0x206F ), new Interval( 0x20D0, 0x20EF ), new Interval( 0x302A, 0x302F ),
-            new Interval( 0x3099, 0x309A ), new Interval( 0xA806, 0xA806 ), new Interval( 0xA80B, 0xA80B ),
-            new Interval( 0xA825, 0xA826 ), new Interval( 0xFB1E, 0xFB1E ), new Interval( 0xFE00, 0xFE0F ),
-            new Interval( 0xFE20, 0xFE23 ), new Interval( 0xFEFF, 0xFEFF ), new Interval( 0xFFF9, 0xFFFB ),
-            new Interval( 0x10A01, 0x10A03 ), new Interval( 0x10A05, 0x10A06 ), new Interval( 0x10A0C, 0x10A0F ),
-            new Interval( 0x10A38, 0x10A3A ), new Interval( 0x10A3F, 0x10A3F ), new Interval( 0x1D167, 0x1D169 ),
-            new Interval( 0x1D173, 0x1D182 ), new Interval( 0x1D185, 0x1D18B ), new Interval( 0x1D1AA, 0x1D1AD ),
-            new Interval( 0x1D242, 0x1D244 ), new Interval( 0x1F3FB, 0x1F3FF ), new Interval( 0xE0001, 0xE0001 ),
-            new Interval( 0xE0020, 0xE007F ), new Interval( 0xE0100, 0xE01EF )
+        new Interval(0x0300, 0x036F), new Interval(0x0483, 0x0486), new Interval(0x0488, 0x0489),
+        new Interval(0x0591, 0x05BD), new Interval(0x05BF, 0x05BF), new Interval(0x05C1, 0x05C2),
+        new Interval(0x05C4, 0x05C5), new Interval(0x05C7, 0x05C7), new Interval(0x0600, 0x0603),
+        new Interval(0x0610, 0x0615), new Interval(0x064B, 0x065E), new Interval(0x0670, 0x0670),
+        new Interval(0x06D6, 0x06E4), new Interval(0x06E7, 0x06E8), new Interval(0x06EA, 0x06ED),
+        new Interval(0x070F, 0x070F), new Interval(0x0711, 0x0711), new Interval(0x0730, 0x074A),
+        new Interval(0x07A6, 0x07B0), new Interval(0x07EB, 0x07F3), new Interval(0x0901, 0x0902),
+        new Interval(0x093C, 0x093C), new Interval(0x0941, 0x0948), new Interval(0x094D, 0x094D),
+        new Interval(0x0951, 0x0954), new Interval(0x0962, 0x0963), new Interval(0x0981, 0x0981),
+        new Interval(0x09BC, 0x09BC), new Interval(0x09C1, 0x09C4), new Interval(0x09CD, 0x09CD),
+        new Interval(0x09E2, 0x09E3), new Interval(0x0A01, 0x0A02), new Interval(0x0A3C, 0x0A3C),
+        new Interval(0x0A41, 0x0A42), new Interval(0x0A47, 0x0A48), new Interval(0x0A4B, 0x0A4D),
+        new Interval(0x0A70, 0x0A71), new Interval(0x0A81, 0x0A82), new Interval(0x0ABC, 0x0ABC),
+        new Interval(0x0AC1, 0x0AC5), new Interval(0x0AC7, 0x0AC8), new Interval(0x0ACD, 0x0ACD),
+        new Interval(0x0AE2, 0x0AE3), new Interval(0x0B01, 0x0B01), new Interval(0x0B3C, 0x0B3C),
+        new Interval(0x0B3F, 0x0B3F), new Interval(0x0B41, 0x0B43), new Interval(0x0B4D, 0x0B4D),
+        new Interval(0x0B56, 0x0B56), new Interval(0x0B82, 0x0B82), new Interval(0x0BC0, 0x0BC0),
+        new Interval(0x0BCD, 0x0BCD), new Interval(0x0C3E, 0x0C40), new Interval(0x0C46, 0x0C48),
+        new Interval(0x0C4A, 0x0C4D), new Interval(0x0C55, 0x0C56), new Interval(0x0CBC, 0x0CBC),
+        new Interval(0x0CBF, 0x0CBF), new Interval(0x0CC6, 0x0CC6), new Interval(0x0CCC, 0x0CCD),
+        new Interval(0x0CE2, 0x0CE3), new Interval(0x0D41, 0x0D43), new Interval(0x0D4D, 0x0D4D),
+        new Interval(0x0DCA, 0x0DCA), new Interval(0x0DD2, 0x0DD4), new Interval(0x0DD6, 0x0DD6),
+        new Interval(0x0E31, 0x0E31), new Interval(0x0E34, 0x0E3A), new Interval(0x0E47, 0x0E4E),
+        new Interval(0x0EB1, 0x0EB1), new Interval(0x0EB4, 0x0EB9), new Interval(0x0EBB, 0x0EBC),
+        new Interval(0x0EC8, 0x0ECD), new Interval(0x0F18, 0x0F19), new Interval(0x0F35, 0x0F35),
+        new Interval(0x0F37, 0x0F37), new Interval(0x0F39, 0x0F39), new Interval(0x0F71, 0x0F7E),
+        new Interval(0x0F80, 0x0F84), new Interval(0x0F86, 0x0F87), new Interval(0x0F90, 0x0F97),
+        new Interval(0x0F99, 0x0FBC), new Interval(0x0FC6, 0x0FC6), new Interval(0x102D, 0x1030),
+        new Interval(0x1032, 0x1032), new Interval(0x1036, 0x1037), new Interval(0x1039, 0x1039),
+        new Interval(0x1058, 0x1059), new Interval(0x1160, 0x11FF), new Interval(0x135F, 0x135F),
+        new Interval(0x1712, 0x1714), new Interval(0x1732, 0x1734), new Interval(0x1752, 0x1753),
+        new Interval(0x1772, 0x1773), new Interval(0x17B4, 0x17B5), new Interval(0x17B7, 0x17BD),
+        new Interval(0x17C6, 0x17C6), new Interval(0x17C9, 0x17D3), new Interval(0x17DD, 0x17DD),
+        new Interval(0x180B, 0x180D), new Interval(0x18A9, 0x18A9), new Interval(0x1920, 0x1922),
+        new Interval(0x1927, 0x1928), new Interval(0x1932, 0x1932), new Interval(0x1939, 0x193B),
+        new Interval(0x1A17, 0x1A18), new Interval(0x1B00, 0x1B03), new Interval(0x1B34, 0x1B34),
+        new Interval(0x1B36, 0x1B3A), new Interval(0x1B3C, 0x1B3C), new Interval(0x1B42, 0x1B42),
+        new Interval(0x1B6B, 0x1B73), new Interval(0x1DC0, 0x1DCA), new Interval(0x1DFE, 0x1DFF),
+        new Interval(0x200B, 0x200F), new Interval(0x202A, 0x202E), new Interval(0x2060, 0x2063),
+        new Interval(0x206A, 0x206F), new Interval(0x20D0, 0x20EF), new Interval(0x302A, 0x302F),
+        new Interval(0x3099, 0x309A), new Interval(0xA806, 0xA806), new Interval(0xA80B, 0xA80B),
+        new Interval(0xA825, 0xA826), new Interval(0xFB1E, 0xFB1E), new Interval(0xFE00, 0xFE0F),
+        new Interval(0xFE20, 0xFE23), new Interval(0xFEFF, 0xFEFF), new Interval(0xFFF9, 0xFFFB),
+        new Interval(0x10A01, 0x10A03), new Interval(0x10A05, 0x10A06), new Interval(0x10A0C, 0x10A0F),
+        new Interval(0x10A38, 0x10A3A), new Interval(0x10A3F, 0x10A3F), new Interval(0x1D167, 0x1D169),
+        new Interval(0x1D173, 0x1D182), new Interval(0x1D185, 0x1D18B), new Interval(0x1D1AA, 0x1D1AD),
+        new Interval(0x1D242, 0x1D244), new Interval(0x1F3FB, 0x1F3FF), new Interval(0xE0001, 0xE0001),
+        new Interval(0xE0020, 0xE007F), new Interval(0xE0100, 0xE01EF)
     };
 
     private static class Interval {
@@ -143,20 +140,14 @@ public final class WCWidth {
         int min = 0;
         int mid;
 
-        if (ucs < table[0].first || ucs > table[max].last)
-            return false;
+        if (ucs < table[0].first || ucs > table[max].last) return false;
         while (max >= min) {
             mid = (min + max) / 2;
-            if (ucs > table[mid].last)
-                min = mid + 1;
-            else if (ucs < table[mid].first)
-                max = mid - 1;
-            else
-                return true;
+            if (ucs > table[mid].last) min = mid + 1;
+            else if (ucs < table[mid].first) max = mid - 1;
+            else return true;
         }
 
         return false;
     }
-
-
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WriterOutputStream.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WriterOutputStream.java
index 3ad63a8f381..b1285f9636e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WriterOutputStream.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/WriterOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2017, the original author or authors.
+ * Copyright (c) 2002-2017, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -35,9 +35,11 @@ public class WriterOutputStream extends OutputStream {
     private final CharBuffer decoderOut = CharBuffer.allocate(128);
 
     public WriterOutputStream(Writer out, Charset charset) {
-        this(out, charset.newDecoder()
-                .onMalformedInput(CodingErrorAction.REPLACE)
-                .onUnmappableCharacter(CodingErrorAction.REPLACE));
+        this(
+                out,
+                charset.newDecoder()
+                        .onMalformedInput(CodingErrorAction.REPLACE)
+                        .onUnmappableCharacter(CodingErrorAction.REPLACE));
     }
 
     public WriterOutputStream(Writer out, CharsetDecoder decoder) {
@@ -47,7 +49,7 @@ public class WriterOutputStream extends OutputStream {
 
     @Override
     public void write(int b) throws IOException {
-        write(new byte[] { (byte)b }, 0, 1);
+        write(new byte[] {(byte) b}, 0, 1);
     }
 
     @Override
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/windows-conemu.caps b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/windows-conemu.caps
index 719bcf86202..f5caa4402bc 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/windows-conemu.caps
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/windows-conemu.caps
@@ -5,6 +5,9 @@ windows-conemu|conemu windows terminal,
 	cr=^M, cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
 	cuu=\E[%p1%dA, cuu1=\E[A,
+	civis=\E[?25l, cvvis=\E[?25h,
+	smcup=\E[?1049h, rmcup=\E[?1049l,
+	rc=\E8, sc=\E7,
 	il=\E[%p1%dL, il1=\E[L,
 	dl=\E[%p1%dM, dl1=\E[M,
 	ech=\E[%p1%dX,
diff --git a/src/jdk.internal.le/share/legal/jline.md b/src/jdk.internal.le/share/legal/jline.md
index 6840c69cfc0..5b813c0af2f 100644
--- a/src/jdk.internal.le/share/legal/jline.md
+++ b/src/jdk.internal.le/share/legal/jline.md
@@ -1,9 +1,9 @@
-## JLine v3.22.0
+## JLine v3.26.1
 
 ### JLine License
 <pre>
 
-Copyright (c) 2002-2018, the original author or authors.
+Copyright (c) 2002-2023, the original author or authors.
 All rights reserved.
 
 https://opensource.org/licenses/BSD-3-Clause
diff --git a/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaNativePty.java b/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaNativePty.java
deleted file mode 100644
index 2cf24e4ba85..00000000000
--- a/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaNativePty.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna;
-
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Constructor;
-
-//import com.sun.jna.Platform;
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.AbstractPty;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-import jdk.internal.org.jline.terminal.spi.Pty;
-//import jdk.internal.org.jline.terminal.impl.jna.freebsd.FreeBsdNativePty;
-//import jdk.internal.org.jline.terminal.impl.jna.linux.LinuxNativePty;
-//import jdk.internal.org.jline.terminal.impl.jna.osx.OsXNativePty;
-//import jdk.internal.org.jline.terminal.impl.jna.solaris.SolarisNativePty;
-
-public abstract class JnaNativePty extends AbstractPty implements Pty {
-
-    private final int master;
-    private final int slave;
-    private final int slaveOut;
-    private final String name;
-    private final FileDescriptor masterFD;
-    private final FileDescriptor slaveFD;
-    private final FileDescriptor slaveOutFD;
-
-    public static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-//        if (Platform.isMac()) {
-//            if (Platform.is64Bit() && Platform.isARM()) {
-//                throw new UnsupportedOperationException();
-//            }
-//            return OsXNativePty.current(console);
-//        } else if (Platform.isLinux()) {
-//            return LinuxNativePty.current(console);
-//        } else if (Platform.isSolaris()) {
-//            return SolarisNativePty.current(console);
-//        } else if (Platform.isFreeBSD()) {
-//            return FreeBsdNativePty.current(console);
-//        } else {
-//            throw new UnsupportedOperationException();
-//        }
-        return JDKNativePty.current(console);
-    }
-
-    public static JnaNativePty open(Attributes attr, Size size) throws IOException {
-//        if (Platform.isMac()) {
-//            return OsXNativePty.open(attr, size);
-//        } else if (Platform.isLinux()) {
-//            return LinuxNativePty.open(attr, size);
-//        } else if (Platform.isSolaris()) {
-//            return SolarisNativePty.open(attr, size);
-//        } else if (Platform.isFreeBSD()) {
-//            return FreeBsdNativePty.open(attr, size);
-//        } else {
-//            throw new UnsupportedOperationException();
-//        }
-        return JDKNativePty.open(attr, size);
-    }
-
-    protected JnaNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, String name) {
-        this(master, masterFD, slave, slaveFD, slave, slaveFD, name);
-    }
-
-    protected JnaNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, int slaveOut, FileDescriptor slaveOutFD, String name) {
-        this.master = master;
-        this.slave = slave;
-        this.slaveOut = slaveOut;
-        this.name = name;
-        this.masterFD = masterFD;
-        this.slaveFD = slaveFD;
-        this.slaveOutFD = slaveOutFD;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (master > 0) {
-            getMasterInput().close();
-        }
-        if (slave > 0) {
-            getSlaveInput().close();
-        }
-    }
-
-    public int getMaster() {
-        return master;
-    }
-
-    public int getSlave() {
-        return slave;
-    }
-
-    public int getSlaveOut() {
-        return slaveOut;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public FileDescriptor getMasterFD() {
-        return masterFD;
-    }
-
-    public FileDescriptor getSlaveFD() {
-        return slaveFD;
-    }
-
-    public FileDescriptor getSlaveOutFD() {
-        return slaveOutFD;
-    }
-
-    public InputStream getMasterInput() {
-        return new FileInputStream(getMasterFD());
-    }
-
-    public OutputStream getMasterOutput() {
-        return new FileOutputStream(getMasterFD());
-    }
-
-    protected InputStream doGetSlaveInput() {
-        return new FileInputStream(getSlaveFD());
-    }
-
-    public OutputStream getSlaveOutput() {
-        return new FileOutputStream(getSlaveOutFD());
-    }
-
-    protected static FileDescriptor newDescriptor(int fd) {
-        try {
-            Constructor<FileDescriptor> cns = FileDescriptor.class.getDeclaredConstructor(int.class);
-            cns.setAccessible(true);
-            return cns.newInstance(fd);
-        } catch (Throwable e) {
-            throw new RuntimeException("Unable to create FileDescriptor", e);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "JnaNativePty[" + getName() + "]";
-    }
-
-    public static boolean isPosixSystemStream(TerminalProvider.Stream stream) {
-        switch (stream) {
-            case Input: return isatty(0);
-            case Output: return isatty(1);
-            case Error: return isatty(2);
-            default: return false;
-        }
-    }
-
-    public static String posixSystemStreamName(TerminalProvider.Stream stream) {
-        switch (stream) {
-            case Input: return ttyname(0);
-            case Output: return ttyname(1);
-            case Error: return ttyname(2);
-            default: return null;
-        }
-    }
-
-    private static boolean isatty(int fd) {
-//        if (Platform.isMac()) {
-//            return OsXNativePty.isatty(fd) == 1;
-//        } else if (Platform.isLinux()) {
-//            return LinuxNativePty.isatty(fd) == 1;
-//        } else if (Platform.isSolaris()) {
-//            return SolarisNativePty.isatty(fd) == 1;
-//        } else if (Platform.isFreeBSD()) {
-//            return FreeBsdNativePty.isatty(fd) == 1;
-//        } else {
-//            return false;
-//        }
-        return JDKNativePty.isatty(fd) == 1;
-    }
-
-    private static String ttyname(int fd) {
-//        if (Platform.isMac()) {
-//            return OsXNativePty.ttyname(fd);
-//        } else if (Platform.isLinux()) {
-//            return LinuxNativePty.ttyname(fd);
-//        } else if (Platform.isSolaris()) {
-//            return SolarisNativePty.ttyname(fd);
-//        } else if (Platform.isFreeBSD()) {
-//            return FreeBsdNativePty.ttyname(fd);
-//        } else {
-//            return null;
-//        }
-        return JDKNativePty.ttyname(fd);
-    }
-
-}
diff --git a/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java b/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
deleted file mode 100644
index 04052202030..00000000000
--- a/src/jdk.internal.le/unix/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna;
-
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.terminal.impl.PosixPtyTerminal;
-import jdk.internal.org.jline.terminal.impl.PosixSysTerminal;
-//import jdk.internal.org.jline.terminal.impl.jna.win.JnaWinSysTerminal;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-import jdk.internal.org.jline.terminal.spi.Pty;
-import jdk.internal.org.jline.utils.OSUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.function.Function;
-
-public class JnaTerminalProvider implements TerminalProvider
-{
-    @Override
-    public String name() {
-        return "jna";
-    }
-
-    public Pty current(TerminalProvider.Stream console) throws IOException {
-        return JnaNativePty.current(console);
-    }
-
-    public Pty open(Attributes attributes, Size size) throws IOException {
-        return JnaNativePty.open(attributes, size);
-    }
-
-    @Override
-    public Terminal sysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-//        if (OSUtils.IS_WINDOWS) {
-//            return winSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream );
-//        } else {
-            return posixSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream, inputStreamWrapper );
-//        }
-    }
-
-//    public Terminal winSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-//                                   boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-//                                   Stream console, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-//        return JnaWinSysTerminal.createTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, console);
-//    }
-//
-    public Terminal posixSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                     boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                     Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-//        Pty pty = jdk.internal.org.jline.terminal.impl.ExecPty.current(consoleStream);
-        Pty pty = current(consoleStream);
-        return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler, inputStreamWrapper);
-    }
-
-    @Override
-    public Terminal newTerminal(String name, String type, InputStream in, OutputStream out,
-                                Charset encoding, Terminal.SignalHandler signalHandler, boolean paused,
-                                Attributes attributes, Size size) throws IOException
-    {
-        Pty pty = open(attributes, size);
-        return new PosixPtyTerminal(name, type, pty, in, out, encoding, signalHandler, paused);
-    }
-
-    @Override
-    public boolean isSystemStream(Stream stream) {
-        try {
-//            if (OSUtils.IS_WINDOWS) {
-//                return isWindowsSystemStream(stream);
-//            } else {
-                return isPosixSystemStream(stream);
-//            }
-        } catch (Throwable t) {
-            return false;
-        }
-    }
-
-//    public boolean isWindowsSystemStream(Stream stream) {
-//        return JnaWinSysTerminal.isWindowsSystemStream(stream);
-//    }
-
-    public boolean isPosixSystemStream(Stream stream) {
-        return JnaNativePty.isPosixSystemStream(stream);
-    }
-
-    @Override
-    public String systemStreamName(Stream stream) {
-        if (OSUtils.IS_WINDOWS) {
-            return null;
-        } else {
-            return JnaNativePty.posixSystemStreamName(stream);
-        }
-    }
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
deleted file mode 100644
index b820ce2187e..00000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/JnaTerminalProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna;
-
-import jdk.internal.org.jline.terminal.Attributes;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.Terminal;
-import jdk.internal.org.jline.terminal.impl.PosixPtyTerminal;
-import jdk.internal.org.jline.terminal.impl.PosixSysTerminal;
-import jdk.internal.org.jline.terminal.impl.jna.win.JnaWinSysTerminal;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-import jdk.internal.org.jline.terminal.spi.Pty;
-import jdk.internal.org.jline.utils.OSUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.function.Function;
-
-public class JnaTerminalProvider implements TerminalProvider
-{
-    @Override
-    public String name() {
-        return "jna";
-    }
-
-//    public Pty current(TerminalProvider.Stream console) throws IOException {
-//        return JnaNativePty.current(console);
-//    }
-//
-//    public Pty open(Attributes attributes, Size size) throws IOException {
-//        return JnaNativePty.open(attributes, size);
-//    }
-
-    @Override
-    public Terminal sysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        if (OSUtils.IS_WINDOWS) {
-            return winSysTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, consoleStream, inputStreamWrapper );
-        } else {
-            return null;
-        }
-    }
-
-    public Terminal winSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-                                   boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-                                   Stream console, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        return JnaWinSysTerminal.createTerminal(name, type, ansiPassThrough, encoding, nativeSignals, signalHandler, paused, console, inputStreamWrapper);
-    }
-
-//    public Terminal posixSysTerminal(String name, String type, boolean ansiPassThrough, Charset encoding,
-//                                     boolean nativeSignals, Terminal.SignalHandler signalHandler, boolean paused,
-//                                     Stream consoleStream) throws IOException {
-//        Pty pty = current(consoleStream);
-//        return new PosixSysTerminal(name, type, pty, encoding, nativeSignals, signalHandler);
-//    }
-
-    @Override
-    public Terminal newTerminal(String name, String type, InputStream in, OutputStream out,
-                                Charset encoding, Terminal.SignalHandler signalHandler, boolean paused,
-                                Attributes attributes, Size size) throws IOException
-    {
-//        Pty pty = open(attributes, size);
-//        return new PosixPtyTerminal(name, type, pty, in, out, encoding, signalHandler, paused);
-        return null;
-    }
-
-    @Override
-    public boolean isSystemStream(Stream stream) {
-        try {
-            if (OSUtils.IS_WINDOWS) {
-                return isWindowsSystemStream(stream);
-            } else {
-//                return isPosixSystemStream(stream);
-                return false;
-            }
-        } catch (Throwable t) {
-            return false;
-        }
-    }
-
-    public boolean isWindowsSystemStream(Stream stream) {
-        return JnaWinSysTerminal.isWindowsSystemStream(stream);
-    }
-
-//    public boolean isPosixSystemStream(Stream stream) {
-//        return JnaNativePty.isPosixSystemStream(stream);
-//    }
-
-    @Override
-    public String systemStreamName(Stream stream) {
-//        if (OSUtils.IS_WINDOWS) {
-            return null;
-//        } else {
-//            return JnaNativePty.posixSystemStreamName(stream);
-//        }
-    }
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/IntByReference.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/IntByReference.java
deleted file mode 100644
index 7cfe401b582..00000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/IntByReference.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.org.jline.terminal.impl.jna.win;
-
-class IntByReference {
-
-    public int value;
-
-    public int getValue() {
-        return value;
-    }
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java
deleted file mode 100644
index 7fcbb5416a6..00000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2002-2017, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.win;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Pointer;
-//import com.sun.jna.ptr.IntByReference;
-import jdk.internal.org.jline.terminal.impl.AbstractWindowsConsoleWriter;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-import java.io.IOException;
-
-class JnaWinConsoleWriter extends AbstractWindowsConsoleWriter {
-
-    private final Pointer console;
-    private final IntByReference writtenChars = new IntByReference();
-
-    JnaWinConsoleWriter(Pointer console) {
-        this.console = console;
-    }
-
-    @Override
-    protected void writeConsole(char[] text, int len) throws IOException {
-        try {
-            Kernel32.INSTANCE.WriteConsoleW(this.console, text, len, this.writtenChars, null);
-        } catch (LastErrorException e) {
-            throw new IOException("Failed to write to console", e);
-        }
-    }
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java
deleted file mode 100644
index 9baafb89bd9..00000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2002-2020, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.win;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.util.function.Function;
-import java.util.function.IntConsumer;
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Pointer;
-//import com.sun.jna.ptr.IntByReference;
-import jdk.internal.org.jline.terminal.Cursor;
-import jdk.internal.org.jline.terminal.Size;
-import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-import jdk.internal.org.jline.terminal.spi.TerminalProvider;
-import jdk.internal.org.jline.utils.InfoCmp;
-import jdk.internal.org.jline.utils.OSUtils;
-
-public class JnaWinSysTerminal extends AbstractWindowsTerminal {
-
-    private static final Pointer consoleIn = Kernel32.INSTANCE.GetStdHandle(Kernel32.STD_INPUT_HANDLE);
-    private static final Pointer consoleOut = Kernel32.INSTANCE.GetStdHandle(Kernel32.STD_OUTPUT_HANDLE);
-    private static final Pointer consoleErr = Kernel32.INSTANCE.GetStdHandle(Kernel32.STD_ERROR_HANDLE);
-
-    public static JnaWinSysTerminal createTerminal(String name, String type, boolean ansiPassThrough, Charset encoding, boolean nativeSignals, SignalHandler signalHandler, boolean paused, TerminalProvider.Stream consoleStream, Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        Pointer console;
-        switch (consoleStream) {
-            case Output:
-                console = JnaWinSysTerminal.consoleOut;
-                break;
-            case Error:
-                console = JnaWinSysTerminal.consoleErr;
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + consoleStream);
-        }
-        Writer writer;
-        if (ansiPassThrough) {
-            if (type == null) {
-                type = OSUtils.IS_CONEMU ? TYPE_WINDOWS_CONEMU : TYPE_WINDOWS;
-            }
-            writer = new JnaWinConsoleWriter(console);
-        } else {
-            IntByReference mode = new IntByReference();
-            Kernel32.INSTANCE.GetConsoleMode(console, mode);
-            try {
-                Kernel32.INSTANCE.SetConsoleMode(console, mode.getValue() | AbstractWindowsTerminal.ENABLE_VIRTUAL_TERMINAL_PROCESSING);
-                if (type == null) {
-                    type = TYPE_WINDOWS_VTP;
-                }
-                writer = new JnaWinConsoleWriter(console);
-            } catch (LastErrorException e) {
-                if (OSUtils.IS_CONEMU) {
-                    if (type == null) {
-                        type = TYPE_WINDOWS_CONEMU;
-                    }
-                    writer = new JnaWinConsoleWriter(console);
-                } else {
-                    if (type == null) {
-                        type = TYPE_WINDOWS;
-                    }
-                    writer = new WindowsAnsiWriter(new BufferedWriter(new JnaWinConsoleWriter(console)), console);
-                }
-            }
-        }
-        JnaWinSysTerminal terminal = new JnaWinSysTerminal(writer, name, type, encoding, nativeSignals, signalHandler, inputStreamWrapper);
-        // Start input pump thread
-        if (!paused) {
-            terminal.resume();
-        }
-        return terminal;
-    }
-
-    public static boolean isWindowsSystemStream(TerminalProvider.Stream stream) {
-        try {
-            IntByReference mode = new IntByReference();
-            Pointer console;
-            switch (stream) {
-                case Input: console = consoleIn; break;
-                case Output: console = consoleOut; break;
-                case Error: console = consoleErr; break;
-                default: return false;
-            }
-            Kernel32.INSTANCE.GetConsoleMode(console, mode);
-            return true;
-        } catch (LastErrorException e) {
-            return false;
-        }
-    }
-
-    JnaWinSysTerminal(Writer writer, String name, String type, Charset encoding, boolean nativeSignals, SignalHandler signalHandler,
-            Function<InputStream, InputStream> inputStreamWrapper) throws IOException {
-        super(writer, name, type, encoding, nativeSignals, signalHandler, inputStreamWrapper);
-        strings.put(InfoCmp.Capability.key_mouse, "\\E[M");
-    }
-
-    @Override
-    protected int getConsoleMode() {
-        IntByReference mode = new IntByReference();
-        Kernel32.INSTANCE.GetConsoleMode(consoleIn, mode);
-        return mode.getValue();
-    }
-
-    @Override
-    protected void setConsoleMode(int mode) {
-        Kernel32.INSTANCE.SetConsoleMode(consoleIn, mode);
-    }
-
-    public Size getSize() {
-        Kernel32.CONSOLE_SCREEN_BUFFER_INFO info = new Kernel32.CONSOLE_SCREEN_BUFFER_INFO();
-        Kernel32.INSTANCE.GetConsoleScreenBufferInfo(consoleOut, info);
-        return new Size(info.windowWidth(), info.windowHeight());
-    }
-
-    public Size getBufferSize() {
-        Kernel32.CONSOLE_SCREEN_BUFFER_INFO info = new Kernel32.CONSOLE_SCREEN_BUFFER_INFO();
-        Kernel32.INSTANCE.GetConsoleScreenBufferInfo(consoleOut, info);
-        return new Size(info.dwSize.X, info.dwSize.Y);
-    }
-
-    protected boolean processConsoleInput() throws IOException {
-        Kernel32.INPUT_RECORD event = readConsoleInput(100);
-        if (event == null) {
-            return false;
-        }
-
-        switch (event.EventType) {
-            case Kernel32.INPUT_RECORD.KEY_EVENT:
-                processKeyEvent(event.Event.KeyEvent);
-                return true;
-            case Kernel32.INPUT_RECORD.WINDOW_BUFFER_SIZE_EVENT:
-                raise(Signal.WINCH);
-                return false;
-            case Kernel32.INPUT_RECORD.MOUSE_EVENT:
-                processMouseEvent(event.Event.MouseEvent);
-                return true;
-            case Kernel32.INPUT_RECORD.FOCUS_EVENT:
-                processFocusEvent(event.Event.FocusEvent.bSetFocus);
-                return true;
-            default:
-                // Skip event
-                return false;
-        }
-    }
-
-    private void processKeyEvent(Kernel32.KEY_EVENT_RECORD keyEvent) throws IOException {
-        processKeyEvent(keyEvent.bKeyDown, keyEvent.wVirtualKeyCode, keyEvent.uChar.UnicodeChar, keyEvent.dwControlKeyState);
-    }
-
-    private char[] focus = new char[] { '\033', '[', ' ' };
-
-    private void processFocusEvent(boolean hasFocus) throws IOException {
-        if (focusTracking) {
-            focus[2] = hasFocus ? 'I' : 'O';
-            slaveInputPipe.write(focus);
-        }
-    }
-
-    private char[] mouse = new char[] { '\033', '[', 'M', ' ', ' ', ' ' };
-
-    private void processMouseEvent(Kernel32.MOUSE_EVENT_RECORD mouseEvent) throws IOException {
-        int dwEventFlags = mouseEvent.dwEventFlags;
-        int dwButtonState = mouseEvent.dwButtonState;
-        if (tracking == MouseTracking.Off
-                || tracking == MouseTracking.Normal && dwEventFlags == Kernel32.MOUSE_MOVED
-                || tracking == MouseTracking.Button && dwEventFlags == Kernel32.MOUSE_MOVED && dwButtonState == 0) {
-            return;
-        }
-        int cb = 0;
-        dwEventFlags &= ~ Kernel32.DOUBLE_CLICK; // Treat double-clicks as normal
-        if (dwEventFlags == Kernel32.MOUSE_WHEELED) {
-            cb |= 64;
-            if ((dwButtonState >> 16) < 0) {
-                cb |= 1;
-            }
-        } else if (dwEventFlags == Kernel32.MOUSE_HWHEELED) {
-            return;
-        } else if ((dwButtonState & Kernel32.FROM_LEFT_1ST_BUTTON_PRESSED) != 0) {
-            cb |= 0x00;
-        } else if ((dwButtonState & Kernel32.RIGHTMOST_BUTTON_PRESSED) != 0) {
-            cb |= 0x01;
-        } else if ((dwButtonState & Kernel32.FROM_LEFT_2ND_BUTTON_PRESSED) != 0) {
-            cb |= 0x02;
-        } else {
-            cb |= 0x03;
-        }
-        int cx = mouseEvent.dwMousePosition.X;
-        int cy = mouseEvent.dwMousePosition.Y;
-        mouse[3] = (char) (' ' + cb);
-        mouse[4] = (char) (' ' + cx + 1);
-        mouse[5] = (char) (' ' + cy + 1);
-        slaveInputPipe.write(mouse);
-    }
-
-    private final Kernel32.INPUT_RECORD[] inputEvents = new Kernel32.INPUT_RECORD[1];
-    private final IntByReference eventsRead = new IntByReference();
-
-    private Kernel32.INPUT_RECORD readConsoleInput(int dwMilliseconds) throws IOException {
-        if (Kernel32.INSTANCE.WaitForSingleObject(consoleIn, dwMilliseconds) != 0) {
-            return null;
-        }
-        Kernel32.INSTANCE.ReadConsoleInput(consoleIn, inputEvents, 1, eventsRead);
-        if (eventsRead.getValue() == 1) {
-            return inputEvents[0];
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public Cursor getCursorPosition(IntConsumer discarded) {
-        Kernel32.CONSOLE_SCREEN_BUFFER_INFO info = new Kernel32.CONSOLE_SCREEN_BUFFER_INFO();
-        Kernel32.INSTANCE.GetConsoleScreenBufferInfo(consoleOut, info);
-        return new Cursor(info.dwCursorPosition.X, info.dwCursorPosition.Y);
-    }
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32.java
deleted file mode 100644
index 20c6eefeece..00000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32.java
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * Copyright (c) 2002-2018, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.win;
-
-//OpenJDK changes:
-//-references to JNA types commented out
-//-replacement types provided where needed (IntByReference, LastErrorException, Pointer)
-//-methods not used by JLine commented out
-//-provided an implementation of the interface (Kernel32Impl), backed by a native implementation (Kernel32.cpp)
-
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Native;
-//import com.sun.jna.Pointer;
-//import com.sun.jna.Structure;
-//import com.sun.jna.Union;
-//import com.sun.jna.ptr.IntByReference;
-//import com.sun.jna.win32.StdCallLibrary;
-//import com.sun.jna.win32.W32APIOptions;
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-
-interface Kernel32 {//extends StdCallLibrary {
-
-    Kernel32 INSTANCE = new Kernel32Impl();
-//    Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
-
-//    Pointer INVALID_HANDLE_VALUE = Pointer.createConstant(-1L);
-
-    int STD_INPUT_HANDLE =  -10;
-    int STD_OUTPUT_HANDLE = -11;
-    int STD_ERROR_HANDLE =  -12;
-
-    int ENABLE_PROCESSED_INPUT =    0x0001;
-    int ENABLE_LINE_INPUT =         0x0002;
-    int ENABLE_ECHO_INPUT =         0x0004;
-    int ENABLE_WINDOW_INPUT =       0x0008;
-    int ENABLE_MOUSE_INPUT =        0x0010;
-    int ENABLE_INSERT_MODE =        0x0020;
-    int ENABLE_QUICK_EDIT_MODE =    0x0040;
-    int ENABLE_EXTENDED_FLAGS =     0x0080;
-
-    int RIGHT_ALT_PRESSED =     0x0001;
-    int LEFT_ALT_PRESSED =      0x0002;
-    int RIGHT_CTRL_PRESSED =    0x0004;
-    int LEFT_CTRL_PRESSED =     0x0008;
-    int SHIFT_PRESSED =         0x0010;
-
-    int FOREGROUND_BLUE =       0x0001;
-    int FOREGROUND_GREEN =      0x0002;
-    int FOREGROUND_RED =        0x0004;
-    int FOREGROUND_INTENSITY =  0x0008;
-    int BACKGROUND_BLUE =       0x0010;
-    int BACKGROUND_GREEN =      0x0020;
-    int BACKGROUND_RED =        0x0040;
-    int BACKGROUND_INTENSITY =  0x0080;
-
-    // Button state
-    int FROM_LEFT_1ST_BUTTON_PRESSED = 0x0001;
-    int RIGHTMOST_BUTTON_PRESSED     = 0x0002;
-    int FROM_LEFT_2ND_BUTTON_PRESSED = 0x0004;
-    int FROM_LEFT_3RD_BUTTON_PRESSED = 0x0008;
-    int FROM_LEFT_4TH_BUTTON_PRESSED = 0x0010;
-
-    // Event flags
-    int MOUSE_MOVED                  = 0x0001;
-    int DOUBLE_CLICK                 = 0x0002;
-    int MOUSE_WHEELED                = 0x0004;
-    int MOUSE_HWHEELED               = 0x0008;
-
-    // DWORD WINAPI WaitForSingleObject(
-    //  _In_ HANDLE hHandle,
-    //  _In_ DWORD  dwMilliseconds
-    // );
-    int WaitForSingleObject(Pointer in_hHandle, int in_dwMilliseconds);
-
-    // HANDLE WINAPI GetStdHandle(
-    // __in DWORD nStdHandle
-    // );
-    Pointer GetStdHandle(int nStdHandle);
-
-//    // BOOL WINAPI AllocConsole(void);
-//    void AllocConsole() throws LastErrorException;
-//
-//    // BOOL WINAPI FreeConsole(void);
-//    void FreeConsole() throws LastErrorException;
-//
-//    // HWND WINAPI GetConsoleWindow(void);
-//    Pointer GetConsoleWindow();
-//
-//    // UINT WINAPI GetConsoleCP(void)
-//    int GetConsoleCP();
-//
-    // UINT WINAPI GetConsoleOutputCP(void)
-    int GetConsoleOutputCP();
-
-    // BOOL WINAPI FillConsoleOutputCharacter(
-    // _In_ HANDLE hConsoleOutput,
-    // _In_ TCHAR cCharacter,
-    // _In_ DWORD nLength,
-    // _In_ COORD dwWriteCoord,
-    // _Out_ LPDWORD lpNumberOfCharsWritten);
-    void FillConsoleOutputCharacter(Pointer in_hConsoleOutput,
-                                    char in_cCharacter, int in_nLength, COORD in_dwWriteCoord,
-                                    IntByReference out_lpNumberOfCharsWritten)
-            throws LastErrorException;
-
-    // BOOL WINAPI FillConsoleOutputAttribute(
-    // _In_ HANDLE hConsoleOutput,
-    // _In_ WORD wAttribute,
-    // _In_ DWORD nLength,
-    // _In_ COORD dwWriteCoord,
-    // _Out_ LPDWORD lpNumberOfAttrsWritten);
-    void FillConsoleOutputAttribute(Pointer in_hConsoleOutput,
-                                    short in_wAttribute, int in_nLength, COORD in_dwWriteCoord,
-                                    IntByReference out_lpNumberOfAttrsWritten)
-            throws LastErrorException;
-//
-////    // BOOL WINAPI GetConsoleCursorInfo(
-////    // _In_ HANDLE hConsoleOutput,
-////    // _Out_ PCONSOLE_CURSOR_INFO lpConsoleCursorInfo);
-////    void GetConsoleCursorInfo(Pointer in_hConsoleOutput,
-////                              CONSOLE_CURSOR_INFO.ByReference out_lpConsoleCursorInfo)
-////            throws LastErrorException;
-//
-    // BOOL WINAPI GetConsoleMode(
-    //   _In_   HANDLE hConsoleHandle,
-    //   _Out_  LPDWORD lpMode);
-    void GetConsoleMode(
-            Pointer in_hConsoleOutput,
-            IntByReference out_lpMode)
-            throws LastErrorException;
-
-    // BOOL WINAPI GetConsoleScreenBufferInfo(
-    // _In_   HANDLE hConsoleOutput,
-    // _Out_  PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo);
-    void GetConsoleScreenBufferInfo(
-            Pointer in_hConsoleOutput,
-            CONSOLE_SCREEN_BUFFER_INFO out_lpConsoleScreenBufferInfo)
-            throws LastErrorException;
-//
-//    // BOOL WINAPI GetNumberOfConsoleInputEvents(
-//    // _In_ HANDLE hConsoleInput,
-//    // _Out_ LPDWORD lpcNumberOfEvents);
-//    void GetNumberOfConsoleInputEvents(Pointer in_hConsoleOutput,
-//                                       IntByReference out_lpcNumberOfEvents) throws LastErrorException;
-//
-    // BOOL WINAPI ReadConsoleInput(
-    // _In_ HANDLE hConsoleInput,
-    // _Out_ PINPUT_RECORD lpBuffer,
-    // _In_ DWORD nLength,
-    // _Out_ LPDWORD lpNumberOfEventsRead);
-    void ReadConsoleInput(Pointer in_hConsoleOutput,
-                          INPUT_RECORD[] out_lpBuffer, int in_nLength,
-                          IntByReference out_lpNumberOfEventsRead) throws LastErrorException;
-
-//    // BOOL WINAPI SetConsoleCtrlHandler(
-//    // _In_opt_  PHANDLER_ROUTINE HandlerRoutine,
-//    // _In_      BOOL Add);
-//    void SetConsoleCtrlHandler(
-//            Pointer in_opt_HandlerRoutine,
-//            boolean in_Add)
-//            throws LastErrorException;
-//
-//    // BOOL WINAPI ReadConsoleOutput(
-//    // _In_     HANDLE hConsoleOutput,
-//    // _Out_    PCHAR_INFO lpBuffer,
-//    // _In_     COORD dwBufferSize,
-//    // _In_     COORD dwBufferCoord,
-//    // _Inout_  PSMALL_RECT lpReadRegion);
-////    void ReadConsoleOutput(Pointer in_hConsoleOutput, CHAR_INFO[] out_lpBuffer,
-////                           COORD in_dwBufferSize, COORD in_dwBufferCoord,
-////                           SMALL_RECT inout_lpReadRegion) throws LastErrorException;
-////    void ReadConsoleOutputA(Pointer in_hConsoleOutput, CHAR_INFO[] out_lpBuffer,
-////                            COORD in_dwBufferSize, COORD in_dwBufferCoord,
-////                            SMALL_RECT inout_lpReadRegion) throws LastErrorException;
-//
-//    // BOOL WINAPI ReadConsoleOutputCharacter(
-//    // _In_   HANDLE hConsoleOutput,
-//    // _Out_  LPTSTR lpCharacter,
-//    // _In_   DWORD nLength,
-//    // _In_   COORD dwReadCoord,
-//    // _Out_  LPDWORD lpNumberOfCharsRead);
-//    void ReadConsoleOutputCharacter(Pointer in_hConsoleOutput,
-//                                    char[] ouy_lpCharacter, int in_nLength, COORD in_dwReadCoord,
-//                                    IntByReference out_lpNumberOfCharsRead)
-//            throws LastErrorException;
-//    void ReadConsoleOutputCharacterA(Pointer in_hConsoleOutput,
-//                                     byte[] ouy_lpCharacter, int in_nLength, COORD in_dwReadCoord,
-//                                     IntByReference out_lpNumberOfCharsRead)
-//            throws LastErrorException;
-//
-//    // BOOL WINAPI SetConsoleCursorInfo(
-//    // _In_ HANDLE hConsoleOutput,
-//    // _In_ const CONSOLE_CURSOR_INFO *lpConsoleCursorInfo);
-//    void SetConsoleCursorInfo(Pointer in_hConsoleOutput,
-//                              CONSOLE_CURSOR_INFO in_lpConsoleCursorInfo)
-//            throws LastErrorException;
-//
-//    // BOOL WINAPI SetConsoleCP(
-//    // _In_ UINT wCodePageID);
-//    void SetConsoleCP(int in_wCodePageID) throws LastErrorException;
-//
-//    // BOOL WINAPI SetConsoleOutputCP(
-//    // _In_ UINT wCodePageID);
-//    void SetConsoleOutputCP(int in_wCodePageID) throws LastErrorException;
-//
-    // BOOL WINAPI SetConsoleCursorPosition(
-    // _In_ HANDLE hConsoleOutput,
-    // _In_ COORD dwCursorPosition);
-    void SetConsoleCursorPosition(Pointer in_hConsoleOutput,
-                                  COORD in_dwCursorPosition) throws LastErrorException;
-
-    // BOOL WINAPI SetConsoleMode(
-    //   _In_  HANDLE hConsoleHandle,
-    //   _In_  DWORD dwMode);
-    void SetConsoleMode(
-            Pointer in_hConsoleOutput,
-            int in_dwMode) throws LastErrorException;
-
-//    // BOOL WINAPI SetConsoleScreenBufferSize(
-//    // __in HANDLE hConsoleOutput,
-//    // __in COORD dwSize
-//    // );
-//    void SetConsoleScreenBufferSize(Pointer in_hConsoleOutput,
-//                                    COORD in_dwSize) throws LastErrorException;
-//
-    // BOOL WINAPI SetConsoleTextAttribute(
-    // _In_ HANDLE hConsoleOutput,
-    // _In_ WORD   wAttributes
-    // );
-    void SetConsoleTextAttribute(Pointer in_hConsoleOutput,
-                                 short in_wAttributes)
-            throws LastErrorException;
-
-    // BOOL WINAPI SetConsoleTitle(
-    // _In_ LPCTSTR lpConsoleTitle
-    // );
-    void SetConsoleTitle(String in_lpConsoleTitle)
-            throws LastErrorException;
-
-//    // BOOL WINAPI SetConsoleWindowInfo(
-//    // _In_ HANDLE hConsoleOutput,
-//    // _In_ BOOL bAbsolute,
-//    // _In_ const SMALL_RECT *lpConsoleWindow);
-//    void SetConsoleWindowInfo(Pointer in_hConsoleOutput,
-//                              boolean in_bAbsolute, SMALL_RECT in_lpConsoleWindow)
-//            throws LastErrorException;
-
-    // BOOL WINAPI WriteConsole(
-    //  _In_             HANDLE  hConsoleOutput,
-    //  _In_       const VOID    *lpBuffer,
-    //  _In_             DWORD   nNumberOfCharsToWrite,
-    //  _Out_            LPDWORD lpNumberOfCharsWritten,
-    //  _Reserved_       LPVOID  lpReserved
-    // );
-    void WriteConsoleW(Pointer in_hConsoleOutput, char[] in_lpBuffer, int in_nNumberOfCharsToWrite,
-                          IntByReference out_lpNumberOfCharsWritten, Pointer reserved_lpReserved) throws LastErrorException;
-
-//    // BOOL WINAPI WriteConsoleOutput(
-//    // _In_ HANDLE hConsoleOutput,
-//    // _In_ const CHAR_INFO *lpBuffer,
-//    // _In_ COORD dwBufferSize,
-//    // _In_ COORD dwBufferCoord,
-//    // _Inout_ PSMALL_RECT lpWriteRegion);
-////    void WriteConsoleOutput(Pointer in_hConsoleOutput, CHAR_INFO[] in_lpBuffer,
-////                            COORD in_dwBufferSize, COORD in_dwBufferCoord,
-////                            SMALL_RECT inout_lpWriteRegion) throws LastErrorException;
-////    void WriteConsoleOutputA(Pointer in_hConsoleOutput, CHAR_INFO[] in_lpBuffer,
-////                             COORD in_dwBufferSize, COORD in_dwBufferCoord,
-////                             SMALL_RECT inout_lpWriteRegion) throws LastErrorException;
-//
-//    // BOOL WINAPI WriteConsoleOutputCharacter(
-//    // _In_ HANDLE hConsoleOutput,
-//    // _In_ LPCTSTR lpCharacter,
-//    // _In_ DWORD nLength,
-//    // _In_ COORD dwWriteCoord,
-//    // _Out_ LPDWORD lpNumberOfCharsWritten);
-//    void WriteConsoleOutputCharacter(Pointer in_hConsoleOutput,
-//                                     char[] in_lpCharacter, int in_nLength, COORD in_dwWriteCoord,
-//                                     IntByReference out_lpNumberOfCharsWritten)
-//            throws LastErrorException;
-//    void WriteConsoleOutputCharacterA(Pointer in_hConsoleOutput,
-//                                      byte[] in_lpCharacter, int in_nLength, COORD in_dwWriteCoord,
-//                                      IntByReference out_lpNumberOfCharsWritten)
-//            throws LastErrorException;
-//
-    // BOOL WINAPI ScrollConsoleScreenBuffer(
-    //     _In_           HANDLE     hConsoleOutput,
-    //     _In_     const SMALL_RECT *lpScrollRectangle,
-    //     _In_opt_ const SMALL_RECT *lpClipRectangle,
-    //     _In_           COORD      dwDestinationOrigin,
-    //     _In_     const CHAR_INFO  *lpFill);
-    void ScrollConsoleScreenBuffer(Pointer in_hConsoleOutput,
-                                   SMALL_RECT in_lpScrollRectangle,
-                                   SMALL_RECT in_lpClipRectangle,
-                                   COORD in_dwDestinationOrigin,
-                                   CHAR_INFO in_lpFill)
-            throws LastErrorException;
-
-    // typedef struct _CHAR_INFO {
-    //   union {
-    //     WCHAR UnicodeChar;
-    //     CHAR  AsciiChar;
-    //   } Char;
-    //   WORD  Attributes;
-    // } CHAR_INFO, *PCHAR_INFO;
-    class CHAR_INFO {//extends Structure {
-        public CHAR_INFO() {
-        }
-
-        public CHAR_INFO(char c, short attr) {
-            uChar = new UnionChar(c);
-            Attributes = attr;
-        }
-
-//        public CHAR_INFO(byte c, short attr) {
-//            uChar = new UnionChar(c);
-//            Attributes = attr;
-//        }
-
-        public UnionChar uChar;
-        public short Attributes;
-
-//        public static CHAR_INFO[] createArray(int size) {
-//            return (CHAR_INFO[]) new CHAR_INFO().toArray(size);
-//        }
-//
-//        private static String[] fieldOrder = { "uChar", "Attributes" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _CONSOLE_CURSOR_INFO {
-    //   DWORD dwSize;
-    //   BOOL  bVisible;
-    // } CONSOLE_CURSOR_INFO, *PCONSOLE_CURSOR_INFO;
-    class CONSOLE_CURSOR_INFO {//extends Structure {
-        public int dwSize;
-        public boolean bVisible;
-
-//        public static class ByReference extends CONSOLE_CURSOR_INFO implements
-//                Structure.ByReference {
-//        }
-//
-//        private static String[] fieldOrder = { "dwSize", "bVisible" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _CONSOLE_SCREEN_BUFFER_INFO {
-    //   COORD      dwSize;
-    //   COORD      dwCursorPosition;
-    //   WORD       wAttributes;
-    //   SMALL_RECT srWindow;
-    //   COORD      dwMaximumWindowSize;
-    // } CONSOLE_SCREEN_BUFFER_INFO;
-    class CONSOLE_SCREEN_BUFFER_INFO {//extends Structure {
-        public COORD      dwSize;
-        public COORD      dwCursorPosition;
-        public short      wAttributes;
-        public SMALL_RECT srWindow;
-        public COORD      dwMaximumWindowSize;
-
-//        private static String[] fieldOrder = { "dwSize", "dwCursorPosition", "wAttributes", "srWindow", "dwMaximumWindowSize" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-
-        public int windowWidth() {
-            return this.srWindow.width() + 1;
-        }
-
-        public int windowHeight() {
-            return this.srWindow.height() + 1;
-        }
-    }
-
-    // typedef struct _COORD {
-    //    SHORT X;
-    //    SHORT Y;
-    //  } COORD, *PCOORD;
-    class COORD {//extends Structure implements Structure.ByValue {
-        public COORD() {
-        }
-
-        public COORD(short X, short Y) {
-            this.X = X;
-            this.Y = Y;
-        }
-
-        public short X;
-        public short Y;
-
-//        private static String[] fieldOrder = { "X", "Y" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _INPUT_RECORD {
-    //   WORD  EventType;
-    //   union {
-    //     KEY_EVENT_RECORD          KeyEvent;
-    //     MOUSE_EVENT_RECORD        MouseEvent;
-    //     WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent;
-    //     MENU_EVENT_RECORD         MenuEvent;
-    //     FOCUS_EVENT_RECORD        FocusEvent;
-    //   } Event;
-    // } INPUT_RECORD;
-    class INPUT_RECORD {//extends Structure {
-        public static final short KEY_EVENT = 0x0001;
-        public static final short MOUSE_EVENT = 0x0002;
-        public static final short WINDOW_BUFFER_SIZE_EVENT = 0x0004;
-        public static final short MENU_EVENT = 0x0008;
-        public static final short FOCUS_EVENT = 0x0010;
-
-        public short EventType;
-        public EventUnion Event;
-
-        public static class EventUnion {//extends Union {
-            public KEY_EVENT_RECORD KeyEvent;
-            public MOUSE_EVENT_RECORD MouseEvent;
-            public WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent;
-            public MENU_EVENT_RECORD MenuEvent;
-            public FOCUS_EVENT_RECORD FocusEvent;
-        }
-
-//        @Override
-//        public void read() {
-//            readField("EventType");
-//            switch (EventType) {
-//                case KEY_EVENT:
-//                    Event.setType(KEY_EVENT_RECORD.class);
-//                    break;
-//                case MOUSE_EVENT:
-//                    Event.setType(MOUSE_EVENT_RECORD.class);
-//                    break;
-//                case WINDOW_BUFFER_SIZE_EVENT:
-//                    Event.setType(WINDOW_BUFFER_SIZE_RECORD.class);
-//                    break;
-//                case MENU_EVENT:
-//                    Event.setType(MENU_EVENT_RECORD.class);
-//                    break;
-//                case FOCUS_EVENT:
-//                    Event.setType(MENU_EVENT_RECORD.class);
-//                    break;
-//            }
-//            super.read();
-//        }
-
-//        private static String[] fieldOrder = {"EventType", "Event"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _KEY_EVENT_RECORD {
-    //   BOOL  bKeyDown;
-    //   WORD  wRepeatCount;
-    //   WORD  wVirtualKeyCode;
-    //   WORD  wVirtualScanCode;
-    //   union {
-    //     WCHAR UnicodeChar;
-    //     CHAR  AsciiChar;
-    //   } uChar;
-    //   DWORD dwControlKeyState;
-    // } KEY_EVENT_RECORD;
-    class KEY_EVENT_RECORD {//extends Structure {
-        public boolean bKeyDown;
-        public short wRepeatCount;
-        public short wVirtualKeyCode;
-        public short wVirtualScanCode;
-        public UnionChar uChar;
-        public int dwControlKeyState;
-
-//        private static String[] fieldOrder = {"bKeyDown", "wRepeatCount", "wVirtualKeyCode", "wVirtualScanCode", "uChar", "dwControlKeyState"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _MOUSE_EVENT_RECORD {
-    //   COORD dwMousePosition;
-    //   DWORD dwButtonState;
-    //   DWORD dwControlKeyState;
-    //   DWORD dwEventFlags;
-    // } MOUSE_EVENT_RECORD;
-    class MOUSE_EVENT_RECORD {//extends Structure {
-        public COORD dwMousePosition;
-        public int dwButtonState;
-        public int dwControlKeyState;
-        public int dwEventFlags;
-
-//        private static String[] fieldOrder = { "dwMousePosition", "dwButtonState", "dwControlKeyState", "dwEventFlags"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _WINDOW_BUFFER_SIZE_RECORD {
-    //   COORD dwSize;
-    // } WINDOW_BUFFER_SIZE_RECORD;
-    class WINDOW_BUFFER_SIZE_RECORD {//extends Structure {
-        public COORD dwSize;
-
-//        private static String[] fieldOrder = {"dwSize"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _MENU_EVENT_RECORD {
-    //   UINT dwCommandId;
-    // } MENU_EVENT_RECORD, *PMENU_EVENT_RECORD;
-    class MENU_EVENT_RECORD {//extends Structure {
-
-        public int dwCommandId;
-
-//        private static String[] fieldOrder = {"dwCommandId"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _FOCUS_EVENT_RECORD {
-    //  BOOL bSetFocus;
-    //} FOCUS_EVENT_RECORD;
-    class FOCUS_EVENT_RECORD {//extends Structure {
-        public boolean bSetFocus;
-
-//        private static String[] fieldOrder = {"bSetFocus"};
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-    }
-
-    // typedef struct _SMALL_RECT {
-    //    SHORT Left;
-    //    SHORT Top;
-    //    SHORT Right;
-    //    SHORT Bottom;
-    //  } SMALL_RECT;
-    class SMALL_RECT {//extends Structure {
-        public SMALL_RECT() {
-        }
-
-        public SMALL_RECT(SMALL_RECT org) {
-            this(org.Top, org.Left, org.Bottom, org.Right);
-        }
-
-        public SMALL_RECT(short Top, short Left, short Bottom, short Right) {
-            this.Top = Top;
-            this.Left = Left;
-            this.Bottom = Bottom;
-            this.Right = Right;
-        }
-
-        public short Left;
-        public short Top;
-        public short Right;
-        public short Bottom;
-
-//        private static String[] fieldOrder = { "Left", "Top", "Right", "Bottom" };
-//
-//        @Override
-//        protected java.util.List<String> getFieldOrder() {
-//            return java.util.Arrays.asList(fieldOrder);
-//        }
-
-        public short width() {
-            return (short)(this.Right - this.Left);
-        }
-
-        public short height() {
-            return (short)(this.Bottom - this.Top);
-        }
-
-    }
-
-    class UnionChar {//extends Union {
-        public UnionChar() {
-        }
-
-        public UnionChar(char c) {
-//            setType(char.class);
-            UnicodeChar = c;
-        }
-
-//        public UnionChar(byte c) {
-//            setType(byte.class);
-//            AsciiChar = c;
-//        }
-
-        public void set(char c) {
-//            setType(char.class);
-            UnicodeChar = c;
-        }
-
-//        public void set(byte c) {
-//            setType(byte.class);
-//            AsciiChar = c;
-//        }
-
-        public char UnicodeChar;
-//        public byte AsciiChar;
-    }
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32Impl.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32Impl.java
deleted file mode 100644
index 67f69a63511..00000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Kernel32Impl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.org.jline.terminal.impl.jna.win;
-
-import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CHAR_INFO;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_SCREEN_BUFFER_INFO;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.COORD;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD;
-import jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.SMALL_RECT;
-
-public class Kernel32Impl implements Kernel32 {
-
-    static {
-        System.loadLibrary("le");
-        initIDs();
-    }
-
-    private static native void initIDs();
-
-    @Override
-    public native int WaitForSingleObject(Pointer in_hHandle, int in_dwMilliseconds);
-
-    @Override
-    public native Pointer GetStdHandle(int nStdHandle);
-
-    @Override
-    public native int GetConsoleOutputCP();
-
-    @Override
-    public native void FillConsoleOutputCharacter(Pointer in_hConsoleOutput, char in_cCharacter, int in_nLength, COORD in_dwWriteCoord, IntByReference out_lpNumberOfCharsWritten) throws LastErrorException;
-
-    @Override
-    public native void FillConsoleOutputAttribute(Pointer in_hConsoleOutput, short in_wAttribute, int in_nLength, COORD in_dwWriteCoord, IntByReference out_lpNumberOfAttrsWritten) throws LastErrorException;
-
-    @Override
-    public native void GetConsoleMode(Pointer in_hConsoleOutput, IntByReference out_lpMode) throws LastErrorException;
-
-    @Override
-    public native void GetConsoleScreenBufferInfo(Pointer in_hConsoleOutput, CONSOLE_SCREEN_BUFFER_INFO out_lpConsoleScreenBufferInfo) throws LastErrorException;
-
-    @Override
-    public native void ReadConsoleInput(Pointer in_hConsoleOutput, INPUT_RECORD[] out_lpBuffer, int in_nLength, IntByReference out_lpNumberOfEventsRead) throws LastErrorException;
-
-    @Override
-    public native void SetConsoleCursorPosition(Pointer in_hConsoleOutput, COORD in_dwCursorPosition) throws LastErrorException;
-
-    @Override
-    public native void SetConsoleMode(Pointer in_hConsoleOutput, int in_dwMode) throws LastErrorException;
-
-    @Override
-    public native void SetConsoleTextAttribute(Pointer in_hConsoleOutput, short in_wAttributes) throws LastErrorException;
-
-    @Override
-    public native void SetConsoleTitle(String in_lpConsoleTitle) throws LastErrorException;
-
-    @Override
-    public native void WriteConsoleW(Pointer in_hConsoleOutput, char[] in_lpBuffer, int in_nNumberOfCharsToWrite, IntByReference out_lpNumberOfCharsWritten, Pointer reserved_lpReserved) throws LastErrorException;
-
-    @Override
-    public native void ScrollConsoleScreenBuffer(Pointer in_hConsoleOutput, SMALL_RECT in_lpScrollRectangle, SMALL_RECT in_lpClipRectangle, COORD in_dwDestinationOrigin, CHAR_INFO in_lpFill) throws LastErrorException;
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Pointer.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Pointer.java
deleted file mode 100644
index aeb7f758e7d..00000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/Pointer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.org.jline.terminal.impl.jna.win;
-
-class Pointer {
-    public final long value;
-
-    public Pointer(long value) {
-        this.value = value;
-    }
-
-}
diff --git a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java b/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java
deleted file mode 100644
index 5ae0df1b201..00000000000
--- a/src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 2002-2016, the original author or authors.
- *
- * This software is distributable under the BSD license. See the terms of the
- * BSD license in the documentation provided with this software.
- *
- * https://opensource.org/licenses/BSD-3-Clause
- */
-package jdk.internal.org.jline.terminal.impl.jna.win;
-
-import java.io.IOException;
-import java.io.Writer;
-
-//import com.sun.jna.Pointer;
-//import com.sun.jna.ptr.IntByReference;
-import jdk.internal.org.jline.utils.AnsiWriter;
-import jdk.internal.org.jline.utils.Colors;
-
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.BACKGROUND_BLUE;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.BACKGROUND_GREEN;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.BACKGROUND_INTENSITY;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.BACKGROUND_RED;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOREGROUND_BLUE;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOREGROUND_GREEN;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOREGROUND_INTENSITY;
-import static jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOREGROUND_RED;
-
-
-/**
- * A Windows ANSI escape processor, uses JNA to access native platform
- * API's to change the console attributes.
- *
- * @since 1.0
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- * @author Joris Kuipers
- */
-public final class WindowsAnsiWriter extends AnsiWriter {
-
-    private static final short FOREGROUND_BLACK   = 0;
-    private static final short FOREGROUND_YELLOW  = (short) (FOREGROUND_RED|FOREGROUND_GREEN);
-    private static final short FOREGROUND_MAGENTA = (short) (FOREGROUND_BLUE|FOREGROUND_RED);
-    private static final short FOREGROUND_CYAN    = (short) (FOREGROUND_BLUE|FOREGROUND_GREEN);
-    private static final short FOREGROUND_WHITE   = (short) (FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE);
-
-    private static final short BACKGROUND_BLACK   = 0;
-    private static final short BACKGROUND_YELLOW  = (short) (BACKGROUND_RED|BACKGROUND_GREEN);
-    private static final short BACKGROUND_MAGENTA = (short) (BACKGROUND_BLUE|BACKGROUND_RED);
-    private static final short BACKGROUND_CYAN    = (short) (BACKGROUND_BLUE|BACKGROUND_GREEN);
-    private static final short BACKGROUND_WHITE   = (short) (BACKGROUND_RED|BACKGROUND_GREEN|BACKGROUND_BLUE);
-
-    private static final short ANSI_FOREGROUND_COLOR_MAP[] = {
-            FOREGROUND_BLACK,
-            FOREGROUND_RED,
-            FOREGROUND_GREEN,
-            FOREGROUND_YELLOW,
-            FOREGROUND_BLUE,
-            FOREGROUND_MAGENTA,
-            FOREGROUND_CYAN,
-            FOREGROUND_WHITE,
-    };
-
-    private static final short ANSI_BACKGROUND_COLOR_MAP[] = {
-            BACKGROUND_BLACK,
-            BACKGROUND_RED,
-            BACKGROUND_GREEN,
-            BACKGROUND_YELLOW,
-            BACKGROUND_BLUE,
-            BACKGROUND_MAGENTA,
-            BACKGROUND_CYAN,
-            BACKGROUND_WHITE,
-    };
-
-    private static final int MAX_ESCAPE_SEQUENCE_LENGTH = 100;
-
-    private final Pointer console;
-
-    private final Kernel32.CONSOLE_SCREEN_BUFFER_INFO info = new Kernel32.CONSOLE_SCREEN_BUFFER_INFO();
-    private final short originalColors;
-
-    private boolean negative;
-    private boolean bold;
-    private boolean underline;
-    private short savedX = -1;
-    private short savedY = -1;
-
-    public WindowsAnsiWriter(Writer out, Pointer console) throws IOException {
-        super(out);
-        this.console = console;
-        getConsoleInfo();
-        originalColors = info.wAttributes;
-    }
-
-    private void getConsoleInfo() throws IOException {
-        out.flush();
-        Kernel32.INSTANCE.GetConsoleScreenBufferInfo(console, info);
-        if (negative) {
-            info.wAttributes = invertAttributeColors(info.wAttributes);
-        }
-    }
-
-    private void applyAttribute() throws IOException {
-        out.flush();
-        short attributes = info.wAttributes;
-        // bold is simulated by high foreground intensity
-        if (bold) {
-            attributes |= FOREGROUND_INTENSITY;
-        }
-        // underline is simulated by high foreground intensity
-        if (underline) {
-            attributes |= BACKGROUND_INTENSITY;
-        }
-        if (negative) {
-            attributes = invertAttributeColors(attributes);
-        }
-        Kernel32.INSTANCE.SetConsoleTextAttribute(console, attributes);
-    }
-
-    private short invertAttributeColors(short attributes) {
-        // Swap the the Foreground and Background bits.
-        int fg = 0x000F & attributes;
-        fg <<= 4;
-        int bg = 0X00F0 & attributes;
-        bg >>= 4;
-        attributes = (short) ((attributes & 0xFF00) | fg | bg);
-        return attributes;
-    }
-
-    private void applyCursorPosition() throws IOException {
-        info.dwCursorPosition.X = (short) Math.max(0, Math.min(info.dwSize.X - 1, info.dwCursorPosition.X));
-        info.dwCursorPosition.Y = (short) Math.max(0, Math.min(info.dwSize.Y - 1, info.dwCursorPosition.Y));
-        Kernel32.INSTANCE.SetConsoleCursorPosition(console, info.dwCursorPosition);
-    }
-
-    protected void processEraseScreen(int eraseOption) throws IOException {
-        getConsoleInfo();
-        IntByReference written = new IntByReference();
-        switch(eraseOption) {
-            case ERASE_SCREEN:
-                Kernel32.COORD topLeft = new Kernel32.COORD();
-                topLeft.X = 0;
-                topLeft.Y = info.srWindow.Top;
-                int screenLength = info.srWindow.height() * info.dwSize.X;
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', screenLength, topLeft, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, screenLength, topLeft, written);
-                break;
-            case ERASE_SCREEN_TO_BEGINING:
-                Kernel32.COORD topLeft2 = new Kernel32.COORD();
-                topLeft2.X = 0;
-                topLeft2.Y = info.srWindow.Top;
-                int lengthToCursor = (info.dwCursorPosition.Y - info.srWindow.Top) * info.dwSize.X + info.dwCursorPosition.X;
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', lengthToCursor, topLeft2, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, lengthToCursor, topLeft2, written);
-                break;
-            case ERASE_SCREEN_TO_END:
-                int lengthToEnd = (info.srWindow.Bottom - info.dwCursorPosition.Y) * info.dwSize.X +
-                        (info.dwSize.X - info.dwCursorPosition.X);
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', lengthToEnd, info.dwCursorPosition, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, lengthToEnd, info.dwCursorPosition, written);
-        }
-    }
-
-    protected void processEraseLine(int eraseOption) throws IOException {
-        getConsoleInfo();
-        IntByReference written = new IntByReference();
-        switch(eraseOption) {
-            case ERASE_LINE:
-                Kernel32.COORD leftColCurrRow = new Kernel32.COORD((short) 0, info.dwCursorPosition.Y);
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', info.dwSize.X, leftColCurrRow, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, info.dwSize.X, leftColCurrRow, written);
-                break;
-            case ERASE_LINE_TO_BEGINING:
-                Kernel32.COORD leftColCurrRow2 = new Kernel32.COORD((short) 0, info.dwCursorPosition.Y);
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', info.dwCursorPosition.X, leftColCurrRow2, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, info.dwCursorPosition.X, leftColCurrRow2, written);
-                break;
-            case ERASE_LINE_TO_END:
-                int lengthToLastCol = info.dwSize.X - info.dwCursorPosition.X;
-                Kernel32.INSTANCE.FillConsoleOutputCharacter(console, ' ', lengthToLastCol, info.dwCursorPosition, written);
-                Kernel32.INSTANCE.FillConsoleOutputAttribute(console, info.wAttributes, lengthToLastCol, info.dwCursorPosition, written);
-        }
-    }
-
-    protected void processCursorUpLine(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X = 0;
-        info.dwCursorPosition.Y -= (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorDownLine(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X = 0;
-        info.dwCursorPosition.Y += (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorLeft(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X -= (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorRight(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X += (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorDown(int count) throws IOException {
-        getConsoleInfo();
-        int nb = Math.max(0, info.dwCursorPosition.Y + count - info.dwSize.Y + 1);
-        if (nb != count) {
-            info.dwCursorPosition.Y += (short) count;
-            applyCursorPosition();
-        }
-        if (nb > 0) {
-            Kernel32.SMALL_RECT scroll = new Kernel32.SMALL_RECT(info.srWindow);
-            scroll.Top = 0;
-            Kernel32.COORD org = new Kernel32.COORD();
-            org.X = 0;
-            org.Y = (short)(- nb);
-            Kernel32.CHAR_INFO info = new Kernel32.CHAR_INFO(' ', originalColors);
-            Kernel32.INSTANCE.ScrollConsoleScreenBuffer(console, scroll, scroll, org, info);
-        }
-    }
-
-    protected void processCursorUp(int count) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.Y -= (short) count;
-        applyCursorPosition();
-    }
-
-    protected void processCursorTo(int row, int col) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.Y = (short) (info.srWindow.Top + row - 1);
-        info.dwCursorPosition.X = (short) (col - 1);
-        applyCursorPosition();
-    }
-
-    protected void processCursorToColumn(int x) throws IOException {
-        getConsoleInfo();
-        info.dwCursorPosition.X = (short) (x - 1);
-        applyCursorPosition();
-    }
-
-    @Override
-    protected void processSetForegroundColorExt(int paletteIndex) throws IOException {
-        int color = Colors.roundColor(paletteIndex, 16);
-        info.wAttributes = (short) ((info.wAttributes & ~0x0007) | ANSI_FOREGROUND_COLOR_MAP[color & 0x07]);
-        info.wAttributes = (short) ((info.wAttributes & ~FOREGROUND_INTENSITY) | (color >= 8 ? FOREGROUND_INTENSITY : 0));
-        applyAttribute();
-    }
-
-    protected void processSetBackgroundColorExt(int paletteIndex) throws IOException {
-        int color = Colors.roundColor(paletteIndex, 16);
-        info.wAttributes = (short)((info.wAttributes & ~0x0070 ) | ANSI_BACKGROUND_COLOR_MAP[color & 0x07]);
-        info.wAttributes = (short) ((info.wAttributes & ~BACKGROUND_INTENSITY) | (color >= 8 ? BACKGROUND_INTENSITY : 0));
-        applyAttribute();
-    }
-
-    protected void processDefaultTextColor() throws IOException {
-        info.wAttributes = (short)((info.wAttributes & ~0x000F ) | (originalColors & 0x000F));
-        applyAttribute();
-    }
-
-    protected void processDefaultBackgroundColor() throws IOException {
-        info.wAttributes = (short)((info.wAttributes & ~0x00F0 ) | (originalColors & 0x00F0));
-        applyAttribute();
-    }
-
-    protected void processAttributeRest() throws IOException {
-        info.wAttributes = (short)((info.wAttributes & ~0x00FF ) | originalColors);
-        this.negative = false;
-        this.bold = false;
-        this.underline = false;
-        applyAttribute();
-    }
-
-    protected void processSetAttribute(int attribute) throws IOException {
-        switch(attribute) {
-            case ATTRIBUTE_INTENSITY_BOLD:
-                bold = true;
-                applyAttribute();
-                break;
-            case ATTRIBUTE_INTENSITY_NORMAL:
-                bold = false;
-                applyAttribute();
-                break;
-
-            case ATTRIBUTE_UNDERLINE:
-                underline = true;
-                applyAttribute();
-                break;
-            case ATTRIBUTE_UNDERLINE_OFF:
-                underline = false;
-                applyAttribute();
-                break;
-
-            case ATTRIBUTE_NEGATIVE_ON:
-                negative = true;
-                applyAttribute();
-                break;
-            case ATTRIBUTE_NEGATIVE_OFF:
-                negative = false;
-                applyAttribute();
-                break;
-        }
-    }
-
-    protected void processSaveCursorPosition() throws IOException {
-        getConsoleInfo();
-        savedX = info.dwCursorPosition.X;
-        savedY = info.dwCursorPosition.Y;
-    }
-
-    protected void processRestoreCursorPosition() throws IOException {
-        // restore only if there was a save operation first
-        if (savedX != -1 && savedY != -1) {
-            out.flush();
-            info.dwCursorPosition.X = savedX;
-            info.dwCursorPosition.Y = savedY;
-            applyCursorPosition();
-        }
-    }
-
-    @Override
-    protected void processInsertLine(int optionInt) throws IOException {
-        getConsoleInfo();
-        Kernel32.SMALL_RECT scroll = new Kernel32.SMALL_RECT(info.srWindow);
-        scroll.Top = info.dwCursorPosition.Y;
-        Kernel32.COORD org = new Kernel32.COORD();
-        org.X = 0;
-        org.Y = (short)(info.dwCursorPosition.Y + optionInt);
-        Kernel32.CHAR_INFO info = new Kernel32.CHAR_INFO(' ', originalColors);
-        Kernel32.INSTANCE.ScrollConsoleScreenBuffer(console, scroll, scroll, org, info);
-    }
-
-    @Override
-    protected void processDeleteLine(int optionInt) throws IOException {
-        getConsoleInfo();
-        Kernel32.SMALL_RECT scroll = new Kernel32.SMALL_RECT(info.srWindow);
-        scroll.Top = info.dwCursorPosition.Y;
-        Kernel32.COORD org = new Kernel32.COORD();
-        org.X = 0;
-        org.Y = (short)(info.dwCursorPosition.Y - optionInt);
-        Kernel32.CHAR_INFO info = new Kernel32.CHAR_INFO(' ', originalColors);
-        Kernel32.INSTANCE.ScrollConsoleScreenBuffer(console, scroll, scroll, org, info);
-    }
-
-    protected void processChangeWindowTitle(String label) {
-        Kernel32.INSTANCE.SetConsoleTitle(label);
-    }
-}
diff --git a/src/jdk.internal.le/windows/native/lible/Kernel32.cpp b/src/jdk.internal.le/windows/native/lible/Kernel32.cpp
deleted file mode 100644
index 59f4df23fb3..00000000000
--- a/src/jdk.internal.le/windows/native/lible/Kernel32.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * 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.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-#include "jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl.h"
-
-#include <stdlib.h>
-#include <wincon.h>
-#include <winuser.h>
-
-static jclass pointerClass;
-static jmethodID pointerConstructor;
-static jfieldID pointerValue;
-
-static jclass intByReferenceClass;
-static jfieldID intByReferenceValue;
-
-static jclass lastErrorExceptionClass;
-static jmethodID lastErrorExceptionConstructor;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CHAR_INFO
-static jclass CHAR_INFO_Class;
-static jmethodID CHAR_INFO_Constructor;
-static jfieldID CHAR_INFO_uChar;
-static jfieldID CHAR_INFO_Attributes;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_CURSOR_INFO
-static jclass CONSOLE_CURSOR_INFO_Class;
-static jmethodID CONSOLE_CURSOR_INFO_Constructor;
-static jfieldID CONSOLE_CURSOR_INFO_dwSize;
-static jfieldID CONSOLE_CURSOR_INFO_bVisible;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_SCREEN_BUFFER_INFO
-static jclass CONSOLE_SCREEN_BUFFER_INFO_Class;
-static jmethodID CONSOLE_SCREEN_BUFFER_INFO_Constructor;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_dwSize;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_dwCursorPosition;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_wAttributes;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_srWindow;
-static jfieldID CONSOLE_SCREEN_BUFFER_INFO_dwMaximumWindowSize;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.COORD
-static jclass COORD_Class;
-static jmethodID COORD_Constructor;
-static jfieldID COORD_X;
-static jfieldID COORD_Y;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD
-static jclass INPUT_RECORD_Class;
-static jmethodID INPUT_RECORD_Constructor;
-static jfieldID INPUT_RECORD_EventType;
-static jfieldID INPUT_RECORD_Event;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD.EventUnion
-static jclass EventUnion_Class;
-static jmethodID EventUnion_Constructor;
-static jfieldID EventUnion_KeyEvent;
-static jfieldID EventUnion_MouseEvent;
-static jfieldID EventUnion_WindowBufferSizeEvent;
-static jfieldID EventUnion_MenuEvent;
-static jfieldID EventUnion_FocusEvent;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.KEY_EVENT_RECORD
-static jclass KEY_EVENT_RECORD_Class;
-static jmethodID KEY_EVENT_RECORD_Constructor;
-static jfieldID KEY_EVENT_RECORD_bKeyDown;
-static jfieldID KEY_EVENT_RECORD_wRepeatCount;
-static jfieldID KEY_EVENT_RECORD_wVirtualKeyCode;
-static jfieldID KEY_EVENT_RECORD_wVirtualScanCode;
-static jfieldID KEY_EVENT_RECORD_uChar;
-static jfieldID KEY_EVENT_RECORD_dwControlKeyState;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.MOUSE_EVENT_RECORD
-static jclass MOUSE_EVENT_RECORD_Class;
-static jmethodID MOUSE_EVENT_RECORD_Constructor;
-static jfieldID MOUSE_EVENT_RECORD_dwMousePosition;
-static jfieldID MOUSE_EVENT_RECORD_dwButtonState;
-static jfieldID MOUSE_EVENT_RECORD_dwControlKeyState;
-static jfieldID MOUSE_EVENT_RECORD_dwEventFlags;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.WINDOW_BUFFER_SIZE_RECORD
-static jclass WINDOW_BUFFER_SIZE_RECORD_Class;
-static jmethodID WINDOW_BUFFER_SIZE_RECORD_Constructor;
-static jfieldID WINDOW_BUFFER_SIZE_RECORD_dwSize;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.MENU_EVENT_RECORD
-static jclass MENU_EVENT_RECORD_Class;
-static jmethodID MENU_EVENT_RECORD_Constructor;
-static jfieldID MENU_EVENT_RECORD_dwCommandId;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOCUS_EVENT_RECORD
-static jclass FOCUS_EVENT_RECORD_Class;
-static jmethodID FOCUS_EVENT_RECORD_Constructor;
-static jfieldID FOCUS_EVENT_RECORD_bSetFocus;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.SMALL_RECT
-static jclass SMALL_RECT_Class;
-static jmethodID SMALL_RECT_Constructor;
-static jfieldID SMALL_RECT_Left;
-static jfieldID SMALL_RECT_Top;
-static jfieldID SMALL_RECT_Right;
-static jfieldID SMALL_RECT_Bottom;
-
-//jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.UnionChar
-static jclass UnionChar_Class;
-static jmethodID UnionChar_Constructor;
-static jfieldID UnionChar_UnicodeChar;
-
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_initIDs
-  (JNIEnv *env, jclass) {
-    jclass cls;
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Pointer");
-    CHECK_NULL(cls);
-    pointerClass = (jclass) env->NewGlobalRef(cls);
-    pointerConstructor = env->GetMethodID(cls, "<init>", "(J)V");
-    CHECK_NULL(pointerConstructor);
-    pointerValue  = env->GetFieldID(cls, "value", "J");
-    CHECK_NULL(pointerValue);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/LastErrorException");
-    CHECK_NULL(cls);
-    lastErrorExceptionClass = (jclass) env->NewGlobalRef(cls);
-    lastErrorExceptionConstructor = env->GetMethodID(cls, "<init>", "(J)V");
-    CHECK_NULL(lastErrorExceptionConstructor);
-
-    cls = env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/IntByReference");
-    CHECK_NULL(cls);
-    intByReferenceClass = (jclass) env->NewGlobalRef(cls);
-    intByReferenceValue = env->GetFieldID(cls, "value", "I");
-    CHECK_NULL(intByReferenceValue);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CHAR_INFO
-    CHAR_INFO_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$CHAR_INFO"));
-    CHECK_NULL(CHAR_INFO_Class);
-    CHAR_INFO_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(CHAR_INFO_Constructor);
-    CHAR_INFO_uChar = env->GetFieldID(CHAR_INFO_Class, "uChar", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$UnionChar;");
-    CHECK_NULL(CHAR_INFO_uChar);
-    CHAR_INFO_Attributes = env->GetFieldID(CHAR_INFO_Class, "Attributes", "S");
-    CHECK_NULL(CHAR_INFO_Attributes);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_CURSOR_INFO
-    CONSOLE_CURSOR_INFO_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$CONSOLE_CURSOR_INFO"));
-    CHECK_NULL(CONSOLE_CURSOR_INFO_Class);
-    CONSOLE_CURSOR_INFO_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(CONSOLE_CURSOR_INFO_Constructor);
-    CONSOLE_CURSOR_INFO_dwSize = env->GetFieldID(CONSOLE_CURSOR_INFO_Class, "dwSize", "I");
-    CHECK_NULL(CONSOLE_CURSOR_INFO_dwSize);
-    CONSOLE_CURSOR_INFO_bVisible = env->GetFieldID(CONSOLE_CURSOR_INFO_Class, "bVisible", "Z");
-    CHECK_NULL(CONSOLE_CURSOR_INFO_bVisible);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.CONSOLE_SCREEN_BUFFER_INFO
-    CONSOLE_SCREEN_BUFFER_INFO_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$CONSOLE_SCREEN_BUFFER_INFO"));
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_Class);
-    CONSOLE_SCREEN_BUFFER_INFO_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_Constructor);
-    CONSOLE_SCREEN_BUFFER_INFO_dwSize = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "dwSize", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_dwSize);
-    CONSOLE_SCREEN_BUFFER_INFO_dwCursorPosition = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "dwCursorPosition", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_dwCursorPosition);
-    CONSOLE_SCREEN_BUFFER_INFO_wAttributes = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "wAttributes", "S");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_wAttributes);
-    CONSOLE_SCREEN_BUFFER_INFO_srWindow = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "srWindow", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$SMALL_RECT;");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_srWindow);
-    CONSOLE_SCREEN_BUFFER_INFO_dwMaximumWindowSize = env->GetFieldID(CONSOLE_SCREEN_BUFFER_INFO_Class, "dwMaximumWindowSize", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(CONSOLE_SCREEN_BUFFER_INFO_dwMaximumWindowSize);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.COORD
-    COORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD"));
-    CHECK_NULL(COORD_Class);
-    COORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(COORD_Constructor);
-    COORD_X = env->GetFieldID(COORD_Class, "X", "S");
-    CHECK_NULL(COORD_X);
-    COORD_Y = env->GetFieldID(COORD_Class, "Y", "S");
-    CHECK_NULL(COORD_Y);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD
-    INPUT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$INPUT_RECORD"));
-    CHECK_NULL(INPUT_RECORD_Class);
-    INPUT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(INPUT_RECORD_Constructor);
-    INPUT_RECORD_EventType = env->GetFieldID(INPUT_RECORD_Class, "EventType", "S");
-    CHECK_NULL(INPUT_RECORD_EventType);
-    INPUT_RECORD_Event = env->GetFieldID(INPUT_RECORD_Class, "Event", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$INPUT_RECORD$EventUnion;");
-    CHECK_NULL(INPUT_RECORD_Event);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.INPUT_RECORD.EventUnion
-    EventUnion_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$INPUT_RECORD$EventUnion"));
-    CHECK_NULL(EventUnion_Class);
-    EventUnion_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(EventUnion_Constructor);
-    EventUnion_KeyEvent = env->GetFieldID(EventUnion_Class, "KeyEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$KEY_EVENT_RECORD;");
-    CHECK_NULL(EventUnion_KeyEvent);
-    EventUnion_MouseEvent = env->GetFieldID(EventUnion_Class, "MouseEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$MOUSE_EVENT_RECORD;");
-    CHECK_NULL(EventUnion_MouseEvent);
-    EventUnion_WindowBufferSizeEvent = env->GetFieldID(EventUnion_Class, "WindowBufferSizeEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$WINDOW_BUFFER_SIZE_RECORD;");
-    CHECK_NULL(EventUnion_WindowBufferSizeEvent);
-    EventUnion_MenuEvent = env->GetFieldID(EventUnion_Class, "MenuEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$MENU_EVENT_RECORD;");
-    CHECK_NULL(EventUnion_MenuEvent);
-    EventUnion_FocusEvent = env->GetFieldID(EventUnion_Class, "FocusEvent", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$FOCUS_EVENT_RECORD;");
-    CHECK_NULL(EventUnion_FocusEvent);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.KEY_EVENT_RECORD
-    KEY_EVENT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$KEY_EVENT_RECORD"));
-    CHECK_NULL(KEY_EVENT_RECORD_Class);
-    KEY_EVENT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(KEY_EVENT_RECORD_Constructor);
-    KEY_EVENT_RECORD_bKeyDown = env->GetFieldID(KEY_EVENT_RECORD_Class, "bKeyDown", "Z");
-    CHECK_NULL(KEY_EVENT_RECORD_bKeyDown);
-    KEY_EVENT_RECORD_wRepeatCount = env->GetFieldID(KEY_EVENT_RECORD_Class, "wRepeatCount", "S");
-    CHECK_NULL(KEY_EVENT_RECORD_wRepeatCount);
-    KEY_EVENT_RECORD_wVirtualKeyCode = env->GetFieldID(KEY_EVENT_RECORD_Class, "wVirtualKeyCode", "S");
-    CHECK_NULL(KEY_EVENT_RECORD_wVirtualKeyCode);
-    KEY_EVENT_RECORD_wVirtualScanCode = env->GetFieldID(KEY_EVENT_RECORD_Class, "wVirtualScanCode", "S");
-    CHECK_NULL(KEY_EVENT_RECORD_wVirtualScanCode);
-    KEY_EVENT_RECORD_uChar = env->GetFieldID(KEY_EVENT_RECORD_Class, "uChar", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$UnionChar;");
-    CHECK_NULL(KEY_EVENT_RECORD_uChar);
-    KEY_EVENT_RECORD_dwControlKeyState = env->GetFieldID(KEY_EVENT_RECORD_Class, "dwControlKeyState", "I");
-    CHECK_NULL(KEY_EVENT_RECORD_dwControlKeyState);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.MOUSE_EVENT_RECORD
-    MOUSE_EVENT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$MOUSE_EVENT_RECORD"));
-    CHECK_NULL(MOUSE_EVENT_RECORD_Class);
-    MOUSE_EVENT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(MOUSE_EVENT_RECORD_Constructor);
-    MOUSE_EVENT_RECORD_dwMousePosition = env->GetFieldID(MOUSE_EVENT_RECORD_Class, "dwMousePosition", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(MOUSE_EVENT_RECORD_dwMousePosition);
-    MOUSE_EVENT_RECORD_dwButtonState = env->GetFieldID(MOUSE_EVENT_RECORD_Class, "dwButtonState", "I");
-    CHECK_NULL(MOUSE_EVENT_RECORD_dwButtonState);
-    MOUSE_EVENT_RECORD_dwControlKeyState = env->GetFieldID(MOUSE_EVENT_RECORD_Class, "dwControlKeyState", "I");
-    CHECK_NULL(MOUSE_EVENT_RECORD_dwControlKeyState);
-    MOUSE_EVENT_RECORD_dwEventFlags = env->GetFieldID(MOUSE_EVENT_RECORD_Class, "dwEventFlags", "I");
-    CHECK_NULL(MOUSE_EVENT_RECORD_dwEventFlags);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.WINDOW_BUFFER_SIZE_RECORD
-    WINDOW_BUFFER_SIZE_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$WINDOW_BUFFER_SIZE_RECORD"));
-    CHECK_NULL(WINDOW_BUFFER_SIZE_RECORD_Class);
-    WINDOW_BUFFER_SIZE_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(WINDOW_BUFFER_SIZE_RECORD_Constructor);
-    WINDOW_BUFFER_SIZE_RECORD_dwSize = env->GetFieldID(WINDOW_BUFFER_SIZE_RECORD_Class, "dwSize", "Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32$COORD;");
-    CHECK_NULL(WINDOW_BUFFER_SIZE_RECORD_dwSize);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.MENU_EVENT_RECORD
-    MENU_EVENT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$MENU_EVENT_RECORD"));
-    CHECK_NULL(MENU_EVENT_RECORD_Class);
-    MENU_EVENT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(MENU_EVENT_RECORD_Constructor);
-    MENU_EVENT_RECORD_dwCommandId = env->GetFieldID(MENU_EVENT_RECORD_Class, "dwCommandId", "I");
-    CHECK_NULL(MENU_EVENT_RECORD_dwCommandId);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.FOCUS_EVENT_RECORD
-    FOCUS_EVENT_RECORD_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$FOCUS_EVENT_RECORD"));
-    CHECK_NULL(FOCUS_EVENT_RECORD_Class);
-    FOCUS_EVENT_RECORD_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(FOCUS_EVENT_RECORD_Constructor);
-    FOCUS_EVENT_RECORD_bSetFocus = env->GetFieldID(FOCUS_EVENT_RECORD_Class, "bSetFocus", "Z");
-    CHECK_NULL(FOCUS_EVENT_RECORD_bSetFocus);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.SMALL_RECT
-    SMALL_RECT_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$SMALL_RECT"));
-    CHECK_NULL(SMALL_RECT_Class);
-    SMALL_RECT_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(SMALL_RECT_Constructor);
-    SMALL_RECT_Left = env->GetFieldID(SMALL_RECT_Class, "Left", "S");
-    CHECK_NULL(SMALL_RECT_Left);
-    SMALL_RECT_Top = env->GetFieldID(SMALL_RECT_Class, "Top", "S");
-    CHECK_NULL(SMALL_RECT_Top);
-    SMALL_RECT_Right = env->GetFieldID(SMALL_RECT_Class, "Right", "S");
-    CHECK_NULL(SMALL_RECT_Right);
-    SMALL_RECT_Bottom = env->GetFieldID(SMALL_RECT_Class, "Bottom", "S");
-    CHECK_NULL(SMALL_RECT_Bottom);
-
-    //jdk.internal.org.jline.terminal.impl.jna.win.Kernel32.UnionChar
-    UnionChar_Class = (jclass) env->NewGlobalRef(env->FindClass("jdk/internal/org/jline/terminal/impl/jna/win/Kernel32$UnionChar"));
-    CHECK_NULL(UnionChar_Class);
-    UnionChar_Constructor = env->GetMethodID(cls, "<init>", "()V");
-    CHECK_NULL(UnionChar_Constructor);
-    UnionChar_UnicodeChar = env->GetFieldID(UnionChar_Class, "UnicodeChar", "C");
-    CHECK_NULL(UnionChar_UnicodeChar);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    WaitForSingleObject
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;I)I
- */
-JNIEXPORT jint JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_WaitForSingleObject
-  (JNIEnv *env, jobject kernel, jobject in_hHandle, jint in_dwMilliseconds) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hHandle, pointerValue));
-    return WaitForSingleObject(h, in_dwMilliseconds);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    GetStdHandle
- * Signature: (I)Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;
- */
-JNIEXPORT jobject JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_GetStdHandle
-  (JNIEnv *env, jobject, jint nStdHandle) {
-    return env->NewObject(pointerClass,
-                          pointerConstructor,
-                          nStdHandle);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    GetConsoleOutputCP
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_GetConsoleOutputCP
-  (JNIEnv *, jobject) {
-    return GetConsoleOutputCP();
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    FillConsoleOutputCharacter
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;CILjdk/internal/org/jline/terminal/impl/jna/win/Kernel32/COORD;Ljdk/internal/org/jline/terminal/impl/jna/win/IntByReference;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_FillConsoleOutputCharacter
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jchar in_cCharacter, jint in_nLength, jobject in_dwWriteCoord, jobject out_lpNumberOfCharsWritten) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    DWORD written;
-    COORD coord;
-    coord.X = (SHORT) env->GetLongField(in_dwWriteCoord, COORD_X);
-    coord.Y = (SHORT) env->GetLongField(in_dwWriteCoord, COORD_Y);
-    if (!FillConsoleOutputCharacter(h, (CHAR) in_cCharacter, in_nLength, coord, &written)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    env->SetIntField(out_lpNumberOfCharsWritten, intByReferenceValue, written);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    FillConsoleOutputAttribute
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;SILjdk/internal/org/jline/terminal/impl/jna/win/Kernel32/COORD;Ljdk/internal/org/jline/terminal/impl/jna/win/IntByReference;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_FillConsoleOutputAttribute
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jshort in_wAttribute, jint in_nLength, jobject in_dwWriteCoord, jobject out_lpNumberOfAttrsWritten) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    DWORD written;
-    COORD coord;
-    coord.X = (SHORT) env->GetLongField(in_dwWriteCoord, COORD_X);
-    coord.Y = (SHORT) env->GetLongField(in_dwWriteCoord, COORD_Y);
-    if (!FillConsoleOutputAttribute(h, in_wAttribute, in_nLength, coord, &written)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    env->SetIntField(out_lpNumberOfAttrsWritten, intByReferenceValue, written);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    GetConsoleMode
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;Ljdk/internal/org/jline/terminal/impl/jna/win/IntByReference;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_GetConsoleMode
-  (JNIEnv *env, jobject, jobject in_hConsoleOutput, jobject out_lpMode) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    DWORD mode;
-    if (!GetConsoleMode(h, &mode)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    env->SetIntField(out_lpMode, intByReferenceValue, mode);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    GetConsoleScreenBufferInfo
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/CONSOLE_SCREEN_BUFFER_INFO;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_GetConsoleScreenBufferInfo
-  (JNIEnv *env, jobject, jobject in_hConsoleOutput, jobject/*CONSOLE_SCREEN_BUFFER_INFO*/ out_lpConsoleScreenBufferInfo) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    CONSOLE_SCREEN_BUFFER_INFO buffer;
-    if (!GetConsoleScreenBufferInfo(h, &buffer)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-
-    jobject dwSize = env->NewObject(COORD_Class,
-                                    COORD_Constructor);
-    env->SetIntField(dwSize, COORD_X, buffer.dwSize.X);
-    env->SetIntField(dwSize, COORD_Y, buffer.dwSize.Y);
-    env->SetObjectField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_dwSize, dwSize);
-
-    jobject dwCursorPosition = env->NewObject(COORD_Class,
-                                              COORD_Constructor);
-    env->SetIntField(dwCursorPosition, COORD_X, buffer.dwCursorPosition.X);
-    env->SetIntField(dwCursorPosition, COORD_Y, buffer.dwCursorPosition.Y);
-    env->SetObjectField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_dwCursorPosition, dwCursorPosition);
-
-    env->SetIntField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_wAttributes, buffer.wAttributes);
-
-    jobject srWindow = env->NewObject(SMALL_RECT_Class,
-                                      SMALL_RECT_Constructor);
-    env->SetIntField(srWindow, SMALL_RECT_Left, buffer.srWindow.Left);
-    env->SetIntField(srWindow, SMALL_RECT_Top, buffer.srWindow.Top);
-    env->SetIntField(srWindow, SMALL_RECT_Right, buffer.srWindow.Right);
-    env->SetIntField(srWindow, SMALL_RECT_Bottom, buffer.srWindow.Bottom);
-    env->SetObjectField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_srWindow, srWindow);
-
-    jobject dwMaximumWindowSize = env->NewObject(COORD_Class,
-                                                 COORD_Constructor);
-    env->SetIntField(dwMaximumWindowSize, COORD_X, buffer.dwMaximumWindowSize.X);
-    env->SetIntField(dwMaximumWindowSize, COORD_Y, buffer.dwMaximumWindowSize.Y);
-    env->SetObjectField(out_lpConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO_dwMaximumWindowSize, dwMaximumWindowSize);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    ReadConsoleInput
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;[Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/INPUT_RECORD;ILjdk/internal/org/jline/terminal/impl/jna/win/IntByReference;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_ReadConsoleInput
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jobjectArray/*INPUT_RECORD[]*/ out_lpBuffer, jint in_nLength, jobject out_lpNumberOfEventsRead) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    INPUT_RECORD *buffer = new INPUT_RECORD[in_nLength];
-    DWORD numberOfEventsRead;
-    if (!ReadConsoleInputW(h, buffer, in_nLength, &numberOfEventsRead)) {
-        delete[] buffer;
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    for (unsigned int i = 0; i < numberOfEventsRead; i++) {
-        jobject record = env->NewObject(INPUT_RECORD_Class,
-                                        INPUT_RECORD_Constructor);
-        env->SetShortField(record, INPUT_RECORD_EventType, buffer[i].EventType);
-        switch (buffer[i].EventType) {
-            case KEY_EVENT: {
-                jobject keyEvent = env->NewObject(KEY_EVENT_RECORD_Class,
-                                                  KEY_EVENT_RECORD_Constructor);
-                env->SetBooleanField(keyEvent, KEY_EVENT_RECORD_bKeyDown, buffer[i].Event.KeyEvent.bKeyDown);
-                env->SetShortField(keyEvent, KEY_EVENT_RECORD_wRepeatCount, buffer[i].Event.KeyEvent.wRepeatCount);
-                env->SetShortField(keyEvent, KEY_EVENT_RECORD_wVirtualKeyCode, buffer[i].Event.KeyEvent.wVirtualKeyCode);
-                env->SetShortField(keyEvent, KEY_EVENT_RECORD_wVirtualScanCode, buffer[i].Event.KeyEvent.wVirtualScanCode);
-
-                jobject unionChar = env->NewObject(UnionChar_Class,
-                                                   UnionChar_Constructor);
-
-                env->SetIntField(unionChar, UnionChar_UnicodeChar, buffer[i].Event.KeyEvent.uChar.UnicodeChar);
-
-                env->SetObjectField(keyEvent, KEY_EVENT_RECORD_uChar, unionChar);
-
-                env->SetIntField(keyEvent, KEY_EVENT_RECORD_dwControlKeyState, buffer[i].Event.KeyEvent.dwControlKeyState);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_KeyEvent, keyEvent);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-            case MOUSE_EVENT: {
-                jobject mouseEvent = env->NewObject(MOUSE_EVENT_RECORD_Class,
-                                                    MOUSE_EVENT_RECORD_Constructor);
-
-                jobject dwMousePosition = env->NewObject(COORD_Class,
-                                                         COORD_Constructor);
-                env->SetIntField(dwMousePosition, COORD_X, buffer[i].Event.MouseEvent.dwMousePosition.X);
-                env->SetIntField(dwMousePosition, COORD_Y, buffer[i].Event.MouseEvent.dwMousePosition.Y);
-                env->SetObjectField(mouseEvent, MOUSE_EVENT_RECORD_dwMousePosition, dwMousePosition);
-                env->SetIntField(mouseEvent, MOUSE_EVENT_RECORD_dwButtonState, buffer[i].Event.MouseEvent.dwButtonState);
-                env->SetIntField(mouseEvent, MOUSE_EVENT_RECORD_dwControlKeyState, buffer[i].Event.MouseEvent.dwControlKeyState);
-                env->SetIntField(mouseEvent, MOUSE_EVENT_RECORD_dwEventFlags, buffer[i].Event.MouseEvent.dwEventFlags);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_MouseEvent, mouseEvent);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-            case WINDOW_BUFFER_SIZE_EVENT: {
-                jobject windowBufferSize = env->NewObject(WINDOW_BUFFER_SIZE_RECORD_Class,
-                                                          WINDOW_BUFFER_SIZE_RECORD_Constructor);
-
-                jobject dwSize = env->NewObject(COORD_Class,
-                                                COORD_Constructor);
-                env->SetIntField(dwSize, COORD_X, buffer[i].Event.WindowBufferSizeEvent.dwSize.X);
-                env->SetIntField(dwSize, COORD_Y, buffer[i].Event.WindowBufferSizeEvent.dwSize.Y);
-                env->SetObjectField(windowBufferSize, WINDOW_BUFFER_SIZE_RECORD_dwSize, dwSize);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_WindowBufferSizeEvent, windowBufferSize);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-            case MENU_EVENT: {
-                jobject menuEvent = env->NewObject(MENU_EVENT_RECORD_Class,
-                                                          MENU_EVENT_RECORD_Constructor);
-
-                env->SetBooleanField(menuEvent, MENU_EVENT_RECORD_dwCommandId, buffer[i].Event.MenuEvent.dwCommandId);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_MenuEvent, menuEvent);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-            case FOCUS_EVENT: {
-                jobject focusEvent = env->NewObject(FOCUS_EVENT_RECORD_Class,
-                                                    FOCUS_EVENT_RECORD_Constructor);
-
-                env->SetIntField(focusEvent, FOCUS_EVENT_RECORD_bSetFocus, buffer[i].Event.FocusEvent.bSetFocus);
-
-                jobject event = env->NewObject(EventUnion_Class,
-                                               EventUnion_Constructor);
-
-                env->SetObjectField(event, EventUnion_FocusEvent, focusEvent);
-                env->SetObjectField(record, INPUT_RECORD_Event, event);
-                break;
-            }
-        }
-        env->SetObjectArrayElement(out_lpBuffer, i, record);
-    }
-    env->SetIntField(out_lpNumberOfEventsRead, intByReferenceValue, numberOfEventsRead);
-    delete[] buffer;
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    SetConsoleCursorPosition
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/COORD;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_SetConsoleCursorPosition
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jobject in_dwCursorPosition) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    COORD coord;
-    coord.X = (SHORT) env->GetLongField(in_dwCursorPosition, COORD_X);
-    coord.Y = (SHORT) env->GetLongField(in_dwCursorPosition, COORD_Y);
-    if (!SetConsoleCursorPosition(h, coord)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return;
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    SetConsoleMode
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;I)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_SetConsoleMode
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jint in_dwMode) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    if (!SetConsoleMode(h, in_dwMode)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    SetConsoleTextAttribute
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;S)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_SetConsoleTextAttribute
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jshort in_wAttributes) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    if (!SetConsoleTextAttribute(h, in_wAttributes)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    SetConsoleTitle
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_SetConsoleTitle
-  (JNIEnv *env, jobject, jstring in_lpConsoleTitle) {
-    const char *chars = env->GetStringUTFChars(in_lpConsoleTitle, NULL);
-    if (!SetConsoleTitle(chars)) {
-        env->ReleaseStringUTFChars(in_lpConsoleTitle, chars);
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-    env->ReleaseStringUTFChars(in_lpConsoleTitle, chars);
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    WriteConsoleW
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;[CILjdk/internal/org/jline/terminal/impl/jna/win/IntByReference;Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_WriteConsoleW
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jcharArray in_lpBuffer, jint in_nNumberOfCharsToWrite, jobject out_lpNumberOfCharsWritten, jobject) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-    jchar *chars = new jchar[in_nNumberOfCharsToWrite];
-    env->GetCharArrayRegion(in_lpBuffer, 0, in_nNumberOfCharsToWrite, chars);
-    DWORD written;
-    if (!WriteConsoleW(h, chars, in_nNumberOfCharsToWrite, &written, NULL)) {
-        delete[] chars;
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-
-    env->SetIntField(out_lpNumberOfCharsWritten, intByReferenceValue, written);
-    delete[] chars;
-}
-
-/*
- * Class:     jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl
- * Method:    ScrollConsoleScreenBuffer
- * Signature: (Ljdk/internal/org/jline/terminal/impl/jna/win/Pointer;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/SMALL_RECT;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/SMALL_RECT;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/COORD;Ljdk/internal/org/jline/terminal/impl/jna/win/Kernel32/CHAR_INFO;)V
- */
-JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_win_Kernel32Impl_ScrollConsoleScreenBuffer
-  (JNIEnv *env, jobject kernel, jobject in_hConsoleOutput, jobject in_lpScrollRectangle, jobject in_lpClipRectangle, jobject in_dwDestinationOrigin, jobject in_lpFill) {
-    HANDLE h = GetStdHandle((jint) env->GetLongField(in_hConsoleOutput, pointerValue));
-
-    SMALL_RECT scrollRectangle;
-    scrollRectangle.Left = (SHORT) env->GetLongField(in_lpScrollRectangle, SMALL_RECT_Left);
-    scrollRectangle.Top = (SHORT) env->GetLongField(in_lpScrollRectangle, SMALL_RECT_Top);
-    scrollRectangle.Right = (SHORT) env->GetLongField(in_lpScrollRectangle, SMALL_RECT_Right);
-    scrollRectangle.Bottom = (SHORT) env->GetLongField(in_lpScrollRectangle, SMALL_RECT_Bottom);
-
-    SMALL_RECT clipRectangle;
-    clipRectangle.Left = (SHORT) env->GetLongField(in_lpClipRectangle, SMALL_RECT_Left);
-    clipRectangle.Top = (SHORT) env->GetLongField(in_lpClipRectangle, SMALL_RECT_Top);
-    clipRectangle.Right = (SHORT) env->GetLongField(in_lpClipRectangle, SMALL_RECT_Right);
-    clipRectangle.Bottom = (SHORT) env->GetLongField(in_lpClipRectangle, SMALL_RECT_Bottom);
-
-    COORD destinationOrigin;
-    destinationOrigin.X = (SHORT) env->GetLongField(in_dwDestinationOrigin, COORD_X);
-    destinationOrigin.Y = (SHORT) env->GetLongField(in_dwDestinationOrigin, COORD_Y);
-
-    CHAR_INFO charInfo;
-    charInfo.Char.UnicodeChar = env->GetCharField(env->GetObjectField(in_lpFill, CHAR_INFO_uChar), UnionChar_UnicodeChar);
-    charInfo.Attributes = env->GetShortField(in_lpFill, CHAR_INFO_Attributes);
-
-    if (!ScrollConsoleScreenBuffer(h, &scrollRectangle, &clipRectangle, destinationOrigin, &charInfo)) {
-        DWORD error = GetLastError();
-        jobject exc = env->NewObject(lastErrorExceptionClass,
-                                     lastErrorExceptionConstructor,
-                                     (jlong) error);
-        env->Throw((jthrowable) exc);
-        return ;
-    }
-}
diff --git a/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java b/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java
index d53c9b20309..1ca4c091d27 100644
--- a/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java
+++ b/test/jdk/jdk/internal/jline/AbstractWindowsTerminalTest.java
@@ -25,8 +25,10 @@
  * @test
  * @bug 8218287
  * @summary Verify the wrapper input stream is used when using Terminal.reader()
- * @modules jdk.internal.le/jdk.internal.org.jline.terminal
+ * @modules jdk.internal.le/jdk.internal.org.jline
+ *          jdk.internal.le/jdk.internal.org.jline.terminal
  *          jdk.internal.le/jdk.internal.org.jline.terminal.impl
+ *          jdk.internal.le/jdk.internal.org.jline.terminal.spi
  *          jdk.internal.le/jdk.internal.org.jline.utils
  */
 
@@ -39,6 +41,7 @@ import java.util.function.Function;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal.SignalHandler;
 import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 
 
 public class AbstractWindowsTerminalTest {
@@ -56,14 +59,17 @@ public class AbstractWindowsTerminalTest {
                 return is.read();
             }
         };
-        var t = new AbstractWindowsTerminal(out, "test", "vt100", null, false, SignalHandler.SIG_DFL, isWrapper) {
+        var t = new AbstractWindowsTerminal<String>(null, SystemStream.Output, out,
+                                                    "test", "vt100", null, false,
+                                                    SignalHandler.SIG_DFL, "", 0,
+                                                    "", 0, isWrapper) {
             @Override
-            protected int getConsoleMode() {
+            protected int getConsoleMode(String console) {
                 return -1;
             }
 
             @Override
-            protected void setConsoleMode(int mode) {
+            protected void setConsoleMode(String console, int mode) {
                 throw new UnsupportedOperationException("unexpected.");
             }
 
diff --git a/test/jdk/jdk/internal/jline/KeyConversionTest.java b/test/jdk/jdk/internal/jline/KeyConversionTest.java
index aed9a726715..ffd116dbbc2 100644
--- a/test/jdk/jdk/internal/jline/KeyConversionTest.java
+++ b/test/jdk/jdk/internal/jline/KeyConversionTest.java
@@ -27,6 +27,7 @@
  * @summary Verify the conversion from key events to escape sequences works properly.
  * @modules jdk.internal.le/jdk.internal.org.jline.terminal
  *          jdk.internal.le/jdk.internal.org.jline.terminal.impl
+ *          jdk.internal.le/jdk.internal.org.jline.terminal.spi
  */
 
 import java.io.IOException;
@@ -36,6 +37,7 @@ import java.nio.charset.Charset;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal.SignalHandler;
 import jdk.internal.org.jline.terminal.impl.AbstractWindowsTerminal;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 
 public class KeyConversionTest {
     public static void main(String... args) throws Exception {
@@ -58,14 +60,17 @@ public class KeyConversionTest {
 
     void checkKeyConversion(KeyEvent event, String expected) throws IOException {
         StringBuilder result = new StringBuilder();
-        new AbstractWindowsTerminal(new StringWriter(), "", "windows", Charset.forName("UTF-8"),
-                                    true, SignalHandler.SIG_DFL, in -> in) {
+        new AbstractWindowsTerminal<String>(null, SystemStream.Output,
+                                            new StringWriter(), "", "windows",
+                                            Charset.forName("UTF-8"), true,
+                                            SignalHandler.SIG_DFL, "", 0,
+                                            "", 0, in -> in) {
             @Override
-            protected int getConsoleMode() {
+            protected int getConsoleMode(String console) {
                 return 0;
             }
             @Override
-            protected void setConsoleMode(int mode) {
+            protected void setConsoleMode(String console, int mode) {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
             @Override
diff --git a/test/langtools/jdk/jshell/ExecPtyGetFlagsToSetTest.java b/test/langtools/jdk/jshell/ExecPtyGetFlagsToSetTest.java
index 36f96644961..efd1cd010cd 100644
--- a/test/langtools/jdk/jshell/ExecPtyGetFlagsToSetTest.java
+++ b/test/langtools/jdk/jshell/ExecPtyGetFlagsToSetTest.java
@@ -26,7 +26,7 @@
  * @bug 8224184
  * @summary Control Char <UNDEF> check for pty
  * @modules jdk.internal.le/jdk.internal.org.jline.terminal
- *          jdk.internal.le/jdk.internal.org.jline.terminal.impl
+ *          jdk.internal.le/jdk.internal.org.jline.terminal.impl.exec
  *          jdk.internal.le/jdk.internal.org.jline.terminal.spi
  * @requires (os.family == "linux") | (os.family == "aix")
  */
@@ -35,12 +35,13 @@ import java.util.List;
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Attributes.ControlChar;
 import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
-import jdk.internal.org.jline.terminal.impl.ExecPty;
+import jdk.internal.org.jline.terminal.impl.exec.ExecPty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 
 public class ExecPtyGetFlagsToSetTest extends ExecPty {
-    public ExecPtyGetFlagsToSetTest(String name, TerminalProvider.Stream stream) {
-        super(name, stream);
+    public ExecPtyGetFlagsToSetTest(TerminalProvider provider, SystemStream stream, String name) {
+        super(provider, stream, name);
     }
 
     @Override
@@ -50,7 +51,7 @@ public class ExecPtyGetFlagsToSetTest extends ExecPty {
 
     public static void main(String[] args) {
         ExecPtyGetFlagsToSetTest testPty =
-            new ExecPtyGetFlagsToSetTest("stty", TerminalProvider.Stream.Output);
+            new ExecPtyGetFlagsToSetTest(null, SystemStream.Output, "stty");
 
         Attributes attr = new Attributes();
         Attributes current = new Attributes();

From c4ff58b9bcfd08eae0623a648a837e08f25b3f9b Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Thu, 9 May 2024 14:30:15 +0000
Subject: [PATCH 377/486] 8330146:
 assert(!_thread->is_in_any_VTMS_transition()) failed

Reviewed-by: cjplummer, kevinw
---
 src/hotspot/share/prims/jvmtiExport.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 5a87e16c855..c2b6d27986b 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -929,7 +929,9 @@ class JvmtiClassFileLoadHookPoster : public StackObj {
     _cached_class_file_ptr = cache_ptr;
     _has_been_modified = false;
 
-    assert(!_thread->is_in_any_VTMS_transition(), "CFLH events are not allowed in any VTMS transition");
+    if (_thread->is_in_any_VTMS_transition()) {
+      return; // no events should be posted if thread is in any VTMS transition
+    }
     _state = JvmtiExport::get_jvmti_thread_state(_thread);
     if (_state != nullptr) {
       _class_being_redefined = _state->get_class_being_redefined();
@@ -1366,10 +1368,9 @@ void JvmtiExport::post_class_load(JavaThread *thread, Klass* klass) {
   if (state == nullptr) {
     return;
   }
-  if (thread->is_in_tmp_VTMS_transition()) {
-    return; // skip ClassLoad events in tmp VTMS transition
+  if (thread->is_in_any_VTMS_transition()) {
+    return; // no events should be posted if thread is in any VTMS transition
   }
-  assert(!thread->is_in_any_VTMS_transition(), "class load events are not allowed in any VTMS transition");
 
   EVT_TRIG_TRACE(JVMTI_EVENT_CLASS_LOAD, ("[%s] Trg Class Load triggered",
                       JvmtiTrace::safe_get_thread_name(thread)));
@@ -1404,10 +1405,9 @@ void JvmtiExport::post_class_prepare(JavaThread *thread, Klass* klass) {
   if (state == nullptr) {
     return;
   }
-  if (thread->is_in_tmp_VTMS_transition()) {
-    return; // skip ClassPrepare events in tmp VTMS transition
+  if (thread->is_in_any_VTMS_transition()) {
+    return; // no events should be posted if thread is in any VTMS transition
   }
-  assert(!thread->is_in_any_VTMS_transition(), "class prepare events are not allowed in any VTMS transition");
 
   EVT_TRIG_TRACE(JVMTI_EVENT_CLASS_PREPARE, ("[%s] Trg Class Prepare triggered",
                       JvmtiTrace::safe_get_thread_name(thread)));

From aa4cddd4b8a6a12ba5d0360a721aebaabf362fff Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 9 May 2024 15:42:41 +0000
Subject: [PATCH 378/486] 8331950: Remove
 MemoryPoolMBean/isCollectionUsageThresholdExceeded from ZGC ProblemLists

Reviewed-by: sspitsyn
---
 test/hotspot/jtreg/ProblemList-generational-zgc.txt | 1 -
 test/hotspot/jtreg/ProblemList-zgc.txt              | 1 -
 2 files changed, 2 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-generational-zgc.txt b/test/hotspot/jtreg/ProblemList-generational-zgc.txt
index a92751cc621..4d5e985c0a6 100644
--- a/test/hotspot/jtreg/ProblemList-generational-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-generational-zgc.txt
@@ -116,5 +116,4 @@ serviceability/sa/sadebugd/SADebugDTest.java                  8307393   generic-
 
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64
 
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded002/TestDescription.java 8298302 generic-all
 vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java 8298991 linux-x64
diff --git a/test/hotspot/jtreg/ProblemList-zgc.txt b/test/hotspot/jtreg/ProblemList-zgc.txt
index 4684d8359bc..d7d600aad49 100644
--- a/test/hotspot/jtreg/ProblemList-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-zgc.txt
@@ -47,5 +47,4 @@ serviceability/sa/TestHeapDumpForInvokeDynamic.java           8315646   generic-
 
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64
 
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded002/TestDescription.java 8298302 generic-all
 vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java 8298991 linux-x64

From c7d98df2ac509ebc8f4e801a0874a9497c54c602 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 9 May 2024 15:54:25 +0000
Subject: [PATCH 379/486] 8329691: Support `nonlikelyScript` parent locale
 inheritance

Reviewed-by: joehw
---
 .../tools/cldrconverter/CLDRConverter.java    |  45 +++++-
 .../ResourceBundleGenerator.java              | 141 +++++++++++-------
 .../SupplementalDataParseHandler.java         |  23 ++-
 .../util/cldr/CLDRLocaleProviderAdapter.java  |  20 ++-
 .../locale/provider/NonLikelyScriptTest.java  | 101 +++++++++++++
 5 files changed, 255 insertions(+), 75 deletions(-)
 create mode 100644 test/jdk/sun/util/locale/provider/NonLikelyScriptTest.java

diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
index 8d39ef4c1d5..15251358a01 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -87,6 +87,7 @@ public class CLDRConverter {
     static final String ZONE_NAME_PREFIX = "timezone.displayname.";
     static final String METAZONE_ID_PREFIX = "metazone.id.";
     static final String PARENT_LOCALE_PREFIX = "parentLocale.";
+    static final String LIKELY_SCRIPT_PREFIX = "likelyScript.";
     static final String META_EMPTY_ZONE_NAME = "EMPTY_ZONE";
     static final String[] EMPTY_ZONE = {"", "", "", "", "", ""};
     static final String META_ETCUTC_ZONE_NAME = "ETC_UTC";
@@ -114,9 +115,13 @@ public class CLDRConverter {
 
     // "parentLocales" map
     private static final Map<String, SortedSet<String>> parentLocalesMap = new HashMap<>();
+    static boolean nonlikelyScript;
     private static final ResourceBundle.Control defCon =
         ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT);
 
+    // "likelyScript" map
+    private static final Map<String, SortedSet<String>> likelyScriptMap = new HashMap<>();
+
     private static Set<String> AVAILABLE_TZIDS;
     static int copyrightYear;
     static String jdkHeaderTemplate;
@@ -175,7 +180,7 @@ public class CLDRConverter {
     private static boolean verbose;
 
     private CLDRConverter() {
-       // no instantiation
+        // no instantiation
     }
 
     @SuppressWarnings("AssignmentToForLoopParameter")
@@ -475,8 +480,8 @@ public class CLDRConverter {
         parseLDMLFile(new File(SPPL_SOURCE_FILE), handlerSuppl);
         Map<String, Object> parentData = handlerSuppl.getData("root");
         parentData.keySet().stream()
-                .filter(key -> key.startsWith(PARENT_LOCALE_PREFIX))
-                .forEach(key -> {
+            .filter(key -> key.startsWith(PARENT_LOCALE_PREFIX))
+            .forEach(key -> {
                 parentLocalesMap.put(key, new TreeSet<String>(
                     Arrays.asList(((String)parentData.get(key)).split(" "))));
             });
@@ -492,6 +497,16 @@ public class CLDRConverter {
         // Parse likelySubtags
         handlerLikelySubtags = new LikelySubtagsParseHandler();
         parseLDMLFile(new File(LIKELYSUBTAGS_SOURCE_FILE), handlerLikelySubtags);
+        handlerLikelySubtags.getData().forEach((from, to) -> {
+            if (!from.contains("-")) { // look for language-only tag
+                var script = to.split("-")[1];
+                var key = LIKELY_SCRIPT_PREFIX + script;
+                var prev = likelyScriptMap.putIfAbsent(key, new TreeSet<String>(Set.of(from)));
+                if (prev != null) {
+                    prev.add(from);
+                }
+            }
+        });
 
         // Parse supplementalMetadata
         // Currently interested in deprecated time zone ids and language aliases.
@@ -561,6 +576,7 @@ public class CLDRConverter {
         // for now.
         if (isBaseModule) {
             metaInfo.putAll(parentLocalesMap);
+            metaInfo.putAll(likelyScriptMap);
         }
 
         for (Bundle bundle : bundles) {
@@ -1135,7 +1151,7 @@ public class CLDRConverter {
         // check irregular parents
         for (int i = 0; i < candidates.size(); i++) {
             Locale l = candidates.get(i);
-            Locale p = childToParentLocaleMap.get(l);
+            Locale p = getParentLocale(l);
             if (!l.equals(Locale.ROOT) &&
                 Objects.nonNull(p) &&
                 !candidates.get(i+1).equals(p)) {
@@ -1152,6 +1168,27 @@ public class CLDRConverter {
         return candidates;
     }
 
+    private static Locale getParentLocale(Locale child) {
+        Locale parent = childToParentLocaleMap.get(child);
+
+        // check non-likely script for root
+        if (nonlikelyScript && parent == null && child.getCountry().isEmpty()) {
+            var lang = " " + child.getLanguage() + " ";
+            var script = child.getScript();
+
+            if (!script.isEmpty()) {
+                parent = likelyScriptMap.entrySet().stream()
+                    .filter(e -> e.getValue().contains(lang))
+                    .findAny()
+                    .map(Map.Entry::getKey)
+                    .map(likely -> likely.equals(script) ? null : Locale.ROOT)
+                    .orElse(null);
+            }
+        }
+
+        return parent;
+    }
+
     private static void generateZoneName() throws Exception {
         Files.createDirectories(Paths.get(DESTINATION_DIR, "java", "time", "format"));
         Files.write(Paths.get(DESTINATION_DIR, "java", "time", "format", "ZoneName.java"),
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java b/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
index 49c74544be6..3953f38f653 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -38,6 +38,7 @@ import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
+import java.util.stream.Collectors;
 
 class ResourceBundleGenerator implements BundleGenerator {
     // preferred timezones - keeping compatibility with JDK1.1 3 letter abbreviations
@@ -306,81 +307,77 @@ class ResourceBundleGenerator implements BundleGenerator {
                 import sun.util.locale.provider.LocaleProviderAdapter;
 
                 public class %s implements LocaleDataMetaInfo {
-                    private static final Map<String, String> resourceNameToLocales = HashMap.newHashMap(%d);
-                %s
-                    static {
-                """, CLDRConverter.isBaseModule ? "cldr" : "resources.cldr.provider",
-                className, metaInfo.keySet().stream().filter(k -> k.equals("AvailableLocales")).count(),
-                CLDRConverter.isBaseModule ?
-                    """
+                """,
+                    CLDRConverter.isBaseModule ? "cldr" : "resources.cldr.provider",
+                    className);
+
+            if (CLDRConverter.isBaseModule) {
+                out.printf("""
                         private static final Map<Locale, String[]> parentLocalesMap = HashMap.newHashMap(%d);
                         private static final Map<String, String> languageAliasMap = HashMap.newHashMap(%d);
+                        static final boolean nonlikelyScript = %s; // package access from CLDRLocaleProviderAdapter
+
+                        static {
                     """.formatted(
                         metaInfo.keySet().stream().filter(k -> k.startsWith(CLDRConverter.PARENT_LOCALE_PREFIX)).count(),
-                        CLDRConverter.handlerSupplMeta.getLanguageAliasData().size()) :
-                    "");
+                        CLDRConverter.handlerSupplMeta.getLanguageAliasData().size(),
+                        Boolean.valueOf(CLDRConverter.nonlikelyScript)));
 
-            for (String key : metaInfo.keySet()) {
-                if (key.startsWith(CLDRConverter.PARENT_LOCALE_PREFIX)) {
-                    String parentTag = key.substring(CLDRConverter.PARENT_LOCALE_PREFIX.length());
-                    if ("root".equals(parentTag)) {
-                        out.printf("        parentLocalesMap.put(Locale.ROOT,\n");
-                    } else {
-                        out.printf("        parentLocalesMap.put(Locale.forLanguageTag(\"%s\"),\n",
-                                   parentTag);
-                    }
-                    String[] children = toLocaleList(metaInfo.get(key), true).split(" ");
-                    Arrays.sort(children);
-                    out.printf("            new String[] {\n" +
-                               "                ");
-                    int count = 0;
-                    for (int i = 0; i < children.length; i++) {
-                        String child = children[i];
-                        out.printf("\"%s\", ", child);
-                        count += child.length() + 4;
-                        if (i != children.length - 1 && count > 64) {
-                            out.printf("\n                ");
-                            count = 0;
+                for (String key : metaInfo.keySet()) {
+                    if (key.startsWith(CLDRConverter.PARENT_LOCALE_PREFIX)) {
+                        String parentTag = key.substring(CLDRConverter.PARENT_LOCALE_PREFIX.length());
+                        if ("root".equals(parentTag)) {
+                            out.printf("        parentLocalesMap.put(Locale.ROOT,\n");
+                        } else {
+                            out.printf("        parentLocalesMap.put(Locale.forLanguageTag(\"%s\"),\n",
+                                    parentTag);
                         }
-                    }
-                    out.printf("\n            });\n");
-                } else {
-                    if ("AvailableLocales".equals(key)) {
-                        out.printf("        resourceNameToLocales.put(\"%s\",\n", key);
-                        out.printf("            \"%s\");\n", toLocaleList(applyLanguageAliases(metaInfo.get(key)), false));
+                        generateStringArray(metaInfo.get(key), out);
                     }
                 }
-            }
-            // for languageAliasMap
-            if (CLDRConverter.isBaseModule) {
+                out.println();
+
+                // for languageAliasMap
                 CLDRConverter.handlerSupplMeta.getLanguageAliasData().forEach((key, value) -> {
                     out.printf("        languageAliasMap.put(\"%s\", \"%s\");\n", key, value);
                 });
-            }
+                out.printf("    }\n\n");
 
-            out.printf("    }\n\n");
+                // end of static initializer block.
 
-            // end of static initializer block.
-
-            // Canonical TZ names for delayed initialization
-            if (CLDRConverter.isBaseModule) {
+                // Delayed initialization section
                 out.printf("""
-                               private static class TZCanonicalIDMapHolder {
-                                   static final Map<String, String> tzCanonicalIDMap = HashMap.newHashMap(%d);
+                               private static class CLDRMapHolder {
+                                   private static final Map<String, String> tzCanonicalIDMap = HashMap.newHashMap(%d);
+                                   private static final Map<String, String> likelyScriptMap = HashMap.newHashMap(%d);
+
                                    static {
-                           """, CLDRConverter.handlerTimeZone.getData().size());
+                           """, CLDRConverter.handlerTimeZone.getData().size(),
+                                metaInfo.keySet().stream().filter(k -> k.startsWith(CLDRConverter.LIKELY_SCRIPT_PREFIX)).count());
                 CLDRConverter.handlerTimeZone.getData().entrySet().stream()
                     .forEach(e -> {
                         String[] ids = ((String)e.getValue()).split("\\s");
                         out.printf("            tzCanonicalIDMap.put(\"%s\", \"%s\");\n", e.getKey(),
-                                ids[0]);
+                            ids[0]);
                         for (int i = 1; i < ids.length; i++) {
                             out.printf("            tzCanonicalIDMap.put(\"%s\", \"%s\");\n", ids[i],
                                 ids[0]);
                         }
                     });
-                out.printf("        }\n    }\n\n");
+                out.println();
+
+                // for likelyScript map
+                for (String key : metaInfo.keySet()) {
+                    if (key.startsWith(CLDRConverter.LIKELY_SCRIPT_PREFIX)) {
+                        // ensure spaces at the begin/end for delimiting purposes
+                        out.printf("            likelyScriptMap.put(\"%s\", \"%s\");\n",
+                                key.substring(CLDRConverter.LIKELY_SCRIPT_PREFIX.length()),
+                                " " + metaInfo.get(key).stream().collect(Collectors.joining(" ")) + " ");
+                    }
+                }
+                out.printf("        }\n    }\n");
             }
+            out.println();
 
             out.printf("""
                     @Override
@@ -390,12 +387,13 @@ class ResourceBundleGenerator implements BundleGenerator {
 
                     @Override
                     public String availableLanguageTags(String category) {
-                        return resourceNameToLocales.getOrDefault(category, "");
+                        return " %s";
                     }
-                    %s
-                }
                 """,
-                CLDRConverter.isBaseModule ? """
+                toLocaleList(applyLanguageAliases(metaInfo.get("AvailableLocales")), false));
+
+            if(CLDRConverter.isBaseModule) {
+                out.printf("""
 
                     @Override
                     public Map<String, String> getLanguageAliasMap() {
@@ -404,16 +402,41 @@ class ResourceBundleGenerator implements BundleGenerator {
 
                     @Override
                     public Map<String, String> tzCanonicalIDs() {
-                        return TZCanonicalIDMapHolder.tzCanonicalIDMap;
+                        return CLDRMapHolder.tzCanonicalIDMap;
                     }
 
                     public Map<Locale, String[]> parentLocales() {
                         return parentLocalesMap;
                     }
-                """ : "");
+
+                    // package access from CLDRLocaleProviderAdapter
+                    Map<String, String> likelyScriptMap() {
+                        return CLDRMapHolder.likelyScriptMap;
+                    }
+                """);
+            }
+            out.printf("}\n");
         }
     }
 
+    private static void generateStringArray(SortedSet<String> set, PrintWriter out) throws IOException {
+        String[] children = toLocaleList(set, true).split(" ");
+        Arrays.sort(children);
+        out.printf("            new String[] {\n" +
+                "                ");
+        int count = 0;
+        for (int i = 0; i < children.length; i++) {
+            String child = children[i];
+            out.printf("\"%s\", ", child);
+            count += child.length() + 4;
+            if (i != children.length - 1 && count > 64) {
+                out.printf("\n                ");
+                count = 0;
+            }
+        }
+        out.printf("\n            });\n");
+    }
+
     private static final Locale.Builder LOCALE_BUILDER = new Locale.Builder();
     private static boolean isBaseLocale(String localeID) {
         localeID = localeID.replaceAll("-", "_");
@@ -433,7 +456,9 @@ class ResourceBundleGenerator implements BundleGenerator {
                 if (!all && CLDRConverter.isBaseModule ^ isBaseLocale(id)) {
                     continue;
                 }
-                sb.append(' ');
+                if (sb.length() > 0) {
+                    sb.append(' ');
+                }
                 sb.append(id);
             }
         }
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/SupplementalDataParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/SupplementalDataParseHandler.java
index f4d20160ffb..9ba4d645199 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/SupplementalDataParseHandler.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/SupplementalDataParseHandler.java
@@ -57,29 +57,22 @@ class SupplementalDataParseHandler extends AbstractLDMLHandler<Object> {
     // the weekData is listed using country code.
     //
     // weekData are generated per each country
-    private final Map<String, Object> firstDayMap;
-    private final Map<String, Object> minDaysMap;
+    private static final Map<String, Object> firstDayMap = new HashMap<>();
+    private static final Map<String, Object> minDaysMap = new HashMap<>();
 
     // Parent locales. These information will only be
     // generated towards the base meta info, with the format of
     //
     // parentLocale.<parent_locale_id>=<child_locale_id>(" "<child_locale_id>)+
-    private final Map<String, String> parentLocalesMap;
+    private static final Map<String, String> parentLocalesMap = new HashMap<>();
 
     // Input Skeleton map for "preferred" and "allowed"
     // Map<"preferred"/"allowed", Map<"skeleton", SortedSet<"regions">>>
-    private final Map<String, Map<String, SortedSet<String>>> inputSkeletonMap;
+    private static final Map<String, Map<String, SortedSet<String>>> inputSkeletonMap = new HashMap<>();
 
     // "component" specific to this parent locale chain
     private String currentParentLocaleComponent;
 
-    SupplementalDataParseHandler() {
-        firstDayMap = new HashMap<>();
-        minDaysMap = new HashMap<>();
-        parentLocalesMap = new HashMap<>();
-        inputSkeletonMap = new HashMap<>();
-    }
-
     /**
      * It returns Map that contains the firstDay and minDays information for
      * the country. The Map is created in JRE format after obtaining the data
@@ -158,9 +151,15 @@ class SupplementalDataParseHandler extends AbstractLDMLHandler<Object> {
                 // Ignore component for now, otherwise "zh-Hant" falling back to "zh" would happen
                 // https://github.com/unicode-org/cldr/pull/2664
                 if (currentParentLocaleComponent == null) {
+                    var parent = attributes.getValue("parent").replaceAll("_", "-");
+
                     parentLocalesMap.put(
-                        attributes.getValue("parent").replaceAll("_", "-"),
+                        parent,
                         attributes.getValue("locales").replaceAll("_", "-"));
+
+                    if ("root".equals(parent)) {
+                        CLDRConverter.nonlikelyScript = "nonlikelyScript".equals(attributes.getValue("localeRules"));
+                    }
                 }
             }
             break;
diff --git a/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
index 9f65e32fa27..0ce080c2054 100644
--- a/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
+++ b/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -259,6 +259,24 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
                     break;
                 }
             }
+
+            if (parent == null) {
+                // check nonlikelyScript locales
+                if (CLDRBaseLocaleDataMetaInfo.nonlikelyScript && locale.getCountry().isEmpty()) {
+                    var lang = " " + locale.getLanguage() + " ";
+                    var script= locale.getScript();
+                    if (!script.isEmpty()) {
+                        parent = baseMetaInfo.likelyScriptMap().entrySet().stream()
+                            .filter(e -> e.getValue().contains(lang))
+                            .findAny()
+                            .map(Map.Entry::getKey)
+                            .map(likely -> likely.equals(script) ? null : Locale.ROOT)
+                            .orElse(null);
+                    }
+                }
+            }
+
+            // no parent found
             if (parent == null) {
                 parent = locale; // non existent marker
             }
diff --git a/test/jdk/sun/util/locale/provider/NonLikelyScriptTest.java b/test/jdk/sun/util/locale/provider/NonLikelyScriptTest.java
new file mode 100644
index 00000000000..dbbfaf6f005
--- /dev/null
+++ b/test/jdk/sun/util/locale/provider/NonLikelyScriptTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2024, 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 8329691
+ * @modules java.base/sun.util.locale.provider
+ *          java.base/sun.util.cldr
+ * @summary Tests CLDR's `nonlikelyScript` attribute is correctly implemented
+ *      with the CLDRLocaleProviderAdapter
+ * @run junit NonLikelyScriptTest
+ */
+
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import sun.util.cldr.CLDRLocaleProviderAdapter;
+import sun.util.locale.provider.LocaleProviderAdapter;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class NonLikelyScriptTest {
+    private static final CLDRLocaleProviderAdapter CLDR_LOCALE_PROVIDER_ADAPTER
+        = (CLDRLocaleProviderAdapter) LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR);
+    private static final Locale AZ_ARAB = Locale.forLanguageTag("az-Arab");
+    private static final Locale AZ_CYRL = Locale.forLanguageTag("az-Cyrl");
+    private static final Locale AZ_LATN = Locale.forLanguageTag("az-Latn");
+    private static final Locale AZ_XXXX = Locale.forLanguageTag("az-Xxxx");
+    private static final Locale RU_LATN = Locale.forLanguageTag("ru-Latn");
+    private static final Locale RU_CYRL = Locale.forLanguageTag("ru-Cyrl");
+    private static final Locale RU_XXXX = Locale.forLanguageTag("ru-Xxxx");
+    private static final Locale EN_LATN = Locale.forLanguageTag("en-Latn");
+    private static final Locale EN_DSRT = Locale.forLanguageTag("en-Dsrt");
+    private static final Locale EN_XXXX = Locale.forLanguageTag("en-Xxxx");
+    private static final Locale ZH_HANT_MO = Locale.forLanguageTag("zh-Hant-MO");
+    private static final Locale ZH_HANS_SG = Locale.forLanguageTag("zh-Hans-SG");
+    private static final Locale ZH_HANS = Locale.forLanguageTag("zh-Hans");
+    private static final Locale ZH_HANT = Locale.forLanguageTag("zh-Hant");
+    private static final Locale ZH_XXXX = Locale.forLanguageTag("zh-Xxxx");
+
+    private static Stream<Arguments> parentLocales() {
+
+        return Stream.of(
+            // likely script
+            Arguments.of(AZ_LATN, List.of(AZ_LATN, Locale.of("az"), Locale.ROOT)),
+            Arguments.of(RU_CYRL, List.of(RU_CYRL, Locale.of("ru"), Locale.ROOT)),
+            Arguments.of(EN_LATN, List.of(EN_LATN, Locale.ENGLISH, Locale.ROOT)),
+            Arguments.of(ZH_HANS, List.of(ZH_HANS, Locale.CHINA, Locale.CHINESE, Locale.ROOT)),
+            Arguments.of(Locale.CHINA, List.of(Locale.forLanguageTag("zh-Hans-CN"), ZH_HANS, Locale.CHINA, Locale.CHINESE, Locale.ROOT)),
+            Arguments.of(ZH_HANS_SG, List.of(ZH_HANS_SG, ZH_HANS, Locale.forLanguageTag("zh-SG"), Locale.CHINESE, Locale.ROOT)),
+
+            // non-likely script, explicit (as of CLDR 45)
+            Arguments.of(AZ_ARAB, List.of(AZ_ARAB, Locale.ROOT)),
+            Arguments.of(AZ_CYRL, List.of(AZ_CYRL, Locale.ROOT)),
+            Arguments.of(EN_DSRT, List.of(EN_DSRT, Locale.ROOT)),
+            Arguments.of(ZH_HANT, List.of(ZH_HANT, Locale.ROOT)),
+            Arguments.of(Locale.TAIWAN, List.of(Locale.forLanguageTag("zh-Hant-TW"), ZH_HANT, Locale.ROOT)),
+            Arguments.of(ZH_HANT_MO, List.of(ZH_HANT_MO, Locale.forLanguageTag("zh-Hant-HK"), ZH_HANT, Locale.ROOT)),
+
+            // non-likely script, implicit
+            Arguments.of(AZ_XXXX, List.of(AZ_XXXX, Locale.ROOT)),
+            Arguments.of(RU_LATN, List.of(RU_LATN, Locale.ROOT)),
+            Arguments.of(RU_XXXX, List.of(RU_XXXX, Locale.ROOT)),
+            Arguments.of(EN_XXXX, List.of(EN_XXXX, Locale.ROOT)),
+            Arguments.of(ZH_XXXX, List.of(ZH_XXXX, Locale.ROOT))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("parentLocales")
+    public void checkParentLocales(Locale locale, List<Locale> expected) {
+        var actual = CLDR_LOCALE_PROVIDER_ADAPTER.getCandidateLocales("", locale);
+        assertEquals(expected, actual);
+    }
+}

From ffbdfffbc702253f32fa45dc1855b663c72074a6 Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Thu, 9 May 2024 18:01:27 +0000
Subject: [PATCH 380/486] 8331999: BasicDirectoryModel/LoaderThreadCount.java
 frequently fails on Windows in CI

Introduce tolerance factor: count > loaderCount.size() / 2
Fail the test only if the number of snapshots with more than
2 file loader threads is greater than half of the number
of valid snapshots.

Reviewed-by: prr, honkar
---
 .../swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
index 689aca5bbdb..770c8f92b26 100644
--- a/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
+++ b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java
@@ -164,7 +164,7 @@ public final class LoaderThreadCount extends ThreadGroup {
             System.out.println("  = 1: " + ones);
             System.out.println("  = 2: " + twos);
             System.out.println("  > 2: " + count);
-            if (count > 0) {
+            if (count > loaderCount.size() / 2) {
                 throw new RuntimeException("Detected " + count + " snapshots "
                                            + "with several loading threads");
             }

From 0bf728212fb4bce067076780aaa5b9341d7cdb6b Mon Sep 17 00:00:00 2001
From: Mikhailo Seledtsov <mseledtsov@openjdk.org>
Date: Thu, 9 May 2024 22:53:10 +0000
Subject: [PATCH 381/486] 8331231: containers/docker/TestContainerInfo.java
 fails

Reviewed-by: dholmes
---
 test/hotspot/jtreg/containers/docker/TestContainerInfo.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/containers/docker/TestContainerInfo.java b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
index dadc262cd5a..6bcb706fa7a 100644
--- a/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
+++ b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
@@ -26,6 +26,7 @@
 /*
  * @test
  * @summary Test container info for cgroup v2
+ * @key cgroups
  * @requires docker.support
  * @library /test/lib
  * @modules java.base/jdk.internal.misc

From d47a4e9f63a9414b90e09514bc26f6f7142ad49f Mon Sep 17 00:00:00 2001
From: Zhao Song <zsong@openjdk.org>
Date: Thu, 9 May 2024 23:05:05 +0000
Subject: [PATCH 382/486] 8332008: Enable issuestitle check

Reviewed-by: erikj
---
 .jcheck/conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.jcheck/conf b/.jcheck/conf
index 17552ee7361..617f3d95ed8 100644
--- a/.jcheck/conf
+++ b/.jcheck/conf
@@ -5,6 +5,7 @@ version=23
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
+warning=issuestitle
 
 [repository]
 tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)

From a643d6c7ac8a7bc0d3a288c1ef3f07876cf70590 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Thu, 9 May 2024 23:37:45 +0000
Subject: [PATCH 383/486] 8331862: Remove split relocation info implementation

Reviewed-by: dlong
---
 src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp |  2 +-
 src/hotspot/cpu/arm/relocInfo_arm.cpp         |  8 +-
 src/hotspot/cpu/ppc/relocInfo_ppc.cpp         |  7 +-
 src/hotspot/cpu/riscv/relocInfo_riscv.cpp     |  4 +-
 src/hotspot/cpu/s390/assembler_s390.hpp       |  6 +-
 src/hotspot/cpu/s390/relocInfo_s390.cpp       | 14 ++-
 src/hotspot/cpu/x86/relocInfo_x86.cpp         |  9 +-
 src/hotspot/cpu/zero/relocInfo_zero.cpp       |  4 +-
 src/hotspot/share/code/relocInfo.cpp          | 40 ++------
 src/hotspot/share/code/relocInfo.hpp          | 93 +++++++------------
 10 files changed, 62 insertions(+), 125 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp b/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
index 5424f0d9c75..332f2499693 100644
--- a/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
@@ -32,7 +32,7 @@
 #include "runtime/safepoint.hpp"
 
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   if (verify_only)
     return;
 
diff --git a/src/hotspot/cpu/arm/relocInfo_arm.cpp b/src/hotspot/cpu/arm/relocInfo_arm.cpp
index fc5b2981ce6..fb112cdcfc0 100644
--- a/src/hotspot/cpu/arm/relocInfo_arm.cpp
+++ b/src/hotspot/cpu/arm/relocInfo_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,13 +30,13 @@
 #include "oops/oop.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
 
   NativeMovConstReg* ni = nativeMovConstReg_at(addr());
   if (verify_only) {
-    guarantee(ni->data() == (intptr_t)(x + o), "instructions must match");
+    guarantee(ni->data() == (intptr_t)x, "instructions must match");
   } else {
-    ni->set_data((intptr_t)(x + o));
+    ni->set_data((intptr_t)x);
   }
 }
 
diff --git a/src/hotspot/cpu/ppc/relocInfo_ppc.cpp b/src/hotspot/cpu/ppc/relocInfo_ppc.cpp
index 39e50465231..5d0d2785bf4 100644
--- a/src/hotspot/cpu/ppc/relocInfo_ppc.cpp
+++ b/src/hotspot/cpu/ppc/relocInfo_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,10 +32,7 @@
 #include "oops/oop.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
-  // Currently we don't support splitting of relocations.
-  assert(o == 0, "tried to split relocations");
-
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   if (!verify_only) {
     if (format() != 1) {
       nativeMovConstReg_at(addr())->set_data_plain(((intptr_t)x), code());
diff --git a/src/hotspot/cpu/riscv/relocInfo_riscv.cpp b/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
index 0e50d0b0796..b3cdb93a979 100644
--- a/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
+++ b/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +31,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   if (verify_only) {
     return;
   }
diff --git a/src/hotspot/cpu/s390/assembler_s390.hpp b/src/hotspot/cpu/s390/assembler_s390.hpp
index 91cc7e611bf..cf80d164faf 100644
--- a/src/hotspot/cpu/s390/assembler_s390.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -352,10 +352,6 @@ class AddressLiteral {
 
   relocInfo::relocType rtype()       const { return _rspec.type(); }
   const RelocationHolder&    rspec() const { return _rspec; }
-
-  RelocationHolder rspec(int offset) const {
-    return offset == 0 ? _rspec : _rspec.plus(offset);
-  }
 };
 
 // Convenience classes
diff --git a/src/hotspot/cpu/s390/relocInfo_s390.cpp b/src/hotspot/cpu/s390/relocInfo_s390.cpp
index 747ae9c535d..9e352be20a3 100644
--- a/src/hotspot/cpu/s390/relocInfo_s390.cpp
+++ b/src/hotspot/cpu/s390/relocInfo_s390.cpp
@@ -30,27 +30,25 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
-  // we don't support splitting of relocations, so o must be zero:
-  assert(o == 0, "tried to split relocations");
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   if (!verify_only) {
     switch (format()) {
       case relocInfo::uncompressed_format:
-        nativeMovConstReg_at(addr())->set_data_plain(((intptr_t)x) + o, code());
+        nativeMovConstReg_at(addr())->set_data_plain(((intptr_t)x), code());
         break;
       case relocInfo::compressed_format:
         if (type() == relocInfo::metadata_type)
-          nativeMovConstReg_at(addr())->set_narrow_klass(((intptr_t)x) + o);
+          nativeMovConstReg_at(addr())->set_narrow_klass(((intptr_t)x));
         else if (type() == relocInfo::oop_type)
-          nativeMovConstReg_at(addr())->set_narrow_oop(((intptr_t)x) + o);
+          nativeMovConstReg_at(addr())->set_narrow_oop(((intptr_t)x));
         else
           guarantee(false, "bad relocInfo type for relocInfo::narrow_oop_format");
         break;
       case relocInfo::pcrel_addr_format:  // patch target location
-        nativeMovConstReg_at(addr())->set_pcrel_addr(((intptr_t)x) + o, code());
+        nativeMovConstReg_at(addr())->set_pcrel_addr(((intptr_t)x), code());
         break;
       case relocInfo::pcrel_data_format:  // patch data at target location
-        nativeMovConstReg_at(addr())->set_pcrel_data(((intptr_t)x) + o, code());
+        nativeMovConstReg_at(addr())->set_pcrel_data(((intptr_t)x), code());
         break;
       default:
         assert(false, "not a valid relocInfo format");
diff --git a/src/hotspot/cpu/x86/relocInfo_x86.cpp b/src/hotspot/cpu/x86/relocInfo_x86.cpp
index db806419b51..d7fddf838ac 100644
--- a/src/hotspot/cpu/x86/relocInfo_x86.cpp
+++ b/src/hotspot/cpu/x86/relocInfo_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,8 @@
 #include "utilities/checkedCast.hpp"
 
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
 #ifdef AMD64
-  x += o;
   typedef Assembler::WhichOperand WhichOperand;
   WhichOperand which = (WhichOperand) format(); // that is, disp32 or imm, call32, narrow oop
   assert(which == Assembler::disp32_operand ||
@@ -80,9 +79,9 @@ void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
   }
 #else
   if (verify_only) {
-    guarantee(*pd_address_in_code() == (x + o), "instructions must match");
+    guarantee(*pd_address_in_code() == x, "instructions must match");
   } else {
-    *pd_address_in_code() = x + o;
+    *pd_address_in_code() = x;
   }
 #endif // AMD64
 }
diff --git a/src/hotspot/cpu/zero/relocInfo_zero.cpp b/src/hotspot/cpu/zero/relocInfo_zero.cpp
index 1e9fdc1081d..b926f20cfe7 100644
--- a/src/hotspot/cpu/zero/relocInfo_zero.cpp
+++ b/src/hotspot/cpu/zero/relocInfo_zero.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2009, 2010, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,7 +30,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+void Relocation::pd_set_data_value(address x, bool verify_only) {
   ShouldNotCallThis();
 }
 
diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp
index 69ff4bc78d6..d0f732edac4 100644
--- a/src/hotspot/share/code/relocInfo.cpp
+++ b/src/hotspot/share/code/relocInfo.cpp
@@ -277,30 +277,6 @@ DEFINE_COPY_INTO_AUX(Relocation)
 #undef DEFINE_COPY_INTO_AUX
 #undef DEFINE_COPY_INTO
 
-//////// Methods for RelocationHolder
-
-RelocationHolder RelocationHolder::plus(int offset) const {
-  if (offset != 0) {
-    switch (type()) {
-    case relocInfo::none:
-      break;
-    case relocInfo::oop_type:
-      {
-        oop_Relocation* r = (oop_Relocation*)reloc();
-        return oop_Relocation::spec(r->oop_index(), r->offset() + offset);
-      }
-    case relocInfo::metadata_type:
-      {
-        metadata_Relocation* r = (metadata_Relocation*)reloc();
-        return metadata_Relocation::spec(r->metadata_index(), r->offset() + offset);
-      }
-    default:
-      ShouldNotReachHere();
-    }
-  }
-  return (*this);
-}
-
 //////// Methods for flyweight Relocation types
 
 // some relocations can compute their own values
@@ -402,24 +378,24 @@ void CallRelocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer
 
 void oop_Relocation::pack_data_to(CodeSection* dest) {
   short* p = (short*) dest->locs_end();
-  p = pack_2_ints_to(p, _oop_index, _offset);
+  p = pack_1_int_to(p, _oop_index);
   dest->set_locs_end((relocInfo*) p);
 }
 
 
 void oop_Relocation::unpack_data() {
-  unpack_2_ints(_oop_index, _offset);
+  _oop_index = unpack_1_int();
 }
 
 void metadata_Relocation::pack_data_to(CodeSection* dest) {
   short* p = (short*) dest->locs_end();
-  p = pack_2_ints_to(p, _metadata_index, _offset);
+  p = pack_1_int_to(p, _metadata_index);
   dest->set_locs_end((relocInfo*) p);
 }
 
 
 void metadata_Relocation::unpack_data() {
-  unpack_2_ints(_metadata_index, _offset);
+  _metadata_index = unpack_1_int();
 }
 
 
@@ -855,8 +831,8 @@ void RelocIterator::print_current() {
         raw_oop   = *oop_addr;
         oop_value = r->oop_value();
       }
-      tty->print(" | [oop_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT " offset=%d]",
-                 p2i(oop_addr), p2i(raw_oop), r->offset());
+      tty->print(" | [oop_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT "]",
+                 p2i(oop_addr), p2i(raw_oop));
       // Do not print the oop by default--we want this routine to
       // work even during GC or other inconvenient times.
       if (WizardMode && oop_value != nullptr) {
@@ -878,8 +854,8 @@ void RelocIterator::print_current() {
         raw_metadata   = *metadata_addr;
         metadata_value = r->metadata_value();
       }
-      tty->print(" | [metadata_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT " offset=%d]",
-                 p2i(metadata_addr), p2i(raw_metadata), r->offset());
+      tty->print(" | [metadata_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT "]",
+                 p2i(metadata_addr), p2i(raw_metadata));
       if (metadata_value != nullptr) {
         tty->print("metadata_value=" INTPTR_FORMAT ": ", p2i(metadata_value));
         metadata_value->print_value_on(tty);
diff --git a/src/hotspot/share/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp
index 9f1db9f4684..6d0907d97de 100644
--- a/src/hotspot/share/code/relocInfo.hpp
+++ b/src/hotspot/share/code/relocInfo.hpp
@@ -129,12 +129,7 @@ class nmethod;
 //   Value:  an oop, or else the address (handle) of an oop
 //   Instruction types: memory (load), set (load address)
 //   Data:  []       an oop stored in 4 bytes of instruction
-//          [n]      n is the index of an oop in the CodeBlob's oop pool
-//          [[N]n l] and l is a byte offset to be applied to the oop
-//          [Nn Ll]  both index and offset may be 32 bits if necessary
-//   Here is a special hack, used only by the old compiler:
-//          [[N]n 00] the value is the __address__ of the nth oop in the pool
-//   (Note that the offset allows optimal references to class variables.)
+//          [[N]n]   the index of an oop in the CodeBlob's oop pool
 //
 // relocInfo::internal_word_type -- an address within the same CodeBlob
 // relocInfo::section_word_type -- same, but can refer to another section
@@ -515,9 +510,6 @@ class RelocationHolder {
   Relocation* reloc() const { return (Relocation*)_relocbuf; }
   inline relocInfo::relocType type() const;
 
-  // Add a constant offset to a relocation.  Helper for class Address.
-  RelocationHolder plus(int offset) const;
-
   // Return a holder containing a relocation of type Reloc, constructed using args.
   template<typename Reloc, typename... Args>
   static RelocationHolder construct(const Args&... args) {
@@ -788,8 +780,8 @@ class Relocation {
   void       const_set_data_value    (address x);
   void       const_verify_data_value (address x);
   // platform-dependent utilities for decoding and patching instructions
-  void       pd_set_data_value       (address x, intptr_t off, bool verify_only = false); // a set or mem-ref
-  void       pd_verify_data_value    (address x, intptr_t off) { pd_set_data_value(x, off, true); }
+  void       pd_set_data_value       (address x, bool verify_only = false); // a set or mem-ref
+  void       pd_verify_data_value    (address x) { pd_set_data_value(x, true); }
   address    pd_call_destination     (address orig_addr = nullptr);
   void       pd_set_call_destination (address x);
 
@@ -895,41 +887,28 @@ relocInfo::relocType RelocationHolder::type() const {
 // A DataRelocation always points at a memory or load-constant instruction..
 // It is absolute on most machines, and the constant is split on RISCs.
 // The specific subtypes are oop, external_word, and internal_word.
-// By convention, the "value" does not include a separately reckoned "offset".
 class DataRelocation : public Relocation {
  public:
   DataRelocation(relocInfo::relocType type) : Relocation(type) {}
 
-  bool          is_data() override             { return true; }
+  bool    is_data() override { return true; }
 
-  // both target and offset must be computed somehow from relocation data
-  virtual int    offset()                      { return 0; }
-  address         value() override             = 0;
-  void        set_value(address x) override    { set_value(x, offset()); }
-  void        set_value(address x, intptr_t o) {
-    if (addr_in_const())
+  // target must be computed somehow from relocation data
+  address value() override = 0;
+  void    set_value(address x) override {
+    if (addr_in_const()) {
       const_set_data_value(x);
-    else
-      pd_set_data_value(x, o);
+    } else {
+      pd_set_data_value(x);
+    }
   }
-  void        verify_value(address x) {
-    if (addr_in_const())
+  void    verify_value(address x) {
+    if (addr_in_const()) {
       const_verify_data_value(x);
-    else
-      pd_verify_data_value(x, offset());
+    } else {
+      pd_verify_data_value(x);
+    }
   }
-
-  // The "o" (displacement) argument is relevant only to split relocations
-  // on RISC machines.  In some CPUs (SPARC), the set-hi and set-lo ins'ns
-  // can encode more than 32 bits between them.  This allows compilers to
-  // share set-hi instructions between addresses that differ by a small
-  // offset (e.g., different static variables in the same class).
-  // On such machines, the "x" argument to set_value on all set-lo
-  // instructions must be the same as the "x" argument for the
-  // corresponding set-hi instructions.  The "o" arguments for the
-  // set-hi instructions are ignored, and must not affect the high-half
-  // immediate constant.  The "o" arguments for the set-lo instructions are
-  // added into the low-half immediate constant, and must not overflow it.
 };
 
 class post_call_nop_Relocation : public Relocation {
@@ -976,40 +955,36 @@ class CallRelocation : public Relocation {
 
 class oop_Relocation : public DataRelocation {
  public:
-  // encode in one of these formats:  [] [n] [n l] [Nn l] [Nn Ll]
-  // an oop in the CodeBlob's oop pool
-  static RelocationHolder spec(int oop_index, int offset = 0) {
+  // an oop in the CodeBlob's oop pool; encoded as [n] or [Nn]
+  static RelocationHolder spec(int oop_index) {
     assert(oop_index > 0, "must be a pool-resident oop");
-    return RelocationHolder::construct<oop_Relocation>(oop_index, offset);
+    return RelocationHolder::construct<oop_Relocation>(oop_index);
   }
-  // an oop in the instruction stream
+  // an oop in the instruction stream; encoded as []
   static RelocationHolder spec_for_immediate() {
     // If no immediate oops are generated, we can skip some walks over nmethods.
     // Assert that they don't get generated accidentally!
     assert(relocInfo::mustIterateImmediateOopsInCode(),
            "Must return true so we will search for oops as roots etc. in the code.");
     const int oop_index = 0;
-    const int offset    = 0;    // if you want an offset, use the oop pool
-    return RelocationHolder::construct<oop_Relocation>(oop_index, offset);
+    return RelocationHolder::construct<oop_Relocation>(oop_index);
   }
 
   void copy_into(RelocationHolder& holder) const override;
 
  private:
   jint _oop_index;                  // if > 0, index into CodeBlob::oop_at
-  jint _offset;                     // byte offset to apply to the oop itself
 
-  oop_Relocation(int oop_index, int offset)
-    : DataRelocation(relocInfo::oop_type), _oop_index(oop_index), _offset(offset) { }
+  oop_Relocation(int oop_index)
+    : DataRelocation(relocInfo::oop_type), _oop_index(oop_index) { }
 
   friend class RelocationHolder;
   oop_Relocation() : DataRelocation(relocInfo::oop_type) {}
 
  public:
   int oop_index() { return _oop_index; }
-  int offset() override { return _offset; }
 
-  // data is packed in "2_ints" format:  [i o] or [Ii Oo]
+  // oop_index is packed in "1_int" format:  [n] or [Nn]
   void pack_data_to(CodeSection* dest) override;
   void unpack_data() override;
 
@@ -1031,27 +1006,24 @@ class oop_Relocation : public DataRelocation {
 class metadata_Relocation : public DataRelocation {
 
  public:
-  // encode in one of these formats:  [] [n] [n l] [Nn l] [Nn Ll]
-  // an metadata in the CodeBlob's metadata pool
-  static RelocationHolder spec(int metadata_index, int offset = 0) {
+  // an metadata in the CodeBlob's metadata pool; encoded as [n] or [Nn]
+  static RelocationHolder spec(int metadata_index) {
     assert(metadata_index > 0, "must be a pool-resident metadata");
-    return RelocationHolder::construct<metadata_Relocation>(metadata_index, offset);
+    return RelocationHolder::construct<metadata_Relocation>(metadata_index);
   }
-  // an metadata in the instruction stream
+  // an metadata in the instruction stream; encoded as []
   static RelocationHolder spec_for_immediate() {
     const int metadata_index = 0;
-    const int offset    = 0;    // if you want an offset, use the metadata pool
-    return RelocationHolder::construct<metadata_Relocation>(metadata_index, offset);
+    return RelocationHolder::construct<metadata_Relocation>(metadata_index);
   }
 
   void copy_into(RelocationHolder& holder) const override;
 
  private:
   jint _metadata_index;            // if > 0, index into nmethod::metadata_at
-  jint _offset;                     // byte offset to apply to the metadata itself
 
-  metadata_Relocation(int metadata_index, int offset)
-    : DataRelocation(relocInfo::metadata_type), _metadata_index(metadata_index), _offset(offset) { }
+  metadata_Relocation(int metadata_index)
+    : DataRelocation(relocInfo::metadata_type), _metadata_index(metadata_index) { }
 
   friend class RelocationHolder;
   metadata_Relocation() : DataRelocation(relocInfo::metadata_type) { }
@@ -1063,9 +1035,8 @@ class metadata_Relocation : public DataRelocation {
 
  public:
   int metadata_index() { return _metadata_index; }
-  int offset() override { return _offset; }
 
-  // data is packed in "2_ints" format:  [i o] or [Ii Oo]
+  // metadata_index is packed in "1_int" format:  [n] or [Nn]
   void pack_data_to(CodeSection* dest) override;
   void unpack_data() override;
 

From a706ca4fdb4db4ba36c6ad04a37c37a348f8af0b Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Fri, 10 May 2024 01:34:02 +0000
Subject: [PATCH 384/486] 8329418: Replace pointers to tables with offsets in
 relocation bitmap

Reviewed-by: cjplummer, iklam
---
 src/hotspot/share/cds/archiveBuilder.cpp      | 20 +++---
 src/hotspot/share/cds/archiveBuilder.hpp      | 16 ++---
 src/hotspot/share/cds/archiveUtils.cpp        | 28 ++-------
 src/hotspot/share/cds/archiveUtils.hpp        |  7 ++-
 src/hotspot/share/cds/cppVtables.cpp          | 21 ++++---
 src/hotspot/share/cds/cppVtables.hpp          |  5 +-
 src/hotspot/share/cds/dynamicArchive.cpp      |  2 +-
 src/hotspot/share/cds/metaspaceShared.cpp     |  4 +-
 src/hotspot/share/cds/serializeClosure.hpp    | 16 ++++-
 src/hotspot/share/classfile/vmSymbols.cpp     |  4 +-
 .../sun/jvm/hotspot/memory/FileMapInfo.java   | 63 ++++++++++++++-----
 11 files changed, 113 insertions(+), 73 deletions(-)

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 51399f03434..a98fd04ba68 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -146,7 +146,7 @@ void ArchiveBuilder::SourceObjList::relocate(int i, ArchiveBuilder* builder) {
 }
 
 ArchiveBuilder::ArchiveBuilder() :
-  _current_dump_space(nullptr),
+  _current_dump_region(nullptr),
   _buffer_bottom(nullptr),
   _last_verified_top(nullptr),
   _num_dump_regions_used(0),
@@ -341,10 +341,10 @@ address ArchiveBuilder::reserve_buffer() {
 
   _buffer_bottom = buffer_bottom;
   _last_verified_top = buffer_bottom;
-  _current_dump_space = &_rw_region;
+  _current_dump_region = &_rw_region;
   _num_dump_regions_used = 1;
   _other_region_used_bytes = 0;
-  _current_dump_space->init(&_shared_rs, &_shared_vs);
+  _current_dump_region->init(&_shared_rs, &_shared_vs);
 
   ArchivePtrMarker::initialize(&_ptrmap, &_shared_vs);
 
@@ -560,21 +560,21 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
   }
 }
 
-void ArchiveBuilder::start_dump_space(DumpRegion* next) {
+void ArchiveBuilder::start_dump_region(DumpRegion* next) {
   address bottom = _last_verified_top;
-  address top = (address)(current_dump_space()->top());
+  address top = (address)(current_dump_region()->top());
   _other_region_used_bytes += size_t(top - bottom);
 
-  current_dump_space()->pack(next);
-  _current_dump_space = next;
+  current_dump_region()->pack(next);
+  _current_dump_region = next;
   _num_dump_regions_used ++;
 
-  _last_verified_top = (address)(current_dump_space()->top());
+  _last_verified_top = (address)(current_dump_region()->top());
 }
 
 void ArchiveBuilder::verify_estimate_size(size_t estimate, const char* which) {
   address bottom = _last_verified_top;
-  address top = (address)(current_dump_space()->top());
+  address top = (address)(current_dump_region()->top());
   size_t used = size_t(top - bottom) + _other_region_used_bytes;
   int diff = int(estimate) - int(used);
 
@@ -630,7 +630,7 @@ void ArchiveBuilder::dump_ro_metadata() {
   ResourceMark rm;
   log_info(cds)("Allocating RO objects ... ");
 
-  start_dump_space(&_ro_region);
+  start_dump_region(&_ro_region);
   make_shallow_copies(&_ro_region, &_ro_src_objs);
 
 #if INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index dab369265b0..cbde5a7e02c 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -91,7 +91,7 @@ const int SharedSpaceObjectAlignment = KlassAlignmentInBytes;
 //
 class ArchiveBuilder : public StackObj {
 protected:
-  DumpRegion* _current_dump_space;
+  DumpRegion* _current_dump_region;
   address _buffer_bottom;                      // for writing the contents of rw/ro regions
   address _last_verified_top;
   int _num_dump_regions_used;
@@ -114,7 +114,7 @@ protected:
 
   intx _buffer_to_requested_delta;
 
-  DumpRegion* current_dump_space() const {  return _current_dump_space;  }
+  DumpRegion* current_dump_region() const {  return _current_dump_region;  }
 
 public:
   enum FollowMode {
@@ -278,17 +278,17 @@ protected:
 
   size_t estimate_archive_size();
 
-  void start_dump_space(DumpRegion* next);
+  void start_dump_region(DumpRegion* next);
   void verify_estimate_size(size_t estimate, const char* which);
 
 public:
   address reserve_buffer();
 
-  address buffer_bottom()                    const { return _buffer_bottom;                       }
-  address buffer_top()                       const { return (address)current_dump_space()->top(); }
-  address requested_static_archive_bottom()  const { return  _requested_static_archive_bottom;    }
-  address mapped_static_archive_bottom()     const { return  _mapped_static_archive_bottom;       }
-  intx buffer_to_requested_delta()           const { return _buffer_to_requested_delta;           }
+  address buffer_bottom()                    const { return _buffer_bottom;                        }
+  address buffer_top()                       const { return (address)current_dump_region()->top(); }
+  address requested_static_archive_bottom()  const { return  _requested_static_archive_bottom;     }
+  address mapped_static_archive_bottom()     const { return  _mapped_static_archive_bottom;        }
+  intx buffer_to_requested_delta()           const { return _buffer_to_requested_delta;            }
 
   bool is_in_buffer_space(address p) const {
     return (buffer_bottom() <= p && p < buffer_top());
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 5ba36960c55..8fd20e20267 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -310,18 +310,11 @@ void WriteClosure::do_ptr(void** p) {
   if (ptr != nullptr && !ArchiveBuilder::current()->is_in_buffer_space(ptr)) {
     ptr = ArchiveBuilder::current()->get_buffered_addr(ptr);
   }
-  _dump_region->append_intptr_t((intptr_t)ptr, true);
-}
-
-void WriteClosure::do_region(u_char* start, size_t size) {
-  assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");
-  assert(size % sizeof(intptr_t) == 0, "bad size");
-  do_tag((int)size);
-  while (size > 0) {
-    do_ptr((void**)start);
-    start += sizeof(intptr_t);
-    size -= sizeof(intptr_t);
+  // null pointers do not need to be converted to offsets
+  if (ptr != nullptr) {
+    ptr = (address)ArchiveBuilder::current()->buffer_to_offset(ptr);
   }
+  _dump_region->append_intptr_t((intptr_t)ptr, false);
 }
 
 void ReadClosure::do_ptr(void** p) {
@@ -329,7 +322,7 @@ void ReadClosure::do_ptr(void** p) {
   intptr_t obj = nextPtr();
   assert((intptr_t)obj >= 0 || (intptr_t)obj < -100,
          "hit tag while initializing ptrs.");
-  *p = (void*)obj;
+  *p = (void*)obj != nullptr ? (void*)(SharedBaseAddress + obj) : (void*)obj;
 }
 
 void ReadClosure::do_u4(u4* p) {
@@ -355,17 +348,6 @@ void ReadClosure::do_tag(int tag) {
   FileMapInfo::assert_mark(tag == old_tag);
 }
 
-void ReadClosure::do_region(u_char* start, size_t size) {
-  assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");
-  assert(size % sizeof(intptr_t) == 0, "bad size");
-  do_tag((int)size);
-  while (size > 0) {
-    *(intptr_t*)start = nextPtr();
-    start += sizeof(intptr_t);
-    size -= sizeof(intptr_t);
-  }
-}
-
 void ArchiveUtils::log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) {
   if (ClassListWriter::is_enabled()) {
     if (SystemDictionaryShared::is_supported_invokedynamic(bootstrap_specifier)) {
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index efe5a468b93..32cef97886f 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -215,7 +215,10 @@ public:
     _dump_region->append_intptr_t((intptr_t)tag);
   }
 
-  void do_region(u_char* start, size_t size);
+  char* region_top() {
+    return _dump_region->top();
+  }
+
   bool reading() const { return false; }
 };
 
@@ -238,8 +241,8 @@ public:
   void do_int(int* p);
   void do_bool(bool *p);
   void do_tag(int tag);
-  void do_region(u_char* start, size_t size);
   bool reading() const { return true; }
+  char* region_top() { return nullptr; }
 };
 
 class ArchiveUtils {
diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index c339ce9c0de..f17d94a82fd 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -213,23 +213,30 @@ void CppVtableCloner<T>::init_orig_cpp_vtptr(int kind) {
 // the following holds true:
 //     _index[ConstantPool_Kind]->cloned_vtable()  == ((intptr_t**)cp)[0]
 //     _index[InstanceKlass_Kind]->cloned_vtable() == ((intptr_t**)ik)[0]
-CppVtableInfo** CppVtables::_index = nullptr;
+static CppVtableInfo* _index[_num_cloned_vtable_kinds];
 
-char* CppVtables::dumptime_init(ArchiveBuilder* builder) {
+// Vtables are all fixed offsets from ArchiveBuilder::current()->mapped_base()
+// E.g. ConstantPool is at offset 0x58. We can archive these offsets in the
+// RO region and use them to alculate their location at runtime without storing
+// the pointers in the RW region
+char* CppVtables::_vtables_serialized_base = nullptr;
+
+void CppVtables::dumptime_init(ArchiveBuilder* builder) {
   assert(CDSConfig::is_dumping_static_archive(), "cpp tables are only dumped into static archive");
-  size_t vtptrs_bytes = _num_cloned_vtable_kinds * sizeof(CppVtableInfo*);
-  _index = (CppVtableInfo**)builder->rw_region()->allocate(vtptrs_bytes);
 
   CPP_VTABLE_TYPES_DO(ALLOCATE_AND_INITIALIZE_VTABLE);
 
   size_t cpp_tables_size = builder->rw_region()->top() - builder->rw_region()->base();
   builder->alloc_stats()->record_cpp_vtables((int)cpp_tables_size);
-
-  return (char*)_index;
 }
 
 void CppVtables::serialize(SerializeClosure* soc) {
-  soc->do_ptr(&_index);
+  if (!soc->reading()) {
+    _vtables_serialized_base = (char*)ArchiveBuilder::current()->buffer_top();
+  }
+  for (int i = 0; i < _num_cloned_vtable_kinds; i++) {
+    soc->do_ptr(&_index[i]);
+  }
   if (soc->reading()) {
     CPP_VTABLE_TYPES_DO(INITIALIZE_VTABLE);
   }
diff --git a/src/hotspot/share/cds/cppVtables.hpp b/src/hotspot/share/cds/cppVtables.hpp
index 5318a9de2ba..973502909dd 100644
--- a/src/hotspot/share/cds/cppVtables.hpp
+++ b/src/hotspot/share/cds/cppVtables.hpp
@@ -36,13 +36,14 @@ class CppVtableInfo;
 
 // Support for C++ vtables in CDS archive.
 class CppVtables : AllStatic {
-  static CppVtableInfo** _index;
+  static char* _vtables_serialized_base;
 public:
-  static char* dumptime_init(ArchiveBuilder* builder);
+  static void dumptime_init(ArchiveBuilder* builder);
   static void zero_archived_vtables();
   static intptr_t* get_archived_vtable(MetaspaceObj::Type msotype, address obj);
   static void serialize(SerializeClosure* sc);
   static bool is_valid_shared_method(const Method* m) NOT_CDS_RETURN_(false);
+  static char* vtables_serialized_base() { return _vtables_serialized_base; }
 };
 
 #endif // SHARE_CDS_CPPVTABLES_HPP
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index cd5dd88b099..f255b337d14 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -137,7 +137,7 @@ public:
       // Note that these tables still point to the *original* objects, so
       // they would need to call DynamicArchive::original_to_target() to
       // get the correct addresses.
-      assert(current_dump_space() == ro_region(), "Must be RO space");
+      assert(current_dump_region() == ro_region(), "Must be RO space");
       SymbolTable::write_to_archive(symbols());
 
       ArchiveBuilder::OtherROAllocMark mark;
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index c7d14f83d03..93c5c1a1e3b 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -511,7 +511,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   builder.gather_source_objs();
   builder.reserve_buffer();
 
-  char* cloned_vtables = CppVtables::dumptime_init(&builder);
+  CppVtables::dumptime_init(&builder);
 
   builder.sort_metadata_objs();
   builder.dump_rw_metadata();
@@ -542,7 +542,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   FileMapInfo* mapinfo = new FileMapInfo(static_archive, true);
   mapinfo->populate_header(MetaspaceShared::core_region_alignment());
   mapinfo->set_serialized_data(serialized_data);
-  mapinfo->set_cloned_vtables(cloned_vtables);
+  mapinfo->set_cloned_vtables(CppVtables::vtables_serialized_base());
   mapinfo->open_for_write();
   builder.write_archive(mapinfo, &_heap_info);
 
diff --git a/src/hotspot/share/cds/serializeClosure.hpp b/src/hotspot/share/cds/serializeClosure.hpp
index 275009286cb..3d401407f37 100644
--- a/src/hotspot/share/cds/serializeClosure.hpp
+++ b/src/hotspot/share/cds/serializeClosure.hpp
@@ -48,8 +48,20 @@ public:
   // Read/write the bool pointed to by p.
   virtual void do_bool(bool* p) = 0;
 
-  // Read/write the region specified.
-  virtual void do_region(u_char* start, size_t size) = 0;
+  // Iterate on the pointers from p[0] through p[num_pointers-1]
+  void do_ptrs(void** p, size_t size) {
+    assert((intptr_t)p % sizeof(intptr_t) == 0, "bad alignment");
+    assert(size % sizeof(intptr_t) == 0, "bad size");
+    do_tag((int)size);
+    while (size > 0) {
+      do_ptr(p);
+      p++;
+      size -= sizeof(intptr_t);
+    }
+  }
+
+  // Address of the first element being written (write only)
+  virtual char* region_top() = 0;
 
   // Check/write the tag.  If reading, then compare the tag against
   // the passed in value and fail is they don't match.  This allows
diff --git a/src/hotspot/share/classfile/vmSymbols.cpp b/src/hotspot/share/classfile/vmSymbols.cpp
index 05cd4767e9a..172d074255b 100644
--- a/src/hotspot/share/classfile/vmSymbols.cpp
+++ b/src/hotspot/share/classfile/vmSymbols.cpp
@@ -205,9 +205,9 @@ void vmSymbols::metaspace_pointers_do(MetaspaceClosure *closure) {
 }
 
 void vmSymbols::serialize(SerializeClosure* soc) {
-  soc->do_region((u_char*)&Symbol::_vm_symbols[FIRST_SID],
+  soc->do_ptrs((void**)&Symbol::_vm_symbols[FIRST_SID],
                  (SID_LIMIT - FIRST_SID) * sizeof(Symbol::_vm_symbols[0]));
-  soc->do_region((u_char*)_type_signatures, sizeof(_type_signatures));
+  soc->do_ptrs((void**)_type_signatures, sizeof(_type_signatures));
 }
 
 #ifndef PRODUCT
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
index 3dfb2bc5d10..37b586116a5 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
@@ -40,6 +40,7 @@ public class FileMapInfo {
   private static Address rwRegionBaseAddress;
   private static Address rwRegionEndAddress;
   private static Address vtablesIndex;
+  private static Address mapped_base_address;
 
   // HashMap created by mapping the vTable addresses in the rw region with
   // the corresponding metadata type.
@@ -98,7 +99,7 @@ public class FileMapInfo {
     // char* mapped_base_address = header->_mapped_base_address
     // size_t cloned_vtable_offset = header->_cloned_vtable_offset
     // CppVtableInfo** vtablesIndex = mapped_base_address + cloned_vtable_offset;
-    Address mapped_base_address = get_AddressField(FileMapHeader_type, header, "_mapped_base_address");
+    mapped_base_address = get_AddressField(FileMapHeader_type, header, "_mapped_base_address");
     long cloned_vtable_offset = get_CIntegerField(FileMapHeader_type, header, "_cloned_vtables_offset");
     vtablesIndex = mapped_base_address.addOffsetTo(cloned_vtable_offset);
 
@@ -168,23 +169,57 @@ public class FileMapInfo {
       vTableTypeMap = new HashMap<Address, Type>();
       long addressSize = VM.getVM().getAddressSize();
 
-      // vtablesIndex points to this:
-      //     class CppVtableInfo {
-      //         intptr_t _vtable_size;
-      //         intptr_t _cloned_vtable[1];
-      //         ...
-      //     };
-      //     CppVtableInfo** CppVtables::_index;
-      // This is the index of all the cloned vtables. E.g., for
+      // vtablesIndex points to to an array like this:
+      // long info[] = {
+      //   offset of the CppVtableInfo for ConstantPool,
+      //   offset of the CppVtableInfo for InstanceKlass,
+      //   offset of the CppVtableInfo for InstanceClassLoaderKlass,
+      //   ...
+      // };
+      //
+      // class CppVtableInfo {
+      //   intptr_t _vtable_size;
+      //   intptr_t _cloned_vtable[1];
+      //   ...
+      // };
+      //
+      // The loop below computes the following
+      //     CppVtableInfo* t_ConstantPool  = mapped_base_address + info[0];
+      //     CppVtableInfo* t_InstanceKlass = mapped_base_address + info[1];
+      //     ...
+      //
+      // If we have the following objects
       //     ConstantPool* cp = ....; // an archived constant pool
       //     InstanceKlass* ik = ....;// an archived class
-      // the following holds true:
-      //     &_index[ConstantPool_Kind]->_cloned_vtable[0]  == ((intptr_t**)cp)[0]
-      //     &_index[InstanceKlass_Kind]->_cloned_vtable[0] == ((intptr_t**)ik)[0]
+      //
+      // then the following holds true:
+      //     ((intptr_t**)cp)[0] == &t_ConstantPool->_cloned_vtable[0]  // The vtable for archived ConstantPools
+      //     ((intptr_t**)ik)[0] == &t_InstanceKlass->_cloned_vtable[0] // The vtable for archived InstanceKlasses
+      //
+      // To get an idea what these address look like, do this:
+      //
+      // $ java -Xlog:cds+vtables=debug -XX:+UnlockDiagnosticVMOptions -XX:ArchiveRelocationMode=0 --version
+      // [0.002s][debug][cds,vtables] Copying  14 vtable entries for ConstantPool to 0x800000018
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceKlass to 0x800000090
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceClassLoaderKlass to 0x8000001e0
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceMirrorKlass to 0x800000330
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceRefKlass to 0x800000480
+      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceStackChunkKlass to 0x8000005d0
+      // [0.002s][debug][cds,vtables] Copying  14 vtable entries for Method to 0x800000720
+      // [0.002s][debug][cds,vtables] Copying  42 vtable entries for ObjArrayKlass to 0x800000798
+      // [0.002s][debug][cds,vtables] Copying  42 vtable entries for TypeArrayKlass to 0x8000008f0
+      // java 23-internal 2024-09-17
+      // ...
 
       for (int i=0; i < metadataTypeArray.length; i++) {
-        Address vtableInfoAddress = vtablesIndex.getAddressAt(i * addressSize); // = _index[i]
-        Address vtableAddress = vtableInfoAddress.addOffsetTo(addressSize); // = &_index[i]->_cloned_vtable[0]
+        long vtable_offset = vtablesIndex.getJLongAt(i * addressSize); // long offset = _index[i]
+
+        // CppVtableInfo* t = the address of the CppVtableInfo for the i-th table
+        Address vtableInfoAddress = mapped_base_address.addOffsetTo(vtable_offset);
+
+        // vtableAddress = &t->_cloned_vtable[0]
+        Address vtableAddress = vtableInfoAddress.addOffsetTo(addressSize);
+
         vTableTypeMap.put(vtableAddress, metadataTypeArray[i]);
       }
     }

From d2d37c913e5b55f7aec2c7a6b5a2328348ded223 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Fri, 10 May 2024 04:30:17 +0000
Subject: [PATCH 385/486] 8331942: On Linux aarch64, CDS archives should be
 using 64K alignment by default

Reviewed-by: aph, iklam
---
 make/autoconf/jdk-options.m4 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 8c91a2ccd33..23f331e79b7 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -190,6 +190,17 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   fi
   AC_SUBST(INCLUDE_SA)
 
+  # Setup default CDS alignment. On platforms where one build may run on machines with different
+  # page sizes, the JVM choses a compatible alignment to fit all possible page sizes. This slightly
+  # increases archive size.
+  # The only platform having this problem at the moment is Linux on aarch64, which may encounter
+  # three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K.
+  COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false
+  if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+    COMPATIBLE_CDS_ALIGNMENT_DEFAULT=true
+  fi
+  AC_SUBST(COMPATIBLE_CDS_ALIGNMENT_DEFAULT)
+
   # Compress jars
   COMPRESS_JARS=false
 
@@ -673,7 +684,7 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
 #
 AC_DEFUN([JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT],
 [
-  UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: false,
+  UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: $COMPATIBLE_CDS_ALIGNMENT_DEFAULT,
       RESULT: ENABLE_COMPATIBLE_CDS_ALIGNMENT,
       DESC: [enable use alternative compatible cds core region alignment],
       DEFAULT_DESC: [disabled],

From b9a142a2243676b3f4fe288e7a28f4957a4d1edd Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 10 May 2024 04:45:01 +0000
Subject: [PATCH 386/486] 8226990: GTK & Nimbus LAF: Tabbed pane's background
 color is not expected one when change the opaque checkbox.

Reviewed-by: tr, honkar, psadhukhan
---
 .../java/swing/plaf/gtk/GTKLookAndFeel.java   |   9 +-
 .../sun/java/swing/plaf/gtk/GTKPainter.java   |   5 +-
 .../classes/javax/swing/plaf/nimbus/skin.laf  |  10 +-
 .../swing/plaf/synth/SynthTabbedPaneUI.java   |  52 +++-
 .../TestJTabbedPaneOpaqueColor.java           | 248 ++++++++++++++++++
 5 files changed, 316 insertions(+), 8 deletions(-)
 create mode 100644 test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java

diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
index 72b8c759e30..65f29ea8384 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -348,6 +348,8 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
         Double defaultCaretAspectRatio = Double.valueOf(0.025);
         Color caretColor = table.getColor("caretColor");
         Color controlText = table.getColor("controlText");
+        Color tabbedPaneBg = new ColorUIResource(238, 238, 238);
+        Color unselectedTabColor = new ColorUIResource(255, 255, 255);
 
         Object fieldInputMap = new UIDefaults.LazyInputMap(new Object[] {
                        "ctrl C", DefaultEditorKit.copyAction,
@@ -1020,6 +1022,11 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
             "TabbedPane.selectedLabelShift", 3,
             "TabbedPane.font", new FontLazyValue(Region.TABBED_PANE),
             "TabbedPane.selectedTabPadInsets", new InsetsUIResource(2, 2, 0, 1),
+            "TabbedPane.selected", tabbedPaneBg,
+            "TabbedPane.contentOpaque", Boolean.TRUE,
+            "TabbedPane.tabsOpaque", Boolean.TRUE,
+            "TabbedPane.contentAreaColor", tabbedPaneBg,
+            "TabbedPane.unselectedBackground", unselectedTabColor,
 
             "Table.scrollPaneBorder", zeroBorder,
             "Table.background", tableBg,
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
index 1635ff66f89..e643d3d28ff 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -972,6 +972,9 @@ class GTKPainter extends SynthPainter {
         JTabbedPane pane = (JTabbedPane)context.getComponent();
         int placement = pane.getTabPlacement();
 
+        // Fill the tab rect area
+        g.fillRect(x, y, w, h);
+
         synchronized (UNIXToolkit.GTK_LOCK) {
             if (! ENGINE.paintCachedImage(g, x, y, w, h,
                     id, gtkState, placement, tabIndex)) {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
index 38e8530983a..1d486f9fe06 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2024, 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
@@ -83,6 +83,9 @@
       <uiColor name="nimbusDisabledText">
          <matte red="142" green="143" blue="145" alpha="255" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
       </uiColor>
+      <uiColor name="nimbusTabbedPaneContentArea">
+         <matte red="238" green="238" blue="238" alpha="255" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
+      </uiColor>
       <uiColor name="nimbusLightBackground">
          <matte red="255" green="255" blue="255" alpha="255" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
       </uiColor>
@@ -21646,6 +21649,11 @@
                <uiProperty name="tabOverlap" type="INT" value="-1"/>
                <uiProperty name="extendTabsToBase" type="BOOLEAN" value="true"/>
                <uiProperty name="useBasicArrows" type="BOOLEAN" value="true"/>
+               <uiProperty name="contentOpaque" type="BOOLEAN" value="true"/>
+               <uiProperty name="tabsOpaque" type="BOOLEAN" value="true"/>
+               <uiProperty name="contentAreaColor" type="COLOR">
+                  <matte red="238" green="238" blue="238" alpha="255" uiDefaultParentName="nimbusTabbedPaneContentArea" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
+               </uiProperty>
                <uiProperty name="shadow" type="COLOR">
                   <matte red="142" green="143" blue="145" alpha="255" uiDefaultParentName="nimbusDisabledText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
                </uiProperty>
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
index e6b00871b10..837c4d8298f 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package javax.swing.plaf.synth;
 
 import java.awt.Component;
+import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
@@ -121,6 +122,13 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI
 
     private boolean selectedTabIsPressed = false;
 
+    // Background color for selected tab and content pane
+    private Color selectColor;
+    // Background color for unselected tabs
+    private Color unselectedBackground;
+    private boolean contentOpaque = true;
+    private boolean tabsOpaque = true;
+
     /**
      *
      * Constructs a {@code SynthTabbedPaneUI}.
@@ -146,6 +154,10 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI
      */
     @Override
     protected void installDefaults() {
+        selectColor = UIManager.getColor("TabbedPane.selected");
+        contentOpaque = UIManager.getBoolean("TabbedPane.contentOpaque");
+        tabsOpaque = UIManager.getBoolean("TabbedPane.tabsOpaque");
+        unselectedBackground = UIManager.getColor("TabbedPane.unselectedBackground");
         updateStyle(tabPane);
     }
 
@@ -636,8 +648,17 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI
                 }
             }
         }
-        tabContext.getPainter().paintTabbedPaneTabBackground(tabContext, g,
-                x, y, width, height, tabIndex, placement);
+
+        if (isSelected) {
+            g.setColor(selectColor);
+        } else {
+            g.setColor(getUnselectedBackgroundAt(tabIndex));
+        }
+
+        if (tabsOpaque || tabPane.isOpaque()) {
+            tabContext.getPainter().paintTabbedPaneTabBackground(tabContext, g,
+                    x, y, width, height, tabIndex, placement);
+        }
         tabContext.getPainter().paintTabbedPaneTabBorder(tabContext, g,
                 x, y, width, height, tabIndex, placement);
 
@@ -655,11 +676,17 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI
             paintIcon(g, tabPlacement, tabIndex, icon, iconRect, isSelected);
             paintText(ss, g, tabPlacement, font, metrics,
                     tabIndex, clippedTitle, textRect, isSelected);
-
-
         }
     }
 
+    private Color getUnselectedBackgroundAt(int index) {
+        Color color = tabPane.getBackgroundAt(index);
+        if (color instanceof UIResource && unselectedBackground != null) {
+            return unselectedBackground;
+        }
+        return color;
+    }
+
     private void layoutLabel(SynthContext ss, int tabPlacement,
                                FontMetrics metrics, int tabIndex,
                                String title, Icon icon,
@@ -737,6 +764,21 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI
               h -= (y - insets.top);
         }
         SynthLookAndFeel.updateSubregion(ss, g, new Rectangle(x, y, w, h));
+
+        if (tabPane.getTabCount() > 0 && (contentOpaque || tabPane.isOpaque())) {
+            // Fill region behind content area
+            Color color = UIManager.getColor("TabbedPane.contentAreaColor");
+            if (color != null) {
+                g.setColor(color);
+            } else if (selectColor == null || selectedIndex == -1) {
+                g.setColor(tabPane.getBackground());
+            } else {
+                g.setColor(selectColor);
+            }
+            // fill content area rect for both GTK and Nimbus LAF here
+            g.fillRect(x, y, w, h);
+        }
+
         ss.getPainter().paintTabbedPaneContentBackground(ss, g, x, y,
                                                            w, h);
         ss.getPainter().paintTabbedPaneContentBorder(ss, g, x, y, w, h);
diff --git a/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java b/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java
new file mode 100644
index 00000000000..360845ccb64
--- /dev/null
+++ b/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.GridLayout;
+import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+/*
+ * @test
+ * @bug 4690946 8226990 6462396
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @requires (os.family == "windows" | os.family == "linux")
+ * @summary Test JTabbedPane's contentarea, tab area and tab color
+ *          for different LAFs when opacity is enabled or disabled.
+ * @run main/manual TestJTabbedPaneOpaqueColor
+ */
+
+public class TestJTabbedPaneOpaqueColor {
+    private static JFrame frame;
+    private static JTabbedPane tabPane;
+    private static final String INSTRUCTIONS = """
+            The background color of panel which contains the tabbed pane is green.
+            The background color of the tabbed pane is red.
+            The TabbedPane is not opaque initially.
+            For 'Content Opaque' and 'Tabs Opaque' to have effect, tab pane opacity should
+            be set to false i.e. Opaque checkbox should be unchecked.
+            NOTE: For Nimbus LAF, tabs color are specific to nimbus style.
+
+            Check the default behaviour of the tabbed pane:
+              - the area behind tabs is transparent (it must be green).
+              - the tabs area is opaque (it must be red, except the selected tab which must be gray).
+              - the content area is opaque (it must be gray).
+
+            Test Case 1 - Test TabPane Opacity:
+            NOTE: For Nimbus LAF, tabs color are always gray in color.
+
+            Verify the following with 'opaque' option:
+            when checked:
+              - the area behind tabs is opaque (it must be red).
+              - the tabs area is opaque (it must be red, except the selected tab which must be gray).
+              - the content area is opaque (it must be gray).
+            when unchecked:
+              - the area behind tabs is transparent (it must be green).
+              - the tabs area is opaque (it must be red, except the selected tab which must be gray).
+              - the content area is opaque (it must be gray).
+
+            Check this behaviour by clicking on present L&F button and tab layout.
+
+            Test Case 2 - Test Content pane opacity:
+            To test Content pane opacity, make sure "Opaque checkbox" is UNCHECKED.
+
+            Verify the following with 'content opaque' option:
+            when checked:
+              - the content area should be opaque (it must be gray).
+            when unchecked:
+              - the content area should be transparent (it must be green).
+
+            Check this behaviour by clicking on present L&F button and tab layout.
+
+            Test Case 3 - Test Tabs opacity:
+            To test Tabs opacity, make sure "Opaque checkbox" is UNCHECKED.
+            NOTE: For Nimbus LAF, tabs color are specific to nimbus style.
+                  All tabs are gray in color if tabs opaque is checked.
+
+            Verify the following with 'tabs opaque' option:
+            when checked:
+              - the tabs are opaque (it must be red, except the selected tab which must be gray).
+            when unchecked:
+              - the tabs are transparent (it must be green).
+
+            Check this behaviour by clicking on present L&F button and tab layout.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+            .title("JTabbedPane Tab and Content Area Color Test Instructions")
+            .instructions(INSTRUCTIONS)
+            .testTimeOut(10)
+            .rows(25)
+            .columns(60)
+            .testUI(TestJTabbedPaneOpaqueColor::createAndShowUI)
+            .build()
+            .awaitAndCheck();
+    }
+
+    private static JFrame createAndShowUI() {
+        int NUM_TABS = 15;
+        frame = new JFrame("Test JTabbedPane Opaque Color");
+        JTabbedPane tabPane = new JTabbedPane();
+        tabPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+        tabPane.setTabPlacement(JTabbedPane.TOP);
+        PassFailJFrame.positionTestWindow(
+                frame, PassFailJFrame.Position.HORIZONTAL);
+        for (int i = 0; i < NUM_TABS; ++i) {
+            tabPane.addTab("Tab " + i , new JLabel("Content Area"));
+        }
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(tabPane, BorderLayout.CENTER);
+        panel.setBackground(Color.green);
+        tabPane.setBackground(Color.red);
+
+        UIManager.LookAndFeelInfo[] laf = UIManager.getInstalledLookAndFeels();
+        JPanel lafButtonPanel = new JPanel(new GridLayout(1, 3));
+        for (int i = 0; i < laf.length; ++i) {
+            if (laf[i].getName().contains("Motif")
+                || laf[i].getName().contains("Windows")) {
+                continue;
+            }
+            JButton button = new JButton(laf[i].getName());
+            button.setText(laf[i].getName());
+            button.addActionListener(new MyAction());
+            lafButtonPanel.add(button);
+        }
+
+        JButton scrollButton = new JButton(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                tabPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+            }
+        });
+        scrollButton.setText("SCROLL layout");
+
+        JPanel layoutButtonPanel = new JPanel(new GridLayout(1, 2));
+        JButton wrapButton = new JButton(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                tabPane.setTabLayoutPolicy(JTabbedPane.WRAP_TAB_LAYOUT);
+            }
+        });
+        wrapButton.setText("WRAP layout");
+
+        layoutButtonPanel.add(scrollButton);
+        layoutButtonPanel.add(wrapButton);
+
+        JCheckBox contentOpaqueChkBox = new JCheckBox(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                if (((AbstractButton)e.getSource()).isSelected()) {
+                    UIManager.put("TabbedPane.contentOpaque", Boolean.TRUE);
+                } else {
+                    UIManager.put("TabbedPane.contentOpaque", Boolean.FALSE);
+                }
+                tabPane.repaint();
+                SwingUtilities.updateComponentTreeUI(frame);
+            }
+        });
+        contentOpaqueChkBox.setText("Content Opaque");
+        contentOpaqueChkBox.setSelected(true);
+        contentOpaqueChkBox.setEnabled(true);
+
+        JCheckBox tabOpaqueChkBox = new JCheckBox(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                if (((AbstractButton)e.getSource()).isSelected()) {
+                    UIManager.put("TabbedPane.tabsOpaque", Boolean.TRUE);
+                } else {
+                    UIManager.put("TabbedPane.tabsOpaque", Boolean.FALSE);
+                }
+                tabPane.repaint();
+                SwingUtilities.updateComponentTreeUI(frame);
+            }
+        });
+        tabOpaqueChkBox.setText("Tabs Opaque");
+        tabOpaqueChkBox.setSelected(true);
+        tabOpaqueChkBox.setEnabled(true);
+
+        JCheckBox tabPaneOpaqueChkBox = new JCheckBox(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                tabPane.setOpaque(((AbstractButton)e.getSource()).isSelected());
+                contentOpaqueChkBox.setEnabled(!((AbstractButton)e.getSource()).isSelected());
+                tabOpaqueChkBox.setEnabled(!((AbstractButton)e.getSource()).isSelected());
+                tabPane.repaint();
+                SwingUtilities.updateComponentTreeUI(frame);
+            }
+        });
+        tabPaneOpaqueChkBox.setText("Opaque");
+
+        JPanel checkBoxPanel = new JPanel();
+        checkBoxPanel.add(tabPaneOpaqueChkBox);
+        checkBoxPanel.add(contentOpaqueChkBox);
+        checkBoxPanel.add(tabOpaqueChkBox);
+
+        JPanel nestedPanels = new JPanel(new GridLayout(2, 1));
+        nestedPanels.add(lafButtonPanel);
+        nestedPanels.add(layoutButtonPanel);
+        panel.add(checkBoxPanel, BorderLayout.NORTH);
+        panel.add(nestedPanels, BorderLayout.SOUTH);
+        frame.add(panel);
+        frame.setSize(500, 500);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setVisible(true);
+        return frame;
+    }
+
+    public static class MyAction implements ActionListener {
+        public void actionPerformed(ActionEvent ae) {
+            String lafClassName = null;
+            UIManager.LookAndFeelInfo lafs[] = UIManager.getInstalledLookAndFeels();
+            for (int i = 0; i < lafs.length; i++) {
+                if (ae.getActionCommand().equals(lafs[i].getName())) {
+                    lafClassName = lafs[i].getClassName();
+                    break;
+                }
+            }
+            try {
+                UIManager.setLookAndFeel(lafClassName);
+                if (frame != null) {
+                    frame.dispose();
+                }
+                createAndShowUI();
+            } catch (UnsupportedLookAndFeelException ignored) {
+                System.out.println("Unsupported LAF: " + lafClassName);
+            } catch (ClassNotFoundException | InstantiationException
+                     | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}

From f47fc867b3518cb285d39f7b157bf7fde87b2083 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 10 May 2024 06:25:38 +0000
Subject: [PATCH 387/486] 8331908: Simplify log code in vectorintrinsics.cpp

Reviewed-by: jwaters, kvn
---
 src/hotspot/share/opto/vectorIntrinsics.cpp | 658 ++++++--------------
 1 file changed, 175 insertions(+), 483 deletions(-)

diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 2039e9c27be..807912327e6 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -59,6 +59,17 @@ static bool check_vbox(const TypeInstPtr* vbox_type) {
 }
 #endif
 
+#define log_if_needed(...)        \
+  if (C->print_intrinsics()) {    \
+    tty->print_cr(__VA_ARGS__);   \
+  }
+
+#ifndef PRODUCT
+#define non_product_log_if_needed(...) log_if_needed(__VA_ARGS__)
+#else
+#define non_product_log_if_needed(...)
+#endif
+
 static bool is_vector_mask(ciKlass* klass) {
   return klass->is_subclass_of(ciEnv::current()->vector_VectorMask_klass());
 }
@@ -85,12 +96,8 @@ bool LibraryCallKit::arch_supports_vector_rotate(int opc, int num_elem, BasicTyp
     if ((mask_use_type & VecMaskUseLoad) != 0) {
       if (!Matcher::match_rule_supported_vector(Op_VectorLoadMask, num_elem, elem_bt) ||
           !Matcher::match_rule_supported_vector(Op_LoadVector, num_elem, T_BOOLEAN)) {
-      #ifndef PRODUCT
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** Rejected vector mask loading (%s,%s,%d) because architecture does not support it",
-                        NodeClassNames[Op_VectorLoadMask], type2name(elem_bt), num_elem);
-        }
-      #endif
+        non_product_log_if_needed("  ** Rejected vector mask loading (%s,%s,%d) because architecture does not support it",
+                                  NodeClassNames[Op_VectorLoadMask], type2name(elem_bt), num_elem);
         return false;
       }
     }
@@ -98,12 +105,8 @@ bool LibraryCallKit::arch_supports_vector_rotate(int opc, int num_elem, BasicTyp
     if ((mask_use_type & VecMaskUsePred) != 0) {
       if (!Matcher::has_predicated_vectors() ||
           !Matcher::match_rule_supported_vector_masked(opc, num_elem, elem_bt)) {
-      #ifndef PRODUCT
-        if (C->print_intrinsics()) {
-          tty->print_cr("Rejected vector mask predicate using (%s,%s,%d) because architecture does not support it",
-                        NodeClassNames[opc], type2name(elem_bt), num_elem);
-        }
-      #endif
+        non_product_log_if_needed("Rejected vector mask predicate using (%s,%s,%d) because architecture does not support it",
+                                  NodeClassNames[opc], type2name(elem_bt), num_elem);
         return false;
       }
     }
@@ -185,43 +188,27 @@ Node* GraphKit::vector_shift_count(Node* cnt, int shift_op, BasicType bt, int nu
 bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type, VectorMaskUseType mask_use_type, bool has_scalar_args) {
   // Check that the operation is valid.
   if (sopc <= 0) {
-#ifndef PRODUCT
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** Rejected intrinsification because no valid vector op could be extracted");
-    }
-#endif
+    non_product_log_if_needed("  ** Rejected intrinsification because no valid vector op could be extracted");
     return false;
   }
 
   if (VectorNode::is_vector_rotate(sopc)) {
     if(!arch_supports_vector_rotate(sopc, num_elem, type, mask_use_type, has_scalar_args)) {
-#ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support variable vector shifts",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-#endif
+      non_product_log_if_needed("  ** Rejected vector op (%s,%s,%d) because architecture does not support variable vector shifts",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     }
   } else if (VectorNode::is_vector_integral_negate(sopc)) {
     if (!VectorNode::is_vector_integral_negate_supported(sopc, num_elem, type, false)) {
-#ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support integral vector negate",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-#endif
+      non_product_log_if_needed("  ** Rejected vector op (%s,%s,%d) because architecture does not support integral vector negate",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     }
   } else {
     // Check that architecture supports this op-size-type combination.
     if (!Matcher::match_rule_supported_vector(sopc, num_elem, type)) {
-#ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-#endif
+      non_product_log_if_needed("  ** Rejected vector op (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     } else {
       assert(Matcher::match_rule_supported(sopc), "must be supported");
@@ -230,23 +217,15 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
 
   if (num_elem == 1) {
     if (mask_use_type != VecMaskNotUsed) {
-#ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector mask op (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-#endif
+      non_product_log_if_needed("  ** Rejected vector mask op (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     }
 
     if (sopc != 0) {
       if (sopc != Op_LoadVector && sopc != Op_StoreVector) {
-#ifndef PRODUCT
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** Not a svml call or load/store vector op (%s,%s,%d)",
-                        NodeClassNames[sopc], type2name(type), num_elem);
-        }
-#endif
+        non_product_log_if_needed("  ** Not a svml call or load/store vector op (%s,%s,%d)",
+                                  NodeClassNames[sopc], type2name(type), num_elem);
         return false;
       }
     }
@@ -254,10 +233,8 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
 
   if (!has_scalar_args && VectorNode::is_vector_shift(sopc) &&
       Matcher::supports_vector_variable_shifts() == false) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support variable vector shifts",
-                    NodeClassNames[sopc], type2name(type), num_elem);
-    }
+    log_if_needed("  ** Rejected vector op (%s,%s,%d) because architecture does not support variable vector shifts",
+                  NodeClassNames[sopc], type2name(type), num_elem);
     return false;
   }
 
@@ -267,12 +244,8 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
   if ((mask_use_type & VecMaskUseLoad) != 0) {
     if (!Matcher::match_rule_supported_vector(Op_VectorLoadMask, num_elem, type) ||
         !Matcher::match_rule_supported_vector(Op_LoadVector, num_elem, T_BOOLEAN)) {
-    #ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected vector mask loading (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[Op_VectorLoadMask], type2name(type), num_elem);
-      }
-    #endif
+      non_product_log_if_needed("  ** Rejected vector mask loading (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[Op_VectorLoadMask], type2name(type), num_elem);
       return false;
     }
   }
@@ -283,12 +256,8 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
   if ((mask_use_type & VecMaskUseStore) != 0) {
     if (!Matcher::match_rule_supported_vector(Op_VectorStoreMask, num_elem, type) ||
         !Matcher::match_rule_supported_vector(Op_StoreVector, num_elem, T_BOOLEAN)) {
-    #ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("Rejected vector mask storing (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[Op_VectorStoreMask], type2name(type), num_elem);
-      }
-    #endif
+      non_product_log_if_needed("Rejected vector mask storing (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[Op_VectorStoreMask], type2name(type), num_elem);
       return false;
     }
   }
@@ -305,12 +274,8 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
     is_supported |= Matcher::supports_vector_predicate_op_emulation(sopc, num_elem, type);
 
     if (!is_supported) {
-    #ifndef PRODUCT
-      if (C->print_intrinsics()) {
-        tty->print_cr("Rejected vector mask predicate using (%s,%s,%d) because architecture does not support it",
-                      NodeClassNames[sopc], type2name(type), num_elem);
-      }
-    #endif
+      non_product_log_if_needed("Rejected vector mask predicate using (%s,%s,%d) because architecture does not support it",
+                                NodeClassNames[sopc], type2name(type), num_elem);
       return false;
     }
   }
@@ -360,27 +325,21 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
 
   if (opr == nullptr || vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       !opr->is_con() || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -390,23 +349,17 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
     if (mask_klass == nullptr || mask_klass->const_oop() == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     if (!is_klass_initialized(mask_klass)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** mask klass argument not initialized");
-      }
+      log_if_needed("  ** mask klass argument not initialized");
       return false;
     }
 
     if (vmask_type->maybe_null()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** null mask values are not allowed for masked op");
-      }
+      log_if_needed("  ** null mask values are not allowed for masked op");
       return false;
     }
   }
@@ -416,17 +369,13 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
   int opc = VectorSupport::vop2ideal(opr->get_con(), elem_bt);
   int sopc = VectorNode::opcode(opc, elem_bt);
   if ((opc != Op_CallLeafVector) && (sopc == 0)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** operation not supported: opc=%s bt=%s", NodeClassNames[opc], type2name(elem_bt));
-    }
+    log_if_needed("  ** operation not supported: opc=%s bt=%s", NodeClassNames[opc], type2name(elem_bt));
     return false; // operation not supported
   }
   if (num_elem == 1) {
     if (opc != Op_CallLeafVector || elem_bt != T_DOUBLE) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not a svml call: arity=%d opc=%d vlen=%d etype=%s",
+      log_if_needed("  ** not a svml call: arity=%d opc=%d vlen=%d etype=%s",
                       n, opc, num_elem, type2name(elem_bt));
-      }
       return false;
     }
   }
@@ -439,22 +388,16 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
 
   if (opc == Op_CallLeafVector) {
     if (!UseVectorStubs) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** vector stubs support is disabled");
-      }
+      log_if_needed("  ** vector stubs support is disabled");
       return false;
     }
     if (!Matcher::supports_vector_calling_convention()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** no vector calling conventions supported");
-      }
+      log_if_needed("  ** no vector calling conventions supported");
       return false;
     }
     if (!Matcher::vector_size_supported(elem_bt, num_elem)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** vector size (vlen=%d, etype=%s) is not supported",
+      log_if_needed("  ** vector size (vlen=%d, etype=%s) is not supported",
                       num_elem, type2name(elem_bt));
-      }
       return false;
     }
   }
@@ -463,21 +406,17 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
   VectorMaskUseType mask_use_type = is_vector_mask(vbox_klass) ? VecMaskUseAll
                                       : is_masked_op ? VecMaskUseLoad : VecMaskNotUsed;
   if ((sopc != 0) && !arch_supports_vector(sopc, num_elem, elem_bt, mask_use_type)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d opc=%d vlen=%d etype=%s ismask=%d is_masked_op=%d",
+    log_if_needed("  ** not supported: arity=%d opc=%d vlen=%d etype=%s ismask=%d is_masked_op=%d",
                     n, sopc, num_elem, type2name(elem_bt),
                     is_vector_mask(vbox_klass) ? 1 : 0, is_masked_op ? 1 : 0);
-    }
     return false; // not supported
   }
 
   // Return true if current platform has implemented the masked operation with predicate feature.
   bool use_predicate = is_masked_op && sopc != 0 && arch_supports_vector(sopc, num_elem, elem_bt, VecMaskUsePred);
   if (is_masked_op && !use_predicate && !arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d opc=%d vlen=%d etype=%s ismask=0 is_masked_op=1",
+    log_if_needed("  ** not supported: arity=%d opc=%d vlen=%d etype=%s ismask=0 is_masked_op=1",
                     n, sopc, num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -486,10 +425,8 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     case 3: {
       opd3 = unbox_vector(argument(7), vbox_type, elem_bt, num_elem);
       if (opd3 == nullptr) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** unbox failed v3=%s",
+        log_if_needed("  ** unbox failed v3=%s",
                         NodeClassNames[argument(7)->Opcode()]);
-        }
         return false;
       }
       // fall-through
@@ -497,10 +434,8 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     case 2: {
       opd2 = unbox_vector(argument(6), vbox_type, elem_bt, num_elem);
       if (opd2 == nullptr) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** unbox failed v2=%s",
+        log_if_needed("  ** unbox failed v2=%s",
                         NodeClassNames[argument(6)->Opcode()]);
-        }
         return false;
       }
       // fall-through
@@ -508,10 +443,8 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     case 1: {
       opd1 = unbox_vector(argument(5), vbox_type, elem_bt, num_elem);
       if (opd1 == nullptr) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** unbox failed v1=%s",
+        log_if_needed("  ** unbox failed v1=%s",
                         NodeClassNames[argument(5)->Opcode()]);
-        }
         return false;
       }
       break;
@@ -526,10 +459,8 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(argument(n + 5), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s",
+      log_if_needed("  ** unbox failed mask=%s",
                       NodeClassNames[argument(n + 5)->Opcode()]);
-      }
       return false;
     }
   }
@@ -539,12 +470,10 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     assert(UseVectorStubs, "sanity");
     operation = gen_call_to_svml(opr->get_con(), elem_bt, num_elem, opd1, opd2);
     if (operation == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** svml call failed for %s_%s_%d",
+      log_if_needed("  ** svml call failed for %s_%s_%d",
                          (elem_bt == T_FLOAT)?"float":"double",
                          VectorSupport::svmlname[opr->get_con() - VectorSupport::VECTOR_OP_SVML_START],
                          num_elem * type2aelembytes(elem_bt));
-      }
       return false;
      }
   } else {
@@ -599,9 +528,7 @@ bool LibraryCallKit::inline_vector_shuffle_iota() {
   }
 
   if (!is_klass_initialized(shuffle_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -708,9 +635,7 @@ bool LibraryCallKit::inline_vector_mask_operation() {
   }
 
   if (!is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -720,10 +645,8 @@ bool LibraryCallKit::inline_vector_mask_operation() {
 
   int mopc = VectorSupport::vop2ideal(oper->get_con(), elem_bt);
   if (!arch_supports_vector(mopc, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
+    log_if_needed("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
                     mopc, num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -732,10 +655,8 @@ bool LibraryCallKit::inline_vector_mask_operation() {
   const TypeInstPtr* mask_box_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
   Node* mask_vec = unbox_vector(mask, mask_box_type, elem_bt, num_elem, true);
   if (mask_vec == nullptr) {
-    if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s",
+    log_if_needed("  ** unbox failed mask=%s",
                       NodeClassNames[argument(4)->Opcode()]);
-    }
     return false;
   }
 
@@ -774,9 +695,7 @@ bool LibraryCallKit::inline_vector_shuffle_to_vector() {
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(shuffle_klass) || !is_klass_initialized(vector_klass) ) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -791,10 +710,8 @@ bool LibraryCallKit::inline_vector_shuffle_to_vector() {
   int cast_vopc = VectorCastNode::opcode(-1, T_BYTE); // from shuffle of type T_BYTE
   // Make sure that cast is implemented to particular type/size combination.
   if (!arch_supports_vector(cast_vopc, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
+    log_if_needed("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
         cast_vopc, num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -838,27 +755,21 @@ bool LibraryCallKit::inline_vector_frombits_coerced() {
   if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr || mode == nullptr ||
       bits_type == nullptr || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr ||
       !vlen->is_con() || !mode->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s bitwise=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s bitwise=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(5)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -872,12 +783,10 @@ bool LibraryCallKit::inline_vector_frombits_coerced() {
   int opc = bcast_mode == VectorSupport::MODE_BITS_COERCED_LONG_TO_MASK ? Op_VectorLongToMask : Op_Replicate;
 
   if (!arch_supports_vector(opc, num_elem, elem_bt, checkFlags, true /*has_scalar_args*/)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=0 op=broadcast vlen=%d etype=%s ismask=%d bcast_mode=%d",
+    log_if_needed("  ** not supported: arity=0 op=broadcast vlen=%d etype=%s ismask=%d bcast_mode=%d",
                     num_elem, type2name(elem_bt),
                     is_mask ? 1 : 0,
                     bcast_mode);
-    }
     return false; // not supported
   }
 
@@ -973,27 +882,21 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
 
   if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr || !from_ms->is_con() ||
       vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s from_ms=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s from_ms=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(6)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -1001,11 +904,9 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
 
   // TODO When mask usage is supported, VecMaskNotUsed needs to be VecMaskUseLoad.
   if (!arch_supports_vector(is_store ? Op_StoreVector : Op_LoadVector, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s ismask=no",
                     is_store, is_store ? "store" : "load",
                     num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -1046,18 +947,14 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
                       arr_type->elem()->array_element_basic_type() != elem_bt);
   BasicType mem_elem_bt = mismatched_ms ? arr_type->elem()->array_element_basic_type() : elem_bt;
   if (!is_java_primitive(mem_elem_bt)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** non-primitive array element type");
-    }
+    log_if_needed("  ** non-primitive array element type");
     return false;
   }
   int mem_num_elem = mismatched_ms ? (num_elem * type2aelembytes(elem_bt)) / type2aelembytes(mem_elem_bt) : num_elem;
   if (arr_type != nullptr && !is_mask && !elem_consistent_with_arr(elem_bt, arr_type, mismatched_ms)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s ismask=no",
                     is_store, is_store ? "store" : "load",
                     num_elem, type2name(elem_bt), type2name(arr_type->elem()->array_element_basic_type()));
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1068,11 +965,9 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
     if (is_store) {
       if (!arch_supports_vector(Op_StoreVector, num_elem, elem_bt, VecMaskNotUsed)
           || !arch_supports_vector(Op_VectorReinterpret, mem_num_elem, mem_elem_bt, VecMaskNotUsed)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d*8 etype=%s/8 ismask=no",
+        log_if_needed("  ** not supported: arity=%d op=%s vlen=%d*8 etype=%s/8 ismask=no",
                         is_store, "store",
                         num_elem, type2name(elem_bt));
-        }
         set_map(old_map);
         set_sp(old_sp);
         return false; // not supported
@@ -1080,11 +975,9 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
     } else {
       if (!arch_supports_vector(Op_LoadVector, mem_num_elem, mem_elem_bt, VecMaskNotUsed)
           || !arch_supports_vector(Op_VectorReinterpret, num_elem, elem_bt, VecMaskNotUsed)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d*8 etype=%s/8 ismask=no",
+        log_if_needed("  ** not supported: arity=%d op=%s vlen=%d*8 etype=%s/8 ismask=no",
                         is_store, "load",
                         mem_num_elem, type2name(mem_elem_bt));
-        }
         set_map(old_map);
         set_sp(old_sp);
         return false; // not supported
@@ -1198,35 +1091,27 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   if (vector_klass == nullptr || mask_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       vector_klass->const_oop() == nullptr || mask_klass->const_oop() == nullptr || from_ms == nullptr ||
       elem_klass->const_oop() == nullptr || !vlen->is_con() || !from_ms->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s from_ms=%s",
+    log_if_needed("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s from_ms=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(7)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   if (!is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** mask klass argument not initialized");
-    }
+    log_if_needed("  ** mask klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -1248,11 +1133,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   BIG_ENDIAN_ONLY(if (mismatched_ms) return false;)
   // If there is no consistency between array and vector element types, it must be special byte array case
   if (arr_type != nullptr && !elem_consistent_with_arr(elem_bt, arr_type, mismatched_ms)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s",
                     is_store, is_store ? "storeMasked" : "loadMasked",
                     num_elem, type2name(elem_bt), type2name(arr_type->elem()->array_element_basic_type()));
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1274,10 +1157,8 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
       // Masked vector load with IOOBE always uses the predicated load.
       const TypeInt* offset_in_range = gvn().type(argument(9))->isa_int();
       if (!offset_in_range->is_con()) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** missing constant: offsetInRange=%s",
+        log_if_needed("  ** missing constant: offsetInRange=%s",
                         NodeClassNames[argument(8)->Opcode()]);
-        }
         set_map(old_map);
         set_sp(old_sp);
         return false;
@@ -1286,11 +1167,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
     }
 
     if (needs_predicate) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: op=%s vlen=%d etype=%s mismatched_ms=%d",
+      log_if_needed("  ** not supported: op=%s vlen=%d etype=%s mismatched_ms=%d",
                       is_store ? "storeMasked" : "loadMasked",
                       num_elem, type2name(elem_bt), mismatched_ms ? 1 : 0);
-      }
       set_map(old_map);
       set_sp(old_sp);
       return false;
@@ -1301,10 +1180,8 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   // the normal vector load and blend operations are supported by backend.
   if (!supports_predicate && (!arch_supports_vector(Op_LoadVector, mem_num_elem, mem_elem_bt, VecMaskNotUsed) ||
       !arch_supports_vector(Op_VectorBlend, mem_num_elem, mem_elem_bt, VecMaskUseLoad))) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: op=loadMasked vlen=%d etype=%s mismatched_ms=%d",
+    log_if_needed("  ** not supported: op=loadMasked vlen=%d etype=%s mismatched_ms=%d",
                     num_elem, type2name(elem_bt), mismatched_ms ? 1 : 0);
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1314,11 +1191,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   // with byte type is supported by backend.
   if (mismatched_ms) {
     if (!arch_supports_vector(Op_VectorReinterpret, mem_num_elem, T_BYTE, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s mismatched_ms=1",
+      log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s mismatched_ms=1",
                       is_store, is_store ? "storeMasked" : "loadMasked",
                       num_elem, type2name(elem_bt));
-      }
       set_map(old_map);
       set_sp(old_sp);
       return false;
@@ -1328,11 +1203,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   // Since it needs to unbox the mask, we need to double check that the related load operations
   // for mask are supported by backend.
   if (!arch_supports_vector(Op_LoadVector, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s",
                       is_store, is_store ? "storeMasked" : "loadMasked",
                       num_elem, type2name(elem_bt));
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1352,11 +1225,9 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
 
   Node* mask = unbox_vector(is_store ? argument(9) : argument(8), mbox_type, elem_bt, num_elem);
   if (mask == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** unbox failed mask=%s",
+    log_if_needed("  ** unbox failed mask=%s",
                     is_store ? NodeClassNames[argument(9)->Opcode()]
                              : NodeClassNames[argument(8)->Opcode()]);
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1365,10 +1236,8 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   if (is_store) {
     Node* val = unbox_vector(argument(8), vbox_type, elem_bt, num_elem);
     if (val == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed vector=%s",
+      log_if_needed("  ** unbox failed vector=%s",
                       NodeClassNames[argument(8)->Opcode()]);
-      }
       set_map(old_map);
       set_sp(old_sp);
       return false; // operand unboxing failed
@@ -1460,28 +1329,22 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
 
   if (vector_klass == nullptr || elem_klass == nullptr || vector_idx_klass == nullptr || vlen == nullptr ||
       vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || vector_idx_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s viclass=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s viclass=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(vector_idx_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -1492,44 +1355,34 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
     if (mask_klass == nullptr || mask_klass->const_oop() == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: maskclass=%s", NodeClassNames[argument(1)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: maskclass=%s", NodeClassNames[argument(1)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     if (!is_klass_initialized(mask_klass)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** mask klass argument not initialized");
-      }
+      log_if_needed("  ** mask klass argument not initialized");
       return false;
     }
 
     if (vmask_type->maybe_null()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** null mask values are not allowed for masked op");
-      }
+      log_if_needed("  ** null mask values are not allowed for masked op");
       return false;
     }
 
     // Check whether the predicated gather/scatter node is supported by architecture.
     VectorMaskUseType mask = (VectorMaskUseType) (VecMaskUseLoad | VecMaskUsePred);
     if (!arch_supports_vector(is_scatter ? Op_StoreVectorScatterMasked : Op_LoadVectorGatherMasked, num_elem, elem_bt, mask)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s is_masked_op=1",
+      log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s is_masked_op=1",
                       is_scatter, is_scatter ? "scatterMasked" : "gatherMasked",
                       num_elem, type2name(elem_bt));
-      }
       return false; // not supported
     }
   } else {
     // Check whether the normal gather/scatter node is supported for non-masked operation.
     if (!arch_supports_vector(is_scatter ? Op_StoreVectorScatter : Op_LoadVectorGather, num_elem, elem_bt, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s is_masked_op=0",
+      log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s is_masked_op=0",
                       is_scatter, is_scatter ? "scatter" : "gather",
                       num_elem, type2name(elem_bt));
-      }
       return false; // not supported
     }
   }
@@ -1537,11 +1390,9 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
   // Check that the vector holding indices is supported by architecture
   // For sub-word gathers expander receive index array.
   if (!is_subword_type(elem_bt) && !arch_supports_vector(Op_LoadVector, num_elem, T_INT, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=%d op=%s/loadindex vlen=%d etype=int is_masked_op=%d",
+      log_if_needed("  ** not supported: arity=%d op=%s/loadindex vlen=%d etype=int is_masked_op=%d",
                       is_scatter, is_scatter ? "scatter" : "gather",
                       num_elem, is_masked_op ? 1 : 0);
-      }
       return false; // not supported
   }
 
@@ -1559,11 +1410,9 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
 
   // The array must be consistent with vector type
   if (arr_type == nullptr || (arr_type != nullptr && !elem_consistent_with_arr(elem_bt, arr_type, false))) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=%d op=%s vlen=%d etype=%s atype=%s ismask=no",
                     is_scatter, is_scatter ? "scatter" : "gather",
                     num_elem, type2name(elem_bt), type2name(arr_type->elem()->array_element_basic_type()));
-    }
     set_map(old_map);
     set_sp(old_sp);
     return false;
@@ -1595,11 +1444,9 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(is_scatter ? argument(10) : argument(9), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s",
+      log_if_needed("  ** unbox failed mask=%s",
                     is_scatter ? NodeClassNames[argument(10)->Opcode()]
                                : NodeClassNames[argument(9)->Opcode()]);
-      }
       set_map(old_map);
       set_sp(old_sp);
       return false;
@@ -1669,26 +1516,20 @@ bool LibraryCallKit::inline_vector_reduction() {
 
   if (opr == nullptr || vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       !opr->is_con() || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -1696,23 +1537,17 @@ bool LibraryCallKit::inline_vector_reduction() {
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
     if (mask_klass == nullptr || mask_klass->const_oop() == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     if (!is_klass_initialized(mask_klass)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** mask klass argument not initialized");
-      }
+      log_if_needed("  ** mask klass argument not initialized");
       return false;
     }
 
     if (vmask_type->maybe_null()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** null mask values are not allowed for masked op");
-      }
+      log_if_needed("  ** null mask values are not allowed for masked op");
       return false;
     }
   }
@@ -1724,20 +1559,16 @@ bool LibraryCallKit::inline_vector_reduction() {
 
   // When using mask, mask use type needs to be VecMaskUseLoad.
   if (!arch_supports_vector(sopc, num_elem, elem_bt, is_masked_op ? VecMaskUseLoad : VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=%d/reduce vlen=%d etype=%s is_masked_op=%d",
+    log_if_needed("  ** not supported: arity=1 op=%d/reduce vlen=%d etype=%s is_masked_op=%d",
                     sopc, num_elem, type2name(elem_bt), is_masked_op ? 1 : 0);
-    }
     return false;
   }
 
   // Return true if current platform has implemented the masked operation with predicate feature.
   bool use_predicate = is_masked_op && arch_supports_vector(sopc, num_elem, elem_bt, VecMaskUsePred);
   if (is_masked_op && !use_predicate && !arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=%d/reduce vlen=%d etype=%s is_masked_op=1",
+    log_if_needed("  ** not supported: arity=1 op=%d/reduce vlen=%d etype=%s is_masked_op=1",
                     sopc, num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -1756,10 +1587,8 @@ bool LibraryCallKit::inline_vector_reduction() {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(argument(6), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s",
+      log_if_needed("  ** unbox failed mask=%s",
                       NodeClassNames[argument(6)->Opcode()]);
-      }
       return false;
     }
   }
@@ -1822,26 +1651,20 @@ bool LibraryCallKit::inline_vector_test() {
 
   if (cond == nullptr || vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       !cond->is_con() || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: cond=%s vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: cond=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -1851,11 +1674,9 @@ bool LibraryCallKit::inline_vector_test() {
   const TypeInstPtr* vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
 
   if (!arch_supports_vector(Op_VectorTest, num_elem, elem_bt, is_vector_mask(vbox_klass) ? VecMaskUseLoad : VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=2 op=test/%d vlen=%d etype=%s ismask=%d",
+    log_if_needed("  ** not supported: arity=2 op=test/%d vlen=%d etype=%s ismask=%d",
                     cond->get_con(), num_elem, type2name(elem_bt),
                     is_vector_mask(vbox_klass));
-    }
     return false;
   }
 
@@ -1900,26 +1721,20 @@ bool LibraryCallKit::inline_vector_blend() {
   }
   if (mask_klass->const_oop() == nullptr || vector_klass->const_oop() == nullptr ||
       elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -1927,10 +1742,8 @@ bool LibraryCallKit::inline_vector_blend() {
   int num_elem = vlen->get_con();
 
   if (!arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=2 op=blend vlen=%d etype=%s ismask=useload",
+    log_if_needed("  ** not supported: arity=2 op=blend vlen=%d etype=%s ismask=useload",
                     num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
   ciKlass* vbox_klass = vector_klass->const_oop()->as_instance()->java_lang_Class_klass();
@@ -1974,27 +1787,21 @@ bool LibraryCallKit::inline_vector_compare() {
   }
   if (!cond->is_con() || vector_klass->const_oop() == nullptr || mask_klass->const_oop() == nullptr ||
       elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: cond=%s vclass=%s mclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: cond=%s vclass=%s mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -2004,19 +1811,15 @@ bool LibraryCallKit::inline_vector_compare() {
 
   if ((cond->get_con() & BoolTest::unsigned_compare) != 0) {
     if (!Matcher::supports_vector_comparison_unsigned(num_elem, elem_bt)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: unsigned comparison op=comp/%d vlen=%d etype=%s ismask=usestore",
+      log_if_needed("  ** not supported: unsigned comparison op=comp/%d vlen=%d etype=%s ismask=usestore",
                       cond->get_con() & (BoolTest::unsigned_compare - 1), num_elem, type2name(elem_bt));
-      }
       return false;
     }
   }
 
   if (!arch_supports_vector(Op_VectorMaskCmp, num_elem, elem_bt, VecMaskUseStore)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore",
+    log_if_needed("  ** not supported: arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore",
                     cond->get_con(), num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -2032,19 +1835,15 @@ bool LibraryCallKit::inline_vector_compare() {
   bool is_masked_op = argument(7)->bottom_type() != TypePtr::NULL_PTR;
   Node* mask = is_masked_op ? unbox_vector(argument(7), mbox_type, elem_bt, num_elem) : nullptr;
   if (is_masked_op && mask == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: mask = null arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore is_masked_op=1",
+    log_if_needed("  ** not supported: mask = null arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore is_masked_op=1",
                     cond->get_con(), num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
   bool use_predicate = is_masked_op && arch_supports_vector(Op_VectorMaskCmp, num_elem, elem_bt, VecMaskUsePred);
   if (is_masked_op && !use_predicate && !arch_supports_vector(Op_AndV, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore is_masked_op=1",
+    log_if_needed("  ** not supported: arity=2 op=comp/%d vlen=%d etype=%s ismask=usestore is_masked_op=1",
                     cond->get_con(), num_elem, type2name(elem_bt));
-    }
     return false;
   }
 
@@ -2097,27 +1896,21 @@ bool LibraryCallKit::inline_vector_rearrange() {
       vector_klass->const_oop()  == nullptr ||
       elem_klass->const_oop()    == nullptr ||
       !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s sclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: vclass=%s sclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)  ||
       !is_klass_initialized(shuffle_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -2125,10 +1918,8 @@ bool LibraryCallKit::inline_vector_rearrange() {
   int num_elem = vlen->get_con();
 
   if (!arch_supports_vector(Op_VectorLoadShuffle, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=0 op=load/shuffle vlen=%d etype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=0 op=load/shuffle vlen=%d etype=%s ismask=no",
                     num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -2138,9 +1929,7 @@ bool LibraryCallKit::inline_vector_rearrange() {
       (mask_klass == nullptr ||
        mask_klass->const_oop() == nullptr ||
        !is_klass_initialized(mask_klass))) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** mask_klass argument not initialized");
-    }
+    log_if_needed("  ** mask_klass argument not initialized");
   }
   VectorMaskUseType checkFlags = (VectorMaskUseType)(is_masked_op ? (VecMaskUseLoad | VecMaskUsePred) : VecMaskNotUsed);
   if (!arch_supports_vector(Op_VectorRearrange, num_elem, elem_bt, checkFlags)) {
@@ -2149,10 +1938,8 @@ bool LibraryCallKit::inline_vector_rearrange() {
        (!arch_supports_vector(Op_VectorRearrange, num_elem, elem_bt, VecMaskNotUsed) ||
         !arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad)     ||
         !arch_supports_vector(Op_Replicate, num_elem, elem_bt, VecMaskNotUsed))) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=2 op=shuffle/rearrange vlen=%d etype=%s ismask=no",
+      log_if_needed("  ** not supported: arity=2 op=shuffle/rearrange vlen=%d etype=%s ismask=no",
                       num_elem, type2name(elem_bt));
-      }
       return false; // not supported
     }
   }
@@ -2175,10 +1962,8 @@ bool LibraryCallKit::inline_vector_rearrange() {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(argument(7), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=3 op=shuffle/rearrange vlen=%d etype=%s ismask=useload is_masked_op=1",
+      log_if_needed("  ** not supported: arity=3 op=shuffle/rearrange vlen=%d etype=%s ismask=useload is_masked_op=1",
                       num_elem, type2name(elem_bt));
-      }
       return false;
     }
   }
@@ -2280,19 +2065,15 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
     return false; // dead code
   }
   if (!opr->is_con() || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -2300,32 +2081,24 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
     if (mask_klass == nullptr || mask_klass->const_oop() == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: maskclass=%s", NodeClassNames[argument(2)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     if (!is_klass_initialized(mask_klass)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** mask klass argument not initialized");
-      }
+      log_if_needed("  ** mask klass argument not initialized");
       return false;
     }
 
     if (vmask_type->maybe_null()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** null mask values are not allowed for masked op");
-      }
+      log_if_needed("  ** null mask values are not allowed for masked op");
       return false;
     }
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -2337,17 +2110,13 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
   bool is_rotate = VectorNode::is_rotate_opcode(opc);
 
   if (opc == 0 || (!is_shift && !is_rotate)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** operation not supported: op=%d bt=%s", opr->get_con(), type2name(elem_bt));
-    }
+    log_if_needed("  ** operation not supported: op=%d bt=%s", opr->get_con(), type2name(elem_bt));
     return false; // operation not supported
   }
 
   int sopc = VectorNode::opcode(opc, elem_bt);
   if (sopc == 0) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** operation not supported: opc=%s bt=%s", NodeClassNames[opc], type2name(elem_bt));
-    }
+    log_if_needed("  ** operation not supported: opc=%s bt=%s", NodeClassNames[opc], type2name(elem_bt));
     return false; // operation not supported
   }
 
@@ -2370,10 +2139,8 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
         (!arch_supports_vector(sopc, num_elem, elem_bt, VecMaskNotUsed, has_scalar_args) ||
          !arch_supports_vector(Op_VectorBlend, num_elem, elem_bt, VecMaskUseLoad))) {
 
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=0 op=int/%d vlen=%d etype=%s is_masked_op=%d",
+      log_if_needed("  ** not supported: arity=0 op=int/%d vlen=%d etype=%s is_masked_op=%d",
                       sopc, num_elem, type2name(elem_bt), is_masked_op ? 1 : 0);
-      }
       return false; // not supported
     }
   }
@@ -2404,9 +2171,7 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
     const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
     mask = unbox_vector(argument(7), mbox_type, elem_bt, num_elem);
     if (mask == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed mask=%s", NodeClassNames[argument(7)->Opcode()]);
-      }
+      log_if_needed("  ** unbox failed mask=%s", NodeClassNames[argument(7)->Opcode()]);
       return false;
     }
   }
@@ -2456,8 +2221,7 @@ bool LibraryCallKit::inline_vector_convert() {
   if (!opr->is_con() ||
       vector_klass_from->const_oop() == nullptr || elem_klass_from->const_oop() == nullptr || !vlen_from->is_con() ||
       vector_klass_to->const_oop() == nullptr || elem_klass_to->const_oop() == nullptr || !vlen_to->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass_from=%s etype_from=%s vlen_from=%s vclass_to=%s etype_to=%s vlen_to=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass_from=%s etype_from=%s vlen_from=%s vclass_to=%s etype_to=%s vlen_to=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
@@ -2465,13 +2229,10 @@ bool LibraryCallKit::inline_vector_convert() {
                     NodeClassNames[argument(4)->Opcode()],
                     NodeClassNames[argument(5)->Opcode()],
                     NodeClassNames[argument(6)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass_from) || !is_klass_initialized(vector_klass_to)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
@@ -2508,11 +2269,9 @@ bool LibraryCallKit::inline_vector_convert() {
                             num_elem_from,
                             elem_bt_from,
                             is_mask ? VecMaskUseAll : VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=%s/1 vlen1=%d etype1=%s ismask=%d",
+    log_if_needed("  ** not supported: arity=1 op=%s/1 vlen1=%d etype1=%s ismask=%d",
                     is_cast ? "cast" : "reinterpret",
                     num_elem_from, type2name(elem_bt_from), is_mask);
-    }
     return false;
   }
 
@@ -2521,11 +2280,9 @@ bool LibraryCallKit::inline_vector_convert() {
                             num_elem_to,
                             elem_bt_to,
                             is_mask ? VecMaskUseAll : VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=%s/2 vlen2=%d etype2=%s ismask=%d",
+    log_if_needed("  ** not supported: arity=1 op=%s/2 vlen2=%d etype2=%s ismask=%d",
                     is_cast ? "cast" : "reinterpret",
                     num_elem_to, type2name(elem_bt_to), is_mask);
-    }
     return false;
   }
 
@@ -2565,10 +2322,8 @@ bool LibraryCallKit::inline_vector_convert() {
     // Make sure that vector cast is implemented to particular type/size combination if it is
     // not a mask casting.
     if (!is_mask && !arch_supports_vector(cast_vopc, num_elem_to, elem_bt_to, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s ismask=%d",
+      log_if_needed("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s ismask=%d",
                       cast_vopc, num_elem_to, type2name(elem_bt_to), is_mask);
-      }
       return false;
     }
 
@@ -2580,11 +2335,9 @@ bool LibraryCallKit::inline_vector_convert() {
       // It is possible that arch does not support this intermediate vector size
       // TODO More complex logic required here to handle this corner case for the sizes.
       if (!arch_supports_vector(cast_vopc, num_elem_for_cast, elem_bt_to, VecMaskNotUsed)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** not supported: arity=1 op=cast#%d/4 vlen1=%d etype2=%s ismask=%d",
+        log_if_needed("  ** not supported: arity=1 op=cast#%d/4 vlen1=%d etype2=%s ismask=%d",
                         cast_vopc,
                         num_elem_for_cast, type2name(elem_bt_to), is_mask);
-        }
         return false;
       }
 
@@ -2602,10 +2355,8 @@ bool LibraryCallKit::inline_vector_convert() {
                                 num_elem_for_resize,
                                 elem_bt_from,
                                 VecMaskNotUsed)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** not supported: arity=1 op=cast/5 vlen2=%d etype1=%s ismask=%d",
+        log_if_needed("  ** not supported: arity=1 op=cast/5 vlen2=%d etype1=%s ismask=%d",
                         num_elem_for_resize, type2name(elem_bt_from), is_mask);
-        }
         return false;
       }
 
@@ -2616,10 +2367,8 @@ bool LibraryCallKit::inline_vector_convert() {
       if (is_mask) {
         // Make sure that cast for vector mask is implemented to particular type/size combination.
         if (!arch_supports_vector(Op_VectorMaskCast, num_elem_to, elem_bt_to, VecMaskNotUsed)) {
-          if (C->print_intrinsics()) {
-            tty->print_cr("  ** not supported: arity=1 op=maskcast vlen2=%d etype2=%s ismask=%d",
+          log_if_needed("  ** not supported: arity=1 op=maskcast vlen2=%d etype2=%s ismask=%d",
                           num_elem_to, type2name(elem_bt_to), is_mask);
-          }
           return false;
         }
         op = gvn().transform(new VectorMaskCastNode(op, dst_type));
@@ -2657,35 +2406,27 @@ bool LibraryCallKit::inline_vector_insert() {
     return false; // dead code
   }
   if (vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con() || !idx->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s idx=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s idx=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
   int num_elem = vlen->get_con();
   if (!arch_supports_vector(Op_VectorInsert, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: arity=1 op=insert vlen=%d etype=%s ismask=no",
+    log_if_needed("  ** not supported: arity=1 op=insert vlen=%d etype=%s ismask=no",
                     num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -2751,25 +2492,19 @@ bool LibraryCallKit::inline_vector_extract() {
     return false; // dead code
   }
   if (vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
   BasicType elem_bt = elem_type->basic_type();
@@ -2807,26 +2542,20 @@ bool LibraryCallKit::inline_vector_extract() {
       opd = gvn().transform(new URShiftLNode(opd, pos));
       opd = gvn().transform(new AndLNode(opd, gvn().makecon(TypeLong::ONE)));
     } else {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** Rejected mask extraction because architecture does not support it");
-      }
+      log_if_needed("  ** Rejected mask extraction because architecture does not support it");
       return false; // not supported
     }
   } else {
     // vbox_klass is vector. This is used for Vector.lane(int).
     if (!idx->is_con()) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** missing constant: idx=%s", NodeClassNames[argument(4)->Opcode()]);
-      }
+      log_if_needed("  ** missing constant: idx=%s", NodeClassNames[argument(4)->Opcode()]);
       return false; // not enough info for intrinsification
     }
 
     int vopc = ExtractNode::opcode(elem_bt);
     if (!arch_supports_vector(vopc, num_elem, elem_bt, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: arity=1 op=extract vlen=%d etype=%s ismask=no",
+      log_if_needed("  ** not supported: arity=1 op=extract vlen=%d etype=%s ismask=no",
                       num_elem, type2name(elem_bt));
-      }
       return false; // not supported
     }
 
@@ -2882,29 +2611,23 @@ bool LibraryCallKit::inline_vector_compress_expand() {
   if (vector_klass == nullptr || elem_klass == nullptr || mask_klass == nullptr || vlen == nullptr ||
       vector_klass->const_oop() == nullptr || mask_klass->const_oop() == nullptr ||
       elem_klass->const_oop() == nullptr || !vlen->is_con() || !opr->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: opr=%s vclass=%s mclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: opr=%s vclass=%s mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
                     NodeClassNames[argument(3)->Opcode()],
                     NodeClassNames[argument(4)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -2913,10 +2636,8 @@ bool LibraryCallKit::inline_vector_compress_expand() {
   int opc = VectorSupport::vop2ideal(opr->get_con(), elem_bt);
 
   if (!arch_supports_vector(opc, num_elem, elem_bt, VecMaskUseLoad)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: opc=%d vlen=%d etype=%s ismask=useload",
+    log_if_needed("  ** not supported: opc=%d vlen=%d etype=%s ismask=useload",
                     opc, num_elem, type2name(elem_bt));
-    }
     return false; // not supported
   }
 
@@ -2927,10 +2648,8 @@ bool LibraryCallKit::inline_vector_compress_expand() {
     vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
     opd1 = unbox_vector(argument(5), vbox_type, elem_bt, num_elem);
     if (opd1 == nullptr) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** unbox failed vector=%s",
+      log_if_needed("  ** unbox failed vector=%s",
                       NodeClassNames[argument(5)->Opcode()]);
-      }
       return false;
     }
   }
@@ -2941,10 +2660,8 @@ bool LibraryCallKit::inline_vector_compress_expand() {
 
   Node* mask = unbox_vector(argument(6), mbox_type, elem_bt, num_elem);
   if (mask == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** unbox failed mask=%s",
+    log_if_needed("  ** unbox failed mask=%s",
                     NodeClassNames[argument(6)->Opcode()]);
-    }
     return false;
   }
 
@@ -2975,27 +2692,21 @@ bool LibraryCallKit::inline_index_vector() {
   if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       vector_klass->const_oop() == nullptr || !vlen->is_con() ||
       elem_klass->const_oop() == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(vector_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -3004,9 +2715,7 @@ bool LibraryCallKit::inline_index_vector() {
 
   // Check whether the iota index generation op is supported by the current hardware
   if (!arch_supports_vector(Op_VectorLoadConst, num_elem, elem_bt, VecMaskNotUsed)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
-    }
+    log_if_needed("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
     return false; // not supported
   }
 
@@ -3021,9 +2730,7 @@ bool LibraryCallKit::inline_index_vector() {
   } else {
     // Check whether the vector multiply op is supported by the current hardware
     if (!arch_supports_vector(vmul_op, num_elem, elem_bt, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
-      }
+      log_if_needed("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
       return false; // not supported
     }
 
@@ -3032,10 +2739,8 @@ bool LibraryCallKit::inline_index_vector() {
       int cast_op = elem_bt == T_LONG ? Op_ConvI2L :
                     elem_bt == T_FLOAT? Op_ConvI2F : Op_ConvI2D;
       if (!Matcher::match_rule_supported(cast_op)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** Rejected op (%s) because architecture does not support it",
+        log_if_needed("  ** Rejected op (%s) because architecture does not support it",
                         NodeClassNames[cast_op]);
-        }
         return false; // not supported
       }
     }
@@ -3045,10 +2750,8 @@ bool LibraryCallKit::inline_index_vector() {
   const TypeInstPtr* vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
   Node* opd = unbox_vector(argument(3), vbox_type, elem_bt, num_elem);
   if (opd == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** unbox failed vector=%s",
+    log_if_needed("  ** unbox failed vector=%s",
                     NodeClassNames[argument(3)->Opcode()]);
-    }
     return false;
   }
 
@@ -3061,9 +2764,7 @@ bool LibraryCallKit::inline_index_vector() {
   } else {
     // Check whether the vector addition op is supported by the current hardware
     if (!arch_supports_vector(vadd_op, num_elem, elem_bt, VecMaskNotUsed)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
-      }
+      log_if_needed("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
       return false; // not supported
     }
   }
@@ -3124,27 +2825,21 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
 
   if (mask_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
       mask_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** missing constant: mclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()]);
-    }
     return false; // not enough info for intrinsification
   }
 
   if (!is_klass_initialized(mask_klass)) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** klass argument not initialized");
-    }
+    log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
   ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
   if (!elem_type->is_primitive_type()) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** not a primitive bt=%d", elem_type->basic_type());
-    }
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
     return false; // should be primitive type
   }
 
@@ -3157,9 +2852,7 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
     if (!arch_supports_vector(Op_VectorLoadConst, num_elem, elem_bt, VecMaskNotUsed) ||
         !arch_supports_vector(Op_Replicate, num_elem, elem_bt, VecMaskNotUsed) ||
         !arch_supports_vector(Op_VectorMaskCmp, num_elem, elem_bt, VecMaskUseStore)) {
-      if (C->print_intrinsics()) {
-        tty->print_cr("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
-      }
+      log_if_needed("  ** not supported: vlen=%d etype=%s", num_elem, type2name(elem_bt));
       return false; // not supported
     }
 
@@ -3168,10 +2861,8 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
       int cast_op = is_integral_type(elem_bt) ? Op_ConvL2I
                                               : (elem_bt == T_FLOAT ? Op_ConvL2F : Op_ConvL2D);
       if (!Matcher::match_rule_supported(cast_op)) {
-        if (C->print_intrinsics()) {
-          tty->print_cr("  ** Rejected op (%s) because architecture does not support it",
+        log_if_needed("  ** Rejected op (%s) because architecture does not support it",
                         NodeClassNames[cast_op]);
-        }
         return false; // not supported
       }
     }
@@ -3180,9 +2871,7 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
   Node* offset = argument(3);
   Node* limit = argument(5);
   if (offset == nullptr || limit == nullptr) {
-    if (C->print_intrinsics()) {
-      tty->print_cr("  ** offset or limit argument is null");
-    }
+    log_if_needed("  ** offset or limit argument is null");
     return false; // not supported
   }
 
@@ -3238,3 +2927,6 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
   C->set_max_vector_size(MAX2(C->max_vector_size(), (uint)(num_elem * type2aelembytes(elem_bt))));
   return true;
 }
+
+#undef non_product_log_if_needed
+#undef log_if_needed

From 7db6a3f0ee3986b492786bec99b207ec36401c57 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 10 May 2024 07:58:20 +0000
Subject: [PATCH 388/486] 8331905: Fix direct includes of g1_globals.hpp

Reviewed-by: ayang, tschatzl, gli
---
 src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp        | 3 +--
 src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp      | 4 ++--
 src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp   | 5 ++---
 src/hotspot/share/gc/g1/g1ParScanThreadState.hpp             | 4 ++--
 src/hotspot/share/gc/g1/g1RemSet.cpp                         | 2 +-
 src/hotspot/share/gc/g1/g1YoungCollector.cpp                 | 2 +-
 .../share/gc/g1/g1YoungGCAllocationFailureInjector.cpp       | 4 ++--
 .../share/gc/g1/g1YoungGCAllocationFailureInjector.hpp       | 4 ++--
 .../gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp      | 4 ++--
 9 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
index dd38d33b5d3..531559545d7 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 #define SHARE_GC_G1_G1COLLECTIONSETCANDIDATES_HPP
 
 #include "gc/g1/g1CollectionSetCandidates.hpp"
-#include "gc/g1/g1_globals.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "memory/allocation.hpp"
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
index a176b847eab..ba309c97ca5 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionManager.inline.hpp"
-#include "gc/g1/g1_globals.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp
index 337acfe2405..59a1afe6f34 100644
--- a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp
+++ b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,8 @@
 #include "gc/g1/g1HeapRegionRemSet.hpp"
 #include "gc/g1/g1MonotonicArenaFreeMemoryTask.hpp"
 #include "gc/g1/g1MonotonicArenaFreePool.hpp"
-#include "gc/g1/g1_globals.hpp"
-#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "runtime/os.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
index 72f7a0b84e7..3f8f8e22a99 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,9 @@
 #include "gc/g1/g1RedirtyCardsQueue.hpp"
 #include "gc/g1/g1OopClosures.hpp"
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
-#include "gc/g1/g1_globals.hpp"
 #include "gc/shared/ageTable.hpp"
 #include "gc/shared/copyFailedInfo.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/partialArrayTaskStepper.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index a47fd379a70..63f48a15e8d 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -42,10 +42,10 @@
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1RemSet.hpp"
-#include "gc/g1/g1_globals.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/bufferNodeList.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index bf1c8b738f8..720cf3a3629 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -49,10 +49,10 @@
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
 #include "gc/g1/g1YoungGCPostEvacuateTasks.hpp"
 #include "gc/g1/g1YoungGCPreEvacuateTasks.hpp"
-#include "gc/g1/g1_globals.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp
index 60b7e0872f2..9bbb6bddb31 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp"
-#include "gc/g1/g1_globals.hpp"
+#include "gc/shared/gc_globals.hpp"
 
 #if ALLOCATION_FAILURE_INJECTOR
 
diff --git a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.hpp b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.hpp
index fb7e8cd3ad3..44677fe4710 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #ifndef SHARE_GC_G1_G1YOUNGGCALLOCATIONFAILUREINJECTOR_HPP
 #define SHARE_GC_G1_G1YOUNGGCALLOCATIONFAILUREINJECTOR_HPP
 
-#include "gc/g1/g1_globals.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/allStatic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp
index 7c71eb14d52..cfa047ea0ce 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
 
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
 
-#include "gc/g1/g1_globals.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 
 #if ALLOCATION_FAILURE_INJECTOR
 

From d65412450254992c05c851298323b6acd3b39bd3 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Fri, 10 May 2024 08:22:46 +0000
Subject: [PATCH 389/486] 8331932: Startup regressions in 23-b13

Reviewed-by: alanb, naoto, liach
---
 .../share/classes/java/util/Locale.java       | 26 ++++++++++++-------
 .../jdk/internal/util/ReferencedKeyMap.java   | 15 +++++++++++
 .../jdk/internal/util/ReferencedKeySet.java   |  9 +++++++
 .../classes/sun/util/locale/BaseLocale.java   | 22 +++++++++++-----
 4 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 0f8474ec12d..ae6c4af5ec5 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -48,6 +48,7 @@ import java.io.Serializable;
 import java.text.DateFormat;
 import java.text.MessageFormat;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 import java.util.spi.LocaleNameProvider;
 import java.util.stream.Stream;
 
@@ -980,29 +981,36 @@ public final class Locale implements Cloneable, Serializable {
         return getInstance(baseloc, extensions);
     }
 
+
     static Locale getInstance(BaseLocale baseloc, LocaleExtensions extensions) {
         if (extensions == null) {
             Locale locale = CONSTANT_LOCALES.get(baseloc);
             if (locale != null) {
                 return locale;
             }
-            return LOCALE_CACHE.computeIfAbsent(baseloc, Locale::createLocale);
+            return LOCALE_CACHE.computeIfAbsent(baseloc, LOCALE_CREATOR);
         } else {
             LocaleKey key = new LocaleKey(baseloc, extensions);
-            return LOCALE_CACHE.computeIfAbsent(key, Locale::createLocale);
+            return LOCALE_CACHE.computeIfAbsent(key, LOCALE_CREATOR);
         }
     }
 
-    private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE = ReferencedKeyMap.create(true, ConcurrentHashMap::new);
-    private static Locale createLocale(Object key) {
-        if (key instanceof BaseLocale base) {
-            return new Locale(base, null);
+    private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE
+            = ReferencedKeyMap.create(true, ReferencedKeyMap.concurrentHashMapSupplier());
+
+    private static final Function<Object, Locale> LOCALE_CREATOR = new Function<>() {
+        @Override
+        public Locale apply(Object key) {
+            if (key instanceof BaseLocale base) {
+                return new Locale(base, null);
+            }
+            LocaleKey lk = (LocaleKey)key;
+            return new Locale(lk.base, lk.exts);
         }
-        LocaleKey lk = (LocaleKey)key;
-        return new Locale(lk.base, lk.exts);
-    }
+    };
 
     private static final class LocaleKey {
+
         private final BaseLocale base;
         private final LocaleExtensions exts;
         private final int hash;
diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
index be392c3ae2d..9c364cd7813 100644
--- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
+++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
@@ -99,6 +99,21 @@ public final class ReferencedKeyMap<K, V> implements Map<K, V> {
      */
     private final ReferenceQueue<K> stale;
 
+    /**
+     * @return a supplier to create a {@code ConcurrentHashMap} appropriate for use in the
+     *         create methods.
+     * @param <K> the type of keys maintained by the new map
+     * @param <V> the type of mapped values
+     */
+    public static <K, V> Supplier<Map<ReferenceKey<K>, V>> concurrentHashMapSupplier() {
+        return new Supplier<>() {
+            @Override
+            public Map<ReferenceKey<K>, V> get() {
+                return new ConcurrentHashMap<>();
+            }
+        };
+    }
+
     /**
      * Private constructor.
      *
diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
index 21b940439e0..73ad6f32640 100644
--- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
+++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
@@ -75,6 +75,15 @@ public final class ReferencedKeySet<T> extends AbstractSet<T> {
      */
     final ReferencedKeyMap<T, ReferenceKey<T>> map;
 
+    /**
+     * @return a supplier to create a {@code ConcurrentHashMap} appropriate for use in the
+     *         create methods.
+     * @param <E> the type of elements maintained by this set
+     */
+    public static <E> Supplier<Map<ReferenceKey<E>, ReferenceKey<E>>> concurrentHashMapSupplier() {
+        return ReferencedKeyMap.concurrentHashMapSupplier();
+    }
+
     /**
      * Private constructor.
      *
diff --git a/src/java.base/share/classes/sun/util/locale/BaseLocale.java b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
index 7e0fc9a2d34..ec2a6a49183 100644
--- a/src/java.base/share/classes/sun/util/locale/BaseLocale.java
+++ b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
@@ -38,7 +38,7 @@ import jdk.internal.util.StaticProperty;
 import jdk.internal.vm.annotation.Stable;
 
 import java.util.StringJoiner;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.UnaryOperator;
 
 public final class BaseLocale {
 
@@ -93,7 +93,7 @@ public final class BaseLocale {
 
     // Interned BaseLocale cache
     private static final ReferencedKeySet<BaseLocale> CACHE =
-            ReferencedKeySet.create(true, ConcurrentHashMap::new);
+            ReferencedKeySet.create(true, ReferencedKeySet.concurrentHashMapSupplier());
 
     public static final String SEP = "_";
 
@@ -164,13 +164,21 @@ public final class BaseLocale {
         // "interned" instance can subsequently be used by the Locale
         // instance which guarantees the locale components are properly cased/interned.
         return CACHE.intern(new BaseLocale(language, script, region, variant),
-            (b) -> new BaseLocale(
-                LocaleUtils.toLowerString(b.language).intern(),
-                LocaleUtils.toTitleString(b.script).intern(),
-                LocaleUtils.toUpperString(b.region).intern(),
-                b.variant.intern()));
+                // Avoid lambdas since this may be on the bootstrap path in many locales
+                INTERNER);
     }
 
+    public static final UnaryOperator<BaseLocale> INTERNER = new UnaryOperator<>() {
+        @Override
+        public BaseLocale apply(BaseLocale b) {
+            return new BaseLocale(
+                    LocaleUtils.toLowerString(b.language).intern(),
+                    LocaleUtils.toTitleString(b.script).intern(),
+                    LocaleUtils.toUpperString(b.region).intern(),
+                    b.variant.intern());
+        }
+    };
+
     public static String convertOldISOCodes(String language) {
         return switch (language) {
             case "he", "iw" -> OLD_ISO_CODES ? "iw" : "he";

From 9f43ce5a725b212cec0f3cd17491c4bada953676 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Fri, 10 May 2024 09:48:14 +0000
Subject: [PATCH 390/486] 8330027: Identity hashes of archived objects must be
 based on a reproducible random seed

Reviewed-by: ccheung, iklam
---
 src/hotspot/share/cds/archiveHeapWriter.cpp | 6 ++----
 src/hotspot/share/cds/heapShared.cpp        | 6 ------
 src/hotspot/share/runtime/thread.cpp        | 6 +++++-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/cds/archiveHeapWriter.cpp b/src/hotspot/share/cds/archiveHeapWriter.cpp
index a86996d3b1f..e9f4fad63d4 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.cpp
+++ b/src/hotspot/share/cds/archiveHeapWriter.cpp
@@ -530,10 +530,8 @@ void ArchiveHeapWriter::update_header_for_requested_obj(oop requested_obj, oop s
   fake_oop->set_narrow_klass(nk);
 
   // We need to retain the identity_hash, because it may have been used by some hashtables
-  // in the shared heap. This also has the side effect of pre-initializing the
-  // identity_hash for all shared objects, so they are less likely to be written
-  // into during run time, increasing the potential of memory sharing.
-  if (src_obj != nullptr) {
+  // in the shared heap.
+  if (src_obj != nullptr && !src_obj->fast_no_hash_check()) {
     intptr_t src_hash = src_obj->identity_hash();
     fake_oop->set_mark(markWord::prototype().copy_set_hash(src_hash));
     assert(fake_oop->mark().is_unlocked(), "sanity");
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 202042e622e..b9f5d963c85 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -278,12 +278,6 @@ bool HeapShared::archive_object(oop obj) {
   } else {
     count_allocation(obj->size());
     ArchiveHeapWriter::add_source_obj(obj);
-
-    // The archived objects are discovered in a predictable order. Compute
-    // their identity_hash() as soon as we see them. This ensures that the
-    // the identity_hash in the object header will have a predictable value,
-    // making the archive reproducible.
-    obj->identity_hash();
     CachedOopInfo info = make_cached_oop_info(obj);
     archived_object_cache()->put_when_absent(obj, info);
     archived_object_cache()->maybe_grow();
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index bbfeaefb1fe..d98fcf6f664 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "precompiled.hpp"
+#include "cds/cdsConfig.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/javaThreadStatus.hpp"
 #include "gc/shared/barrierSet.hpp"
@@ -103,7 +104,10 @@ Thread::Thread() {
   _vm_error_callbacks = nullptr;
 
   // thread-specific hashCode stream generator state - Marsaglia shift-xor form
-  _hashStateX = os::random();
+  // If we are dumping, keep ihashes constant. Note that during dumping we only
+  // ever run one java thread, and no other thread should generate ihashes either,
+  // so using a constant seed should work fine.
+  _hashStateX = CDSConfig::is_dumping_static_archive() ? 0x12345678 : os::random();
   _hashStateY = 842502087;
   _hashStateZ = 0x8767;    // (int)(3579807591LL & 0xffff) ;
   _hashStateW = 273326509;

From dab92c51c70767abcda3b1a91dd7d1a9b40290c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8A=E5=A4=A9?= <jinguojie.jgj@alibaba-inc.com>
Date: Fri, 10 May 2024 10:01:40 +0000
Subject: [PATCH 391/486] 8331558: AArch64: optimize integer remainder

Reviewed-by: eliu, aph
---
 .../cpu/aarch64/macroAssembler_aarch64.cpp    | 31 +++++++++++++++++--
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |  5 ++-
 .../cpu/aarch64/vm_version_aarch64.cpp        | 15 ++-------
 .../cpu/aarch64/vm_version_aarch64.hpp        | 24 ++++++++++++++
 4 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index b90b5862ee5..182bb784d5f 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -2285,6 +2285,33 @@ Address MacroAssembler::form_address(Register Rd, Register base, int64_t byte_of
   return Address(Rd);
 }
 
+// On Neoverse, MSUB uses the same ALU with other instructions (e.g. SDIV).
+// The combination of MUL/SUB can utilize multiple ALUs,
+// and can be somewhat faster than MSUB.
+void MacroAssembler::msub(Register Rd, Register Rn, Register Rm, Register Ra)
+{
+  if (VM_Version::supports_a53mac() && Ra != zr)
+    nop();
+  if (VM_Version::is_neoverse()) {
+    mul(rscratch1, Rn, Rm);
+    sub(Rd, Ra, rscratch1);
+  } else {
+    Assembler::msub(Rd, Rn, Rm, Ra);
+  }
+}
+
+void MacroAssembler::msubw(Register Rd, Register Rn, Register Rm, Register Ra)
+{
+  if (VM_Version::supports_a53mac() && Ra != zr)
+    nop();
+  if (VM_Version::is_neoverse()) {
+    mulw(rscratch1, Rn, Rm);
+    subw(Rd, Ra, rscratch1);
+  } else {
+    Assembler::msubw(Rd, Rn, Rm, Ra);
+  }
+}
+
 int MacroAssembler::corrected_idivl(Register result, Register ra, Register rb,
                                     bool want_remainder, Register scratch)
 {
@@ -2309,7 +2336,7 @@ int MacroAssembler::corrected_idivl(Register result, Register ra, Register rb,
     sdivw(result, ra, rb);
   } else {
     sdivw(scratch, ra, rb);
-    Assembler::msubw(result, scratch, rb, ra);
+    msubw(result, scratch, rb, ra);
   }
 
   return idivl_offset;
@@ -2339,7 +2366,7 @@ int MacroAssembler::corrected_idivq(Register result, Register ra, Register rb,
     sdiv(result, ra, rb);
   } else {
     sdiv(scratch, ra, rb);
-    Assembler::msub(result, scratch, rb, ra);
+    msub(result, scratch, rb, ra);
   }
 
   return idivq_offset;
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 67fd7236842..efcfa95f25e 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -437,11 +437,14 @@ class MacroAssembler: public Assembler {
     Assembler::INSN(Rd, Rn, Rm, Ra);                                          \
   }
 
-  WRAP(madd) WRAP(msub) WRAP(maddw) WRAP(msubw)
+  WRAP(madd) WRAP(maddw)
   WRAP(smaddl) WRAP(smsubl) WRAP(umaddl) WRAP(umsubl)
 #undef WRAP
 
 
+  void msub(Register Rd, Register Rn, Register Rm, Register Ra);
+  void msubw(Register Rd, Register Rn, Register Rm, Register Ra);
+
   // macro assembly operations needed for aarch64
 
 public:
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index 18f310c746c..7eda594c9d2 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -212,13 +212,7 @@ void VM_Version::initialize() {
     }
   }
 
-  // Neoverse
-  //   N1: 0xd0c
-  //   N2: 0xd49
-  //   V1: 0xd40
-  //   V2: 0xd4f
-  if (_cpu == CPU_ARM && (model_is(0xd0c) || model_is(0xd49) ||
-                          model_is(0xd40) || model_is(0xd4f))) {
+  if (is_neoverse()) {
     if (FLAG_IS_DEFAULT(UseSIMDForMemoryOps)) {
       FLAG_SET_DEFAULT(UseSIMDForMemoryOps, true);
     }
@@ -247,10 +241,7 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseCRC32, false);
   }
 
-  // Neoverse
-  //   V1: 0xd40
-  //   V2: 0xd4f
-  if (_cpu == CPU_ARM && (model_is(0xd40) || model_is(0xd4f))) {
+  if (is_neoverse_v_series()) {
     if (FLAG_IS_DEFAULT(UseCryptoPmullForCRC32)) {
       FLAG_SET_DEFAULT(UseCryptoPmullForCRC32, true);
     }
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
index f6cac72804f..282f88cc8b0 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
@@ -114,6 +114,13 @@ enum Ampere_CPU_Model {
     CPU_MODEL_AMPERE_1B = 0xac5  /* AMPERE_1B core Implements ARMv8.7 with CSSC, MTE, SM3/SM4 extensions */
 };
 
+enum Neoverse_CPU_Model {
+    CPU_MODEL_NEOVERSE_N1 = 0xd0c,
+    CPU_MODEL_NEOVERSE_N2 = 0xd49,
+    CPU_MODEL_NEOVERSE_V1 = 0xd40,
+    CPU_MODEL_NEOVERSE_V2 = 0xd4f,
+};
+
 #define CPU_FEATURE_FLAGS(decl)               \
     decl(FP,            fp,            0)     \
     decl(ASIMD,         asimd,         1)     \
@@ -156,6 +163,23 @@ enum Ampere_CPU_Model {
     return _model == cpu_model || _model2 == cpu_model;
   }
 
+
+  static bool is_neoverse() {
+    switch(_model) {
+      case CPU_MODEL_NEOVERSE_N1:
+      case CPU_MODEL_NEOVERSE_N2:
+      case CPU_MODEL_NEOVERSE_V1:
+      case CPU_MODEL_NEOVERSE_V2:
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  static bool is_neoverse_v_series() {
+    return (model_is(CPU_MODEL_NEOVERSE_V1) || model_is(CPU_MODEL_NEOVERSE_V2));
+  }
+
   static bool is_zva_enabled() { return 0 <= _zva_length; }
   static int zva_length() {
     assert(is_zva_enabled(), "ZVA not available");

From dea8076a584fcb41d1b911af911605e2e7f82a87 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Fri, 10 May 2024 10:10:53 +0000
Subject: [PATCH 392/486] 8332006: Test
 com/sun/net/httpserver/TcpNoDelayNotRequired.java run timeout with -Xcomp

Reviewed-by: jpai, dfuchs
---
 test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java b/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java
index b7366188821..a66f25dd487 100644
--- a/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java
+++ b/test/jdk/com/sun/net/httpserver/TcpNoDelayNotRequired.java
@@ -25,6 +25,7 @@
  * @test
  * @bug 6968351
  * @summary  tcp no delay not required for small payloads
+ * @requires vm.compMode != "Xcomp"
  * @library /test/lib
  * @run main/othervm/timeout=5 -Dsun.net.httpserver.nodelay=false  TcpNoDelayNotRequired
  */

From 784b8fce7a1b05209a8db168c8d2f86484a1a817 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 10 May 2024 10:50:51 +0000
Subject: [PATCH 393/486] 8331744: java.lang.classfile.TypeKind improvements

Reviewed-by: asotona, redestad
---
 .../classes/java/lang/classfile/TypeKind.java |  35 ++++--
 .../NewPrimitiveArrayInstruction.java         |   4 +-
 .../classfile/impl/AbstractInstruction.java   |   4 +-
 test/jdk/jdk/classfile/TypeKindTest.java      |  48 ++++++++
 .../java/lang/classfile/TypeKindBench.java    | 108 ++++++++++++++++++
 5 files changed, 183 insertions(+), 16 deletions(-)
 create mode 100644 test/jdk/jdk/classfile/TypeKindTest.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java

diff --git a/src/java.base/share/classes/java/lang/classfile/TypeKind.java b/src/java.base/share/classes/java/lang/classfile/TypeKind.java
index bf2435f43ef..5ba566b3d06 100644
--- a/src/java.base/share/classes/java/lang/classfile/TypeKind.java
+++ b/src/java.base/share/classes/java/lang/classfile/TypeKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@ public enum TypeKind {
 
     private final String name;
     private final String descriptor;
-    private final int newarraycode;
+    private final int newarrayCode;
 
     /** {@return the human-readable name corresponding to this type} */
     public String typeName() { return name; }
@@ -66,9 +66,12 @@ public enum TypeKind {
     /** {@return the field descriptor character corresponding to this type} */
     public String descriptor() { return descriptor; }
 
-    /** {@return the code used by the {@code newarray} opcode corresponding to this type} */
-    public int newarraycode() {
-        return newarraycode;
+    /**
+     * {@return the code used by the {@code newarray} opcode corresponding to this type}
+     * @since 23
+     */
+    public int newarrayCode() {
+        return newarrayCode;
     }
 
     /**
@@ -94,19 +97,21 @@ public enum TypeKind {
         };
     }
 
-    TypeKind(String name, String descriptor, int newarraycode) {
+    TypeKind(String name, String descriptor, int newarrayCode) {
         this.name = name;
         this.descriptor = descriptor;
-        this.newarraycode = newarraycode;
+        this.newarrayCode = newarrayCode;
     }
 
     /**
      * {@return the type kind associated with the array type described by the
      * array code used as an operand to {@code newarray}}
-     * @param newarraycode the operand of the {@code newarray} instruction
+     * @param newarrayCode the operand of the {@code newarray} instruction
+     * @throws IllegalArgumentException if the code is invalid
+     * @since 23
      */
-    public static TypeKind fromNewArrayCode(int newarraycode) {
-        return switch (newarraycode) {
+    public static TypeKind fromNewarrayCode(int newarrayCode) {
+        return switch (newarrayCode) {
             case 4 -> TypeKind.BooleanType;
             case 5 -> TypeKind.CharType;
             case 6 -> TypeKind.FloatType;
@@ -115,15 +120,19 @@ public enum TypeKind {
             case 9 -> TypeKind.ShortType;
             case 10 -> TypeKind.IntType;
             case 11 -> TypeKind.LongType;
-            default -> throw new IllegalArgumentException("Bad new array code: " + newarraycode);
+            default -> throw new IllegalArgumentException("Bad newarray code: " + newarrayCode);
         };
     }
 
     /**
      * {@return the type kind associated with the specified field descriptor}
      * @param s the field descriptor
+     * @throws IllegalArgumentException only if the descriptor is not valid
      */
     public static TypeKind fromDescriptor(CharSequence s) {
+        if (s.isEmpty()) { // implicit null check
+            throw new IllegalArgumentException("Empty descriptor");
+        }
         return switch (s.charAt(0)) {
             case '[', 'L' -> TypeKind.ReferenceType;
             case 'B' -> TypeKind.ByteType;
@@ -144,6 +153,8 @@ public enum TypeKind {
      * @param descriptor the field descriptor
      */
     public static TypeKind from(TypeDescriptor.OfField<?> descriptor) {
-        return fromDescriptor(descriptor.descriptorString());
+        return descriptor.isPrimitive() // implicit null check
+                ? fromDescriptor(descriptor.descriptorString())
+                : TypeKind.ReferenceType;
     }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
index a67a0f21c08..ae3f465402d 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/NewPrimitiveArrayInstruction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -56,7 +56,7 @@ public sealed interface NewPrimitiveArrayInstruction extends Instruction
      */
     static NewPrimitiveArrayInstruction of(TypeKind typeKind) {
         // Implicit null-check:
-        if (typeKind.newarraycode() < 0) {
+        if (typeKind.newarrayCode() < 0) {
             throw new IllegalArgumentException("Illegal component type: " + typeKind.typeName());
         }
         return new AbstractInstruction.UnboundNewPrimitiveArrayInstruction(typeKind);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
index 4e9a55c77ac..e1598db1545 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
@@ -557,7 +557,7 @@ public abstract sealed class AbstractInstruction
 
         @Override
         public TypeKind typeKind() {
-            return TypeKind.fromNewArrayCode(code.classReader.readU1(pos + 1));
+            return TypeKind.fromNewarrayCode(code.classReader.readU1(pos + 1));
         }
 
         @Override
@@ -1149,7 +1149,7 @@ public abstract sealed class AbstractInstruction
 
         @Override
         public void writeTo(DirectCodeBuilder writer) {
-            writer.writeNewPrimitiveArray(typeKind.newarraycode());
+            writer.writeNewPrimitiveArray(typeKind.newarrayCode());
         }
 
         @Override
diff --git a/test/jdk/jdk/classfile/TypeKindTest.java b/test/jdk/jdk/classfile/TypeKindTest.java
new file mode 100644
index 00000000000..19ef0b27150
--- /dev/null
+++ b/test/jdk/jdk/classfile/TypeKindTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024, 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
+ * @summary Testing TypeKind.
+ * @bug 8331744
+ * @run junit TypeKindTest
+ */
+import org.junit.jupiter.api.Test;
+
+import java.lang.classfile.TypeKind;
+
+import static org.junit.Assert.assertThrows;
+
+class TypeKindTest {
+    @Test
+    void testContracts() {
+        assertThrows(NullPointerException.class, () -> TypeKind.from(null));
+
+        assertThrows(NullPointerException.class, () -> TypeKind.fromDescriptor(null));
+        assertThrows(IllegalArgumentException.class, () -> TypeKind.fromDescriptor(""));
+        assertThrows(IllegalArgumentException.class, () -> TypeKind.fromDescriptor("int"));
+
+        assertThrows(IllegalArgumentException.class, () -> TypeKind.fromNewarrayCode(-1));
+        assertThrows(IllegalArgumentException.class, () -> TypeKind.fromNewarrayCode(21));
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java b/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java
new file mode 100644
index 00000000000..c8d9ad85d54
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/classfile/TypeKindBench.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+package org.openjdk.bench.java.lang.classfile;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.lang.classfile.TypeKind;
+import java.lang.constant.ClassDesc;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Performance of conversion from type descriptor objects to type kind.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 3, time = 2)
+@Measurement(iterations = 6, time = 1)
+@Fork(jvmArgsAppend = "--enable-preview", value = 1)
+@State(Scope.Thread)
+public class TypeKindBench {
+
+    public enum ClassType {
+        PRIMITIVE, REFERENCE, MIXED;
+    }
+
+    @Param
+    ClassType type;
+    Class<?>[] classes;
+    ClassDesc[] classDescs;
+
+    @Setup
+    public void setup() {
+        var references = List.of(Character.class, String.class, Integer.class,
+                Long.class, Object.class, int[].class, TypeKindBench.class,
+                Byte[].class, boolean[][].class);
+        var primitives = List.of(int.class, long.class, void.class, double.class,
+                float.class, boolean.class, char.class, short.class, byte.class);
+        final List<Class<?>> candidates = switch (type) {
+            case REFERENCE -> references;
+            case PRIMITIVE -> primitives;
+            case MIXED -> {
+                var list = new ArrayList<Class<?>>(references.size() + primitives.size());
+                list.addAll(references);
+                list.addAll(primitives);
+                yield list;
+            }
+        };
+
+        // Use fixed seed to ensure results are comparable across
+        // different JVMs
+        classes = new Random(0xbf5fe40dd887d9e2L)
+                .ints(100, 0, candidates.size())
+                .mapToObj(candidates::get)
+                .toArray(Class<?>[]::new);
+        classDescs = Arrays.stream(classes)
+                .map(cl -> cl.describeConstable().orElseThrow())
+                .toArray(ClassDesc[]::new);
+    }
+
+    @Benchmark
+    public void fromClasses(Blackhole bh) {
+        for (var clz : classes) {
+            bh.consume(TypeKind.from(clz));
+        }
+    }
+
+    @Benchmark
+    public void fromClassDescs(Blackhole bh) {
+        for (var clz : classDescs) {
+            bh.consume(TypeKind.from(clz));
+        }
+    }
+}

From 1547a696512b03ccc950b17f201ddca83f5016ec Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Fri, 10 May 2024 11:26:12 +0000
Subject: [PATCH 394/486] 8327696: [TESTBUG]
 "javax/swing/JTable/KeyBoardNavigation/KeyBoardNavigation.java" test
 instruction needs to be corrected

Reviewed-by: abhiscxk, honkar
---
 .../swing/JTable/KeyBoardNavigation.java      | 198 ++++++++++++------
 1 file changed, 131 insertions(+), 67 deletions(-)

diff --git a/test/jdk/javax/swing/JTable/KeyBoardNavigation.java b/test/jdk/javax/swing/JTable/KeyBoardNavigation.java
index 4a75b8c68d7..595547421ad 100644
--- a/test/jdk/javax/swing/JTable/KeyBoardNavigation.java
+++ b/test/jdk/javax/swing/JTable/KeyBoardNavigation.java
@@ -30,11 +30,9 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-import javax.swing.SwingUtilities;
 import javax.swing.border.BevelBorder;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
 
@@ -49,52 +47,7 @@ import javax.swing.table.TableModel;
  */
 
 public class KeyBoardNavigation {
-    static JFrame frame;
-    public static PassFailJFrame passFailJFrame;
-
-    static void initTest() throws Exception {
-        final String INSTRUCTIONS = """
-                Instructions to Test:
-                1. Refer the below keyboard navigation specs
-                 (referenced from bug report 4112270).
-                2. Check all combinations of navigational keys in all four modes
-                  shift and control verifying each change to the selection against
-                  the spec. If it does, press "pass", otherwise press "fail".
-
-                  Navigate In - Tab, shift-tab, control-tab, shift-control-tab
-                  Return/shift-return - move focus one cell down/up.
-                  Tab/shift-tab - move focus one cell right/left.
-                  Up/down arrow - deselect current selection; move focus one cell up/down
-                  Left/right arrow - deselect current selection; move focus one cell
-                                             left/right
-                  PageUp/PageDown - deselect current selection; scroll up/down one
-                                    JViewport view; first visible cell in current
-                                    column gets focus
-                  Control-PageUp/PageDown - deselect current selection; scroll
-                                            left/right one JViewport view; first
-                                            visible cell in current row gets
-                                            focus
-                  Home/end - deselect current selection; move focus and view to
-                                     first/last cell in current row
-                  Control-home/end - deselect current selection; move focus and view to
-                                             upper-left/lower-right cell in table
-                  F2 - Allows editing in a cell containing information without
-                               overwriting the information
-                  Esc - Resets the cell content back to the state it was in before
-                                editing started
-                  Ctrl+A, Ctrl+/ = Select all
-                  Ctrl+\\ = De-select all
-                  Shift-up/down arrow - extend selection up/down one row
-                  Shift-left/right arrow - extend selection left/right one column
-                  Control-shift up/down arrow - extend selection to top/bottom of column
-                  Shift-home/end - extend selection to left/right end of row
-                  Control-shift-home/end - extend selection to beginning/end of data
-                  Shift-PageUp/PageDown - extend selection up/down one view and scroll
-                                          table
-                  Control-shift-PageUp/PageDown - extend selection left/right one view
-                                                          and scroll table
-                """;
-
+    static JFrame initTest() {
         final String[] names = {"First Name", "Last Name", "Favorite Color",
                 "Favorite Number", "Vegetarian"};
         final Object[][] data = {
@@ -121,12 +74,7 @@ public class KeyBoardNavigation {
                 {"Arnaud", "Weber", "Green", 44, Boolean.FALSE}
         };
 
-        frame = new JFrame("JTable Keyboard Navigation Test");
-        passFailJFrame = new PassFailJFrame("Test Instructions",
-                INSTRUCTIONS, 5L, 15, 50);
-
-        PassFailJFrame.addTestWindow(frame);
-        PassFailJFrame.positionTestWindow(frame, PassFailJFrame.Position.VERTICAL);
+        JFrame frame = new JFrame("JTable Keyboard Navigation Test");
 
         JTable tableView = getTableDetails(names, data);
 
@@ -151,9 +99,9 @@ public class KeyBoardNavigation {
         colorColumn.setCellRenderer(colorColumnRenderer);
 
         // Set a tooltip for the header of the colors column.
-        TableCellRenderer headerRenderer = colorColumn.getHeaderRenderer();
-        if (headerRenderer instanceof DefaultTableCellRenderer)
-            ((DefaultTableCellRenderer) headerRenderer).setToolTipText("Hi Mom!");
+        if (colorColumn.getHeaderRenderer() instanceof DefaultTableCellRenderer headerRenderer) {
+            headerRenderer.setToolTipText("Hi Mom!");
+        }
 
         // Set the width of the "Vegetarian" column.
         TableColumn vegetarianColumn = tableView.getColumn("Vegetarian");
@@ -163,7 +111,7 @@ public class KeyBoardNavigation {
         TableColumn numbersColumn = tableView.getColumn("Favorite Number");
         DefaultTableCellRenderer numberColumnRenderer = new DefaultTableCellRenderer() {
             public void setValue(Object value) {
-                int cellValue = (value instanceof Number) ? ((Number) value).intValue() : 0;
+                int cellValue = (value instanceof Number number) ? number.intValue() : 0;
                 setForeground((cellValue > 30) ? Color.black : Color.red);
                 setText((value == null) ? "" : value.toString());
             }
@@ -172,13 +120,14 @@ public class KeyBoardNavigation {
         numbersColumn.setCellRenderer(numberColumnRenderer);
         numbersColumn.setPreferredWidth(110);
 
+        tableView.setColumnSelectionAllowed(true);
         JScrollPane scrollPane = new JScrollPane(tableView);
         scrollPane.setBorder(new BevelBorder(BevelBorder.LOWERED));
         scrollPane.setPreferredSize(new Dimension(430, 200));
 
         frame.add(scrollPane);
         frame.pack();
-        frame.setVisible(true);
+        return frame;
     }
 
     private static JTable getTableDetails(String[] names, Object[][] data) {
@@ -224,13 +173,128 @@ public class KeyBoardNavigation {
     }
 
     public static void main(String[] args) throws Exception {
-        SwingUtilities.invokeAndWait(() -> {
-            try {
-                initTest();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-        passFailJFrame.awaitAndCheck();
+        String INSTRUCTIONS = """
+                Instructions to Test:
+                1. Refer the below keyboard navigation specs
+                 (referenced from bug report 4112270).
+                2. Check all combinations of navigational keys mentioned below
+                 and verifying each key combinations against the spec defined.
+                 If it does, press "pass", otherwise press "fail".
+
+                """;
+
+        INSTRUCTIONS += getOSSpecificInstructions();
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .rows(30)
+                .columns(50)
+                .testUI(KeyBoardNavigation::initTest)
+                .testTimeOut(10)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static String getOSSpecificInstructions() {
+        final String WINDOWS_SPECIFIC = """
+                Tab, Shift-Tab - Navigate In.
+                Return/Shift-Return - Move focus one cell down/up.
+                Tab/Shift-Tab -  Move focus one cell right/left.
+                Up/Down Arrow - Deselect current selection; move focus one
+                                cell up/down
+                Left/Right Arrow - Deselect current selection; move focus
+                                   one cell left/right
+                PageUp/PageDown - Deselect current selection; scroll up/down
+                                  one JViewport view; first visible cell in
+                                  current column gets focus
+                Control-PageUp/PageDown - Deselect current selection;
+                                          move focus and view to
+                                          first/last cell in current row
+                Home/End - Deselect current selection; move focus and view to
+                           first/last cell in current row
+                Control-Home/End - Deselect current selection;
+                                   scroll up/down one  JViewport view;
+                                   first/last visible row of the table
+                F2 - Allows editing in a cell containing information without
+                     overwriting the information
+                Esc -  Resets the cell content back to the state it was in
+                       before editing started
+                Ctrl+A, Ctrl+/ - Select All
+                Ctrl+\\ - Deselect all
+                Shift-Up/Down Arrow -  Extend selection up/down one row
+                Shift-Left/Right Arrow - Extend selection left/right one
+                                         column
+                Control-shift Up/Down Arrow -  Extend selection to top/bottom
+                                                of column
+                Shift-Home/End -  Extend selection to left/right end of row
+                Control-Shift-Home/End  - Extend selection to beginning/end
+                                          of data
+                Shift-PageUp/PageDown - Extend selection up/down one view
+                                        and scroll table
+                Control-Shift-PageUp/PageDown - Extend selection left/right
+                                                end of row
+                """;
+
+        final String LINUX_SPECIFIC = """
+                Tab, Shift-Tab - Navigate In.
+                Return/Shift-Return - Move focus one cell down/up.
+                Tab/Shift-Tab -  Move focus one cell right/left.
+                Up/Down Arrow - Deselect current selection;
+                                move focus one cell up/down
+                Left/Right Arrow - Deselect current selection;
+                                   move focus one cell left/right
+                PageUp/PageDown - Deselect current selection;
+                                  scroll up/down one  JViewport view;
+                                  first visible cell in current column gets focus
+                Home/End - Deselect current selection; move focus and view to
+                                     first/last cell in current row
+                F2 - Allows editing in a cell containing information without
+                     overwriting the information
+                Esc -  Resets the cell content back to the state it was in
+                       before editing started
+                Ctrl+A, Ctrl+/ - Select All
+                Ctrl+\\ - Deselect all
+                Shift-Up/Down Arrow -  Extend selection up/down one row
+                Shift-Left/Right Arrow - Extend selection left/right one column
+                Control-Shift Up/Down Arrow -  Extend selection to top/bottom of
+                                               column
+                Shift-Home/End -  Extend selection to left/right end of row
+                Shift-PageUp/PageDown - Extend selection up/down one view and
+                                        scroll  table
+                """;
+
+        final String MAC_SPECIFIC = """
+                Tab, Shift-Tab - Navigate In.
+                Return/Shift-Return - Move focus one cell down/up.
+                Tab/Shift-Tab -  Move focus one cell right/left.
+                Up/Down Arrow - Deselect current selection; move focus one cell
+                                up/down
+                Left/Right Arrow - Deselect current selection;
+                                   move focus one cell left/right
+                FN+Up Arrow/FN+Down Arrow - Deselect current selection;
+                                   scroll up/down one JViewport view;
+                                   first visible cell in current column gets focus
+                Control-FN+Up Arrow/FN+Down Arrow - Deselect current selection;
+                                                    move focus and view to
+                                                    first/last cell in current row
+                F2 - Allows editing in a cell containing information without
+                     overwriting the information
+                Esc -  Resets the cell content back to the state it was in
+                       before editing started
+                Ctrl+A, Ctrl+/ - Select All
+                Ctrl+\\ - Deselect all
+                Shift-Up/Down Arrow -  Extend selection up/down one row
+                Shift-Left/Right Arrow - Extend selection left/right one column
+                FN-Shift Up/Down Arrow -  Extend selection to top/bottom of column
+                Shift-PageUp/PageDown - Extend selection up/down one view and scroll
+                                        table
+                                """;
+        String osName = System.getProperty("os.name").toLowerCase();
+        if (osName.startsWith("mac")) {
+            return MAC_SPECIFIC;
+        } else if (osName.startsWith("win")) {
+            return WINDOWS_SPECIFIC;
+        } else {
+            return LINUX_SPECIFIC;
+        }
     }
 }

From 45792c5829fb1d5ee016c4a1fd6badb5d2b4239c Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratochvil@openjdk.org>
Date: Fri, 10 May 2024 12:16:47 +0000
Subject: [PATCH 395/486] 8331352: error: template-id not allowed for
 constructor/destructor in C++20

Reviewed-by: kbarrett, stefank
---
 src/hotspot/share/gc/z/zArray.inline.hpp    | 2 +-
 src/hotspot/share/utilities/chunkedList.hpp | 2 +-
 src/hotspot/share/utilities/events.hpp      | 2 +-
 src/hotspot/share/utilities/linkedlist.hpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/z/zArray.inline.hpp b/src/hotspot/share/gc/z/zArray.inline.hpp
index e4de7a37040..2ec87a76156 100644
--- a/src/hotspot/share/gc/z/zArray.inline.hpp
+++ b/src/hotspot/share/gc/z/zArray.inline.hpp
@@ -96,7 +96,7 @@ ZActivatedArray<T>::ZActivatedArray(bool locked)
     _array() {}
 
 template <typename T>
-ZActivatedArray<T>::~ZActivatedArray<T>() {
+ZActivatedArray<T>::~ZActivatedArray() {
   FreeHeap(_lock);
 }
 
diff --git a/src/hotspot/share/utilities/chunkedList.hpp b/src/hotspot/share/utilities/chunkedList.hpp
index 81898ac53b2..9a600e4ce1b 100644
--- a/src/hotspot/share/utilities/chunkedList.hpp
+++ b/src/hotspot/share/utilities/chunkedList.hpp
@@ -44,7 +44,7 @@ template <class T, MEMFLAGS F> class ChunkedList : public CHeapObj<F> {
   }
 
  public:
-  ChunkedList<T, F>() : _top(_values), _next_used(nullptr), _next_free(nullptr) {}
+  ChunkedList() : _top(_values), _next_used(nullptr), _next_free(nullptr) {}
 
   bool is_full() const {
     return _top == end();
diff --git a/src/hotspot/share/utilities/events.hpp b/src/hotspot/share/utilities/events.hpp
index 0aefbbefd2b..4470002a1e3 100644
--- a/src/hotspot/share/utilities/events.hpp
+++ b/src/hotspot/share/utilities/events.hpp
@@ -99,7 +99,7 @@ template <class T> class EventLogBase : public EventLog {
   EventRecord<T>* _records;
 
  public:
-  EventLogBase<T>(const char* name, const char* handle, int length = LogEventsBufferEntries):
+  EventLogBase(const char* name, const char* handle, int length = LogEventsBufferEntries):
     _mutex(Mutex::event, name),
     _name(name),
     _handle(handle),
diff --git a/src/hotspot/share/utilities/linkedlist.hpp b/src/hotspot/share/utilities/linkedlist.hpp
index 5b8e258d539..eec7ea1e48d 100644
--- a/src/hotspot/share/utilities/linkedlist.hpp
+++ b/src/hotspot/share/utilities/linkedlist.hpp
@@ -82,7 +82,7 @@ template <class E> class LinkedListNode : public AnyObj {
 template <class E> class LinkedList : public AnyObj {
  protected:
   LinkedListNode<E>*    _head;
-  NONCOPYABLE(LinkedList<E>);
+  NONCOPYABLE(LinkedList);
 
  public:
   LinkedList() : _head(nullptr) { }

From 242446b07fcfcac136510495d1ff16d26859aea4 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 10 May 2024 12:30:05 +0000
Subject: [PATCH 396/486] 8331931: JFR: Avoid loading regex classes during
 startup

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/internal/SecuritySupport.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
index 68888967899..1a577c4d775 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -287,10 +287,11 @@ public final class SecuritySupport {
 
     public static List<SafePath> getPredefinedJFCFiles() {
         List<SafePath> list = new ArrayList<>();
-        try (var ds = doPrivilegedIOWithReturn(() -> Files.newDirectoryStream(JFC_DIRECTORY.toPath(), "*.jfc"))) {
+        try (var ds = doPrivilegedIOWithReturn(() -> Files.newDirectoryStream(JFC_DIRECTORY.toPath()))) {
             for (Path path : ds) {
                 SafePath s = new SafePath(path);
-                if (!SecuritySupport.isDirectory(s)) {
+                String text = s.toString();
+                if (text.endsWith(".jfc") && !SecuritySupport.isDirectory(s)) {
                     list.add(s);
                 }
             }

From 675fbe699ed1aad37f34429cbe1f4f3e029be03f Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 10 May 2024 13:57:55 +0000
Subject: [PATCH 397/486] 8331993: Add counting leading/trailing zero tests for
 Integer

Reviewed-by: chagedorn
---
 .../irTests/TestDisableAutoVectOpcodes.java   |  4 +-
 .../compiler/lib/ir_framework/IRNode.java     | 18 +++--
 .../TestNumberOfContinuousZeros.java          | 68 ++++++++++++++-----
 3 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestDisableAutoVectOpcodes.java b/test/hotspot/jtreg/compiler/c2/irTests/TestDisableAutoVectOpcodes.java
index 31112a74eb1..8ee3d2ecdd9 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestDisableAutoVectOpcodes.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestDisableAutoVectOpcodes.java
@@ -117,7 +117,7 @@ public class TestDisableAutoVectOpcodes {
     }
 
     @Test
-    @IR(failOn = {IRNode.COUNTTRAILINGZEROS_VL})
+    @IR(failOn = {IRNode.COUNT_TRAILING_ZEROS_VL})
     public void testNumberOfTrailingZeros() {
         for (int i = 0; i < SIZE; ++i) {
             inta[i] = Long.numberOfTrailingZeros(longa[i]);
@@ -125,7 +125,7 @@ public class TestDisableAutoVectOpcodes {
     }
 
     @Test
-    @IR(failOn = {IRNode.COUNTLEADINGZEROS_VL})
+    @IR(failOn = {IRNode.COUNT_LEADING_ZEROS_VL})
     public void testNumberOfLeadingZeros() {
         for (int i = 0; i < SIZE; ++i) {
             inta[i] = Long.numberOfLeadingZeros(longa[i]);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 449252b6bad..11f324a91e1 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1159,14 +1159,24 @@ public class IRNode {
         vectorNode(POPCOUNT_VL, "PopCountVL", TYPE_LONG);
     }
 
-    public static final String COUNTTRAILINGZEROS_VL = VECTOR_PREFIX + "COUNTTRAILINGZEROS_VL" + POSTFIX;
+    public static final String COUNT_TRAILING_ZEROS_VL = VECTOR_PREFIX + "COUNT_TRAILING_ZEROS_VL" + POSTFIX;
     static {
-        vectorNode(COUNTTRAILINGZEROS_VL, "CountTrailingZerosV", TYPE_LONG);
+        vectorNode(COUNT_TRAILING_ZEROS_VL, "CountTrailingZerosV", TYPE_LONG);
     }
 
-    public static final String COUNTLEADINGZEROS_VL = VECTOR_PREFIX + "COUNTLEADINGZEROS_VL" + POSTFIX;
+    public static final String COUNT_TRAILING_ZEROS_VI = VECTOR_PREFIX + "COUNT_TRAILING_ZEROS_VI" + POSTFIX;
     static {
-        vectorNode(COUNTLEADINGZEROS_VL, "CountLeadingZerosV", TYPE_LONG);
+        vectorNode(COUNT_TRAILING_ZEROS_VI, "CountTrailingZerosV", TYPE_INT);
+    }
+
+    public static final String COUNT_LEADING_ZEROS_VL = VECTOR_PREFIX + "COUNT_LEADING_ZEROS_VL" + POSTFIX;
+    static {
+        vectorNode(COUNT_LEADING_ZEROS_VL, "CountLeadingZerosV", TYPE_LONG);
+    }
+
+    public static final String COUNT_LEADING_ZEROS_VI = VECTOR_PREFIX + "COUNT_LEADING_ZEROS_VI" + POSTFIX;
+    static {
+        vectorNode(COUNT_LEADING_ZEROS_VI, "CountLeadingZerosV", TYPE_INT);
     }
 
     public static final String POPULATE_INDEX = PREFIX + "POPULATE_INDEX" + POSTFIX;
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
index abbabca0f2a..57e4596c985 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
@@ -39,8 +39,10 @@ import java.util.Random;
 import jdk.test.lib.Asserts;
 
 public class TestNumberOfContinuousZeros {
-    private long[] input;
-    private int[] output;
+    private long[] inputLong;
+    private int[] outputLong;
+    private int[] inputInt;
+    private int[] outputInt;
     private static final int LEN = 1024;
     private Random rng;
 
@@ -49,39 +51,71 @@ public class TestNumberOfContinuousZeros {
     }
 
     public TestNumberOfContinuousZeros() {
-        input = new long[LEN];
-        output = new int[LEN];
+        inputLong = new long[LEN];
+        outputLong = new int[LEN];
+        inputInt = new int[LEN];
+        outputInt = new int[LEN];
         rng = new Random(42);
         for (int i = 0; i < LEN; ++i) {
-            input[i] = rng.nextLong();
+            inputLong[i] = rng.nextLong();
+            inputInt[i] = rng.nextInt();
         }
     }
 
     @Test
-    @IR(counts = {IRNode.COUNTTRAILINGZEROS_VL, "> 0"})
-    public void vectorizeNumberOfTrailingZeros() {
+    @IR(counts = {IRNode.COUNT_TRAILING_ZEROS_VL, "> 0"})
+    public void vectorizeNumberOfTrailingZerosLong() {
         for (int i = 0; i < LEN; ++i) {
-            output[i] = Long.numberOfTrailingZeros(input[i]);
+            outputLong[i] = Long.numberOfTrailingZeros(inputLong[i]);
         }
     }
 
     @Test
-    @IR(counts = {IRNode.COUNTLEADINGZEROS_VL, "> 0"})
-    public void vectorizeNumberOfLeadingZeros() {
+    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
+    public void vectorizeNumberOfLeadingZerosLong() {
         for (int i = 0; i < LEN; ++i) {
-            output[i] = Long.numberOfLeadingZeros(input[i]);
+            outputLong[i] = Long.numberOfLeadingZeros(inputLong[i]);
         }
     }
 
-    @Run(test = {"vectorizeNumberOfTrailingZeros", "vectorizeNumberOfLeadingZeros"})
-    public void checkResult() {
-        vectorizeNumberOfTrailingZeros();
+    @Run(test = {"vectorizeNumberOfTrailingZerosLong", "vectorizeNumberOfLeadingZerosLong"})
+    public void checkResultLong() {
+        vectorizeNumberOfTrailingZerosLong();
         for (int i = 0; i < LEN; ++i) {
-            Asserts.assertEquals(output[i], Long.numberOfTrailingZeros(input[i]));
+            Asserts.assertEquals(outputLong[i], Long.numberOfTrailingZeros(inputLong[i]));
         }
-        vectorizeNumberOfLeadingZeros();
+        vectorizeNumberOfLeadingZerosLong();
         for (int i = 0; i < LEN; ++i) {
-            Asserts.assertEquals(output[i], Long.numberOfLeadingZeros(input[i]));
+            Asserts.assertEquals(outputLong[i], Long.numberOfLeadingZeros(inputLong[i]));
+        }
+    }
+
+
+    @Test
+    @IR(counts = {IRNode.COUNT_TRAILING_ZEROS_VI, "> 0"})
+    public void vectorizeNumberOfTrailingZerosInt() {
+        for (int i = 0; i < LEN; ++i) {
+            outputInt[i] = Integer.numberOfTrailingZeros(inputInt[i]);
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VI, "> 0"})
+    public void vectorizeNumberOfLeadingZerosInt() {
+        for (int i = 0; i < LEN; ++i) {
+            outputInt[i] = Integer.numberOfLeadingZeros(inputInt[i]);
+        }
+    }
+
+    @Run(test = {"vectorizeNumberOfTrailingZerosInt", "vectorizeNumberOfLeadingZerosInt"})
+    public void checkResultInt() {
+        vectorizeNumberOfTrailingZerosInt();
+        for (int i = 0; i < LEN; ++i) {
+            Asserts.assertEquals(outputInt[i], Integer.numberOfTrailingZeros(inputInt[i]));
+        }
+        vectorizeNumberOfLeadingZerosInt();
+        for (int i = 0; i < LEN; ++i) {
+            Asserts.assertEquals(outputInt[i], Integer.numberOfLeadingZeros(inputInt[i]));
         }
     }
 }

From f95c93740538e5e508407ec6750ed9f126fdc3c3 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 10 May 2024 13:59:09 +0000
Subject: [PATCH 398/486] 8331577: RISC-V: C2 CountLeadingZerosV 8331578:
 RISC-V: C2 CountTrailingZerosV

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |  3 +
 src/hotspot/cpu/riscv/riscv_v.ad              | 76 ++++++++++++++++---
 .../TestNumberOfContinuousZeros.java          |  3 +-
 3 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 614e4ee3d18..2db57083ce5 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1891,6 +1891,9 @@ enum Nf {
   INSN(vbrev8_v, 0b1010111, 0b010, 0b01000, 0b010010); // reverse bits in every byte of element
   INSN(vrev8_v,  0b1010111, 0b010, 0b01001, 0b010010); // reverse bytes in every elememt
 
+  INSN(vclz_v,  0b1010111, 0b010, 0b01100, 0b010010); // count leading zeros
+  INSN(vctz_v,  0b1010111, 0b010, 0b01101, 0b010010); // count trailing zeros
+
 #undef INSN
 
 #define INSN(NAME, op, funct3, vm, funct6)                                   \
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 863d3772379..3d2cbbe5cf4 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -73,6 +73,8 @@ source %{
           return false;
         }
         break;
+      case Op_CountTrailingZerosV:
+      case Op_CountLeadingZerosV:
       case Op_ReverseBytesV:
       case Op_PopCountVL:
       case Op_PopCountVI:
@@ -3759,14 +3761,14 @@ instruct vsignum_reg(vReg dst, vReg zero, vReg one, vRegMask_V0 v0) %{
 
 // -------------------------------- Reverse Bytes Vector Operations ------------------------
 
-instruct vreverse_bytes_masked(vReg dst, vReg src, vRegMask_V0 v0) %{
-  match(Set dst (ReverseBytesV src v0));
-  format %{ "vreverse_bytes_masked $dst, $src, v0" %}
+instruct vreverse_bytes_masked(vReg dst_src, vRegMask_V0 v0) %{
+  match(Set dst_src (ReverseBytesV dst_src v0));
+  format %{ "vreverse_bytes_masked $dst_src, $dst_src, v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint vlen = Matcher::vector_length(this);
     __ vsetvli_helper(bt, vlen);
-    __ vrev8_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), Assembler::v0_t);
+    __ vrev8_v(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg), Assembler::v0_t);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -3817,16 +3819,16 @@ instruct vconvF2HF(vReg dst, vReg src, vReg vtmp, vRegMask_V0 v0, iRegINoSp tmp)
 
 // ------------------------------ Popcount vector ------------------------------
 
-instruct vpopcount_masked(vReg dst, vReg src, vRegMask_V0 v0) %{
-  match(Set dst (PopCountVI src v0));
-  match(Set dst (PopCountVL src v0));
+instruct vpopcount_masked(vReg dst_src, vRegMask_V0 v0) %{
+  match(Set dst_src (PopCountVI dst_src v0));
+  match(Set dst_src (PopCountVL dst_src v0));
   ins_cost(VEC_COST);
-  format %{ "vcpop_v $dst, $src, $v0\t# vcpop_v with mask" %}
+  format %{ "vcpop_v $dst_src, $dst_src, $v0\t# vcpop_v with mask" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint vlen = Matcher::vector_length(this);
     __ vsetvli_helper(bt, vlen);
-    __ vcpop_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), Assembler::v0_t);
+    __ vcpop_v(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg), Assembler::v0_t);
   %}
   ins_pipe(pipe_slow);
 %}
@@ -3845,6 +3847,62 @@ instruct vpopcount(vReg dst, vReg src) %{
   ins_pipe(pipe_slow);
 %}
 
+// ------------------------------ CountLeadingZerosV --------------------------
+
+instruct vcountLeadingZeros_masked(vReg dst_src, vRegMask_V0 v0) %{
+  match(Set dst_src (CountLeadingZerosV dst_src v0));
+  ins_cost(VEC_COST);
+  format %{ "vcount_leading_zeros_masked $dst_src, $dst_src, v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vclz_v(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vcountLeadingZeros(vReg dst, vReg src) %{
+  match(Set dst (CountLeadingZerosV src));
+  ins_cost(VEC_COST);
+  format %{ "vcount_leading_zeros $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vclz_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// ------------------------------ CountTrailingZerosV --------------------------
+
+instruct vcountTrailingZeros_masked(vReg dst_src, vRegMask_V0 v0) %{
+  match(Set dst_src (CountTrailingZerosV dst_src v0));
+  ins_cost(VEC_COST);
+  format %{ "vcount_trailing_zeros_masked $dst_src, $dst_src, v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vctz_v(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vcountTrailingZeros(vReg dst, vReg src) %{
+  match(Set dst (CountTrailingZerosV src));
+  ins_cost(VEC_COST);
+  format %{ "vcount_trailing_zeros $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vctz_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector Load Gather ---------------------------
 
 instruct gather_load(vReg dst, indirect mem, vReg idx) %{
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
index 57e4596c985..db0b563d1fe 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
@@ -27,7 +27,8 @@
 * @summary Test vectorization of numberOfTrailingZeros/numberOfLeadingZeros for Long
 * @requires vm.compiler2.enabled
 * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") |
-*           (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*")
+*           (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*") |
+*           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
 * @library /test/lib /
 * @run driver compiler.vectorization.TestNumberOfContinuousZeros
 */

From d11e70ade3e9094c8bef0074c736215d48d47a2a Mon Sep 17 00:00:00 2001
From: Serhiy Sachkov <serhiy.sachkov@oracle.com>
Date: Fri, 10 May 2024 14:59:26 +0000
Subject: [PATCH 399/486] 8331646: Add specific regression leap year tests

Reviewed-by: naoto
---
 .../Calendar/CalendarLeapYearAddTest.java     | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 test/jdk/java/util/Calendar/CalendarLeapYearAddTest.java

diff --git a/test/jdk/java/util/Calendar/CalendarLeapYearAddTest.java b/test/jdk/java/util/Calendar/CalendarLeapYearAddTest.java
new file mode 100644
index 00000000000..13b2856ed57
--- /dev/null
+++ b/test/jdk/java/util/Calendar/CalendarLeapYearAddTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2024, 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 8331646
+ * @summary confirm that Calendar.add() works correctly with leap year calculations
+ * @run junit CalendarLeapYearAddTest
+ */
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import static java.util.Calendar.APRIL;
+import static java.util.Calendar.DATE;
+import static java.util.Calendar.DAY_OF_MONTH;
+import static java.util.Calendar.DAY_OF_WEEK;
+import static java.util.Calendar.DAY_OF_WEEK_IN_MONTH;
+import static java.util.Calendar.DAY_OF_YEAR;
+import static java.util.Calendar.FEBRUARY;
+import static java.util.Calendar.LONG;
+import static java.util.Calendar.MARCH;
+import static java.util.Calendar.MONTH;
+import static java.util.Calendar.WEEK_OF_YEAR;
+import static java.util.Calendar.YEAR;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class CalendarLeapYearAddTest {
+
+    /**
+     * 8331646 Calendar add for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarAddSource")
+    public void testAddLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                int value, int calendarField, int expectedDate, int expectedMonth,
+                                int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.add(calendarField, value);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+    }
+
+    /**
+     * 8331646 Calendar month and year add/subtract for leap/non-leap year
+     */
+    @Test
+    public void testMonthYearAddSubtractNonLeapYear() {
+        Calendar calendar = new GregorianCalendar(2024, FEBRUARY, 29);
+        calendar.add(MONTH, 1);
+        calendar.add(YEAR, -1);
+        calendar.add(MONTH, -1);
+        /* When month added date jumps to 29th of March 2024, after year subtracted date jumps to 29th of March 2023
+           after month subtracted date jumps to 28th of Feb 2023 as non leap year
+         */
+        assertEquals(28, calendar.get(DATE),
+                "testMonthYearAddSubtractNonLeapYear Expected 28th of February 2024 but got " + calendar.getTime());
+        assertEquals(FEBRUARY, calendar.get(MONTH),
+                " testMonthYearAddSubtractNonLeapYear Expected February but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+    }
+
+    /**
+     * 8331646 Calendar add/subtract for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarAddSubtractSource")
+    public void testAddSubtractLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                        int firstValue, int secondValue, int calendarField, int expectedDate,
+                                        int expectedMonth, int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.add(calendarField, firstValue);
+        calendar.add(calendarField, secondValue);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+    }
+
+    private static Stream<Arguments> calendarAddSubtractSource() {
+        return Stream.of(
+                Arguments.of("testMonthAddSubtractLeapYearReversed", 31, MARCH, 2024, -1, 1, MONTH, 29, MARCH, 2024),
+                Arguments.of("testMonthAddSubtractLeapYear", 29, FEBRUARY, 2024, 1, -1, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testYearAddSubtractLeapYear", 29, FEBRUARY, 2024, 1, -1, YEAR, 28, FEBRUARY, 2024),
+                Arguments.of("testDayOfYearAddSubtractLeapYear", 29, FEBRUARY, 2024, 365, -365, DAY_OF_YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDateAddSubtractLeapYear", 29, FEBRUARY, 2024, 365, -365, DATE, 29, FEBRUARY, 2024),
+                Arguments.of("testWeekOfYearAddSubtractLeapYear", 29, FEBRUARY, 2024, 52, -52, WEEK_OF_YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfMonthAddSubtractLeapYear", 29, FEBRUARY, 2024, 31, -31, DAY_OF_MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekInMonthAddSubtractLeapYear", 29, FEBRUARY, 2024, 6, -6, DAY_OF_WEEK_IN_MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekAddSubtractLeapYear", 29, FEBRUARY, 2024, 6, -6, DAY_OF_WEEK, 29, FEBRUARY, 2024)
+        );
+    }
+
+    private static Stream<Arguments> calendarAddSource() {
+        return Stream.of(
+                Arguments.of("testMonthAddLeapYear", 29, FEBRUARY, 2024, 1, MONTH, 29, MARCH, 2024),
+                Arguments.of("testOneMonthSubtractLeapYear", 31, MARCH, 2024, -1, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testTwoMonthSubtractLeapYear", 30, APRIL, 2024, -2, MONTH, 29, FEBRUARY, 2024)
+        );
+    }
+}

From d215bc46475b90abd898e995c1b4a6aa4b6cb024 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@openjdk.org>
Date: Fri, 10 May 2024 15:06:21 +0000
Subject: [PATCH 400/486] 8332066: AArch64: Math test failures since
 JDK-8331558

Reviewed-by: kvn
---
 .../cpu/aarch64/macroAssembler_aarch64.cpp    | 31 ++-----------------
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |  5 +--
 .../cpu/aarch64/vm_version_aarch64.cpp        | 15 +++++++--
 .../cpu/aarch64/vm_version_aarch64.hpp        | 24 --------------
 4 files changed, 15 insertions(+), 60 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 182bb784d5f..b90b5862ee5 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -2285,33 +2285,6 @@ Address MacroAssembler::form_address(Register Rd, Register base, int64_t byte_of
   return Address(Rd);
 }
 
-// On Neoverse, MSUB uses the same ALU with other instructions (e.g. SDIV).
-// The combination of MUL/SUB can utilize multiple ALUs,
-// and can be somewhat faster than MSUB.
-void MacroAssembler::msub(Register Rd, Register Rn, Register Rm, Register Ra)
-{
-  if (VM_Version::supports_a53mac() && Ra != zr)
-    nop();
-  if (VM_Version::is_neoverse()) {
-    mul(rscratch1, Rn, Rm);
-    sub(Rd, Ra, rscratch1);
-  } else {
-    Assembler::msub(Rd, Rn, Rm, Ra);
-  }
-}
-
-void MacroAssembler::msubw(Register Rd, Register Rn, Register Rm, Register Ra)
-{
-  if (VM_Version::supports_a53mac() && Ra != zr)
-    nop();
-  if (VM_Version::is_neoverse()) {
-    mulw(rscratch1, Rn, Rm);
-    subw(Rd, Ra, rscratch1);
-  } else {
-    Assembler::msubw(Rd, Rn, Rm, Ra);
-  }
-}
-
 int MacroAssembler::corrected_idivl(Register result, Register ra, Register rb,
                                     bool want_remainder, Register scratch)
 {
@@ -2336,7 +2309,7 @@ int MacroAssembler::corrected_idivl(Register result, Register ra, Register rb,
     sdivw(result, ra, rb);
   } else {
     sdivw(scratch, ra, rb);
-    msubw(result, scratch, rb, ra);
+    Assembler::msubw(result, scratch, rb, ra);
   }
 
   return idivl_offset;
@@ -2366,7 +2339,7 @@ int MacroAssembler::corrected_idivq(Register result, Register ra, Register rb,
     sdiv(result, ra, rb);
   } else {
     sdiv(scratch, ra, rb);
-    msub(result, scratch, rb, ra);
+    Assembler::msub(result, scratch, rb, ra);
   }
 
   return idivq_offset;
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index efcfa95f25e..67fd7236842 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -437,14 +437,11 @@ class MacroAssembler: public Assembler {
     Assembler::INSN(Rd, Rn, Rm, Ra);                                          \
   }
 
-  WRAP(madd) WRAP(maddw)
+  WRAP(madd) WRAP(msub) WRAP(maddw) WRAP(msubw)
   WRAP(smaddl) WRAP(smsubl) WRAP(umaddl) WRAP(umsubl)
 #undef WRAP
 
 
-  void msub(Register Rd, Register Rn, Register Rm, Register Ra);
-  void msubw(Register Rd, Register Rn, Register Rm, Register Ra);
-
   // macro assembly operations needed for aarch64
 
 public:
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index 7eda594c9d2..18f310c746c 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -212,7 +212,13 @@ void VM_Version::initialize() {
     }
   }
 
-  if (is_neoverse()) {
+  // Neoverse
+  //   N1: 0xd0c
+  //   N2: 0xd49
+  //   V1: 0xd40
+  //   V2: 0xd4f
+  if (_cpu == CPU_ARM && (model_is(0xd0c) || model_is(0xd49) ||
+                          model_is(0xd40) || model_is(0xd4f))) {
     if (FLAG_IS_DEFAULT(UseSIMDForMemoryOps)) {
       FLAG_SET_DEFAULT(UseSIMDForMemoryOps, true);
     }
@@ -241,7 +247,10 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseCRC32, false);
   }
 
-  if (is_neoverse_v_series()) {
+  // Neoverse
+  //   V1: 0xd40
+  //   V2: 0xd4f
+  if (_cpu == CPU_ARM && (model_is(0xd40) || model_is(0xd4f))) {
     if (FLAG_IS_DEFAULT(UseCryptoPmullForCRC32)) {
       FLAG_SET_DEFAULT(UseCryptoPmullForCRC32, true);
     }
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
index 282f88cc8b0..f6cac72804f 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
@@ -114,13 +114,6 @@ enum Ampere_CPU_Model {
     CPU_MODEL_AMPERE_1B = 0xac5  /* AMPERE_1B core Implements ARMv8.7 with CSSC, MTE, SM3/SM4 extensions */
 };
 
-enum Neoverse_CPU_Model {
-    CPU_MODEL_NEOVERSE_N1 = 0xd0c,
-    CPU_MODEL_NEOVERSE_N2 = 0xd49,
-    CPU_MODEL_NEOVERSE_V1 = 0xd40,
-    CPU_MODEL_NEOVERSE_V2 = 0xd4f,
-};
-
 #define CPU_FEATURE_FLAGS(decl)               \
     decl(FP,            fp,            0)     \
     decl(ASIMD,         asimd,         1)     \
@@ -163,23 +156,6 @@ enum Neoverse_CPU_Model {
     return _model == cpu_model || _model2 == cpu_model;
   }
 
-
-  static bool is_neoverse() {
-    switch(_model) {
-      case CPU_MODEL_NEOVERSE_N1:
-      case CPU_MODEL_NEOVERSE_N2:
-      case CPU_MODEL_NEOVERSE_V1:
-      case CPU_MODEL_NEOVERSE_V2:
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  static bool is_neoverse_v_series() {
-    return (model_is(CPU_MODEL_NEOVERSE_V1) || model_is(CPU_MODEL_NEOVERSE_V2));
-  }
-
   static bool is_zva_enabled() { return 0 <= _zva_length; }
   static int zva_length() {
     assert(is_zva_enabled(), "ZVA not available");

From 65abf24fde6432fb386a616bbadc5689975c3bf4 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Fri, 10 May 2024 16:10:40 +0000
Subject: [PATCH 401/486] 8331866: Add warnings for locale data dependence

Reviewed-by: jlu, srl, joehw
---
 .../share/classes/java/util/spi/LocaleServiceProvider.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
index 2bf0c711cfe..6ec8b2a149a 100644
--- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
+++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
@@ -152,6 +152,11 @@ import java.util.Locale;
  * supported by the Java runtime environment. The following table lists the
  * version of CLDR used in each JDK release. Unless otherwise specified, all
  * update releases in a given JDK release family use the same CLDR version.
+ * Note that the CLDR locale data are subject to change. Users should not assume
+ * that the locale data remain the same across CLDR versions. Otherwise, unexpected
+ * incompatible behaviors may occur, such as an exception on parsing a date.
+ * Refer to <a href="https://cldr.unicode.org/index/downloads">CLDR Releases</a>
+ * for the deltas between their releases.
  * <table class="striped">
  * <caption style="display:none">JDK releases and supported CLDR versions</caption>
  * <thead>
@@ -264,7 +269,7 @@ public abstract class LocaleServiceProvider {
         for (Locale available : getAvailableLocales()) {
             if (locale.equals(available.stripExtensions())) {
                 return true;
-}
+            }
         }
         return false;
     }

From 1c5f1501ac4ef55ca6ffaaa0576de9b0e1dd8d06 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Fri, 10 May 2024 16:22:28 +0000
Subject: [PATCH 402/486] 8331734: Atomic MemorySegment VarHandle operations
 fails for element layouts

Reviewed-by: pminborg, psandoz
---
 .../jdk/internal/foreign/LayoutPath.java      |  6 ++--
 test/jdk/java/foreign/TestAccessModes.java    | 28 ++++++++++-------
 .../lang/foreign/LoopOverNonConstant.java     | 30 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
index 5eee17573ee..390ad1b2f97 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
@@ -26,6 +26,7 @@
 package jdk.internal.foreign;
 
 import jdk.internal.vm.annotation.ForceInline;
+
 import java.lang.foreign.AddressLayout;
 import java.lang.foreign.GroupLayout;
 import java.lang.foreign.MemoryLayout;
@@ -204,10 +205,7 @@ public class LayoutPath {
                     String.format("Path does not select a value layout: %s", breadcrumbs()));
         }
 
-        // If we have an enclosing layout, drop the alignment check for the accessed element,
-        // we check the root layout instead
-        ValueLayout accessedLayout = enclosing != null ? valueLayout.withByteAlignment(1) : valueLayout;
-        VarHandle handle = accessedLayout.varHandle();
+        VarHandle handle = valueLayout.varHandle();
         handle = MethodHandles.collectCoordinates(handle, 1, offsetHandle());
 
         // we only have to check the alignment of the root layout for the first dereference we do,
diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java
index 9ee5020fd9e..89662c95252 100644
--- a/test/jdk/java/foreign/TestAccessModes.java
+++ b/test/jdk/java/foreign/TestAccessModes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,7 @@
  * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes
  */
 
-import java.lang.foreign.AddressLayout;
-import java.lang.foreign.Arena;
-import java.lang.foreign.MemoryLayout;
-import java.lang.foreign.MemorySegment;
-import java.lang.foreign.ValueLayout;
+import java.lang.foreign.*;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -50,10 +46,12 @@ import static org.testng.Assert.*;
 public class TestAccessModes {
 
     @Test(dataProvider = "segmentsAndLayoutsAndModes")
-    public void testAccessModes(MemorySegment segment, ValueLayout layout, AccessMode mode) throws Throwable {
-        VarHandle varHandle = layout.varHandle();
+    public void testAccessModes(MemorySegment segment, MemoryLayout layout, AccessMode mode) throws Throwable {
+        VarHandle varHandle = layout instanceof ValueLayout ?
+                layout.varHandle() :
+                layout.varHandle(MemoryLayout.PathElement.groupElement(0));
         MethodHandle methodHandle = varHandle.toMethodHandle(mode);
-        boolean compatible = AccessModeKind.supportedModes(layout).contains(AccessModeKind.of(mode));
+        boolean compatible = AccessModeKind.supportedModes(accessLayout(layout)).contains(AccessModeKind.of(mode));
         try {
             Object o = methodHandle.invokeWithArguments(makeArgs(segment, varHandle.accessModeType(mode)));
             assertTrue(compatible);
@@ -61,10 +59,19 @@ public class TestAccessModes {
             assertFalse(compatible);
         } catch (IllegalArgumentException ex) {
             // access is unaligned, but access mode is supported
-            assertTrue(compatible);
+            assertTrue(compatible ||
+                    (layout instanceof GroupLayout && segment.maxByteAlignment() < layout.byteAlignment()));
         }
     }
 
+    static ValueLayout accessLayout(MemoryLayout layout) {
+        return switch (layout) {
+            case ValueLayout vl -> vl;
+            case GroupLayout gl -> accessLayout(gl.memberLayouts().get(0));
+            default -> throw new IllegalStateException();
+        };
+    }
+
     Object[] makeArgs(MemorySegment segment, MethodType type) throws Throwable {
         List<Object> args = new ArrayList<>();
         args.add(segment);
@@ -145,6 +152,7 @@ public class TestAccessModes {
         for (MemoryLayout layout : valueLayouts) {
             for (int align : new int[] { 1, 2, 4, 8 }) {
                 layouts.add(layout.withByteAlignment(align));
+                layouts.add(MemoryLayout.structLayout(layout.withByteAlignment(align)));
             }
         }
         return layouts.toArray(new MemoryLayout[0]);
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java
index c1c04ebd8d7..91ce8faec38 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 package org.openjdk.bench.java.lang.foreign;
 
 import java.lang.foreign.Arena;
+import java.lang.foreign.MemoryLayout;
 import java.lang.foreign.MemorySegment;
 
 import org.openjdk.jmh.annotations.Benchmark;
@@ -37,6 +38,8 @@ import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 import sun.misc.Unsafe;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.concurrent.TimeUnit;
@@ -57,6 +60,13 @@ public class LoopOverNonConstant extends JavaLayouts {
     static final int CARRIER_SIZE = (int)JAVA_INT.byteSize();
     static final int ALLOC_SIZE = ELEM_SIZE * CARRIER_SIZE;
 
+    static final VarHandle VH_SEQ_INT = bindToZeroOffset(MemoryLayout.sequenceLayout(ELEM_SIZE, JAVA_INT).varHandle(PathElement.sequenceElement()));
+    static final VarHandle VH_SEQ_INT_UNALIGNED = bindToZeroOffset(MemoryLayout.sequenceLayout(ELEM_SIZE, JAVA_INT.withByteAlignment(1)).varHandle(PathElement.sequenceElement()));
+
+    static VarHandle bindToZeroOffset(VarHandle varHandle) {
+        return MethodHandles.insertCoordinates(varHandle, 1, 0L);
+    }
+
     Arena arena;
     MemorySegment segment;
     long unsafe_addr;
@@ -132,6 +142,24 @@ public class LoopOverNonConstant extends JavaLayouts {
         return sum;
     }
 
+    @Benchmark
+    public int segment_loop_nested() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_SIZE; i++) {
+            sum += (int) VH_SEQ_INT.get(segment, (long) i);
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int segment_loop_nested_unaligned() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_SIZE; i++) {
+            sum += (int) VH_SEQ_INT_UNALIGNED.get(segment, (long) i);
+        }
+        return sum;
+    }
+
     @Benchmark
     public int segment_loop_instance() {
         int sum = 0;

From 1b476f52ba85f9ceaabe785d36cb07df831fd0e8 Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Fri, 10 May 2024 16:53:27 +0000
Subject: [PATCH 403/486] 8293345: SunPKCS11 provider checks on PKCS11
 Mechanism are problematic

Reviewed-by: djelinski, weijun
---
 .../classes/sun/security/pkcs11/Config.java   | 11 ++++-
 .../sun/security/pkcs11/SunPKCS11.java        | 41 ++++++++-----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
index 3a1bb807263..20726bb8d47 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -121,6 +121,9 @@ final class Config {
     // whether to print debug info during startup
     private boolean showInfo = false;
 
+    // whether to allow legacy mechanisms
+    private boolean allowLegacy = false;
+
     // template manager, initialized from parsed attributes
     private TemplateManager templateManager;
 
@@ -251,6 +254,10 @@ final class Config {
         return (SunPKCS11.debug != null) || showInfo;
     }
 
+    boolean getAllowLegacy() {
+        return allowLegacy;
+    }
+
     TemplateManager getTemplateManager() {
         if (templateManager == null) {
             templateManager = new TemplateManager();
@@ -453,6 +460,8 @@ final class Config {
                 destroyTokenAfterLogout = parseBooleanEntry(st.sval);
             case "showInfo"->
                 showInfo = parseBooleanEntry(st.sval);
+            case "allowLegacy"->
+                allowLegacy = parseBooleanEntry(st.sval);
             case "keyStoreCompatibilityMode"->
                 keyStoreCompatibilityMode = parseBooleanEntry(st.sval);
             case "explicitCancel"->
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
index 3e112bfe0ed..07aaa1037ea 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
@@ -1222,25 +1222,6 @@ public final class SunPKCS11 extends AuthProvider {
         }
     }
 
-    private static boolean isLegacy(CK_MECHANISM_INFO mechInfo)
-            throws PKCS11Exception {
-        // assume full support if no mech info available
-        // For vendor-specific mechanisms, often no mech info is provided
-        boolean partialSupport = false;
-
-        if (mechInfo != null) {
-            if ((mechInfo.flags & CKF_DECRYPT) != 0) {
-                // non-legacy cipher mechs should support encryption
-                partialSupport |= ((mechInfo.flags & CKF_ENCRYPT) == 0);
-            }
-            if ((mechInfo.flags & CKF_VERIFY) != 0) {
-                // non-legacy signature mechs should support signing
-                partialSupport |= ((mechInfo.flags & CKF_SIGN) == 0);
-            }
-        }
-        return partialSupport;
-    }
-
     // test if a token is present and initialize this provider for it if so.
     // does nothing if no token is found
     // called from constructor and by poller
@@ -1309,12 +1290,6 @@ public final class SunPKCS11 extends AuthProvider {
                 }
                 continue;
             }
-            if (isLegacy(mechInfo)) {
-                if (showInfo) {
-                    System.out.println("DISABLED due to legacy");
-                }
-                continue;
-            }
 
             if (brokenMechanisms.contains(longMech)) {
                 if (showInfo) {
@@ -1336,6 +1311,7 @@ public final class SunPKCS11 extends AuthProvider {
             if (ds == null) {
                 continue;
             }
+            boolean allowLegacy = config.getAllowLegacy();
             descLoop:
             for (Descriptor d : ds) {
                 Integer oldMech = supportedAlgs.get(d);
@@ -1351,6 +1327,21 @@ public final class SunPKCS11 extends AuthProvider {
                             }
                         }
                     }
+
+                    // assume full support if no mech info available
+                    if (!allowLegacy && mechInfo != null) {
+                        if ((d.type == CIP &&
+                                (mechInfo.flags & CKF_ENCRYPT) == 0) ||
+                                (d.type == SIG &&
+                                (mechInfo.flags & CKF_SIGN) == 0)) {
+                            if (showInfo) {
+                                System.out.println("DISABLED " +  d.type +
+                                        " " + d.algorithm +
+                                        " due to partial support");
+                            }
+                            continue;
+                        }
+                    }
                     supportedAlgs.put(d, integerMech);
                     continue;
                 }

From 5e8e8ef6565e82a23626fe16893f93870dae1012 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Fri, 10 May 2024 20:34:17 +0000
Subject: [PATCH 404/486] 8315431: ArchiveHeapWriter::get_filler_size_at()
 cannot handle buffer expansion

Reviewed-by: matsaave, ccheung
---
 src/hotspot/share/cds/archiveHeapWriter.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/cds/archiveHeapWriter.cpp b/src/hotspot/share/cds/archiveHeapWriter.cpp
index e9f4fad63d4..d526a961b7f 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.cpp
+++ b/src/hotspot/share/cds/archiveHeapWriter.cpp
@@ -67,8 +67,10 @@ ArchiveHeapWriter::BufferOffsetToSourceObjectTable*
   ArchiveHeapWriter::_buffer_offset_to_source_obj_table = nullptr;
 
 
-typedef ResourceHashtable<address, size_t,
-      127, // prime number
+typedef ResourceHashtable<
+      size_t,    // offset of a filler from ArchiveHeapWriter::buffer_bottom()
+      size_t,    // size of this filler (in bytes)
+      127,       // prime number
       AnyObj::C_HEAP,
       mtClassShared> FillersTable;
 static FillersTable* _fillers;
@@ -361,12 +363,12 @@ void ArchiveHeapWriter::maybe_fill_gc_region_gap(size_t required_byte_size) {
                         array_length, fill_bytes, _buffer_used);
     HeapWord* filler = init_filler_array_at_buffer_top(array_length, fill_bytes);
     _buffer_used = filler_end;
-    _fillers->put((address)filler, fill_bytes);
+    _fillers->put(buffered_address_to_offset((address)filler), fill_bytes);
   }
 }
 
 size_t ArchiveHeapWriter::get_filler_size_at(address buffered_addr) {
-  size_t* p = _fillers->get(buffered_addr);
+  size_t* p = _fillers->get(buffered_address_to_offset(buffered_addr));
   if (p != nullptr) {
     assert(*p > 0, "filler must be larger than zero bytes");
     return *p;

From 1dac34fa757f1d603f0bc9b9c1994c114c276add Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Fri, 10 May 2024 21:13:43 +0000
Subject: [PATCH 405/486] 8331098: [Aarch64] Fix crash in Arrays.equals()
 intrinsic with -CCP

Reviewed-by: aboldtch, aph
---
 .../cpu/aarch64/macroAssembler_aarch64.cpp    | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index b90b5862ee5..faba321afc7 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -5535,12 +5535,22 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
   Label DONE, SAME;
   Register tmp1 = rscratch1;
   Register tmp2 = rscratch2;
-  Register cnt2 = tmp2;  // cnt2 only used in array length compare
   int elem_per_word = wordSize/elem_size;
   int log_elem_size = exact_log2(elem_size);
+  int klass_offset  = arrayOopDesc::klass_offset_in_bytes();
   int length_offset = arrayOopDesc::length_offset_in_bytes();
   int base_offset
     = arrayOopDesc::base_offset_in_bytes(elem_size == 2 ? T_CHAR : T_BYTE);
+  // When the length offset is not aligned to 8 bytes,
+  // then we align it down. This is valid because the new
+  // offset will always be the klass which is the same
+  // for type arrays.
+  int start_offset = align_down(length_offset, BytesPerWord);
+  int extra_length = base_offset - start_offset;
+  assert(start_offset == length_offset || start_offset == klass_offset,
+         "start offset must be 8-byte-aligned or be the klass offset");
+  assert(base_offset != start_offset, "must include the length field");
+  extra_length = extra_length / elem_size; // We count in elements, not bytes.
   int stubBytesThreshold = 3 * 64 + (UseSIMDForArrayEquals ? 0 : 16);
 
   assert(elem_size == 1 || elem_size == 2, "must be char or byte");
@@ -5574,11 +5584,10 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     //      return false;
     bind(A_IS_NOT_NULL);
     ldrw(cnt1, Address(a1, length_offset));
-    ldrw(cnt2, Address(a2, length_offset));
-    eorw(tmp5, cnt1, cnt2);
-    cbnzw(tmp5, DONE);
-    lea(a1, Address(a1, base_offset));
-    lea(a2, Address(a2, base_offset));
+    // Increase loop counter by diff between base- and actual start-offset.
+    addw(cnt1, cnt1, extra_length);
+    lea(a1, Address(a1, start_offset));
+    lea(a2, Address(a2, start_offset));
     // Check for short strings, i.e. smaller than wordSize.
     subs(cnt1, cnt1, elem_per_word);
     br(Assembler::LT, SHORT);
@@ -5641,18 +5650,18 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     cbz(a1, DONE);
     ldrw(cnt1, Address(a1, length_offset));
     cbz(a2, DONE);
-    ldrw(cnt2, Address(a2, length_offset));
+    // Increase loop counter by diff between base- and actual start-offset.
+    addw(cnt1, cnt1, extra_length);
+
     // on most CPUs a2 is still "locked"(surprisingly) in ldrw and it's
     // faster to perform another branch before comparing a1 and a2
     cmp(cnt1, (u1)elem_per_word);
     br(LE, SHORT); // short or same
-    ldr(tmp3, Address(pre(a1, base_offset)));
+    ldr(tmp3, Address(pre(a1, start_offset)));
     subs(zr, cnt1, stubBytesThreshold);
     br(GE, STUB);
-    ldr(tmp4, Address(pre(a2, base_offset)));
+    ldr(tmp4, Address(pre(a2, start_offset)));
     sub(tmp5, zr, cnt1, LSL, 3 + log_elem_size);
-    cmp(cnt2, cnt1);
-    br(NE, DONE);
 
     // Main 16 byte comparison loop with 2 exits
     bind(NEXT_DWORD); {
@@ -5684,9 +5693,7 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     b(LAST_CHECK);
 
     bind(STUB);
-    ldr(tmp4, Address(pre(a2, base_offset)));
-    cmp(cnt2, cnt1);
-    br(NE, DONE);
+    ldr(tmp4, Address(pre(a2, start_offset)));
     if (elem_size == 2) { // convert to byte counter
       lsl(cnt1, cnt1, 1);
     }
@@ -5707,12 +5714,9 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     mov(result, a2);
     b(DONE);
     bind(SHORT);
-    cmp(cnt2, cnt1);
-    br(NE, DONE);
-    cbz(cnt1, SAME);
     sub(tmp5, zr, cnt1, LSL, 3 + log_elem_size);
-    ldr(tmp3, Address(a1, base_offset));
-    ldr(tmp4, Address(a2, base_offset));
+    ldr(tmp3, Address(a1, start_offset));
+    ldr(tmp4, Address(a2, start_offset));
     bind(LAST_CHECK);
     eor(tmp4, tmp3, tmp4);
     lslv(tmp5, tmp4, tmp5);

From b87a7e990631c8b402578f645397b2aeda8927bb Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Sat, 11 May 2024 04:24:48 +0000
Subject: [PATCH 406/486] 8144100: Incorrect case-sensitive equality in
 com.sun.net.httpserver.BasicAuthenticator

Reviewed-by: jpai, dfuchs
---
 .../net/httpserver/BasicAuthenticator.java    |   4 +-
 .../sun/net/httpserver/BasicAuthToken.java    | 118 ++++++++++++++++++
 2 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/com/sun/net/httpserver/BasicAuthToken.java

diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
index a240fa725d4..440d80d3b1a 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,7 +118,7 @@ public abstract class BasicAuthenticator extends Authenticator {
             return new Authenticator.Retry (401);
         }
         int sp = auth.indexOf (' ');
-        if (sp == -1 || !auth.substring(0, sp).equals ("Basic")) {
+        if (sp == -1 || !auth.substring(0, sp).equalsIgnoreCase("Basic")) {
             return new Authenticator.Failure (401);
         }
         byte[] b = Base64.getDecoder().decode(auth.substring(sp+1));
diff --git a/test/jdk/com/sun/net/httpserver/BasicAuthToken.java b/test/jdk/com/sun/net/httpserver/BasicAuthToken.java
new file mode 100644
index 00000000000..a393ac4c5dd
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/BasicAuthToken.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2024, 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 8144100
+ * @summary checking token sent by client should be done in case-insensitive manner
+ * @run main BasicAuthToken
+ */
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.Base64;
+import com.sun.net.httpserver.Authenticator;
+import com.sun.net.httpserver.BasicAuthenticator;
+import com.sun.net.httpserver.HttpServer;
+
+public class BasicAuthToken {
+    private static final String CRLF = "\r\n";
+    private static final String someContext = "/test";
+
+    public static void main(String[] args) throws Exception {
+        HttpServer server = server();
+        try {
+            client(server.getAddress().getPort());
+        } finally {
+            server.stop(0);
+        }
+    }
+
+    static HttpServer server() throws Exception {
+        String realm = "someRealm";
+        ServerAuthenticator authenticator = new ServerAuthenticator(realm);
+        HttpServer server = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
+        server.createContext(someContext, exchange -> {
+            if (authenticator.authenticate(exchange) instanceof Authenticator.Failure) {
+                exchange.sendResponseHeaders(401, -1);
+                exchange.close();
+                return;
+            }
+            exchange.sendResponseHeaders(200, -1);
+            exchange.close();
+        }).setAuthenticator(authenticator);
+        server.start();
+        return server;
+    }
+
+    static void client(int port) throws Exception {
+        try (Socket socket = new Socket(InetAddress.getLoopbackAddress(), port)) {
+            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            String credentials = "username:password";
+            String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes());
+            writer.write("GET " + someContext + " HTTP/1.1" + CRLF);
+            writer.write("Host: localhost:" + port + CRLF);
+            writer.write("User-Agent: Java/" + System.getProperty("java.version") + CRLF);
+            writer.write("Authorization: BAsIc " + encodedCredentials + CRLF);
+            writer.write(CRLF);
+            writer.flush();
+
+            System.err.println("Server response");
+            String statusLine = reader.readLine();
+            System.err.println(statusLine);
+
+            if (!statusLine.startsWith("HTTP/1.1 200")) {
+                throw new RuntimeException("unexpected status line: " + statusLine);
+            }
+            if (!ServerAuthenticator.wasChecked()) {
+                throw new RuntimeException("Authenticator wasn't invoked");
+            }
+        }
+    }
+
+
+    static class ServerAuthenticator extends BasicAuthenticator {
+        private static volatile boolean invoked = false;
+
+        ServerAuthenticator(String realm) {
+            super(realm);
+        }
+
+        public static boolean wasChecked() {
+            return invoked;
+        }
+
+        @Override
+        public boolean checkCredentials(String username, String password) {
+            String validUsername = "username", validPassword = "password";
+            invoked = true;
+            return username.equals(validUsername) && password.equals(validPassword);
+        }
+    }
+}

From f9a1d3381b12c97784c11649be079147c85939c0 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Sat, 11 May 2024 04:31:11 +0000
Subject: [PATCH 407/486] 8332020: jwebserver tool prints invalid URL in case
 of IPv6 address binding

Reviewed-by: dfuchs, vtewari
---
 .../simpleserver/SimpleFileServerImpl.java    | 10 +-
 .../jwebserver/IPv6BoundHost.java             | 98 +++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/IPv6BoundHost.java

diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
index 7e97d203b6c..88f72c7aeae 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import com.sun.net.httpserver.SimpleFileServer;
 import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 
 import java.io.PrintWriter;
+import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
@@ -169,6 +170,13 @@ final class SimpleFileServerImpl {
             if (!addrSpecified) {
                 writer.println(ResourceBundleHelper.getMessage("loopback.info"));
             }
+            if (inetAddr instanceof Inet6Address && addr.contains(":") && !addr.startsWith("[")) {
+                // we use the "addr" when printing the URL, so make sure it
+                // conforms to RFC-2732, section 2:
+                // To use a literal IPv6 address in a URL, the literal
+                // address should be enclosed in "[" and "]" characters.
+                addr = "[" + addr + "]";
+            }
             if (isAnyLocal) {
                 writer.println(ResourceBundleHelper.getMessage("msg.start.anylocal", root, addr, port));
             } else {
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/IPv6BoundHost.java b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/IPv6BoundHost.java
new file mode 100644
index 00000000000..04c9c3c6fc6
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/IPv6BoundHost.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+import jdk.internal.util.OperatingSystem;
+import jdk.test.lib.net.IPSupport;
+import jdk.test.lib.process.ProcessTools;
+import jtreg.SkippedException;
+
+/*
+ * @test
+ * @bug 8332020
+ * @summary verifies that when jwebserver is launched with a IPv6 bind address
+ *          then the URL printed contains the correct host literal
+ * @modules jdk.httpserver java.base/jdk.internal.util
+ * @library /test/lib
+ * @build jdk.test.lib.net.IPSupport
+ * @run driver IPv6BoundHost
+ */
+public class IPv6BoundHost {
+
+    private static final Path JDK_BIN_DIR = Path.of(System.getProperty("java.home")).resolve("bin");
+    private static final Path JWEBSERVER_BINARY = OperatingSystem.isWindows()
+            ? JDK_BIN_DIR.resolve("jwebserver.exe") : JDK_BIN_DIR.resolve("jwebserver");
+
+    public static void main(final String[] args) throws Exception {
+        IPSupport.printPlatformSupport(System.err); // for debug purposes
+        if (!IPSupport.hasIPv6()) {
+            throw new SkippedException("Skipping test - IPv6 is not supported");
+        }
+        final String output = launchJwebserverAndExit(List.of("-b", "::1", "-p", "0"));
+        if (output.contains("URL http://[::1]:")
+                || output.contains("URL http://[0:0:0:0:0:0:0:1]:")) {
+            // found expected content
+            System.out.println("found expected URL in jwebserver output");
+        } else {
+            throw new AssertionError("missing IPv6 address in jwebserver process output");
+        }
+    }
+
+    private static String launchJwebserverAndExit(final List<String> args) throws Exception {
+        final Predicate<String> waitForLine = (s) -> s.startsWith("URL http://");
+        final StringBuilder sb = new StringBuilder();  // stdout & stderr
+        final List<String> cmd = new ArrayList<>();
+        cmd.add(JWEBSERVER_BINARY.toString());
+        cmd.addAll(args);
+        // start the process and await the waitForLine before returning
+        final Process p = ProcessTools.startProcess("8332020-test", new ProcessBuilder(cmd),
+                line -> sb.append(line).append("\n"),
+                waitForLine,
+                30,  // suitably high default timeout, not expected to timeout
+                TimeUnit.SECONDS);
+        System.out.println(sb.toString()); // print the process' stdout/stderr
+        // the process has started and it is confirmed that the process output has the line
+        // we were waiting for. now kill the process.
+        p.destroy();
+        final int exitCode = p.waitFor();
+        if (!isNormalExitCode(exitCode)) {
+            throw new AssertionError("jwebserver exited with unexpected exit code: " + exitCode);
+        }
+        return sb.toString();
+    }
+
+    private static boolean isNormalExitCode(final int exitCode) {
+        final int SIGTERM = 15;
+        if (OperatingSystem.isWindows()) {
+            return exitCode == 1; // we expect exit code == 1 on Windows for Process.destroy()
+        } else {
+            // signal terminated exit code on Unix is 128 + signal value
+            return exitCode == (128 + SIGTERM);
+        }
+    }
+}

From 32c7681cf310c87669c502c4a8b62a7fecc93360 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Sat, 11 May 2024 07:36:52 +0000
Subject: [PATCH 408/486] 8332029: Provide access to initial value of stderr
 via JavaLangAccess

Reviewed-by: jpai, bpb, mcimadamore
---
 .../share/classes/java/lang/System.java       | 19 ++++++++++---------
 .../jdk/internal/access/JavaLangAccess.java   |  6 ++++++
 .../share/classes/jdk/internal/misc/VM.java   | 10 +++++++++-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index ae1c65b9f93..5e28b9ce95b 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -191,8 +191,9 @@ public final class System {
      */
     public static final PrintStream err = null;
 
-    // Holder for the initial value of `in`, set within `initPhase1()`.
-    private static InputStream initialIn;
+    // Initial values of System.in and System.err, set in initPhase1().
+    private static @Stable InputStream initialIn;
+    private static @Stable PrintStream initialErr;
 
     // indicates if a security manager is possible
     private static final int NEVER = 1;
@@ -355,9 +356,6 @@ public final class System {
             = Collections.synchronizedMap(new WeakHashMap<>());
     }
 
-    // Remember initial System.err. setSecurityManager() warning goes here
-    private static volatile @Stable PrintStream initialErrStream;
-
     private static URL codeSource(Class<?> clazz) {
         PrivilegedAction<ProtectionDomain> pa = clazz::getProtectionDomain;
         @SuppressWarnings("removal")
@@ -417,7 +415,7 @@ public final class System {
                 } else {
                     source = callerClass.getName() + " (" + url + ")";
                 }
-                initialErrStream.printf("""
+                initialErr.printf("""
                         WARNING: A terminally deprecated method in java.lang.System has been called
                         WARNING: System::setSecurityManager has been called by %s
                         WARNING: Please consider reporting this to the maintainers of %s
@@ -2200,7 +2198,8 @@ public final class System {
         // thus they are equivalent to Console.charset(), otherwise the encodings
         // of those properties default to native.encoding
         setOut0(newPrintStream(fdOut, props.getProperty("stdout.encoding")));
-        setErr0(newPrintStream(fdErr, props.getProperty("stderr.encoding")));
+        initialErr = newPrintStream(fdErr, props.getProperty("stderr.encoding"));
+        setErr0(initialErr);
 
         // Setup Java signal handlers for HUP, TERM, and INT (where available).
         Terminator.setup();
@@ -2406,8 +2405,6 @@ public final class System {
                     notSupportedJnuEncoding);
         }
 
-        initialErrStream = System.err;
-
         // initializing the system class loader
         VM.initLevel(3);
 
@@ -2598,6 +2595,10 @@ public final class System {
                 return initialIn;
             }
 
+            public PrintStream initialSystemErr() {
+                return initialErr;
+            }
+
             public void setCause(Throwable t, Throwable cause) {
                 t.setCause(cause);
             }
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index af7ff2e4aa2..c31e745cd89 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -26,6 +26,7 @@
 package jdk.internal.access;
 
 import java.io.InputStream;
+import java.io.PrintStream;
 import java.lang.annotation.Annotation;
 import java.lang.foreign.MemorySegment;
 import java.lang.invoke.MethodHandle;
@@ -401,6 +402,11 @@ public interface JavaLangAccess {
      */
     InputStream initialSystemIn();
 
+    /**
+     * Returns the initial value of System.err.
+     */
+    PrintStream initialSystemErr();
+
     /**
      * Encodes ASCII codepoints as possible from the source array into
      * the destination byte array, assuming that the encoding is ASCII
diff --git a/src/java.base/share/classes/jdk/internal/misc/VM.java b/src/java.base/share/classes/jdk/internal/misc/VM.java
index 9b51cfad458..de6f011fe8f 100644
--- a/src/java.base/share/classes/jdk/internal/misc/VM.java
+++ b/src/java.base/share/classes/jdk/internal/misc/VM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package jdk.internal.misc;
 
 import static java.lang.Thread.State.*;
 
+import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -496,4 +497,11 @@ public class VM {
     public static List<BufferPool> getBufferPools() {
         return BufferPoolsHolder.BUFFER_POOLS;
     }
+
+    /**
+     * Return the initial value of System.err that was set during VM initialization.
+     */
+    public static PrintStream initialErr() {
+        return SharedSecrets.getJavaLangAccess().initialSystemErr();
+    }
 }

From 5053b70a7fc67ce9b73dbeecbdd88fbc34d45e04 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Sat, 11 May 2024 18:37:43 +0000
Subject: [PATCH 409/486] 8278255: Add more warning text in ReentrantLock and
 ReentrantReadWriteLock

Reviewed-by: prappo, alanb
---
 .../share/classes/java/util/concurrent/locks/Lock.java   | 4 ++--
 .../java/util/concurrent/locks/ReentrantLock.java        | 9 +++++----
 .../util/concurrent/locks/ReentrantReadWriteLock.java    | 3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/locks/Lock.java b/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
index 84100e64a13..bd6ce2eb6f9 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
@@ -80,11 +80,11 @@ import java.util.concurrent.TimeUnit;
  *
  * <pre> {@code
  * Lock l = ...;
- * l.lock();
+ * l.lock(); // lock() as the last statement before the try block
  * try {
  *   // access the resource protected by this lock
  * } finally {
- *   l.unlock();
+ *   l.unlock(); // unlock() as the first statement in the finally block
  * }}</pre>
  *
  * When locking and unlocking occur in different scopes, care must be
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
index c58925b086e..3378ce3983a 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
@@ -71,8 +71,9 @@ import jdk.internal.vm.annotation.ReservedStackAccess;
  * is available even if other threads are waiting.
  *
  * <p>It is recommended practice to <em>always</em> immediately
- * follow a call to {@code lock} with a {@code try} block, most
- * typically in a before/after construction such as:
+ * follow a call to {@code lock} with a {@code try} block, and
+ * to <em>always</em> immediately call {@code unlock} as the
+ * first statement in the finally block, as follows:
  *
  * <pre> {@code
  * class X {
@@ -80,11 +81,11 @@ import jdk.internal.vm.annotation.ReservedStackAccess;
  *   // ...
  *
  *   public void m() {
- *     lock.lock();  // block until condition holds
+ *     lock.lock();  // lock() as the last statement before the try block
  *     try {
  *       // ... method body
  *     } finally {
- *       lock.unlock();
+ *       lock.unlock(); // unlock() as the first statement in the finally block
  *     }
  *   }
  * }}</pre>
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
index c73bd41cea8..517708e70f3 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
@@ -141,6 +141,7 @@ import jdk.internal.vm.annotation.ReservedStackAccess;
  *
  *   void processCachedData() {
  *     rwl.readLock().lock();
+ *     // Code between the lock() above, and the unlock() below must not throw
  *     if (!cacheValid) {
  *       // Must release read lock before acquiring write lock
  *       rwl.readLock().unlock();
@@ -158,7 +159,7 @@ import jdk.internal.vm.annotation.ReservedStackAccess;
  *         rwl.writeLock().unlock(); // Unlock write, still hold read
  *       }
  *     }
- *
+ *     // Make sure that code that could throw is executed inside the try block
  *     try {
  *       use(data);
  *     } finally {

From d517d2df451e135583083ed3684d7d3241b36f76 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Mon, 13 May 2024 05:45:36 +0000
Subject: [PATCH 410/486] 8331764: C2 SuperWord: refactor
 _align_to_ref/_mem_ref_for_main_loop_alignment

Reviewed-by: kvn, chagedorn
---
 src/hotspot/share/opto/superword.cpp | 64 ++++++++++++++++++----------
 src/hotspot/share/opto/superword.hpp |  9 ++--
 2 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index cd9b76eb44d..f41e8a7b8b3 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -45,12 +45,13 @@ SuperWord::SuperWord(const VLoopAnalyzer &vloop_analyzer) :
   _arena(mtCompiler),
   _node_info(arena(), _vloop.estimated_body_length(), 0, SWNodeInfo::initial), // info needed per node
   _clone_map(phase()->C->clone_map()),                      // map of nodes created in cloning
-  _align_to_ref(nullptr),                                   // memory reference to align vectors to
   _pairset(&_arena, _vloop_analyzer),
   _packset(&_arena, _vloop_analyzer
            NOT_PRODUCT(COMMA is_trace_superword_packset())
            NOT_PRODUCT(COMMA is_trace_superword_rejections())
            ),
+  _mem_ref_for_main_loop_alignment(nullptr),
+  _aw_for_main_loop_alignment(0),
   _do_vector_loop(phase()->C->do_vector_loop()),            // whether to do vectorization/simd style
   _num_work_vecs(0),                                        // amount of vector work we have
   _num_reductions(0)                                        // amount of reduction work we have
@@ -516,22 +517,12 @@ void SuperWord::find_adjacent_refs() {
 
   int max_idx;
 
-  // Take the first mem_ref as the reference to align to. The pre-loop trip count is
-  // modified to align this reference to a vector-aligned address. If strict alignment
-  // is required, we may change the reference later (see filter_packs_for_alignment()).
-  MemNode* align_to_mem_ref = nullptr;
-
   while (memops.size() != 0) {
     // Find a memory reference to align to.
     MemNode* mem_ref = find_align_to_ref(memops, max_idx);
     if (mem_ref == nullptr) break;
     int iv_adjustment = get_iv_adjustment(mem_ref);
 
-    if (align_to_mem_ref == nullptr) {
-      align_to_mem_ref = mem_ref;
-      set_align_to_ref(align_to_mem_ref);
-    }
-
     const VPointer& align_to_ref_p = vpointer(mem_ref);
     // Set alignment relative to "align_to_ref" for all related memory operations.
     for (int i = memops.size() - 1; i >= 0; i--) {
@@ -573,9 +564,6 @@ void SuperWord::find_adjacent_refs() {
     }
   } // while (memops.size() != 0)
 
-  assert(_pairset.is_empty() || align_to_mem_ref != nullptr,
-         "pairset empty or we find the alignment reference");
-
 #ifndef PRODUCT
   if (is_trace_superword_packset()) {
     tty->print_cr("\nAfter Superword::find_adjacent_refs");
@@ -1723,7 +1711,11 @@ void SuperWord::filter_packs_for_alignment() {
   if (current->is_constrained()) {
     // Solution is constrained (not trivial)
     // -> must change pre-limit to achieve alignment
-    set_align_to_ref(current->as_constrained()->mem_ref());
+    MemNode const* mem = current->as_constrained()->mem_ref();
+    Node_List* pack = get_pack(mem);
+    assert(pack != nullptr, "memop of final solution must still be packed");
+    _mem_ref_for_main_loop_alignment = mem;
+    _aw_for_main_loop_alignment = pack->size() * mem->memory_size();
   }
 }
 
@@ -3397,6 +3389,32 @@ LoadNode::ControlDependency SuperWord::control_dependency(Node_List* p) {
   return dep;
 }
 
+// Find the memop pack with the maximum vector width, unless they were already
+// determined by SuperWord::filter_packs_for_alignment().
+void SuperWord::determine_mem_ref_and_aw_for_main_loop_alignment() {
+  if (_mem_ref_for_main_loop_alignment != nullptr) {
+    assert(vectors_should_be_aligned(), "mem_ref only set if filtered for alignment");
+    return;
+  }
+
+  MemNode const* mem_ref = nullptr;
+  int max_aw = 0;
+  for (int i = 0; i < _packset.length(); i++) {
+    Node_List* pack = _packset.at(i);
+    MemNode* first = pack->at(0)->isa_Mem();
+    if (first == nullptr) { continue; }
+
+    int vw = first->memory_size() * pack->size();
+    if (vw > max_aw) {
+      max_aw = vw;
+      mem_ref = first;
+    }
+  }
+  assert(mem_ref != nullptr && max_aw > 0, "found mem_ref and aw");
+  _mem_ref_for_main_loop_alignment = mem_ref;
+  _aw_for_main_loop_alignment = max_aw;
+}
+
 #define TRACE_ALIGN_VECTOR_NODE(node) { \
   DEBUG_ONLY(                           \
     if (is_trace_align_vector()) {      \
@@ -3407,11 +3425,14 @@ LoadNode::ControlDependency SuperWord::control_dependency(Node_List* p) {
 }                                       \
 
 // Ensure that the main loop vectors are aligned by adjusting the pre loop limit. We memory-align
-// the address of "align_to_ref" to the maximal possible vector width. We adjust the pre-loop
-// iteration count by adjusting the pre-loop limit.
+// the address of "_mem_ref_for_main_loop_alignment" to "_aw_for_main_loop_alignment", which is a
+// sufficiently large alignment width. We adjust the pre-loop iteration count by adjusting the
+// pre-loop limit.
 void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
-  const MemNode* align_to_ref = _align_to_ref;
-  assert(align_to_ref != nullptr, "align_to_ref must be set");
+  determine_mem_ref_and_aw_for_main_loop_alignment();
+  const MemNode* align_to_ref = _mem_ref_for_main_loop_alignment;
+  const int aw                = _aw_for_main_loop_alignment;
+  assert(align_to_ref != nullptr && aw > 0, "must have alignment reference and aw");
   assert(cl()->is_main_loop(), "can only do alignment for main loop");
 
   // The opaque node for the limit, where we adjust the input
@@ -3556,10 +3577,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   //                   = MIN(new_limit,                   orig_limit)         (15a, stride > 0)
   // constrained_limit = MAX(old_limit - adjust_pre_iter, orig_limit)
   //                   = MAX(new_limit,                   orig_limit)         (15a, stride < 0)
-
-  // We chose an aw that is the maximal possible vector width for the type of
-  // align_to_ref.
-  const int aw       = vector_width_in_bytes(align_to_ref);
+  //
   const int stride   = iv_stride();
   const int scale    = align_to_ref_p.scale_in_bytes();
   const int offset   = align_to_ref_p.offset_in_bytes();
diff --git a/src/hotspot/share/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp
index 7d1ba1131f3..159032d94b9 100644
--- a/src/hotspot/share/opto/superword.hpp
+++ b/src/hotspot/share/opto/superword.hpp
@@ -411,11 +411,15 @@ class SuperWord : public ResourceObj {
 
   GrowableArray<SWNodeInfo> _node_info;  // Info needed per node
   CloneMap&            _clone_map;       // map of nodes created in cloning
-  MemNode const* _align_to_ref;          // Memory reference that pre-loop will align to
 
   PairSet _pairset;
   PackSet _packset;
 
+  // Memory reference, and the alignment width (aw) for which we align the main-loop,
+  // by adjusting the pre-loop limit.
+  MemNode const* _mem_ref_for_main_loop_alignment;
+  int _aw_for_main_loop_alignment;
+
  public:
   SuperWord(const VLoopAnalyzer &vloop_analyzer);
 
@@ -563,8 +567,6 @@ class SuperWord : public ResourceObj {
   Arena* arena()                   { return &_arena; }
 
   int get_vw_bytes_special(MemNode* s);
-  const MemNode* align_to_ref() const { return _align_to_ref; }
-  void set_align_to_ref(const MemNode* m) { _align_to_ref = m; }
 
   // Ensure node_info contains element "i"
   void grow_node_info(int i) { if (i >= _node_info.length()) _node_info.at_put_grow(i, SWNodeInfo::initial); }
@@ -670,6 +672,7 @@ private:
   // Alignment within a vector memory reference
   int memory_alignment(MemNode* s, int iv_adjust);
   // Ensure that the main loop vectors are aligned by adjusting the pre loop limit.
+  void determine_mem_ref_and_aw_for_main_loop_alignment();
   void adjust_pre_loop_limit_to_align_main_loop_vectors();
 };
 

From 3e3f7cf4bddf243fddfeac8cfc1d9b2a1be55043 Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Mon, 13 May 2024 07:33:42 +0000
Subject: [PATCH 411/486] 8330387: Crash with a different types patterns
 (primitive vs generic) in instanceof

Reviewed-by: vromero
---
 .../share/classes/com/sun/tools/javac/comp/Lower.java     | 4 ++--
 .../PrimitiveInstanceOfPatternOpWithRecordPatterns.java   | 8 +++++++-
 .../PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java | 7 ++++++-
 .../patterns/PrimitiveInstanceOfTypeComparisonOp.java     | 7 ++++++-
 .../javac/patterns/PrimitivePatternsSwitchErrors.java     | 4 ++++
 .../javac/patterns/PrimitivePatternsSwitchErrors.out      | 3 ++-
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index 66de5203d57..da0e3f9c747 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -2974,10 +2974,10 @@ public class Lower extends TreeTranslator {
             // preserving the side effects of the value
             VarSymbol dollar_s = new VarSymbol(FINAL | SYNTHETIC,
                     names.fromString("tmp" + tree.pos + this.target.syntheticNameChar()),
-                    tree.expr.type,
+                    types.erasure(tree.expr.type),
                     currentMethodSym);
             JCStatement var = make.at(tree.pos())
-                    .VarDef(dollar_s, instanceOfExpr).setType(dollar_s.type);
+                    .VarDef(dollar_s, instanceOfExpr);
 
             if (types.isUnconditionallyExact(tree.expr.type, tree.pattern.type)) {
                 exactnessCheck = make.Literal(BOOLEAN, 1).setType(syms.booleanType.constType(1));
diff --git a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithRecordPatterns.java b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithRecordPatterns.java
index 0c22c987f6c..dce025a0708 100644
--- a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithRecordPatterns.java
+++ b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithRecordPatterns.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8304487
+ * @bug 8304487 8327683 8330387
  * @summary Compiler Implementation for Primitive types in patterns, instanceof, and switch (Preview)
  * @enablePreview
  * @compile PrimitiveInstanceOfPatternOpWithRecordPatterns.java
@@ -42,6 +42,7 @@ public class PrimitiveInstanceOfPatternOpWithRecordPatterns {
         assertEquals(true,  unboxingWithObject());
         assertEquals(true,  wideningReferenceConversionUnboxing());
         assertEquals(true,  wideningReferenceConversionUnboxing2());
+        assertEquals(true,  wideningReferenceConversionUnboxing3());
         assertEquals(true,  wideningReferenceConversionUnboxingAndWideningPrimitive());
         assertEquals(true,  unboxingAndWideningPrimitiveExact());
         assertEquals(false, unboxingAndWideningPrimitiveNotExact());
@@ -114,6 +115,11 @@ public class PrimitiveInstanceOfPatternOpWithRecordPatterns {
         return i instanceof R_generic2(byte _);
     }
 
+    public static boolean wideningReferenceConversionUnboxing3() {
+        R_generic<Integer> i = new R_generic<Integer>(0x1000000);
+        return i instanceof R_generic(float _);
+    }
+
     public static boolean wideningReferenceConversionUnboxingAndWideningPrimitive() {
         R_generic<Integer> i = new R_generic<Integer>(42);
         return i instanceof R_generic(double _);
diff --git a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java
index 545c2482825..5c6d3e6361d 100644
--- a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java
+++ b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8304487 8325257
+ * @bug 8304487 8325257 8327683 8330387
  * @summary Compiler Implementation for Primitive types in patterns, instanceof, and switch (Preview)
  * @enablePreview
  * @compile PrimitiveInstanceOfPatternOpWithTopLevelPatterns.java
@@ -44,6 +44,7 @@ public class PrimitiveInstanceOfPatternOpWithTopLevelPatterns {
         assertEquals(true,  unboxingWithObject());
         assertEquals(true,  wideningReferenceConversionUnboxing(42));
         assertEquals(true,  wideningReferenceConversionUnboxing2(Byte.valueOf((byte) 42)));
+        assertEquals(true,  wideningReferenceConversionUnboxing3(0x1000000));
         assertEquals(true,  wideningReferenceConversionUnboxingAndWideningPrimitive(42));
         assertEquals(true,  unboxingAndWideningPrimitiveExact());
         assertEquals(false, unboxingAndWideningPrimitiveNotExact());
@@ -121,6 +122,10 @@ public class PrimitiveInstanceOfPatternOpWithTopLevelPatterns {
         return i instanceof byte bb;
     }
 
+    public static <T extends Integer> boolean wideningReferenceConversionUnboxing3(T i) {
+        return i instanceof float ff;
+    }
+
     public static <T extends Integer> boolean wideningReferenceConversionUnboxingAndWideningPrimitive(T i) {
         return i instanceof double ii;
     }
diff --git a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfTypeComparisonOp.java b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfTypeComparisonOp.java
index 7110d2b2d8f..47686c98a42 100644
--- a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfTypeComparisonOp.java
+++ b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfTypeComparisonOp.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8304487 8325257
+ * @bug 8304487 8325257 8327683 8330387
  * @summary Compiler Implementation for Primitive types in patterns, instanceof, and switch (Preview)
  * @enablePreview
  * @compile PrimitiveInstanceOfTypeComparisonOp.java
@@ -44,6 +44,7 @@ public class PrimitiveInstanceOfTypeComparisonOp {
         assertEquals(true,  unboxingWithObject());
         assertEquals(true,  wideningReferenceConversionUnboxing(42));
         assertEquals(true,  wideningReferenceConversionUnboxing2(Byte.valueOf((byte) 42)));
+        assertEquals(true,  wideningReferenceConversionUnboxing3(0x1000000));
         assertEquals(true,  wideningReferenceConversionUnboxingAndWideningPrimitive(42));
         assertEquals(true,  unboxingAndWideningPrimitiveExact());
         assertEquals(false, unboxingAndWideningPrimitiveNotExact());
@@ -121,6 +122,10 @@ public class PrimitiveInstanceOfTypeComparisonOp {
         return i instanceof byte;
     }
 
+    public static <T extends Integer> boolean wideningReferenceConversionUnboxing3(T i) {
+        return i instanceof float;
+    }
+
     public static <T extends Integer> boolean wideningReferenceConversionUnboxingAndWideningPrimitive(T i) {
         return i instanceof double;
     }
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
index 72489d562ea..4186b83f2f1 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
@@ -261,4 +261,8 @@ public class PrimitivePatternsSwitchErrors {
             case char c -> c; // Error - not exhaustive and not allowed
         };
     }
+
+    public static <T extends Integer> boolean wideningReferenceConversionUnboxingAndNarrowingPrimitive(T i) {
+        return i instanceof byte b;  // not allowed as a conversion
+    }
 }
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
index 22178944b7c..1cbf288e774 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.out
@@ -29,6 +29,7 @@ PrimitivePatternsSwitchErrors.java:216:18: compiler.err.prob.found.req: (compile
 PrimitivePatternsSwitchErrors.java:248:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Long, char)
 PrimitivePatternsSwitchErrors.java:255:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Long, int)
 PrimitivePatternsSwitchErrors.java:261:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Short, char)
+PrimitivePatternsSwitchErrors.java:266:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, byte)
 PrimitivePatternsSwitchErrors.java:30:16: compiler.err.not.exhaustive
 PrimitivePatternsSwitchErrors.java:37:16: compiler.err.not.exhaustive
 PrimitivePatternsSwitchErrors.java:44:16: compiler.err.not.exhaustive
@@ -43,4 +44,4 @@ PrimitivePatternsSwitchErrors.java:254:16: compiler.err.not.exhaustive
 PrimitivePatternsSwitchErrors.java:260:16: compiler.err.not.exhaustive
 - compiler.note.preview.filename: PrimitivePatternsSwitchErrors.java, DEFAULT
 - compiler.note.preview.recompile
-43 errors
\ No newline at end of file
+44 errors

From 5a8df4106ac5386eb72e874dcadf2b18defe27d8 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 13 May 2024 08:16:30 +0000
Subject: [PATCH 412/486] 8331535: Incorrect prompt for Console.readLine
 8331681: Test that jdk.internal.io.JdkConsole does not interpret prompts

Reviewed-by: naoto, asotona
---
 .../org/jline/JdkConsoleProviderImpl.java     |   5 +-
 .../jshell/tool/ConsoleIOContext.java         |   2 +-
 .../java/io/Console/ConsolePromptTest.java    | 104 ++++++++++++++++++
 .../jline/JLineConsoleProviderTest.java       | 104 ++++++++++++++++++
 .../langtools/jdk/jshell/ConsoleToolTest.java |  63 +++++++++++
 .../langtools/jdk/jshell/ReplToolTesting.java |  23 +++-
 6 files changed, 296 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/java/io/Console/ConsolePromptTest.java
 create mode 100644 test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
 create mode 100644 test/langtools/jdk/jshell/ConsoleToolTest.java

diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
index d876cffb377..64255b5ab60 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -98,7 +98,7 @@ public class JdkConsoleProviderImpl implements JdkConsoleProvider {
         public String readLine(String fmt, Object ... args) {
             try {
                 initJLineIfNeeded();
-                return jline.readLine(fmt.formatted(args));
+                return jline.readLine(fmt.formatted(args).replace("%", "%%"));
             } catch (EndOfFileException eofe) {
                 return null;
             }
@@ -113,7 +113,8 @@ public class JdkConsoleProviderImpl implements JdkConsoleProvider {
         public char[] readPassword(String fmt, Object ... args) {
             try {
                 initJLineIfNeeded();
-                return jline.readLine(fmt.formatted(args), '\0').toCharArray();
+                return jline.readLine(fmt.formatted(args).replace("%", "%%"), '\0')
+                            .toCharArray();
             } catch (EndOfFileException eofe) {
                 return null;
             } finally {
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
index fde9b6cadb7..06effa3083c 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
@@ -1007,7 +1007,7 @@ class ConsoleIOContext extends IOContext {
             input.setState(State.WAIT);
             Display.DISABLE_CR = true;
             in.setHistory(userInputHistory);
-            return in.readLine(prompt, mask);
+            return in.readLine(prompt.replace("%", "%%"), mask);
         } catch (UserInterruptException ex) {
             throw new InterruptedIOException();
         } finally {
diff --git a/test/jdk/java/io/Console/ConsolePromptTest.java b/test/jdk/java/io/Console/ConsolePromptTest.java
new file mode 100644
index 00000000000..3cab25b5a1c
--- /dev/null
+++ b/test/jdk/java/io/Console/ConsolePromptTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2024, 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 8331681
+ * @summary Verify the java.base's console provider handles the prompt correctly.
+ * @library /test/lib
+ * @run main/othervm --limit-modules java.base ConsolePromptTest
+ * @run main/othervm -Djdk.console=java.base ConsolePromptTest
+ */
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class ConsolePromptTest {
+
+    public static void main(String... args) throws Throwable {
+        for (Method m : ConsolePromptTest.class.getDeclaredMethods()) {
+            if (m.getName().startsWith("test")) {
+                m.invoke(new ConsolePromptTest());
+            }
+        }
+    }
+
+    void testCorrectOutputReadLine() throws Exception {
+        doRunConsoleTest("testCorrectOutputReadLine", "inp", "%s");
+    }
+
+    void testCorrectOutputReadPassword() throws Exception {
+        doRunConsoleTest("testCorrectOutputReadPassword", "inp", "%s");
+    }
+
+    void doRunConsoleTest(String testName,
+                          String input,
+                          String expectedOut) throws Exception {
+        ProcessBuilder builder =
+                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName(),
+                                                          testName);
+        OutputAnalyzer output = ProcessTools.executeProcess(builder, input);
+
+        output.waitFor();
+
+        if (output.getExitValue() != 0) {
+            throw new AssertionError("Unexpected return value: " + output.getExitValue() +
+                                     ", actualOut: " + output.getStdout() +
+                                     ", actualErr: " + output.getStderr());
+        }
+
+        String actualOut = output.getStdout();
+
+        if (!Objects.equals(expectedOut, actualOut)) {
+            throw new AssertionError("Unexpected stdout content. " +
+                                     "Expected: '" + expectedOut + "'" +
+                                     ", got: '" + actualOut + "'");
+        }
+
+        String expectedErr = "";
+        String actualErr = output.getStderr();
+
+        if (!Objects.equals(expectedErr, actualErr)) {
+            throw new AssertionError("Unexpected stderr content. " +
+                                     "Expected: '" + expectedErr + "'" +
+                                     ", got: '" + actualErr + "'");
+        }
+    }
+
+    public static class ConsoleTest {
+        public static void main(String... args) {
+            switch (args[0]) {
+                case "testCorrectOutputReadLine" ->
+                    System.console().readLine("%%s");
+                case "testCorrectOutputReadPassword" ->
+                    System.console().readPassword("%%s");
+                default -> throw new UnsupportedOperationException(args[0]);
+            }
+
+            System.exit(0);
+        }
+    }
+}
diff --git a/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java b/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
new file mode 100644
index 00000000000..5e69cdf4f4b
--- /dev/null
+++ b/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2024, 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 8331535
+ * @summary Verify the jdk.internal.le's console provider works properly.
+ * @modules jdk.internal.le
+ * @library /test/lib
+ * @run main/othervm -Djdk.console=jdk.internal.le JLineConsoleProviderTest
+ */
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class JLineConsoleProviderTest {
+
+    public static void main(String... args) throws Throwable {
+        for (Method m : JLineConsoleProviderTest.class.getDeclaredMethods()) {
+            if (m.getName().startsWith("test")) {
+                m.invoke(new JLineConsoleProviderTest());
+            }
+        }
+    }
+
+    void testCorrectOutputReadLine() throws Exception {
+        doRunConsoleTest("testCorrectOutputReadLine", "inp", "%s");
+    }
+
+    void testCorrectOutputReadPassword() throws Exception {
+        doRunConsoleTest("testCorrectOutputReadPassword", "inp", "%s");
+    }
+
+    void doRunConsoleTest(String testName,
+                          String input,
+                          String expectedOut) throws Exception {
+        ProcessBuilder builder =
+                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName(),
+                                                          testName);
+        OutputAnalyzer output = ProcessTools.executeProcess(builder, input);
+
+        output.waitFor();
+
+        if (output.getExitValue() != 0) {
+            throw new AssertionError("Unexpected return value: " + output.getExitValue() +
+                                     ", actualOut: " + output.getStdout() +
+                                     ", actualErr: " + output.getStderr());
+        }
+
+        String actualOut = output.getStdout();
+
+        if (!Objects.equals(expectedOut, actualOut)) {
+            throw new AssertionError("Unexpected stdout content. " +
+                                     "Expected: '" + expectedOut + "'" +
+                                     ", got: '" + actualOut + "'");
+        }
+
+        String expectedErr = "";
+        String actualErr = output.getStderr();
+
+        if (!Objects.equals(expectedErr, actualErr)) {
+            throw new AssertionError("Unexpected stderr content. " +
+                                     "Expected: '" + expectedErr + "'" +
+                                     ", got: '" + actualErr + "'");
+        }
+    }
+
+    public static class ConsoleTest {
+        public static void main(String... args) {
+            switch (args[0]) {
+                case "testCorrectOutputReadLine" ->
+                    System.console().readLine("%%s");
+                case "testCorrectOutputReadPassword" ->
+                    System.console().readPassword("%%s");
+                default -> throw new UnsupportedOperationException(args[0]);
+            }
+
+            System.exit(0);
+        }
+    }
+}
diff --git a/test/langtools/jdk/jshell/ConsoleToolTest.java b/test/langtools/jdk/jshell/ConsoleToolTest.java
new file mode 100644
index 00000000000..8fa85a3ec27
--- /dev/null
+++ b/test/langtools/jdk/jshell/ConsoleToolTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024, 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 8331535
+ * @summary Test the JShell tool Console handling
+ * @modules jdk.internal.le/jdk.internal.org.jline.reader
+ *          jdk.jshell/jdk.internal.jshell.tool:+open
+ * @build ConsoleToolTest ReplToolTesting
+ * @run testng ConsoleToolTest
+ */
+
+
+import org.testng.annotations.Test;
+
+public class ConsoleToolTest extends ReplToolTesting {
+
+    @Test
+    public void testOutput() {
+        test(
+             a -> {assertCommandWithOutputAndTerminal(a,
+                                                      "System.console().readLine(\"%%s\");\ninput", //newline automatically appended
+                                                      "$1 ==> \"input\"",
+                                                      """
+                                                      \u0005System.console().readLine(\"%%s\");
+                                                      %sinput
+                                                      """);},
+             a -> {assertCommandWithOutputAndTerminal(a,
+                                                      "System.console().readPassword(\"%%s\");\ninput!", //newline automatically appended
+                                                      "$2 ==> char[6] { 'i', 'n', 'p', 'u', 't', '!' }",
+                                                      """
+                                                      \u0005System.console().readPassword(\"%%s\");
+                                                      %s
+                                                      """);}
+            );
+    }
+
+    void assertCommandWithOutputAndTerminal(boolean a, String command, String out, String terminalOut) {
+        assertCommand(a, command, out, null, null, null, null, terminalOut);
+    }
+
+}
diff --git a/test/langtools/jdk/jshell/ReplToolTesting.java b/test/langtools/jdk/jshell/ReplToolTesting.java
index 52eb2d5798c..589b7b5cf39 100644
--- a/test/langtools/jdk/jshell/ReplToolTesting.java
+++ b/test/langtools/jdk/jshell/ReplToolTesting.java
@@ -221,6 +221,12 @@ public class ReplToolTesting {
         return s;
     }
 
+    public String getTerminalOutput() {
+        String s = normalizeLineEndings("\r\n", console.data.toString());
+        console.data.reset();
+        return s;
+    }
+
     public void test(ReplTest... tests) {
         test(new String[0], tests);
     }
@@ -476,6 +482,7 @@ public class ReplToolTesting {
 
     public void dropClass(boolean after, String cmd, String name, String output) {
         dropKey(after, cmd, name, classes, output);
+
     }
 
     public void dropImport(boolean after, String cmd, String name, String output) {
@@ -532,6 +539,11 @@ public class ReplToolTesting {
 
     public void assertCommand(boolean after, String cmd, String out, String err,
             String userinput, String print, String usererr) {
+        assertCommand(after, cmd, out, err, userinput, print, usererr, null);
+    }
+
+    public void assertCommand(boolean after, String cmd, String out, String err,
+            String userinput, String print, String usererr, String terminalOut) {
         if (!after) {
             if (userinput != null) {
                 setUserInput(userinput);
@@ -546,6 +558,7 @@ public class ReplToolTesting {
             assertOutput(getCommandErrorOutput(), err, "command error: " + cmd);
             assertOutput(getUserOutput(), print, "user output: " + cmd);
             assertOutput(getUserErrorOutput(), usererr, "user error: " + cmd);
+            assertOutput(getTerminalOutput(), terminalOut, "terminal output: " + cmd);
         }
     }
 
@@ -565,7 +578,11 @@ public class ReplToolTesting {
     }
 
     private String normalizeLineEndings(String text) {
-        return ANSI_CODE_PATTERN.matcher(text.replace(System.getProperty("line.separator"), "\n")).replaceAll("");
+        return normalizeLineEndings(System.getProperty("line.separator"), text);
+    }
+
+    private String normalizeLineEndings(String lineSeparator, String text) {
+        return ANSI_CODE_PATTERN.matcher(text.replace(lineSeparator, "\n")).replaceAll("");
     }
         private static final Pattern ANSI_CODE_PATTERN = Pattern.compile("\033\\[[\060-\077]*[\040-\057]*[\100-\176]");
 
@@ -846,6 +863,7 @@ public class ReplToolTesting {
 
     class PromptedCommandOutputStream extends OutputStream {
         private final ReplTest[] tests;
+        private final ByteArrayOutputStream data = new ByteArrayOutputStream();
         private int index = 0;
         PromptedCommandOutputStream(ReplTest[] tests) {
             this.tests = tests;
@@ -861,7 +879,8 @@ public class ReplToolTesting {
                     fail("Did not exit Repl tool after test");
                 }
                 ++index;
-            } // For now, anything else is thrown away
+            }
+            data.write(b);
         }
 
         @Override

From adaa509b6ed3d12569b8e5f2ec802cef22ab53c7 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Mon, 13 May 2024 09:11:49 +0000
Subject: [PATCH 413/486] 8327499: MethodHandleStatics.traceLambdaForm includes
 methods that cannot be generated

Reviewed-by: redestad, iklam
---
 .../lang/invoke/GenerateJLIClassesHelper.java | 92 +++++++++++++------
 .../dynamicArchive/CDSLambdaInvoker.java      |  9 +-
 .../dynamicArchive/TestLambdaInvokers.java    |  9 +-
 .../plugins/GenerateJLIClassesPluginTest.java | 53 ++++++++++-
 test/jdk/tools/lib/tests/JImageValidator.java | 11 ++-
 5 files changed, 140 insertions(+), 34 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
index 19a193a924a..46eeb67de54 100644
--- a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
+++ b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
@@ -28,7 +28,6 @@ package java.lang.invoke;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.Opcodes;
 import sun.invoke.util.Wrapper;
-import sun.util.logging.PlatformLogger;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -73,6 +72,7 @@ class GenerateJLIClassesHelper {
 
         private final TreeSet<String> speciesTypes = new TreeSet<>();
         private final TreeSet<String> invokerTypes = new TreeSet<>();
+        private final TreeSet<String> linkerTypes = new TreeSet<>();
         private final TreeSet<String> callSiteTypes = new TreeSet<>();
         private final Map<String, Set<String>> dmhMethods = new TreeMap<>();
 
@@ -87,6 +87,12 @@ class GenerateJLIClassesHelper {
             return this;
         }
 
+        HolderClassBuilder addLinkerType(String methodType) {
+            validateMethodType(methodType);
+            linkerTypes.add(methodType);
+            return this;
+        }
+
         HolderClassBuilder addCallSiteType(String csType) {
             validateMethodType(csType);
             callSiteTypes.add(csType);
@@ -130,19 +136,33 @@ class GenerateJLIClassesHelper {
                 }
             }
 
-            // The invoker type to ask for is retrieved by removing the first
+            // The linker type to ask for is retrieved by removing the first
             // and the last argument, which needs to be of Object.class
+            MethodType[] linkerMethodTypes = new MethodType[linkerTypes.size()];
+            index = 0;
+            for (String linkerType : linkerTypes) {
+                MethodType mt = asMethodType(linkerType);
+                final int lastParam = mt.parameterCount() - 1;
+                if (!checkLinkerTypeParams(mt)) {
+                    throw new RuntimeException(
+                            "Linker type parameter must start and end with Object: " + linkerType);
+                }
+                mt = mt.dropParameterTypes(lastParam, lastParam + 1);
+                linkerMethodTypes[index] = mt.dropParameterTypes(0, 1);
+                index++;
+            }
+
+            // The invoker type to ask for is retrieved by removing the first
+            // argument, which needs to be of Object.class
             MethodType[] invokerMethodTypes = new MethodType[invokerTypes.size()];
             index = 0;
             for (String invokerType : invokerTypes) {
                 MethodType mt = asMethodType(invokerType);
-                final int lastParam = mt.parameterCount() - 1;
                 if (!checkInvokerTypeParams(mt)) {
                     throw new RuntimeException(
-                            "Invoker type parameter must start and end with Object: " + invokerType);
+                            "Invoker type parameter must start with 2 Objects: " + invokerType);
                 }
-                mt = mt.dropParameterTypes(lastParam, lastParam + 1);
-                invokerMethodTypes[index] = mt.dropParameterTypes(0, 1);
+                invokerMethodTypes[index] = mt.dropParameterTypes(0, 2);
                 index++;
             }
 
@@ -171,7 +191,7 @@ class GenerateJLIClassesHelper {
                             DELEGATING_HOLDER, directMethodTypes));
             result.put(INVOKERS_HOLDER,
                        generateInvokersHolderClassBytes(INVOKERS_HOLDER,
-                            invokerMethodTypes, callSiteMethodTypes));
+                            linkerMethodTypes, invokerMethodTypes, callSiteMethodTypes));
             result.put(BASIC_FORMS_HOLDER,
                        generateBasicFormsClassBytes(BASIC_FORMS_HOLDER));
 
@@ -207,6 +227,12 @@ class GenerateJLIClassesHelper {
         }
 
         public static boolean checkInvokerTypeParams(MethodType mt) {
+            return (mt.parameterCount() >= 2 &&
+                    mt.parameterType(0) == Object.class &&
+                    mt.parameterType(1) == Object.class);
+        }
+
+        public static boolean checkLinkerTypeParams(MethodType mt) {
             final int lastParam = mt.parameterCount() - 1;
             return (mt.parameterCount() >= 2 &&
                     mt.parameterType(0) == Object.class &&
@@ -320,15 +346,11 @@ class GenerateJLIClassesHelper {
                                 if ("linkToTargetMethod".equals(parts[2]) ||
                                         "linkToCallSite".equals(parts[2])) {
                                     builder.addCallSiteType(methodType);
+                                } else if (parts[2].endsWith("nvoker")) {
+                                    // MH.exactInvoker exactInvoker MH.invoker invoker
+                                    builder.addInvokerType(methodType);
                                 } else {
-                                    MethodType mt = HolderClassBuilder.asMethodType(methodType);
-                                    // Work around JDK-8327499
-                                    if (HolderClassBuilder.checkInvokerTypeParams(mt)) {
-                                        builder.addInvokerType(methodType);
-                                    } else {
-                                        PlatformLogger.getLogger("java.lang.invoke")
-                                                .warning("Invalid LF_RESOLVE " + parts[1] + " " + parts[2] + " " + parts[3]);
-                                    }
+                                    builder.addLinkerType(methodType);
                                 }
                             } else if (parts[1].contains("DirectMethodHandle")) {
                                 String dmh = parts[2];
@@ -465,27 +487,27 @@ class GenerateJLIClassesHelper {
 
     /**
      * Returns a {@code byte[]} representation of a class implementing
-     * the invoker forms for the set of supplied {@code invokerMethodTypes}
-     * and {@code callSiteMethodTypes}.
+     * the invoker forms for the set of supplied {@code linkerMethodTypes}
+     * {@code invokerMethodTypes}, and {@code callSiteMethodTypes}.
      */
     static byte[] generateInvokersHolderClassBytes(String className,
-            MethodType[] invokerMethodTypes, MethodType[] callSiteMethodTypes) {
+            MethodType[] linkerMethodTypes, MethodType[] invokerMethodTypes,
+            MethodType[] callSiteMethodTypes) {
 
         HashSet<MethodType> dedupSet = new HashSet<>();
         ArrayList<LambdaForm> forms = new ArrayList<>();
         ArrayList<String> names = new ArrayList<>();
-        int[] types = {
-            MethodTypeForm.LF_EX_LINKER,
+
+        int[] invokerTypes = {
             MethodTypeForm.LF_EX_INVOKER,
-            MethodTypeForm.LF_GEN_LINKER,
-            MethodTypeForm.LF_GEN_INVOKER
+            MethodTypeForm.LF_GEN_INVOKER,
         };
 
-        for (int i = 0; i < invokerMethodTypes.length; i++) {
+        for (MethodType methodType : invokerMethodTypes) {
             // generate methods representing invokers of the specified type
-            if (dedupSet.add(invokerMethodTypes[i])) {
-                for (int type : types) {
-                    LambdaForm invokerForm = Invokers.invokeHandleForm(invokerMethodTypes[i],
+            if (dedupSet.add(methodType)) {
+                for (int type : invokerTypes) {
+                    LambdaForm invokerForm = Invokers.invokeHandleForm(methodType,
                             /*customized*/false, type);
                     forms.add(invokerForm);
                     names.add(invokerForm.kind.defaultLambdaName);
@@ -493,6 +515,24 @@ class GenerateJLIClassesHelper {
             }
         }
 
+        int[] linkerTypes = {
+                MethodTypeForm.LF_EX_LINKER,
+                MethodTypeForm.LF_GEN_LINKER,
+        };
+
+        dedupSet = new HashSet<>();
+        for (MethodType methodType : linkerMethodTypes) {
+            // generate methods representing linkers of the specified type
+            if (dedupSet.add(methodType)) {
+                for (int type : linkerTypes) {
+                    LambdaForm linkerForm = Invokers.invokeHandleForm(methodType,
+                            /*customized*/false, type);
+                    forms.add(linkerForm);
+                    names.add(linkerForm.kind.defaultLambdaName);
+                }
+            }
+        }
+
         dedupSet = new HashSet<>();
         for (int i = 0; i < callSiteMethodTypes.length; i++) {
             // generate methods representing invokers of the specified type
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSLambdaInvoker.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSLambdaInvoker.java
index f3485ee26a6..5d78d2bdd78 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSLambdaInvoker.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSLambdaInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 
+/**
+ * This is launched from TestLambdaInvokers.
+ */
 public class CDSLambdaInvoker {
     public static void main(String args[]) throws Throwable {
         // The following calls trigger the generation of new Species classes
@@ -44,6 +47,10 @@ public class CDSLambdaInvoker {
                                               boolean.class, Object.class, long.class, double.class);
         MethodHandle mh = lookup.findStatic(CDSLambdaInvoker.class, "callme", mt);
         mh.invokeExact(4.0f, 5.0, 6, true, (Object)args, 7L, 8.0);
+
+        mh = MethodHandles.dropArguments(MethodHandles.zero(Object.class), 0, Object.class, int.class);
+        MethodHandle inv = MethodHandles.invoker(mh.type());
+        invoke(inv, mh, args, 3);
     }
 
     private static Object invoke(MethodHandle mh, Object ... args) throws Throwable {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestLambdaInvokers.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestLambdaInvokers.java
index 9a16f55e149..3769ab97b93 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestLambdaInvokers.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestLambdaInvokers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @test
  * @key randomness
  * @summary test archive lambda invoker species type in dynamic dump
- * @bug 8280767
+ * @bug 8280767 8327499
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive
  * @compile CDSLambdaInvoker.java
@@ -59,6 +59,7 @@ public class TestLambdaInvokers extends DynamicArchiveTestBase {
              "-Xlog:cds",
              "-Xlog:cds+dynamic=debug",
              "-Xlog:class+load",
+             "-Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true",
              "-cp",
              jarFile,
              mainClass)
@@ -69,6 +70,10 @@ public class TestLambdaInvokers extends DynamicArchiveTestBase {
                  // java.lang.invoke.BoundMethodHandle$Species_JL is generated from CDSLambdaInvoker and
                  // stored in the dynamic archive
                  output.shouldContain("java.lang.invoke.BoundMethodHandle$Species_JL source: shared objects file (top)");
+
+                 // java.lang.invoke.Invokers$Holder has invoker(Object,Object,Object,int)Object available
+                 // from the archives
+                 output.shouldContain("[LF_RESOLVE] java.lang.invoke.Invokers$Holder invoker L3I_L (success)");
              });
     }
 
diff --git a/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
index 275043ed8d8..5d06288fb59 100644
--- a/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,8 @@
  */
 
 import java.io.IOException;
+import java.lang.classfile.ClassFile;
+import java.lang.constant.MethodTypeDesc;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -29,6 +31,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.testng.Assert;
 import tests.Helper;
 import tests.JImageGenerator;
 import tests.JImageValidator;
@@ -37,9 +40,12 @@ import tests.Result;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
- /*
+import static java.lang.constant.ConstantDescs.CD_Object;
+import static java.lang.constant.ConstantDescs.CD_int;
+
+/*
  * @test
- * @bug 8252919
+ * @bug 8252919 8327499
  * @library ../../lib
  * @summary Test --generate-jli-classes plugin
  * @enablePreview
@@ -122,6 +128,47 @@ public class GenerateJLIClassesPluginTest {
         validateHolderClasses(image);
     }
 
+    @Test
+    public static void testInvokers() throws IOException {
+        var fileString = "[LF_RESOLVE] java.lang.invoke.Invokers$Holder invoker L3I_L (fail)";
+        Path invokersTrace = Files.createTempFile("invokers", "trace");
+        Files.writeString(invokersTrace, fileString, Charset.defaultCharset());
+        Result result = JImageGenerator.getJLinkTask()
+                .modulePath(helper.defaultModulePath())
+                .output(helper.createNewImageDir("jli-invokers"))
+                .option("--generate-jli-classes=@" + invokersTrace.toString())
+                .addMods("java.base")
+                .call();
+
+        var image = result.assertSuccess();
+        var targetMtd = MethodTypeDesc.of(CD_Object, CD_Object, CD_Object, CD_Object, CD_int);
+
+        validateHolderClasses(image);
+        JImageValidator.validate(image.resolve("lib").resolve("modules"),
+                List.of(), List.of(), bytes -> {
+                    var cf = ClassFile.of().parse(bytes);
+                    if (!cf.thisClass().name().equalsString("java/lang/invoke/Invokers$Holder")) {
+                        return;
+                    }
+
+                    boolean found = false;
+                    for (var m : cf.methods()) {
+                        // LambdaForm.Kind
+                        if (m.methodName().equalsString("invoker") && m.methodTypeSymbol().equals(targetMtd)) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        var methodsInfo = cf.methods().stream()
+                                .map(m -> m.methodName() + m.methodTypeSymbol().displayDescriptor())
+                                .collect(Collectors.joining("\n"));
+
+                        Assert.fail("Missing invoker L3I_L in java.lang.invoke.Invokers$Holder, found:\n" + methodsInfo);
+                    }
+                });
+    }
+
     private static void validateHolderClasses(Path image) throws IOException {
         JImageValidator.validate(image.resolve("lib").resolve("modules"),
                 List.of("/java.base/java/lang/invoke/DirectMethodHandle$Holder.class",
diff --git a/test/jdk/tools/lib/tests/JImageValidator.java b/test/jdk/tools/lib/tests/JImageValidator.java
index 125afb9d24c..3d22a558dbd 100644
--- a/test/jdk/tools/lib/tests/JImageValidator.java
+++ b/test/jdk/tools/lib/tests/JImageValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.Properties;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.ClassHierarchyResolver;
+import java.util.function.Consumer;
 
 import jdk.internal.jimage.BasicImageReader;
 import jdk.internal.jimage.ImageLocation;
@@ -172,6 +173,11 @@ public class JImageValidator {
 
     public static void validate(Path jimage, List<String> expectedLocations,
             List<String> unexpectedPaths) throws IOException {
+        validate(jimage, expectedLocations, unexpectedPaths, _ -> {});
+    }
+
+    public static void validate(Path jimage, List<String> expectedLocations,
+            List<String> unexpectedPaths, Consumer<byte[]> classChecker) throws IOException {
         BasicImageReader reader = BasicImageReader.open(jimage);
         // Validate expected locations
         List<String> seenLocations = new ArrayList<>();
@@ -195,6 +201,7 @@ public class JImageValidator {
                         throw new IOException("NULL RESOURCE " + s);
                     }
                     readClass(r);
+                    classChecker.accept(r);
                 } catch (IOException ex) {
                     System.err.println(s + " ERROR " + ex);
                     throw ex;
@@ -222,7 +229,7 @@ public class JImageValidator {
         return moduleExecutionTime;
     }
 
-    public static void readClass(byte[] clazz) throws IOException{
+    public static void readClass(byte[] clazz) throws IOException {
         var errors = ClassFile.of(
                 //resolution of all classes as interfaces cancels assignability verification
                 ClassFile.ClassHierarchyResolverOption.of(cls -> ClassHierarchyResolver.ClassHierarchyInfo.ofInterface()))

From 391bbbc7d0fb95b0cd55e2f56c43bee019aeab7f Mon Sep 17 00:00:00 2001
From: Tobias Holenstein <tholenstein@openjdk.org>
Date: Mon, 13 May 2024 09:14:17 +0000
Subject: [PATCH 414/486] 8330584: IGV: XML does not save all node properties

Reviewed-by: rcastanedalo, chagedorn
---
 .../igv/coordinator/OutlineTopComponent.java  | 164 +++++++++++-------
 .../com/sun/hotspot/igv/data/InputNode.java   |  18 +-
 .../igv/data/serialization/Printer.java       |  17 +-
 3 files changed, 131 insertions(+), 68 deletions(-)

diff --git a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
index c66c40810c0..9508a5dfbca 100644
--- a/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
+++ b/src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java
@@ -41,16 +41,17 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.io.*;
 import java.nio.channels.FileChannel;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
+import java.nio.file.*;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import java.util.zip.ZipInputStream;
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.filechooser.FileFilter;
+import javax.swing.filechooser.FileNameExtensionFilter;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.ErrorManager;
@@ -66,6 +67,9 @@ import org.openide.util.NbBundle;
 import org.openide.windows.Mode;
 import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+
 
 /**
  *
@@ -76,17 +80,7 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
     public static final String PREFERRED_ID = "OutlineTopComponent";
     private static final GraphDocument document = new GraphDocument();
     private static final int WORK_UNITS = 10000;
-    private static final FileFilter xmlFileFilter = new FileFilter() {
-        @Override
-        public boolean accept(File f) {
-            return f.getName().toLowerCase().endsWith(".xml") || f.isDirectory();
-        }
-
-        @Override
-        public String getDescription() {
-            return "Graph files (*.xml)";
-        }
-    };
+    private static final FileFilter graphFileFilter = new FileNameExtensionFilter("Graph files (*.xml, *.igv)", "xml", "igv");
     private static final Server server = new Server(document, OutlineTopComponent::loadContext);
     public static OutlineTopComponent instance;
     private final Set<FolderNode> selectedFolders = new HashSet<>();
@@ -161,8 +155,26 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
             }
         }
 
-        try (Writer writer = new OutputStreamWriter(new FileOutputStream(path))) {
-            Printer.exportGraphDocument(writer, doc, saveContexts);
+        if (path.endsWith(".igv")) {
+            File zipFile = new File(path);
+            String fileName = zipFile.getName();
+            try (FileOutputStream fos = new FileOutputStream(zipFile);
+                 ZipOutputStream zos = new ZipOutputStream(fos);
+                 Writer writer = new OutputStreamWriter(zos)) {
+
+                // Replace the '.igv' extension with '.xml's
+                String zipEntryName = fileName.substring(0, fileName.length() - 4) + ".xml";
+                ZipEntry zipEntry = new ZipEntry(zipEntryName);
+                zos.putNextEntry(zipEntry);
+
+                Printer.exportGraphDocument(writer, doc, saveContexts);
+
+                zos.closeEntry();
+            }
+        } else {
+            try (Writer writer = new OutputStreamWriter(new FileOutputStream(path))) {
+                Printer.exportGraphDocument(writer, doc, saveContexts);
+            }
         }
     }
 
@@ -358,7 +370,7 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
      **/
     public void openFile() {
         JFileChooser fc = new JFileChooser(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT));
-        fc.setFileFilter(xmlFileFilter);
+        fc.setFileFilter(graphFileFilter);
         if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
             clearWorkspace();
             String path = fc.getSelectedFile().getAbsolutePath();
@@ -403,9 +415,22 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
     }
 
     public void saveAs() {
-        JFileChooser fc = new JFileChooser();
+        JFileChooser fc = new JFileChooser() {
+            @Override
+            public void approveSelection() {
+                File selectedFile = getSelectedFile();
+                if (selectedFile != null) {
+                    String fileName = selectedFile.getName().toLowerCase();
+                    if (!fileName.endsWith(".xml") && !fileName.endsWith(".igv")) {
+                        JOptionPane.showMessageDialog(this, "Please select a graph file with .xml or .igv extension.", "Invalid File", JOptionPane.ERROR_MESSAGE);
+                        return;
+                    }
+                }
+                super.approveSelection();
+            }
+        };
         fc.setDialogTitle("Save As...");
-        fc.setFileFilter(xmlFileFilter);
+        fc.setFileFilter(graphFileFilter);
         fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
         if (fc.showSaveDialog(null) == JFileChooser.APPROVE_OPTION) {
             String path = fc.getSelectedFile().getAbsolutePath();
@@ -432,7 +457,7 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
      **/
     public void importFromXML() {
         JFileChooser fc = new JFileChooser();
-        fc.setFileFilter(xmlFileFilter);
+        fc.setFileFilter(graphFileFilter);
         fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
         fc.setMultiSelectionEnabled(true);
         if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
@@ -482,60 +507,83 @@ public final class OutlineTopComponent extends TopComponent implements ExplorerM
     }
 
     /**
-     * Loads a graph document from the given file path, updating progress via a ProgressHandle.
-     * Parse the XML file, add the parsed document to the workspace, and load associated contexts if specified.
+     * Loads a graph document from the specified path, either as an XML file or from a ZIP archive.
+     * If loading the context is requested, it loads the context along with the document.
      */
     private void loadGraphDocument(String path, boolean loadContext) throws IOException {
         if (Files.notExists(Path.of(path))) {
             return;
         }
         File file = new File(path);
-        final FileChannel channel;
-        final long start;
-        try {
-            channel = FileChannel.open(file.toPath(), StandardOpenOption.READ);
-            start = channel.size();
-        } catch (Exception ex) {
-            Exceptions.printStackTrace(ex);
-            return;
+        if (file.getName().endsWith(".xml")) {
+            try (FileChannel channel = FileChannel.open(file.toPath(), StandardOpenOption.READ)) {
+                loadFile(channel, file, loadContext);
+            }
+        } else if (file.getName().endsWith(".igv")) {
+            try (ZipInputStream zis = new ZipInputStream(new FileInputStream(file))) {
+                ZipEntry entry = zis.getNextEntry();
+                if (entry != null && entry.getName().endsWith(".xml")) {
+                    loadFile(Channels.newChannel(zis), file, loadContext);
+                }
+            }
         }
+    }
 
+    /**
+     * Loads an XML or ZIP document from the provided channel, while monitoring the progress of the operation.
+     */
+    private void loadFile(ReadableByteChannel channel,  File file, boolean loadContext) throws IOException {
         final ProgressHandle handle = ProgressHandleFactory.createHandle("Opening file " + file.getName());
         handle.start(WORK_UNITS);
 
-        ParseMonitor monitor = new ParseMonitor() {
-            @Override
-            public void updateProgress() {
-                try {
-                    int prog = (int) (WORK_UNITS * (double) channel.position() / (double) start);
-                    handle.progress(prog);
-                } catch (IOException ignored) {
+        ParseMonitor monitor;
+        if (channel instanceof FileChannel fileChannel) {
+            final long start = fileChannel.size();
+            monitor = new ParseMonitor() {
+                @Override
+                public void updateProgress() {
+                    try {
+                        int prog = (int) (WORK_UNITS * (double) fileChannel.position() / (double) start);
+                        handle.progress(prog);
+                    } catch (IOException ignored) {}
                 }
-            }
 
-            @Override
-            public void setState(String state) {
-                updateProgress();
-                handle.progress(state);
-            }
-        };
+                @Override
+                public void setState(String state) {
+                    updateProgress();
+                    handle.progress(state);
+                }
+            };
+        } else {
+            monitor = new ParseMonitor() {
+                @Override
+                public void updateProgress() {
+                    handle.progress("Processing...");
+                }
+
+                @Override
+                public void setState(String state) {
+                    updateProgress();
+                    handle.progress(state);
+                }
+            };
+        }
+
         try {
-            if (file.getName().endsWith(".xml")) {
-                ArrayList<GraphContext> contexts = new ArrayList<>();
-                final Parser parser = new Parser(channel, monitor, document, loadContext ? contexts::add : null);
-                parser.parse();
-                SwingUtilities.invokeLater(() -> {
-                    for (Node child : manager.getRootContext().getChildren().getNodes(true)) {
-                        // Nodes are lazily created. By expanding and collapsing they are all initialized
-                        ((BeanTreeView) this.treeView).expandNode(child);
-                        ((BeanTreeView) this.treeView).collapseNode(child);
-                    }
-                    requestActive();
-                });
+            ArrayList<GraphContext> contexts = new ArrayList<>();
+            final Parser parser = new Parser(channel, monitor, document, loadContext ? contexts::add : null);
+            parser.parse();
+            SwingUtilities.invokeLater(() -> {
+                for (Node child : manager.getRootContext().getChildren().getNodes(true)) {
+                    // Nodes are lazily created. By expanding and collapsing they are all initialized
+                    ((BeanTreeView) this.treeView).expandNode(child);
+                    ((BeanTreeView) this.treeView).collapseNode(child);
+                }
+                requestActive();
                 for (GraphContext ctx : contexts) {
                     loadContext(ctx);
                 }
-            }
+            });
         } catch (IOException ex) {
             Exceptions.printStackTrace(ex);
         }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java
index 75b8b17ed5a..f2e1ad16ea6 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
  */
 package com.sun.hotspot.igv.data;
 
+import java.util.Objects;
+
 /**
  *
  * @author Thomas Wuerthinger
@@ -49,17 +51,21 @@ public class InputNode extends Properties.Entity {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof InputNode)) {
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-        InputNode n = (InputNode) o;
-        return n.id == id;
+        InputNode other = (InputNode) obj;
+        return id == other.id &&
+                Objects.equals(getProperties(), other.getProperties());
     }
 
     @Override
     public int hashCode() {
-        return id * 13;
+        return Objects.hash(id, getProperties());
     }
 
     @Override
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java
index f930e478776..b098b6ef5da 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Printer.java
@@ -103,10 +103,15 @@ public class Printer {
             for (InputNode n : removed) {
                 writer.simpleTag(Parser.REMOVE_NODE_ELEMENT, new Properties(Parser.NODE_ID_PROPERTY, Integer.toString(n.getId())));
             }
-        }
-
-        for (InputNode n : graph.getNodes()) {
-            if (!difference || !equal.contains(n)) {
+            for (InputNode n : graph.getNodes()) {
+                if (!equal.contains(n)) {
+                    writer.startTag(Parser.NODE_ELEMENT, new Properties(Parser.NODE_ID_PROPERTY, Integer.toString(n.getId())));
+                    writer.writeProperties(n.getProperties());
+                    writer.endTag(); // Parser.NODE_ELEMENT
+                }
+            }
+        } else {
+            for (InputNode n : graph.getNodes()) {
                 writer.startTag(Parser.NODE_ELEMENT, new Properties(Parser.NODE_ID_PROPERTY, Integer.toString(n.getId())));
                 writer.writeProperties(n.getProperties());
                 writer.endTag(); // Parser.NODE_ELEMENT
@@ -227,6 +232,10 @@ public class Printer {
             b.append(code.getBci());
             b.append(" ");
             b.append(code.getName());
+            b.append(" ");
+            b.append(code.getOperands());
+            b.append(" ");
+            b.append(code.getComment());
             b.append("\n");
         }
 

From 1484153c1a092cefc20270b35aa1e508280843a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 13 May 2024 09:48:23 +0000
Subject: [PATCH 415/486] 8332080: Update troff man page for javadoc

Reviewed-by: jjg
---
 src/jdk.javadoc/share/man/javadoc.1                      | 9 +++++++--
 test/langtools/jdk/javadoc/tool/CheckManPageOptions.java | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/jdk.javadoc/share/man/javadoc.1 b/src/jdk.javadoc/share/man/javadoc.1
index d42d7137657..8c149ff58f0 100644
--- a/src/jdk.javadoc/share/man/javadoc.1
+++ b/src/jdk.javadoc/share/man/javadoc.1
@@ -108,8 +108,8 @@ declaration, they will be ignored.
 To check for any extra or misplaced documentation comments, compile your
 source code with the \f[V]javac\f[R] option \f[V]-Xlint\f[R], or more
 specifically, \f[V]-Xlint:dangling-doc-comments\f[R].
-Within a source file, you may use suppress any warnings generated by
-these options by using
+Within a source file, you may suppress any warnings generated by these
+options by using
 \f[V]\[at]SuppressWarnings(\[dq]dangling-doc-comments\[dq])\f[R] on a
 suitable enclosing declaration.
 .SS Conformance
@@ -920,6 +920,11 @@ throughout the rest of the document.
 This is useful when your source code contains no deprecated APIs, and
 you want to make the navigation bar cleaner.
 .TP
+\f[V]--no-fonts\f[R]
+Prevents inclusion of font files in the generated documentation.
+This can be useful if the documentation uses a custom stylesheet which
+does not use the default fonts.
+.TP
 \f[V]-nohelp\f[R]
 Omits the \f[B]HELP\f[R] link in the navigation bar at the top of each
 generated page.
diff --git a/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java b/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java
index 9e985e7d5d1..2e2d0d0f84d 100644
--- a/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java
+++ b/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java
@@ -66,7 +66,7 @@ public class CheckManPageOptions {
 
     static final PrintStream out = System.err;
 
-    List<String> MISSING_IN_MAN_PAGE = List.of("--no-fonts");
+    List<String> MISSING_IN_MAN_PAGE = List.of();
 
     void run(String... args) throws Exception {
         var file = args.length == 0 ? findDefaultFile() : Path.of(args[0]);

From abf54bb1e6da6d7bc432b3e9bb3ff164a895bd3e Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Mon, 13 May 2024 13:01:15 +0000
Subject: [PATCH 416/486] 8332100: Add missing `@since` to KeyValue::EC_TYPE in
 `java.xml.crypto`

Reviewed-by: mullan
---
 .../share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java
index aab9237f5c7..b1dc3ba8603 100644
--- a/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java
+++ b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -152,6 +152,8 @@ public interface KeyValue extends XMLStructure {
      * the value of the <code>type</code> parameter of the
      * {@link RetrievalMethod} class to describe a remote
      * <code>ECKeyValue</code> structure.
+     *
+     * @since 13
      */
     static final String EC_TYPE =
         "http://www.w3.org/2009/xmldsig11#ECKeyValue";

From ff4bf1cf9f18547cff8f484433c3c55b4c288aaa Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Mon, 13 May 2024 13:49:01 +0000
Subject: [PATCH 417/486] 8332102: Add `@since` to package-info of
 `jdk.security.jarsigner`

Reviewed-by: weijun
---
 .../share/classes/jdk/security/jarsigner/package-info.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jdk.jartool/share/classes/jdk/security/jarsigner/package-info.java b/src/jdk.jartool/share/classes/jdk/security/jarsigner/package-info.java
index 0b7c40fcf69..26d32ccf264 100644
--- a/src/jdk.jartool/share/classes/jdk/security/jarsigner/package-info.java
+++ b/src/jdk.jartool/share/classes/jdk/security/jarsigner/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,5 +25,6 @@
 
 /**
  * This package defines APIs for signing jar files.
+ * @since 9
  */
 package jdk.security.jarsigner;

From 7c2c24fc0511b36132952c96be46eea5904a53c5 Mon Sep 17 00:00:00 2001
From: Prajwal Kumaraswamy <pkumaraswamy@openjdk.org>
Date: Mon, 13 May 2024 16:10:45 +0000
Subject: [PATCH 418/486] 8261433: Better pkcs11 performance for
 libpkcs11:C_EncryptInit/libpkcs11:C_DecryptInit

Reviewed-by: djelinski, valeriep, coffeys
---
 .../sun/security/pkcs11/P11AEADCipher.java    |  26 +++-
 .../sun/security/pkcs11/wrapper/PKCS11.java   |  36 +++++
 .../share/native/libj2pkcs11/p11_convert.c    |  23 ++--
 .../share/native/libj2pkcs11/p11_crypt.c      | 129 ++++++++++++++----
 .../share/native/libj2pkcs11/p11_util.c       |  83 ++++++-----
 5 files changed, 220 insertions(+), 77 deletions(-)

diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java
index d8477217947..d04776a0384 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -454,12 +454,26 @@ final class P11AEADCipher extends CipherSpi {
             if (session == null) {
                 session = token.getOpSession();
             }
-            if (encrypt) {
-                token.p11.C_EncryptInit(session.id(), mechWithParams,
-                    p11KeyID);
+
+            if (type == Transformation.AES_GCM) {
+                CK_VERSION cryptokiVersion = token.p11.getVersion();
+                boolean useNormativeMechFirst = cryptokiVersion.major > 2 ||
+                    (cryptokiVersion.major == 2  && cryptokiVersion.minor >= 40);
+                if (encrypt) {
+                    token.p11.C_GCMEncryptInitWithRetry(session.id(), mechWithParams,
+                        p11KeyID, useNormativeMechFirst);
+                } else {
+                    token.p11.C_GCMDecryptInitWithRetry(session.id(), mechWithParams,
+                        p11KeyID, useNormativeMechFirst);
+                }
             } else {
-                token.p11.C_DecryptInit(session.id(), mechWithParams,
-                    p11KeyID);
+                if (encrypt) {
+                    token.p11.C_EncryptInit(session.id(), mechWithParams,
+                        p11KeyID);
+                } else {
+                    token.p11.C_DecryptInit(session.id(), mechWithParams,
+                        p11KeyID);
+                }
             }
         } catch (PKCS11Exception e) {
             p11Key.releaseKeyID();
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
index 63303105587..db4a471f334 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
@@ -793,6 +793,24 @@ public class PKCS11 {
     public native void C_EncryptInit(long hSession, CK_MECHANISM pMechanism,
             long hKey) throws PKCS11Exception;
 
+    /**
+     * C_GCMEncryptInitWithRetry initializes a GCM encryption operation and retry
+     * with alternative param structure for max compatibility.
+     * (Encryption and decryption)
+     *
+     * @param hSession the session's handle
+     *         (PKCS#11 param: CK_SESSION_HANDLE hSession)
+     * @param pMechanism the encryption mechanism
+     *         (PKCS#11 param: CK_MECHANISM_PTR pMechanism)
+     * @param hKey the handle of the encryption key
+     *         (PKCS#11 param: CK_OBJECT_HANDLE hKey)
+     * @param useNormativeVerFirst whether to use normative version of GCM parameter first
+     * @exception PKCS11Exception If function returns other value than CKR_OK.
+     * @preconditions
+     * @postconditions
+     */
+    public native void C_GCMEncryptInitWithRetry(long hSession, CK_MECHANISM pMechanism,
+            long hKey, boolean useNormativeVerFirst) throws PKCS11Exception;
 
     /**
      * C_Encrypt encrypts single-part data.
@@ -887,6 +905,24 @@ public class PKCS11 {
     public native void C_DecryptInit(long hSession, CK_MECHANISM pMechanism,
             long hKey) throws PKCS11Exception;
 
+    /**
+     * C_GCMDecryptInitWithRetry initializes a GCM decryption operation
+     * with alternative param structure for max compatibility.
+     * (Encryption and decryption)
+     *
+     * @param hSession the session's handle
+     *         (PKCS#11 param: CK_SESSION_HANDLE hSession)
+     * @param pMechanism the decryption mechanism
+     *         (PKCS#11 param: CK_MECHANISM_PTR pMechanism)
+     * @param hKey the handle of the decryption key
+     *         (PKCS#11 param: CK_OBJECT_HANDLE hKey)
+     * @param useNormativeVerFirst whether to use normative version of GCM parameter first
+     * @exception PKCS11Exception If function returns other value than CKR_OK.
+     * @preconditions
+     * @postconditions
+     */
+    public native void C_GCMDecryptInitWithRetry(long hSession, CK_MECHANISM pMechanism,
+            long hKey, boolean useNormativeVerFirst) throws PKCS11Exception;
 
     /**
      * C_Decrypt decrypts encrypted data in a single part.
diff --git a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c
index 53ee635a24c..986ef9799c4 100644
--- a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c
+++ b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -1014,18 +1014,19 @@ cleanup:
 }
 
 /*
- * converts the Java CK_GCM_PARAMS object to a CK_GCM_PARAMS_NO_IVBITS pointer
- * Note: Need to try NSS definition first to avoid SIGSEGV.
+ * converts the Java CK_GCM_PARAMS object to a CK_GCM_PARAMS pointer
+ * Note: Early NSS versions crash w/ CK_GCM_PARAMS and need to use
+ * CK_GCM_PARAMS_NO_IVBITS to avoid SIGSEGV.
  *
  * @param env - used to call JNI funktions to get the Java classes and objects
  * @param jParam - the Java CK_GCM_PARAMS object to convert
  * @param pLength - length of the allocated memory of the returned pointer
- * @return pointer to the new CK_GCM_PARAMS_NO_IVBITS structure
+ * @return pointer to the new CK_GCM_PARAMS structure
  */
-CK_GCM_PARAMS_NO_IVBITS_PTR
+CK_GCM_PARAMS_PTR
 jGCMParamsToCKGCMParamPtr(JNIEnv *env, jobject jParam, CK_ULONG *pLength)
 {
-    CK_GCM_PARAMS_NO_IVBITS_PTR ckParamPtr;
+    CK_GCM_PARAMS_PTR ckParamPtr;
     jclass jGcmParamsClass;
     jfieldID fieldID;
     jobject jIv, jAad;
@@ -1053,8 +1054,8 @@ jGCMParamsToCKGCMParamPtr(JNIEnv *env, jobject jParam, CK_ULONG *pLength)
     if (fieldID == NULL) { return NULL; }
     jTagLen = (*env)->GetLongField(env, jParam, fieldID);
 
-    // allocate memory for CK_GCM_PARAMS_NO_IVBITS pointer
-    ckParamPtr = calloc(1, sizeof(CK_GCM_PARAMS_NO_IVBITS));
+    // allocate memory for CK_GCM_PARAMS pointer
+    ckParamPtr = calloc(1, sizeof(CK_GCM_PARAMS));
     if (ckParamPtr == NULL) {
         p11ThrowOutOfMemoryError(env, 0);
         return NULL;
@@ -1065,6 +1066,8 @@ jGCMParamsToCKGCMParamPtr(JNIEnv *env, jobject jParam, CK_ULONG *pLength)
     if ((*env)->ExceptionCheck(env)) {
         goto cleanup;
     }
+    // adjust since the value is in bits
+    ckParamPtr->ulIvBits = ckParamPtr->ulIvLen << 3;
 
     jByteArrayToCKByteArray(env, jAad, &(ckParamPtr->pAAD), &(ckParamPtr->ulAADLen));
     if ((*env)->ExceptionCheck(env)) {
@@ -1074,9 +1077,9 @@ jGCMParamsToCKGCMParamPtr(JNIEnv *env, jobject jParam, CK_ULONG *pLength)
     ckParamPtr->ulTagBits = jLongToCKULong(jTagLen);
 
     if (pLength != NULL) {
-        *pLength = sizeof(CK_GCM_PARAMS_NO_IVBITS);
+        *pLength = sizeof(CK_GCM_PARAMS);
     }
-    TRACE1("Created inner GCM_PARAMS PTR w/o ulIvBits %p\n", ckParamPtr);
+    TRACE1("Created inner GCM_PARAMS PTR %p\n", ckParamPtr);
     return ckParamPtr;
 cleanup:
     free(ckParamPtr->pIv);
diff --git a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c
index 6d8cca4da83..d969fabffd0 100644
--- a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c
+++ b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -72,7 +72,6 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptInit
 {
     CK_SESSION_HANDLE ckSessionHandle;
     CK_MECHANISM_PTR ckpMechanism = NULL;
-    CK_MECHANISM_PTR ckpTemp;
     CK_OBJECT_HANDLE ckKeyHandle;
     CK_RV rv;
 
@@ -90,20 +89,60 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptInit
     rv = (*ckpFunctions->C_EncryptInit)(ckSessionHandle, ckpMechanism,
                                         ckKeyHandle);
 
-    if (ckpMechanism->mechanism == CKM_AES_GCM) {
-        if (rv == CKR_ARGUMENTS_BAD || rv == CKR_MECHANISM_PARAM_INVALID) {
-            // retry with CKM_GCM_PARAMS structure in pkcs11t.h
-            TRACE0("DEBUG C_EncryptInit: retry with CK_GCM_PARAMS\n");
-            ckpTemp = updateGCMParams(env, ckpMechanism);
-            if (ckpTemp != NULL) { // only re-call if conversion succeeds
-                ckpMechanism = ckpTemp;
-                rv = (*ckpFunctions->C_EncryptInit)(ckSessionHandle, ckpMechanism,
-                        ckKeyHandle);
-            }
+    TRACE1("DEBUG C_EncryptInit: freed pMech = %p\n", ckpMechanism);
+    freeCKMechanismPtr(ckpMechanism);
+    if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; }
+
+    TRACE0("FINISHED\n");
+}
+
+/*
+ * Class:     sun_security_pkcs11_wrapper_PKCS11
+ * Method:    C_GCMEncryptInitWithRetry
+ * Signature: (JLsun/security/pkcs11/wrapper/CK_MECHANISM;JZ)V
+ * Parametermapping:                    *PKCS11*
+ * @param   jlong jSessionHandle        CK_SESSION_HANDLE hSession
+ * @param   jobject jMechanism          CK_MECHANISM_PTR pMechanism
+ * @param   jlong jKeyHandle            CK_OBJECT_HANDLE hKey
+ * @param   jboolean useNormVerFirst    CK_BBOOL retry (only retry if the first
+ *                                      init uses the non-normative version)
+ */
+JNIEXPORT void JNICALL
+Java_sun_security_pkcs11_wrapper_PKCS11_C_1GCMEncryptInitWithRetry
+(JNIEnv *env, jobject obj, jlong jSessionHandle,
+ jobject jMechanism, jlong jKeyHandle, jboolean useNormVerFirst)
+{
+    CK_SESSION_HANDLE ckSessionHandle;
+    CK_MECHANISM_PTR ckpMechanism = NULL;
+    CK_OBJECT_HANDLE ckKeyHandle;
+    CK_BBOOL retry = FALSE;
+    CK_RV rv = 1;
+
+    CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
+    if (ckpFunctions == NULL) { return; }
+
+    ckSessionHandle = jLongToCKULong(jSessionHandle);
+    ckKeyHandle = jLongToCKULong(jKeyHandle);
+    ckpMechanism = jMechanismToCKMechanismPtr(env, jMechanism);
+
+    if ((*env)->ExceptionCheck(env)) { return; }
+
+    // if !useNormVerFirst, then update 'ckpMechanism' in place w/
+    // non-normative GCM params.
+    retry = (!useNormVerFirst && updateGCMParams(env, ckpMechanism) != NULL);
+
+    rv = (*ckpFunctions->C_EncryptInit)(ckSessionHandle, ckpMechanism, ckKeyHandle);
+
+    if (rv == CKR_ARGUMENTS_BAD || rv == CKR_MECHANISM_PARAM_INVALID) {
+        // retry and update 'ckpMechanism' in place w/ normative GCM params.
+        if (retry && updateGCMParams(env, ckpMechanism) != NULL) {
+            TRACE0("DEBUG retry C_EncryptInit\n");
+            rv = (*ckpFunctions->C_EncryptInit)(ckSessionHandle,
+                ckpMechanism, ckKeyHandle);
         }
     }
 
-    TRACE1("DEBUG C_EncryptInit: freed pMech = %p\n", ckpMechanism);
+    TRACE1("DEBUG C_GCMEncryptInitWithRetry: freed pMech = %p\n", ckpMechanism);
     freeCKMechanismPtr(ckpMechanism);
     if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; }
 
@@ -312,7 +351,6 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptInit
 {
     CK_SESSION_HANDLE ckSessionHandle;
     CK_MECHANISM_PTR ckpMechanism = NULL;
-    CK_MECHANISM_PTR ckpTemp;
     CK_OBJECT_HANDLE ckKeyHandle;
     CK_RV rv;
 
@@ -330,20 +368,61 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptInit
     rv = (*ckpFunctions->C_DecryptInit)(ckSessionHandle, ckpMechanism,
                                         ckKeyHandle);
 
-    if (ckpMechanism->mechanism == CKM_AES_GCM) {
-        if (rv == CKR_ARGUMENTS_BAD || rv == CKR_MECHANISM_PARAM_INVALID) {
-            // retry with CKM_GCM_PARAMS structure in pkcs11t.h
-            TRACE0("DEBUG C_DecryptInit: retry with CK_GCM_PARAMS\n");
-            ckpTemp = updateGCMParams(env, ckpMechanism);
-            if (ckpTemp != NULL) { // only re-call if conversion succeeds
-                ckpMechanism = ckpTemp;
-                rv = (*ckpFunctions->C_DecryptInit)(ckSessionHandle, ckpMechanism,
-                        ckKeyHandle);
-            }
+    TRACE1("DEBUG C_DecryptInit: freed pMech = %p\n", ckpMechanism);
+    freeCKMechanismPtr(ckpMechanism);
+    if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; }
+
+    TRACE0("FINISHED\n");
+}
+
+/*
+ * Class:     sun_security_pkcs11_wrapper_PKCS11
+ * Method:    C_GCMDecryptInitWithRetry
+ * Signature: (JLsun/security/pkcs11/wrapper/CK_MECHANISM;JZ)V
+ * Parametermapping:                    *PKCS11*
+ * @param   jlong jSessionHandle        CK_SESSION_HANDLE hSession
+ * @param   jobject jMechanism          CK_MECHANISM_PTR pMechanism
+ * @param   jlong jKeyHandle            CK_OBJECT_HANDLE hKey
+ * @param   jboolean useNormVerFirst    CK_BBOOL retry (only retry if the first
+ *                                      init uses the non-normative version)
+ */
+JNIEXPORT void JNICALL
+Java_sun_security_pkcs11_wrapper_PKCS11_C_1GCMDecryptInitWithRetry
+(JNIEnv *env, jobject obj, jlong jSessionHandle,
+ jobject jMechanism, jlong jKeyHandle, jboolean useNormVerFirst)
+{
+    CK_SESSION_HANDLE ckSessionHandle;
+    CK_MECHANISM_PTR ckpMechanism = NULL;
+    CK_OBJECT_HANDLE ckKeyHandle;
+    CK_BBOOL retry = FALSE;
+    CK_RV rv = 1;
+
+    CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
+    if (ckpFunctions == NULL) { return; }
+
+    ckSessionHandle = jLongToCKULong(jSessionHandle);
+    ckKeyHandle = jLongToCKULong(jKeyHandle);
+    ckpMechanism = jMechanismToCKMechanismPtr(env, jMechanism);
+
+    if ((*env)->ExceptionCheck(env)) { return; }
+
+    // if !useNormVerFirst, then update 'ckpMechanism' in place w/
+    // non-normative GCM params.
+    retry = (!useNormVerFirst && updateGCMParams(env, ckpMechanism) != NULL);
+
+    rv = (*ckpFunctions->C_DecryptInit)(ckSessionHandle, ckpMechanism,
+        ckKeyHandle);
+
+    if (rv == CKR_ARGUMENTS_BAD || rv == CKR_MECHANISM_PARAM_INVALID) {
+        // retry and update 'ckpMechanism' in place w/ normative GCM params.
+        if (retry && updateGCMParams(env, ckpMechanism) != NULL) {
+            TRACE0("DEBUG retry C_DecryptInit with normative CK_GCM_PARAMS\n");
+            rv = (*ckpFunctions->C_DecryptInit)(ckSessionHandle, ckpMechanism,
+                ckKeyHandle);
         }
     }
 
-    TRACE1("DEBUG C_DecryptInit: freed pMech = %p\n", ckpMechanism);
+    TRACE1("DEBUG C_GCMDecryptInitWithRetry: freed pMech = %p\n", ckpMechanism);
     freeCKMechanismPtr(ckpMechanism);
     if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; }
 
diff --git a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c
index abc39a0ce08..4edf9c94ce2 100644
--- a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c
+++ b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -327,14 +327,14 @@ void freeCKMechanismPtr(CK_MECHANISM_PTR mechPtr) {
              tmp = mechPtr->pParameter;
              switch (mechPtr->mechanism) {
                  case CKM_AES_GCM:
-                     if (mechPtr->ulParameterLen == sizeof(CK_GCM_PARAMS_NO_IVBITS)) {
-                         TRACE0("[ GCM_PARAMS w/o ulIvBits ]\n");
-                         free(((CK_GCM_PARAMS_NO_IVBITS*)tmp)->pIv);
-                         free(((CK_GCM_PARAMS_NO_IVBITS*)tmp)->pAAD);
-                     } else if (mechPtr->ulParameterLen == sizeof(CK_GCM_PARAMS)) {
+                     if (mechPtr->ulParameterLen == sizeof(CK_GCM_PARAMS)) {
                          TRACE0("[ GCM_PARAMS ]\n");
                          free(((CK_GCM_PARAMS*)tmp)->pIv);
                          free(((CK_GCM_PARAMS*)tmp)->pAAD);
+                     } else if (mechPtr->ulParameterLen == sizeof(CK_GCM_PARAMS_NO_IVBITS)) {
+                         TRACE0("[ GCM_PARAMS w/o ulIvBits ]\n");
+                         free(((CK_GCM_PARAMS_NO_IVBITS*)tmp)->pIv);
+                         free(((CK_GCM_PARAMS_NO_IVBITS*)tmp)->pAAD);
                      }
                      break;
                  case CKM_AES_CCM:
@@ -451,43 +451,54 @@ void freeCKMechanismPtr(CK_MECHANISM_PTR mechPtr) {
      }
 }
 
-/* This function replaces the CK_GCM_PARAMS_NO_IVBITS structure associated
- * with the specified CK_MECHANISM structure with CK_GCM_PARAMS
- * structure.
+/* This function updates the specified CK_MECHANISM structure
+ * and its GCM parameter structure switching between CK_GCM_PARAMS and
+ * CK_GCM_PARAMS_NO_IVBITS.
  *
  * @param mechPtr pointer to the CK_MECHANISM structure containing
- * the to-be-converted CK_GCM_PARAMS_NO_IVBITS structure.
+ * the to-be-converted CK_GCM_PARAMS / CK_GCM_PARAMS_NO_IVBITS structure.
  * @return pointer to the CK_MECHANISM structure containing the
- * converted CK_GCM_PARAMS structure or NULL if no conversion took place.
+ * converted structure or NULL if no conversion is done.
  */
 CK_MECHANISM_PTR updateGCMParams(JNIEnv *env, CK_MECHANISM_PTR mechPtr) {
-    CK_GCM_PARAMS* pGcmParams2 = NULL;
-    CK_GCM_PARAMS_NO_IVBITS* pParams = NULL;
-    if ((mechPtr->mechanism == CKM_AES_GCM) &&
-            (mechPtr->pParameter != NULL_PTR) &&
-            (mechPtr->ulParameterLen == sizeof(CK_GCM_PARAMS_NO_IVBITS))) {
-        pGcmParams2 = calloc(1, sizeof(CK_GCM_PARAMS));
-        if (pGcmParams2 == NULL) {
-            p11ThrowOutOfMemoryError(env, 0);
-            return NULL;
+    CK_GCM_PARAMS_PTR pParams;
+    CK_GCM_PARAMS_NO_IVBITS_PTR pParamsNoIvBits;
+    CK_ULONG paramLen;
+
+    if (mechPtr != NULL) {
+        paramLen = mechPtr->ulParameterLen;
+        if (paramLen == sizeof(CK_GCM_PARAMS)) {
+            // CK_GCM_PARAMS => CK_GCM_PARAMS_NO_IVBITS
+            pParams = (CK_GCM_PARAMS*) mechPtr->pParameter;
+            pParamsNoIvBits = calloc(1, sizeof(CK_GCM_PARAMS_NO_IVBITS));
+            pParamsNoIvBits->pIv = pParams->pIv;
+            pParamsNoIvBits->ulIvLen = pParams->ulIvLen;
+            pParamsNoIvBits->pAAD = pParams->pAAD;
+            pParamsNoIvBits->ulAADLen = pParams->ulAADLen;
+            pParamsNoIvBits->ulTagBits = pParams->ulTagBits;
+            mechPtr->pParameter = pParamsNoIvBits;
+            mechPtr->ulParameterLen = sizeof(CK_GCM_PARAMS_NO_IVBITS);
+            free(pParams);
+            TRACE0("DEBUG update CK_GCM_PARAMS to CK_GCM_PARAMS_NO_IVBITS\n");
+            return mechPtr;
+        } else if (paramLen == sizeof(CK_GCM_PARAMS_NO_IVBITS)) {
+            // CK_GCM_PARAMS_NO_IVBITS => CK_GCM_PARAMS
+            pParamsNoIvBits = (CK_GCM_PARAMS_NO_IVBITS*) mechPtr->pParameter;
+            pParams = calloc(1, sizeof(CK_GCM_PARAMS));
+            pParams->pIv = pParamsNoIvBits->pIv;
+            pParams->ulIvLen = pParamsNoIvBits->ulIvLen;
+            pParams->ulIvBits = pParamsNoIvBits->ulIvLen << 3;
+            pParams->pAAD = pParamsNoIvBits->pAAD;
+            pParams->ulAADLen = pParamsNoIvBits->ulAADLen;
+            pParams->ulTagBits = pParamsNoIvBits->ulTagBits;
+            mechPtr->pParameter = pParams;
+            mechPtr->ulParameterLen = sizeof(CK_GCM_PARAMS);
+            free(pParamsNoIvBits);
+            TRACE0("DEBUG update CK_GCM_PARAMS_NO_IVBITS to CK_GCM_PARAMS\n");
+            return mechPtr;
         }
-        pParams = (CK_GCM_PARAMS_NO_IVBITS*) mechPtr->pParameter;
-        pGcmParams2->pIv = pParams->pIv;
-        pGcmParams2->ulIvLen = pParams->ulIvLen;
-        pGcmParams2->ulIvBits = (pGcmParams2->ulIvLen << 3);
-        pGcmParams2->pAAD = pParams->pAAD;
-        pGcmParams2->ulAADLen = pParams->ulAADLen;
-        pGcmParams2->ulTagBits = pParams->ulTagBits;
-        TRACE1("DEBUG updateGCMParams: pMech %p\n", mechPtr);
-        TRACE2("\t=> GCM param w/o ulIvBits %p => GCM param %p\n", pParams,
-                pGcmParams2);
-        free(pParams);
-        mechPtr->pParameter = pGcmParams2;
-        mechPtr->ulParameterLen = sizeof(CK_GCM_PARAMS);
-        return mechPtr;
-    } else {
-        TRACE0("DEBUG updateGCMParams: no conversion done\n");
     }
+    TRACE0("DEBUG updateGCMParams: no conversion done\n");
     return NULL;
 }
 

From 5ded8da676d62158d0011086d7f80ff2c9096e13 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 13 May 2024 16:49:48 +0000
Subject: [PATCH 419/486] 8332085: Remove 10 year old transition check in
 GenerateCurrencyData tool

Reviewed-by: erikj, iris
Backport-of: 4f3b76ff496e7423e5c43ca62cef019e4f4292ec
---
 .../tools/generatecurrencydata/GenerateCurrencyData.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java b/make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
index 9655e08016c..673e9829488 100644
--- a/make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
+++ b/make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -312,9 +312,6 @@ public class GenerateCurrencyData {
             checkCurrencyCode(newCurrency);
             String timeString = currencyInfo.substring(4, length - 4);
             long time = format.parse(timeString).getTime();
-            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
-                throw new RuntimeException("time is more than 10 years from present: " + time);
-            }
             specialCaseCutOverTimes[specialCaseCount] = time;
             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
             specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency);

From 440782e0160f867f08afbec0abf48d557a522c72 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Tue, 14 May 2024 02:12:57 +0000
Subject: [PATCH 420/486] 8331466: Problemlist
 serviceability/dcmd/gc/RunFinalizationTest.java on generic-all

Reviewed-by: sspitsyn, cjplummer
---
 test/hotspot/jtreg/ProblemList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 4b787c1b1ee..a0c1913e52c 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -134,7 +134,7 @@ serviceability/sa/TestRevPtrsForInvokeDynamic.java 8241235 generic-all
 serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java 8225354 windows-all
 serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java 8318090,8318729 generic-all
 serviceability/jvmti/vthread/GetSetLocalTest/GetSetLocalTest.java 8286836 generic-all
-serviceability/dcmd/gc/RunFinalizationTest.java 8227120 linux-all,windows-x64,aix-ppc64
+serviceability/dcmd/gc/RunFinalizationTest.java 8227120 generic-all
 
 serviceability/sa/ClhsdbCDSCore.java 8267433 macosx-x64
 serviceability/sa/ClhsdbFindPC.java#xcomp-core 8267433 macosx-x64

From beea5305b071820e2b128a55c5ca384caf470fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Tue, 14 May 2024 05:01:51 +0000
Subject: [PATCH 421/486] 8331907: BigInteger and BigDecimal should use
 optimized division

Reviewed-by: rgiulietti, bpb
---
 .../share/classes/java/math/BigDecimal.java   |  61 +---------
 .../classes/java/math/MutableBigInteger.java  | 108 +++---------------
 .../openjdk/bench/java/math/BigDecimals.java  |  71 ++++++------
 .../openjdk/bench/java/math/BigIntegers.java  |  35 +++++-
 4 files changed, 89 insertions(+), 186 deletions(-)

diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java
index 207ff9bdf54..d915568a502 100644
--- a/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/src/java.base/share/classes/java/math/BigDecimal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
@@ -5680,18 +5680,8 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
 
         tmp = (dividendHi << shift) | (dividendLo >>> 64 - shift);
         long u2 = tmp & LONG_MASK;
-        long q1, r_tmp;
-        if (v1 == 1) {
-            q1 = tmp;
-            r_tmp = 0;
-        } else if (tmp >= 0) {
-            q1 = tmp / v1;
-            r_tmp = tmp - q1 * v1;
-        } else {
-            long[] rq = divRemNegativeLong(tmp, v1);
-            q1 = rq[1];
-            r_tmp = rq[0];
-        }
+        long q1 = Long.divideUnsigned(tmp, v1);
+        long r_tmp = Long.remainderUnsigned(tmp, v1);
 
         while(q1 >= DIV_NUM_BASE || unsignedLongCompare(q1*v0, make64(r_tmp, u1))) {
             q1--;
@@ -5702,18 +5692,8 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
 
         tmp = mulsub(u2,u1,v1,v0,q1);
         u1 = tmp & LONG_MASK;
-        long q0;
-        if (v1 == 1) {
-            q0 = tmp;
-            r_tmp = 0;
-        } else if (tmp >= 0) {
-            q0 = tmp / v1;
-            r_tmp = tmp - q0 * v1;
-        } else {
-            long[] rq = divRemNegativeLong(tmp, v1);
-            q0 = rq[1];
-            r_tmp = rq[0];
-        }
+        long q0 = Long.divideUnsigned(tmp, v1);
+        r_tmp = Long.remainderUnsigned(tmp, v1);
 
         while(q0 >= DIV_NUM_BASE || unsignedLongCompare(q0*v0,make64(r_tmp,u0))) {
             q0--;
@@ -5793,37 +5773,6 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
         }
     }
 
-    /**
-     * Calculate the quotient and remainder of dividing a negative long by
-     * another long.
-     *
-     * @param n the numerator; must be negative
-     * @param d the denominator; must not be unity
-     * @return a two-element {@code long} array with the remainder and quotient in
-     *         the initial and final elements, respectively
-     */
-    private static long[] divRemNegativeLong(long n, long d) {
-        assert n < 0 : "Non-negative numerator " + n;
-        assert d != 1 : "Unity denominator";
-
-        // Approximate the quotient and remainder
-        long q = (n >>> 1) / (d >>> 1);
-        long r = n - q * d;
-
-        // Correct the approximation
-        while (r < 0) {
-            r += d;
-            q--;
-        }
-        while (r >= d) {
-            r -= d;
-            q++;
-        }
-
-        // n - q*d == r && 0 <= r < d, hence we're done.
-        return new long[] {r, q};
-    }
-
     private static long make64(long hi, long lo) {
         return hi<<32 | lo;
     }
diff --git a/src/java.base/share/classes/java/math/MutableBigInteger.java b/src/java.base/share/classes/java/math/MutableBigInteger.java
index eca42ee25b1..30ea8e130fc 100644
--- a/src/java.base/share/classes/java/math/MutableBigInteger.java
+++ b/src/java.base/share/classes/java/math/MutableBigInteger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -1092,9 +1092,9 @@ class MutableBigInteger {
 
         // Special case of one word dividend
         if (intLen == 1) {
-            long dividendValue = value[offset] & LONG_MASK;
-            int q = (int) (dividendValue / divisorLong);
-            int r = (int) (dividendValue - q * divisorLong);
+            int dividendValue = value[offset];
+            int q = Integer.divideUnsigned(dividendValue, divisor);
+            int r = Integer.remainderUnsigned(dividendValue, divisor);
             quotient.value[0] = q;
             quotient.intLen = (q == 0) ? 0 : 1;
             quotient.offset = 0;
@@ -1106,41 +1106,17 @@ class MutableBigInteger {
         quotient.offset = 0;
         quotient.intLen = intLen;
 
-        // Normalize the divisor
-        int shift = Integer.numberOfLeadingZeros(divisor);
-
-        int rem = value[offset];
-        long remLong = rem & LONG_MASK;
-        if (remLong < divisorLong) {
-            quotient.value[0] = 0;
-        } else {
-            quotient.value[0] = (int)(remLong / divisorLong);
-            rem = (int) (remLong - (quotient.value[0] * divisorLong));
-            remLong = rem & LONG_MASK;
-        }
-        int xlen = intLen;
-        while (--xlen > 0) {
-            long dividendEstimate = (remLong << 32) |
+        long rem = 0;
+        for (int xlen = intLen; xlen > 0; xlen--) {
+            long dividendEstimate = (rem << 32) |
                     (value[offset + intLen - xlen] & LONG_MASK);
-            int q;
-            if (dividendEstimate >= 0) {
-                q = (int) (dividendEstimate / divisorLong);
-                rem = (int) (dividendEstimate - q * divisorLong);
-            } else {
-                long tmp = divWord(dividendEstimate, divisor);
-                q = (int) (tmp & LONG_MASK);
-                rem = (int) (tmp >>> 32);
-            }
+            int q = (int) Long.divideUnsigned(dividendEstimate, divisorLong);
+            rem = Long.remainderUnsigned(dividendEstimate, divisorLong);
             quotient.value[intLen - xlen] = q;
-            remLong = rem & LONG_MASK;
         }
 
         quotient.normalize();
-        // Unnormalize
-        if (shift > 0)
-            return rem % divisor;
-        else
-            return rem;
+        return (int)rem;
     }
 
     /**
@@ -1557,14 +1533,8 @@ class MutableBigInteger {
                 skipCorrection = qrem + 0x80000000 < nh2;
             } else {
                 long nChunk = (((long)nh) << 32) | (nm & LONG_MASK);
-                if (nChunk >= 0) {
-                    qhat = (int) (nChunk / dhLong);
-                    qrem = (int) (nChunk - (qhat * dhLong));
-                } else {
-                    long tmp = divWord(nChunk, dh);
-                    qhat = (int) (tmp & LONG_MASK);
-                    qrem = (int) (tmp >>> 32);
-                }
+                qhat = (int) Long.divideUnsigned(nChunk, dhLong);
+                qrem = (int) Long.remainderUnsigned(nChunk, dhLong);
             }
 
             if (qhat == 0)
@@ -1616,14 +1586,8 @@ class MutableBigInteger {
             skipCorrection = qrem + 0x80000000 < nh2;
         } else {
             long nChunk = (((long) nh) << 32) | (nm & LONG_MASK);
-            if (nChunk >= 0) {
-                qhat = (int) (nChunk / dhLong);
-                qrem = (int) (nChunk - (qhat * dhLong));
-            } else {
-                long tmp = divWord(nChunk, dh);
-                qhat = (int) (tmp & LONG_MASK);
-                qrem = (int) (tmp >>> 32);
-            }
+            qhat = (int) Long.divideUnsigned(nChunk, dhLong);
+            qrem = (int) Long.remainderUnsigned(nChunk, dhLong);
         }
         if (qhat != 0) {
             if (!skipCorrection) { // Correct qhat
@@ -1732,14 +1696,8 @@ class MutableBigInteger {
                 skipCorrection = qrem + 0x80000000 < nh2;
             } else {
                 long nChunk = (((long) nh) << 32) | (nm & LONG_MASK);
-                if (nChunk >= 0) {
-                    qhat = (int) (nChunk / dhLong);
-                    qrem = (int) (nChunk - (qhat * dhLong));
-                } else {
-                    long tmp = divWord(nChunk, dh);
-                    qhat =(int)(tmp & LONG_MASK);
-                    qrem = (int)(tmp>>>32);
-                }
+                qhat = (int) Long.divideUnsigned(nChunk, dhLong);
+                qrem = (int) Long.remainderUnsigned(nChunk, dhLong);
             }
 
             if (qhat == 0)
@@ -1834,40 +1792,6 @@ class MutableBigInteger {
         return (one+Long.MIN_VALUE) > (two+Long.MIN_VALUE);
     }
 
-    /**
-     * This method divides a long quantity by an int to estimate
-     * qhat for two multi precision numbers. It is used when
-     * the signed value of n is less than zero.
-     * Returns long value where high 32 bits contain remainder value and
-     * low 32 bits contain quotient value.
-     */
-    static long divWord(long n, int d) {
-        long dLong = d & LONG_MASK;
-        long r;
-        long q;
-        if (dLong == 1) {
-            q = (int)n;
-            r = 0;
-            return (r << 32) | (q & LONG_MASK);
-        }
-
-        // Approximate the quotient and remainder
-        q = (n >>> 1) / (dLong >>> 1);
-        r = n - q*dLong;
-
-        // Correct the approximation
-        while (r < 0) {
-            r += dLong;
-            q--;
-        }
-        while (r >= dLong) {
-            r -= dLong;
-            q++;
-        }
-        // n - q*dlong == r && 0 <= r <dLong, hence we're done.
-        return (r << 32) | (q & LONG_MASK);
-    }
-
     /**
      * Calculate the integer square root {@code floor(sqrt(this))} where
      * {@code sqrt(.)} denotes the mathematical square root. The contents of
diff --git a/test/micro/org/openjdk/bench/java/math/BigDecimals.java b/test/micro/org/openjdk/bench/java/math/BigDecimals.java
index abb5d1aa940..3c443db013f 100644
--- a/test/micro/org/openjdk/bench/java/math/BigDecimals.java
+++ b/test/micro/org/openjdk/bench/java/math/BigDecimals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,15 +133,6 @@ public class BigDecimals {
         }
     }
 
-    /** Invokes the toString method of BigDecimal with various different values. */
-    @Benchmark
-    @OperationsPerInvocation(TEST_SIZE)
-    public void testToString(Blackhole bh) {
-        for (BigDecimal s : bigDecimals) {
-            bh.consume(s.toString());
-        }
-    }
-
     /**
      * Invokes the setScale method of BigDecimal with various different values.
      */
@@ -194,6 +185,39 @@ public class BigDecimals {
         bh.consume(tmp);
     }
 
+    /** Test divide with huge/small numbers */
+    @Benchmark
+    @OperationsPerInvocation(TEST_SIZE * TEST_SIZE)
+    public void testHugeSmallDivide(Blackhole bh) {
+        for (BigDecimal s : hugeArray) {
+            for (BigDecimal t : smallArray) {
+                bh.consume(s.divide(t, RoundingMode.DOWN));
+            }
+        }
+    }
+
+    /** Test divide with large/small numbers */
+    @Benchmark
+    @OperationsPerInvocation(TEST_SIZE * TEST_SIZE)
+    public void testLargeSmallDivide(Blackhole bh) {
+        for (BigDecimal s : largeArray) {
+            for (BigDecimal t : smallArray) {
+                bh.consume(s.divide(t, RoundingMode.DOWN));
+            }
+        }
+    }
+
+    /** Test divide with huge/large numbers */
+    @Benchmark
+    @OperationsPerInvocation(TEST_SIZE * TEST_SIZE)
+    public void testHugeLargeDivide(Blackhole bh) {
+        for (BigDecimal s : hugeArray) {
+            for (BigDecimal t : largeArray) {
+                bh.consume(s.divide(t, RoundingMode.DOWN));
+            }
+        }
+    }
+
     /** Invokes the compareTo method of BigDecimal with various different values. */
     @Benchmark
     @OperationsPerInvocation(TEST_SIZE - 1)
@@ -203,31 +227,4 @@ public class BigDecimals {
             bh.consume(c.compareTo(s));
         }
     }
-
-    /** Test BigDecimal.toString() with huge numbers larger than MAX_LONG */
-    @Benchmark
-    @OperationsPerInvocation(TEST_SIZE)
-    public void testHugeToString(Blackhole bh) {
-        for (BigDecimal s : hugeArray) {
-            bh.consume(s.toString());
-        }
-    }
-
-    /** Test BigDecimal.toString() with large numbers less than MAX_LONG but larger than MAX_INT */
-    @Benchmark
-    @OperationsPerInvocation(TEST_SIZE)
-    public void testLargeToString(Blackhole bh) {
-        for (BigDecimal s : largeArray) {
-            bh.consume(s.toString());
-        }
-    }
-
-    /** Test BigDecimal.toString() with small numbers less than MAX_INT */
-    @Benchmark
-    @OperationsPerInvocation(TEST_SIZE)
-    public void testSmallToString(Blackhole bh) {
-        for (BigDecimal s : smallArray) {
-            bh.consume(s.toString());
-        }
-    }
 }
diff --git a/test/micro/org/openjdk/bench/java/math/BigIntegers.java b/test/micro/org/openjdk/bench/java/math/BigIntegers.java
index f74e69579b4..e0fa90cfe8f 100644
--- a/test/micro/org/openjdk/bench/java/math/BigIntegers.java
+++ b/test/micro/org/openjdk/bench/java/math/BigIntegers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -132,6 +132,39 @@ public class BigIntegers {
         bh.consume(tmp);
     }
 
+    /** Test divide with huge/small numbers */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE * TESTSIZE)
+    public void testHugeSmallDivide(Blackhole bh) {
+        for (BigInteger s : hugeArray) {
+            for (BigInteger t : smallArray) {
+                bh.consume(s.divide(t));
+            }
+        }
+    }
+
+    /** Test divide with large/small numbers */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE * TESTSIZE)
+    public void testLargeSmallDivide(Blackhole bh) {
+        for (BigInteger s : largeArray) {
+            for (BigInteger t : smallArray) {
+                bh.consume(s.divide(t));
+            }
+        }
+    }
+
+    /** Test divide with huge/large numbers */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE * TESTSIZE)
+    public void testHugeLargeDivide(Blackhole bh) {
+        for (BigInteger s : hugeArray) {
+            for (BigInteger t : largeArray) {
+                bh.consume(s.divide(t));
+            }
+        }
+    }
+
     /** Invokes the multiply method of BigInteger with various different values. */
     @Benchmark
     @OperationsPerInvocation(TESTSIZE)

From ea5eb74a65f20ce28fa0a94ea851915d4a6f83da Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Tue, 14 May 2024 06:41:58 +0000
Subject: [PATCH 422/486] 8326404: Assertion error when trying to compile
 switch with fallthrough with pattern

Co-authored-by: Jan Lahoda <jlahoda@openjdk.org>
Reviewed-by: vromero
---
 .../sun/tools/javac/comp/TransPatterns.java   |  18 +-
 .../tools/javac/patterns/T8326404.java        | 157 ++++++++++++++++++
 2 files changed, 169 insertions(+), 6 deletions(-)
 create mode 100644 test/langtools/tools/javac/patterns/T8326404.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
index 5dc85d5f2c5..aed7b3265f8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
@@ -458,7 +458,9 @@ public class TransPatterns extends TreeTranslator {
                 newCases.add(c.head);
                 appendBreakIfNeeded(tree, cases, c.head);
             }
-            cases = processCases(tree, newCases.toList());
+            cases = newCases.toList();
+            patchCompletingNormallyCases(cases);
+            cases = processCases(tree, cases);
             ListBuffer<JCStatement> statements = new ListBuffer<>();
             VarSymbol temp = new VarSymbol(Flags.SYNTHETIC,
                     names.fromString("selector" + variableIndex++ + target.syntheticNameChar() + "temp"),
@@ -523,8 +525,6 @@ public class TransPatterns extends TreeTranslator {
             boolean previousCompletesNormally = false;
             boolean hasDefault = false;
 
-            patchCompletingNormallyCases(cases);
-
             for (var c : cases) {
                 List<JCCaseLabel> clearedPatterns = c.labels;
                 boolean hasJoinedNull =
@@ -685,7 +685,7 @@ public class TransPatterns extends TreeTranslator {
             if (currentCase.caseKind == CaseKind.STATEMENT &&
                 currentCase.completesNormally &&
                 cases.tail.nonEmpty() &&
-                cases.tail.head.guard != null) {
+                (cases.tail.head.guard != null || cases.tail.head.labels.stream().anyMatch(cl -> cl instanceof JCPatternCaseLabel p && p.syntheticGuard != null))) {
                 ListBuffer<JCStatement> newStatements = new ListBuffer<>();
                 List<JCCase> copyFrom = cases;
 
@@ -700,6 +700,7 @@ public class TransPatterns extends TreeTranslator {
                 };
 
                 currentCase.stats = newStatements.toList();
+                currentCase.completesNormally = false;
             }
 
             cases = cases.tail;
@@ -948,10 +949,12 @@ public class TransPatterns extends TreeTranslator {
         JCExpression commonNestedExpression = null;
         VarSymbol commonNestedBinding = null;
         boolean previousNullable = false;
+        boolean previousCompletesNormally = false;
 
         for (List<JCCase> c = inputCases; c.nonEmpty(); c = c.tail) {
             VarSymbol currentBinding = null;
             boolean currentNullable = false;
+            boolean currentCompletesNormally = c.head.completesNormally;
             JCExpression currentNestedExpression = null;
             VarSymbol currentNestedBinding = null;
 
@@ -986,6 +989,8 @@ public class TransPatterns extends TreeTranslator {
                        commonBinding.isUnnamedVariable() == currentBinding.isUnnamedVariable() &&
                        !previousNullable &&
                        !currentNullable &&
+                       !previousCompletesNormally &&
+                       !currentCompletesNormally &&
                        new TreeDiffer(List.of(commonBinding), List.of(currentBinding))
                                .scan(commonNestedExpression, currentNestedExpression)) {
                 accummulator.add(c.head);
@@ -1001,6 +1006,7 @@ public class TransPatterns extends TreeTranslator {
                 commonNestedBinding = currentNestedBinding;
             }
             previousNullable = currentNullable;
+            previousCompletesNormally = currentCompletesNormally;
         }
         resolveAccummulator.resolve(commonBinding, commonNestedExpression, commonNestedBinding);
         return result.toList();
@@ -1473,8 +1479,8 @@ public class TransPatterns extends TreeTranslator {
             ListBuffer<JCStatement> stats = new ListBuffer<>();
             for (Entry<BindingSymbol, VarSymbol> e : hoistedVarMap.entrySet()) {
                 JCVariableDecl decl = makeHoistedVarDecl(diagPos, e.getValue());
-                if (!e.getKey().isPreserved() ||
-                    !parent.tryPrepend(e.getKey(), decl)) {
+                if (!e.getValue().isUnnamedVariable() &&
+                        (!e.getKey().isPreserved() || !parent.tryPrepend(e.getKey(), decl))) {
                     stats.add(decl);
                 }
             }
diff --git a/test/langtools/tools/javac/patterns/T8326404.java b/test/langtools/tools/javac/patterns/T8326404.java
new file mode 100644
index 00000000000..aafaf97a5e1
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/T8326404.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2024, 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 8326404
+ * @summary Assertion error when trying to compile switch with fallthrough with pattern
+ * @compile T8326404.java
+ * @run main T8326404
+ */
+public class T8326404 {
+    private static final record R<T>(T a) {}
+
+    public static void main(String[] args) {
+        assertEquals(4, run1(""));
+        assertEquals(3, run1(new R("")));
+        assertEquals(2, run1(new R(42)));
+
+        assertEquals(2, run1_break1(""));
+        assertEquals(1, run1_break1(new R("")));
+        assertEquals(2, run1_break1(new R(42)));
+
+        assertEquals(3, run2(""));
+        assertEquals(4, run2(new R("")));
+        assertEquals(2, run2(new R(42)));
+
+        assertEquals(1, run2_break1(""));
+        assertEquals(2, run2_break1(new R("")));
+        assertEquals(2, run2_break1(new R(42)));
+
+        assertEquals(2, run3(""));
+        assertEquals(4, run3(new R("")));
+        assertEquals(3, run3(new R(42)));
+
+        assertEquals(2, run3_break1(""));
+        assertEquals(2, run3_break1(new R("")));
+        assertEquals(1, run3_break1(new R(42)));
+    }
+
+    private static int run1(Object o) {
+        int i = 0;
+        switch (o) {
+            case String _:
+                i++;
+            case R(String _):
+                i++;
+            case R(Integer _):
+                i++;
+            default:
+                i++;
+        }
+        return i;
+    }
+
+    private static int run1_break1(Object o) {
+        int i = 0;
+        switch (o) {
+            case String s:
+                i++;
+            case R(String _):
+                i++;
+                break;
+            case R(Integer _):
+                i++;
+            default:
+                i++;
+        }
+        return i;
+    }
+
+    private static int run2(Object o) {
+        int i = 0;
+        switch (o) {
+            case R(String _):
+                i++;
+            case String _:
+                i++;
+            case R(Integer _):
+                i++;
+            default:
+                i++;
+        }
+        return i;
+    }
+
+    private static int run2_break1(Object o) {
+        int i = 0;
+        switch (o) {
+            case R(String _):
+                i++;
+            case String _:
+                i++;
+                break;
+            case R(Integer _):
+                i++;
+            default:
+                i++;
+        }
+        return i;
+    }
+
+    private static int run3(Object o) {
+        int i = 0;
+        switch (o) {
+            case R(String _):
+                i++;
+            case R(Integer _):
+                i++;
+            case String _:
+                i++;
+            default:
+                i++;
+        }
+        return i;
+    }
+
+    private static int run3_break1(Object o) {
+        int i = 0;
+        switch (o) {
+            case R(String _):
+                i++;
+            case R(Integer _):
+                i++;
+                break;
+            case String _:
+                i++;
+            default:
+                i++;
+        }
+        return i;
+    }
+
+    static void assertEquals(int expected, int actual) {
+        if (expected != actual) {
+            throw new AssertionError("Expected: " + expected + ", but got: " + actual);
+        }
+    }
+}
\ No newline at end of file

From 7ce4a13c0a891e606480e138f4025ffa328a18b3 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 14 May 2024 11:26:57 +0000
Subject: [PATCH 423/486] 8332130: RISC-V: remove wrong instructions of Vector
 Crypto Extension

Reviewed-by: luhenry, fyang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 2db57083ce5..ff55951bd7d 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1869,15 +1869,10 @@ enum Nf {
 
   // Vector Bit-manipulation used in Cryptography (Zvkb) Extension
   INSN(vandn_vv,   0b1010111, 0b000, 0b000001);
-  INSN(vandn_vx,   0b1010111, 0b100, 0b000001);
   INSN(vclmul_vv,  0b1010111, 0b010, 0b001100);
-  INSN(vclmul_vx,  0b1010111, 0b110, 0b001100);
   INSN(vclmulh_vv, 0b1010111, 0b010, 0b001101);
-  INSN(vclmulh_vx, 0b1010111, 0b110, 0b001101);
   INSN(vror_vv,    0b1010111, 0b000, 0b010100);
-  INSN(vror_vx,    0b1010111, 0b100, 0b010100);
   INSN(vrol_vv,    0b1010111, 0b000, 0b010101);
-  INSN(vrol_vx,    0b1010111, 0b100, 0b010101);
 
 #undef INSN
 

From 4ba74475d44831c1fe49359458163cd1567e9619 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Tue, 14 May 2024 13:11:28 +0000
Subject: [PATCH 424/486] 8326957: Implement JEP 474: ZGC: Generational Mode by
 Default

Reviewed-by: stefank, eosterlund
---
 src/hotspot/share/gc/shared/gc_globals.hpp    |  2 +-
 src/hotspot/share/gc/x/xArguments.cpp         |  2 +
 src/hotspot/share/gc/x/xInitialize.cpp        |  2 +-
 src/hotspot/share/runtime/arguments.cpp       |  1 +
 test/hotspot/jtreg/gc/x/TestDeprecated.java   | 50 ++++++++++++++++++
 test/hotspot/jtreg/gc/z/TestDefault.java      | 51 +++++++++++++++++++
 .../CommandLine/VMDeprecatedOptions.java      |  1 +
 7 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/gc/x/TestDeprecated.java
 create mode 100644 test/hotspot/jtreg/gc/z/TestDefault.java

diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index 42d9e028b5e..1440f788e18 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -118,7 +118,7 @@
   product(bool, UseZGC, false,                                              \
           "Use the Z garbage collector")                                    \
                                                                             \
-  product(bool, ZGenerational, false,                                       \
+  product(bool, ZGenerational, true,                                        \
           "Use the generational version of ZGC")                            \
                                                                             \
   product(bool, UseShenandoahGC, false,                                     \
diff --git a/src/hotspot/share/gc/x/xArguments.cpp b/src/hotspot/share/gc/x/xArguments.cpp
index 60e78d2c756..13cb302d14a 100644
--- a/src/hotspot/share/gc/x/xArguments.cpp
+++ b/src/hotspot/share/gc/x/xArguments.cpp
@@ -42,6 +42,8 @@ void XArguments::initialize_heap_flags_and_sizes() {
 }
 
 void XArguments::initialize() {
+  warning("Non-generational ZGC is deprecated.");
+
   // Check mark stack size
   const size_t mark_stack_space_limit = XAddressSpaceLimit::mark_stack();
   if (ZMarkStackSpaceLimit > mark_stack_space_limit) {
diff --git a/src/hotspot/share/gc/x/xInitialize.cpp b/src/hotspot/share/gc/x/xInitialize.cpp
index 01b79f3ffd7..156be17971f 100644
--- a/src/hotspot/share/gc/x/xInitialize.cpp
+++ b/src/hotspot/share/gc/x/xInitialize.cpp
@@ -41,7 +41,7 @@ XInitialize::XInitialize(XBarrierSet* barrier_set) {
   log_info(gc, init)("Version: %s (%s)",
                      VM_Version::vm_release(),
                      VM_Version::jdk_debug_level());
-  log_info(gc, init)("Using legacy single-generation mode");
+  log_info(gc, init)("Using deprecated non-generational mode");
 
   // Early initialization
   XAddress::initialize();
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index ee8c7b24541..7a74ef6e248 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -496,6 +496,7 @@ static SpecialFlag const special_jvm_flags[] = {
   // --- Non-alias flags - sorted by obsolete_in then expired_in:
   { "AllowRedefinitionToAddDeleteMethods", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() },
   { "FlightRecorder",               JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() },
+  { "ZGenerational",                JDK_Version::jdk(23), JDK_Version::undefined(), JDK_Version::undefined() },
   { "DumpSharedSpaces",             JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "DynamicDumpSharedSpaces",      JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "RequireSharedSpaces",          JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
diff --git a/test/hotspot/jtreg/gc/x/TestDeprecated.java b/test/hotspot/jtreg/gc/x/TestDeprecated.java
new file mode 100644
index 00000000000..39b0318d52b
--- /dev/null
+++ b/test/hotspot/jtreg/gc/x/TestDeprecated.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package gc.x;
+
+/*
+ * @test TestDeprecated
+ * @requires vm.gc.ZSinglegen
+ * @summary Test ZGenerational Deprecated
+ * @library /test/lib
+ * @run driver gc.x.TestDeprecated
+ */
+
+import java.util.LinkedList;
+import jdk.test.lib.process.ProcessTools;
+
+public class TestDeprecated {
+    static class Test {
+        public static void main(String[] args) throws Exception {}
+    }
+    public static void main(String[] args) throws Exception {
+        ProcessTools.executeLimitedTestJava("-XX:+UseZGC",
+                                            "-XX:-ZGenerational",
+                                            "-Xlog:gc+init",
+                                            Test.class.getName())
+                    .shouldContain("Option ZGenerational was deprecated")
+                    .shouldContain("Using deprecated non-generational mode")
+                    .shouldHaveExitValue(0);
+    }
+}
diff --git a/test/hotspot/jtreg/gc/z/TestDefault.java b/test/hotspot/jtreg/gc/z/TestDefault.java
new file mode 100644
index 00000000000..1f1b7d49408
--- /dev/null
+++ b/test/hotspot/jtreg/gc/z/TestDefault.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package gc.z;
+
+/*
+ * @test TestDefault
+ * @requires vm.gc.ZGenerational
+ * @summary Test that ZGC Generational Mode is Default
+ * @library /test/lib
+ * @run driver gc.z.TestDefault
+ */
+
+import java.util.LinkedList;
+import jdk.test.lib.process.ProcessTools;
+
+public class TestDefault {
+    static class Test {
+        public static void main(String[] args) throws Exception {}
+    }
+    public static void main(String[] args) throws Exception {
+        ProcessTools.executeLimitedTestJava("-XX:+UseZGC",
+                                            "-Xlog:gc+init",
+                                            Test.class.getName())
+                    .shouldNotContain("Option ZGenerational was deprecated")
+                    .shouldNotContain("Using deprecated non-generational mode")
+                    .shouldContain("GC Workers for Old Generation")
+                    .shouldContain("GC Workers for Young Generation")
+                    .shouldHaveExitValue(0);
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
index fa4ff56b691..584a9eae18f 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
@@ -61,6 +61,7 @@ public class VMDeprecatedOptions {
             {"PreserveAllAnnotations", "true"},
             {"AllowRedefinitionToAddDeleteMethods", "true"},
             {"UseEmptySlotsInSupers", "true"},
+            {"ZGenerational", "false"},
 
             // deprecated alias flags (see also aliased_jvm_flags):
             {"CreateMinidumpOnCrash", "false"}

From 5a4415a6bddb25cbd5b87ff8ad1a06179c2e452e Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Tue, 14 May 2024 14:04:28 +0000
Subject: [PATCH 425/486] 8331858: [nmt] VM.native_memory statistics should
 work in summary mode

Reviewed-by: stuefe, jsjolen
---
 src/hotspot/share/nmt/memTracker.cpp          | 19 ++++---
 src/hotspot/share/nmt/nmtDCmd.cpp             |  6 +-
 .../runtime/NMT/JcmdSummaryStatistics.java    | 57 +++++++++++++++++++
 3 files changed, 73 insertions(+), 9 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/NMT/JcmdSummaryStatistics.java

diff --git a/src/hotspot/share/nmt/memTracker.cpp b/src/hotspot/share/nmt/memTracker.cpp
index a63e754b9f5..5504f436b7d 100644
--- a/src/hotspot/share/nmt/memTracker.cpp
+++ b/src/hotspot/share/nmt/memTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -146,12 +146,17 @@ void MemTracker::report(bool summary_only, outputStream* output, size_t scale) {
 void MemTracker::tuning_statistics(outputStream* out) {
   // NMT statistics
   out->print_cr("Native Memory Tracking Statistics:");
-  out->print_cr("State: %s", NMTUtil::tracking_level_to_string(_tracking_level));
-  out->print_cr("Malloc allocation site table size: %d", MallocSiteTable::hash_buckets());
-  out->print_cr("             Tracking stack depth: %d", NMT_TrackingStackDepth);
-  out->cr();
-  MallocSiteTable::print_tuning_statistics(out);
-  out->cr();
+  out->print_cr("State: %s",
+                NMTUtil::tracking_level_to_string(_tracking_level));
+  if (_tracking_level == NMT_detail) {
+    out->print_cr("Malloc allocation site table size: %d",
+                  MallocSiteTable::hash_buckets());
+    out->print_cr("             Tracking stack depth: %d",
+                  NMT_TrackingStackDepth);
+    out->cr();
+    MallocSiteTable::print_tuning_statistics(out);
+    out->cr();
+  }
   out->print_cr("Preinit state:");
   NMTPreInit::print_state(out);
   MallocLimitHandler::print_on(out);
diff --git a/src/hotspot/share/nmt/nmtDCmd.cpp b/src/hotspot/share/nmt/nmtDCmd.cpp
index 80b2ed6141a..cb42212ba6b 100644
--- a/src/hotspot/share/nmt/nmtDCmd.cpp
+++ b/src/hotspot/share/nmt/nmtDCmd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -137,8 +137,10 @@ void NMTDCmd::execute(DCmdSource source, TRAPS) {
       output()->print_cr("No detail baseline for comparison");
     }
   } else if (_statistics.value()) {
-    if (check_detail_tracking_level(output())) {
+    if (MemTracker::enabled()) {
       MemTracker::tuning_statistics(output());
+    } else {
+      output()->print_cr("Native memory tracking is not enabled");
     }
   } else {
     ShouldNotReachHere();
diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdSummaryStatistics.java b/test/hotspot/jtreg/runtime/NMT/JcmdSummaryStatistics.java
new file mode 100644
index 00000000000..58081dfe0ba
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/NMT/JcmdSummaryStatistics.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Red Hat Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test the NMT scale parameter
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run main/othervm -XX:NativeMemoryTracking=summary JcmdSummaryStatistics
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
+
+public class JcmdSummaryStatistics {
+
+    public static void main(String[] args) throws Exception {
+        ProcessBuilder pb = new ProcessBuilder();
+        OutputAnalyzer output;
+        // Grab my own PID
+        String pid = Long.toString(jdk.test.lib.process.ProcessTools.getProcessId());
+
+        // Run 'jcmd <pid> VM.native_memory statistics=true'
+        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "statistics=true"});
+        output = new OutputAnalyzer(pb.start());
+
+        output.shouldContainMultiLinePattern(
+                "Native Memory Tracking Statistics:",
+                "State: summary",
+                "Preinit state:",
+                "entries:",
+                "pre-init mallocs:",
+                "MallocLimit:");
+    }
+}

From 95a601316de06b4b0fbf6e3c7777be5d2a1ca978 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Tue, 14 May 2024 14:58:51 +0000
Subject: [PATCH 426/486] 8332042: Move MEMFLAGS to its own include file

Reviewed-by: jsjolen, stefank
---
 src/hotspot/share/gc/g1/g1MonotonicArena.hpp  |  4 +-
 src/hotspot/share/gc/shared/oopStorageSet.hpp |  4 +-
 .../stringdedup/stringDedupProcessor.cpp      |  4 +-
 .../gc/shenandoah/shenandoahTaskqueue.hpp     |  4 +-
 src/hotspot/share/gc/z/zNMT.cpp               |  4 +-
 .../jfr/leakprofiler/chains/jfrbitset.hpp     |  4 +-
 .../jfr/periodic/jfrNativeMemoryEvent.hpp     |  4 +-
 src/hotspot/share/memory/allocation.hpp       | 60 +-------------
 src/hotspot/share/memory/guardedMemory.cpp    |  5 +-
 src/hotspot/share/memory/padded.hpp           |  4 +-
 src/hotspot/share/nmt/allocationSite.hpp      |  4 +-
 src/hotspot/share/nmt/mallocHeader.cpp        |  6 ++
 src/hotspot/share/nmt/mallocHeader.hpp        |  4 +-
 src/hotspot/share/nmt/mallocTracker.hpp       |  4 +-
 src/hotspot/share/nmt/memFlagBitmap.hpp       |  6 +-
 src/hotspot/share/nmt/memMapPrinter.cpp       |  2 +-
 src/hotspot/share/nmt/memMapPrinter.hpp       |  6 +-
 src/hotspot/share/nmt/memReporter.cpp         |  4 +-
 src/hotspot/share/nmt/memflags.hpp            | 82 +++++++++++++++++++
 src/hotspot/share/nmt/nmtCommon.hpp           |  5 +-
 src/hotspot/share/prims/jvmtiAgentList.hpp    |  2 +-
 src/hotspot/share/services/mallocLimit.cpp    |  5 +-
 src/hotspot/share/services/mallocLimit.hpp    |  4 +-
 src/hotspot/share/services/threadService.cpp  |  4 +-
 src/hotspot/share/utilities/bitMap.hpp        |  2 +-
 25 files changed, 135 insertions(+), 102 deletions(-)
 create mode 100644 src/hotspot/share/nmt/memflags.hpp

diff --git a/src/hotspot/share/gc/g1/g1MonotonicArena.hpp b/src/hotspot/share/gc/g1/g1MonotonicArena.hpp
index 586766a8c8f..bf46e4a3351 100644
--- a/src/hotspot/share/gc/g1/g1MonotonicArena.hpp
+++ b/src/hotspot/share/gc/g1/g1MonotonicArena.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,7 +27,7 @@
 #define SHARE_GC_G1_G1MONOTONICARENA_HPP
 
 #include "gc/shared/freeListAllocator.hpp"
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/lockFreeStack.hpp"
 
diff --git a/src/hotspot/share/gc/shared/oopStorageSet.hpp b/src/hotspot/share/gc/shared/oopStorageSet.hpp
index 89cdde4b969..26e0e9f5a77 100644
--- a/src/hotspot/share/gc/shared/oopStorageSet.hpp
+++ b/src/hotspot/share/gc/shared/oopStorageSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #ifndef SHARE_GC_SHARED_OOPSTORAGESET_HPP
 #define SHARE_GC_SHARED_OOPSTORAGESET_HPP
 
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/enumIterator.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp
index 23311a2868d..aab2f5d3123 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,8 @@
 #include "gc/shared/stringdedup/stringDedupStorageUse.hpp"
 #include "gc/shared/stringdedup/stringDedupTable.hpp"
 #include "logging/log.hpp"
-#include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
+#include "nmt/memflags.hpp"
 #include "oops/access.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/cpuTimeCounters.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
index 90b51160e7a..50f18a8c73f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -28,7 +28,7 @@
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/taskqueue.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/mutex.hpp"
diff --git a/src/hotspot/share/gc/z/zNMT.cpp b/src/hotspot/share/gc/z/zNMT.cpp
index 9a54c0f5963..7d1719aa6f0 100644
--- a/src/hotspot/share/gc/z/zNMT.cpp
+++ b/src/hotspot/share/gc/z/zNMT.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zNMT.hpp"
 #include "gc/z/zVirtualMemory.hpp"
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "nmt/memTracker.hpp"
 #include "utilities/nativeCallStack.hpp"
 
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/jfrbitset.hpp b/src/hotspot/share/jfr/leakprofiler/chains/jfrbitset.hpp
index d786a87e3b8..8f1d2b4d5b1 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/jfrbitset.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/jfrbitset.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #ifndef SHARE_JFR_LEAKPROFILER_JFRBITSET_HPP
 #define SHARE_JFR_LEAKPROFILER_JFRBITSET_HPP
 
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/objectBitSet.inline.hpp"
 
 typedef ObjectBitSet<mtTracing> JFRBitSet;
diff --git a/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.hpp b/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.hpp
index 710198efddd..c5a476c78a8 100644
--- a/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.hpp
+++ b/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #ifndef SHARE_JFR_PERIODIC_JFRNATIVEMEMORYEVENT_HPP
 #define SHARE_JFR_PERIODIC_JFRNATIVEMEMORYEVENT_HPP
 
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "nmt/nmtUsage.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ticks.hpp"
diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp
index 50bb2e0c68b..495ca66d867 100644
--- a/src/hotspot/share/memory/allocation.hpp
+++ b/src/hotspot/share/memory/allocation.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #define SHARE_MEMORY_ALLOCATION_HPP
 
 #include "memory/allStatic.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -99,63 +100,6 @@ typedef AllocFailStrategy::AllocFailEnum AllocFailType;
 // void FreeHeap(void* p);
 //
 
-#define MEMORY_TYPES_DO(f)                                                           \
-  /* Memory type by sub systems. It occupies lower byte. */                          \
-  f(mtJavaHeap,       "Java Heap")   /* Java heap                                 */ \
-  f(mtClass,          "Class")       /* Java classes                              */ \
-  f(mtThread,         "Thread")      /* thread objects                            */ \
-  f(mtThreadStack,    "Thread Stack")                                                \
-  f(mtCode,           "Code")        /* generated code                            */ \
-  f(mtGC,             "GC")                                                          \
-  f(mtGCCardSet,      "GCCardSet")   /* G1 card set remembered set                */ \
-  f(mtCompiler,       "Compiler")                                                    \
-  f(mtJVMCI,          "JVMCI")                                                       \
-  f(mtInternal,       "Internal")    /* memory used by VM, but does not belong to */ \
-                                     /* any of above categories, and not used by  */ \
-                                     /* NMT                                       */ \
-  f(mtOther,          "Other")       /* memory not used by VM                     */ \
-  f(mtSymbol,         "Symbol")                                                      \
-  f(mtNMT,            "Native Memory Tracking")  /* memory used by NMT            */ \
-  f(mtClassShared,    "Shared class space")      /* class data sharing            */ \
-  f(mtChunk,          "Arena Chunk") /* chunk that holds content of arenas        */ \
-  f(mtTest,           "Test")        /* Test type for verifying NMT               */ \
-  f(mtTracing,        "Tracing")                                                     \
-  f(mtLogging,        "Logging")                                                     \
-  f(mtStatistics,     "Statistics")                                                  \
-  f(mtArguments,      "Arguments")                                                   \
-  f(mtModule,         "Module")                                                      \
-  f(mtSafepoint,      "Safepoint")                                                   \
-  f(mtSynchronizer,   "Synchronization")                                             \
-  f(mtServiceability, "Serviceability")                                              \
-  f(mtMetaspace,      "Metaspace")                                                   \
-  f(mtStringDedup,    "String Deduplication")                                        \
-  f(mtObjectMonitor,  "Object Monitors")                                             \
-  f(mtNone,           "Unknown")                                                     \
-  //end
-
-#define MEMORY_TYPE_DECLARE_ENUM(type, human_readable) \
-  type,
-
-/*
- * Memory types
- */
-enum class MEMFLAGS : uint8_t  {
-  MEMORY_TYPES_DO(MEMORY_TYPE_DECLARE_ENUM)
-  mt_number_of_types   // number of memory types (mtDontTrack
-                       // is not included as validate type)
-};
-// Extra insurance that MEMFLAGS truly has the same size as uint8_t.
-STATIC_ASSERT(sizeof(MEMFLAGS) == sizeof(uint8_t));
-
-#define MEMORY_TYPE_SHORTNAME(type, human_readable) \
-  constexpr MEMFLAGS type = MEMFLAGS::type;
-
-// Generate short aliases for the enum values. E.g. mtGC instead of MEMFLAGS::mtGC.
-MEMORY_TYPES_DO(MEMORY_TYPE_SHORTNAME)
-
-// Make an int version of the sentinel end value.
-constexpr int mt_number_of_types = static_cast<int>(MEMFLAGS::mt_number_of_types);
-
 extern bool NMT_track_callsite;
 
 class NativeCallStack;
diff --git a/src/hotspot/share/memory/guardedMemory.cpp b/src/hotspot/share/memory/guardedMemory.cpp
index 25a50f8ffb3..91adb016c65 100644
--- a/src/hotspot/share/memory/guardedMemory.cpp
+++ b/src/hotspot/share/memory/guardedMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,8 @@
  *
  */
 #include "precompiled.hpp"
-#include "memory/allocation.hpp"
-#include "memory/allocation.inline.hpp"
 #include "memory/guardedMemory.hpp"
+#include "nmt/memflags.hpp"
 #include "runtime/os.hpp"
 
 void* GuardedMemory::wrap_copy(const void* ptr, const size_t len, const void* tag) {
diff --git a/src/hotspot/share/memory/padded.hpp b/src/hotspot/share/memory/padded.hpp
index 0597dbd9f3c..bca1d168cb5 100644
--- a/src/hotspot/share/memory/padded.hpp
+++ b/src/hotspot/share/memory/padded.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #ifndef SHARE_MEMORY_PADDED_HPP
 #define SHARE_MEMORY_PADDED_HPP
 
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/nmt/allocationSite.hpp b/src/hotspot/share/nmt/allocationSite.hpp
index 5093bb39f0c..022fb6f4390 100644
--- a/src/hotspot/share/nmt/allocationSite.hpp
+++ b/src/hotspot/share/nmt/allocationSite.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #ifndef SHARE_NMT_ALLOCATIONSITE_HPP
 #define SHARE_NMT_ALLOCATIONSITE_HPP
 
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/nativeCallStack.hpp"
 
 // Allocation site represents a code path that makes a memory
diff --git a/src/hotspot/share/nmt/mallocHeader.cpp b/src/hotspot/share/nmt/mallocHeader.cpp
index 57d1c4a313a..a125ba416b1 100644
--- a/src/hotspot/share/nmt/mallocHeader.cpp
+++ b/src/hotspot/share/nmt/mallocHeader.cpp
@@ -26,11 +26,17 @@
 
 #include "nmt/mallocHeader.inline.hpp"
 #include "nmt/mallocSiteTable.hpp"
+#include "nmt/memflags.hpp"
 #include "runtime/os.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/nativeCallStack.hpp"
 #include "utilities/ostream.hpp"
 
+// The malloc header, as well as the coming VMATree implementation, rely on MEMFLAGS
+// fitting into eight bits.
+STATIC_ASSERT(sizeof(MEMFLAGS) == sizeof(uint8_t));
+
 void MallocHeader::print_block_on_error(outputStream* st, address bad_address) const {
   assert(bad_address >= (address)this, "sanity");
 
diff --git a/src/hotspot/share/nmt/mallocHeader.hpp b/src/hotspot/share/nmt/mallocHeader.hpp
index c0fae5803ce..6d847a22de3 100644
--- a/src/hotspot/share/nmt/mallocHeader.hpp
+++ b/src/hotspot/share/nmt/mallocHeader.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,7 +26,7 @@
 #ifndef SHARE_NMT_MALLOCHEADER_HPP
 #define SHARE_NMT_MALLOCHEADER_HPP
 
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/nativeCallStack.hpp"
diff --git a/src/hotspot/share/nmt/mallocTracker.hpp b/src/hotspot/share/nmt/mallocTracker.hpp
index f3b38b43ef0..5d755f60ae6 100644
--- a/src/hotspot/share/nmt/mallocTracker.hpp
+++ b/src/hotspot/share/nmt/mallocTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,8 +26,8 @@
 #ifndef SHARE_NMT_MALLOCTRACKER_HPP
 #define SHARE_NMT_MALLOCTRACKER_HPP
 
-#include "memory/allocation.hpp"
 #include "nmt/mallocHeader.hpp"
+#include "nmt/memflags.hpp"
 #include "nmt/nmtCommon.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/threadCritical.hpp"
diff --git a/src/hotspot/share/nmt/memFlagBitmap.hpp b/src/hotspot/share/nmt/memFlagBitmap.hpp
index 87815536980..0464179948b 100644
--- a/src/hotspot/share/nmt/memFlagBitmap.hpp
+++ b/src/hotspot/share/nmt/memFlagBitmap.hpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +26,8 @@
 #ifndef SHARE_NMT_MEMFLAGBITMAP_HPP
 #define SHARE_NMT_MEMFLAGBITMAP_HPP
 
-#include "memory/allocation.hpp" // for mt_number_of_types
+#include "nmt/memflags.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class MemFlagBitmap {
diff --git a/src/hotspot/share/nmt/memMapPrinter.cpp b/src/hotspot/share/nmt/memMapPrinter.cpp
index fdf9674f290..ec5003c562e 100644
--- a/src/hotspot/share/nmt/memMapPrinter.cpp
+++ b/src/hotspot/share/nmt/memMapPrinter.cpp
@@ -29,8 +29,8 @@
 
 #include "logging/logAsyncWriter.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "memory/allocation.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memflags.hpp"
 #include "runtime/nonJavaThread.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/thread.hpp"
diff --git a/src/hotspot/share/nmt/memMapPrinter.hpp b/src/hotspot/share/nmt/memMapPrinter.hpp
index 09e1cea113b..67706c4d4d7 100644
--- a/src/hotspot/share/nmt/memMapPrinter.hpp
+++ b/src/hotspot/share/nmt/memMapPrinter.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
 #ifndef SHARE_SERVICES_MEMMAPPRINTER_HPP
 #define SHARE_SERVICES_MEMMAPPRINTER_HPP
 
-#include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 #ifdef LINUX
diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
index 964911bb595..edb289c2f35 100644
--- a/src/hotspot/share/nmt/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
  */
 #include "precompiled.hpp"
 #include "cds/filemap.hpp"
-#include "memory/allocation.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "nmt/mallocTracker.hpp"
+#include "nmt/memflags.hpp"
 #include "nmt/memReporter.hpp"
 #include "nmt/threadStackTracker.hpp"
 #include "nmt/virtualMemoryTracker.hpp"
diff --git a/src/hotspot/share/nmt/memflags.hpp b/src/hotspot/share/nmt/memflags.hpp
new file mode 100644
index 00000000000..530c9ae9d95
--- /dev/null
+++ b/src/hotspot/share/nmt/memflags.hpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2012, 2024, 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.
+ *
+ */
+
+#ifndef SHARE_NMT_MEMFLAGS_HPP
+#define SHARE_NMT_MEMFLAGS_HPP
+
+#include "utilities/globalDefinitions.hpp"
+
+#define MEMORY_TYPES_DO(f)                                                           \
+  /* Memory type by sub systems. It occupies lower byte. */                          \
+  f(mtJavaHeap,       "Java Heap")   /* Java heap                                 */ \
+  f(mtClass,          "Class")       /* Java classes                              */ \
+  f(mtThread,         "Thread")      /* thread objects                            */ \
+  f(mtThreadStack,    "Thread Stack")                                                \
+  f(mtCode,           "Code")        /* generated code                            */ \
+  f(mtGC,             "GC")                                                          \
+  f(mtGCCardSet,      "GCCardSet")   /* G1 card set remembered set                */ \
+  f(mtCompiler,       "Compiler")                                                    \
+  f(mtJVMCI,          "JVMCI")                                                       \
+  f(mtInternal,       "Internal")    /* memory used by VM, but does not belong to */ \
+                                     /* any of above categories, and not used by  */ \
+                                     /* NMT                                       */ \
+  f(mtOther,          "Other")       /* memory not used by VM                     */ \
+  f(mtSymbol,         "Symbol")                                                      \
+  f(mtNMT,            "Native Memory Tracking")  /* memory used by NMT            */ \
+  f(mtClassShared,    "Shared class space")      /* class data sharing            */ \
+  f(mtChunk,          "Arena Chunk") /* chunk that holds content of arenas        */ \
+  f(mtTest,           "Test")        /* Test type for verifying NMT               */ \
+  f(mtTracing,        "Tracing")                                                     \
+  f(mtLogging,        "Logging")                                                     \
+  f(mtStatistics,     "Statistics")                                                  \
+  f(mtArguments,      "Arguments")                                                   \
+  f(mtModule,         "Module")                                                      \
+  f(mtSafepoint,      "Safepoint")                                                   \
+  f(mtSynchronizer,   "Synchronization")                                             \
+  f(mtServiceability, "Serviceability")                                              \
+  f(mtMetaspace,      "Metaspace")                                                   \
+  f(mtStringDedup,    "String Deduplication")                                        \
+  f(mtObjectMonitor,  "Object Monitors")                                             \
+  f(mtNone,           "Unknown")                                                     \
+  //end
+
+#define MEMORY_TYPE_DECLARE_ENUM(type, human_readable) \
+  type,
+
+enum class MEMFLAGS : uint8_t  {
+  MEMORY_TYPES_DO(MEMORY_TYPE_DECLARE_ENUM)
+  mt_number_of_types   // number of memory types (mtDontTrack
+                       // is not included as validate type)
+};
+
+#define MEMORY_TYPE_SHORTNAME(type, human_readable) \
+  constexpr MEMFLAGS type = MEMFLAGS::type;
+
+// Generate short aliases for the enum values. E.g. mtGC instead of MEMFLAGS::mtGC.
+MEMORY_TYPES_DO(MEMORY_TYPE_SHORTNAME)
+
+// Make an int version of the sentinel end value.
+constexpr int mt_number_of_types = static_cast<int>(MEMFLAGS::mt_number_of_types);
+
+#endif // SHARE_NMT_MEMFLAGS_HPP
diff --git a/src/hotspot/share/nmt/nmtCommon.hpp b/src/hotspot/share/nmt/nmtCommon.hpp
index c6d1bcddf5e..8ca0965b3d3 100644
--- a/src/hotspot/share/nmt/nmtCommon.hpp
+++ b/src/hotspot/share/nmt/nmtCommon.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2023 SAP SE. All rights reserved.
 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,7 +27,8 @@
 #ifndef SHARE_NMT_NMTCOMMON_HPP
 #define SHARE_NMT_NMTCOMMON_HPP
 
-#include "memory/allocation.hpp" // for MEMFLAGS only
+#include "memory/allStatic.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/prims/jvmtiAgentList.hpp b/src/hotspot/share/prims/jvmtiAgentList.hpp
index c4a497dfa9e..671def02681 100644
--- a/src/hotspot/share/prims/jvmtiAgentList.hpp
+++ b/src/hotspot/share/prims/jvmtiAgentList.hpp
@@ -25,7 +25,7 @@
 #ifndef SHARE_PRIMS_JVMTIAGENTLIST_HPP
 #define SHARE_PRIMS_JVMTIAGENTLIST_HPP
 
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "prims/jvmtiAgent.hpp"
 #include "utilities/growableArray.hpp"
 
diff --git a/src/hotspot/share/services/mallocLimit.cpp b/src/hotspot/share/services/mallocLimit.cpp
index 392b20f61ef..de3e8e872ee 100644
--- a/src/hotspot/share/services/mallocLimit.cpp
+++ b/src/hotspot/share/services/mallocLimit.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023 SAP SE. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,7 @@
  */
 
 #include "precompiled.hpp"
-
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "nmt/nmtCommon.hpp"
 #include "runtime/java.hpp"
 #include "runtime/globals.hpp"
diff --git a/src/hotspot/share/services/mallocLimit.hpp b/src/hotspot/share/services/mallocLimit.hpp
index 3e5e9347629..281cfa51396 100644
--- a/src/hotspot/share/services/mallocLimit.hpp
+++ b/src/hotspot/share/services/mallocLimit.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023 SAP SE. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #ifndef SHARE_SERVICES_MALLOCLIMIT_HPP
 #define SHARE_SERVICES_MALLOCLIMIT_HPP
 
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp
index bf9979fa3b4..09cb7ffb25a 100644
--- a/src/hotspot/share/services/threadService.cpp
+++ b/src/hotspot/share/services/threadService.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,11 @@
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "gc/shared/oopStorageSet.hpp"
-#include "memory/allocation.hpp"
 #include "memory/heapInspection.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memflags.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/objArrayKlass.hpp"
diff --git a/src/hotspot/share/utilities/bitMap.hpp b/src/hotspot/share/utilities/bitMap.hpp
index 6d83c5cdad9..0d592de7cd0 100644
--- a/src/hotspot/share/utilities/bitMap.hpp
+++ b/src/hotspot/share/utilities/bitMap.hpp
@@ -25,7 +25,7 @@
 #ifndef SHARE_UTILITIES_BITMAP_HPP
 #define SHARE_UTILITIES_BITMAP_HPP
 
-#include "memory/allocation.hpp"
+#include "nmt/memflags.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 

From e91492ab4333c61f39b50eb428fa932131a5b908 Mon Sep 17 00:00:00 2001
From: Inigo Mediavilla Saiz <imediava@gmail.com>
Date: Tue, 14 May 2024 16:04:34 +0000
Subject: [PATCH 427/486] 8313674: (fc)
 java/nio/channels/FileChannel/BlockDeviceSize.java should test for more block
 devices

Reviewed-by: alanb, bpb
---
 .../channels/FileChannel/BlockDeviceSize.java | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java b/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java
index db3c042275f..a240ea9cad6 100644
--- a/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java
+++ b/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,41 +24,47 @@
 /* @test
  * @bug 8054029 8313368
  * @requires (os.family == "linux")
- * @summary Block devices should not report size=0 on Linux
- * @run main/manual BlockDeviceSize
+ * @summary FileChannel.size() should be equal to RandomAccessFile.size() and > 0 for block devs on Linux
  */
 
 import java.io.RandomAccessFile;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.channels.FileChannel;
 import java.nio.file.AccessDeniedException;
 import java.nio.file.NoSuchFileException;
+import java.util.List;
+
 import static java.nio.file.StandardOpenOption.*;
 
 
 public class BlockDeviceSize {
-    private static final String BLK_FNAME = "/dev/sda1";
-    private static final Path BLK_PATH = Paths.get(BLK_FNAME);
+    private static final List<String> BLK_FNAMES = List.of("/dev/sda1", "/dev/nvme0n1", "/dev/xvda1") ;
 
     public static void main(String[] args) throws Throwable {
-        try (FileChannel ch = FileChannel.open(BLK_PATH, READ);
-             RandomAccessFile file = new RandomAccessFile(BLK_FNAME, "r")) {
+        for (String blkFname: BLK_FNAMES) {
+            Path blkPath = Path.of(blkFname);
+            try (FileChannel ch = FileChannel.open(blkPath, READ);
+                 RandomAccessFile file = new RandomAccessFile(blkFname, "r")) {
 
-            long size1 = ch.size();
-            long size2 = file.length();
-            if (size1 != size2) {
-                throw new RuntimeException("size differs when retrieved" +
-                        " in different ways: " + size1 + " != " + size2);
+                long size1 = ch.size();
+                long size2 = file.length();
+                if (size1 != size2) {
+                    throw new RuntimeException("size differs when retrieved" +
+                            " in different ways: " + size1 + " != " + size2);
+                }
+                if (size1 <= 0) {
+                    throw new RuntimeException("size() for a block device size returns zero or a negative value");
+                }
+                System.out.println("OK");
+
+            } catch (NoSuchFileException nsfe) {
+                System.err.println("File " + blkFname + " not found." +
+                        " Skipping test");
+            } catch (AccessDeniedException ade) {
+                throw new RuntimeException("Access to " + blkFname + " is denied."
+                        + " Run test as root.", ade);
             }
-            System.out.println("OK");
 
-        } catch (NoSuchFileException nsfe) {
-            System.err.println("File " + BLK_FNAME + " not found." +
-                    " Skipping test");
-        } catch (AccessDeniedException ade) {
-            throw new RuntimeException("Access to " + BLK_FNAME + " is denied."
-                    + " Run test as root.", ade);
         }
     }
 }

From 4d32c607a4b496bf2bb09e54167ecbbab5569a0c Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Tue, 14 May 2024 19:21:51 +0000
Subject: [PATCH 428/486] 8322008: Exclude some CDS tests from running with
 -Xshare:off

Reviewed-by: lmesnik, iklam
---
 test/hotspot/jtreg/TEST.groups | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index 0456b3ec69a..703ee707916 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -57,6 +57,13 @@ hotspot_runtime_no_cds = \
   runtime \
   -runtime/cds
 
+hotspot_runtime_non_cds_mode = \
+  runtime \
+  -runtime/cds/CheckSharingWithDefaultArchive.java \
+  -runtime/cds/appcds/dynamicArchive/DynamicSharedSymbols.java \
+  -runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java \
+  -runtime/cds/appcds/jcmd
+
 hotspot_handshake = \
   runtime/handshake
 

From 0bb5ae645165b97527ecccf02308df6072c363d8 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 14 May 2024 20:17:01 +0000
Subject: [PATCH 429/486] 8332248: (fc)
 java/nio/channels/FileChannel/BlockDeviceSize.java failed with
 RuntimeException

Reviewed-by: alanb
---
 test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java b/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java
index a240ea9cad6..415e1e52aad 100644
--- a/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java
+++ b/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java
@@ -25,6 +25,7 @@
  * @bug 8054029 8313368
  * @requires (os.family == "linux")
  * @summary FileChannel.size() should be equal to RandomAccessFile.size() and > 0 for block devs on Linux
+ * @library /test/lib
  */
 
 import java.io.RandomAccessFile;
@@ -36,6 +37,7 @@ import java.util.List;
 
 import static java.nio.file.StandardOpenOption.*;
 
+import jtreg.SkippedException;
 
 public class BlockDeviceSize {
     private static final List<String> BLK_FNAMES = List.of("/dev/sda1", "/dev/nvme0n1", "/dev/xvda1") ;
@@ -61,7 +63,7 @@ public class BlockDeviceSize {
                 System.err.println("File " + blkFname + " not found." +
                         " Skipping test");
             } catch (AccessDeniedException ade) {
-                throw new RuntimeException("Access to " + blkFname + " is denied."
+                throw new SkippedException("Access to " + blkFname + " is denied."
                         + " Run test as root.", ade);
             }
 

From 7b4ba7f90ab9ea5e1070c79534c587dad17d1bdd Mon Sep 17 00:00:00 2001
From: Julian Waters <jwaters@openjdk.org>
Date: Wed, 15 May 2024 00:23:26 +0000
Subject: [PATCH 430/486] 8325932: Replace ATTRIBUTE_NORETURN with direct
 [[noreturn]]

Reviewed-by: kbarrett, dholmes
---
 src/hotspot/share/runtime/os.hpp              | 12 ++---
 .../share/utilities/attributeNoreturn.hpp     | 50 -------------------
 src/hotspot/share/utilities/debug.hpp         | 19 ++++---
 .../share/utilities/globalDefinitions.hpp     |  1 -
 src/hotspot/share/utilities/vmError.hpp       | 12 ++---
 5 files changed, 21 insertions(+), 73 deletions(-)
 delete mode 100644 src/hotspot/share/utilities/attributeNoreturn.hpp

diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index 4bfcd9c2da5..971c3c884c4 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -606,7 +606,7 @@ class os: AllStatic {
   // multiple calls to naked_short_sleep. Only for use by non-JavaThreads.
   static void naked_sleep(jlong millis);
   // Never returns, use with CAUTION
-  ATTRIBUTE_NORETURN static void infinite_sleep();
+  [[noreturn]] static void infinite_sleep();
   static void naked_yield () ;
   static OSReturn set_priority(Thread* thread, ThreadPriority priority);
   static OSReturn get_priority(const Thread* const thread, ThreadPriority& priority);
@@ -630,26 +630,26 @@ class os: AllStatic {
   static int fork_and_exec(const char *cmd);
 
   // Call ::exit() on all platforms
-  ATTRIBUTE_NORETURN static void exit(int num);
+  [[noreturn]] static void exit(int num);
 
   // Call ::_exit() on all platforms. Similar semantics to die() except we never
   // want a core dump.
-  ATTRIBUTE_NORETURN static void _exit(int num);
+  [[noreturn]] static void _exit(int num);
 
   // Terminate the VM, but don't exit the process
   static void shutdown();
 
   // Terminate with an error.  Default is to generate a core file on platforms
   // that support such things.  This calls shutdown() and then aborts.
-  ATTRIBUTE_NORETURN static void abort(bool dump_core, void *siginfo, const void *context);
-  ATTRIBUTE_NORETURN static void abort(bool dump_core = true);
+  [[noreturn]] static void abort(bool dump_core, void *siginfo, const void *context);
+  [[noreturn]] static void abort(bool dump_core = true);
 
   // Die immediately, no exit hook, no abort hook, no cleanup.
   // Dump a core file, if possible, for debugging. os::abort() is the
   // preferred means to abort the VM on error. os::die() should only
   // be called if something has gone badly wrong. CreateCoredumpOnCrash
   // is intentionally not honored by this function.
-  ATTRIBUTE_NORETURN static void die();
+  [[noreturn]] static void die();
 
   // File i/o operations
   static int open(const char *path, int oflag, int mode);
diff --git a/src/hotspot/share/utilities/attributeNoreturn.hpp b/src/hotspot/share/utilities/attributeNoreturn.hpp
deleted file mode 100644
index 559b154708c..00000000000
--- a/src/hotspot/share/utilities/attributeNoreturn.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2023, 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.
- *
- */
-
-#ifndef SHARE_UTILITY_ATTRIBUTENORETURN_HPP
-#define SHARE_UTILITY_ATTRIBUTENORETURN_HPP
-
-// Provide a (temporary) macro for the [[noreturn]] attribute.
-//
-// Unfortunately, some older (though still in use) compilers have bugs when
-// using [[noreturn]].  For them we use an empty definition for the attribute.
-//
-// Note: This can't be placed in globalDefinitions_xxx.hpp because the
-// attribute is used in debug.hpp, which can't include globalDefinitions.hpp.
-
-// clang 12 (and possibly prior) crashes during build if we use [[noreturn]]
-// for assertion failure reporting functions.  The problem seems to be fixed
-// in clang 13.
-#ifdef __clang__
-#if __clang_major__ < 13
-#define ATTRIBUTE_NORETURN
-#endif
-#endif
-
-// All other platforms can use [[noreturn]].
-#ifndef ATTRIBUTE_NORETURN
-#define ATTRIBUTE_NORETURN [[noreturn]]
-#endif
-
-#endif // SHARE_UTILITY_ATTRIBUTENORETURN_HPP
diff --git a/src/hotspot/share/utilities/debug.hpp b/src/hotspot/share/utilities/debug.hpp
index d21439c35ca..f4e97832a5d 100644
--- a/src/hotspot/share/utilities/debug.hpp
+++ b/src/hotspot/share/utilities/debug.hpp
@@ -25,7 +25,6 @@
 #ifndef SHARE_UTILITIES_DEBUG_HPP
 #define SHARE_UTILITIES_DEBUG_HPP
 
-#include "utilities/attributeNoreturn.hpp"
 #include "utilities/breakpoint.hpp"
 #include "utilities/compilerWarnings.hpp"
 #include "utilities/macros.hpp"
@@ -254,32 +253,32 @@ enum VMErrorType : unsigned int {
 };
 
 // error reporting helper functions
-ATTRIBUTE_NORETURN
+[[noreturn]]
 void report_vm_error(const char* file, int line, const char* error_msg);
 
-ATTRIBUTE_NORETURN
+[[noreturn]]
 ATTRIBUTE_PRINTF(4, 5)
 void report_vm_error(const char* file, int line, const char* error_msg,
                      const char* detail_fmt, ...);
 
-ATTRIBUTE_NORETURN
+[[noreturn]]
 void report_vm_status_error(const char* file, int line, const char* error_msg,
                             int status, const char* detail);
 
-ATTRIBUTE_NORETURN
+[[noreturn]]
 ATTRIBUTE_PRINTF(4, 5)
 void report_fatal(VMErrorType error_type, const char* file, int line, const char* detail_fmt, ...);
 
-ATTRIBUTE_NORETURN
+[[noreturn]]
 ATTRIBUTE_PRINTF(5, 6)
 void report_vm_out_of_memory(const char* file, int line, size_t size, VMErrorType vm_err_type,
                              const char* detail_fmt, ...);
 
-ATTRIBUTE_NORETURN void report_should_not_call(const char* file, int line);
-ATTRIBUTE_NORETURN void report_should_not_reach_here(const char* file, int line);
-ATTRIBUTE_NORETURN void report_unimplemented(const char* file, int line);
+[[noreturn]] void report_should_not_call(const char* file, int line);
+[[noreturn]] void report_should_not_reach_here(const char* file, int line);
+[[noreturn]] void report_unimplemented(const char* file, int line);
 
-// NOT ATTRIBUTE_NORETURN
+// NOT [[noreturn]]
 void report_untested(const char* file, int line, const char* message);
 
 ATTRIBUTE_PRINTF(1, 2)
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 34f0a40a826..a15a4de3e93 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -25,7 +25,6 @@
 #ifndef SHARE_UTILITIES_GLOBALDEFINITIONS_HPP
 #define SHARE_UTILITIES_GLOBALDEFINITIONS_HPP
 
-#include "utilities/attributeNoreturn.hpp"
 #include "utilities/compilerWarnings.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
diff --git a/src/hotspot/share/utilities/vmError.hpp b/src/hotspot/share/utilities/vmError.hpp
index a2a098e2cda..dee8335afd5 100644
--- a/src/hotspot/share/utilities/vmError.hpp
+++ b/src/hotspot/share/utilities/vmError.hpp
@@ -164,32 +164,32 @@ public:
   static void print_vm_info(outputStream* st);
 
   // main error reporting function
-  ATTRIBUTE_NORETURN
+  [[noreturn]]
   ATTRIBUTE_PRINTF(6, 7)
   static void report_and_die(Thread* thread, unsigned int sig, address pc, void* siginfo,
                              void* context, const char* detail_fmt, ...);
 
-  ATTRIBUTE_NORETURN
+  [[noreturn]]
   ATTRIBUTE_PRINTF(6, 7)
   static void report_and_die(Thread* thread, void* context, const char* filename, int lineno, const char* message,
                              const char* detail_fmt, ...);
 
-  ATTRIBUTE_NORETURN
+  [[noreturn]]
   ATTRIBUTE_PRINTF(3, 0)
   static void report_and_die(int id, const char* message, const char* detail_fmt, va_list detail_args,
                              Thread* thread, address pc, void* siginfo, void* context,
                              const char* filename, int lineno, size_t size);
 
-  ATTRIBUTE_NORETURN
+  [[noreturn]]
   static void report_and_die(Thread* thread, unsigned int sig, address pc,
                              void* siginfo, void* context);
 
-  ATTRIBUTE_NORETURN
+  [[noreturn]]
   ATTRIBUTE_PRINTF(6, 0)
   static void report_and_die(Thread* thread, void* context, const char* filename, int lineno, const char* message,
                              const char* detail_fmt, va_list detail_args);
 
-  ATTRIBUTE_NORETURN
+  [[noreturn]]
   ATTRIBUTE_PRINTF(6, 0)
   static void report_and_die(Thread* thread, const char* filename, int lineno, size_t size,
                              VMErrorType vm_err_type, const char* detail_fmt,

From 4e77cf881d031e5b0320915b3eabd7702e560291 Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Wed, 15 May 2024 01:46:22 +0000
Subject: [PATCH 431/486] 8330795: C2: assert((uint)type <= T_CONFLICT &&
 _zero_type[type] != nullptr) failed: bad type with
 -XX:-UseCompressedClassPointers

Reviewed-by: kvn
---
 src/hotspot/share/opto/escape.cpp             |  4 +-
 .../c2/TestReduceAllocationAndLoadKlass.java  | 64 +++++++++++++
 .../AllocationMergesTests.java                | 92 +++++++++++++++----
 3 files changed, 138 insertions(+), 22 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 71051ee7bd1..4b328806122 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -548,8 +548,8 @@ bool ConnectionGraph::can_reduce_check_users(Node* n, uint nesting) const {
         if (!use_use->is_Load() || !use_use->as_Load()->can_split_through_phi_base(_igvn)) {
           NOT_PRODUCT(if (TraceReduceAllocationMerges) tty->print_cr("Can NOT reduce Phi %d on invocation %d. AddP user isn't a [splittable] Load(): %s", n->_idx, _invocation, use_use->Name());)
           return false;
-        } else if (nesting > 0 && load_type->isa_narrowklass()) {
-          NOT_PRODUCT(if (TraceReduceAllocationMerges) tty->print_cr("Can NOT reduce Phi %d on invocation %d. Nested NarrowKlass Load: %s", n->_idx, _invocation, use_use->Name());)
+        } else if (load_type->isa_narrowklass() || load_type->isa_klassptr()) {
+          NOT_PRODUCT(if (TraceReduceAllocationMerges) tty->print_cr("Can NOT reduce Phi %d on invocation %d. [Narrow] Klass Load: %s", n->_idx, _invocation, use_use->Name());)
           return false;
         }
       }
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
new file mode 100644
index 00000000000..e3515eaa20b
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024, 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 8330795
+ * @summary Check that Reduce Allocation Merges doesn't crash when CompressedClassPointers
+ *          is disabled and there is an access to Klass "field" through the phi.
+ * @requires vm.bits == 64 & vm.flagless & vm.compiler2.enabled & vm.opt.final.EliminateAllocations
+ * @run main/othervm -XX:CompileCommand=dontinline,*TestReduceAllocationAndLoadKlass*::test
+ *                   -XX:CompileCommand=compileonly,*TestReduceAllocationAndLoadKlass*::test
+ *                   -XX:CompileCommand=compileonly,*Shape*::*init*
+ *                   -XX:CompileCommand=compileonly,*Point*::*init*
+ *                   -XX:CompileCommand=exclude,*TestReduceAllocationAndLoadKlass*::dummy
+ *                   -XX:-TieredCompilation
+ *                   -XX:-UseCompressedClassPointers
+ *                   -Xbatch
+ *                   -Xcomp
+ *                   -server
+ *                   compiler.c2.TestReduceAllocationAndLoadKlass
+ */
+
+package compiler.c2;
+
+public class TestReduceAllocationAndLoadKlass {
+    public static void main(String[] args) {
+        Point p = new Point();
+        Line q = new Line();
+
+        test(true);
+        test(false);
+    }
+
+    static Class test(boolean cond) {
+        Object p = cond ? dummy() : new Line();
+        return p.getClass();
+    }
+
+    static Point dummy() { return new Point(); }
+
+    static class Shape { }
+    static class Point extends Shape { }
+    static class Line extends Shape { }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java b/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java
index a3bbf0f4c33..cd3d5329771 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java
@@ -31,7 +31,7 @@ import compiler.lib.ir_framework.*;
  * @bug 8281429
  * @summary Tests that C2 can correctly scalar replace some object allocation merges.
  * @library /test/lib /
- * @requires vm.debug == true & vm.bits == 64 & vm.compiler2.enabled & vm.opt.final.UseCompressedOops & vm.opt.final.EliminateAllocations
+ * @requires vm.debug == true & vm.flagless & vm.bits == 64 & vm.compiler2.enabled & vm.opt.final.EliminateAllocations
  * @run driver compiler.c2.irTests.scalarReplacement.AllocationMergesTests
  */
 public class AllocationMergesTests {
@@ -39,15 +39,44 @@ public class AllocationMergesTests {
     private static Point global_escape = new Point(2022, 2023);
 
     public static void main(String[] args) {
-        TestFramework.runWithFlags("-XX:+UnlockDiagnosticVMOptions",
-                                   "-XX:+ReduceAllocationMerges",
-                                   "-XX:+TraceReduceAllocationMerges",
-                                   "-XX:+DeoptimizeALot",
-                                   "-XX:CompileCommand=inline,*::charAt*",
-                                   "-XX:CompileCommand=inline,*PicturePositions::*",
-                                   "-XX:CompileCommand=inline,*Point::*",
-                                   "-XX:CompileCommand=inline,*Nested::*",
-                                   "-XX:CompileCommand=exclude,*::dummy*");
+        TestFramework framework = new TestFramework();
+
+        Scenario scenario0 = new Scenario(0, "-XX:+UnlockDiagnosticVMOptions",
+                                             "-XX:+ReduceAllocationMerges",
+                                             "-XX:+TraceReduceAllocationMerges",
+                                             "-XX:+DeoptimizeALot",
+                                             "-XX:+UseCompressedOops",
+                                             "-XX:+UseCompressedClassPointers",
+                                             "-XX:CompileCommand=inline,*::charAt*",
+                                             "-XX:CompileCommand=inline,*PicturePositions::*",
+                                             "-XX:CompileCommand=inline,*Point::*",
+                                             "-XX:CompileCommand=inline,*Nested::*",
+                                             "-XX:CompileCommand=exclude,*::dummy*");
+
+        Scenario scenario1 = new Scenario(1, "-XX:+UnlockDiagnosticVMOptions",
+                                             "-XX:+ReduceAllocationMerges",
+                                             "-XX:+TraceReduceAllocationMerges",
+                                             "-XX:+DeoptimizeALot",
+                                             "-XX:+UseCompressedOops",
+                                             "-XX:-UseCompressedClassPointers",
+                                             "-XX:CompileCommand=inline,*::charAt*",
+                                             "-XX:CompileCommand=inline,*PicturePositions::*",
+                                             "-XX:CompileCommand=inline,*Point::*",
+                                             "-XX:CompileCommand=inline,*Nested::*",
+                                             "-XX:CompileCommand=exclude,*::dummy*");
+
+        Scenario scenario2 = new Scenario(2, "-XX:+UnlockDiagnosticVMOptions",
+                                             "-XX:+ReduceAllocationMerges",
+                                             "-XX:+TraceReduceAllocationMerges",
+                                             "-XX:+DeoptimizeALot",
+                                             "-XX:-UseCompressedOops",
+                                             "-XX:CompileCommand=inline,*::charAt*",
+                                             "-XX:CompileCommand=inline,*PicturePositions::*",
+                                             "-XX:CompileCommand=inline,*Point::*",
+                                             "-XX:CompileCommand=inline,*Nested::*",
+                                             "-XX:CompileCommand=exclude,*::dummy*");
+
+        framework.addScenarios(scenario0, scenario1, scenario2).start();
     }
 
     // ------------------ No Scalar Replacement Should Happen in The Tests Below ------------------- //
@@ -94,7 +123,8 @@ public class AllocationMergesTests {
                  "testSRAndNSR_Trap_C2",
                  "testString_one_C2",
                  "testString_two_C2",
-                 "testLoadNarrowKlass_C2",
+                 "testLoadKlassFromCast_C2",
+                 "testLoadKlassFromPhi_C2",
                  "testReReduce_C2"
                 })
     public void runner(RunInfo info) {
@@ -150,7 +180,8 @@ public class AllocationMergesTests {
         Asserts.assertEQ(testSRAndNSR_NoTrap_Interp(cond1, x, y),                   testSRAndNSR_NoTrap_C2(cond1, x, y));
         Asserts.assertEQ(testString_one_Interp(cond1),                              testString_one_C2(cond1));
         Asserts.assertEQ(testString_two_Interp(cond1),                              testString_two_C2(cond1));
-        Asserts.assertEQ(testLoadNarrowKlass_Interp(cond1),                         testLoadNarrowKlass_C2(cond1));
+        Asserts.assertEQ(testLoadKlassFromCast_Interp(cond1),                       testLoadKlassFromCast_C2(cond1));
+        Asserts.assertEQ(testLoadKlassFromPhi_Interp(cond1),                        testLoadKlassFromPhi_C2(cond1));
         Asserts.assertEQ(testReReduce_Interp(cond1, x, y),                          testReReduce_C2(cond1, x, y));
 
         Asserts.assertEQ(testSRAndNSR_Trap_Interp(false, cond1, cond2, x, y),
@@ -771,10 +802,11 @@ public class AllocationMergesTests {
     }
 
     @Test
-    @IR(counts = { IRNode.ALLOC, "2" } )
+    @IR(counts = { IRNode.ALLOC, "2" }, applyIf = {"UseCompressedOops", "true"} )
+    @IR(failOn = { IRNode.ALLOC }, applyIf = {"UseCompressedOops", "false"} )
     // The two Picture objects will be removed. The nested Point objects won't
-    // be removed because the Phi merging them will have a DecodeN user - which
-    // currently isn't supported.
+    // be removed, if CompressedOops is enabled, because the Phi merging them will
+    // have a DecodeN user - which currently isn't supported.
     int testNestedObjectsNoEscapeObject_C2(boolean cond, int x, int y) { return testNestedObjectsNoEscapeObject(cond, x, y); }
 
     @DontCompile
@@ -1258,7 +1290,7 @@ public class AllocationMergesTests {
     // -------------------------------------------------------------------------
 
     @ForceInline
-    Class testLoadNarrowKlass(boolean cond1) {
+    Class testLoadKlassFromCast(boolean cond1) {
         Object p = new Circle(10);
 
         if (cond1) {
@@ -1270,12 +1302,32 @@ public class AllocationMergesTests {
 
     @Test
     @IR(counts = { IRNode.ALLOC, "1" })
-    // The allocation won't be reduced because we don't support NarrowKlass
-    // loads under CastPPs.
-    Class testLoadNarrowKlass_C2(boolean cond1) { return testLoadNarrowKlass(cond1); }
+    // The allocation won't be reduced because we don't support [Narrow]Klass loads
+    Class testLoadKlassFromCast_C2(boolean cond1) { return testLoadKlassFromCast(cond1); }
 
     @DontCompile
-    Class testLoadNarrowKlass_Interp(boolean cond1) { return testLoadNarrowKlass(cond1); }
+    Class testLoadKlassFromCast_Interp(boolean cond1) { return testLoadKlassFromCast(cond1); }
+
+    // -------------------------------------------------------------------------
+
+    @ForceInline
+    Class testLoadKlassFromPhi(boolean cond1) {
+        Shape p = new Square(20);
+
+        if (cond1) {
+            p = new Circle(10);
+        }
+
+        return p.getClass();
+    }
+
+    @Test
+    @IR(counts = { IRNode.ALLOC, "2" })
+    // The allocation won't be reduced because we don't support [Narrow]Klass loads
+    Class testLoadKlassFromPhi_C2(boolean cond1) { return testLoadKlassFromPhi(cond1); }
+
+    @DontCompile
+    Class testLoadKlassFromPhi_Interp(boolean cond1) { return testLoadKlassFromPhi(cond1); }
 
     // -------------------------------------------------------------------------
 

From d04ac14bdbab4187d0be98b8471f90be8a14f649 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Wed, 15 May 2024 05:43:18 +0000
Subject: [PATCH 432/486] 8332236: javac crashes with module imports and
 implicitly declared class

Reviewed-by: vromero
---
 .../sun/tools/javac/parser/JavacParser.java   |  2 +-
 test/langtools/tools/javac/ImportModule.java  | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 4278b902fb3..ce484e14b05 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -4118,7 +4118,7 @@ public class JavacParser implements Parser {
         for (JCTree def : origDefs) {
             if (def.hasTag(Tag.PACKAGEDEF)) {
                 log.error(def.pos(), Errors.ImplicitClassShouldNotHavePackageDeclaration);
-            } else if (def.hasTag(Tag.IMPORT)) {
+            } else if (def.hasTag(Tag.IMPORT) || def.hasTag(Tag.MODULEIMPORT)) {
                 topDefs.append(def);
             } else if (!def.hasTag(Tag.SKIP)) {
                 defs.append(def);
diff --git a/test/langtools/tools/javac/ImportModule.java b/test/langtools/tools/javac/ImportModule.java
index 767288d4d2f..efbc9c21077 100644
--- a/test/langtools/tools/javac/ImportModule.java
+++ b/test/langtools/tools/javac/ImportModule.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8328481
+ * @bug 8328481 8332236
  * @summary Check behavior of module imports.
  * @library /tools/lib
  * @modules java.logging
@@ -719,4 +719,26 @@ public class ImportModule extends TestRunner {
             .writeAll();
     }
 
+    @Test
+    public void testImplicitlyDeclaredClass(Path base) throws Exception {
+        Path current = base.resolve(".");
+        Path src = current.resolve("src");
+        Path classes = current.resolve("classes");
+        tb.writeFile(src.resolve("Test.java"),
+                     """
+                     import module java.base;
+                     void main() {
+                     }
+                     """);
+
+        Files.createDirectories(classes);
+
+        new JavacTask(tb)
+            .options("--enable-preview", "--release", SOURCE_VERSION)
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run(Task.Expect.SUCCESS)
+            .writeAll();
+    }
+
 }

From c642f44bbe1e4cdbc23496a34ddaae30990ce7c0 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Wed, 15 May 2024 06:05:23 +0000
Subject: [PATCH 433/486] 8329839: Cleanup ZPhysicalMemoryBacking trace logging

Reviewed-by: stefank, ayang
---
 src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp        | 4 ++--
 src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp    | 4 ++--
 .../os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp b/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
index bd1d7174c12..29825a9eab2 100644
--- a/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
+++ b/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
@@ -103,7 +103,7 @@ bool ZPhysicalMemoryBacking::commit_inner(zoffset offset, size_t length) const {
   assert(is_aligned(length, os::vm_page_size()), "Invalid length");
 
   log_trace(gc, heap)("Committing memory: " SIZE_FORMAT "M-" SIZE_FORMAT "M (" SIZE_FORMAT "M)",
-                      untype(offset) / M, untype(offset) + length / M, length / M);
+                      untype(offset) / M, untype(to_zoffset_end(offset, length)) / M, length / M);
 
   const uintptr_t addr = _base + untype(offset);
   const void* const res = mmap((void*)addr, length, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
@@ -150,7 +150,7 @@ size_t ZPhysicalMemoryBacking::uncommit(zoffset offset, size_t length) const {
   assert(is_aligned(length, os::vm_page_size()), "Invalid length");
 
   log_trace(gc, heap)("Uncommitting memory: " SIZE_FORMAT "M-" SIZE_FORMAT "M (" SIZE_FORMAT "M)",
-                      untype(offset) / M, untype(offset) + length / M, length / M);
+                      untype(offset) / M, untype(to_zoffset_end(offset, length)) / M, length / M);
 
   const uintptr_t start = _base + untype(offset);
   const void* const res = mmap((void*)start, length, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE, -1, 0);
diff --git a/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp b/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
index ff891509365..76f9d90cd71 100644
--- a/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
+++ b/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
@@ -597,7 +597,7 @@ ZErrno ZPhysicalMemoryBacking::fallocate(bool punch_hole, zoffset offset, size_t
 
 bool ZPhysicalMemoryBacking::commit_inner(zoffset offset, size_t length) const {
   log_trace(gc, heap)("Committing memory: " SIZE_FORMAT "M-" SIZE_FORMAT "M (" SIZE_FORMAT "M)",
-                      untype(offset) / M, untype(offset + length) / M, length / M);
+                      untype(offset) / M, untype(to_zoffset_end(offset, length)) / M, length / M);
 
 retry:
   const ZErrno err = fallocate(false /* punch_hole */, offset, length);
@@ -697,7 +697,7 @@ size_t ZPhysicalMemoryBacking::commit(zoffset offset, size_t length) const {
 
 size_t ZPhysicalMemoryBacking::uncommit(zoffset offset, size_t length) const {
   log_trace(gc, heap)("Uncommitting memory: " SIZE_FORMAT "M-" SIZE_FORMAT "M (" SIZE_FORMAT "M)",
-                      untype(offset) / M, untype(offset + length) / M, length / M);
+                      untype(offset) / M, untype(to_zoffset_end(offset, length)) / M, length / M);
 
   const ZErrno err = fallocate(true /* punch_hole */, offset, length);
   if (err) {
diff --git a/src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp b/src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp
index 9a38352d1d7..181d0fada59 100644
--- a/src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp
+++ b/src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp
@@ -225,14 +225,14 @@ void ZPhysicalMemoryBacking::warn_commit_limits(size_t max_capacity) const {
 
 size_t ZPhysicalMemoryBacking::commit(zoffset offset, size_t length) {
   log_trace(gc, heap)("Committing memory: " SIZE_FORMAT "M-" SIZE_FORMAT "M (" SIZE_FORMAT "M)",
-                      untype(offset) / M, (untype(offset) + length) / M, length / M);
+                      untype(offset) / M, untype(to_zoffset_end(offset, length)) / M, length / M);
 
   return _impl->commit(offset, length);
 }
 
 size_t ZPhysicalMemoryBacking::uncommit(zoffset offset, size_t length) {
   log_trace(gc, heap)("Uncommitting memory: " SIZE_FORMAT "M-" SIZE_FORMAT "M (" SIZE_FORMAT "M)",
-                      untype(offset) / M, (untype(offset) + length) / M, length / M);
+                      untype(offset) / M, untype(to_zoffset_end(offset, length)) / M, length / M);
 
   return _impl->uncommit(offset, length);
 }

From 2f10a316ff0c5a4c124b94f6fabb38fb119d2c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@openjdk.org>
Date: Wed, 15 May 2024 07:48:15 +0000
Subject: [PATCH 434/486] 8302850: Implement C1 clone intrinsic that reuses
 arraycopy code for primitive arrays

Reviewed-by: dlong, roland
---
 .../cpu/aarch64/c1_LIRAssembler_aarch64.cpp   |   7 +-
 .../cpu/aarch64/c1_LIRGenerator_aarch64.cpp   |  21 ++-
 .../cpu/aarch64/c1_MacroAssembler_aarch64.cpp |   6 +-
 .../cpu/aarch64/c1_MacroAssembler_aarch64.hpp |   3 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp   |   7 +-
 src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp   |  34 ++++-
 src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp |  14 +-
 src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp |   3 +-
 src/hotspot/share/c1/c1_Compiler.cpp          |   3 +
 src/hotspot/share/c1/c1_GraphBuilder.cpp      |  53 ++++++-
 src/hotspot/share/c1/c1_GraphBuilder.hpp      |   1 +
 src/hotspot/share/c1/c1_Instruction.hpp       |   6 +-
 src/hotspot/share/c1/c1_LIR.cpp               |  18 ++-
 src/hotspot/share/c1/c1_LIR.hpp               |   9 +-
 src/hotspot/share/c1/c1_ValueStack.hpp        |   4 +
 .../jtreg/compiler/c1/TestNullArrayClone.java | 133 ++++++++++++++++++
 16 files changed, 288 insertions(+), 34 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c1/TestNullArrayClone.java

diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 9bd8c6b8e9f..615c8e19ac8 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -1212,7 +1212,8 @@ void LIR_Assembler::emit_alloc_array(LIR_OpAllocArray* op) {
                       arrayOopDesc::base_offset_in_bytes(op->type()),
                       array_element_size(op->type()),
                       op->klass()->as_register(),
-                      *op->stub()->entry());
+                      *op->stub()->entry(),
+                      op->zero_array());
   }
   __ bind(*op->stub()->continuation());
 }
@@ -2504,7 +2505,9 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
    __ call_VM_leaf(entry, 3);
  }
 
-  __ bind(*stub->continuation());
+  if (stub != nullptr) {
+    __ bind(*stub->continuation());
+  }
 }
 
 
diff --git a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
index 568be65e144..8f1260feba3 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
@@ -878,7 +878,13 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   assert(x->number_of_arguments() == 5, "wrong type");
 
   // Make all state_for calls early since they can emit code
-  CodeEmitInfo* info = state_for(x, x->state());
+  CodeEmitInfo* info = nullptr;
+  if (x->state_before() != nullptr && x->state_before()->force_reexecute()) {
+    info = state_for(x, x->state_before());
+    info->set_force_reexecute();
+  } else {
+    info = state_for(x, x->state());
+  }
 
   LIRItem src(x->argument_at(0), this);
   LIRItem src_pos(x->argument_at(1), this);
@@ -911,6 +917,9 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   int flags;
   ciArrayKlass* expected_type;
   arraycopy_helper(x, &flags, &expected_type);
+  if (x->check_flag(Instruction::OmitChecksFlag)) {
+    flags = 0;
+  }
 
   __ arraycopy(src.result(), src_pos.result(), dst.result(), dst_pos.result(), length.result(), tmp, expected_type, flags, info); // does add_safepoint
 }
@@ -1132,7 +1141,13 @@ void LIRGenerator::do_NewInstance(NewInstance* x) {
 }
 
 void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
-  CodeEmitInfo* info = state_for(x, x->state());
+  CodeEmitInfo* info = nullptr;
+  if (x->state_before() != nullptr && x->state_before()->force_reexecute()) {
+    info = state_for(x, x->state_before());
+    info->set_force_reexecute();
+  } else {
+    info = state_for(x, x->state());
+  }
 
   LIRItem length(x->length(), this);
   length.load_item_force(FrameMap::r19_opr);
@@ -1149,7 +1164,7 @@ void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
   __ metadata2reg(ciTypeArrayKlass::make(elem_type)->constant_encoding(), klass_reg);
 
   CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info);
-  __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path);
+  __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path, x->zero_array());
 
   LIR_Opr result = rlock_result(x);
   __ move(reg, result);
diff --git a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
index e48d64d9069..c0455ad1bff 100644
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
@@ -272,7 +272,7 @@ void C1_MacroAssembler::initialize_object(Register obj, Register klass, Register
 
   verify_oop(obj);
 }
-void C1_MacroAssembler::allocate_array(Register obj, Register len, Register t1, Register t2, int base_offset_in_bytes, int f, Register klass, Label& slow_case) {
+void C1_MacroAssembler::allocate_array(Register obj, Register len, Register t1, Register t2, int base_offset_in_bytes, int f, Register klass, Label& slow_case, bool zero_array) {
   assert_different_registers(obj, len, t1, t2, klass);
 
   // determine alignment mask
@@ -297,7 +297,9 @@ void C1_MacroAssembler::allocate_array(Register obj, Register len, Register t1,
   // following the length field in initialize_header().
   int base_offset = align_up(base_offset_in_bytes, BytesPerWord);
   // clear rest of allocated space
-  initialize_body(obj, arr_size, base_offset, t1, t2);
+  if (zero_array) {
+    initialize_body(obj, arr_size, base_offset, t1, t2);
+  }
   if (Compilation::current()->bailed_out()) {
     return;
   }
diff --git a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
index 3a4c868744c..fc8e83d706b 100644
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
@@ -100,7 +100,8 @@ using MacroAssembler::null_check;
   // base_offset_in_bytes: offset of first array element, in bytes
   // f                   : element scale factor
   // slow_case           : exit to slow case implementation if fast allocation fails
-  void allocate_array(Register obj, Register len, Register t, Register t2, int base_offset_in_bytes, int f, Register klass, Label& slow_case);
+  // zero_array          : zero the allocated array or not
+  void allocate_array(Register obj, Register len, Register t, Register t2, int base_offset_in_bytes, int f, Register klass, Label& slow_case, bool zero_array);
 
   int  rsp_offset() const { return _rsp_offset; }
   void set_rsp_offset(int n) { _rsp_offset = n; }
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index c279e3073af..978708d03e6 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -1621,7 +1621,8 @@ void LIR_Assembler::emit_alloc_array(LIR_OpAllocArray* op) {
                       arrayOopDesc::base_offset_in_bytes(op->type()),
                       array_element_size(op->type()),
                       op->klass()->as_register(),
-                      *op->stub()->entry());
+                      *op->stub()->entry(),
+                      op->zero_array());
   }
   __ bind(*op->stub()->continuation());
 }
@@ -3453,7 +3454,9 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
   address entry = StubRoutines::select_arraycopy_function(basic_type, aligned, disjoint, name, false);
   __ call_VM_leaf(entry, 0);
 
-  __ bind(*stub->continuation());
+  if (stub != nullptr) {
+    __ bind(*stub->continuation());
+  }
 }
 
 void LIR_Assembler::emit_updatecrc32(LIR_OpUpdateCRC32* op) {
diff --git a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
index 7088cf33cf6..d3add6975b4 100644
--- a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
@@ -1004,7 +1004,13 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   assert(x->number_of_arguments() == 5, "wrong type");
 
   // Make all state_for calls early since they can emit code
-  CodeEmitInfo* info = state_for(x, x->state());
+  CodeEmitInfo* info = nullptr;
+  if (x->state_before() != nullptr && x->state_before()->force_reexecute()) {
+    info = state_for(x, x->state_before());
+    info->set_force_reexecute();
+  } else {
+    info = state_for(x, x->state());
+  }
 
   LIRItem src(x->argument_at(0), this);
   LIRItem src_pos(x->argument_at(1), this);
@@ -1016,6 +1022,13 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   // LinearScan will fail allocation (because arraycopy always needs a
   // call)
 
+  int flags;
+  ciArrayKlass* expected_type;
+  arraycopy_helper(x, &flags, &expected_type);
+  if (x->check_flag(Instruction::OmitChecksFlag)) {
+    flags = 0;
+  }
+
 #ifndef _LP64
   src.load_item_force     (FrameMap::rcx_oop_opr);
   src_pos.load_item_force (FrameMap::rdx_opr);
@@ -1023,6 +1036,11 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   dst_pos.load_item_force (FrameMap::rbx_opr);
   length.load_item_force  (FrameMap::rdi_opr);
   LIR_Opr tmp =           (FrameMap::rsi_opr);
+
+  if (expected_type != nullptr && flags == 0) {
+    FrameMap* f = Compilation::current()->frame_map();
+    f->update_reserved_argument_area_size(3 * BytesPerWord);
+  }
 #else
 
   // The java calling convention will give us enough registers
@@ -1044,10 +1062,6 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
 
   set_no_result(x);
 
-  int flags;
-  ciArrayKlass* expected_type;
-  arraycopy_helper(x, &flags, &expected_type);
-
   __ arraycopy(src.result(), src_pos.result(), dst.result(), dst_pos.result(), length.result(), tmp, expected_type, flags, info); // does add_safepoint
 }
 
@@ -1310,7 +1324,13 @@ void LIRGenerator::do_NewInstance(NewInstance* x) {
 
 
 void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
-  CodeEmitInfo* info = state_for(x, x->state());
+  CodeEmitInfo* info = nullptr;
+  if (x->state_before() != nullptr && x->state_before()->force_reexecute()) {
+    info = state_for(x, x->state_before());
+    info->set_force_reexecute();
+  } else {
+    info = state_for(x, x->state());
+  }
 
   LIRItem length(x->length(), this);
   length.load_item_force(FrameMap::rbx_opr);
@@ -1327,7 +1347,7 @@ void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
   __ metadata2reg(ciTypeArrayKlass::make(elem_type)->constant_encoding(), klass_reg);
 
   CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info);
-  __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path);
+  __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path, x->zero_array());
 
   LIR_Opr result = rlock_result(x);
   __ move(reg, result);
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
index caca3a15282..2374324ca7c 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
@@ -278,7 +278,7 @@ void C1_MacroAssembler::initialize_object(Register obj, Register klass, Register
   verify_oop(obj);
 }
 
-void C1_MacroAssembler::allocate_array(Register obj, Register len, Register t1, Register t2, int base_offset_in_bytes, Address::ScaleFactor f, Register klass, Label& slow_case) {
+void C1_MacroAssembler::allocate_array(Register obj, Register len, Register t1, Register t2, int base_offset_in_bytes, Address::ScaleFactor f, Register klass, Label& slow_case, bool zero_array) {
   assert(obj == rax, "obj must be in rax, for cmpxchg");
   assert_different_registers(obj, len, t1, t2, klass);
 
@@ -300,11 +300,13 @@ void C1_MacroAssembler::allocate_array(Register obj, Register len, Register t1,
   initialize_header(obj, klass, len, t1, t2);
 
   // clear rest of allocated space
-  const Register len_zero = len;
-  // Align-up to word boundary, because we clear the 4 bytes potentially
-  // following the length field in initialize_header().
-  int base_offset = align_up(base_offset_in_bytes, BytesPerWord);
-  initialize_body(obj, arr_size, base_offset, len_zero);
+  if (zero_array) {
+    const Register len_zero = len;
+    // Align-up to word boundary, because we clear the 4 bytes potentially
+    // following the length field in initialize_header().
+    int base_offset = align_up(base_offset_in_bytes, BytesPerWord);
+    initialize_body(obj, arr_size, base_offset, len_zero);
+  }
 
   if (CURRENT_ENV->dtrace_alloc_probes()) {
     assert(obj == rax, "must be");
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp
index a705dd70efd..6344a7b6ef1 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp
@@ -89,7 +89,8 @@
   // base_offset_in_bytes: offset of the first array element, in bytes
   // f                   : element scale factor
   // slow_case           : exit to slow case implementation if fast allocation fails
-  void allocate_array(Register obj, Register len, Register t, Register t2, int base_offset_in_bytes, Address::ScaleFactor f, Register klass, Label& slow_case);
+  // zero_array          : zero the allocated array or not
+  void allocate_array(Register obj, Register len, Register t, Register t2, int base_offset_in_bytes, Address::ScaleFactor f, Register klass, Label& slow_case, bool zero_array);
 
   int  rsp_offset() const { return _rsp_offset; }
   void set_rsp_offset(int n) { _rsp_offset = n; }
diff --git a/src/hotspot/share/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp
index bdbeb39f89a..6e518b0213b 100644
--- a/src/hotspot/share/c1/c1_Compiler.cpp
+++ b/src/hotspot/share/c1/c1_Compiler.cpp
@@ -235,6 +235,9 @@ bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_counterTime:
 #endif
   case vmIntrinsics::_getObjectSize:
+#if defined(X86) || defined(AARCH64)
+  case vmIntrinsics::_clone:
+#endif
     break;
   case vmIntrinsics::_blackhole:
     break;
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp
index a361f3da9c2..db025883b78 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp
@@ -2026,8 +2026,11 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
       int index = state()->stack_size() - (target->arg_size_no_receiver() + 1);
       receiver = state()->stack_at(index);
       ciType* type = receiver->exact_type();
-      if (type != nullptr && type->is_loaded() &&
-          type->is_instance_klass() && !type->as_instance_klass()->is_interface()) {
+      if (type != nullptr && type->is_loaded()) {
+        assert(!type->is_instance_klass() || !type->as_instance_klass()->is_interface(), "Must not be an interface");
+        // Detects non-interface instances, primitive arrays, and some object arrays.
+        // Array receivers can only call Object methods, so we should be able to allow
+        // all object arrays here too, even those with unloaded types.
         receiver_klass = (ciInstanceKlass*) type;
         type_is_exact = true;
       }
@@ -2243,7 +2246,7 @@ void GraphBuilder::new_instance(int klass_index) {
 
 void GraphBuilder::new_type_array() {
   ValueStack* state_before = copy_state_exhandling();
-  apush(append_split(new NewTypeArray(ipop(), (BasicType)stream()->get_index(), state_before)));
+  apush(append_split(new NewTypeArray(ipop(), (BasicType)stream()->get_index(), state_before, true)));
 }
 
 
@@ -3650,9 +3653,13 @@ void GraphBuilder::build_graph_for_intrinsic(ciMethod* callee, bool ignore_retur
   case vmIntrinsics::_getAndSetReference     : append_unsafe_get_and_set(callee, false); return;
   case vmIntrinsics::_getCharStringU         : append_char_access(callee, false); return;
   case vmIntrinsics::_putCharStringU         : append_char_access(callee, true); return;
+  case vmIntrinsics::_clone                  : append_alloc_array_copy(callee); return;
   default:
     break;
   }
+  if (_inline_bailout_msg != nullptr) {
+    return;
+  }
 
   // create intrinsic node
   const bool has_receiver = !callee->is_static();
@@ -3714,6 +3721,9 @@ bool GraphBuilder::try_inline_intrinsics(ciMethod* callee, bool ignore_return) {
     }
   }
   build_graph_for_intrinsic(callee, ignore_return);
+  if (_inline_bailout_msg != nullptr) {
+    return false;
+  }
   return true;
 }
 
@@ -4427,6 +4437,43 @@ void GraphBuilder::append_char_access(ciMethod* callee, bool is_store) {
   }
 }
 
+void GraphBuilder::append_alloc_array_copy(ciMethod* callee) {
+  const int args_base = state()->stack_size() - callee->arg_size();
+  ciType* receiver_type = state()->stack_at(args_base)->exact_type();
+  if (receiver_type == nullptr) {
+    inline_bailout("must have a receiver");
+    return;
+  }
+  if (!receiver_type->is_type_array_klass()) {
+    inline_bailout("clone array not primitive");
+    return;
+  }
+
+  ValueStack* state_before = copy_state_before();
+  state_before->set_force_reexecute();
+  Value src = apop();
+  BasicType basic_type = src->exact_type()->as_array_klass()->element_type()->basic_type();
+  Value length = append(new ArrayLength(src, state_before));
+  Value new_array = append_split(new NewTypeArray(length, basic_type, state_before, false));
+
+  ValueType* result_type = as_ValueType(callee->return_type());
+  vmIntrinsics::ID id = vmIntrinsics::_arraycopy;
+  Values* args = new Values(5);
+  args->push(src);
+  args->push(append(new Constant(new IntConstant(0))));
+  args->push(new_array);
+  args->push(append(new Constant(new IntConstant(0))));
+  args->push(length);
+  const bool has_receiver = true;
+  Intrinsic* array_copy = new Intrinsic(result_type, id,
+                                    args, has_receiver, state_before,
+                                    vmIntrinsics::preserves_state(id),
+                                    vmIntrinsics::can_trap(id));
+  array_copy->set_flag(Instruction::OmitChecksFlag, true);
+  append_split(array_copy);
+  apush(new_array);
+}
+
 void GraphBuilder::print_inlining(ciMethod* callee, const char* msg, bool success) {
   CompileLog* log = compilation()->log();
   if (log != nullptr) {
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.hpp b/src/hotspot/share/c1/c1_GraphBuilder.hpp
index 42233455d4c..92b9a518a20 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.hpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.hpp
@@ -379,6 +379,7 @@ class GraphBuilder {
   void append_unsafe_CAS(ciMethod* callee);
   void append_unsafe_get_and_set(ciMethod* callee, bool is_add);
   void append_char_access(ciMethod* callee, bool is_store);
+  void append_alloc_array_copy(ciMethod* callee);
 
   void print_inlining(ciMethod* callee, const char* msg, bool success = true);
 
diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp
index 8f7fd698e79..32ff3d9f61c 100644
--- a/src/hotspot/share/c1/c1_Instruction.hpp
+++ b/src/hotspot/share/c1/c1_Instruction.hpp
@@ -364,6 +364,7 @@ class Instruction: public CompilationResourceObj {
     InWorkListFlag,
     DeoptimizeOnException,
     KillsMemoryFlag,
+    OmitChecksFlag,
     InstructionLastFlag
   };
 
@@ -1327,16 +1328,19 @@ BASE(NewArray, StateSplit)
 LEAF(NewTypeArray, NewArray)
  private:
   BasicType _elt_type;
+  bool _zero_array;
 
  public:
   // creation
-  NewTypeArray(Value length, BasicType elt_type, ValueStack* state_before)
+  NewTypeArray(Value length, BasicType elt_type, ValueStack* state_before, bool zero_array)
   : NewArray(length, state_before)
   , _elt_type(elt_type)
+  , _zero_array(zero_array)
   {}
 
   // accessors
   BasicType elt_type() const                     { return _elt_type; }
+  bool zero_array()    const                     { return _zero_array; }
   ciType* exact_type() const;
 };
 
diff --git a/src/hotspot/share/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp
index dee208c11be..4017a5324b5 100644
--- a/src/hotspot/share/c1/c1_LIR.cpp
+++ b/src/hotspot/share/c1/c1_LIR.cpp
@@ -353,7 +353,15 @@ LIR_OpArrayCopy::LIR_OpArrayCopy(LIR_Opr src, LIR_Opr src_pos, LIR_Opr dst, LIR_
   , _tmp(tmp)
   , _expected_type(expected_type)
   , _flags(flags) {
+#if defined(X86) || defined(AARCH64)
+  if (expected_type != nullptr && flags == 0) {
+    _stub = nullptr;
+  } else {
+    _stub = new ArrayCopyStub(this);
+  }
+#else
   _stub = new ArrayCopyStub(this);
+#endif
 }
 
 LIR_OpUpdateCRC32::LIR_OpUpdateCRC32(LIR_Opr crc, LIR_Opr val, LIR_Opr res)
@@ -999,7 +1007,10 @@ void LIR_OpLabel::emit_code(LIR_Assembler* masm) {
 
 void LIR_OpArrayCopy::emit_code(LIR_Assembler* masm) {
   masm->emit_arraycopy(this);
-  masm->append_code_stub(stub());
+  ArrayCopyStub* code_stub = stub();
+  if (code_stub != nullptr) {
+    masm->append_code_stub(code_stub);
+  }
 }
 
 void LIR_OpUpdateCRC32::emit_code(LIR_Assembler* masm) {
@@ -1365,7 +1376,7 @@ void LIR_List::allocate_object(LIR_Opr dst, LIR_Opr t1, LIR_Opr t2, LIR_Opr t3,
                            stub));
 }
 
-void LIR_List::allocate_array(LIR_Opr dst, LIR_Opr len, LIR_Opr t1,LIR_Opr t2, LIR_Opr t3,LIR_Opr t4, BasicType type, LIR_Opr klass, CodeStub* stub) {
+void LIR_List::allocate_array(LIR_Opr dst, LIR_Opr len, LIR_Opr t1,LIR_Opr t2, LIR_Opr t3,LIR_Opr t4, BasicType type, LIR_Opr klass, CodeStub* stub, bool zero_array) {
   append(new LIR_OpAllocArray(
                            klass,
                            len,
@@ -1375,7 +1386,8 @@ void LIR_List::allocate_array(LIR_Opr dst, LIR_Opr len, LIR_Opr t1,LIR_Opr t2, L
                            t3,
                            t4,
                            type,
-                           stub));
+                           stub,
+                           zero_array));
 }
 
 void LIR_List::shift_left(LIR_Opr value, LIR_Opr count, LIR_Opr dst, LIR_Opr tmp) {
diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp
index 6f527135fbe..c69d29f8d61 100644
--- a/src/hotspot/share/c1/c1_LIR.hpp
+++ b/src/hotspot/share/c1/c1_LIR.hpp
@@ -1750,9 +1750,10 @@ class LIR_OpAllocArray : public LIR_Op {
   LIR_Opr   _tmp4;
   BasicType _type;
   CodeStub* _stub;
+  bool      _zero_array;
 
  public:
-  LIR_OpAllocArray(LIR_Opr klass, LIR_Opr len, LIR_Opr result, LIR_Opr t1, LIR_Opr t2, LIR_Opr t3, LIR_Opr t4, BasicType type, CodeStub* stub)
+  LIR_OpAllocArray(LIR_Opr klass, LIR_Opr len, LIR_Opr result, LIR_Opr t1, LIR_Opr t2, LIR_Opr t3, LIR_Opr t4, BasicType type, CodeStub* stub, bool zero_array)
     : LIR_Op(lir_alloc_array, result, nullptr)
     , _klass(klass)
     , _len(len)
@@ -1761,7 +1762,8 @@ class LIR_OpAllocArray : public LIR_Op {
     , _tmp3(t3)
     , _tmp4(t4)
     , _type(type)
-    , _stub(stub) {}
+    , _stub(stub)
+    , _zero_array(zero_array) {}
 
   LIR_Opr   klass()   const                      { return _klass;       }
   LIR_Opr   len()     const                      { return _len;         }
@@ -1772,6 +1774,7 @@ class LIR_OpAllocArray : public LIR_Op {
   LIR_Opr   tmp4()    const                      { return _tmp4;        }
   BasicType type()    const                      { return _type;        }
   CodeStub* stub()    const                      { return _stub;        }
+  bool zero_array()   const                      { return _zero_array;  }
 
   virtual void emit_code(LIR_Assembler* masm);
   virtual LIR_OpAllocArray * as_OpAllocArray () { return this; }
@@ -2302,7 +2305,7 @@ class LIR_List: public CompilationResourceObj {
   void irem(LIR_Opr left, int   right, LIR_Opr res, LIR_Opr tmp, CodeEmitInfo* info);
 
   void allocate_object(LIR_Opr dst, LIR_Opr t1, LIR_Opr t2, LIR_Opr t3, LIR_Opr t4, int header_size, int object_size, LIR_Opr klass, bool init_check, CodeStub* stub);
-  void allocate_array(LIR_Opr dst, LIR_Opr len, LIR_Opr t1,LIR_Opr t2, LIR_Opr t3,LIR_Opr t4, BasicType type, LIR_Opr klass, CodeStub* stub);
+  void allocate_array(LIR_Opr dst, LIR_Opr len, LIR_Opr t1,LIR_Opr t2, LIR_Opr t3,LIR_Opr t4, BasicType type, LIR_Opr klass, CodeStub* stub, bool zero_array = true);
 
   // jump is an unconditional branch
   void jump(BlockBegin* block) {
diff --git a/src/hotspot/share/c1/c1_ValueStack.hpp b/src/hotspot/share/c1/c1_ValueStack.hpp
index 0a75fa39bf6..bb0c475585c 100644
--- a/src/hotspot/share/c1/c1_ValueStack.hpp
+++ b/src/hotspot/share/c1/c1_ValueStack.hpp
@@ -58,6 +58,7 @@ class ValueStack: public CompilationResourceObj {
   Values   _locals;                              // the locals
   Values   _stack;                               // the expression stack
   Values*  _locks;                               // the monitor stack (holding the locked values)
+  bool     _force_reexecute;                     // force the reexecute flag on, used for patching stub
 
   Value check(ValueTag tag, Value t) {
     assert(tag == t->type()->tag() || (tag == objectTag && t->type()->tag() == addressTag), "types must correspond");
@@ -225,6 +226,9 @@ class ValueStack: public CompilationResourceObj {
   void setup_phi_for_stack(BlockBegin* b, int index);
   void setup_phi_for_local(BlockBegin* b, int index);
 
+  bool force_reexecute() const         { return _force_reexecute; }
+  void set_force_reexecute()           { _force_reexecute = true; }
+
   // debugging
   void print()  PRODUCT_RETURN;
   void verify() PRODUCT_RETURN;
diff --git a/test/hotspot/jtreg/compiler/c1/TestNullArrayClone.java b/test/hotspot/jtreg/compiler/c1/TestNullArrayClone.java
new file mode 100644
index 00000000000..d153eac3abd
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c1/TestNullArrayClone.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2024, 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 8302850
+ * @summary Tests that an array clone call that has been compiled with C1
+ *          handles null values correctly.
+ * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:TieredStopAtLevel=1
+ *                   -XX:CompileOnly=compiler.c1.TestNullArrayClone::testClone* -XX:+UnlockExperimentalVMOptions
+ *                   compiler.c1.TestNullArrayClone
+ */
+package compiler.c1;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+public class TestNullArrayClone {
+    static final int ITER = 2000; // ~ Tier3CompileThreshold
+    static final int ARRAY_SIZE = 999;
+
+    public static void main(String[] args) {
+        testInts();
+        testLongs();
+        testBytes();
+    }
+
+    private static void testInts() {
+        final int[] arr = new int[ARRAY_SIZE];
+        for (int i = 0; i < arr.length; i++) {
+            arr[i] = ThreadLocalRandom.current().nextInt();
+        }
+
+        for (int i = 0; i < ITER; i++) {
+            int[] result = testClonePrimitiveInt(arr);
+            if (result.length != arr.length) {
+                throw new RuntimeException("Unexpected clone length: source array length " + arr.length + " != clone array length " + result.length);
+            }
+            for (int j = 0; j < arr.length; j++) {
+                if (result[j] != arr[j]) {
+                    throw new RuntimeException("Unexpected result: " + result[j] + " != " + j);
+                }
+            }
+        }
+
+        try {
+            testClonePrimitiveInt(null);
+            throw new RuntimeException("Expected NullPointerException to be thrown");
+        } catch (NullPointerException e) {
+        }
+    }
+
+    private static void testLongs() {
+        final long[] arr = new long[ARRAY_SIZE];
+        for (int i = 0; i < arr.length; i++) {
+            arr[i] = ThreadLocalRandom.current().nextLong();
+        }
+
+        for (int i = 0; i < ITER; i++) {
+            long[] result = testClonePrimitiveLong(arr);
+            if (result.length != arr.length) {
+                throw new RuntimeException("Unexpected clone length: source array length " + arr.length + " != clone array length " + result.length);
+            }
+            for (int j = 0; j < arr.length; j++) {
+                if (result[j] != arr[j]) {
+                    throw new RuntimeException("Unexpected result: " + result[j] + " != " + j);
+                }
+            }
+        }
+
+        try {
+            testClonePrimitiveLong(null);
+            throw new RuntimeException("Expected NullPointerException to be thrown");
+        } catch (NullPointerException e) {
+        }
+    }
+
+    private static void testBytes() {
+        final byte[] arr = new byte[ARRAY_SIZE];
+        for (int i = 0; i < arr.length; i++) {
+            arr[i] = (byte) ThreadLocalRandom.current().nextInt();
+        }
+
+        for (int i = 0; i < ITER; i++) {
+            byte[] result = testClonePrimitiveBytes(arr);
+            if (result.length != arr.length) {
+                throw new RuntimeException("Unexpected clone length: source array length " + arr.length + " != clone array length " + result.length);
+            }
+            for (int j = 0; j < arr.length; j++) {
+                if (result[j] != arr[j]) {
+                    throw new RuntimeException("Unexpected result: " + result[j] + " != " + j);
+                }
+            }
+        }
+
+        try {
+            testClonePrimitiveBytes(null);
+            throw new RuntimeException("Expected NullPointerException to be thrown");
+        } catch (NullPointerException e) {
+        }
+    }
+
+    static int[] testClonePrimitiveInt(int[] ints) {
+        return ints.clone();
+    }
+
+    static long[] testClonePrimitiveLong(long[] longs) {
+        return longs.clone();
+    }
+
+    static byte[] testClonePrimitiveBytes(byte[] bytes) {
+        return bytes.clone();
+    }
+}

From 957eb611ce2531a3fcc764813ad1e0776887fdda Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yzheng@openjdk.org>
Date: Wed, 15 May 2024 09:35:11 +0000
Subject: [PATCH 435/486] 8331429: [JVMCI] Cleanup JVMCIRuntime allocation
 routines

Reviewed-by: dlong, dnsimon
---
 src/hotspot/share/gc/shared/memAllocator.hpp | 22 +++----
 src/hotspot/share/jvmci/jvmciRuntime.cpp     | 65 ++++++++------------
 src/hotspot/share/jvmci/jvmciRuntime.hpp     | 34 +++-------
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp  | 63 +++++++++----------
 4 files changed, 71 insertions(+), 113 deletions(-)

diff --git a/src/hotspot/share/gc/shared/memAllocator.hpp b/src/hotspot/share/gc/shared/memAllocator.hpp
index f299dd633e5..a0450af4450 100644
--- a/src/hotspot/share/gc/shared/memAllocator.hpp
+++ b/src/hotspot/share/gc/shared/memAllocator.hpp
@@ -125,23 +125,17 @@ class InternalOOMEMark: public StackObj {
 
  public:
   explicit InternalOOMEMark(JavaThread* thread) {
-    if (thread != nullptr) {
-      _outer = thread->is_in_internal_oome_mark();
-      thread->set_is_in_internal_oome_mark(true);
-      _thread = thread;
-    } else {
-      _outer = false;
-      _thread = nullptr;
-    }
+    assert(thread != nullptr, "nullptr is not supported");
+    _outer = thread->is_in_internal_oome_mark();
+    thread->set_is_in_internal_oome_mark(true);
+    _thread = thread;
   }
 
   ~InternalOOMEMark() {
-    if (_thread != nullptr) {
-      // Check that only InternalOOMEMark sets
-      // JavaThread::_is_in_internal_oome_mark
-      assert(_thread->is_in_internal_oome_mark(), "must be");
-      _thread->set_is_in_internal_oome_mark(_outer);
-    }
+    // Check that only InternalOOMEMark sets
+    // JavaThread::_is_in_internal_oome_mark
+    assert(_thread->is_in_internal_oome_mark(), "must be");
+    _thread->set_is_in_internal_oome_mark(_outer);
   }
 
   JavaThread* thread() const  { return _thread; }
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 99f427ee168..9dc0e381df9 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -102,7 +102,7 @@ class RetryableAllocationMark {
  private:
    InternalOOMEMark _iom;
  public:
-  RetryableAllocationMark(JavaThread* thread, bool activate) : _iom(activate ? thread : nullptr) {}
+  RetryableAllocationMark(JavaThread* thread) : _iom(thread) {}
   ~RetryableAllocationMark() {
     JavaThread* THREAD = _iom.thread(); // For exception macros.
     if (THREAD != nullptr) {
@@ -117,34 +117,29 @@ class RetryableAllocationMark {
   }
 };
 
-JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_instance_common(JavaThread* current, Klass* klass, bool null_on_fail))
+JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_instance_or_null(JavaThread* current, Klass* klass))
   JRT_BLOCK;
   assert(klass->is_klass(), "not a class");
   Handle holder(current, klass->klass_holder()); // keep the klass alive
   InstanceKlass* h = InstanceKlass::cast(klass);
   {
-    RetryableAllocationMark ram(current, null_on_fail);
+    RetryableAllocationMark ram(current);
     h->check_valid_for_instantiation(true, CHECK);
-    oop obj;
-    if (null_on_fail) {
-      if (!h->is_initialized()) {
-        // Cannot re-execute class initialization without side effects
-        // so return without attempting the initialization
-        return;
-      }
-    } else {
-      // make sure klass is initialized
-      h->initialize(CHECK);
+    if (!h->is_initialized()) {
+      // Cannot re-execute class initialization without side effects
+      // so return without attempting the initialization
+      current->set_vm_result(nullptr);
+      return;
     }
     // allocate instance and return via TLS
-    obj = h->allocate_instance(CHECK);
+    oop obj = h->allocate_instance(CHECK);
     current->set_vm_result(obj);
   }
   JRT_BLOCK_END;
   SharedRuntime::on_slowpath_allocation_exit(current);
 JRT_END
 
-JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array_common(JavaThread* current, Klass* array_klass, jint length, bool null_on_fail))
+JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array_or_null(JavaThread* current, Klass* array_klass, jint length))
   JRT_BLOCK;
   // Note: no handle for klass needed since they are not used
   //       anymore after new_objArray() and no GC can happen before.
@@ -153,27 +148,21 @@ JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array_common(JavaThread* current, Klass*
   oop obj;
   if (array_klass->is_typeArray_klass()) {
     BasicType elt_type = TypeArrayKlass::cast(array_klass)->element_type();
-    RetryableAllocationMark ram(current, null_on_fail);
+    RetryableAllocationMark ram(current);
     obj = oopFactory::new_typeArray(elt_type, length, CHECK);
   } else {
     Handle holder(current, array_klass->klass_holder()); // keep the klass alive
     Klass* elem_klass = ObjArrayKlass::cast(array_klass)->element_klass();
-    RetryableAllocationMark ram(current, null_on_fail);
+    RetryableAllocationMark ram(current);
     obj = oopFactory::new_objArray(elem_klass, length, CHECK);
   }
   // This is pretty rare but this runtime patch is stressful to deoptimization
   // if we deoptimize here so force a deopt to stress the path.
   if (DeoptimizeALot) {
     static int deopts = 0;
-    // Alternate between deoptimizing and raising an error (which will also cause a deopt)
     if (deopts++ % 2 == 0) {
-      if (null_on_fail) {
-        // Drop the allocation
-        obj = nullptr;
-      } else {
-        ResourceMark rm(current);
-        THROW(vmSymbols::java_lang_OutOfMemoryError());
-      }
+      // Drop the allocation
+      obj = nullptr;
     } else {
       deopt_caller();
     }
@@ -183,42 +172,38 @@ JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array_common(JavaThread* current, Klass*
   SharedRuntime::on_slowpath_allocation_exit(current);
 JRT_END
 
-JRT_ENTRY(void, JVMCIRuntime::new_multi_array_common(JavaThread* current, Klass* klass, int rank, jint* dims, bool null_on_fail))
+JRT_ENTRY(void, JVMCIRuntime::new_multi_array_or_null(JavaThread* current, Klass* klass, int rank, jint* dims))
   assert(klass->is_klass(), "not a class");
   assert(rank >= 1, "rank must be nonzero");
   Handle holder(current, klass->klass_holder()); // keep the klass alive
-  RetryableAllocationMark ram(current, null_on_fail);
+  RetryableAllocationMark ram(current);
   oop obj = ArrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK);
   current->set_vm_result(obj);
 JRT_END
 
-JRT_ENTRY(void, JVMCIRuntime::dynamic_new_array_common(JavaThread* current, oopDesc* element_mirror, jint length, bool null_on_fail))
-  RetryableAllocationMark ram(current, null_on_fail);
+JRT_ENTRY(void, JVMCIRuntime::dynamic_new_array_or_null(JavaThread* current, oopDesc* element_mirror, jint length))
+  RetryableAllocationMark ram(current);
   oop obj = Reflection::reflect_new_array(element_mirror, length, CHECK);
   current->set_vm_result(obj);
 JRT_END
 
-JRT_ENTRY(void, JVMCIRuntime::dynamic_new_instance_common(JavaThread* current, oopDesc* type_mirror, bool null_on_fail))
+JRT_ENTRY(void, JVMCIRuntime::dynamic_new_instance_or_null(JavaThread* current, oopDesc* type_mirror))
   InstanceKlass* klass = InstanceKlass::cast(java_lang_Class::as_Klass(type_mirror));
 
   if (klass == nullptr) {
     ResourceMark rm(current);
     THROW(vmSymbols::java_lang_InstantiationException());
   }
-  RetryableAllocationMark ram(current, null_on_fail);
+  RetryableAllocationMark ram(current);
 
   // Create new instance (the receiver)
   klass->check_valid_for_instantiation(false, CHECK);
 
-  if (null_on_fail) {
-    if (!klass->is_initialized()) {
-      // Cannot re-execute class initialization without side effects
-      // so return without attempting the initialization
-      return;
-    }
-  } else {
-    // Make sure klass gets initialized
-    klass->initialize(CHECK);
+  if (!klass->is_initialized()) {
+    // Cannot re-execute class initialization without side effects
+    // so return without attempting the initialization
+    current->set_vm_result(nullptr);
+    return;
   }
 
   oop obj = klass->allocate_instance(CHECK);
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp
index 6a920eb8c70..123cfde15ac 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp
@@ -504,34 +504,16 @@ class JVMCIRuntime: public CHeapObj<mtJVMCI> {
 
   static BasicType kindToBasicType(const Handle& kind, TRAPS);
 
-  static void new_instance_common(JavaThread* current, Klass* klass, bool null_on_fail);
-  static void new_array_common(JavaThread* current, Klass* klass, jint length, bool null_on_fail);
-  static void new_multi_array_common(JavaThread* current, Klass* klass, int rank, jint* dims, bool null_on_fail);
-  static void dynamic_new_array_common(JavaThread* current, oopDesc* element_mirror, jint length, bool null_on_fail);
-  static void dynamic_new_instance_common(JavaThread* current, oopDesc* type_mirror, bool null_on_fail);
-
   // The following routines are called from compiled JVMCI code
 
-  // When allocation fails, these stubs:
-  // 1. Exercise -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError handling and also
-  //    post a JVMTI_EVENT_RESOURCE_EXHAUSTED event if the failure is an OutOfMemroyError
-  // 2. Return null with a pending exception.
-  // Compiled code must ensure these stubs are not called twice for the same allocation
-  // site due to the non-repeatable side effects in the case of OOME.
-  static void new_instance(JavaThread* current, Klass* klass) { new_instance_common(current, klass, false); }
-  static void new_array(JavaThread* current, Klass* klass, jint length) { new_array_common(current, klass, length, false); }
-  static void new_multi_array(JavaThread* current, Klass* klass, int rank, jint* dims) { new_multi_array_common(current, klass, rank, dims, false); }
-  static void dynamic_new_array(JavaThread* current, oopDesc* element_mirror, jint length) { dynamic_new_array_common(current, element_mirror, length, false); }
-  static void dynamic_new_instance(JavaThread* current, oopDesc* type_mirror) { dynamic_new_instance_common(current, type_mirror, false); }
-
-  // When allocation fails, these stubs return null and have no pending exception. Compiled code
-  // can use these stubs if a failed allocation will be retried (e.g., by deoptimizing and
-  // re-executing in the interpreter).
-  static void new_instance_or_null(JavaThread* thread, Klass* klass) { new_instance_common(thread, klass, true); }
-  static void new_array_or_null(JavaThread* thread, Klass* klass, jint length) { new_array_common(thread, klass, length, true); }
-  static void new_multi_array_or_null(JavaThread* thread, Klass* klass, int rank, jint* dims) { new_multi_array_common(thread, klass, rank, dims, true); }
-  static void dynamic_new_array_or_null(JavaThread* thread, oopDesc* element_mirror, jint length) { dynamic_new_array_common(thread, element_mirror, length, true); }
-  static void dynamic_new_instance_or_null(JavaThread* thread, oopDesc* type_mirror) { dynamic_new_instance_common(thread, type_mirror, true); }
+  // When allocation fails, these stubs return null and have no pending OutOfMemoryError exception.
+  // Compiled code can use these stubs if a failed allocation will be retried (e.g., by deoptimizing
+  // and re-executing in the interpreter).
+  static void new_instance_or_null(JavaThread* thread, Klass* klass);
+  static void new_array_or_null(JavaThread* thread, Klass* klass, jint length);
+  static void new_multi_array_or_null(JavaThread* thread, Klass* klass, int rank, jint* dims);
+  static void dynamic_new_array_or_null(JavaThread* thread, oopDesc* element_mirror, jint length);
+  static void dynamic_new_instance_or_null(JavaThread* thread, oopDesc* type_mirror);
 
   static void vm_message(jboolean vmError, jlong format, jlong v1, jlong v2, jlong v3);
   static jint identity_hash_code(JavaThread* current, oopDesc* obj);
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index cadbba27f6e..035c1dd1ce9 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -251,6 +251,8 @@
   nonstatic_field(Klass,                       _modifier_flags,                               jint)                                  \
   nonstatic_field(Klass,                       _access_flags,                                 AccessFlags)                           \
   nonstatic_field(Klass,                       _class_loader_data,                            ClassLoaderData*)                      \
+  nonstatic_field(Klass,                       _bitmap,                                       uintx)                                 \
+  nonstatic_field(Klass,                       _hash_slot,                                    uint8_t)                               \
                                                                                                                                      \
   nonstatic_field(LocalVariableTableElement,   start_bci,                                     u2)                                    \
   nonstatic_field(LocalVariableTableElement,   length,                                        u2)                                    \
@@ -381,6 +383,7 @@
   static_field(StubRoutines,                _bigIntegerRightShiftWorker,                      address)                               \
   static_field(StubRoutines,                _bigIntegerLeftShiftWorker,                       address)                               \
   static_field(StubRoutines,                _cont_thaw,                                       address)                               \
+  static_field(StubRoutines,                _lookup_secondary_supers_table_slow_path_stub,    address)                               \
                                                                                                                                      \
   nonstatic_field(Thread,                   _tlab,                                            ThreadLocalAllocBuffer)                \
   nonstatic_field(Thread,                   _allocated_bytes,                                 jlong)                                 \
@@ -800,39 +803,33 @@
   declare_function(Deoptimization::uncommon_trap)                         \
   declare_function(Deoptimization::unpack_frames)                         \
                                                                           \
-  declare_function(JVMCIRuntime::new_instance) \
-  declare_function(JVMCIRuntime::new_array) \
-  declare_function(JVMCIRuntime::new_multi_array) \
-  declare_function(JVMCIRuntime::dynamic_new_array) \
-  declare_function(JVMCIRuntime::dynamic_new_instance) \
-  \
-  declare_function(JVMCIRuntime::new_instance_or_null) \
-  declare_function(JVMCIRuntime::new_array_or_null) \
-  declare_function(JVMCIRuntime::new_multi_array_or_null) \
-  declare_function(JVMCIRuntime::dynamic_new_array_or_null) \
-  declare_function(JVMCIRuntime::dynamic_new_instance_or_null) \
-  \
-  declare_function(JVMCIRuntime::invoke_static_method_one_arg) \
-  \
-  declare_function(JVMCIRuntime::vm_message) \
-  declare_function(JVMCIRuntime::identity_hash_code) \
-  declare_function(JVMCIRuntime::exception_handler_for_pc) \
-  declare_function(JVMCIRuntime::monitorenter) \
-  declare_function(JVMCIRuntime::monitorexit) \
-  declare_function(JVMCIRuntime::object_notify) \
-  declare_function(JVMCIRuntime::object_notifyAll) \
-  declare_function(JVMCIRuntime::throw_and_post_jvmti_exception) \
-  declare_function(JVMCIRuntime::throw_klass_external_name_exception) \
-  declare_function(JVMCIRuntime::throw_class_cast_exception) \
-  declare_function(JVMCIRuntime::log_primitive) \
-  declare_function(JVMCIRuntime::log_object) \
-  declare_function(JVMCIRuntime::log_printf) \
-  declare_function(JVMCIRuntime::vm_error) \
-  declare_function(JVMCIRuntime::load_and_clear_exception) \
-  G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_pre)) \
-  G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_post)) \
-  declare_function(JVMCIRuntime::validate_object) \
-  \
+  declare_function(JVMCIRuntime::new_instance_or_null)                    \
+  declare_function(JVMCIRuntime::new_array_or_null)                       \
+  declare_function(JVMCIRuntime::new_multi_array_or_null)                 \
+  declare_function(JVMCIRuntime::dynamic_new_array_or_null)               \
+  declare_function(JVMCIRuntime::dynamic_new_instance_or_null)            \
+                                                                          \
+  declare_function(JVMCIRuntime::invoke_static_method_one_arg)            \
+                                                                          \
+  declare_function(JVMCIRuntime::vm_message)                              \
+  declare_function(JVMCIRuntime::identity_hash_code)                      \
+  declare_function(JVMCIRuntime::exception_handler_for_pc)                \
+  declare_function(JVMCIRuntime::monitorenter)                            \
+  declare_function(JVMCIRuntime::monitorexit)                             \
+  declare_function(JVMCIRuntime::object_notify)                           \
+  declare_function(JVMCIRuntime::object_notifyAll)                        \
+  declare_function(JVMCIRuntime::throw_and_post_jvmti_exception)          \
+  declare_function(JVMCIRuntime::throw_klass_external_name_exception)     \
+  declare_function(JVMCIRuntime::throw_class_cast_exception)              \
+  declare_function(JVMCIRuntime::log_primitive)                           \
+  declare_function(JVMCIRuntime::log_object)                              \
+  declare_function(JVMCIRuntime::log_printf)                              \
+  declare_function(JVMCIRuntime::vm_error)                                \
+  declare_function(JVMCIRuntime::load_and_clear_exception)                \
+  G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_pre))            \
+  G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_post))           \
+  declare_function(JVMCIRuntime::validate_object)                         \
+                                                                          \
   declare_function(JVMCIRuntime::test_deoptimize_call_int)
 
 

From 1a944478a26a766f5a573a1236b642d8e7b0685c Mon Sep 17 00:00:00 2001
From: Evgeny Astigeevich <eastigeevich@openjdk.org>
Date: Wed, 15 May 2024 09:56:05 +0000
Subject: [PATCH 436/486] 8332111: [BACKOUT] A way to align already compiled
 methods with compiler directives

Reviewed-by: shade, kvn
---
 src/hotspot/share/ci/ciEnv.cpp                |  20 +--
 src/hotspot/share/code/codeCache.cpp          |  62 --------
 src/hotspot/share/code/codeCache.hpp          |   3 -
 src/hotspot/share/compiler/compileBroker.cpp  |  26 ++--
 src/hotspot/share/compiler/compileTask.hpp    |   4 +-
 .../share/compiler/compilerDirectives.cpp     |  19 ---
 .../share/compiler/compilerDirectives.hpp     |   1 -
 src/hotspot/share/oops/method.hpp             |   8 -
 src/hotspot/share/oops/methodFlags.hpp        |   1 -
 src/hotspot/share/runtime/mutexLocker.cpp     |   2 +-
 .../share/services/diagnosticCommand.cpp      |  67 +--------
 .../share/services/diagnosticCommand.hpp      |  41 +-----
 .../compiler/CompilerDirectivesDCMDTest.java  |  10 +-
 .../dcmd/compiler/DirectivesRefreshTest.java  | 138 ------------------
 .../dcmd/compiler/refresh_control.txt         |   8 -
 15 files changed, 33 insertions(+), 377 deletions(-)
 delete mode 100644 test/hotspot/jtreg/serviceability/dcmd/compiler/DirectivesRefreshTest.java
 delete mode 100644 test/hotspot/jtreg/serviceability/dcmd/compiler/refresh_control.txt

diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index 5861ac3ac33..6d11a436f65 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1139,15 +1139,17 @@ void ciEnv::register_method(ciMethod* target,
 #endif
 
       if (entry_bci == InvocationEntryBci) {
-        // If there is an old version we're done with it
-        nmethod* old = method->code();
-        if (TraceMethodReplacement && old != nullptr) {
-          ResourceMark rm;
-          char *method_name = method->name_and_sig_as_C_string();
-          tty->print_cr("Replacing method %s", method_name);
-        }
-        if (old != nullptr) {
-          old->make_not_used();
+        if (TieredCompilation) {
+          // If there is an old version we're done with it
+          nmethod* old = method->code();
+          if (TraceMethodReplacement && old != nullptr) {
+            ResourceMark rm;
+            char *method_name = method->name_and_sig_as_C_string();
+            tty->print_cr("Replacing method %s", method_name);
+          }
+          if (old != nullptr) {
+            old->make_not_used();
+          }
         }
 
         LogTarget(Info, nmethod, install) lt;
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index 73eca19f086..20583ce492d 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -34,7 +34,6 @@
 #include "compiler/compilationPolicy.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
-#include "compiler/compilerDirectives.hpp"
 #include "compiler/oopMap.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
@@ -1330,67 +1329,6 @@ void CodeCache::mark_all_nmethods_for_evol_deoptimization(DeoptimizationScope* d
 
 #endif // INCLUDE_JVMTI
 
-void CodeCache::mark_directives_matches(bool top_only) {
-  MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-  Thread *thread = Thread::current();
-  HandleMark hm(thread);
-
-  NMethodIterator iter(NMethodIterator::not_unloading);
-  while(iter.next()) {
-    nmethod* nm = iter.method();
-    methodHandle mh(thread, nm->method());
-    if (DirectivesStack::hasMatchingDirectives(mh, top_only)) {
-      ResourceMark rm;
-      log_trace(codecache)("Mark because of matching directives %s", mh->external_name());
-      mh->set_has_matching_directives();
-    }
-  }
-}
-
-void CodeCache::recompile_marked_directives_matches() {
-  Thread *thread = Thread::current();
-  HandleMark hm(thread);
-
-  // Try the max level and let the directives be applied during the compilation.
-  int comp_level = CompilationPolicy::highest_compile_level();
-  RelaxedNMethodIterator iter(RelaxedNMethodIterator::not_unloading);
-  while(iter.next()) {
-    nmethod* nm = iter.method();
-    methodHandle mh(thread, nm->method());
-    if (mh->has_matching_directives()) {
-      ResourceMark rm;
-      mh->clear_directive_flags();
-      bool deopt = false;
-
-      if (!nm->is_osr_method()) {
-        log_trace(codecache)("Recompile to level %d because of matching directives %s",
-                             comp_level, mh->external_name());
-        nmethod * comp_nm = CompileBroker::compile_method(mh, InvocationEntryBci, comp_level,
-                                                          methodHandle(), 0,
-                                                          CompileTask::Reason_DirectivesChanged,
-                                                          (JavaThread*)thread);
-        if (comp_nm == nullptr) {
-          log_trace(codecache)("Recompilation to level %d failed, deoptimize %s",
-                               comp_level, mh->external_name());
-          deopt = true;
-        }
-      } else {
-        log_trace(codecache)("Deoptimize OSR %s", mh->external_name());
-        deopt = true;
-      }
-      // For some reason the method cannot be compiled by C2, e.g. the new directives forbid it.
-      // Deoptimize the method and let the usual hotspot logic do the rest.
-      if (deopt) {
-        if (!nm->has_been_deoptimized() && nm->can_be_deoptimized()) {
-          nm->make_not_entrant();
-          nm->make_deoptimized();
-        }
-      }
-      gc_on_allocation(); // Flush unused methods from CodeCache if required.
-    }
-  }
-}
-
 // Mark methods for deopt (if safe or possible).
 void CodeCache::mark_all_nmethods_for_deoptimization(DeoptimizationScope* deopt_scope) {
   MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
diff --git a/src/hotspot/share/code/codeCache.hpp b/src/hotspot/share/code/codeCache.hpp
index 7d8835abd11..8fcbf32b644 100644
--- a/src/hotspot/share/code/codeCache.hpp
+++ b/src/hotspot/share/code/codeCache.hpp
@@ -295,9 +295,6 @@ class CodeCache : AllStatic {
   static void mark_for_deoptimization(DeoptimizationScope* deopt_scope, Method* dependee);
   static void make_marked_nmethods_deoptimized();
 
-  static void mark_directives_matches(bool top_only = false);
-  static void recompile_marked_directives_matches();
-
   // Marks dependents during classloading
   static void mark_dependents_on(DeoptimizationScope* deopt_scope, InstanceKlass* dependee);
 
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index ddd5b2f0eb7..45b0b331e25 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -1172,13 +1172,11 @@ void CompileBroker::compile_method_base(const methodHandle& method,
     tty->cr();
   }
 
-  if (compile_reason != CompileTask::Reason_DirectivesChanged) {
-    // A request has been made for compilation.  Before we do any
-    // real work, check to see if the method has been compiled
-    // in the meantime with a definitive result.
-    if (compilation_is_complete(method, osr_bci, comp_level)) {
-      return;
-    }
+  // A request has been made for compilation.  Before we do any
+  // real work, check to see if the method has been compiled
+  // in the meantime with a definitive result.
+  if (compilation_is_complete(method, osr_bci, comp_level)) {
+    return;
   }
 
 #ifndef PRODUCT
@@ -1223,13 +1221,11 @@ void CompileBroker::compile_method_base(const methodHandle& method,
       return;
     }
 
-    if (compile_reason != CompileTask::Reason_DirectivesChanged) {
-      // We need to check again to see if the compilation has
-      // completed.  A previous compilation may have registered
-      // some result.
-      if (compilation_is_complete(method, osr_bci, comp_level)) {
-        return;
-      }
+    // We need to check again to see if the compilation has
+    // completed.  A previous compilation may have registered
+    // some result.
+    if (compilation_is_complete(method, osr_bci, comp_level)) {
+      return;
     }
 
     // We now know that this compilation is not pending, complete,
@@ -1378,7 +1374,7 @@ nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
   if (osr_bci == InvocationEntryBci) {
     // standard compilation
     nmethod* method_code = method->code();
-    if (method_code != nullptr && (compile_reason != CompileTask::Reason_DirectivesChanged)) {
+    if (method_code != nullptr) {
       if (compilation_is_complete(method, osr_bci, comp_level)) {
         return method_code;
       }
diff --git a/src/hotspot/share/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp
index 137e9843c35..37459bd0ff5 100644
--- a/src/hotspot/share/compiler/compileTask.hpp
+++ b/src/hotspot/share/compiler/compileTask.hpp
@@ -62,7 +62,6 @@ class CompileTask : public CHeapObj<mtCompiler> {
       Reason_Whitebox,         // Whitebox API
       Reason_MustBeCompiled,   // Used for -Xcomp or AlwaysCompileLoopMethods (see CompilationPolicy::must_be_compiled())
       Reason_Bootstrap,        // JVMCI bootstrap
-      Reason_DirectivesChanged, // Changed CompilerDirectivesStack
       Reason_Count
   };
 
@@ -75,8 +74,7 @@ class CompileTask : public CHeapObj<mtCompiler> {
       "replay",
       "whitebox",
       "must_be_compiled",
-      "bootstrap",
-      "directives_changed"
+      "bootstrap"
     };
     return reason_names[compile_reason];
   }
diff --git a/src/hotspot/share/compiler/compilerDirectives.cpp b/src/hotspot/share/compiler/compilerDirectives.cpp
index f5ccd9e69e9..b48eb4fb817 100644
--- a/src/hotspot/share/compiler/compilerDirectives.cpp
+++ b/src/hotspot/share/compiler/compilerDirectives.cpp
@@ -747,25 +747,6 @@ void DirectivesStack::release(CompilerDirectives* dir) {
   }
 }
 
-bool DirectivesStack::hasMatchingDirectives(const methodHandle& method, bool top_only) {
-  assert(_depth > 0, "Must never be empty");
-  MutexLocker locker(DirectivesStack_lock, Mutex::_no_safepoint_check_flag);
-
-  CompilerDirectives* dir = _top;
-  assert(dir != nullptr, "Must be initialized");
-
-  while (dir != nullptr) {
-    if (!dir->is_default_directive() && dir->match(method)) {
-      return true;
-    }
-    if (top_only) {
-      break;
-    }
-    dir = dir->next();
-  }
-  return false;
-}
-
 DirectiveSet* DirectivesStack::getMatchingDirective(const methodHandle& method, AbstractCompiler *comp) {
   assert(_depth > 0, "Must never be empty");
 
diff --git a/src/hotspot/share/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp
index 0b1090406b9..bf15fe9c713 100644
--- a/src/hotspot/share/compiler/compilerDirectives.hpp
+++ b/src/hotspot/share/compiler/compilerDirectives.hpp
@@ -114,7 +114,6 @@ private:
 public:
   static void init();
   static DirectiveSet* getMatchingDirective(const methodHandle& mh, AbstractCompiler* comp);
-  static bool hasMatchingDirectives(const methodHandle& method, bool top_only = false);
   static DirectiveSet* getDefaultDirective(AbstractCompiler* comp);
   static void push(CompilerDirectives* directive);
   static void pop(int count);
diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
index b5634c8a099..319a8ff1557 100644
--- a/src/hotspot/share/oops/method.hpp
+++ b/src/hotspot/share/oops/method.hpp
@@ -811,14 +811,6 @@ public:
     return _method_counters;
   }
 
-  // Clear the flags related to compiler directives that were set by the compilerBroker,
-  // because the directives can be updated.
-  void clear_directive_flags() {
-    set_has_matching_directives(false);
-    clear_is_not_c1_compilable();
-    clear_is_not_c2_compilable();
-  }
-
   void clear_is_not_c1_compilable()           { set_is_not_c1_compilable(false); }
   void clear_is_not_c2_compilable()           { set_is_not_c2_compilable(false); }
   void clear_is_not_c2_osr_compilable()       { set_is_not_c2_osr_compilable(false); }
diff --git a/src/hotspot/share/oops/methodFlags.hpp b/src/hotspot/share/oops/methodFlags.hpp
index 0a5ce56599a..25d597b06ef 100644
--- a/src/hotspot/share/oops/methodFlags.hpp
+++ b/src/hotspot/share/oops/methodFlags.hpp
@@ -58,7 +58,6 @@ class MethodFlags {
    status(has_loops_flag              , 1 << 13) /* Method has loops */ \
    status(has_loops_flag_init         , 1 << 14) /* The loop flag has been initialized */ \
    status(on_stack_flag               , 1 << 15) /* RedefineClasses support to keep Metadata from being cleaned */ \
-   status(has_matching_directives     , 1 << 16) /* Temporary mark, used only when methods are to be refreshed to reflect a compiler directives update */ \
    /* end of list */
 
 #define M_STATUS_ENUM_NAME(name, value)    _misc_##name = value,
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index dec40136336..2587375c52e 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -268,6 +268,7 @@ void mutex_init() {
   MUTEX_DEFN(CompiledIC_lock                 , PaddedMutex  , nosafepoint);  // locks VtableStubs_lock, InlineCacheBuffer_lock
   MUTEX_DEFN(MethodCompileQueue_lock         , PaddedMonitor, safepoint);
   MUTEX_DEFN(CompileStatistics_lock          , PaddedMutex  , safepoint);
+  MUTEX_DEFN(DirectivesStack_lock            , PaddedMutex  , nosafepoint);
 
   MUTEX_DEFN(JvmtiThreadState_lock           , PaddedMutex  , safepoint);   // Used by JvmtiThreadState/JvmtiEventController
   MUTEX_DEFN(EscapeBarrier_lock              , PaddedMonitor, nosafepoint); // Used to synchronize object reallocation/relocking triggered by JVMTI
@@ -325,7 +326,6 @@ void mutex_init() {
   MUTEX_DEFL(InlineCacheBuffer_lock         , PaddedMutex  , CompiledIC_lock);
   MUTEX_DEFL(VtableStubs_lock               , PaddedMutex  , CompiledIC_lock);  // Also holds DumpTimeTable_lock
   MUTEX_DEFL(CodeCache_lock                 , PaddedMonitor, VtableStubs_lock);
-  MUTEX_DEFL(DirectivesStack_lock           , PaddedMutex  , CodeCache_lock);
   MUTEX_DEFL(NMethodState_lock              , PaddedMutex  , CodeCache_lock);
 
   MUTEX_DEFL(Threads_lock                   , PaddedMonitor, CompileThread_lock, true);
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 06fcad88d06..6e6a7172290 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -144,7 +144,6 @@ void DCmd::register_dcmds(){
 
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesPrintDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesAddDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesReplaceDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesRemoveDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesClearDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilationMemoryStatisticDCmd>(full_export, true, false));
@@ -924,81 +923,21 @@ void CompilerDirectivesPrintDCmd::execute(DCmdSource source, TRAPS) {
 
 CompilerDirectivesAddDCmd::CompilerDirectivesAddDCmd(outputStream* output, bool heap) :
                            DCmdWithParser(output, heap),
-  _filename("filename", "Name of the directives file", "STRING", true),
-  _refresh("-r", "Refresh affected methods", "BOOLEAN", false, "false") {
-
+  _filename("filename","Name of the directives file", "STRING",true) {
   _dcmdparser.add_dcmd_argument(&_filename);
-  _dcmdparser.add_dcmd_option(&_refresh);
 }
 
 void CompilerDirectivesAddDCmd::execute(DCmdSource source, TRAPS) {
   DirectivesParser::parse_from_file(_filename.value(), output(), true);
-  if (_refresh.value()) {
-    CodeCache::mark_directives_matches(true);
-    CodeCache::recompile_marked_directives_matches();
-  }
-}
-
-CompilerDirectivesReplaceDCmd::CompilerDirectivesReplaceDCmd(outputStream* output, bool heap) :
-                           DCmdWithParser(output, heap),
-  _filename("filename", "Name of the directives file", "STRING", true),
-  _refresh("-r", "Refresh affected methods", "BOOLEAN", false, "false") {
-
-  _dcmdparser.add_dcmd_argument(&_filename);
-  _dcmdparser.add_dcmd_option(&_refresh);
-}
-
-void CompilerDirectivesReplaceDCmd::execute(DCmdSource source, TRAPS) {
-  // Need to mark the methods twice, to account for the method that doesn't match
-  // the directives anymore
-  if (_refresh.value()) {
-    CodeCache::mark_directives_matches();
-
-    DirectivesStack::clear();
-    DirectivesParser::parse_from_file(_filename.value(), output(), true);
-
-    CodeCache::mark_directives_matches();
-    CodeCache::recompile_marked_directives_matches();
-  } else {
-    DirectivesStack::clear();
-    DirectivesParser::parse_from_file(_filename.value(), output(), true);
-  }
-}
-
-CompilerDirectivesRemoveDCmd::CompilerDirectivesRemoveDCmd(outputStream* output, bool heap) :
-                           DCmdWithParser(output, heap),
-  _refresh("-r", "Refresh affected methods", "BOOLEAN", false, "false") {
-
-  _dcmdparser.add_dcmd_option(&_refresh);
 }
 
 void CompilerDirectivesRemoveDCmd::execute(DCmdSource source, TRAPS) {
-  if (_refresh.value()) {
-    CodeCache::mark_directives_matches(true);
-    DirectivesStack::pop(1);
-    CodeCache::recompile_marked_directives_matches();
-  } else {
-    DirectivesStack::pop(1);
-  }
-}
-
-CompilerDirectivesClearDCmd::CompilerDirectivesClearDCmd(outputStream* output, bool heap) :
-                           DCmdWithParser(output, heap),
-  _refresh("-r", "Refresh affected methods", "BOOLEAN", false, "false") {
-
-  _dcmdparser.add_dcmd_option(&_refresh);
+  DirectivesStack::pop(1);
 }
 
 void CompilerDirectivesClearDCmd::execute(DCmdSource source, TRAPS) {
-  if (_refresh.value()) {
-    CodeCache::mark_directives_matches();
-    DirectivesStack::clear();
-    CodeCache::recompile_marked_directives_matches();
-  } else {
-    DirectivesStack::clear();
-  }
+  DirectivesStack::clear();
 }
-
 #if INCLUDE_SERVICES
 ClassHierarchyDCmd::ClassHierarchyDCmd(outputStream* output, bool heap) :
                                        DCmdWithParser(output, heap),
diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp
index f87d6d277da..88a48970810 100644
--- a/src/hotspot/share/services/diagnosticCommand.hpp
+++ b/src/hotspot/share/services/diagnosticCommand.hpp
@@ -688,12 +688,9 @@ public:
   virtual void execute(DCmdSource source, TRAPS);
 };
 
-class CompilerDirectivesRemoveDCmd : public DCmdWithParser {
-protected:
-  DCmdArgument<bool> _refresh; // true if update should be forced after directives changes.
+class CompilerDirectivesRemoveDCmd : public DCmd {
 public:
-  static int num_arguments() { return 1; }
-  CompilerDirectivesRemoveDCmd(outputStream* output, bool heap);
+  CompilerDirectivesRemoveDCmd(outputStream* output, bool heap) : DCmd(output, heap) {}
   static const char* name() {
     return "Compiler.directives_remove";
   }
@@ -714,9 +711,8 @@ public:
 class CompilerDirectivesAddDCmd : public DCmdWithParser {
 protected:
   DCmdArgument<char*> _filename;
-  DCmdArgument<bool> _refresh; // true if update should be forced after directives changes.
 public:
-  static int num_arguments() { return 2; }
+  static int num_arguments() { return 1; }
   CompilerDirectivesAddDCmd(outputStream* output, bool heap);
   static const char* name() {
     return "Compiler.directives_add";
@@ -735,36 +731,9 @@ public:
   virtual void execute(DCmdSource source, TRAPS);
 };
 
-class CompilerDirectivesReplaceDCmd : public DCmdWithParser {
-protected:
-  DCmdArgument<char*> _filename;
-  DCmdArgument<bool> _refresh; // true if update should be forced after directives changes.
+class CompilerDirectivesClearDCmd : public DCmd {
 public:
-  static int num_arguments() { return 2; }
-  CompilerDirectivesReplaceDCmd(outputStream* output, bool heap);
-  static const char* name() {
-    return "Compiler.directives_replace";
-  }
-  static const char* description() {
-    return "Clear directives stack, and load new compiler directives from file.";
-  }
-  static const char* impact() {
-    return "Low";
-  }
-  static const JavaPermission permission() {
-    JavaPermission p = {"java.lang.management.ManagementPermission",
-                        "monitor", NULL};
-    return p;
-  }
-  virtual void execute(DCmdSource source, TRAPS);
-};
-
-class CompilerDirectivesClearDCmd : public DCmdWithParser {
-protected:
-  DCmdArgument<bool> _refresh; // true if update should be forced after directives changes.
-public:
-  static int num_arguments() { return 1; }
-  CompilerDirectivesClearDCmd(outputStream* output, bool heap);
+  CompilerDirectivesClearDCmd(outputStream* output, bool heap) : DCmd(output, heap) {}
   static const char* name() {
     return "Compiler.directives_clear";
   }
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java
index ee9a07f0adc..8d40423b5e8 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,14 +96,6 @@ public class CompilerDirectivesDCMDTest {
             Assert.fail("Expected three directives - found " + count);
         }
 
-        // Test replacement with some directives from file
-        output = executor.execute("Compiler.directives_replace " + filename);
-        output = executor.execute("Compiler.directives_print");
-        count = find(output, "Directive:");
-        if (count != 3) {
-            Assert.fail("Expected three directives - found " + count);
-        }
-
         // Test remove one directive
         output = executor.execute("Compiler.directives_remove");
         output = executor.execute("Compiler.directives_print");
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/DirectivesRefreshTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/DirectivesRefreshTest.java
deleted file mode 100644
index 2e6882b4ac2..00000000000
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/DirectivesRefreshTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2023, BELLSOFT. All rights reserved.
- * Copyright (c) 2023, 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 DirectivesRefreshTest
- * @summary Test of forced recompile after compiler directives changes by diagnostic command
- * @requires vm.compiler1.enabled & vm.compiler2.enabled
- * @library /test/lib /
- * @modules java.base/jdk.internal.misc
- *
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- *
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:-BackgroundCompilation
- *                   serviceability.dcmd.compiler.DirectivesRefreshTest
- */
-
-package serviceability.dcmd.compiler;
-
-import jdk.test.whitebox.WhiteBox;
-
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.dcmd.CommandExecutor;
-import jdk.test.lib.dcmd.JMXExecutor;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.lang.reflect.Method;
-import java.util.Random;
-
-import static jdk.test.lib.Asserts.assertEQ;
-
-import static compiler.whitebox.CompilerWhiteBoxTest.COMP_LEVEL_NONE;
-import static compiler.whitebox.CompilerWhiteBoxTest.COMP_LEVEL_SIMPLE;
-import static compiler.whitebox.CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION;
-
-public class DirectivesRefreshTest {
-
-    static Path cmdPath = Paths.get(System.getProperty("test.src", "."), "refresh_control.txt");
-    static WhiteBox wb = WhiteBox.getWhiteBox();
-    static Random random = new Random();
-
-    static Method method;
-    static CommandExecutor executor;
-
-    static int callable() {
-        int result = 0;
-        for (int i = 0; i < 100; i++) {
-            result += random.nextInt(100);
-        }
-        return result;
-    }
-
-    static void checkCompilationLevel(Method method, int level) {
-        assertEQ(wb.getMethodCompilationLevel(method), level, "Compilation level");
-    }
-
-    static void setup() throws Exception {
-        method = DirectivesRefreshTest.class.getDeclaredMethod("callable");
-        executor = new JMXExecutor();
-
-        System.out.println("Compilation with C2");
-
-        // Happens with fairly hot methods.
-        wb.enqueueMethodForCompilation(method, COMP_LEVEL_FULL_OPTIMIZATION);
-        checkCompilationLevel(method, COMP_LEVEL_FULL_OPTIMIZATION);
-    }
-
-    static void testDirectivesAddRefresh() {
-        System.out.println("Force forbid C2 via directive, method deoptimized");
-
-        var output = executor.execute("Compiler.directives_add -r " + cmdPath.toString());
-        output.stderrShouldBeEmpty().shouldContain("1 compiler directives added");
-        // Current handling of 'Exclude' for '-r' clears flags.
-        checkCompilationLevel(method, COMP_LEVEL_NONE);
-
-        System.out.println("C2 is excluded, re-compilation with C1");
-
-        // Sanity check for the directive.
-        wb.enqueueMethodForCompilation(method, COMP_LEVEL_FULL_OPTIMIZATION);
-        checkCompilationLevel(method, COMP_LEVEL_NONE);
-
-        // Happens with fairly hot methods.
-        wb.enqueueMethodForCompilation(method, COMP_LEVEL_SIMPLE);
-        checkCompilationLevel(method, COMP_LEVEL_SIMPLE);
-    }
-
-    static void testDirectivesClearRefresh() {
-        System.out.println("Re-compilation with C2 due to removed restriction");
-
-        var output = executor.execute("Compiler.directives_clear -r");
-        output.stderrShouldBeEmpty().stdoutShouldBeEmpty();
-
-        // No need to enqueue the method, "immediate" effect of '-r' without deoptimization.
-        checkCompilationLevel(method, COMP_LEVEL_FULL_OPTIMIZATION);
-    }
-
-    static void testDirectivesAddRegular() {
-        System.out.println("No changes if the restriction is not forced");
-
-        // According to original JEP 165, the directive will be handled
-        // "when a method is submitted for a compilation".
-        var output = executor.execute("Compiler.directives_add " + cmdPath.toString());
-        output.stderrShouldBeEmpty().shouldContain("1 compiler directives added");
-
-        // In this program the method is not called, and here it is not enqueued.
-        checkCompilationLevel(method, COMP_LEVEL_FULL_OPTIMIZATION);
-    }
-
-    public static void main(String[] args) throws Exception {
-        setup();
-        testDirectivesAddRefresh();
-        testDirectivesClearRefresh();
-        testDirectivesAddRegular();
-    }
-}
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/refresh_control.txt b/test/hotspot/jtreg/serviceability/dcmd/compiler/refresh_control.txt
deleted file mode 100644
index d6bcb91a11a..00000000000
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/refresh_control.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  {
-    match: "serviceability.dcmd.compiler.DirectivesRefreshTest::callable",
-    c2: {
-      Exclude: true
-    }
-  }
-]

From a5005c87c4d5598eb54e9824105767d833f9660b Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Wed, 15 May 2024 10:36:24 +0000
Subject: [PATCH 437/486] 8330814: Cleanups for KeepAliveCache tests

Reviewed-by: jpai, dfuchs
---
 .../net/www/http/KeepAliveCache/B5045306.java | 235 ++++++++++--------
 .../net/www/http/KeepAliveCache/B8291637.java |  67 ++---
 .../net/www/http/KeepAliveCache/B8293562.java |  34 +--
 .../KeepAliveCache/KeepAliveProperty.java     |  23 +-
 .../KeepAliveCache/KeepAliveTimerThread.java  |  21 +-
 5 files changed, 212 insertions(+), 168 deletions(-)

diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java b/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java
index 2d275ebfc9e..b9b9de57cdf 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,9 @@
 /*
  * @test
  * @bug 5045306 6356004 6993490 8255124
+ * @summary Http keep-alive implementation is not efficient
  * @library /test/lib
  * @run main/othervm B5045306
- * @summary Http keep-alive implementation is not efficient
  */
 
 import java.io.IOException;
@@ -42,14 +42,17 @@ import java.net.Proxy;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 
+import jdk.test.lib.net.URIBuilder;
+
 /* Part 1:
- * The http client makes a connection to a URL whos content contains a lot of
+ * The http client makes a connection to a URL whose content contains a lot of
  * data, more than can fit in the socket buffer. The client only reads
  * 1 byte of the data from the InputStream leaving behind more data than can
  * fit in the socket buffer. The client then makes a second call to the http
@@ -63,150 +66,166 @@ import com.sun.net.httpserver.HttpServer;
 
 public class B5045306 {
     static HttpServer server;
-
-    public static void main(String[] args) {
-        startHttpServer();
-        clientHttpCalls();
-    }
+    static ExecutorService executor = Executors.newSingleThreadExecutor();
 
     public static void startHttpServer() {
         try {
-            server = HttpServer.create(new InetSocketAddress(InetAddress.getLocalHost(), 0), 10, "/", new SimpleHttpTransactionHandler());
-            server.setExecutor(Executors.newSingleThreadExecutor());
-            server.start();
+            server = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 10, "/", new SimpleHttpTransactionHandler());
         } catch (IOException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
+        server.setExecutor(executor);
+        server.start();
+        System.out.println("http server listens on: " + server.getAddress());
     }
 
-    public static void clientHttpCalls() {
+    public static void stopHttpServer() {
+        server.stop(1);
+        executor.shutdown();
+    }
+
+    public static void clientHttpCalls() throws Exception {
         List<Throwable> uncaught = new ArrayList<>();
         Thread.setDefaultUncaughtExceptionHandler((t, ex) -> {
             uncaught.add(ex);
         });
-        try {
-            System.out.println("http server listen on: " + server.getAddress().getPort());
-            String hostAddr =  InetAddress.getLocalHost().getHostAddress();
-            if (hostAddr.indexOf(':') > -1) hostAddr = "[" + hostAddr + "]";
-            String baseURLStr = "http://" + hostAddr + ":" + server.getAddress().getPort() + "/";
 
-            URL bigDataURL = new URL (baseURLStr + "firstCall");
-            URL smallDataURL = new URL (baseURLStr + "secondCall");
+        URL bigDataURL = URIBuilder.newBuilder()
+                .scheme("http")
+                .loopback()
+                .port(server.getAddress().getPort())
+                .path("/firstCall")
+                .toURL();
 
-            HttpURLConnection uc = (HttpURLConnection)bigDataURL.openConnection(Proxy.NO_PROXY);
+        URL smallDataURL = URIBuilder.newBuilder()
+                .scheme("http")
+                .loopback()
+                .port(server.getAddress().getPort())
+                .path("/secondCall")
+                .toURL();
 
-            //Only read 1 byte of response data and close the stream
-            InputStream is = uc.getInputStream();
+        HttpURLConnection uc = (HttpURLConnection)bigDataURL.openConnection(Proxy.NO_PROXY);
+
+        // Only read 1 byte of response data and close the stream
+        try (InputStream is = uc.getInputStream()) {
             byte[] ba = new byte[1];
             is.read(ba);
-            is.close();
+        }
 
-            // Allow the KeepAliveStreamCleaner thread to read the data left behind and cache the connection.
-            try { Thread.sleep(2000); } catch (Exception e) {}
+        // Allow the KeepAliveStreamCleaner thread to read the data left behind and cache the connection.
+        try { Thread.sleep(2000); } catch (Exception e) {}
 
-            uc = (HttpURLConnection)smallDataURL.openConnection(Proxy.NO_PROXY);
-            uc.getResponseCode();
+        uc = (HttpURLConnection)smallDataURL.openConnection(Proxy.NO_PROXY);
+        uc.getResponseCode();
 
-            if (SimpleHttpTransactionHandler.failed)
-                throw new RuntimeException("Failed: Initial Keep Alive Connection is not being reused");
+        if (SimpleHttpTransactionHandler.failed)
+            throw new RuntimeException("Failed: Initial Keep Alive Connection is not being reused");
 
-            // Part 2
-            URL part2Url = new URL (baseURLStr + "part2");
-            uc = (HttpURLConnection)part2Url.openConnection(Proxy.NO_PROXY);
-            is = uc.getInputStream();
-            is.close();
+        // Part 2
+        URL part2Url = URIBuilder.newBuilder()
+                .scheme("http")
+                .loopback()
+                .port(server.getAddress().getPort())
+                .path("/part2")
+                .toURL();
 
-            // Allow the KeepAliveStreamCleaner thread to try and read the data left behind and cache the connection.
-            try { Thread.sleep(2000); } catch (Exception e) {}
+        uc = (HttpURLConnection)part2Url.openConnection(Proxy.NO_PROXY);
+        try (InputStream is = uc.getInputStream()) {}
 
-            ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
-            if (threadMXBean.isThreadCpuTimeSupported()) {
-                long[] threads = threadMXBean.getAllThreadIds();
-                ThreadInfo[] threadInfo = threadMXBean.getThreadInfo(threads);
-                for (int i=0; i<threadInfo.length; i++) {
-                    if (threadInfo[i].getThreadName().equals("Keep-Alive-SocketCleaner"))  {
-                        System.out.println("Found Keep-Alive-SocketCleaner thread");
-                        long threadID = threadInfo[i].getThreadId();
-                        long before = threadMXBean.getThreadCpuTime(threadID);
-                        try { Thread.sleep(2000); } catch (Exception e) {}
-                        long after = threadMXBean.getThreadCpuTime(threadID);
+        // Allow the KeepAliveStreamCleaner thread to try and read the data left behind and cache the connection.
+        try { Thread.sleep(2000); } catch (Exception e) {}
 
-                        if (before ==-1 || after == -1)
-                            break;  // thread has died, OK
+        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+        if (threadMXBean.isThreadCpuTimeSupported()) {
+            long[] threads = threadMXBean.getAllThreadIds();
+            ThreadInfo[] threadInfo = threadMXBean.getThreadInfo(threads);
+            for (int i = 0; i < threadInfo.length; i++) {
+                if (threadInfo[i].getThreadName().equals("Keep-Alive-SocketCleaner")) {
+                    System.out.println("Found Keep-Alive-SocketCleaner thread");
+                    long threadID = threadInfo[i].getThreadId();
+                    long before = threadMXBean.getThreadCpuTime(threadID);
+                    try { Thread.sleep(2000); } catch (Exception e) {}
+                    long after = threadMXBean.getThreadCpuTime(threadID);
 
-                        // if Keep-Alive-SocketCleaner consumes more than 50% of cpu then we
-                        // can assume a recursive loop.
-                        long total = after - before;
-                        if (total >= 1000000000)  // 1 second, or 1 billion nanoseconds
-                            throw new RuntimeException("Failed: possible recursive loop in Keep-Alive-SocketCleaner");
-                    }
+                    if (before ==-1 || after == -1)
+                        break;  // thread has died, OK
+
+                    // if Keep-Alive-SocketCleaner consumes more than 50% of cpu then we
+                    // can assume a recursive loop.
+                    long total = after - before;
+                    if (total >= 1000000000)  // 1 second, or 1 billion nanoseconds
+                        throw new RuntimeException("Failed: possible recursive loop in Keep-Alive-SocketCleaner");
                 }
             }
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            server.stop(1);
         }
         if (!uncaught.isEmpty()) {
             throw new RuntimeException("Unhandled exception:", uncaught.get(0));
         }
     }
-}
 
-class SimpleHttpTransactionHandler implements HttpHandler
-{
-    static volatile boolean failed = false;
+    static class SimpleHttpTransactionHandler implements HttpHandler {
+        static volatile boolean failed = false;
 
-    // Need to have enough data here that is too large for the socket buffer to hold.
-    // Also http.KeepAlive.remainingData must be greater than this value, default is 256K.
-    static final int RESPONSE_DATA_LENGTH = 128 * 1024;
+        // Need to have enough data here that is too large for the socket buffer to hold.
+        // Also http.KeepAlive.remainingData must be greater than this value, default is 256K.
+        static final int RESPONSE_DATA_LENGTH = 128 * 1024;
 
-    int port1;
+        int port1;
 
-    public void handle(HttpExchange trans) {
-        try {
-            String path = trans.getRequestURI().getPath();
-            if (path.equals("/firstCall")) {
-                port1 = trans.getRemoteAddress().getPort();
-                System.out.println("First connection on client port = " + port1);
+        public void handle(HttpExchange trans) {
+            try {
+                String path = trans.getRequestURI().getPath();
+                if (path.equals("/firstCall")) {
+                    port1 = trans.getRemoteAddress().getPort();
+                    System.out.println("First connection on client port = " + port1);
 
-                byte[] responseBody = new byte[RESPONSE_DATA_LENGTH];
-                for (int i=0; i<responseBody.length; i++)
-                    responseBody[i] = 0x41;
-                trans.sendResponseHeaders(200, responseBody.length);
-                try (OutputStream os = trans.getResponseBody()) {
+                    byte[] responseBody = new byte[RESPONSE_DATA_LENGTH];
+                    for (int i=0; i<responseBody.length; i++)
+                        responseBody[i] = 0x41;
+                    trans.sendResponseHeaders(200, responseBody.length);
+                    try (OutputStream os = trans.getResponseBody()) {
+                        os.write(responseBody);
+                    }
+                } else if (path.equals("/secondCall")) {
+                    int port2 = trans.getRemoteAddress().getPort();
+                    System.out.println("Second connection on client port = " + port2);
+
+                    if (port1 != port2)
+                        failed = true;
+
+                     /* Force the server to not respond for more that the timeout
+                      * set by the keepalive cleaner (5000 millis). This ensures the
+                      * timeout is correctly resets the default read timeout,
+                      * infinity. See 6993490. */
+                    System.out.println("server sleeping...");
+                    try {Thread.sleep(6000); } catch (InterruptedException e) {}
+                    trans.sendResponseHeaders(200, -1);
+                } else if (path.equals("/part2")) {
+                    System.out.println("Call to /part2");
+                    byte[] responseBody = new byte[RESPONSE_DATA_LENGTH];
+                    for (int i=0; i<responseBody.length; i++)
+                        responseBody[i] = 0x41;
+                    // override the Content-length header to be greater than the actual response body
+                    trans.sendResponseHeaders(200, responseBody.length+1);
+                    OutputStream os = trans.getResponseBody();
                     os.write(responseBody);
+                    // now close the socket
+                    // closing the stream here would throw; close the exchange instead
+                    trans.close();
                 }
-            } else if (path.equals("/secondCall")) {
-                int port2 = trans.getRemoteAddress().getPort();
-                System.out.println("Second connection on client port = " + port2);
-
-                if (port1 != port2)
-                    failed = true;
-
-                 /* Force the server to not respond for more that the timeout
-                  * set by the keepalive cleaner (5000 millis). This ensures the
-                  * timeout is correctly resets the default read timeout,
-                  * infinity. See 6993490. */
-                System.out.println("server sleeping...");
-                try {Thread.sleep(6000); } catch (InterruptedException e) {}
-                trans.sendResponseHeaders(200, -1);
-            } else if(path.equals("/part2")) {
-                System.out.println("Call to /part2");
-                byte[] responseBody = new byte[RESPONSE_DATA_LENGTH];
-                for (int i=0; i<responseBody.length; i++)
-                    responseBody[i] = 0x41;
-                // override the Content-length header to be greater than the actual response body
-                trans.sendResponseHeaders(200, responseBody.length+1);
-                OutputStream os = trans.getResponseBody();
-                os.write(responseBody);
-                // now close the socket
-                // closing the stream here would throw; close the exchange instead
-                trans.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+                failed = true;
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        startHttpServer();
+        try {
+            clientHttpCalls();
+        } finally {
+            stopHttpServer();
         }
     }
 }
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java b/test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java
index c96df382017..16afa4a130a 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,43 +24,45 @@
 /*
  * @test
  * @bug 8291637
- * @run main/othervm -Dhttp.keepAlive.time.server=20 -esa -ea B8291637 timeout
- * @run main/othervm -Dhttp.keepAlive.time.server=20 -esa -ea B8291637 max
+ * @library /test/lib
+ * @run main/othervm -Dhttp.keepAlive.time.server=20 -esa -ea B8291637
  */
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.*;
+import java.net.HttpURLConnection;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CompletableFuture;
 
+import jdk.test.lib.net.URIBuilder;
+
 public class B8291637 {
     static CompletableFuture<Boolean> passed = new CompletableFuture<>();
 
-    static class Server extends Thread {
-        final ServerSocket serverSocket;
-        final int port;
+    static class Server extends Thread implements AutoCloseable {
         final String param; // the parameter to test "max" or "timeout"
+        final ServerSocket serverSocket = new ServerSocket(0);
+        final int port;
         volatile Socket s;
 
         public Server(String param) throws IOException {
-            serverSocket = new ServerSocket(0);
+            this.param = param;
             port = serverSocket.getLocalPort();
             setDaemon(true);
-            this.param = param;
         }
 
         public int getPort() {
             return port;
         }
 
-        public void close() {
-            try {
-                serverSocket.close();
-                if (s != null)
-                    s.close();
-            } catch (IOException e) {}
+        public void close() throws IOException {
+            serverSocket.close();
+            if (s != null)
+                s.close();
         }
 
         static final byte[] requestEnd = new byte[] {'\r', '\n', '\r', '\n' };
@@ -125,28 +127,29 @@ public class B8291637 {
         }
     }
 
-    public static void main(String[] args) throws Exception {
-        Server server = new Server(args[0]);
-        int port = server.getPort();
-        server.start();
-        URL url = new URL("http://127.0.0.1:" + Integer.toString(port) + "/");
-        HttpURLConnection urlc = (HttpURLConnection) url.openConnection();
-        InputStream i = urlc.getInputStream();
-        int c,count=0;
-        byte[] buf = new byte[256];
-        while ((c=i.read(buf)) != -1) {
-            count+=c;
-        }
-        i.close();
-        System.out.println("Read " + count );
-        try {
+    public static void runTest(String param) throws Exception {
+        try (Server server = new Server(param)) {
+            server.start();
+            URL url = URIBuilder.newBuilder()
+                    .scheme("http")
+                    .loopback()
+                    .port(server.getPort())
+                    .path("/")
+                    .toURL();
+            HttpURLConnection urlc = (HttpURLConnection) url.openConnection();
+            try (InputStream i = urlc.getInputStream()) {
+                System.out.println("Read " + i.readAllBytes().length);
+            }
             if (!passed.get()) {
                 throw new RuntimeException("Test failed");
             } else {
                 System.out.println("Test passed");
             }
-        } finally {
-            server.close();
         }
     }
+
+    public static void main(String[] args) throws Exception {
+        runTest("timeout");
+        runTest("max");
+    }
 }
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java b/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
index 0a6e7ef1416..c7202af70dd 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/B8293562.java
@@ -24,20 +24,11 @@
 /*
  * @test
  * @bug 8293562
+ * @summary Http keep-alive thread should close sockets without holding a lock
  * @library /test/lib
  * @run main/othervm -Dhttp.keepAlive.time.server=1 B8293562
- * @summary Http keep-alive thread should close sockets without holding a lock
  */
 
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
-
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -53,6 +44,18 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.HandshakeCompletedListener;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+
+import jdk.test.lib.net.URIBuilder;
+
 public class B8293562 {
     static HttpServer server;
     static CountDownLatch closing = new CountDownLatch(1);
@@ -73,12 +76,13 @@ public class B8293562 {
 
     public static void clientHttpCalls() throws Exception {
         try {
-            System.out.println("http server listen on: " + server.getAddress().getPort());
-            String hostAddr = InetAddress.getLoopbackAddress().getHostAddress();
-            if (hostAddr.indexOf(':') > -1) hostAddr = "[" + hostAddr + "]";
-            String baseURLStr = "https://" + hostAddr + ":" + server.getAddress().getPort() + "/";
+            System.out.println("http server listens on: " + server.getAddress().getPort());
 
-            URL testUrl = new URL (baseURLStr);
+            URL testUrl = URIBuilder.newBuilder()
+                    .scheme("https")
+                    .loopback()
+                    .port(server.getAddress().getPort())
+                    .toURL();
 
             // SlowCloseSocketFactory is not a real SSLSocketFactory;
             // it produces regular non-SSL sockets. Effectively, the request
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveProperty.java b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveProperty.java
index 83491ad4e38..0e065b1224c 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveProperty.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,18 +23,29 @@
 
 /*
  * @test
- * @library /test/lib
  * @bug 8278067
+ * @library /test/lib
  * @run main/othervm -Dhttp.keepAlive.time.server=30 KeepAliveProperty long
  * @run main/othervm -Dhttp.keepAlive.time.server=1 KeepAliveProperty short
  * @run main/othervm -ea -Dhttp.keepAlive.time.server=0 KeepAliveProperty short
  */
 
-import java.net.*;
-import java.io.*;
-import java.nio.charset.*;
-import java.util.logging.*;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import jdk.test.lib.net.URIBuilder;
+
 import static java.net.Proxy.NO_PROXY;
 
 public class KeepAliveProperty {
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java
index 5568f0c54a9..44130b2a820 100644
--- a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,26 @@
 
 /*
  * @test
- * @library /test/lib
  * @bug 4701299
  * @summary Keep-Alive-Timer thread management in KeepAliveCache causes memory leak
+ * @library /test/lib
  * @run main KeepAliveTimerThread
  * @run main/othervm -Djava.net.preferIPv6Addresses=true KeepAliveTimerThread
  */
 
-import java.net.*;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+
 import jdk.test.lib.net.URIBuilder;
+
 import static java.net.Proxy.NO_PROXY;
 
 public class KeepAliveTimerThread {
@@ -131,8 +141,5 @@ public class KeepAliveTimerThread {
         if (grp.activeCount() > 0) {
             throw new RuntimeException("Keep-alive thread started in wrong thread group");
         }
-
-        grp.destroy();
     }
-
 }

From fa043aec425ae1e3086d09492b3fabcfbd3fa779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 15 May 2024 11:47:49 +0000
Subject: [PATCH 438/486] 8294880: Review running time of
 jdk/internal/shellsupport/doc/JavadocHelperTest.java

Reviewed-by: jjg
---
 test/langtools/TEST.groups                    | 11 +++--
 .../doc/FullJavadocHelperTest.java            | 49 +++++++++++++++++++
 .../shellsupport/doc/JavadocHelperTest.java   | 45 ++++++++++++++---
 3 files changed, 96 insertions(+), 9 deletions(-)
 create mode 100644 test/langtools/jdk/internal/shellsupport/doc/FullJavadocHelperTest.java

diff --git a/test/langtools/TEST.groups b/test/langtools/TEST.groups
index e1ffd5d530b..74503501da9 100644
--- a/test/langtools/TEST.groups
+++ b/test/langtools/TEST.groups
@@ -1,4 +1,4 @@
-#  Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 #  This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,9 @@ langtools_jdeps = \
     tools/all \
     tools/jdeps
 
+langtools_slow = \
+    jdk/internal/shellsupport/doc/FullJavadocHelperTest.java
+
 # All tests
 
 all = \
@@ -78,11 +81,13 @@ tier1 = \
     :langtools_all \
     lib \
     tools \
-    -:langtools_jshell_unstable
+    -:langtools_jshell_unstable \
+    -:langtools_slow
 
 # (Almost) no langtools tests are tier 2.
 tier2 = \
-    :langtools_jshell_unstable
+    :langtools_jshell_unstable \
+    :langtools_slow
 
 # No langtools tests are tier 3 either.
 tier3 =
diff --git a/test/langtools/jdk/internal/shellsupport/doc/FullJavadocHelperTest.java b/test/langtools/jdk/internal/shellsupport/doc/FullJavadocHelperTest.java
new file mode 100644
index 00000000000..729ac92143f
--- /dev/null
+++ b/test/langtools/jdk/internal/shellsupport/doc/FullJavadocHelperTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017, 2024, 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 8189778
+ * @summary Test JavadocHelper
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/jdk.internal.shellsupport.doc
+ * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
+ * @run testng/timeout=900/othervm -Xmx1024m FullJavadocHelperTest
+ */
+
+import java.io.IOException;
+
+import org.testng.annotations.Test;
+
+@Test
+public class FullJavadocHelperTest {
+
+    /*
+     * Long-running test to retrieve doc comments for enclosed elements of all JDK classes.
+     */
+    public void testAllDocs() throws IOException {
+        new JavadocHelperTest().retrieveDocComments(Boolean.TRUE::booleanValue);
+    }
+}
diff --git a/test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java b/test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java
index d8539b8c656..55d258788fe 100644
--- a/test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java
+++ b/test/langtools/jdk/internal/shellsupport/doc/JavadocHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,8 @@
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.compiler/jdk.internal.shellsupport.doc
  * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
- * @run testng/timeout=900/othervm -Xmx1024m JavadocHelperTest
+ * @run testng JavadocHelperTest
+ * @key randomness
  */
 
 import java.io.IOException;
@@ -46,6 +47,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Random;
+import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
@@ -383,7 +386,35 @@ public class JavadocHelperTest {
 
     }
 
-    public void testAllDocs() throws IOException {
+    private static long getSeed() {
+        long seed;
+        try {
+            // Throws NumberFormatException if the property is undefined
+            seed = Long.parseLong(System.getProperty("seed"));
+        } catch (NumberFormatException e) {
+            seed = new Random().nextLong();
+        }
+        System.out.println("Random Seed: " + seed);
+        return seed;
+    }
+
+    /*
+     * Retrieves doc comments for a random subset of JDK classes.
+     * Set the system property `seed` to a random seed to reproduce
+     * a specific run of this test.
+     */
+    public void testRandomDocs() throws IOException {
+        Random random = new Random(getSeed());
+        // Run test on 2% of classes, which corresponds to ~ 140 classes
+        retrieveDocComments(() -> random.nextInt(100) < 2);
+    }
+
+    /**
+     * Retrieve documentation of enclosed elements for some or all JDK classes.
+     *
+     * @param shouldTest oracle function to decide whether a class should be tested
+     */
+    protected void retrieveDocComments(BooleanSupplier shouldTest) throws IOException {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         DiagnosticListener<? super JavaFileObject> noErrors = d -> {
             if (d.getKind() == Kind.ERROR) {
@@ -408,7 +439,7 @@ public class JavadocHelperTest {
                     }
                 }
                 try (StandardJavaFileManager fm =
-                        compiler.getStandardFileManager(null, null, null)) {
+                             compiler.getStandardFileManager(null, null, null)) {
                     JavacTask task =
                             (JavacTask) compiler.getTask(null, fm, noErrors, null, null, null);
                     task.getElements().getTypeElement("java.lang.Object");
@@ -420,8 +451,10 @@ public class JavadocHelperTest {
                                 List<? extends Element> content =
                                         ed.getPackage().getEnclosedElements();
                                 for (TypeElement clazz : ElementFilter.typesIn(content)) {
-                                    for (Element el : clazz.getEnclosedElements()) {
-                                        helper.getResolvedDocComment(el);
+                                    if (shouldTest.getAsBoolean()) {
+                                        for (Element el : clazz.getEnclosedElements()) {
+                                            helper.getResolvedDocComment(el);
+                                        }
                                     }
                                 }
                             }

From 8032d640c0d34fe507392a1d4faa4ff2005c771d Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Wed, 15 May 2024 12:01:20 +0000
Subject: [PATCH 439/486] 8332245: C2: missing record_for_ign() call in
 GraphKit::must_be_not_null()

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/graphKit.cpp           |  3 +
 .../irTests/TestBackToBackMustBeNotNull.java  | 74 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackMustBeNotNull.java

diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 794403611e5..bcf4ee40424 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -1468,6 +1468,9 @@ Node* GraphKit::must_be_not_null(Node* value, bool do_replace_in_map) {
   Node* opaq = _gvn.transform(new Opaque4Node(C, tst, intcon(1)));
   IfNode *iff = new IfNode(control(), opaq, PROB_MAX, COUNT_UNKNOWN);
   _gvn.set_type(iff, iff->Value(&_gvn));
+  if (!tst->is_Con()) {
+    record_for_igvn(iff);
+  }
   Node *if_f = _gvn.transform(new IfFalseNode(iff));
   Node *frame = _gvn.transform(new ParmNode(C->start(), TypeFunc::FramePtr));
   Node* halt = _gvn.transform(new HaltNode(if_f, frame, "unexpected null in intrinsic"));
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackMustBeNotNull.java b/test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackMustBeNotNull.java
new file mode 100644
index 00000000000..9487df23d1c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackMustBeNotNull.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2024, 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 8332245
+ * @summary C2: missing record_for_ign() call in GraphKit::must_be_not_null()
+ *
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestBackToBackMustBeNotNull
+ */
+
+package compiler.c2.irTests;
+import jdk.internal.misc.Unsafe;
+import java.lang.reflect.Field;
+import compiler.lib.ir_framework.*;
+
+
+public class TestBackToBackMustBeNotNull {
+    static final jdk.internal.misc.Unsafe UNSAFE = Unsafe.getUnsafe();
+    static final long F_OFFSET;
+    private static A fieldA = new A();
+
+    static {
+        try {
+            Field fField = A.class.getDeclaredField("f");
+            F_OFFSET = UNSAFE.objectFieldOffset(fField);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static public void main(String[] args) {
+        TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED");
+    }
+
+    @Test
+    @IR(phase = { CompilePhase.ITER_GVN1 }, counts = { IRNode.IF, "1" })
+    private static void test1() {
+        final Object o1 = UNSAFE.getReference(fieldA, F_OFFSET);
+        final Object o2 = UNSAFE.getReference(fieldA, F_OFFSET);
+        notInlined(o1, o2);
+    }
+
+    @DontInline
+    private static void notInlined(Object o1, Object o2) {
+
+    }
+
+    static class A {
+        Object f;
+    }
+}

From c4867c62c44b48e48845608fe4b29b58749767ad Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Wed, 15 May 2024 13:16:08 +0000
Subject: [PATCH 440/486] 8329273: C2 SuperWord: Some basic MemorySegment IR
 tests

Reviewed-by: kvn, chagedorn
---
 .../loopopts/superword/TestMemorySegment.java | 810 ++++++++++++++++++
 1 file changed, 810 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java

diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
new file mode 100644
index 00000000000..02197d94a51
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
@@ -0,0 +1,810 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+package compiler.loopopts.superword;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Utils;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Random;
+import java.lang.foreign.*;
+
+/*
+ * @test id=byte-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment ByteArray
+ */
+
+/*
+ * @test id=char-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment CharArray
+ */
+
+/*
+ * @test id=short-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment ShortArray
+ */
+
+/*
+ * @test id=int-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment IntArray
+ */
+
+/*
+ * @test id=long-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment LongArray
+ */
+
+/*
+ * @test id=float-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment FloatArray
+ */
+
+/*
+ * @test id=double-array
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment DoubleArray
+ */
+
+/*
+ * @test id=byte-buffer
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment ByteBuffer
+ */
+
+/*
+ * @test id=byte-buffer-direct
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment ByteBufferDirect
+ */
+
+/*
+ * @test id=native
+ * @bug 8329273
+ * @summary Test vectorization of loops over MemorySegment
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegment Native
+ */
+
+// FAILS: mixed providers currently do not vectorize. Maybe there is some inlining issue.
+// /*
+//  * @test id=mixed-array
+//  * @bug 8329273
+//  * @summary Test vectorization of loops over MemorySegment
+//  * @library /test/lib /
+//  * @run driver compiler.loopopts.superword.TestMemorySegment MixedArray
+//  */
+//
+// /*
+//  * @test id=MixedBuffer
+//  * @bug 8329273
+//  * @summary Test vectorization of loops over MemorySegment
+//  * @library /test/lib /
+//  * @run driver compiler.loopopts.superword.TestMemorySegment MixedBuffer
+//  */
+//
+// /*
+//  * @test id=mixed
+//  * @bug 8329273
+//  * @summary Test vectorization of loops over MemorySegment
+//  * @library /test/lib /
+//  * @run driver compiler.loopopts.superword.TestMemorySegment Mixed
+//  */
+
+public class TestMemorySegment {
+    public static void main(String[] args) {
+        TestFramework framework = new TestFramework(TestMemorySegmentImpl.class);
+        framework.addFlags("-DmemorySegmentProviderNameForTestVM=" + args[0]);
+        framework.setDefaultWarmup(100);
+        framework.start();
+    }
+}
+
+class TestMemorySegmentImpl {
+    static final int BACKING_SIZE = 1024 * 8;
+    static final Random RANDOM = Utils.getRandomInstance();
+
+
+    interface TestFunction {
+        Object[] run();
+    }
+
+    interface MemorySegmentProvider {
+        MemorySegment newMemorySegment();
+    }
+
+    static MemorySegmentProvider provider;
+
+    static {
+        String providerName = System.getProperty("memorySegmentProviderNameForTestVM");
+        provider = switch (providerName) {
+            case "ByteArray"        -> TestMemorySegmentImpl::newMemorySegmentOfByteArray;
+            case "CharArray"        -> TestMemorySegmentImpl::newMemorySegmentOfCharArray;
+            case "ShortArray"       -> TestMemorySegmentImpl::newMemorySegmentOfShortArray;
+            case "IntArray"         -> TestMemorySegmentImpl::newMemorySegmentOfIntArray;
+            case "LongArray"        -> TestMemorySegmentImpl::newMemorySegmentOfLongArray;
+            case "FloatArray"       -> TestMemorySegmentImpl::newMemorySegmentOfFloatArray;
+            case "DoubleArray"      -> TestMemorySegmentImpl::newMemorySegmentOfDoubleArray;
+            case "ByteBuffer"       -> TestMemorySegmentImpl::newMemorySegmentOfByteBuffer;
+            case "ByteBufferDirect" -> TestMemorySegmentImpl::newMemorySegmentOfByteBufferDirect;
+            case "Native"           -> TestMemorySegmentImpl::newMemorySegmentOfNative;
+            case "MixedArray"       -> TestMemorySegmentImpl::newMemorySegmentOfMixedArray;
+            case "MixedBuffer"      -> TestMemorySegmentImpl::newMemorySegmentOfMixedBuffer;
+            case "Mixed"            -> TestMemorySegmentImpl::newMemorySegmentOfMixed;
+            default -> throw new RuntimeException("Test argument not recognized: " + providerName);
+        };
+    }
+
+    // List of tests
+    Map<String, TestFunction> tests = new HashMap<>();
+
+    // List of gold, the results from the first run before compilation
+    Map<String, Object[]> golds = new HashMap<>();
+
+    public TestMemorySegmentImpl () {
+        // Generate two MemorySegments as inputs
+        MemorySegment a = newMemorySegment();
+        MemorySegment b = newMemorySegment();
+        fillRandom(a);
+        fillRandom(b);
+
+        // Add all tests to list
+        tests.put("testMemorySegmentBadExitCheck",                 () -> testMemorySegmentBadExitCheck(copy(a)));
+        tests.put("testIntLoop_iv_byte",                           () -> testIntLoop_iv_byte(copy(a)));
+        tests.put("testIntLoop_longIndex_intInvar_sameAdr_byte",   () -> testIntLoop_longIndex_intInvar_sameAdr_byte(copy(a), 0));
+        tests.put("testIntLoop_longIndex_longInvar_sameAdr_byte",  () -> testIntLoop_longIndex_longInvar_sameAdr_byte(copy(a), 0));
+        tests.put("testIntLoop_longIndex_intInvar_byte",           () -> testIntLoop_longIndex_intInvar_byte(copy(a), 0));
+        tests.put("testIntLoop_longIndex_longInvar_byte",          () -> testIntLoop_longIndex_longInvar_byte(copy(a), 0));
+        tests.put("testIntLoop_intIndex_intInvar_byte",            () -> testIntLoop_intIndex_intInvar_byte(copy(a), 0));
+        tests.put("testIntLoop_iv_int",                            () -> testIntLoop_iv_int(copy(a)));
+        tests.put("testIntLoop_longIndex_intInvar_sameAdr_int",    () -> testIntLoop_longIndex_intInvar_sameAdr_int(copy(a), 0));
+        tests.put("testIntLoop_longIndex_longInvar_sameAdr_int",   () -> testIntLoop_longIndex_longInvar_sameAdr_int(copy(a), 0));
+        tests.put("testIntLoop_longIndex_intInvar_int",            () -> testIntLoop_longIndex_intInvar_int(copy(a), 0));
+        tests.put("testIntLoop_longIndex_longInvar_int",           () -> testIntLoop_longIndex_longInvar_int(copy(a), 0));
+        tests.put("testIntLoop_intIndex_intInvar_int",             () -> testIntLoop_intIndex_intInvar_int(copy(a), 0));
+        tests.put("testLongLoop_iv_byte",                          () -> testLongLoop_iv_byte(copy(a)));
+        tests.put("testLongLoop_longIndex_intInvar_sameAdr_byte",  () -> testLongLoop_longIndex_intInvar_sameAdr_byte(copy(a), 0));
+        tests.put("testLongLoop_longIndex_longInvar_sameAdr_byte", () -> testLongLoop_longIndex_longInvar_sameAdr_byte(copy(a), 0));
+        tests.put("testLongLoop_longIndex_intInvar_byte",          () -> testLongLoop_longIndex_intInvar_byte(copy(a), 0));
+        tests.put("testLongLoop_longIndex_longInvar_byte",         () -> testLongLoop_longIndex_longInvar_byte(copy(a), 0));
+        tests.put("testLongLoop_intIndex_intInvar_byte",           () -> testLongLoop_intIndex_intInvar_byte(copy(a), 0));
+        tests.put("testLongLoop_iv_int",                           () -> testLongLoop_iv_int(copy(a)));
+        tests.put("testLongLoop_longIndex_intInvar_sameAdr_int",   () -> testLongLoop_longIndex_intInvar_sameAdr_int(copy(a), 0));
+        tests.put("testLongLoop_longIndex_longInvar_sameAdr_int",  () -> testLongLoop_longIndex_longInvar_sameAdr_int(copy(a), 0));
+        tests.put("testLongLoop_longIndex_intInvar_int",           () -> testLongLoop_longIndex_intInvar_int(copy(a), 0));
+        tests.put("testLongLoop_longIndex_longInvar_int",          () -> testLongLoop_longIndex_longInvar_int(copy(a), 0));
+        tests.put("testLongLoop_intIndex_intInvar_int",            () -> testLongLoop_intIndex_intInvar_int(copy(a), 0));
+
+        // Compute gold value for all test methods before compilation
+        for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
+            String name = entry.getKey();
+            TestFunction test = entry.getValue();
+            Object[] gold = test.run();
+            golds.put(name, gold);
+        }
+    }
+
+    MemorySegment newMemorySegment() {
+        return provider.newMemorySegment();
+    }
+
+    MemorySegment copy(MemorySegment src) {
+        MemorySegment dst = newMemorySegment();
+        MemorySegment.copy(src, 0, dst, 0, src.byteSize());
+        return dst;
+    }
+
+    static MemorySegment newMemorySegmentOfByteArray() {
+        return MemorySegment.ofArray(new byte[BACKING_SIZE]);
+    }
+
+    static MemorySegment newMemorySegmentOfCharArray() {
+        return MemorySegment.ofArray(new char[BACKING_SIZE / 2]);
+    }
+
+    static MemorySegment newMemorySegmentOfShortArray() {
+        return MemorySegment.ofArray(new short[BACKING_SIZE / 2]);
+    }
+
+    static MemorySegment newMemorySegmentOfIntArray() {
+        return MemorySegment.ofArray(new int[BACKING_SIZE / 4]);
+    }
+
+    static MemorySegment newMemorySegmentOfLongArray() {
+        return MemorySegment.ofArray(new long[BACKING_SIZE / 8]);
+    }
+
+    static MemorySegment newMemorySegmentOfFloatArray() {
+        return MemorySegment.ofArray(new float[BACKING_SIZE / 4]);
+    }
+
+    static MemorySegment newMemorySegmentOfDoubleArray() {
+        return MemorySegment.ofArray(new double[BACKING_SIZE / 8]);
+    }
+
+    static MemorySegment newMemorySegmentOfByteBuffer() {
+        return MemorySegment.ofBuffer(ByteBuffer.allocate(BACKING_SIZE));
+    }
+
+    static MemorySegment newMemorySegmentOfByteBufferDirect() {
+        return MemorySegment.ofBuffer(ByteBuffer.allocateDirect(BACKING_SIZE));
+    }
+
+    static MemorySegment newMemorySegmentOfNative() {
+        // Auto arena: GC decides when there is no reference to the MemorySegment,
+        // and then it deallocates the backing memory.
+        return Arena.ofAuto().allocate(BACKING_SIZE, 1);
+    }
+
+    static MemorySegment newMemorySegmentOfMixedArray() {
+        switch(RANDOM.nextInt(7)) {
+            case 0  -> { return newMemorySegmentOfByteArray(); }
+            case 1  -> { return newMemorySegmentOfCharArray(); }
+            case 2  -> { return newMemorySegmentOfShortArray(); }
+            case 3  -> { return newMemorySegmentOfIntArray(); }
+            case 4  -> { return newMemorySegmentOfLongArray(); }
+            case 5  -> { return newMemorySegmentOfFloatArray(); }
+            default -> { return newMemorySegmentOfDoubleArray(); }
+        }
+    }
+
+    static MemorySegment newMemorySegmentOfMixedBuffer() {
+        switch (RANDOM.nextInt(2)) {
+            case 0  -> { return newMemorySegmentOfByteBuffer(); }
+            default -> { return newMemorySegmentOfByteBufferDirect(); }
+        }
+    }
+
+    static MemorySegment newMemorySegmentOfMixed() {
+        switch (RANDOM.nextInt(3)) {
+            case 0  -> { return newMemorySegmentOfMixedArray(); }
+            case 1  -> { return newMemorySegmentOfMixedBuffer(); }
+            default -> { return newMemorySegmentOfNative(); }
+        }
+    }
+
+    static void fillRandom(MemorySegment data) {
+        for (int i = 0; i < (int)data.byteSize(); i += 8) {
+            data.set(ValueLayout.JAVA_LONG_UNALIGNED, i, RANDOM.nextLong());
+        }
+    }
+
+
+    static void verify(String name, Object[] gold, Object[] result) {
+        if (gold.length != result.length) {
+            throw new RuntimeException("verify " + name + ": not the same number of outputs: gold.length = " +
+                                       gold.length + ", result.length = " + result.length);
+        }
+        for (int i = 0; i < gold.length; i++) {
+            Object g = gold[i];
+            Object r = result[i];
+            if (g == r) {
+                throw new RuntimeException("verify " + name + ": should be two separate objects (with identical content):" +
+                                           " gold[" + i + "] == result[" + i + "]");
+            }
+
+            if (!(g instanceof MemorySegment && r instanceof MemorySegment)) {
+                throw new RuntimeException("verify " + name + ": only MemorySegment supported, i=" + i);
+            }
+
+            MemorySegment mg = (MemorySegment)g;
+            MemorySegment mr = (MemorySegment)r;
+
+            if (mg.byteSize() != mr.byteSize()) {
+                throw new RuntimeException("verify " + name + ": MemorySegment must have same byteSize:" +
+                                       " gold[" + i + "].byteSize = " + mg.byteSize() +
+                                       " result[" + i + "].byteSize = " + mr.byteSize());
+            }
+
+            for (int j = 0; j < (int)mg.byteSize(); j++) {
+                byte vg = mg.get(ValueLayout.JAVA_BYTE, j);
+                byte vr = mr.get(ValueLayout.JAVA_BYTE, j);
+                if (vg != vr) {
+                    throw new RuntimeException("verify " + name + ": MemorySegment must have same content:" +
+                                               " gold[" + i + "][" + j + "] = " + vg +
+                                               " result[" + i + "][" + j + "] = " + vr);
+                }
+            }
+        }
+    }
+
+    @Run(test = {"testMemorySegmentBadExitCheck",
+                 "testIntLoop_iv_byte",
+                 "testIntLoop_longIndex_intInvar_sameAdr_byte",
+                 "testIntLoop_longIndex_longInvar_sameAdr_byte",
+                 "testIntLoop_longIndex_intInvar_byte",
+                 "testIntLoop_longIndex_longInvar_byte",
+                 "testIntLoop_intIndex_intInvar_byte",
+                 "testIntLoop_iv_int",
+                 "testIntLoop_longIndex_intInvar_sameAdr_int",
+                 "testIntLoop_longIndex_longInvar_sameAdr_int",
+                 "testIntLoop_longIndex_intInvar_int",
+                 "testIntLoop_longIndex_longInvar_int",
+                 "testIntLoop_intIndex_intInvar_int",
+                 "testLongLoop_iv_byte",
+                 "testLongLoop_longIndex_intInvar_sameAdr_byte",
+                 "testLongLoop_longIndex_longInvar_sameAdr_byte",
+                 "testLongLoop_longIndex_intInvar_byte",
+                 "testLongLoop_longIndex_longInvar_byte",
+                 "testLongLoop_intIndex_intInvar_byte",
+                 "testLongLoop_iv_int",
+                 "testLongLoop_longIndex_intInvar_sameAdr_int",
+                 "testLongLoop_longIndex_longInvar_sameAdr_int",
+                 "testLongLoop_longIndex_intInvar_int",
+                 "testLongLoop_longIndex_longInvar_int",
+                 "testLongLoop_intIndex_intInvar_int"})
+    void runTests() {
+        for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
+            String name = entry.getKey();
+            TestFunction test = entry.getValue();
+            // Recall gold value from before compilation
+            Object[] gold = golds.get(name);
+            // Compute new result
+            Object[] result = test.run();
+            // Compare gold and new result
+            verify(name, gold, result);
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS
+    // Exit check: iv < long_limit      ->     (long)iv < long_limit
+    // Thus, we have an int-iv, but a long-exit-check.
+    // Is not properly recognized by either CountedLoop or LongCountedLoop
+    static Object[] testMemorySegmentBadExitCheck(MemorySegment a) {
+        for (int i = 0; i < a.byteSize(); i++) {
+            long adr = i;
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_iv_byte(MemorySegment a) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr = i;
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_longIndex_intInvar_sameAdr_byte(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_longIndex_longInvar_sameAdr_byte(MemorySegment a, long invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testIntLoop_longIndex_intInvar_byte(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr1 = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr1);
+            long adr2 = (long)(i) + (long)(invar);
+            a.set(ValueLayout.JAVA_BYTE, adr2, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testIntLoop_longIndex_longInvar_byte(MemorySegment a, long invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            long adr1 = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr1);
+            long adr2 = (long)(i) + (long)(invar);
+            a.set(ValueLayout.JAVA_BYTE, adr2, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: RangeCheck cannot be eliminated because of int_index
+    static Object[] testIntLoop_intIndex_intInvar_byte(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize(); i++) {
+            int int_index = i + invar;
+            byte v = a.get(ValueLayout.JAVA_BYTE, int_index);
+            a.set(ValueLayout.JAVA_BYTE, int_index, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_iv_int(MemorySegment a) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++ ) {
+            long adr = 4L * i;
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_longIndex_intInvar_sameAdr_int(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            long adr = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testIntLoop_longIndex_longInvar_sameAdr_int(MemorySegment a, long invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            long adr = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testIntLoop_longIndex_intInvar_int(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            long adr1 = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr1);
+            long adr2 = 4L * (long)(i) + 4L * (long)(invar);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr2, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testIntLoop_longIndex_longInvar_int(MemorySegment a, long invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            long adr1 = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr1);
+            long adr2 = 4L * (long)(i) + 4L * (long)(invar);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr2, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: RangeCheck cannot be eliminated because of int_index
+    static Object[] testIntLoop_intIndex_intInvar_int(MemorySegment a, int invar) {
+        for (int i = 0; i < (int)a.byteSize()/4; i++) {
+            int int_index = i + invar;
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, 4L * int_index);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, 4L * int_index, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testLongLoop_iv_byte(MemorySegment a) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr = i;
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testLongLoop_longIndex_intInvar_sameAdr_byte(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testLongLoop_longIndex_longInvar_sameAdr_byte(MemorySegment a, long invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr);
+            a.set(ValueLayout.JAVA_BYTE, adr, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testLongLoop_longIndex_intInvar_byte(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr1 = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr1);
+            long adr2 = (long)(i) + (long)(invar);
+            a.set(ValueLayout.JAVA_BYTE, adr2, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testLongLoop_longIndex_longInvar_byte(MemorySegment a, long invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            long adr1 = (long)(i) + (long)(invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, adr1);
+            long adr2 = (long)(i) + (long)(invar);
+            a.set(ValueLayout.JAVA_BYTE, adr2, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
+                  IRNode.ADD_VB,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: RangeCheck cannot be eliminated because of int_index
+    static Object[] testLongLoop_intIndex_intInvar_byte(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize(); i++) {
+            int int_index = (int)(i + invar);
+            byte v = a.get(ValueLayout.JAVA_BYTE, int_index);
+            a.set(ValueLayout.JAVA_BYTE, int_index, (byte)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    static Object[] testLongLoop_iv_int(MemorySegment a) {
+        for (long i = 0; i < a.byteSize()/4; i++ ) {
+            long adr = 4L * i;
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    //@IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+    //              IRNode.ADD_VI,        "> 0",
+    //              IRNode.STORE_VECTOR,  "> 0"},
+    //    applyIfPlatform = {"64-bit", "true"},
+    //    applyIf = {"AlignVector", "false"},
+    //    applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: for native memory. I think it is because of invariants, but need investigation.
+    //        The long -> int loop conversion introduces extra invariants.
+    static Object[] testLongLoop_longIndex_intInvar_sameAdr_int(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            long adr = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    //@IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+    //              IRNode.ADD_VI,        "> 0",
+    //              IRNode.STORE_VECTOR,  "> 0"},
+    //    applyIfPlatform = {"64-bit", "true"},
+    //    applyIf = {"AlignVector", "false"},
+    //    applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: for native memory. I think it is because of invariants, but need investigation.
+    //        The long -> int loop conversion introduces extra invariants.
+    static Object[] testLongLoop_longIndex_longInvar_sameAdr_int(MemorySegment a, long invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            long adr = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testLongLoop_longIndex_intInvar_int(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            long adr1 = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr1);
+            long adr2 = 4L * (long)(i) + 4L * (long)(invar);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr2, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: invariants are sorted differently, because of differently inserted Cast.
+    // See: JDK-8330274
+    static Object[] testLongLoop_longIndex_longInvar_int(MemorySegment a, long invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            long adr1 = 4L * (long)(i) + 4L * (long)(invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, adr1);
+            long adr2 = 4L * (long)(i) + 4L * (long)(invar);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, adr2, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.ADD_VI,        "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // FAILS: RangeCheck cannot be eliminated because of int_index
+    static Object[] testLongLoop_intIndex_intInvar_int(MemorySegment a, int invar) {
+        for (long i = 0; i < a.byteSize()/4; i++) {
+            int int_index = (int)(i + invar);
+            int v = a.get(ValueLayout.JAVA_INT_UNALIGNED, 4L * int_index);
+            a.set(ValueLayout.JAVA_INT_UNALIGNED, 4L * int_index, (int)(v + 1));
+        }
+        return new Object[]{ a };
+    }
+}

From 30bb066b1982c5318d54bfe74115306c602e2974 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Wed, 15 May 2024 14:39:51 +0000
Subject: [PATCH 441/486] 8332003: Clarify javadoc for
 MemoryLayout::offsetHandle

Reviewed-by: psandoz
---
 .../java/lang/foreign/MemoryLayout.java       | 51 +++++++++++++++++--
 test/jdk/java/foreign/TestLayoutPaths.java    | 22 +++++++-
 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
index acd3546f335..123c5897f26 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
@@ -571,6 +571,10 @@ public sealed interface MemoryLayout
      * derived from the size of the element layout of a sequence, and
      * {@code c_1}, {@code c_2}, ... {@code c_m} are other <em>static</em> offset
      * constants (such as field offsets) which are derived from the layout path.
+     * <p>
+     * For any given dynamic argument {@code x_i}, it must be that {@code 0 <= x_i < size_i},
+     * where {@code size_i} is the size of the open path element associated with {@code x_i}.
+     * Otherwise, the returned method handle throws {@link IndexOutOfBoundsException}.
      *
      * @apiNote The returned method handle can be used to compute a layout offset,
      *          similarly to {@link #byteOffset(PathElement...)}, but more flexibly, as
@@ -609,7 +613,7 @@ public sealed interface MemoryLayout
      * offset {@code O} of the access operation is computed as follows:
      *
      * {@snippet lang = "java":
-     * O = this.offsetHandle(P).invokeExact(B, I1, I2, ... In);
+     * O = this.byteOffsetHandle(P).invokeExact(B, I1, I2, ... In);
      * }
      * <p>
      * Accessing a memory segment using the var handle returned by this method is subject
@@ -627,6 +631,9 @@ public sealed interface MemoryLayout
      *     {@code O + A <= S}, where {@code O} is the accessed offset (computed as above),
      *     {@code A} is the size of the selected layout and {@code S} is the size of the
      *     accessed memory segment.</li>
+     *     <li>If the provided layout path has an open path element whose size is {@code S},
+     *     its corresponding trailing {@code long} coordinate value {@code I} must be
+     *     {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.</li>
      *     <li>The accessed memory segment must be
      *     {@link MemorySegment#isAccessibleBy(Thread) accessible} from the thread
      *     performing the access operation, or a {@link WrongThreadException} is thrown.</li>
@@ -728,14 +735,43 @@ public sealed interface MemoryLayout
      * offset {@code O} of the access operation is computed as follows:
      *
      * {@snippet lang = "java":
-     * O = this.offsetHandle(P).invokeExact(this.scale(B, I0), I1, I2, ... In);
+     * O = this.byteOffsetHandle(P).invokeExact(this.scale(B, I0), I1, I2, ... In);
      * }
      * <p>
-     * More formally, this method can be obtained from the {@link #varHandle(PathElement...)},
+     * More formally, the method handle returned by this method is obtained from {@link #varHandle(PathElement...)},
      * as follows:
      * {@snippet lang = "java":
      * MethodHandles.collectCoordinates(varHandle(elements), 1, scaleHandle())
      * }
+     * <p>
+     * Accessing a memory segment using the var handle returned by this method is subject
+     * to the following checks:
+     * <ul>
+     *     <li>The physical address of the accessed memory segment must be
+     *     <a href="MemorySegment.html#segment-alignment">aligned</a> according to the
+     *     {@linkplain #byteAlignment() alignment constraint} of the root layout
+     *     (this layout), or an {@link IllegalArgumentException} is thrown. Note
+     *     that the alignment constraint of the root layout can be more strict
+     *     (but not less) than the alignment constraint of the selected value layout.</li>
+     *     <li>The offset of the access operation (computed as above) must fall inside
+     *     the spatial bounds of the accessed memory segment, or an
+     *     {@link IndexOutOfBoundsException} is thrown. This is the case when
+     *     {@code O + A <= S}, where {@code O} is the accessed offset (computed as above),
+     *     {@code A} is the size of the selected layout and {@code S} is the size of the
+     *     accessed memory segment.</li>
+     *     <li>If the provided layout path has an open path element whose size is {@code S},
+     *     its corresponding trailing {@code long} coordinate value {@code I} must be
+     *     {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.</li>
+     *     <li>The accessed memory segment must be
+     *     {@link MemorySegment#isAccessibleBy(Thread) accessible} from the thread
+     *     performing the access operation, or a {@link WrongThreadException} is thrown.</li>
+     *     <li>For write operations, the accessed memory segment must not be
+     *     {@link MemorySegment#isReadOnly() read only}, or an
+     *     {@link IllegalArgumentException} is thrown.</li>
+     *     <li>The {@linkplain MemorySegment#scope() scope} associated with the accessed
+     *     segment must be {@linkplain MemorySegment.Scope#isAlive() alive}, or an
+     *     {@link IllegalStateException} is thrown.</li>
+     * </ul>
      *
      * @apiNote
      * As the leading index coordinate {@code I0} is not bound by any sequence layout, it
@@ -792,6 +828,9 @@ public sealed interface MemoryLayout
      *     {@code O + A <= S}, where {@code O} is the start offset of
      *     the slicing operation (computed as above), {@code A} is the size of the
      *     selected layout and {@code S} is the size of the accessed memory segment.</li>
+     *     <li>If the provided layout path has an open path element whose size is {@code S},
+     *     its corresponding trailing {@code long} coordinate value {@code I} must be
+     *     {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.</li>
      * </ul>
      *
      * @apiNote The returned method handle can be used to obtain a memory segment slice,
@@ -838,7 +877,8 @@ public sealed interface MemoryLayout
      *     layout as its target layout.</li>
      * </ul>
      * Sequence path elements selecting more than one sequence element layout are called
-     * <a href="MemoryLayout.html#open-path-elements">open path elements</a>.
+     * <a href="MemoryLayout.html#open-path-elements">open path elements</a>. The <em>size</em>
+     * of an open path element determines the number of element layouts that can be selected by it.
      *
      * @implSpec
      * Implementations of this interface are immutable, thread-safe and
@@ -906,6 +946,7 @@ public sealed interface MemoryLayout
          *    <li>if {@code F > 0}, then {@code B = ceilDiv(C - S, F)}</li>
          *    <li>if {@code F < 0}, then {@code B = ceilDiv(-(S + 1), -F)}</li>
          * </ul>
+         * That is, the size of the returned open path element is {@code B}.
          *
          * @param start the index of the first sequence element to be selected
          * @param step the step factor at which subsequence sequence elements are to be
@@ -924,7 +965,7 @@ public sealed interface MemoryLayout
          * <p>
          * The exact sequence element selected by this layout is expressed as an index
          * {@code I}. If {@code C} is the sequence element count, it follows that
-         * {@code 0 <= I < C}.
+         * {@code 0 <= I < C}. That is, {@code C} is the size of the returned open path element.
          */
         static PathElement sequenceElement() {
             return LayoutPath.SequenceElement.instance();
diff --git a/test/jdk/java/foreign/TestLayoutPaths.java b/test/jdk/java/foreign/TestLayoutPaths.java
index e6bfe8450a0..484e8f86ab5 100644
--- a/test/jdk/java/foreign/TestLayoutPaths.java
+++ b/test/jdk/java/foreign/TestLayoutPaths.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,10 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.function.IntFunction;
+import java.util.stream.Stream;
 
 import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
 import static java.lang.foreign.MemoryLayout.PathElement.sequenceElement;
@@ -311,6 +313,24 @@ public class TestLayoutPaths {
         assertEquals(actualByteOffset, expectedByteOffset);
     }
 
+    @Test(dataProvider = "testLayouts")
+    public void testOffsetHandleOOBIndex(MemoryLayout layout, PathElement[] pathElements, long[] indexes,
+                                 long expectedByteOffset) throws Throwable {
+        int[] badIndices = { -1, 10 };
+        MemoryLayout seqLayout = MemoryLayout.sequenceLayout(badIndices[1], layout);
+        for (int badIndex : badIndices) {
+            PathElement[] seqPathElements = new PathElement[pathElements.length + 1];
+            long[] seqIndexes = new long[indexes.length + 1];
+            System.arraycopy(pathElements, 0, seqPathElements, 1, pathElements.length);
+            System.arraycopy(indexes, 0, seqIndexes, 1, indexes.length);
+            seqPathElements[0] = PathElement.sequenceElement();
+            seqIndexes[0] = badIndex;
+            MethodHandle seqByteOffsetHandle = seqLayout.byteOffsetHandle(seqPathElements)
+                    .asSpreader(long[].class, seqIndexes.length);
+            assertThrows(IndexOutOfBoundsException.class, () -> seqByteOffsetHandle.invoke(0L, seqIndexes));
+        }
+    }
+
     @Test
     public void testHashCodeCollision() {
         PathElement sequenceElement = PathElement.sequenceElement();

From 61aff6db15d5bdda77427af5ce34d0fe43373197 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Wed, 15 May 2024 14:57:22 +0000
Subject: [PATCH 442/486] 8332112: Update nsk.share.Log to don't print summary
 during VM shutdown hook

Reviewed-by: dholmes, cjplummer
---
 .../plugAttachConnect001.java                 |   3 +-
 .../plugAttachConnect002.java                 |   3 +-
 .../plugAttachConnect003.java                 |   3 +-
 .../plugLaunchConnect001.java                 |   3 +-
 .../plugLaunchConnect002.java                 |   3 +-
 .../plugLaunchConnect003.java                 |   3 +-
 .../plugListenConnect001.java                 |   3 +-
 .../plugListenConnect002.java                 |   3 +-
 .../plugListenConnect003.java                 |   3 +-
 .../plugMultiConnect001.java                  |   3 +-
 .../plugMultiConnect002.java                  |   3 +-
 .../plugMultiConnect003.java                  |   3 +-
 .../plugMultiConnect004.java                  |   3 +-
 .../plugMultiConnect005.java                  |   3 +-
 .../plugMultiConnect006.java                  |   3 +-
 .../transportService001.java                  |   3 +-
 .../transportService002.java                  |   3 +-
 .../transportService003.java                  |   3 +-
 .../genericSignature/genericSignature001.java |   1 -
 .../genericSignature001a.java                 |   3 +-
 .../genericSignature/genericSignature002.java |   1 -
 .../genericSignature002a.java                 |   3 +-
 .../genericSignature/genericSignature001.java |   1 -
 .../genericSignature001a.java                 |   3 +-
 .../genericSignature/genericSignature002.java |   1 -
 .../genericSignature002a.java                 |   3 +-
 .../createVirtualMachine/createVM001.java     |   1 -
 .../jtreg/vmTestbase/nsk/share/Log.java       | 122 ++----------------
 .../vmTestbase/nsk/share/jpda/BindServer.java |   4 +-
 .../vm/mlvm/share/MlvmTestExecutor.java       |   3 +-
 30 files changed, 34 insertions(+), 166 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java
index e6d7e740202..b1badcc533f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -147,7 +147,6 @@ public class plugAttachConnect001 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String expectedPlugAttachConnectorName = "PlugAttachConnector001_Name";
         String expectedPlugAttachConnectorDescription = "PlugAttachConnector001_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java
index 18cf8cd4c7b..7c0f8fc8310 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,6 @@ public class plugAttachConnect002 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String checkedPlugAttachConnectorName = "PlugAttachConnector002_Name";
         String checkedPlugAttachConnectorDescription = "PlugAttachConnector002_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java
index b6314aeb390..0bc4527ecf9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,6 @@ public class plugAttachConnect003 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java
index daa70d305aa..096e6b970af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -149,7 +149,6 @@ public class plugLaunchConnect001 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String expectedPlugLaunchConnectorName = "PlugLaunchConnector001_Name";
         String expectedPlugLaunchConnectorDescription = "PlugLaunchConnector001_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java
index d395320250a..71c0cc2987e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,6 @@ public class plugLaunchConnect002 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String checkedPlugLaunchConnectorName = "PlugLaunchConnector002_Name";
         String checkedPlugLaunchConnectorDescription = "PlugLaunchConnector002_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java
index 53aa59f9c6b..2f5898dfd86 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,6 @@ public class plugLaunchConnect003 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java
index 2f21e2a359e..bab07c442dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -149,7 +149,6 @@ public class plugListenConnect001 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String expectedPlugListenConnectorName = "PlugListenConnector001_Name";
         String expectedPlugListenConnectorDescription = "PlugListenConnector001_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java
index 407c3781394..2861c75491f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,6 @@ public class plugListenConnect002 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         String checkedPlugListenConnectorName = "PlugListenConnector002_Name";
         String checkedPlugListenConnectorDescription = "PlugListenConnector002_Description";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java
index 34b4587dacb..300af2f6851 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,6 @@ public class plugListenConnect003 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java
index 720cd845b41..250b30a9472 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -176,7 +176,6 @@ public class plugMultiConnect001 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java
index 8fd40809fee..b5f63b7e2ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -201,7 +201,6 @@ public class plugMultiConnect002 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java
index 376cdbe7087..6e883c779ac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -214,7 +214,6 @@ public class plugMultiConnect003 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java
index 64a810a17b2..00b57cb6731 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -233,7 +233,6 @@ public class plugMultiConnect004 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java
index 4b13ad99001..577cdd23f9d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -238,7 +238,6 @@ public class plugMultiConnect005 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java
index 88f44940ffa..e753a3656fe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -263,7 +263,6 @@ public class plugMultiConnect006 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java
index ff68a83cbff..bf090ce7fa7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -185,7 +185,6 @@ public class transportService001 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/TransportService/transportService001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java
index 6a1bb9f78a1..370b5dbd7b3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -185,7 +185,6 @@ public class transportService002 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/TransportService/transportService002 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java
index 7716bdd8aae..889942922b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -136,7 +136,6 @@ public class transportService003 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/PlugConnectors/TransportService/transportService003 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java
index 92b85582c68..20b473062b3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001.java
@@ -158,7 +158,6 @@ public class genericSignature001 {
         argsHandler = new ArgumentHandler(argv);
         verboseMode = argsHandler.verbose();
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/ReferenceType/genericSignature/genericSignature001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java
index dd41eab3ddc..42c738fa86e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -113,7 +113,6 @@ public class genericSignature001a {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(System.err, argsHandler);
-        logHandler.enableErrorsSummary(false);
         IOPipe pipe = argsHandler.createDebugeeIOPipe();
 
         logOnVerbose(infoLogPrefixHead + "Debugee started!");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java
index 07d8da57c92..781b0f6f4ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002.java
@@ -140,7 +140,6 @@ public class genericSignature002 {
         argsHandler = new ArgumentHandler(argv);
         verboseMode = argsHandler.verbose();
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/ReferenceType/genericSignature/genericSignature002 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java
index 9be56cd362f..2caa90e0a92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,6 @@ public class genericSignature002a {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(System.err, argsHandler);
-        logHandler.enableErrorsSummary(false);
         IOPipe pipe = argsHandler.createDebugeeIOPipe();
 
         logOnVerbose(infoLogPrefixHead + "Debugee started!");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java
index c23ff079c0e..d5368568bec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001.java
@@ -183,7 +183,6 @@ public class genericSignature001 {
         argsHandler = new ArgumentHandler(argv);
         verboseMode = argsHandler.verbose();
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/TypeComponent/genericSignature/genericSignature001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java
index 6fe6f41c89f..e479baa584b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,7 +112,6 @@ public class genericSignature001a {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(System.err, argsHandler);
-        logHandler.enableErrorsSummary(false);
         IOPipe pipe = argsHandler.createDebugeeIOPipe();
 
         logOnVerbose(infoLogPrefixHead + "Debugee started!");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java
index cb596163da1..8eabd51f713 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002.java
@@ -175,7 +175,6 @@ public class genericSignature002 {
         argsHandler = new ArgumentHandler(argv);
         verboseMode = argsHandler.verbose();
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/TypeComponent/genericSignature/genericSignature002 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java
index de3b50167c1..476393e39cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -288,7 +288,6 @@ public class genericSignature002a {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(System.err, argsHandler);
-        logHandler.enableErrorsSummary(false);
         IOPipe pipe = argsHandler.createDebugeeIOPipe();
 
         logOnVerbose(infoLogPrefixHead + "Debugee started!");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java
index 5b0363f9dd4..26ad37078d8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java
@@ -94,7 +94,6 @@ public class createVM001 {
 
         argsHandler = new ArgumentHandler(argv);
         logHandler = new Log(out, argsHandler);
-        logHandler.enableErrorsSummary(false);
 
         logAlways("==> nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001 test...");
         logOnVerbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java b/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java
index 6bdc5266fc4..735f487f6c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -56,9 +56,6 @@ import nsk.share.test.LazyFormatString;
  * Error messages appeares in log stream in all modes. Additional log massages,
  * printed with <code>display()</code> method will be filtered out, if log mode
  * is not verbose. In verbose log made messages of both types are printed.
- * Additionally, in verbose mode a summary of all occured errors will be printed
- * at the program exit, by automatically invoking method
- * <code>printErrorsSummary()</code>.
  * <p>
  * To provide printing messages from different sources into one log
  * with distinct prefixes use internal <code>Log.Logger</code> class.
@@ -69,14 +66,11 @@ import nsk.share.test.LazyFormatString;
  * @see ArgumentParser
  * @see Log.Logger
  */
-public class Log extends FinalizableObject {
+public class Log {
     /**
      * Report step-by-step activity to this stream.
-     *
-     * @deprecated  Tests should not use this field directly.
      */
-    @Deprecated
-    protected PrintStream out = null;
+    private PrintStream out = null;
 
     /**
      * Is log-mode verbose?
@@ -114,7 +108,7 @@ public class Log extends FinalizableObject {
 
         public static int nameToLevel(String value) throws IllegalArgumentException {
             Integer level = NAME_TO_LEVEL_MAP.get(value.toLowerCase());
-            if ( level == null )
+           if ( level == null )
                 throw new IllegalArgumentException("Wrong trace level: " + value);
 
             return level;
@@ -135,16 +129,6 @@ public class Log extends FinalizableObject {
      */
     private int traceLevel = TraceLevel.DEFAULT;
 
-    /**
-     * Is printing errors summary enabled? Default value is <code>true</code>;
-     */
-    private boolean errorsSummaryEnabled = true;
-
-    /**
-     * Is printing saved verbose messages on error enabled? Default value is <code>true</code>;
-     */
-    private boolean verboseOnErrorEnabled = true;
-
     /**
      * This <code>errosBuffer</code> will keep all messages printed via
      * <code>complain()</code> method for final summary output.
@@ -188,8 +172,6 @@ public class Log extends FinalizableObject {
      */
     @Deprecated
     protected Log() {
-        // install finalizer to print errors summary at exit
-        registerCleanup();
         // Don't log exceptions from this method. It would just add unnecessary logs.
         loggedExceptions.add("nsk.share.jdi.SerialExecutionDebugger.executeTests");
     }
@@ -234,34 +216,6 @@ public class Log extends FinalizableObject {
         return verbose;
     }
 
-    /**
-     * Return <i>true</i> if printing errors summary at exit is enabled.
-     */
-    public boolean isErrorsSummaryEnabled() {
-        return errorsSummaryEnabled;
-    }
-
-    /**
-     * Enable or disable printing errors summary at exit.
-     */
-    public void enableErrorsSummary(boolean enable) {
-        errorsSummaryEnabled = enable;
-    }
-
-    /**
-     * Return <i>true</i> if printing saved verbose messages on error is enabled.
-     */
-    public boolean isVerboseOnErrorEnabled() {
-        return errorsSummaryEnabled;
-    }
-
-    /**
-     * Enable or disable printing saved verbose messages on error.
-     */
-    public void enableVerboseOnError(boolean enable) {
-        verboseOnErrorEnabled = enable;
-    }
-
     /**
      * Enable or disable verbose mode for printing messages.
      */
@@ -315,7 +269,7 @@ public class Log extends FinalizableObject {
     @Deprecated
     public synchronized void println(String message) {
         doPrint(message);
-        if (!verbose() && isVerboseOnErrorEnabled()) {
+        if (!verbose()) {
             keepLog(composeLine(message));
         }
     }
@@ -371,10 +325,8 @@ public class Log extends FinalizableObject {
     public synchronized void display(Object message) {
         if (verbose()) {
             doPrint(message.toString());
-        } else if (isVerboseOnErrorEnabled()) {
-            keepLog(composeLine(message.toString()));
         } else {
-            // ignore
+            keepLog(composeLine(message.toString()));
         }
     }
 
@@ -384,7 +336,7 @@ public class Log extends FinalizableObject {
      * into <code>errorsBuffer</code>.
      */
     public synchronized void complain(Object message) {
-        if (!verbose() && isVerboseOnErrorEnabled()) {
+        if (!verbose()) {
             PrintStream stream = findOutStream();
             stream.println("#>  ");
             stream.println("#>  WARNING: switching log to verbose mode,");
@@ -395,9 +347,6 @@ public class Log extends FinalizableObject {
         }
         String msgStr = message.toString();
         printError(msgStr);
-        if (isErrorsSummaryEnabled()) {
-            keepError(msgStr);
-        }
 
         logExceptionForFailureAnalysis(msgStr);
     }
@@ -469,7 +418,9 @@ public class Log extends FinalizableObject {
      */
     @Deprecated
     protected synchronized void logTo(PrintStream stream) {
-        cleanup(); // flush older log stream
+        if (out != null) {
+            out.flush();
+        }
         out = stream;
         verbose = true;
     }
@@ -573,59 +524,6 @@ public class Log extends FinalizableObject {
         logBuffer.addElement(message);
     }
 
-    /**
-     * Keep the given error <code>message</code> into <code>errorsBuffer</code>.
-     */
-    private synchronized void keepError(String message) {
-        errorsBuffer.addElement(message);
-    }
-
-    /**
-     * Print errors messages summary from errors buffer if any;
-     * print a warning message first.
-     */
-    private synchronized void printErrorsSummary() {
-        if (errorsBuffer.size() <= 0)
-            return;
-
-        PrintStream stream = findOutStream();
-        stream.println();
-        stream.println();
-        stream.println("#>  ");
-        stream.println("#>  SUMMARY: Following errors occured");
-        stream.println("#>      during test execution:");
-        stream.println("#>  ");
-        stream.flush();
-
-        for (Enumeration e = errorsBuffer.elements(); e.hasMoreElements(); ) {
-            printError((String) e.nextElement());
-        }
-    }
-
-    /**
-     * Print errors summary if mode is verbose, flush and cancel output stream.
-     *
-     * This is replacement of the finalize() method and is called when this
-     * Log instance becomes unreachable.
-     *
-     */
-    @Override
-    public void cleanup() {
-        if (verbose() && isErrorsSummaryEnabled()) {
-            printErrorsSummary();
-        }
-        if (out != null)
-            out.flush();
-        out = null;
-    }
-
-    /**
-     * Perform finalization at the exit.
-     */
-    public void finalizeAtExit() {
-        cleanup();
-    }
-
     /**
      * This class can be used as a base for each class that use <code>Log</code>
      * for print messages and errors.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
index 2fc76a991d5..bd57206302b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -147,8 +147,6 @@ public class BindServer implements Finalizable {
         }
 
         log = new Log(out, argHandler);
-        log.enableErrorsSummary(false);
-        log.enableVerboseOnError(false);
         logger = new Log.Logger(log, "");
 
         registerCleanup();
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java
index 581f8a90571..2c219309b63 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -235,7 +235,6 @@ public class MlvmTestExecutor {
      * @see #runMlvmTest(Class<?> testClass, Object[] constructorArgs)
      */
     public static void launch(Class<?> testClass, Object[] constructorArgs) {
-        Env.getLog().enableVerboseOnError(true);
 
         long startTime = System.currentTimeMillis();
         boolean passed;

From 42ccb74399113a3d59ce016483518f033dd6e010 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Wed, 15 May 2024 16:14:15 +0000
Subject: [PATCH 443/486] 8331940: ClassFile API ArrayIndexOutOfBoundsException
 with certain class files

Reviewed-by: liach, psandoz
---
 .../jdk/internal/classfile/impl/CodeImpl.java    |  6 +++++-
 test/jdk/jdk/classfile/LimitsTest.java           | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
index 394f7cc807a..5be0715ec2f 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -237,6 +237,10 @@ public final class CodeImpl
                 int pEnd = p + (nLn * 4);
                 for (; p < pEnd; p += 4) {
                     int startPc = classReader.readU2(p);
+                    if (startPc > codeLength) {
+                        throw new IllegalArgumentException(String.format(
+                                "Line number start_pc out of range; start_pc=%d, codeLength=%d", startPc, codeLength));
+                    }
                     int lineNumber = classReader.readU2(p + 2);
                     lineNumbers[startPc] = lineNumber;
                 }
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index 8a8d8bddc35..ff090278ceb 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8320360 8330684 8331320 8331655
+ * @bug 8320360 8330684 8331320 8331655 8331940
  * @summary Testing ClassFile limits.
  * @run junit LimitsTest
  */
@@ -35,8 +35,12 @@ import java.lang.constant.MethodTypeDesc;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.Opcode;
 import java.lang.classfile.attribute.CodeAttribute;
+import java.lang.classfile.attribute.LineNumberInfo;
+import java.lang.classfile.attribute.LineNumberTableAttribute;
 import java.lang.classfile.constantpool.ConstantPoolException;
 import java.lang.classfile.constantpool.IntegerEntry;
+import java.util.List;
+import jdk.internal.classfile.impl.DirectCodeBuilder;
 import jdk.internal.classfile.impl.DirectMethodBuilder;
 import jdk.internal.classfile.impl.LabelContext;
 import jdk.internal.classfile.impl.UnboundAttribute;
@@ -161,4 +165,14 @@ class LimitsTest {
                                     b.writeU2(0);//attributes
                                 }})))).methods().get(0).code().get().elementList());
     }
+
+    @Test
+    void testLineNumberOutOfBounds() {
+        assertThrows(IllegalArgumentException.class, () ->
+                ClassFile.of().parse(ClassFile.of().build(ClassDesc.of("LineNumberClass"), cb -> cb.withMethodBody(
+                "lineNumberMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, cob -> ((DirectCodeBuilder)cob
+                        .return_())
+                        .writeAttribute(LineNumberTableAttribute.of(List.of(LineNumberInfo.of(500, 0))))
+                ))).methods().get(0).code().get().elementList());
+    }
 }

From 9c02c8dd71023df6338cb94997bca6b00768af6f Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Wed, 15 May 2024 16:42:19 +0000
Subject: [PATCH 444/486] 8332255: Shenandoah: Remove duplicate definition of
 init mark closure

Reviewed-by: shade, kdnilsen
---
 .../share/gc/shenandoah/shenandoahHeap.cpp    | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index c9d3d1d9364..870885b385c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1637,29 +1637,6 @@ void ShenandoahHeap::parallel_heap_region_iterate(ShenandoahHeapRegionClosure* b
   }
 }
 
-class ShenandoahInitMarkUpdateRegionStateClosure : public ShenandoahHeapRegionClosure {
-private:
-  ShenandoahMarkingContext* const _ctx;
-public:
-  ShenandoahInitMarkUpdateRegionStateClosure() : _ctx(ShenandoahHeap::heap()->marking_context()) {}
-
-  void heap_region_do(ShenandoahHeapRegion* r) {
-    assert(!r->has_live(), "Region " SIZE_FORMAT " should have no live data", r->index());
-    if (r->is_active()) {
-      // Check if region needs updating its TAMS. We have updated it already during concurrent
-      // reset, so it is very likely we don't need to do another write here.
-      if (_ctx->top_at_mark_start(r) != r->top()) {
-        _ctx->capture_top_at_mark_start(r);
-      }
-    } else {
-      assert(_ctx->top_at_mark_start(r) == r->top(),
-             "Region " SIZE_FORMAT " should already have correct TAMS", r->index());
-    }
-  }
-
-  bool is_thread_safe() { return true; }
-};
-
 class ShenandoahRendezvousClosure : public HandshakeClosure {
 public:
   inline ShenandoahRendezvousClosure() : HandshakeClosure("ShenandoahRendezvous") {}

From 491b3b45634fffb0101244f7d491a1681e7e8002 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Wed, 15 May 2024 16:53:04 +0000
Subject: [PATCH 445/486] 8332256: Shenandoah: Do not visit heap threads during
 shutdown

Reviewed-by: shade, kdnilsen
---
 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 870885b385c..53d4911797d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1291,7 +1291,14 @@ void ShenandoahHeap::prepare_for_verify() {
 }
 
 void ShenandoahHeap::gc_threads_do(ThreadClosure* tcl) const {
-  tcl->do_thread(_control_thread);
+  if (_shenandoah_policy->is_at_shutdown()) {
+    return;
+  }
+
+  if (_control_thread != nullptr) {
+    tcl->do_thread(_control_thread);
+  }
+
   workers()->threads_do(tcl);
   if (_safepoint_workers != nullptr) {
     _safepoint_workers->threads_do(tcl);
@@ -1848,7 +1855,7 @@ uint ShenandoahHeap::max_workers() {
 void ShenandoahHeap::stop() {
   // The shutdown sequence should be able to terminate when GC is running.
 
-  // Step 0. Notify policy to disable event recording.
+  // Step 0. Notify policy to disable event recording and prevent visiting gc threads during shutdown
   _shenandoah_policy->record_shutdown();
 
   // Step 1. Notify control thread that we are in shutdown.

From 8a4315f833f3700075d65fae6bc566011c837c07 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Wed, 15 May 2024 18:35:46 +0000
Subject: [PATCH 446/486] 8331987: Enhance stacktrace clarity for
 CompletableFuture CancellationException

Reviewed-by: alanb, dfuchs
---
 .../util/concurrent/CancellationException.java  | 12 ++++++++++++
 .../java/util/concurrent/CompletableFuture.java | 16 ++++++++--------
 .../concurrent/tck/CompletableFutureTest.java   | 17 +++++++++++++++--
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/CancellationException.java b/src/java.base/share/classes/java/util/concurrent/CancellationException.java
index bd351730421..c211464f26d 100644
--- a/src/java.base/share/classes/java/util/concurrent/CancellationException.java
+++ b/src/java.base/share/classes/java/util/concurrent/CancellationException.java
@@ -60,4 +60,16 @@ public class CancellationException extends IllegalStateException {
     public CancellationException(String message) {
         super(message);
     }
+
+    /**
+     * Only intended for in-package usage.
+     * Constructs a {@code CancellationException} with the specified detail
+     * message and CancellationException cause.
+     *
+     * @param message the detail message
+     * @param cause the underlying cancellation exception
+     */
+    CancellationException(String message, CancellationException cause) {
+        super(message, cause);
+    }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
index a664365fe29..94d46e8c662 100644
--- a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
+++ b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
@@ -380,7 +380,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     /**
      * Reports result using Future.get conventions.
      */
-    private static Object reportGet(Object r)
+    private static Object reportGet(Object r, String details)
         throws InterruptedException, ExecutionException {
         if (r == null) // by convention below, null means interrupted
             throw new InterruptedException();
@@ -389,7 +389,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
             if ((x = ((AltResult)r).ex) == null)
                 return null;
             if (x instanceof CancellationException)
-                throw (CancellationException)x;
+                throw new CancellationException(details, (CancellationException)x);
             if ((x instanceof CompletionException) &&
                 (cause = x.getCause()) != null)
                 x = cause;
@@ -401,13 +401,13 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     /**
      * Decodes outcome to return result or throw unchecked exception.
      */
-    private static Object reportJoin(Object r) {
+    private static Object reportJoin(Object r, String details) {
         if (r instanceof AltResult) {
             Throwable x;
             if ((x = ((AltResult)r).ex) == null)
                 return null;
             if (x instanceof CancellationException)
-                throw (CancellationException)x;
+                throw new CancellationException(details, (CancellationException)x);
             if (x instanceof CompletionException)
                 throw (CompletionException)x;
             throw new CompletionException(x);
@@ -2070,7 +2070,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
         Object r;
         if ((r = result) == null)
             r = waitingGet(true);
-        return (T) reportGet(r);
+        return (T) reportGet(r, "get");
     }
 
     /**
@@ -2093,7 +2093,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
         Object r;
         if ((r = result) == null)
             r = timedGet(nanos);
-        return (T) reportGet(r);
+        return (T) reportGet(r, "get");
     }
 
     /**
@@ -2115,7 +2115,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
         Object r;
         if ((r = result) == null)
             r = waitingGet(false);
-        return (T) reportJoin(r);
+        return (T) reportJoin(r, "join");
     }
 
     /**
@@ -2131,7 +2131,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     @SuppressWarnings("unchecked")
     public T getNow(T valueIfAbsent) {
         Object r;
-        return ((r = result) == null) ? valueIfAbsent : (T) reportJoin(r);
+        return ((r = result) == null) ? valueIfAbsent : (T) reportJoin(r, "getNow");
     }
 
     @Override
diff --git a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
index 10e035df51f..8b7d69b1ef4 100644
--- a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
+++ b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
@@ -199,27 +199,40 @@ public class CompletableFutureTest extends JSR166TestCase {
         checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
     }
 
+    void checkCancellationException(CancellationException thrown, String message) {
+        assertTrue(message.equals(thrown.getMessage()));
+
+        assertTrue(thrown.getCause() instanceof CancellationException);
+        assertTrue(thrown.getCause().getCause() == null);
+    }
+
     void checkCancelled(CompletableFuture<?> f) {
         long startTime = System.nanoTime();
         try {
             f.get(LONG_DELAY_MS, MILLISECONDS);
             shouldThrow();
         } catch (CancellationException success) {
+            checkCancellationException(success, "get");
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
 
         try {
             f.join();
             shouldThrow();
-        } catch (CancellationException success) {}
+        } catch (CancellationException success) {
+            checkCancellationException(success, "join");
+        }
         try {
             f.getNow(null);
             shouldThrow();
-        } catch (CancellationException success) {}
+        } catch (CancellationException success) {
+            checkCancellationException(success, "getNow");
+        }
         try {
             f.get();
             shouldThrow();
         } catch (CancellationException success) {
+            checkCancellationException(success, "get");
         } catch (Throwable fail) { threadUnexpectedException(fail); }
 
         assertTrue(exceptionalCompletion(f) instanceof CancellationException);

From 7cff04fc8a8114a297437aa526b18b6185831eac Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 15 May 2024 19:28:24 +0000
Subject: [PATCH 447/486] 8330276: Console methods with explicit Locale

Reviewed-by: joehw, rriggs, jlahoda
---
 .../share/classes/java/io/Console.java        | 272 +++++++++++++++---
 .../classes/java/io/ProxyingConsole.java      |  50 +++-
 .../classes/jdk/internal/io/JdkConsole.java   |  10 +-
 .../jdk/internal/io/JdkConsoleImpl.java       |  28 +-
 .../org/jline/JdkConsoleProviderImpl.java     |  22 +-
 .../jdk/internal/org/jline/utils/Display.java |   4 +-
 .../jshell/execution/impl/ConsoleImpl.java    |  28 +-
 test/jdk/java/io/Console/LocaleTest.java      | 107 +++++++
 8 files changed, 417 insertions(+), 104 deletions(-)
 create mode 100644 test/jdk/java/io/Console/LocaleTest.java

diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java
index bbf2e39eb48..45f5dddafb2 100644
--- a/src/java.base/share/classes/java/io/Console.java
+++ b/src/java.base/share/classes/java/io/Console.java
@@ -62,6 +62,11 @@ import sun.security.action.GetPropertyAction;
  * on the objects returned by {@link #reader()} and {@link #writer()} may
  * block in multithreaded scenarios.
  * <p>
+ * Operations that format strings are locale sensitive, using either the
+ * specified {@code Locale}, or the
+ * {@link Locale##default_locale default format Locale} to produce localized
+ * formatted strings.
+ * <p>
  * Invoking {@code close()} on the objects returned by the {@link #reader()}
  * and the {@link #writer()} will not close the underlying stream of those
  * objects.
@@ -147,11 +152,12 @@ public sealed class Console implements Flushable permits ProxyingConsole {
 
     /**
      * Writes a formatted string to this console's output stream using
-     * the specified format string and arguments.
+     * the specified format string and arguments with the
+     * {@link Locale##default_locale default format locale}.
      *
-     * @param  fmt
-     *         A format string as described in <a
-     *         href="../util/Formatter.html#syntax">Format string syntax</a>.
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
      *
      * @param  args
      *         Arguments referenced by the format specifiers in the format
@@ -160,39 +166,75 @@ public sealed class Console implements Flushable permits ProxyingConsole {
      *         variable and may be zero.  The maximum number of arguments is
      *         limited by the maximum dimension of a Java array as defined by
      *         <cite>The Java Virtual Machine Specification</cite>.
-     *         The behaviour on a
-     *         {@code null} argument depends on the <a
-     *         href="../util/Formatter.html#syntax">conversion</a>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format
      *          specifier that is incompatible with the given arguments,
      *          insufficient arguments given the format string, or other
      *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section
      *          of the formatter class specification.
      *
      * @return  This console
      */
-    public Console format(String fmt, Object ...args) {
+    public Console format(String format, Object ... args) {
+        throw newUnsupportedOperationException();
+    }
+
+    /**
+     * Writes a formatted string to this console's output stream using
+     * the specified format string and arguments with the specified
+     * {@code locale}.
+     *
+     * @param  locale The {@linkplain Locale locale} to apply during
+     *         formatting.  If {@code locale} is {@code null} then no localization
+     *         is applied.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section
+     *          of the formatter class specification.
+     *
+     * @return  This console
+     * @since   23
+     */
+    public Console format(Locale locale, String format, Object ... args) {
         throw newUnsupportedOperationException();
     }
 
     /**
      * A convenience method to write a formatted string to this console's
-     * output stream using the specified format string and arguments.
+     * output stream using the specified format string and arguments with
+     * the {@link Locale##default_locale default format locale}.
      *
-     * <p> An invocation of this method of the form
-     * {@code con.printf(format, args)} behaves in exactly the same way
-     * as the invocation of
-     * {@snippet lang=java :
-     *     con.format(format, args)
-     * }
+     * @implSpec This is the same as calling {@code format(format, args)}.
      *
      * @param  format
-     *         A format string as described in <a
-     *         href="../util/Formatter.html#syntax">Format string syntax</a>.
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
      *
      * @param  args
      *         Arguments referenced by the format specifiers in the format
@@ -201,17 +243,17 @@ public sealed class Console implements Flushable permits ProxyingConsole {
      *         variable and may be zero.  The maximum number of arguments is
      *         limited by the maximum dimension of a Java array as defined by
      *         <cite>The Java Virtual Machine Specification</cite>.
-     *         The behaviour on a
-     *         {@code null} argument depends on the <a
-     *         href="../util/Formatter.html#syntax">conversion</a>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format
      *          specifier that is incompatible with the given arguments,
      *          insufficient arguments given the format string, or other
      *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section of the
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
      *          formatter class specification.
      *
      * @return  This console
@@ -221,28 +263,76 @@ public sealed class Console implements Flushable permits ProxyingConsole {
     }
 
     /**
-     * Provides a formatted prompt, then reads a single line of text from the
-     * console.
+     * A convenience method to write a formatted string to this console's
+     * output stream using the specified format string and arguments with
+     * the specified {@code locale}.
      *
-     * @param  fmt
-     *         A format string as described in <a
-     *         href="../util/Formatter.html#syntax">Format string syntax</a>.
+     * @implSpec This is the same as calling
+     *         {@code format(locale, format, args)}.
+     *
+     * @param  locale The {@linkplain Locale locale} to apply during
+     *         formatting.  If {@code locale} is {@code null} then no localization
+     *         is applied.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
      *
      * @param  args
      *         Arguments referenced by the format specifiers in the format
      *         string.  If there are more arguments than format specifiers, the
-     *         extra arguments are ignored.  The maximum number of arguments is
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
      *         limited by the maximum dimension of a Java array as defined by
      *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format
      *          specifier that is incompatible with the given arguments,
      *          insufficient arguments given the format string, or other
      *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section
-     *          of the formatter class specification.
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
+     *
+     * @return  This console
+     * @since   23
+     */
+    public Console printf(Locale locale, String format, Object ... args) {
+        throw newUnsupportedOperationException();
+    }
+
+    /**
+     * Provides a formatted prompt using the
+     * {@link Locale##default_locale default format locale}, then reads a
+     * single line of text from the console.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
      *
      * @throws IOError
      *         If an I/O error occurs.
@@ -251,7 +341,51 @@ public sealed class Console implements Flushable permits ProxyingConsole {
      *          including any line-termination characters, or {@code null}
      *          if an end of stream has been reached.
      */
-    public String readLine(String fmt, Object ... args) {
+    public String readLine(String format, Object ... args) {
+        throw newUnsupportedOperationException();
+    }
+
+    /**
+     * Provides a formatted prompt using the specified {@code locale}, then
+     * reads a single line of text from the console.
+     *
+     * @param  locale The {@linkplain Locale locale} to apply during
+     *         formatting.  If {@code locale} is {@code null} then no localization
+     *         is applied.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}.
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
+     *
+     * @throws IOError
+     *         If an I/O error occurs.
+     *
+     * @return  A string containing the line read from the console, not
+     *          including any line-termination characters, or {@code null}
+     *          if an end of stream has been reached.
+     * @since   23
+     */
+    public String readLine(Locale locale, String format, Object ... args) {
         throw newUnsupportedOperationException();
     }
 
@@ -270,29 +404,34 @@ public sealed class Console implements Flushable permits ProxyingConsole {
     }
 
     /**
-     * Provides a formatted prompt, then reads a password or passphrase from
-     * the console with echoing disabled.
+     * Provides a formatted prompt using the
+     * {@link Locale##default_locale default format locale}, then reads a
+     * password or passphrase from the console with echoing disabled.
      *
-     * @param  fmt
-     *         A format string as described in <a
-     *         href="../util/Formatter.html#syntax">Format string syntax</a>
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}
      *         for the prompt text.
      *
      * @param  args
      *         Arguments referenced by the format specifiers in the format
      *         string.  If there are more arguments than format specifiers, the
-     *         extra arguments are ignored.  The maximum number of arguments is
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
      *         limited by the maximum dimension of a Java array as defined by
      *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format
      *          specifier that is incompatible with the given arguments,
      *          insufficient arguments given the format string, or other
      *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a>
-     *          section of the formatter class specification.
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
      *
      * @throws IOError
      *         If an I/O error occurs.
@@ -301,7 +440,52 @@ public sealed class Console implements Flushable permits ProxyingConsole {
      *          from the console, not including any line-termination characters,
      *          or {@code null} if an end of stream has been reached.
      */
-    public char[] readPassword(String fmt, Object ... args) {
+    public char[] readPassword(String format, Object ... args) {
+        throw newUnsupportedOperationException();
+    }
+
+    /**
+     * Provides a formatted prompt using the specified {@code locale}, then
+     * reads a password or passphrase from the console with echoing disabled.
+     *
+     * @param  locale The {@linkplain Locale locale} to apply during
+     *         formatting.  If {@code locale} is {@code null} then no localization
+     *         is applied.
+     *
+     * @param  format
+     *         A format string as described in {@link
+     *         Formatter##syntax Format string syntax}
+     *         for the prompt text.
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java Virtual Machine Specification</cite>.
+     *         The behavior on a
+     *         {@code null} argument depends on the {@link
+     *         Formatter##syntax conversion}.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the {@link
+     *          Formatter##detail Details} section of the
+     *          formatter class specification.
+     *
+     * @throws IOError
+     *         If an I/O error occurs.
+     *
+     * @return  A character array containing the password or passphrase read
+     *          from the console, not including any line-termination characters,
+     *          or {@code null} if an end of stream has been reached.
+     * @since   23
+     */
+    public char[] readPassword(Locale locale, String format, Object ... args) {
         throw newUnsupportedOperationException();
     }
 
diff --git a/src/java.base/share/classes/java/io/ProxyingConsole.java b/src/java.base/share/classes/java/io/ProxyingConsole.java
index 0e8a6e83301..2179afa31c0 100644
--- a/src/java.base/share/classes/java/io/ProxyingConsole.java
+++ b/src/java.base/share/classes/java/io/ProxyingConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
 package java.io;
 
 import java.nio.charset.Charset;
+import java.util.Locale;
+
 import jdk.internal.io.JdkConsole;
 
 /**
@@ -83,9 +85,17 @@ final class ProxyingConsole extends Console {
      * {@inheritDoc}
      */
     @Override
-    public Console format(String fmt, Object ... args) {
+    public Console format(String format, Object ... args) {
+        return format(Locale.getDefault(Locale.Category.FORMAT), format, args);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Console format(Locale locale, String format, Object ... args) {
         synchronized (writeLock) {
-            delegate.format(fmt, args);
+            delegate.format(locale, format, args);
         }
         return this;
     }
@@ -95,8 +105,16 @@ final class ProxyingConsole extends Console {
      */
     @Override
     public Console printf(String format, Object ... args) {
+        return printf(Locale.getDefault(Locale.Category.FORMAT), format, args);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Console printf(Locale locale, String format, Object ... args) {
         synchronized (writeLock) {
-            delegate.printf(format, args);
+            delegate.format(locale, format, args);
         }
         return this;
     }
@@ -105,10 +123,18 @@ final class ProxyingConsole extends Console {
      * {@inheritDoc}
      */
     @Override
-    public String readLine(String fmt, Object ... args) {
+    public String readLine(String format, Object ... args) {
+        return readLine(Locale.getDefault(Locale.Category.FORMAT), format, args);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String readLine(Locale locale, String format, Object ... args) {
         synchronized (writeLock) {
             synchronized (readLock) {
-                return delegate.readLine(fmt, args);
+                return delegate.readLine(locale, format, args);
             }
         }
     }
@@ -127,10 +153,18 @@ final class ProxyingConsole extends Console {
      * {@inheritDoc}
      */
     @Override
-    public char[] readPassword(String fmt, Object ... args) {
+    public char[] readPassword(String format, Object ... args) {
+        return readPassword(Locale.getDefault(Locale.Category.FORMAT), format, args);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public char[] readPassword(Locale locale, String format, Object ... args) {
         synchronized (writeLock) {
             synchronized (readLock) {
-                return delegate.readPassword(fmt, args);
+                return delegate.readPassword(locale, format, args);
             }
         }
     }
diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsole.java b/src/java.base/share/classes/jdk/internal/io/JdkConsole.java
index a75941fd2a5..2d48748fbfc 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsole.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package jdk.internal.io;
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.util.Locale;
 
 /**
  * Delegate interface for custom Console implementations.
@@ -37,11 +38,10 @@ import java.nio.charset.Charset;
 public interface JdkConsole {
     PrintWriter writer();
     Reader reader();
-    JdkConsole format(String fmt, Object ... args);
-    JdkConsole printf(String format, Object ... args);
-    String readLine(String fmt, Object ... args);
+    JdkConsole format(Locale locale, String format, Object ... args);
+    String readLine(Locale locale, String format, Object ... args);
     String readLine();
-    char[] readPassword(String fmt, Object ... args);
+    char[] readPassword(Locale locale, String format, Object ... args);
     char[] readPassword();
     void flush();
     Charset charset();
diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
index a75ff582085..e25626ead0c 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ import java.io.Writer;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Formatter;
+import java.util.Locale;
 import java.util.Objects;
 
 import jdk.internal.access.SharedSecrets;
@@ -57,23 +58,18 @@ public final class JdkConsoleImpl implements JdkConsole {
     }
 
     @Override
-    public JdkConsole format(String fmt, Object ... args) {
-        formatter.format(fmt, args).flush();
+    public JdkConsole format(Locale locale, String format, Object ... args) {
+        formatter.format(locale, format, args).flush();
         return this;
     }
 
     @Override
-    public JdkConsole printf(String format, Object ... args) {
-        return format(format, args);
-    }
-
-    @Override
-    public String readLine(String fmt, Object ... args) {
+    public String readLine(Locale locale, String format, Object ... args) {
         String line = null;
         synchronized (writeLock) {
             synchronized(readLock) {
-                if (!fmt.isEmpty())
-                    pw.format(fmt, args);
+                if (!format.isEmpty())
+                    pw.format(locale, format, args);
                 try {
                     char[] ca = readline(false);
                     if (ca != null)
@@ -88,11 +84,11 @@ public final class JdkConsoleImpl implements JdkConsole {
 
     @Override
     public String readLine() {
-        return readLine("");
+        return readLine(Locale.getDefault(Locale.Category.FORMAT), "");
     }
 
     @Override
-    public char[] readPassword(String fmt, Object ... args) {
+    public char[] readPassword(Locale locale, String format, Object ... args) {
         char[] passwd = null;
         synchronized (writeLock) {
             synchronized(readLock) {
@@ -104,8 +100,8 @@ public final class JdkConsoleImpl implements JdkConsole {
                 }
                 IOError ioe = null;
                 try {
-                    if (!fmt.isEmpty())
-                        pw.format(fmt, args);
+                    if (!format.isEmpty())
+                        pw.format(locale, format, args);
                     passwd = readline(true);
                 } catch (IOException x) {
                     ioe = new IOError(x);
@@ -164,7 +160,7 @@ public final class JdkConsoleImpl implements JdkConsole {
 
     @Override
     public char[] readPassword() {
-        return readPassword("");
+        return readPassword(Locale.getDefault(Locale.Category.FORMAT), "");
     }
 
     @Override
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
index 64255b5ab60..aa90f68c1cf 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -30,6 +30,7 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
+import java.util.Locale;
 
 import jdk.internal.io.JdkConsole;
 import jdk.internal.io.JdkConsoleProvider;
@@ -84,21 +85,16 @@ public class JdkConsoleProviderImpl implements JdkConsoleProvider {
         }
 
         @Override
-        public JdkConsole format(String fmt, Object ... args) {
-            writer().format(fmt, args).flush();
+        public JdkConsole format(Locale locale, String format, Object ... args) {
+            writer().format(locale, format, args).flush();
             return this;
         }
 
         @Override
-        public JdkConsole printf(String format, Object ... args) {
-            return format(format, args);
-        }
-
-        @Override
-        public String readLine(String fmt, Object ... args) {
+        public String readLine(Locale locale, String format, Object ... args) {
             try {
                 initJLineIfNeeded();
-                return jline.readLine(fmt.formatted(args).replace("%", "%%"));
+                return jline.readLine(String.format(locale, format, args).replace("%", "%%"));
             } catch (EndOfFileException eofe) {
                 return null;
             }
@@ -106,14 +102,14 @@ public class JdkConsoleProviderImpl implements JdkConsoleProvider {
 
         @Override
         public String readLine() {
-            return readLine("");
+            return readLine(Locale.getDefault(Locale.Category.FORMAT), "");
         }
 
         @Override
-        public char[] readPassword(String fmt, Object ... args) {
+        public char[] readPassword(Locale locale, String format, Object ... args) {
             try {
                 initJLineIfNeeded();
-                return jline.readLine(fmt.formatted(args).replace("%", "%%"), '\0')
+                return jline.readLine(String.format(locale, format, args).replace("%", "%%"), '\0')
                             .toCharArray();
             } catch (EndOfFileException eofe) {
                 return null;
@@ -124,7 +120,7 @@ public class JdkConsoleProviderImpl implements JdkConsoleProvider {
 
         @Override
         public char[] readPassword() {
-            return readPassword("");
+            return readPassword(Locale.getDefault(Locale.Category.FORMAT), "");
         }
 
         @Override
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
index 557024a121e..32663d414ce 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
@@ -76,7 +76,9 @@ public class Display {
 
     public void resize(int rows, int columns) {
         if (rows == 0 || columns == 0) {
-            columns = 1;
+            // OpenJDK patch. Original code assigned 1 to columns, which ended up
+            // appending " \b" to the prompt in certain cases.
+            columns = Integer.MAX_VALUE - 1;
             rows = 1;
         }
         if (this.rows != rows || this.columns != columns) {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
index 202f29e3140..68901aebc84 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@ import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.Locale;
+
 import jdk.internal.io.JdkConsole;
 import jdk.internal.io.JdkConsoleProvider;
 import jdk.jshell.JShellConsole;
@@ -193,8 +195,8 @@ public class ConsoleImpl {
          * {@inheritDoc}
          */
         @Override
-        public JdkConsole format(String fmt, Object... args) {
-            writer().format(fmt, args).flush();
+        public JdkConsole format(Locale locale, String format, Object... args) {
+            writer().format(locale, format, args).flush();
             return this;
         }
 
@@ -202,19 +204,11 @@ public class ConsoleImpl {
          * {@inheritDoc}
          */
         @Override
-        public JdkConsole printf(String format, Object... args) {
-            return format(format, args);
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public String readLine(String fmt, Object... args) {
+        public String readLine(Locale locale, String format, Object... args) {
             try {
                 return sendAndReceive(() -> {
                     remoteInput.write(Task.READ_LINE.ordinal());
-                    String prompt = fmt.formatted(args);
+                    String prompt = String.format(locale, format, args);
                     char[] chars = prompt.toCharArray();
                     sendChars(chars, 0, chars.length);
                     char[] line = readChars();
@@ -230,18 +224,18 @@ public class ConsoleImpl {
          */
         @Override
         public String readLine() {
-            return readLine("");
+            return readLine(Locale.getDefault(Locale.Category.FORMAT), "");
         }
 
         /**
          * {@inheritDoc}
          */
         @Override
-        public char[] readPassword(String fmt, Object... args) {
+        public char[] readPassword(Locale locale, String format, Object... args) {
             try {
                 return sendAndReceive(() -> {
                     remoteInput.write(Task.READ_PASSWORD.ordinal());
-                    String prompt = fmt.formatted(args);
+                    String prompt = String.format(locale, format, args);
                     char[] chars = prompt.toCharArray();
                     sendChars(chars, 0, chars.length);
                     return readChars();
@@ -256,7 +250,7 @@ public class ConsoleImpl {
          */
         @Override
         public char[] readPassword() {
-            return readPassword("");
+            return readPassword(Locale.getDefault(Locale.Category.FORMAT), "");
         }
 
         /**
diff --git a/test/jdk/java/io/Console/LocaleTest.java b/test/jdk/java/io/Console/LocaleTest.java
new file mode 100644
index 00000000000..1fe725a3ab4
--- /dev/null
+++ b/test/jdk/java/io/Console/LocaleTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Locale;
+
+import jdk.test.lib.process.ProcessTools;
+
+/**
+ * @test
+ * @bug 8330276
+ * @summary Tests Console methods that have Locale as an argument
+ * @library /test/lib
+ * @modules jdk.internal.le jdk.localedata
+ */
+public class LocaleTest {
+    private static Calendar TODAY  = new GregorianCalendar(2024, Calendar.APRIL, 22);
+    private static String FORMAT = "%1$tY-%1$tB-%1$te %1$tA";
+    // We want to limit the expected strings within US-ASCII charset, as
+    // the native encoding is determined as such, which is used by
+    // the `Process` class under jtreg environment.
+    private static List<String> EXPECTED = List.of(
+        String.format(Locale.UK, FORMAT, TODAY),
+        String.format(Locale.FRANCE, FORMAT, TODAY),
+        String.format(Locale.GERMANY, FORMAT, TODAY),
+        String.format(Locale.of("es"), FORMAT, TODAY),
+        String.format((Locale)null, FORMAT, TODAY),
+        String.format((Locale)null, FORMAT, TODAY),
+        String.format((Locale)null, FORMAT, TODAY),
+        String.format((Locale)null, FORMAT, TODAY)
+    );
+
+    public static void main(String... args) throws Throwable {
+        if (args.length == 0) {
+            // no arg will launch the child process that actually perform tests
+            var pb = ProcessTools.createTestJavaProcessBuilder(
+                    "LocaleTest", "dummy");
+            var input = new File(System.getProperty("test.src", "."), "input.txt");
+            pb.redirectInput(input);
+            var oa = ProcessTools.executeProcess(pb);
+            if (oa.getExitValue() == -1) {
+                System.out.println("System.console() returns null. Ignoring the test.");
+            } else {
+                var output = oa.asLines();
+                var resultText =
+                    """
+                    Actual output: %s
+                    Expected output: %s
+                    """.formatted(output, EXPECTED);
+                if (!output.equals(EXPECTED)) {
+                    throw new RuntimeException("Standard out had unexpected strings:\n" + resultText);
+                } else {
+                    oa.shouldHaveExitValue(0);
+                    System.out.println("Formatting with explicit Locale succeeded.\n" + resultText);
+                }
+            }
+        } else {
+            var con = System.console();
+            if (con != null) {
+                // tests these additional methods that take a Locale
+                con.format(Locale.UK, FORMAT, TODAY);
+                con.printf("\n");
+                con.printf(Locale.FRANCE, FORMAT, TODAY);
+                con.printf("\n");
+                con.readLine(Locale.GERMANY, FORMAT, TODAY);
+                con.printf("\n");
+                con.readPassword(Locale.of("es"), FORMAT, TODAY);
+                con.printf("\n");
+
+                // tests null locale
+                con.format((Locale)null, FORMAT, TODAY);
+                con.printf("\n");
+                con.printf((Locale)null, FORMAT, TODAY);
+                con.printf("\n");
+                con.readLine((Locale)null, FORMAT, TODAY);
+                con.printf("\n");
+                con.readPassword((Locale)null, FORMAT, TODAY);
+            } else {
+                // Exit with -1
+                System.exit(-1);
+            }
+        }
+    }
+}

From 43b109b111e77d0f7b302debc0d76e4ac7c9ac56 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Wed, 15 May 2024 19:29:30 +0000
Subject: [PATCH 448/486] 8330066: HeapDumpPath and HeapDumpGzipLevel VM
 options do not mention HeapDumpBeforeFullGC and HeapDumpAfterFullGC

Reviewed-by: cjplummer, dholmes, yyang
---
 src/hotspot/share/runtime/globals.hpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 3995a871474..d2f40520fe2 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -542,11 +542,11 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   product(bool, HeapDumpBeforeFullGC, false, MANAGEABLE,                    \
           "Dump heap to file before any major stop-the-world GC "           \
-          "(also see FullGCHeapDumpLimit)")                                 \
+          "(also see FullGCHeapDumpLimit, HeapDumpPath, HeapDumpGzipLevel)")\
                                                                             \
   product(bool, HeapDumpAfterFullGC, false, MANAGEABLE,                     \
           "Dump heap to file after any major stop-the-world GC "            \
-          "(also see FullGCHeapDumpLimit)")                                 \
+          "(also see FullGCHeapDumpLimit, HeapDumpPath, HeapDumpGzipLevel)")\
                                                                             \
   product(uint, FullGCHeapDumpLimit, 0, MANAGEABLE,                         \
           "Limit the number of heap dumps triggered by "                    \
@@ -555,15 +555,18 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   product(bool, HeapDumpOnOutOfMemoryError, false, MANAGEABLE,              \
           "Dump heap to file when java.lang.OutOfMemoryError is thrown "    \
-          "from JVM")                                                       \
+          "from JVM "                                                       \
+          "(also see HeapDumpPath, HeapDumpGzipLevel)")                     \
                                                                             \
   product(ccstr, HeapDumpPath, nullptr, MANAGEABLE,                         \
-          "When HeapDumpOnOutOfMemoryError is on, the path (filename or "   \
+          "When HeapDumpOnOutOfMemoryError, HeapDumpBeforeFullGC "          \
+          "or HeapDumpAfterFullGC is on, the path (filename or "            \
           "directory) of the dump file (defaults to java_pid<pid>.hprof "   \
           "in the working directory)")                                      \
                                                                             \
   product(int, HeapDumpGzipLevel, 0, MANAGEABLE,                            \
-          "When HeapDumpOnOutOfMemoryError is on, the gzip compression "    \
+          "When HeapDumpOnOutOfMemoryError, HeapDumpBeforeFullGC "          \
+          "or HeapDumpAfterFullGC is on, the gzip compression "             \
           "level of the dump file. 0 (the default) disables gzip "          \
           "compression. Otherwise the level must be between 1 and 9.")      \
           range(0, 9)                                                       \

From 4083255440cfbf39b9683ea88a433d71ec6111e7 Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Wed, 15 May 2024 20:18:57 +0000
Subject: [PATCH 449/486] 8316138: Add GlobalSign 2 TLS root certificates

Reviewed-by: mullan
---
 .../share/data/cacerts/globalsigne46          | 20 ++++++++++
 .../share/data/cacerts/globalsignr46          | 38 +++++++++++++++++++
 .../certification/CAInterop.java              | 29 ++++++++++++++
 .../security/lib/cacerts/VerifyCACerts.java   | 10 +++--
 4 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 src/java.base/share/data/cacerts/globalsigne46
 create mode 100644 src/java.base/share/data/cacerts/globalsignr46

diff --git a/src/java.base/share/data/cacerts/globalsigne46 b/src/java.base/share/data/cacerts/globalsigne46
new file mode 100644
index 00000000000..50c7dadefdd
--- /dev/null
+++ b/src/java.base/share/data/cacerts/globalsigne46
@@ -0,0 +1,20 @@
+Owner: CN=GlobalSign Root E46, O=GlobalSign nv-sa, C=BE
+Issuer: CN=GlobalSign Root E46, O=GlobalSign nv-sa, C=BE
+Serial number: 11d2bbba336ed4bce62468c50d841d98e843
+Valid from: Wed Mar 20 00:00:00 GMT 2019 until: Tue Mar 20 00:00:00 GMT 2046
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICCzCCAZGgAwIBAgISEdK7ujNu1LzmJGjFDYQdmOhDMAoGCCqGSM49BAMDMEYx
+CzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQD
+ExNHbG9iYWxTaWduIFJvb3QgRTQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAw
+MDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2Ex
+HDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAScDrHPt+ieUnd1NPqlRqetMhkytAepJ8qUuwzSChDH2omwlwxwEwkBjtjq
+R+q+soArzfwoDdusvKSGN+1wCAB16pMLey5SnCNoIwZD7JIvU4Tb+0cUB+hflGdd
+yXqBPCCjQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBQxCpCPtsad0kRLgLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ
+7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZkvLtoURMMA/cVi4RguYv/Uo7njLwcAjA8
++RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+CAezNIm8BZ/3Hobui3A=
+-----END CERTIFICATE-----
diff --git a/src/java.base/share/data/cacerts/globalsignr46 b/src/java.base/share/data/cacerts/globalsignr46
new file mode 100644
index 00000000000..80d7d92d4fb
--- /dev/null
+++ b/src/java.base/share/data/cacerts/globalsignr46
@@ -0,0 +1,38 @@
+Owner: CN=GlobalSign Root R46, O=GlobalSign nv-sa, C=BE
+Issuer: CN=GlobalSign Root R46, O=GlobalSign nv-sa, C=BE
+Serial number: 11d2bbb9d723189e405f0a9d2dd0df2567d1
+Valid from: Wed Mar 20 00:00:00 GMT 2019 until: Tue Mar 20 00:00:00 GMT 2046
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgISEdK7udcjGJ5AXwqdLdDfJWfRMA0GCSqGSIb3DQEBDAUA
+MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYD
+VQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMy
+MDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYt
+c2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCsrHQy6LNl5brtQyYdpokNRbopiLKkHWPd08EsCVeJ
+OaFV6Wc0dwxu5FUdUiXSE2te4R2pt32JMl8Nnp8semNgQB+msLZ4j5lUlghYruQG
+vGIFAha/r6gjA7aUD7xubMLL1aa7DOn2wQL7Id5m3RerdELv8HQvJfTqa1VbkNud
+316HCkD7rRlr+/fKYIje2sGP1q7Vf9Q8g+7XFkyDRTNrJ9CG0Bwta/OrffGFqfUo
+0q3v84RLHIf8E6M6cqJaESvWJ3En7YEtbWaBkoe0G1h6zD8K+kZPTXhc+CtI4wSE
+y132tGqzZfxCnlEmIyDLPRT5ge1lFgBPGmSXZgjPjHvjK8Cd+RTyG/FWaha/LIWF
+zXg4mutCagI0GIMXTpRW+LaCtfOW3T3zvn8gdz57GSNrLNRyc0NXfeD412lPFzYE
++cCQYDdF3uYM2HSNrpyibXRdQr4G9dlkbgIQrImwTDsHTUB+JMWKmIJ5jqSngiCN
+I/onccnfxkF0oE32kRbcRoxfKWMxWXEM2G/CtjJ9++ZdU6Z+Ffy7dXxd7Pj2Fxzs
+x2sZy/N78CsHpdlseVR2bJ0cpm4O6XkMqCNqo98bMDGfsVR7/mrLZqrcZdCinkqa
+ByFrgY/bxFn63iLABJzjqls2k+g9vXqhnQt2sQvHnf3PmKgGwvgqo6GDoLclcqUC
+4wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUA1yrc4GHqMywptWU4jaWSf8FmSwwDQYJKoZIhvcNAQEMBQADggIBAHx4
+7PYCLLtbfpIrXTncvtgdokIzTfnvpCo7RGkerNlFo048p9gkUbJUHJNOxO97k4Vg
+JuoJSOD1u8fpaNK7ajFxzHmuEajwmf3lH7wvqMxX63bEIaZHU1VNaL8FpO7XJqti
+2kM3S+LGteWygxk6x9PbTZ4IevPuzz5i+6zoYMzRx6Fcg0XERczzF2sUyQQCPtIk
+pnnpHs6i58FZFZ8d4kuaPp92CC1r2LpXFNqD6v6MVenQTqnMdzGxRBF6XLE+0xRF
+FRhiJBPSy03OXIPBNvIQtQ6IbbjhVp+J3pZmOUdkLG5NrmJ7v2B0GbhWrJKsFjLt
+rWhV/pi60zTe9Mlhww6G9kuEYO4Ne7UyWHmRVSyBQ7N0H3qqJZ4d16GLuc1CLgSk
+ZoNNiTW2bKg2SnkheCLQQrzRQDGQob4Ez8pn7fXwgNNgyYMqIgXQBztSvwyeqiv5
+u+YfjyW6hY0XHgL+XVAEV8/+LbzvXMAaq7afJMbfc2hIkCwU9D9SGuTSyxTDYWnP
+4vkYxboznxSjBF25cfe1lNj2M8FawTSLfJvdkzrnE6JwYZ+vj+vYxXX4M2bUdGc6
+N3ec592kD3ZDZopD8p/7DEJ4Y9HiD2971KE9dJeFt0g5QdYg/NA6s/rob8SKunE3
+vouXsXgxT7PntgMTzlSdriVZzH81Xwj3QEUxeCp6
+-----END CERTIFICATE-----
diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
index 0b832366286..9f071bc1450 100644
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
+++ b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
@@ -511,6 +511,28 @@
  * @run main/othervm -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop certainlyroote1 DEFAULT
  */
 
+/*
+ * @test id=globalsignr46
+ * @bug 8316138
+ * @summary Interoperability tests with GlobalSign Root R46
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsignr46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop globalsignr46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop globalsignr46 CRL
+ */
+
+/*
+ * @test id=globalsigne46
+ * @bug 8316138
+ * @summary Interoperability tests with GlobalSign Root E46
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsigne46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop globalsigne46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop globalsigne46 CRL
+ */
+
 /**
  * Collection of certificate validation tests for interoperability with external CAs
  */
@@ -680,6 +702,13 @@ public class CAInterop {
                     new CATestURLs("https://valid.root-e1.certainly.com",
                             "https://revoked.root-e1.certainly.com");
 
+            case "globalsignr46" ->
+                    new CATestURLs("https://valid.r46.roots.globalsign.com",
+                            "https://revoked.r46.roots.globalsign.com");
+            case "globalsigne46" ->
+                    new CATestURLs("https://valid.e46.roots.globalsign.com",
+                            "https://revoked.e46.roots.globalsign.com");
+
             default -> throw new RuntimeException("No test setup found for: " + alias);
         };
     }
diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
index 548024efc6c..83427f1a33a 100644
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
@@ -29,7 +29,7 @@
  *      8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320
  *      8243559 8225072 8258630 8259312 8256421 8225081 8225082 8225083 8245654
  *      8305975 8304760 8307134 8295894 8314960 8317373 8317374 8318759 8319187
- *      8321408
+ *      8321408 8316138
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -48,12 +48,12 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 108;
+    private static final int COUNT = 110;
 
     // SHA-256 of cacerts, can be generated with
     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
     private static final String CHECKSUM
-            = "C4:A2:41:9E:B6:4D:77:26:AA:21:02:83:51:C7:88:21:66:1E:D8:88:4A:AC:84:D5:B0:15:0C:7C:C6:45:85:AF";
+            = "BD:80:65:81:68:E5:6C:51:64:ED:B9:08:53:9F:BB:2F:D9:6C:5D:D4:06:D4:16:59:39:10:8E:F8:24:81:8B:78";
 
     // Hex formatter to upper case with ":" delimiter
     private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
@@ -278,6 +278,10 @@ public class VerifyCACerts {
                     "77:B8:2C:D8:64:4C:43:05:F7:AC:C5:CB:15:6B:45:67:50:04:03:3D:51:C6:0C:62:02:A8:E0:C3:34:67:D3:A0");
             put("certainlyroote1 [jdk]",
                     "B4:58:5F:22:E4:AC:75:6A:4E:86:12:A1:36:1C:5D:9D:03:1A:93:FD:84:FE:BB:77:8F:A3:06:8B:0F:C4:2D:C2");
+            put("globalsignr46 [jdk]",
+                    "4F:A3:12:6D:8D:3A:11:D1:C4:85:5A:4F:80:7C:BA:D6:CF:91:9D:3A:5A:88:B0:3B:EA:2C:63:72:D9:3C:40:C9");
+            put("globalsigne46 [jdk]",
+                    "CB:B9:C4:4D:84:B8:04:3E:10:50:EA:31:A6:9F:51:49:55:D7:BF:D2:E2:C6:B4:93:01:01:9A:D6:1D:9F:50:58");
         }
     };
 

From b687aa550837830b38f0f0faa69c353b1e85219c Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 15 May 2024 23:01:53 +0000
Subject: [PATCH 450/486] 8332176: Refactor ClassListParser::parse()

Reviewed-by: matsaave, ccheung
---
 src/hotspot/share/cds/classListParser.cpp | 218 ++++++++++------------
 src/hotspot/share/cds/classListParser.hpp |  20 +-
 src/hotspot/share/cds/metaspaceShared.cpp |  13 +-
 3 files changed, 120 insertions(+), 131 deletions(-)

diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index 4e49cd3d881..79119a997de 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -61,7 +61,7 @@ ClassListParser::ClassListParser(const char* file, ParseMode parse_mode) :
     _file_input(do_open(file), /* need_close=*/true),
     _input_stream(&_file_input) {
   log_info(cds)("Parsing %s%s", file,
-                (parse_mode == _parse_lambda_forms_invokers_only) ? " (lambda form invokers only)" : "");
+                parse_lambda_forms_invokers_only() ? " (lambda form invokers only)" : "");
   if (!_file_input.is_open()) {
     char errmsg[JVM_MAXPATHLEN];
     os::lasterror(errmsg, JVM_MAXPATHLEN);
@@ -102,120 +102,108 @@ ClassListParser::~ClassListParser() {
   _instance = nullptr;
 }
 
-int ClassListParser::parse(TRAPS) {
-  int class_count = 0;
-
+void ClassListParser::parse(TRAPS) {
   for (; !_input_stream.done(); _input_stream.next()) {
     _line = _input_stream.current_line();
-    if (*_line == '#') { // comment
-      continue;
+    clean_up_input_line();
+
+    // Each line in the classlist can be one of three forms:
+    if (_line[0] == '#') {
+      // A comment; ignore it
+    } else if (_line[0] == '@') {
+      // @xxx - a tag like @lambda-proxy, to be parsed by parse_at_tags()
+      parse_at_tags(CHECK);
+    } else {
+      // A class name, followed by optional attributes. E.g.
+      //   java/lang/String
+      //   java/lang/Object id: 1
+      //   my/pkg/TestClass id: 5 super: 1 interfaces: 3 4 source: foo.jar
+      parse_class_name_and_attributes(CHECK);
     }
-    if (!parse_one_line()) {
-      break;
-    }
-
-    if (lambda_form_line()) {
-      // The current line is "@lambda-form-invoker ...". It has been recorded in LambdaFormInvokers,
-      // and will be processed later.
-      continue;
-    }
-
-    if (_parse_mode == _parse_lambda_forms_invokers_only) {
-      continue;
-    }
-
-    check_class_name(_class_name);
-    TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name);
-    if (_indy_items->length() > 0) {
-      // The current line is "@lambda-proxy class_name". Load the proxy class.
-      resolve_indy(THREAD, class_name_symbol);
-      class_count++;
-      continue;
-    }
-
-    Klass* klass = load_current_class(class_name_symbol, THREAD);
-    if (HAS_PENDING_EXCEPTION) {
-      if (PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())) {
-        // If we have run out of memory, don't try to load the rest of the classes in
-        // the classlist. Throw an exception, which will terminate the dumping process.
-        return 0; // THROW
-      }
-
-      ResourceMark rm(THREAD);
-      char* ex_msg = (char*)"";
-      oop message = java_lang_Throwable::message(PENDING_EXCEPTION);
-      if (message != nullptr) {
-        ex_msg = java_lang_String::as_utf8_string(message);
-      }
-      log_warning(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(), ex_msg);
-      // We might have an invalid class name or an bad class. Warn about it
-      // and keep going to the next line.
-      CLEAR_PENDING_EXCEPTION;
-      log_warning(cds)("Preload Warning: Cannot find %s", _class_name);
-      continue;
-    }
-
-    assert(klass != nullptr, "sanity");
-    if (log_is_enabled(Trace, cds)) {
-      ResourceMark rm(THREAD);
-      log_trace(cds)("Shared spaces preloaded: %s", klass->external_name());
-    }
-
-    if (klass->is_instance_klass()) {
-      InstanceKlass* ik = InstanceKlass::cast(klass);
-
-      // Link the class to cause the bytecodes to be rewritten and the
-      // cpcache to be created. The linking is done as soon as classes
-      // are loaded in order that the related data structures (klass and
-      // cpCache) are located together.
-      MetaspaceShared::try_link_class(THREAD, ik);
-    }
-
-    class_count++;
   }
-
-  return class_count;
 }
 
-bool ClassListParser::parse_one_line() {
-  {
-    int len = (int)strlen(_line);
-    int i;
-    // Replace \t\r\n\f with ' '
-    for (i=0; i<len; i++) {
-      if (_line[i] == '\t' || _line[i] == '\r' || _line[i] == '\n' || _line[i] == '\f') {
-        _line[i] = ' ';
-      }
-    }
+void ClassListParser::parse_class_name_and_attributes(TRAPS) {
+  read_class_name_and_attributes();
 
-    // Remove trailing newline/space
-    while (len > 0) {
-      if (_line[len-1] == ' ') {
-        _line[len-1] = '\0';
-        len --;
-      } else {
-        break;
-      }
-    }
-    _line_len = len;
+  if (parse_lambda_forms_invokers_only()) {
+    return;
   }
 
+  check_class_name(_class_name);
+  TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name);
+  Klass* klass = load_current_class(class_name_symbol, THREAD);
+  if (HAS_PENDING_EXCEPTION) {
+    if (PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())) {
+      // If we have run out of memory, don't try to load the rest of the classes in
+      // the classlist. Throw an exception, which will terminate the dumping process.
+      return; // THROW
+    }
+
+    ResourceMark rm(THREAD);
+    char* ex_msg = (char*)"";
+    oop message = java_lang_Throwable::message(PENDING_EXCEPTION);
+    if (message != nullptr) {
+      ex_msg = java_lang_String::as_utf8_string(message);
+    }
+    log_warning(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(), ex_msg);
+    // We might have an invalid class name or an bad class. Warn about it
+    // and keep going to the next line.
+    CLEAR_PENDING_EXCEPTION;
+    log_warning(cds)("Preload Warning: Cannot find %s", _class_name);
+    return;
+  }
+
+  assert(klass != nullptr, "sanity");
+  if (log_is_enabled(Trace, cds)) {
+    ResourceMark rm(THREAD);
+    log_trace(cds)("Shared spaces preloaded: %s", klass->external_name());
+  }
+
+  if (klass->is_instance_klass()) {
+    InstanceKlass* ik = InstanceKlass::cast(klass);
+
+    // Link the class to cause the bytecodes to be rewritten and the
+    // cpcache to be created. The linking is done as soon as classes
+    // are loaded in order that the related data structures (klass and
+    // cpCache) are located together.
+    MetaspaceShared::try_link_class(THREAD, ik);
+  }
+}
+
+void ClassListParser::clean_up_input_line() {
+  int len = (int)strlen(_line);
+  int i;
+  // Replace \t\r\n\f with ' '
+  for (i=0; i<len; i++) {
+    if (_line[i] == '\t' || _line[i] == '\r' || _line[i] == '\n' || _line[i] == '\f') {
+      _line[i] = ' ';
+    }
+  }
+
+  // Remove trailing newline/space
+  while (len > 0) {
+    if (_line[len-1] == ' ') {
+      _line[len-1] = '\0';
+      len --;
+    } else {
+      break;
+    }
+  }
+  _line_len = len;
+}
+
+void ClassListParser::read_class_name_and_attributes() {
   _class_name = _line;
   _id = _unspecified;
   _super = _unspecified;
   _interfaces->clear();
   _source = nullptr;
   _interfaces_specified = false;
-  _indy_items->clear();
-  _lambda_form_line = false;
-
-  if (_line[0] == '@') {
-    return parse_at_tags();
-  }
 
   if ((_token = strchr(_line, ' ')) == nullptr) {
-    // No optional arguments are specified.
-    return true;
+    // No optional attributes are specified.
+    return;
   }
 
   // Mark the end of the name, and go to the next input char
@@ -257,10 +245,9 @@ bool ClassListParser::parse_one_line() {
   //     # the class is loaded from classpath
   //     id may be specified
   //     super, interfaces, loader must not be specified
-  return true;
 }
 
-void ClassListParser::split_tokens_by_whitespace(int offset) {
+void ClassListParser::split_tokens_by_whitespace(int offset, GrowableArray<const char*>* items) {
   int start = offset;
   int end;
   bool done = false;
@@ -273,7 +260,7 @@ void ClassListParser::split_tokens_by_whitespace(int offset) {
     } else {
       _line[end] = '\0';
     }
-    _indy_items->append(_line + start);
+    items->append(_line + start);
     start = ++end;
   }
 }
@@ -290,29 +277,30 @@ int ClassListParser::split_at_tag_from_line() {
   return (int)(ptr - _line);
 }
 
-bool ClassListParser::parse_at_tags() {
+void ClassListParser::parse_at_tags(TRAPS) {
   assert(_line[0] == '@', "must be");
-  int offset;
-  if ((offset = split_at_tag_from_line()) == 0) {
-    return false;
-  }
+  int offset = split_at_tag_from_line();
+  assert(offset > 0, "would have exited VM");
 
   if (strcmp(_token, LAMBDA_PROXY_TAG) == 0) {
-    split_tokens_by_whitespace(offset);
+    _indy_items->clear();
+    split_tokens_by_whitespace(offset, _indy_items);
     if (_indy_items->length() < 2) {
       error("Line with @ tag has too few items \"%s\" line #%zu", _token, lineno());
-      return false;
     }
-    // set the class name
-    _class_name = _indy_items->at(0);
-    return true;
+    if (!parse_lambda_forms_invokers_only()) {
+      _class_name = _indy_items->at(0);
+      check_class_name(_class_name);
+      TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name);
+      if (_indy_items->length() > 0) {
+        // The current line is "@lambda-proxy class_name". Load the proxy class.
+        resolve_indy(THREAD, class_name_symbol);
+      }
+    }
   } else if (strcmp(_token, LAMBDA_FORM_TAG) == 0) {
     LambdaFormInvokers::append(os::strdup((const char*)(_line + offset), mtInternal));
-    _lambda_form_line = true;
-    return true;
   } else {
     error("Invalid @ tag at the beginning of line \"%s\" line #%zu", _token, lineno());
-    return false;
   }
 }
 
@@ -441,9 +429,9 @@ void ClassListParser::error(const char* msg, ...) {
     }
     jio_fprintf(defaultStream::error_stream(), "^\n");
   }
+  va_end(ap);
 
   vm_exit_during_initialization("class list format error.", nullptr);
-  va_end(ap);
 }
 
 void ClassListParser::check_class_name(const char* class_name) {
diff --git a/src/hotspot/share/cds/classListParser.hpp b/src/hotspot/share/cds/classListParser.hpp
index a383e04d8e6..50ede4f6dff 100644
--- a/src/hotspot/share/cds/classListParser.hpp
+++ b/src/hotspot/share/cds/classListParser.hpp
@@ -104,7 +104,6 @@ private:
   GrowableArray<int>* _interfaces;
   bool                _interfaces_specified;
   const char*         _source;
-  bool                _lambda_form_line;
   ParseMode           _parse_mode;
 
   bool parse_int_option(const char* option_name, int* value);
@@ -120,7 +119,9 @@ private:
 
   void resolve_indy(JavaThread* current, Symbol* class_name_symbol);
   void resolve_indy_impl(Symbol* class_name_symbol, TRAPS);
-  bool parse_one_line();
+  void clean_up_input_line();
+  void read_class_name_and_attributes();
+  void parse_class_name_and_attributes(TRAPS);
   Klass* load_current_class(Symbol* class_name_symbol, TRAPS);
 
   size_t lineno() { return _input_stream.lineno(); }
@@ -129,9 +130,9 @@ private:
   ~ClassListParser();
 
 public:
-  static int parse_classlist(const char* classlist_path, ParseMode parse_mode, TRAPS) {
+  static void parse_classlist(const char* classlist_path, ParseMode parse_mode, TRAPS) {
     ClassListParser parser(classlist_path, parse_mode);
-    return parser.parse(THREAD); // returns the number of classes loaded.
+    parser.parse(THREAD);
   }
 
   static bool is_parsing_thread();
@@ -141,10 +142,10 @@ public:
     return _instance;
   }
 
-  int parse(TRAPS);
-  void split_tokens_by_whitespace(int offset);
+  void parse(TRAPS);
+  void split_tokens_by_whitespace(int offset, GrowableArray<const char*>* items);
   int split_at_tag_from_line();
-  bool parse_at_tags();
+  void parse_at_tags(TRAPS);
   char* _token;
   void error(const char* msg, ...);
   void parse_int(int* value);
@@ -154,6 +155,9 @@ public:
   void skip_whitespaces();
   void skip_non_whitespaces();
 
+  bool parse_lambda_forms_invokers_only() {
+    return _parse_mode == _parse_lambda_forms_invokers_only;
+  }
   bool is_id_specified() {
     return _id != _unspecified;
   }
@@ -184,8 +188,6 @@ public:
 
   bool is_loading_from_source();
 
-  bool lambda_form_line() { return _lambda_form_line; }
-
   // Look up the super or interface of the current class being loaded
   // (in this->load_current_class()).
   InstanceKlass* lookup_super_for_current_class(Symbol* super_name);
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 93c5c1a1e3b..35cf37346b3 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -737,18 +737,18 @@ void MetaspaceShared::preload_classes(TRAPS) {
   }
 
   log_info(cds)("Loading classes to share ...");
-  int class_count = ClassListParser::parse_classlist(classlist_path,
-                                                     ClassListParser::_parse_all, CHECK);
+  ClassListParser::parse_classlist(classlist_path,
+                                   ClassListParser::_parse_all, CHECK);
   if (ExtraSharedClassListFile) {
-    class_count += ClassListParser::parse_classlist(ExtraSharedClassListFile,
-                                                    ClassListParser::_parse_all, CHECK);
+    ClassListParser::parse_classlist(ExtraSharedClassListFile,
+                                     ClassListParser::_parse_all, CHECK);
   }
   if (classlist_path != default_classlist) {
     struct stat statbuf;
     if (os::stat(default_classlist, &statbuf) == 0) {
       // File exists, let's use it.
-      class_count += ClassListParser::parse_classlist(default_classlist,
-                                                      ClassListParser::_parse_lambda_forms_invokers_only, CHECK);
+      ClassListParser::parse_classlist(default_classlist,
+                                       ClassListParser::_parse_lambda_forms_invokers_only, CHECK);
     }
   }
 
@@ -758,7 +758,6 @@ void MetaspaceShared::preload_classes(TRAPS) {
   CDSProtectionDomain::create_jar_manifest(dummy, strlen(dummy), CHECK);
 
   log_info(cds)("Loading classes to share: done.");
-  log_info(cds)("Shared spaces: preloaded %d classes", class_count);
 }
 
 void MetaspaceShared::preload_and_dump_impl(TRAPS) {

From 95f79c678737fb8de9ed45c516761d4d818869ef Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Thu, 16 May 2024 02:21:30 +0000
Subject: [PATCH 451/486] 8332253: Linux arm32 build fails after 8292591

Reviewed-by: stuefe, dholmes, shade
---
 src/hotspot/os/linux/systemMemoryBarrier_linux.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp b/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
index 892d825b40c..a6b26928520 100644
--- a/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
+++ b/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
@@ -41,6 +41,8 @@
   #define SYS_membarrier 365
   #elif defined(AARCH64)
   #define SYS_membarrier 283
+  #elif defined(ARM32)
+  #define SYS_membarrier 389
   #elif defined(ALPHA)
   #define SYS_membarrier 517
   #else

From fe8a2aff3129b515c2a0f3ab96f5e3ad6cef7b70 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 16 May 2024 05:42:38 +0000
Subject: [PATCH 452/486] 8307778: com/sun/jdi/cds tests fail with jtreg's
 Virtual test thread factory

Reviewed-by: dholmes, sspitsyn, cjplummer, lmesnik
---
 test/jdk/ProblemList-Virtual.txt         | 3 ---
 test/jdk/com/sun/jdi/cds/CDSJDITest.java | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/jdk/ProblemList-Virtual.txt b/test/jdk/ProblemList-Virtual.txt
index e3b0a922857..c45353e65ed 100644
--- a/test/jdk/ProblemList-Virtual.txt
+++ b/test/jdk/ProblemList-Virtual.txt
@@ -29,9 +29,6 @@ com/sun/jdi/EATests.java#id0                                    8264699 generic-
 
 com/sun/jdi/ExceptionEvents.java 8278470 generic-all
 com/sun/jdi/RedefineCrossStart.java 8278470 generic-all
-com/sun/jdi/cds/CDSBreakpointTest.java 8307778 generic-all
-com/sun/jdi/cds/CDSDeleteAllBkptsTest.java 8307778 generic-all
-com/sun/jdi/cds/CDSFieldWatchpoints.java 8307778 generic-all
 
 javax/management/remote/mandatory/connection/BrokenConnectionTest.java 8308035 windows-x64
 
diff --git a/test/jdk/com/sun/jdi/cds/CDSJDITest.java b/test/jdk/com/sun/jdi/cds/CDSJDITest.java
index 0ec201d7035..3bb6ec6ebdf 100644
--- a/test/jdk/com/sun/jdi/cds/CDSJDITest.java
+++ b/test/jdk/com/sun/jdi/cds/CDSJDITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, 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
@@ -48,7 +48,7 @@ public class CDSJDITest {
             // pass them to the subprocess it will create for the debuggee. This
             // is how the -javaopts are passed to the debuggee. See
             // VMConnection.getDebuggeeVMOptions().
-            getPropOpt("test.classes"),
+            getPropOpt("test.class.path"),
             getPropOpt("test.java.opts"),
             getPropOpt("test.vm.opts"),
             // Pass -showversion to the JDI test just so we get a bit of trace output.

From ab8d7b0cedfaae124262325cd1d4b59cef996d85 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Thu, 16 May 2024 07:25:11 +0000
Subject: [PATCH 453/486] 8324517: C2: crash in compiled code because of
 dependency on removed range check CastIIs

Reviewed-by: epeter, thartmann
---
 src/hotspot/share/opto/castnode.cpp           |  19 +-
 src/hotspot/share/opto/compile.cpp            |  50 +-
 src/hotspot/share/opto/compile.hpp            |   3 +
 src/hotspot/share/opto/node.cpp               |  12 +
 src/hotspot/share/opto/node.hpp               |   7 +
 ...yAccessAboveRCAfterRCCastIIEliminated.java | 474 ++++++++++++++++++
 6 files changed, 539 insertions(+), 26 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java

diff --git a/src/hotspot/share/opto/castnode.cpp b/src/hotspot/share/opto/castnode.cpp
index a93c9b382f9..1771107c851 100644
--- a/src/hotspot/share/opto/castnode.cpp
+++ b/src/hotspot/share/opto/castnode.cpp
@@ -213,13 +213,7 @@ const Type* CastIINode::Value(PhaseGVN* phase) const {
 
   // Similar to ConvI2LNode::Value() for the same reasons
   // see if we can remove type assertion after loop opts
-  // But here we have to pay extra attention:
-  // Do not narrow the type of range check dependent CastIINodes to
-  // avoid corruption of the graph if a CastII is replaced by TOP but
-  // the corresponding range check is not removed.
-  if (!_range_check_dependency) {
-    res = widen_type(phase, res, T_INT);
-  }
+  res = widen_type(phase, res, T_INT);
 
   return res;
 }
@@ -239,11 +233,11 @@ Node *CastIINode::Ideal(PhaseGVN *phase, bool can_reshape) {
   if (progress != nullptr) {
     return progress;
   }
-  if (can_reshape && !_range_check_dependency && !phase->C->post_loop_opts_phase()) {
+  if (can_reshape && !phase->C->post_loop_opts_phase()) {
     // makes sure we run ::Value to potentially remove type assertion after loop opts
     phase->C->record_for_post_loop_opts_igvn(this);
   }
-  if (!_range_check_dependency) {
+  if (!_type->is_int()->empty()) {
     return optimize_integer_cast(phase, T_INT);
   }
   return nullptr;
@@ -254,13 +248,6 @@ Node* CastIINode::Identity(PhaseGVN* phase) {
   if (progress != this) {
     return progress;
   }
-  if (_range_check_dependency) {
-    if (phase->C->post_loop_opts_phase()) {
-      return this->in(1);
-    } else {
-      phase->C->record_for_post_loop_opts_igvn(this);
-    }
-  }
   return this;
 }
 
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 25c7ced8aeb..445f22c6b80 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -3464,6 +3464,10 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
     }
     break;
   }
+  case Op_CastII: {
+    remove_range_check_cast(n->as_CastII());
+  }
+  break;
 #ifdef _LP64
   case Op_CmpP:
     // Do this transformation here to preserve CmpPNode::sub() and
@@ -3615,16 +3619,6 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
 
 #endif
 
-#ifdef ASSERT
-  case Op_CastII:
-    // Verify that all range check dependent CastII nodes were removed.
-    if (n->isa_CastII()->has_range_check()) {
-      n->dump(3);
-      assert(false, "Range check dependent CastII node was not removed");
-    }
-    break;
-#endif
-
   case Op_ModI:
     if (UseDivMod) {
       // Check if a%b and a/b both exist
@@ -3633,6 +3627,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
         // Replace them with a fused divmod if supported
         if (Matcher::has_match_rule(Op_DivModI)) {
           DivModINode* divmod = DivModINode::make(n);
+          divmod->add_prec_from(n);
+          divmod->add_prec_from(d);
           d->subsume_by(divmod->div_proj(), this);
           n->subsume_by(divmod->mod_proj(), this);
         } else {
@@ -3653,6 +3649,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
         // Replace them with a fused divmod if supported
         if (Matcher::has_match_rule(Op_DivModL)) {
           DivModLNode* divmod = DivModLNode::make(n);
+          divmod->add_prec_from(n);
+          divmod->add_prec_from(d);
           d->subsume_by(divmod->div_proj(), this);
           n->subsume_by(divmod->mod_proj(), this);
         } else {
@@ -3673,6 +3671,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
         // Replace them with a fused unsigned divmod if supported
         if (Matcher::has_match_rule(Op_UDivModI)) {
           UDivModINode* divmod = UDivModINode::make(n);
+          divmod->add_prec_from(n);
+          divmod->add_prec_from(d);
           d->subsume_by(divmod->div_proj(), this);
           n->subsume_by(divmod->mod_proj(), this);
         } else {
@@ -3693,6 +3693,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
         // Replace them with a fused unsigned divmod if supported
         if (Matcher::has_match_rule(Op_UDivModL)) {
           UDivModLNode* divmod = UDivModLNode::make(n);
+          divmod->add_prec_from(n);
+          divmod->add_prec_from(d);
           d->subsume_by(divmod->div_proj(), this);
           n->subsume_by(divmod->mod_proj(), this);
         } else {
@@ -3894,6 +3896,34 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
   }
 }
 
+void Compile::remove_range_check_cast(CastIINode* cast) {
+  if (cast->has_range_check()) {
+    // Range check CastII nodes feed into an address computation subgraph. Remove them to let that subgraph float freely.
+    // For memory access or integer divisions nodes that depend on the cast, record the dependency on the cast's control
+    // as a precedence edge, so they can't float above the cast in case that cast's narrowed type helped eliminate a
+    // range check or a null divisor check.
+    assert(cast->in(0) != nullptr, "All RangeCheck CastII must have a control dependency");
+    ResourceMark rm;
+    Unique_Node_List wq;
+    wq.push(cast);
+    for (uint next = 0; next < wq.size(); ++next) {
+      Node* m = wq.at(next);
+      for (DUIterator_Fast imax, i = m->fast_outs(imax); i < imax; i++) {
+        Node* use = m->fast_out(i);
+        if (use->is_Mem() || use->is_div_or_mod(T_INT) || use->is_div_or_mod(T_LONG)) {
+          use->ensure_control_or_add_prec(cast->in(0));
+        } else if (!use->is_CFG() && !use->is_Phi()) {
+          wq.push(use);
+        }
+      }
+    }
+    cast->subsume_by(cast->in(1), this);
+    if (cast->outcnt() == 0) {
+      cast->disconnect_inputs(this);
+    }
+  }
+}
+
 //------------------------------final_graph_reshaping_walk---------------------
 // Replacing Opaque nodes with their input in final_graph_reshaping_impl(),
 // requires that the walk visits a node's inputs before visiting the node.
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index e1d9b61f7f8..9a873b8b9cb 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -53,6 +53,7 @@ class Block;
 class Bundle;
 class CallGenerator;
 class CallStaticJavaNode;
+class CastIINode;
 class CloneMap;
 class CompilationFailureInfo;
 class ConnectionGraph;
@@ -1314,6 +1315,8 @@ private:
                             BasicType out_bt, BasicType in_bt);
 
   static Node* narrow_value(BasicType bt, Node* value, const Type* type, PhaseGVN* phase, bool transform_res);
+
+  void remove_range_check_cast(CastIINode* cast);
 };
 
 #endif // SHARE_OPTO_COMPILE_HPP
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index fa85344d0da..cadea46e2c9 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -2878,6 +2878,15 @@ void Node::ensure_control_or_add_prec(Node* c) {
   }
 }
 
+void Node::add_prec_from(Node* n) {
+  for (uint i = n->req(); i < n->len(); i++) {
+    Node* prec = n->in(i);
+    if (prec != nullptr) {
+      add_prec(prec);
+    }
+  }
+}
+
 bool Node::is_dead_loop_safe() const {
   if (is_Phi()) {
     return true;
@@ -2901,6 +2910,9 @@ bool Node::is_dead_loop_safe() const {
   return false;
 }
 
+bool Node::is_div_or_mod(BasicType bt) const { return Opcode() == Op_Div(bt) || Opcode() == Op_Mod(bt) ||
+                                                      Opcode() == Op_UDiv(bt) || Opcode() == Op_UMod(bt); }
+
 //=============================================================================
 //------------------------------yank-------------------------------------------
 // Find and remove
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 04631dcbae2..412e193a612 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1143,6 +1143,7 @@ public:
 
   // Set control or add control as precedence edge
   void ensure_control_or_add_prec(Node* c);
+  void add_prec_from(Node* n);
 
   // Visit boundary uses of the node and apply a callback function for each.
   // Recursively traverse uses, stopping and applying the callback when
@@ -1254,6 +1255,8 @@ public:
   // Whether this is a memory phi node
   bool is_memory_phi() const { return is_Phi() && bottom_type() == Type::MEMORY; }
 
+  bool is_div_or_mod(BasicType bt) const;
+
 //----------------- Printing, etc
 #ifndef PRODUCT
  public:
@@ -2023,6 +2026,10 @@ Op_IL(URShift)
 Op_IL(LShift)
 Op_IL(Xor)
 Op_IL(Cmp)
+Op_IL(Div)
+Op_IL(Mod)
+Op_IL(UDiv)
+Op_IL(UMod)
 
 inline int Op_ConIL(BasicType bt) {
   assert(bt == T_INT || bt == T_LONG, "only for int or longs");
diff --git a/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java b/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java
new file mode 100644
index 00000000000..7f22db08a36
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java
@@ -0,0 +1,474 @@
+/*
+ * Copyright (c) 2024, 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 8324517
+ * @summary C2: out of bound array load because of dependency on removed range check CastIIs
+ *
+ * @run main/othervm -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation
+ *                   -XX:CompileCommand=dontinline,TestArrayAccessAboveRCAfterRCCastIIEliminated::notInlined
+ *                   TestArrayAccessAboveRCAfterRCCastIIEliminated
+ * @run main/othervm -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation
+ *                   -XX:CompileCommand=dontinline,TestArrayAccessAboveRCAfterRCCastIIEliminated::notInlined
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM TestArrayAccessAboveRCAfterRCCastIIEliminated
+ * @run main/othervm TestArrayAccessAboveRCAfterRCCastIIEliminated
+ * @run main/othervm -XX:CompileCommand=dontinline,TestArrayAccessAboveRCAfterRCCastIIEliminated::notInlined
+ *                   TestArrayAccessAboveRCAfterRCCastIIEliminated
+ *
+ */
+
+public class TestArrayAccessAboveRCAfterRCCastIIEliminated {
+    private static int intField;
+    private static long longField;
+    private static volatile int volatileField;
+
+    public static void main(String[] args) {
+        int[] array = new int[100];
+        for (int i = 0; i < 20_000; i++) {
+            test1(9, 10, 1, true);
+            test1(9, 10, 1, false);
+            test2(9, 10, 1, true);
+            test2(9, 10, 1, false);
+            test3(9, 10, 1, true);
+            test3(9, 10, 1, false);
+            test4(9, 10, 1, true);
+            test4(9, 10, 1, false);
+            test5(9, 10, 1, true);
+            test5(9, 10, 1, false);
+            test6(9, 10, 1, true);
+            test6(9, 10, 1, false);
+            test7(9, 10, 1, true);
+            test7(9, 10, 1, false);
+            test8(9, 10, 1, true);
+            test8(9, 10, 1, false);
+            test9(9, 10, 1, true);
+            test9(9, 10, 1, false);
+            test10(9, 10, 1, true);
+            test10(9, 10, 1, false);
+            test11(9, 10, 1, true);
+            test11(9, 10, 1, false);
+            test12(9, 10, 1, true);
+            test12(9, 10, 1, false);
+            test13(9, 10, 1, true);
+            test13(9, 10, 1, false);
+        }
+        try {
+            test1(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test2(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test3(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test4(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test5(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test6(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test7(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test8(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test9(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test10(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test11(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test12(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test13(-1, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+    }
+
+    private static void test1(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = array[otherArray.length];
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = array[otherArray.length];
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test2(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 / (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 / (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test3(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L / (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L / (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test4(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 % (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 % (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test5(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L % (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L % (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test6(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 % (otherArray.length + 1) + 1 / (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = 1 % (otherArray.length + 1) + 1 / (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test7(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L % (otherArray.length + 1) + 1L / (otherArray.length + 1);
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = 1L % (otherArray.length + 1) + 1L / (otherArray.length + 1);
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+    private static void test8(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.divideUnsigned(1, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.divideUnsigned(1, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test9(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.divideUnsigned(1L, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.divideUnsigned(1L, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test10(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.remainderUnsigned(1, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.remainderUnsigned(1, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test11(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.remainderUnsigned(1L, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.remainderUnsigned(1L, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test12(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.divideUnsigned(1, (otherArray.length + 1)) +
+                    Integer.remainderUnsigned(1, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            intField = Integer.divideUnsigned(1, (otherArray.length + 1)) +
+                    Integer.remainderUnsigned(1, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void test13(int i, int j, int flag, boolean flag2) {
+        i = Math.min(i, 9);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.remainderUnsigned(1L, (otherArray.length + 1)) +
+                    Long.divideUnsigned(1L, (otherArray.length + 1));
+        } else {
+            float[] newArray = new float[j];
+            newArray[i] = 42;
+            float[] otherArray = new float[i];
+            if (flag == 0) {
+            }
+            longField = Long.remainderUnsigned(1L, (otherArray.length + 1)) +
+                    Long.divideUnsigned(1L, (otherArray.length + 1));
+        }
+        for (int k = 0; k < 10; k++) {
+
+        }
+    }
+
+    private static void notInlined(int[] array) {
+
+    }
+}

From ee4a9d34827166ff9ac04e2375058fdc08e43194 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 16 May 2024 07:32:24 +0000
Subject: [PATCH 454/486] 8321622: ClassFile.verify(byte[] bytes) throws
 unexpected ConstantPoolException, IAE

Reviewed-by: jpai
---
 .../jdk/internal/classfile/impl/verifier/VerifierImpl.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
index d5b724ff684..8dfa726ec19 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -285,7 +285,6 @@ public final class VerifierImpl {
         } catch (VerifyError err) {
             errorsCollector.add(err);
         } catch (Error | Exception e) {
-            e.printStackTrace();
             errorsCollector.add(new VerifyError(e.toString()));
         }
     }

From 96c5c3fe75103dc45bc1c3ccce0ab36303121a60 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Thu, 16 May 2024 07:51:40 +0000
Subject: [PATCH 455/486] 8329998: Remove double initialization for parts of
 small TypeArrays in ZObjArrayAllocator

Reviewed-by: stefank, gli
---
 src/hotspot/share/gc/z/zObjArrayAllocator.cpp | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
index 45f65f0e7e5..1b2f3804e3d 100644
--- a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
+++ b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
@@ -49,21 +49,8 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
   // suggested that it offered a good trade-off between allocation
   // time and time-to-safepoint
   const size_t segment_max = ZUtils::bytes_to_words(64 * K);
-  const BasicType element_type = ArrayKlass::cast(_klass)->element_type();
 
-  // Clear leading 32 bits, if necessary.
-  int base_offset = arrayOopDesc::base_offset_in_bytes(element_type);
-  if (!is_aligned(base_offset, HeapWordSize)) {
-    assert(is_aligned(base_offset, BytesPerInt), "array base must be 32 bit aligned");
-    *reinterpret_cast<jint*>(reinterpret_cast<char*>(mem) + base_offset) = 0;
-    base_offset += BytesPerInt;
-  }
-  assert(is_aligned(base_offset, HeapWordSize), "remaining array base must be 64 bit aligned");
-
-  const size_t header = heap_word_size(base_offset);
-  const size_t payload_size = _word_size - header;
-
-  if (payload_size <= segment_max) {
+  if (_word_size <= segment_max) {
     // To small to use segmented clearing
     return ObjArrayAllocator::initialize(mem);
   }
@@ -88,6 +75,22 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
   // over such objects.
   ZThreadLocalData::set_invisible_root(_thread, (zaddress_unsafe*)&mem);
 
+  const BasicType element_type = ArrayKlass::cast(_klass)->element_type();
+  const size_t base_offset_in_bytes = arrayOopDesc::base_offset_in_bytes(element_type);
+  const size_t process_start_offset_in_bytes = align_up(base_offset_in_bytes, BytesPerWord);
+
+  if (process_start_offset_in_bytes != base_offset_in_bytes) {
+    // initialize_memory can only fill word aligned memory,
+    // fill the first 4 bytes here.
+    assert(process_start_offset_in_bytes - base_offset_in_bytes == 4, "Must be 4-byte aligned");
+    assert(!is_reference_type(element_type), "Only TypeArrays can be 4-byte aligned");
+    *reinterpret_cast<int*>(reinterpret_cast<char*>(mem) + base_offset_in_bytes) = 0;
+  }
+
+  // Note: initialize_memory may clear padding bytes at the end
+  const size_t process_start_offset = ZUtils::bytes_to_words(process_start_offset_in_bytes);
+  const size_t process_size = _word_size - process_start_offset;
+
   uint32_t old_seqnum_before = ZGeneration::old()->seqnum();
   uint32_t young_seqnum_before = ZGeneration::young()->seqnum();
   uintptr_t color_before = ZPointerStoreGoodMask;
@@ -100,10 +103,10 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
   bool seen_gc_safepoint = false;
 
   auto initialize_memory = [&]() {
-    for (size_t processed = 0; processed < payload_size; processed += segment_max) {
+    for (size_t processed = 0; processed < process_size; processed += segment_max) {
       // Clear segment
-      uintptr_t* const start = (uintptr_t*)(mem + header + processed);
-      const size_t remaining = payload_size - processed;
+      uintptr_t* const start = (uintptr_t*)(mem + process_start_offset + processed);
+      const size_t remaining = process_size - processed;
       const size_t segment = MIN2(remaining, segment_max);
       // Usually, the young marking code has the responsibility to color
       // raw nulls, before they end up in the old generation. However, the

From f398cd225012694a586e528936159b6df7b1586c Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Thu, 16 May 2024 08:55:03 +0000
Subject: [PATCH 456/486] 8331575: C2: crash when ConvL2I is split thru phi at
 LongCountedLoop

Reviewed-by: chagedorn, epeter
---
 src/hotspot/share/opto/loopopts.cpp           |  5 +-
 .../splitif/TestLongCountedLoopConvL2I.java   | 67 +++++++++++++++++++
 .../splitif/TestLongCountedLoopConvL2I2.java  | 59 ++++++++++++++++
 3 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I.java
 create mode 100644 test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I2.java

diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index e7cd56d57ea..25000f10000 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -49,8 +49,9 @@
 //------------------------------split_thru_phi---------------------------------
 // Split Node 'n' through merge point if there is enough win.
 Node* PhaseIdealLoop::split_thru_phi(Node* n, Node* region, int policy) {
-  if (n->Opcode() == Op_ConvI2L && n->bottom_type() != TypeLong::LONG) {
-    // ConvI2L may have type information on it which is unsafe to push up
+  if ((n->Opcode() == Op_ConvI2L && n->bottom_type() != TypeLong::LONG) ||
+      (n->Opcode() == Op_ConvL2I && n->bottom_type() != TypeInt::INT)) {
+    // ConvI2L/ConvL2I may have type information on it which is unsafe to push up
     // so disable this for now
     return nullptr;
   }
diff --git a/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I.java b/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I.java
new file mode 100644
index 00000000000..957ebaf4531
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2024, 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 8331575
+ * @summary C2: crash when ConvL2I is split thru phi at LongCountedLoop
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:-UseOnStackReplacement
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:StressSeed=92643864 TestLongCountedLoopConvL2I
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:-UseOnStackReplacement
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM TestLongCountedLoopConvL2I
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-TieredCompilation
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM TestLongCountedLoopConvL2I
+ */
+
+public class TestLongCountedLoopConvL2I {
+    private static volatile int volatileField;
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 20_000; i++) {
+            testHelper1(42);
+            test1(0);
+        }
+    }
+
+    private static int test1(int res) {
+        int k = 1;
+        for (; k < 2; k *= 2) {
+        }
+        long i = testHelper1(k);
+        for (; i > 0; i--) {
+            res += 42 / ((int) i);
+            for (int j = 1; j < 10; j *= 2) {
+
+            }
+        }
+        return res;
+    }
+
+    private static long testHelper1(int k) {
+        if (k == 2) {
+            return 100;
+        } else {
+            return 99;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I2.java b/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I2.java
new file mode 100644
index 00000000000..311dbdfb19b
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/splitif/TestLongCountedLoopConvL2I2.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024, 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 8331575
+ * @summary C2: crash when ConvL2I is split thru phi at LongCountedLoop
+ * @run main/othervm -Xcomp -XX:CompileOnly=TestLongCountedLoopConvL2I2.* TestLongCountedLoopConvL2I2
+ */
+
+public class TestLongCountedLoopConvL2I2 {
+    static int x = 34;
+
+    public static void main(String[] strArr) {
+        for (int i = 0; i < 2; i++) {
+            test();
+        }
+    }
+
+    static int test() {
+        int a = 5, b = 6;
+        long lArr[] = new long[2];
+
+        for (long i = 159; i > 1; i -= 3) {
+            a += 3;
+            for (int j = 1; j < 4; j++) {
+                if (a == 9) {
+                    if (x == 73) {
+                        try {
+                            b = 10 / (int) i;
+                        } catch (ArithmeticException a_e) {
+                        }
+                    }
+                }
+            }
+        }
+        return b;
+    }
+}

From f9f8d0b48057a02923e36c8e11286b57cc72279e Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Thu, 16 May 2024 10:36:51 +0000
Subject: [PATCH 457/486] 8332101: Add an `@since` to
 `StandardOperation:REMOVE` in `jdk.dynalink`

Reviewed-by: jpai
---
 .../share/classes/jdk/dynalink/StandardOperation.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java
index 176a87acd36..cb6490c890d 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,8 @@ public enum StandardOperation implements Operation {
      * <code>(receiver)&rarr;void</code> when used with {@link NamedOperation},
      * with all parameters being of any type (either primitive
      * or reference). This operation must always be used as part of a {@link NamespaceOperation}.
+     *
+     * @since 10
      */
     REMOVE,
     /**

From 910d77becd15580296687b00fed085ab106cb2eb Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Thu, 16 May 2024 10:58:50 +0000
Subject: [PATCH 458/486] 8331953: ubsan: metaspaceShared.cpp:1305:57: runtime
 error: applying non-zero offset 12849152 to null pointer

Reviewed-by: iklam, mbaesken
---
 src/hotspot/share/cds/metaspaceShared.cpp | 41 +++++++++++++----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 35cf37346b3..6213b9848f1 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -225,6 +225,14 @@ static bool shared_base_too_high(char* specified_base, char* aligned_base, size_
 static char* compute_shared_base(size_t cds_max) {
   char* specified_base = (char*)SharedBaseAddress;
   char* aligned_base = align_up(specified_base, MetaspaceShared::core_region_alignment());
+  if (UseCompressedClassPointers) {
+    aligned_base = align_up(specified_base, Metaspace::reserve_alignment());
+  }
+
+  if (aligned_base != specified_base) {
+    log_info(cds)("SharedBaseAddress (" INTPTR_FORMAT ") aligned up to " INTPTR_FORMAT,
+                   p2i(specified_base), p2i(aligned_base));
+  }
 
   const char* err = nullptr;
   if (shared_base_too_high(specified_base, aligned_base, cds_max)) {
@@ -1259,15 +1267,15 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
   size_t archive_end_offset  = (dynamic_mapinfo == nullptr) ? static_mapinfo->mapping_end_offset() : dynamic_mapinfo->mapping_end_offset();
   size_t archive_space_size = align_up(archive_end_offset, archive_space_alignment);
 
-  // If a base address is given, it must have valid alignment and be suitable as encoding base.
-  if (base_address != nullptr) {
-    assert(is_aligned(base_address, archive_space_alignment),
-           "Archive base address invalid: " PTR_FORMAT ".", p2i(base_address));
-  }
-
   if (!Metaspace::using_class_space()) {
     // Get the simple case out of the way first:
     // no compressed class space, simple allocation.
+
+    // When running without class space, requested archive base should be aligned to cds core alignment.
+    assert(is_aligned(base_address, archive_space_alignment),
+             "Archive base address unaligned: " PTR_FORMAT ", needs alignment: %zu.",
+             p2i(base_address), archive_space_alignment);
+
     archive_space_rs = ReservedSpace(archive_space_size, archive_space_alignment,
                                      os::vm_page_size(), (char*)base_address);
     if (archive_space_rs.is_reserved()) {
@@ -1288,12 +1296,12 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
 
   const size_t class_space_alignment = Metaspace::reserve_alignment();
 
-  // To simplify matters, lets assume that metaspace alignment will always be
-  //  equal or a multiple of archive alignment.
-  assert(is_power_of_2(class_space_alignment) &&
-                       is_power_of_2(archive_space_alignment) &&
-                       class_space_alignment >= archive_space_alignment,
-                       "Sanity");
+  // When running with class space, requested archive base must satisfy both cds core alignment
+  // and class space alignment.
+  const size_t base_address_alignment = MAX2(class_space_alignment, archive_space_alignment);
+  assert(is_aligned(base_address, base_address_alignment),
+           "Archive base address unaligned: " PTR_FORMAT ", needs alignment: %zu.",
+           p2i(base_address), base_address_alignment);
 
   const size_t class_space_size = CompressedClassSpaceSize;
   assert(CompressedClassSpaceSize > 0 &&
@@ -1301,12 +1309,11 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
          "CompressedClassSpaceSize malformed: "
          SIZE_FORMAT, CompressedClassSpaceSize);
 
-  const size_t ccs_begin_offset = align_up(base_address + archive_space_size,
-                                           class_space_alignment) - base_address;
+  const size_t ccs_begin_offset = align_up(archive_space_size, class_space_alignment);
   const size_t gap_size = ccs_begin_offset - archive_space_size;
 
   const size_t total_range_size =
-      align_up(archive_space_size + gap_size + class_space_size, core_region_alignment());
+      archive_space_size + gap_size + class_space_size;
 
   assert(total_range_size > ccs_begin_offset, "must be");
   if (use_windows_memory_mapping() && use_archive_base_addr) {
@@ -1331,7 +1338,7 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
     MemTracker::record_virtual_memory_type(class_space_rs.base(), mtClass);
   } else {
     if (use_archive_base_addr && base_address != nullptr) {
-      total_space_rs = ReservedSpace(total_range_size, archive_space_alignment,
+      total_space_rs = ReservedSpace(total_range_size, base_address_alignment,
                                      os::vm_page_size(), (char*) base_address);
     } else {
       // We did not manage to reserve at the preferred address, or were instructed to relocate. In that
@@ -1349,7 +1356,7 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
     // Paranoid checks:
     assert(base_address == nullptr || (address)total_space_rs.base() == base_address,
            "Sanity (" PTR_FORMAT " vs " PTR_FORMAT ")", p2i(base_address), p2i(total_space_rs.base()));
-    assert(is_aligned(total_space_rs.base(), archive_space_alignment), "Sanity");
+    assert(is_aligned(total_space_rs.base(), base_address_alignment), "Sanity");
     assert(total_space_rs.size() == total_range_size, "Sanity");
 
     // Now split up the space into ccs and cds archive. For simplicity, just leave

From a33cb9045b2c0cae7d894715d1484e77b7607de6 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Thu, 16 May 2024 11:04:45 +0000
Subject: [PATCH 459/486] 8332098: Add missing @ since tags to jdk.jdi

Reviewed-by: alanb, cjplummer
---
 .../share/classes/com/sun/jdi/connect/package-info.java       | 4 +++-
 .../share/classes/com/sun/jdi/connect/spi/package-info.java   | 4 +++-
 src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java | 4 +++-
 src/jdk.jdi/share/classes/com/sun/jdi/package-info.java       | 4 +++-
 .../share/classes/com/sun/jdi/request/package-info.java       | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java
index c7a240ef47d..e2c2f49adec 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -33,6 +33,8 @@
  * Methods may be added to the interfaces in the JDI packages in future
  * releases. Existing packages may be renamed if the JDI becomes a standard
  * extension.
+ *
+ * @since 1.3
  */
 
 package com.sun.jdi.connect;
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java
index ad8a359817f..68323fc1ddb 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * This package comprises the interfaces and classes used to
  * develop new {@link com.sun.jdi.connect.spi.TransportService}
  * implementations.
+ *
+ * @since 1.5
  */
 
 package com.sun.jdi.connect.spi;
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java
index 921df07a72d..7435454d8a7 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/event/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -41,6 +41,8 @@
  * Methods may be added to the interfaces in the JDI packages in future
  * releases. Existing packages may be renamed if the JDI becomes a standard
  * extension.
+ *
+ * @since 1.3
  */
 
 package com.sun.jdi.event;
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java
index 3b34bc24182..9b9b82ba577 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,8 @@
  * Methods may be added to the interfaces in the JDI packages in future
  * releases. Existing packages may be renamed if the JDI becomes a standard
  * extension.
+ *
+ * @since 1.3
  */
 
 package com.sun.jdi;
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java
index 1b430cae426..d6cb01bc2f9 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/request/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -40,6 +40,8 @@
  * Methods may be added to the interfaces in the JDI packages in future
  * releases. Existing packages may be renamed if the JDI becomes a standard
  * extension.
+ *
+ * @since 1.3
  */
 
 package com.sun.jdi.request;

From fa3e94d30f11bdccbe290041ae19490ce4940bb1 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Thu, 16 May 2024 14:00:03 +0000
Subject: [PATCH 460/486] 8332393: Problemlist
 compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java

Reviewed-by: chagedorn
---
 test/hotspot/jtreg/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index a0c1913e52c..ffd5eaac189 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -78,6 +78,8 @@ compiler/floatingpoint/TestSubnormalDouble.java 8317810 generic-i586
 
 compiler/startup/StartupOutput.java 8326615 generic-x64
 
+compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java 8332369 generic-all
+
 #############################################################################
 
 # :hotspot_gc

From 6f7ddbec7d0bc459d44b6518fe1d982eaba7f37b Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Thu, 16 May 2024 15:49:46 +0000
Subject: [PATCH 461/486] 8260633: [macos]
 java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.html
 test failed

Reviewed-by: serb, dnguyen, tr
---
 .../MouseEventAfterStartDragTest.java         | 214 ++++++++++++++++++
 1 file changed, 214 insertions(+)
 create mode 100644 test/jdk/java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.java

diff --git a/test/jdk/java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.java b/test/jdk/java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.java
new file mode 100644
index 00000000000..faa98c43b75
--- /dev/null
+++ b/test/jdk/java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureListener;
+import java.awt.dnd.DragSource;
+import java.awt.dnd.DragSourceAdapter;
+import java.awt.dnd.DragSourceDragEvent;
+import java.awt.dnd.DragSourceListener;
+import java.awt.event.AWTEventListener;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4613903
+ * @summary verifies that mouse events are not dispatched during drag
+ * @key headful
+ * @run main MouseEventAfterStartDragTest
+ */
+
+public final class MouseEventAfterStartDragTest implements AWTEventListener {
+    final Frame frame = new Frame();
+    volatile Point srcPoint;
+    volatile Dimension d;
+    volatile MouseEvent lastMouseEvent = null;
+    volatile boolean passed = true;
+    final DragSource dragSource = DragSource.getDefaultDragSource();
+    final Transferable transferable = new StringSelection("TEXT");
+
+    final MouseMotionListener mouseMotionListener = new MouseMotionAdapter() {
+        public void mouseDragged(MouseEvent e) {
+            System.out.println("mouseDragged: " + e
+                    + ", hash:" + e.hashCode());
+            if (lastMouseEvent != null && !e.equals(lastMouseEvent)) {
+                System.out.println("Unexpected: " + e
+                        + ", hash:" + e.hashCode());
+                passed = false;
+            }
+        }
+    };
+
+    final DragSourceListener dragSourceListener = new DragSourceAdapter() {
+        public void dragDropEnd(DragSourceDragEvent dsde) {
+            System.out.println("dragDropEnd: " + dsde);
+            lastMouseEvent = null;
+        }
+    };
+
+    final DragGestureListener dragGestureListener = new DragGestureListener() {
+        public void dragGestureRecognized(DragGestureEvent dge) {
+            System.out.println("dragGestureRecognized: " + dge);
+            Object[] events = dge.toArray();
+            Object lastEvent = events[events.length - 1];
+            if (lastEvent instanceof MouseEvent) {
+                lastMouseEvent = (MouseEvent) lastEvent;
+            }
+            System.out.println("The last mouse event: " + lastMouseEvent
+                    + ", hash:" + lastMouseEvent.hashCode());
+            dge.startDrag(null, transferable, dragSourceListener);
+        }
+    };
+
+    static final Object SYNC_LOCK = new Object();
+    static final int MOUSE_RELEASE_TIMEOUT = 1000;
+    volatile Component clickedComponent = null;
+
+    public static void main(String[] args) throws Exception {
+        System.setProperty("awt.dnd.drag.threshold", "0");
+        MouseEventAfterStartDragTest app = new MouseEventAfterStartDragTest();
+        try {
+            app.createAndShowGUI();
+            app.test();
+        } finally {
+            app.dispose();
+        }
+    }
+
+    public void createAndShowGUI() throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            frame.setTitle("Test frame");
+            frame.setBounds(100, 100, 200, 200);
+            frame.setLocationRelativeTo(null);
+            frame.addMouseMotionListener(mouseMotionListener);
+            dragSource.createDefaultDragGestureRecognizer(frame, DnDConstants.ACTION_COPY_OR_MOVE,
+                    dragGestureListener);
+
+            frame.getToolkit().addAWTEventListener(this, AWTEvent.MOUSE_EVENT_MASK);
+            frame.setVisible(true);
+        });
+    }
+
+    public static int sign(int n) {
+        return n < 0 ? -1 : n == 0 ? 0 : 1;
+    }
+
+    public void test() throws Exception {
+        final Robot robot = new Robot();
+        robot.setAutoDelay(45);
+        robot.waitForIdle();
+
+        SwingUtilities.invokeAndWait(() -> {
+            srcPoint = frame.getLocationOnScreen();
+            d = frame.getSize();
+        });
+        srcPoint.translate(d.width / 2, d.height / 2);
+
+        if (!pointInComponent(robot, srcPoint, frame)) {
+            System.err.println("WARNING: Couldn't locate source frame.");
+            return;
+        }
+
+        final Point dstPoint = new Point(srcPoint);
+        dstPoint.translate(d.width / 4, d.height / 4);
+
+        if (!pointInComponent(robot, dstPoint, frame)) {
+            System.err.println("WARNING: Couldn't locate target frame.");
+            return;
+        }
+
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseMove(srcPoint.x, srcPoint.y);
+        robot.delay(250);
+        System.out.println("srcPoint = " + srcPoint);
+        for (; !srcPoint.equals(dstPoint);
+                srcPoint.translate(sign(dstPoint.x - srcPoint.x),
+                sign(dstPoint.y - srcPoint.y))) {
+            robot.mouseMove(srcPoint.x, srcPoint.y);
+            System.out.println("srcPoint = " + srcPoint);
+        }
+
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        System.out.println("done");
+        robot.waitForIdle();
+        robot.delay(MOUSE_RELEASE_TIMEOUT);
+
+        if (!passed) {
+            throw new RuntimeException("Test failed");
+        }
+    }
+
+    public void dispose() throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            if (frame != null) {
+                frame.dispose();
+            }
+        });
+    }
+
+    public void reset() {
+        clickedComponent = null;
+    }
+
+    public void eventDispatched(AWTEvent e) {
+        if (e.getID() == MouseEvent.MOUSE_RELEASED) {
+            clickedComponent = (Component) e.getSource();
+            synchronized (SYNC_LOCK) {
+                SYNC_LOCK.notifyAll();
+            }
+        }
+    }
+
+    boolean pointInComponent(Robot robot, Point p, Component comp)
+            throws InterruptedException {
+        robot.waitForIdle();
+        reset();
+        robot.mouseMove(p.x, p.y);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        synchronized (SYNC_LOCK) {
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            SYNC_LOCK.wait(MOUSE_RELEASE_TIMEOUT);
+        }
+
+        Component c = clickedComponent;
+
+        while (c != null && c != comp) {
+            c = c.getParent();
+        }
+
+        return c == comp;
+    }
+}

From 259915168d6656b1b8ddad03c377082d6a5224e5 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 16 May 2024 16:12:53 +0000
Subject: [PATCH 462/486] 8331202: Support for Duration until another Instant

Reviewed-by: joehw, scolebourne, rriggs
---
 .../share/classes/java/time/Instant.java      | 26 +++++++++++++-
 .../java/time/test/java/time/TestInstant.java | 35 +++++++++++++++++--
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/time/Instant.java b/src/java.base/share/classes/java/time/Instant.java
index 37dd9f8d2ac..05358cc4f3c 100644
--- a/src/java.base/share/classes/java/time/Instant.java
+++ b/src/java.base/share/classes/java/time/Instant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -1162,6 +1162,30 @@ public final class Instant
         return unit.between(this, end);
     }
 
+    /**
+     * Calculates the {@code Duration} until another {@code Instant}.
+     * <p>
+     * The start and end points are {@code this} and the specified instant.
+     * The result will be negative if the end is before the start. Calling
+     * this method is equivalent to
+     * {@link Duration#between(Temporal, Temporal) Duration.between(this,
+     * endExclusive)}.
+     * <p>
+     * This instance is immutable and unaffected by this method call.
+     *
+     * @param endExclusive the end {@code Instant}, exclusive, not null
+     * @return the {@code Duration} from this {@code Instant} until the
+     *      specified {@code endExclusive} {@code Instant}
+     * @see Duration#between(Temporal, Temporal)
+     * @since 23
+     */
+    public Duration until(Instant endExclusive) {
+        Objects.requireNonNull(endExclusive, "endExclusive");
+        long secsDiff = Math.subtractExact(endExclusive.seconds, seconds);
+        int nanosDiff = endExclusive.nanos - nanos;
+        return Duration.ofSeconds(secsDiff, nanosDiff);
+    }
+
     private long nanosUntil(Instant end) {
         long secsDiff = Math.subtractExact(end.seconds, seconds);
         long totalNanos = Math.multiplyExact(secsDiff, NANOS_PER_SECOND);
diff --git a/test/jdk/java/time/test/java/time/TestInstant.java b/test/jdk/java/time/test/java/time/TestInstant.java
index c6a3fb90683..1879334cb2a 100644
--- a/test/jdk/java/time/test/java/time/TestInstant.java
+++ b/test/jdk/java/time/test/java/time/TestInstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -59,16 +59,18 @@
  */
 package test.java.time;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 
 import org.testng.annotations.Test;
 import org.testng.annotations.DataProvider;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
 
 /**
  * Test Instant.
- * @bug 8273369
+ * @bug 8273369 8331202
  */
 @Test
 public class TestInstant extends AbstractTest {
@@ -120,4 +122,33 @@ public class TestInstant extends AbstractTest {
         assertEquals(Instant.MIN.until(Instant.MIN.plusSeconds(1), ChronoUnit.MILLIS), 1000L);
         assertEquals(Instant.MAX.plusSeconds(-1).until(Instant.MAX, ChronoUnit.MILLIS), 1000L);
     }
+
+    @DataProvider
+    private Object[][] provider_until_1arg() {
+        Instant t1 = Instant.ofEpochSecond(0, 10);
+        Instant t2 = Instant.ofEpochSecond(10, -20);
+        return new Object[][] {
+            {t1, t2},
+            {t2, t1},
+            {Instant.MIN, Instant.MAX},
+            {Instant.MAX, Instant.MIN},
+        };
+    }
+
+    @Test(dataProvider = "provider_until_1arg")
+    public void test_until_1arg(Instant start, Instant end) {
+        Duration result = start.until(end);
+        Duration expected = Duration.ofSeconds(end.getEpochSecond() - start.getEpochSecond(),
+                end.getNano() - start.getNano());
+        assertEquals(result, expected);
+        expected = Duration.between(start, end);
+        assertEquals(result, expected);
+    }
+
+    @Test
+    public void test_until_1arg_NPE() {
+        assertThrows(NullPointerException.class, () -> {
+            Instant.now().until(null);
+        });
+    }
 }

From dc184f1099e09cef095cd8438d88dd8a1e6f5522 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Thu, 16 May 2024 16:47:09 +0000
Subject: [PATCH 463/486] 8324649: Shenandoah: replace implementation of free
 set

Reviewed-by: wkemper, ysr, rkennke
---
 .../share/gc/shenandoah/shenandoahFreeSet.cpp | 1398 ++++++++++++-----
 .../share/gc/shenandoah/shenandoahFreeSet.hpp |  361 ++++-
 .../share/gc/shenandoah/shenandoahFullGC.cpp  |    1 -
 .../share/gc/shenandoah/shenandoahHeap.cpp    |   16 +-
 .../gc/shenandoah/shenandoahSimpleBitMap.cpp  |  291 ++++
 .../gc/shenandoah/shenandoahSimpleBitMap.hpp  |  170 ++
 .../shenandoahSimpleBitMap.inline.hpp         |  100 ++
 .../test_shenandoahSimpleBitMap.cpp           |  451 ++++++
 8 files changed, 2392 insertions(+), 396 deletions(-)
 create mode 100644 src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.cpp
 create mode 100644 src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp
 create mode 100644 src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.inline.hpp
 create mode 100644 test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 72a3f411ea0..c11d7e814e4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016, 2021, Red Hat, Inc. All rights reserved.
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,82 +29,658 @@
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.inline.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/orderAccess.hpp"
 
+static const char* partition_name(ShenandoahFreeSetPartitionId t) {
+  switch (t) {
+    case ShenandoahFreeSetPartitionId::NotFree: return "NotFree";
+    case ShenandoahFreeSetPartitionId::Mutator: return "Mutator";
+    case ShenandoahFreeSetPartitionId::Collector: return "Collector";
+    default:
+      ShouldNotReachHere();
+      return "Unrecognized";
+  }
+}
+
+#ifndef PRODUCT
+void ShenandoahRegionPartitions::dump_bitmap() const {
+  log_info(gc)("Mutator range [" SSIZE_FORMAT ", " SSIZE_FORMAT "], Collector range [" SSIZE_FORMAT ", " SSIZE_FORMAT "]",
+               _leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)],
+               _rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)],
+               _leftmosts[int(ShenandoahFreeSetPartitionId::Collector)],
+               _rightmosts[int(ShenandoahFreeSetPartitionId::Collector)]);
+  log_info(gc)("Empty Mutator range [" SSIZE_FORMAT ", " SSIZE_FORMAT
+               "], Empty Collector range [" SSIZE_FORMAT ", " SSIZE_FORMAT "]",
+               _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
+               _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
+               _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
+               _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)]);
+
+  log_info(gc)("%6s: %18s %18s %18s", "index", "Mutator Bits", "Collector Bits", "NotFree Bits");
+  dump_bitmap_range(0, _max-1);
+}
+
+void ShenandoahRegionPartitions::dump_bitmap_range(idx_t start_region_idx, idx_t end_region_idx) const {
+  assert((start_region_idx >= 0) && (start_region_idx < (idx_t) _max), "precondition");
+  assert((end_region_idx >= 0) && (end_region_idx < (idx_t) _max), "precondition");
+  idx_t aligned_start = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].aligned_index(start_region_idx);
+  idx_t aligned_end = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].aligned_index(end_region_idx);
+  idx_t alignment = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].alignment();
+  while (aligned_start <= aligned_end) {
+    dump_bitmap_row(aligned_start);
+    aligned_start += alignment;
+  }
+}
+
+void ShenandoahRegionPartitions::dump_bitmap_row(idx_t region_idx) const {
+  assert((region_idx >= 0) && (region_idx < (idx_t) _max), "precondition");
+  idx_t aligned_idx = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].aligned_index(region_idx);
+  uintx mutator_bits = _membership[int(ShenandoahFreeSetPartitionId::Mutator)].bits_at(aligned_idx);
+  uintx collector_bits = _membership[int(ShenandoahFreeSetPartitionId::Collector)].bits_at(aligned_idx);
+  uintx free_bits = mutator_bits | collector_bits;
+  uintx notfree_bits =  ~free_bits;
+  log_info(gc)(SSIZE_FORMAT_W(6) ": " SIZE_FORMAT_X_0 " 0x" SIZE_FORMAT_X_0 " 0x" SIZE_FORMAT_X_0,
+               aligned_idx, mutator_bits, collector_bits, notfree_bits);
+}
+#endif
+
+ShenandoahRegionPartitions::ShenandoahRegionPartitions(size_t max_regions, ShenandoahFreeSet* free_set) :
+    _max(max_regions),
+    _region_size_bytes(ShenandoahHeapRegion::region_size_bytes()),
+    _free_set(free_set),
+    _membership{ ShenandoahSimpleBitMap(max_regions), ShenandoahSimpleBitMap(max_regions) }
+{
+  make_all_regions_unavailable();
+}
+
+inline bool ShenandoahFreeSet::can_allocate_from(ShenandoahHeapRegion *r) const {
+  return r->is_empty() || (r->is_trash() && !_heap->is_concurrent_weak_root_in_progress());
+}
+
+inline bool ShenandoahFreeSet::can_allocate_from(size_t idx) const {
+  ShenandoahHeapRegion* r = _heap->get_region(idx);
+  return can_allocate_from(r);
+}
+
+inline size_t ShenandoahFreeSet::alloc_capacity(ShenandoahHeapRegion *r) const {
+  if (r->is_trash()) {
+    // This would be recycled on allocation path
+    return ShenandoahHeapRegion::region_size_bytes();
+  } else {
+    return r->free();
+  }
+}
+
+inline size_t ShenandoahFreeSet::alloc_capacity(size_t idx) const {
+  ShenandoahHeapRegion* r = _heap->get_region(idx);
+  return alloc_capacity(r);
+}
+
+inline bool ShenandoahFreeSet::has_alloc_capacity(ShenandoahHeapRegion *r) const {
+  return alloc_capacity(r) > 0;
+}
+
+inline idx_t ShenandoahRegionPartitions::leftmost(ShenandoahFreeSetPartitionId which_partition) const {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  idx_t idx = _leftmosts[int(which_partition)];
+  if (idx >= _max) {
+    return _max;
+  } else {
+    // Cannot assert that membership[which_partition.is_set(idx) because this helper method may be used
+    // to query the original value of leftmost when leftmost must be adjusted because the interval representing
+    // which_partition is shrinking after the region that used to be leftmost is retired.
+    return idx;
+  }
+}
+
+inline idx_t ShenandoahRegionPartitions::rightmost(ShenandoahFreeSetPartitionId which_partition) const {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  idx_t idx = _rightmosts[int(which_partition)];
+  // Cannot assert that membership[which_partition.is_set(idx) because this helper method may be used
+  // to query the original value of leftmost when leftmost must be adjusted because the interval representing
+  // which_partition is shrinking after the region that used to be leftmost is retired.
+  return idx;
+}
+
+void ShenandoahRegionPartitions::make_all_regions_unavailable() {
+  for (size_t partition_id = 0; partition_id < IntNumPartitions; partition_id++) {
+    _membership[partition_id].clear_all();
+    _leftmosts[partition_id] = _max;
+    _rightmosts[partition_id] = -1;
+    _leftmosts_empty[partition_id] = _max;
+    _rightmosts_empty[partition_id] = -1;;
+    _capacity[partition_id] = 0;
+    _used[partition_id] = 0;
+  }
+  _region_counts[int(ShenandoahFreeSetPartitionId::Mutator)] = _region_counts[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
+}
+
+void ShenandoahRegionPartitions::establish_mutator_intervals(idx_t mutator_leftmost, idx_t mutator_rightmost,
+                                                             idx_t mutator_leftmost_empty, idx_t mutator_rightmost_empty,
+                                                             size_t mutator_region_count, size_t mutator_used) {
+  _region_counts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_region_count;
+  _leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_leftmost;
+  _rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_rightmost;
+  _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_leftmost_empty;
+  _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_rightmost_empty;
+
+  _region_counts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_region_count;
+  _used[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_used;
+  _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_region_count * _region_size_bytes;
+
+  _leftmosts[int(ShenandoahFreeSetPartitionId::Collector)] = _max;
+  _rightmosts[int(ShenandoahFreeSetPartitionId::Collector)] = -1;
+  _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)] = _max;
+  _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)] = -1;
+
+  _region_counts[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
+  _used[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
+  _capacity[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
+}
+
+void ShenandoahRegionPartitions::increase_used(ShenandoahFreeSetPartitionId which_partition, size_t bytes) {
+  assert (which_partition < NumPartitions, "Partition must be valid");
+  _used[int(which_partition)] += bytes;
+  assert (_used[int(which_partition)] <= _capacity[int(which_partition)],
+          "Must not use (" SIZE_FORMAT ") more than capacity (" SIZE_FORMAT ") after increase by " SIZE_FORMAT,
+          _used[int(which_partition)], _capacity[int(which_partition)], bytes);
+}
+
+inline void ShenandoahRegionPartitions::shrink_interval_if_range_modifies_either_boundary(
+  ShenandoahFreeSetPartitionId partition, idx_t low_idx, idx_t high_idx) {
+  assert((low_idx <= high_idx) && (low_idx >= 0) && (high_idx < _max), "Range must span legal index values");
+  if (low_idx == leftmost(partition)) {
+    assert (!_membership[int(partition)].is_set(low_idx), "Do not shrink interval if region not removed");
+    if (high_idx + 1 == _max) {
+      _leftmosts[int(partition)] = _max;
+    } else {
+      _leftmosts[int(partition)] = find_index_of_next_available_region(partition, high_idx + 1);
+    }
+    if (_leftmosts_empty[int(partition)] < _leftmosts[int(partition)]) {
+      // This gets us closer to where we need to be; we'll scan further when leftmosts_empty is requested.
+      _leftmosts_empty[int(partition)] = leftmost(partition);
+    }
+  }
+  if (high_idx == _rightmosts[int(partition)]) {
+    assert (!_membership[int(partition)].is_set(high_idx), "Do not shrink interval if region not removed");
+    if (low_idx == 0) {
+      _rightmosts[int(partition)] = -1;
+    } else {
+      _rightmosts[int(partition)] = find_index_of_previous_available_region(partition, low_idx - 1);
+    }
+    if (_rightmosts_empty[int(partition)] > _rightmosts[int(partition)]) {
+      // This gets us closer to where we need to be; we'll scan further when rightmosts_empty is requested.
+      _rightmosts_empty[int(partition)] = _rightmosts[int(partition)];
+    }
+  }
+  if (_leftmosts[int(partition)] > _rightmosts[int(partition)]) {
+    _leftmosts[int(partition)] = _max;
+    _rightmosts[int(partition)] = -1;
+    _leftmosts_empty[int(partition)] = _max;
+    _rightmosts_empty[int(partition)] = -1;
+  }
+}
+
+inline void ShenandoahRegionPartitions::shrink_interval_if_boundary_modified(ShenandoahFreeSetPartitionId partition, idx_t idx) {
+  shrink_interval_if_range_modifies_either_boundary(partition, idx, idx);
+}
+
+inline void ShenandoahRegionPartitions::expand_interval_if_boundary_modified(ShenandoahFreeSetPartitionId partition,
+                                                                             idx_t idx, size_t region_available) {
+  if (_leftmosts[int(partition)] > idx) {
+    _leftmosts[int(partition)] = idx;
+  }
+  if (_rightmosts[int(partition)] < idx) {
+    _rightmosts[int(partition)] = idx;
+  }
+  if (region_available == _region_size_bytes) {
+    if (_leftmosts_empty[int(partition)] > idx) {
+      _leftmosts_empty[int(partition)] = idx;
+    }
+    if (_rightmosts_empty[int(partition)] < idx) {
+      _rightmosts_empty[int(partition)] = idx;
+    }
+  }
+}
+
+void ShenandoahRegionPartitions::retire_range_from_partition(
+  ShenandoahFreeSetPartitionId partition, idx_t low_idx, idx_t high_idx) {
+
+  // Note: we may remove from free partition even if region is not entirely full, such as when available < PLAB::min_size()
+  assert ((low_idx < _max) && (high_idx < _max), "Both indices are sane: " SIZE_FORMAT " and " SIZE_FORMAT " < " SIZE_FORMAT,
+          low_idx, high_idx, _max);
+  assert (partition < NumPartitions, "Cannot remove from free partitions if not already free");
+
+  for (idx_t idx = low_idx; idx <= high_idx; idx++) {
+    assert (in_free_set(partition, idx), "Must be in partition to remove from partition");
+    _membership[int(partition)].clear_bit(idx);
+  }
+  _region_counts[int(partition)] -= high_idx + 1 - low_idx;
+  shrink_interval_if_range_modifies_either_boundary(partition, low_idx, high_idx);
+}
+
+void ShenandoahRegionPartitions::retire_from_partition(ShenandoahFreeSetPartitionId partition, idx_t idx, size_t used_bytes) {
+
+  // Note: we may remove from free partition even if region is not entirely full, such as when available < PLAB::min_size()
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  assert (partition < NumPartitions, "Cannot remove from free partitions if not already free");
+  assert (in_free_set(partition, idx), "Must be in partition to remove from partition");
+
+  if (used_bytes < _region_size_bytes) {
+    // Count the alignment pad remnant of memory as used when we retire this region
+    increase_used(partition, _region_size_bytes - used_bytes);
+  }
+  _membership[int(partition)].clear_bit(idx);
+  shrink_interval_if_boundary_modified(partition, idx);
+  _region_counts[int(partition)]--;
+}
+
+void ShenandoahRegionPartitions::make_free(idx_t idx, ShenandoahFreeSetPartitionId which_partition, size_t available) {
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  assert (membership(idx) == ShenandoahFreeSetPartitionId::NotFree, "Cannot make free if already free");
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  assert (available <= _region_size_bytes, "Available cannot exceed region size");
+
+  _membership[int(which_partition)].set_bit(idx);
+  _capacity[int(which_partition)] += _region_size_bytes;
+  _used[int(which_partition)] += _region_size_bytes - available;
+  expand_interval_if_boundary_modified(which_partition, idx, available);
+
+  _region_counts[int(which_partition)]++;
+}
+
+void ShenandoahRegionPartitions::move_from_partition_to_partition(idx_t idx, ShenandoahFreeSetPartitionId orig_partition,
+                                                                  ShenandoahFreeSetPartitionId new_partition, size_t available) {
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  assert (orig_partition < NumPartitions, "Original partition must be valid");
+  assert (new_partition < NumPartitions, "New partition must be valid");
+  assert (available <= _region_size_bytes, "Available cannot exceed region size");
+
+  // Expected transitions:
+  //  During rebuild:         Mutator => Collector
+  //  During flip_to_gc:      Mutator empty => Collector
+  // At start of update refs: Collector => Mutator
+  assert (((available <= _region_size_bytes) &&
+           (((orig_partition == ShenandoahFreeSetPartitionId::Mutator)
+             && (new_partition == ShenandoahFreeSetPartitionId::Collector)) ||
+            ((orig_partition == ShenandoahFreeSetPartitionId::Collector)
+             && (new_partition == ShenandoahFreeSetPartitionId::Mutator)))) ||
+          ((available == _region_size_bytes) &&
+           ((orig_partition == ShenandoahFreeSetPartitionId::Mutator)
+            && (new_partition == ShenandoahFreeSetPartitionId::Collector))), "Unexpected movement between partitions");
+
+  size_t used = _region_size_bytes - available;
+
+  _membership[int(orig_partition)].clear_bit(idx);
+  _membership[int(new_partition)].set_bit(idx);
+
+  _capacity[int(orig_partition)] -= _region_size_bytes;
+  _used[int(orig_partition)] -= used;
+  shrink_interval_if_boundary_modified(orig_partition, idx);
+
+  _capacity[int(new_partition)] += _region_size_bytes;;
+  _used[int(new_partition)] += used;
+  expand_interval_if_boundary_modified(new_partition, idx, available);
+
+  _region_counts[int(orig_partition)]--;
+  _region_counts[int(new_partition)]++;
+}
+
+const char* ShenandoahRegionPartitions::partition_membership_name(idx_t idx) const {
+  return partition_name(membership(idx));
+}
+
+inline ShenandoahFreeSetPartitionId ShenandoahRegionPartitions::membership(idx_t idx) const {
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  ShenandoahFreeSetPartitionId result = ShenandoahFreeSetPartitionId::NotFree;
+  for (uint partition_id = 0; partition_id < UIntNumPartitions; partition_id++) {
+    if (_membership[partition_id].is_set(idx)) {
+      assert(result == ShenandoahFreeSetPartitionId::NotFree, "Region should reside in only one partition");
+      result = (ShenandoahFreeSetPartitionId) partition_id;
+    }
+  }
+  return result;
+}
+
+#ifdef ASSERT
+inline bool ShenandoahRegionPartitions::partition_id_matches(idx_t idx, ShenandoahFreeSetPartitionId test_partition) const {
+  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT, idx, _max);
+  assert (test_partition < ShenandoahFreeSetPartitionId::NotFree, "must be a valid partition");
+
+  return membership(idx) == test_partition;
+}
+#endif
+
+inline bool ShenandoahRegionPartitions::is_empty(ShenandoahFreeSetPartitionId which_partition) const {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  return (leftmost(which_partition) > rightmost(which_partition));
+}
+
+inline idx_t ShenandoahRegionPartitions::find_index_of_next_available_region(
+  ShenandoahFreeSetPartitionId which_partition, idx_t start_index) const {
+  idx_t rightmost_idx = rightmost(which_partition);
+  idx_t leftmost_idx = leftmost(which_partition);
+  if ((rightmost_idx < leftmost_idx) || (start_index > rightmost_idx)) return _max;
+  if (start_index < leftmost_idx) {
+    start_index = leftmost_idx;
+  }
+  idx_t result = _membership[int(which_partition)].find_first_set_bit(start_index, rightmost_idx + 1);
+  if (result > rightmost_idx) {
+    result = _max;
+  }
+  assert (result >= start_index, "Requires progress");
+  return result;
+}
+
+inline idx_t ShenandoahRegionPartitions::find_index_of_previous_available_region(
+  ShenandoahFreeSetPartitionId which_partition, idx_t last_index) const {
+  idx_t rightmost_idx = rightmost(which_partition);
+  idx_t leftmost_idx = leftmost(which_partition);
+  // if (leftmost_idx == max) then (last_index < leftmost_idx)
+  if (last_index < leftmost_idx) return -1;
+  if (last_index > rightmost_idx) {
+    last_index = rightmost_idx;
+  }
+  idx_t result = _membership[int(which_partition)].find_last_set_bit(-1, last_index);
+  if (result < leftmost_idx) {
+    result = -1;
+  }
+  assert (result <= last_index, "Requires progress");
+  return result;
+}
+
+inline idx_t ShenandoahRegionPartitions::find_index_of_next_available_cluster_of_regions(
+  ShenandoahFreeSetPartitionId which_partition, idx_t start_index, size_t cluster_size) const {
+  idx_t rightmost_idx = rightmost(which_partition);
+  idx_t leftmost_idx = leftmost(which_partition);
+  if ((rightmost_idx < leftmost_idx) || (start_index > rightmost_idx)) return _max;
+  idx_t result = _membership[int(which_partition)].find_first_consecutive_set_bits(start_index, rightmost_idx + 1, cluster_size);
+  if (result > rightmost_idx) {
+    result = _max;
+  }
+  assert (result >= start_index, "Requires progress");
+  return result;
+}
+
+inline idx_t ShenandoahRegionPartitions::find_index_of_previous_available_cluster_of_regions(
+  ShenandoahFreeSetPartitionId which_partition, idx_t last_index, size_t cluster_size) const {
+  idx_t leftmost_idx = leftmost(which_partition);
+  // if (leftmost_idx == max) then (last_index < leftmost_idx)
+  if (last_index < leftmost_idx) return -1;
+  idx_t result = _membership[int(which_partition)].find_last_consecutive_set_bits(leftmost_idx - 1, last_index, cluster_size);
+  if (result <= leftmost_idx) {
+    result = -1;
+  }
+  assert (result <= last_index, "Requires progress");
+  return result;
+}
+
+idx_t ShenandoahRegionPartitions::leftmost_empty(ShenandoahFreeSetPartitionId which_partition) {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  idx_t max_regions = _max;
+  if (_leftmosts_empty[int(which_partition)] == _max) {
+    return _max;
+  }
+  for (idx_t idx = find_index_of_next_available_region(which_partition, _leftmosts_empty[int(which_partition)]);
+       idx < max_regions; ) {
+    assert(in_free_set(which_partition, idx), "Boundaries or find_last_set_bit failed: " SSIZE_FORMAT, idx);
+    if (_free_set->alloc_capacity(idx) == _region_size_bytes) {
+      _leftmosts_empty[int(which_partition)] = idx;
+      return idx;
+    }
+    idx = find_index_of_next_available_region(which_partition, idx + 1);
+  }
+  _leftmosts_empty[int(which_partition)] = _max;
+  _rightmosts_empty[int(which_partition)] = -1;
+  return _max;
+}
+
+idx_t ShenandoahRegionPartitions::rightmost_empty(ShenandoahFreeSetPartitionId which_partition) {
+  assert (which_partition < NumPartitions, "selected free partition must be valid");
+  if (_rightmosts_empty[int(which_partition)] < 0) {
+    return -1;
+  }
+  for (idx_t idx = find_index_of_previous_available_region(which_partition, _rightmosts_empty[int(which_partition)]);
+       idx >= 0; ) {
+    assert(in_free_set(which_partition, idx), "Boundaries or find_last_set_bit failed: " SSIZE_FORMAT, idx);
+    if (_free_set->alloc_capacity(idx) == _region_size_bytes) {
+      _rightmosts_empty[int(which_partition)] = idx;
+      return idx;
+    }
+    idx = find_index_of_previous_available_region(which_partition, idx - 1);
+  }
+  _leftmosts_empty[int(which_partition)] = _max;
+  _rightmosts_empty[int(which_partition)] = -1;
+  return -1;
+}
+
+
+#ifdef ASSERT
+void ShenandoahRegionPartitions::assert_bounds() {
+
+  idx_t leftmosts[UIntNumPartitions];
+  idx_t rightmosts[UIntNumPartitions];
+  idx_t empty_leftmosts[UIntNumPartitions];
+  idx_t empty_rightmosts[UIntNumPartitions];
+
+  for (uint i = 0; i < UIntNumPartitions; i++) {
+    leftmosts[i] = _max;
+    empty_leftmosts[i] = _max;
+    rightmosts[i] = -1;
+    empty_rightmosts[i] = -1;
+  }
+
+  for (idx_t i = 0; i < _max; i++) {
+    ShenandoahFreeSetPartitionId partition = membership(i);
+    switch (partition) {
+      case ShenandoahFreeSetPartitionId::NotFree:
+        break;
+
+      case ShenandoahFreeSetPartitionId::Mutator:
+      case ShenandoahFreeSetPartitionId::Collector:
+      {
+        size_t capacity = _free_set->alloc_capacity(i);
+        bool is_empty = (capacity == _region_size_bytes);
+        assert(capacity > 0, "free regions must have allocation capacity");
+        if (i < leftmosts[int(partition)]) {
+          leftmosts[int(partition)] = i;
+        }
+        if (is_empty && (i < empty_leftmosts[int(partition)])) {
+          empty_leftmosts[int(partition)] = i;
+        }
+        if (i > rightmosts[int(partition)]) {
+          rightmosts[int(partition)] = i;
+        }
+        if (is_empty && (i > empty_rightmosts[int(partition)])) {
+          empty_rightmosts[int(partition)] = i;
+        }
+        break;
+      }
+
+      default:
+        ShouldNotReachHere();
+    }
+  }
+
+  // Performance invariants. Failing these would not break the free partition, but performance would suffer.
+  assert (leftmost(ShenandoahFreeSetPartitionId::Mutator) <= _max,
+          "leftmost in bounds: "  SSIZE_FORMAT " < " SSIZE_FORMAT, leftmost(ShenandoahFreeSetPartitionId::Mutator),  _max);
+  assert (rightmost(ShenandoahFreeSetPartitionId::Mutator) < _max,
+          "rightmost in bounds: "  SSIZE_FORMAT " < " SSIZE_FORMAT, rightmost(ShenandoahFreeSetPartitionId::Mutator),  _max);
+
+  assert (leftmost(ShenandoahFreeSetPartitionId::Mutator) == _max
+          || partition_id_matches(leftmost(ShenandoahFreeSetPartitionId::Mutator), ShenandoahFreeSetPartitionId::Mutator),
+          "leftmost region should be free: " SSIZE_FORMAT,  leftmost(ShenandoahFreeSetPartitionId::Mutator));
+  assert (leftmost(ShenandoahFreeSetPartitionId::Mutator) == _max
+          || partition_id_matches(rightmost(ShenandoahFreeSetPartitionId::Mutator), ShenandoahFreeSetPartitionId::Mutator),
+          "rightmost region should be free: " SSIZE_FORMAT, rightmost(ShenandoahFreeSetPartitionId::Mutator));
+
+  // If Mutator partition is empty, leftmosts will both equal max, rightmosts will both equal zero.
+  // Likewise for empty region partitions.
+  idx_t beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
+  idx_t end_off = rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
+  assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::Mutator),
+          "free regions before the leftmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          beg_off, leftmost(ShenandoahFreeSetPartitionId::Mutator));
+  assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::Mutator),
+          "free regions past the rightmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          end_off, rightmost(ShenandoahFreeSetPartitionId::Mutator));
+
+  beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
+  end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
+  assert (beg_off >= leftmost_empty(ShenandoahFreeSetPartitionId::Mutator),
+          "free empty regions before the leftmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::Mutator));
+  assert (end_off <= rightmost_empty(ShenandoahFreeSetPartitionId::Mutator),
+          "free empty regions past the rightmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          end_off, rightmost_empty(ShenandoahFreeSetPartitionId::Mutator));
+
+  // Performance invariants. Failing these would not break the free partition, but performance would suffer.
+  assert (leftmost(ShenandoahFreeSetPartitionId::Collector) <= _max, "leftmost in bounds: "  SSIZE_FORMAT " < " SSIZE_FORMAT,
+          leftmost(ShenandoahFreeSetPartitionId::Collector),  _max);
+  assert (rightmost(ShenandoahFreeSetPartitionId::Collector) < _max, "rightmost in bounds: "  SSIZE_FORMAT " < " SSIZE_FORMAT,
+          rightmost(ShenandoahFreeSetPartitionId::Collector),  _max);
+
+  assert (leftmost(ShenandoahFreeSetPartitionId::Collector) == _max
+          || partition_id_matches(leftmost(ShenandoahFreeSetPartitionId::Collector), ShenandoahFreeSetPartitionId::Collector),
+          "leftmost region should be free: " SSIZE_FORMAT,  leftmost(ShenandoahFreeSetPartitionId::Collector));
+  assert (leftmost(ShenandoahFreeSetPartitionId::Collector) == _max
+          || partition_id_matches(rightmost(ShenandoahFreeSetPartitionId::Collector), ShenandoahFreeSetPartitionId::Collector),
+          "rightmost region should be free: " SSIZE_FORMAT, rightmost(ShenandoahFreeSetPartitionId::Collector));
+
+  // If Collector partition is empty, leftmosts will both equal max, rightmosts will both equal zero.
+  // Likewise for empty region partitions.
+  beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::Collector)];
+  end_off = rightmosts[int(ShenandoahFreeSetPartitionId::Collector)];
+  assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::Collector),
+          "free regions before the leftmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          beg_off, leftmost(ShenandoahFreeSetPartitionId::Collector));
+  assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::Collector),
+          "free regions past the rightmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          end_off, rightmost(ShenandoahFreeSetPartitionId::Collector));
+
+  beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::Collector)];
+  end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::Collector)];
+  assert (beg_off >= _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
+          "free empty regions before the leftmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::Collector));
+  assert (end_off <= _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
+          "free empty regions past the rightmost: " SSIZE_FORMAT ", bound " SSIZE_FORMAT,
+          end_off, rightmost_empty(ShenandoahFreeSetPartitionId::Collector));
+}
+#endif
+
 ShenandoahFreeSet::ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions) :
   _heap(heap),
-  _mutator_free_bitmap(max_regions, mtGC),
-  _collector_free_bitmap(max_regions, mtGC),
-  _max(max_regions)
+  _partitions(max_regions, this),
+  _right_to_left_bias(false),
+  _alloc_bias_weight(0)
 {
   clear_internal();
 }
 
-void ShenandoahFreeSet::increase_used(size_t num_bytes) {
-  shenandoah_assert_heaplocked();
-  _used += num_bytes;
-
-  assert(_used <= _capacity, "must not use more than we have: used: " SIZE_FORMAT
-         ", capacity: " SIZE_FORMAT ", num_bytes: " SIZE_FORMAT, _used, _capacity, num_bytes);
-}
-
-bool ShenandoahFreeSet::is_mutator_free(size_t idx) const {
-  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT " (left: " SIZE_FORMAT ", right: " SIZE_FORMAT ")",
-          idx, _max, _mutator_leftmost, _mutator_rightmost);
-  return _mutator_free_bitmap.at(idx);
-}
-
-bool ShenandoahFreeSet::is_collector_free(size_t idx) const {
-  assert (idx < _max, "index is sane: " SIZE_FORMAT " < " SIZE_FORMAT " (left: " SIZE_FORMAT ", right: " SIZE_FORMAT ")",
-          idx, _max, _collector_leftmost, _collector_rightmost);
-  return _collector_free_bitmap.at(idx);
-}
-
 HeapWord* ShenandoahFreeSet::allocate_single(ShenandoahAllocRequest& req, bool& in_new_region) {
+  shenandoah_assert_heaplocked();
+
   // Scan the bitmap looking for a first fit.
   //
-  // Leftmost and rightmost bounds provide enough caching to walk bitmap efficiently. Normally,
-  // we would find the region to allocate at right away.
+  // Leftmost and rightmost bounds provide enough caching to quickly find a region from which to allocate.
   //
-  // Allocations are biased: new application allocs go to beginning of the heap, and GC allocs
-  // go to the end. This makes application allocation faster, because we would clear lots
-  // of regions from the beginning most of the time.
+  // Allocations are biased: GC allocations are taken from the high end of the heap.  Regular (and TLAB)
+  // mutator allocations are taken from the middle of heap, below the memory reserved for Collector.
+  // Humongous mutator allocations are taken from the bottom of the heap.
   //
-  // Free set maintains mutator and collector views, and normally they allocate in their views only,
-  // unless we special cases for stealing and mixed allocations.
+  // Free set maintains mutator and collector partitions.  Mutator can only allocate from the
+  // Mutator partition.  Collector prefers to allocate from the Collector partition, but may steal
+  // regions from the Mutator partition if the Collector partition has been depleted.
 
   switch (req.type()) {
     case ShenandoahAllocRequest::_alloc_tlab:
     case ShenandoahAllocRequest::_alloc_shared: {
-
       // Try to allocate in the mutator view
-      for (size_t idx = _mutator_leftmost; idx <= _mutator_rightmost; idx++) {
-        if (is_mutator_free(idx)) {
-          HeapWord* result = try_allocate_in(_heap->get_region(idx), req, in_new_region);
-          if (result != nullptr) {
-            return result;
+      if (_alloc_bias_weight-- <= 0) {
+        // We have observed that regions not collected in previous GC cycle tend to congregate at one end or the other
+        // of the heap.  Typically, these are the more recently engaged regions and the objects in these regions have not
+        // yet had a chance to die (and/or are treated as floating garbage).  If we use the same allocation bias on each
+        // GC pass, these "most recently" engaged regions for GC pass N will also be the "most recently" engaged regions
+        // for GC pass N+1, and the relatively large amount of live data and/or floating garbage introduced
+        // during the most recent GC pass may once again prevent the region from being collected.  We have found that
+        // alternating the allocation behavior between GC passes improves evacuation performance by 3-7% on certain
+        // benchmarks.  In the best case, this has the effect of consuming these partially consumed regions before
+        // the start of the next mark cycle so all of their garbage can be efficiently reclaimed.
+        //
+        // First, finish consuming regions that are already partially consumed so as to more tightly limit ranges of
+        // available regions.  Other potential benefits:
+        //  1. Eventual collection set has fewer regions because we have packed newly allocated objects into fewer regions
+        //  2. We preserve the "empty" regions longer into the GC cycle, reducing likelihood of allocation failures
+        //     late in the GC cycle.
+        idx_t non_empty_on_left = (_partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Mutator)
+                                     - _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator));
+        idx_t non_empty_on_right = (_partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator)
+                                      - _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Mutator));
+        _right_to_left_bias = (non_empty_on_right > non_empty_on_left);
+        _alloc_bias_weight = _InitialAllocBiasWeight;
+      }
+      if (_right_to_left_bias) {
+        // Allocate within mutator free from high memory to low so as to preserve low memory for humongous allocations
+        if (!_partitions.is_empty(ShenandoahFreeSetPartitionId::Mutator)) {
+          // Use signed idx.  Otherwise, loop will never terminate.
+          idx_t leftmost = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator);
+          for (idx_t idx = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator); idx >= leftmost; ) {
+            assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx),
+                   "Boundaries or find_last_set_bit failed: " SSIZE_FORMAT, idx);
+            ShenandoahHeapRegion* r = _heap->get_region(idx);
+            // try_allocate_in() increases used if the allocation is successful.
+            HeapWord* result;
+            size_t min_size = (req.type() == ShenandoahAllocRequest::_alloc_tlab)? req.min_size(): req.size();
+            if ((alloc_capacity(r) >= min_size) && ((result = try_allocate_in(r, req, in_new_region)) != nullptr)) {
+              return result;
+            }
+            idx = _partitions.find_index_of_previous_available_region(ShenandoahFreeSetPartitionId::Mutator, idx - 1);
+          }
+        }
+      } else {
+        // Allocate from low to high memory.  This keeps the range of fully empty regions more tightly packed.
+        // Note that the most recently allocated regions tend not to be evacuated in a given GC cycle.  So this
+        // tends to accumulate "fragmented" uncollected regions in high memory.
+        if (!_partitions.is_empty(ShenandoahFreeSetPartitionId::Mutator)) {
+          // Use signed idx.  Otherwise, loop will never terminate.
+          idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator);
+          for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator); idx <= rightmost; ) {
+            assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx),
+                   "Boundaries or find_last_set_bit failed: " SSIZE_FORMAT, idx);
+            ShenandoahHeapRegion* r = _heap->get_region(idx);
+            // try_allocate_in() increases used if the allocation is successful.
+            HeapWord* result;
+            size_t min_size = (req.type() == ShenandoahAllocRequest::_alloc_tlab)? req.min_size(): req.size();
+            if ((alloc_capacity(r) >= min_size) && ((result = try_allocate_in(r, req, in_new_region)) != nullptr)) {
+              return result;
+            }
+            idx = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Mutator, idx + 1);
           }
         }
       }
-
       // There is no recovery. Mutator does not touch collector view at all.
       break;
     }
     case ShenandoahAllocRequest::_alloc_gclab:
-    case ShenandoahAllocRequest::_alloc_shared_gc: {
-      // size_t is unsigned, need to dodge underflow when _leftmost = 0
+      // GCLABs are for evacuation so we must be in evacuation phase.
 
+    case ShenandoahAllocRequest::_alloc_shared_gc: {
       // Fast-path: try to allocate in the collector view first
-      for (size_t c = _collector_rightmost + 1; c > _collector_leftmost; c--) {
-        size_t idx = c - 1;
-        if (is_collector_free(idx)) {
-          HeapWord* result = try_allocate_in(_heap->get_region(idx), req, in_new_region);
-          if (result != nullptr) {
-            return result;
-          }
+      idx_t leftmost_collector = _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector);
+      for (idx_t idx = _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector); idx >= leftmost_collector; ) {
+        assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, idx),
+               "Boundaries or find_prev_last_bit failed: " SSIZE_FORMAT, idx);
+        HeapWord* result = try_allocate_in(_heap->get_region(idx), req, in_new_region);
+        if (result != nullptr) {
+          return result;
         }
+        idx = _partitions.find_index_of_previous_available_region(ShenandoahFreeSetPartitionId::Collector, idx - 1);
       }
 
       // No dice. Can we borrow space from mutator view?
@@ -111,166 +688,166 @@ HeapWord* ShenandoahFreeSet::allocate_single(ShenandoahAllocRequest& req, bool&
         return nullptr;
       }
 
-      // Try to steal the empty region from the mutator view
-      for (size_t c = _mutator_rightmost + 1; c > _mutator_leftmost; c--) {
-        size_t idx = c - 1;
-        if (is_mutator_free(idx)) {
-          ShenandoahHeapRegion* r = _heap->get_region(idx);
-          if (can_allocate_from(r)) {
-            flip_to_gc(r);
-            HeapWord *result = try_allocate_in(r, req, in_new_region);
-            if (result != nullptr) {
-              return result;
-            }
+      // Try to steal an empty region from the mutator view.
+      idx_t leftmost_mutator_empty = _partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Mutator);
+      for (idx_t idx = _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Mutator); idx >= leftmost_mutator_empty; ) {
+        assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx),
+               "Boundaries or find_prev_last_bit failed: " SSIZE_FORMAT, idx);
+        ShenandoahHeapRegion* r = _heap->get_region(idx);
+        if (can_allocate_from(r)) {
+          flip_to_gc(r);
+          HeapWord *result = try_allocate_in(r, req, in_new_region);
+          if (result != nullptr) {
+            log_debug(gc)("Flipped region " SIZE_FORMAT " to gc for request: " PTR_FORMAT, idx, p2i(&req));
+            return result;
           }
         }
+        idx = _partitions.find_index_of_previous_available_region(ShenandoahFreeSetPartitionId::Mutator, idx - 1);
       }
 
-      // No dice. Do not try to mix mutator and GC allocations, because
-      // URWM moves due to GC allocations would expose unparsable mutator
-      // allocations.
-
+      // No dice. Do not try to mix mutator and GC allocations, because adjusting region UWM
+      // due to GC allocations would expose unparsable mutator allocations.
       break;
     }
     default:
       ShouldNotReachHere();
   }
-
   return nullptr;
 }
 
 HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, ShenandoahAllocRequest& req, bool& in_new_region) {
-  assert (!has_no_alloc_capacity(r), "Performance: should avoid full regions on this path: " SIZE_FORMAT, r->index());
-
-  if (_heap->is_concurrent_weak_root_in_progress() &&
-      r->is_trash()) {
+  assert (has_alloc_capacity(r), "Performance: should avoid full regions on this path: " SIZE_FORMAT, r->index());
+  if (_heap->is_concurrent_weak_root_in_progress() && r->is_trash()) {
     return nullptr;
   }
 
+  HeapWord* result = nullptr;
   try_recycle_trashed(r);
-
   in_new_region = r->is_empty();
 
-  HeapWord* result = nullptr;
-  size_t size = req.size();
+  if (in_new_region) {
+    log_debug(gc)("Using new region (" SIZE_FORMAT ") for %s (" PTR_FORMAT ").",
+                       r->index(), ShenandoahAllocRequest::alloc_type_to_string(req.type()), p2i(&req));
+  }
 
+  // req.size() is in words, r->free() is in bytes.
   if (req.is_lab_alloc()) {
+    // This is a GCLAB or a TLAB allocation
+    size_t adjusted_size = req.size();
     size_t free = align_down(r->free() >> LogHeapWordSize, MinObjAlignment);
-    if (size > free) {
-      size = free;
+    if (adjusted_size > free) {
+      adjusted_size = free;
     }
-    if (size >= req.min_size()) {
-      result = r->allocate(size, req.type());
-      assert (result != nullptr, "Allocation must succeed: free " SIZE_FORMAT ", actual " SIZE_FORMAT, free, size);
+    if (adjusted_size >= req.min_size()) {
+      result = r->allocate(adjusted_size, req.type());
+      log_debug(gc)("Allocated " SIZE_FORMAT " words (adjusted from " SIZE_FORMAT ") for %s @" PTR_FORMAT
+                          " from %s region " SIZE_FORMAT ", free bytes remaining: " SIZE_FORMAT,
+                          adjusted_size, req.size(), ShenandoahAllocRequest::alloc_type_to_string(req.type()), p2i(result),
+                          _partitions.partition_membership_name(r->index()), r->index(), r->free());
+      assert (result != nullptr, "Allocation must succeed: free " SIZE_FORMAT ", actual " SIZE_FORMAT, free, adjusted_size);
+      req.set_actual_size(adjusted_size);
+    } else {
+      log_trace(gc, free)("Failed to shrink TLAB or GCLAB request (" SIZE_FORMAT ") in region " SIZE_FORMAT " to " SIZE_FORMAT
+                          " because min_size() is " SIZE_FORMAT, req.size(), r->index(), adjusted_size, req.min_size());
     }
   } else {
+    size_t size = req.size();
     result = r->allocate(size, req.type());
+    if (result != nullptr) {
+      // Record actual allocation size
+      log_debug(gc)("Allocated " SIZE_FORMAT " words for %s @" PTR_FORMAT
+                          " from %s region " SIZE_FORMAT ", free bytes remaining: " SIZE_FORMAT,
+                          size, ShenandoahAllocRequest::alloc_type_to_string(req.type()), p2i(result),
+                          _partitions.partition_membership_name(r->index()),  r->index(), r->free());
+      req.set_actual_size(size);
+    }
   }
 
   if (result != nullptr) {
     // Allocation successful, bump stats:
     if (req.is_mutator_alloc()) {
-      increase_used(size * HeapWordSize);
-    }
+      _partitions.increase_used(ShenandoahFreeSetPartitionId::Mutator, req.actual_size() * HeapWordSize);
+    } else {
+      assert(req.is_gc_alloc(), "Should be gc_alloc since req wasn't mutator alloc");
 
-    // Record actual allocation size
-    req.set_actual_size(size);
-
-    if (req.is_gc_alloc()) {
+      // For GC allocations, we advance update_watermark because the objects relocated into this memory during
+      // evacuation are not updated during evacuation.
       r->set_update_watermark(r->top());
     }
   }
 
-  if (result == nullptr || has_no_alloc_capacity(r)) {
-    // Region cannot afford this or future allocations. Retire it.
-    //
-    // While this seems a bit harsh, especially in the case when this large allocation does not
-    // fit, but the next small one would, we are risking to inflate scan times when lots of
-    // almost-full regions precede the fully-empty region where we want allocate the entire TLAB.
-    // TODO: Record first fully-empty region, and use that for large allocations
+  static const size_t min_capacity = (size_t) (ShenandoahHeapRegion::region_size_bytes() * (1.0 - 1.0 / ShenandoahEvacWaste));
+  size_t ac = alloc_capacity(r);
 
-    // Record the remainder as allocation waste
-    if (req.is_mutator_alloc()) {
-      size_t waste = r->free();
-      if (waste > 0) {
-        increase_used(waste);
-        _heap->notify_mutator_alloc_words(waste >> LogHeapWordSize, true);
-      }
-    }
+  if (((result == nullptr) && (ac < min_capacity)) || (alloc_capacity(r) < PLAB::min_size() * HeapWordSize)) {
+    // Regardless of whether this allocation succeeded, if the remaining memory is less than PLAB:min_size(), retire this region.
+    // Note that retire_from_partition() increases used to account for waste.
 
-    size_t num = r->index();
-    _collector_free_bitmap.clear_bit(num);
-    _mutator_free_bitmap.clear_bit(num);
-    // Touched the bounds? Need to update:
-    if (touches_bounds(num)) {
-      adjust_bounds();
-    }
-    assert_bounds();
+    // Also, if this allocation request failed and the consumed within this region * ShenandoahEvacWaste > region size,
+    // then retire the region so that subsequent searches can find available memory more quickly.
+
+    size_t idx = r->index();
+    _partitions.retire_from_partition(req.is_mutator_alloc()?
+                                      ShenandoahFreeSetPartitionId::Mutator: ShenandoahFreeSetPartitionId::Collector,
+                                      idx, r->used());
+    _partitions.assert_bounds();
   }
   return result;
 }
 
-bool ShenandoahFreeSet::touches_bounds(size_t num) const {
-  return num == _collector_leftmost || num == _collector_rightmost || num == _mutator_leftmost || num == _mutator_rightmost;
-}
-
-void ShenandoahFreeSet::recompute_bounds() {
-  // Reset to the most pessimistic case:
-  _mutator_rightmost = _max - 1;
-  _mutator_leftmost = 0;
-  _collector_rightmost = _max - 1;
-  _collector_leftmost = 0;
-
-  // ...and adjust from there
-  adjust_bounds();
-}
-
-void ShenandoahFreeSet::adjust_bounds() {
-  // Rewind both mutator bounds until the next bit.
-  while (_mutator_leftmost < _max && !is_mutator_free(_mutator_leftmost)) {
-    _mutator_leftmost++;
-  }
-  while (_mutator_rightmost > 0 && !is_mutator_free(_mutator_rightmost)) {
-    _mutator_rightmost--;
-  }
-  // Rewind both collector bounds until the next bit.
-  while (_collector_leftmost < _max && !is_collector_free(_collector_leftmost)) {
-    _collector_leftmost++;
-  }
-  while (_collector_rightmost > 0 && !is_collector_free(_collector_rightmost)) {
-    _collector_rightmost--;
-  }
-}
-
 HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
+  assert(req.is_mutator_alloc(), "All humongous allocations are performed by mutator");
   shenandoah_assert_heaplocked();
 
   size_t words_size = req.size();
-  size_t num = ShenandoahHeapRegion::required_regions(words_size * HeapWordSize);
+  idx_t num = ShenandoahHeapRegion::required_regions(words_size * HeapWordSize);
 
-  // No regions left to satisfy allocation, bye.
-  if (num > mutator_count()) {
+  // Check if there are enough regions left to satisfy allocation.
+  if (num > (idx_t) _partitions.count(ShenandoahFreeSetPartitionId::Mutator)) {
     return nullptr;
   }
 
+  idx_t start_range = _partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Mutator);
+  idx_t end_range = _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Mutator) + 1;
+  idx_t last_possible_start = end_range - num;
+
   // Find the continuous interval of $num regions, starting from $beg and ending in $end,
   // inclusive. Contiguous allocations are biased to the beginning.
-
-  size_t beg = _mutator_leftmost;
-  size_t end = beg;
+  idx_t beg = _partitions.find_index_of_next_available_cluster_of_regions(ShenandoahFreeSetPartitionId::Mutator,
+                                                                            start_range, num);
+  if (beg > last_possible_start) {
+    // Hit the end, goodbye
+    return nullptr;
+  }
+  idx_t end = beg;
 
   while (true) {
-    if (end >= _max) {
-      // Hit the end, goodbye
-      return nullptr;
-    }
-
-    // If regions are not adjacent, then current [beg; end] is useless, and we may fast-forward.
-    // If region is not completely free, the current [beg; end] is useless, and we may fast-forward.
-    if (!is_mutator_free(end) || !can_allocate_from(_heap->get_region(end))) {
-      end++;
-      beg = end;
-      continue;
+    // We've confirmed num contiguous regions belonging to Mutator partition, so no need to confirm membership.
+    // If region is not completely free, the current [beg; end] is useless, and we may fast-forward.  If we can extend
+    // the existing range, we can exploit that certain regions are already known to be in the Mutator free set.
+    while (!can_allocate_from(_heap->get_region(end))) {
+      // region[end] is not empty, so we restart our search after region[end]
+      idx_t slide_delta = end + 1 - beg;
+      if (beg + slide_delta > last_possible_start) {
+        // no room to slide
+        return nullptr;
+      }
+      for (idx_t span_end = beg + num; slide_delta > 0; slide_delta--) {
+        if (!_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, span_end)) {
+          beg = _partitions.find_index_of_next_available_cluster_of_regions(ShenandoahFreeSetPartitionId::Mutator,
+                                                                            span_end + 1, num);
+          break;
+        } else {
+          beg++;
+          span_end++;
+        }
+      }
+      // Here, either beg identifies a range of num regions all of which are in the Mutator free set, or beg > last_possible_start
+      if (beg > last_possible_start) {
+        // Hit the end, goodbye
+        return nullptr;
+      }
+      end = beg;
     }
 
     if ((end - beg + 1) == num) {
@@ -282,9 +859,8 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
   }
 
   size_t remainder = words_size & ShenandoahHeapRegion::region_size_words_mask();
-
   // Initialize regions:
-  for (size_t i = beg; i <= end; i++) {
+  for (idx_t i = beg; i <= end; i++) {
     ShenandoahHeapRegion* r = _heap->get_region(i);
     try_recycle_trashed(r);
 
@@ -306,46 +882,23 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
     }
 
     r->set_top(r->bottom() + used_words);
-
-    _mutator_free_bitmap.clear_bit(r->index());
   }
 
-  // While individual regions report their true use, all humongous regions are
-  // marked used in the free set.
-  increase_used(ShenandoahHeapRegion::region_size_bytes() * num);
-
   if (remainder != 0) {
     // Record this remainder as allocation waste
     _heap->notify_mutator_alloc_words(ShenandoahHeapRegion::region_size_words() - remainder, true);
   }
 
-  // Allocated at left/rightmost? Move the bounds appropriately.
-  if (beg == _mutator_leftmost || end == _mutator_rightmost) {
-    adjust_bounds();
-  }
-  assert_bounds();
+  // retire_range_from_partition() will adjust bounds on Mutator free set if appropriate
+  _partitions.retire_range_from_partition(ShenandoahFreeSetPartitionId::Mutator, beg, end);
 
+  size_t total_humongous_size = ShenandoahHeapRegion::region_size_bytes() * num;
+  _partitions.increase_used(ShenandoahFreeSetPartitionId::Mutator, total_humongous_size);
+  _partitions.assert_bounds();
   req.set_actual_size(words_size);
   return _heap->get_region(beg)->bottom();
 }
 
-bool ShenandoahFreeSet::can_allocate_from(ShenandoahHeapRegion *r) {
-  return r->is_empty() || (r->is_trash() && !_heap->is_concurrent_weak_root_in_progress());
-}
-
-size_t ShenandoahFreeSet::alloc_capacity(ShenandoahHeapRegion *r) {
-  if (r->is_trash()) {
-    // This would be recycled on allocation path
-    return ShenandoahHeapRegion::region_size_bytes();
-  } else {
-    return r->free();
-  }
-}
-
-bool ShenandoahFreeSet::has_no_alloc_capacity(ShenandoahHeapRegion *r) {
-  return alloc_capacity(r) == 0;
-}
-
 void ShenandoahFreeSet::try_recycle_trashed(ShenandoahHeapRegion *r) {
   if (r->is_trash()) {
     _heap->decrease_used(r->used());
@@ -370,20 +923,16 @@ void ShenandoahFreeSet::recycle_trash() {
 void ShenandoahFreeSet::flip_to_gc(ShenandoahHeapRegion* r) {
   size_t idx = r->index();
 
-  assert(_mutator_free_bitmap.at(idx), "Should be in mutator view");
+  assert(_partitions.partition_id_matches(idx, ShenandoahFreeSetPartitionId::Mutator), "Should be in mutator view");
   assert(can_allocate_from(r), "Should not be allocated");
 
-  _mutator_free_bitmap.clear_bit(idx);
-  _collector_free_bitmap.set_bit(idx);
-  _collector_leftmost = MIN2(idx, _collector_leftmost);
-  _collector_rightmost = MAX2(idx, _collector_rightmost);
+  size_t ac = alloc_capacity(r);
+  _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Mutator,
+                                               ShenandoahFreeSetPartitionId::Collector, ac);
+  _partitions.assert_bounds();
 
-  _capacity -= alloc_capacity(r);
-
-  if (touches_bounds(idx)) {
-    adjust_bounds();
-  }
-  assert_bounds();
+  // We do not ensure that the region is no longer trash, relying on try_allocate_in(), which always comes next,
+  // to recycle trash before attempting to allocate anything in the region.
 }
 
 void ShenandoahFreeSet::clear() {
@@ -392,67 +941,259 @@ void ShenandoahFreeSet::clear() {
 }
 
 void ShenandoahFreeSet::clear_internal() {
-  _mutator_free_bitmap.clear();
-  _collector_free_bitmap.clear();
-  _mutator_leftmost = _max;
-  _mutator_rightmost = 0;
-  _collector_leftmost = _max;
-  _collector_rightmost = 0;
-  _capacity = 0;
-  _used = 0;
+  _partitions.make_all_regions_unavailable();
 }
 
-void ShenandoahFreeSet::rebuild() {
-  shenandoah_assert_heaplocked();
-  clear();
+void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &cset_regions) {
+
+  cset_regions = 0;
+  clear_internal();
+  size_t region_size_bytes = _partitions.region_size_bytes();
+  size_t max_regions = _partitions.max_regions();
+
+  size_t mutator_leftmost = max_regions;
+  size_t mutator_rightmost = 0;
+  size_t mutator_leftmost_empty = max_regions;
+  size_t mutator_rightmost_empty = 0;
+
+  size_t mutator_regions = 0;
+  size_t mutator_used = 0;
 
   for (size_t idx = 0; idx < _heap->num_regions(); idx++) {
     ShenandoahHeapRegion* region = _heap->get_region(idx);
+    if (region->is_trash()) {
+      // Trashed regions represent regions that had been in the collection partition but have not yet been "cleaned up".
+      // The cset regions are not "trashed" until we have finished update refs.
+      cset_regions++;
+    }
     if (region->is_alloc_allowed() || region->is_trash()) {
-      assert(!region->is_cset(), "Shouldn't be adding those to the free set");
 
-      // Do not add regions that would surely fail allocation
-      if (has_no_alloc_capacity(region)) continue;
-
-      _capacity += alloc_capacity(region);
-      assert(_used <= _capacity, "must not use more than we have");
-
-      assert(!is_mutator_free(idx), "We are about to add it, it shouldn't be there already");
-      _mutator_free_bitmap.set_bit(idx);
-    }
-  }
-
-  // Evac reserve: reserve trailing space for evacuations
-  size_t to_reserve = _heap->max_capacity() / 100 * ShenandoahEvacReserve;
-  size_t reserved = 0;
-
-  for (size_t idx = _heap->num_regions() - 1; idx > 0; idx--) {
-    if (reserved >= to_reserve) break;
-
-    ShenandoahHeapRegion* region = _heap->get_region(idx);
-    if (_mutator_free_bitmap.at(idx) && can_allocate_from(region)) {
-      _mutator_free_bitmap.clear_bit(idx);
-      _collector_free_bitmap.set_bit(idx);
+      // Do not add regions that would almost surely fail allocation
       size_t ac = alloc_capacity(region);
-      _capacity -= ac;
-      reserved += ac;
+      if (ac > PLAB::min_size() * HeapWordSize) {
+        _partitions.raw_assign_membership(idx, ShenandoahFreeSetPartitionId::Mutator);
+
+        if (idx < mutator_leftmost) {
+          mutator_leftmost = idx;
+        }
+        if (idx > mutator_rightmost) {
+          mutator_rightmost = idx;
+        }
+        if (ac == region_size_bytes) {
+          if (idx < mutator_leftmost_empty) {
+            mutator_leftmost_empty = idx;
+          }
+          if (idx > mutator_rightmost_empty) {
+            mutator_rightmost_empty = idx;
+          }
+        }
+        mutator_regions++;
+        mutator_used += (region_size_bytes - ac);
+
+        log_debug(gc)(
+          "  Adding Region " SIZE_FORMAT " (Free: " SIZE_FORMAT "%s, Used: " SIZE_FORMAT "%s) to mutator partition",
+          idx, byte_size_in_proper_unit(region->free()), proper_unit_for_byte_size(region->free()),
+          byte_size_in_proper_unit(region->used()), proper_unit_for_byte_size(region->used()));
+      }
+    }
+  }
+  _partitions.establish_mutator_intervals(mutator_leftmost, mutator_rightmost, mutator_leftmost_empty, mutator_rightmost_empty,
+                                          mutator_regions, mutator_used);
+}
+
+void ShenandoahFreeSet::move_regions_from_collector_to_mutator(size_t max_xfer_regions) {
+  size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+  size_t collector_empty_xfer = 0;
+  size_t collector_not_empty_xfer = 0;
+
+  // Process empty regions within the Collector free partition
+  if ((max_xfer_regions > 0) &&
+      (_partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Collector)
+       <= _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Collector))) {
+    ShenandoahHeapLocker locker(_heap->lock());
+    idx_t rightmost = _partitions.rightmost_empty(ShenandoahFreeSetPartitionId::Collector);
+    for (idx_t idx = _partitions.leftmost_empty(ShenandoahFreeSetPartitionId::Collector);
+         (max_xfer_regions > 0) && (idx <= rightmost); ) {
+      assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, idx),
+             "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, idx);
+      // Note: can_allocate_from() denotes that region is entirely empty
+      if (can_allocate_from(idx)) {
+        _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Collector,
+                                                     ShenandoahFreeSetPartitionId::Mutator, region_size_bytes);
+        max_xfer_regions--;
+        collector_empty_xfer += region_size_bytes;
+      }
+      idx = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Collector, idx + 1);
     }
   }
 
-  recompute_bounds();
-  assert_bounds();
+  // If there are any non-empty regions within Collector partition, we can also move them to the Mutator free partition
+  if ((max_xfer_regions > 0) && (_partitions.leftmost(ShenandoahFreeSetPartitionId::Collector)
+                                 <= _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector))) {
+    ShenandoahHeapLocker locker(_heap->lock());
+    idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector);
+    for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector);
+         (max_xfer_regions > 0) && (idx <= rightmost); ) {
+      assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, idx),
+             "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, idx);
+      size_t ac = alloc_capacity(idx);
+      if (ac > 0) {
+        _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Collector,
+                                                     ShenandoahFreeSetPartitionId::Mutator, ac);
+        max_xfer_regions--;
+        collector_not_empty_xfer += ac;
+      }
+      idx = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Collector, idx + 1);
+    }
+  }
+
+  size_t collector_xfer = collector_empty_xfer + collector_not_empty_xfer;
+  log_info(gc)("At start of update refs, moving " SIZE_FORMAT "%s to Mutator free partition from Collector Reserve",
+               byte_size_in_proper_unit(collector_xfer), proper_unit_for_byte_size(collector_xfer));
+}
+
+void ShenandoahFreeSet::prepare_to_rebuild(size_t &cset_regions) {
+  shenandoah_assert_heaplocked();
+
+  log_debug(gc)("Rebuilding FreeSet");
+
+  // This places regions that have alloc_capacity into the mutator partition.
+  find_regions_with_alloc_capacity(cset_regions);
+}
+
+void ShenandoahFreeSet::finish_rebuild(size_t cset_regions) {
+  shenandoah_assert_heaplocked();
+
+  // Our desire is to reserve this much memory for future evacuation.  We may end up reserving less, if
+  // memory is in short supply.
+
+  size_t reserve = _heap->max_capacity() * ShenandoahEvacReserve / 100;
+  size_t available_in_collector_partition = (_partitions.capacity_of(ShenandoahFreeSetPartitionId::Collector)
+                                             - _partitions.used_by(ShenandoahFreeSetPartitionId::Collector));
+  size_t additional_reserve;
+  if (available_in_collector_partition < reserve) {
+    additional_reserve = reserve - available_in_collector_partition;
+  } else {
+    additional_reserve = 0;
+  }
+
+  reserve_regions(reserve);
+  _partitions.assert_bounds();
+  log_status();
+}
+
+void ShenandoahFreeSet::rebuild() {
+  size_t cset_regions;
+  prepare_to_rebuild(cset_regions);
+  finish_rebuild(cset_regions);
+}
+
+void ShenandoahFreeSet::reserve_regions(size_t to_reserve) {
+  for (size_t i = _heap->num_regions(); i > 0; i--) {
+    size_t idx = i - 1;
+    ShenandoahHeapRegion* r = _heap->get_region(idx);
+
+    if (!_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx)) {
+      continue;
+    }
+
+    size_t ac = alloc_capacity(r);
+    assert (ac > 0, "Membership in free partition implies has capacity");
+
+    bool move_to_collector = _partitions.available_in(ShenandoahFreeSetPartitionId::Collector) < to_reserve;
+    if (!move_to_collector) {
+      // We've satisfied to_reserve
+      break;
+    }
+
+    if (move_to_collector) {
+      // Note: In a previous implementation, regions were only placed into the survivor space (collector_is_free) if
+      // they were entirely empty.  This has the effect of causing new Mutator allocation to reside next to objects
+      // that have already survived at least one GC, mixing ephemeral with longer-lived objects in the same region.
+      // Any objects that have survived a GC are less likely to immediately become garbage, so a region that contains
+      // survivor objects is less likely to be selected for the collection set.  This alternative implementation allows
+      // survivor regions to continue accumulating other survivor objects, and makes it more likely that ephemeral objects
+      // occupy regions comprised entirely of ephemeral objects.  These regions are highly likely to be included in the next
+      // collection set, and they are easily evacuated because they have low density of live objects.
+      _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Mutator,
+                                                   ShenandoahFreeSetPartitionId::Collector, ac);
+      log_debug(gc)("  Shifting region " SIZE_FORMAT " from mutator_free to collector_free", idx);
+    }
+  }
+
+  if (LogTarget(Info, gc, free)::is_enabled()) {
+    size_t reserve = _partitions.capacity_of(ShenandoahFreeSetPartitionId::Collector);
+    if (reserve < to_reserve) {
+      log_debug(gc)("Wanted " PROPERFMT " for young reserve, but only reserved: " PROPERFMT,
+                    PROPERFMTARGS(to_reserve), PROPERFMTARGS(reserve));
+    }
+  }
 }
 
 void ShenandoahFreeSet::log_status() {
   shenandoah_assert_heaplocked();
 
-  LogTarget(Info, gc, ergo) lt;
+#ifdef ASSERT
+  // Dump of the FreeSet details is only enabled if assertions are enabled
+  if (LogTarget(Debug, gc, free)::is_enabled()) {
+#define BUFFER_SIZE 80
+    size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+    size_t consumed_collector = 0;
+    size_t available_collector = 0;
+    size_t consumed_mutator = 0;
+    size_t available_mutator = 0;
+
+    char buffer[BUFFER_SIZE];
+    for (uint i = 0; i < BUFFER_SIZE; i++) {
+      buffer[i] = '\0';
+    }
+    log_debug(gc)("FreeSet map legend: M:mutator_free C:collector_free H:humongous _:retired");
+    log_debug(gc)(" mutator free range [" SIZE_FORMAT ".." SIZE_FORMAT "],"
+                  " collector free range [" SIZE_FORMAT ".." SIZE_FORMAT "]",
+                  _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator),
+                  _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator),
+                  _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector),
+                  _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector));
+
+    for (uint i = 0; i < _heap->num_regions(); i++) {
+      ShenandoahHeapRegion *r = _heap->get_region(i);
+      uint idx = i % 64;
+      if ((i != 0) && (idx == 0)) {
+        log_debug(gc)(" %6u: %s", i-64, buffer);
+      }
+      if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, i)) {
+        size_t capacity = alloc_capacity(r);
+        available_mutator += capacity;
+        consumed_mutator += region_size_bytes - capacity;
+        buffer[idx] = (capacity == region_size_bytes)? 'M': 'm';
+      } else if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, i)) {
+        size_t capacity = alloc_capacity(r);
+        available_collector += capacity;
+        consumed_collector += region_size_bytes - capacity;
+        buffer[idx] = (capacity == region_size_bytes)? 'C': 'c';
+      } else if (r->is_humongous()) {
+        buffer[idx] = 'h';
+      } else {
+        buffer[idx] = '_';
+      }
+    }
+    uint remnant = _heap->num_regions() % 64;
+    if (remnant > 0) {
+      buffer[remnant] = '\0';
+    } else {
+      remnant = 64;
+    }
+    log_debug(gc)(" %6u: %s", (uint) (_heap->num_regions() - remnant), buffer);
+  }
+#endif
+
+  LogTarget(Info, gc, free) lt;
   if (lt.is_enabled()) {
     ResourceMark rm;
     LogStream ls(lt);
 
     {
-      size_t last_idx = 0;
+      idx_t last_idx = 0;
       size_t max = 0;
       size_t max_contig = 0;
       size_t empty_contig = 0;
@@ -461,13 +1202,12 @@ void ShenandoahFreeSet::log_status() {
       size_t total_free = 0;
       size_t total_free_ext = 0;
 
-      for (size_t idx = _mutator_leftmost; idx <= _mutator_rightmost; idx++) {
-        if (is_mutator_free(idx)) {
+      for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator);
+           idx <= _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator); idx++) {
+        if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, idx)) {
           ShenandoahHeapRegion *r = _heap->get_region(idx);
           size_t free = alloc_capacity(r);
-
           max = MAX2(max, free);
-
           if (r->is_empty()) {
             total_free_ext += free;
             if (last_idx + 1 == idx) {
@@ -478,10 +1218,8 @@ void ShenandoahFreeSet::log_status() {
           } else {
             empty_contig = 0;
           }
-
           total_used += r->used();
           total_free += free;
-
           max_contig = MAX2(max_contig, empty_contig);
           last_idx = idx;
         }
@@ -490,8 +1228,13 @@ void ShenandoahFreeSet::log_status() {
       size_t max_humongous = max_contig * ShenandoahHeapRegion::region_size_bytes();
       size_t free = capacity() - used();
 
+      // Since certain regions that belonged to the Mutator free partition at the time of most recent rebuild may have been
+      // retired, the sum of used and capacities within regions that are still in the Mutator free partition may not match
+      // my internally tracked values of used() and free().
+      assert(free == total_free, "Free memory should match");
+
       ls.print("Free: " SIZE_FORMAT "%s, Max: " SIZE_FORMAT "%s regular, " SIZE_FORMAT "%s humongous, ",
-               byte_size_in_proper_unit(total_free),    proper_unit_for_byte_size(total_free),
+               byte_size_in_proper_unit(free),          proper_unit_for_byte_size(free),
                byte_size_in_proper_unit(max),           proper_unit_for_byte_size(max),
                byte_size_in_proper_unit(max_humongous), proper_unit_for_byte_size(max_humongous)
       );
@@ -506,38 +1249,43 @@ void ShenandoahFreeSet::log_status() {
       ls.print(SIZE_FORMAT "%% external, ", frag_ext);
 
       size_t frag_int;
-      if (mutator_count() > 0) {
-        frag_int = (100 * (total_used / mutator_count()) / ShenandoahHeapRegion::region_size_bytes());
+      if (_partitions.count(ShenandoahFreeSetPartitionId::Mutator) > 0) {
+        frag_int = (100 * (total_used / _partitions.count(ShenandoahFreeSetPartitionId::Mutator))
+                    / ShenandoahHeapRegion::region_size_bytes());
       } else {
         frag_int = 0;
       }
       ls.print(SIZE_FORMAT "%% internal; ", frag_int);
+      ls.print("Used: " SIZE_FORMAT "%s, Mutator Free: " SIZE_FORMAT,
+               byte_size_in_proper_unit(total_used), proper_unit_for_byte_size(total_used),
+               _partitions.count(ShenandoahFreeSetPartitionId::Mutator));
     }
 
     {
       size_t max = 0;
       size_t total_free = 0;
+      size_t total_used = 0;
 
-      for (size_t idx = _collector_leftmost; idx <= _collector_rightmost; idx++) {
-        if (is_collector_free(idx)) {
+      for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector);
+           idx <= _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector); idx++) {
+        if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, idx)) {
           ShenandoahHeapRegion *r = _heap->get_region(idx);
           size_t free = alloc_capacity(r);
           max = MAX2(max, free);
           total_free += free;
+          total_used += r->used();
         }
       }
-
-      ls.print_cr("Reserve: " SIZE_FORMAT "%s, Max: " SIZE_FORMAT "%s",
-                  byte_size_in_proper_unit(total_free), proper_unit_for_byte_size(total_free),
-                  byte_size_in_proper_unit(max),        proper_unit_for_byte_size(max));
+      ls.print(" Collector Reserve: " SIZE_FORMAT "%s, Max: " SIZE_FORMAT "%s; Used: " SIZE_FORMAT "%s",
+               byte_size_in_proper_unit(total_free), proper_unit_for_byte_size(total_free),
+               byte_size_in_proper_unit(max),        proper_unit_for_byte_size(max),
+               byte_size_in_proper_unit(total_used), proper_unit_for_byte_size(total_used));
     }
   }
 }
 
 HeapWord* ShenandoahFreeSet::allocate(ShenandoahAllocRequest& req, bool& in_new_region) {
   shenandoah_assert_heaplocked();
-  assert_bounds();
-
   if (req.size() > ShenandoahHeapRegion::humongous_threshold_words()) {
     switch (req.type()) {
       case ShenandoahAllocRequest::_alloc_shared:
@@ -559,71 +1307,40 @@ HeapWord* ShenandoahFreeSet::allocate(ShenandoahAllocRequest& req, bool& in_new_
   }
 }
 
-size_t ShenandoahFreeSet::unsafe_peek_free() const {
-  // Deliberately not locked, this method is unsafe when free set is modified.
-
-  for (size_t index = _mutator_leftmost; index <= _mutator_rightmost; index++) {
-    if (index < _max && is_mutator_free(index)) {
-      ShenandoahHeapRegion* r = _heap->get_region(index);
-      if (r->free() >= MinTLABSize) {
-        return r->free();
-      }
-    }
-  }
-
-  // It appears that no regions left
-  return 0;
-}
-
 void ShenandoahFreeSet::print_on(outputStream* out) const {
-  out->print_cr("Mutator Free Set: " SIZE_FORMAT "", mutator_count());
-  for (size_t index = _mutator_leftmost; index <= _mutator_rightmost; index++) {
-    if (is_mutator_free(index)) {
-      _heap->get_region(index)->print_on(out);
-    }
+  out->print_cr("Mutator Free Set: " SIZE_FORMAT "", _partitions.count(ShenandoahFreeSetPartitionId::Mutator));
+  idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator);
+  for (idx_t index = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator); index <= rightmost; ) {
+    assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, index),
+           "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, index);
+    _heap->get_region(index)->print_on(out);
+    index = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Mutator, index + 1);
   }
-  out->print_cr("Collector Free Set: " SIZE_FORMAT "", collector_count());
-  for (size_t index = _collector_leftmost; index <= _collector_rightmost; index++) {
-    if (is_collector_free(index)) {
-      _heap->get_region(index)->print_on(out);
-    }
+  out->print_cr("Collector Free Set: " SIZE_FORMAT "", _partitions.count(ShenandoahFreeSetPartitionId::Collector));
+  rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector);
+  for (idx_t index = _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector); index <= rightmost; ) {
+    assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, index),
+           "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, index);
+    _heap->get_region(index)->print_on(out);
+    index = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Collector, index + 1);
   }
 }
 
-/*
- * Internal fragmentation metric: describes how fragmented the heap regions are.
- *
- * It is derived as:
- *
- *               sum(used[i]^2, i=0..k)
- *   IF = 1 - ------------------------------
- *              C * sum(used[i], i=0..k)
- *
- * ...where k is the number of regions in computation, C is the region capacity, and
- * used[i] is the used space in the region.
- *
- * The non-linearity causes IF to be lower for the cases where the same total heap
- * used is densely packed. For example:
- *   a) Heap is completely full  => IF = 0
- *   b) Heap is half full, first 50% regions are completely full => IF = 0
- *   c) Heap is half full, each region is 50% full => IF = 1/2
- *   d) Heap is quarter full, first 50% regions are completely full => IF = 0
- *   e) Heap is quarter full, each region is 25% full => IF = 3/4
- *   f) Heap has one small object per each region => IF =~ 1
- */
 double ShenandoahFreeSet::internal_fragmentation() {
   double squared = 0;
   double linear = 0;
   int count = 0;
 
-  for (size_t index = _mutator_leftmost; index <= _mutator_rightmost; index++) {
-    if (is_mutator_free(index)) {
-      ShenandoahHeapRegion* r = _heap->get_region(index);
-      size_t used = r->used();
-      squared += used * used;
-      linear += used;
-      count++;
-    }
+  idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator);
+  for (idx_t index = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator); index <= rightmost; ) {
+    assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, index),
+           "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, index);
+    ShenandoahHeapRegion* r = _heap->get_region(index);
+    size_t used = r->used();
+    squared += used * used;
+    linear += used;
+    count++;
+    index = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Mutator, index + 1);
   }
 
   if (count > 0) {
@@ -634,43 +1351,31 @@ double ShenandoahFreeSet::internal_fragmentation() {
   }
 }
 
-/*
- * External fragmentation metric: describes how fragmented the heap is.
- *
- * It is derived as:
- *
- *   EF = 1 - largest_contiguous_free / total_free
- *
- * For example:
- *   a) Heap is completely empty => EF = 0
- *   b) Heap is completely full => EF = 0
- *   c) Heap is first-half full => EF = 1/2
- *   d) Heap is half full, full and empty regions interleave => EF =~ 1
- */
 double ShenandoahFreeSet::external_fragmentation() {
-  size_t last_idx = 0;
+  idx_t last_idx = 0;
   size_t max_contig = 0;
   size_t empty_contig = 0;
 
   size_t free = 0;
 
-  for (size_t index = _mutator_leftmost; index <= _mutator_rightmost; index++) {
-    if (is_mutator_free(index)) {
-      ShenandoahHeapRegion* r = _heap->get_region(index);
-      if (r->is_empty()) {
-        free += ShenandoahHeapRegion::region_size_bytes();
-        if (last_idx + 1 == index) {
-          empty_contig++;
-        } else {
-          empty_contig = 1;
-        }
+  idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator);
+  for (idx_t index = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator); index <= rightmost; ) {
+    assert(_partitions.in_free_set(ShenandoahFreeSetPartitionId::Mutator, index),
+           "Boundaries or find_first_set_bit failed: " SSIZE_FORMAT, index);
+    ShenandoahHeapRegion* r = _heap->get_region(index);
+    if (r->is_empty()) {
+      free += ShenandoahHeapRegion::region_size_bytes();
+      if (last_idx + 1 == index) {
+        empty_contig++;
       } else {
-        empty_contig = 0;
+        empty_contig = 1;
       }
-
-      max_contig = MAX2(max_contig, empty_contig);
-      last_idx = index;
+    } else {
+      empty_contig = 0;
     }
+    max_contig = MAX2(max_contig, empty_contig);
+    last_idx = index;
+    index = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Mutator, index + 1);
   }
 
   if (free > 0) {
@@ -680,30 +1385,3 @@ double ShenandoahFreeSet::external_fragmentation() {
   }
 }
 
-#ifdef ASSERT
-void ShenandoahFreeSet::assert_bounds() const {
-  // Performance invariants. Failing these would not break the free set, but performance
-  // would suffer.
-  assert (_mutator_leftmost <= _max, "leftmost in bounds: "  SIZE_FORMAT " < " SIZE_FORMAT, _mutator_leftmost,  _max);
-  assert (_mutator_rightmost < _max, "rightmost in bounds: " SIZE_FORMAT " < " SIZE_FORMAT, _mutator_rightmost, _max);
-
-  assert (_mutator_leftmost == _max || is_mutator_free(_mutator_leftmost),  "leftmost region should be free: " SIZE_FORMAT,  _mutator_leftmost);
-  assert (_mutator_rightmost == 0   || is_mutator_free(_mutator_rightmost), "rightmost region should be free: " SIZE_FORMAT, _mutator_rightmost);
-
-  size_t beg_off = _mutator_free_bitmap.find_first_set_bit(0);
-  size_t end_off = _mutator_free_bitmap.find_first_set_bit(_mutator_rightmost + 1);
-  assert (beg_off >= _mutator_leftmost, "free regions before the leftmost: " SIZE_FORMAT ", bound " SIZE_FORMAT, beg_off, _mutator_leftmost);
-  assert (end_off == _max,      "free regions past the rightmost: " SIZE_FORMAT ", bound " SIZE_FORMAT,  end_off, _mutator_rightmost);
-
-  assert (_collector_leftmost <= _max, "leftmost in bounds: "  SIZE_FORMAT " < " SIZE_FORMAT, _collector_leftmost,  _max);
-  assert (_collector_rightmost < _max, "rightmost in bounds: " SIZE_FORMAT " < " SIZE_FORMAT, _collector_rightmost, _max);
-
-  assert (_collector_leftmost == _max || is_collector_free(_collector_leftmost),  "leftmost region should be free: " SIZE_FORMAT,  _collector_leftmost);
-  assert (_collector_rightmost == 0   || is_collector_free(_collector_rightmost), "rightmost region should be free: " SIZE_FORMAT, _collector_rightmost);
-
-  beg_off = _collector_free_bitmap.find_first_set_bit(0);
-  end_off = _collector_free_bitmap.find_first_set_bit(_collector_rightmost + 1);
-  assert (beg_off >= _collector_leftmost, "free regions before the leftmost: " SIZE_FORMAT ", bound " SIZE_FORMAT, beg_off, _collector_leftmost);
-  assert (end_off == _max,      "free regions past the rightmost: " SIZE_FORMAT ", bound " SIZE_FORMAT,  end_off, _collector_rightmost);
-}
-#endif
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 634adfb63e0..e2852e5548c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016, 2019, Red Hat, Inc. All rights reserved.
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,70 +28,366 @@
 
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+
+// Each ShenandoahHeapRegion is associated with a ShenandoahFreeSetPartitionId.
+enum class ShenandoahFreeSetPartitionId : uint8_t {
+  Mutator,                      // Region is in the Mutator free set: available memory is available to mutators.
+  Collector,                    // Region is in the Collector free set: available memory is reserved for evacuations.
+  NotFree                       // Region is in no free set: it has no available memory
+};
+
+// We do not maintain counts, capacity, or used for regions that are not free.  Informally, if a region is NotFree, it is
+// in no partition.  NumPartitions represents the size of an array that may be indexed by Mutator or Collector.
+#define NumPartitions           (ShenandoahFreeSetPartitionId::NotFree)
+#define IntNumPartitions     int(ShenandoahFreeSetPartitionId::NotFree)
+#define UIntNumPartitions   uint(ShenandoahFreeSetPartitionId::NotFree)
+
+// ShenandoahRegionPartitions provides an abstraction to help organize the implementation of ShenandoahFreeSet.  This
+// class implements partitioning of regions into distinct sets.  Each ShenandoahHeapRegion is either in the Mutator free set,
+// the Collector free set, or in neither free set (NotFree).  When we speak of a "free partition", we mean partitions that
+// for which the ShenandoahFreeSetPartitionId is not equal to NotFree.
+class ShenandoahRegionPartitions {
+
+private:
+  const ssize_t _max;           // The maximum number of heap regions
+  const size_t _region_size_bytes;
+  const ShenandoahFreeSet* _free_set;
+  // For each partition, we maintain a bitmap of which regions are affiliated with his partition.
+  ShenandoahSimpleBitMap _membership[UIntNumPartitions];
+
+  // For each partition, we track an interval outside of which a region affiliated with that partition is guaranteed
+  // not to be found. This makes searches for free space more efficient.  For each partition p, _leftmosts[p]
+  // represents its least index, and its _rightmosts[p] its greatest index. Empty intervals are indicated by the
+  // canonical [_max, -1].
+  ssize_t _leftmosts[UIntNumPartitions];
+  ssize_t _rightmosts[UIntNumPartitions];
+
+  // Allocation for humongous objects needs to find regions that are entirely empty.  For each partion p, _leftmosts_empty[p]
+  // represents the first region belonging to this partition that is completely empty and _rightmosts_empty[p] represents the
+  // last region that is completely empty.  If there is no completely empty region in this partition, this is represented
+  // by the canonical [_max, -1].
+  ssize_t _leftmosts_empty[UIntNumPartitions];
+  ssize_t _rightmosts_empty[UIntNumPartitions];
+
+  // For each partition p, _capacity[p] represents the total amount of memory within the partition at the time
+  // of the most recent rebuild, _used[p] represents the total amount of memory that has been allocated within this
+  // partition (either already allocated as of the rebuild, or allocated since the rebuild).  _capacity[p] and _used[p]
+  // are denoted in bytes.  Note that some regions that had been assigned to a particular partition at rebuild time
+  // may have been retired following the rebuild.  The tallies for these regions are still reflected in _capacity[p]
+  // and _used[p], even though the region may have been removed from the free set.
+  size_t _capacity[UIntNumPartitions];
+  size_t _used[UIntNumPartitions];
+  size_t _region_counts[UIntNumPartitions];
+
+  // Shrink the intervals associated with partition when region idx is removed from this free set
+  inline void shrink_interval_if_boundary_modified(ShenandoahFreeSetPartitionId partition, ssize_t idx);
+
+  // Shrink the intervals associated with partition when regions low_idx through high_idx inclusive are removed from this free set
+  inline void shrink_interval_if_range_modifies_either_boundary(ShenandoahFreeSetPartitionId partition,
+                                                                ssize_t low_idx, ssize_t high_idx);
+  inline void expand_interval_if_boundary_modified(ShenandoahFreeSetPartitionId partition, ssize_t idx, size_t capacity);
+
+#ifndef PRODUCT
+  void dump_bitmap_row(ssize_t region_idx) const;
+  void dump_bitmap_range(ssize_t start_region_idx, ssize_t end_region_idx) const;
+  void dump_bitmap() const;
+#endif
+public:
+  ShenandoahRegionPartitions(size_t max_regions, ShenandoahFreeSet* free_set);
+  ~ShenandoahRegionPartitions() {}
+
+  // Remove all regions from all partitions and reset all bounds
+  void make_all_regions_unavailable();
+
+  // Set the partition id for a particular region without adjusting interval bounds or usage/capacity tallies
+  inline void raw_assign_membership(size_t idx, ShenandoahFreeSetPartitionId p) {
+    _membership[int(p)].set_bit(idx);
+  }
+
+  // Set the Mutator intervals, usage, and capacity according to arguments.  Reset the Collector intervals, used, capacity
+  // to represent empty Collector free set.  We use this at the end of rebuild_free_set() to avoid the overhead of making
+  // many redundant incremental adjustments to the mutator intervals as the free set is being rebuilt.
+  void establish_mutator_intervals(ssize_t mutator_leftmost, ssize_t mutator_rightmost,
+                                   ssize_t mutator_leftmost_empty, ssize_t mutator_rightmost_empty,
+                                   size_t mutator_region_count, size_t mutator_used);
+
+  // Retire region idx from within partition, , leaving its capacity and used as part of the original free partition's totals.
+  // Requires that region idx is in in the Mutator or Collector partitions.  Hereafter, identifies this region as NotFree.
+  // Any remnant of available memory at the time of retirement is added to the original partition's total of used bytes.
+  void retire_from_partition(ShenandoahFreeSetPartitionId p, ssize_t idx, size_t used_bytes);
+
+  // Retire all regions between low_idx and high_idx inclusive from within partition.  Requires that each region idx is
+  // in the same Mutator or Collector partition.  Hereafter, identifies each region as NotFree.   Assumes that each region
+  // is now considered fully used, since the region is presumably used to represent a humongous object.
+  void retire_range_from_partition(ShenandoahFreeSetPartitionId partition, ssize_t low_idx, ssize_t high_idx);
+
+  // Place region idx into free set which_partition.  Requires that idx is currently NotFree.
+  void make_free(ssize_t idx, ShenandoahFreeSetPartitionId which_partition, size_t region_capacity);
+
+  // Place region idx into free partition new_partition, adjusting used and capacity totals for the original and new partition
+  // given that available bytes can still be allocated within this region.  Requires that idx is currently not NotFree.
+  void move_from_partition_to_partition(ssize_t idx, ShenandoahFreeSetPartitionId orig_partition,
+                                        ShenandoahFreeSetPartitionId new_partition, size_t available);
+
+  const char* partition_membership_name(ssize_t idx) const;
+
+  // Return the index of the next available region >= start_index, or maximum_regions if not found.
+  inline ssize_t find_index_of_next_available_region(ShenandoahFreeSetPartitionId which_partition, ssize_t start_index) const;
+
+  // Return the index of the previous available region <= last_index, or -1 if not found.
+  inline ssize_t find_index_of_previous_available_region(ShenandoahFreeSetPartitionId which_partition, ssize_t last_index) const;
+
+  // Return the index of the next available cluster of cluster_size regions >= start_index, or maximum_regions if not found.
+  inline ssize_t find_index_of_next_available_cluster_of_regions(ShenandoahFreeSetPartitionId which_partition,
+                                                                 ssize_t start_index, size_t cluster_size) const;
+
+  // Return the index of the previous available cluster of cluster_size regions <= last_index, or -1 if not found.
+  inline ssize_t find_index_of_previous_available_cluster_of_regions(ShenandoahFreeSetPartitionId which_partition,
+                                                                     ssize_t last_index, size_t cluster_size) const;
+
+  inline bool in_free_set(ShenandoahFreeSetPartitionId which_partition, ssize_t idx) const {
+    return _membership[int(which_partition)].is_set(idx);
+  }
+
+  // Returns the ShenandoahFreeSetPartitionId affiliation of region idx, NotFree if this region is not currently in any partition.
+  // This does not enforce that free_set membership implies allocation capacity.
+  inline ShenandoahFreeSetPartitionId membership(ssize_t idx) const;
+
+#ifdef ASSERT
+  // Returns true iff region idx's membership is which_partition.  If which_partition represents a free set, asserts
+  // that the region has allocation capacity.
+  inline bool partition_id_matches(ssize_t idx, ShenandoahFreeSetPartitionId which_partition) const;
+#endif
+
+  inline size_t max_regions() const { return _max; }
+
+  inline size_t region_size_bytes() const { return _region_size_bytes; };
+
+  // The following four methods return the left-most and right-most bounds on ranges of regions representing
+  // the requested set.  The _empty variants represent bounds on the range that holds completely empty
+  // regions, which are required for humongous allocations and desired for "very large" allocations.
+  //   if the requested which_partition is empty:
+  //     leftmost() and leftmost_empty() return _max, rightmost() and rightmost_empty() return 0
+  //   otherwise, expect the following:
+  //     0 <= leftmost <= leftmost_empty <= rightmost_empty <= rightmost < _max
+  inline ssize_t leftmost(ShenandoahFreeSetPartitionId which_partition) const;
+  inline ssize_t rightmost(ShenandoahFreeSetPartitionId which_partition) const;
+  ssize_t leftmost_empty(ShenandoahFreeSetPartitionId which_partition);
+  ssize_t rightmost_empty(ShenandoahFreeSetPartitionId which_partition);
+
+  inline bool is_empty(ShenandoahFreeSetPartitionId which_partition) const;
+
+  inline void increase_used(ShenandoahFreeSetPartitionId which_partition, size_t bytes);
+
+  inline size_t capacity_of(ShenandoahFreeSetPartitionId which_partition) const {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    return _capacity[int(which_partition)];
+  }
+
+  inline size_t used_by(ShenandoahFreeSetPartitionId which_partition) const {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    return _used[int(which_partition)];
+  }
+
+  inline size_t available_in(ShenandoahFreeSetPartitionId which_partition) const {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    return _capacity[int(which_partition)] - _used[int(which_partition)];
+  }
+
+  inline void set_capacity_of(ShenandoahFreeSetPartitionId which_partition, size_t value) {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    _capacity[int(which_partition)] = value;
+  }
+
+  inline void set_used_by(ShenandoahFreeSetPartitionId which_partition, size_t value) {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    _used[int(which_partition)] = value;
+  }
+
+  inline size_t count(ShenandoahFreeSetPartitionId which_partition) const { return _region_counts[int(which_partition)]; }
+
+  // Assure leftmost, rightmost, leftmost_empty, and rightmost_empty bounds are valid for all free sets.
+  // Valid bounds honor all of the following (where max is the number of heap regions):
+  //   if the set is empty, leftmost equals max and rightmost equals 0
+  //   Otherwise (the set is not empty):
+  //     0 <= leftmost < max and 0 <= rightmost < max
+  //     the region at leftmost is in the set
+  //     the region at rightmost is in the set
+  //     rightmost >= leftmost
+  //     for every idx that is in the set {
+  //       idx >= leftmost &&
+  //       idx <= rightmost
+  //     }
+  //   if the set has no empty regions, leftmost_empty equals max and rightmost_empty equals 0
+  //   Otherwise (the region has empty regions):
+  //     0 <= leftmost_empty < max and 0 <= rightmost_empty < max
+  //     rightmost_empty >= leftmost_empty
+  //     for every idx that is in the set and is empty {
+  //       idx >= leftmost &&
+  //       idx <= rightmost
+  //     }
+  void assert_bounds() NOT_DEBUG_RETURN;
+};
+
+// Publicly, ShenandoahFreeSet represents memory that is available to mutator threads.  The public capacity(), used(),
+// and available() methods represent this public notion of memory that is under control of the mutator.  Separately,
+// ShenandoahFreeSet also represents memory available to garbage collection activities for compaction purposes.
+//
+// The Shenandoah garbage collector evacuates live objects out of specific regions that are identified as members of the
+// collection set (cset).
+//
+// The ShenandoahFreeSet endeavors to congregrate survivor objects (objects that have been evacuated at least once) at the
+// high end of memory.  New mutator allocations are taken from the low end of memory.  Within the mutator's range of regions,
+// humongous allocations are taken from the lowest addresses, and LAB (local allocation buffers) and regular shared allocations
+// are taken from the higher address of the mutator's range of regions.  This approach allows longer lasting survivor regions
+// to congregate at the top of the heap and longer lasting humongous regions to congregate at the bottom of the heap, with
+// short-lived frequently evacuated regions occupying the middle of the heap.
+//
+// Mutator and garbage collection activities tend to scramble the content of regions.  Twice, during each GC pass, we rebuild
+// the free set in an effort to restore the efficient segregation of Collector and Mutator regions:
+//
+//  1. At the start of evacuation, we know exactly how much memory is going to be evacuated, and this guides our
+//     sizing of the Collector free set.
+//
+//  2. At the end of GC, we have reclaimed all of the memory that was spanned by the cset.  We rebuild here to make
+//     sure there is enough memory reserved at the high end of memory to hold the objects that might need to be evacuated
+//     during the next GC pass.
 
 class ShenandoahFreeSet : public CHeapObj<mtGC> {
 private:
   ShenandoahHeap* const _heap;
-  CHeapBitMap _mutator_free_bitmap;
-  CHeapBitMap _collector_free_bitmap;
-  size_t _max;
+  ShenandoahRegionPartitions _partitions;
 
-  // Left-most and right-most region indexes. There are no free regions outside
-  // of [left-most; right-most] index intervals
-  size_t _mutator_leftmost, _mutator_rightmost;
-  size_t _collector_leftmost, _collector_rightmost;
+  // Mutator allocations are biased from left-to-right or from right-to-left based on which end of mutator range
+  // is most likely to hold partially used regions.  In general, we want to finish consuming partially used
+  // regions and retire them in order to reduce the regions that must be searched for each allocation request.
+  bool _right_to_left_bias;
 
-  size_t _capacity;
-  size_t _used;
+  // We re-evaluate the left-to-right allocation bias whenever _alloc_bias_weight is less than zero.  Each time
+  // we allocate an object, we decrement the count of this value.  Each time we re-evaluate whether to allocate
+  // from right-to-left or left-to-right, we reset the value of this counter to _InitialAllocBiasWeight.
+  ssize_t _alloc_bias_weight;
 
-  void assert_bounds() const NOT_DEBUG_RETURN;
-
-  bool is_mutator_free(size_t idx) const;
-  bool is_collector_free(size_t idx) const;
+  const ssize_t _InitialAllocBiasWeight = 256;
 
   HeapWord* try_allocate_in(ShenandoahHeapRegion* region, ShenandoahAllocRequest& req, bool& in_new_region);
+
+  // While holding the heap lock, allocate memory for a single object or LAB  which is to be entirely contained
+  // within a single HeapRegion as characterized by req.
+  //
+  // Precondition: req.size() <= ShenandoahHeapRegion::humongous_threshold_words().
   HeapWord* allocate_single(ShenandoahAllocRequest& req, bool& in_new_region);
+
+  // While holding the heap lock, allocate memory for a humongous object which spans one or more regions that
+  // were previously empty.  Regions that represent humongous objects are entirely dedicated to the humongous
+  // object.  No other objects are packed into these regions.
+  //
+  // Precondition: req.size() > ShenandoahHeapRegion::humongous_threshold_words().
   HeapWord* allocate_contiguous(ShenandoahAllocRequest& req);
 
+  // Change region r from the Mutator partition to the GC's Collector partition.  This requires that the region is entirely empty.
+  // Typical usage: During evacuation, the GC may find it needs more memory than had been reserved at the start of evacuation to
+  // hold evacuated objects.  If this occurs and memory is still available in the Mutator's free set, we will flip a region from
+  // the Mutator free set into the Collector free set.
   void flip_to_gc(ShenandoahHeapRegion* r);
-
-  void recompute_bounds();
-  void adjust_bounds();
-  bool touches_bounds(size_t num) const;
-
-  void increase_used(size_t amount);
   void clear_internal();
-
-  size_t collector_count() const { return _collector_free_bitmap.count_one_bits(); }
-  size_t mutator_count()   const { return _mutator_free_bitmap.count_one_bits();   }
-
   void try_recycle_trashed(ShenandoahHeapRegion *r);
 
-  bool can_allocate_from(ShenandoahHeapRegion *r);
-  size_t alloc_capacity(ShenandoahHeapRegion *r);
-  bool has_no_alloc_capacity(ShenandoahHeapRegion *r);
+  // Returns true iff this region is entirely available, either because it is empty() or because it has been found to represent
+  // immediate trash and we'll be able to immediately recycle it.  Note that we cannot recycle immediate trash if
+  // concurrent weak root processing is in progress.
+  inline bool can_allocate_from(ShenandoahHeapRegion *r) const;
+  inline bool can_allocate_from(size_t idx) const;
+
+  inline bool has_alloc_capacity(ShenandoahHeapRegion *r) const;
+
+  // This function places all regions that have allocation capacity into the mutator_partition, identifying regions
+  // that have no allocation capacity as NotFree.  Subsequently, we will move some of the mutator regions into the
+  // collector partition with the intent of packing collector memory into the highest (rightmost) addresses of the
+  // heap, with mutator memory consuming the lowest addresses of the heap.
+  void find_regions_with_alloc_capacity(size_t &cset_regions);
+
+  // Having placed all regions that have allocation capacity into the mutator partition, move some of these regions from
+  // the mutator partition into the collector partition in order to assure that the memory available for allocations within
+  // the collector partition is at least to_reserve.
+  void reserve_regions(size_t to_reserve);
+
+  // Overwrite arguments to represent the number of regions to be reclaimed from the cset
+  void prepare_to_rebuild(size_t &cset_regions);
+
+  void finish_rebuild(size_t cset_regions);
 
 public:
   ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions);
 
+  // Public because ShenandoahRegionPartitions assertions require access.
+  inline size_t alloc_capacity(ShenandoahHeapRegion *r) const;
+  inline size_t alloc_capacity(size_t idx) const;
+
   void clear();
   void rebuild();
 
-  void recycle_trash();
+  // Move up to cset_regions number of regions from being available to the collector to being available to the mutator.
+  //
+  // Typical usage: At the end of evacuation, when the collector no longer needs the regions that had been reserved
+  // for evacuation, invoke this to make regions available for mutator allocations.
+  //
+  // Note that we plan to replenish the Collector reserve at the end of update refs, at which time all
+  // of the regions recycled from the collection set will be available.  If the very unlikely event that there
+  // are fewer regions in the collection set than remain in the collector set, we limit the transfer in order
+  // to assure that the replenished Collector reserve can be sufficiently large.
+  void move_regions_from_collector_to_mutator(size_t cset_regions);
 
+  void recycle_trash();
   void log_status();
 
-  size_t capacity()  const { return _capacity; }
-  size_t used()      const { return _used;     }
-  size_t available() const {
-    assert(_used <= _capacity, "must use less than capacity");
-    return _capacity - _used;
+  inline size_t capacity()  const { return _partitions.capacity_of(ShenandoahFreeSetPartitionId::Mutator); }
+  inline size_t used()      const { return _partitions.used_by(ShenandoahFreeSetPartitionId::Mutator);     }
+  inline size_t available() const {
+    assert(used() <= capacity(), "must use less than capacity");
+    return capacity() - used();
   }
 
   HeapWord* allocate(ShenandoahAllocRequest& req, bool& in_new_region);
   size_t unsafe_peek_free() const;
 
+  /*
+   * Internal fragmentation metric: describes how fragmented the heap regions are.
+   *
+   * It is derived as:
+   *
+   *               sum(used[i]^2, i=0..k)
+   *   IF = 1 - ------------------------------
+   *              C * sum(used[i], i=0..k)
+   *
+   * ...where k is the number of regions in computation, C is the region capacity, and
+   * used[i] is the used space in the region.
+   *
+   * The non-linearity causes IF to be lower for the cases where the same total heap
+   * used is densely packed. For example:
+   *   a) Heap is completely full  => IF = 0
+   *   b) Heap is half full, first 50% regions are completely full => IF = 0
+   *   c) Heap is half full, each region is 50% full => IF = 1/2
+   *   d) Heap is quarter full, first 50% regions are completely full => IF = 0
+   *   e) Heap is quarter full, each region is 25% full => IF = 3/4
+   *   f) Heap has one small object per each region => IF =~ 1
+   */
   double internal_fragmentation();
+
+  /*
+   * External fragmentation metric: describes how fragmented the heap is.
+   *
+   * It is derived as:
+   *
+   *   EF = 1 - largest_contiguous_free / total_free
+   *
+   * For example:
+   *   a) Heap is completely empty => EF = 0
+   *   b) Heap is completely full => EF = 0
+   *   c) Heap is first-half full => EF = 1/2
+   *   d) Heap is half full, full and empty regions interleave => EF =~ 1
+   */
   double external_fragmentation();
 
   void print_on(outputStream* out) const;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index 2aeec0911d0..de7d81d0f43 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -912,7 +912,6 @@ private:
 
 public:
   ShenandoahPostCompactClosure() : _heap(ShenandoahHeap::heap()), _live(0) {
-    _heap->free_set()->clear();
   }
 
   void heap_region_do(ShenandoahHeapRegion* r) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 53d4911797d..8150df10914 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -2103,17 +2103,27 @@ public:
     if (CONCURRENT) {
       ShenandoahConcurrentWorkerSession worker_session(worker_id);
       ShenandoahSuspendibleThreadSetJoiner stsj;
-      do_work<ShenandoahConcUpdateRefsClosure>();
+      do_work<ShenandoahConcUpdateRefsClosure>(worker_id);
     } else {
       ShenandoahParallelWorkerSession worker_session(worker_id);
-      do_work<ShenandoahSTWUpdateRefsClosure>();
+      do_work<ShenandoahSTWUpdateRefsClosure>(worker_id);
     }
   }
 
 private:
   template<class T>
-  void do_work() {
+  void do_work(uint worker_id) {
     T cl;
+    if (CONCURRENT && (worker_id == 0)) {
+      // We ask the first worker to replenish the Mutator free set by moving regions previously reserved to hold the
+      // results of evacuation.  These reserves are no longer necessary because evacuation has completed.
+      size_t cset_regions = _heap->collection_set()->count();
+      // We cannot transfer any more regions than will be reclaimed when the existing collection set is recycled because
+      // we need the reclaimed collection set regions to replenish the collector reserves
+      _heap->free_set()->move_regions_from_collector_to_mutator(cset_regions);
+    }
+    // If !CONCURRENT, there's no value in expanding Mutator free set
+
     ShenandoahHeapRegion* r = _regions->next();
     ShenandoahMarkingContext* const ctx = _heap->complete_marking_context();
     while (r != nullptr) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.cpp
new file mode 100644
index 00000000000..c3e8108752f
--- /dev/null
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.cpp
@@ -0,0 +1,291 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+
+ShenandoahSimpleBitMap::ShenandoahSimpleBitMap(size_t num_bits) :
+    _num_bits(num_bits),
+    _num_words(align_up(num_bits, BitsPerWord) / BitsPerWord),
+    _bitmap(NEW_C_HEAP_ARRAY(uintx, _num_words, mtGC))
+{
+  clear_all();
+}
+
+ShenandoahSimpleBitMap::~ShenandoahSimpleBitMap() {
+  if (_bitmap != nullptr) {
+    FREE_C_HEAP_ARRAY(uintx, _bitmap);
+  }
+}
+
+size_t ShenandoahSimpleBitMap::count_leading_ones(idx_t start_idx) const {
+  assert((start_idx >= 0) && (start_idx < _num_bits), "precondition");
+  size_t array_idx = start_idx >> LogBitsPerWord;
+  uintx element_bits = _bitmap[array_idx];
+  uintx bit_number = start_idx & right_n_bits(LogBitsPerWord);
+  uintx mask = ~right_n_bits(bit_number);
+  size_t counted_ones = 0;
+  while ((element_bits & mask) == mask) {
+    // All bits numbered >= bit_number are set
+    size_t found_ones = BitsPerWord - bit_number;
+    counted_ones += found_ones;
+    // Dead code: do not need to compute: start_idx += found_ones;
+    // Strength reduction:                array_idx = (start_idx >> LogBitsPerWord)
+    array_idx++;
+    element_bits = _bitmap[array_idx];
+    // Constant folding:                  bit_number = start_idx & right_n_bits(LogBitsPerWord);
+    bit_number = 0;
+    // Constant folding:                  mask = ~right_n_bits(bit_number);
+    mask = ~0;
+  }
+
+  // Add in number of consecutive ones starting with the_bit and including more significant bits and return result
+  uintx aligned = element_bits >> bit_number;
+  uintx complement = ~aligned;
+  return counted_ones + count_trailing_zeros<uintx>(complement);
+}
+
+size_t ShenandoahSimpleBitMap::count_trailing_ones(idx_t last_idx) const {
+  assert((last_idx >= 0) && (last_idx < _num_bits), "precondition");
+  size_t array_idx = last_idx >> LogBitsPerWord;
+  uintx element_bits = _bitmap[array_idx];
+  uintx bit_number = last_idx & right_n_bits(LogBitsPerWord);
+  // All ones from bit 0 to the_bit
+  uintx mask = right_n_bits(bit_number + 1);
+  size_t counted_ones = 0;
+  while ((element_bits & mask) == mask) {
+    // All bits numbered <= bit_number are set
+    size_t found_ones = bit_number + 1;
+    counted_ones += found_ones;
+    // Dead code: do not need to compute: last_idx -= found_ones;
+    array_idx--;
+    element_bits = _bitmap[array_idx];
+    // Constant folding:                  bit_number = last_idx & right_n_bits(LogBitsPerWord);
+    bit_number = BitsPerWord - 1;
+    // Constant folding:                  mask = right_n_bits(bit_number + 1);
+    mask = ~0;
+  }
+
+  // Add in number of consecutive ones starting with the_bit and including less significant bits and return result
+  uintx aligned = element_bits << (BitsPerWord - (bit_number + 1));
+  uintx complement = ~aligned;
+  return counted_ones + count_leading_zeros<uintx>(complement);
+}
+
+bool ShenandoahSimpleBitMap::is_forward_consecutive_ones(idx_t start_idx, idx_t count) const {
+  while (count > 0) {
+    assert((start_idx >= 0) && (start_idx < _num_bits), "precondition: start_idx: " SSIZE_FORMAT ", count: " SSIZE_FORMAT,
+           start_idx, count);
+    assert(start_idx + count <= (idx_t) _num_bits, "precondition");
+    size_t array_idx = start_idx >> LogBitsPerWord;
+    uintx bit_number = start_idx & right_n_bits(LogBitsPerWord);
+    uintx element_bits = _bitmap[array_idx];
+    uintx bits_to_examine  = BitsPerWord - bit_number;
+    element_bits >>= bit_number;
+    uintx complement = ~element_bits;
+    uintx trailing_ones;
+    if (complement != 0) {
+      trailing_ones = count_trailing_zeros<uintx>(complement);
+    } else {
+      trailing_ones = bits_to_examine;
+    }
+    if (trailing_ones >= (uintx) count) {
+      return true;
+    } else if (trailing_ones == bits_to_examine) {
+      start_idx += bits_to_examine;
+      count -= bits_to_examine;
+      // Repeat search with smaller goal
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
+bool ShenandoahSimpleBitMap::is_backward_consecutive_ones(idx_t last_idx, idx_t count) const {
+  while (count > 0) {
+    assert((last_idx >= 0) && (last_idx < _num_bits), "precondition");
+    assert(last_idx - count >= -1, "precondition");
+    size_t array_idx = last_idx >> LogBitsPerWord;
+    uintx bit_number = last_idx & right_n_bits(LogBitsPerWord);
+    uintx element_bits = _bitmap[array_idx];
+    uintx bits_to_examine = bit_number + 1;
+    element_bits <<= (BitsPerWord - bits_to_examine);
+    uintx complement = ~element_bits;
+    uintx leading_ones;
+    if (complement != 0) {
+      leading_ones = count_leading_zeros<uintx>(complement);
+    } else {
+      leading_ones = bits_to_examine;
+    }
+    if (leading_ones >= (uintx) count) {
+      return true;
+    } else if (leading_ones == bits_to_examine) {
+      last_idx -= leading_ones;
+      count -= leading_ones;
+      // Repeat search with smaller goal
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
+idx_t ShenandoahSimpleBitMap::find_first_consecutive_set_bits(idx_t beg, idx_t end, size_t num_bits) const {
+  assert((beg >= 0) && (beg < _num_bits), "precondition");
+
+  // Stop looking if there are not num_bits remaining in probe space.
+  idx_t start_boundary = end - num_bits;
+  if (beg > start_boundary) {
+    return end;
+  }
+  uintx array_idx = beg >> LogBitsPerWord;
+  uintx bit_number = beg & right_n_bits(LogBitsPerWord);
+  uintx element_bits = _bitmap[array_idx];
+  if (bit_number > 0) {
+    uintx mask_out = right_n_bits(bit_number);
+    element_bits &= ~mask_out;
+  }
+
+  // The following loop minimizes the number of spans probed in order to find num_bits consecutive bits.
+  // For example, if bit_number = beg = 0, num_bits = 8, and element bits equals 00111111_11000000_00000000_10011000B,
+  // we need only 3 probes to find the match at bit offset 22.
+  //
+  // Let beg = 0
+  // element_bits = 00111111_11000000_00000000_10011000B;
+  //                                           ________   (the searched span)
+  //                                           ^   ^  ^- bit_number = beg = 0
+  //                                           |   +-- next_start_candidate_1 (where next 1 is found)
+  //                                           +------ next_start_candidate_2 (start of the trailing 1s within span)
+  // Let beg = 7
+  // element_bits = 00111111_11000000_00000000_10011000B;
+  //                          ^       ^_________   (the searched span)
+  //                          |       |        ^- bit_number = beg = 7
+  //                          |       +---------- next_start_candidate_2 (there are no trailing 1s within span)
+  //                          +------------------ next_start_candidate_1 (where next 1 is found)
+  // Let beg = 22
+  // Let beg = 22
+  // element_bits = 00111111_11000001_11111100_10011000B;
+  //                  _________   (the searched span)
+  //                          ^- bit_number = beg = 18
+  // Here, is_forward_consecutive_ones(22, 8) succeeds and we report the match
+
+  while (true) {
+    if (element_bits == 0) {
+      // move to the next element
+      beg += BitsPerWord - bit_number;
+      if (beg > start_boundary) {
+        // No match found.
+        return end;
+      }
+      array_idx++;
+      bit_number = 0;
+      element_bits = _bitmap[array_idx];
+    } else if (is_forward_consecutive_ones(beg, num_bits)) {
+      return beg;
+    } else {
+      // There is at least one non-zero bit within the masked element_bits. Arrange to skip over bits that
+      // cannot be part of a consecutive-ones match.
+      uintx next_set_bit = count_trailing_zeros<uintx>(element_bits);
+      uintx next_start_candidate_1 = (array_idx << LogBitsPerWord) + next_set_bit;
+
+      // There is at least one zero bit in this span. Align the next probe at the start of trailing ones for probed span,
+      // or align at end of span if this span has no trailing ones.
+      size_t trailing_ones = count_trailing_ones(beg + num_bits - 1);
+      uintx next_start_candidate_2 = beg + num_bits - trailing_ones;
+
+      beg = MAX2(next_start_candidate_1, next_start_candidate_2);
+      if (beg > start_boundary) {
+        // No match found.
+        return end;
+      }
+      array_idx = beg >> LogBitsPerWord;
+      element_bits = _bitmap[array_idx];
+      bit_number = beg & right_n_bits(LogBitsPerWord);
+      if (bit_number > 0) {
+        size_t mask_out = right_n_bits(bit_number);
+        element_bits &= ~mask_out;
+      }
+    }
+  }
+}
+
+idx_t ShenandoahSimpleBitMap::find_last_consecutive_set_bits(const idx_t beg, idx_t end, const size_t num_bits) const {
+
+  assert((end >= 0) && (end < _num_bits), "precondition");
+
+  // Stop looking if there are not num_bits remaining in probe space.
+  idx_t last_boundary = beg + num_bits;
+  if (end < last_boundary) {
+    return beg;
+  }
+
+  size_t array_idx = end >> LogBitsPerWord;
+  uintx bit_number = end & right_n_bits(LogBitsPerWord);
+  uintx element_bits = _bitmap[array_idx];
+  if (bit_number < BitsPerWord - 1) {
+    uintx mask_in = right_n_bits(bit_number + 1);
+    element_bits &= mask_in;
+  }
+
+  // See comment in find_first_consecutive_set_bits to understand how this loop works.
+  while (true) {
+    if (element_bits == 0) {
+      // move to the previous element
+      end -= bit_number + 1;
+      if (end < last_boundary) {
+        // No match found.
+        return beg;
+      }
+      array_idx--;
+      bit_number = BitsPerWord - 1;
+      element_bits = _bitmap[array_idx];
+    } else if (is_backward_consecutive_ones(end, num_bits)) {
+      return end + 1 - num_bits;
+    } else {
+      // There is at least one non-zero bit within the masked element_bits. Arrange to skip over bits that
+      // cannot be part of a consecutive-ones match.
+      uintx next_set_bit = BitsPerWord - (1 + count_leading_zeros<uintx>(element_bits));
+      uintx next_last_candidate_1 = (array_idx << LogBitsPerWord) + next_set_bit;
+
+      // There is at least one zero bit in this span.  Align the next probe at the end of leading ones for probed span,
+      // or align before start of span if this span has no leading ones.
+      size_t leading_ones = count_leading_ones(end - (num_bits - 1));
+      uintx next_last_candidate_2 = end - (num_bits - leading_ones);
+
+      end = MIN2(next_last_candidate_1, next_last_candidate_2);
+      if (end < last_boundary) {
+        // No match found.
+        return beg;
+      }
+      array_idx = end >> LogBitsPerWord;
+      bit_number = end & right_n_bits(LogBitsPerWord);
+      element_bits = _bitmap[array_idx];
+      if (bit_number < BitsPerWord - 1){
+        size_t mask_in = right_n_bits(bit_number + 1);
+        element_bits &= mask_in;
+      }
+    }
+  }
+}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp
new file mode 100644
index 00000000000..c22e9527002
--- /dev/null
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp
@@ -0,0 +1,170 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_HPP
+
+#include <cstddef>
+
+#include "gc/shenandoah/shenandoahAsserts.hpp"
+
+// TODO: Merge the enhanced capabilities of ShenandoahSimpleBitMap into src/hotspot/share/utilities/bitMap.hpp
+//       and deprecate ShenandoahSimpleBitMap.  The key enhanced capabilities to be integrated include:
+//
+//   1. Allow searches from high to low memory (when biasing allocations towards the top of the heap)
+//   2. Allow searches for clusters of contiguous set bits (to expedite allocation for humongous objects)
+//
+// idx_t is defined here as ssize_t.  In src/hotspot/share/utiliities/bitMap.hpp, idx is defined as size_t.
+// This is a significant incompatibility.
+//
+// The API and internal implementation of ShenandoahSimpleBitMap and ShenandoahRegionPartitions use idx_t to
+// represent index, even though index is "inherently" unsigned.  There are two reasons for this choice:
+//  1. We use -1 as a sentinel value to represent empty partitions.  This same value may be used to represent
+//     failure to find a previous set bit or previous range of set bits.
+//  2. Certain loops are written most naturally if the iterator, which may hold the sentinel -1 value, can be
+//     declared as signed and the terminating condition can be < 0.
+
+typedef ssize_t idx_t;
+
+// ShenandoahSimpleBitMap resembles CHeapBitMap but adds missing support for find_first_consecutive_set_bits() and
+// find_last_consecutive_set_bits.  An alternative refactoring of code would subclass CHeapBitMap, but this might
+// break abstraction rules, because efficient implementation requires assumptions about superclass internals that
+// might be violatee through future software maintenance.
+class ShenandoahSimpleBitMap {
+  const idx_t _num_bits;
+  const size_t _num_words;
+  uintx* const _bitmap;
+
+public:
+  ShenandoahSimpleBitMap(size_t num_bits);
+
+  ~ShenandoahSimpleBitMap();
+
+  void clear_all() {
+    for (size_t i = 0; i < _num_words; i++) {
+      _bitmap[i] = 0;
+    }
+  }
+
+private:
+
+  // Count consecutive ones in forward order, starting from start_idx.  Requires that there is at least one zero
+  // between start_idx and index value (_num_bits - 1), inclusive.
+  size_t count_leading_ones(idx_t start_idx) const;
+
+  // Count consecutive ones in reverse order, starting from last_idx.  Requires that there is at least one zero
+  // between last_idx and index value zero, inclusive.
+  size_t count_trailing_ones(idx_t last_idx) const;
+
+  bool is_forward_consecutive_ones(idx_t start_idx, idx_t count) const;
+  bool is_backward_consecutive_ones(idx_t last_idx, idx_t count) const;
+
+public:
+
+  inline idx_t aligned_index(idx_t idx) const {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    idx_t array_idx = idx & ~right_n_bits(LogBitsPerWord);
+    return array_idx;
+  }
+
+  inline constexpr idx_t alignment() const {
+    return BitsPerWord;
+  }
+
+  // For testing
+  inline idx_t size() const {
+    return _num_bits;
+  }
+
+  // Return the word that holds idx bit and its neighboring bits.
+  inline uintx bits_at(idx_t idx) const {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    idx_t array_idx = idx >> LogBitsPerWord;
+    return _bitmap[array_idx];
+  }
+
+  inline void set_bit(idx_t idx) {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    size_t array_idx = idx >> LogBitsPerWord;
+    uintx bit_number = idx & right_n_bits(LogBitsPerWord);
+    uintx the_bit = nth_bit(bit_number);
+    _bitmap[array_idx] |= the_bit;
+  }
+
+  inline void clear_bit(idx_t idx) {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    assert(idx >= 0, "precondition");
+    size_t array_idx = idx >> LogBitsPerWord;
+    uintx bit_number = idx & right_n_bits(LogBitsPerWord);
+    uintx the_bit = nth_bit(bit_number);
+    _bitmap[array_idx] &= ~the_bit;
+  }
+
+  inline bool is_set(idx_t idx) const {
+    assert((idx >= 0) && (idx < _num_bits), "precondition");
+    assert(idx >= 0, "precondition");
+    size_t array_idx = idx >> LogBitsPerWord;
+    uintx bit_number = idx & right_n_bits(LogBitsPerWord);
+    uintx the_bit = nth_bit(bit_number);
+    return (_bitmap[array_idx] & the_bit)? true: false;
+  }
+
+  // Return the index of the first set bit in the range [beg, size()), or size() if none found.
+  // precondition: beg and end form a valid range for the bitmap.
+  inline idx_t find_first_set_bit(idx_t beg) const;
+
+  // Return the index of the first set bit in the range [beg, end), or end if none found.
+  // precondition: beg and end form a valid range for the bitmap.
+  inline idx_t find_first_set_bit(idx_t beg, idx_t end) const;
+
+  // Return the index of the last set bit in the range (-1, end], or -1 if none found.
+  // precondition: beg and end form a valid range for the bitmap.
+  inline idx_t find_last_set_bit(idx_t end) const;
+
+  // Return the index of the last set bit in the range (beg, end], or beg if none found.
+  // precondition: beg and end form a valid range for the bitmap.
+  inline idx_t find_last_set_bit(idx_t beg, idx_t end) const;
+
+  // Return the start index of the first run of <num_bits> consecutive set bits for which the first set bit is within
+  //   the range [beg, size()), or size() if the run of <num_bits> is not found within this range.
+  // precondition: beg is within the valid range for the bitmap.
+  inline idx_t find_first_consecutive_set_bits(idx_t beg, size_t num_bits) const;
+
+  // Return the start index of the first run of <num_bits> consecutive set bits for which the first set bit is within
+  //   the range [beg, end), or end if the run of <num_bits> is not found within this range.
+  // precondition: beg and end form a valid range for the bitmap.
+  idx_t find_first_consecutive_set_bits(idx_t beg, idx_t end, size_t num_bits) const;
+
+  // Return the start index of the last run of <num_bits> consecutive set bits for which the entire run of set bits is within
+  // the range (-1, end], or -1 if the run of <num_bits> is not found within this range.
+  // precondition: end is within the valid range for the bitmap.
+  inline idx_t find_last_consecutive_set_bits(idx_t end, size_t num_bits) const;
+
+  // Return the start index of the first run of <num_bits> consecutive set bits for which the entire run of set bits is within
+  // the range (beg, end], or beg if the run of <num_bits> is not found within this range.
+  // precondition: beg and end form a valid range for the bitmap.
+  idx_t find_last_consecutive_set_bits(idx_t beg, idx_t end, size_t num_bits) const;
+};
+
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.inline.hpp
new file mode 100644
index 00000000000..3e602ed11e0
--- /dev/null
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.inline.hpp
@@ -0,0 +1,100 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_INLINE_HPP
+
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+
+inline idx_t ShenandoahSimpleBitMap::find_first_set_bit(idx_t beg, idx_t end) const {
+  assert((beg >= 0) && (beg < _num_bits), "precondition");
+  assert((end > beg) && (end <= _num_bits), "precondition");
+  do {
+    size_t array_idx = beg >> LogBitsPerWord;
+    uintx bit_number = beg & right_n_bits(LogBitsPerWord);
+    uintx element_bits = _bitmap[array_idx];
+    if (bit_number > 0) {
+      uintx mask_out = right_n_bits(bit_number);
+      element_bits &= ~mask_out;
+    }
+    if (element_bits) {
+      // The next set bit is here.  Find first set bit >= bit_number;
+      uintx aligned = element_bits >> bit_number;
+      uintx first_set_bit = count_trailing_zeros<uintx>(aligned);
+      idx_t candidate_result = (array_idx * BitsPerWord) + bit_number + first_set_bit;
+      return (candidate_result < end)? candidate_result: end;
+    } else {
+      // Next bit is not here.  Try the next array element
+      beg += BitsPerWord - bit_number;
+    }
+  } while (beg < end);
+  return end;
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_first_set_bit(idx_t beg) const {
+  assert((beg >= 0) && (beg < size()), "precondition");
+  return find_first_set_bit(beg, size());
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_last_set_bit(idx_t beg, idx_t end) const {
+  assert((end >= 0) && (end < _num_bits), "precondition");
+  assert((beg >= -1) && (beg < end), "precondition");
+  do {
+    idx_t array_idx = end >> LogBitsPerWord;
+    uintx bit_number = end & right_n_bits(LogBitsPerWord);
+    uintx element_bits = _bitmap[array_idx];
+    if (bit_number < BitsPerWord - 1){
+      uintx mask_in = right_n_bits(bit_number + 1);
+      element_bits &= mask_in;
+    }
+    if (element_bits) {
+      // The prev set bit is here.  Find the first set bit <= bit_number
+      uintx aligned = element_bits << (BitsPerWord - (bit_number + 1));
+      uintx first_set_bit = count_leading_zeros<uintx>(aligned);
+      idx_t candidate_result = array_idx * BitsPerWord + (bit_number - first_set_bit);
+      return (candidate_result > beg)? candidate_result: beg;
+    } else {
+      // Next bit is not here.  Try the previous array element
+      end -= (bit_number + 1);
+    }
+  } while (end > beg);
+  return beg;
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_last_set_bit(idx_t end) const {
+  assert((end >= 0) && (end < _num_bits), "precondition");
+  return find_last_set_bit(-1, end);
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_first_consecutive_set_bits(idx_t beg, size_t num_bits) const {
+  assert((beg >= 0) && (beg < _num_bits), "precondition");
+  return find_first_consecutive_set_bits(beg, size(), num_bits);
+}
+
+inline idx_t ShenandoahSimpleBitMap::find_last_consecutive_set_bits(idx_t end, size_t num_bits) const {
+  assert((end >= 0) && (end < _num_bits), "precondition");
+  return find_last_consecutive_set_bits((idx_t) -1, end, num_bits);
+}
+
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_INLINE_HPP
diff --git a/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp b/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp
new file mode 100644
index 00000000000..c9a6d638ba8
--- /dev/null
+++ b/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp
@@ -0,0 +1,451 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "precompiled.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+#include "gc/shenandoah/shenandoahSimpleBitMap.inline.hpp"
+
+#include <iostream>
+#include "utilities/ostream.hpp"
+#include "utilities/vmassert_uninstall.hpp"
+#include "utilities/vmassert_reinstall.hpp"
+#include "unittest.hpp"
+
+static bool _success;
+static size_t _assertion_failures;
+
+#define BitMapAssertEqual(a, b)  ASSERT_EQ((a), (b)); if ((a) != (b)) { _assertion_failures++; }
+
+class ShenandoahSimpleBitMapTest: public ::testing::Test {
+protected:
+
+  static const ssize_t SMALL_BITMAP_SIZE =  512;
+  static const ssize_t LARGE_BITMAP_SIZE = 4096;
+
+  // set_bits[] is an array of indexes holding bits that are supposed to be set, in increasing order.
+  static void verifyBitMapState(ShenandoahSimpleBitMap& bm, ssize_t size, ssize_t set_bits[], ssize_t num_set_bits) {
+    // Verify number of bits
+    BitMapAssertEqual(bm.size(), size);
+
+    ssize_t set_bit_index = 0;
+    // Check that is_set(idx) for every possible idx
+    for (ssize_t i = 0; i < size; i++) {
+      bool is_set = bm.is_set(i);
+      bool intended_value = false;;
+      if (set_bit_index < num_set_bits) {
+        if (set_bits[set_bit_index] == i) {
+          intended_value = true;
+          set_bit_index++;
+        }
+      } else {
+        // If we've exhausted set_bits array, there should be no more set_bits
+        BitMapAssertEqual(is_set, false);
+        BitMapAssertEqual(set_bit_index, num_set_bits);
+      }
+      BitMapAssertEqual(is_set, intended_value);
+    }
+    BitMapAssertEqual(set_bit_index, num_set_bits);
+
+    // Check that bits_at(array_idx) matches intended value for every valid array_idx value
+    set_bit_index = 0;
+    ssize_t alignment = bm.alignment();
+    for (ssize_t i = 0; i < size; i += alignment) {
+      size_t bits = bm.bits_at(i);
+      for (ssize_t b = 0; b < alignment; b++) {
+        ssize_t bit_value = i + b;
+        bool intended_value = false;;
+        if (set_bit_index < num_set_bits) {
+          if (set_bits[set_bit_index] == bit_value) {
+            intended_value = true;
+            set_bit_index++;
+          }
+        }
+        size_t bit_mask = ((size_t) 0x01) << b;
+        bool is_set = (bits & bit_mask) != 0;
+        BitMapAssertEqual(is_set, intended_value);
+      }
+    }
+
+    // Make sure find_first_set_bit() works correctly
+    ssize_t probe_point = 0;
+    for (ssize_t i = 0; i < num_set_bits; i++) {
+      ssize_t next_expected_bit = set_bits[i];
+      probe_point = bm.find_first_set_bit(probe_point);
+      BitMapAssertEqual(probe_point, next_expected_bit);
+      probe_point++;            // Prepare to look beyond the most recent bit.
+    }
+    if (probe_point < size) {
+      probe_point = bm.find_first_set_bit(probe_point);
+      BitMapAssertEqual(probe_point, size); // Verify that last failed search returns sentinel value: num bits in bit map
+    }
+
+    // Confirm that find_first_set_bit() with a bounded search space works correctly
+    // Limit this search to the first 3/4 of the full bit map
+    ssize_t boundary_idx = 3 * size / 4;
+    probe_point = 0;
+    for (ssize_t i = 0; i < num_set_bits; i++) {
+      ssize_t next_expected_bit = set_bits[i];
+      if (next_expected_bit >= boundary_idx) {
+        break;
+      } else {
+        probe_point = bm.find_first_set_bit(probe_point, boundary_idx);
+        BitMapAssertEqual(probe_point, next_expected_bit);
+        probe_point++;            // Prepare to look beyond the most recent bit.
+      }
+    }
+    if (probe_point < boundary_idx) {
+      // In case there are no set bits in the last 1/4 of bit map, confirm that last failed search returns sentinel: boundary_idx
+      probe_point = bm.find_first_set_bit(probe_point, boundary_idx);
+      BitMapAssertEqual(probe_point, boundary_idx);
+    }
+
+    // Make sure find_last_set_bit() works correctly
+    probe_point = size - 1;
+    for (ssize_t i = num_set_bits - 1; i >= 0; i--) {
+      ssize_t next_expected_bit = set_bits[i];
+      probe_point = bm.find_last_set_bit(probe_point);
+      BitMapAssertEqual(probe_point, next_expected_bit);
+      probe_point--;            // Prepare to look before the most recent bit.
+    }
+    if (probe_point >= 0) {
+      probe_point = bm.find_last_set_bit(probe_point);
+      BitMapAssertEqual(probe_point, (ssize_t) -1); // Verify that last failed search returns sentinel value: -1
+    }
+
+    // Confirm that find_last_set_bit() with a bounded search space works correctly
+    // Limit this search to the last 3/4 of the full bit map
+    boundary_idx = size / 4;
+    probe_point = size - 1;
+    for (ssize_t i = num_set_bits - 1; i >= 0; i--) {
+      ssize_t next_expected_bit = set_bits[i];
+      if (next_expected_bit > boundary_idx) {
+        probe_point = bm.find_last_set_bit(boundary_idx, probe_point);
+        BitMapAssertEqual(probe_point, next_expected_bit);
+        probe_point--;
+      } else {
+        break;
+      }
+    }
+    if (probe_point > boundary_idx) {
+      probe_point = bm.find_last_set_bit(boundary_idx, probe_point);
+        // Verify that last failed search returns sentinel value: boundary_idx
+      BitMapAssertEqual(probe_point, boundary_idx);
+    }
+
+    // What's the longest cluster of consecutive bits
+    ssize_t previous_value = -2;
+    ssize_t longest_run = 0;
+    ssize_t current_run = 0;
+    for (ssize_t i = 0; i < num_set_bits; i++) {
+      ssize_t next_expected_bit = set_bits[i];
+      if (next_expected_bit == previous_value + 1) {
+        current_run++;
+      } else {
+        previous_value = next_expected_bit;
+        current_run = 1;
+      }
+      if (current_run > longest_run) {
+        longest_run = current_run;
+      }
+      previous_value = next_expected_bit;
+    }
+
+    // Confirm that find_first_consecutive_set_bits() works for each cluster size known to have at least one match
+    for (ssize_t cluster_size = 1; cluster_size <= longest_run; cluster_size++) {
+      // Verify that find_first_consecutive_set_bits() works
+      ssize_t bit_idx = 0;
+      ssize_t probe_point = 0;
+      while ((probe_point <= size - cluster_size) && (bit_idx <= num_set_bits - cluster_size)) {
+        bool cluster_found = false;
+        while (!cluster_found && (bit_idx + cluster_size <= num_set_bits)) {
+          cluster_found = true;
+          for (ssize_t i = 1; i < cluster_size; i++) {
+            if (set_bits[bit_idx] + i != set_bits[bit_idx + i]) {
+              cluster_found = false;
+              bit_idx++;
+              break;
+            }
+          }
+        }
+        if (cluster_found) {
+          ssize_t next_expected_cluster = set_bits[bit_idx];
+          ssize_t orig_probe_point = probe_point;
+          probe_point = bm.find_first_consecutive_set_bits(orig_probe_point, cluster_size);
+          BitMapAssertEqual(next_expected_cluster, probe_point);
+          probe_point++;
+          bit_idx++;
+        } else {
+          bit_idx++;
+          break;
+        }
+      }
+      if (probe_point < size) {
+        // Confirm that the last request, which fails to find a cluster, returns sentinel value: num_bits
+        probe_point = bm.find_first_consecutive_set_bits(probe_point, cluster_size);
+        BitMapAssertEqual(probe_point, size);
+      }
+
+      // Repeat the above experiment, using 3/4 size as the search boundary_idx
+      bit_idx = 0;
+      probe_point = 0;
+      boundary_idx = 4 * size / 4;
+      while ((probe_point <= boundary_idx - cluster_size) && (bit_idx <= num_set_bits - cluster_size)) {
+        bool cluster_found = false;
+        while (!cluster_found && (bit_idx + cluster_size <= num_set_bits)) {
+          cluster_found = true;
+          for (int i = 1; i < cluster_size; i++) {
+            if (set_bits[bit_idx] + i != set_bits[bit_idx + i]) {
+              cluster_found = false;
+              bit_idx++;
+              break;
+            }
+          }
+        }
+        if (cluster_found) {
+          ssize_t next_expected_cluster = set_bits[bit_idx];
+          probe_point = bm.find_first_consecutive_set_bits(probe_point, boundary_idx, cluster_size);
+          BitMapAssertEqual(next_expected_cluster, probe_point);
+          probe_point++;
+          bit_idx++;
+        } else {
+          bit_idx++;
+        }
+      }
+      if (probe_point < boundary_idx) {
+        // Confirm that the last request, which fails to find a cluster, returns sentinel value: boundary_idx
+        probe_point = bm.find_first_consecutive_set_bits(probe_point, boundary_idx, cluster_size);
+        BitMapAssertEqual(probe_point, boundary_idx);
+      }
+
+      // Verify that find_last_consecutive_set_bits() works
+      bit_idx = num_set_bits - 1;
+      probe_point = size - 1;
+      // Iterate over all set bits in reverse order
+      while (bit_idx + 1 >= cluster_size) {
+        bool cluster_found = true;
+        for (int i = 1; i < cluster_size; i++) {
+          if (set_bits[bit_idx] - i != set_bits[bit_idx - i]) {
+            cluster_found = false;
+            break;
+          }
+        }
+        if (cluster_found) {
+          ssize_t next_expected_cluster = set_bits[bit_idx] + 1 - cluster_size;
+          probe_point = bm.find_last_consecutive_set_bits(probe_point, cluster_size);
+          BitMapAssertEqual(next_expected_cluster, probe_point);
+          probe_point = probe_point + cluster_size - 2;
+          bit_idx--;
+        } else {
+          bit_idx--;
+        }
+      }
+      if (probe_point >= 0) {
+        // Confirm that the last request, which fails to find a cluster, returns sentinel value: boundary_idx
+        probe_point = bm.find_last_consecutive_set_bits(boundary_idx, probe_point, cluster_size);
+        BitMapAssertEqual(probe_point, (ssize_t) boundary_idx);
+      }
+
+      // Verify that find_last_consecutive_set_bits() works with the search range bounded at 1/4 size
+      bit_idx = num_set_bits - 1;
+      probe_point = size - 1;
+      boundary_idx = size / 4;
+      while (bit_idx + 1 >= cluster_size) {
+        bool cluster_found = true;
+        for (int i = 1; i < cluster_size; i++) {
+          if (set_bits[bit_idx] - i != set_bits[bit_idx - i]) {
+            cluster_found = false;
+            break;
+          }
+        }
+        if (cluster_found && (set_bits[bit_idx] + 1 - cluster_size > boundary_idx)) {
+          ssize_t next_expected_cluster = set_bits[bit_idx] + 1 - cluster_size;
+          probe_point = bm.find_last_consecutive_set_bits(boundary_idx, probe_point, cluster_size);
+          BitMapAssertEqual(next_expected_cluster, probe_point);
+          probe_point = probe_point + cluster_size - 2;
+          bit_idx--;
+        } else if (set_bits[bit_idx] + 1 - cluster_size <= boundary_idx) {
+          break;
+        } else {
+          bit_idx--;
+        }
+      }
+      if (probe_point > boundary_idx) {
+        // Confirm that the last request, which fails to find a cluster, returns sentinel value: boundary_idx
+        probe_point = bm.find_last_consecutive_set_bits(boundary_idx, probe_point, cluster_size);
+        BitMapAssertEqual(probe_point, boundary_idx);
+      }
+    }
+
+    // Confirm that find_first_consecutive_set_bits() works for a cluster size known not to have any matches
+    probe_point = bm.find_first_consecutive_set_bits(0, longest_run + 1);
+    BitMapAssertEqual(probe_point, size);  // Confirm: failed search returns sentinel: size
+
+    probe_point = bm.find_last_consecutive_set_bits(size - 1, longest_run + 1);
+    BitMapAssertEqual(probe_point, (ssize_t) -1);    // Confirm: failed search returns sentinel: -1
+
+    boundary_idx = 3 * size / 4;
+    probe_point = bm.find_first_consecutive_set_bits(0, boundary_idx, longest_run + 1);
+    BitMapAssertEqual(probe_point, boundary_idx); // Confirm: failed search returns sentinel: boundary_idx
+
+    boundary_idx = size / 4;
+    probe_point = bm.find_last_consecutive_set_bits(boundary_idx, size - 1, longest_run + 1);
+    BitMapAssertEqual(probe_point, boundary_idx);           // Confirm: failed search returns sentinel: boundary_idx
+  }
+
+public:
+
+  static bool run_test() {
+
+    _success = false;
+    _assertion_failures = 0;
+
+    ShenandoahSimpleBitMap bm_small(SMALL_BITMAP_SIZE);
+    ShenandoahSimpleBitMap bm_large(LARGE_BITMAP_SIZE);
+
+    // Initial state of each bitmap is all bits are clear.  Confirm this:
+    ssize_t set_bits_0[1] = { 0 };
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_0, 0);
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_0, 0);
+
+    bm_small.set_bit(5);
+    bm_small.set_bit(63);
+    bm_small.set_bit(128);
+    ssize_t set_bits_1[3] = { 5, 63, 128 };
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_1, 3);
+
+    bm_large.set_bit(5);
+    bm_large.set_bit(63);
+    bm_large.set_bit(128);
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_1, 3);
+
+    // Test some consecutive bits
+    bm_small.set_bit(140);
+    bm_small.set_bit(141);
+    bm_small.set_bit(142);
+
+    bm_small.set_bit(253);
+    bm_small.set_bit(254);
+    bm_small.set_bit(255);
+
+    bm_small.set_bit(271);
+    bm_small.set_bit(272);
+
+    bm_small.set_bit(320);
+    bm_small.set_bit(321);
+    bm_small.set_bit(322);
+
+    bm_small.set_bit(361);
+
+    ssize_t set_bits_2[15] = { 5, 63, 128, 140, 141, 142, 253, 254, 255, 271, 272, 320, 321, 322, 361 };
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_2, 15);
+
+    bm_large.set_bit(140);
+    bm_large.set_bit(141);
+    bm_large.set_bit(142);
+
+    bm_large.set_bit(1021);
+    bm_large.set_bit(1022);
+    bm_large.set_bit(1023);
+
+    bm_large.set_bit(1051);
+
+    bm_large.set_bit(1280);
+    bm_large.set_bit(1281);
+    bm_large.set_bit(1282);
+
+    bm_large.set_bit(1300);
+    bm_large.set_bit(1301);
+    bm_large.set_bit(1302);
+
+    ssize_t set_bits_3[16] = { 5, 63, 128, 140, 141, 142, 1021, 1022, 1023, 1051, 1280, 1281, 1282, 1300, 1301, 1302 };
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_3, 16);
+
+    // Test clear_bit
+    bm_small.clear_bit(141);
+    bm_small.clear_bit(253);
+    ssize_t set_bits_4[13] = { 5, 63, 128, 140, 142, 254, 255, 271, 272, 320, 321, 322, 361 };
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_4, 13);
+
+    bm_large.clear_bit(5);
+    bm_large.clear_bit(63);
+    bm_large.clear_bit(128);
+    bm_large.clear_bit(141);
+    ssize_t set_bits_5[12] = { 140, 142, 1021, 1022, 1023, 1051, 1280, 1281, 1282, 1300, 1301, 1302 };
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_5, 12);
+
+    // Look for large island of contiguous surrounded by smaller islands of contiguous
+    bm_large.set_bit(1024);
+    bm_large.set_bit(1025);  // size-5 island from 1021 to 1025
+    bm_large.set_bit(1027);
+    bm_large.set_bit(1028);
+    bm_large.set_bit(1029);
+    bm_large.set_bit(1030);
+    bm_large.set_bit(1031);
+    bm_large.set_bit(1032);  // size-6 island from 1027 to 1032
+    bm_large.set_bit(1034);
+    bm_large.set_bit(1035);
+    bm_large.set_bit(1036);  // size-3 island from 1034 to 1036
+    ssize_t set_bits_6[23] = {  140,  142, 1021, 1022, 1023, 1024, 1025, 1027, 1028, 1029, 1030,
+                               1031, 1032, 1034, 1035, 1036, 1051, 1280, 1281, 1282, 1300, 1301, 1302 };
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_6, 23);
+
+    // Test that entire bitmap word (from 1024 to 1088) is 1's
+    ssize_t set_bits_7[76];
+    set_bits_7[0] = 140;
+    set_bits_7[1] = 142;
+    set_bits_7[2] = 1021;
+    set_bits_7[3] = 1022;
+    set_bits_7[4] = 1023;
+    size_t bit_idx = 5;
+    for (ssize_t i = 1024; i <= 1088; i++) {
+      bm_large.set_bit(i);
+      set_bits_7[bit_idx++] = i;
+    }
+    set_bits_7[bit_idx++] = 1280;
+    set_bits_7[bit_idx++] = 1281;
+    set_bits_7[bit_idx++] = 1282;
+    set_bits_7[bit_idx++] = 1300;
+    set_bits_7[bit_idx++] = 1301;
+    set_bits_7[bit_idx++] = 1302;
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_7, bit_idx);
+
+    // Test clear_all()
+    bm_small.clear_all();
+    bm_large.clear_all();
+
+    verifyBitMapState(bm_small, SMALL_BITMAP_SIZE, set_bits_0, 0);
+    verifyBitMapState(bm_large, LARGE_BITMAP_SIZE, set_bits_0, 0);
+
+    _success = true;
+    return true;
+  }
+
+};
+
+TEST(BasicShenandoahSimpleBitMapTest, minimum_test) {
+
+  bool result = ShenandoahSimpleBitMapTest::run_test();
+  ASSERT_EQ(result, true);
+  ASSERT_EQ(_success, true);
+  ASSERT_EQ(_assertion_failures, (size_t) 0);
+}

From da9c23ace9bdf398d811a88ed137217dd3167231 Mon Sep 17 00:00:00 2001
From: Mark Powers <mpowers@openjdk.org>
Date: Thu, 16 May 2024 17:07:19 +0000
Subject: [PATCH 464/486] 8325384:
 sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java failing
 intermittently when main thread is a virtual thread

Reviewed-by: ssahoo, ascarpino
---
 .../ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java
index 4778cc217ba..ea7f4895785 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @library /test/lib /javax/net/ssl/templates
  * @summary Test that a New Session Ticket will be generated when a
  * SSLSessionBindingListener is set (boundValues)
- * @key intermittent
  * @run main/othervm ResumptionUpdateBoundValues
  */
 
@@ -238,7 +237,7 @@ public class ResumptionUpdateBoundValues extends SSLContextTemplate {
         Thread t;
         while ((t = threads.take()) != Thread.currentThread()) {
             System.out.printf("  joining: %s%n", t);
-            t.join(1000L);
+            t.join(4000L);
         }
         serverReady = false;
         System.gc();

From de57d4b2e0fe3add0ef09945b34ddd0b67bbfa2b Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Fri, 17 May 2024 00:44:36 +0000
Subject: [PATCH 465/486] 8332257: Shenandoah: Move evacuation methods to
 implementation file

Reviewed-by: shade, kdnilsen
---
 .../share/gc/shenandoah/shenandoahHeap.cpp    | 77 +++++++++++++++++++
 .../share/gc/shenandoah/shenandoahHeap.hpp    |  2 +-
 .../gc/shenandoah/shenandoahHeap.inline.hpp   | 77 -------------------
 3 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 8150df10914..f270e16f53e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1119,6 +1119,83 @@ void ShenandoahHeap::evacuate_collection_set(bool concurrent) {
   workers()->run_task(&task);
 }
 
+oop ShenandoahHeap::evacuate_object(oop p, Thread* thread) {
+  if (ShenandoahThreadLocalData::is_oom_during_evac(Thread::current())) {
+    // This thread went through the OOM during evac protocol and it is safe to return
+    // the forward pointer. It must not attempt to evacuate any more.
+    return ShenandoahBarrierSet::resolve_forwarded(p);
+  }
+
+  assert(ShenandoahThreadLocalData::is_evac_allowed(thread), "must be enclosed in oom-evac scope");
+
+  size_t size = p->size();
+
+  assert(!heap_region_containing(p)->is_humongous(), "never evacuate humongous objects");
+
+  bool alloc_from_gclab = true;
+  HeapWord* copy = nullptr;
+
+#ifdef ASSERT
+  if (ShenandoahOOMDuringEvacALot &&
+      (os::random() & 1) == 0) { // Simulate OOM every ~2nd slow-path call
+    copy = nullptr;
+  } else {
+#endif
+    if (UseTLAB) {
+      copy = allocate_from_gclab(thread, size);
+    }
+    if (copy == nullptr) {
+      ShenandoahAllocRequest req = ShenandoahAllocRequest::for_shared_gc(size);
+      copy = allocate_memory(req);
+      alloc_from_gclab = false;
+    }
+#ifdef ASSERT
+  }
+#endif
+
+  if (copy == nullptr) {
+    control_thread()->handle_alloc_failure_evac(size);
+
+    _oom_evac_handler.handle_out_of_memory_during_evacuation();
+
+    return ShenandoahBarrierSet::resolve_forwarded(p);
+  }
+
+  // Copy the object:
+  Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(p), copy, size);
+
+  // Try to install the new forwarding pointer.
+  oop copy_val = cast_to_oop(copy);
+  ContinuationGCSupport::relativize_stack_chunk(copy_val);
+
+  oop result = ShenandoahForwarding::try_update_forwardee(p, copy_val);
+  if (result == copy_val) {
+    // Successfully evacuated. Our copy is now the public one!
+    shenandoah_assert_correct(nullptr, copy_val);
+    return copy_val;
+  }  else {
+    // Failed to evacuate. We need to deal with the object that is left behind. Since this
+    // new allocation is certainly after TAMS, it will be considered live in the next cycle.
+    // But if it happens to contain references to evacuated regions, those references would
+    // not get updated for this stale copy during this cycle, and we will crash while scanning
+    // it the next cycle.
+    //
+    // For GCLAB allocations, it is enough to rollback the allocation ptr. Either the next
+    // object will overwrite this stale copy, or the filler object on LAB retirement will
+    // do this. For non-GCLAB allocations, we have no way to retract the allocation, and
+    // have to explicitly overwrite the copy with the filler object. With that overwrite,
+    // we have to keep the fwdptr initialized and pointing to our (stale) copy.
+    if (alloc_from_gclab) {
+      ShenandoahThreadLocalData::gclab(thread)->undo_allocation(copy, size);
+    } else {
+      fill_with_object(copy, size);
+      shenandoah_assert_correct(nullptr, copy_val);
+    }
+    shenandoah_assert_correct(nullptr, result);
+    return result;
+  }
+}
+
 void ShenandoahHeap::trash_cset_regions() {
   ShenandoahHeapLocker locker(lock());
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index e30b1d12e77..f3625da218c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -639,7 +639,7 @@ public:
 
   // Evacuates object src. Returns the evacuated object, either evacuated
   // by this thread, or by some other thread.
-  inline oop evacuate_object(oop src, Thread* thread);
+  oop evacuate_object(oop src, Thread* thread);
 
   // Call before/after evacuation.
   inline void enter_evacuation(Thread* t);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index 87c3ea50ba6..f2cc602d8cb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -287,83 +287,6 @@ inline HeapWord* ShenandoahHeap::allocate_from_gclab(Thread* thread, size_t size
   return allocate_from_gclab_slow(thread, size);
 }
 
-inline oop ShenandoahHeap::evacuate_object(oop p, Thread* thread) {
-  if (ShenandoahThreadLocalData::is_oom_during_evac(Thread::current())) {
-    // This thread went through the OOM during evac protocol and it is safe to return
-    // the forward pointer. It must not attempt to evacuate any more.
-    return ShenandoahBarrierSet::resolve_forwarded(p);
-  }
-
-  assert(ShenandoahThreadLocalData::is_evac_allowed(thread), "must be enclosed in oom-evac scope");
-
-  size_t size = p->size();
-
-  assert(!heap_region_containing(p)->is_humongous(), "never evacuate humongous objects");
-
-  bool alloc_from_gclab = true;
-  HeapWord* copy = nullptr;
-
-#ifdef ASSERT
-  if (ShenandoahOOMDuringEvacALot &&
-      (os::random() & 1) == 0) { // Simulate OOM every ~2nd slow-path call
-        copy = nullptr;
-  } else {
-#endif
-    if (UseTLAB) {
-      copy = allocate_from_gclab(thread, size);
-    }
-    if (copy == nullptr) {
-      ShenandoahAllocRequest req = ShenandoahAllocRequest::for_shared_gc(size);
-      copy = allocate_memory(req);
-      alloc_from_gclab = false;
-    }
-#ifdef ASSERT
-  }
-#endif
-
-  if (copy == nullptr) {
-    control_thread()->handle_alloc_failure_evac(size);
-
-    _oom_evac_handler.handle_out_of_memory_during_evacuation();
-
-    return ShenandoahBarrierSet::resolve_forwarded(p);
-  }
-
-  // Copy the object:
-  Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(p), copy, size);
-
-  // Try to install the new forwarding pointer.
-  oop copy_val = cast_to_oop(copy);
-  ContinuationGCSupport::relativize_stack_chunk(copy_val);
-
-  oop result = ShenandoahForwarding::try_update_forwardee(p, copy_val);
-  if (result == copy_val) {
-    // Successfully evacuated. Our copy is now the public one!
-    shenandoah_assert_correct(nullptr, copy_val);
-    return copy_val;
-  }  else {
-    // Failed to evacuate. We need to deal with the object that is left behind. Since this
-    // new allocation is certainly after TAMS, it will be considered live in the next cycle.
-    // But if it happens to contain references to evacuated regions, those references would
-    // not get updated for this stale copy during this cycle, and we will crash while scanning
-    // it the next cycle.
-    //
-    // For GCLAB allocations, it is enough to rollback the allocation ptr. Either the next
-    // object will overwrite this stale copy, or the filler object on LAB retirement will
-    // do this. For non-GCLAB allocations, we have no way to retract the allocation, and
-    // have to explicitly overwrite the copy with the filler object. With that overwrite,
-    // we have to keep the fwdptr initialized and pointing to our (stale) copy.
-    if (alloc_from_gclab) {
-      ShenandoahThreadLocalData::gclab(thread)->undo_allocation(copy, size);
-    } else {
-      fill_with_object(copy, size);
-      shenandoah_assert_correct(nullptr, copy_val);
-    }
-    shenandoah_assert_correct(nullptr, result);
-    return result;
-  }
-}
-
 inline bool ShenandoahHeap::requires_marking(const void* entry) const {
   oop obj = cast_to_oop(entry);
   return !_marking_context->is_marked_strong(obj);

From 7c750fd95b83d0a93b0cce681dcfbbae1f220fdd Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Fri, 17 May 2024 01:55:30 +0000
Subject: [PATCH 466/486] 8331746: Create a test to verify that the cmm id is
 not ignored

Reviewed-by: prr, dmarkov, aivanov
---
 .../awt/color/ICC_Profile/CustomCMMID.java    | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 test/jdk/java/awt/color/ICC_Profile/CustomCMMID.java

diff --git a/test/jdk/java/awt/color/ICC_Profile/CustomCMMID.java b/test/jdk/java/awt/color/ICC_Profile/CustomCMMID.java
new file mode 100644
index 00000000000..5eb6221d39e
--- /dev/null
+++ b/test/jdk/java/awt/color/ICC_Profile/CustomCMMID.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_Profile;
+import java.util.Arrays;
+
+/**
+ * @test
+ * @bug 8321489
+ * @summary tests that the cmm id is not ignored
+ */
+public final class CustomCMMID {
+
+    private static final byte[] JAVA_ID = {
+            (byte) 'j', (byte) 'a', (byte) 'v', (byte) 'a',
+    };
+
+    private static final int[] CS = {
+            ColorSpace.CS_CIEXYZ, ColorSpace.CS_GRAY, ColorSpace.CS_LINEAR_RGB,
+            ColorSpace.CS_PYCC, ColorSpace.CS_sRGB
+    };
+
+    public static void main(String[] args) {
+        for (int cs : CS) {
+            ICC_Profile p = createProfile(cs);
+            validate(p);
+        }
+    }
+
+    private static ICC_Profile createProfile(int type) {
+        byte[] data = ICC_Profile.getInstance(type).getData();
+        System.arraycopy(JAVA_ID, 0, data, ICC_Profile.icHdrCmmId,
+                         JAVA_ID.length);
+        return ICC_Profile.getInstance(data);
+    }
+
+    private static void validate(ICC_Profile p) {
+        byte[] header = p.getData(ICC_Profile.icSigHead);
+        byte[] id = new byte[JAVA_ID.length];
+        System.arraycopy(header, ICC_Profile.icHdrCmmId, id, 0, JAVA_ID.length);
+
+        if (!java.util.Arrays.equals(id, JAVA_ID)) {
+            System.err.println("Expected: " + Arrays.toString(JAVA_ID));
+            System.err.println("Actual: " + Arrays.toString(id));
+            throw new RuntimeException("Wrong cmm id");
+        }
+    }
+}

From 9160ef8b9d9f2c87ca6df08d85dad4271085f0ac Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Fri, 17 May 2024 04:59:11 +0000
Subject: [PATCH 467/486] 8332237: [nmt] Remove the need for
 ThreadStackTracker::track_as_vm()

Reviewed-by: jsjolen, azafari
---
 src/hotspot/share/nmt/memBaseline.cpp         |  7 +-
 src/hotspot/share/nmt/memReporter.cpp         | 59 ++++--------
 src/hotspot/share/nmt/memTracker.cpp          |  3 +-
 src/hotspot/share/nmt/nmtUsage.cpp            | 14 ++-
 src/hotspot/share/nmt/threadStackTracker.cpp  | 96 +++++--------------
 src/hotspot/share/nmt/threadStackTracker.hpp  | 51 +---------
 .../share/nmt/virtualMemoryTracker.cpp        |  9 +-
 7 files changed, 56 insertions(+), 183 deletions(-)

diff --git a/src/hotspot/share/nmt/memBaseline.cpp b/src/hotspot/share/nmt/memBaseline.cpp
index 1e20bdfe9f6..1411bf7640e 100644
--- a/src/hotspot/share/nmt/memBaseline.cpp
+++ b/src/hotspot/share/nmt/memBaseline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -151,11 +151,6 @@ bool MemBaseline::baseline_allocation_sites() {
     return false;
   }
 
-  // Walk simple thread stacks
-  if (!ThreadStackTracker::walk_simple_thread_stack_site(&malloc_walker)) {
-    return false;
-  }
-
   _malloc_sites.move(malloc_walker.malloc_sites());
   // The malloc sites are collected in size order
   _malloc_sites_order = by_size;
diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
index edb289c2f35..b880e56a853 100644
--- a/src/hotspot/share/nmt/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -193,17 +193,10 @@ void MemSummaryReporter::report_summary_of_type(MEMFLAGS flag,
 
   // Count thread's native stack in "Thread" category
   if (flag == mtThread) {
-    if (ThreadStackTracker::track_as_vm()) {
-      const VirtualMemory* thread_stack_usage =
-        (const VirtualMemory*)_vm_snapshot->by_type(mtThreadStack);
-      reserved_amount  += thread_stack_usage->reserved();
-      committed_amount += thread_stack_usage->committed();
-    } else {
-      const MallocMemory* thread_stack_usage =
-        (const MallocMemory*)_malloc_snapshot->by_type(mtThreadStack);
-      reserved_amount += thread_stack_usage->malloc_size();
-      committed_amount += thread_stack_usage->malloc_size();
-    }
+    const VirtualMemory* thread_stack_usage =
+      (const VirtualMemory*)_vm_snapshot->by_type(mtThreadStack);
+    reserved_amount  += thread_stack_usage->reserved();
+    committed_amount += thread_stack_usage->committed();
   } else if (flag == mtNMT) {
     // Count malloc headers in "NMT" category
     reserved_amount  += _malloc_snapshot->malloc_overhead();
@@ -240,21 +233,12 @@ void MemSummaryReporter::report_summary_of_type(MEMFLAGS flag,
     out->print_cr("%27s (  instance classes #" SIZE_FORMAT ", array classes #" SIZE_FORMAT ")",
       " ", _instance_class_count, _array_class_count);
   } else if (flag == mtThread) {
-    if (ThreadStackTracker::track_as_vm()) {
-      const VirtualMemory* thread_stack_usage =
-       _vm_snapshot->by_type(mtThreadStack);
-      // report thread count
-      out->print_cr("%27s (threads #" SIZE_FORMAT ")", " ", ThreadStackTracker::thread_count());
-      out->print("%27s (stack: ", " ");
-      print_total(thread_stack_usage->reserved(), thread_stack_usage->committed(), thread_stack_usage->peak_size());
-    } else {
-      MallocMemory* thread_stack_memory = _malloc_snapshot->by_type(mtThreadStack);
-      const char* scale = current_scale();
-      // report thread count
-      out->print_cr("%27s (threads #" SIZE_FORMAT ")", " ", thread_stack_memory->malloc_count());
-      out->print("%27s (Stack: " SIZE_FORMAT "%s", " ",
-        amount_in_current_scale(thread_stack_memory->malloc_size()), scale);
-    }
+    const VirtualMemory* thread_stack_usage =
+     _vm_snapshot->by_type(mtThreadStack);
+    // report thread count
+    out->print_cr("%27s (threads #" SIZE_FORMAT ")", " ", ThreadStackTracker::thread_count());
+    out->print("%27s (stack: ", " ");
+    print_total(thread_stack_usage->reserved(), thread_stack_usage->committed(), thread_stack_usage->peak_size());
     out->print_cr(")");
   }
 
@@ -627,24 +611,15 @@ void MemSummaryDiffReporter::diff_summary_of_type(MEMFLAGS flag,
       out->print_cr(")");
 
       out->print("%27s (stack: ", " ");
-      if (ThreadStackTracker::track_as_vm()) {
-        // report thread stack
-        const VirtualMemory* current_thread_stack =
-          _current_baseline.virtual_memory(mtThreadStack);
-        const VirtualMemory* early_thread_stack =
-          _early_baseline.virtual_memory(mtThreadStack);
+      // report thread stack
+      const VirtualMemory* current_thread_stack =
+        _current_baseline.virtual_memory(mtThreadStack);
+      const VirtualMemory* early_thread_stack =
+        _early_baseline.virtual_memory(mtThreadStack);
 
-        print_virtual_memory_diff(current_thread_stack->reserved(), current_thread_stack->committed(),
-          early_thread_stack->reserved(), early_thread_stack->committed());
-      } else {
-        const MallocMemory* current_thread_stack =
-          _current_baseline.malloc_memory(mtThreadStack);
-        const MallocMemory* early_thread_stack =
-          _early_baseline.malloc_memory(mtThreadStack);
+      print_virtual_memory_diff(current_thread_stack->reserved(), current_thread_stack->committed(),
+        early_thread_stack->reserved(), early_thread_stack->committed());
 
-        print_malloc_diff(current_thread_stack->malloc_size(), current_thread_stack->malloc_count(),
-          early_thread_stack->malloc_size(), early_thread_stack->malloc_count(), flag);
-      }
       out->print_cr(")");
     }
 
diff --git a/src/hotspot/share/nmt/memTracker.cpp b/src/hotspot/share/nmt/memTracker.cpp
index 5504f436b7d..955bd816737 100644
--- a/src/hotspot/share/nmt/memTracker.cpp
+++ b/src/hotspot/share/nmt/memTracker.cpp
@@ -67,8 +67,7 @@ void MemTracker::initialize() {
 
   if (level > NMT_off) {
     if (!MallocTracker::initialize(level) ||
-        !VirtualMemoryTracker::initialize(level) ||
-        !ThreadStackTracker::initialize(level)) {
+        !VirtualMemoryTracker::initialize(level)) {
       assert(false, "NMT initialization failed");
       level = NMT_off;
       log_warning(nmt)("NMT initialization failed. NMT disabled.");
diff --git a/src/hotspot/share/nmt/nmtUsage.cpp b/src/hotspot/share/nmt/nmtUsage.cpp
index a00b3cdc90d..62c41225441 100644
--- a/src/hotspot/share/nmt/nmtUsage.cpp
+++ b/src/hotspot/share/nmt/nmtUsage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,13 +43,11 @@ NMTUsage::NMTUsage(NMTUsageOptions options) :
     _usage_options(options) { }
 
 void NMTUsage::walk_thread_stacks() {
-  // If backed by virtual memory, snapping the thread stacks involves walking
-  // them to to figure out how much memory is committed if they are backed by
-  // virtual memory. This needs ot happen before we take the snapshot of the
-  // virtual memory since it will update this information.
-  if (ThreadStackTracker::track_as_vm()) {
-    VirtualMemoryTracker::snapshot_thread_stacks();
-  }
+  // Snapping the thread stacks involves walking the areas to figure out how
+  // much memory had been committed if they are backed by virtual memory. This
+  // needs to happen before we take the snapshot of the virtual memory since it
+  // will update this information.
+  VirtualMemoryTracker::snapshot_thread_stacks();
 }
 
 void NMTUsage::update_malloc_usage() {
diff --git a/src/hotspot/share/nmt/threadStackTracker.cpp b/src/hotspot/share/nmt/threadStackTracker.cpp
index 6060b636153..6f112fa8fc5 100644
--- a/src/hotspot/share/nmt/threadStackTracker.cpp
+++ b/src/hotspot/share/nmt/threadStackTracker.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2019, 2021, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2019, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,95 +25,46 @@
 
 #include "precompiled.hpp"
 
-#include "nmt/mallocTracker.hpp"
 #include "nmt/memTracker.hpp"
 #include "nmt/threadStackTracker.hpp"
 #include "nmt/virtualMemoryTracker.hpp"
+#include "runtime/os.hpp"
 #include "runtime/threadCritical.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 volatile size_t ThreadStackTracker::_thread_count = 0;
-SortedLinkedList<SimpleThreadStackSite, ThreadStackTracker::compare_thread_stack_base>* ThreadStackTracker::_simple_thread_stacks = nullptr;
 
-bool ThreadStackTracker::initialize(NMT_TrackingLevel level) {
-  if (level == NMT_detail && !track_as_vm()) {
-    _simple_thread_stacks = new (std::nothrow, mtNMT)
-      SortedLinkedList<SimpleThreadStackSite, ThreadStackTracker::compare_thread_stack_base>();
-    return (_simple_thread_stacks != nullptr);
-  }
-  return true;
-}
-
-int ThreadStackTracker::compare_thread_stack_base(const SimpleThreadStackSite& s1, const SimpleThreadStackSite& s2) {
-  return primitive_compare(s1.base(), s2.base());
+static void align_thread_stack_boundaries_inward(void*& base, size_t& size) {
+  // Thread stack boundaries don't have to be aligned to page boundaries. For cases where they
+  // are not aligned (e.g. AIX, Alpine), this function corrects boundaries inward to the next
+  // page boundaries. This ensures that we can track thread stacks piggybacking on the virtual
+  // memory tracker.
+  void* const base_aligned = align_up(base, os::vm_page_size());
+  const size_t size_aligned = align_down(size, os::vm_page_size());
+  assert(size_aligned > 0, "stack size less than a page?");
+  base = base_aligned;
+  size = size_aligned;
 }
 
 void ThreadStackTracker::new_thread_stack(void* base, size_t size, const NativeCallStack& stack) {
-  assert(MemTracker::tracking_level() >= NMT_summary, "Must be");
+  assert(MemTracker::enabled(), "Must be");
   assert(base != nullptr, "Should have been filtered");
+  align_thread_stack_boundaries_inward(base, size);
+
   ThreadCritical tc;
-  if (track_as_vm()) {
-    VirtualMemoryTracker::add_reserved_region((address)base, size, stack, mtThreadStack);
-  } else {
-    // Use a slot in mallocMemorySummary for thread stack bookkeeping
-    MallocMemorySummary::record_malloc(size, mtThreadStack);
-    if (MemTracker::tracking_level() == NMT_detail) {
-      assert(_simple_thread_stacks != nullptr, "Must be initialized");
-      SimpleThreadStackSite site((address)base, size, stack);
-      _simple_thread_stacks->add(site);
-    }
-  }
+  VirtualMemoryTracker::add_reserved_region((address)base, size, stack, mtThreadStack);
   _thread_count++;
 }
 
 void ThreadStackTracker::delete_thread_stack(void* base, size_t size) {
-  assert(MemTracker::tracking_level() >= NMT_summary, "Must be");
+  assert(MemTracker::enabled(), "Must be");
   assert(base != nullptr, "Should have been filtered");
+  align_thread_stack_boundaries_inward(base, size);
+
   ThreadCritical tc;
-  if(track_as_vm()) {
-    VirtualMemoryTracker::remove_released_region((address)base, size);
-  } else {
-    // Use a slot in mallocMemorySummary for thread stack bookkeeping
-    MallocMemorySummary::record_free(size, mtThreadStack);
-    if (MemTracker::tracking_level() == NMT_detail) {
-      assert(_simple_thread_stacks != nullptr, "Must be initialized");
-      SimpleThreadStackSite site((address)base, size, NativeCallStack::empty_stack()); // Fake object just to serve as compare target for delete
-      bool removed = _simple_thread_stacks->remove(site);
-      assert(removed, "Must exist");
-    }
-  }
+  VirtualMemoryTracker::remove_released_region((address)base, size);
   _thread_count--;
 }
 
-bool ThreadStackTracker::walk_simple_thread_stack_site(MallocSiteWalker* walker) {
-  if (!track_as_vm()) {
-    LinkedListImpl<MallocSite> _sites;
-    {
-      ThreadCritical tc;
-      assert(_simple_thread_stacks != nullptr, "Must be initialized");
-      LinkedListIterator<SimpleThreadStackSite> itr(_simple_thread_stacks->head());
-      const SimpleThreadStackSite* ts = itr.next();
-      // Consolidate sites and convert to MallocSites, so we can piggyback into
-      // malloc snapshot
-      while (ts != nullptr) {
-        MallocSite site(*ts->call_stack(), mtThreadStack);
-        MallocSite* exist = _sites.find(site);
-        if (exist != nullptr) {
-          exist->allocate(ts->size());
-        } else {
-          site.allocate(ts->size());
-          _sites.add(site);
-        }
-        ts = itr.next();
-      }
-    }
-
-    // Piggyback to malloc snapshot
-    LinkedListIterator<MallocSite> site_itr(_sites.head());
-    const MallocSite* s = site_itr.next();
-    while (s != nullptr) {
-      walker->do_malloc_site(s);
-      s = site_itr.next();
-    }
-  }
-  return true;
-}
diff --git a/src/hotspot/share/nmt/threadStackTracker.hpp b/src/hotspot/share/nmt/threadStackTracker.hpp
index 6e2ec361954..0be7f528264 100644
--- a/src/hotspot/share/nmt/threadStackTracker.hpp
+++ b/src/hotspot/share/nmt/threadStackTracker.hpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2019, 2021, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2019, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,61 +26,17 @@
 #ifndef SHARE_NMT_THREADSTACKTRACKER_HPP
 #define SHARE_NMT_THREADSTACKTRACKER_HPP
 
-#include "nmt/allocationSite.hpp"
-#include "nmt/mallocSiteTable.hpp"
-#include "nmt/nmtCommon.hpp"
-#include "utilities/linkedlist.hpp"
+#include "memory/allStatic.hpp"
+#include "utilities/globalDefinitions.hpp"
 #include "utilities/nativeCallStack.hpp"
 
-class SimpleThreadStackSite : public AllocationSite {
-  const address _base;
-  const size_t  _size;
-public:
-  SimpleThreadStackSite(address base, size_t size, const NativeCallStack& stack) :
-    AllocationSite(stack, mtThreadStack),
-    _base(base),
-    _size(size) {}
-
-  bool equals(const SimpleThreadStackSite& mts) const {
-    bool eq = base() == mts.base();
-    assert(!eq || size() == mts.size(), "Must match");
-    return eq;
-  }
-
-  size_t  size() const { return _size; }
-  address base() const { return _base; }
-};
-
-  /*
-   * Most of platforms, that hotspot support, have their thread stacks backed by
-   * virtual memory by default. For these cases, thread stack tracker simply
-   * delegates tracking to virtual memory tracker.
-   * However, there are exceptions, (e.g. AIX), that platforms can provide stacks
-   * that are not page aligned. A hypothetical VM implementation, it can provide
-   * it own stacks. In these case, track_as_vm() should return false and manage
-   * stack tracking by this tracker internally.
-   * During memory snapshot, tracked thread stacks memory data is walked and stored
-   * along with malloc'd data inside baseline. The regions are not scanned and assumed
-   * all committed for now. Can add scanning phase when there is a need.
-   */
 class ThreadStackTracker : AllStatic {
 private:
   static volatile size_t _thread_count;
-
-  static int compare_thread_stack_base(const SimpleThreadStackSite& s1, const SimpleThreadStackSite& s2);
-  static SortedLinkedList<SimpleThreadStackSite, compare_thread_stack_base>* _simple_thread_stacks;
 public:
-  static bool initialize(NMT_TrackingLevel level);
-
   static void new_thread_stack(void* base, size_t size, const NativeCallStack& stack);
   static void delete_thread_stack(void* base, size_t size);
-
-  static bool   track_as_vm()  { return AIX_ONLY(false) NOT_AIX(true); }
   static size_t thread_count() { return _thread_count; }
-
-  // Snapshot support. Piggyback thread stack data in malloc slot, NMT always handles
-  // thread stack slot specially since beginning.
-  static bool walk_simple_thread_stack_site(MallocSiteWalker* walker);
 };
 
 #endif // SHARE_NMT_THREADSTACKTRACKER_HPP
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index 06f9469f25e..46d7e4b644f 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, 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
@@ -47,11 +47,8 @@ void VirtualMemory::update_peak(size_t size) {
 }
 
 void VirtualMemorySummary::snapshot(VirtualMemorySnapshot* s) {
-  // Only if thread stack is backed by virtual memory
-  if (ThreadStackTracker::track_as_vm()) {
-    // Snapshot current thread stacks
-    VirtualMemoryTracker::snapshot_thread_stacks();
-  }
+  // Snapshot current thread stacks
+  VirtualMemoryTracker::snapshot_thread_stacks();
   as_snapshot()->copy_to(s);
 }
 

From 6422efa3c7917525a879e80657ca4dcfb6d67514 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 17 May 2024 06:33:56 +0000
Subject: [PATCH 468/486] 8332394: Add friendly output when @IR rule missing
 value

Reviewed-by: chagedorn
---
 .../ir_framework/test/IREncodingPrinter.java  | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
index 47cec9f5e13..52697072560 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -158,22 +158,22 @@ public class IREncodingPrinter {
         checkIRAnnotations(irAnno);
         if (isIRNodeUnsupported(irAnno)) {
             return false;
-        } else if (irAnno.applyIfPlatform().length != 0 && !hasAllRequiredPlatform(irAnno.applyIfPlatform())) {
+        } else if (irAnno.applyIfPlatform().length != 0 && !hasAllRequiredPlatform(irAnno.applyIfPlatform(), "applyIfPlatform")) {
             printDisableReason(m, "Constraint not met (applyIfPlatform)", irAnno.applyIfPlatform(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfPlatformAnd().length != 0 && !hasAllRequiredPlatform(irAnno.applyIfPlatformAnd())) {
+        } else if (irAnno.applyIfPlatformAnd().length != 0 && !hasAllRequiredPlatform(irAnno.applyIfPlatformAnd(), "applyIfPlatformAnd")) {
             printDisableReason(m, "Not all constraints are met (applyIfPlatformAnd)", irAnno.applyIfPlatformAnd(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfPlatformOr().length != 0 && !hasAnyRequiredPlatform(irAnno.applyIfPlatformOr())) {
+        } else if (irAnno.applyIfPlatformOr().length != 0 && !hasAnyRequiredPlatform(irAnno.applyIfPlatformOr(), "applyIfPlatformOr")) {
             printDisableReason(m, "None of the constraints are met (applyIfPlatformOr)", irAnno.applyIfPlatformOr(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfCPUFeature().length != 0 && !hasAllRequiredCPUFeature(irAnno.applyIfCPUFeature())) {
+        } else if (irAnno.applyIfCPUFeature().length != 0 && !hasAllRequiredCPUFeature(irAnno.applyIfCPUFeature(), "applyIfCPUFeature")) {
             printDisableReason(m, "Feature constraint not met (applyIfCPUFeature)", irAnno.applyIfCPUFeature(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfCPUFeatureAnd().length != 0 && !hasAllRequiredCPUFeature(irAnno.applyIfCPUFeatureAnd())) {
+        } else if (irAnno.applyIfCPUFeatureAnd().length != 0 && !hasAllRequiredCPUFeature(irAnno.applyIfCPUFeatureAnd(), "applyIfCPUFeatureAnd")) {
             printDisableReason(m, "Not all feature constraints are met (applyIfCPUFeatureAnd)", irAnno.applyIfCPUFeatureAnd(), ruleIndex, ruleMax);
             return false;
-        } else if (irAnno.applyIfCPUFeatureOr().length != 0 && !hasAnyRequiredCPUFeature(irAnno.applyIfCPUFeatureOr())) {
+        } else if (irAnno.applyIfCPUFeatureOr().length != 0 && !hasAnyRequiredCPUFeature(irAnno.applyIfCPUFeatureOr(), "applyIfCPUFeatureOr")) {
             printDisableReason(m, "None of the feature constraints met (applyIfCPUFeatureOr)", irAnno.applyIfCPUFeatureOr(), ruleIndex, ruleMax);
             return false;
         } else if (irAnno.applyIf().length != 0 && !hasAllRequiredFlags(irAnno.applyIf(), "applyIf")) {
@@ -285,22 +285,24 @@ public class IREncodingPrinter {
         return returnValue;
     }
 
-    private boolean hasAllRequiredPlatform(String[] andRules) {
+    private boolean hasAllRequiredPlatform(String[] andRules, String ruleType) {
         boolean returnValue = true;
         for (int i = 0; i < andRules.length; i++) {
             String platform = andRules[i].trim();
             i++;
+            TestFormat.check(i < andRules.length, "Missing value for platform " + platform + " in " + ruleType + failAt());
             String value = andRules[i].trim();
             returnValue &= checkPlatform(platform, value);
         }
         return returnValue;
     }
 
-    private boolean hasAnyRequiredPlatform(String[] orRules) {
+    private boolean hasAnyRequiredPlatform(String[] orRules, String ruleType) {
         boolean returnValue = false;
         for (int i = 0; i < orRules.length; i++) {
             String platform = orRules[i].trim();
             i++;
+            TestFormat.check(i < orRules.length, "Missing value for platform " + platform + " in " + ruleType + failAt());
             String value = orRules[i].trim();
             returnValue |= checkPlatform(platform, value);
         }
@@ -361,22 +363,24 @@ public class IREncodingPrinter {
         return (trueValue && currentPlatform.contains(platform)) || (falseValue && !currentPlatform.contains(platform));
     }
 
-    private boolean hasAllRequiredCPUFeature(String[] andRules) {
+    private boolean hasAllRequiredCPUFeature(String[] andRules, String ruleType) {
         boolean returnValue = true;
         for (int i = 0; i < andRules.length; i++) {
             String feature = andRules[i].trim();
             i++;
+            TestFormat.check(i < andRules.length, "Missing value for cpu feature " + feature + " in " + ruleType + failAt());
             String value = andRules[i].trim();
             returnValue &= checkCPUFeature(feature, value);
         }
         return returnValue;
     }
 
-    private boolean hasAnyRequiredCPUFeature(String[] orRules) {
+    private boolean hasAnyRequiredCPUFeature(String[] orRules, String ruleType) {
         boolean returnValue = false;
         for (int i = 0; i < orRules.length; i++) {
             String feature = orRules[i].trim();
             i++;
+            TestFormat.check(i < orRules.length, "Missing value for cpu feature " + feature + " in " + ruleType + failAt());
             String value = orRules[i].trim();
             returnValue |= checkCPUFeature(feature, value);
         }

From ae999eae7e61072ad964a43f622fa930ce1179f7 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Fri, 17 May 2024 06:39:53 +0000
Subject: [PATCH 469/486] 8129418: JShell: better highlighting of errors in
 imports on demand

Reviewed-by: jlahoda
---
 .../share/classes/com/sun/tools/javac/comp/Check.java       | 2 +-
 test/langtools/jdk/jshell/ImportTest.java                   | 5 ++---
 test/langtools/tools/javac/7129225/NegTest.out              | 2 +-
 test/langtools/tools/javac/7129225/TestImportStar.out       | 2 +-
 .../tools/javac/importChecks/ImportIsFullyQualified.out     | 2 +-
 .../tools/javac/importChecks/ImportsObservable.out          | 2 +-
 .../tools/javac/modules/ConvenientAccessErrorsTest.java     | 6 +++---
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index d98aad1e9d8..fc96eaa0be1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -4428,7 +4428,7 @@ public class Check {
                 TypeSymbol tsym = imp.qualid.selected.type.tsym;
                 if (tsym.kind == PCK && tsym.members().isEmpty() &&
                     !(Feature.IMPORT_ON_DEMAND_OBSERVABLE_PACKAGES.allowedInSource(source) && tsym.exists())) {
-                    log.error(DiagnosticFlag.RESOLVE_ERROR, imp.pos, Errors.DoesntExist(tsym));
+                    log.error(DiagnosticFlag.RESOLVE_ERROR, imp.qualid.selected.pos(), Errors.DoesntExist(tsym));
                 }
             }
         }
diff --git a/test/langtools/jdk/jshell/ImportTest.java b/test/langtools/jdk/jshell/ImportTest.java
index b8f3f1ee5d0..0e1dbfead96 100644
--- a/test/langtools/jdk/jshell/ImportTest.java
+++ b/test/langtools/jdk/jshell/ImportTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8141415
+ * @bug 8141415 8129418
  * @summary Test imports
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -80,12 +80,11 @@ public class ImportTest extends KullaTesting {
         assertEval("abs(cos(PI / 2)) < 0.00001;", "true");
     }
 
-    @Test(enabled = false) // TODO 8129418
     public void testUnknownPackage() {
         assertDeclareFail("import unknown.qqq;",
                 new ExpectedDiagnostic("compiler.err.doesnt.exist", 7, 18, 14, -1, -1, Diagnostic.Kind.ERROR));
         assertDeclareFail("import unknown.*;",
-                new ExpectedDiagnostic("compiler.err.doesnt.exist", 7, 15, 7, -1, -1, Diagnostic.Kind.ERROR));
+                new ExpectedDiagnostic("compiler.err.doesnt.exist", 7, 14, 7, -1, -1, Diagnostic.Kind.ERROR));
     }
 
     public void testBogusImportIgnoredInFuture() {
diff --git a/test/langtools/tools/javac/7129225/NegTest.out b/test/langtools/tools/javac/7129225/NegTest.out
index d6fbd22adc3..53ceaa4cb9a 100644
--- a/test/langtools/tools/javac/7129225/NegTest.out
+++ b/test/langtools/tools/javac/7129225/NegTest.out
@@ -1,2 +1,2 @@
-TestImportStar.java:16:1: compiler.err.doesnt.exist: xxx
+TestImportStar.java:16:8: compiler.err.doesnt.exist: xxx
 1 error
diff --git a/test/langtools/tools/javac/7129225/TestImportStar.out b/test/langtools/tools/javac/7129225/TestImportStar.out
index 86ff8933138..352c0848392 100644
--- a/test/langtools/tools/javac/7129225/TestImportStar.out
+++ b/test/langtools/tools/javac/7129225/TestImportStar.out
@@ -1,4 +1,4 @@
 - compiler.note.proc.messager: RUNNING - lastRound = false
-TestImportStar.java:16:1: compiler.err.doesnt.exist: xxx
+TestImportStar.java:16:8: compiler.err.doesnt.exist: xxx
 - compiler.note.proc.messager: RUNNING - lastRound = true
 1 error
diff --git a/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out b/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out
index 33e7d2f71c3..89495c2b93d 100644
--- a/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out
+++ b/test/langtools/tools/javac/importChecks/ImportIsFullyQualified.out
@@ -1,2 +1,2 @@
-ImportIsFullyQualified.java:11:1: compiler.err.doesnt.exist: JobAttributes
+ImportIsFullyQualified.java:11:8: compiler.err.doesnt.exist: JobAttributes
 1 error
diff --git a/test/langtools/tools/javac/importChecks/ImportsObservable.out b/test/langtools/tools/javac/importChecks/ImportsObservable.out
index e6b6e51e4bb..28ba84c6aa4 100644
--- a/test/langtools/tools/javac/importChecks/ImportsObservable.out
+++ b/test/langtools/tools/javac/importChecks/ImportsObservable.out
@@ -1,2 +1,2 @@
-ImportsObservable.java:9:1: compiler.err.doesnt.exist: javax
+ImportsObservable.java:9:8: compiler.err.doesnt.exist: javax
 1 error
diff --git a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
index cf06bd06dfe..24c2b045800 100644
--- a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
+++ b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
@@ -799,7 +799,7 @@ public class ConvenientAccessErrorsTest extends ModuleTestBase {
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected = Arrays.asList(
-                "Test.java:1:31: compiler.err.doesnt.exist: ma",
+                "Test.java:1:38: compiler.err.doesnt.exist: ma",
                 "1 error");
 
         if (!expected.equals(log))
@@ -827,7 +827,7 @@ public class ConvenientAccessErrorsTest extends ModuleTestBase {
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected = Arrays.asList(
-                "Test.java:1:15: compiler.err.doesnt.exist: ma",
+                "Test.java:1:22: compiler.err.doesnt.exist: ma",
                 "1 error");
 
         if (!expected.equals(log))
@@ -861,7 +861,7 @@ public class ConvenientAccessErrorsTest extends ModuleTestBase {
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected = Arrays.asList(
-                "Test.java:1:15: compiler.err.doesnt.exist: ma",
+                "Test.java:1:22: compiler.err.doesnt.exist: ma",
                 "1 error");
 
         if (!expected.equals(log))

From 14198f502f0a721e479adc754a2c7d94b665fbe6 Mon Sep 17 00:00:00 2001
From: Joachim Kern <jkern@openjdk.org>
Date: Fri, 17 May 2024 08:31:41 +0000
Subject: [PATCH 470/486] 8329653: JLILaunchTest fails on AIX after JDK-8329131

Reviewed-by: clanger, mdoerr
---
 src/java.base/unix/native/libjli/java_md.c    | 11 +++++
 src/java.base/unix/native/libjli/java_md.h    |  1 +
 .../unix/native/libjli/java_md_common.c       | 43 +++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/src/java.base/unix/native/libjli/java_md.c b/src/java.base/unix/native/libjli/java_md.c
index d2c04d8c25d..2a1a4e7795a 100644
--- a/src/java.base/unix/native/libjli/java_md.c
+++ b/src/java.base/unix/native/libjli/java_md.c
@@ -516,6 +516,17 @@ GetJREPath(char *path, jint pathsize, jboolean speculative)
         }
     }
 
+#if defined(AIX)
+    /* at least on AIX try also the LD_LIBRARY_PATH / LIBPATH */
+    if (GetApplicationHomeFromLibpath(path, pathsize)) {
+        JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/" JAVA_DLL, path);
+        if (stat(libjava, &s) == 0) {
+            JLI_TraceLauncher("JRE path is %s\n", path);
+            return JNI_TRUE;
+        }
+    }
+#endif
+
     if (!speculative)
       JLI_ReportErrorMessage(JRE_ERROR8 JAVA_DLL);
     return JNI_FALSE;
diff --git a/src/java.base/unix/native/libjli/java_md.h b/src/java.base/unix/native/libjli/java_md.h
index e3600f67347..acc75ab091d 100644
--- a/src/java.base/unix/native/libjli/java_md.h
+++ b/src/java.base/unix/native/libjli/java_md.h
@@ -60,6 +60,7 @@ static jboolean GetJVMPath(const char *jrepath, const char *jvmtype,
 static jboolean GetJREPath(char *path, jint pathsize, jboolean speculative);
 
 #if defined(_AIX)
+jboolean GetApplicationHomeFromLibpath(char *buf, jint bufsize);
 #include "java_md_aix.h"
 #endif
 
diff --git a/src/java.base/unix/native/libjli/java_md_common.c b/src/java.base/unix/native/libjli/java_md_common.c
index 488b7382b7c..511519ae362 100644
--- a/src/java.base/unix/native/libjli/java_md_common.c
+++ b/src/java.base/unix/native/libjli/java_md_common.c
@@ -25,6 +25,8 @@
 #include <sys/time.h>
 #include "java.h"
 
+#define JAVA_DLL "libjava.so"
+
 /*
  * Find the last occurrence of a string
  */
@@ -108,6 +110,47 @@ GetApplicationHomeFromDll(char *buf, jint bufsize)
     return JNI_FALSE;
 }
 
+#if defined(AIX)
+static jboolean
+LibjavaExists(const char *path)
+{
+    char tmp[PATH_MAX + 1];
+    struct stat statbuf;
+    JLI_Snprintf(tmp, PATH_MAX, "%s/%s", path, JAVA_DLL);
+    if (stat(tmp, &statbuf) == 0) {
+        return JNI_TRUE;
+    }
+    return JNI_FALSE;
+}
+
+/*
+ * Retrieves the path to the JRE home by locating libjava.so in
+ * LIBPATH and then truncating the path to it.
+ */
+jboolean
+GetApplicationHomeFromLibpath(char *buf, jint bufsize)
+{
+    char *env = getenv("LIBPATH");
+    char *tmp;
+    char *save_ptr = NULL;
+    char *envpath = JLI_StringDup(env);
+    for (tmp = strtok_r(envpath, ":", &save_ptr); tmp != NULL; tmp = strtok_r(NULL, ":", &save_ptr)) {
+        if (LibjavaExists(tmp)) {
+            char *path = realpath(tmp, buf);
+            if (path == buf) {
+                JLI_StrCat(buf, "/");
+                if (JNI_TRUE == TruncatePath(buf, JNI_TRUE)) {
+                    JLI_MemFree(envpath);
+                    return JNI_TRUE;
+                }
+            }
+        }
+    }
+    JLI_MemFree(envpath);
+    return JNI_FALSE;
+}
+#endif
+
 /*
  * Return true if the named program exists
  */

From f1ce9b0ecce9b506f5bf7a66fcf03c93b9ae8fed Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 17 May 2024 09:09:02 +0000
Subject: [PATCH 471/486] 8331557: Serial: Refactor SerialHeap::do_collection

Reviewed-by: gli, iwalulya
---
 .../share/gc/serial/defNewGeneration.cpp      |  17 +-
 .../share/gc/serial/defNewGeneration.hpp      |  10 +-
 src/hotspot/share/gc/serial/generation.cpp    |  11 -
 src/hotspot/share/gc/serial/generation.hpp    |  52 ---
 src/hotspot/share/gc/serial/serialHeap.cpp    | 388 +++++++-----------
 src/hotspot/share/gc/serial/serialHeap.hpp    |  44 +-
 .../share/gc/serial/serialVMOperations.cpp    |  10 +-
 .../share/gc/serial/serialVMOperations.hpp    |  31 +-
 .../share/gc/serial/tenuredGeneration.cpp     |  23 --
 .../share/gc/serial/tenuredGeneration.hpp     |  14 +-
 .../share/gc/serial/vmStructs_serial.hpp      |   5 -
 .../share/gc/shared/gcVMOperations.hpp        |   8 +-
 src/hotspot/share/runtime/vmOperation.hpp     |   4 +-
 .../sun/jvm/hotspot/gc/serial/Generation.java |  26 --
 .../sun/jvm/hotspot/gc/serial/SerialHeap.java |   4 +-
 15 files changed, 208 insertions(+), 439 deletions(-)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index ff65a6dd450..b1f69e126f1 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -641,22 +641,9 @@ void DefNewGeneration::adjust_desired_tenuring_threshold() {
   age_table()->print_age_table();
 }
 
-void DefNewGeneration::collect(bool   full,
-                               bool   clear_all_soft_refs,
-                               size_t size,
-                               bool   is_tlab) {
-  assert(full || size > 0, "otherwise we don't want to collect");
-
+bool DefNewGeneration::collect(bool clear_all_soft_refs) {
   SerialHeap* heap = SerialHeap::heap();
 
-  // If the next generation is too full to accommodate promotion
-  // from this generation, pass on collection; let the next generation
-  // do it.
-  if (!collection_attempt_is_safe()) {
-    log_trace(gc)(":: Collection attempt not safe ::");
-    heap->set_incremental_collection_failed(); // Slight lie: we did not even attempt one
-    return;
-  }
   assert(to()->is_empty(), "Else not collection_attempt_is_safe");
   _gc_timer->register_gc_start();
   _gc_tracer->report_gc_start(heap->gc_cause(), _gc_timer->gc_start());
@@ -774,6 +761,8 @@ void DefNewGeneration::collect(bool   full,
   _gc_timer->register_gc_end();
 
   _gc_tracer->report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
+
+  return !_promotion_failed;
 }
 
 void DefNewGeneration::init_assuming_no_promotion_failure() {
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index 2feb92505e6..db7eba29ad2 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -208,19 +208,18 @@ class DefNewGeneration: public Generation {
   HeapWord* block_start(const void* p) const;
 
   // Allocation support
-  virtual bool should_allocate(size_t word_size, bool is_tlab) {
+  bool should_allocate(size_t word_size, bool is_tlab) {
     assert(UseTLAB || !is_tlab, "Should not allocate tlab");
+    assert(word_size != 0, "precondition");
 
     size_t overflow_limit    = (size_t)1 << (BitsPerSize_t - LogHeapWordSize);
 
-    const bool non_zero      = word_size > 0;
     const bool overflows     = word_size >= overflow_limit;
     const bool check_too_big = _pretenure_size_threshold_words > 0;
     const bool not_too_big   = word_size < _pretenure_size_threshold_words;
     const bool size_ok       = is_tlab || !check_too_big || not_too_big;
 
     bool result = !overflows &&
-                  non_zero   &&
                   size_ok;
 
     return result;
@@ -253,10 +252,7 @@ class DefNewGeneration: public Generation {
   // at some additional cost.
   bool collection_attempt_is_safe();
 
-  virtual void collect(bool   full,
-                       bool   clear_all_soft_refs,
-                       size_t size,
-                       bool   is_tlab);
+  bool collect(bool clear_all_soft_refs);
 
   HeapWord* expand_and_allocate(size_t size, bool is_tlab);
 
diff --git a/src/hotspot/share/gc/serial/generation.cpp b/src/hotspot/share/gc/serial/generation.cpp
index 02edd8ae0a1..f17851af590 100644
--- a/src/hotspot/share/gc/serial/generation.cpp
+++ b/src/hotspot/share/gc/serial/generation.cpp
@@ -70,14 +70,3 @@ void Generation::print_on(outputStream* st)  const {
               p2i(_virtual_space.high()),
               p2i(_virtual_space.high_boundary()));
 }
-
-void Generation::print_summary_info_on(outputStream* st) {
-  StatRecord* sr = stat_record();
-  double time = sr->accumulated_time.seconds();
-  st->print_cr("Accumulated %s generation GC time %3.7f secs, "
-               "%u GC's, avg GC time %3.7f",
-               SerialHeap::heap()->is_young_gen(this) ? "young" : "old" ,
-               time,
-               sr->invocations,
-               sr->invocations > 0 ? time / sr->invocations : 0.0);
-}
diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp
index 50531705dd3..9f73caacb19 100644
--- a/src/hotspot/share/gc/serial/generation.hpp
+++ b/src/hotspot/share/gc/serial/generation.hpp
@@ -107,20 +107,6 @@ class Generation: public CHeapObj<mtGC> {
     return _reserved.contains(p);
   }
 
-  // Returns "true" iff this generation should be used to allocate an
-  // object of the given size.  Young generations might
-  // wish to exclude very large objects, for example, since, if allocated
-  // often, they would greatly increase the frequency of young-gen
-  // collection.
-  virtual bool should_allocate(size_t word_size, bool is_tlab) {
-    bool result = false;
-    size_t overflow_limit = (size_t)1 << (BitsPerSize_t - LogHeapWordSize);
-    if (!is_tlab || supports_tlab_allocation()) {
-      result = (word_size > 0) && (word_size < overflow_limit);
-    }
-    return result;
-  }
-
   // Allocate and returns a block of the requested size, or returns "null".
   // Assumes the caller has done any necessary locking.
   virtual HeapWord* allocate(size_t word_size, bool is_tlab) = 0;
@@ -131,31 +117,6 @@ class Generation: public CHeapObj<mtGC> {
   // Thread-local allocation buffers
   virtual bool supports_tlab_allocation() const { return false; }
 
-  // Returns "true" iff collect() should subsequently be called on this
-  // this generation. See comment below.
-  // This is a generic implementation which can be overridden.
-  //
-  // Note: in the current (1.4) implementation, when serialHeap's
-  // incremental_collection_will_fail flag is set, all allocations are
-  // slow path (the only fast-path place to allocate is DefNew, which
-  // will be full if the flag is set).
-  // Thus, older generations which collect younger generations should
-  // test this flag and collect if it is set.
-  virtual bool should_collect(bool   full,
-                              size_t word_size,
-                              bool   is_tlab) {
-    return (full || should_allocate(word_size, is_tlab));
-  }
-
-  // Perform a garbage collection.
-  // If full is true attempt a full garbage collection of this generation.
-  // Otherwise, attempting to (at least) free enough space to support an
-  // allocation of the given "word_size".
-  virtual void collect(bool   full,
-                       bool   clear_all_soft_refs,
-                       size_t word_size,
-                       bool   is_tlab) = 0;
-
   // Perform a heap collection, attempting to create (at least) enough
   // space to support an allocation of the given "word_size".  If
   // successful, perform the allocation and return the resulting
@@ -172,20 +133,7 @@ class Generation: public CHeapObj<mtGC> {
 
   virtual void verify() = 0;
 
-  struct StatRecord {
-    int invocations;
-    elapsedTimer accumulated_time;
-    StatRecord() :
-      invocations(0),
-      accumulated_time(elapsedTimer()) {}
-  };
-private:
-  StatRecord _stat_record;
 public:
-  StatRecord* stat_record() { return &_stat_record; }
-
-  virtual void print_summary_info_on(outputStream* st);
-
   // Performance Counter support
   virtual void update_counters() = 0;
   virtual CollectorCounters* counters() { return _gc_counters; }
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index b5bcd949c94..bcb18a2fb12 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -314,7 +314,7 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size,
   for (uint try_count = 1, gclocker_stalled_count = 0; /* return or throw */; try_count += 1) {
 
     // First allocation attempt is lock-free.
-    Generation *young = _young_gen;
+    DefNewGeneration *young = _young_gen;
     if (young->should_allocate(size, is_tlab)) {
       result = young->par_allocate(size, is_tlab);
       if (result != nullptr) {
@@ -379,7 +379,7 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size,
       gc_count_before = total_collections();
     }
 
-    VM_GenCollectForAllocation op(size, is_tlab, gc_count_before);
+    VM_SerialCollectForAllocation op(size, is_tlab, gc_count_before);
     VMThread::execute(&op);
     if (op.prologue_succeeded()) {
       result = op.result();
@@ -432,200 +432,61 @@ bool SerialHeap::must_clear_all_soft_refs() {
          _gc_cause == GCCause::_wb_full_gc;
 }
 
-void SerialHeap::collect_generation(Generation* gen, bool full, size_t size,
-                                    bool is_tlab, bool run_verification, bool clear_soft_refs) {
-  FormatBuffer<> title("Collect gen: %s", gen->short_name());
-  GCTraceTime(Trace, gc, phases) t1(title);
-  TraceCollectorStats tcs(gen->counters());
-  TraceMemoryManagerStats tmms(gen->gc_manager(), gc_cause(), heap()->is_young_gen(gen) ? "end of minor GC" : "end of major GC");
+bool SerialHeap::is_young_gc_safe() const {
+  if (!_young_gen->to()->is_empty()) {
+    return false;
+  }
+  return _old_gen->promotion_attempt_is_safe(_young_gen->used());
+}
 
-  gen->stat_record()->invocations++;
-  gen->stat_record()->accumulated_time.start();
+bool SerialHeap::do_young_collection(bool clear_soft_refs) {
+  if (!is_young_gc_safe()) {
+    return false;
+  }
+  IsSTWGCActiveMark gc_active_mark;
+  SvcGCMarker sgcm(SvcGCMarker::MINOR);
+  GCIdMark gc_id_mark;
+  GCTraceCPUTime tcpu(_young_gen->gc_tracer());
+  GCTraceTime(Info, gc) t("Pause Young", nullptr, gc_cause(), true);
+  TraceCollectorStats tcs(_young_gen->counters());
+  TraceMemoryManagerStats tmms(_young_gen->gc_manager(), gc_cause(), "end of minor GC");
+  print_heap_before_gc();
+  const PreGenGCValues pre_gc_values = get_pre_gc_values();
 
-  // Must be done anew before each collection because
-  // a previous collection will do mangling and will
-  // change top of some spaces.
   record_gen_tops_before_GC();
-
-  log_trace(gc)("%s invoke=%d size=" SIZE_FORMAT, heap()->is_young_gen(gen) ? "Young" : "Old", gen->stat_record()->invocations, size * HeapWordSize);
-
-  if (run_verification && VerifyBeforeGC) {
+  increment_total_collections(false);
+  const bool should_verify = total_collections() >= VerifyGCStartAt;
+  if (should_verify && VerifyBeforeGC) {
+    prepare_for_verify();
     Universe::verify("Before GC");
   }
+  gc_prologue(false);
   COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::clear());
 
-  // Do collection work
-  {
-    save_marks();   // save marks for all gens
+  save_marks();
 
-    gen->collect(full, clear_soft_refs, size, is_tlab);
-  }
+  bool result = _young_gen->collect(clear_soft_refs);
 
   COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::update_pointers());
 
-  gen->stat_record()->accumulated_time.stop();
+  update_gc_stats(_young_gen, false);
 
-  update_gc_stats(gen, full);
-
-  if (run_verification && VerifyAfterGC) {
+  if (should_verify && VerifyAfterGC) {
     Universe::verify("After GC");
   }
-}
 
-void SerialHeap::do_collection(bool full,
-                               bool clear_all_soft_refs,
-                               size_t size,
-                               bool is_tlab,
-                               GenerationType max_generation) {
-  ResourceMark rm;
-  DEBUG_ONLY(Thread* my_thread = Thread::current();)
+  _young_gen->compute_new_size();
 
-  assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
-  assert(my_thread->is_VM_thread(), "only VM thread");
-  assert(Heap_lock->is_locked(),
-         "the requesting thread should have the Heap_lock");
-  guarantee(!is_stw_gc_active(), "collection is not reentrant");
+  print_heap_change(pre_gc_values);
 
-  if (GCLocker::check_active_before_gc()) {
-    return; // GC is disabled (e.g. JNI GetXXXCritical operation)
-  }
+  // Track memory usage and detect low memory after GC finishes
+  MemoryService::track_memory_usage();
 
-  const bool do_clear_all_soft_refs = clear_all_soft_refs ||
-                          soft_ref_policy()->should_clear_all_soft_refs();
+  gc_epilogue(false);
 
-  ClearedAllSoftRefs casr(do_clear_all_soft_refs, soft_ref_policy());
+  print_heap_after_gc();
 
-  IsSTWGCActiveMark active_gc_mark;
-
-  bool complete = full && (max_generation == OldGen);
-  bool old_collects_young = complete;
-  bool do_young_collection = !old_collects_young && _young_gen->should_collect(full, size, is_tlab);
-
-  const PreGenGCValues pre_gc_values = get_pre_gc_values();
-
-  bool run_verification = total_collections() >= VerifyGCStartAt;
-  bool prepared_for_verification = false;
-  bool do_full_collection = false;
-
-  if (do_young_collection) {
-    GCIdMark gc_id_mark;
-    GCTraceCPUTime tcpu(((DefNewGeneration*)_young_gen)->gc_tracer());
-    GCTraceTime(Info, gc) t("Pause Young", nullptr, gc_cause(), true);
-
-    print_heap_before_gc();
-
-    if (run_verification && VerifyBeforeGC) {
-      prepare_for_verify();
-      prepared_for_verification = true;
-    }
-
-    gc_prologue(complete);
-    increment_total_collections(complete);
-
-    collect_generation(_young_gen,
-                       full,
-                       size,
-                       is_tlab,
-                       run_verification,
-                       do_clear_all_soft_refs);
-
-    if (size > 0 && (!is_tlab || _young_gen->supports_tlab_allocation()) &&
-        size * HeapWordSize <= _young_gen->unsafe_max_alloc_nogc()) {
-      // Allocation request was met by young GC.
-      size = 0;
-    }
-
-    // Ask if young collection is enough. If so, do the final steps for young collection,
-    // and fallthrough to the end.
-    do_full_collection = should_do_full_collection(size, full, is_tlab, max_generation);
-    if (!do_full_collection) {
-      // Adjust generation sizes.
-      _young_gen->compute_new_size();
-
-      print_heap_change(pre_gc_values);
-
-      // Track memory usage and detect low memory after GC finishes
-      MemoryService::track_memory_usage();
-
-      gc_epilogue(complete);
-    }
-
-    print_heap_after_gc();
-
-  } else {
-    // No young collection, ask if we need to perform Full collection.
-    do_full_collection = should_do_full_collection(size, full, is_tlab, max_generation);
-  }
-
-  if (do_full_collection) {
-    GCIdMark gc_id_mark;
-    GCTraceCPUTime tcpu(SerialFullGC::gc_tracer());
-    GCTraceTime(Info, gc) t("Pause Full", nullptr, gc_cause(), true);
-
-    print_heap_before_gc();
-
-    if (!prepared_for_verification && run_verification && VerifyBeforeGC) {
-      prepare_for_verify();
-    }
-
-    if (!do_young_collection) {
-      gc_prologue(complete);
-      increment_total_collections(complete);
-    }
-
-    // Accounting quirk: total full collections would be incremented when "complete"
-    // is set, by calling increment_total_collections above. However, we also need to
-    // account Full collections that had "complete" unset.
-    if (!complete) {
-      increment_total_full_collections();
-    }
-
-    CodeCache::on_gc_marking_cycle_start();
-
-    ClassUnloadingContext ctx(1 /* num_nmethod_unlink_workers */,
-                              false /* unregister_nmethods_during_purge */,
-                              false /* lock_nmethod_free_separately */);
-
-    collect_generation(_old_gen,
-                       full,
-                       size,
-                       is_tlab,
-                       run_verification,
-                       do_clear_all_soft_refs);
-
-    CodeCache::on_gc_marking_cycle_finish();
-    CodeCache::arm_all_nmethods();
-
-    // Adjust generation sizes.
-    _old_gen->compute_new_size();
-    _young_gen->compute_new_size();
-
-    // Delete metaspaces for unloaded class loaders and clean up loader_data graph
-    ClassLoaderDataGraph::purge(/*at_safepoint*/true);
-    DEBUG_ONLY(MetaspaceUtils::verify();)
-
-    // Need to clear claim bits for the next mark.
-    ClassLoaderDataGraph::clear_claimed_marks();
-
-    // Resize the metaspace capacity after full collections
-    MetaspaceGC::compute_new_size();
-
-    print_heap_change(pre_gc_values);
-
-    // Track memory usage and detect low memory after GC finishes
-    MemoryService::track_memory_usage();
-
-    // Need to tell the epilogue code we are done with Full GC, regardless what was
-    // the initial value for "complete" flag.
-    gc_epilogue(true);
-
-    print_heap_after_gc();
-  }
-}
-
-bool SerialHeap::should_do_full_collection(size_t size, bool full, bool is_tlab,
-                                           SerialHeap::GenerationType max_gen) const {
-  return max_gen == OldGen && _old_gen->should_collect(full, size, is_tlab);
+  return result;
 }
 
 void SerialHeap::register_nmethod(nmethod* nm) {
@@ -649,10 +510,11 @@ void SerialHeap::prune_unlinked_nmethods() {
 }
 
 HeapWord* SerialHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
-  GCCauseSetter x(this, GCCause::_allocation_failure);
+  assert(size != 0, "precondition");
+
   HeapWord* result = nullptr;
 
-  assert(size != 0, "Precondition violated");
+  GCLocker::check_active_before_gc();
   if (GCLocker::is_active_and_needs_gc()) {
     // GC locker is active; instead of a collection we will attempt
     // to expand the heap, if there's room for expansion.
@@ -660,30 +522,14 @@ HeapWord* SerialHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
       result = expand_heap_and_allocate(size, is_tlab);
     }
     return result;   // Could be null if we are out of space.
-  } else if (!incremental_collection_will_fail(false /* don't consult_young */)) {
-    // Do an incremental collection.
-    do_collection(false,                     // full
-                  false,                     // clear_all_soft_refs
-                  size,                      // size
-                  is_tlab,                   // is_tlab
-                  SerialHeap::OldGen); // max_generation
-  } else {
-    log_trace(gc)(" :: Trying full because partial may fail :: ");
-    // Try a full collection; see delta for bug id 6266275
-    // for the original code and why this has been simplified
-    // with from-space allocation criteria modified and
-    // such allocation moved out of the safepoint path.
-    do_collection(true,                      // full
-                  false,                     // clear_all_soft_refs
-                  size,                      // size
-                  is_tlab,                   // is_tlab
-                  SerialHeap::OldGen); // max_generation
   }
 
-  result = attempt_allocation(size, is_tlab, false /*first_only*/);
+  // If young-gen can handle this allocation, attempt young-gc firstly.
+  bool should_run_young_gc = _young_gen->should_allocate(size, is_tlab);
+  collect_at_safepoint(!should_run_young_gc);
 
+  result = attempt_allocation(size, is_tlab, false /*first_only*/);
   if (result != nullptr) {
-    assert(is_in_reserved(result), "result not in heap");
     return result;
   }
 
@@ -700,17 +546,17 @@ HeapWord* SerialHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
   // attempt fails, an OOM exception will be thrown.
   {
     UIntFlagSetting flag_change(MarkSweepAlwaysCompactCount, 1); // Make sure the heap is fully compacted
-
-    do_collection(true,                      // full
-                  true,                      // clear_all_soft_refs
-                  size,                      // size
-                  is_tlab,                   // is_tlab
-                  SerialHeap::OldGen); // max_generation
+    const bool clear_all_soft_refs = true;
+    do_full_collection_no_gc_locker(clear_all_soft_refs);
   }
 
   result = attempt_allocation(size, is_tlab, false /* first_only */);
   if (result != nullptr) {
-    assert(is_in_reserved(result), "result not in heap");
+    return result;
+  }
+  // The previous full-gc can shrink the heap, so re-expand it.
+  result = expand_heap_and_allocate(size, is_tlab);
+  if (result != nullptr) {
     return result;
   }
 
@@ -786,6 +632,28 @@ void SerialHeap::scan_evacuated_objs(YoungGenScanClosure* young_cl,
   guarantee(young_gen()->promo_failure_scan_is_complete(), "Failed to finish scan");
 }
 
+void SerialHeap::try_collect_at_safepoint(bool full) {
+  assert(SafepointSynchronize::is_at_safepoint(), "precondition");
+  if (GCLocker::check_active_before_gc()) {
+    return;
+  }
+  collect_at_safepoint(full);
+}
+
+void SerialHeap::collect_at_safepoint(bool full) {
+  assert(!GCLocker::is_active(), "precondition");
+  bool clear_soft_refs = must_clear_all_soft_refs();
+
+  if (!full) {
+    bool success = do_young_collection(clear_soft_refs);
+    if (success) {
+      return;
+    }
+    // Upgrade to Full-GC if young-gc fails
+  }
+  do_full_collection_no_gc_locker(clear_soft_refs);
+}
+
 // public collection interfaces
 void SerialHeap::collect(GCCause::Cause cause) {
   // The caller doesn't have the Heap_lock
@@ -809,13 +677,11 @@ void SerialHeap::collect(GCCause::Cause cause) {
                            || (cause == GCCause::_gc_locker)
                 DEBUG_ONLY(|| (cause == GCCause::_scavenge_alot));
 
-  const GenerationType max_generation = should_run_young_gc
-                                      ? YoungGen
-                                      : OldGen;
-
   while (true) {
-    VM_GenCollectFull op(gc_count_before, full_gc_count_before,
-                         cause, max_generation);
+    VM_SerialGCCollect op(!should_run_young_gc,
+                          gc_count_before,
+                          full_gc_count_before,
+                          cause);
     VMThread::execute(&op);
 
     if (!GCCause::is_explicit_full_gc(cause)) {
@@ -838,27 +704,83 @@ void SerialHeap::collect(GCCause::Cause cause) {
 }
 
 void SerialHeap::do_full_collection(bool clear_all_soft_refs) {
-   do_full_collection(clear_all_soft_refs, OldGen);
+  if (GCLocker::check_active_before_gc()) {
+    return;
+  }
+  do_full_collection_no_gc_locker(clear_all_soft_refs);
 }
 
-void SerialHeap::do_full_collection(bool clear_all_soft_refs,
-                                    GenerationType last_generation) {
-  do_collection(true,                   // full
-                clear_all_soft_refs,    // clear_all_soft_refs
-                0,                      // size
-                false,                  // is_tlab
-                last_generation);       // last_generation
-  // Hack XXX FIX ME !!!
-  // A scavenge may not have been attempted, or may have
-  // been attempted and failed, because the old gen was too full
-  if (gc_cause() == GCCause::_gc_locker && incremental_collection_failed()) {
-    log_debug(gc, jni)("GC locker: Trying a full collection because scavenge failed");
-    // This time allow the old gen to be collected as well
-    do_collection(true,                // full
-                  clear_all_soft_refs, // clear_all_soft_refs
-                  0,                   // size
-                  false,               // is_tlab
-                  OldGen);             // last_generation
+void SerialHeap::do_full_collection_no_gc_locker(bool clear_all_soft_refs) {
+  IsSTWGCActiveMark gc_active_mark;
+  SvcGCMarker sgcm(SvcGCMarker::FULL);
+  GCIdMark gc_id_mark;
+  GCTraceCPUTime tcpu(SerialFullGC::gc_tracer());
+  GCTraceTime(Info, gc) t("Pause Full", nullptr, gc_cause(), true);
+  TraceCollectorStats tcs(_old_gen->counters());
+  TraceMemoryManagerStats tmms(_old_gen->gc_manager(), gc_cause(), "end of major GC");
+  const PreGenGCValues pre_gc_values = get_pre_gc_values();
+  print_heap_before_gc();
+
+  increment_total_collections(true);
+  const bool should_verify = total_collections() >= VerifyGCStartAt;
+  if (should_verify && VerifyBeforeGC) {
+    prepare_for_verify();
+    Universe::verify("Before GC");
+  }
+
+  gc_prologue(true);
+  COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::clear());
+  CodeCache::on_gc_marking_cycle_start();
+  ClassUnloadingContext ctx(1 /* num_nmethod_unlink_workers */,
+                            false /* unregister_nmethods_during_purge */,
+                            false /* lock_nmethod_free_separately */);
+
+  STWGCTimer* gc_timer = SerialFullGC::gc_timer();
+  gc_timer->register_gc_start();
+
+  SerialOldTracer* gc_tracer = SerialFullGC::gc_tracer();
+  gc_tracer->report_gc_start(gc_cause(), gc_timer->gc_start());
+
+  pre_full_gc_dump(gc_timer);
+
+  SerialFullGC::invoke_at_safepoint(clear_all_soft_refs);
+
+  post_full_gc_dump(gc_timer);
+
+  gc_timer->register_gc_end();
+
+  gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
+  CodeCache::on_gc_marking_cycle_finish();
+  CodeCache::arm_all_nmethods();
+  COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::update_pointers());
+
+  // Adjust generation sizes.
+  _old_gen->compute_new_size();
+  _young_gen->compute_new_size();
+
+  // Delete metaspaces for unloaded class loaders and clean up loader_data graph
+  ClassLoaderDataGraph::purge(/*at_safepoint*/true);
+  DEBUG_ONLY(MetaspaceUtils::verify();)
+
+  // Need to clear claim bits for the next mark.
+  ClassLoaderDataGraph::clear_claimed_marks();
+
+  // Resize the metaspace capacity after full collections
+  MetaspaceGC::compute_new_size();
+
+  print_heap_change(pre_gc_values);
+
+  // Track memory usage and detect low memory after GC finishes
+  MemoryService::track_memory_usage();
+
+  // Need to tell the epilogue code we are done with Full GC, regardless what was
+  // the initial value for "complete" flag.
+  gc_epilogue(true);
+
+  print_heap_after_gc();
+
+  if (should_verify && VerifyAfterGC) {
+    Universe::verify("After GC");
   }
 }
 
@@ -982,11 +904,7 @@ bool SerialHeap::print_location(outputStream* st, void* addr) const {
 }
 
 void SerialHeap::print_tracing_info() const {
-  if (log_is_enabled(Debug, gc, heap, exit)) {
-    LogStreamHandle(Debug, gc, heap, exit) lsh;
-    _young_gen->print_summary_info_on(&lsh);
-    _old_gen->print_summary_info_on(&lsh);
-  }
+ // Does nothing
 }
 
 void SerialHeap::print_heap_change(const PreGenGCValues& pre_gc_values) const {
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index fca877e2925..84b8e8592d8 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -67,8 +67,6 @@ class SerialHeap : public CollectedHeap {
   friend class DefNewGeneration;
   friend class TenuredGeneration;
   friend class SerialFullGC;
-  friend class VM_GenCollectForAllocation;
-  friend class VM_GenCollectFull;
   friend class VM_GC_HeapInspection;
   friend class VM_HeapDumper;
   friend class HeapInspection;
@@ -87,7 +85,7 @@ private:
   TenuredGeneration* _old_gen;
   HeapWord* _young_gen_saved_top;
   HeapWord* _old_gen_saved_top;
-private:
+
   // The singleton CardTable Remembered Set.
   CardTableRS* _rem_set;
 
@@ -98,16 +96,13 @@ private:
   // condition that caused that incremental collection to fail.
   bool _incremental_collection_failed;
 
-  // Collects the given generation.
-  void collect_generation(Generation* gen, bool full, size_t size, bool is_tlab,
-                          bool run_verification, bool clear_soft_refs);
+  bool do_young_collection(bool clear_soft_refs);
 
   // Reserve aligned space for the heap as needed by the contained generations.
   ReservedHeapSpace allocate(size_t alignment);
 
   PreGenGCValues get_pre_gc_values() const;
 
-private:
   GCMemoryManager* _young_manager;
   GCMemoryManager* _old_manager;
 
@@ -116,29 +111,17 @@ private:
                                bool   is_tlab,
                                bool   first_only);
 
-  // Helper function for two callbacks below.
-  // Considers collection of the first max_level+1 generations.
-  void do_collection(bool           full,
-                     bool           clear_all_soft_refs,
-                     size_t         size,
-                     bool           is_tlab,
-                     GenerationType max_generation);
-
-  // Callback from VM_GenCollectForAllocation operation.
-  // This function does everything necessary/possible to satisfy an
-  // allocation request that failed in the youngest generation that should
-  // have handled it (including collection, expansion, etc.)
-  HeapWord* satisfy_failed_allocation(size_t size, bool is_tlab);
-
-  // Callback from VM_GenCollectFull operation.
-  // Perform a full collection of the first max_level+1 generations.
   void do_full_collection(bool clear_all_soft_refs) override;
-  void do_full_collection(bool clear_all_soft_refs, GenerationType max_generation);
+  void do_full_collection_no_gc_locker(bool clear_all_soft_refs);
+
+  void collect_at_safepoint(bool full);
 
   // Does the "cause" of GC indicate that
   // we absolutely __must__ clear soft refs?
   bool must_clear_all_soft_refs();
 
+  bool is_young_gc_safe() const;
+
 public:
   // Returns JNI_OK on success
   jint initialize() override;
@@ -159,6 +142,15 @@ public:
 
   HeapWord* mem_allocate(size_t size, bool*  gc_overhead_limit_was_exceeded) override;
 
+  // Callback from VM_SerialCollectForAllocation operation.
+  // This function does everything necessary/possible to satisfy an
+  // allocation request that failed in the youngest generation that should
+  // have handled it (including collection, expansion, etc.)
+  HeapWord* satisfy_failed_allocation(size_t size, bool is_tlab);
+
+  // Callback from VM_SerialGCCollect.
+  void try_collect_at_safepoint(bool full);
+
   // Perform a full collection of the heap; intended for use in implementing
   // "System.gc". This implies as full a collection as the CollectedHeap
   // supports. Caller does not hold the Heap_lock on entry.
@@ -305,10 +297,6 @@ private:
   // Save the tops of the spaces in all generations
   void record_gen_tops_before_GC() PRODUCT_RETURN;
 
-  // Return true if we need to perform full collection.
-  bool should_do_full_collection(size_t size, bool full,
-                                 bool is_tlab, GenerationType max_gen) const;
-
 private:
   MemoryPool* _eden_pool;
   MemoryPool* _survivor_pool;
diff --git a/src/hotspot/share/gc/serial/serialVMOperations.cpp b/src/hotspot/share/gc/serial/serialVMOperations.cpp
index 9e88fa59711..36805f619ec 100644
--- a/src/hotspot/share/gc/serial/serialVMOperations.cpp
+++ b/src/hotspot/share/gc/serial/serialVMOperations.cpp
@@ -26,9 +26,7 @@
 #include "gc/serial/serialVMOperations.hpp"
 #include "gc/shared/gcLocker.hpp"
 
-void VM_GenCollectForAllocation::doit() {
-  SvcGCMarker sgcm(SvcGCMarker::MINOR);
-
+void VM_SerialCollectForAllocation::doit() {
   SerialHeap* gch = SerialHeap::heap();
   GCCauseSetter gccs(gch, _gc_cause);
   _result = gch->satisfy_failed_allocation(_word_size, _tlab);
@@ -39,10 +37,8 @@ void VM_GenCollectForAllocation::doit() {
   }
 }
 
-void VM_GenCollectFull::doit() {
-  SvcGCMarker sgcm(SvcGCMarker::FULL);
-
+void VM_SerialGCCollect::doit() {
   SerialHeap* gch = SerialHeap::heap();
   GCCauseSetter gccs(gch, _gc_cause);
-  gch->do_full_collection(gch->must_clear_all_soft_refs(), _max_generation);
+  gch->try_collect_at_safepoint(_full);
 }
diff --git a/src/hotspot/share/gc/serial/serialVMOperations.hpp b/src/hotspot/share/gc/serial/serialVMOperations.hpp
index a056740dd85..294920f4ae2 100644
--- a/src/hotspot/share/gc/serial/serialVMOperations.hpp
+++ b/src/hotspot/share/gc/serial/serialVMOperations.hpp
@@ -28,37 +28,32 @@
 #include "gc/serial/serialHeap.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 
-class VM_GenCollectForAllocation : public VM_CollectForAllocation {
+class VM_SerialCollectForAllocation : public VM_CollectForAllocation {
  private:
   bool        _tlab;                       // alloc is of a tlab.
  public:
-  VM_GenCollectForAllocation(size_t word_size,
-                             bool tlab,
-                             uint gc_count_before)
+  VM_SerialCollectForAllocation(size_t word_size,
+                                bool tlab,
+                                uint gc_count_before)
     : VM_CollectForAllocation(word_size, gc_count_before, GCCause::_allocation_failure),
       _tlab(tlab) {
     assert(word_size != 0, "An allocation should always be requested with this operation.");
   }
-  ~VM_GenCollectForAllocation()  {}
-  virtual VMOp_Type type() const { return VMOp_GenCollectForAllocation; }
+  virtual VMOp_Type type() const { return VMOp_SerialCollectForAllocation; }
   virtual void doit();
 };
 
 // VM operation to invoke a collection of the heap as a
 // SerialHeap heap.
-class VM_GenCollectFull: public VM_GC_Operation {
- private:
-  SerialHeap::GenerationType _max_generation;
+class VM_SerialGCCollect: public VM_GC_Operation {
  public:
-  VM_GenCollectFull(uint gc_count_before,
-                    uint full_gc_count_before,
-                    GCCause::Cause gc_cause,
-                    SerialHeap::GenerationType max_generation)
-    : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before,
-                      max_generation != SerialHeap::YoungGen /* full */),
-      _max_generation(max_generation) { }
-  ~VM_GenCollectFull() {}
-  virtual VMOp_Type type() const { return VMOp_GenCollectFull; }
+  VM_SerialGCCollect(bool full,
+                     uint gc_count_before,
+                     uint full_gc_count_before,
+                     GCCause::Cause gc_cause)
+    : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before, full) {}
+
+  virtual VMOp_Type type() const { return VMOp_SerialGCCollect; }
   virtual void doit();
 };
 
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index 8a851fba642..cef6b26d18a 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -453,29 +453,6 @@ oop TenuredGeneration::promote(oop obj, size_t obj_size) {
   return new_obj;
 }
 
-void TenuredGeneration::collect(bool   full,
-                                bool   clear_all_soft_refs,
-                                size_t size,
-                                bool   is_tlab) {
-  SerialHeap* gch = SerialHeap::heap();
-
-  STWGCTimer* gc_timer = SerialFullGC::gc_timer();
-  gc_timer->register_gc_start();
-
-  SerialOldTracer* gc_tracer = SerialFullGC::gc_tracer();
-  gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
-
-  gch->pre_full_gc_dump(gc_timer);
-
-  SerialFullGC::invoke_at_safepoint(clear_all_soft_refs);
-
-  gch->post_full_gc_dump(gc_timer);
-
-  gc_timer->register_gc_end();
-
-  gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
-}
-
 HeapWord*
 TenuredGeneration::expand_and_allocate(size_t word_size, bool is_tlab) {
   assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 9cbf7fef5fc..27d3bc617ec 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -135,11 +135,6 @@ public:
   virtual inline HeapWord* allocate(size_t word_size, bool is_tlab);
   virtual inline HeapWord* par_allocate(size_t word_size, bool is_tlab);
 
-  virtual void collect(bool full,
-                       bool clear_all_soft_refs,
-                       size_t size,
-                       bool is_tlab);
-
   HeapWord* expand_and_allocate(size_t size, bool is_tlab);
 
   void gc_prologue();
@@ -149,6 +144,15 @@ public:
                       size_t word_size,
                       bool   is_tlab);
 
+  bool should_allocate(size_t word_size, bool is_tlab) {
+    bool result = false;
+    size_t overflow_limit = (size_t)1 << (BitsPerSize_t - LogHeapWordSize);
+    if (!is_tlab || supports_tlab_allocation()) {
+      result = (word_size > 0) && (word_size < overflow_limit);
+    }
+    return result;
+  }
+
   // Performance Counter support
   void update_counters();
 
diff --git a/src/hotspot/share/gc/serial/vmStructs_serial.hpp b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
index e5ce220195c..994843a7eec 100644
--- a/src/hotspot/share/gc/serial/vmStructs_serial.hpp
+++ b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
@@ -36,10 +36,6 @@
                             static_field)                                                                   \
   nonstatic_field(Generation,                        _reserved,              MemRegion)                     \
   nonstatic_field(Generation,                        _virtual_space,         VirtualSpace)                  \
-  nonstatic_field(Generation,                        _stat_record,           Generation::StatRecord)        \
-                                                                                                            \
-  nonstatic_field(Generation::StatRecord,            invocations,            int)                           \
-  nonstatic_field(Generation::StatRecord,            accumulated_time,       elapsedTimer)                  \
                                                                                                             \
   nonstatic_field(TenuredGeneration,                 _rs,                    CardTableRS*)                  \
   nonstatic_field(TenuredGeneration,                 _bts,                   SerialBlockOffsetTable*)       \
@@ -67,7 +63,6 @@
                           declare_toplevel_type,                              \
                           declare_integer_type)                               \
   declare_toplevel_type(Generation)                                           \
-  declare_toplevel_type(Generation::StatRecord)                               \
   declare_type(SerialHeap,                   CollectedHeap)                   \
   declare_type(TenuredGeneration,            Generation)                      \
                                                                               \
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp
index c7a2edb1355..aa007fec5a6 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp
@@ -41,10 +41,10 @@
 //      VM_GC_Operation
 //        VM_GC_HeapInspection
 //        VM_PopulateDynamicDumpSharedSpace
-//        VM_GenCollectFull
+//        VM_SerialGCCollect
 //        VM_ParallelGCSystemGC
 //        VM_CollectForAllocation
-//          VM_GenCollectForAllocation
+//          VM_SerialCollectForAllocation
 //          VM_ParallelGCFailedAllocation
 //      VM_Verify
 //      VM_PopulateDumpSharedSpace
@@ -63,13 +63,13 @@
 //     is specified; and also the attach "inspectheap" operation
 //
 //  VM_CollectForAllocation
-//  VM_GenCollectForAllocation
+//  VM_SerialCollectForAllocation
 //  VM_ParallelGCFailedAllocation
 //   - this operation is invoked when allocation is failed;
 //     operation performs garbage collection and tries to
 //     allocate afterwards;
 //
-//  VM_GenCollectFull
+//  VM_SerialGCCollect
 //  VM_ParallelGCSystemGC
 //   - these operations perform full collection of heaps of
 //     different kind
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index f6991d78f8e..47eff632a39 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -50,8 +50,8 @@
   template(CollectForMetadataAllocation)          \
   template(CollectForCodeCacheAllocation)         \
   template(GC_HeapInspection)                     \
-  template(GenCollectFull)                        \
-  template(GenCollectForAllocation)               \
+  template(SerialCollectForAllocation)            \
+  template(SerialGCCollect)                       \
   template(ParallelGCFailedAllocation)            \
   template(ParallelGCSystemGC)                    \
   template(G1CollectForAllocation)                \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/Generation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/Generation.java
index 0b152a1f95f..7fcac7eb39b 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/Generation.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/Generation.java
@@ -50,9 +50,6 @@ public abstract class Generation extends VMObject {
   private static long          reservedFieldOffset;
   private static long          virtualSpaceFieldOffset;
   protected static final int  K = 1024;
-  // Fields for class StatRecord
-  private static Field         statRecordField;
-  private static CIntegerField invocationField;
 
   static {
     VM.registerVMInitializedObserver(new Observer() {
@@ -67,20 +64,12 @@ public abstract class Generation extends VMObject {
 
     reservedFieldOffset     = type.getField("_reserved").getOffset();
     virtualSpaceFieldOffset = type.getField("_virtual_space").getOffset();
-    // StatRecord
-    statRecordField         = type.getField("_stat_record");
-    type                    = db.lookupType("Generation::StatRecord");
-    invocationField         = type.getCIntegerField("invocations");
   }
 
   public Generation(Address addr) {
     super(addr);
   }
 
-  public int invocations() {
-    return getStatRecord().getInvocations();
-  }
-
   /** The maximum number of object bytes the generation can currently
       hold. */
   public abstract long capacity();
@@ -123,19 +112,4 @@ public abstract class Generation extends VMObject {
 
   public void print() { printOn(System.out); }
   public abstract void printOn(PrintStream tty);
-
-  public static class StatRecord extends VMObject {
-    public StatRecord(Address addr) {
-      super(addr);
-    }
-
-    public int getInvocations() {
-      return (int) invocationField.getValue(addr);
-    }
-
-  }
-
-  private StatRecord getStatRecord() {
-    return VMObjectFactory.newObject(StatRecord.class, addr.addOffsetTo(statRecordField.getOffset()));
-  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/SerialHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/SerialHeap.java
index 397d0e0b762..89741177140 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/SerialHeap.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/SerialHeap.java
@@ -95,11 +95,11 @@ public class SerialHeap extends CollectedHeap {
   public void printOn(PrintStream tty) {
     tty.println("SerialHeap:");
 
-    tty.println("Young Generation - Invocations: " + youngGen().invocations());
+    tty.println("Young Generation: ");
     youngGen().printOn(tty);
     tty.println();
 
-    tty.println("Old Generation - Invocations: " + oldGen().invocations());
+    tty.println("Old Generation: ");
     oldGen().printOn(tty);
     tty.println();
   }

From d84a8fd8762fe9448e73d75ec9dc8c4876b1a709 Mon Sep 17 00:00:00 2001
From: Andrei Pangin <apangin@openjdk.org>
Date: Fri, 17 May 2024 09:40:39 +0000
Subject: [PATCH 472/486] 8332327: Return _methods_jmethod_ids field back in
 VMStructs

Reviewed-by: cjplummer, sspitsyn, coleenp, shade
---
 src/hotspot/share/runtime/vmStructs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index cc1351e2742..4381bb973bb 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -253,6 +253,7 @@
   nonstatic_field(InstanceKlass,               _jni_ids,                                      JNIid*)                                \
   nonstatic_field(InstanceKlass,               _osr_nmethods_head,                            nmethod*)                              \
   JVMTI_ONLY(nonstatic_field(InstanceKlass,    _breakpoints,                                  BreakpointInfo*))                      \
+  volatile_nonstatic_field(InstanceKlass,      _methods_jmethod_ids,                          jmethodID*)                            \
   volatile_nonstatic_field(InstanceKlass,      _idnum_allocated_count,                        u2)                                    \
   nonstatic_field(InstanceKlass,               _annotations,                                  Annotations*)                          \
   nonstatic_field(InstanceKlass,               _method_ordering,                              Array<int>*)                           \

From 0b0445be2833286b4eace698b91a658de3e7608b Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Fri, 17 May 2024 09:49:44 +0000
Subject: [PATCH 473/486] 8331724: Refactor j.l.constant implementation to
 internal package

Reviewed-by: liach, asotona
---
 .../classes/java/lang/constant/ClassDesc.java | 91 ++++++++++++-------
 .../java/lang/constant/ConstantDescs.java     | 77 ++++++++--------
 .../lang/constant/DirectMethodHandleDesc.java | 24 +----
 .../lang/constant/DynamicCallSiteDesc.java    |  6 +-
 .../lang/constant/DynamicConstantDesc.java    |  6 +-
 .../java/lang/constant/MethodHandleDesc.java  |  4 +-
 .../java/lang/constant/MethodTypeDesc.java    |  9 +-
 .../java/lang/constant/ModuleDesc.java        |  3 +
 .../java/lang/constant/PackageDesc.java       |  5 +-
 .../internal}/constant/ConstantUtils.java     | 84 +++++++++--------
 .../constant/DirectMethodHandleDescImpl.java  | 26 +++---
 .../constant/MethodTypeDescImpl.java          | 58 ++++++++----
 .../internal}/constant/ModuleDescImpl.java    |  8 +-
 .../internal}/constant/PackageDescImpl.java   |  8 +-
 .../constant/PrimitiveClassDescImpl.java      | 11 ++-
 .../constant/ReferenceClassDescImpl.java      | 29 ++++--
 .../jdk/java/lang/constant/ClassDescTest.java |  6 ++
 .../internal}/constant/ConstantUtilsTest.java |  6 +-
 .../lang/constant/ClassDescFactories.java     | 16 ++++
 .../java/lang/constant/ClassDescMethods.java  | 79 ++++++++++++++++
 20 files changed, 364 insertions(+), 192 deletions(-)
 rename src/java.base/share/classes/{java/lang => jdk/internal}/constant/ConstantUtils.java (84%)
 rename src/java.base/share/classes/{java/lang => jdk/internal}/constant/DirectMethodHandleDescImpl.java (91%)
 rename src/java.base/share/classes/{java/lang => jdk/internal}/constant/MethodTypeDescImpl.java (80%)
 rename src/java.base/share/classes/{java/lang => jdk/internal}/constant/ModuleDescImpl.java (86%)
 rename src/java.base/share/classes/{java/lang => jdk/internal}/constant/PackageDescImpl.java (85%)
 rename src/java.base/share/classes/{java/lang => jdk/internal}/constant/PrimitiveClassDescImpl.java (88%)
 rename src/java.base/share/classes/{java/lang => jdk/internal}/constant/ReferenceClassDescImpl.java (83%)
 rename test/jdk/java/lang/constant/boottest/java.base/{java/lang => jdk/internal}/constant/ConstantUtilsTest.java (94%)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/constant/ClassDescMethods.java

diff --git a/src/java.base/share/classes/java/lang/constant/ClassDesc.java b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
index 89be851dbf5..130a81420b6 100644
--- a/src/java.base/share/classes/java/lang/constant/ClassDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
@@ -28,14 +28,19 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.TypeDescriptor;
 import java.util.stream.Stream;
 
+import jdk.internal.constant.PrimitiveClassDescImpl;
+import jdk.internal.constant.ReferenceClassDescImpl;
 import sun.invoke.util.Wrapper;
 
-import static java.lang.constant.ConstantUtils.binaryToInternal;
-import static java.lang.constant.ConstantUtils.dropLastChar;
-import static java.lang.constant.ConstantUtils.internalToBinary;
-import static java.lang.constant.ConstantUtils.validateMemberName;
-import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
+import static jdk.internal.constant.ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS;
+import static jdk.internal.constant.ConstantUtils.arrayDepth;
+import static jdk.internal.constant.ConstantUtils.binaryToInternal;
+import static jdk.internal.constant.ConstantUtils.dropFirstAndLastChar;
+import static jdk.internal.constant.ConstantUtils.internalToBinary;
+import static jdk.internal.constant.ConstantUtils.validateBinaryClassName;
+import static jdk.internal.constant.ConstantUtils.validateInternalClassName;
+import static jdk.internal.constant.ConstantUtils.validateMemberName;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a
@@ -77,7 +82,7 @@ public sealed interface ClassDesc
      * @see ClassDesc#ofInternalName(String)
      */
     static ClassDesc of(String name) {
-        ConstantUtils.validateBinaryClassName(requireNonNull(name));
+        validateBinaryClassName(name);
         return ClassDesc.ofDescriptor("L" + binaryToInternal(name) + ";");
     }
 
@@ -103,7 +108,7 @@ public sealed interface ClassDesc
      * @since 20
      */
     static ClassDesc ofInternalName(String name) {
-        ConstantUtils.validateInternalClassName(requireNonNull(name));
+        validateInternalClassName(name);
         return ClassDesc.ofDescriptor("L" + name + ";");
     }
 
@@ -122,11 +127,11 @@ public sealed interface ClassDesc
      * not in the correct format
      */
     static ClassDesc of(String packageName, String className) {
-        ConstantUtils.validateBinaryClassName(requireNonNull(packageName));
+        validateBinaryClassName(packageName);
         if (packageName.isEmpty()) {
             return of(className);
         }
-        validateMemberName(requireNonNull(className), false);
+        validateMemberName(className, false);
         return ofDescriptor("L" + binaryToInternal(packageName) +
                 "/" + className + ";");
     }
@@ -162,7 +167,7 @@ public sealed interface ClassDesc
         return (descriptor.length() == 1)
                ? Wrapper.forPrimitiveType(descriptor.charAt(0)).classDescriptor()
                // will throw IAE on descriptor.length == 0 or if array dimensions too long
-               : new ReferenceClassDescImpl(descriptor);
+               : ReferenceClassDescImpl.of(descriptor);
     }
 
     /**
@@ -175,13 +180,18 @@ public sealed interface ClassDesc
      * @jvms 4.4.1 The CONSTANT_Class_info Structure
      */
     default ClassDesc arrayType() {
-        int depth = ConstantUtils.arrayDepth(descriptorString());
-        if (depth >= ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
+        String desc = descriptorString();
+        int depth = arrayDepth(desc);
+        if (depth >= MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
             throw new IllegalStateException(
                     "Cannot create an array type descriptor with more than " +
-                    ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS + " dimensions");
+                    MAX_ARRAY_TYPE_DESC_DIMENSIONS + " dimensions");
         }
-        return arrayType(1);
+        String newDesc = "[".concat(desc);
+        if (desc.length() == 1 && desc.charAt(0) == 'V') {
+            throw new IllegalArgumentException("not a valid reference type descriptor: " + newDesc);
+        }
+        return ReferenceClassDescImpl.ofValidated(newDesc);
     }
 
     /**
@@ -196,22 +206,22 @@ public sealed interface ClassDesc
      * @jvms 4.4.1 The CONSTANT_Class_info Structure
      */
     default ClassDesc arrayType(int rank) {
-        int netRank;
         if (rank <= 0) {
             throw new IllegalArgumentException("rank " + rank + " is not a positive value");
         }
-        try {
-            int currentDepth = ConstantUtils.arrayDepth(descriptorString());
-            netRank = Math.addExact(currentDepth, rank);
-            if (netRank > ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
-                throw new IllegalArgumentException("rank: " + netRank +
-                                                   " exceeds maximum supported dimension of " +
-                                                   ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS);
-            }
-        } catch (ArithmeticException ae) {
-            throw new IllegalArgumentException("Integer overflow in rank computation");
+        String desc = descriptorString();
+        long currentDepth = arrayDepth(desc);
+        long netRank = currentDepth + rank;
+        if (netRank > MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
+            throw new IllegalArgumentException("rank: " + netRank +
+                    " exceeds maximum supported dimension of " +
+                    MAX_ARRAY_TYPE_DESC_DIMENSIONS);
         }
-        return ClassDesc.ofDescriptor("[".repeat(rank) + descriptorString());
+        String newDesc = new StringBuilder(desc.length() + rank).repeat('[', rank).append(desc).toString();
+        if (desc.length() == 1 && desc.charAt(0) == 'V') {
+            throw new IllegalArgumentException("not a valid reference type descriptor: " + newDesc);
+        }
+        return ReferenceClassDescImpl.ofValidated(newDesc);
     }
 
     /**
@@ -235,7 +245,10 @@ public sealed interface ClassDesc
         validateMemberName(nestedName, false);
         if (!isClassOrInterface())
             throw new IllegalStateException("Outer class is not a class or interface type");
-        return ClassDesc.ofDescriptor(dropLastChar(descriptorString()) + "$" + nestedName + ";");
+        String desc = descriptorString();
+        StringBuilder sb = new StringBuilder(desc.length() + nestedName.length() + 1);
+        sb.append(desc, 0, desc.length() - 1).append('$').append(nestedName).append(';');
+        return ReferenceClassDescImpl.ofValidated(sb.toString());
     }
 
     /**
@@ -255,7 +268,7 @@ public sealed interface ClassDesc
         if (!isClassOrInterface())
             throw new IllegalStateException("Outer class is not a class or interface type");
         validateMemberName(firstNestedName, false);
-        requireNonNull(moreNestedNames);
+        // implicit null-check
         for (String addNestedNames : moreNestedNames) {
             validateMemberName(addNestedNames, false);
         }
@@ -299,7 +312,15 @@ public sealed interface ClassDesc
      * if this descriptor does not describe an array type
      */
     default ClassDesc componentType() {
-        return isArray() ? ClassDesc.ofDescriptor(descriptorString().substring(1)) : null;
+        if (isArray()) {
+            String desc = descriptorString();
+            if (desc.length() == 2) {
+                return Wrapper.forBasicType(desc.charAt(1)).classDescriptor();
+            } else {
+                return ReferenceClassDescImpl.ofValidated(desc.substring(1));
+            }
+        }
+        return null;
     }
 
     /**
@@ -312,9 +333,9 @@ public sealed interface ClassDesc
     default String packageName() {
         if (!isClassOrInterface())
             return "";
-        String className = internalToBinary(ConstantUtils.dropFirstAndLastChar(descriptorString()));
-        int index = className.lastIndexOf('.');
-        return (index == -1) ? "" : className.substring(0, index);
+        String desc = descriptorString();
+        int index = desc.lastIndexOf('/');
+        return (index == -1) ? "" : internalToBinary(desc.substring(1, index));
     }
 
     /**
@@ -332,11 +353,11 @@ public sealed interface ClassDesc
         if (isPrimitive())
             return Wrapper.forBasicType(descriptorString().charAt(0)).primitiveSimpleName();
         else if (isClassOrInterface()) {
-            return descriptorString().substring(Math.max(1, descriptorString().lastIndexOf('/') + 1),
-                                                descriptorString().length() - 1);
+            String desc = descriptorString();
+            return desc.substring(Math.max(1, desc.lastIndexOf('/') + 1), desc.length() - 1);
         }
         else if (isArray()) {
-            int depth = ConstantUtils.arrayDepth(descriptorString());
+            int depth = arrayDepth(descriptorString());
             ClassDesc c = this;
             for (int i=0; i<depth; i++)
                 c = c.componentType();
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantDescs.java b/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
index a67a16643c3..0e11415f910 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
+++ b/src/java.base/share/classes/java/lang/constant/ConstantDescs.java
@@ -24,6 +24,9 @@
  */
 package java.lang.constant;
 
+import jdk.internal.constant.PrimitiveClassDescImpl;
+import jdk.internal.constant.ReferenceClassDescImpl;
+
 import java.lang.Enum.EnumDesc;
 import java.lang.invoke.CallSite;
 import java.lang.invoke.ConstantBootstraps;
@@ -64,115 +67,115 @@ public final class ConstantDescs {
     // Don't change the order of these declarations!
 
     /** {@link ClassDesc} representing {@link Object} */
-    public static final ClassDesc CD_Object = new ReferenceClassDescImpl("Ljava/lang/Object;");
+    public static final ClassDesc CD_Object = ReferenceClassDescImpl.ofValidated("Ljava/lang/Object;");
 
     /** {@link ClassDesc} representing {@link String} */
-    public static final ClassDesc CD_String = new ReferenceClassDescImpl("Ljava/lang/String;");
+    public static final ClassDesc CD_String = ReferenceClassDescImpl.ofValidated("Ljava/lang/String;");
 
     /** {@link ClassDesc} representing {@link Class} */
-    public static final ClassDesc CD_Class = new ReferenceClassDescImpl("Ljava/lang/Class;");
+    public static final ClassDesc CD_Class = ReferenceClassDescImpl.ofValidated("Ljava/lang/Class;");
 
     /** {@link ClassDesc} representing {@link Number} */
-    public static final ClassDesc CD_Number = new ReferenceClassDescImpl("Ljava/lang/Number;");
+    public static final ClassDesc CD_Number = ReferenceClassDescImpl.ofValidated("Ljava/lang/Number;");
 
     /** {@link ClassDesc} representing {@link Integer} */
-    public static final ClassDesc CD_Integer = new ReferenceClassDescImpl("Ljava/lang/Integer;");
+    public static final ClassDesc CD_Integer = ReferenceClassDescImpl.ofValidated("Ljava/lang/Integer;");
 
     /** {@link ClassDesc} representing {@link Long} */
-    public static final ClassDesc CD_Long = new ReferenceClassDescImpl("Ljava/lang/Long;");
+    public static final ClassDesc CD_Long = ReferenceClassDescImpl.ofValidated("Ljava/lang/Long;");
 
     /** {@link ClassDesc} representing {@link Float} */
-    public static final ClassDesc CD_Float = new ReferenceClassDescImpl("Ljava/lang/Float;");
+    public static final ClassDesc CD_Float = ReferenceClassDescImpl.ofValidated("Ljava/lang/Float;");
 
     /** {@link ClassDesc} representing {@link Double} */
-    public static final ClassDesc CD_Double = new ReferenceClassDescImpl("Ljava/lang/Double;");
+    public static final ClassDesc CD_Double = ReferenceClassDescImpl.ofValidated("Ljava/lang/Double;");
 
     /** {@link ClassDesc} representing {@link Short} */
-    public static final ClassDesc CD_Short = new ReferenceClassDescImpl("Ljava/lang/Short;");
+    public static final ClassDesc CD_Short = ReferenceClassDescImpl.ofValidated("Ljava/lang/Short;");
 
     /** {@link ClassDesc} representing {@link Byte} */
-    public static final ClassDesc CD_Byte = new ReferenceClassDescImpl("Ljava/lang/Byte;");
+    public static final ClassDesc CD_Byte = ReferenceClassDescImpl.ofValidated("Ljava/lang/Byte;");
 
     /** {@link ClassDesc} representing {@link Character} */
-    public static final ClassDesc CD_Character = new ReferenceClassDescImpl("Ljava/lang/Character;");
+    public static final ClassDesc CD_Character = ReferenceClassDescImpl.ofValidated("Ljava/lang/Character;");
 
     /** {@link ClassDesc} representing {@link Boolean} */
-    public static final ClassDesc CD_Boolean = new ReferenceClassDescImpl("Ljava/lang/Boolean;");
+    public static final ClassDesc CD_Boolean = ReferenceClassDescImpl.ofValidated("Ljava/lang/Boolean;");
 
     /** {@link ClassDesc} representing {@link Void} */
-    public static final ClassDesc CD_Void = new ReferenceClassDescImpl("Ljava/lang/Void;");
+    public static final ClassDesc CD_Void = ReferenceClassDescImpl.ofValidated("Ljava/lang/Void;");
 
     /** {@link ClassDesc} representing {@link Throwable} */
-    public static final ClassDesc CD_Throwable = new ReferenceClassDescImpl("Ljava/lang/Throwable;");
+    public static final ClassDesc CD_Throwable = ReferenceClassDescImpl.ofValidated("Ljava/lang/Throwable;");
 
     /** {@link ClassDesc} representing {@link Exception} */
-    public static final ClassDesc CD_Exception = new ReferenceClassDescImpl("Ljava/lang/Exception;");
+    public static final ClassDesc CD_Exception = ReferenceClassDescImpl.ofValidated("Ljava/lang/Exception;");
 
     /** {@link ClassDesc} representing {@link Enum} */
-    public static final ClassDesc CD_Enum = new ReferenceClassDescImpl("Ljava/lang/Enum;");
+    public static final ClassDesc CD_Enum = ReferenceClassDescImpl.ofValidated("Ljava/lang/Enum;");
 
     /** {@link ClassDesc} representing {@link VarHandle} */
-    public static final ClassDesc CD_VarHandle = new ReferenceClassDescImpl("Ljava/lang/invoke/VarHandle;");
+    public static final ClassDesc CD_VarHandle = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/VarHandle;");
 
     /** {@link ClassDesc} representing {@link MethodHandles} */
-    public static final ClassDesc CD_MethodHandles = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodHandles;");
+    public static final ClassDesc CD_MethodHandles = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/MethodHandles;");
 
     /** {@link ClassDesc} representing {@link MethodHandles.Lookup} */
-    public static final ClassDesc CD_MethodHandles_Lookup = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodHandles$Lookup;");
+    public static final ClassDesc CD_MethodHandles_Lookup = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/MethodHandles$Lookup;");
 
     /** {@link ClassDesc} representing {@link MethodHandle} */
-    public static final ClassDesc CD_MethodHandle = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodHandle;");
+    public static final ClassDesc CD_MethodHandle = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/MethodHandle;");
 
     /** {@link ClassDesc} representing {@link MethodType} */
-    public static final ClassDesc CD_MethodType = new ReferenceClassDescImpl("Ljava/lang/invoke/MethodType;");
+    public static final ClassDesc CD_MethodType = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/MethodType;");
 
     /** {@link ClassDesc} representing {@link CallSite} */
-    public static final ClassDesc CD_CallSite = new ReferenceClassDescImpl("Ljava/lang/invoke/CallSite;");
+    public static final ClassDesc CD_CallSite = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/CallSite;");
 
     /** {@link ClassDesc} representing {@link Collection} */
-    public static final ClassDesc CD_Collection = new ReferenceClassDescImpl("Ljava/util/Collection;");
+    public static final ClassDesc CD_Collection = ReferenceClassDescImpl.ofValidated("Ljava/util/Collection;");
 
     /** {@link ClassDesc} representing {@link List} */
-    public static final ClassDesc CD_List = new ReferenceClassDescImpl("Ljava/util/List;");
+    public static final ClassDesc CD_List = ReferenceClassDescImpl.ofValidated("Ljava/util/List;");
 
     /** {@link ClassDesc} representing {@link Set} */
-    public static final ClassDesc CD_Set = new ReferenceClassDescImpl("Ljava/util/Set;");
+    public static final ClassDesc CD_Set = ReferenceClassDescImpl.ofValidated("Ljava/util/Set;");
 
     /** {@link ClassDesc} representing {@link Map} */
-    public static final ClassDesc CD_Map = new ReferenceClassDescImpl("Ljava/util/Map;");
+    public static final ClassDesc CD_Map = ReferenceClassDescImpl.ofValidated("Ljava/util/Map;");
 
     /** {@link ClassDesc} representing {@link ConstantDesc} */
-    public static final ClassDesc CD_ConstantDesc = new ReferenceClassDescImpl("Ljava/lang/constant/ConstantDesc;");
+    public static final ClassDesc CD_ConstantDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/ConstantDesc;");
 
     /** {@link ClassDesc} representing {@link ClassDesc} */
-    public static final ClassDesc CD_ClassDesc = new ReferenceClassDescImpl("Ljava/lang/constant/ClassDesc;");
+    public static final ClassDesc CD_ClassDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/ClassDesc;");
 
     /** {@link ClassDesc} representing {@link EnumDesc} */
-    public static final ClassDesc CD_EnumDesc = new ReferenceClassDescImpl("Ljava/lang/Enum$EnumDesc;");
+    public static final ClassDesc CD_EnumDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/Enum$EnumDesc;");
 
     /** {@link ClassDesc} representing {@link MethodTypeDesc} */
-    public static final ClassDesc CD_MethodTypeDesc = new ReferenceClassDescImpl("Ljava/lang/constant/MethodTypeDesc;");
+    public static final ClassDesc CD_MethodTypeDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/MethodTypeDesc;");
 
     /** {@link ClassDesc} representing {@link MethodHandleDesc} */
-    public static final ClassDesc CD_MethodHandleDesc = new ReferenceClassDescImpl("Ljava/lang/constant/MethodHandleDesc;");
+    public static final ClassDesc CD_MethodHandleDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/MethodHandleDesc;");
 
     /** {@link ClassDesc} representing {@link DirectMethodHandleDesc} */
-    public static final ClassDesc CD_DirectMethodHandleDesc = new ReferenceClassDescImpl("Ljava/lang/constant/DirectMethodHandleDesc;");
+    public static final ClassDesc CD_DirectMethodHandleDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/DirectMethodHandleDesc;");
 
     /** {@link ClassDesc} representing {@link VarHandleDesc} */
-    public static final ClassDesc CD_VarHandleDesc = new ReferenceClassDescImpl("Ljava/lang/invoke/VarHandle$VarHandleDesc;");
+    public static final ClassDesc CD_VarHandleDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/VarHandle$VarHandleDesc;");
 
     /** {@link ClassDesc} representing {@link DirectMethodHandleDesc.Kind} */
-    public static final ClassDesc CD_MethodHandleDesc_Kind = new ReferenceClassDescImpl("Ljava/lang/constant/DirectMethodHandleDesc$Kind;");
+    public static final ClassDesc CD_MethodHandleDesc_Kind = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/DirectMethodHandleDesc$Kind;");
 
     /** {@link ClassDesc} representing {@link DynamicConstantDesc} */
-    public static final ClassDesc CD_DynamicConstantDesc = new ReferenceClassDescImpl("Ljava/lang/constant/DynamicConstantDesc;");
+    public static final ClassDesc CD_DynamicConstantDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/DynamicConstantDesc;");
 
     /** {@link ClassDesc} representing {@link DynamicCallSiteDesc} */
-    public static final ClassDesc CD_DynamicCallSiteDesc = new ReferenceClassDescImpl("Ljava/lang/constant/DynamicCallSiteDesc;");
+    public static final ClassDesc CD_DynamicCallSiteDesc = ReferenceClassDescImpl.ofValidated("Ljava/lang/constant/DynamicCallSiteDesc;");
 
     /** {@link ClassDesc} representing {@link ConstantBootstraps} */
-    public static final ClassDesc CD_ConstantBootstraps = new ReferenceClassDescImpl("Ljava/lang/invoke/ConstantBootstraps;");
+    public static final ClassDesc CD_ConstantBootstraps = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/ConstantBootstraps;");
 
     private static final ClassDesc[] INDY_BOOTSTRAP_ARGS = {
             CD_MethodHandles_Lookup,
diff --git a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java b/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java
index c725ccfb091..2f22bd34eda 100644
--- a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,8 @@ package java.lang.constant;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandleInfo;
-import java.util.OptionalInt;
-import java.util.stream.Stream;
 
+import jdk.internal.constant.DirectMethodHandleDescImpl;
 import jdk.internal.vm.annotation.Stable;
 
 import static java.lang.invoke.MethodHandleInfo.REF_getField;
@@ -89,7 +88,7 @@ public sealed interface DirectMethodHandleDesc
          */
         public final boolean isInterface;
         Kind(int refKind) {
-            this(refKind, false);
+            this.refKind = refKind; this.isInterface = false;
         }
 
         Kind(int refKind, boolean isInterface) { this.refKind = refKind; this.isInterface = isInterface; }
@@ -179,23 +178,6 @@ public sealed interface DirectMethodHandleDesc
                 }
             }
         }
-
-        /**
-         * Does this {@code Kind} correspond to a virtual method invocation?
-         *
-         * @return if this {@code Kind} corresponds to a virtual method invocation
-         */
-        boolean isVirtualMethod() {
-            switch (this) {
-                case VIRTUAL:
-                case SPECIAL:
-                case INTERFACE_VIRTUAL:
-                case INTERFACE_SPECIAL:
-                    return true;
-                default:
-                    return false;
-            }
-        }
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java b/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java
index 41a602ab4b0..0cfbcd4abf5 100644
--- a/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,10 +32,10 @@ import java.util.Objects;
 import java.util.stream.Stream;
 
 import static java.lang.constant.ConstantDescs.CD_String;
-import static java.lang.constant.ConstantUtils.EMPTY_CONSTANTDESC;
-import static java.lang.constant.ConstantUtils.validateMemberName;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
+import static jdk.internal.constant.ConstantUtils.EMPTY_CONSTANTDESC;
+import static jdk.internal.constant.ConstantUtils.validateMemberName;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for an
diff --git a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
index 180841cd798..f89e3f361a1 100644
--- a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,10 +39,10 @@ import java.util.stream.Stream;
 import static java.lang.constant.ConstantDescs.CD_Class;
 import static java.lang.constant.ConstantDescs.CD_VarHandle;
 import static java.lang.constant.ConstantDescs.DEFAULT_NAME;
-import static java.lang.constant.ConstantUtils.EMPTY_CONSTANTDESC;
-import static java.lang.constant.ConstantUtils.validateMemberName;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
+import static jdk.internal.constant.ConstantUtils.EMPTY_CONSTANTDESC;
+import static jdk.internal.constant.ConstantUtils.validateMemberName;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a
diff --git a/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java b/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java
index 91d6951153e..616c5b67365 100644
--- a/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 
+import jdk.internal.constant.DirectMethodHandleDescImpl;
+
 import static java.lang.constant.ConstantDescs.CD_void;
 import static java.lang.constant.DirectMethodHandleDesc.Kind.CONSTRUCTOR;
 
diff --git a/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java b/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java
index ff750ccc893..19bce254d49 100644
--- a/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/MethodTypeDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,11 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import jdk.internal.constant.ConstantUtils;
+import jdk.internal.constant.MethodTypeDescImpl;
+
+import static java.util.Objects.requireNonNull;
+
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a
  * {@linkplain MethodType} constant.
@@ -64,7 +69,7 @@ public sealed interface MethodTypeDesc
      * @since 21
      */
     static MethodTypeDesc of(ClassDesc returnDesc) {
-        return MethodTypeDescImpl.ofTrusted(returnDesc, ConstantUtils.EMPTY_CLASSDESC);
+        return MethodTypeDescImpl.ofValidated(requireNonNull(returnDesc), ConstantUtils.EMPTY_CLASSDESC);
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/constant/ModuleDesc.java b/src/java.base/share/classes/java/lang/constant/ModuleDesc.java
index fe68d096f1d..b9690b7d0b3 100644
--- a/src/java.base/share/classes/java/lang/constant/ModuleDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ModuleDesc.java
@@ -24,6 +24,9 @@
  */
 package java.lang.constant;
 
+import jdk.internal.constant.ConstantUtils;
+import jdk.internal.constant.ModuleDescImpl;
+
 import static java.util.Objects.requireNonNull;
 
 /**
diff --git a/src/java.base/share/classes/java/lang/constant/PackageDesc.java b/src/java.base/share/classes/java/lang/constant/PackageDesc.java
index 2dc20696a47..c354cafae3c 100644
--- a/src/java.base/share/classes/java/lang/constant/PackageDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/PackageDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,9 @@
  */
 package java.lang.constant;
 
+import jdk.internal.constant.ConstantUtils;
+import jdk.internal.constant.PackageDescImpl;
+
 import static java.util.Objects.requireNonNull;
 
 /**
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java b/src/java.base/share/classes/jdk/internal/constant/ConstantUtils.java
similarity index 84%
rename from src/java.base/share/classes/java/lang/constant/ConstantUtils.java
rename to src/java.base/share/classes/jdk/internal/constant/ConstantUtils.java
index d8a1ccd543b..8d761f4f04e 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantUtils.java
+++ b/src/java.base/share/classes/jdk/internal/constant/ConstantUtils.java
@@ -22,28 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
 import sun.invoke.util.Wrapper;
 
+import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDesc;
+import java.lang.constant.ConstantDescs;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * Helper methods for the implementation of {@code java.lang.constant}.
  */
-class ConstantUtils {
+public final class ConstantUtils {
     /** an empty constant descriptor */
     public static final ConstantDesc[] EMPTY_CONSTANTDESC = new ConstantDesc[0];
-    static final ClassDesc[] EMPTY_CLASSDESC = new ClassDesc[0];
-    static final Constable[] EMPTY_CONSTABLE = new Constable[0];
-    static final int MAX_ARRAY_TYPE_DESC_DIMENSIONS = 255;
+    public static final ClassDesc[] EMPTY_CLASSDESC = new ClassDesc[0];
+    public static final int MAX_ARRAY_TYPE_DESC_DIMENSIONS = 255;
 
     private static final Set<String> pointyNames = Set.of(ConstantDescs.INIT_NAME, ConstantDescs.CLASS_INIT_NAME);
 
+    /** No instantiation */
+    private ConstantUtils() {}
+
     /**
      * Validates the correctness of a binary class name. In particular checks for the presence of
      * invalid characters in the name.
@@ -51,9 +54,10 @@ class ConstantUtils {
      * @param name the class name
      * @return the class name passed if valid
      * @throws IllegalArgumentException if the class name is invalid
+     * @throws NullPointerException if class name is {@code null}
      */
-    static String validateBinaryClassName(String name) {
-        for (int i=0; i<name.length(); i++) {
+    public static String validateBinaryClassName(String name) {
+        for (int i = 0; i < name.length(); i++) {
             char ch = name.charAt(i);
             if (ch == ';' || ch == '[' || ch == '/')
                 throw new IllegalArgumentException("Invalid class name: " + name);
@@ -62,21 +66,22 @@ class ConstantUtils {
     }
 
     /**
-      * Validates the correctness of an internal class name.
-      * In particular checks for the presence of invalid characters in the name.
-      *
-      * @param name the class name
-      * @return the class name passed if valid
-      * @throws IllegalArgumentException if the class name is invalid
-      */
-     static String validateInternalClassName(String name) {
-         for (int i=0; i<name.length(); i++) {
-             char ch = name.charAt(i);
-             if (ch == ';' || ch == '[' || ch == '.')
-                 throw new IllegalArgumentException("Invalid class name: " + name);
-         }
-         return name;
-     }
+     * Validates the correctness of an internal class name.
+     * In particular checks for the presence of invalid characters in the name.
+     *
+     * @param name the class name
+     * @return the class name passed if valid
+     * @throws IllegalArgumentException if the class name is invalid
+     * @throws NullPointerException if class name is {@code null}
+     */
+    public static String validateInternalClassName(String name) {
+        for (int i = 0; i < name.length(); i++) {
+            char ch = name.charAt(i);
+            if (ch == ';' || ch == '[' || ch == '.')
+                throw new IllegalArgumentException("Invalid class name: " + name);
+        }
+        return name;
+    }
 
     /**
      * Validates the correctness of a binary package name.
@@ -89,7 +94,7 @@ class ConstantUtils {
      * @throws NullPointerException if the package name is {@code null}
      */
     public static String validateBinaryPackageName(String name) {
-        for (int i=0; i<name.length(); i++) {
+        for (int i = 0; i < name.length(); i++) {
             char ch = name.charAt(i);
             if (ch == ';' || ch == '[' || ch == '/')
                 throw new IllegalArgumentException("Invalid package name: " + name);
@@ -108,7 +113,7 @@ class ConstantUtils {
      * @throws NullPointerException if the package name is {@code null}
      */
     public static String validateInternalPackageName(String name) {
-        for (int i=0; i<name.length(); i++) {
+        for (int i = 0; i < name.length(); i++) {
             char ch = name.charAt(i);
             if (ch == ';' || ch == '[' || ch == '.')
                 throw new IllegalArgumentException("Invalid package name: " + name);
@@ -129,7 +134,7 @@ class ConstantUtils {
      * @throws NullPointerException if the module name is {@code null}
      */
     public static String validateModuleName(String name) {
-        for (int i=name.length() - 1; i >= 0; i--) {
+        for (int i = name.length() - 1; i >= 0; i--) {
             char ch = name.charAt(i);
             if ((ch >= '\u0000' && ch <= '\u001F')
             || ((ch == '\\' || ch == ':' || ch =='@') && (i == 0 || name.charAt(--i) != '\\')))
@@ -144,11 +149,13 @@ class ConstantUtils {
      * @param name the name of the member
      * @return the name passed if valid
      * @throws IllegalArgumentException if the member name is invalid
+     * @throws NullPointerException if the member name is {@code null}
      */
     public static String validateMemberName(String name, boolean method) {
-        if (name.length() == 0)
+        int len = name.length();
+        if (len == 0)
             throw new IllegalArgumentException("zero-length member name");
-        for (int i=0; i<name.length(); i++) {
+        for (int i = 0; i < len; i++) {
             char ch = name.charAt(i);
             if (ch == '.' || ch == ';' || ch == '[' || ch == '/')
                 throw new IllegalArgumentException("Invalid member name: " + name);
@@ -160,31 +167,27 @@ class ConstantUtils {
         return name;
     }
 
-    static void validateClassOrInterface(ClassDesc classDesc) {
+    public static void validateClassOrInterface(ClassDesc classDesc) {
         if (!classDesc.isClassOrInterface())
             throw new IllegalArgumentException("not a class or interface type: " + classDesc);
     }
 
-    static int arrayDepth(String descriptorString) {
+    public static int arrayDepth(String descriptorString) {
         int depth = 0;
         while (descriptorString.charAt(depth) == '[')
             depth++;
         return depth;
     }
 
-    static String binaryToInternal(String name) {
+    public static String binaryToInternal(String name) {
         return name.replace('.', '/');
     }
 
-    static String internalToBinary(String name) {
+    public static String internalToBinary(String name) {
         return name.replace('/', '.');
     }
 
-    static String dropLastChar(String s) {
-        return s.substring(0, s.length() - 1);
-    }
-
-    static String dropFirstAndLastChar(String s) {
+    public static String dropFirstAndLastChar(String s) {
         return s.substring(1, s.length() - 1);
     }
 
@@ -196,7 +199,7 @@ class ConstantUtils {
      * @return the list of types
      * @throws IllegalArgumentException if the descriptor string is not valid
      */
-    static List<ClassDesc> parseMethodDescriptor(String descriptor) {
+    public static List<ClassDesc> parseMethodDescriptor(String descriptor) {
         int cur = 0, end = descriptor.length();
         ArrayList<ClassDesc> ptypes = new ArrayList<>();
         ptypes.add(null); // placeholder for return type
@@ -227,7 +230,8 @@ class ConstantUtils {
         if (len == 1) {
             return Wrapper.forPrimitiveType(descriptor.charAt(start)).classDescriptor();
         }
-        return ClassDesc.ofDescriptor(descriptor.substring(start, start + len));
+        // Pre-verified in parseMethodDescriptor; avoid redundant verification
+        return ReferenceClassDescImpl.ofValidated(descriptor.substring(start, start + len));
     }
 
     private static final char JVM_SIGNATURE_ARRAY = '[';
diff --git a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/DirectMethodHandleDescImpl.java
similarity index 91%
rename from src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/DirectMethodHandleDescImpl.java
index 47aa3dc36d2..0097ed6b0c2 100644
--- a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/DirectMethodHandleDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,25 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
+import java.lang.constant.ClassDesc;
+import java.lang.constant.DirectMethodHandleDesc;
+import java.lang.constant.MethodTypeDesc;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.Objects;
 
 import static java.lang.constant.ConstantDescs.CD_void;
-import static java.lang.constant.ConstantUtils.validateClassOrInterface;
-import static java.lang.constant.ConstantUtils.validateMemberName;
 import static java.lang.constant.DirectMethodHandleDesc.Kind.CONSTRUCTOR;
 import static java.util.Objects.requireNonNull;
+import static jdk.internal.constant.ConstantUtils.validateClassOrInterface;
+import static jdk.internal.constant.ConstantUtils.validateMemberName;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a direct
  * {@link MethodHandle}.  A {@linkplain DirectMethodHandleDescImpl} corresponds to
  * a {@code Constant_MethodHandle_info} entry in the constant pool of a classfile.
  */
-final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
+public final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
 
     private final Kind kind;
     private final ClassDesc owner;
@@ -62,7 +65,7 @@ final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
      * is not {@code void}
      * @jvms 4.2.2 Unqualified Names
      */
-    DirectMethodHandleDescImpl(Kind kind, ClassDesc owner, String name, MethodTypeDesc type) {
+    public DirectMethodHandleDescImpl(Kind kind, ClassDesc owner, String name, MethodTypeDesc type) {
         if (kind == CONSTRUCTOR)
             name = "<init>";
 
@@ -82,12 +85,11 @@ final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
         this.kind = kind;
         this.owner = owner;
         this.name = name;
-        if (kind.isVirtualMethod())
-            this.invocationType = type.insertParameterTypes(0, owner);
-        else if (kind == CONSTRUCTOR)
-            this.invocationType = type.changeReturnType(owner);
-        else
-            this.invocationType = type;
+        this.invocationType = switch (kind) {
+            case VIRTUAL, SPECIAL, INTERFACE_VIRTUAL, INTERFACE_SPECIAL -> type.insertParameterTypes(0, owner);
+            case CONSTRUCTOR -> type.changeReturnType(owner);
+            default -> type;
+        };
     }
 
     private static void validateFieldType(MethodTypeDesc type, boolean isSetter, boolean isVirtual) {
diff --git a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java
similarity index 80%
rename from src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java
index 7ee0995439a..d6d622b419c 100644
--- a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java
@@ -22,10 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
 import jdk.internal.vm.annotation.Stable;
 
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.security.AccessController;
@@ -41,7 +43,7 @@ import static java.util.Objects.requireNonNull;
  * {@link MethodType}.  A {@linkplain MethodTypeDescImpl} corresponds to a
  * {@code Constant_MethodType_info} entry in the constant pool of a classfile.
  */
-final class MethodTypeDescImpl implements MethodTypeDesc {
+public final class MethodTypeDescImpl implements MethodTypeDesc {
     private final ClassDesc returnType;
     private final @Stable ClassDesc[] argTypes;
     private @Stable String cachedDescriptorString;
@@ -65,15 +67,31 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
      * @param returnType a {@link ClassDesc} describing the return type
      * @param trustedArgTypes {@link ClassDesc}s describing the trusted parameter types
      */
-    static MethodTypeDescImpl ofTrusted(ClassDesc returnType, ClassDesc[] trustedArgTypes) {
+    public static MethodTypeDescImpl ofTrusted(ClassDesc returnType, ClassDesc[] trustedArgTypes) {
         requireNonNull(returnType);
-        if (trustedArgTypes.length == 0) // implicit null check
+        // implicit null checks of trustedArgTypes and all elements
+        for (ClassDesc cd : trustedArgTypes) {
+            validateArgument(cd);
+        }
+        return ofValidated(returnType, trustedArgTypes);
+    }
+
+    private static ClassDesc validateArgument(ClassDesc arg) {
+        if (arg.descriptorString().charAt(0) == 'V') // implicit null check
+            throw new IllegalArgumentException("Void parameters not permitted");
+        return arg;
+    }
+
+    /**
+     * Constructs a {@linkplain MethodTypeDesc} with the specified pre-validated return type
+     * and a pre-validated trusted parameter types array.
+     *
+     * @param returnType a {@link ClassDesc} describing the return type
+     * @param trustedArgTypes {@link ClassDesc}s describing the trusted parameter types
+     */
+    public static MethodTypeDescImpl ofValidated(ClassDesc returnType, ClassDesc[] trustedArgTypes) {
+        if (trustedArgTypes.length == 0)
             return new MethodTypeDescImpl(returnType, ConstantUtils.EMPTY_CLASSDESC);
-
-        for (ClassDesc cd : trustedArgTypes)
-            if (cd.descriptorString().charAt(0) == 'V') // implicit null check
-                throw new IllegalArgumentException("Void parameters not permitted");
-
         return new MethodTypeDescImpl(returnType, trustedArgTypes);
     }
 
@@ -86,7 +104,7 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
      * method descriptor
      * @jvms 4.3.3 Method Descriptors
      */
-    static MethodTypeDescImpl ofDescriptor(String descriptor) {
+    public static MethodTypeDescImpl ofDescriptor(String descriptor) {
         // Implicit null-check of descriptor
         List<ClassDesc> ptypes = ConstantUtils.parseMethodDescriptor(descriptor);
         int args = ptypes.size() - 1;
@@ -94,7 +112,7 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
                 ? ptypes.subList(1, args + 1).toArray(ConstantUtils.EMPTY_CLASSDESC)
                 : ConstantUtils.EMPTY_CLASSDESC;
 
-        MethodTypeDescImpl result = ofTrusted(ptypes.get(0), paramTypes);
+        MethodTypeDescImpl result = ofValidated(ptypes.get(0), paramTypes);
         result.cachedDescriptorString = descriptor;
         return result;
     }
@@ -127,14 +145,14 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
 
     @Override
     public MethodTypeDesc changeReturnType(ClassDesc returnType) {
-        return new MethodTypeDescImpl(requireNonNull(returnType), argTypes);
+        return ofValidated(requireNonNull(returnType), argTypes);
     }
 
     @Override
     public MethodTypeDesc changeParameterType(int index, ClassDesc paramType) {
         ClassDesc[] newArgs = argTypes.clone();
-        newArgs[index] = paramType;
-        return ofTrusted(returnType, newArgs);
+        newArgs[index] = validateArgument(paramType);
+        return ofValidated(returnType, newArgs);
     }
 
     @Override
@@ -149,7 +167,7 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
         if (end < argTypes.length) {
             System.arraycopy(argTypes, end, newArgs, start, argTypes.length - end);
         }
-        return ofTrusted(returnType, newArgs);
+        return ofValidated(returnType, newArgs);
     }
 
     @Override
@@ -162,10 +180,16 @@ final class MethodTypeDescImpl implements MethodTypeDesc {
             System.arraycopy(argTypes, 0, newArgs, 0, pos);
         }
         System.arraycopy(paramTypes, 0, newArgs, pos, paramTypes.length);
+        int destPos = pos + paramTypes.length;
         if (pos < argTypes.length) {
-            System.arraycopy(argTypes, pos, newArgs, pos + paramTypes.length, argTypes.length - pos);
+            System.arraycopy(argTypes, pos, newArgs, destPos, argTypes.length - pos);
         }
-        return ofTrusted(returnType, newArgs);
+        // Validate after copying to avoid TOCTOU
+        for (int i = pos; i < destPos; i++) {
+            validateArgument(newArgs[i]);
+        }
+
+        return ofValidated(returnType, newArgs);
     }
 
     @Override
diff --git a/src/java.base/share/classes/java/lang/constant/ModuleDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/ModuleDescImpl.java
similarity index 86%
rename from src/java.base/share/classes/java/lang/constant/ModuleDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/ModuleDescImpl.java
index 0a01f5b2b73..89310c1331c 100644
--- a/src/java.base/share/classes/java/lang/constant/ModuleDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/ModuleDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
+
+import java.lang.constant.ModuleDesc;
 
 /*
  * Implementation of {@code ModuleDesc}
  * @param name must have been validated
  */
-record ModuleDescImpl(String name) implements ModuleDesc {
+public record ModuleDescImpl(String name) implements ModuleDesc {
 
     @Override
     public String toString() {
diff --git a/src/java.base/share/classes/java/lang/constant/PackageDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/PackageDescImpl.java
similarity index 85%
rename from src/java.base/share/classes/java/lang/constant/PackageDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/PackageDescImpl.java
index 1f0077007b8..3ef65b4e4ea 100644
--- a/src/java.base/share/classes/java/lang/constant/PackageDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/PackageDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
+
+import java.lang.constant.PackageDesc;
 
 /*
  * Implementation of {@code PackageDesc}
  * @param internalName must have been validated
  */
-record PackageDescImpl(String internalName) implements PackageDesc {
+public record PackageDescImpl(String internalName) implements PackageDesc {
 
     @Override
     public String toString() {
diff --git a/src/java.base/share/classes/java/lang/constant/PrimitiveClassDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/PrimitiveClassDescImpl.java
similarity index 88%
rename from src/java.base/share/classes/java/lang/constant/PrimitiveClassDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/PrimitiveClassDescImpl.java
index 0478fbe3bba..123c76a1e9f 100644
--- a/src/java.base/share/classes/java/lang/constant/PrimitiveClassDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/PrimitiveClassDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
+import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDescs;
+import java.lang.constant.DynamicConstantDesc;
 import java.lang.invoke.MethodHandles;
 
 import sun.invoke.util.Wrapper;
@@ -34,7 +37,7 @@ import static java.util.Objects.requireNonNull;
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for the class
  * constant corresponding to a primitive type (e.g., {@code int.class}).
  */
-final class PrimitiveClassDescImpl
+public final class PrimitiveClassDescImpl
         extends DynamicConstantDesc<Class<?>> implements ClassDesc {
 
     private final String descriptor;
@@ -49,7 +52,7 @@ final class PrimitiveClassDescImpl
      * describe a valid primitive type
      * @jvms 4.3 Descriptors
      */
-    PrimitiveClassDescImpl(String descriptor) {
+    public PrimitiveClassDescImpl(String descriptor) {
         super(ConstantDescs.BSM_PRIMITIVE_CLASS, requireNonNull(descriptor), ConstantDescs.CD_Class);
         if (descriptor.length() != 1
             || "VIJCSBFDZ".indexOf(descriptor.charAt(0)) < 0)
diff --git a/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/ReferenceClassDescImpl.java
similarity index 83%
rename from src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
rename to src/java.base/share/classes/jdk/internal/constant/ReferenceClassDescImpl.java
index 5e2aaa98442..e8d73b08097 100644
--- a/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/ReferenceClassDescImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,21 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package java.lang.constant;
+package jdk.internal.constant;
 
+import java.lang.constant.ClassDesc;
 import java.lang.invoke.MethodHandles;
 
-import static java.lang.constant.ConstantUtils.*;
-import static java.util.Objects.requireNonNull;
+import static jdk.internal.constant.ConstantUtils.*;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a class,
  * interface, or array type.  A {@linkplain ReferenceClassDescImpl} corresponds to a
  * {@code Constant_Class_info} entry in the constant pool of a classfile.
  */
-final class ReferenceClassDescImpl implements ClassDesc {
+public final class ReferenceClassDescImpl implements ClassDesc {
     private final String descriptor;
 
+    private ReferenceClassDescImpl(String descriptor) {
+        this.descriptor = descriptor;
+    }
+
     /**
      * Creates a {@linkplain ClassDesc} from a descriptor string for a class or
      * interface type or an array type.
@@ -46,12 +50,23 @@ final class ReferenceClassDescImpl implements ClassDesc {
      * field descriptor string, or does not describe a class or interface type
      * @jvms 4.3.2 Field Descriptors
      */
-    ReferenceClassDescImpl(String descriptor) {
+    public static ReferenceClassDescImpl of(String descriptor) {
         int dLen = descriptor.length();
         int len = ConstantUtils.skipOverFieldSignature(descriptor, 0, dLen, false);
         if (len <= 1 || len != dLen)
             throw new IllegalArgumentException(String.format("not a valid reference type descriptor: %s", descriptor));
-        this.descriptor = descriptor;
+        return new ReferenceClassDescImpl(descriptor);
+    }
+
+    /**
+     * Creates a {@linkplain ClassDesc} from a pre-validated descriptor string
+     * for a class or interface type or an array type.
+     *
+     * @param descriptor a field descriptor string for a class or interface type
+     * @jvms 4.3.2 Field Descriptors
+     */
+    public static ReferenceClassDescImpl ofValidated(String descriptor) {
+        return new ReferenceClassDescImpl(descriptor);
     }
 
     @Override
diff --git a/test/jdk/java/lang/constant/ClassDescTest.java b/test/jdk/java/lang/constant/ClassDescTest.java
index 4c9493721d9..4d98e1283f0 100644
--- a/test/jdk/java/lang/constant/ClassDescTest.java
+++ b/test/jdk/java/lang/constant/ClassDescTest.java
@@ -237,6 +237,12 @@ public class ClassDescTest extends SymbolicDescTest {
             testBadArrayRank(ClassDesc.of("Bar"));
             testArrayRankOverflow();
         }
+        try {
+            ConstantDescs.CD_void.arrayType();
+            fail("Should throw IAE");
+        } catch (IllegalArgumentException iae) {
+            // Expected
+        }
     }
 
     public void testBadClassDescs() {
diff --git a/test/jdk/java/lang/constant/boottest/java.base/java/lang/constant/ConstantUtilsTest.java b/test/jdk/java/lang/constant/boottest/java.base/jdk/internal/constant/ConstantUtilsTest.java
similarity index 94%
rename from test/jdk/java/lang/constant/boottest/java.base/java/lang/constant/ConstantUtilsTest.java
rename to test/jdk/java/lang/constant/boottest/java.base/jdk/internal/constant/ConstantUtilsTest.java
index 12ef29273dc..f3e9619a0e1 100644
--- a/test/jdk/java/lang/constant/boottest/java.base/java/lang/constant/ConstantUtilsTest.java
+++ b/test/jdk/java/lang/constant/boottest/java.base/jdk/internal/constant/ConstantUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,8 @@
  * questions.
  */
 
-package java.lang.constant;
+package jdk.internal.constant;
 
-import java.lang.invoke.*;
 import java.lang.constant.*;
 import java.util.*;
 
@@ -35,6 +34,7 @@ import static org.testng.Assert.*;
  * @test
  * @bug 8303930
  * @compile ConstantUtilsTest.java
+ * @modules java.base/jdk.internal.constant
  * @run testng ConstantUtilsTest
  * @summary unit tests for methods of java.lang.constant.ConstantUtils that are not covered by other unit tests
  */
diff --git a/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java
index c74271995d5..c9ce4a6c100 100644
--- a/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java
+++ b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescFactories.java
@@ -35,6 +35,7 @@ import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 
 import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDescs;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -60,4 +61,19 @@ public class ClassDescFactories {
     public ClassDesc ofDescriptor() {
         return ClassDesc.ofDescriptor(descString);
     }
+
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.NANOSECONDS)
+    @Warmup(iterations = 3, time = 2)
+    @Measurement(iterations = 6, time = 1)
+    @Fork(1)
+    @State(Scope.Thread)
+    public static class ReferenceOnly {
+        public ClassDesc desc = ConstantDescs.CD_Object;
+        @Benchmark
+        public ClassDesc ofNested() {
+            return desc.nested("Foo");
+        }
+
+    }
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/constant/ClassDescMethods.java b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescMethods.java
new file mode 100644
index 00000000000..8d9f686b013
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/constant/ClassDescMethods.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+package org.openjdk.bench.java.lang.constant;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.lang.constant.ClassDesc;
+import java.lang.constant.ConstantDescs;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test various operations on
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 3, time = 2)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+@State(Scope.Thread)
+public class ClassDescMethods {
+
+    @Benchmark
+    public String packageName() {
+        return ConstantDescs.CD_Object.packageName();
+    }
+
+    @Benchmark
+    public String displayName() {
+        return ConstantDescs.CD_Object.displayName();
+    }
+
+    @Benchmark
+    public void arrayType(Blackhole bh) {
+        bh.consume(ConstantDescs.CD_Object.arrayType());
+        bh.consume(ConstantDescs.CD_boolean.arrayType());
+    }
+
+    @Benchmark
+    public void arrayType1(Blackhole bh) {
+        bh.consume(ConstantDescs.CD_Object.arrayType(1));
+        bh.consume(ConstantDescs.CD_boolean.arrayType(1));
+    }
+
+    @Benchmark
+    public void arrayType2(Blackhole bh) {
+        bh.consume(ConstantDescs.CD_Object.arrayType(2));
+        bh.consume(ConstantDescs.CD_boolean.arrayType(2));
+    }
+}

From e0d1c4b38c7ad2dc67f3d14b0b179b313c85fc0a Mon Sep 17 00:00:00 2001
From: Larry Cable <larry.cable@oracle.com>
Date: Fri, 17 May 2024 12:12:43 +0000
Subject: [PATCH 474/486] 8321428: Deprecate for removal the package
 java.beans.beancontext

Reviewed-by: prr, tr, iris, serb, aivanov
---
 src/java.desktop/share/classes/java/beans/Beans.java     | 9 ++++++---
 .../classes/java/beans/beancontext/BeanContext.java      | 5 +++--
 .../classes/java/beans/beancontext/BeanContextChild.java | 4 +++-
 .../beancontext/BeanContextChildComponentProxy.java      | 4 +++-
 .../java/beans/beancontext/BeanContextChildSupport.java  | 4 +++-
 .../beans/beancontext/BeanContextContainerProxy.java     | 4 +++-
 .../classes/java/beans/beancontext/BeanContextEvent.java | 4 +++-
 .../beans/beancontext/BeanContextMembershipEvent.java    | 5 ++++-
 .../beans/beancontext/BeanContextMembershipListener.java | 4 +++-
 .../classes/java/beans/beancontext/BeanContextProxy.java | 4 +++-
 .../beancontext/BeanContextServiceAvailableEvent.java    | 4 +++-
 .../beans/beancontext/BeanContextServiceProvider.java    | 4 +++-
 .../beancontext/BeanContextServiceProviderBeanInfo.java  | 4 +++-
 .../beancontext/BeanContextServiceRevokedEvent.java      | 5 ++++-
 .../beancontext/BeanContextServiceRevokedListener.java   | 5 ++++-
 .../java/beans/beancontext/BeanContextServices.java      | 5 ++++-
 .../beans/beancontext/BeanContextServicesListener.java   | 5 ++++-
 .../beans/beancontext/BeanContextServicesSupport.java    | 5 ++++-
 .../java/beans/beancontext/BeanContextSupport.java       | 3 +++
 .../classes/java/beans/beancontext/package-info.java     | 9 ++++++++-
 20 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/src/java.desktop/share/classes/java/beans/Beans.java b/src/java.desktop/share/classes/java/beans/Beans.java
index 165aba4708b..cd42aaaa33e 100644
--- a/src/java.desktop/share/classes/java/beans/Beans.java
+++ b/src/java.desktop/share/classes/java/beans/Beans.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
@@ -102,8 +102,10 @@ public class Beans {
      *              object could not be found.
      * @throws IOException if an I/O error occurs.
      * @since 1.2
+     * @deprecated this method will be removed when java.beans.beancontext is removed
      */
-    @SuppressWarnings("deprecation")
+    @Deprecated(since = "23", forRemoval = true)
+    @SuppressWarnings({"deprecation", "removal"})
     public static Object instantiate(ClassLoader cls, String beanName,
                                      BeanContext beanContext)
             throws IOException, ClassNotFoundException {
@@ -352,7 +354,8 @@ public class Beans {
         return result;
     }
 
-    @SuppressWarnings("unchecked")
+    @Deprecated(since = "23", forRemoval = true)
+    @SuppressWarnings({ "unchecked", "removal" })
     private static void unsafeBeanContextAdd(BeanContext beanContext, Object res) {
         beanContext.add(res);
     }
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
index abc686f963c..d41f286fc31 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,8 @@ import java.util.Locale;
  * @see java.util.Collection
  */
 
-@SuppressWarnings("rawtypes")
+@Deprecated(since = "23", forRemoval = true)
+@SuppressWarnings({"rawtypes", "removal"})
 public interface BeanContext extends BeanContextChild, Collection, DesignMode, Visibility {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
index c1e92715875..4d0c029fa71 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -65,6 +65,8 @@ import java.beans.beancontext.BeanContext;
  * @see java.beans.VetoableChangeListener
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextChild {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
index 8bab7514908..91d22ecce3b 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -41,6 +41,8 @@ import java.awt.Component;
  * @see java.beans.beancontext.BeanContextSupport
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextChildComponentProxy {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
index e3a213a8dfa..532661dc29b 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -54,6 +54,8 @@ import java.io.Serializable;
  * @see java.beans.beancontext.BeanContextChild
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class BeanContextChildSupport implements BeanContextChild, BeanContextServicesListener, Serializable {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
index 3934d0afadd..3c6e0656c50 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -40,6 +40,8 @@ import java.awt.Container;
  * @see java.beans.beancontext.BeanContextSupport
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextContainerProxy {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
index 9e4c2f3a53e..62fd45eee79 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -46,6 +46,8 @@ import java.util.EventObject;
  * @see         java.beans.beancontext.BeanContext
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public abstract class BeanContextEvent extends EventObject {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
index 466c4fa44a2..5c5d112d36a 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -50,6 +50,9 @@ import java.util.Iterator;
  * @see         java.beans.beancontext.BeanContextEvent
  * @see         java.beans.beancontext.BeanContextMembershipListener
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class BeanContextMembershipEvent extends BeanContextEvent {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
index 8f68792fcb2..37f124fd5d8 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -40,6 +40,8 @@ import java.util.EventListener;
  * @see         java.beans.beancontext.BeanContext
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextMembershipListener extends EventListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
index cff8e7624fd..b7b8de50310 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -72,6 +72,8 @@ package java.beans.beancontext;
  * @see java.beans.beancontext.BeanContextChildSupport
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextProxy {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
index 1521f8e01ed..dd4cc457a31 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@ import java.util.Iterator;
  * </p>
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since="23", forRemoval=true)
 public class BeanContextServiceAvailableEvent extends BeanContextEvent {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
index f3de87b4344..7b5db26ad84 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -49,6 +49,8 @@ import java.util.Iterator;
  * </p>
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServiceProvider {
 
    /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
index 298be756e26..11fe3fff730 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@ import java.beans.BeanInfo;
  * services.
  */
 
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServiceProviderBeanInfo extends BeanInfo {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
index 3b8c9f2d756..d32b18376a4 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,9 @@ import java.io.Serial;
  * identify the service being revoked.
  * </p>
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class BeanContextServiceRevokedEvent extends BeanContextEvent {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
index 9a1a70863b1..96d31a0885a 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,9 @@ import java.util.EventListener;
  * interested in processing a {@code BeanContextServiceRevokedEvent}
  * implements this interface.
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServiceRevokedListener extends EventListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
index b132ee069ca..1a346450024 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,9 @@ import java.beans.beancontext.BeanContextServicesListener;
  * to expose generic "services" to the BeanContextChild objects within.
  * </p>
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServices extends BeanContext, BeanContextServicesListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
index 247c4f44b19..ca506fb45f7 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 1014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,9 @@ import java.beans.beancontext.BeanContextServiceRevokedListener;
  * A class that is interested in processing a
  * {@code BeanContextServiceAvailableEvent} implements this interface.
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public interface BeanContextServicesListener extends BeanContextServiceRevokedListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
index 21e136ba9e5..98d68d92fa1 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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
@@ -54,6 +54,9 @@ import java.util.TooManyListenersException;
  * @author Laurence P. G. Cable
  * @since 1.2
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class      BeanContextServicesSupport extends BeanContextSupport
        implements BeanContextServices {
 
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
index cc61cc78612..fedd6667de1 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
@@ -59,6 +59,9 @@ import java.util.Map;
  * @author Laurence P. G. Cable
  * @since 1.2
  */
+
+@SuppressWarnings("removal")
+@Deprecated(since = "23", forRemoval = true)
 public class      BeanContextSupport extends BeanContextChildSupport
        implements BeanContext,
                   Serializable,
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/package-info.java b/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
index f1b22cf7da0..25c38996dee 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,13 @@
  * contains events and listener interface for beans being added and removed from
  * a bean context.
  *
+ * This package has been deprecated and may be removed in a future version of the Java Platform
+ * There is no replacement.
+ *
+ * All of the classes and interfaces in this package have been terminally deprecated.
+ *
+ * Users are advised to migrate their applications to other technologies.
+ *
  * @since 1.2
  */
 package java.beans.beancontext;

From beeffd4671649e5d8f9c96f0455ac90a82917234 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 17 May 2024 12:24:39 +0000
Subject: [PATCH 475/486] 8332109: Convert remaining tests using
 com.sun.tools.classfile to ClassFile API

Reviewed-by: asotona
---
 test/jdk/java/lang/StackWalker/TestBCI.java   |  65 ++--
 .../CallerSensitiveFinder.java                | 123 ++++----
 .../reflect/CallerSensitive/CheckCSMs.java    | 250 ++++++++-------
 .../MissingCallerSensitive.java               |   5 +-
 .../jdk/javadoc/tool/CheckResourceKeys.java   |  16 +-
 .../CheckACC_STRICTFlagOnclinitTest.java      | 108 +++----
 .../StringConcat/TestIndyStringConcat.java    | 133 ++++----
 .../SourceFile/SourceFileTestBase_legacy.java | 117 --------
 .../SourceFile/SyntheticClassTest.java        |  53 ++--
 ...geMethodsForLambdaTargetRelease14Test.java |  14 +-
 .../Synthetic/SyntheticTestDriver_legacy.java | 212 -------------
 .../attributes/lib_legacy/TestBase.java       | 284 ------------------
 .../attributes/lib_legacy/TestResult.java     | 191 ------------
 ...heckACC_STRICTFlagOnDefaultMethodTest.java |  80 ++---
 .../javac/lambda/LambdaTestStrictFPFlag.java  |  81 ++---
 test/langtools/tools/javap/T6866657.java      |   6 +-
 test/langtools/tools/javap/T7186925.java      |   7 +-
 test/langtools/tools/jdeps/APIDeps.java       |   9 +-
 test/langtools/tools/jdeps/m/Gee.java         |   4 +-
 19 files changed, 442 insertions(+), 1316 deletions(-)
 delete mode 100644 test/langtools/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase_legacy.java
 delete mode 100644 test/langtools/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver_legacy.java
 delete mode 100644 test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestBase.java
 delete mode 100644 test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestResult.java

diff --git a/test/jdk/java/lang/StackWalker/TestBCI.java b/test/jdk/java/lang/StackWalker/TestBCI.java
index c7d3a332ce1..3cba0505e9c 100644
--- a/test/jdk/java/lang/StackWalker/TestBCI.java
+++ b/test/jdk/java/lang/StackWalker/TestBCI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,18 @@
  * @test
  * @bug 8140450
  * @summary Basic test for the StackWalker::getByteCodeIndex method
- * @modules jdk.jdeps/com.sun.tools.classfile
+ * @enablePreview
  * @run main TestBCI
  */
 
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.Code_attribute;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.LineNumberTable_attribute;
-import com.sun.tools.classfile.Method;
-
 import java.lang.StackWalker.StackFrame;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.lang.constant.MethodTypeDesc;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
@@ -66,12 +62,12 @@ public class TestBCI {
 
     private final Map<String, MethodInfo> methods;
     private final Class<?> clazz;
-    TestBCI(Class<?> c) throws ConstantPoolException, IOException {
+    TestBCI(Class<?> c) throws IllegalArgumentException, IOException {
         Map<String, MethodInfo> methods;
         String filename = c.getName().replace('.', '/') + ".class";
         try (InputStream in = c.getResourceAsStream(filename)) {
-            ClassFile cf = ClassFile.read(in);
-            methods = Arrays.stream(cf.methods)
+            var cf = ClassFile.of().parse(in.readAllBytes());
+            methods = cf.methods().stream()
                 .map(m -> new MethodInfo(cf, m))
                 .collect(Collectors.toMap(MethodInfo::name, Function.identity()));
         }
@@ -129,37 +125,20 @@ public class TestBCI {
     }
 
     static class MethodInfo {
-        final Method method;
+        final MethodModel method;
         final String name;
-        final String paramTypes;
-        final String returnType;
+        final MethodTypeDesc desc;
         final Map<Integer, SortedSet<Integer>> bciToLineNumbers = new HashMap<>();
-        MethodInfo(ClassFile cf, Method m) {
+        MethodInfo(ClassModel cf, MethodModel m) {
             this.method = m;
-
-            String name;
-            String paramTypes;
-            String returnType;
-            LineNumberTable_attribute.Entry[] lineNumberTable;
-            try {
-                // method name
-                name = m.getName(cf.constant_pool);
-                // signature
-                paramTypes = m.descriptor.getParameterTypes(cf.constant_pool);
-                returnType = m.descriptor.getReturnType(cf.constant_pool);
-                Code_attribute codeAttr = (Code_attribute)
-                    m.attributes.get(Attribute.Code);
-                lineNumberTable = ((LineNumberTable_attribute)
-                    codeAttr.attributes.get(Attribute.LineNumberTable)).line_number_table;
-            } catch (ConstantPoolException|Descriptor.InvalidDescriptor e) {
-                throw new RuntimeException(e);
-            }
-            this.name = name;
-            this.paramTypes = paramTypes;
-            this.returnType = returnType;
-            Arrays.stream(lineNumberTable).forEach(entry ->
-                bciToLineNumbers.computeIfAbsent(entry.start_pc, _n -> new TreeSet<>())
-                    .add(entry.line_number));
+            this.name = m.methodName().stringValue();
+            this.desc = m.methodTypeSymbol();
+            m.code().orElseThrow(() -> new IllegalArgumentException("Missing Code in " + m))
+                    .findAttribute(Attributes.LINE_NUMBER_TABLE)
+                    .orElseThrow(() -> new IllegalArgumentException("Missing LineNumberTable in " + m))
+                    .lineNumbers().forEach(entry ->
+                            bciToLineNumbers.computeIfAbsent(entry.startPc(), _ -> new TreeSet<>())
+                                    .add(entry.lineNumber()));
         }
 
         String name() {
@@ -178,7 +157,7 @@ public class TestBCI {
         public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append(name);
-            sb.append(paramTypes).append(returnType).append(" ");
+            sb.append(desc.displayDescriptor()).append(" ");
             bciToLineNumbers.entrySet().stream()
                 .sorted(Map.Entry.comparingByKey())
                 .forEach(entry -> sb.append("bci:").append(entry.getKey()).append(" ")
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java
index 763222e6845..a313aab2552 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,16 @@
  * questions.
  */
 
-import com.sun.tools.classfile.*;
-import static com.sun.tools.classfile.ConstantPool.*;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.Opcode;
+import java.lang.classfile.constantpool.MethodRefEntry;
+import java.lang.classfile.instruction.InvokeInstruction;
 import java.net.URI;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -47,7 +51,7 @@ import java.util.stream.Stream;
  * @bug 8010117
  * @summary Verify if CallerSensitive methods are annotated with
  *          CallerSensitive annotation
- * @modules jdk.jdeps/com.sun.tools.classfile jdk.jdeps/com.sun.tools.jdeps
+ * @enablePreview
  * @build CallerSensitiveFinder
  * @run main/othervm/timeout=900 CallerSensitiveFinder
  */
@@ -87,58 +91,71 @@ public class CallerSensitiveFinder {
     }
 
     private final List<String> csMethodsMissingAnnotation = new CopyOnWriteArrayList<>();
-    private final ReferenceFinder finder;
     public CallerSensitiveFinder() {
-        this.finder = new ReferenceFinder(getFilter(), getVisitor());
         pool = Executors.newFixedThreadPool(numThreads);
 
     }
 
-    private ReferenceFinder.Filter getFilter() {
-        final String classname = "jdk/internal/reflect/Reflection";
-        final String method = "getCallerClass";
-        return new ReferenceFinder.Filter() {
-            public boolean accept(ConstantPool cpool, CPRefInfo cpref) {
-                try {
-                    CONSTANT_NameAndType_info nat = cpref.getNameAndTypeInfo();
-                    return cpref.getClassName().equals(classname) && nat.getName().equals(method);
-                } catch (ConstantPoolException ex) {
-                    throw new RuntimeException(ex);
+    private void check(ClassModel clazz) {
+        final String className = "jdk/internal/reflect/Reflection";
+        final String methodName = "getCallerClass";
+        boolean checkMethods = false;
+        for (var pe : clazz.constantPool()) {
+            if (pe instanceof MethodRefEntry ref
+                    && ref.owner().name().equalsString(className)
+                    && ref.name().equalsString(methodName)) {
+                checkMethods = true;
+            }
+        }
+
+        if (!checkMethods)
+            return;
+
+        for (var method : clazz.methods()) {
+            var code = method.code().orElse(null);
+            if (code == null)
+                continue;
+
+            boolean needsCsm = false;
+            for (var element : code) {
+                if (element instanceof InvokeInstruction invoke
+                        && invoke.opcode() == Opcode.INVOKESTATIC
+                        && invoke.method() instanceof MethodRefEntry ref
+                        && ref.owner().name().equalsString(className)
+                        && ref.name().equalsString(methodName)) {
+                    needsCsm = true;
+                    break;
                 }
             }
-        };
+
+            if (needsCsm) {
+                process(clazz, method);
+            }
+        }
     }
 
-    private ReferenceFinder.Visitor getVisitor() {
-        return new ReferenceFinder.Visitor() {
-            public void visit(ClassFile cf, Method m,  List<CPRefInfo> refs) {
-                try {
-                    // ignore jdk.unsupported/sun.reflect.Reflection.getCallerClass
-                    // which is a "special" delegate to the internal getCallerClass
-                    if (cf.getName().equals("sun/reflect/Reflection") &&
-                        m.getName(cf.constant_pool).equals("getCallerClass"))
-                        return;
+    private void process(ClassModel cf, MethodModel m) {
+        // ignore jdk.unsupported/sun.reflect.Reflection.getCallerClass
+        // which is a "special" delegate to the internal getCallerClass
+        if (cf.thisClass().name().equalsString("sun/reflect/Reflection") &&
+                m.methodName().equalsString("getCallerClass"))
+            return;
 
-                    String name = String.format("%s#%s %s", cf.getName(),
-                                                m.getName(cf.constant_pool),
-                                                m.descriptor.getValue(cf.constant_pool));
-                    if (!CallerSensitiveFinder.isCallerSensitive(m, cf.constant_pool)) {
-                        csMethodsMissingAnnotation.add(name);
-                        System.err.println("Missing @CallerSensitive: " + name);
-                    } else {
-                        if (verbose) {
-                            System.out.format("@CS  %s%n", name);
-                        }
-                    }
-                } catch (ConstantPoolException ex) {
-                    throw new RuntimeException(ex);
-                }
+        String name = cf.thisClass().asInternalName() + '#'
+                + m.methodName().stringValue() + ' '
+                + m.methodType().stringValue();
+        if (!CallerSensitiveFinder.isCallerSensitive(m)) {
+            csMethodsMissingAnnotation.add(name);
+            System.err.println("Missing @CallerSensitive: " + name);
+        } else {
+            if (verbose) {
+                System.out.format("@CS  %s%n", name);
             }
-        };
+        }
     }
 
     public List<String> run(Stream<Path> classes)throws IOException, InterruptedException,
-            ExecutionException, ConstantPoolException
+            ExecutionException, IllegalArgumentException
     {
         classes.forEach(p -> pool.submit(getTask(p)));
         waitForCompletion();
@@ -146,16 +163,11 @@ public class CallerSensitiveFinder {
     }
 
     private static final String CALLER_SENSITIVE_ANNOTATION = "Ljdk/internal/reflect/CallerSensitive;";
-    private static boolean isCallerSensitive(Method m, ConstantPool cp)
-            throws ConstantPoolException
-    {
-        RuntimeAnnotations_attribute attr =
-            (RuntimeAnnotations_attribute)m.attributes.get(Attribute.RuntimeVisibleAnnotations);
+    private static boolean isCallerSensitive(MethodModel m) {
+        var attr = m.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
         if (attr != null) {
-            for (int i = 0; i < attr.annotations.length; i++) {
-                Annotation ann = attr.annotations[i];
-                String annType = cp.getUTF8Value(ann.type_index);
-                if (CALLER_SENSITIVE_ANNOTATION.equals(annType)) {
+            for (var ann : attr.annotations()) {
+                if (ann.className().equalsString(CALLER_SENSITIVE_ANNOTATION)) {
                     return true;
                 }
             }
@@ -174,12 +186,11 @@ public class CallerSensitiveFinder {
     private FutureTask<Void> getTask(Path p) {
         FutureTask<Void> task = new FutureTask<>(new Callable<>() {
             public Void call() throws Exception {
-                try (InputStream is = Files.newInputStream(p)) {
-                    finder.parse(ClassFile.read(is));
+                try {
+                    var clz = ClassFile.of().parse(p); // propagate IllegalArgumentException
+                    check(clz);
                 } catch (IOException x) {
                     throw new UncheckedIOException(x);
-                } catch (ConstantPoolException x) {
-                    throw new RuntimeException(x);
                 }
                 return null;
             }
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
index 0a9d75e27a8..0a8a0ccfaea 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,21 +21,23 @@
  * questions.
  */
 
-import com.sun.tools.classfile.*;
-
-import static com.sun.tools.classfile.AccessFlags.ACC_PRIVATE;
-import static com.sun.tools.classfile.ConstantPool.*;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.Opcode;
+import java.lang.classfile.constantpool.MethodRefEntry;
+import java.lang.classfile.instruction.InvokeInstruction;
+import java.lang.reflect.AccessFlag;
 import java.net.URI;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -50,12 +52,13 @@ import java.util.concurrent.FutureTask;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.lang.constant.ConstantDescs.CD_Class;
+
 /*
  * @test
  * @summary CallerSensitive methods should be static or final instance
  *          methods except the known list of non-final instance methods
- * @modules jdk.jdeps/com.sun.tools.classfile
- *          jdk.jdeps/com.sun.tools.jdeps
+ * @enablePreview
  * @build CheckCSMs
  * @run main/othervm/timeout=900 CheckCSMs
  */
@@ -66,7 +69,7 @@ public class CheckCSMs {
 
     // The goal is to remove this list of Non-final instance @CS methods
     // over time.  Do not add any new one to this list.
-    private static Set<String> KNOWN_NON_FINAL_CSMS =
+    private static final Set<String> KNOWN_NON_FINAL_CSMS =
         Set.of("java/io/ObjectStreamField#getType ()Ljava/lang/Class;",
                "java/lang/Runtime#load (Ljava/lang/String;)V",
                "java/lang/Runtime#loadLibrary (Ljava/lang/String;)V",
@@ -111,119 +114,120 @@ public class CheckCSMs {
     private final Set<String> nonFinalCSMs = new ConcurrentSkipListSet<>();
     private final Map<String, Set<String>> csmWithCallerParameter = new ConcurrentHashMap<>();
 
-    private final ReferenceFinder finder;
     public CheckCSMs() {
-        this.finder = new ReferenceFinder(getFilter(), getVisitor());
         pool = Executors.newFixedThreadPool(numThreads);
-
     }
 
     public Set<String> run(Stream<Path> classes)
         throws IOException, InterruptedException, ExecutionException,
-               ConstantPoolException
+               IllegalArgumentException
     {
         classes.forEach(p -> pool.submit(getTask(p)));
         waitForCompletion();
         return nonFinalCSMs;
     }
 
+    private void check(ClassModel clazz) {
+        final String className = "jdk/internal/reflect/Reflection";
+        final String methodName = "getCallerClass";
+        boolean checkMethods = false;
+        for (var pe : clazz.constantPool()) {
+            if (pe instanceof MethodRefEntry ref
+                    && ref.owner().name().equalsString(className)
+                    && ref.name().equalsString(methodName)) {
+                checkMethods = true;
+            }
+        }
 
-    private ReferenceFinder.Filter getFilter() {
-        final String classname = "jdk/internal/reflect/Reflection";
-        final String method = "getCallerClass";
-        return new ReferenceFinder.Filter() {
-            public boolean accept(ConstantPool cpool, CPRefInfo cpref) {
-                try {
-                    CONSTANT_NameAndType_info nat = cpref.getNameAndTypeInfo();
-                    return cpref.getClassName().equals(classname) && nat.getName().equals(method);
-                } catch (ConstantPoolException ex) {
-                    throw new RuntimeException(ex);
+        if (!checkMethods)
+            return;
+
+        for (var method : clazz.methods()) {
+            var code = method.code().orElse(null);
+            if (code == null)
+                continue;
+
+            boolean needsCsm = false;
+            for (var element : code) {
+                if (element instanceof InvokeInstruction invoke
+                        && invoke.opcode() == Opcode.INVOKESTATIC
+                        && invoke.method() instanceof MethodRefEntry ref
+                        && ref.owner().name().equalsString(className)
+                        && ref.name().equalsString(methodName)) {
+                    needsCsm = true;
+                    break;
                 }
             }
-        };
-    }
 
-    private ReferenceFinder.Visitor getVisitor() {
-        return new ReferenceFinder.Visitor() {
-            public void visit(ClassFile cf, Method m,  List<CPRefInfo> refs) {
-                try {
-                    // ignore jdk.unsupported/sun.reflect.Reflection.getCallerClass
-                    // which is a "special" delegate to the internal getCallerClass
-                    if (cf.getName().equals("sun/reflect/Reflection") &&
-                        m.getName(cf.constant_pool).equals("getCallerClass"))
-                        return;
-
-                    String name = methodSignature(cf, m);
-                    if (!CheckCSMs.isStaticOrFinal(cf, m, cf.constant_pool)) {
-                        System.err.println("Unsupported @CallerSensitive: " + name);
-                        nonFinalCSMs.add(name);
-                    } else {
-                        if (listCSMs) {
-                            System.out.format("@CS  %s%n", name);
-                        }
-                    }
-
-                    // find the adapter implementation for CSM with the caller parameter
-                    if (!csmWithCallerParameter.containsKey(cf.getName())) {
-                        Set<String> methods = Arrays.stream(cf.methods)
-                                                    .filter(m0 -> csmWithCallerParameter(cf, m, m0))
-                                                    .map(m0 -> methodSignature(cf, m0))
-                                                    .collect(Collectors.toSet());
-                        csmWithCallerParameter.put(cf.getName(), methods);
-                    }
-                } catch (ConstantPoolException ex) {
-                    throw new RuntimeException(ex);
-                }
+            if (needsCsm) {
+                process(clazz, method);
             }
-        };
-    }
-
-    private static String methodSignature(ClassFile cf, Method m) {
-        try {
-            return String.format("%s#%s %s", cf.getName(),
-                                 m.getName(cf.constant_pool),
-                                 m.descriptor.getValue(cf.constant_pool));
-        } catch (ConstantPoolException ex) {
-            throw new RuntimeException(ex);
         }
     }
 
-    private static boolean csmWithCallerParameter(ClassFile cf, Method csm, Method m) {
-        ConstantPool cp = cf.constant_pool;
-        try {
-            int csmParamCount = csm.descriptor.getParameterCount(cp);
-            int paramCount = m.descriptor.getParameterCount(cp);
-            // an adapter method must have the same name and return type and a trailing Class parameter
-            if (!(csm.getName(cp).equals(m.getName(cp)) &&
-                    paramCount == (csmParamCount+1) &&
-                    m.descriptor.getReturnType(cp).equals(csm.descriptor.getReturnType(cp)))) {
+    private void process(ClassModel cf, MethodModel m) {
+        // ignore jdk.unsupported/sun.reflect.Reflection.getCallerClass
+        // which is a "special" delegate to the internal getCallerClass
+        if (cf.thisClass().name().equalsString("sun/reflect/Reflection")
+                && m.methodName().equalsString("getCallerClass"))
+            return;
+
+        String name = methodSignature(cf, m);
+        if (!CheckCSMs.isStaticOrFinal(cf, m)) {
+            System.err.println("Unsupported @CallerSensitive: " + name);
+            nonFinalCSMs.add(name);
+        } else {
+            if (listCSMs) {
+                System.out.format("@CS  %s%n", name);
+            }
+        }
+
+        // find the adapter implementation for CSM with the caller parameter
+        if (!csmWithCallerParameter.containsKey(cf.thisClass().asInternalName())) {
+            Set<String> methods = cf.methods().stream()
+                    .filter(m0 -> csmWithCallerParameter(cf, m, m0))
+                    .map(m0 -> methodSignature(cf, m0))
+                    .collect(Collectors.toSet());
+            csmWithCallerParameter.put(cf.thisClass().asInternalName(), methods);
+        }
+    }
+
+    private static String methodSignature(ClassModel cf, MethodModel m) {
+        return cf.thisClass().asInternalName() + '#'
+                + m.methodName().stringValue() + ' '
+                + m.methodType().stringValue();
+    }
+
+    private static boolean csmWithCallerParameter(ClassModel cf, MethodModel csm, MethodModel m) {
+        var csmType = csm.methodTypeSymbol();
+        var mType = m.methodTypeSymbol();
+        // an adapter method must have the same name and return type and a trailing Class parameter
+        if (!(csm.methodName().equals(m.methodName()) &&
+                mType.parameterCount() == (csmType.parameterCount() + 1) &&
+                mType.returnType().equals(csmType.returnType()))) {
+            return false;
+        }
+        // the descriptor of the adapter method must have the parameters
+        // of the caller-sensitive method and an additional Class parameter
+        for (int i = 0; i < csmType.parameterCount(); i++) {
+            if (mType.parameterType(i) != csmType.parameterType(i)) {
                 return false;
             }
-            // the descriptor of the adapter method must have the parameters
-            // of the caller-sensitive method and an additional Class parameter
-            String csmDesc = csm.descriptor.getParameterTypes(cp);
-            String desc = m.descriptor.getParameterTypes(cp);
-            int index = desc.indexOf(", java.lang.Class)");
-            if (index == -1) {
-                index = desc.indexOf("java.lang.Class)");
-                if (index == -1) return false;
-            }
-            String s = desc.substring(0, index) + ")";
-            if (s.equals(csmDesc)) {
-                if (!m.access_flags.is(ACC_PRIVATE)) {
-                    throw new RuntimeException(methodSignature(cf, m) + " adapter method for " +
-                            methodSignature(cf, csm) + " must be private");
-                }
-                if (!isCallerSensitiveAdapter(m, cp)) {
-                    throw new RuntimeException(methodSignature(cf, m) + " adapter method for " +
-                            methodSignature(cf, csm) + " must be annotated with @CallerSensitiveAdapter");
-                }
-                return true;
-            }
-        } catch (ConstantPoolException|Descriptor.InvalidDescriptor e) {
-            throw new RuntimeException(e);
         }
-        return false;
+
+        if (!mType.parameterType(mType.parameterCount() - 1).equals(CD_Class)) {
+            return false;
+        }
+
+        if (!m.flags().has(AccessFlag.PRIVATE)) {
+            throw new RuntimeException(methodSignature(cf, m) + " adapter method for " +
+                    methodSignature(cf, csm) + " must be private");
+        }
+        if (!isCallerSensitiveAdapter(m)) {
+            throw new RuntimeException(methodSignature(cf, m) + " adapter method for " +
+                    methodSignature(cf, csm) + " must be annotated with @CallerSensitiveAdapter");
+        }
+        return true;
     }
 
     private static final String CALLER_SENSITIVE_ANNOTATION
@@ -231,16 +235,13 @@ public class CheckCSMs {
     private static final String CALLER_SENSITIVE_ADAPTER_ANNOTATION
         = "Ljdk/internal/reflect/CallerSensitiveAdapter;";
 
-    private static boolean isCallerSensitive(Method m, ConstantPool cp)
-        throws ConstantPoolException
+    private static boolean isCallerSensitive(MethodModel m)
+        throws IllegalArgumentException
     {
-        RuntimeAnnotations_attribute attr =
-            (RuntimeAnnotations_attribute)m.attributes.get(Attribute.RuntimeVisibleAnnotations);
+        var attr = m.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
         if (attr != null) {
-            for (int i = 0; i < attr.annotations.length; i++) {
-                Annotation ann = attr.annotations[i];
-                String annType = cp.getUTF8Value(ann.type_index);
-                if (CALLER_SENSITIVE_ANNOTATION.equals(annType)) {
+            for (var ann : attr.annotations()) {
+                if (ann.className().equalsString(CALLER_SENSITIVE_ANNOTATION)) {
                     return true;
                 }
             }
@@ -248,16 +249,12 @@ public class CheckCSMs {
         return false;
     }
 
-    private static boolean isCallerSensitiveAdapter(Method m, ConstantPool cp)
-            throws ConstantPoolException
-    {
-        RuntimeAnnotations_attribute attr =
-                (RuntimeAnnotations_attribute)m.attributes.get(Attribute.RuntimeInvisibleAnnotations);
+    private static boolean isCallerSensitiveAdapter(MethodModel m) {
+        var attr = m.findAttribute(Attributes.RUNTIME_INVISIBLE_ANNOTATIONS).orElse(null);
+
         if (attr != null) {
-            for (int i = 0; i < attr.annotations.length; i++) {
-                Annotation ann = attr.annotations[i];
-                String annType = cp.getUTF8Value(ann.type_index);
-                if (CALLER_SENSITIVE_ADAPTER_ANNOTATION.equals(annType)) {
+            for (var ann : attr.annotations()) {
+                if (ann.className().equalsString(CALLER_SENSITIVE_ADAPTER_ANNOTATION)) {
                     return true;
                 }
             }
@@ -265,16 +262,14 @@ public class CheckCSMs {
         return false;
     }
 
-    private static boolean isStaticOrFinal(ClassFile cf, Method m, ConstantPool cp)
-        throws ConstantPoolException
-    {
-        if (!isCallerSensitive(m, cp))
+    private static boolean isStaticOrFinal(ClassModel cf, MethodModel m) {
+        if (!isCallerSensitive(m))
             return false;
 
         // either a static method or a final instance method
-        return m.access_flags.is(AccessFlags.ACC_STATIC) ||
-               m.access_flags.is(AccessFlags.ACC_FINAL) ||
-               cf.access_flags.is(AccessFlags.ACC_FINAL);
+        return m.flags().has(AccessFlag.STATIC) ||
+               m.flags().has(AccessFlag.FINAL) ||
+               cf.flags().has(AccessFlag.FINAL);
     }
 
     private final List<FutureTask<Void>> tasks = new ArrayList<>();
@@ -288,12 +283,11 @@ public class CheckCSMs {
     private FutureTask<Void> getTask(Path p) {
         FutureTask<Void> task = new FutureTask<>(new Callable<>() {
             public Void call() throws Exception {
-                try (InputStream is = Files.newInputStream(p)) {
-                    finder.parse(ClassFile.read(is));
+                try {
+                    var clz = ClassFile.of().parse(p); // propagate IllegalArgumentException
+                    check(clz);
                 } catch (IOException x) {
                     throw new UncheckedIOException(x);
-                } catch (ConstantPoolException x) {
-                    throw new RuntimeException(x);
                 }
                 return null;
             }
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java b/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java
index b9d4706fe40..781c75b23ae 100644
--- a/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java
+++ b/test/jdk/jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @bug 8010117
  * @summary Test CallerSensitiveFinder to find missing annotation
  * @modules java.base/jdk.internal.reflect
- *          jdk.jdeps/com.sun.tools.classfile
- *          jdk.jdeps/com.sun.tools.jdeps
+ * @enablePreview
  * @compile -XDignore.symbol.file MissingCallerSensitive.java
  * @build CallerSensitiveFinder
  * @run main MissingCallerSensitive
diff --git a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
index 0a72e7dff89..f188aa036f4 100644
--- a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
+++ b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
@@ -29,15 +29,17 @@
  *          jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.resources:open
  *          jdk.javadoc/jdk.javadoc.internal.doclets.toolkit.resources:open
  *          jdk.javadoc/jdk.javadoc.internal.tool.resources:open
- *          jdk.jdeps/com.sun.tools.classfile
+ * @enablePreview
  */
 
 import java.io.*;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.constantpool.Utf8Entry;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.tools.*;
-import com.sun.tools.classfile.*;
 
 /**
  * Compare string constants in javadoc classes against keys in javadoc resource bundles.
@@ -268,15 +270,15 @@ public class CheckResourceKeys {
         //System.err.println("scan " + fo.getName());
         InputStream in = fo.openInputStream();
         try {
-            ClassFile cf = ClassFile.read(in);
-            for (ConstantPool.CPInfo cpinfo: cf.constant_pool.entries()) {
-                if (cpinfo.getTag() == ConstantPool.CONSTANT_Utf8) {
-                    String v = ((ConstantPool.CONSTANT_Utf8_info) cpinfo).value;
+            ClassModel cf = ClassFile.of().parse(in.readAllBytes());
+            for (var cpinfo : cf.constantPool()) {
+                if (cpinfo instanceof Utf8Entry utf8Entry) {
+                    String v = utf8Entry.stringValue();
                     if (v.matches("(doclet|main|javadoc|tag)\\.[A-Za-z0-9-_.]+"))
                         results.add(v);
                 }
             }
-        } catch (ConstantPoolException ignore) {
+        } catch (IllegalArgumentException ignore) {
         } finally {
             in.close();
         }
diff --git a/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java b/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
index e81db00e5df..734b1741682 100644
--- a/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
+++ b/test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,60 +25,66 @@
  * @test
  * @bug 7166455
  * @summary javac doesn't set ACC_STRICT bit on <clinit> for strictfp class
- * @modules jdk.jdeps/com.sun.tools.classfile
- * @compile -source 16 -target 16 CheckACC_STRICTFlagOnclinitTest.java
- * @run main CheckACC_STRICTFlagOnclinitTest
+ * @library /tools/lib /test/lib
+ * @enablePreview
  */
 
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
+
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.io.File;
 import java.io.IOException;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-import com.sun.tools.classfile.Method;
 
-import static com.sun.tools.classfile.AccessFlags.ACC_STRICT;
-
-public strictfp class CheckACC_STRICTFlagOnclinitTest {
+public class CheckACC_STRICTFlagOnclinitTest {
     private static final String AssertionErrorMessage =
         "All methods should have the ACC_STRICT access flag " +
         "please check output";
     private static final String offendingMethodErrorMessage =
         "Method %s of class %s doesn't have the ACC_STRICT access flag";
 
-    static {
-        class Foo {
-            class Bar {
-                void m11() {}
+    private static final String SOURCE = """
+            public strictfp class Test {
+                static {
+                    class Foo {
+                        class Bar {
+                            void m11() {}
+                        }
+                        void m1() {}
+                    }
+                }
+                void m2() {
+                    class Any {
+                        void m21() {}
+                    }
+                }
             }
-            void m1() {}
-        }
-    }
-    void m2() {
-        class Any {
-            void m21() {}
-        }
-    }
+            """;
 
-    private List<String> errors = new ArrayList<>();
+    private final List<String> errors = new ArrayList<>();
 
     public static void main(String[] args)
-            throws IOException, ConstantPoolException, InvalidDescriptor {
+            throws IOException {
         new CheckACC_STRICTFlagOnclinitTest().run();
     }
 
     private void run()
-            throws IOException, ConstantPoolException, InvalidDescriptor {
-        String testClasses = System.getProperty("test.classes");
-        check(testClasses,
-              "CheckACC_STRICTFlagOnclinitTest.class",
-              "CheckACC_STRICTFlagOnclinitTest$1Foo.class",
-              "CheckACC_STRICTFlagOnclinitTest$1Foo$Bar.class",
-              "CheckACC_STRICTFlagOnclinitTest$1Any.class");
-        if (errors.size() > 0) {
+            throws IOException {
+        Path in = Path.of("in");
+        Path out = Path.of("out");
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(in, SOURCE);
+        CompilerUtils.compile(in, out, "--release", "16");
+        check(out,
+              "Test.class",
+              "Test$1Foo.class",
+              "Test$1Foo$Bar.class",
+              "Test$1Any.class");
+        if (!errors.isEmpty()) {
             for (String error: errors) {
                 System.err.println(error);
             }
@@ -86,37 +92,17 @@ public strictfp class CheckACC_STRICTFlagOnclinitTest {
         }
     }
 
-    void check(String dir, String... fileNames)
-        throws
-            IOException,
-            ConstantPoolException,
-            Descriptor.InvalidDescriptor {
+    void check(Path dir, String... fileNames) throws IOException {
         for (String fileName : fileNames) {
-            ClassFile classFileToCheck = ClassFile.read(new File(dir, fileName));
+            ClassModel classFileToCheck = ClassFile.of().parse(dir.resolve(fileName));
 
-            for (Method method : classFileToCheck.methods) {
-                if ((method.access_flags.flags & ACC_STRICT) == 0) {
+            for (MethodModel method : classFileToCheck.methods()) {
+                if ((method.flags().flagsMask() & ClassFile.ACC_STRICT) == 0) {
                     errors.add(String.format(offendingMethodErrorMessage,
-                            method.getName(classFileToCheck.constant_pool),
-                            classFileToCheck.getName()));
+                            method.methodName().stringValue(),
+                            classFileToCheck.thisClass().asInternalName()));
                 }
             }
         }
     }
-
-// this version of the code can be used when ClassFile API in not in a preview
-//    void check(String dir, String... fileNames) throws IOException{
-//        for (String fileName : fileNames) {
-//            ClassModel classFileToCheck = ClassFile.of().parse(new File(dir, fileName).toPath());
-//
-//            for (MethodModel method : classFileToCheck.methods()) {
-//                if ((method.flags().flagsMask() & ClassFile.ACC_STRICT) == 0) {
-//                    errors.add(String.format(offendingMethodErrorMessage,
-//                            method.methodName().stringValue(),
-//                            classFileToCheck.thisClass().asInternalName()));
-//                }
-//            }
-//        }
-//    }
-
 }
diff --git a/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java b/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java
index 39b9cd52998..72576a7fcb8 100644
--- a/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java
+++ b/test/langtools/tools/javac/StringConcat/TestIndyStringConcat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,76 +21,78 @@
  * questions.
  */
 
-import com.sun.tools.classfile.*;
-import com.sun.tools.classfile.BootstrapMethods_attribute.BootstrapMethodSpecifier;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_InvokeDynamic_info;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_MethodHandle_info;
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
 
-import java.io.File;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.BootstrapMethodEntry;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.CodeElement;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.attribute.CodeAttribute;
+import java.lang.classfile.constantpool.MethodHandleEntry;
+import java.lang.classfile.instruction.InvokeDynamicInstruction;
+import java.nio.file.Path;
 
 /*
  * @test
  * @bug     8148483 8151516 8151223
  * @summary Test that StringConcat is working for JDK >= 9
- * @modules jdk.jdeps/com.sun.tools.classfile
- *
- * @clean *
- * @compile -source 8 -target 8 TestIndyStringConcat.java
- * @run main TestIndyStringConcat false
- *
- * @clean *
- * @compile -XDstringConcat=inline TestIndyStringConcat.java
- * @run main TestIndyStringConcat false
- *
- * @clean *
- * @compile -XDstringConcat=indy TestIndyStringConcat.java
- * @run main TestIndyStringConcat true
- *
- * @clean *
- * @compile -XDstringConcat=indyWithConstants TestIndyStringConcat.java
- * @run main TestIndyStringConcat true
+ * @library /tools/lib /test/lib
+ * @enablePreview
+ * @run main TestIndyStringConcat
  */
 public class TestIndyStringConcat {
 
-    static String other;
+    private static final String SOURCE = """
+            public class IndyStringConcat {
+                static String other;
 
-    public static String test() {
-        return "Foo" + other;
-    }
+                public static String test() {
+                    return "Foo" + other;
+                }
+            }
+            """;
 
     public static void main(String[] args) throws Exception {
-        boolean expected = Boolean.valueOf(args[0]);
-        boolean actual = hasStringConcatFactoryCall("test");
-        if (expected != actual) {
-            throw new AssertionError("expected = " + expected + ", actual = " + actual);
+        Path src = Path.of("src");
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(src, SOURCE);
+
+        int errors = 0;
+        errors += test(false, "java8", "-source", "8", "-target", "8");
+        errors += test(false, "inline", "-XDstringConcat=inline");
+        errors += test(true, "indy", "-XDstringConcat=indy");
+        errors += test(true, "indyWithConstants", "-XDstringConcat=indyWithConstants");
+
+        if (errors > 0) {
+            throw new AssertionError(errors + " cases failed");
         }
     }
 
-    public static boolean hasStringConcatFactoryCall(String methodName) throws Exception {
-        ClassFile classFile = ClassFile.read(new File(System.getProperty("test.classes", "."),
-                TestIndyStringConcat.class.getName() + ".class"));
-        ConstantPool constantPool = classFile.constant_pool;
+    public static int test(boolean expected, String label, String... args) throws Exception {
+        Path src = Path.of("src");
+        Path out = Path.of(label);
+        CompilerUtils.compile(src, out, args);
+        if (hasStringConcatFactoryCall(out.resolve("IndyStringConcat.class"), "test") != expected) {
+            System.err.println("Expected " + expected + " failed for case " + label);
+            return 1;
+        }
+        return 0;
+    }
 
-        BootstrapMethods_attribute bsm_attr =
-                (BootstrapMethods_attribute)classFile
-                        .getAttribute(Attribute.BootstrapMethods);
+    public static boolean hasStringConcatFactoryCall(Path file, String methodName) throws Exception {
+        ClassModel classFile = ClassFile.of().parse(file);
 
-        for (Method method : classFile.methods) {
-            if (method.getName(constantPool).equals(methodName)) {
-                Code_attribute code = (Code_attribute) method.attributes
-                        .get(Attribute.Code);
-                for (Instruction i : code.getInstructions()) {
-                    if (i.getOpcode() == Opcode.INVOKEDYNAMIC) {
-                        CONSTANT_InvokeDynamic_info indyInfo =
-                                (CONSTANT_InvokeDynamic_info) constantPool.get(i.getUnsignedShort(1));
-
-                        BootstrapMethodSpecifier bsmSpec =
-                                bsm_attr.bootstrap_method_specifiers[indyInfo.bootstrap_method_attr_index];
-
-                        CONSTANT_MethodHandle_info bsmInfo =
-                                (CONSTANT_MethodHandle_info) constantPool.get(bsmSpec.bootstrap_method_ref);
-
-                        if (bsmInfo.getCPRefInfo().getClassName().equals("java/lang/invoke/StringConcatFactory")) {
+        for (MethodModel method : classFile.methods()) {
+            if (method.methodName().equalsString(methodName)) {
+                CodeAttribute code = method.findAttribute(Attributes.CODE).orElseThrow();
+                for (CodeElement i : code.elementList()) {
+                    if (i instanceof InvokeDynamicInstruction indy) {
+                        BootstrapMethodEntry bsmSpec = indy.invokedynamic().bootstrap();
+                        MethodHandleEntry bsmInfo = bsmSpec.bootstrapMethod();
+                        if (bsmInfo.reference().owner().asInternalName().equals("java/lang/invoke/StringConcatFactory")) {
                             return true;
                         }
                     }
@@ -100,27 +102,4 @@ public class TestIndyStringConcat {
         return false;
     }
 
-// this version of the code can be used when ClassFile API in not in a preview
-//    public static boolean hasStringConcatFactoryCall(String methodName) throws Exception {
-//        ClassModel classFile = ClassFile.of().parse(new File(System.getProperty("test.classes", "."),
-//                TestIndyStringConcat.class.getName() + ".class").toPath());
-//
-//        for (MethodModel method : classFile.methods()) {
-//            if (method.methodName().equalsString(methodName)) {
-//                CodeAttribute code = method.findAttribute(Attributes.CODE).orElseThrow();
-//                for (CodeElement i : code.elementList()) {
-//                    if (i instanceof InvokeDynamicInstruction) {
-//                        InvokeDynamicInstruction indy = (InvokeDynamicInstruction) i;
-//                        BootstrapMethodEntry bsmSpec = indy.invokedynamic().bootstrap();
-//                        MethodHandleEntry bsmInfo = bsmSpec.bootstrapMethod();
-//                        if (bsmInfo.reference().owner().asInternalName().equals("java/lang/invoke/StringConcatFactory")) {
-//                            return true;
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//        return false;
-//    }
-
 }
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase_legacy.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase_legacy.java
deleted file mode 100644
index b8fdcff4e88..00000000000
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SourceFileTestBase_legacy.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import com.sun.tools.classfile.Attribute;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.SourceFile_attribute;
-
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.tools.JavaFileObject;
-
-import toolbox.ToolBox;
-
-/**
- * Base class for Source file attribute tests. Checks expected file name for specified classes in the SourceFile attribute.
- * To add new tests you should extend the SourceFileTestBase class and invoke {@link #test} for static sources
- * or {@link #compileAndTest} for generated sources. For more information see corresponding methods.
- *
- * @see #test
- * @see #compileAndTest
- */
-public class SourceFileTestBase_legacy extends TestBase {
-    /**
-     * Checks expected fileName for the specified class in the SourceFile attribute.
-     *
-     * @param classToTest class to check its SourceFile attribute
-     * @param fileName    expected name of the file from which the test file is compiled.
-     */
-    protected void test(Class<?> classToTest, String fileName) throws Exception {
-        assertAttributePresent(ClassFile.read(getClassFile(classToTest)), fileName);
-    }
-
-    /**
-     * Checks expected fileName for the specified class in the SourceFile attribute.
-     *
-     * @param classToTest class name to check its SourceFile attribute
-     * @param fileName    expected name of the file from which the test file is compiled.
-     */
-    protected void test(String classToTest, String fileName) throws Exception {
-        assertAttributePresent(ClassFile.read(getClassFile(classToTest + ".class")), fileName);
-    }
-
-    /**
-     * Checks expected fileName for the specified class in the SourceFile attribute.
-     *
-     * @param classToTest path of class to check its SourceFile attribute
-     * @param fileName    expected name of the file from which the test file is compiled.
-     */
-    protected void test(Path classToTest, String fileName) throws Exception {
-        assertAttributePresent(ClassFile.read(classToTest), fileName);
-    }
-
-    /**
-     * Compiles sourceCode and for each specified class name checks the SourceFile attribute.
-     * The file name is extracted from source code.
-     *
-     * @param sourceCode    source code to compile
-     * @param classesToTest class names to check their SourceFile attribute.
-     */
-    protected void compileAndTest(String sourceCode, String... classesToTest) throws Exception {
-
-        Map<String, ? extends JavaFileObject> classes = compile(sourceCode).getClasses();
-        String fileName = ToolBox.getJavaFileNameFromSource(sourceCode);
-        for (String className : classesToTest) {
-            ClassFile classFile;
-            try (InputStream input = classes.get(className).openInputStream()) {
-                classFile = ClassFile.read(input);
-            }
-            assertAttributePresent(classFile, fileName);
-        }
-    }
-
-    private void assertAttributePresent(ClassFile classFile, String fileName) throws Exception {
-
-        //We need to count attributes with the same names because there is no appropriate API in the ClassFile.
-
-        List<SourceFile_attribute> sourceFileAttributes = new ArrayList<>();
-        for (Attribute a : classFile.attributes.attrs) {
-            if (Attribute.SourceFile.equals(a.getName(classFile.constant_pool))) {
-                sourceFileAttributes.add((SourceFile_attribute) a);
-            }
-        }
-
-        assertEquals(sourceFileAttributes.size(), 1, "Should be the only SourceFile attribute");
-
-        SourceFile_attribute attribute = sourceFileAttributes.get(0);
-
-        assertEquals(classFile.constant_pool.getUTF8Info(attribute.attribute_name_index).value,
-                Attribute.SourceFile, "Incorrect attribute name");
-        assertEquals(classFile.constant_pool.getUTF8Info(attribute.sourcefile_index).value, fileName,
-                "Incorrect source file name");
-        assertEquals(attribute.attribute_length, 2, "Incorrect attribute length");
-    }
-}
diff --git a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
index 92a6e6b9bae..33f55545d81 100644
--- a/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,27 +25,49 @@
  * @test
  * @summary sourcefile attribute test for synthetic class.
  * @bug 8040129
- * @library /tools/lib /tools/javac/lib ../lib_legacy
+ * @library /tools/lib /tools/javac/lib /test/lib ../lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.jdeps/com.sun.tools.classfile
- * @build toolbox.ToolBox InMemoryFileManager TestBase SourceFileTestBase_legacy
- * @compile -source 10 -target 10 SyntheticClassTest.java
- * @run main SyntheticClassTest true
- * @clean SyntheticClassTest$1
- * @compile SyntheticClassTest.java
- * @run main SyntheticClassTest false
+ *          java.base/jdk.internal.classfile.impl
+ * @build toolbox.ToolBox InMemoryFileManager TestBase SourceFileTestBase
+ * @enablePreview
+ * @run main SyntheticClassTest
  */
 
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
+
 import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
 
-public class SyntheticClassTest extends SourceFileTestBase_legacy {
+public class SyntheticClassTest extends SourceFileTestBase {
     public static void main(String[] args) throws Exception {
-        boolean expectSynthetic = Boolean.parseBoolean(args[0]);
-        new Inner();
+        String sourceCode = """
+                public class SyntheticClass {
+                    static class Inner {
+                        private Inner() {
+                        }
+                    }
 
+                    public SyntheticClass() {
+                        new Inner();
+                    }
+                }
+                """;
+        Path srcDir = Path.of("src");
+        Path v10Dir = Path.of("out10");
+        Path modernDir = Path.of("out");
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(srcDir, sourceCode);
+        CompilerUtils.compile(srcDir, v10Dir, "--release", "10");
+        CompilerUtils.compile(srcDir, modernDir);
+        test(v10Dir, true);
+        test(modernDir, false);
+    }
+
+    private static void test(Path path, boolean expectSynthetic) throws Exception {
         try {
-            new SyntheticClassTest().test("SyntheticClassTest$1", "SyntheticClassTest.java");
+            new SyntheticClassTest().test(path.resolve("SyntheticClass$1.class"), "SyntheticClass.java");
             if (!expectSynthetic) {
                 throw new AssertionError("Synthetic class should not have been emitted!");
             }
@@ -55,9 +77,4 @@ public class SyntheticClassTest extends SourceFileTestBase_legacy {
             }
         }
     }
-
-    static class Inner {
-        private Inner() {
-        }
-    }
 }
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java
index 76d5d3c178d..e4dfb5000f5 100644
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java
+++ b/test/langtools/tools/javac/classfiles/attributes/Synthetic/BridgeMethodsForLambdaTargetRelease14Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,14 @@
  *          compiling with --release 14.
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.jdeps/com.sun.tools.classfile
- * @library /tools/lib /tools/javac/lib ../lib_legacy
- * @build toolbox.ToolBox InMemoryFileManager TestResult TestBase
- * @build SyntheticTestDriver_legacy ExpectedClass ExpectedClasses
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build toolbox.ToolBox InMemoryFileManager
+ *        ExpectedClass ExpectedClasses
+ * @compile --enable-preview --source ${jdk.version} --target ${jdk.version}
+ *          SyntheticTestDriver.java
+ *          ../lib/TestResult.java ../lib/TestBase.java
  * @compile --source 14 -target 14 -XDdeduplicateLambdas=false BridgeMethodsForLambdaTargetRelease14Test.java
- * @run main SyntheticTestDriver_legacy BridgeMethodsForLambdaTargetRelease14Test
+ * @run main/othervm --enable-preview SyntheticTestDriver BridgeMethodsForLambdaTargetRelease14Test
  */
 
 import java.util.Comparator;
diff --git a/test/langtools/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver_legacy.java b/test/langtools/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver_legacy.java
deleted file mode 100644
index c9e333b0d4e..00000000000
--- a/test/langtools/tools/javac/classfiles/attributes/Synthetic/SyntheticTestDriver_legacy.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.regex.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.sun.tools.classfile.*;
-
-/**
- * The tests work as follows. Firstly, it looks through the test cases
- * and extracts the appropriate compiled classes. Each test case contains
- * a set of expected classes, methods and fields. Those class members must not have
- * the Synthetic attribute, while other found classes, methods and fields must have
- * the Synthetic attribute if they are not in the set of expected class members.
- *
- * Each test executes SyntheticTestDriver specifying the name of test cases and
- * the number of expected synthetic classes. Each test class is annotated by
- * annotations which contains non-synthetic class members.
- *
- * See the appropriate class for more information about a test case.
- */
-public class SyntheticTestDriver_legacy extends TestResult {
-
-    private static final String ACC_SYNTHETIC = "ACC_SYNTHETIC";
-
-    private final String testCaseName;
-    private final Map<String, ClassFile> classes;
-    private final Map<String, ExpectedClass> expectedClasses;
-
-    public static void main(String[] args)
-            throws TestFailedException, ConstantPoolException, IOException, ClassNotFoundException {
-        if (args.length != 1 && args.length != 2) {
-            throw new IllegalArgumentException("Usage: SyntheticTestDriver <class-name> [<number-of-synthetic-classes>]");
-        }
-        int numberOfSyntheticClasses = args.length == 1 ? 0 : Integer.parseInt(args[1]);
-        new SyntheticTestDriver_legacy(args[0]).test(numberOfSyntheticClasses);
-    }
-
-    public SyntheticTestDriver_legacy(String testCaseName) throws IOException, ConstantPoolException, ClassNotFoundException {
-        Class<?> clazz = Class.forName(testCaseName);
-        this.testCaseName = testCaseName;
-        this.expectedClasses = Stream.of(clazz.getAnnotationsByType(ExpectedClass.class))
-                .collect(Collectors.toMap(ExpectedClass::className, Function.identity()));
-        this.classes = new HashMap<>();
-        Path classDir = getClassDir().toPath();
-        Pattern filePattern = Pattern.compile(Pattern.quote(testCaseName.replace('.', File.separatorChar)) + ".*\\.class");
-        List<Path> paths = Files.walk(classDir)
-                .map(p -> classDir.relativize(p.toAbsolutePath()))
-                .filter(p -> filePattern.matcher(p.toString()).matches())
-                .collect(Collectors.toList());
-        for (Path path : paths) {
-            String className = path.toString().replace(".class", "").replace(File.separatorChar, '.');
-            classes.put(className, readClassFile(classDir.resolve(path).toFile()));
-        }
-        if (classes.isEmpty()) {
-            throw new RuntimeException("Classes have not been found.");
-        }
-        boolean success = classes.entrySet().stream()
-                .allMatch(e -> e.getKey().startsWith(testCaseName));
-        if (!success) {
-            classes.forEach((className, $) -> printf("Found class: %s\n", className));
-            throw new RuntimeException("Found classes are not from the test case : " + testCaseName);
-        }
-    }
-
-    private String getMethodName(ClassFile classFile, Method method)
-            throws ConstantPoolException, Descriptor.InvalidDescriptor {
-        String methodName = method.getName(classFile.constant_pool);
-        String parameters = method.descriptor.getParameterTypes(classFile.constant_pool);
-        return methodName + parameters;
-    }
-
-    public void test(int expectedNumberOfSyntheticClasses) throws TestFailedException {
-        try {
-            addTestCase(testCaseName);
-            Set<String> foundClasses = new HashSet<>();
-
-            int numberOfSyntheticClasses = 0;
-            for (Map.Entry<String, ClassFile> entry : classes.entrySet()) {
-                String className = entry.getKey();
-                ClassFile classFile = entry.getValue();
-                foundClasses.add(className);
-                if (testAttribute(
-                        classFile,
-                        () -> (Synthetic_attribute) classFile.getAttribute(Attribute.Synthetic),
-                        classFile.access_flags::getClassFlags,
-                        expectedClasses.keySet(),
-                        className,
-                        "Testing class " + className)) {
-                    ++numberOfSyntheticClasses;
-                }
-                ExpectedClass expectedClass = expectedClasses.get(className);
-                Set<String> expectedMethods = expectedClass != null
-                        ? toSet(expectedClass.expectedMethods())
-                        : new HashSet<>();
-                int numberOfSyntheticMethods = 0;
-                Set<String> foundMethods = new HashSet<>();
-                for (Method method : classFile.methods) {
-                    String methodName = getMethodName(classFile, method);
-                    foundMethods.add(methodName);
-                    if (testAttribute(
-                            classFile,
-                            () -> (Synthetic_attribute) method.attributes.get(Attribute.Synthetic),
-                            method.access_flags::getMethodFlags,
-                            expectedMethods,
-                            methodName,
-                            "Testing method " + methodName + " in class "
-                                    + className)) {
-                        ++numberOfSyntheticMethods;
-                    }
-                }
-                checkContains(foundMethods, expectedMethods,
-                        "Checking that all methods of class " + className
-                                + " without Synthetic attribute have been found");
-                checkEquals(numberOfSyntheticMethods,
-                        expectedClass == null ? 0 : expectedClass.expectedNumberOfSyntheticMethods(),
-                        "Checking number of synthetic methods in class: " + className);
-
-                Set<String> expectedFields = expectedClass != null
-                        ? toSet(expectedClass.expectedFields())
-                        : new HashSet<>();
-                int numberOfSyntheticFields = 0;
-                Set<String> foundFields = new HashSet<>();
-                for (Field field : classFile.fields) {
-                    String fieldName = field.getName(classFile.constant_pool);
-                    foundFields.add(fieldName);
-                    if (testAttribute(
-                            classFile,
-                            () -> (Synthetic_attribute) field.attributes.get(Attribute.Synthetic),
-                            field.access_flags::getFieldFlags,
-                            expectedFields,
-                            fieldName,
-                            "Testing field " + fieldName + " in class "
-                                    + className)) {
-                        ++numberOfSyntheticFields;
-                    }
-                }
-                checkContains(foundFields, expectedFields,
-                        "Checking that all fields of class " + className
-                                + " without Synthetic attribute have been found");
-                checkEquals(numberOfSyntheticFields,
-                        expectedClass == null ? 0 : expectedClass.expectedNumberOfSyntheticFields(),
-                        "Checking number of synthetic fields in class: " + className);
-            }
-            checkContains(foundClasses, expectedClasses.keySet(),
-                    "Checking that all classes have been found");
-            checkEquals(numberOfSyntheticClasses, expectedNumberOfSyntheticClasses,
-                    "Checking number of synthetic classes");
-        } catch (Exception e) {
-            addFailure(e);
-        } finally {
-            checkStatus();
-        }
-    }
-
-    private boolean testAttribute(ClassFile classFile,
-                               Supplier<Synthetic_attribute> getSyntheticAttribute,
-                               Supplier<Set<String>> getAccessFlags,
-                               Set<String> expectedMembers, String memberName,
-                               String info) throws ConstantPoolException {
-        echo(info);
-        String className = classFile.getName();
-        Synthetic_attribute attr = getSyntheticAttribute.get();
-        Set<String> flags = getAccessFlags.get();
-        if (expectedMembers.contains(memberName)) {
-            checkNull(attr, "Member must not have synthetic attribute : "
-                    + memberName);
-            checkFalse(flags.contains(ACC_SYNTHETIC),
-                    "Member must not have synthetic flag : " + memberName
-                            + " in class : " + className);
-            return false;
-        } else {
-            return checkNull(attr, "Synthetic attribute should not be generated")
-                    && checkTrue(flags.contains(ACC_SYNTHETIC), "Member must have synthetic flag : "
-                                + memberName + " in class : " + className);
-        }
-    }
-
-    private Set<String> toSet(String[] strings) {
-        HashSet<String> set = new HashSet<>();
-        Collections.addAll(set, strings);
-        return set;
-    }
-}
diff --git a/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestBase.java b/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestBase.java
deleted file mode 100644
index 08de973cc3f..00000000000
--- a/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestBase.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.tools.DiagnosticCollector;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.ToolProvider;
-
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-
-import toolbox.JavacTask;
-import toolbox.ToolBox;
-
-/**
- * Base class for class file attribute tests.
- * Contains methods for compiling generated sources in memory,
- * for reading files from disk and a lot of assert* methods.
- */
-public class TestBase {
-
-    public static final String LINE_SEPARATOR = System.lineSeparator();
-    public static final boolean isDumpOfSourceEnabled = Boolean.getBoolean("dump.src");
-
-    private <S> InMemoryFileManager compile(
-            List<String> options,
-            Function<S, ? extends JavaFileObject> src2JavaFileObject,
-            List<S> sources)
-            throws IOException, CompilationException {
-
-        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
-        List<? extends JavaFileObject> src = sources.stream()
-                .map(src2JavaFileObject)
-                .collect(Collectors.toList());
-
-        DiagnosticCollector<? super JavaFileObject> dc = new DiagnosticCollector<>();
-        try (InMemoryFileManager fileManager
-                     = new InMemoryFileManager(compiler.getStandardFileManager(null, null, null))) {
-            JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, dc, options, null, src);
-            boolean success = task.call();
-            if (!success) {
-                String errorMessage = dc.getDiagnostics().stream()
-                        .map(Object::toString)
-                        .collect(Collectors.joining("\n"));
-                throw new CompilationException("Compilation Error\n\n" + errorMessage);
-            }
-            return fileManager;
-        }
-    }
-
-    /**
-     * Compiles sources in memory.
-     *
-     * @param sources to compile
-     * @return in-memory file manager which contains class files and class loader
-     */
-    public InMemoryFileManager compile(String... sources)
-            throws IOException, CompilationException {
-        return compile(Collections.emptyList(), sources);
-    }
-
-    /**
-     * Compiles sources in memory.
-     *
-     * @param options compiler options.
-     * @param sources sources to compile.
-     * @return in-memory file manager which contains class files and class loader.
-     */
-    public InMemoryFileManager compile(List<String> options, String... sources)
-            throws IOException, CompilationException {
-        return compile(options, ToolBox.JavaSource::new, Arrays.asList(sources));
-    }
-
-    /**
-     * Compiles sources in memory.
-     *
-     * @param sources sources[i][0] - name of file, sources[i][1] - sources.
-     * @return in-memory file manager which contains class files and class loader.
-     */
-    public InMemoryFileManager compile(String[]... sources) throws IOException,
-            CompilationException {
-        return compile(Collections.emptyList(), sources);
-    }
-
-    /**
-     * Compiles sources in memory.
-     *
-     * @param options compiler options
-     * @param sources sources[i][0] - name of file, sources[i][1] - sources.
-     * @return in-memory file manager which contains class files and class loader.
-     */
-    public InMemoryFileManager compile(List<String> options, String[]... sources)
-            throws IOException, CompilationException {
-        return compile(options, src -> new ToolBox.JavaSource(src[0], src[1]), Arrays.asList(sources));
-    }
-
-    /**
-     * Returns class file that is read from {@code is}.
-     *
-     * @param is an input stream
-     * @return class file that is read from {@code is}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(InputStream is) throws IOException, ConstantPoolException {
-        return ClassFile.read(is);
-    }
-
-    /**
-     * Returns class file that is read from {@code fileObject}.
-     *
-     * @param fileObject a file object
-     * @return class file that is read from {@code fileObject}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(JavaFileObject fileObject) throws IOException, ConstantPoolException {
-        try (InputStream is = fileObject.openInputStream()) {
-            return readClassFile(is);
-        }
-    }
-
-    /**
-     * Returns class file that corresponds to {@code clazz}.
-     *
-     * @param clazz a class
-     * @return class file that is read from {@code clazz}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(Class<?> clazz) throws IOException, ConstantPoolException {
-        return readClassFile(getClassFile(clazz));
-    }
-
-    /**
-     * Returns class file that corresponds to {@code className}.
-     *
-     * @param className a class name
-     * @return class file that is read from {@code className}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(String className) throws IOException, ConstantPoolException {
-        return readClassFile(getClassFile(className + ".class"));
-    }
-
-    /**
-     * Returns class file that is read from {@code file}.
-     *
-     * @param file a file
-     * @return class file that is read from {@code file}
-     * @throws IOException if I/O error occurs
-     * @throws ConstantPoolException if constant pool error occurs
-     */
-    public ClassFile readClassFile(File file) throws IOException, ConstantPoolException {
-        try (InputStream is = new FileInputStream(file)) {
-            return readClassFile(is);
-        }
-    }
-
-    public void assertEquals(Object actual, Object expected, String message) {
-        if (!Objects.equals(actual, expected))
-            throw new AssertionFailedException(String.format("%s%nGot: %s, Expected: %s",
-                    message, actual, expected));
-    }
-
-    public void assertNull(Object actual, String message) {
-        assertEquals(actual, null, message);
-    }
-
-    public void assertNotNull(Object actual, String message) {
-        if (Objects.isNull(actual)) {
-            throw new AssertionFailedException(message + " : Expected not null value");
-        }
-    }
-
-    public void assertTrue(boolean actual, String message) {
-        assertEquals(actual, true, message);
-    }
-
-    public void assertFalse(boolean actual, String message) {
-        assertEquals(actual, false, message);
-    }
-
-    public void assertContains(Set<?> found, Set<?> expected, String message) {
-        Set<?> copy = new HashSet<>(expected);
-        copy.removeAll(found);
-        assertTrue(found.containsAll(expected), message + " : " + copy);
-    }
-
-    public void writeToFile(Path path, String source) throws IOException {
-        try (BufferedWriter writer = Files.newBufferedWriter(path)) {
-            writer.write(source);
-        }
-    }
-
-    public void writeToFileIfEnabled(Path path, String source) throws IOException {
-        if (isDumpOfSourceEnabled) {
-            writeToFile(path, source);
-        } else {
-            System.err.println("Source dumping disabled. To enable, run the test with '-Ddump.src=true'");
-        }
-    }
-
-    public File getSourceDir() {
-        return new File(System.getProperty("test.src", "."));
-    }
-
-    public File getClassDir() {
-        return new File(System.getProperty("test.classes", TestBase.class.getResource(".").getPath()));
-    }
-
-    public File getSourceFile(String fileName) {
-        return new File(getSourceDir(), fileName);
-    }
-
-    public File getClassFile(String fileName) {
-        return new File(getClassDir(), fileName);
-    }
-
-    public File getClassFile(Class clazz) {
-        return getClassFile(clazz.getName().replace(".", "/") + ".class");
-    }
-
-    /**
-     * Prints message to standard error. New lines are converted to system dependent NL.
-     *
-     * @param message string to print.
-     */
-    public void echo(String message) {
-        printf(message + "\n");
-    }
-
-    /**
-     * Substitutes args in template and prints result to standard error.
-     * New lines are converted to system dependent NL.
-     *
-     * @param template template in standard String.format(...) format.
-     * @param args arguments to substitute in template.
-     */
-    public void printf(String template, Object... args) {
-        System.err.printf(String.format(template, args).replace("\n", LINE_SEPARATOR));
-    }
-
-    public static class CompilationException extends Exception {
-
-        public CompilationException(String message) {
-            super(message);
-        }
-    }
-
-    public static class AssertionFailedException extends RuntimeException {
-        public AssertionFailedException(String message) {
-            super(message);
-        }
-    }
-}
diff --git a/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestResult.java b/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestResult.java
deleted file mode 100644
index 4c9662f110f..00000000000
--- a/test/langtools/tools/javac/classfiles/attributes/lib_legacy/TestResult.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.*;
-
-/**
- * This class accumulates test results. Test results can be checked with method {@code checkStatus}.
- */
-public class TestResult extends TestBase {
-
-    private final List<Info> testCasesInfo;
-
-    public TestResult() {
-        testCasesInfo = new ArrayList<>();
-    }
-
-    /**
-     * Adds new test case info.
-     *
-     * @param info the information about test case
-     */
-    public void addTestCase(String info) {
-        System.err.println("Test case: " + info);
-        testCasesInfo.add(new Info(info));
-    }
-
-    public boolean checkEquals(Object actual, Object expected, String message) {
-        echo("Testing : " + message);
-        if (!Objects.equals(actual, expected)) {
-            getLastTestCase().addAssert(String.format("%s\n" +
-                    "Expected: %s,\n" +
-                    "     Got: %s", message, expected, actual));
-            return false;
-        }
-        return true;
-    }
-
-    public boolean checkNull(Object actual, String message) {
-        return checkEquals(actual, null, message);
-    }
-
-    public boolean checkNotNull(Object actual, String message) {
-        echo("Testing : " + message);
-        if (Objects.isNull(actual)) {
-            getLastTestCase().addAssert(message + " : Expected not null value");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean checkFalse(boolean actual, String message) {
-        return checkEquals(actual, false, message);
-    }
-
-    public boolean checkTrue(boolean actual, String message) {
-        return checkEquals(actual, true, message);
-    }
-
-    public boolean checkContains(Collection<?> found, Collection<?> expected, String message) {
-        Set<?> copy = new HashSet<>(expected);
-        copy.removeAll(found);
-        if (!found.containsAll(expected)) {
-            return checkTrue(false, message + " FAIL : not found elements : " + copy + "\n" +
-                    "Actual: " + found);
-        } else {
-            return checkTrue(true, message + " PASS : all elements found");
-        }
-    }
-
-    public void addFailure(Throwable th) {
-        if (testCasesInfo.isEmpty()) {
-            testCasesInfo.add(new Info("Dummy info"));
-        }
-        getLastTestCase().addFailure(th);
-    }
-
-    private Info getLastTestCase() {
-        if (testCasesInfo.isEmpty()) {
-            throw new IllegalStateException("Test case should be created");
-        }
-        return testCasesInfo.get(testCasesInfo.size() - 1);
-    }
-
-    /**
-     * Throws {@code TestFailedException} if one of the checks are failed
-     * or an exception occurs. Prints error message of failed test cases.
-     *
-     * @throws TestFailedException if one of the checks are failed
-     *                             or an exception occurs
-     */
-    public void checkStatus() throws TestFailedException {
-        int passed = 0;
-        int failed = 0;
-        for (Info testCaseInfo : testCasesInfo) {
-            if (testCaseInfo.isFailed()) {
-                String info = testCaseInfo.info().replace("\n", LINE_SEPARATOR);
-                String errorMessage = testCaseInfo.getMessage().replace("\n", LINE_SEPARATOR);
-                System.err.printf("Failure in test case:%n%s%n%s%n", info, errorMessage);
-                ++failed;
-            } else {
-                ++passed;
-            }
-        }
-        System.err.printf("Test cases: passed: %d, failed: %d, total: %d.%n", passed, failed, passed + failed);
-        if (failed > 0) {
-            throw new TestFailedException("Test failed");
-        }
-        if (passed + failed == 0) {
-            throw new TestFailedException("Test cases were not found");
-        }
-    }
-
-    @Override
-    public void printf(String template, Object... args) {
-        getLastTestCase().printf(template, args);
-    }
-
-    private static class Info {
-
-        private final String info;
-        private final StringWriter writer;
-        private boolean isFailed;
-
-        private Info(String info) {
-            this.info = info;
-            writer = new StringWriter();
-        }
-
-        public String info() {
-            return info;
-        }
-
-        public boolean isFailed() {
-            return isFailed;
-        }
-
-        public void printf(String template, Object... args) {
-            writer.write(String.format(template, args));
-        }
-
-        public void addFailure(Throwable th) {
-            isFailed = true;
-            printf("[ERROR] : %s\n", getStackTrace(th));
-        }
-
-        public void addAssert(String e) {
-            isFailed = true;
-            printf("[ASSERT] : %s\n", e);
-        }
-
-        public String getMessage() {
-            return writer.toString();
-        }
-
-        public String getStackTrace(Throwable throwable) {
-            StringWriter stringWriter = new StringWriter();
-            try (PrintWriter printWriter = new PrintWriter(stringWriter)) {
-                throwable.printStackTrace(printWriter);
-            }
-            return stringWriter.toString();
-        }
-    }
-
-    public static class TestFailedException extends Exception {
-        public TestFailedException(String message) {
-            super(message);
-        }
-    }
-}
diff --git a/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java b/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
index 8df5d1e0939..fd321f3a269 100644
--- a/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
+++ b/test/langtools/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,44 +25,51 @@
  * @test
  * @bug 8012723
  * @summary strictfp interface misses strictfp modifer on default method
- * @modules jdk.jdeps/com.sun.tools.classfile
- * @compile -source 16 -target 16 CheckACC_STRICTFlagOnDefaultMethodTest.java
+ * @library /tools/lib /test/lib
+ * @enablePreview
  * @run main CheckACC_STRICTFlagOnDefaultMethodTest
  */
 
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
+
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.io.File;
 import java.io.IOException;
 
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Descriptor;
-import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-import com.sun.tools.classfile.Method;
-
-import static com.sun.tools.classfile.AccessFlags.ACC_STRICT;
-
 public class CheckACC_STRICTFlagOnDefaultMethodTest {
     private static final String AssertionErrorMessage =
         "All methods should have the ACC_STRICT access flag " +
         "please check output";
     private static final String offendingMethodErrorMessage =
         "Method %s of class %s doesn't have the ACC_STRICT access flag";
+    private static final String SOURCE = """
+            strictfp interface StrictfpInterface {
+                default void default_interface_method() {}
+                static void static_interface_method() {}
+            }
+            """;
 
     private List<String> errors = new ArrayList<>();
 
     public static void main(String[] args)
-            throws IOException, ConstantPoolException, InvalidDescriptor {
+            throws IOException {
         new CheckACC_STRICTFlagOnDefaultMethodTest().run();
     }
 
     private void run()
-            throws IOException, ConstantPoolException, InvalidDescriptor {
-        String testClasses = System.getProperty("test.classes");
-        check(testClasses,
-                "CheckACC_STRICTFlagOnDefaultMethodTest$StrictfpInterface.class");
-        if (errors.size() > 0) {
+            throws IOException {
+        Path src = Path.of("src");
+        Path out = Path.of("out");
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(src, SOURCE);
+        CompilerUtils.compile(src, out, "--release", "16");
+        check(out, "StrictfpInterface.class");
+        if (!errors.isEmpty()) {
             for (String error: errors) {
                 System.err.println(error);
             }
@@ -70,42 +77,17 @@ public class CheckACC_STRICTFlagOnDefaultMethodTest {
         }
     }
 
-    void check(String dir, String... fileNames)
-        throws
-            IOException,
-            ConstantPoolException,
-            Descriptor.InvalidDescriptor {
+    void check(Path dir, String... fileNames) throws IOException {
         for (String fileName : fileNames) {
-            ClassFile classFileToCheck = ClassFile.read(new File(dir, fileName));
+            ClassModel classFileToCheck = ClassFile.of().parse(dir.resolve(fileName));
 
-            for (Method method : classFileToCheck.methods) {
-                if ((method.access_flags.flags & ACC_STRICT) == 0) {
+            for (MethodModel method : classFileToCheck.methods()) {
+                if ((method.flags().flagsMask() & ClassFile.ACC_STRICT) == 0) {
                     errors.add(String.format(offendingMethodErrorMessage,
-                            method.getName(classFileToCheck.constant_pool),
-                            classFileToCheck.getName()));
+                            method.methodName().stringValue(),
+                            classFileToCheck.thisClass().asInternalName()));
                 }
             }
         }
     }
-
-// this version of the code can be used when ClassFile API in not in a preview
-//    void check(String dir, String... fileNames) throws IOException {
-//        for (String fileName : fileNames) {
-//            ClassModel classFileToCheck = ClassFile.of().parse(new File(dir, fileName).toPath());
-//
-//            for (MethodModel method : classFileToCheck.methods()) {
-//                if ((method.flags().flagsMask() & ClassFile.ACC_STRICT) == 0) {
-//                    errors.add(String.format(offendingMethodErrorMessage,
-//                            method.methodName().stringValue(),
-//                            classFileToCheck.thisClass().asInternalName()));
-//                }
-//            }
-//        }
-//    }
-
-    strictfp interface StrictfpInterface {
-        default void default_interface_method() {}
-        static void static_interface_method() {}
-    }
-
 }
diff --git a/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java b/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
index b24144aa80f..47bc3f78f79 100644
--- a/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
+++ b/test/langtools/tools/javac/lambda/LambdaTestStrictFPFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,27 +25,49 @@
  * @test
  * @bug 8046060
  * @summary Different results of floating point multiplication for lambda code block
- * @modules jdk.jdeps/com.sun.tools.classfile
- * @compile -source 16 -target 16 LambdaTestStrictFPFlag.java
+ * @library /tools/lib /test/lib
+ * @enablePreview
  * @run main LambdaTestStrictFPFlag
  */
 
-import java.io.*;
-import java.net.URL;
-import com.sun.tools.classfile.*;
+import jdk.test.lib.compiler.CompilerUtils;
+import toolbox.ToolBox;
+
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.nio.file.Path;
 
 public class LambdaTestStrictFPFlag {
+    private static final String SOURCE = """
+            class Test {
+                strictfp void test() {
+                    Face itf = () -> { };
+                }
+            }
+
+            interface Face {
+                void m();
+            }
+            """;
+
     public static void main(String[] args) throws Exception {
         new LambdaTestStrictFPFlag().run();
     }
 
     void run() throws Exception {
-        ClassFile cf = getClassFile("LambdaTestStrictFPFlag$Test.class");
-        ConstantPool cp = cf.constant_pool;
+        Path src = Path.of("src");
+        Path out = Path.of("out");
+
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(src, SOURCE);
+        CompilerUtils.compile(src, out, "--release", "16");
+
+        ClassModel cm = ClassFile.of().parse(out.resolve("Test.class"));
         boolean found = false;
-        for (Method meth: cf.methods) {
-            if (meth.getName(cp).startsWith("lambda$")) {
-                if ((meth.access_flags.flags & AccessFlags.ACC_STRICT) == 0) {
+        for (MethodModel meth: cm.methods()) {
+            if (meth.methodName().stringValue().startsWith("lambda$")) {
+                if ((meth.flags().flagsMask() & ClassFile.ACC_STRICT) == 0){
                     throw new Exception("strict flag missing from lambda");
                 }
                 found = true;
@@ -55,41 +77,4 @@ public class LambdaTestStrictFPFlag {
             throw new Exception("did not find lambda method");
         }
     }
-
-// this version of the code can be used when ClassFile API in not in a preview
-//    void run() throws Exception {
-//        ClassModel cm = getClassFile("LambdaTestStrictFPFlag$Test.class");
-//        boolean found = false;
-//        for (MethodModel meth: cm.methods()) {
-//            if (meth.methodName().stringValue().startsWith("lambda$")) {
-//                if ((meth.flags().flagsMask() & ClassFile.ACC_STRICT) == 0){
-//                    throw new Exception("strict flag missing from lambda");
-//                }
-//                found = true;
-//            }
-//        }
-//        if (!found) {
-//            throw new Exception("did not find lambda method");
-//        }
-//    }
-
-    ClassFile getClassFile(String name) throws IOException, ConstantPoolException {
-        URL url = getClass().getResource(name);
-        InputStream in = url.openStream();
-        try {
-            return ClassFile.read(in);
-        } finally {
-            in.close();
-        }
-    }
-
-    class Test {
-        strictfp void test() {
-            Face itf = () -> { };
-        }
-    }
-
-    interface Face {
-        void m();
-    }
 }
diff --git a/test/langtools/tools/javap/T6866657.java b/test/langtools/tools/javap/T6866657.java
index c935d4747f8..0b46cd07f66 100644
--- a/test/langtools/tools/javap/T6866657.java
+++ b/test/langtools/tools/javap/T6866657.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,10 @@
  * @test
  * @bug 6866657
  * @summary add byteLength() method to primary classfile types
- * @modules jdk.jdeps/com.sun.tools.classfile
- *          jdk.jdeps/com.sun.tools.javap
+ * @modules jdk.jdeps/com.sun.tools.javap
  */
 
 import java.io.*;
-import java.util.*;
 import javax.tools.*;
 import com.sun.tools.javap.*;
 
diff --git a/test/langtools/tools/javap/T7186925.java b/test/langtools/tools/javap/T7186925.java
index 2d4553526b1..dcbe8af10ba 100644
--- a/test/langtools/tools/javap/T7186925.java
+++ b/test/langtools/tools/javap/T7186925.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,9 @@
  * @test
  * @bug 7186925
  * @summary JavapTask passes null to java.io.Writer
- * @modules jdk.jdeps/com.sun.tools.classfile
- *          jdk.jdeps/com.sun.tools.javap
+ * @modules jdk.jdeps/com.sun.tools.javap
  */
 
-import java.io.*;
-import java.util.*;
 import javax.tools.*;
 import com.sun.tools.javap.*;
 
diff --git a/test/langtools/tools/jdeps/APIDeps.java b/test/langtools/tools/jdeps/APIDeps.java
index 05b4bd2f3a5..826135fd532 100644
--- a/test/langtools/tools/jdeps/APIDeps.java
+++ b/test/langtools/tools/jdeps/APIDeps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @library lib
  * @modules java.base/sun.security.x509
  *          java.management
- *          jdk.jdeps/com.sun.tools.classfile
  *          jdk.jdeps/com.sun.tools.jdeps
  * @run main APIDeps
  */
@@ -104,17 +103,17 @@ public class APIDeps {
              new String[] {"c.I", "e.E", "f.F", "m.Bar"},
              new String[] {"-classpath", testDir.getPath(), "-verbose:class", "-filter:none"});
         test(new File(mDir, "Gee.class"),
-             new String[] {"g.G", "sun.security.x509.X509CertInfo", "com.sun.tools.classfile.ClassFile",
+             new String[] {"g.G", "sun.security.x509.X509CertInfo", "com.sun.tools.jdeps.Analyzer",
                            "com.sun.management.ThreadMXBean", "com.sun.source.tree.BinaryTree"},
              new String[] {"-classpath", testDir.getPath(), "-verbose"});
 
         // -jdkinternals
         test(new File(mDir, "Gee.class"),
-             new String[] {"sun.security.x509.X509CertInfo", "com.sun.tools.classfile.ClassFile"},
+             new String[] {"sun.security.x509.X509CertInfo", "com.sun.tools.jdeps.Analyzer"},
              new String[] {"-jdkinternals", "-quiet"});
         // -jdkinternals parses all classes on -classpath and the input arguments
         test(new File(mDir, "Gee.class"),
-             new String[] {"com.sun.tools.classfile.ClassFile",
+             new String[] {"com.sun.tools.jdeps.Analyzer",
                            "sun.security.x509.X509CertInfo"},
              // use -classpath tmp/a with no use of JDK internal API
              new String[] {"-classpath", dest.resolve("a").toString(), "-jdkinternals", "-quiet"});
diff --git a/test/langtools/tools/jdeps/m/Gee.java b/test/langtools/tools/jdeps/m/Gee.java
index 194a30d7f1b..d1e56428acf 100644
--- a/test/langtools/tools/jdeps/m/Gee.java
+++ b/test/langtools/tools/jdeps/m/Gee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@ package m;
 
 class Gee extends g.G {
     public sun.security.x509.X509CertInfo cert;
-    public com.sun.tools.classfile.ClassFile cf;     // not exported
+    public com.sun.tools.jdeps.Analyzer analyzer;     // not exported
     public com.sun.source.tree.BinaryTree tree;      // exported
     public com.sun.management.ThreadMXBean mxbean;   // exported
 }

From d4c2edf2c91a790874c80f1a7bea5bfd4f438bde Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 17 May 2024 12:26:22 +0000
Subject: [PATCH 476/486] 8331855: Convert jdk.jdeps jdeprscan and jdeps to use
 the Classfile API

Reviewed-by: asotona
---
 .../sun/tools/jdeprscan/scan/CPEntries.java   |  29 +-
 .../sun/tools/jdeprscan/scan/CPSelector.java  | 123 -----
 .../sun/tools/jdeprscan/scan/ClassFinder.java |  31 +-
 .../sun/tools/jdeprscan/scan/MethodSig.java   | 167 -------
 .../com/sun/tools/jdeprscan/scan/Scan.java    | 259 +++++------
 .../classes/com/sun/tools/jdeps/Analyzer.java |   4 +-
 .../classes/com/sun/tools/jdeps/Archive.java  |   4 +-
 .../com/sun/tools/jdeps/ClassFileReader.java  |  76 ++--
 .../{classfile => jdeps}/Dependencies.java    | 427 +++++++-----------
 .../{classfile => jdeps}/Dependency.java      |   8 +-
 .../com/sun/tools/jdeps/DependencyFinder.java |  43 +-
 .../com/sun/tools/jdeps/DepsAnalyzer.java     |   5 +-
 .../sun/tools/jdeps/JdepsConfiguration.java   |   4 +-
 .../com/sun/tools/jdeps/JdepsFilter.java      |   6 +-
 .../com/sun/tools/jdeps/ModuleAnalyzer.java   |   4 +-
 .../com/sun/tools/jdeps/VersionHelper.java    |  12 +-
 .../tools/javap/classfile/deps/GetDeps.java   |  17 +-
 .../tools/javap/classfile/deps/T6907575.java  |   5 +-
 .../tests/jdk/jdeprscan/TestMethodSig.java    |  61 ---
 19 files changed, 416 insertions(+), 869 deletions(-)
 delete mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java
 delete mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java
 rename src/jdk.jdeps/share/classes/com/sun/tools/{classfile => jdeps}/Dependencies.java (62%)
 rename src/jdk.jdeps/share/classes/com/sun/tools/{classfile => jdeps}/Dependency.java (95%)
 delete mode 100644 test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java

diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java
index 8314a2b608a..09d0c0fe27a 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,13 @@
 
 package com.sun.tools.jdeprscan.scan;
 
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.constantpool.*;
 import java.util.ArrayList;
 import java.util.Formatter;
 import java.util.List;
 import java.util.Locale;
 
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPool;
-
-import static com.sun.tools.classfile.ConstantPool.CPInfo;
-
 /**
  * A container for selected constant pool entries. There are currently
  * lists that contain the following types of CP entries:
@@ -45,15 +42,21 @@ import static com.sun.tools.classfile.ConstantPool.CPInfo;
  *  - CONSTANT_InterfaceMethodref_info
  */
 class CPEntries {
-    final List<ConstantPool.CONSTANT_Class_info> classes = new ArrayList<>();
-    final List<ConstantPool.CONSTANT_Fieldref_info> fieldRefs = new ArrayList<>();
-    final List<ConstantPool.CONSTANT_Methodref_info> methodRefs = new ArrayList<>();
-    final List<ConstantPool.CONSTANT_InterfaceMethodref_info> intfMethodRefs = new ArrayList<>();
+    final List<ClassEntry> classes = new ArrayList<>();
+    final List<FieldRefEntry> fieldRefs = new ArrayList<>();
+    final List<MethodRefEntry> methodRefs = new ArrayList<>();
+    final List<InterfaceMethodRefEntry> intfMethodRefs = new ArrayList<>();
 
-    public static CPEntries loadFrom(ClassFile cf) {
+    public static CPEntries loadFrom(ClassModel cf) {
         CPEntries entries = new CPEntries();
-        for (CPInfo cpi : cf.constant_pool.entries()) {
-            cpi.accept(new CPSelector(), entries);
+        for (PoolEntry cpi : cf.constantPool()) {
+            switch (cpi) {
+                case ClassEntry ce -> entries.classes.add(ce);
+                case MethodRefEntry mref -> entries.methodRefs.add(mref);
+                case InterfaceMethodRefEntry imref -> entries.intfMethodRefs.add(imref);
+                case FieldRefEntry fref -> entries.fieldRefs.add(fref);
+                default -> {}
+            }
         }
         return entries;
     }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java
deleted file mode 100644
index ab81c4503da..00000000000
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/CPSelector.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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 com.sun.tools.jdeprscan.scan;
-
-import com.sun.tools.classfile.ConstantPool;
-import com.sun.tools.classfile.ConstantPool.CONSTANT_Dynamic_info;
-
-/**
- * A visitor that selects constant pool entries by type and adds
- * them to the given CPEntries object.
- */
-class CPSelector implements ConstantPool.Visitor<Void,CPEntries> {
-    @Override
-    public Void visitClass(ConstantPool.CONSTANT_Class_info info, CPEntries p) {
-        p.classes.add(info);
-        return null;
-    }
-
-    @Override
-    public Void visitDouble(ConstantPool.CONSTANT_Double_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitFieldref(ConstantPool.CONSTANT_Fieldref_info info, CPEntries p) {
-        p.fieldRefs.add(info);
-        return null;
-    }
-
-    @Override
-    public Void visitFloat(ConstantPool.CONSTANT_Float_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitInteger(ConstantPool.CONSTANT_Integer_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitInterfaceMethodref(ConstantPool.CONSTANT_InterfaceMethodref_info info, CPEntries p) {
-        p.intfMethodRefs.add(info);
-        return null;
-    }
-
-    @Override
-    public Void visitInvokeDynamic(ConstantPool.CONSTANT_InvokeDynamic_info info, CPEntries p) {
-        return null;
-    }
-
-    public Void visitDynamicConstant(CONSTANT_Dynamic_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitLong(ConstantPool.CONSTANT_Long_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitMethodref(ConstantPool.CONSTANT_Methodref_info info, CPEntries p) {
-        p.methodRefs.add(info);
-        return null;
-    }
-
-    @Override
-    public Void visitMethodHandle(ConstantPool.CONSTANT_MethodHandle_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitMethodType(ConstantPool.CONSTANT_MethodType_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitModule(ConstantPool.CONSTANT_Module_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitNameAndType(ConstantPool.CONSTANT_NameAndType_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitPackage(ConstantPool.CONSTANT_Package_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitString(ConstantPool.CONSTANT_String_info info, CPEntries p) {
-        return null;
-    }
-
-    @Override
-    public Void visitUtf8(ConstantPool.CONSTANT_Utf8_info info, CPEntries p) {
-        return null;
-    }
-}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java
index ebb847bbe99..b447bad8197 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/ClassFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@
 
 package com.sun.tools.jdeprscan.scan;
 
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-
 import java.io.IOException;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
 import java.net.URI;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
@@ -92,9 +91,9 @@ public class ClassFinder {
      * @param className the class to search for
      * @return a ClassFile instance, or null if not found
      */
-    public ClassFile find(String className) {
+    public ClassModel find(String className) {
         for (PathEntry pe : list) {
-            ClassFile cf = pe.find(className);
+            ClassModel cf = pe.find(className);
             if (cf != null) {
                 return cf;
             }
@@ -113,7 +112,7 @@ public class ClassFinder {
          * @param className the class to search for
          * @return a ClassFile instance, or null if not found
          */
-        ClassFile find(String className);
+        ClassModel find(String className);
     }
 
     /**
@@ -127,14 +126,14 @@ public class ClassFinder {
         }
 
         @Override
-        public ClassFile find(String className) {
+        public ClassModel find(String className) {
             JarEntry entry = jarFile.getJarEntry(className + ".class");
             if (entry == null) {
                 return null;
             }
             try {
-                return ClassFile.read(jarFile.getInputStream(entry));
-            } catch (IOException | ConstantPoolException ex) {
+                return ClassFile.of().parse(jarFile.getInputStream(entry).readAllBytes());
+            } catch (IOException | IllegalArgumentException ex) {
                 if (verbose) {
                     ex.printStackTrace();
                 }
@@ -154,13 +153,13 @@ public class ClassFinder {
         }
 
         @Override
-        public ClassFile find(String className) {
+        public ClassModel find(String className) {
             Path classFileName = dir.resolve(className + ".class");
             try {
-                return ClassFile.read(classFileName);
+                return ClassFile.of().parse(classFileName);
             } catch (NoSuchFileException nsfe) {
                 // not found, return silently
-            } catch (IOException | ConstantPoolException ex) {
+            } catch (IOException | IllegalArgumentException ex) {
                 if (verbose) {
                     ex.printStackTrace();
                 }
@@ -181,7 +180,7 @@ public class ClassFinder {
         final FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
 
         @Override
-        public ClassFile find(String className) {
+        public ClassModel find(String className) {
             int end = className.lastIndexOf('/');
             if (end < 0) {
                 return null;
@@ -194,13 +193,13 @@ public class ClassFinder {
                         .filter(Files::exists)
                         .findFirst();
                 if (opath.isPresent()) {
-                    return ClassFile.read(opath.get());
+                    return ClassFile.of().parse(opath.get());
                 } else {
                     return null;
                 }
             } catch (NoSuchFileException nsfe) {
                 // not found, return silently
-            } catch (IOException | ConstantPoolException ex) {
+            } catch (IOException | IllegalArgumentException ex) {
                 if (verbose) {
                     ex.printStackTrace();
                 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java
deleted file mode 100644
index 723b489f727..00000000000
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/MethodSig.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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 com.sun.tools.jdeprscan.scan;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Represents a method's signature, that is, its parameter types
- * and its return type.
- */
-public class MethodSig {
-    final List<String> parameters;
-    final String returnType;
-
-    /**
-     * Parses the method descriptor and returns a MethodSig instance.
-     *
-     * @param desc the descriptor to parse
-     * @return the new MethodSig instance
-     */
-    public static MethodSig fromDesc(String desc) {
-        return parse(desc, 0, desc.length());
-    }
-
-    /**
-     * Returns this method's return type.
-     *
-     * @return the return type
-     */
-    public String getReturnType() {
-        return returnType;
-    }
-
-    /**
-     * Returns a list of parameters of this method.
-     *
-     * @return the parameter list
-     */
-    public List<String> getParameters() {
-        return parameters;
-    }
-
-    /**
-     * Returns a string describing this method.
-     *
-     * @return the string description
-     */
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("parameters");
-        if (parameters.isEmpty()) {
-            sb.append(" none");
-        } else {
-            int i = 0;
-            for (String p : parameters) {
-                sb.append(String.format(" %d=%s", i++, p));
-            }
-        }
-        sb.append(String.format(" return %s", returnType));
-        return sb.toString();
-    }
-
-    private MethodSig(List<String> parameters, String returnType) {
-        this.parameters = Collections.unmodifiableList(parameters);
-        this.returnType = returnType;
-    }
-
-    private static IllegalArgumentException ex(String desc, int pos) {
-        return new IllegalArgumentException(String.format(
-            "illegal descriptor \"%s\" at position %d", desc, pos));
-    }
-
-    private static MethodSig parse(String desc, int start, int end)
-            throws IllegalArgumentException {
-        int p = start;
-        int dims = 0;
-        boolean inReturnType = false;
-        String returnType = null;
-        List<String> parameters = new ArrayList<>();
-
-        while (p < end) {
-            String type;
-            char ch;
-            switch (ch = desc.charAt(p)) {
-                case '(':
-                    p++;
-                    continue;
-
-                case ')':
-                    p++;
-                    inReturnType = true;
-                    continue;
-
-                case '[':
-                    p++;
-                    dims++;
-                    continue;
-
-                case 'B': // byte
-                case 'C': // char
-                case 'D': // double
-                case 'F': // float
-                case 'I': // int
-                case 'J': // long
-                case 'S': // short
-                case 'Z': // boolean
-                case 'V': // void
-                    type = Character.toString(ch);
-                    p++;
-                    break;
-
-                case 'L':
-                    int sep = desc.indexOf(';', p);
-                    if (sep == -1 || sep >= end)
-                        throw ex(desc, p);
-                    type = desc.substring(p, ++sep);
-                    p = sep;
-                    break;
-
-                default:
-                    throw ex(desc, p);
-            }
-
-            StringBuilder sb = new StringBuilder();
-            for ( ; dims > 0; dims-- )
-                sb.append("[");
-            sb.append(type);
-            if (inReturnType) {
-                returnType = sb.toString();
-            } else {
-                parameters.add(sb.toString());
-            }
-        }
-
-        if (returnType == null) {
-            throw ex(desc, end);
-        }
-
-        return new MethodSig(parameters, returnType);
-    }
-}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java
index 671c3a39e96..8f1a2b3f005 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/scan/Scan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,13 @@ package com.sun.tools.jdeprscan.scan;
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.lang.classfile.AccessFlags;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.constantpool.FieldRefEntry;
+import java.lang.classfile.constantpool.NameAndTypeEntry;
+import java.lang.constant.MethodTypeDesc;
+import java.lang.reflect.AccessFlag;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
@@ -41,17 +48,12 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.sun.tools.classfile.*;
 import com.sun.tools.jdeprscan.DeprData;
 import com.sun.tools.jdeprscan.DeprDB;
 import com.sun.tools.jdeprscan.Messages;
 
-import static com.sun.tools.classfile.AccessFlags.*;
-import static com.sun.tools.classfile.ConstantPool.*;
-
 /**
  * An object that represents the scanning phase of deprecation usage checking.
  * Given a deprecation database, scans the targeted directory hierarchy, jar
@@ -85,7 +87,7 @@ public class Scan {
         // one, we should instead add a reference to the symbol file for that release instead
         // of the current image. The problems are a) it's unclear how to get from a release
         // to paths that reference the symbol files, as this might be internal to the file
-        // manager; and b) the symbol file includes .sig files, not class files, which ClassFile
+        // manager; and b) the symbol file includes .sig files, not class files, which ClassModel
         // might not be able to handle.
         f.addJrt();
 
@@ -164,13 +166,13 @@ public class Scan {
 
     Pattern refTypePattern = Pattern.compile("\\[+L(.*);");
 
-    String typeKind(ClassFile cf) {
-        AccessFlags flags = cf.access_flags;
-        if (flags.is(ACC_ENUM)) {
+    String typeKind(ClassModel cf) {
+        AccessFlags flags = cf.flags();
+        if (flags.has(AccessFlag.ENUM)) {
             return "enum";
-        } else if (flags.is(ACC_ANNOTATION)) {
+        } else if (flags.has(AccessFlag.ANNOTATION)) {
             return "@interface";
-        } else if (flags.is(ACC_INTERFACE)) {
+        } else if (flags.has(AccessFlag.INTERFACE)) {
             return "interface";
         } else {
             return "class";
@@ -181,44 +183,43 @@ public class Scan {
         return Messages.get(forRemoval ? "scan.dep.removal" : "scan.dep.normal");
     }
 
-    void printType(String key, ClassFile cf, String cname, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get(key, typeKind(cf), cf.getName(), cname, dep(r)));
+    void printType(String key, ClassModel cf, String cname, boolean r) {
+        out.println(Messages.get(key, typeKind(cf), cf.thisClass().asInternalName(), cname, dep(r)));
     }
 
-    void printMethod(String key, ClassFile cf, String cname, String mname, String rtype,
-                     boolean r) throws ConstantPoolException {
-        out.println(Messages.get(key, typeKind(cf), cf.getName(), cname, mname, rtype, dep(r)));
+    void printMethod(String key, ClassModel cf, String cname, String mname, String rtype,
+                     boolean r)  {
+        out.println(Messages.get(key, typeKind(cf), cf.thisClass().asInternalName(), cname, mname, rtype, dep(r)));
     }
 
-    void printField(String key, ClassFile cf, String cname, String fname,
-                     boolean r) throws ConstantPoolException {
-        out.println(Messages.get(key, typeKind(cf), cf.getName(), cname, fname, dep(r)));
+    void printField(String key, ClassModel cf, String cname, String fname,
+                     boolean r)  {
+        out.println(Messages.get(key, typeKind(cf), cf.thisClass().asInternalName(), cname, fname, dep(r)));
     }
 
-    void printFieldType(String key, ClassFile cf, String cname, String fname, String type,
-                     boolean r) throws ConstantPoolException {
-        out.println(Messages.get(key, typeKind(cf), cf.getName(), cname, fname, type, dep(r)));
+    void printFieldType(String key, ClassModel cf, String cname, String fname, String type,
+                     boolean r)  {
+        out.println(Messages.get(key, typeKind(cf), cf.thisClass().asInternalName(), cname, fname, type, dep(r)));
     }
 
-    void printHasField(ClassFile cf, String fname, String type, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get("scan.out.hasfield", typeKind(cf), cf.getName(), fname, type, dep(r)));
+    void printHasField(ClassModel cf, String fname, String type, boolean r)
+             {
+        out.println(Messages.get("scan.out.hasfield", typeKind(cf), cf.thisClass().asInternalName(), fname, type, dep(r)));
     }
 
-    void printHasMethodParmType(ClassFile cf, String mname, String parmType, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get("scan.out.methodparmtype", typeKind(cf), cf.getName(), mname, parmType, dep(r)));
+    void printHasMethodParmType(ClassModel cf, String mname, String parmType, boolean r)
+             {
+        out.println(Messages.get("scan.out.methodparmtype", typeKind(cf), cf.thisClass().asInternalName(), mname, parmType, dep(r)));
     }
 
-    void printHasMethodRetType(ClassFile cf, String mname, String retType, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get("scan.out.methodrettype", typeKind(cf), cf.getName(), mname, retType, dep(r)));
+    void printHasMethodRetType(ClassModel cf, String mname, String retType, boolean r)
+             {
+        out.println(Messages.get("scan.out.methodrettype", typeKind(cf), cf.thisClass().asInternalName(), mname, retType, dep(r)));
     }
 
-    void printHasOverriddenMethod(ClassFile cf, String overridden, String mname, String desc, boolean r)
-            throws ConstantPoolException {
-        out.println(Messages.get("scan.out.methodoverride", typeKind(cf), cf.getName(), overridden,
+    void printHasOverriddenMethod(ClassModel cf, String overridden, String mname, String desc, boolean r)
+             {
+        out.println(Messages.get("scan.out.methodoverride", typeKind(cf), cf.thisClass().asInternalName(), overridden,
                                  mname, desc, dep(r)));
     }
 
@@ -253,29 +254,29 @@ public class Scan {
      * The checkMethod parameter determines whether this checks for a method
      * or for a field.
      *
-     * @param targetClass the ClassFile of the class to search
+     * @param targetClass the ClassModel of the class to search
      * @param targetName the method or field's name
      * @param targetDesc the methods descriptor (ignored if checkMethod is false)
      * @param checkMethod true if checking for method, false if checking for field
      * @return boolean indicating whether the member is present
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @ if a constant pool entry cannot be found
      */
-    boolean isMemberPresent(ClassFile targetClass,
+    boolean isMemberPresent(ClassModel targetClass,
                             String targetName,
                             String targetDesc,
                             boolean checkMethod)
-            throws ConstantPoolException {
+             {
         if (checkMethod) {
-            for (Method m : targetClass.methods) {
-                String mname = m.getName(targetClass.constant_pool);
-                String mdesc = targetClass.constant_pool.getUTF8Value(m.descriptor.index);
+            for (var m : targetClass.methods()) {
+                String mname = m.methodName().stringValue();
+                String mdesc = m.methodType().stringValue();
                 if (targetName.equals(mname) && targetDesc.equals(mdesc)) {
                     return true;
                 }
             }
         } else {
-            for (Field f : targetClass.fields) {
-                String fname = f.getName(targetClass.constant_pool);
+            for (var f : targetClass.fields()) {
+                String fname = f.fieldName().stringValue();
                 if (targetName.equals(fname)) {
                     return true;
                 }
@@ -288,14 +289,12 @@ public class Scan {
      * Adds all interfaces from this class to the deque of interfaces.
      *
      * @param intfs the deque of interfaces
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void addInterfaces(Deque<String> intfs, ClassFile cf)
-            throws ConstantPoolException {
-        int count = cf.interfaces.length;
-        for (int i = 0; i < count; i++) {
-            intfs.addLast(cf.getInterfaceName(i));
+    void addInterfaces(Deque<String> intfs, ClassModel cf) {
+        for (var itf : cf.interfaces()) {
+            intfs.addLast(itf.asInternalName());
         }
     }
 
@@ -307,7 +306,7 @@ public class Scan {
      *
      * TODO: refine error handling
      *
-     * @param cf the ClassFile of this class
+     * @param cf the ClassModel of this class
      * @param startClassName the name of the class at which to start searching
      * @param findName the member name to search for
      * @param findDesc the method descriptor to search for (ignored for fields)
@@ -315,15 +314,15 @@ public class Scan {
      * @param checkStartClass true if the start class should be searched, false if
      *                        it should be skipped
      * @return the name of the class where the member resolved, or null
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @ if a constant pool entry cannot be found
      */
     String resolveMember(
-            ClassFile cf, String startClassName, String findName, String findDesc,
+            ClassModel cf, String startClassName, String findName, String findDesc,
             boolean resolveMethod, boolean checkStartClass)
-            throws ConstantPoolException {
-        ClassFile startClass;
+             {
+        ClassModel startClass;
 
-        if (cf.getName().equals(startClassName)) {
+        if (cf.thisClass().asInternalName().equals(startClassName)) {
             startClass = cf;
         } else {
             startClass = finder.find(startClassName);
@@ -336,7 +335,7 @@ public class Scan {
         // follow super_class until it's 0, meaning we've reached Object
         // accumulate interfaces of superclasses as we go along
 
-        ClassFile curClass = startClass;
+        ClassModel curClass = startClass;
         Deque<String> intfs = new ArrayDeque<>();
         while (true) {
             if ((checkStartClass || curClass != startClass) &&
@@ -344,12 +343,13 @@ public class Scan {
                 break;
             }
 
-            if (curClass.super_class == 0) { // reached Object
+            var superclass = curClass.superclass();
+            if (superclass.isEmpty()) { // reached Object
                 curClass = null;
                 break;
             }
 
-            String superName = curClass.getSuperclassName();
+            String superName = superclass.get().asInternalName();
             curClass = finder.find(superName);
             if (curClass == null) {
                 errorNoClass(superName);
@@ -391,7 +391,7 @@ public class Scan {
                 return null;
             }
         } else {
-            String foundClassName = curClass.getName();
+            String foundClassName = curClass.thisClass().asInternalName();
             return foundClassName;
         }
     }
@@ -399,11 +399,15 @@ public class Scan {
     /**
      * Checks the superclass of this class.
      *
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkSuper(ClassFile cf) throws ConstantPoolException {
-        String sname = cf.getSuperclassName();
+    void checkSuper(ClassModel cf)  {
+        var superclass = cf.superclass();
+        if (superclass.isEmpty()) {
+            return;
+        }
+        String sname = superclass.get().asInternalName();
         DeprData dd = db.getTypeDeprecated(sname);
         if (dd != null) {
             printType("scan.out.extends", cf, sname, dd.isForRemoval());
@@ -413,13 +417,12 @@ public class Scan {
     /**
      * Checks the interfaces of this class.
      *
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkInterfaces(ClassFile cf) throws ConstantPoolException {
-        int ni = cf.interfaces.length;
-        for (int i = 0; i < ni; i++) {
-            String iname = cf.getInterfaceName(i);
+    void checkInterfaces(ClassModel cf)  {
+        for (var itf : cf.interfaces()) {
+            String iname = itf.asInternalName();
             DeprData dd = db.getTypeDeprecated(iname);
             if (dd != null) {
                 printType("scan.out.implements", cf, iname, dd.isForRemoval());
@@ -430,13 +433,13 @@ public class Scan {
     /**
      * Checks Class_info entries in the constant pool.
      *
-     * @param cf the ClassFile of this class
+     * @param cf the ClassModel of this class
      * @param entries constant pool entries collected from this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @ if a constant pool entry cannot be found
      */
-    void checkClasses(ClassFile cf, CPEntries entries) throws ConstantPoolException {
-        for (ConstantPool.CONSTANT_Class_info ci : entries.classes) {
-            String name = nameFromRefType(ci.getName());
+    void checkClasses(ClassModel cf, CPEntries entries)  {
+        for (var ci : entries.classes) {
+            String name = nameFromRefType(ci.asInternalName());
             if (name != null) {
                 DeprData dd = db.getTypeDeprecated(name);
                 if (dd != null) {
@@ -449,18 +452,18 @@ public class Scan {
     /**
      * Checks methods referred to from the constant pool.
      *
-     * @param cf the ClassFile of this class
+     * @param cf the ClassModel of this class
      * @param clname the class name
      * @param nti the NameAndType_info from a MethodRef or InterfaceMethodRef entry
      * @param msgKey message key for localization
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @ if a constant pool entry cannot be found
      */
-    void checkMethodRef(ClassFile cf,
+    void checkMethodRef(ClassModel cf,
                         String clname,
-                        CONSTANT_NameAndType_info nti,
-                        String msgKey) throws ConstantPoolException {
-        String name = nti.getName();
-        String type = nti.getType();
+                        NameAndTypeEntry nti,
+                        String msgKey)  {
+        String name = nti.name().stringValue();
+        String type = nti.type().stringValue();
         clname = nameFromRefType(clname);
         if (clname != null) {
             clname = resolveMember(cf, clname, name, type, true, true);
@@ -474,15 +477,15 @@ public class Scan {
     /**
      * Checks fields referred to from the constant pool.
      *
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkFieldRef(ClassFile cf,
-                       ConstantPool.CONSTANT_Fieldref_info fri) throws ConstantPoolException {
-        String clname = nameFromRefType(fri.getClassName());
-        CONSTANT_NameAndType_info nti = fri.getNameAndTypeInfo();
-        String name = nti.getName();
-        String type = nti.getType();
+    void checkFieldRef(ClassModel cf,
+                       FieldRefEntry fri)  {
+        String clname = nameFromRefType(fri.owner().asInternalName());
+        var nti = fri.nameAndType();
+        String name = nti.name().stringValue();
+        String type = nti.type().stringValue();
 
         if (clname != null) {
             clname = resolveMember(cf, clname, name, type, false, true);
@@ -496,16 +499,16 @@ public class Scan {
     /**
      * Checks the fields declared in this class.
      *
-     * @param cf the ClassFile of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkFields(ClassFile cf) throws ConstantPoolException {
-        for (Field f : cf.fields) {
-            String type = nameFromDescType(cf.constant_pool.getUTF8Value(f.descriptor.index));
+    void checkFields(ClassModel cf)  {
+        for (var f : cf.fields()) {
+            String type = nameFromDescType(f.fieldType().stringValue());
             if (type != null) {
                 DeprData dd = db.getTypeDeprecated(type);
                 if (dd != null) {
-                    printHasField(cf, f.getName(cf.constant_pool), type, dd.isForRemoval());
+                    printHasField(cf, f.fieldName().stringValue(), type, dd.isForRemoval());
                 }
             }
         }
@@ -514,17 +517,18 @@ public class Scan {
     /**
      * Checks the methods declared in this class.
      *
-     * @param cf the ClassFile object of this class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel object of this class
+     * @ if a constant pool entry cannot be found
      */
-    void checkMethods(ClassFile cf) throws ConstantPoolException {
-        for (Method m : cf.methods) {
-            String mname = m.getName(cf.constant_pool);
-            String desc = cf.constant_pool.getUTF8Value(m.descriptor.index);
-            MethodSig sig = MethodSig.fromDesc(desc);
+    void checkMethods(ClassModel cf)  {
+        for (var m : cf.methods()) {
+            String mname = m.methodName().stringValue();
+            var desc = m.methodType().stringValue();
+            MethodTypeDesc sig = m.methodTypeSymbol();
             DeprData dd;
 
-            for (String parm : sig.getParameters()) {
+            for (var parmDesc : sig.parameterArray()) {
+                var parm = parmDesc.descriptorString();
                 parm = nameFromDescType(parm);
                 if (parm != null) {
                     dd = db.getTypeDeprecated(parm);
@@ -534,7 +538,7 @@ public class Scan {
                 }
             }
 
-            String ret = nameFromDescType(sig.getReturnType());
+            String ret = nameFromDescType(sig.returnType().descriptorString());
             if (ret != null) {
                 dd = db.getTypeDeprecated(ret);
                 if (dd != null) {
@@ -543,7 +547,7 @@ public class Scan {
             }
 
             // check overrides
-            String overridden = resolveMember(cf, cf.getName(), mname, desc, true, false);
+            String overridden = resolveMember(cf, cf.thisClass().asInternalName(), mname, desc, true, false);
             if (overridden != null) {
                 dd = db.getMethodDeprecated(overridden, mname, desc);
                 if (dd != null) {
@@ -556,12 +560,12 @@ public class Scan {
     /**
      * Processes a single class file.
      *
-     * @param cf the ClassFile of the class
-     * @throws ConstantPoolException if a constant pool entry cannot be found
+     * @param cf the ClassModel of the class
+     * @ if a constant pool entry cannot be found
      */
-    void processClass(ClassFile cf) throws ConstantPoolException {
+    void processClass(ClassModel cf)  {
         if (verbose) {
-            out.println(Messages.get("scan.process.class", cf.getName()));
+            out.println(Messages.get("scan.process.class", cf.thisClass().asInternalName()));
         }
 
         CPEntries entries = CPEntries.loadFrom(cf);
@@ -570,19 +574,19 @@ public class Scan {
         checkInterfaces(cf);
         checkClasses(cf, entries);
 
-        for (ConstantPool.CONSTANT_Methodref_info mri : entries.methodRefs) {
-            String clname = mri.getClassName();
-            CONSTANT_NameAndType_info nti = mri.getNameAndTypeInfo();
+        for (var mri : entries.methodRefs) {
+            String clname = mri.owner().asInternalName();
+            var nti = mri.nameAndType();
             checkMethodRef(cf, clname, nti, "scan.out.usesmethod");
         }
 
-        for (ConstantPool.CONSTANT_InterfaceMethodref_info imri : entries.intfMethodRefs) {
-            String clname = imri.getClassName();
-            CONSTANT_NameAndType_info nti = imri.getNameAndTypeInfo();
+        for (var imri : entries.intfMethodRefs) {
+            String clname = imri.owner().asInternalName();
+            var nti = imri.nameAndType();
             checkMethodRef(cf, clname, nti, "scan.out.usesintfmethod");
         }
 
-        for (ConstantPool.CONSTANT_Fieldref_info fri : entries.fieldRefs) {
+        for (var fri : entries.fieldRefs) {
             checkFieldRef(cf, fri);
         }
 
@@ -607,13 +611,14 @@ public class Scan {
                 if (name.endsWith(".class")
                         && !name.endsWith("package-info.class")
                         && !name.endsWith("module-info.class")) {
-                    processClass(ClassFile.read(jf.getInputStream(entry)));
+                    processClass(ClassFile.of().parse(jf
+                            .getInputStream(entry).readAllBytes()));
                 }
             }
             return true;
         } catch (NoSuchFileException nsfe) {
             errorNoFile(jarname);
-        } catch (IOException | ConstantPoolException ex) {
+        } catch (IOException | IllegalArgumentException ex) {
             errorException(ex);
         }
         return false;
@@ -640,10 +645,10 @@ public class Scan {
             out.println(Messages.get("scan.head.dir", dirname));
 
             for (Path p : classes) {
-                processClass(ClassFile.read(p));
+                processClass(ClassFile.of().parse(p));
             }
             return true;
-        } catch (IOException | ConstantPoolException ex) {
+        } catch (IOException | IllegalArgumentException ex) {
             errorException(ex);
             return false;
         }
@@ -657,7 +662,7 @@ public class Scan {
      */
     public boolean processClassName(String className) {
         try {
-            ClassFile cf = finder.find(className);
+            ClassModel cf = finder.find(className);
             if (cf == null) {
                 errorNoClass(className);
                 return false;
@@ -665,7 +670,7 @@ public class Scan {
                 processClass(cf);
                 return true;
             }
-        } catch (ConstantPoolException ex) {
+        } catch (IllegalArgumentException ex) {
             errorException(ex);
             return false;
         }
@@ -680,12 +685,12 @@ public class Scan {
     public boolean processClassFile(String fileName) {
         Path path = Paths.get(fileName);
         try {
-            ClassFile cf = ClassFile.read(path);
+            ClassModel cf = ClassFile.of().parse(path);
             processClass(cf);
             return true;
         } catch (NoSuchFileException nsfe) {
             errorNoFile(fileName);
-        } catch (IOException | ConstantPoolException ex) {
+        } catch (IOException | IllegalArgumentException ex) {
             errorException(ex);
         }
         return false;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
index 6e83e2196b7..22377715a1e 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependency.Location;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java
index 796681f1c3d..f9720a268cd 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependency.Location;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
index b03c175da24..fc1bf5302d6 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,7 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.AccessFlags;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Dependencies.ClassFileError;
+import com.sun.tools.jdeps.Dependencies.ClassFileError;
 
 import java.io.Closeable;
 import java.io.File;
@@ -36,13 +33,14 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -54,7 +52,7 @@ import java.util.stream.Stream;
 import java.util.zip.ZipFile;
 
 /**
- * ClassFileReader reads ClassFile(s) of a given path that can be
+ * ClassFileReader reads ClassModel(s) of a given path that can be
  * a .class file, a directory, or a JAR file.
  */
 public class ClassFileReader implements Closeable {
@@ -117,10 +115,10 @@ public class ClassFileReader implements Closeable {
     }
 
     /**
-     * Returns the ClassFile matching the given binary name
+     * Returns the ClassModel matching the given binary name
      * or a fully-qualified class name.
      */
-    public ClassFile getClassFile(String name) throws IOException {
+    public ClassModel getClassFile(String name) throws IOException {
         if (name.indexOf('.') > 0) {
             int i = name.lastIndexOf('.');
             String pathname = name.replace('.', File.separatorChar) + ".class";
@@ -137,31 +135,25 @@ public class ClassFileReader implements Closeable {
         return null;
     }
 
-    public Iterable<ClassFile> getClassFiles() throws IOException {
+    public Iterable<ClassModel> getClassFiles() throws IOException {
         return FileIterator::new;
     }
 
-    protected ClassFile readClassFile(Path p) throws IOException {
-        InputStream is = null;
+    protected ClassModel readClassFile(Path p) throws IOException {
         try {
-            is = Files.newInputStream(p);
-            return ClassFile.read(is);
-        } catch (ConstantPoolException e) {
+            return ClassFile.of().parse(p);
+        } catch (IllegalArgumentException e) {
             throw new ClassFileError(e);
-        } finally {
-            if (is != null) {
-                is.close();
-            }
         }
     }
 
     protected Set<String> scan() {
         try {
-            ClassFile cf = ClassFile.read(path);
-            String name = cf.access_flags.is(AccessFlags.ACC_MODULE)
-                ? "module-info" : cf.getName();
+            ClassModel cf = ClassFile.of().parse(path);
+            String name = cf.isModuleInfo()
+                ? "module-info" : cf.thisClass().asInternalName();
             return Collections.singleton(name);
-        } catch (ConstantPoolException|IOException e) {
+        } catch (IllegalArgumentException|IOException e) {
             throw new ClassFileError(e);
         }
     }
@@ -175,7 +167,7 @@ public class ClassFileReader implements Closeable {
     public void close() throws IOException {
     }
 
-    class FileIterator implements Iterator<ClassFile> {
+    class FileIterator implements Iterator<ClassModel> {
         int count;
         FileIterator() {
             this.count = 0;
@@ -184,12 +176,12 @@ public class ClassFileReader implements Closeable {
             return count == 0 && baseFileName.endsWith(".class");
         }
 
-        public ClassFile next() {
+        public ClassModel next() {
             if (!hasNext()) {
                 throw new NoSuchElementException();
             }
             try {
-                ClassFile cf = readClassFile(path);
+                ClassModel cf = readClassFile(path);
                 count++;
                 return cf;
             } catch (IOException e) {
@@ -228,7 +220,7 @@ public class ClassFileReader implements Closeable {
             }
         }
 
-        public ClassFile getClassFile(String name) throws IOException {
+        public ClassModel getClassFile(String name) throws IOException {
             if (name.indexOf('.') > 0) {
                 int i = name.lastIndexOf('.');
                 String pathname = name.replace(".", fsSep) + ".class";
@@ -249,12 +241,12 @@ public class ClassFileReader implements Closeable {
             return null;
         }
 
-        public Iterable<ClassFile> getClassFiles() throws IOException {
-            final Iterator<ClassFile> iter = new DirectoryIterator();
+        public Iterable<ClassModel> getClassFiles() throws IOException {
+            final Iterator<ClassModel> iter = new DirectoryIterator();
             return () -> iter;
         }
 
-        class DirectoryIterator implements Iterator<ClassFile> {
+        class DirectoryIterator implements Iterator<ClassModel> {
             private final List<Path> entries;
             private int index = 0;
             DirectoryIterator() throws IOException {
@@ -271,7 +263,7 @@ public class ClassFileReader implements Closeable {
                 return index != entries.size();
             }
 
-            public ClassFile next() {
+            public ClassModel next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
                 }
@@ -332,7 +324,7 @@ public class ClassFileReader implements Closeable {
             }
         }
 
-        public ClassFile getClassFile(String name) throws IOException {
+        public ClassModel getClassFile(String name) throws IOException {
             if (name.indexOf('.') > 0) {
                 int i = name.lastIndexOf('.');
                 String entryName = name.replace('.', '/') + ".class";
@@ -353,31 +345,31 @@ public class ClassFileReader implements Closeable {
             return null;
         }
 
-        protected ClassFile readClassFile(JarFile jarfile, JarEntry e) throws IOException {
+        protected ClassModel readClassFile(JarFile jarfile, JarEntry e) throws IOException {
             try (InputStream is = jarfile.getInputStream(e)) {
-                ClassFile cf = ClassFile.read(is);
+                ClassModel cf = ClassFile.of().parse(is.readAllBytes());
                 // exclude module-info.class since this jarFile is on classpath
-                if (jarfile.isMultiRelease() && !cf.getName().equals("module-info")) {
+                if (jarfile.isMultiRelease() && !cf.isModuleInfo()) {
                     VersionHelper.add(jarfile, e, cf);
                 }
                 return cf;
-            } catch (ConstantPoolException ex) {
+            } catch (IllegalArgumentException ex) {
                 throw new ClassFileError(ex);
             }
         }
 
-        public Iterable<ClassFile> getClassFiles() throws IOException {
-            final Iterator<ClassFile> iter = new JarFileIterator(this, jarfile);
+        public Iterable<ClassModel> getClassFiles() throws IOException {
+            final Iterator<ClassModel> iter = new JarFileIterator(this, jarfile);
             return () -> iter;
         }
     }
 
-    class JarFileIterator implements Iterator<ClassFile> {
+    class JarFileIterator implements Iterator<ClassModel> {
         protected final JarFileReader reader;
         protected Iterator<JarEntry> entries;
         protected JarFile jf;
         protected JarEntry nextEntry;
-        protected ClassFile cf;
+        protected ClassModel cf;
         JarFileIterator(JarFileReader reader) {
             this(reader, null);
         }
@@ -413,11 +405,11 @@ public class ClassFileReader implements Closeable {
             return false;
         }
 
-        public ClassFile next() {
+        public ClassModel next() {
             if (!hasNext()) {
                 throw new NoSuchElementException();
             }
-            ClassFile classFile = cf;
+            ClassModel classFile = cf;
             cf = null;
             nextEntry = nextEntry();
             return classFile;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java
similarity index 62%
rename from src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java
rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java
index aeb479646ef..422845150f0 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,31 +23,20 @@
  * questions.
  */
 
-package com.sun.tools.classfile;
+package com.sun.tools.jdeps;
 
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.lang.classfile.*;
+import java.lang.classfile.constantpool.*;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
+import java.lang.reflect.AccessFlag;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
-import com.sun.tools.classfile.Dependency.Filter;
-import com.sun.tools.classfile.Dependency.Finder;
-import com.sun.tools.classfile.Dependency.Location;
-import com.sun.tools.classfile.Type.ArrayType;
-import com.sun.tools.classfile.Type.ClassSigType;
-import com.sun.tools.classfile.Type.ClassType;
-import com.sun.tools.classfile.Type.MethodType;
-import com.sun.tools.classfile.Type.SimpleType;
-import com.sun.tools.classfile.Type.TypeParamType;
-import com.sun.tools.classfile.Type.WildcardType;
-
-import static com.sun.tools.classfile.ConstantPool.*;
+import com.sun.tools.jdeps.Dependency.Filter;
+import com.sun.tools.jdeps.Dependency.Finder;
+import com.sun.tools.jdeps.Dependency.Location;
 
 /**
  * A framework for determining {@link Dependency dependencies} between class files.
@@ -107,7 +96,7 @@ public class Dependencies {
          * @throws Dependencies.ClassFileNotFoundException if the classfile cannot be
          *   found
          */
-        public ClassFile getClassFile(String className)
+        public ClassModel getClassFile(String className)
                 throws ClassFileNotFoundException;
     }
 
@@ -127,7 +116,7 @@ public class Dependencies {
      * @return the default finder
      */
     public static Finder getDefaultFinder() {
-        return new APIDependencyFinder(AccessFlags.ACC_PRIVATE);
+        return new APIDependencyFinder(ClassFile.ACC_PRIVATE);
     }
 
     /**
@@ -135,9 +124,9 @@ public class Dependencies {
      * These include the superclass, superinterfaces, and classes referenced in
      * the declarations of fields and methods.  The fields and methods that
      * are checked can be limited according to a specified access.
-     * The access parameter must be one of {@link AccessFlags#ACC_PUBLIC ACC_PUBLIC},
-     * {@link AccessFlags#ACC_PRIVATE ACC_PRIVATE},
-     * {@link AccessFlags#ACC_PROTECTED ACC_PROTECTED}, or 0 for
+     * The access parameter must be one of {@link ClassFile#ACC_PUBLIC ACC_PUBLIC},
+     * {@link ClassFile#ACC_PRIVATE ACC_PRIVATE},
+     * {@link ClassFile#ACC_PROTECTED ACC_PROTECTED}, or 0 for
      * package private access. Members with greater than or equal accessibility
      * to that specified will be searched for dependencies.
      * @param access the access of members to be checked
@@ -291,7 +280,7 @@ public class Dependencies {
             assert (!doneClasses.contains(className));
             doneClasses.add(className);
 
-            ClassFile cf = classFinder.getClassFile(className);
+            ClassModel cf = classFinder.getClassFile(className);
 
             // The following code just applies the filter to the dependencies
             // followed for the transitive closure.
@@ -466,28 +455,25 @@ public class Dependencies {
      * This class identifies class names directly or indirectly in the constant pool.
      */
     static class ClassDependencyFinder extends BasicDependencyFinder {
-        public Iterable<? extends Dependency> findDependencies(ClassFile classfile) {
+        public Iterable<? extends Dependency> findDependencies(ClassModel classfile) {
             Visitor v = new Visitor(classfile);
-            for (CPInfo cpInfo: classfile.constant_pool.entries()) {
+            for (var cpInfo: classfile.constantPool()) {
                 v.scan(cpInfo);
             }
             try {
-                v.addClass(classfile.super_class);
-                v.addClasses(classfile.interfaces);
-                v.scan(classfile.attributes);
+                classfile.superclass().ifPresent(v::addClass);
+                v.addClasses(classfile.interfaces());
+                v.scanAttributes(classfile);
 
-                for (Field f : classfile.fields) {
-                    v.scan(f.descriptor, f.attributes);
+                for (var f : classfile.fields()) {
+                    v.scan(f.fieldTypeSymbol());
+                    v.scanAttributes(f);
                 }
-                for (Method m : classfile.methods) {
-                    v.scan(m.descriptor, m.attributes);
-                    Exceptions_attribute e =
-                        (Exceptions_attribute)m.attributes.get(Attribute.Exceptions);
-                    if (e != null) {
-                        v.addClasses(e.exception_index_table);
-                    }
+                for (var m : classfile.methods()) {
+                    v.scan(m.methodTypeSymbol());
+                    v.scanAttributes(m);
                 }
-            } catch (ConstantPoolException e) {
+            } catch (IllegalArgumentException e) {
                 throw new ClassFileError(e);
             }
 
@@ -502,9 +488,9 @@ public class Dependencies {
     static class APIDependencyFinder extends BasicDependencyFinder {
         APIDependencyFinder(int access) {
             switch (access) {
-                case AccessFlags.ACC_PUBLIC:
-                case AccessFlags.ACC_PROTECTED:
-                case AccessFlags.ACC_PRIVATE:
+                case ClassFile.ACC_PUBLIC:
+                case ClassFile.ACC_PROTECTED:
+                case ClassFile.ACC_PRIVATE:
                 case 0:
                     showAccess = access;
                     break;
@@ -514,41 +500,40 @@ public class Dependencies {
             }
         }
 
-        public Iterable<? extends Dependency> findDependencies(ClassFile classfile) {
+        public Iterable<? extends Dependency> findDependencies(ClassModel classfile) {
             try {
                 Visitor v = new Visitor(classfile);
-                v.addClass(classfile.super_class);
-                v.addClasses(classfile.interfaces);
+                classfile.superclass().ifPresent(v::addClass);
+                v.addClasses(classfile.interfaces());
                 // inner classes?
-                for (Field f : classfile.fields) {
-                    if (checkAccess(f.access_flags))
-                        v.scan(f.descriptor, f.attributes);
+                for (var f : classfile.fields()) {
+                    if (checkAccess(f.flags())) {
+                        v.scan(f.fieldTypeSymbol());
+                        v.scanAttributes(f);
+                    }
                 }
-                for (Method m : classfile.methods) {
-                    if (checkAccess(m.access_flags)) {
-                        v.scan(m.descriptor, m.attributes);
-                        Exceptions_attribute e =
-                                (Exceptions_attribute) m.attributes.get(Attribute.Exceptions);
-                        if (e != null)
-                            v.addClasses(e.exception_index_table);
+                for (var m : classfile.methods()) {
+                    if (checkAccess(m.flags())) {
+                        v.scan(m.methodTypeSymbol());
+                        v.scanAttributes(m);
                     }
                 }
                 return v.deps;
-            } catch (ConstantPoolException e) {
+            } catch (IllegalArgumentException e) {
                 throw new ClassFileError(e);
             }
         }
 
         boolean checkAccess(AccessFlags flags) {
             // code copied from javap.Options.checkAccess
-            boolean isPublic = flags.is(AccessFlags.ACC_PUBLIC);
-            boolean isProtected = flags.is(AccessFlags.ACC_PROTECTED);
-            boolean isPrivate = flags.is(AccessFlags.ACC_PRIVATE);
+            boolean isPublic = flags.has(AccessFlag.PUBLIC);
+            boolean isProtected = flags.has(AccessFlag.PROTECTED);
+            boolean isPrivate = flags.has(AccessFlag.PRIVATE);
             boolean isPackage = !(isPublic || isProtected || isPrivate);
 
-            if ((showAccess == AccessFlags.ACC_PUBLIC) && (isProtected || isPrivate || isPackage))
+            if ((showAccess == ClassFile.ACC_PUBLIC) && (isProtected || isPrivate || isPackage))
                 return false;
-            else if ((showAccess == AccessFlags.ACC_PROTECTED) && (isPrivate || isPackage))
+            else if ((showAccess == ClassFile.ACC_PROTECTED) && (isPrivate || isPackage))
                 return false;
             else if ((showAccess == 0) && (isPrivate))
                 return false;
@@ -566,238 +551,158 @@ public class Dependencies {
             return locations.computeIfAbsent(className, SimpleLocation::new);
         }
 
-        class Visitor implements ConstantPool.Visitor<Void,Void>, Type.Visitor<Void, Void> {
-            private ConstantPool constant_pool;
-            private Location origin;
-            Set<Dependency> deps;
+        class Visitor {
+            private final Location origin;
+            final Set<Dependency> deps;
 
-            Visitor(ClassFile classFile) {
+            Visitor(ClassModel classFile) {
                 try {
-                    constant_pool = classFile.constant_pool;
-                    origin = getLocation(classFile.getName());
-                    deps = new HashSet<>();
-                } catch (ConstantPoolException e) {
+                    origin = getLocation(classFile.thisClass().asInternalName());
+                } catch (IllegalArgumentException e) {
                     throw new ClassFileError(e);
                 }
+                deps = new HashSet<>();
             }
 
-            void scan(Descriptor d, Attributes attrs) {
-                try {
-                    scan(new Signature(d.index).getType(constant_pool));
-                    scan(attrs);
-                } catch (ConstantPoolException e) {
-                    throw new ClassFileError(e);
-                }
+            private void addDependency(String internalName) {
+                deps.add(new SimpleDependency(origin, getLocation(internalName)));
             }
 
-            void scan(CPInfo cpInfo) {
-                cpInfo.accept(this, null);
+            private void addClass(ClassEntry ce) throws IllegalArgumentException {
+                assert ce.name().charAt(0) != '[';
+                addDependency(ce.asInternalName());
             }
 
-            void scan(Type t) {
-                t.accept(this, null);
-            }
-
-            void scan(Attributes attrs) {
-                try {
-                    Signature_attribute sa = (Signature_attribute)attrs.get(Attribute.Signature);
-                    if (sa != null)
-                        scan(sa.getParsedSignature().getType(constant_pool));
-
-                    scan((RuntimeVisibleAnnotations_attribute)
-                            attrs.get(Attribute.RuntimeVisibleAnnotations));
-                    scan((RuntimeVisibleParameterAnnotations_attribute)
-                            attrs.get(Attribute.RuntimeVisibleParameterAnnotations));
-                } catch (ConstantPoolException e) {
-                    throw new ClassFileError(e);
-                }
-            }
-
-            private void scan(RuntimeAnnotations_attribute attr) throws ConstantPoolException {
-                if (attr == null) {
-                    return;
-                }
-                for (int i = 0; i < attr.annotations.length; i++) {
-                    int index = attr.annotations[i].type_index;
-                    scan(new Signature(index).getType(constant_pool));
-                }
-            }
-
-            private void scan(RuntimeParameterAnnotations_attribute attr) throws ConstantPoolException {
-                if (attr == null) {
-                    return;
-                }
-                for (int param = 0; param < attr.parameter_annotations.length; param++) {
-                    for (int i = 0; i < attr.parameter_annotations[param].length; i++) {
-                        int index = attr.parameter_annotations[param][i].type_index;
-                        scan(new Signature(index).getType(constant_pool));
-                    }
-                }
-            }
-
-            void addClass(int index) throws ConstantPoolException {
-                if (index != 0) {
-                    String name = constant_pool.getClassInfo(index).getBaseName();
-                    if (name != null)
-                        addDependency(name);
-                }
-            }
-
-            void addClasses(int[] indices) throws ConstantPoolException {
-                for (int i: indices)
+            private void addClasses(Collection<? extends ClassEntry> ces) throws IllegalArgumentException {
+                for (var i: ces)
                     addClass(i);
             }
 
-            private void addDependency(String name) {
-                deps.add(new SimpleDependency(origin, getLocation(name)));
+            private void scan(ClassDesc cd) {
+                while (cd.isArray()) {
+                    cd = cd.componentType();
+                }
+                if (cd.isClassOrInterface()) {
+                    var desc = cd.descriptorString();
+                    addDependency(desc.substring(1, desc.length() - 1));
+                }
             }
 
-            // ConstantPool.Visitor methods
+            private void scan(MethodTypeDesc mtd) {
+                scan(mtd.returnType());
+                for (int i = 0; i < mtd.parameterCount(); i++) {
+                    scan(mtd.parameterType(i));
+                }
+            }
 
-            public Void visitClass(CONSTANT_Class_info info, Void p) {
+            void scanAttributes(AttributedElement attrs) {
                 try {
-                    if (info.getName().startsWith("["))
-                        new Signature(info.name_index).getType(constant_pool).accept(this, null);
-                    else
-                        addDependency(info.getBaseName());
-                    return null;
-                } catch (ConstantPoolException e) {
+                    var sa = attrs.findAttribute(Attributes.SIGNATURE).orElse(null);
+                    if (sa != null) {
+                        switch (attrs) {
+                            case ClassModel _ -> scan(sa.asClassSignature());
+                            case MethodModel _ -> scan(sa.asMethodSignature());
+                            default -> scan(sa.asTypeSignature());
+                        }
+                    }
+
+                    var rvaa = attrs.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
+                    if (rvaa != null) {
+                        for (var anno : rvaa.annotations()) {
+                            scan(anno.classSymbol());
+                        }
+                    }
+
+                    var rvpaa = attrs.findAttribute(Attributes.RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS).orElse(null);
+                    if (rvpaa != null) {
+                        for (var parameter : rvpaa.parameterAnnotations()) {
+                            for (var anno : parameter) {
+                                scan(anno.classSymbol());
+                            }
+                        }
+                    }
+
+                    var exceptions = attrs.findAttribute(Attributes.EXCEPTIONS).orElse(null);
+                    if (exceptions != null) {
+                        for (var e : exceptions.exceptions()) {
+                            addClass(e);
+                        }
+                    }
+                } catch (IllegalArgumentException e) {
                     throw new ClassFileError(e);
                 }
             }
 
-            public Void visitDouble(CONSTANT_Double_info info, Void p) {
-                return null;
-            }
+            // ConstantPool scanning
 
-            public Void visitFieldref(CONSTANT_Fieldref_info info, Void p) {
-                return visitRef(info, p);
-            }
-
-            public Void visitFloat(CONSTANT_Float_info info, Void p) {
-                return null;
-            }
-
-            public Void visitInteger(CONSTANT_Integer_info info, Void p) {
-                return null;
-            }
-
-            public Void visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Void p) {
-                return visitRef(info, p);
-            }
-
-            public Void visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Void p) {
-                return null;
-            }
-
-            @Override
-            public Void visitDynamicConstant(CONSTANT_Dynamic_info info, Void aVoid) {
-                return null;
-            }
-
-            public Void visitLong(CONSTANT_Long_info info, Void p) {
-                return null;
-            }
-
-            public Void visitMethodHandle(CONSTANT_MethodHandle_info info, Void p) {
-                return null;
-            }
-
-            public Void visitMethodType(CONSTANT_MethodType_info info, Void p) {
-                return null;
-            }
-
-            public Void visitMethodref(CONSTANT_Methodref_info info, Void p) {
-                return visitRef(info, p);
-            }
-
-            public Void visitModule(CONSTANT_Module_info info, Void p) {
-                return null;
-            }
-
-            public Void visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
+            void scan(PoolEntry cpInfo) {
                 try {
-                    new Signature(info.type_index).getType(constant_pool).accept(this, null);
-                    return null;
-                } catch (ConstantPoolException e) {
+                    switch (cpInfo) {
+                        case ClassEntry clazz -> scan(clazz.asSymbol());
+                        case FieldRefEntry field -> scan(field.owner().asSymbol());
+                        case MethodRefEntry method -> scan(method.owner().asSymbol());
+                        case InterfaceMethodRefEntry interfaceMethod -> scan(interfaceMethod.owner().asSymbol());
+                        case NameAndTypeEntry nat -> {
+                            var desc = nat.type();
+                            if (desc.charAt(0) == '(') {
+                                scan(MethodTypeDesc.ofDescriptor(desc.stringValue()));
+                            } else {
+                                scan(ClassDesc.ofDescriptor(desc.stringValue()));
+                            }
+                        }
+                        default -> {}
+                    }
+                } catch (IllegalArgumentException e) {
                     throw new ClassFileError(e);
                 }
             }
 
-            public Void visitPackage(CONSTANT_Package_info info, Void p) {
-                return null;
-            }
+            // Signature scanning
 
-            public Void visitString(CONSTANT_String_info info, Void p) {
-                return null;
-            }
-
-            public Void visitUtf8(CONSTANT_Utf8_info info, Void p) {
-                return null;
-            }
-
-            private Void visitRef(CPRefInfo info, Void p) {
-                try {
-                    visitClass(info.getClassInfo(), p);
-                    return null;
-                } catch (ConstantPoolException e) {
-                    throw new ClassFileError(e);
+            private void scan(MethodSignature sig) {
+                for (var param : sig.typeParameters()) {
+                    scan(param);
+                }
+                for (var param : sig.arguments()) {
+                    scan(param);
+                }
+                scan(sig.result());
+                for (var thrown : sig.throwableSignatures()) {
+                    scan(thrown);
                 }
             }
 
-            // Type.Visitor methods
-
-            private void findDependencies(Type t) {
-                if (t != null)
-                    t.accept(this, null);
-            }
-
-            private void findDependencies(List<? extends Type> ts) {
-                if (ts != null) {
-                    for (Type t: ts)
-                        t.accept(this, null);
+            private void scan(ClassSignature sig) {
+                for (var param : sig.typeParameters()) {
+                    scan(param);
+                }
+                scan(sig.superclassSignature());
+                for (var itf : sig.superinterfaceSignatures()) {
+                    scan(itf);
                 }
             }
 
-            public Void visitSimpleType(SimpleType type, Void p) {
-                return null;
+            private void scan(Signature.TypeParam param) {
+                param.classBound().ifPresent(this::scan);
+                for (var itf : param.interfaceBounds()) {
+                    scan(itf);
+                }
             }
 
-            public Void visitArrayType(ArrayType type, Void p) {
-                findDependencies(type.elemType);
-                return null;
-            }
-
-            public Void visitMethodType(MethodType type, Void p) {
-                findDependencies(type.paramTypes);
-                findDependencies(type.returnType);
-                findDependencies(type.throwsTypes);
-                findDependencies(type.typeParamTypes);
-                return null;
-            }
-
-            public Void visitClassSigType(ClassSigType type, Void p) {
-                findDependencies(type.superclassType);
-                findDependencies(type.superinterfaceTypes);
-                return null;
-            }
-
-            public Void visitClassType(ClassType type, Void p) {
-                findDependencies(type.outerType);
-                addDependency(type.getBinaryName());
-                findDependencies(type.typeArgs);
-                return null;
-            }
-
-            public Void visitTypeParamType(TypeParamType type, Void p) {
-                findDependencies(type.classBound);
-                findDependencies(type.interfaceBounds);
-                return null;
-            }
-
-            public Void visitWildcardType(WildcardType type, Void p) {
-                findDependencies(type.boundType);
-                return null;
+            private void scan(Signature sig) {
+                switch (sig) {
+                    case Signature.ClassTypeSig ct -> {
+                        ct.outerType().ifPresent(this::scan);
+                        scan(ct.classDesc());
+                        for (var arg : ct.typeArgs()) {
+                            if (arg instanceof Signature.TypeArg.Bounded bounded) {
+                                scan(bounded.boundType());
+                            }
+                        }
+                    }
+                    case Signature.ArrayTypeSig at -> scan(at.componentSignature());
+                    case Signature.BaseTypeSig _, Signature.TypeVarSig _ -> {}
+                }
             }
         }
     }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependency.java
similarity index 95%
rename from src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java
rename to src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependency.java
index 96c9427ec4a..713fc9ef0e9 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependency.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,11 @@
  * questions.
  */
 
-package com.sun.tools.classfile;
+package com.sun.tools.jdeps;
 
 
+import java.lang.classfile.ClassModel;
+
 /**
  * A directed relationship between two {@link Dependency.Location Location}s.
  * Subtypes of {@code Dependency} may provide additional detail about the dependency.
@@ -56,7 +58,7 @@ public interface Dependency {
          * @param classfile the class file to be examined
          * @return the dependencies located in the given class file.
          */
-        public Iterable<? extends Dependency> findDependencies(ClassFile classfile);
+        public Iterable<? extends Dependency> findDependencies(ClassModel classfile);
     }
 
 
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
index d9a07700134..179043bc578 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,17 +28,15 @@ import static com.sun.tools.jdeps.Module.*;
 import static com.sun.tools.jdeps.Analyzer.NOT_FOUND;
 import static java.util.stream.Collectors.*;
 
-import com.sun.tools.classfile.AccessFlags;
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-import com.sun.tools.classfile.Dependencies;
-import com.sun.tools.classfile.Dependencies.ClassFileError;
-import com.sun.tools.classfile.Dependency;
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependencies.ClassFileError;
+import com.sun.tools.jdeps.Dependency.Location;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.nio.file.Paths;
+import java.lang.classfile.AccessFlags;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.reflect.AccessFlag;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
@@ -46,7 +44,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ExecutionException;
@@ -176,20 +173,20 @@ class DependencyFinder {
         trace("parsing %s %s%n", archive.getName(), archive.getPathName());
         FutureTask<Set<Location>> task = new FutureTask<>(() -> {
             Set<Location> targets = new HashSet<>();
-            for (ClassFile cf : archive.reader().getClassFiles()) {
-                if (cf.access_flags.is(AccessFlags.ACC_MODULE))
+            for (var cf : archive.reader().getClassFiles()) {
+                if (cf.isModuleInfo())
                     continue;
 
                 String classFileName;
                 try {
-                    classFileName = cf.getName();
-                } catch (ConstantPoolException e) {
+                    classFileName = cf.thisClass().asInternalName();
+                } catch (IllegalArgumentException e) {
                     throw new ClassFileError(e);
                 }
 
                 // filter source class/archive
                 String cn = classFileName.replace('/', '.');
-                if (!finder.accept(archive, cn, cf.access_flags))
+                if (!finder.accept(archive, cn, cf.flags()))
                     continue;
 
                 // tests if this class matches the -include
@@ -217,24 +214,24 @@ class DependencyFinder {
     private Set<Location> parse(Archive archive, Finder finder, String name)
         throws IOException
     {
-        ClassFile cf = archive.reader().getClassFile(name);
+        var cf = archive.reader().getClassFile(name);
         if (cf == null) {
             throw new IllegalArgumentException(archive.getName() +
                 " does not contain " + name);
         }
 
-        if (cf.access_flags.is(AccessFlags.ACC_MODULE))
+        if (cf.isModuleInfo())
             return Collections.emptySet();
 
         Set<Location> targets = new HashSet<>();
         String cn;
         try {
-            cn =  cf.getName().replace('/', '.');
-        } catch (ConstantPoolException e) {
+            cn =  cf.thisClass().asInternalName().replace('/', '.');
+        } catch (IllegalArgumentException e) {
             throw new Dependencies.ClassFileError(e);
         }
 
-        if (!finder.accept(archive, cn, cf.access_flags))
+        if (!finder.accept(archive, cn, cf.flags()))
             return targets;
 
         // tests if this class matches the -include
@@ -296,7 +293,7 @@ class DependencyFinder {
         Finder(boolean apiOnly) {
             this.apiOnly = apiOnly;
             this.finder = apiOnly
-                ? Dependencies.getAPIFinder(AccessFlags.ACC_PROTECTED)
+                ? Dependencies.getAPIFinder(ClassFile.ACC_PROTECTED)
                 : Dependencies.getClassDependencyFinder();
 
         }
@@ -309,12 +306,12 @@ class DependencyFinder {
             // if -apionly is specified, analyze only exported and public types
             // All packages are exported in unnamed module.
             return apiOnly ? archive.getModule().isExported(pn) &&
-                                 accessFlags.is(AccessFlags.ACC_PUBLIC)
+                                 accessFlags.has(AccessFlag.PUBLIC)
                            : true;
         }
 
         @Override
-        public Iterable<? extends Dependency> findDependencies(ClassFile classfile) {
+        public Iterable<? extends Dependency> findDependencies(ClassModel classfile) {
             return finder.findDependencies(classfile);
         }
     }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java
index 8ff7d4911d2..accf5d70e8f 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependency.Location;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Deque;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
index 4684dd32846..e3071c27064 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,6 @@ package com.sun.tools.jdeps;
 import static com.sun.tools.jdeps.Module.trace;
 import static java.util.stream.Collectors.*;
 
-import com.sun.tools.classfile.Dependency;
-
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java
index 3ab46528fc7..344efd8d0f8 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,7 @@
  */
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.Dependencies;
-import com.sun.tools.classfile.Dependency;
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependency.Location;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java
index 60631663b9b..693f219ad95 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,6 @@ import static com.sun.tools.jdeps.Module.*;
 import static java.lang.module.ModuleDescriptor.Requires.Modifier.*;
 import static java.util.stream.Collectors.*;
 
-import com.sun.tools.classfile.Dependency;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.module.ModuleDescriptor;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java
index 227c9ccd264..fc139c9f595 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/VersionHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,7 @@
 
 package com.sun.tools.jdeps;
 
-import com.sun.tools.classfile.ClassFile;
-import com.sun.tools.classfile.ConstantPoolException;
-
+import java.lang.classfile.ClassModel;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarEntry;
@@ -44,8 +42,8 @@ public class VersionHelper {
         return classname;
     }
 
-    public static void add(JarFile jarfile, JarEntry e, ClassFile cf)
-            throws ConstantPoolException
+    public static void add(JarFile jarfile, JarEntry e, ClassModel cf)
+            throws IllegalArgumentException
     {
         String realName = e.getRealName();
         if (realName.startsWith(META_INF_VERSIONS)) {
@@ -54,7 +52,7 @@ public class VersionHelper {
             if (n > 0) {
                 String version = realName.substring(len, n);
                 assert (Integer.parseInt(version) > 8);
-                String name = cf.getName().replace('/', '.');
+                String name = cf.thisClass().asInternalName().replace('/', '.');
                 String v = nameToVersion.computeIfAbsent(name, _n -> version);
                 if (!version.equals(v)) {
                     throw new MultiReleaseException("err.multirelease.version.associated",
diff --git a/test/langtools/tools/javap/classfile/deps/GetDeps.java b/test/langtools/tools/javap/classfile/deps/GetDeps.java
index 5165e6611f9..c21d010b5be 100644
--- a/test/langtools/tools/javap/classfile/deps/GetDeps.java
+++ b/test/langtools/tools/javap/classfile/deps/GetDeps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,16 @@
  */
 
 import java.io.*;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
 import java.util.*;
 import java.util.regex.Pattern;
 import javax.tools.*;
 
-import com.sun.tools.classfile.*;
-import com.sun.tools.classfile.Dependencies.*;
-import com.sun.tools.classfile.Dependency.Location;
+import com.sun.tools.jdeps.Dependencies;
+import com.sun.tools.jdeps.Dependencies.*;
+import com.sun.tools.jdeps.Dependency;
+import com.sun.tools.jdeps.Dependency.Location;
 import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.util.Context;
 
@@ -140,7 +143,7 @@ public class GetDeps {
         }
 
         @Override
-        public ClassFile getClassFile(String className) throws ClassFileNotFoundException {
+        public ClassModel getClassFile(String className) throws ClassFileNotFoundException {
             try {
                 JavaFileObject fo = fm.getJavaFileForInput(
                         StandardLocation.CLASS_PATH, className, JavaFileObject.Kind.CLASS);
@@ -151,11 +154,11 @@ public class GetDeps {
                     throw new ClassFileNotFoundException(className);
                 InputStream in = fo.openInputStream();
                 try {
-                    return ClassFile.read(in);
+                    return ClassFile.of().parse(in.readAllBytes());
                 } finally {
                     in.close();
                 }
-            } catch (ConstantPoolException e) {
+            } catch (IllegalArgumentException e) {
                 throw new ClassFileNotFoundException(className, e);
             } catch (IOException e) {
                 throw new ClassFileNotFoundException(className, e);
diff --git a/test/langtools/tools/javap/classfile/deps/T6907575.java b/test/langtools/tools/javap/classfile/deps/T6907575.java
index 81d80d95847..49019d4f870 100644
--- a/test/langtools/tools/javap/classfile/deps/T6907575.java
+++ b/test/langtools/tools/javap/classfile/deps/T6907575.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,10 @@
 /*
  * @test
  * @bug 6907575
- * @modules jdk.jdeps/com.sun.tools.classfile
+ * @modules jdk.jdeps/com.sun.tools.jdeps
  *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
+ * @enablePreview
  * @build GetDeps p.C1
  * @run main T6907575
  */
diff --git a/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java b/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java
deleted file mode 100644
index e44b8b2e133..00000000000
--- a/test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestMethodSig.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @summary Simple tests for method signature parsing
- * @modules jdk.jdeps/com.sun.tools.jdeprscan.scan
- * @build TestMethodSig
- * @run testng jdk.jdeprscan.TestMethodSig
- */
-
-package jdk.jdeprscan;
-
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static com.sun.tools.jdeprscan.scan.MethodSig.fromDesc;
-
-public class TestMethodSig {
-    @Test
-    public void testSimple() {
-        assertEquals(fromDesc("(Ljava/rmi/RMISecurityManager;)Ljava/lang/Object;").toString(),
-                     "parameters 0=Ljava/rmi/RMISecurityManager; return Ljava/lang/Object;");
-    }
-
-    @Test
-    public void testMultParamVoidReturn() {
-        assertEquals(fromDesc("([[IZLjava/lang/String;B[J)V").toString(),
-                     "parameters 0=[[I 1=Z 2=Ljava/lang/String; 3=B 4=[J return V");
-    }
-
-    @Test
-    public void testNoParams() {
-        assertEquals(fromDesc("()J").toString(),
-                     "parameters none return J");
-    }
-
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testMissingReturnType() {
-        fromDesc("(ISJZ)");
-    }
-}

From 4eb1eaf04477b9a8947a57655cf36380b5b88b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 17 May 2024 12:32:23 +0000
Subject: [PATCH 477/486] 8329617: Update stylesheet for specs and tool
 documentation

Reviewed-by: jjg
---
 .../docs-resources/resources/jdk-default.css  | 100 ++++++++++--------
 1 file changed, 54 insertions(+), 46 deletions(-)

diff --git a/make/data/docs-resources/resources/jdk-default.css b/make/data/docs-resources/resources/jdk-default.css
index 371f3ba00b9..29f4f43764f 100644
--- a/make/data/docs-resources/resources/jdk-default.css
+++ b/make/data/docs-resources/resources/jdk-default.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,56 +23,62 @@
  * questions.
  */
 
+@import url('../api/resource-files/fonts/dejavu.css');
+
 body {
-  margin: 2em 2em;
   font-family: DejaVu Sans, Bitstream Vera Sans, Luxi Sans, Verdana, Arial, Helvetica, sans-serif;
   font-size: 10pt;
+  margin: 0;
+  padding: 0;
+  height: 100%;
+  width: 100%;
+  min-width: 100%;
   line-height: 1.4;
 }
 
 pre, code, tt {
-  font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono,
-    Courier New, monospace;
+    font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono, Courier New, monospace;
+}
+
+main, footer {
+  margin: 16px 27px;
+}
+
+/* Adjust horizontal margin for content elements outside of main element */
+:is(body, header) > :is(nav, h1, h2, h3, h4, h5, h6, p, .sub-title) {
+    margin-left: 27px;
+    margin-right: 27px;
 }
 
 blockquote {
-  margin: 1.5ex 0em 1.5ex 2em;
+  margin: 1.5ex 0 1.5ex 2em;
 }
 
 p {
-  padding: 0pt;
-  margin: 1ex 0em;
+  margin-top: 1ex;
+  margin-bottom: 1ex;
 }
 
-p:first-child, pre:first-child { margin-top: 0pt; }
-
-h1 {
-  font-weight: bold;
-  padding: 0pt;
-  margin: 2ex .5ex 1ex 0pt;
+dd > p:first-child, pre:first-child {
+  margin-top: 0;
 }
 
 h1:first-child, h2:first-child {
-  margin-top: 0ex;
+  margin-top: 0;
 }
 
-h2 {
-  font-weight: bold;
-  padding: 0pt;
-  margin: 2ex 0pt 1ex 0pt;
+h1, h2 {
+  margin-top: 2ex;
+  margin-bottom: 1ex;
 }
 
-h3 {
-  font-weight: bold;
-  padding: 0pt;
-  margin: 1.5ex 0pt 1ex 0pt;
+h3, h4, h5 {
+  margin-top: 1.5ex;
+  margin-bottom: 1ex;
 }
 
 h4, h5 {
   font-size: 100%;
-  font-weight: bold;
-  padding: 0pt;
-  margin: 1.5ex 0pt 1ex 0pt;
 }
 
 .subtitle {
@@ -100,7 +106,7 @@ a[href]:hover {
 }
 
 a img {
-  border-width: 0px;
+  border-width: 0;
 }
 
 img {
@@ -154,9 +160,9 @@ table.centered td {
 
 .draft-header {
   text-align: center;
-  font-size: 80%;
+  font-size: 11.2px;
   padding: 6px;
-  margin: -2.5em -2.5em 2.5em -2.5em;
+  line-height: initial;
 }
 
 .legal-footer {
@@ -183,29 +189,31 @@ nav#TOC ul ul li::before {
     content: " \2022  "
 }
 
-header#title-block-header {
-    margin-top:-2em;
+/* Rules below replicate sizing of navigation bar in API docs */
+header#title-block-header div.navbar {
+    padding: 0 20px 0 26px;
+    margin-bottom: 30px;
+    background-color: #4D7A97;
+    color: #FFFFFF;
+    height: 44px;
+    overflow: hidden;
+    font-size: 0.857em;
+    line-height: initial;
+    display: flex;
+    flex-direction: row-reverse;
+    align-items: center;
 }
 
-header#title-block-header div.navbar {
-    margin: 0 -2.5em 2.5em -2.5em;
-    padding: 0 2.5em;
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    float:left;
-    width:100%;
-    clear:right;
-    min-height:2.8em;
-    padding-top:10px;
-    overflow:hidden;
-    font-size:12px;
+header#title-block-header div.navbar nav {
+    flex: 1 1 auto;
+    font-size: 12px;
+    white-space: nowrap;
 }
 
 header#title-block-header div.navbar div {
-    float:right;
-    font-size:11px;
-    height:2.9em;
-    margin: auto 0;
+    flex: 0 0 auto;
+    font-size: 10.978px;
+    white-space: nowrap;
 }
 
 header#title-block-header ul {

From 9bb6169a1cba900fa79d63119696efe265762083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 17 May 2024 12:36:06 +0000
Subject: [PATCH 478/486] 8317621: --add-script should support JavaScript
 modules

Reviewed-by: jjg
---
 .../formats/html/HtmlConfiguration.java       |  47 +++++-
 .../doclets/formats/html/markup/Head.java     |  23 ++-
 .../TestJavaScriptModules.java                | 149 ++++++++++++++++++
 3 files changed, 206 insertions(+), 13 deletions(-)
 create mode 100644 test/langtools/jdk/javadoc/doclet/testJavaScriptModules/TestJavaScriptModules.java

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
index d3d46c3c3b8..649687e19a2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
@@ -25,8 +25,11 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.time.ZonedDateTime;
@@ -41,6 +44,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
@@ -64,6 +68,7 @@ import jdk.javadoc.internal.doclets.toolkit.Messages;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
+import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.NewAPIBuilder;
@@ -198,6 +203,18 @@ public class HtmlConfiguration extends BaseConfiguration {
      */
     private final Set<PackageElement> containingPackagesSeen;
 
+    /**
+     * List of additional JavaScript files
+     */
+    private List<JavaScriptFile> additionalScripts;
+
+    /**
+     * Record for JavaScript file and module flag.
+     * @param path file path
+     * @param isModule module flag
+     */
+    public record JavaScriptFile(DocPath path, boolean isModule) {}
+
     /**
      * Constructs the full configuration needed by the doclet, including
      * the format-specific part, defined in this class, and the format-independent
@@ -316,6 +333,9 @@ public class HtmlConfiguration extends BaseConfiguration {
                 }
             }
         }
+        additionalScripts = options.additionalScripts().stream()
+                .map(this::detectJSModule)
+                .collect(Collectors.toList());
         if (options.createIndex()) {
             indexBuilder = new HtmlIndexBuilder(this);
         }
@@ -326,6 +346,26 @@ public class HtmlConfiguration extends BaseConfiguration {
         return true;
     }
 
+    private JavaScriptFile detectJSModule(String fileName) {
+        DocFile file = DocFile.createFileForInput(this, fileName);
+        boolean isModule = fileName.toLowerCase(Locale.ROOT).endsWith(".mjs");
+        if (!isModule) {
+            // Regex to detect JavaScript modules
+            Pattern modulePattern = Pattern.compile("""
+                    (?:^|[;}])\\s*(?:\
+                    import\\s*["']|\
+                    import[\\s{*][^()]*from\\s*["']|\
+                    export(?:\\s+(?:let|const|function|class|var|default|async)|\\s*[{*]))""");
+            try (InputStream in = file.openInputStream();
+                 BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
+                isModule = reader.lines().anyMatch(s -> modulePattern.matcher(s).find());
+            } catch (DocFileIOException | IOException e) {
+                // Errors are handled when copying resources
+            }
+        }
+        return new JavaScriptFile(DocPath.create(file.getName()), isModule);
+    }
+
     /**
      * {@return the date to be recorded in generated files}
      */
@@ -421,11 +461,8 @@ public class HtmlConfiguration extends BaseConfiguration {
                 .collect(Collectors.toCollection(ArrayList::new));
     }
 
-    public List<DocPath> getAdditionalScripts() {
-        return options.additionalScripts().stream()
-                .map(sf -> DocFile.createFileForInput(this, sf))
-                .map(file -> DocPath.create(file.getName()))
-                .collect(Collectors.toCollection(ArrayList::new));
+    public List<JavaScriptFile> getAdditionalScripts() {
+        return additionalScripts;
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
index 77d09c7226e..c4a223a94c7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
@@ -35,6 +35,7 @@ import java.util.List;
 import java.util.Locale;
 
 import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 
@@ -60,7 +61,7 @@ public class Head extends Content {
     private Script mainBodyScript;
     private final List<Script> scripts;
     // Scripts added via --add-script option
-    private List<DocPath> additionalScripts = List.of();
+    private List<HtmlConfiguration.JavaScriptFile> additionalScripts = List.of();
     private final List<Content> extraContent;
     private boolean addDefaultScript = true;
     private DocPath canonicalLink;
@@ -176,7 +177,7 @@ public class Head extends Content {
      * @param scripts the list of additional script files
      * @return this object
      */
-    public Head setAdditionalScripts(List<DocPath> scripts) {
+    public Head setAdditionalScripts(List<HtmlConfiguration.JavaScriptFile> scripts) {
         this.additionalScripts = scripts;
         return this;
     }
@@ -346,7 +347,7 @@ public class Head extends Content {
 
     private void addScripts(HtmlTree head) {
         if (addDefaultScript) {
-            addScriptElement(head, DocPaths.SCRIPT_FILES.resolve(DocPaths.SCRIPT_JS));
+            addScriptElement(head, DocPaths.SCRIPT_JS);
         }
         if (index) {
             if (pathToRoot != null && mainBodyScript != null) {
@@ -356,11 +357,11 @@ public class Head extends Content {
                         .append(";\n")
                         .append("loadScripts(document, 'script');");
             }
-            addScriptElement(head, DocPaths.SCRIPT_FILES.resolve(DocPaths.JQUERY_JS));
-            addScriptElement(head, DocPaths.SCRIPT_FILES.resolve(DocPaths.JQUERY_UI_JS));
+            addScriptElement(head, DocPaths.JQUERY_JS);
+            addScriptElement(head, DocPaths.JQUERY_UI_JS);
         }
-        for (DocPath path : additionalScripts) {
-            addScriptElement(head, DocPaths.SCRIPT_FILES.resolve(path));
+        for (HtmlConfiguration.JavaScriptFile javaScriptFile : additionalScripts) {
+            addScriptElement(head, javaScriptFile);
         }
         for (Script script : scripts) {
             head.add(script.asContent());
@@ -368,7 +369,13 @@ public class Head extends Content {
     }
 
     private void addScriptElement(HtmlTree head, DocPath filePath) {
-        DocPath scriptFile = pathToRoot.resolve(filePath);
+        DocPath scriptFile = pathToRoot.resolve(DocPaths.SCRIPT_FILES).resolve(filePath);
         head.add(HtmlTree.SCRIPT(scriptFile.getPath()));
     }
+
+    private void addScriptElement(HtmlTree head, HtmlConfiguration.JavaScriptFile script) {
+        DocPath scriptFile = pathToRoot.resolve(DocPaths.SCRIPT_FILES).resolve(script.path());
+        HtmlTree scriptTag = HtmlTree.SCRIPT(scriptFile.getPath());
+        head.add(script.isModule() ? scriptTag.put(HtmlAttr.TYPE, "module") : scriptTag);
+    }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testJavaScriptModules/TestJavaScriptModules.java b/test/langtools/jdk/javadoc/doclet/testJavaScriptModules/TestJavaScriptModules.java
new file mode 100644
index 00000000000..e38215c3d4b
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testJavaScriptModules/TestJavaScriptModules.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2024, 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      8317621
+ * @summary  --add-script should support JavaScript modules
+ * @library /tools/lib ../../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build toolbox.ToolBox javadoc.tester.*
+ * @run main TestJavaScriptModules
+ */
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+public class TestJavaScriptModules extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestJavaScriptModules();
+        tester.setup().runTests();
+    }
+
+    private final ToolBox tb = new ToolBox();
+    Path src;
+
+    TestJavaScriptModules setup() throws IOException {
+        src = Path.of("src");
+        tb.writeJavaFiles(src, """
+                   /**
+                    * Simple dummy class.
+                    */
+                   public class Test {}
+                   """);
+        tb.writeFile("module.mjs", """
+                   var x = 1;
+                   """);
+        tb.writeFile("module1.js", """
+                   const x = 1;
+                   export class FooModule {}
+                   """);
+        tb.writeFile("module2.js", """
+                   const x = 1;
+                   export function f() {}
+                   """);
+        tb.writeFile("module3.js", """
+                       const x = 1;
+                       export async function a() {}
+                   """);
+        tb.writeFile("module4.js", """
+                   // Another JS module
+                   export const c = 3;
+                   """);
+        tb.writeFile("module5.js", """
+                   export default class FooModule {}
+                   """);
+        tb.writeFile("module6.js", """
+                   const x = 1;
+                   export class FooModule {}
+                   """);
+        tb.writeFile("module7.js", """
+                   function abc() {}
+                   import * as foo from "module1.js";
+                   """);
+        tb.writeFile("module8.js", """
+                   var z = false;
+                   import { _A_, $b, C0 } from "abc.js";
+                   """);
+        tb.writeFile("script1.js", """
+                   var z = false;
+                   import(1, z);
+                   """);
+        tb.writeFile("script2.js", """
+                   export("foo");
+                   """);
+        tb.writeFile("script3.js", """
+                   var import = 1;
+                   """);
+        return this;
+    }
+
+    @Test
+    public void test(Path base) {
+        javadoc("-d", base.resolve("out").toString(),
+                "--add-script", "module.mjs",
+                "--add-script", "module1.js",
+                "--add-script", "module2.js",
+                "--add-script", "module3.js",
+                "--add-script", "module4.js",
+                "--add-script", "module5.js",
+                "--add-script", "module6.js",
+                "--add-script", "module7.js",
+                "--add-script", "module8.js",
+                "--add-script", "script1.js",
+                "--add-script", "script2.js",
+                "--add-script", "script3.js",
+                src.resolve("Test.java").toString());
+        checkExit(Exit.OK);
+
+        checkOutput("Test.html", true,
+                """
+                    <script type="module" src="script-files/module.mjs"></script>""",
+                """
+                    <script type="module" src="script-files/module1.js"></script>""",
+                """
+                    <script type="module" src="script-files/module2.js"></script>""",
+                """
+                    <script type="module" src="script-files/module3.js"></script>""",
+                """
+                    <script type="module" src="script-files/module4.js"></script>""",
+                """
+                    <script type="module" src="script-files/module5.js"></script>""",
+                """
+                    <script type="module" src="script-files/module6.js"></script>""",
+                """
+                    <script type="module" src="script-files/module7.js"></script>""",
+                """
+                    <script type="module" src="script-files/module8.js"></script>""",
+                """
+                    <script type="text/javascript" src="script-files/script1.js"></script>""",
+                """
+                    <script type="text/javascript" src="script-files/script2.js"></script>""",
+                """
+                    <script type="text/javascript" src="script-files/script3.js"></script>""");
+    }
+}

From 44bdf9964eb2dd0eb4034576e1f903a27c410286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 17 May 2024 13:28:51 +0000
Subject: [PATCH 479/486] 8332239: Improve CSS for block tags

Reviewed-by: prappo, liach, jjg
---
 .../doclets/formats/html/resources/stylesheet.css     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index f0777a6ba96..8086e0d88b3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -372,9 +372,13 @@ dl.notes > dt {
     color:var(--body-text-color);
 }
 dl.notes > dd {
-    margin:5px 10px 10px 0;
+    margin:5px 10px 10px 15px;
     font-size:var(--block-font-size);
-    font-family:var(--block-font-family)
+    font-family:var(--block-font-family);
+}
+dl.notes > dd > ul, dl.notes > dd > ol {
+    margin-bottom: 1em;
+    margin-top: 1em;
 }
 dl.name-value > dt {
     margin-left:1px;
@@ -547,8 +551,9 @@ ul.ref-list > li {
     margin-top:0;
     margin-bottom:1px;
 }
-ul.tag-list, ul.tag-list-long {
+dl.notes > dd > ul.tag-list, dl.notes > dd > ul.tag-list-long {
     padding-left: 0;
+    margin: 0;
     list-style: none;
 }
 ul.tag-list li {

From e611151796d71c40a9395cb6fbe734f36d4c1b55 Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Fri, 17 May 2024 13:48:42 +0000
Subject: [PATCH 480/486] 8331281: RISC-V: C2: Support vector-scalar and
 vector-immediate bitwise logic instructions

Reviewed-by: fjiang, fyang
---
 src/hotspot/cpu/riscv/riscv.ad   |  37 ++-
 src/hotspot/cpu/riscv/riscv_v.ad | 436 +++++++++++++++++++++++++++++++
 2 files changed, 471 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 826049f4b8a..a0d1b1921cd 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -2150,11 +2150,44 @@ bool size_fits_all_mem_uses(AddPNode* addp, int shift) {
   return true;
 }
 
+// Binary src (Replicate scalar/immediate)
+static bool is_vector_scalar_bitwise_pattern(Node* n, Node* m) {
+  if (n == nullptr || m == nullptr) {
+    return false;
+  }
+
+  if (m->Opcode() != Op_Replicate) {
+    return false;
+  }
+
+  switch (n->Opcode()) {
+    case Op_AndV:
+    case Op_OrV:
+    case Op_XorV: {
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+
+// (XorV src (Replicate m1))
+// (XorVMask src (MaskAll m1))
+static bool is_vector_bitwise_not_pattern(Node* n, Node* m) {
+  if (n != nullptr && m != nullptr) {
+    return (n->Opcode() == Op_XorV || n->Opcode() == Op_XorVMask) &&
+           VectorNode::is_all_ones_vector(m);
+  }
+  return false;
+}
+
 // Should the Matcher clone input 'm' of node 'n'?
 bool Matcher::pd_clone_node(Node* n, Node* m, Matcher::MStack& mstack) {
   assert_cond(m != nullptr);
-  if (is_vshift_con_pattern(n, m)) { // ShiftV src (ShiftCntV con)
-    mstack.push(m, Visit);           // m = ShiftCntV
+  if (is_vshift_con_pattern(n, m) || // ShiftV src (ShiftCntV con)
+      is_vector_bitwise_not_pattern(n, m) ||
+      is_vector_scalar_bitwise_pattern(n, m)) {
+    mstack.push(m, Visit);
     return true;
   }
   return false;
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 3d2cbbe5cf4..6ee3365ff73 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -483,6 +483,130 @@ instruct vand_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector-immediate and (unpredicated)
+
+instruct vand_immI(vReg dst_src, immI5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (AndV dst_src (Replicate con)));
+  format %{ "vand_immI $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vand_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_immL(vReg dst_src, immL5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (AndV dst_src (Replicate con)));
+  format %{ "vand_immL $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vand_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar and (unpredicated)
+
+instruct vand_regI(vReg dst_src, iRegIorL2I src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (AndV dst_src (Replicate src)));
+  format %{ "vand_regI $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vand_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_regL(vReg dst_src, iRegL src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (AndV dst_src (Replicate src)));
+  format %{ "vand_regL $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vand_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-immediate and (predicated)
+
+instruct vand_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (AndV (Binary dst_src (Replicate con)) v0));
+  format %{ "vand_immI_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vand_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (AndV (Binary dst_src (Replicate con)) v0));
+  format %{ "vand_immL_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vand_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar and (predicated)
+
+instruct vand_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (AndV (Binary dst_src (Replicate src)) v0));
+  format %{ "vand_regI_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vand_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_regL_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (AndV (Binary dst_src (Replicate src)) v0));
+  format %{ "vand_regL_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vand_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector or
 
 instruct vor(vReg dst, vReg src1, vReg src2) %{
@@ -515,6 +639,130 @@ instruct vor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector-immediate or (unpredicated)
+
+instruct vor_immI(vReg dst_src, immI5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (OrV dst_src (Replicate con)));
+  format %{ "vor_immI $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vor_vi(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vor_immL(vReg dst_src, immL5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (OrV dst_src (Replicate con)));
+  format %{ "vor_immL $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vor_vi(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar or (unpredicated)
+
+instruct vor_regI(vReg dst_src, iRegIorL2I src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (OrV dst_src (Replicate src)));
+  format %{ "vor_regI $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vor_vx(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vor_regL(vReg dst_src, iRegL src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (OrV dst_src (Replicate src)));
+  format %{ "vor_regL $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vor_vx(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-immediate or (predicated)
+
+instruct vor_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (OrV (Binary dst_src (Replicate con)) v0));
+  format %{ "vor_immI_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vor_vi(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vor_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (OrV (Binary dst_src (Replicate con)) v0));
+  format %{ "vor_immL_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vor_vi(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar or (predicated)
+
+instruct vor_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (OrV (Binary dst_src (Replicate src)) v0));
+  format %{ "vor_regI_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vor_vx(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vor_regL_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (OrV (Binary dst_src (Replicate src)) v0));
+  format %{ "vor_regL_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vor_vx(as_VectorRegister($dst_src$$reg),
+              as_VectorRegister($dst_src$$reg),
+              as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector xor
 
 instruct vxor(vReg dst, vReg src1, vReg src2) %{
@@ -547,6 +795,194 @@ instruct vxor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector-immediate xor (unpredicated)
+
+instruct vxor_immI(vReg dst_src, immI5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV dst_src (Replicate con)));
+  format %{ "vxor_immI $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vxor_immL(vReg dst_src, immL5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV dst_src (Replicate con)));
+  format %{ "vxor_immL $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar xor (unpredicated)
+
+instruct vxor_regI(vReg dst_src, iRegIorL2I src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV dst_src (Replicate src)));
+  format %{ "vxor_regI $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vxor_regL(vReg dst_src, iRegL src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV dst_src (Replicate src)));
+  format %{ "vxor_regL $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-immediate xor (predicated)
+
+instruct vxor_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV (Binary dst_src (Replicate con)) v0));
+  format %{ "vxor_immI_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vxor_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV (Binary dst_src (Replicate con)) v0));
+  format %{ "vxor_immL_masked $dst_src, $dst_src, $con" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               $con$$constant, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector-scalar xor (predicated)
+
+instruct vxor_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV (Binary dst_src (Replicate src)) v0));
+  format %{ "vxor_regI_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vxor_regL_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV (Binary dst_src (Replicate src)) v0));
+  format %{ "vxor_regL_masked $dst_src, $dst_src, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vx(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               as_Register($src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// ------------------------------ Vector not -----------------------------------
+
+// vector not
+
+instruct vnotI(vReg dst, vReg src, immI_M1 m1) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst (XorV src (Replicate m1)));
+  format %{ "vnotI $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src$$reg),
+               -1);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vnotL(vReg dst, vReg src, immL_M1 m1) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst (XorV src (Replicate m1)));
+  format %{ "vnotL $dst, $src" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src$$reg),
+               -1);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector not - predicated
+
+instruct vnotI_masked(vReg dst_src, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src (XorV (Binary dst_src (Replicate m1)) v0));
+  format %{ "vnotI_masked $dst_src, $dst_src, $v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               -1, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vnotL_masked(vReg dst_src, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src (XorV (Binary dst_src (Replicate m1)) v0));
+  format %{ "vnotL_masked $dst_src, $dst_src, $v0" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vxor_vi(as_VectorRegister($dst_src$$reg),
+               as_VectorRegister($dst_src$$reg),
+               -1, Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector float div
 
 instruct vdiv_fp(vReg dst, vReg src1, vReg src2) %{

From b7ae0ae1d7481e66a07f40bf01c5614fdf44c2ed Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 17 May 2024 14:06:08 +0000
Subject: [PATCH 481/486] 8328572: JFR: Use Class.forPrimitiveName(String)

Reviewed-by: mgronlun
---
 .../classes/jdk/jfr/internal/util/Utils.java  | 79 +++++--------------
 1 file changed, 18 insertions(+), 61 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
index c133a11b3c5..53b3599f9d9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Repeatable;
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -37,7 +38,6 @@ import java.nio.file.Path;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -243,67 +243,24 @@ public final class Utils {
     }
 
     public static Object makePrimitiveArray(String typeName, List<Object> values) {
-        int length = values.size();
-        switch (typeName) {
-        case "int":
-            int[] ints = new int[length];
-            for (int i = 0; i < length; i++) {
-                ints[i] = (int) values.get(i);
-            }
-            return ints;
-        case "long":
-            long[] longs = new long[length];
-            for (int i = 0; i < length; i++) {
-                longs[i] = (long) values.get(i);
-            }
-            return longs;
-
-        case "float":
-            float[] floats = new float[length];
-            for (int i = 0; i < length; i++) {
-                floats[i] = (float) values.get(i);
-            }
-            return floats;
-
-        case "double":
-            double[] doubles = new double[length];
-            for (int i = 0; i < length; i++) {
-                doubles[i] = (double) values.get(i);
-            }
-            return doubles;
-
-        case "short":
-            short[] shorts = new short[length];
-            for (int i = 0; i < length; i++) {
-                shorts[i] = (short) values.get(i);
-            }
-            return shorts;
-        case "char":
-            char[] chars = new char[length];
-            for (int i = 0; i < length; i++) {
-                chars[i] = (char) values.get(i);
-            }
-            return chars;
-        case "byte":
-            byte[] bytes = new byte[length];
-            for (int i = 0; i < length; i++) {
-                bytes[i] = (byte) values.get(i);
-            }
-            return bytes;
-        case "boolean":
-            boolean[] booleans = new boolean[length];
-            for (int i = 0; i < length; i++) {
-                booleans[i] = (boolean) values.get(i);
-            }
-            return booleans;
-        case "java.lang.String":
-            String[] strings = new String[length];
-            for (int i = 0; i < length; i++) {
-                strings[i] = (String) values.get(i);
-            }
-            return strings;
+        Class<?> componentType = makePrimitiveType(typeName);
+        if (componentType == null) {
+            return null;
         }
-        return null;
+        int length = values.size();
+        Object array =  Array.newInstance(componentType, length);
+        for (int index = 0; index < length; index++) {
+            Array.set(array, index, values.get(index));
+        }
+        return array;
+    }
+
+    private static Class<?> makePrimitiveType(String typeName) {
+        return switch(typeName) {
+            case "void" -> null;
+            case "java.lang.String" -> String.class;
+            default -> Class.forPrimitiveName(typeName);
+        };
     }
 
     public static boolean isSettingVisible(long typeId, boolean hasEventHook) {

From 39a55e97799b5328da85aaa66c8d23175b305691 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Fri, 17 May 2024 14:16:11 +0000
Subject: [PATCH 482/486] 8324809: compiler can crash with SOE while proving if
 two recursive types are disjoint

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/code/Types.java       | 25 ++++++++----
 .../SOEWhileProvingDisjointnessTest.java      | 39 +++++++++++++++++++
 2 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 test/langtools/tools/javac/generics/wildcards/SOEWhileProvingDisjointnessTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index 4b2f32521a3..28768f2517b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -4734,6 +4734,10 @@ public class Types {
 
         boolean high;
         boolean rewriteTypeVars;
+        // map to avoid visiting same type argument twice, like in Foo<T>.Bar<T>
+        Map<Type, Type> argMap = new HashMap<>();
+        // cycle detection within an argument, see JDK-8324809
+        Set<Type> seen = new HashSet<>();
 
         Rewriter(boolean high, boolean rewriteTypeVars) {
             this.high = high;
@@ -4745,7 +4749,10 @@ public class Types {
             ListBuffer<Type> rewritten = new ListBuffer<>();
             boolean changed = false;
             for (Type arg : t.allparams()) {
-                Type bound = visit(arg);
+                Type bound = argMap.get(arg);
+                if (bound == null) {
+                    argMap.put(arg, bound = visit(arg));
+                }
                 if (arg != bound) {
                     changed = true;
                 }
@@ -4774,13 +4781,17 @@ public class Types {
 
         @Override
         public Type visitTypeVar(TypeVar t, Void s) {
-            if (rewriteTypeVars) {
-                Type bound = t.getUpperBound().contains(t) ?
-                        erasure(t.getUpperBound()) :
-                        visit(t.getUpperBound());
-                return rewriteAsWildcardType(bound, t, EXTENDS);
+            if (seen.add(t)) {
+                if (rewriteTypeVars) {
+                    Type bound = t.getUpperBound().contains(t) ?
+                            erasure(t.getUpperBound()) :
+                            visit(t.getUpperBound());
+                    return rewriteAsWildcardType(bound, t, EXTENDS);
+                } else {
+                    return t;
+                }
             } else {
-                return t;
+                return rewriteTypeVars ? makeExtendsWildcard(syms.objectType, t) : t;
             }
         }
 
diff --git a/test/langtools/tools/javac/generics/wildcards/SOEWhileProvingDisjointnessTest.java b/test/langtools/tools/javac/generics/wildcards/SOEWhileProvingDisjointnessTest.java
new file mode 100644
index 00000000000..8ec946609f3
--- /dev/null
+++ b/test/langtools/tools/javac/generics/wildcards/SOEWhileProvingDisjointnessTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024, 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 8324809
+ * @summary compiler can crash with SOE while proving if two recursive types are disjoint
+ * @compile SOEWhileProvingDisjointnessTest.java
+ */
+
+class SOEWhileProvingDisjointnessTest {
+    class Criteria<B extends Builder<? extends Criteria>> {
+        public <D extends Builder<E>, E extends Criteria<D>> D builder() {
+            return (D) new Builder<>();
+        }
+    }
+
+    class Builder<C extends Criteria<? extends Builder<C>>> {}
+}

From 0a58cffe88ba823e71fcdcca64b784ed04ca5398 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Fri, 17 May 2024 17:42:46 +0000
Subject: [PATCH 483/486] 8298405: Implement JEP 467: Markdown Documentation
 Comments 8329296: Update Elements for '///' documentation comments

Co-authored-by: Jim Laskey <jlaskey@openjdk.org>
Reviewed-by: prappo, darcy, hannesw
---
 make/CompileDemos.gmk                         |    2 +-
 make/autoconf/spec.gmk.template               |    2 +-
 .../src/classes/build/tools/taglet/JSpec.java |    9 +-
 .../classes/build/tools/taglet/ToolGuide.java |   11 +-
 make/modules/java.base/Java.gmk               |    2 +-
 make/modules/jdk.incubator.vector/Java.gmk    |    4 +-
 make/modules/jdk.jpackage/Java.gmk            |    4 +-
 make/modules/jdk.unsupported/Java.gmk         |   26 +
 make/test/BuildMicrobenchmark.gmk             |    4 +-
 .../jdk/internal/jrtfs/JrtFileAttributes.java |    6 +-
 .../javax/lang/model/util/Elements.java       |  109 +-
 .../com/sun/source/doctree/DocTree.java       |   10 +-
 .../sun/source/doctree/DocTreeVisitor.java    |   18 +-
 .../sun/source/doctree/InheritDocTree.java    |    7 +-
 .../com/sun/source/doctree/RawTextTree.java   |   55 +
 .../com/sun/source/doctree/package-info.java  |    3 +-
 .../com/sun/source/util/DocTreeFactory.java   |   15 +-
 .../com/sun/source/util/DocTreeScanner.java   |   18 +-
 .../classes/com/sun/source/util/DocTrees.java |   56 +-
 .../sun/source/util/SimpleDocTreeVisitor.java |   18 +-
 .../com/sun/tools/javac/api/JavacTrees.java   |  248 +-
 .../com/sun/tools/javac/main/Option.java      |    4 +-
 .../sun/tools/javac/model/JavacElements.java  |   16 +-
 .../tools/javac/parser/DocCommentParser.java  |  977 ++++++--
 .../sun/tools/javac/parser/JavaTokenizer.java |  132 +-
 .../javac/parser/LazyDocCommentTable.java     |   30 +-
 .../sun/tools/javac/parser/ParserFactory.java |    9 +-
 .../com/sun/tools/javac/parser/Scanner.java   |    2 +-
 .../tools/javac/parser/ScannerFactory.java    |    7 +-
 .../com/sun/tools/javac/parser/Tokens.java    |   18 +-
 .../tools/javac/resources/javac.properties    |    2 +
 .../com/sun/tools/javac/tree/DCTree.java      |   40 +-
 .../sun/tools/javac/tree/DocCommentTable.java |   26 +-
 .../com/sun/tools/javac/tree/DocPretty.java   |   20 +-
 .../sun/tools/javac/tree/DocTreeMaker.java    |  295 ++-
 .../com/sun/tools/javac/tree/TreeInfo.java    |    7 -
 .../share/classes/module-info.java            |   13 +-
 src/jdk.compiler/share/man/javac.1            |    5 +-
 .../markdown/MarkdownTransformer.java         |  976 ++++++++
 .../internal/org/commonmark/Extension.java    |   43 +
 .../commonmark/ext/gfm/tables/TableBlock.java |   41 +
 .../commonmark/ext/gfm/tables/TableBody.java  |   41 +
 .../commonmark/ext/gfm/tables/TableCell.java  |   86 +
 .../commonmark/ext/gfm/tables/TableHead.java  |   41 +
 .../commonmark/ext/gfm/tables/TableRow.java   |   41 +
 .../ext/gfm/tables/TablesExtension.java       |  117 +
 .../gfm/tables/internal/TableBlockParser.java |  344 +++
 .../internal/TableHtmlNodeRenderer.java       |  126 +
 .../internal/TableMarkdownNodeRenderer.java   |  121 +
 .../tables/internal/TableNodeRenderer.java    |   84 +
 .../TableTextContentNodeRenderer.java         |  103 +
 .../org/commonmark/internal/BlockContent.java |   61 +
 .../internal/BlockContinueImpl.java           |   61 +
 .../commonmark/internal/BlockQuoteParser.java |   95 +
 .../commonmark/internal/BlockStartImpl.java   |   83 +
 .../org/commonmark/internal/Bracket.java      |   96 +
 .../org/commonmark/internal/Delimiter.java    |  114 +
 .../internal/DocumentBlockParser.java         |   70 +
 .../commonmark/internal/DocumentParser.java   |  639 +++++
 .../internal/FencedCodeBlockParser.java       |  171 ++
 .../commonmark/internal/HeadingParser.java    |  188 ++
 .../commonmark/internal/HtmlBlockParser.java  |  178 ++
 .../internal/IndentedCodeBlockParser.java     |  105 +
 .../internal/InlineParserContextImpl.java     |   62 +
 .../commonmark/internal/InlineParserImpl.java |  787 ++++++
 .../LinkReferenceDefinitionParser.java        |  313 +++
 .../internal/LinkReferenceDefinitions.java    |   59 +
 .../commonmark/internal/ListBlockParser.java  |  286 +++
 .../commonmark/internal/ListItemParser.java   |  107 +
 .../commonmark/internal/ParagraphParser.java  |  108 +
 .../internal/StaggeredDelimiterProcessor.java |  108 +
 .../internal/ThematicBreakParser.java         |  107 +
 .../inline/AsteriskDelimiterProcessor.java    |   40 +
 .../internal/inline/AutolinkInlineParser.java |   81 +
 .../inline/BackslashInlineParser.java         |   67 +
 .../inline/BackticksInlineParser.java         |   82 +
 .../inline/EmphasisDelimiterProcessor.java    |   98 +
 .../internal/inline/EntityInlineParser.java   |   87 +
 .../internal/inline/HtmlInlineParser.java     |  235 ++
 .../internal/inline/InlineContentParser.java  |   38 +
 .../internal/inline/InlineParserState.java    |   48 +
 .../internal/inline/ParsedInline.java         |   56 +
 .../internal/inline/ParsedInlineImpl.java     |   54 +
 .../commonmark/internal/inline/Position.java  |   48 +
 .../commonmark/internal/inline/Scanner.java   |  313 +++
 .../inline/UnderscoreDelimiterProcessor.java  |   40 +
 .../internal/renderer/NodeRendererMap.java    |   58 +
 .../renderer/text/BulletListHolder.java       |   48 +
 .../internal/renderer/text/ListHolder.java    |   59 +
 .../renderer/text/OrderedListHolder.java      |   58 +
 .../internal/util/AsciiMatcher.java           |   83 +
 .../commonmark/internal/util/CharMatcher.java |   38 +
 .../commonmark/internal/util/Escaping.java    |  183 ++
 .../internal/util/Html5Entities.java          |  103 +
 .../commonmark/internal/util/LinkScanner.java |  234 ++
 .../org/commonmark/internal/util/Parsing.java |   42 +
 .../org/commonmark/internal/util/entities.txt | 2126 +++++++++++++++++
 .../org/commonmark/node/AbstractVisitor.java  |  173 ++
 .../internal/org/commonmark/node/Block.java   |   51 +
 .../org/commonmark/node/BlockQuote.java       |   41 +
 .../org/commonmark/node/BulletList.java       |   70 +
 .../internal/org/commonmark/node/Code.java    |   58 +
 .../org/commonmark/node/CustomBlock.java      |   41 +
 .../org/commonmark/node/CustomNode.java       |   40 +
 .../org/commonmark/node/Delimited.java        |   49 +
 .../org/commonmark/node/Document.java         |   41 +
 .../org/commonmark/node/Emphasis.java         |   64 +
 .../org/commonmark/node/FencedCodeBlock.java  |  159 ++
 .../org/commonmark/node/HardLineBreak.java    |   41 +
 .../internal/org/commonmark/node/Heading.java |   51 +
 .../org/commonmark/node/HtmlBlock.java        |   56 +
 .../org/commonmark/node/HtmlInline.java       |   56 +
 .../internal/org/commonmark/node/Image.java   |   73 +
 .../commonmark/node/IndentedCodeBlock.java    |   51 +
 .../internal/org/commonmark/node/Link.java    |   93 +
 .../node/LinkReferenceDefinition.java         |   89 +
 .../org/commonmark/node/ListBlock.java        |   51 +
 .../org/commonmark/node/ListItem.java         |   87 +
 .../internal/org/commonmark/node/Node.java    |  193 ++
 .../internal/org/commonmark/node/Nodes.java   |   98 +
 .../org/commonmark/node/OrderedList.java      |   98 +
 .../org/commonmark/node/Paragraph.java        |   44 +
 .../org/commonmark/node/SoftLineBreak.java    |   41 +
 .../org/commonmark/node/SourceSpan.java       |  122 +
 .../org/commonmark/node/SourceSpans.java      |   85 +
 .../org/commonmark/node/StrongEmphasis.java   |   64 +
 .../internal/org/commonmark/node/Text.java    |   63 +
 .../org/commonmark/node/ThematicBreak.java    |   54 +
 .../internal/org/commonmark/node/Visitor.java |   87 +
 .../org/commonmark/node/package-info.java     |   36 +
 .../internal/org/commonmark/package-info.java |   42 +
 .../commonmark/parser/IncludeSourceSpans.java |   54 +
 .../org/commonmark/parser/InlineParser.java   |   47 +
 .../parser/InlineParserContext.java           |   59 +
 .../parser/InlineParserFactory.java           |   40 +
 .../org/commonmark/parser/Parser.java         |  316 +++
 .../org/commonmark/parser/PostProcessor.java  |   45 +
 .../org/commonmark/parser/SourceLine.java     |   79 +
 .../org/commonmark/parser/SourceLines.java    |   98 +
 .../org/commonmark/parser/beta/Position.java  |   48 +
 .../org/commonmark/parser/beta/Scanner.java   |  313 +++
 .../commonmark/parser/beta/package-info.java  |   36 +
 .../parser/block/AbstractBlockParser.java     |   74 +
 .../block/AbstractBlockParserFactory.java     |   36 +
 .../parser/block/BlockContinue.java           |   61 +
 .../commonmark/parser/block/BlockParser.java  |   88 +
 .../parser/block/BlockParserFactory.java      |   44 +
 .../commonmark/parser/block/BlockStart.java   |   59 +
 .../parser/block/MatchedBlockParser.java      |   53 +
 .../commonmark/parser/block/ParserState.java  |   82 +
 .../commonmark/parser/block/package-info.java |   36 +
 .../parser/delimiter/DelimiterProcessor.java  |   76 +
 .../parser/delimiter/DelimiterRun.java        |   90 +
 .../org/commonmark/parser/package-info.java   |   36 +
 .../org/commonmark/renderer/NodeRenderer.java |   55 +
 .../org/commonmark/renderer/Renderer.java     |   54 +
 .../renderer/html/AttributeProvider.java      |   61 +
 .../html/AttributeProviderContext.java        |   41 +
 .../html/AttributeProviderFactory.java        |   47 +
 .../renderer/html/CoreHtmlNodeRenderer.java   |  352 +++
 .../renderer/html/DefaultUrlSanitizer.java    |  115 +
 .../html/HtmlNodeRendererContext.java         |   93 +
 .../html/HtmlNodeRendererFactory.java         |   49 +
 .../renderer/html/HtmlRenderer.java           |  337 +++
 .../commonmark/renderer/html/HtmlWriter.java  |  107 +
 .../renderer/html/UrlSanitizer.java           |   62 +
 .../renderer/html/package-info.java           |   36 +
 .../markdown/CoreMarkdownNodeRenderer.java    |  582 +++++
 .../markdown/MarkdownNodeRendererContext.java |   62 +
 .../markdown/MarkdownNodeRendererFactory.java |   57 +
 .../renderer/markdown/MarkdownRenderer.java   |  195 ++
 .../renderer/markdown/MarkdownWriter.java     |  278 +++
 .../renderer/markdown/package-info.java       |   36 +
 .../text/CoreTextContentNodeRenderer.java     |  312 +++
 .../text/TextContentNodeRendererContext.java  |   57 +
 .../text/TextContentNodeRendererFactory.java  |   49 +
 .../renderer/text/TextContentRenderer.java    |  184 ++
 .../renderer/text/TextContentWriter.java      |   99 +
 .../renderer/text/package-info.java           |   36 +
 .../org/commonmark/text/AsciiMatcher.java     |  105 +
 .../org/commonmark/text/CharMatcher.java      |   45 +
 .../org/commonmark/text/Characters.java       |  189 ++
 .../org/commonmark/text/package-info.java     |   36 +
 .../share/classes/module-info.java            |   77 +
 src/jdk.internal.md/share/legal/commonmark.md |   29 +
 .../doclets/formats/html/Content.java         |   13 +-
 .../doclets/formats/html/DocFilesHandler.java |   13 +-
 .../formats/html/ExternalSpecsWriter.java     |   28 +-
 .../formats/html/HtmlDocletWriter.java        |  370 ++-
 .../formats/html/NewAPIListWriter.java        |   16 +-
 .../formats/html/SystemPropertiesWriter.java  |   29 +-
 .../formats/html/markup/ContentBuilder.java   |   14 +-
 .../doclets/formats/html/markup/Entity.java   |    5 +
 .../doclets/formats/html/markup/HtmlTree.java |   19 +
 .../doclets/formats/html/markup/RawHtml.java  |   32 +-
 .../doclets/formats/html/markup/TagName.java  |   49 +-
 .../doclets/formats/html/markup/Text.java     |    7 +-
 .../formats/html/markup/TextBuilder.java      |   13 +-
 .../formats/html/taglets/SeeTaglet.java       |    4 +-
 .../formats/html/taglets/SpecTaglet.java      |   39 +-
 .../doclets/toolkit/BaseConfiguration.java    |    4 +-
 .../doclets/toolkit/CommentUtils.java         |    4 +-
 .../doclets/toolkit/DocFileElement.java       |   19 +-
 .../doclets/toolkit/util/CommentHelper.java   |    9 +-
 .../doclets/toolkit/util/NewAPIBuilder.java   |   15 +-
 .../internal/doclets/toolkit/util/Utils.java  |   37 +-
 .../jdk/javadoc/internal/doclint/Checker.java |   24 +-
 .../jdk/javadoc/internal/doclint/Env.java     |    7 +-
 .../jdk/javadoc/internal/tool/Start.java      |   12 +
 .../javadoc/internal/tool/ToolOptions.java    |    9 +-
 .../tool/resources/javadoc.properties         |    4 +
 .../share/classes/module-info.java            |    6 +-
 src/jdk.javadoc/share/man/javadoc.1           |  107 +-
 .../doclet/testMarkdown/DivTaglet.java        |   61 +
 .../doclet/testMarkdown/SpanTaglet.java       |   61 +
 .../doclet/testMarkdown/TestMarkdown.java     |  302 +++
 .../testMarkdown/TestMarkdownCodeBlocks.java  |  489 ++++
 .../testMarkdown/TestMarkdownCodeSpans.java   |  391 +++
 .../testMarkdown/TestMarkdownDeprecated.java  |  136 ++
 .../testMarkdown/TestMarkdownFiles.java       |  106 +
 .../TestMarkdownFirstSentence.java            |  274 +++
 .../testMarkdown/TestMarkdownHeadings.java    |  344 +++
 .../testMarkdown/TestMarkdownInheritDoc.java  |  148 ++
 .../testMarkdown/TestMarkdownLinks.java       |  349 +++
 .../testMarkdown/TestMarkdownTaglets.java     |  226 ++
 .../sampleapi/util/PoorDocCommentTable.java   |   13 +-
 .../TestLineCommentOption.java                |  101 +
 .../tool/testTransformer/TestTransformer.java |  173 ++
 .../deprecated/DeprecatedPackageTest.java     |    5 +-
 .../attributes/deprecated/DeprecatedTest.java |   12 +-
 .../DanglingDocCommentsClass.enabled.out      |   12 +-
 .../DanglingDocCommentsClass.java             |    2 +
 .../DanglingDocCommentsClass_Line.enabled.out |    7 +
 .../DanglingDocCommentsClass_Line.java        |   56 +
 ...DanglingDocCommentsClass_Mixed.enabled.out |    4 +
 .../DanglingDocCommentsClass_Mixed.java       |   24 +
 .../DanglingDocCommentsEnum.enabled.out       |   14 +-
 .../DanglingDocCommentsEnum.java              |    2 +
 .../tools/javac/doctree/DocCommentTester.java |  139 +-
 .../tools/javac/doctree/ElementTest.java      |   16 +-
 .../tools/javac/doctree/EntityTest.java       |   15 +-
 .../javac/doctree/FirstSentenceTest.java      |  144 +-
 .../tools/javac/doctree/MDPrinter.java        |  272 +++
 .../tools/javac/doctree/MarkdownTest.java     |  617 +++++
 .../MarkdownTransformerPositionTest.java      |  124 +
 .../tools/javac/lexer/CommentTest.java        |  524 ++++
 test/langtools/tools/javac/lib/DPrinter.java  |    7 +-
 .../util/elements/TestGetDocCommentKind.java  |   87 +
 ...ents.java => TestGetDocComment_Block.java} |   14 +-
 .../util/elements/TestGetDocComment_Line.java |  173 ++
 250 files changed, 26320 insertions(+), 712 deletions(-)
 create mode 100644 make/modules/jdk.unsupported/Java.gmk
 create mode 100644 src/jdk.compiler/share/classes/com/sun/source/doctree/RawTextTree.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/markdown/MarkdownTransformer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/Extension.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBlock.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBody.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableCell.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableHead.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableRow.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TablesExtension.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableBlockParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableHtmlNodeRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableNodeRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableTextContentNodeRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContent.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContinueImpl.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockQuoteParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockStartImpl.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Bracket.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Delimiter.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentBlockParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/FencedCodeBlockParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HeadingParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HtmlBlockParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/IndentedCodeBlockParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserContextImpl.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserImpl.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitionParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitions.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListBlockParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListItemParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ParagraphParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/StaggeredDelimiterProcessor.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ThematicBreakParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AsteriskDelimiterProcessor.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AutolinkInlineParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackslashInlineParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackticksInlineParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EmphasisDelimiterProcessor.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EntityInlineParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/HtmlInlineParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineContentParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineParserState.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInline.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInlineImpl.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Position.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Scanner.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/UnderscoreDelimiterProcessor.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/NodeRendererMap.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/BulletListHolder.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/ListHolder.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/OrderedListHolder.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/AsciiMatcher.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/CharMatcher.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Escaping.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Html5Entities.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/LinkScanner.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Parsing.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/entities.txt
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/AbstractVisitor.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Block.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BlockQuote.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BulletList.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Code.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomBlock.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomNode.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Delimited.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Document.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Emphasis.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/FencedCodeBlock.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HardLineBreak.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Heading.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlBlock.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlInline.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Image.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/IndentedCodeBlock.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Link.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/LinkReferenceDefinition.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListBlock.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListItem.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Node.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Nodes.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/OrderedList.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Paragraph.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SoftLineBreak.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpan.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpans.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/StrongEmphasis.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Text.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ThematicBreak.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Visitor.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/package-info.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/package-info.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/IncludeSourceSpans.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserContext.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserFactory.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/Parser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/PostProcessor.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLine.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLines.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Position.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Scanner.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/package-info.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParserFactory.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockContinue.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParserFactory.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockStart.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/MatchedBlockParser.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/ParserState.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/package-info.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterProcessor.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterRun.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/package-info.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/NodeRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/Renderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProvider.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderContext.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderFactory.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/DefaultUrlSanitizer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererContext.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererFactory.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlWriter.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/UrlSanitizer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/package-info.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererContext.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererFactory.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownWriter.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/package-info.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/CoreTextContentNodeRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererContext.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererFactory.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentRenderer.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentWriter.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/package-info.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/AsciiMatcher.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/CharMatcher.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/Characters.java
 create mode 100644 src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/package-info.java
 create mode 100644 src/jdk.internal.md/share/classes/module-info.java
 create mode 100644 src/jdk.internal.md/share/legal/commonmark.md
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/DivTaglet.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/SpanTaglet.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdown.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeBlocks.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeSpans.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownDeprecated.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFiles.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFirstSentence.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownInheritDoc.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
 create mode 100644 test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
 create mode 100644 test/langtools/jdk/javadoc/tool/testLineCommentOption/TestLineCommentOption.java
 create mode 100644 test/langtools/jdk/javadoc/tool/testTransformer/TestTransformer.java
 create mode 100644 test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.enabled.out
 create mode 100644 test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.java
 create mode 100644 test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.enabled.out
 create mode 100644 test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.java
 create mode 100644 test/langtools/tools/javac/doctree/MDPrinter.java
 create mode 100644 test/langtools/tools/javac/doctree/MarkdownTest.java
 create mode 100644 test/langtools/tools/javac/doctree/MarkdownTransformerPositionTest.java
 create mode 100644 test/langtools/tools/javac/lexer/CommentTest.java
 create mode 100644 test/langtools/tools/javac/processing/model/util/elements/TestGetDocCommentKind.java
 rename test/langtools/tools/javac/processing/model/util/elements/{TestGetDocComments.java => TestGetDocComment_Block.java} (94%)
 create mode 100644 test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Line.java

diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
index 599ce9842e4..6c751552e50 100644
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -183,7 +183,7 @@ $(eval $(call SetupBuildDemo, SwingSet2, \
 ))
 
 $(eval $(call SetupBuildDemo, Font2DTest, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape dangling-doc-comments, \
     DEMO_SUBDIR := jfc, \
 ))
 
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 616999f2736..7ce4038f641 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -675,7 +675,7 @@ DOCS_REFERENCE_JAVADOC := @DOCS_REFERENCE_JAVADOC@
 SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
 
 # Interim langtools modules and arguments
-INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
+INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.internal.md jdk.javadoc
 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
 INTERIM_LANGTOOLS_ADD_EXPORTS := \
     --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
diff --git a/make/jdk/src/classes/build/tools/taglet/JSpec.java b/make/jdk/src/classes/build/tools/taglet/JSpec.java
index ff8abc46ffd..fda372c8b01 100644
--- a/make/jdk/src/classes/build/tools/taglet/JSpec.java
+++ b/make/jdk/src/classes/build/tools/taglet/JSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 import javax.lang.model.element.Element;
 
 import com.sun.source.doctree.DocTree;
@@ -157,7 +159,10 @@ public class JSpec implements Taglet  {
                     continue;
             }
 
-            String tagText = contents.toString().trim();
+            String tagText = contents.stream()
+                    .map(Object::toString)
+                    .collect(Collectors.joining())
+                    .trim();
             Matcher m = TAG_PATTERN.matcher(tagText);
             if (m.find()) {
                 String chapter = m.group("chapter");
diff --git a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
index f3ce80cf241..af38e0a765c 100644
--- a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
+++ b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
@@ -105,8 +107,11 @@ public class ToolGuide implements Taglet {
                 continue;
             }
 
-            UnknownBlockTagTree blockTag = (UnknownBlockTagTree)tag;
-            String tagText = blockTag.getContent().toString().trim();
+            UnknownBlockTagTree blockTag = (UnknownBlockTagTree) tag;
+            String tagText = blockTag.getContent().stream()
+                    .map(Object::toString)
+                    .collect(Collectors.joining())
+                    .trim();
             Matcher m = TAG_PATTERN.matcher(tagText);
             if (m.matches()) {
                 String name = m.group("name");
diff --git a/make/modules/java.base/Java.gmk b/make/modules/java.base/Java.gmk
index 5820c280fe9..cbe6eecf187 100644
--- a/make/modules/java.base/Java.gmk
+++ b/make/modules/java.base/Java.gmk
@@ -27,7 +27,7 @@
 # new warning is added to javac, it can be temporarily added to the
 # disabled warnings list.
 #
-# DISABLED_WARNINGS_java +=
+DISABLED_WARNINGS_java += dangling-doc-comments
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
diff --git a/make/modules/jdk.incubator.vector/Java.gmk b/make/modules/jdk.incubator.vector/Java.gmk
index a2013179ace..6cd5301428f 100644
--- a/make/modules/jdk.incubator.vector/Java.gmk
+++ b/make/modules/jdk.incubator.vector/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,4 +23,6 @@
 # questions.
 #
 
+DISABLED_WARNINGS_java += dangling-doc-comments
+
 DOCLINT += -Xdoclint:all/protected
diff --git a/make/modules/jdk.jpackage/Java.gmk b/make/modules/jdk.jpackage/Java.gmk
index acb8529f9ef..9d31e5417e9 100644
--- a/make/modules/jdk.jpackage/Java.gmk
+++ b/make/modules/jdk.jpackage/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
 # questions.
 #
 
+DISABLED_WARNINGS_java += dangling-doc-comments
+
 COPY += .gif .png .txt .spec .script .prerm .preinst \
     .postrm .postinst .list .sh .desktop .copyright .control .plist .template \
     .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff .service
diff --git a/make/modules/jdk.unsupported/Java.gmk b/make/modules/jdk.unsupported/Java.gmk
new file mode 100644
index 00000000000..fc8b2f832d7
--- /dev/null
+++ b/make/modules/jdk.unsupported/Java.gmk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2024, 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.
+#
+
+DISABLED_WARNINGS_java += dangling-doc-comments
diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index 3d6ec9950d7..4a6232afbe0 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -95,7 +95,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
     SMALL_JAVA := false, \
     CLASSPATH := $(JMH_COMPILE_JARS), \
     DISABLED_WARNINGS := restricted this-escape processing rawtypes cast \
-        serial preview, \
+        serial preview dangling-doc-comments, \
     SRC := $(MICROBENCHMARK_SRC), \
     BIN := $(MICROBENCHMARK_CLASSES), \
     JAVAC_FLAGS := \
diff --git a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java
index 5dd556215d3..f0804b58c1c 100644
--- a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java
+++ b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, 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
@@ -46,7 +46,7 @@ final class JrtFileAttributes  implements BasicFileAttributes {
         this.node = node;
     }
 
-    ///////// basic attributes ///////////
+    //-------- basic attributes --------
     @Override
     public FileTime creationTime() {
         return node.creationTime();
@@ -92,7 +92,7 @@ final class JrtFileAttributes  implements BasicFileAttributes {
         return node.resolveLink(true);
     }
 
-    ///////// jrtfs specific attributes ///////////
+    //-------- jrtfs specific attributes --------
     /**
      * Compressed resource file. If not available or not applicable, 0L is
      * returned.
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/Elements.java b/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
index 56c86fc3ce4..2faf3f5ec32 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
@@ -277,19 +277,26 @@ public interface Elements {
             getElementValuesWithDefaults(AnnotationMirror a);
 
     /**
-     * Returns the text of the documentation (&quot;Javadoc&quot;)
+     * Returns the text of the documentation (&quot;JavaDoc&quot;)
      * comment of an element.
      *
-     * <p> A documentation comment of an element is a comment that
-     * begins with "{@code /**}", ends with a separate
-     * "<code>*&#47;</code>", and immediately precedes the element,
-     * ignoring white space, annotations, end-of-line-comments ({@code
-     * "//"} comments), and intermediate traditional comments
-     * (<code>"/* ... *&#47;"</code> comments) that are not doc comments.
-     * Therefore, a documentation comment
-     * contains at least three "{@code *}" characters.  The text
+     * <p>A documentation comment of an element is a particular kind
+     * of comment that immediately precedes the element, ignoring
+     * white space, annotations and any other comments that are
+     * not themselves documentation comments.
+     *
+     * <p>There are two kinds of documentation comments, either based on
+     * <em>traditional comments</em> or based on a series of
+     * <em>end-of-line comments</em>. For both kinds, the text
      * returned for the documentation comment is a processed form of
-     * the comment as it appears in source code:
+     * the comment as it appears in source code, as described below.
+     *
+     * <p>A {@linkplain DocCommentKind#TRADITIONAL traditional
+     * documentation comment} is a traditional comment that begins
+     * with "{@code /**}", and ends with a separate "<code>*&#47;</code>".
+     * (Therefore, such a comment contains at least three "{@code *}"
+     * characters.)
+     * The lines of such a comment are processed as follows:
      * <ul>
      * <li>The leading "{@code /**}" is removed, as are any
      * immediately following space characters on that line. If all the
@@ -297,8 +304,8 @@ public interface Elements {
      * the returned comment.
      * <li>For subsequent lines
      * of the doc comment starting after the initial "{@code /**}",
-     * if the lines start with <em>zero</em> or more whitespace characters followed by
-     * <em>one</em> or more "{@code *}" characters,
+     * if the lines start with <em>zero</em> or more whitespace characters
+     * followed by <em>one</em> or more "{@code *}" characters,
      * those leading whitespace characters are discarded as are any
      * consecutive "{@code *}" characters appearing after the white
      * space or starting the line.
@@ -306,22 +313,88 @@ public interface Elements {
      * form, the entire line is retained.
      * <li> The trailing "<code>*&#47;</code>" is removed. The line
      * with the trailing" <code>*&#47;</code>" also undergoes leading
-     * space and "{@code *}" character removal as described above. If all the characters
-     * of the line are removed, it makes no contribution to the
-     * returned comment.
+     * space and "{@code *}" character removal as described above.
+     * <li>The processed lines are then concatenated together,
+     * separated by newline ("{@code \n}") characters, and returned.
+     * </ul>
+     *
+     * <p>An {@linkplain DocCommentKind#END_OF_LINE end-of-line
+     * documentation comment} is a series of adjacent end-of-line
+     * comments, each on a line by itself, ignoring any whitespace
+     * characters at the beginning of the line, and each beginning
+     * with "{@code ///}".
+     * The lines of such a comment are processed as follows:
+     * <ul>
+     * <li>Any leading whitespace and the three initial "{@code /}"
+     * characters are removed from each line.
+     * <li>The lines are shifted left, by removing leading whitespace
+     * characters, until the non-blank line with the least leading
+     * whitespace characters has no remaining leading whitespace
+     * characters.
+     * <li>Additional leading whitespace characters and any trailing
+     * whitespace characters in each line are preserved.
+     * <li>
+     * The processed lines are then concatenated together,
+     * separated by newline ("{@code \n}") characters, and returned.
+     * If the last line is not blank, the returned value will not be
+     * terminated by a newline character.
      * </ul>
-     * The processed lines are then
-     * concatenated together (including line terminators) and
-     * returned.
      *
      * @param e  the element being examined
      * @return the documentation comment of the element, or {@code null}
      *          if there is none
      * @jls 3.6 White Space
      * @jls 3.7 Comments
+     *
+     * @apiNote
+     * Documentation comments are processed by the standard doclet
+     * used by the {@code javadoc} tool to generate API documentation.
      */
     String getDocComment(Element e);
 
+    /**
+     * {@return the kind of the documentation comment for the given element,
+     * or {@code null} if there is no comment or the kind is not known}
+     *
+     * @implSpec The default implementation of this method returns
+     * {@code null}.
+     *
+     * @param e the element being examined
+     * @since 23
+     */
+    default DocCommentKind getDocCommentKind(Element e) {
+        return null;
+    }
+
+    /**
+     * The kind of documentation comment.
+     *
+     * @since 23
+     */
+    enum DocCommentKind {
+        /**
+         * The kind of comments whose lines are prefixed by {@code ///}.
+         *
+         * @apiNote
+         * The standard doclet used by the {@code javadoc} tool treats these comments
+         * as containing Markdown and documentation comment tags.
+         *
+         *
+         * @see <a href="https://openjdk.org/jeps/467">
+         * JEP 467: Markdown Documentation Comments</a>
+         */
+        END_OF_LINE,
+
+        /**
+         * The kind of comments that begin with {@code /**}.
+         *
+         * @apiNote
+         * The standard doclet used by the {@code javadoc} tool treats these comments
+         * as containing HTML and documentation comment tags.
+         */
+        TRADITIONAL
+    }
+
     /**
      * {@return {@code true} if the element is deprecated, {@code false} otherwise}
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
index a7c2c49df83..34286939f8a 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -161,6 +161,14 @@ public interface DocTree {
          */
         LITERAL("literal"),
 
+        /**
+         * Used for instances of {@link RawTextTree}
+         * representing a fragment of Markdown content.
+         *
+         * @since 23
+         */
+        MARKDOWN,
+
         /**
          * Used for instances of {@link ParamTree}
          * representing an {@code @param} tag.
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
index d7ddbe30d9e..da0d149e9e1 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -247,6 +247,22 @@ public interface DocTreeVisitor<R,P> {
         return visitOther(node, p);
     }
 
+    /**
+     * Visits a {@code RawTextTree} node.
+     *
+     * @implSpec Visits the provided {@code RawTextTree} node
+     * by calling {@code visitOther(node, p)}.
+     *
+     * @param node the node being visited
+     * @param p a parameter value
+     * @return a result value
+     *
+     * @since 23
+     */
+    default R visitRawText(RawTextTree node, P p) {
+        return visitOther(node, p);
+    }
+
     /**
      * Visits a {@code ReferenceTree} node.
      * @param node the node being visited
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java
index 7d3624413ed..0df2c0db028 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/InheritDocTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -33,6 +33,11 @@ package com.sun.source.doctree;
  *    {&#064;inheritDoc supertype}
  * </pre>
  *
+ * @apiNote
+ * There is no requirement that the comment containing the tag and the comment
+ * containing the inherited documentation should either be both Markdown comments
+ * or both traditional (not Markdown) comments.
+ *
  * @since 1.8
  */
 public interface InheritDocTree extends InlineTagTree {
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/RawTextTree.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/RawTextTree.java
new file mode 100644
index 00000000000..e2a02b42cb9
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/RawTextTree.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2022, 2024, 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 com.sun.source.doctree;
+
+/**
+ * A tree node for a fragment of uninterpreted raw text content.
+ *
+ * <p>
+ * The content may contain any text except that for
+ * {@linkplain InlineTagTree inline tags}.
+ *
+ * <p>The format of the content is indicated by the {@linkplain #getKind() kind}
+ * of the tree node.
+ *
+ * @apiNote
+ * This class may be used to represent tree nodes containing
+ * {@linkplain DocTree.Kind#MARKDOWN Markdown} text.
+ * Such nodes will typically exist in a list of {@code DocTree} nodes,
+ * along with other kinds of {@code DocTree} nodes, such as for inline tags.
+ * When processing any such list, any non-Markdown nodes will be processed
+ * recursively first, and then treated as opaque objects within the remaining
+ * stream of Markdown nodes. Thus, the content of any non-Markdown nodes will
+ * not affect how the Markdown nodes will be processed.
+ *
+ * @since 23
+ */
+public interface RawTextTree extends DocTree {
+    /**
+     * {@return the content}
+     */
+    String getContent();
+}
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
index e4794e7be94..22be135e696 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * trees (AST).
  *
  * @spec javadoc/doc-comment-spec.html Documentation Comment Specification for the Standard Doclet
- * @author Jonathan Gibbons
  * @since 1.8
  *
  */
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java
index 391acfdfb6e..610c685f848 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -52,6 +52,7 @@ import com.sun.source.doctree.IndexTree;
 import com.sun.source.doctree.InheritDocTree;
 import com.sun.source.doctree.LinkTree;
 import com.sun.source.doctree.LiteralTree;
+import com.sun.source.doctree.RawTextTree;
 import com.sun.source.doctree.ParamTree;
 import com.sun.source.doctree.ProvidesTree;
 import com.sun.source.doctree.ReferenceTree;
@@ -289,6 +290,18 @@ public interface DocTreeFactory {
      */
     ProvidesTree newProvidesTree(ReferenceTree name, List<? extends DocTree> description);
 
+    /**
+     * Creates a new {@code RawTextTree} object, to represent a fragment of uninterpreted raw text.
+     *
+     * @param kind the kind of text
+     * @param code the code
+     * @return a {@code RawTextTree} object
+     * @throws IllegalArgumentException if the kind is not a recognized kind for raw text
+     *
+     * @since 23
+     */
+    RawTextTree newRawTextTree(DocTree.Kind kind, String code);
+
     /**
      * Creates a new {@code ReferenceTree} object, to represent a reference to an API element.
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
index cde78ea467c..2dd83d85a5d 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -413,6 +413,22 @@ public class DocTreeScanner<R,P> implements DocTreeVisitor<R,P> {
         return r;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @implSpec This implementation returns {@code null}.
+     *
+     * @param node  {@inheritDoc}
+     * @param p  {@inheritDoc}
+     * @return the result of scanning
+     *
+     * @since 23
+     */
+    @Override
+    public R visitRawText(RawTextTree node, P p) {
+        return null;
+    }
+
     /**
      * {@inheritDoc}
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
index ecad91f76c9..6d2e60e58a3 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,12 @@ package com.sun.source.util;
 import java.io.IOException;
 import java.text.BreakIterator;
 import java.util.List;
+
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements.DocCommentKind;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.JavaCompiler.CompilationTask;
@@ -84,6 +86,16 @@ public abstract class DocTrees extends Trees {
      */
     public abstract BreakIterator getBreakIterator();
 
+    /**
+     * {@return the style of the documentation comment associated with a tree node}
+     *
+     * @param path the path for the tree node
+     *
+     * @see Trees#getPath(Element)
+     * @since 23
+     */
+    public abstract DocCommentKind getDocCommentKind(TreePath path);
+
     /**
      * Returns the doc comment tree, if any, for the Tree node identified by a given TreePath.
      * Returns {@code null} if no doc comment was found.
@@ -113,10 +125,14 @@ public abstract class DocTrees extends Trees {
     public abstract DocCommentTree getDocCommentTree(Element e);
 
     /**
-     * Returns the doc comment tree of the given file. The file must be
-     * an HTML file, in which case the doc comment tree represents the
-     * entire contents of the file.
-     * Returns {@code null} if no doc comment was found.
+     * Returns the doc comment tree of the given file, which must
+     * be of one of the supported file types.
+     *
+     * <p>The supported file types are:
+     * <ul>
+     * <li>HTML files, identified by a file name ending in {@code .html},
+     * <li>Markdown files, identified by a file name ending in {@code .md}.
+     * </ul>
      * Future releases may support additional file types.
      *
      * @implNote The default implementation of this method returns a
@@ -124,16 +140,22 @@ public abstract class DocTrees extends Trees {
      *
      * @param fileObject the content container
      * @return the doc comment tree
+     * @throws IllegalArgumentException if the file type is not supported
+     *
      * @since 9
      */
     public abstract DocCommentTree getDocCommentTree(FileObject fileObject);
 
     /**
-     * Returns the doc comment tree of the given file whose path is
-     * specified relative to the given element. The file must be an HTML
-     * file, in which case the doc comment tree represents the contents
-     * of the &lt;body&gt; tag, and any enclosing tags are ignored.
-     * Returns {@code null} if no doc comment was found.
+     * Returns the doc comment tree of the given file, which must
+     * be of one of the supported file types, and whose path is
+     * specified relative to the given element.
+     *
+     * <p>The supported file types are:
+     * <ul>
+     * <li>HTML files, identified by a file name ending in {@code .html},
+     * <li>Markdown files, identified by a file name ending in {@code .md}.
+     * </ul>
      * Future releases may support additional file types.
      *
      * @implNote The default implementation of this method returns a
@@ -142,16 +164,20 @@ public abstract class DocTrees extends Trees {
      * @param e an element whose path is used as a reference
      * @param relativePath the relative path from the Element
      * @return the doc comment tree
-     * @throws java.io.IOException if an exception occurs
+     * @throws IOException if an exception occurs
+     * @throws IllegalArgumentException if the file type is not supported
      *
      * @since 9
      */
     public abstract DocCommentTree getDocCommentTree(Element e, String relativePath) throws IOException;
 
     /**
-     * Returns a doc tree path containing the doc comment tree of the given file.
-     * The file must be an HTML file, in which case the doc comment tree represents
-     * the contents of the {@code <body>} tag, and any enclosing tags are ignored.
+     * Returns a doc tree path containing the doc comment tree of the given file,
+     * which must be of one of the supported file types.
+     *
+     * Supported file types are HTML files and Markdown files.
+     * Future releases may support additional file types.
+     *
      * Any references to source code elements contained in {@code @see} and
      * {@code {@link}} tags in the doc comment tree will be evaluated in the
      * context of the given package element.
@@ -161,7 +187,7 @@ public abstract class DocTrees extends Trees {
      * @param packageElement a package element to associate with the given file object
      * representing a legacy package.html, null otherwise
      * @return a doc tree path containing the doc comment parsed from the given file
-     * @throws IllegalArgumentException if the fileObject is not an HTML file
+     * @throws IllegalArgumentException if the file type is not supported
      *
      * @since 9
      */
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
index bdd6225c869..77ecb5535a1 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -366,6 +366,22 @@ public class SimpleDocTreeVisitor<R,P> implements DocTreeVisitor<R, P> {
         return defaultAction(node, p);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @implSpec This implementation calls {@code defaultAction}.
+     *
+     * @param node {@inheritDoc}
+     * @param p {@inheritDoc}
+     * @return  the result of {@code defaultAction}
+     *
+     * @since 23
+     */
+    @Override
+    public R visitRawText(RawTextTree node, P p) {
+        return defaultAction(node, p);
+    }
+
     /**
      * {@inheritDoc}
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
index 45c76071f8b..8f84f5d7fbd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.WeakHashMap;
 
@@ -48,6 +49,7 @@ import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements.DocCommentKind;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.ForwardingFileObject;
@@ -67,7 +69,6 @@ import com.sun.source.tree.Scope;
 import com.sun.source.tree.Tree;
 import com.sun.source.util.DocSourcePositions;
 import com.sun.source.util.DocTreePath;
-import com.sun.source.util.DocTreeScanner;
 import com.sun.source.util.DocTrees;
 import com.sun.source.util.JavacTask;
 import com.sun.source.util.TreePath;
@@ -100,6 +101,7 @@ import com.sun.tools.javac.file.BaseFileManager;
 import com.sun.tools.javac.model.JavacElements;
 import com.sun.tools.javac.parser.DocCommentParser;
 import com.sun.tools.javac.parser.ParserFactory;
+import com.sun.tools.javac.parser.ReferenceParser;
 import com.sun.tools.javac.parser.Tokens.Comment;
 import com.sun.tools.javac.processing.JavacProcessingEnvironment;
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
@@ -169,10 +171,12 @@ public class JavacTrees extends DocTrees {
     private final Types types;
     private final DocTreeMaker docTreeMaker;
     private final JavaFileManager fileManager;
-    private final ParserFactory parser;
     private final Symtab syms;
 
     private BreakIterator breakIterator;
+    private final ParserFactory parserFactory;
+
+    private DocCommentTreeTransformer docCommentTreeTransformer;
 
     private final Map<Type, Type> extraType2OriginalMap = new WeakHashMap<>();
 
@@ -214,7 +218,7 @@ public class JavacTrees extends DocTrees {
         names = Names.instance(context);
         types = Types.instance(context);
         docTreeMaker = DocTreeMaker.instance(context);
-        parser = ParserFactory.instance(context);
+        parserFactory = ParserFactory.instance(context);
         syms = Symtab.instance(context);
         fileManager = context.get(JavaFileManager.class);
         var task = context.get(JavacTask.class);
@@ -261,20 +265,6 @@ public class JavacTrees extends DocTrees {
         return docTreeMaker;
     }
 
-    private DocTree getLastChild(DocTree tree) {
-        final DocTree[] last = new DocTree[] {null};
-
-        tree.accept(new DocTreeScanner<Void, Void>() {
-            @Override @DefinedBy(Api.COMPILER_TREE)
-            public Void scan(DocTree node, Void p) {
-                if (node != null) last[0] = node;
-                return null;
-            }
-        }, null);
-
-        return last[0];
-    }
-
     @Override @DefinedBy(Api.COMPILER_TREE)
     public JCClassDecl getTree(TypeElement element) {
         return (JCClassDecl) getTree((Element) element);
@@ -723,8 +713,8 @@ public class JavacTrees extends DocTrees {
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public TypeMirror getTypeMirror(TreePath path) {
-        Tree t = path.getLeaf();
-        Type ty = ((JCTree)t).type;
+        Tree leaf = path.getLeaf();
+        Type ty = ((JCTree) leaf).type;
         return ty == null ? null : ty.stripMetadataIfNeeded();
     }
 
@@ -733,26 +723,40 @@ public class JavacTrees extends DocTrees {
         return JavacScope.create(getAttrContext(path));
     }
 
+    @Override @DefinedBy(Api.COMPILER_TREE)
+    public DocCommentKind getDocCommentKind(TreePath path) {
+        var compUnit = path.getCompilationUnit();
+        var leaf = path.getLeaf();
+        if (compUnit instanceof JCTree.JCCompilationUnit cu && leaf instanceof JCTree l
+                && cu.docComments != null) {
+            Comment c = cu.docComments.getComment(l);
+            return (c == null) ? null : switch (c.getStyle()) {
+                case JAVADOC_BLOCK -> DocCommentKind.TRADITIONAL;
+                case JAVADOC_LINE -> DocCommentKind.END_OF_LINE;
+                default -> null;
+            };
+        }
+        return null;
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public String getDocComment(TreePath path) {
-        CompilationUnitTree t = path.getCompilationUnit();
-        Tree leaf = path.getLeaf();
-        if (t instanceof JCTree.JCCompilationUnit compilationUnit && leaf instanceof JCTree tree) {
-            if (compilationUnit.docComments != null) {
-                return compilationUnit.docComments.getCommentText(tree);
-            }
+        var compUnit = path.getCompilationUnit();
+        var leaf = path.getLeaf();
+        if (compUnit instanceof JCTree.JCCompilationUnit cu && leaf instanceof JCTree l
+                && cu.docComments != null) {
+            return cu.docComments.getCommentText(l);
         }
         return null;
     }
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public DocCommentTree getDocCommentTree(TreePath path) {
-        CompilationUnitTree t = path.getCompilationUnit();
-        Tree leaf = path.getLeaf();
-        if (t instanceof JCTree.JCCompilationUnit compilationUnit && leaf instanceof JCTree tree) {
-            if (compilationUnit.docComments != null) {
-                return compilationUnit.docComments.getCommentTree(tree);
-            }
+        var compUnit = path.getCompilationUnit();
+        var leaf = path.getLeaf();
+        if (compUnit instanceof JCTree.JCCompilationUnit cu && leaf instanceof JCTree l
+                && cu.docComments != null) {
+            return cu.docComments.getCommentTree(l);
         }
         return null;
     }
@@ -990,33 +994,40 @@ public class JavacTrees extends DocTrees {
         return flatNameForClass;
     }
 
-    static JavaFileObject asJavaFileObject(FileObject fileObject) {
-        JavaFileObject jfo = null;
+    private static boolean isHtmlFile(FileObject fo) {
+        return fo.getName().endsWith(".html");
+    }
 
-        if (fileObject instanceof JavaFileObject javaFileObject) {
-            checkHtmlKind(fileObject, Kind.HTML);
-            return javaFileObject;
+    private static boolean isMarkdownFile(FileObject fo) {
+        return fo.getName().endsWith(".md");
+    }
+
+
+    static JavaFileObject asDocFileObject(FileObject fo) {
+        if (fo instanceof JavaFileObject jfo) {
+            switch (jfo.getKind()) {
+                case HTML -> {
+                    return jfo;
+                }
+                case OTHER -> {
+                    if (isMarkdownFile(jfo)) {
+                        return jfo;
+                    }
+                }
+            }
+        } else {
+            if (isHtmlFile(fo) || isMarkdownFile(fo)) {
+                return new DocFileObject(fo);
+            }
         }
 
-        checkHtmlKind(fileObject);
-        jfo = new HtmlFileObject(fileObject);
-        return jfo;
+        throw new IllegalArgumentException(("Not a documentation file: " + fo.getName()));
     }
 
-    private static void checkHtmlKind(FileObject fileObject) {
-        checkHtmlKind(fileObject, BaseFileManager.getKind(fileObject.getName()));
-    }
-
-    private static void checkHtmlKind(FileObject fileObject, JavaFileObject.Kind kind) {
-        if (kind != JavaFileObject.Kind.HTML) {
-            throw new IllegalArgumentException("HTML file expected:" + fileObject.getName());
-        }
-    }
-
-    private static class HtmlFileObject extends ForwardingFileObject<FileObject>
+    private static class DocFileObject extends ForwardingFileObject<FileObject>
             implements JavaFileObject {
 
-        public HtmlFileObject(FileObject fileObject) {
+        public DocFileObject(FileObject fileObject) {
             super(fileObject);
         }
 
@@ -1043,7 +1054,7 @@ public class JavacTrees extends DocTrees {
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public DocCommentTree getDocCommentTree(FileObject fileObject) {
-        JavaFileObject jfo = asJavaFileObject(fileObject);
+        JavaFileObject jfo = asDocFileObject(fileObject);
         DiagnosticSource diagSource = new DiagnosticSource(jfo, log);
 
         final Comment comment = new Comment() {
@@ -1071,21 +1082,26 @@ public class JavacTrees extends DocTrees {
 
             @Override
             public CommentStyle getStyle() {
-                throw new UnsupportedOperationException();
+                return isHtmlFile(fileObject) ? CommentStyle.JAVADOC_BLOCK
+                        : isMarkdownFile(fileObject) ? CommentStyle.JAVADOC_LINE
+                        : null;
             }
 
             @Override
             public boolean isDeprecated() {
-                throw new UnsupportedOperationException();
+                return false;
             }
         };
 
-        return new DocCommentParser(parser, diagSource, comment, true).parse();
+        boolean isHtmlFile = jfo.getKind() == Kind.HTML;
+
+        var dct = new DocCommentParser(parserFactory, diagSource, comment, isHtmlFile).parse();
+        return transform(dct);
     }
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public DocTreePath getDocTreePath(FileObject fileObject, PackageElement packageElement) {
-        JavaFileObject jfo = asJavaFileObject(fileObject);
+        JavaFileObject jfo = asDocFileObject(fileObject);
         DocCommentTree docCommentTree = getDocCommentTree(jfo);
         if (docCommentTree == null)
             return null;
@@ -1103,6 +1119,103 @@ public class JavacTrees extends DocTrees {
         return Entity.getCharacters(tree);
     }
 
+    /**
+     * {@return the doc comment tree for a given comment}
+     *
+     * @param diagSource the source containing the comment, used when displaying any diagnostics
+     * @param c the comment
+     */
+    public DocCommentTree getDocCommentTree(DiagnosticSource diagSource, Comment c) {
+        var dct = new DocCommentParser(parserFactory, diagSource, c).parse();
+        return transform(dct);
+    }
+
+    /**
+     * An interface for transforming a {@code DocCommentTree}.
+     * It is primarily used as the service-provider interface for an implementation
+     * that embodies the JDK extensions to CommonMark, such as reference links to
+     * program elements.
+     */
+    public interface DocCommentTreeTransformer {
+        /**
+         * The name used by the implementation that embodies the JDK extensions to CommonMark.
+         */
+        public final String STANDARD = "standard";
+
+        /**
+         * {@return the name of this transformer}
+         */
+        String name();
+
+        /**
+         * Transforms a documentation comment tree.
+         *
+         * @param trees an instance of the {@link DocTrees} utility interface.
+         * @param tree the tree to be transformed
+         * @return the transformed tree
+         */
+        DocCommentTree transform(DocTrees trees, DocCommentTree tree);
+    }
+
+    /**
+     * A class that provides the identity transform on instances of {@code DocCommentTree}.
+     */
+    public static class IdentityTransformer implements DocCommentTreeTransformer {
+        @Override
+        public String name() {
+            return "identity";
+        }
+
+        @Override
+        public DocCommentTree transform(DocTrees trees, DocCommentTree tree) {
+            return tree;
+        }
+    }
+
+    public DocCommentTreeTransformer getDocCommentTreeTransformer() {
+        return docCommentTreeTransformer;
+    }
+
+    public void setDocCommentTreeTransformer(DocCommentTreeTransformer transformer) {
+        docCommentTreeTransformer = transformer;
+    }
+
+    /**
+     * Initialize {@link #docCommentTreeTransformer} if it is {@code null},
+     * using a service provider to look up an implementation with the name "standard".
+     * If none is found, an identity transformer is used, with the name "identity".
+     */
+    public void initDocCommentTreeTransformer() {
+        if (docCommentTreeTransformer == null) {
+            var sl = ServiceLoader.load(DocCommentTreeTransformer.class);
+            docCommentTreeTransformer = sl.stream()
+                    .map(ServiceLoader.Provider::get)
+                    .filter(t -> t.name().equals(DocCommentTreeTransformer.STANDARD))
+                    .findFirst()
+                    .orElseGet(() -> new IdentityTransformer());
+        }
+    }
+
+    /**
+     * Transforms the given tree using the current {@linkplain #getDocCommentTreeTransformer() transformer},
+     * after ensuring it has been {@linkplain #initDocCommentTreeTransformer() initialized}.
+     *
+     * @param tree the tree
+     * @return the transformed tree
+     */
+    private DocCommentTree transform(DocCommentTree tree) {
+        initDocCommentTreeTransformer();
+        return docCommentTreeTransformer.transform(this, tree);
+    }
+
+    /**
+     * {@return the {@linkplain ParserFactory} parser factory}
+     * The factory can be used to create a {@link ReferenceParser}, to parse link references.
+     */
+    public ParserFactory getParserFactory() {
+        return parserFactory;
+    }
+
     /**
      * Makes a copy of a tree, noting the value resulting from copying a particular leaf.
      **/
@@ -1206,20 +1319,10 @@ public class JavacTrees extends DocTrees {
 
         try {
             switch (kind) {
-            case ERROR:
-                log.error(DiagnosticFlag.API, pos, Errors.ProcMessager(msg.toString()));
-                break;
-
-            case WARNING:
-                log.warning(pos, Warnings.ProcMessager(msg.toString()));
-                break;
-
-            case MANDATORY_WARNING:
-                log.mandatoryWarning(pos, Warnings.ProcMessager(msg.toString()));
-                break;
-
-            default:
-                log.note(pos, Notes.ProcMessager(msg.toString()));
+                case ERROR ->             log.error(DiagnosticFlag.API, pos, Errors.ProcMessager(msg.toString()));
+                case WARNING ->           log.warning(pos, Warnings.ProcMessager(msg.toString()));
+                case MANDATORY_WARNING -> log.mandatoryWarning(pos, Warnings.ProcMessager(msg.toString()));
+                default ->                log.note(pos, Notes.ProcMessager(msg.toString()));
             }
         } finally {
             if (oldSource != null)
@@ -1272,6 +1375,11 @@ public class JavacTrees extends DocTrees {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
+            public DocCommentKind getCommentKind(JCTree tree) {
+                throw new UnsupportedOperationException();
+            }
+
             @Override
             public String getCommentText(JCTree tree) {
                 throw new UnsupportedOperationException();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index e49ce45240a..cec23aea0b7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -381,6 +381,8 @@ public enum Option {
 
     PREVIEW("--enable-preview", "opt.preview", STANDARD, BASIC),
 
+    DISABLE_LINE_DOC_COMMENTS("--disable-line-doc-comments", "opt.lineDocComments", EXTENDED, BASIC),
+
     PROFILE("-profile", "opt.arg.profile", "opt.profile", STANDARD, BASIC) {
         @Override
         public void process(OptionHelper helper, String option, String operand) throws InvalidValueException {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
index bdd25c066e5..7cf419f3ca8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -33,6 +33,7 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
 import javax.lang.model.AnnotatedConstruct;
@@ -61,6 +62,7 @@ import com.sun.tools.javac.comp.Enter;
 import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.processing.PrintingProcessor;
+import com.sun.tools.javac.tree.DocCommentTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.tree.TreeInfo;
@@ -74,7 +76,6 @@ import static com.sun.tools.javac.code.TypeTag.CLASS;
 import com.sun.tools.javac.comp.Attr;
 import com.sun.tools.javac.comp.Modules;
 import com.sun.tools.javac.comp.Resolve;
-import com.sun.tools.javac.comp.Resolve.RecoveryLoadClass;
 import com.sun.tools.javac.resources.CompilerProperties.Notes;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
@@ -433,6 +434,15 @@ public class JavacElements implements Elements {
 
     @DefinedBy(Api.LANGUAGE_MODEL)
     public String getDocComment(Element e) {
+        return getDocCommentItem(e, ((docCommentTable, tree) -> docCommentTable.getCommentText(tree)));
+    }
+
+    @DefinedBy(Api.LANGUAGE_MODEL)
+    public DocCommentKind getDocCommentKind(Element e) {
+        return getDocCommentItem(e, ((docCommentTable, tree) -> docCommentTable.getCommentKind(tree)));
+    }
+
+    private <R> R getDocCommentItem(Element e, BiFunction<DocCommentTable, JCTree, R> f) {
         // Our doc comment is contained in a map in our toplevel,
         // indexed by our tree.  Find our enter environment, which gives
         // us our toplevel.  It also gives us a tree that contains our
@@ -444,7 +454,7 @@ public class JavacElements implements Elements {
         JCCompilationUnit toplevel = treeTop.snd;
         if (toplevel.docComments == null)
             return null;
-        return toplevel.docComments.getCommentText(tree);
+        return f.apply(toplevel.docComments, tree);
     }
 
     @DefinedBy(Api.LANGUAGE_MODEL)
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
index 603e7c42807..acd79c69bd4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,13 @@
 package com.sun.tools.javac.parser;
 
 import java.io.Serial;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import com.sun.source.doctree.AttributeTree.ValueKind;
+import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.ErroneousTree;
 import com.sun.source.doctree.UnknownBlockTagTree;
 import com.sun.source.doctree.UnknownInlineTagTree;
@@ -76,7 +79,27 @@ public class DocCommentParser {
         }
     }
 
-    private enum Phase { PREAMBLE, BODY, POSTAMBLE }
+    /**
+     * An indication of the part of documentation comment or file being read.
+     * A documentation comment and a Markdown file just have a {@code BODY}.
+     * An HTML file has a {@code PREAMBLE}, {@code BODY} and {@code POSTAMBLE}.
+     * While parsing a {@code BODY}, text within {@code {@tag ... }} may be
+     * read as {@code INLINE}.
+     * One of the primary characteristics of each "phase" is the termination
+     * condition, indicating when the current phase is complete, and either
+     * the previous one resumed (in the case of {@code INLINE}) or the
+     * next phase started.
+     */
+    private enum Phase {
+        /** The initial part of an HTML file up to and including the {@code body} and possible {@code <main>} tag. */
+        PREAMBLE,
+        /** The initial part of a doc comment, or the rich-text content of a block tag. */
+        BODY,
+        /** The end of an HTML file, from and including the {@code </main>} or {@code </body>} tag. */
+        POSTAMBLE,
+        /** The rich-text content of an inline documentation comment tag. */
+        INLINE
+    }
 
     private final ParserFactory fac;
     private final JCDiagnostic.Factory diags;
@@ -84,7 +107,9 @@ public class DocCommentParser {
     private final Comment comment;
     private final DocTreeMaker m;
     private final Names names;
-    private final boolean isFileContent;
+    private final boolean isHtmlFile;
+    private final DocTree.Kind textKind;
+    private final Markdown markdown;
 
     /** The input buffer, index of most recent character read,
      *  index of one past last character in buffer.
@@ -103,22 +128,79 @@ public class DocCommentParser {
 
     private final Map<Name, TagParser> tagParsers;
 
+    /**
+     * Creates a parser for a documentation comment.
+     *
+     * @param fac a parser factory, for a doc-tree maker and for reference parsers
+     * @param diagSource the source in which the comment was found
+     * @param comment the comment
+     */
+    public DocCommentParser(ParserFactory fac, DiagnosticSource diagSource, Comment comment) {
+        this(fac, diagSource, comment, false);
+    }
+
+    /**
+     * Creates a parser for a documentation comment.
+     *
+     * If the comment is the content of a standalone HTML file, it will be parsed
+     * in three parts: a preamble (up to and including the {@code <main>} tag,
+     * or {@code <body>} tag if there is no {@code <main>} tag, then the main content
+     * of the file, and then finally the end part of the file starting at the
+     * end tag matching the tag that ended the preamble.
+     *
+     * @param fac a parser factory, for a doc-tree maker and for reference parsers
+     * @param diagSource the source in which the comment was found
+     * @param comment the comment
+     * @param isHtmlFile whether the comment is the entire content of an HTML file
+     */
     public DocCommentParser(ParserFactory fac, DiagnosticSource diagSource,
-                            Comment comment, boolean isFileContent) {
+                            Comment comment, boolean isHtmlFile) {
         this.fac = fac;
         this.diags = fac.log.diags;
         this.diagSource = diagSource;
         this.comment = comment;
         names = fac.names;
-        this.isFileContent = isFileContent;
+        this.isHtmlFile = isHtmlFile;
+        textKind = isHtmlFile ? DocTree.Kind.TEXT : getTextKind(comment);
         m = fac.docTreeMaker;
         tagParsers = createTagParsers();
+        markdown = textKind == DocTree.Kind.MARKDOWN ? new Markdown() : null;
     }
 
-    public DocCommentParser(ParserFactory fac, DiagnosticSource diagSource, Comment comment) {
-        this(fac, diagSource, comment, false);
+    private static DocTree.Kind getTextKind(Comment c) {
+        return switch (c.getStyle()) {
+            case JAVADOC_BLOCK -> DocTree.Kind.TEXT;
+            case JAVADOC_LINE -> DocTree.Kind.MARKDOWN;
+            default -> throw new IllegalArgumentException(c.getStyle().name());
+        };
     }
 
+    /**
+     * {@return the result of parsing the content given to the constructor}
+     *
+     * The parsing rules for "traditional" documentation comments are generally incompatible
+     * with the rules for parsing CommonMark Markdown: traditional comments are parsed
+     * with a simple recursive-descent parser, while CommonMark is parsed in two "phases":
+     * first identifying blocks, and then subsequently parsing the content of those blocks.
+     * The conflict shows up most with the rules for inline tags, some of which may contain
+     * almost arbitrary content, including blank lines in particular.
+     *
+     * We do not want to build and maintain a fully-compliant Markdown parser, nor
+     * can we leverage an existing Markdown parser, such as in commonmark-java,
+     * which cannot handle arbitrary content in "inline" constructs, or the recursive
+     * nature of some inline tags.
+     *
+     * The solution is a compromise. First, we identify inline and block tags,
+     * so that they may be treated as opaque objects when subsequently using a
+     * library (such as commonmark-java) to process the enclosing parts of the
+     * comment. The catch is that while we do not need to provide a full Markdown
+     * parser, we do need to parse it enough to recognize character sequences of
+     * literal code (that is, code spans and code blocks), which should not be
+     * scanned for inline and block tags. Most of this work is handled by the
+     * nested {@link Markdown} class.
+     *
+     * @see <a href="https://spec.commonmark.org/0.30/#blocks-and-inlines">Blocks and Inlines</a>
+     */
     public DCDocComment parse() {
         String c = comment.getText();
         buf = new char[c.length() + 1];
@@ -128,12 +210,13 @@ public class DocCommentParser {
         bp = -1;
         nextChar();
 
-        List<DCTree> preamble = isFileContent ? blockContent(Phase.PREAMBLE) : List.nil();
-        List<DCTree> body = blockContent(Phase.BODY);
+        List<DCTree> preamble = isHtmlFile ? content(Phase.PREAMBLE) : List.nil();
+        List<DCTree> body = content(Phase.BODY);
         List<DCTree> tags = blockTags();
-        List<DCTree> postamble = isFileContent ? blockContent(Phase.POSTAMBLE) : List.nil();
+        List<DCTree> postamble = isHtmlFile ? content(Phase.POSTAMBLE) : List.nil();
 
-        int pos = !preamble.isEmpty() ? preamble.head.pos
+        int pos = textKind == DocTree.Kind.MARKDOWN ? 0
+                : !preamble.isEmpty() ? preamble.head.pos
                 : !body.isEmpty() ? body.head.pos
                 : !tags.isEmpty() ? tags.head.pos
                 : !postamble.isEmpty() ? postamble.head.pos
@@ -145,7 +228,17 @@ public class DocCommentParser {
     void nextChar() {
         ch = buf[bp < buflen ? ++bp : buflen];
         switch (ch) {
-            case '\f', '\n', '\r' -> newline = true;
+            case '\n' -> {
+                newline = true;
+            }
+
+            case '\r' -> {
+                if (bp + 1 < buflen && buf[bp + 1] == '\n') {
+                    bp++;
+                    ch = '\n';
+                }
+                newline = true;
+            }
         }
     }
 
@@ -154,74 +247,146 @@ public class DocCommentParser {
     }
 
     protected List<DCTree> blockContent() {
-        return blockContent(Phase.BODY);
+        // The whitespace after a tag name is typically problematic:
+        // should it be included in the content or not?
+        // The problem is made worse by Markdown, in which leading
+        // whitespace in Markdown content may be significant.
+        // While generally in traditional comments, whitespace
+        // after a tag name is skipped, to allow for Markdown we just
+        // skip horizontal whitespace.
+        while (isHorizontalWhitespace(ch) && bp < buflen) {
+            nextChar();
+        }
+        return content(Phase.BODY);
     }
 
     /**
-     * Read block content, consisting of text, html and inline tags.
-     * Terminated by the end of input, or the beginning of the next block tag:
-     * that is, @ as the first non-whitespace character on a line.
+     * Reads "rich text" content, consisting of text, html and inline tags,
+     * according to the given {@code phase}.
+     *
+     * Inline tags are only recognized in {@code BODY} and {@code INLINE}
+     * phases, and not in {@code PREAMBLE} and {@code POSTAMBLE} phases.
+     *
+     * The end of the content is dependent on the phase:
+     *
+     * <ul>
+     * <li>{@code PREAMBLE}: the appearance of {@code <body>} (or {@code <main>}),
+     *      as determined by {@link #isEndPreamble()}
+     * <li>{@code BODY}: the beginning of a block tag, or when reading from
+     *      an HTML file, the appearance of {@code </main>} (or {@code </body>},
+     *      as determined by {@link #isEndBody()}
+     * <li>{@code INLINE}: '}', after skipping any matching {@code { }}
+     * <li>{@code PREAMBLE}: end of file
+     * </ul>
      */
-    @SuppressWarnings("fallthrough")
-    protected List<DCTree> blockContent(Phase phase) {
+    protected List<DCTree> content(Phase phase) {
         ListBuffer<DCTree> trees = new ListBuffer<>();
         textStart = -1;
 
+        int depth = 1;                  // only used when phase is INLINE
+        int pos = bp;                   // only used when phase is INLINE
+
         loop:
         while (bp < buflen) {
             switch (ch) {
-                case '\n': case '\r': case '\f':
-                case ' ': case '\t':
+                case '\n', '\r' -> {
                     nextChar();
-                    break;
-
-                case '&':
-                    entity(trees);
-                    break;
-
-                case '<':
-                    newline = false;
-                    if (isFileContent) {
-                        switch (phase) {
-                            case PREAMBLE -> {
-                                if (isEndPreamble()) {
-                                    trees.add(html());
-                                    if (textStart == -1) {
-                                        textStart = bp;
-                                        lastNonWhite = -1;
-                                    }
-                                    // mark this as the start, for processing purposes
-                                    newline = true;
-                                    break loop;
-                                }
-                            }
-                            case BODY -> {
-                                if (isEndBody()) {
-                                    addPendingText(trees, lastNonWhite);
-                                    break loop;
-                                }
-                            }
-
-                            default -> { }
+                    if (textKind == DocTree.Kind.MARKDOWN) {
+                        markdown.update();
+                        if (markdown.isIndentedCodeBlock()) {
+                            markdown.skipLine();
                         }
                     }
-                    addPendingText(trees, bp - 1);
-                    trees.add(html());
+                }
 
-                    if (phase == Phase.PREAMBLE || phase == Phase.POSTAMBLE) {
-                        break; // Ignore newlines after html tags, in the meta content
-                    }
-                    if (textStart == -1) {
+                case ' ', '\t' -> {
+                    if (textKind == DocTree.Kind.MARKDOWN && textStart == -1) {
                         textStart = bp;
-                        lastNonWhite = -1;
                     }
-                    break;
+                    nextChar();
+                }
 
-                case '{':
-                    inlineTag(trees);
-                    break;
 
-                case '@':
+                case '&' -> {
+                    switch (textKind) {
+                        case MARKDOWN -> defaultContentCharacter();
+                        case TEXT -> entity(trees);
+                        default -> throw unknownTextKind(textKind);
+                    }
+                }
+
+                case '<' -> {
+                    switch (textKind) {
+                        case MARKDOWN -> {
+                            defaultContentCharacter();
+                        }
+                        case TEXT -> {
+                            newline = false;
+                            if (isHtmlFile) {
+                                switch (phase) {
+                                    case PREAMBLE -> {
+                                        if (isEndPreamble()) {
+                                            trees.add(html());
+                                            if (textStart == -1) {
+                                                textStart = bp;
+                                                lastNonWhite = -1;
+                                            }
+                                            // mark this as the start, for processing purposes
+                                            newline = true;
+                                            break loop;
+                                        }
+                                    }
+                                    case BODY -> {
+                                        if (isEndBody()) {
+                                            addPendingText(trees, lastNonWhite);
+                                            break loop;
+                                        }
+                                    }
+                                    default -> { }
+                                }
+                            }
+                            addPendingText(trees, bp - 1);
+                            trees.add(html());
+
+                            if (phase == Phase.PREAMBLE || phase == Phase.POSTAMBLE) {
+                                break; // Ignore newlines after html tags, in the meta content
+                            }
+                            if (textStart == -1) {
+                                textStart = bp;
+                                lastNonWhite = -1;
+                            }
+                        }
+                        default -> throw unknownTextKind(textKind);
+                    }
+                }
+
+                case '{' -> {
+                    switch (phase) {
+                        case PREAMBLE, POSTAMBLE -> defaultContentCharacter();
+                        case BODY -> inlineTag(trees);
+                        case INLINE -> {
+                            if (!inlineTag(trees)) {
+                                depth++;
+                            }
+                        }
+                    }
+                }
+
+                case '}' -> {
+                    if (phase == Phase.INLINE) {
+                        newline = false;
+                        if (--depth == 0) {
+                            addPendingText(trees, bp - 1);
+                            nextChar();
+                            return trees.toList();
+                        }
+                        nextChar();
+                    } else {
+                        defaultContentCharacter();
+                    }
+                }
+
+                case '@' -> {
                     // check for context-sensitive escape sequences:
                     //   newline whitespace @@
                     //   newline whitespace @*
@@ -236,7 +401,7 @@ public class DocCommentParser {
                             nextChar();
                             textStart = bp;
                             break;
-                        } else {
+                        } else if (phase == Phase.BODY) {
                             addPendingText(trees, lastNonWhite);
                             break loop;
                         }
@@ -249,21 +414,82 @@ public class DocCommentParser {
                         textStart = bp;
                         break;
                     }
-                    // fallthrough
+                    defaultContentCharacter();
+                }
 
-                default:
-                    newline = false;
-                    if (textStart == -1)
-                        textStart = bp;
-                    lastNonWhite = bp;
-                    nextChar();
+                case '\\' -> {
+                    switch (textKind) {
+                        case MARKDOWN -> {
+                            defaultContentCharacter();
+                            nextChar();
+                            defaultContentCharacter();
+                        }
+                        case TEXT -> {
+                            defaultContentCharacter();
+                        }
+                    }
+                }
+
+                case '`', '~' -> {
+                    switch (textKind) {
+                        case MARKDOWN -> {
+                            newline = false;
+                            if (textStart == -1) {
+                                textStart = bp;
+                            }
+                            lastNonWhite = bp;
+                            var saveNewline = newline;
+                            var isCodeFence = markdown.isCodeFence();
+                            if (ch == '`' || ch == '~' && isCodeFence) {
+                                int end = markdown.skipCode();
+                                if (end == -1) {
+                                    // if a match for the opening sequence of characters was not found:
+                                    // - if the characters were a fence, the code block extends to the end of file
+                                    // - if the characters were inline, the opening characters are treated literally
+                                    if (isCodeFence) {
+                                        lastNonWhite = buflen - 1;
+                                    } else {
+                                        bp = lastNonWhite;
+                                        newline = saveNewline;
+                                        nextChar();
+                                    }
+                                } else {
+                                    lastNonWhite = end - 1;
+                                }
+                            } else {
+                                nextChar();
+                            }
+                        }
+                        case TEXT -> {
+                            defaultContentCharacter();
+                        }
+                    }
+                }
+
+                default -> {
+                    defaultContentCharacter();
+                }
             }
         }
 
         if (lastNonWhite != -1)
             addPendingText(trees, lastNonWhite);
 
-        return trees.toList();
+        return (phase == Phase.INLINE)
+                ? List.of(erroneous("dc.unterminated.inline.tag", pos))
+                : trees.toList();
+    }
+
+    void defaultContentCharacter() {
+        newline = false;
+        if (textStart == -1)
+            textStart = bp;
+        lastNonWhite = bp;
+        nextChar();
+    }
+
+    private IllegalStateException unknownTextKind(DocTree.Kind textKind) {
+        return new IllegalStateException(textKind.toString());
     }
 
     /**
@@ -312,7 +538,40 @@ public class DocCommentParser {
         }
     }
 
-    protected void inlineTag(ListBuffer<DCTree> list) {
+    // unused, but useful when debugging
+    private String showPos(int p) {
+        var sb = new StringBuilder();
+        sb.append("[").append(p).append("] ");
+        if (p >= 0) {
+            for (int i = Math.max(p - 10, 0); i < Math.min(p + 10, buflen); i++) {
+                if (i == p) sb.append("[");
+                var c = buf[i];
+                sb.append(switch (c) {
+                    case '\n' -> '|';
+                    case ' ' -> '_';
+                    default -> c;
+                });
+                if (i == p) sb.append("]");
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Reads a possible inline tag, after finding an opening brace <code>{</code> character.
+     *
+     * If the next character is {@code @}, an opening tag is read and added to the
+     * given {@code list}, and the result is {@code true}.
+     *
+     * Otherwise, the {@code list} is updated with the characters that have been read,
+     * and the result is {@code false}. The result also indicates that a single
+     * opening brace was read, and that a corresponding closing brace should eventually
+     * be read.
+     *
+     * @param list the list of trees being accumulated
+     * @return {@code true} if an inline tag was read, and {@code false} otherwise
+     */
+    protected boolean inlineTag(ListBuffer<DCTree> list) {
         newline = false;
         nextChar();
         if (ch == '@') {
@@ -333,12 +592,14 @@ public class DocCommentParser {
                 list.add(inlineTag());
                 textStart = bp;
                 lastNonWhite = -1;
+                return true;
             }
         } else {
             if (textStart == -1)
                 textStart = bp - 1;
             lastNonWhite = bp;
         }
+        return false;
     }
 
     /**
@@ -586,97 +847,9 @@ public class DocCommentParser {
      * Matching pairs of '{' '}' are skipped; the text is terminated by the first
      * unmatched '}'. It is an error if the beginning of the next tag is detected.
      */
-    @SuppressWarnings("fallthrough")
     private List<DCTree> inlineContent() {
-        ListBuffer<DCTree> trees = new ListBuffer<>();
-
         skipWhitespace();
-        int pos = bp;
-        int depth = 1;
-        textStart = -1;
-
-        loop:
-        while (bp < buflen) {
-
-            switch (ch) {
-                case '\n': case '\r': case '\f':
-                case ' ': case '\t':
-                    nextChar();
-                    break;
-
-                case '&':
-                    entity(trees);
-                    break;
-
-                case '<':
-                    newline = false;
-                    addPendingText(trees, bp - 1);
-                    trees.add(html());
-                    textStart = bp;
-                    lastNonWhite = -1;
-                    break;
-
-                case '{':
-                    if (textStart == -1)
-                        textStart = bp;
-                    newline = false;
-                    nextChar();
-                    if (ch == '@') {
-                        addPendingText(trees, bp - 2);
-                        trees.add(inlineTag());
-                        textStart = bp;
-                        lastNonWhite = -1;
-                    } else {
-                        depth++;
-                    }
-                    break;
-
-                case '}':
-                    newline = false;
-                    if (--depth == 0) {
-                        addPendingText(trees, bp - 1);
-                        nextChar();
-                        return trees.toList();
-                    }
-                    nextChar();
-                    break;
-
-                case '@':
-                    // check for context-sensitive escape sequences:
-                    //   newline whitespace @@
-                    //   newline whitespace @*
-                    //   *@/
-                    if (newline) {
-                        char peek = peekChar();
-                        if (peek == '@' || peek == '*') {
-                            addPendingText(trees, bp - 1);
-                            nextChar();
-                            trees.add(m.at(bp - 1).newEscapeTree(ch));
-                            newline = false;
-                            nextChar();
-                            textStart = bp;
-                            break;
-                        }
-                    } else if (textStart != -1 && buf[bp - 1] == '*' && peekChar() == '/') {
-                        addPendingText(trees, bp - 1);
-                        nextChar();
-                        trees.add(m.at(bp - 1).newEscapeTree('/'));
-                        newline = false;
-                        nextChar();
-                        textStart = bp;
-                        break;
-                    }
-                    // fallthrough
-
-                default:
-                    if (textStart == -1)
-                        textStart = bp;
-                    nextChar();
-                    break;
-            }
-        }
-
-        return List.of(erroneous("dc.unterminated.inline.tag", pos));
+        return content(Phase.INLINE);
     }
 
     protected void entity(ListBuffer<DCTree> list) {
@@ -845,8 +1018,15 @@ public class DocCommentParser {
     }
 
     /**
-     * Read the start or end of an HTML tag, or an HTML comment
-     * {@literal <identifier attrs> } or {@literal </identifier> }
+     * Reads an HTML construct, beginning with {@code <}.
+     *
+     * <ul>
+     * <li>start element: {@code <identifier attrs> }
+     * <li>end element: {@code </identifier> }
+     * <li>comment: {@code <!-- ... -->}
+     * <li>doctype: {@code <!doctype ... >}
+     * <li>cdata: {@code <![CDATA[ ... ]]>}
+     * </ul>
      */
     private DCTree html() {
         int p = bp;
@@ -983,7 +1163,7 @@ public class DocCommentParser {
                         }
                         attrValueChar(v);
                     }
-                    addPendingText(v, bp - 1);
+                    addPendingText(v, bp - 1, DocTree.Kind.TEXT);
                     nextChar();
                 } else {
                     vkind = ValueKind.UNQUOTED;
@@ -991,7 +1171,7 @@ public class DocCommentParser {
                     while (bp < buflen && !isUnquotedAttrValueTerminator(ch)) {
                         attrValueChar(v);
                     }
-                    addPendingText(v, bp - 1);
+                    addPendingText(v, bp - 1, DocTree.Kind.TEXT);
                 }
                 skipWhitespace();
                 value = v.toList();
@@ -1012,9 +1192,20 @@ public class DocCommentParser {
     }
 
     protected void addPendingText(ListBuffer<DCTree> list, int textEnd) {
+        addPendingText(list, textEnd, textKind);
+    }
+
+    protected void addPendingText(ListBuffer<DCTree> list, int textEnd, DocTree.Kind kind) {
         if (textStart != -1) {
             if (textStart <= textEnd) {
-                list.add(m.at(textStart).newTextTree(newString(textStart, textEnd + 1)));
+                switch (kind) {
+                    case TEXT ->
+                            list.add(m.at(textStart).newTextTree(newString(textStart, textEnd + 1)));
+                    case MARKDOWN ->
+                            list.add(m.at(textStart).newRawTextTree(DocTree.Kind.MARKDOWN, newString(textStart, textEnd + 1)));
+                    default ->
+                        throw new IllegalArgumentException(kind.toString());
+                }
             }
             textStart = -1;
         }
@@ -1124,6 +1315,456 @@ public class DocCommentParser {
         return names.fromChars(buf, pos, bp - pos);
     }
 
+    /**
+     * A class to encapsulate the work to parse Markdown enough to
+     * detect the boundaries of character sequences of literal text,
+     * and to skip over such sequences, without analyzing the content.
+     *
+     * The primary factors are:
+     *   - the content of the current line, including its indentation
+     *   - the currently open set of container blocks, and any leaf block
+     *   - a serial number that is incremented when a line is encountered
+     *     that is not a continuation of the previous block.
+     *
+     * There are some limitations when using code blocks containing
+     * strings that resemble tags, which should be treated as literal text.
+     * In particular, list items are parsed individually and not as
+     * part of an overall group of list items. This means that the
+     * indentation is determined _for each item_, and not for the group
+     * as a whole. This in turn implies that a list item cannot begin
+     * with an indented code block. The workaround is to use a fenced code
+     * block. It is also recommended, as a matter of style, that all
+     * list items should use the same relative indentation for their content.
+     *
+     * The restrictions only apply when indented code blocks contain
+     * strings resembling tags.
+     *
+     * @see <a href="https://spec.commonmark.org/0.30/">CommonMark spec</a>
+     */
+    class Markdown {
+        // Container blocks may nested contained blocks and leaf blocks.
+        // Note, the code does not model lists, which would require
+        // arbitrary multi-line lookahead.
+        // https://spec.commonmark.org/0.30/#container-blocks
+        private enum ContainerBlockKind {
+            LIST_ITEM, QUOTE
+        }
+
+        /**
+         * Details about a currently open container block.
+         * @param blockKind the kind of block
+         * @param indent the indentation for the block's content, for list items
+         */
+        private record BlockInfo(ContainerBlockKind blockKind, int indent) { }
+
+        /**
+         * A list of the currently open container blocks.
+         */
+        private final java.util.List<BlockInfo> containers = new ArrayList<>();
+
+
+        // Except for NONE, leaf blocks contain "textual" content.
+        // Single-line leaf blocks, like ATX headings and thematic breaks are all represented by NONE.
+        // See https://spec.commonmark.org/0.30/#leaf-blocks
+        private enum LeafBlockKind {
+            NONE, PARAGRAPH, FENCED_CODE, INDENTED_CODE
+        }
+
+        private LeafBlockKind leafKind = LeafBlockKind.NONE;
+
+        /**
+         * A serial number for the current "block".
+         * It is updated whenever a line is encountered that indicates
+         * the beginning of a new block, such that any potential code span
+         * should be terminated as "not a span".
+         */
+        private int blockId = 0;
+
+        /**
+         * Updates the state after a newline has been read.
+         * There are two primary goals.
+         *
+         * 1. Determine any change to the current list of container blocks
+         * 2. Determine if the current line is part of a code block
+         */
+        void update() {
+            var prevLeafKind = leafKind;
+            int indent = readIndent(0);
+
+            final var line = peekLine();
+            var peekIndex = 0;  // index into `line`; note it does not include `indent`
+            var blockIndex = 0; // index into `blocks`
+
+            // Iterate examining the beginning of the line, left to right,
+            // comparing indications of containers (indentation or markers)
+            // against the list of currently open container blocks.
+            // Side effects may open nested blocks or close existing ones.
+            while (true) {
+                if (blockIndex == containers.size()) {
+                    // check for an open code block
+                    if (prevLeafKind == LeafBlockKind.FENCED_CODE) {
+                        return;
+                    } else {
+                        var codeIndent = (containers.isEmpty() ? 0 : containers.getLast().indent) + 4;
+                        if (indent >= codeIndent && prevLeafKind != LeafBlockKind.PARAGRAPH) {
+                            leafKind = LeafBlockKind.INDENTED_CODE;
+                            if (leafKind != prevLeafKind) {
+                                blockId++;
+                            }
+                            return;
+                        }
+                    }
+                    // examine the remaining part of the lne
+                    var peekLineKind = getLineKind(line.substring(peekIndex));
+                    switch (peekLineKind) {
+                        case BULLETED_LIST_ITEM, ORDERED_LIST_ITEM -> {
+                            var count = indent;
+                            // skip over the list marker
+                            while (ch != ' ' && ch != '\t') {
+                                count++;
+                                nextChar();
+                            }
+                            var listItemIndent = readIndent(count);
+                            containers.add(new BlockInfo(ContainerBlockKind.LIST_ITEM, listItemIndent));
+                            blockIndex++;
+                            peekIndex = listItemIndent - indent;
+                            blockId++;
+                        }
+
+                        case BLOCK_QUOTE -> {
+                            containers.add(new BlockInfo(ContainerBlockKind.QUOTE,  indent + 1));
+                            blockIndex++;
+                            peekIndex += 1;
+                            blockId++;
+                        }
+
+                        case OTHER -> {
+                            leafKind = LeafBlockKind.PARAGRAPH;
+                            return;
+                        }
+
+                        case ATX_HEADER, SETEXT_UNDERLINE, THEMATIC_BREAK, BLANK -> {
+                            leafKind = LeafBlockKind.NONE;
+                            blockId++;
+                            return;
+                        }
+
+                        case CODE_FENCE -> {
+                            leafKind = LeafBlockKind.FENCED_CODE;
+                            blockId++;
+                            return;
+                        }
+                    }
+                } else {
+                    var block = containers.get(blockIndex);
+                    var blockKind = block.blockKind;
+                    switch (blockKind) {
+                        case LIST_ITEM -> {
+                            if (indent >= block.indent) {
+                                blockIndex++;
+                            } else {
+                                var peekLineKind = getLineKind(line.substring(peekIndex));
+                                if (peekLineKind == LineKind.BLANK) {
+                                    // blank lines are considered to be part of a list item
+                                    blockIndex++;
+                                } else if (peekLineKind == LineKind.OTHER && prevLeafKind == LeafBlockKind.PARAGRAPH) {
+                                    // lazy continuation line: leaf kind and id are unchanged
+                                    return;
+                                } else {
+                                    closeContainer(blockIndex);
+                                    blockId++;
+                                }
+                            }
+                        }
+
+                        case QUOTE -> {
+                            var peekLineKind = getLineKind(line.substring(peekIndex));
+                            if (peekLineKind == LineKind.BLOCK_QUOTE) {
+                                blockIndex++;
+                                peekIndex++;
+                            } else if (peekLineKind == LineKind.OTHER && prevLeafKind == LeafBlockKind.PARAGRAPH) {
+                                // lazy continuation line: leaf kind and id are unchanged
+                                return;
+                            } else {
+                                closeContainer(blockIndex);
+                                blockId++;
+                            }
+                        }
+
+                        default -> throw new IllegalStateException(blockKind.toString());
+                    }
+                }
+            }
+        }
+
+        /**
+         * {@return {@code true} if the current line is part of an indented code block,
+         *          and {@code false} otherwise}
+         * Indented code blocks should be treated as literal text and not scanned for tags.
+         */
+        boolean isIndentedCodeBlock() {
+            return leafKind == LeafBlockKind.INDENTED_CODE;
+        }
+
+        /**
+         * {@return {@code true} if the current line is part of a fenced code block,
+         *          and {@code false} otherwise}
+         * Code fences are used to surround content that should be treated as literal text
+         * and not scanned for tags.
+         */
+        boolean isCodeFence() {
+            return leafKind == LeafBlockKind.FENCED_CODE;
+        }
+
+        /**
+         * Closes a given container block, and any open nested blocks.
+         *
+         * @param index the index of the block to be closed
+         */
+        private void closeContainer(int index) {
+            containers.subList(index, containers.size()).clear();
+        }
+
+        /**
+         * Skips the content of the current line.
+         */
+        void skipLine() {
+            while (bp < buflen) {
+                if (ch == '\n' || ch == '\r') {
+                    return;
+                }
+                nextChar();
+            }
+        }
+
+        /**
+         * Skips literal content.
+         *
+         * The ending delimiter is a function of the repetition count of the current
+         * character, and whether this is fenced content or not.
+         *
+         * In fenced content, the ending delimiter must appear at the start of a line;
+         * the code block may also be terminated implicitly by the end of a containing block.
+         *
+         * In other content, the scan may be terminated if the blockId changes,
+         * meaning the ending delimiter was not found before the block ended.
+         *
+         * @return the current position, or {@code -1} to indicate that the ending
+         *         delimiter was not found
+         */
+        int skipCode() {
+            char term = ch;
+            var count = count(term);
+            var initialLeafKind = leafKind;
+            var isFenced = (leafKind == LeafBlockKind.FENCED_CODE);
+            var initialBlockId = blockId;
+            while (bp < buflen) {
+                switch (ch) {
+                    case '\n', '\r' -> {
+                        nextChar();
+                        update();
+                        if (isFenced) {
+                            if (leafKind == LeafBlockKind.FENCED_CODE && ch == term && count(ch) >= count
+                                    || blockId != initialBlockId) {
+                                leafKind = LeafBlockKind.NONE;
+                                return bp;
+                            }
+                        } else {
+                            if (blockId != initialBlockId) {
+                                return -1;
+                            }
+                        }
+                    }
+
+                    default -> {
+                        if (ch == term && initialLeafKind != LeafBlockKind.FENCED_CODE ) {
+                            if (count(ch) == count) {
+                                return bp;
+                            }
+                        }
+                        nextChar();
+                    }
+                }
+            }
+            // found end of input
+            return -1;
+        }
+
+        /**
+         * Reads spaces and tabs, expanding tabs as if they were replaced by spaces
+         * with a tab stop of 4 characters.
+         *
+         * @param initialCount the initial indentation
+         * @return the indentation after skipping spaces and tabs
+         */
+        private int readIndent(int initialCount) {
+            final int TABSTOP = 4;
+            int indent = initialCount;
+            while (bp < buflen) {
+                switch (ch) {
+                    case ' ' -> indent++;
+                    case '\t' -> indent += TABSTOP - indent % TABSTOP;
+                    default -> {
+                        return indent;
+                    }
+                }
+                nextChar();
+            }
+            return indent;
+        }
+
+        /**
+         * Matches a string against an ordered series of regular expressions,
+         * to determine the "kind" of the string.
+         *
+         * @return the "kind" of the line
+         */
+        private LineKind getLineKind(String s) {
+            if (s.isBlank()) {
+                return LineKind.BLANK;
+            }
+
+            switch (s.charAt(0)) {
+                case '#', '=', '-', '+', '*', '_', '`', '~', '>',
+                        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' -> {
+                    for (LineKind lk : LineKind.values()) {
+                        if (lk.pattern.matcher(s).matches()) {
+                            return lk;
+                        }
+                    }
+                }
+            }
+
+            return LineKind.OTHER;
+        }
+
+        /**
+         * {@return a string obtained by peeking ahead at the current line}
+         * The current position is unchanged.
+         */
+        private String peekLine() {
+            int p = bp;
+            while (p < buflen) {
+                switch (buf[p]) {
+                    case '\n', '\r' -> {
+                        return newString(bp, p);
+                    }
+                    default -> p++;
+                }
+            }
+            return newString(bp, buflen);
+        }
+
+        /**
+         * {@return the number of consecutive occurrences of the given character}
+         *
+         * @param c the character
+         */
+        private int count(char c) {
+            int n = 1;
+            nextChar();
+            while (bp < buflen && ch == c) {
+                n++;
+                nextChar();
+            }
+            return n;
+        }
+
+        // unused, but useful when debugging
+        @Override
+        public String toString() {
+            return getClass().getSimpleName()
+                    + "[containers:" + containers
+                    + ", leafKind:" + leafKind
+                    + ", blockId:" + blockId
+                    + "]";
+        }
+    }
+
+    /**
+     * The kinds of line, used when reading a Markdown documentation comment.
+     * The values are loosely ordered by a combination of the specificity of
+     * the associated pattern, and the likelihood of use in a doc comment.
+     *
+     * Note that some of the patterns overlap, such as SETEXT_UNDERLINE and
+     * THEMATIC_BREAK. The CommonMark spec resolves the ambiguities with
+     * priority rules, such as the following:
+     *
+     * * If a line of dashes that meets the above conditions for being a
+     *   thematic break could also be interpreted as the underline of a
+     *   setext heading, the interpretation as a setext heading takes precedence.
+     *
+     * * When both a thematic break and a list item are possible interpretations
+     *   of a line, the thematic break takes precedence.
+     *
+     * Here in this context, the primary purpose of these kinds is to help
+     * determine when a block boundary terminates literal text, such as a
+     * code span, and so the exact nature of the line kind does not matter.
+     */
+    // This class is only used within the Markdown class, and could be
+    // a private nested class there.
+    enum LineKind {
+        BLANK(Pattern.compile("[ \t]*")),
+
+        /**
+         * ATX header: starts with 1 to 6 # characters, followed by space or tab or end of line.
+         * @see <a href="https://spec.commonmark.org/0.30/#atx-headings">ATX Headings</a>
+         */
+        ATX_HEADER(Pattern.compile("#{1,6}([ \t].*|$)")),
+
+        /**
+         * Setext header: underline is sequence of = or - followed by optional spaces and tabs.
+         * @see <a href="https://spec.commonmark.org/0.30/#setext-headings">Setext Headings</a>
+         */
+        SETEXT_UNDERLINE(Pattern.compile("(=+|-+)[ \t]*")),
+
+        /**
+         * Thematic break: a line of * - _ interspersed with optional spaces and tabs
+         * @see <a href="https://spec.commonmark.org/0.30/#thematic-breaks">Thematic Break</a>
+         */
+        THEMATIC_BREAK(Pattern.compile("((\\*[ \t]*+){3,})|((-[ \t]*+){3,})|((_[ \t]*+){3,})")),
+
+        /**
+         * Code fence: 3 or more back ticks or tildes; back tick fence cannot have back ticks
+         * in the info string.
+         * Note potential conflict with strikeout for similar reasons if strikeout is supported.
+         * @see <a href="https://spec.commonmark.org/0.30/#code-fence">Code Fence</a>
+         */
+        CODE_FENCE(Pattern.compile("(`{3,}[^`]*+)|(~{3,}.*+)")),
+
+        /**
+         * Bullet list item: * + - followed by at least one space or tab
+         * @see <a href="https://spec.commonmark.org/0.30/#list-items">List items</a>
+         */
+        BULLETED_LIST_ITEM(Pattern.compile("[-+*][ \t].*")),
+
+        /**
+         * Ordered list item: a sequence of 1-9 arabic digits (0-9), followed by
+         * either a . character or a ), followed by at least one space or tab
+         * @see <a href="https://spec.commonmark.org/0.30/#list-items">List items</a>
+         */
+        ORDERED_LIST_ITEM(Pattern.compile("[0-9]{1,9}[.)][ \t].*")),
+
+        /**
+         * Block quote: >
+         * @see <a href="https://spec.commonmark.org/0.30/#block-quotes">Block quotes</a>
+         */
+        BLOCK_QUOTE(Pattern.compile(">.*")),
+
+        /**
+         * Everything else...
+         *
+         * This entry must come last, since it matches "none of the above".
+         */
+        OTHER(Pattern.compile(".*"));
+
+        LineKind(Pattern p) {
+            this.pattern = p;
+        }
+
+        final Pattern pattern;
+    }
+
     protected boolean isDecimalDigit(char ch) {
         return ('0' <= ch && ch <= '9');
     }
@@ -1559,7 +2200,7 @@ public class DocCommentParser {
                                 while (bp < buflen && ch != quote) {
                                     nextChar();
                                 }
-                                addPendingText(v, bp - 1);
+                                addPendingText(v, bp - 1, DocTree.Kind.TEXT);
                                 nextChar();
                             } else {
                                 vkind = ValueKind.UNQUOTED;
@@ -1568,7 +2209,7 @@ public class DocCommentParser {
                                 while (bp < buflen && (ch != '}' && ch != ':' && !isUnquotedAttrValueTerminator(ch))) {
                                     nextChar();
                                 }
-                                addPendingText(v, bp - 1);
+                                addPendingText(v, bp - 1, DocTree.Kind.TEXT);
                             }
                             skipWhitespace();
                             value = v.toList();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
index 403cb30921a..a38658a315e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -76,6 +76,11 @@ public class JavaTokenizer extends UnicodeReader {
      */
     private final Preview preview;
 
+    /**
+     * Whether "///" comments are recognized as documentation comments.
+     */
+    protected final boolean enableLineDocComments;
+
     /**
      * The log to be used for error reporting. Copied from scanner factory.
      */
@@ -163,6 +168,7 @@ public class JavaTokenizer extends UnicodeReader {
         this.tokens = fac.tokens;
         this.source = fac.source;
         this.preview = fac.preview;
+        this.enableLineDocComments = fac.enableLineDocComments;
         this.lint = fac.lint;
         this.sb = new StringBuilder(256);
     }
@@ -918,10 +924,22 @@ public class JavaTokenizer extends UnicodeReader {
                     next();
 
                     if (accept('/')) { // (Spec. 3.7)
-                        skipToEOLN();
+                        if (enableLineDocComments && accept('/')) { // JavaDoc line comment
+                            int endPos;
+                            do {
+                                skipToEOLN();
+                                endPos = position();
+                                skipLineTerminator();
+                                skipWhitespace();
+                             } while (accept("///"));
 
-                        if (isAvailable()) {
-                            comments = appendComment(comments, processComment(pos, position(), CommentStyle.LINE));
+                            comments = appendComment(comments, processComment(pos, endPos, CommentStyle.JAVADOC_LINE));
+                        } else {
+                            skipToEOLN();
+
+                            if (isAvailable()) {
+                                comments = appendComment(comments, processComment(pos, position(), CommentStyle.LINE));
+                            }
                         }
                         break;
                     } else if (accept('*')) { // (Spec. 3.7)
@@ -929,7 +947,7 @@ public class JavaTokenizer extends UnicodeReader {
                         CommentStyle style;
 
                         if (accept('*')) {
-                            style = CommentStyle.JAVADOC;
+                            style = CommentStyle.JAVADOC_BLOCK;
 
                             if (is('/')) {
                                 isEmpty = true;
@@ -1207,7 +1225,7 @@ public class JavaTokenizer extends UnicodeReader {
         /**
          * Style of comment
          */
-        CommentStyle cs;
+        final CommentStyle cs;
 
         DiagnosticPosition pos;
 
@@ -1312,7 +1330,7 @@ public class JavaTokenizer extends UnicodeReader {
         }
 
         /**
-         * Trim the first part of the JavaDoc comment.
+         * Trim the first part of the JavaDoc block comment.
          *
          * @param line line reader
          *
@@ -1334,6 +1352,49 @@ public class JavaTokenizer extends UnicodeReader {
             return line;
         }
 
+        /**
+         * Determine how much indent to remove from a JavaDoc line comment.
+         *
+         * @return minimum indent to remove
+         */
+        int getJavadocLineCommentIndent() {
+            int result = Integer.MAX_VALUE;
+            UnicodeReader fullReader = lineReader(position(), position() + length());
+
+            while (fullReader.isAvailable()) {
+                UnicodeReader line = fullReader.lineReader();
+                line.skipWhitespace();
+                line.accept("///");
+                int pos = line.position();
+                line.skipWhitespace();
+
+                if (line.isAvailable()) {
+                    result = Integer.min(result, line.position() - pos);
+                }
+            }
+
+            return result == Integer.MAX_VALUE ? 0 : result;
+        }
+
+        /**
+         * Trim the first part of a JavaDoc line comment.
+         *
+         * @param indent how much indentation to remove
+         * @param line line reader
+         *
+         * @return modified line reader
+         */
+        UnicodeReader trimJavadocLineComment(UnicodeReader line, int indent) {
+            line.skipWhitespace();
+            line.accept("///");
+
+            for (int i = 0; line.isAvailable() && i < indent; i++) {
+                line.next();
+            }
+
+            return line;
+        }
+
         /**
          * Put the line into the buffer.
          *
@@ -1350,39 +1411,52 @@ public class JavaTokenizer extends UnicodeReader {
             if (!scanned) {
                 deprecatedFlag = false;
                 scanned = true;
+                CommentStyle style;
+                int indent = 0;
+                int start = position();
 
-                if (!accept("/**")) {
+                if (accept("/**")) {
+                    style = CommentStyle.JAVADOC_BLOCK;
+                    if (skip('*') != 0 && is('/')) {
+                        return ;
+                    }
+
+                    skipWhitespace();
+
+                    if (isEOLN()) {
+                        accept('\r');
+                        accept('\n');
+                    }
+                } else if (accept("///")) {
+                    style = CommentStyle.JAVADOC_LINE;
+                    reset(start);
+                    indent = getJavadocLineCommentIndent();
+                } else {
                     return;
                 }
 
-                if (skip('*') != 0 && is('/')) {
-                    return ;
-                }
-
-                skipWhitespace();
-
-                if (isEOLN()) {
-                    accept('\r');
-                    accept('\n');
-                }
-
                 while (isAvailable()) {
                     UnicodeReader line = lineReader();
-                    line = trimJavadocComment(line);
+                    line = (style == CommentStyle.JAVADOC_LINE)
+                            ? trimJavadocLineComment(line, indent)
+                            : trimJavadocComment(line);
 
-                    // If standalone @deprecated tag
-                    int pos = line.position();
-                    line.skipWhitespace();
+                    if (cs == CommentStyle.JAVADOC_BLOCK) {
+                        // If standalone @deprecated tag
+                        int pos = line.position();
+                        line.skipWhitespace();
 
-                    if (line.accept("@deprecated") &&
-                            (!line.isAvailable() ||
-                                    line.isWhitespace() ||
-                                    line.isEOLN() ||
-                                    line.get() == EOI)) {
-                        deprecatedFlag = true;
+                        if (line.accept("@deprecated") &&
+                                (!line.isAvailable() ||
+                                        line.isWhitespace() ||
+                                        line.isEOLN() ||
+                                        line.get() == EOI)) {
+                            deprecatedFlag = true;
+                        }
+
+                        line.reset(pos);
                     }
 
-                    line.reset(pos);
                     putLine(line);
                 }
             }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
index 23966c7bd9a..7fcd46d38a5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,11 @@ package com.sun.tools.javac.parser;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.lang.model.util.Elements.DocCommentKind;
+
+import com.sun.source.doctree.DocCommentTree;
+
 import com.sun.tools.javac.parser.Tokens.Comment;
-import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.DocCommentTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.DiagnosticSource;
@@ -44,7 +47,7 @@ import com.sun.tools.javac.util.DiagnosticSource;
 public class LazyDocCommentTable implements DocCommentTable {
     private static class Entry {
         final Comment comment;
-        DCDocComment tree;
+        DocCommentTree tree;
 
         Entry(Comment c) {
             comment = c;
@@ -72,6 +75,16 @@ public class LazyDocCommentTable implements DocCommentTable {
         return (e == null) ? null : e.comment;
     }
 
+    @Override
+    public DocCommentKind getCommentKind(JCTree tree) {
+        Comment c = getComment(tree);
+        return (c == null) ? null : switch (c.getStyle()) {
+            case JAVADOC_BLOCK -> DocCommentKind.TRADITIONAL;
+            case JAVADOC_LINE -> DocCommentKind.END_OF_LINE;
+            default -> throw new IllegalStateException(c.getStyle().toString());
+        };
+    }
+
     @Override
     public String getCommentText(JCTree tree) {
         Comment c = getComment(tree);
@@ -79,12 +92,14 @@ public class LazyDocCommentTable implements DocCommentTable {
     }
 
     @Override
-    public DCDocComment getCommentTree(JCTree tree) {
+    public DocCommentTree getCommentTree(JCTree tree) {
         Entry e = table.get(tree);
-        if (e == null)
+        if (e == null) {
             return null;
-        if (e.tree == null)
-            e.tree = new DocCommentParser(fac, diagSource, e.comment).parse();
+        }
+        if (e.tree == null) {
+            e.tree = fac.getTrees().getDocCommentTree(diagSource, e.comment);
+        }
         return e.tree;
     }
 
@@ -92,5 +107,4 @@ public class LazyDocCommentTable implements DocCommentTable {
     public void putComment(JCTree tree, Comment c) {
         table.put(tree, new Entry(c));
     }
-
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
index 3c07c382aa3..c873c6f31b7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
@@ -27,6 +27,7 @@ package com.sun.tools.javac.parser;
 
 import java.util.Locale;
 
+import com.sun.tools.javac.api.JavacTrees;
 import com.sun.tools.javac.code.DeferredLintHandler;
 import com.sun.tools.javac.code.Lint;
 import com.sun.tools.javac.code.Preview;
@@ -34,7 +35,6 @@ import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.tree.DocTreeMaker;
 import com.sun.tools.javac.tree.TreeMaker;
 import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.JCDiagnostic;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Names;
 import com.sun.tools.javac.util.Options;
@@ -72,6 +72,8 @@ public class ParserFactory {
     final Locale locale;
     final DeferredLintHandler deferredLintHandler;
 
+    private final JavacTrees trees;
+
     @SuppressWarnings("this-escape")
     protected ParserFactory(Context context) {
         super();
@@ -87,6 +89,7 @@ public class ParserFactory {
         this.scannerFactory = ScannerFactory.instance(context);
         this.locale = context.get(Locale.class);
         this.deferredLintHandler = DeferredLintHandler.instance(context);
+        this.trees = JavacTrees.instance(context);
     }
 
     public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap) {
@@ -97,4 +100,8 @@ public class ParserFactory {
         Lexer lexer = scannerFactory.newScanner(input, keepDocComments);
         return new JavacParser(this, lexer, keepDocComments, keepLineMap, keepEndPos, parseModuleInfo);
     }
+
+    public JavacTrees getTrees() {
+        return trees;
+    }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
index a182c74b07b..a24e73a4141 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Scanner.java
@@ -125,7 +125,7 @@ public class Scanner implements Lexer {
             if (token.comments != null) {
                 for (var c : token.comments) {
                     switch (c.getStyle()) {
-                        case JAVADOC -> {
+                        case JAVADOC_BLOCK, JAVADOC_LINE -> {
                             docComments.add(c);
                         }
                     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
index 90188eaafea..188fe838b18 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,11 @@ import java.nio.CharBuffer;
 import com.sun.tools.javac.code.Lint;
 import com.sun.tools.javac.code.Preview;
 import com.sun.tools.javac.code.Source;
+import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Names;
+import com.sun.tools.javac.util.Options;
 
 
 /**
@@ -61,6 +63,7 @@ public class ScannerFactory {
     final Preview preview;
     final Tokens tokens;
     final Lint lint;
+    final boolean enableLineDocComments;
 
     /** Create a new scanner factory. */
     @SuppressWarnings("this-escape")
@@ -72,6 +75,8 @@ public class ScannerFactory {
         this.preview = Preview.instance(context);
         this.tokens = Tokens.instance(context);
         this.lint = Lint.instance(context);
+        var options = Options.instance(context);
+        this.enableLineDocComments = !options.isSet(Option.DISABLE_LINE_DOC_COMMENTS);
     }
 
     public Scanner newScanner(CharSequence input, boolean keepDocComments) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
index a05d48d320b..963b545b8b3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
@@ -274,9 +274,10 @@ public class Tokens {
     public interface Comment {
 
         enum CommentStyle {
-            LINE,       // Starting with //
-            BLOCK,      // starting with /*
-            JAVADOC,    // starting with /**
+            LINE,            // starting with //   -- also known in JLS as "end-of-line comment"
+            BLOCK,           // starting with /*   -- also known in JLS as "traditional comment"
+            JAVADOC_LINE,    // starting with ///
+            JAVADOC_BLOCK    // starting with /**
         }
 
         String getText();
@@ -360,7 +361,7 @@ public class Tokens {
          * the last one is returned
          */
         public Comment docComment() {
-            List<Comment> comments = getComments(Comment.CommentStyle.JAVADOC);
+            List<Comment> comments = getDocComments();
             return comments.isEmpty() ?
                     null :
                     comments.head;
@@ -371,7 +372,7 @@ public class Tokens {
          * javadoc comment attached to this token contains the '@deprecated' string
          */
         public boolean deprecatedFlag() {
-            for (Comment c : getComments(Comment.CommentStyle.JAVADOC)) {
+            for (Comment c : getDocComments()) {
                 if (c.isDeprecated()) {
                     return true;
                 }
@@ -379,14 +380,15 @@ public class Tokens {
             return false;
         }
 
-        private List<Comment> getComments(Comment.CommentStyle style) {
+        private List<Comment> getDocComments() {
             if (comments == null) {
                 return List.nil();
             } else {
                 ListBuffer<Comment> buf = new ListBuffer<>();
                 for (Comment c : comments) {
-                    if (c.getStyle() == style) {
-                        buf.add(c);
+                    Comment.CommentStyle style = c.getStyle();
+                    switch (style) {
+                        case JAVADOC_BLOCK, JAVADOC_LINE -> buf.add(c);
                     }
                 }
                 return buf.toList();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index 0566272ca1b..2b48676e6b8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -381,6 +381,8 @@ javac.opt.inherit_runtime_environment=\
 javac.opt.default.module.for.created.files=\
     Fallback target module for files created by annotation processors,\n\
     if none specified or inferred.
+javac.opt.lineDocComments=\
+    Disable support for documentation comments with lines beginning '///'
 
 ## messages
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
index b1f9802354d..a999786f119 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -158,6 +158,11 @@ public abstract class DCTree implements DocTree {
         }
 
         switch (getKind()) {
+            case MARKDOWN -> {
+                DCRawText markdown = (DCRawText) this;
+                return markdown.pos + markdown.code.length();
+            }
+
             case TEXT -> {
                 DCText text = (DCText) this;
                 return text.pos + text.text.length();
@@ -896,6 +901,39 @@ public abstract class DCTree implements DocTree {
         }
     }
 
+    public static class DCRawText extends DCTree implements RawTextTree {
+        public final Kind kind;
+        public final String code;
+
+        DCRawText(Kind kind, String code) {
+            if (kind != Kind.MARKDOWN) {
+                throw new IllegalArgumentException(String.valueOf(kind));
+            }
+            this.kind = kind;
+            this.code = code;
+        }
+
+        @Override
+        public boolean isBlank() {
+            return code.isBlank();
+        }
+
+        @Override @DefinedBy(Api.COMPILER_TREE)
+        public Kind getKind() {
+            return Kind.MARKDOWN;
+        }
+
+        @Override @DefinedBy(Api.COMPILER_TREE)
+        public <R, D> R accept(DocTreeVisitor<R, D> v, D d) {
+            return v.visitRawText(this, d);
+        }
+
+        @Override @DefinedBy(Api.COMPILER_TREE)
+        public String getContent() {
+            return code;
+        }
+    }
+
     public static class DCReference extends DCEndPosTree<DCReference> implements ReferenceTree {
         public final String signature;
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
index c5445624d40..9582aa213f9 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,12 @@
 
 package com.sun.tools.javac.tree;
 
+import javax.lang.model.util.Elements.DocCommentKind;
+
+import com.sun.source.doctree.DocCommentTree;
 import com.sun.source.doctree.ErroneousTree;
+
 import com.sun.tools.javac.parser.Tokens.Comment;
-import com.sun.tools.javac.tree.DCTree.DCDocComment;
 
 /**
  * A table giving the doc comment, if any, for any tree node.
@@ -39,29 +42,34 @@ import com.sun.tools.javac.tree.DCTree.DCDocComment;
  */
 public interface DocCommentTable {
     /**
-     * Check if a tree node has a corresponding doc comment.
+     * Checks if a tree node has a corresponding doc comment.
      */
     boolean hasComment(JCTree tree);
 
     /**
-     * Get the Comment token containing the doc comment, if any, for a tree node.
+     * Returns the Comment token containing the doc comment, if any, for a tree node.
      */
     Comment getComment(JCTree tree);
 
     /**
-     * Get the plain text of the doc comment, if any, for a tree node.
+     * Returns the kind of the doc comment, if any, for a tree node.
+     */
+    DocCommentKind getCommentKind(JCTree tree);
+
+    /**
+     * Returns the plain text of the doc comment, if any, for a tree node.
      */
     String getCommentText(JCTree tree);
 
     /**
-     * Get the parsed form of the doc comment as a DocTree. If any errors
+     * Returns the parsed form of the doc comment as a DocTree. If any errors
      * are detected during parsing, they will be reported via
-     * {@link ErroneousTree ErroneousTree} nodes within the resulting tree.
+     * {@link ErroneousTree} nodes within the resulting tree.
      */
-    DCDocComment getCommentTree(JCTree tree);
+    DocCommentTree getCommentTree(JCTree tree);
 
     /**
-     * Set the Comment to be associated with a tree node.
+     * Sets the Comment to be associated with a tree node.
      */
     void putComment(JCTree tree, Comment c);
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
index e4f7cf096eb..aac2647db3c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -390,6 +390,16 @@ public class DocPretty implements DocTreeVisitor<Void,Void> {
         return null;
     }
 
+    @Override @DefinedBy(Api.COMPILER_TREE)
+    public Void visitRawText(RawTextTree node, Void p) {
+        try {
+            print(node.getContent());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        return null;
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitReference(ReferenceTree node, Void p) {
         try {
@@ -627,8 +637,12 @@ public class DocPretty implements DocTreeVisitor<Void,Void> {
             print('{');
             print('@');
             print(node.getTagName());
-            print(' ');
-            print(node.getContent());
+            var content = node.getContent();
+            boolean isEmpty = content.stream().allMatch(n -> (n instanceof TextTree t) && t.getBody().isEmpty());
+            if (!isEmpty) {
+                print(' ');
+                print(content);
+            }
             print('}');
         } catch (IOException e) {
             throw new UncheckedIOException(e);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
index c729b6ff832..77f6eefc073 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
@@ -30,6 +30,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.lang.model.element.Name;
 import javax.tools.Diagnostic;
@@ -68,6 +70,7 @@ import com.sun.tools.javac.tree.DCTree.DCLiteral;
 import com.sun.tools.javac.tree.DCTree.DCParam;
 import com.sun.tools.javac.tree.DCTree.DCProvides;
 import com.sun.tools.javac.tree.DCTree.DCReference;
+import com.sun.tools.javac.tree.DCTree.DCRawText;
 import com.sun.tools.javac.tree.DCTree.DCReturn;
 import com.sun.tools.javac.tree.DCTree.DCSee;
 import com.sun.tools.javac.tree.DCTree.DCSerial;
@@ -211,12 +214,12 @@ public class DocTreeMaker implements DocTreeFactory {
         lb.addAll(cast(fullBody));
         List<DCTree> fBody = lb.toList();
 
-        // A dummy comment to keep the diagnostics logic happy.
+        // A dummy comment that returns Position.NOPOS for any source position.
+        // A different solution would be to replace the Comment field
+        // in DCDocComment with a narrower type equivalent to Function<int,int>
+        // so that here in this code we can just supply a lambda as follows:
+        //   i -> Position.NOPOS
         Comment c = new Comment() {
-            @Override
-            public String getText() {
-                return null;
-            }
 
             @Override
             public JCDiagnostic.DiagnosticPosition getPos() {
@@ -228,14 +231,19 @@ public class DocTreeMaker implements DocTreeFactory {
                 return Position.NOPOS;
             }
 
+            @Override
+            public String getText() {
+                throw new UnsupportedOperationException(getClass() + ".getText");
+            }
+
             @Override
             public CommentStyle getStyle() {
-                return CommentStyle.JAVADOC;
+                throw new UnsupportedOperationException(getClass() + ".getStyle");
             }
 
             @Override
             public boolean isDeprecated() {
-                return false;
+                throw new UnsupportedOperationException(getClass() + ".isDeprecated");
             }
         };
         Pair<List<DCTree>, List<DCTree>> pair = splitBody(fullBody);
@@ -347,6 +355,13 @@ public class DocTreeMaker implements DocTreeFactory {
         return tree;
     }
 
+    @Override @DefinedBy(Api.COMPILER_TREE)
+    public DCRawText newRawTextTree(DocTree.Kind kind, String text) {
+        DCTree.DCRawText tree = new DCRawText(kind, text);
+        tree.pos = pos;
+        return tree;
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public DCParam newParamTree(boolean isTypeParameter, IdentifierTree name, List<? extends DocTree> description) {
         DCParam tree = new DCParam(isTypeParameter, (DCIdentifier) name, cast(description));
@@ -574,34 +589,29 @@ public class DocTreeMaker implements DocTreeFactory {
                             foundFirstSentence = true;
                         }
 
-                        case TEXT -> {
-                            var dtPos = dt.pos;
-                            var s = ((DCText) dt).getBody();
-                            var peekedNext = iter.hasNext()
-                                    ? alist.get(iter.nextIndex())
-                                    : null;
-                            int sbreak = getSentenceBreak(s, peekedNext);
-                            if (sbreak > 0) {
-                                var fsPart = m.at(dtPos).newTextTree(s.substring(0, sbreak).stripTrailing());
+                        case TEXT, MARKDOWN -> {
+                            var peekedNext = iter.hasNext() ? alist.get(iter.nextIndex()) : null;
+                            var content = getContent(dt);
+                            int breakOffset = getSentenceBreak(dt.getKind(), content, peekedNext);
+                            if (breakOffset > 0) {
+                                // the end of sentence is within the current node;
+                                // split it, skipping whitespace in between the two parts
+                                var fsPart = newNode(dt.getKind(), dt.pos, content.substring(0, breakOffset).stripTrailing());
                                 fs.add(fsPart);
-                                int offsetPos = skipWhiteSpace(s, sbreak);
-                                if (offsetPos > 0) {
-                                    DCText bodyPart = m.at(dtPos + offsetPos).newTextTree(s.substring(offsetPos));
+                                int wsOffset = skipWhiteSpace(content, breakOffset);
+                                if (wsOffset > 0) {
+                                    var bodyPart = newNode(dt.getKind(), dt.pos + wsOffset, content.substring(wsOffset));
                                     body.add(bodyPart);
                                 }
                                 foundFirstSentence = true;
-                            } else if (peekedNext != null) {
-                                // if the next doctree is a break, remove trailing spaces
-                                if (isSentenceBreak(peekedNext, false)) {
-                                    DCTree next = iter.next();
-                                    DCText fsPart = m.at(dtPos).newTextTree(s.stripTrailing());
-                                    fs.add(fsPart);
-                                    body.add(next);
-                                    foundFirstSentence = true;
-                                } else {
-                                    fs.add(dt);
-                                }
+                            } else if (peekedNext != null && isSentenceBreak(peekedNext, false)) {
+                                // the next node is a sentence break, so this is the end of the first sentence;
+                                // remove trailing spaces
+                                var fsPart = newNode(dt.getKind(), dt.pos, content.stripTrailing());
+                                fs.add(fsPart);
+                                foundFirstSentence = true;
                             } else {
+                                // no sentence break found; keep scanning
                                 fs.add(dt);
                             }
                         }
@@ -633,34 +643,20 @@ public class DocTreeMaker implements DocTreeFactory {
             }
         }
 
-        /*
-         * Computes the first sentence break, a simple dot-space algorithm.
-         */
-        private int defaultSentenceBreak(String s) {
-            // scan for period followed by whitespace
-            int period = -1;
-            for (int i = 0; i < s.length(); i++) {
-                switch (s.charAt(i)) {
-                    case '.':
-                        period = i;
-                        break;
+        private String getContent(DCTree dt) {
+            return switch (dt.getKind()) {
+                case TEXT -> ((DCText) dt).text;
+                case MARKDOWN -> ((DCRawText) dt).code;
+                default -> throw new IllegalArgumentException(dt.getKind().toString());
+            };
+        }
 
-                    case ' ':
-                    case '\f':
-                    case '\n':
-                    case '\r':
-                    case '\t':
-                        if (period >= 0) {
-                            return i;
-                        }
-                        break;
-
-                    default:
-                        period = -1;
-                        break;
-                }
-            }
-            return -1;
+        private DCTree newNode(DocTree.Kind kind, int pos, String text) {
+            return switch (kind) {
+                case TEXT -> m.at(pos).newTextTree(text);
+                case MARKDOWN -> m.at(pos).newRawTextTree(kind, text);
+                default -> throw new IllegalArgumentException(kind.toString());
+            };
         }
 
         /*
@@ -683,36 +679,53 @@ public class DocTreeMaker implements DocTreeFactory {
          * Therefore, we have to probe further to determine whether
          * there really is a sentence break or not at the end of this run of text.
          */
-        private int getSentenceBreak(String s, DCTree nextTree) {
+        private int getSentenceBreak(DocTree.Kind kind, String s, DCTree nextTree) {
             BreakIterator breakIterator = m.trees.getBreakIterator();
             if (breakIterator == null) {
-                return defaultSentenceBreak(s);
+                return defaultSentenceBreak(kind, s);
             }
-            breakIterator.setText(s);
+
+            // If there is a paragraph break in a run of Markdown text, restrict the
+            // search to the first paragraph, to avoid beginning-of-line Markdown constructs
+            // confusing the sentence breaker.
+            String s2 = normalize(kind, kind == Kind.MARKDOWN ? firstParaText(s) : s);
+            breakIterator.setText(s2);
             final int sbrk = breakIterator.next();
-            // This is the last doctree, found the droid we are looking for
-            if (nextTree == null) {
+
+            switch (kind) {
+                case MARKDOWN -> {
+                    int endParaPos = endParaPos(s2);
+                    if (endParaPos != -1) {
+                        return Math.min(sbrk, endParaPos);
+                    }
+                }
+            }
+
+            // If this is the last doctree, or if there was a paragraph break in a run
+            // of Markdown text, then we found the droid we are looking for
+            if (nextTree == null || kind == Kind.MARKDOWN && s2.length() < s.length()) {
                 return sbrk;
             }
 
-            // If the break is well within the span of the string ie. not
+            // If the break is well within the span of the string i.e. not
             // at EOL, then we have a clear break.
             if (sbrk < s.length() - 1) {
                 return sbrk;
             }
 
-            if (nextTree.getKind() == Kind.TEXT) {
-                // Two adjacent text trees, a corner case, perhaps
-                // produced by a tool synthesizing a doctree. In
-                // this case, does the break lie within the first span,
-                // then we have the droid, otherwise allow the callers
-                // logic to handle the break in the adjacent doctree.
-                TextTree ttnext = (TextTree) nextTree;
-                String combined = s + ttnext.getBody();
-                breakIterator.setText(combined);
-                int sbrk2 = breakIterator.next();
-                if (sbrk < sbrk2) {
-                    return sbrk;
+            switch (nextTree.getKind()) {
+                case TEXT, MARKDOWN -> {
+                    // Two adjacent text trees, a corner case, perhaps
+                    // produced by a tool synthesizing a doctree. In
+                    // this case, does the break lie within the first span,
+                    // then we have the droid, otherwise allow the callers
+                    // logic to handle the break in the adjacent doctree.
+                    String combined = s2 + normalize(nextTree.getKind(), getContent(nextTree));
+                    breakIterator.setText(combined);
+                    int sbrk2 = breakIterator.next();
+                    if (sbrk < sbrk2) {
+                        return sbrk;
+                    }
                 }
             }
 
@@ -733,6 +746,69 @@ public class DocTreeMaker implements DocTreeFactory {
             return -1; // indeterminate at this time
         }
 
+        /*
+         * Computes the first sentence break, a simple dot-space algorithm.
+         */
+        private int defaultSentenceBreak(DocTree.Kind kind, String s) {
+            String s2 = normalize(kind, s);
+
+            // scan for period followed by whitespace
+            int period = -1;
+            for (int i = 0; i < s2.length(); i++) {
+                switch (s2.charAt(i)) {
+                    case '.':
+                        period = i;
+                        break;
+
+                    case ' ':
+                    case '\f':
+                    case '\n':
+                    case '\r':
+                    case '\t':
+                        if (period >= 0) {
+                            switch (kind) {
+                                case MARKDOWN -> {
+                                    int endParaPos = endParaPos(s2);
+                                    return endParaPos == -1 || i < endParaPos ? i : endParaPos;
+                                }
+                                case TEXT -> {
+                                    return i;
+                                }
+                                default -> throw new IllegalArgumentException(kind.toString());
+                            }
+                        }
+                        break;
+
+                    default:
+                        period = -1;
+                        break;
+                }
+            }
+
+            return switch (kind) {
+                case MARKDOWN -> endParaPos(s2); // may be -1
+                case TEXT -> -1;
+                default -> throw new IllegalArgumentException(kind.toString());
+            };
+        }
+
+        // End of paragraph is newline, followed by a blank line or the beginning of the next block.
+        // - + * are list markers
+        // # = - are for headings
+        // - _ * are for thematic breaks
+        // >     is for block quotes
+        private static final Pattern endPara = Pattern.compile("\n(([ \t]*\n)|( {0,3}[-+*#=_>]))");
+
+        private static int endParaPos(String s) {
+            Matcher m = endPara.matcher(s);
+            return m.find() ? m.start() : -1;
+        }
+
+        private static String firstParaText(String s) {
+            int endParaPos = endParaPos(s);
+            return endParaPos == -1 ? s : s.substring(0, endParaPos);
+        }
+
         private boolean isSentenceBreak(DCTree dt, boolean isFirstDocTree) {
             switch (dt.getKind()) {
                 case START_ELEMENT:
@@ -762,6 +838,75 @@ public class DocTreeMaker implements DocTreeFactory {
             }
             return -1;
         }
+
+        private String normalize(DocTree.Kind kind, String s) {
+            return switch (kind) {
+                case TEXT -> s;
+                case MARKDOWN -> normalizeMarkdown(s);
+                default -> throw new IllegalArgumentException(kind.toString());
+            };
+        }
+
+        // Returns a string in which any periods that should not be considered
+        // as ending a sentence are replaced by dashes.  This specifically
+        // includes periods in code spans and links.
+        private String normalizeMarkdown(String s) {
+            StringBuilder sb = new StringBuilder();
+            int slen = s.length();
+            int i = 0;
+            while (i < slen) {
+                char ch = s.charAt(i);
+                switch (ch) {
+                    case '\\' -> {
+                        sb.append(ch);
+                        i++;
+                        if (i < slen) {
+                            sb.append(s.charAt(i));
+                            i++;
+                        }
+                    }
+
+                    case '<' -> i = skip(sb, s, i, ch, '>');
+                    case '[' -> i = skip(sb, s, i, ch, ']');
+                    case '(' -> i = skip(sb, s, i, ch, ')');
+
+                    case '`' -> {
+                        int start = i;
+                        i++;
+                        while (i < slen && s.charAt(i) == '`') {
+                            i++;
+                        }
+                        String prefix = s.substring(start, i);
+                        sb.append(prefix);
+                        int j = s.indexOf(prefix, i);
+                        if (j > i) {
+                            sb.append(s.substring(i, j).replace('.', '-'));
+                            sb.append(prefix);
+                            i = j + prefix.length();
+                        }
+                    }
+
+                    default -> {
+                        sb.append(ch);
+                        i++;
+                    }
+                }
+            }
+
+            return sb.toString();
+        }
+
+        private int skip(StringBuilder sb, String s, int i, char ch, char term) {
+            sb.append(ch);
+            i++;
+            int j = s.indexOf(term, i);
+            if (j != -1) {
+                sb.append(s.substring(i, j).replace('.', '-'));
+                return j;
+            } else {
+                return i;
+            }
+        }
     }
 
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 42cfd9ac675..54917c90dc2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -478,13 +478,6 @@ public class TreeInfo {
         return (docComments == null) ? null : docComments.getCommentText(tree);
     }
 
-    public static DCTree.DCDocComment getCommentTree(Env<?> env, JCTree tree) {
-        DocCommentTable docComments = (tree.hasTag(JCTree.Tag.TOPLEVEL))
-                ? ((JCCompilationUnit) tree).docComments
-                : env.toplevel.docComments;
-        return (docComments == null) ? null : docComments.getCommentTree(tree);
-    }
-
     /** The position of the first statement in a block, or the position of
      *  the block itself if it is empty.
      */
diff --git a/src/jdk.compiler/share/classes/module-info.java b/src/jdk.compiler/share/classes/module-info.java
index 9b12171ef6d..63b5aa63e4c 100644
--- a/src/jdk.compiler/share/classes/module-info.java
+++ b/src/jdk.compiler/share/classes/module-info.java
@@ -233,7 +233,8 @@ module jdk.compiler {
         jdk.javadoc;
     exports com.sun.tools.javac.api to
         jdk.javadoc,
-        jdk.jshell;
+        jdk.jshell,
+        jdk.internal.md;
     exports com.sun.tools.javac.resources to
         jdk.jshell;
     exports com.sun.tools.javac.code to
@@ -253,17 +254,20 @@ module jdk.compiler {
     exports com.sun.tools.javac.model to
         jdk.javadoc;
     exports com.sun.tools.javac.parser to
-        jdk.jshell;
+        jdk.jshell,
+        jdk.internal.md;
     exports com.sun.tools.javac.platform to
         jdk.jdeps,
         jdk.javadoc;
     exports com.sun.tools.javac.tree to
         jdk.javadoc,
-        jdk.jshell;
+        jdk.jshell,
+        jdk.internal.md;
     exports com.sun.tools.javac.util to
         jdk.jdeps,
         jdk.javadoc,
-        jdk.jshell;
+        jdk.jshell,
+        jdk.internal.md;
     exports jdk.internal.shellsupport.doc to
         jdk.jshell;
 
@@ -271,6 +275,7 @@ module jdk.compiler {
     uses com.sun.source.util.Plugin;
     uses com.sun.tools.doclint.DocLint;
     uses com.sun.tools.javac.platform.PlatformProvider;
+    uses com.sun.tools.javac.api.JavacTrees.DocCommentTreeTransformer;
 
     provides java.util.spi.ToolProvider with
         com.sun.tools.javac.main.JavacToolProvider;
diff --git a/src/jdk.compiler/share/man/javac.1 b/src/jdk.compiler/share/man/javac.1
index 6586bcaf83f..de374e7d0c7 100644
--- a/src/jdk.compiler/share/man/javac.1
+++ b/src/jdk.compiler/share/man/javac.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1994, 2024, 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
@@ -563,6 +563,9 @@ module.
 Specifies the fallback target module for files created by annotation
 processors, if none is specified or inferred.
 .TP
+\f[V]--disable-line-doc-comments\f[R]
+Disables support for documentation comments with lines beginning ///.
+.TP
 \f[V]-Djava.endorsed.dirs=\f[R]\f[I]dirs\f[R]
 Overrides the location of the endorsed standards path.
 .RS
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/markdown/MarkdownTransformer.java b/src/jdk.internal.md/share/classes/jdk/internal/markdown/MarkdownTransformer.java
new file mode 100644
index 00000000000..bd2521e4efa
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/markdown/MarkdownTransformer.java
@@ -0,0 +1,976 @@
+/*
+ * Copyright (c) 2023, 2024, 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.markdown;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.MatchResult;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.DocTreeVisitor;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.util.DocTreeScanner;
+import com.sun.source.util.DocTrees;
+
+import com.sun.tools.javac.api.JavacTrees;
+import com.sun.tools.javac.parser.ReferenceParser;
+import com.sun.tools.javac.tree.DCTree;
+import com.sun.tools.javac.tree.DocTreeMaker;
+import com.sun.tools.javac.util.DefinedBy;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.TablesExtension;
+import jdk.internal.org.commonmark.internal.InlineParserImpl;
+import jdk.internal.org.commonmark.node.AbstractVisitor;
+import jdk.internal.org.commonmark.node.Link;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.IncludeSourceSpans;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.InlineParserContext;
+import jdk.internal.org.commonmark.parser.InlineParserFactory;
+import jdk.internal.org.commonmark.parser.Parser;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+
+import static com.sun.tools.javac.util.Position.NOPOS;
+
+/**
+ * A class to transform a {@code DocTree} node into a similar one with
+ * doc-comment "extensions" translated into equivalent standard {@code DocTree} nodes.
+ *
+ * <p>The primary extension is to allow references to program elements to be
+ * translated to {@code {@link ...}} or {@code {@linkplain ...}} tags.
+ */
+public class MarkdownTransformer implements JavacTrees.DocCommentTreeTransformer {
+
+    /**
+     * Public no-args constructor, suitable for use with {@link java.util.ServiceLoader}.
+     */
+    public MarkdownTransformer() { }
+
+    public String name() {
+        return "standard";
+    }
+
+    @Override @DefinedBy(DefinedBy.Api.COMPILER_TREE)
+    public DocCommentTree transform(DocTrees trees, DocCommentTree tree) {
+        if (!(trees instanceof JavacTrees t)) {
+            throw new IllegalArgumentException("class not supported: " + trees.getClass());
+        }
+        if (!(tree instanceof DCTree.DCDocComment dc)) {
+            throw new IllegalArgumentException("class not supported: " + tree.getClass());
+        }
+
+        return isMarkdown(dc) ? new DCTransformer(t).transform(dc) : dc;
+    }
+
+    private boolean isMarkdown(DocCommentTree node) {
+        return isMarkdownVisitor.visitDocComment(node, null);
+    }
+
+    /**
+     * A fast scanner for detecting Markdown nodes in documentation comment nodes.
+     * The scanner returns as soon as any Markdown node is found.
+     */
+    private static final DocTreeVisitor<Boolean, Void> isMarkdownVisitor = new DocTreeScanner<>() {
+        @Override
+        public Boolean scan(Iterable<? extends DocTree> nodes, Void ignore) {
+            if (nodes != null) {
+                for (DocTree node : nodes) {
+                    Boolean b = scan(node, ignore);
+                    if (b == Boolean.TRUE) {
+                        return b;
+                    }
+                }
+            }
+            return false;
+        }
+
+        @Override
+        public Boolean scan(DocTree node, Void ignore) {
+            return node != null && node.getKind() == DocTree.Kind.MARKDOWN ? Boolean.TRUE : super.scan(node, ignore);
+        }
+
+        @Override
+        public Boolean reduce(Boolean r1, Boolean r2) {
+            return r1 == Boolean.TRUE || r2 == Boolean.TRUE;
+        }
+    };
+
+    private static final char PLACEHOLDER = '\uFFFC'; // Unicode Object Replacement Character
+
+    private static class DCTransformer {
+        private final DocTreeMaker m;
+        private final ReferenceParser refParser;
+
+        // a dynamically generated scheme for the URLs of automatically generated references;
+        // to allow user-generated code URLs, change this to just "code:"
+        private final String autorefScheme = "code-" + Integer.toHexString(hashCode()) + ":";
+
+        DCTransformer(JavacTrees t) {
+            m = t.getDocTreeFactory();
+            refParser = new ReferenceParser(t.getParserFactory());
+        }
+
+        /**
+         * Transforms a doc tree node.
+         * This node dispatches to a more specific overload, based on the kind of the node.
+         * The result may be the same as the argument if no transformations were made.
+         *
+         * @param tree the tree node
+         * @return a tree with any "extensions" converted into tags
+         */
+        public DCTree transform(DCTree tree) {
+            // The following switch statement could eventually be converted to a
+            // pattern switch. It is intended to be a total switch, with a default
+            // to catch any omissions.
+            return switch (tree.getKind()) {
+                // The following cannot contain Markdown and so always transform to themselves.
+                case ATTRIBUTE,
+                        CODE, COMMENT,
+                        DOC_ROOT, DOC_TYPE,
+                        END_ELEMENT, ENTITY, ERRONEOUS, ESCAPE,
+                        IDENTIFIER, INHERIT_DOC,
+                        LITERAL,
+                        REFERENCE,
+                        SNIPPET, START_ELEMENT, SYSTEM_PROPERTY,
+                        TEXT,
+                        VALUE -> tree;
+
+                // The following may contain Markdown in at least one of their fields.
+                case AUTHOR -> transform((DCTree.DCAuthor) tree);
+                case DEPRECATED -> transform((DCTree.DCDeprecated) tree);
+                case DOC_COMMENT -> transform((DCTree.DCDocComment) tree);
+                case EXCEPTION, THROWS -> transform((DCTree.DCThrows) tree);
+                case HIDDEN -> transform((DCTree.DCHidden) tree);
+                case INDEX -> transform((DCTree.DCIndex) tree);
+                case LINK, LINK_PLAIN -> transform((DCTree.DCLink) tree);
+                case PARAM -> transform((DCTree.DCParam) tree);
+                case PROVIDES -> transform((DCTree.DCProvides) tree);
+                case RETURN -> transform((DCTree.DCReturn) tree);
+                case SEE -> transform((DCTree.DCSee) tree);
+                case SERIAL -> transform((DCTree.DCSerial) tree);
+                case SERIAL_DATA -> transform((DCTree.DCSerialData) tree);
+                case SERIAL_FIELD -> transform((DCTree.DCSerialField) tree);
+                case SINCE -> transform((DCTree.DCSince) tree);
+                case SPEC -> transform((DCTree.DCSpec) tree);
+                case SUMMARY -> transform((DCTree.DCSummary) tree);
+                case UNKNOWN_BLOCK_TAG -> transform((DCTree.DCUnknownBlockTag) tree);
+                case UNKNOWN_INLINE_TAG -> transform((DCTree.DCUnknownInlineTag) tree);
+                case USES -> transform((DCTree.DCUses) tree);
+                case VERSION -> transform((DCTree.DCVersion) tree);
+
+                // This should never be handled directly; instead it should be handled as part of
+                //   transform(List<? extends DocTree>);
+                // because a Markdown node has the potential to be split into multiple nodes.
+                case MARKDOWN -> throw new IllegalArgumentException(tree.getKind().toString());
+
+                // Catch in case new kinds are added
+                default -> throw new IllegalArgumentException(tree.getKind().toString());
+            };
+        }
+
+        /**
+         * Transforms a list of doc tree nodes.
+         * If any of the nodes contain Markdown, the Markdown source is parsed
+         * and analyzed for any transformations.
+         * Any non-Markdown nodes are individually transformed.
+         *
+         * @param trees the list of tree nodes to be transformed
+         * @return the transformed list
+         */
+        private List<? extends DCTree> transform(List<? extends DCTree> trees) {
+            boolean hasMarkdown = trees.stream().anyMatch(t -> t.getKind() == DocTree.Kind.MARKDOWN);
+            if (hasMarkdown) {
+                var sourceBuilder = new StringBuilder();
+                var replacements = new ArrayList<>();
+
+                /*
+                 * Step 1: Convert the trees into a string containing Markdown text,
+                 *         using Unicode Object Replacement characters to mark the positions
+                 *         of non-Markdown content.
+                 */
+                for (DCTree tree : trees) {
+                    if (tree instanceof RawTextTree t) {
+                        if (t.getKind() != DocTree.Kind.MARKDOWN) {
+                            throw new IllegalStateException(t.getKind().toString());
+                        }
+                        String code = t.getContent();
+                        // handle the (unlikely) case of any U+FFFC characters existing in the code
+                        int start = 0;
+                        int pos;
+                        while ((pos = code.indexOf(PLACEHOLDER, start)) != -1) {
+                            replacements.add(PLACEHOLDER);
+                            start = pos + 1;
+                        }
+                        sourceBuilder.append(code);
+                    } else {
+                        replacements.add(transform(tree));
+                        sourceBuilder.append(PLACEHOLDER);
+                    }
+                }
+
+                /*
+                 * Step 2: Build a parser, and configure it to accept additional syntactic constructs,
+                 *         such as reference-style links to program elements.
+                 */
+                String source = sourceBuilder.toString();
+                Parser parser = Parser.builder()
+                        .extensions(List.of(TablesExtension.create()))
+                        .inlineParserFactory(new AutoRefInlineParserFactory(refParser, autorefScheme))
+                        .includeSourceSpans(IncludeSourceSpans.BLOCKS_AND_INLINES)
+                        .build();
+                Node document = parser.parse(source);
+
+                /*
+                 * Step 3: Analyze the parsed tree, converting it back to a list of DocTree nodes,
+                 *         consisting of Markdown text interspersed with any pre-existing
+                 *         DocTree nodes, as well as any new nodes created by converting
+                 *         parts of the Markdown tree into nodes for old-style javadoc tags.
+                 */
+                var firstTreePos = trees.getFirst().getStartPosition();
+                Lower v = new Lower(m, document, source, firstTreePos, replacements, autorefScheme);
+                document.accept(v);
+
+                return v.getTrees();
+
+            } else {
+                var list2 = trees.stream()
+                        .map(this::transform)
+                        .toList();
+                return equal(list2, trees) ? trees : list2;
+            }
+        }
+
+        //-----------------------------------------------------------------------------
+        //
+        // The following {@code transform} methods invoke {@code transform} on
+        // any children that may contain Markdown. If the transformations on
+        // the children are all identity transformations (that is the result
+        // of the transformations are the same as the originals) then the
+        // result of the overall transform is the original object. But if
+        // any transformation on the children is not an identity transformation
+        // then the result is a new node containing the transformed values.
+        //
+        // Thus, we only duplicate the parts of the tree that have changed,
+        // and we do not duplicate the parts of the tree that have not changed.
+
+        private DCTree.DCAuthor transform(DCTree.DCAuthor tree) {
+            var name2 = transform(tree.name);
+            return (equal(name2, tree.name))
+                    ? tree
+                    : m.at(tree.pos).newAuthorTree(name2);
+        }
+
+        private DCTree.DCDeprecated transform(DCTree.DCDeprecated tree) {
+            var body2 = transform(tree.body);
+            return (equal(body2, tree.body))
+                    ? tree
+                    : m.at(tree.pos).newDeprecatedTree(body2);
+        }
+
+        public DCTree.DCDocComment transform(DCTree.DCDocComment tree) {
+            var fullBody2 = transform(tree.fullBody);
+            var tags2 = transform(tree.tags);
+            // Note: preamble and postamble only appear in HTML files, so should always be
+            // null or empty for doc comments and/or Markdown files
+            var pre2 = transform(tree.preamble);
+            var post2 = transform(tree.postamble);
+            return (equal(fullBody2, tree.fullBody) && equal(tags2, tree.tags)
+                    && equal(pre2, tree.preamble) && equal(post2, tree.postamble))
+                    ? tree
+                    : m.at(tree.pos).newDocCommentTree(tree.comment, fullBody2, tags2, pre2, post2);
+        }
+
+        private DCTree.DCHidden transform(DCTree.DCHidden tree) {
+            var body2 = transform(tree.body);
+            return (equal(body2, tree.body))
+                    ? tree
+                    : m.at(tree.pos).newHiddenTree(body2);
+        }
+
+        private DCTree.DCIndex transform(DCTree.DCIndex tree) {
+            // The public API permits a DocTree, although in the implementation, it is always a TextTree.
+            var term2 = transform(tree.term);
+            var desc2 = transform(tree.description);
+            return (equal(term2, tree.term) && equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newIndexTree(term2, desc2).setEndPos(tree.getEndPos());
+        }
+
+        private DCTree.DCLink transform(DCTree.DCLink tree) {
+            var label2 = transform(tree.label);
+            return (equal(label2, tree.label))
+                    ? tree
+                    : switch (tree.getKind()) {
+                case LINK -> m.at(tree.pos).newLinkTree(tree.ref, label2).setEndPos(tree.getEndPos());
+                case LINK_PLAIN -> m.at(tree.pos).newLinkPlainTree(tree.ref, label2).setEndPos(tree.getEndPos());
+                default -> throw new IllegalArgumentException(tree.getKind().toString());
+            };
+        }
+
+        private DCTree.DCParam transform(DCTree.DCParam tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newParamTree(tree.isTypeParameter, tree.name, desc2);
+        }
+
+        private DCTree.DCProvides transform(DCTree.DCProvides tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newProvidesTree(tree.serviceType, desc2);
+        }
+
+        private DCTree.DCReturn transform(DCTree.DCReturn tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newReturnTree(tree.inline, desc2).setEndPos(tree.getEndPos());
+        }
+
+        private DCTree.DCSee transform(DCTree.DCSee tree) {
+            List<? extends DocTree> ref2 = transform(tree.reference);
+            return (equal(ref2, tree.getReference()))
+                    ? tree
+                    : m.at(tree.pos).newSeeTree(ref2);
+        }
+
+        private DCTree.DCSerial transform(DCTree.DCSerial tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newSerialTree(desc2);
+        }
+
+        private DCTree.DCSerialData transform(DCTree.DCSerialData tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newSerialDataTree(desc2);
+        }
+
+        private DCTree.DCSerialField transform(DCTree.DCSerialField tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newSerialFieldTree(tree.name, tree.type, desc2);
+        }
+
+        DCTree.DCSince transform(DCTree.DCSince tree) {
+            var body2 = transform(tree.body);
+            return (equal(body2, tree.body))
+                    ? tree
+                    : m.at(tree.pos).newSinceTree(body2);
+        }
+
+        private DCTree.DCSpec transform(DCTree.DCSpec tree) {
+            var title2 = transform(tree.title);
+            return (equal(title2, tree.title))
+                    ? tree
+                    : m.at(tree.pos).newSpecTree(tree.uri, title2);
+        }
+
+        private DCTree.DCSummary transform(DCTree.DCSummary tree) {
+            var summ2 = transform(tree.summary);
+            return (equal(summ2, tree.summary))
+                    ? tree
+                    : m.at(tree.pos).newSummaryTree(summ2).setEndPos(tree.getEndPos());
+        }
+
+        private DCTree.DCThrows transform(DCTree.DCThrows tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : switch (tree.getKind()) {
+                case EXCEPTION -> m.at(tree.pos).newExceptionTree(tree.name, desc2);
+                case THROWS -> m.at(tree.pos).newThrowsTree(tree.name, desc2);
+                default -> throw new IllegalArgumentException(tree.getKind().toString());
+            };
+        }
+
+        private DCTree.DCUnknownBlockTag transform(DCTree.DCUnknownBlockTag tree) {
+            var cont2 = transform(tree.content);
+            return (equal(cont2, tree.content))
+                    ? tree
+                    : m.at(tree.pos).newUnknownBlockTagTree(tree.name, cont2);
+        }
+
+        private DCTree.DCUnknownInlineTag transform(DCTree.DCUnknownInlineTag tree) {
+            var cont2 = transform(tree.content);
+            return (equal(cont2, tree.content))
+                    ? tree
+                    : m.at(tree.pos).newUnknownInlineTagTree(tree.name, cont2).setEndPos(tree.getEndPos());
+        }
+
+        private DCTree.DCUses transform(DCTree.DCUses tree) {
+            var desc2 = transform(tree.description);
+            return (equal(desc2, tree.description))
+                    ? tree
+                    : m.at(tree.pos).newUsesTree(tree.serviceType, desc2);
+        }
+
+        private DCTree.DCVersion transform(DCTree.DCVersion tree) {
+            var body2 = transform(tree.body);
+            return (equal(body2, tree.body))
+                    ? tree
+                    : m.at(tree.pos).newVersionTree(body2);
+        }
+
+        /**
+         * Shallow "equals" for two doc tree nodes.
+         *
+         * @param <T> the type of the items
+         * @param item1 the first item
+         * @param item2 the second item
+         * @return {@code true} if the items are reference-equal, and {@code false} otherwise
+         */
+        private static <T extends DocTree> boolean equal(T item1, T item2) {
+            return item1 == item2;
+        }
+
+        /**
+         * Shallow "equals" for two lists of doc tree nodes.
+         *
+         * @param <T> the type of the items
+         * @param list1 the first item
+         * @param list2 the second item
+         * @return {@code true} if the items are reference-equal, and {@code false} otherwise
+         */
+        private static <T extends DocTree> boolean equal(List<? extends T> list1, List<? extends T> list2) {
+            if (list1 == null || list2 == null) {
+                return (list1 == list2);
+            }
+
+            if (list1.size() != list2.size()) {
+                return false;
+            }
+
+            var iter1 = list1.iterator();
+            var iter2 = list2.iterator();
+            while (iter1.hasNext()) {
+                var item1 = iter1.next();
+                var item2 = iter2.next();
+                if (item1 != item2) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+
+    /**
+     * An {@code InlineParserFactory} that checks any unresolved link references in
+     * reference links. If an unresolved link reference appears to be a reference to a
+     * program element, such as may be used in {@code @see ...} or {@code {@link ...}}
+     * tags, it generates a synthetic {@code LinkReferenceDefinition}.
+     *
+     * The reference is not validated to ensure it refers to any existing element.
+     *
+     * The primary function of this {@code InlineParserFactory} is to provide
+     * a custom implementation of an {@code InlineParserContext} via the
+     * {@code create(InlineParserContext inlineParserContext)} method.
+     * It is this {@code InlineParserContext} that actually manages the set
+     * of link reference definitions.
+     *
+     * This {@code InlineParserFactory} is intended to be registered with a
+     * {@code Parser.Builder} using {@code setInlineParserFactory}.
+     */
+    private static class AutoRefInlineParserFactory implements InlineParserFactory {
+        private final ReferenceParser refParser;
+        private final String autorefScheme;
+
+        AutoRefInlineParserFactory(ReferenceParser refParser,
+                                   String autorefScheme) {
+            this.refParser = refParser;
+            this.autorefScheme = autorefScheme;
+        }
+
+        /**
+         * Creates a parser with a modified {@code InlineParserContext} that
+         * delegates to the standard {@code InlineParserContext} and also
+         * checks unresolved link references.
+         *
+         * @param inlineParserContext the standard {@code InlineParserContext}
+         * @return the {@code InlineParser}
+         */
+        @Override
+        public InlineParser create(InlineParserContext inlineParserContext) {
+            return new InlineParserImpl(new InlineParserContext() {
+
+                @Override
+                public List<DelimiterProcessor> getCustomDelimiterProcessors() {
+                    return inlineParserContext.getCustomDelimiterProcessors();
+                }
+
+                /**
+                 * {@inheritDoc}
+                 *
+                 * If the given label does not match any explicitly defined
+                 * link reference definition, but does match a reference
+                 * to a program element, a synthetic link reference definition
+                 * is returned, with the label prefixed by the {@code autorefScheme}.
+                 *
+                 * @param label the link label to look up
+                 * @return the link reference definition for the label, or {@code null}
+                 */
+                @Override
+                public LinkReferenceDefinition getLinkReferenceDefinition(String label) {
+                    // In CommonMark, square brackets characters need to be escaped within a link label.
+                    // See https://spec.commonmark.org/0.30/#link-label
+                    //   Unescaped square bracket characters are not allowed inside the opening
+                    //   and closing square brackets of link labels.
+                    // The escape characters are still present here in the label,
+                    // so we remove them before creating the autoref URL.
+                    // Note that the characters always appear together as a pair in API references.
+                    var l = label.replace("\\[\\]", "[]");
+                    var d = inlineParserContext.getLinkReferenceDefinition(l);
+                    return d == null && isReference(l)
+                            ? new LinkReferenceDefinition("", autorefScheme + l, "")
+                            : d;
+                }
+            });
+        }
+
+        /**
+         * {@return whether a string appears to be a reference to a program element}
+         *
+         * @param s the string
+         */
+        private boolean isReference(String s) {
+            try {
+                refParser.parse(s, ReferenceParser.Mode.MEMBER_OPTIONAL);
+                return true;
+            } catch (ReferenceParser.ParseException e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * A visitor to scan a Markdown document looking for any constructs that
+     * should be mapped to doc comment nodes.
+     *
+     * The intended use is as follows:
+     * {@snippet
+     *     Lower v = new Lower(document, source, replacements);
+     *     document.accept(v);
+     *     var result = v.getTrees();
+     * }
+     *
+     * On coordinates ...
+     *
+     * There are various position/coordinate systems in play in this code:
+     *
+     * 1. Tree positions, which correspond to positions in the original comment,
+     *    represented as a 0-based character offset within the content of the comment.
+     * 2. Positions in the source string given to the Markdown parser,
+     *    represented as a 0-based character offset within the source string.
+     *    These differ from positions in the original comment if the source string
+     *    contains U+FFFC characters representing embedded tree nodes.
+     * 3. Positions in the source string given to the Markdown parser,
+     *    represented as (line, column) values within SourceSpan nodes.
+     *    Both line and column are 0-based.
+     *    Note: SourceSpan objects never include newline characters.
+     *
+     * See {@link Lower#toSourcePos(int, int)} to convert from (line, column)
+     * coordinates to a source position.
+     * See {@link Lower#sourcePosToTreePos(int)} to convert from a source
+     * position to a position in the original comment, for use in tree nodes.
+     */
+
+    // Future opportunity:
+    //
+    // It would be possible to override {@code visit(Heading)} and
+    // check for certain recognized headings, and for those headings,
+    // check the content that follows up to but not including
+    // the next heading at the same or higher level, or end of text.
+    // When a match occurs, the heading and the content could be translated
+    // into one or more block tags. Note that any such block tags should
+    // probably be stored separately from {@code trees}, and handled
+    // appropriately by the caller of this method, either by accepting
+    // such tags, or by reporting an error if they are not applicable.
+    //
+    // A variant would be to pass in a boolean parameter to indicate
+    // whether such tags would be acceptable if found, and to ignore
+    // the heading and content if the block tag would not be acceptable.
+    //
+    // If a heading and any following content is converted to a block tag,
+    // the content should probably be removed from the tree, so that
+    // it is not handled by the call of {@code visitChildren} that
+    // invoked {@code visit(Heading)}.
+    //
+    // Overall, this would allow Markdown constructs such as the following:
+    //
+    // /// Method description.
+    // ///
+    // /// # Parameters
+    // /// * args
+    // ///
+    // /// # Returns
+    // ///   a result
+    // ///
+    // /// # Throws
+    // /// * IOException if an error occurs
+    //
+    // That being said, is it so much better than using standard block tags?
+    // It is somewhat more concise for any repeatable block tag, if we
+    // leverage the idea of a heading followed by a list.
+    private static class Lower extends AbstractVisitor {
+        private final DocTreeMaker m;
+        private final String autorefScheme;
+
+        /**
+         * The Markdown document being processed.
+         */
+        private final Node document;
+
+        /**
+         * The source for the Markdown document being processed.
+         * The document has "source spans" that indirectly point into this string
+         * using {@code (line, column)} coordinates.
+         * @see #toSourcePos(int, int)
+         */
+        private final String source;
+
+        /**
+         * An array giving the position of the first character after each newline
+         * in the source.
+         * Used to convert {@code (line, column)} coordinates to a character offset
+         * in {@code source}.
+         */
+        private final int[] sourceLineOffsets;
+
+        /**
+         * An iterator containing the values to be substituted into the generated
+         * tree when U+FFFC characters are encountered in the document.
+         * There is a 1-1 correspondence between the values returned by the
+         * iterator and the U+FFFC characters in the document.
+         * The replacement objects may be either {@code DCTree} objects or
+         * U+FFFC characters that were found in the original document.
+         */
+        private final Iterator<?> replaceIter;
+
+        /**
+         * The list of trees being built.
+         * It may be temporarily replaced while visiting the children of
+         * {@code Link} codes.
+         */
+        private List<DCTree> trees;
+
+        /**
+         * The source text being accumulated, prior to being placed in a
+         * Markdown source node ({@code RawTextTree} with kind {@code MARKDOWN}).
+         */
+        private final StringBuilder text;
+
+        /**
+         * The initial position in the enclosing comment of the source
+         * being transformed.
+         */
+        private int mainStartPos;
+
+        /**
+         * The start of source text to be copied literally when required.
+         */
+        private int copyStartPos;
+
+        /**
+         * The current adjustment from positions in {@code source} to positions
+         * in the original comment, as used in doc tree nodes.
+         * The difference arises because of the use of U+FFFC characters for
+         * embedded objects. As the document (and source) are scanned,
+         * this offset is updated when U+FFFC characters are encountered.
+         */
+        private int replaceAdjustPos;
+
+        /**
+         * The pattern for a line break.
+         * This is equivalent to the detection in the Markdown parser, so that
+         * {@code (line, column)} coordinates can be accurately converted back
+         * into source positions.
+         *
+         * @see jdk.internal.org.commonmark.internal.DocumentParser#parse(String)
+         * @see jdk.internal.org.commonmark.internal.util.Parsing#findLineBreak(CharSequence, int)
+         */
+        private static final Pattern lineBreak = Pattern.compile("\n|\r\n?");
+
+        /**
+         * Creates an instance of the visitor, given a document,
+         * the source text for the document and objects to be substituted
+         * when U+FFFC characters are encountered.
+         *
+         * Note the document does not itself contain any source text:
+         * it just contains {@code SourceSpan} objects that point into
+         * the source text using line and column indices.
+         *
+         * @param document the document to be converted
+         * @param source the source of the document to be converted
+         * @param sourcePos the position in the enclosing comment of the source to be converted
+         * @param replacements the objects to be substituted when U+FFFC is encountered
+         * @param autorefScheme the scheme used for auto-generated references
+         */
+        public Lower(DocTreeMaker docTreeMaker,
+                     Node document,
+                     String source, int sourcePos,
+                     List<?> replacements,
+                     String autorefScheme) {
+            this.m = docTreeMaker;
+            this.document = document;
+            this.source = source;
+            this.autorefScheme = autorefScheme;
+
+            sourceLineOffsets = Stream.concat(
+                            Stream.of(0),
+                            lineBreak.matcher(source).results().map(MatchResult::end))
+                    .mapToInt(Integer::intValue)
+                    .toArray();
+
+            replaceIter = replacements.iterator();
+
+            trees = new ArrayList<>();
+            text = new StringBuilder();
+            mainStartPos = sourcePos;
+            copyStartPos = 0;
+            replaceAdjustPos = 0;
+        }
+
+        /**
+         * {@return the trees that were built after using the visitor}
+         */
+        public List<DCTree> getTrees() {
+            return trees;
+        }
+
+        /**
+         * Visits a CommonMark {@code Link} node.
+         *
+         * If the destination for the link begins with the {@code autorefScheme}
+         * convert it to {@code {@link ...}} or {@code {@linkplain ...}} DocTree node.
+         * {@code {@link ...}} will be used if the content (label) for
+         * the link is the same as the reference found after the {@code code:};
+         * otherwise, {@code {@linkplain ...}} will be used.
+         *
+         * The label will be left blank for {@code {@link ...}} nodes,
+         * implying that a default label should be used, based on the
+         * program element that was referenced.
+         *
+         * @param link the link node
+         */
+        @Override
+        public void visit(Link link) {
+            String dest = link.getDestination();
+            if (dest.startsWith(autorefScheme)) {
+                // copy the source text up to the start of the node
+                copyTo(getStartPos(link));
+                // push temporary value for {@code trees} while handling the content of the node
+                var saveTrees = trees;
+                trees = new ArrayList<>();
+                try {
+                    copyStartPos = getStartPos(link.getFirstChild());
+                    visitChildren(link);
+                    copyTo(getEndPos(link.getLastChild()));
+
+                    // determine whether to use {@link ... } or {@linkplain ...}
+                    // based on whether the "link text" is the same as the "link destination"
+                    String ref = dest.substring(autorefScheme.length());
+                    int refPos = sourcePosToTreePos(getRefPos(ref, link));
+                    var newRefTree = m.at(refPos).newReferenceTree(ref).setEndPos(refPos + ref.length());
+
+                    Node child = link.getFirstChild();
+                    DocTree.Kind linkKind = child.getNext() == null
+                            && child instanceof Text t
+                            && t.getLiteral().equals(ref) ? DocTree.Kind.LINK : DocTree.Kind.LINK_PLAIN;
+
+                    DCTree newLinkTree = linkKind == DocTree.Kind.LINK
+                            ? m.at(NOPOS).newLinkTree(newRefTree, List.of()) // ignore the child trees
+                            : m.at(NOPOS).newLinkPlainTree(newRefTree, trees);
+
+                    saveTrees.add(newLinkTree);
+                } finally {
+                    // start any subsequent copy after the end of the link node
+                    copyStartPos = getEndPos(link);
+                    trees = saveTrees;
+                }
+            } else {
+                visitChildren(link);
+            }
+        }
+
+        /**
+         * {@return the position in the source for the reference in a link}
+         * Many syntactic forms may yield a {@code Link} object, so scan the
+         * source looking for a match. Since the reference typically comes
+         * after any text (when they are different), scan the source backwards.
+         *
+         * @param ref the reference to find
+         * @param link the link containing the reference
+         */
+        private int getRefPos(String ref, Link link) {
+            var spans = link.getSourceSpans();
+            var revSpanIter = spans.listIterator(spans.size());
+            while (revSpanIter.hasPrevious()) {
+                var span = revSpanIter.previous();
+                var start = toSourcePos(span.getLineIndex(), span.getColumnIndex());
+                var end = toSourcePos(span.getLineIndex(), span.getColumnIndex() + span.getLength());
+                var s = source.substring(start, end);
+                var index = s.lastIndexOf(ref);
+                if (index != -1) {
+                    return start + index;
+                }
+            }
+            return NOPOS;
+        }
+
+        /**
+         * {@return the position in the original comment for a position in {@code source},
+         * using {@link #replaceAdjustPos}}
+         *
+         * @param pos the position in {@code source}
+         */
+        private int sourcePosToTreePos(int pos) {
+            return pos == NOPOS ? NOPOS : mainStartPos + pos + replaceAdjustPos;
+        }
+
+        /**
+         * Processes a node and any children.
+         *
+         * If the node has children, the children are each visited by
+         * calling their {@code accept} method, and then finally, if this
+         * is the top-level {@code document} node, any pending text is
+         * flushed.
+         *
+         * If the node does not have children, the source spans for
+         * the node are processed instead.
+         *
+         * Note that unlike the default implementation of {@code visitChildren},
+         * the next child is not accessed until after the current child
+         * has been visited.  This allows a child to peek at and possibly remove
+         * any child nodes that may follow it.
+         *
+         * @param node the node whose children should be visited
+         */
+        @Override
+        protected void visitChildren(Node node) {
+            Node child = node.getFirstChild();
+            if (child != null) {
+                while (child != null) {
+                    // defer getting the next child until after this node has
+                    // been processed, in case any following nodes were handled
+                    // by this node, and removed from the document
+                    child.accept(this);
+                    child = child.getNext();
+                }
+                if (node == document) {
+                    // the top level document has no spans of its own, so use the last child
+                    copyTo(getEndPos(document.getLastChild()));
+                }
+            }
+        }
+
+        /**
+         * {@return the start of this node, from the start of the first span}
+         *
+         * @param node the node
+         */
+        private int getStartPos(Node node) {
+            var spans = node.getSourceSpans();
+            var firstSpan = spans.getFirst();
+            return toSourcePos(firstSpan.getLineIndex(), firstSpan.getColumnIndex());
+        }
+
+        /**
+         * {@return the end of this node, from the end of the last span}
+         * The end points to the first character not included in the span.
+         *
+         * @param node the node
+         */
+        private int getEndPos(Node node) {
+            var spans = node.getSourceSpans();
+            var lastSpan = spans.getLast();
+            return toSourcePos(lastSpan.getLineIndex(), lastSpan.getColumnIndex() + lastSpan.getLength());
+        }
+
+        /**
+         * {@return the position in the {@code source} string for a given {@code (line, column}}
+         *
+         * @param lineIndex the line index
+         * @param columnIndex the column index
+         */
+        private int toSourcePos(int lineIndex, int columnIndex) {
+            return sourceLineOffsets[lineIndex] + columnIndex;
+        }
+
+        /**
+         * Copies source text from the saved copy-start position to the given end position
+         * using the saved {@code source}, to the list of {@code trees}.
+         *
+         * @param endPos the end position
+         */
+        private void copyTo(int endPos) {
+            int startPos = copyStartPos;
+            int rawTextStartPos = copyStartPos;
+            int pos;
+            while ((pos = source.indexOf(PLACEHOLDER, startPos)) != -1 && pos < endPos) {
+                text.append(source, startPos, pos);
+                assert replaceIter.hasNext();
+                Object r = replaceIter.next();
+                if (r instanceof DCTree t) {
+                    flushText(rawTextStartPos);
+                    trees.add(t);
+                    replaceAdjustPos += t.getEndPosition() - t.getStartPosition() - 1;
+                    rawTextStartPos = pos + 1;
+                } else if (r.equals(PLACEHOLDER)) {
+                    text.append(PLACEHOLDER);
+                } else {
+                    throw new IllegalStateException(r.getClass().toString());
+                }
+                startPos = pos + 1;
+            }
+            if (startPos < endPos) {
+                text.append(source, startPos, endPos);
+            }
+            flushText(rawTextStartPos);
+        }
+
+        /**
+         * Flushes any text in the {@code text} buffer, by creating a new
+         * Markdown source text node and adding it to the list of trees.
+         */
+        private void flushText(int pos) {
+            if (!text.isEmpty()) {
+                trees.add(m.at(sourcePosToTreePos(pos)).newRawTextTree(DocTree.Kind.MARKDOWN, text.toString()));
+                text.setLength(0);
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/Extension.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/Extension.java
new file mode 100644
index 00000000000..b0f1ed378f6
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/Extension.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark;
+
+/**
+ * Base interface for a parser/renderer extension.
+ * <p>
+ * Doesn't have any methods itself, but has specific sub interfaces to
+ * configure parser/renderer. This base interface is for convenience, so that a list of extensions can be built and then
+ * used for configuring both the parser and renderer in the same way.
+ */
+public interface Extension {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBlock.java
new file mode 100644
index 00000000000..95e6676b137
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBlock.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomBlock;
+
+/**
+ * Table block containing a {@link TableHead} and optionally a {@link TableBody}.
+ */
+public class TableBlock extends CustomBlock {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBody.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBody.java
new file mode 100644
index 00000000000..7f0361467d3
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableBody.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomNode;
+
+/**
+ * Body part of a {@link TableBlock} containing {@link TableRow TableRows}.
+ */
+public class TableBody extends CustomNode {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableCell.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableCell.java
new file mode 100644
index 00000000000..3613fc2aea1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableCell.java
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomNode;
+
+/**
+ * Table cell of a {@link TableRow} containing inline nodes.
+ */
+public class TableCell extends CustomNode {
+
+    private boolean header;
+    private Alignment alignment;
+    private int width;
+
+    /**
+     * @return whether the cell is a header or not
+     */
+    public boolean isHeader() {
+        return header;
+    }
+
+    public void setHeader(boolean header) {
+        this.header = header;
+    }
+
+    /**
+     * @return the cell alignment or {@code null} if no specific alignment
+     */
+    public Alignment getAlignment() {
+        return alignment;
+    }
+
+    public void setAlignment(Alignment alignment) {
+        this.alignment = alignment;
+    }
+
+    /**
+     * @return the cell width (the number of dash and colon characters in the delimiter row of the table for this column)
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    /**
+     * How the cell is aligned horizontally.
+     */
+    public enum Alignment {
+        LEFT, CENTER, RIGHT
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableHead.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableHead.java
new file mode 100644
index 00000000000..3cff03071f8
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableHead.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomNode;
+
+/**
+ * Head part of a {@link TableBlock} containing {@link TableRow TableRows}.
+ */
+public class TableHead extends CustomNode {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableRow.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableRow.java
new file mode 100644
index 00000000000..b50d6cc0c38
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TableRow.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.node.CustomNode;
+
+/**
+ * Table row of a {@link TableHead} or {@link TableBody} containing {@link TableCell TableCells}.
+ */
+public class TableRow extends CustomNode {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TablesExtension.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TablesExtension.java
new file mode 100644
index 00000000000..63cd4f8e2e5
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/TablesExtension.java
@@ -0,0 +1,117 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.ext.gfm.tables.internal.TableBlockParser;
+import jdk.internal.org.commonmark.ext.gfm.tables.internal.TableHtmlNodeRenderer;
+import jdk.internal.org.commonmark.ext.gfm.tables.internal.TableMarkdownNodeRenderer;
+import jdk.internal.org.commonmark.ext.gfm.tables.internal.TableTextContentNodeRenderer;
+import jdk.internal.org.commonmark.parser.Parser;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererFactory;
+import jdk.internal.org.commonmark.renderer.html.HtmlRenderer;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownNodeRendererFactory;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownRenderer;
+import jdk.internal.org.commonmark.renderer.text.TextContentNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.text.TextContentNodeRendererFactory;
+import jdk.internal.org.commonmark.renderer.text.TextContentRenderer;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Extension for GFM tables using "|" pipes (GitHub Flavored Markdown).
+ * <p>
+ * Create it with {@link #create()} and then configure it on the builders
+ * ({@link org.commonmark.parser.Parser.Builder#extensions(Iterable)},
+ * {@link HtmlRenderer.Builder#extensions(Iterable)}).
+ * </p>
+ * <p>
+ * The parsed tables are turned into {@link TableBlock} blocks.
+ * </p>
+ *
+ * @see <a href="https://github.github.com/gfm/#tables-extension-">Tables (extension) in GitHub Flavored Markdown Spec</a>
+ */
+public class TablesExtension implements Parser.ParserExtension, HtmlRenderer.HtmlRendererExtension,
+        TextContentRenderer.TextContentRendererExtension, MarkdownRenderer.MarkdownRendererExtension {
+
+    private TablesExtension() {
+    }
+
+    public static Extension create() {
+        return new TablesExtension();
+    }
+
+    @Override
+    public void extend(Parser.Builder parserBuilder) {
+        parserBuilder.customBlockParserFactory(new TableBlockParser.Factory());
+    }
+
+    @Override
+    public void extend(HtmlRenderer.Builder rendererBuilder) {
+        rendererBuilder.nodeRendererFactory(new HtmlNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(HtmlNodeRendererContext context) {
+                return new TableHtmlNodeRenderer(context);
+            }
+        });
+    }
+
+    @Override
+    public void extend(TextContentRenderer.Builder rendererBuilder) {
+        rendererBuilder.nodeRendererFactory(new TextContentNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(TextContentNodeRendererContext context) {
+                return new TableTextContentNodeRenderer(context);
+            }
+        });
+    }
+
+    @Override
+    public void extend(MarkdownRenderer.Builder rendererBuilder) {
+        rendererBuilder.nodeRendererFactory(new MarkdownNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(MarkdownNodeRendererContext context) {
+                return new TableMarkdownNodeRenderer(context);
+            }
+
+            @Override
+            public Set<Character> getSpecialCharacters() {
+                return Collections.singleton('|');
+            }
+        });
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableBlockParser.java
new file mode 100644
index 00000000000..aca4db8fc1c
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableBlockParser.java
@@ -0,0 +1,344 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.*;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TableBlockParser extends AbstractBlockParser {
+
+    private final TableBlock block = new TableBlock();
+    private final List<SourceLine> rowLines = new ArrayList<>();
+    private final List<TableCellInfo> columns;
+
+    private boolean canHaveLazyContinuationLines = true;
+
+    private TableBlockParser(List<TableCellInfo> columns, SourceLine headerLine) {
+        this.columns = columns;
+        this.rowLines.add(headerLine);
+    }
+
+    @Override
+    public boolean canHaveLazyContinuationLines() {
+        return canHaveLazyContinuationLines;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        CharSequence content = state.getLine().getContent();
+        int pipe = Characters.find('|', content, state.getNextNonSpaceIndex());
+        if (pipe != -1) {
+            if (pipe == state.getNextNonSpaceIndex()) {
+                // If we *only* have a pipe character (and whitespace), that is not a valid table row and ends the table.
+                if (Characters.skipSpaceTab(content, pipe + 1, content.length()) == content.length()) {
+                    // We also don't want the pipe to be added via lazy continuation.
+                    canHaveLazyContinuationLines = false;
+                    return BlockContinue.none();
+                }
+            }
+            return BlockContinue.atIndex(state.getIndex());
+        } else {
+            return BlockContinue.none();
+        }
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        rowLines.add(line);
+    }
+
+    @Override
+    public void parseInlines(InlineParser inlineParser) {
+        List<SourceSpan> sourceSpans = block.getSourceSpans();
+
+        SourceSpan headerSourceSpan = !sourceSpans.isEmpty() ? sourceSpans.get(0) : null;
+        Node head = new TableHead();
+        if (headerSourceSpan != null) {
+            head.addSourceSpan(headerSourceSpan);
+        }
+        block.appendChild(head);
+
+        TableRow headerRow = new TableRow();
+        headerRow.setSourceSpans(head.getSourceSpans());
+        head.appendChild(headerRow);
+
+        List<SourceLine> headerCells = split(rowLines.get(0));
+        int headerColumns = headerCells.size();
+        for (int i = 0; i < headerColumns; i++) {
+            SourceLine cell = headerCells.get(i);
+            TableCell tableCell = parseCell(cell, i, inlineParser);
+            tableCell.setHeader(true);
+            headerRow.appendChild(tableCell);
+        }
+
+        TableBody body = null;
+        // Body starts at index 2. 0 is header, 1 is separator.
+        for (int rowIndex = 2; rowIndex < rowLines.size(); rowIndex++) {
+            SourceLine rowLine = rowLines.get(rowIndex);
+            SourceSpan sourceSpan = rowIndex < sourceSpans.size() ? sourceSpans.get(rowIndex) : null;
+            List<SourceLine> cells = split(rowLine);
+            TableRow row = new TableRow();
+            if (sourceSpan != null) {
+                row.addSourceSpan(sourceSpan);
+            }
+
+            // Body can not have more columns than head
+            for (int i = 0; i < headerColumns; i++) {
+                SourceLine cell = i < cells.size() ? cells.get(i) : SourceLine.of("", null);
+                TableCell tableCell = parseCell(cell, i, inlineParser);
+                row.appendChild(tableCell);
+            }
+
+            if (body == null) {
+                // It's valid to have a table without body. In that case, don't add an empty TableBody node.
+                body = new TableBody();
+                block.appendChild(body);
+            }
+            body.appendChild(row);
+            body.addSourceSpan(sourceSpan);
+        }
+    }
+
+    private TableCell parseCell(SourceLine cell, int column, InlineParser inlineParser) {
+        TableCell tableCell = new TableCell();
+        SourceSpan sourceSpan = cell.getSourceSpan();
+        if (sourceSpan != null) {
+            tableCell.addSourceSpan(sourceSpan);
+        }
+
+        if (column < columns.size()) {
+            TableCellInfo cellInfo = columns.get(column);
+            tableCell.setAlignment(cellInfo.getAlignment());
+            tableCell.setWidth(cellInfo.getWidth());
+        }
+
+        CharSequence content = cell.getContent();
+        int start = Characters.skipSpaceTab(content, 0, content.length());
+        int end = Characters.skipSpaceTabBackwards(content, content.length() - 1, start);
+        inlineParser.parse(SourceLines.of(cell.substring(start, end + 1)), tableCell);
+
+        return tableCell;
+    }
+
+    private static List<SourceLine> split(SourceLine line) {
+        CharSequence row = line.getContent();
+        int nonSpace = Characters.skipSpaceTab(row, 0, row.length());
+        int cellStart = nonSpace;
+        int cellEnd = row.length();
+        if (row.charAt(nonSpace) == '|') {
+            // This row has leading/trailing pipes - skip the leading pipe
+            cellStart = nonSpace + 1;
+            // Strip whitespace from the end but not the pipe or we could miss an empty ("||") cell
+            int nonSpaceEnd = Characters.skipSpaceTabBackwards(row, row.length() - 1, cellStart);
+            cellEnd = nonSpaceEnd + 1;
+        }
+        List<SourceLine> cells = new ArrayList<>();
+        StringBuilder sb = new StringBuilder();
+        for (int i = cellStart; i < cellEnd; i++) {
+            char c = row.charAt(i);
+            switch (c) {
+                case '\\':
+                    if (i + 1 < cellEnd && row.charAt(i + 1) == '|') {
+                        // Pipe is special for table parsing. An escaped pipe doesn't result in a new cell, but is
+                        // passed down to inline parsing as an unescaped pipe. Note that that applies even for the `\|`
+                        // in an input like `\\|` - in other words, table parsing doesn't support escaping backslashes.
+                        sb.append('|');
+                        i++;
+                    } else {
+                        // Preserve backslash before other characters or at end of line.
+                        sb.append('\\');
+                    }
+                    break;
+                case '|':
+                    String content = sb.toString();
+
+                    cells.add(SourceLine.of(content, line.substring(cellStart, i).getSourceSpan()));
+                    sb.setLength(0);
+                    // + 1 to skip the pipe itself for the next cell's span
+                    cellStart = i + 1;
+                    break;
+                default:
+                    sb.append(c);
+            }
+        }
+        if (sb.length() > 0) {
+            String content = sb.toString();
+            cells.add(SourceLine.of(content, line.substring(cellStart, line.getContent().length()).getSourceSpan()));
+        }
+        return cells;
+    }
+
+    // Examples of valid separators:
+    //
+    // |-
+    // -|
+    // |-|
+    // -|-
+    // |-|-|
+    // --- | ---
+    private static List<TableCellInfo> parseSeparator(CharSequence s) {
+        List<TableCellInfo> columns = new ArrayList<>();
+        int pipes = 0;
+        boolean valid = false;
+        int i = 0;
+        int width = 0;
+        while (i < s.length()) {
+            char c = s.charAt(i);
+            switch (c) {
+                case '|':
+                    i++;
+                    pipes++;
+                    if (pipes > 1) {
+                        // More than one adjacent pipe not allowed
+                        return null;
+                    }
+                    // Need at lest one pipe, even for a one column table
+                    valid = true;
+                    break;
+                case '-':
+                case ':':
+                    if (pipes == 0 && !columns.isEmpty()) {
+                        // Need a pipe after the first column (first column doesn't need to start with one)
+                        return null;
+                    }
+                    boolean left = false;
+                    boolean right = false;
+                    if (c == ':') {
+                        left = true;
+                        i++;
+                        width++;
+                    }
+                    boolean haveDash = false;
+                    while (i < s.length() && s.charAt(i) == '-') {
+                        i++;
+                        width++;
+                        haveDash = true;
+                    }
+                    if (!haveDash) {
+                        // Need at least one dash
+                        return null;
+                    }
+                    if (i < s.length() && s.charAt(i) == ':') {
+                        right = true;
+                        i++;
+                        width++;
+                    }
+                    columns.add(new TableCellInfo(getAlignment(left, right), width));
+                    width = 0;
+                    // Next, need another pipe
+                    pipes = 0;
+                    break;
+                case ' ':
+                case '\t':
+                    // White space is allowed between pipes and columns
+                    i++;
+                    break;
+                default:
+                    // Any other character is invalid
+                    return null;
+            }
+        }
+        if (!valid) {
+            return null;
+        }
+        return columns;
+    }
+
+    private static TableCell.Alignment getAlignment(boolean left, boolean right) {
+        if (left && right) {
+            return TableCell.Alignment.CENTER;
+        } else if (left) {
+            return TableCell.Alignment.LEFT;
+        } else if (right) {
+            return TableCell.Alignment.RIGHT;
+        } else {
+            return null;
+        }
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            List<SourceLine> paragraphLines = matchedBlockParser.getParagraphLines().getLines();
+            if (paragraphLines.size() == 1 && Characters.find('|', paragraphLines.get(0).getContent(), 0) != -1) {
+                SourceLine line = state.getLine();
+                SourceLine separatorLine = line.substring(state.getIndex(), line.getContent().length());
+                List<TableCellInfo> columns = parseSeparator(separatorLine.getContent());
+                if (columns != null && !columns.isEmpty()) {
+                    SourceLine paragraph = paragraphLines.get(0);
+                    List<SourceLine> headerCells = split(paragraph);
+                    if (columns.size() >= headerCells.size()) {
+                        return BlockStart.of(new TableBlockParser(columns, paragraph))
+                                .atIndex(state.getIndex())
+                                .replaceActiveBlockParser();
+                    }
+                }
+            }
+            return BlockStart.none();
+        }
+    }
+
+    private static class TableCellInfo {
+        private final TableCell.Alignment alignment;
+        private final int width;
+
+        public TableCell.Alignment getAlignment() {
+            return alignment;
+        }
+
+        public int getWidth() {
+            return width;
+        }
+
+        public TableCellInfo(TableCell.Alignment alignment, int width) {
+            this.alignment = alignment;
+            this.width = width;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableHtmlNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableHtmlNodeRenderer.java
new file mode 100644
index 00000000000..7c9f74fec43
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableHtmlNodeRenderer.java
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.*;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.html.HtmlWriter;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class TableHtmlNodeRenderer extends TableNodeRenderer {
+
+    private final HtmlWriter htmlWriter;
+    private final HtmlNodeRendererContext context;
+
+    public TableHtmlNodeRenderer(HtmlNodeRendererContext context) {
+        this.htmlWriter = context.getWriter();
+        this.context = context;
+    }
+
+    protected void renderBlock(TableBlock tableBlock) {
+        htmlWriter.line();
+        htmlWriter.tag("table", getAttributes(tableBlock, "table"));
+        renderChildren(tableBlock);
+        htmlWriter.tag("/table");
+        htmlWriter.line();
+    }
+
+    protected void renderHead(TableHead tableHead) {
+        htmlWriter.line();
+        htmlWriter.tag("thead", getAttributes(tableHead, "thead"));
+        renderChildren(tableHead);
+        htmlWriter.tag("/thead");
+        htmlWriter.line();
+    }
+
+    protected void renderBody(TableBody tableBody) {
+        htmlWriter.line();
+        htmlWriter.tag("tbody", getAttributes(tableBody, "tbody"));
+        renderChildren(tableBody);
+        htmlWriter.tag("/tbody");
+        htmlWriter.line();
+    }
+
+    protected void renderRow(TableRow tableRow) {
+        htmlWriter.line();
+        htmlWriter.tag("tr", getAttributes(tableRow, "tr"));
+        renderChildren(tableRow);
+        htmlWriter.tag("/tr");
+        htmlWriter.line();
+    }
+
+    protected void renderCell(TableCell tableCell) {
+        String tagName = tableCell.isHeader() ? "th" : "td";
+        htmlWriter.line();
+        htmlWriter.tag(tagName, getCellAttributes(tableCell, tagName));
+        renderChildren(tableCell);
+        htmlWriter.tag("/" + tagName);
+        htmlWriter.line();
+    }
+
+    private Map<String, String> getAttributes(Node node, String tagName) {
+        return context.extendAttributes(node, tagName, Collections.<String, String>emptyMap());
+    }
+
+    private Map<String, String> getCellAttributes(TableCell tableCell, String tagName) {
+        if (tableCell.getAlignment() != null) {
+            return context.extendAttributes(tableCell, tagName, Collections.singletonMap("align", getAlignValue(tableCell.getAlignment())));
+        } else {
+            return context.extendAttributes(tableCell, tagName, Collections.<String, String>emptyMap());
+        }
+    }
+
+    private static String getAlignValue(TableCell.Alignment alignment) {
+        switch (alignment) {
+            case LEFT:
+                return "left";
+            case CENTER:
+                return "center";
+            case RIGHT:
+                return "right";
+        }
+        throw new IllegalStateException("Unknown alignment: " + alignment);
+    }
+
+    private void renderChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
new file mode 100644
index 00000000000..00712579a5b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableMarkdownNodeRenderer.java
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.*;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.markdown.MarkdownWriter;
+import jdk.internal.org.commonmark.text.AsciiMatcher;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The Table node renderer that is needed for rendering GFM tables (GitHub Flavored Markdown) to text content.
+ */
+public class TableMarkdownNodeRenderer extends TableNodeRenderer implements NodeRenderer {
+    private final MarkdownWriter writer;
+    private final MarkdownNodeRendererContext context;
+
+    private final AsciiMatcher pipe = AsciiMatcher.builder().c('|').build();
+
+    private final List<TableCell.Alignment> columns = new ArrayList<>();
+
+    public TableMarkdownNodeRenderer(MarkdownNodeRendererContext context) {
+        this.writer = context.getWriter();
+        this.context = context;
+    }
+
+    @Override
+    protected void renderBlock(TableBlock node) {
+        columns.clear();
+        writer.pushTight(true);
+        renderChildren(node);
+        writer.popTight();
+        writer.block();
+    }
+
+    @Override
+    protected void renderHead(TableHead node) {
+        renderChildren(node);
+        for (TableCell.Alignment columnAlignment : columns) {
+            writer.raw('|');
+            if (columnAlignment == TableCell.Alignment.LEFT) {
+                writer.raw(":---");
+            } else if (columnAlignment == TableCell.Alignment.RIGHT) {
+                writer.raw("---:");
+            } else if (columnAlignment == TableCell.Alignment.CENTER) {
+                writer.raw(":---:");
+            } else {
+                writer.raw("---");
+            }
+        }
+        writer.raw("|");
+        writer.block();
+    }
+
+    @Override
+    protected void renderBody(TableBody node) {
+        renderChildren(node);
+    }
+
+    @Override
+    protected void renderRow(TableRow node) {
+        renderChildren(node);
+        // Trailing | at the end of the line
+        writer.raw("|");
+        writer.block();
+    }
+
+    @Override
+    protected void renderCell(TableCell node) {
+        if (node.getParent() != null && node.getParent().getParent() instanceof TableHead) {
+            columns.add(node.getAlignment());
+        }
+        writer.raw("|");
+        writer.pushRawEscape(pipe);
+        renderChildren(node);
+        writer.popRawEscape();
+    }
+
+    private void renderChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableNodeRenderer.java
new file mode 100644
index 00000000000..c7b6beabb0d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableNodeRenderer.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.TableBlock;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableBody;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableCell;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableHead;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableRow;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+abstract class TableNodeRenderer implements NodeRenderer {
+
+    @Override
+    public Set<Class<? extends Node>> getNodeTypes() {
+        return new HashSet<>(Arrays.asList(
+                TableBlock.class,
+                TableHead.class,
+                TableBody.class,
+                TableRow.class,
+                TableCell.class
+        ));
+    }
+
+    @Override
+    public void render(Node node) {
+        if (node instanceof TableBlock) {
+            renderBlock((TableBlock) node);
+        } else if (node instanceof TableHead) {
+            renderHead((TableHead) node);
+        } else if (node instanceof TableBody) {
+            renderBody((TableBody) node);
+        } else if (node instanceof TableRow) {
+            renderRow((TableRow) node);
+        } else if (node instanceof TableCell) {
+            renderCell((TableCell) node);
+        }
+    }
+
+    protected abstract void renderBlock(TableBlock node);
+
+    protected abstract void renderHead(TableHead node);
+
+    protected abstract void renderBody(TableBody node);
+
+    protected abstract void renderRow(TableRow node);
+
+    protected abstract void renderCell(TableCell node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableTextContentNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableTextContentNodeRenderer.java
new file mode 100644
index 00000000000..3b618474bce
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/ext/gfm/tables/internal/TableTextContentNodeRenderer.java
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.ext.gfm.tables.internal;
+
+import jdk.internal.org.commonmark.ext.gfm.tables.TableBlock;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableBody;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableCell;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableHead;
+import jdk.internal.org.commonmark.ext.gfm.tables.TableRow;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.text.TextContentNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.text.TextContentWriter;
+
+/**
+ * The Table node renderer that is needed for rendering GFM tables (GitHub Flavored Markdown) to text content.
+ */
+public class TableTextContentNodeRenderer extends TableNodeRenderer {
+
+    private final TextContentWriter textContentWriter;
+    private final TextContentNodeRendererContext context;
+
+    public TableTextContentNodeRenderer(TextContentNodeRendererContext context) {
+        this.textContentWriter = context.getWriter();
+        this.context = context;
+    }
+
+    protected void renderBlock(TableBlock tableBlock) {
+        renderChildren(tableBlock);
+        if (tableBlock.getNext() != null) {
+            textContentWriter.write("\n");
+        }
+    }
+
+    protected void renderHead(TableHead tableHead) {
+        renderChildren(tableHead);
+    }
+
+    protected void renderBody(TableBody tableBody) {
+        renderChildren(tableBody);
+    }
+
+    protected void renderRow(TableRow tableRow) {
+        textContentWriter.line();
+        renderChildren(tableRow);
+        textContentWriter.line();
+    }
+
+    protected void renderCell(TableCell tableCell) {
+        renderChildren(tableCell);
+        textContentWriter.write('|');
+        textContentWriter.whitespace();
+    }
+
+    private void renderLastCell(TableCell tableCell) {
+        renderChildren(tableCell);
+    }
+
+    private void renderChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+
+            // For last cell in row, we dont render the delimiter.
+            if (node instanceof TableCell && next == null) {
+                renderLastCell((TableCell) node);
+            } else {
+                context.render(node);
+            }
+
+            node = next;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContent.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContent.java
new file mode 100644
index 00000000000..64e9e5f7bf1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContent.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+class BlockContent {
+
+    private final StringBuilder sb;
+
+    private int lineCount = 0;
+
+    public BlockContent() {
+        sb = new StringBuilder();
+    }
+
+    public BlockContent(String content) {
+        sb = new StringBuilder(content);
+    }
+
+    public void add(CharSequence line) {
+        if (lineCount != 0) {
+            sb.append('\n');
+        }
+        sb.append(line);
+        lineCount++;
+    }
+
+    public String getString() {
+        return sb.toString();
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContinueImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContinueImpl.java
new file mode 100644
index 00000000000..47697018e40
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockContinueImpl.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.parser.block.BlockContinue;
+
+public class BlockContinueImpl extends BlockContinue {
+
+    private final int newIndex;
+    private final int newColumn;
+    private final boolean finalize;
+
+    public BlockContinueImpl(int newIndex, int newColumn, boolean finalize) {
+        this.newIndex = newIndex;
+        this.newColumn = newColumn;
+        this.finalize = finalize;
+    }
+
+    public int getNewIndex() {
+        return newIndex;
+    }
+
+    public int getNewColumn() {
+        return newColumn;
+    }
+
+    public boolean isFinalize() {
+        return finalize;
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockQuoteParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockQuoteParser.java
new file mode 100644
index 00000000000..db6f81976b4
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockQuoteParser.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.BlockQuote;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+public class BlockQuoteParser extends AbstractBlockParser {
+
+    private final BlockQuote block = new BlockQuote();
+
+    @Override
+    public boolean isContainer() {
+        return true;
+    }
+
+    @Override
+    public boolean canContain(Block block) {
+        return true;
+    }
+
+    @Override
+    public BlockQuote getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        int nextNonSpace = state.getNextNonSpaceIndex();
+        if (isMarker(state, nextNonSpace)) {
+            int newColumn = state.getColumn() + state.getIndent() + 1;
+            // optional following space or tab
+            if (Characters.isSpaceOrTab(state.getLine().getContent(), nextNonSpace + 1)) {
+                newColumn++;
+            }
+            return BlockContinue.atColumn(newColumn);
+        } else {
+            return BlockContinue.none();
+        }
+    }
+
+    private static boolean isMarker(ParserState state, int index) {
+        CharSequence line = state.getLine().getContent();
+        return state.getIndent() < Parsing.CODE_BLOCK_INDENT && index < line.length() && line.charAt(index) == '>';
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            if (isMarker(state, nextNonSpace)) {
+                int newColumn = state.getColumn() + state.getIndent() + 1;
+                // optional following space or tab
+                if (Characters.isSpaceOrTab(state.getLine().getContent(), nextNonSpace + 1)) {
+                    newColumn++;
+                }
+                return BlockStart.of(new BlockQuoteParser()).atColumn(newColumn);
+            } else {
+                return BlockStart.none();
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockStartImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockStartImpl.java
new file mode 100644
index 00000000000..bde28136b82
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/BlockStartImpl.java
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.parser.block.BlockParser;
+import jdk.internal.org.commonmark.parser.block.BlockStart;
+
+public class BlockStartImpl extends BlockStart {
+
+    private final BlockParser[] blockParsers;
+    private int newIndex = -1;
+    private int newColumn = -1;
+    private boolean replaceActiveBlockParser = false;
+
+    public BlockStartImpl(BlockParser... blockParsers) {
+        this.blockParsers = blockParsers;
+    }
+
+    public BlockParser[] getBlockParsers() {
+        return blockParsers;
+    }
+
+    public int getNewIndex() {
+        return newIndex;
+    }
+
+    public int getNewColumn() {
+        return newColumn;
+    }
+
+    public boolean isReplaceActiveBlockParser() {
+        return replaceActiveBlockParser;
+    }
+
+    @Override
+    public BlockStart atIndex(int newIndex) {
+        this.newIndex = newIndex;
+        return this;
+    }
+
+    @Override
+    public BlockStart atColumn(int newColumn) {
+        this.newColumn = newColumn;
+        return this;
+    }
+
+    @Override
+    public BlockStart replaceActiveBlockParser() {
+        this.replaceActiveBlockParser = true;
+        return this;
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Bracket.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Bracket.java
new file mode 100644
index 00000000000..373d3ac1663
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Bracket.java
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.beta.Position;
+
+/**
+ * Opening bracket for links (<code>[</code>) or images (<code>![</code>).
+ */
+public class Bracket {
+
+    public final Text node;
+
+    /**
+     * The position of the marker for the bracket (<code>[</code> or <code>![</code>)
+     */
+    public final Position markerPosition;
+
+    /**
+     * The position of the content (after the opening bracket)
+     */
+    public final Position contentPosition;
+
+    /**
+     * Whether this is an image or link.
+     */
+    public final boolean image;
+
+    /**
+     * Previous bracket.
+     */
+    public final Bracket previous;
+
+    /**
+     * Previous delimiter (emphasis, etc) before this bracket.
+     */
+    public final Delimiter previousDelimiter;
+
+    /**
+     * Whether this bracket is allowed to form a link/image (also known as "active").
+     */
+    public boolean allowed = true;
+
+    /**
+     * Whether there is an unescaped bracket (opening or closing) anywhere after this opening bracket.
+     */
+    public boolean bracketAfter = false;
+
+    static public Bracket link(Text node, Position markerPosition, Position contentPosition, Bracket previous, Delimiter previousDelimiter) {
+        return new Bracket(node, markerPosition, contentPosition, previous, previousDelimiter, false);
+    }
+
+    static public Bracket image(Text node, Position markerPosition, Position contentPosition, Bracket previous, Delimiter previousDelimiter) {
+        return new Bracket(node, markerPosition, contentPosition, previous, previousDelimiter, true);
+    }
+
+    private Bracket(Text node, Position markerPosition, Position contentPosition, Bracket previous, Delimiter previousDelimiter, boolean image) {
+        this.node = node;
+        this.markerPosition = markerPosition;
+        this.contentPosition = contentPosition;
+        this.image = image;
+        this.previous = previous;
+        this.previousDelimiter = previousDelimiter;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Delimiter.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Delimiter.java
new file mode 100644
index 00000000000..8437594dd6d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/Delimiter.java
@@ -0,0 +1,114 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterRun;
+
+import java.util.List;
+
+/**
+ * Delimiter (emphasis, strong emphasis or custom emphasis).
+ */
+public class Delimiter implements DelimiterRun {
+
+    public final List<Text> characters;
+    public final char delimiterChar;
+    private final int originalLength;
+
+    // Can open emphasis, see spec.
+    private final boolean canOpen;
+
+    // Can close emphasis, see spec.
+    private final boolean canClose;
+
+    public Delimiter previous;
+    public Delimiter next;
+
+    public Delimiter(List<Text> characters, char delimiterChar, boolean canOpen, boolean canClose, Delimiter previous) {
+        this.characters = characters;
+        this.delimiterChar = delimiterChar;
+        this.canOpen = canOpen;
+        this.canClose = canClose;
+        this.previous = previous;
+        this.originalLength = characters.size();
+    }
+
+    @Override
+    public boolean canOpen() {
+        return canOpen;
+    }
+
+    @Override
+    public boolean canClose() {
+        return canClose;
+    }
+
+    @Override
+    public int length() {
+        return characters.size();
+    }
+
+    @Override
+    public int originalLength() {
+        return originalLength;
+    }
+
+    @Override
+    public Text getOpener() {
+        return characters.get(characters.size() - 1);
+    }
+
+    @Override
+    public Text getCloser() {
+        return characters.get(0);
+    }
+
+    @Override
+    public Iterable<Text> getOpeners(int length) {
+        if (!(length >= 1 && length <= length())) {
+            throw new IllegalArgumentException("length must be between 1 and " + length() + ", was " + length);
+        }
+
+        return characters.subList(characters.size() - length, characters.size());
+    }
+
+    @Override
+    public Iterable<Text> getClosers(int length) {
+        if (!(length >= 1 && length <= length())) {
+            throw new IllegalArgumentException("length must be between 1 and " + length() + ", was " + length);
+        }
+
+        return characters.subList(0, length);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentBlockParser.java
new file mode 100644
index 00000000000..8f18feed1a0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentBlockParser.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.Document;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.block.AbstractBlockParser;
+import jdk.internal.org.commonmark.parser.block.BlockContinue;
+import jdk.internal.org.commonmark.parser.block.ParserState;
+
+public class DocumentBlockParser extends AbstractBlockParser {
+
+    private final Document document = new Document();
+
+    @Override
+    public boolean isContainer() {
+        return true;
+    }
+
+    @Override
+    public boolean canContain(Block block) {
+        return true;
+    }
+
+    @Override
+    public Document getBlock() {
+        return document;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        return BlockContinue.atIndex(state.getIndex());
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentParser.java
new file mode 100644
index 00000000000..34ac293d891
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/DocumentParser.java
@@ -0,0 +1,639 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.*;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.*;
+
+public class DocumentParser implements ParserState {
+
+    private static final Set<Class<? extends Block>> CORE_FACTORY_TYPES = new LinkedHashSet<>(Arrays.asList(
+            BlockQuote.class,
+            Heading.class,
+            FencedCodeBlock.class,
+            HtmlBlock.class,
+            ThematicBreak.class,
+            ListBlock.class,
+            IndentedCodeBlock.class));
+
+    private static final Map<Class<? extends Block>, BlockParserFactory> NODES_TO_CORE_FACTORIES;
+
+    static {
+        Map<Class<? extends Block>, BlockParserFactory> map = new HashMap<>();
+        map.put(BlockQuote.class, new BlockQuoteParser.Factory());
+        map.put(Heading.class, new HeadingParser.Factory());
+        map.put(FencedCodeBlock.class, new FencedCodeBlockParser.Factory());
+        map.put(HtmlBlock.class, new HtmlBlockParser.Factory());
+        map.put(ThematicBreak.class, new ThematicBreakParser.Factory());
+        map.put(ListBlock.class, new ListBlockParser.Factory());
+        map.put(IndentedCodeBlock.class, new IndentedCodeBlockParser.Factory());
+        NODES_TO_CORE_FACTORIES = Collections.unmodifiableMap(map);
+    }
+
+    private SourceLine line;
+
+    /**
+     * Line index (0-based)
+     */
+    private int lineIndex = -1;
+
+    /**
+     * current index (offset) in input line (0-based)
+     */
+    private int index = 0;
+
+    /**
+     * current column of input line (tab causes column to go to next 4-space tab stop) (0-based)
+     */
+    private int column = 0;
+
+    /**
+     * if the current column is within a tab character (partially consumed tab)
+     */
+    private boolean columnIsInTab;
+
+    private int nextNonSpace = 0;
+    private int nextNonSpaceColumn = 0;
+    private int indent = 0;
+    private boolean blank;
+
+    private final List<BlockParserFactory> blockParserFactories;
+    private final InlineParserFactory inlineParserFactory;
+    private final List<DelimiterProcessor> delimiterProcessors;
+    private final IncludeSourceSpans includeSourceSpans;
+    private final DocumentBlockParser documentBlockParser;
+    private final LinkReferenceDefinitions definitions = new LinkReferenceDefinitions();
+
+    private final List<OpenBlockParser> openBlockParsers = new ArrayList<>();
+    private final List<BlockParser> allBlockParsers = new ArrayList<>();
+
+    public DocumentParser(List<BlockParserFactory> blockParserFactories, InlineParserFactory inlineParserFactory,
+                          List<DelimiterProcessor> delimiterProcessors, IncludeSourceSpans includeSourceSpans) {
+        this.blockParserFactories = blockParserFactories;
+        this.inlineParserFactory = inlineParserFactory;
+        this.delimiterProcessors = delimiterProcessors;
+        this.includeSourceSpans = includeSourceSpans;
+
+        this.documentBlockParser = new DocumentBlockParser();
+        activateBlockParser(new OpenBlockParser(documentBlockParser, 0));
+    }
+
+    public static Set<Class<? extends Block>> getDefaultBlockParserTypes() {
+        return CORE_FACTORY_TYPES;
+    }
+
+    public static List<BlockParserFactory> calculateBlockParserFactories(List<BlockParserFactory> customBlockParserFactories, Set<Class<? extends Block>> enabledBlockTypes) {
+        List<BlockParserFactory> list = new ArrayList<>();
+        // By having the custom factories come first, extensions are able to change behavior of core syntax.
+        list.addAll(customBlockParserFactories);
+        for (Class<? extends Block> blockType : enabledBlockTypes) {
+            list.add(NODES_TO_CORE_FACTORIES.get(blockType));
+        }
+        return list;
+    }
+
+    public static void checkEnabledBlockTypes(Set<Class<? extends Block>> enabledBlockTypes) {
+        for (Class<? extends Block> enabledBlockType : enabledBlockTypes) {
+            if (!NODES_TO_CORE_FACTORIES.containsKey(enabledBlockType)) {
+                throw new IllegalArgumentException("Can't enable block type " + enabledBlockType + ", possible options are: " + NODES_TO_CORE_FACTORIES.keySet());
+            }
+        }
+    }
+
+    /**
+     * The main parsing function. Returns a parsed document AST.
+     */
+    public Document parse(String input) {
+        int lineStart = 0;
+        int lineBreak;
+        while ((lineBreak = Characters.findLineBreak(input, lineStart)) != -1) {
+            String line = input.substring(lineStart, lineBreak);
+            parseLine(line);
+            if (lineBreak + 1 < input.length() && input.charAt(lineBreak) == '\r' && input.charAt(lineBreak + 1) == '\n') {
+                lineStart = lineBreak + 2;
+            } else {
+                lineStart = lineBreak + 1;
+            }
+        }
+        if (input.length() > 0 && (lineStart == 0 || lineStart < input.length())) {
+            String line = input.substring(lineStart);
+            parseLine(line);
+        }
+
+        return finalizeAndProcess();
+    }
+
+    public Document parse(Reader input) throws IOException {
+        BufferedReader bufferedReader;
+        if (input instanceof BufferedReader) {
+            bufferedReader = (BufferedReader) input;
+        } else {
+            bufferedReader = new BufferedReader(input);
+        }
+
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            parseLine(line);
+        }
+
+        return finalizeAndProcess();
+    }
+
+    @Override
+    public SourceLine getLine() {
+        return line;
+    }
+
+    @Override
+    public int getIndex() {
+        return index;
+    }
+
+    @Override
+    public int getNextNonSpaceIndex() {
+        return nextNonSpace;
+    }
+
+    @Override
+    public int getColumn() {
+        return column;
+    }
+
+    @Override
+    public int getIndent() {
+        return indent;
+    }
+
+    @Override
+    public boolean isBlank() {
+        return blank;
+    }
+
+    @Override
+    public BlockParser getActiveBlockParser() {
+        return openBlockParsers.get(openBlockParsers.size() - 1).blockParser;
+    }
+
+    /**
+     * Analyze a line of text and update the document appropriately. We parse markdown text by calling this on each
+     * line of input, then finalizing the document.
+     */
+    private void parseLine(CharSequence ln) {
+        setLine(ln);
+
+        // For each containing block, try to parse the associated line start.
+        // The document will always match, so we can skip the first block parser and start at 1 matches
+        int matches = 1;
+        for (int i = 1; i < openBlockParsers.size(); i++) {
+            OpenBlockParser openBlockParser = openBlockParsers.get(i);
+            BlockParser blockParser = openBlockParser.blockParser;
+            findNextNonSpace();
+
+            BlockContinue result = blockParser.tryContinue(this);
+            if (result instanceof BlockContinueImpl) {
+                BlockContinueImpl blockContinue = (BlockContinueImpl) result;
+                openBlockParser.sourceIndex = getIndex();
+                if (blockContinue.isFinalize()) {
+                    addSourceSpans();
+                    closeBlockParsers(openBlockParsers.size() - i);
+                    return;
+                } else {
+                    if (blockContinue.getNewIndex() != -1) {
+                        setNewIndex(blockContinue.getNewIndex());
+                    } else if (blockContinue.getNewColumn() != -1) {
+                        setNewColumn(blockContinue.getNewColumn());
+                    }
+                    matches++;
+                }
+            } else {
+                break;
+            }
+        }
+
+        int unmatchedBlocks = openBlockParsers.size() - matches;
+        BlockParser blockParser = openBlockParsers.get(matches - 1).blockParser;
+        boolean startedNewBlock = false;
+
+        int lastIndex = index;
+
+        // Unless last matched container is a code block, try new container starts,
+        // adding children to the last matched container:
+        boolean tryBlockStarts = blockParser.getBlock() instanceof Paragraph || blockParser.isContainer();
+        while (tryBlockStarts) {
+            lastIndex = index;
+            findNextNonSpace();
+
+            // this is a little performance optimization:
+            if (isBlank() || (indent < Parsing.CODE_BLOCK_INDENT && Characters.isLetter(this.line.getContent(), nextNonSpace))) {
+                setNewIndex(nextNonSpace);
+                break;
+            }
+
+            BlockStartImpl blockStart = findBlockStart(blockParser);
+            if (blockStart == null) {
+                setNewIndex(nextNonSpace);
+                break;
+            }
+
+            startedNewBlock = true;
+            int sourceIndex = getIndex();
+
+            // We're starting a new block. If we have any previous blocks that need to be closed, we need to do it now.
+            if (unmatchedBlocks > 0) {
+                closeBlockParsers(unmatchedBlocks);
+                unmatchedBlocks = 0;
+            }
+
+            if (blockStart.getNewIndex() != -1) {
+                setNewIndex(blockStart.getNewIndex());
+            } else if (blockStart.getNewColumn() != -1) {
+                setNewColumn(blockStart.getNewColumn());
+            }
+
+            List<SourceSpan> replacedSourceSpans = null;
+            if (blockStart.isReplaceActiveBlockParser()) {
+                Block replacedBlock = prepareActiveBlockParserForReplacement();
+                replacedSourceSpans = replacedBlock.getSourceSpans();
+            }
+
+            for (BlockParser newBlockParser : blockStart.getBlockParsers()) {
+                addChild(new OpenBlockParser(newBlockParser, sourceIndex));
+                if (replacedSourceSpans != null) {
+                    newBlockParser.getBlock().setSourceSpans(replacedSourceSpans);
+                }
+                blockParser = newBlockParser;
+                tryBlockStarts = newBlockParser.isContainer();
+            }
+        }
+
+        // What remains at the offset is a text line. Add the text to the
+        // appropriate block.
+
+        // First check for a lazy paragraph continuation:
+        if (!startedNewBlock && !isBlank() &&
+                getActiveBlockParser().canHaveLazyContinuationLines()) {
+            openBlockParsers.get(openBlockParsers.size() - 1).sourceIndex = lastIndex;
+            // lazy paragraph continuation
+            addLine();
+
+        } else {
+
+            // finalize any blocks not matched
+            if (unmatchedBlocks > 0) {
+                closeBlockParsers(unmatchedBlocks);
+            }
+
+            if (!blockParser.isContainer()) {
+                addLine();
+            } else if (!isBlank()) {
+                // create paragraph container for line
+                ParagraphParser paragraphParser = new ParagraphParser();
+                addChild(new OpenBlockParser(paragraphParser, lastIndex));
+                addLine();
+            } else {
+                // This can happen for a list item like this:
+                // ```
+                // *
+                // list item
+                // ```
+                //
+                // The first line does not start a paragraph yet, but we still want to record source positions.
+                addSourceSpans();
+            }
+        }
+    }
+
+    private void setLine(CharSequence ln) {
+        lineIndex++;
+        index = 0;
+        column = 0;
+        columnIsInTab = false;
+
+        CharSequence lineContent = prepareLine(ln);
+        SourceSpan sourceSpan = null;
+        if (includeSourceSpans != IncludeSourceSpans.NONE) {
+            sourceSpan = SourceSpan.of(lineIndex, 0, lineContent.length());
+        }
+        this.line = SourceLine.of(lineContent, sourceSpan);
+    }
+
+    private void findNextNonSpace() {
+        int i = index;
+        int cols = column;
+
+        blank = true;
+        int length = line.getContent().length();
+        while (i < length) {
+            char c = line.getContent().charAt(i);
+            switch (c) {
+                case ' ':
+                    i++;
+                    cols++;
+                    continue;
+                case '\t':
+                    i++;
+                    cols += (4 - (cols % 4));
+                    continue;
+            }
+            blank = false;
+            break;
+        }
+
+        nextNonSpace = i;
+        nextNonSpaceColumn = cols;
+        indent = nextNonSpaceColumn - column;
+    }
+
+    private void setNewIndex(int newIndex) {
+        if (newIndex >= nextNonSpace) {
+            // We can start from here, no need to calculate tab stops again
+            index = nextNonSpace;
+            column = nextNonSpaceColumn;
+        }
+        int length = line.getContent().length();
+        while (index < newIndex && index != length) {
+            advance();
+        }
+        // If we're going to an index as opposed to a column, we're never within a tab
+        columnIsInTab = false;
+    }
+
+    private void setNewColumn(int newColumn) {
+        if (newColumn >= nextNonSpaceColumn) {
+            // We can start from here, no need to calculate tab stops again
+            index = nextNonSpace;
+            column = nextNonSpaceColumn;
+        }
+        int length = line.getContent().length();
+        while (column < newColumn && index != length) {
+            advance();
+        }
+        if (column > newColumn) {
+            // Last character was a tab and we overshot our target
+            index--;
+            column = newColumn;
+            columnIsInTab = true;
+        } else {
+            columnIsInTab = false;
+        }
+    }
+
+    private void advance() {
+        char c = line.getContent().charAt(index);
+        index++;
+        if (c == '\t') {
+            column += Parsing.columnsToNextTabStop(column);
+        } else {
+            column++;
+        }
+    }
+
+    /**
+     * Add line content to the active block parser. We assume it can accept lines -- that check should be done before
+     * calling this.
+     */
+    private void addLine() {
+        CharSequence content;
+        if (columnIsInTab) {
+            // Our column is in a partially consumed tab. Expand the remaining columns (to the next tab stop) to spaces.
+            int afterTab = index + 1;
+            CharSequence rest = line.getContent().subSequence(afterTab, line.getContent().length());
+            int spaces = Parsing.columnsToNextTabStop(column);
+            StringBuilder sb = new StringBuilder(spaces + rest.length());
+            for (int i = 0; i < spaces; i++) {
+                sb.append(' ');
+            }
+            sb.append(rest);
+            content = sb.toString();
+        } else if (index == 0) {
+            content = line.getContent();
+        } else {
+            content = line.getContent().subSequence(index, line.getContent().length());
+        }
+        SourceSpan sourceSpan = null;
+        if (includeSourceSpans == IncludeSourceSpans.BLOCKS_AND_INLINES) {
+            // Note that if we're in a partially-consumed tab, the length here corresponds to the content but not to the
+            // actual source length. That sounds like a problem, but I haven't found a test case where it matters (yet).
+            sourceSpan = SourceSpan.of(lineIndex, index, content.length());
+        }
+        getActiveBlockParser().addLine(SourceLine.of(content, sourceSpan));
+        addSourceSpans();
+    }
+
+    private void addSourceSpans() {
+        if (includeSourceSpans != IncludeSourceSpans.NONE) {
+            // Don't add source spans for Document itself (it would get the whole source text)
+            for (int i = 1; i < openBlockParsers.size(); i++) {
+                OpenBlockParser openBlockParser = openBlockParsers.get(i);
+                int blockIndex = openBlockParser.sourceIndex;
+                int length = line.getContent().length() - blockIndex;
+                if (length != 0) {
+                    openBlockParser.blockParser.addSourceSpan(SourceSpan.of(lineIndex, blockIndex, length));
+                }
+            }
+        }
+    }
+
+    private BlockStartImpl findBlockStart(BlockParser blockParser) {
+        MatchedBlockParser matchedBlockParser = new MatchedBlockParserImpl(blockParser);
+        for (BlockParserFactory blockParserFactory : blockParserFactories) {
+            BlockStart result = blockParserFactory.tryStart(this, matchedBlockParser);
+            if (result instanceof BlockStartImpl) {
+                return (BlockStartImpl) result;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Finalize a block. Close it and do any necessary postprocessing, e.g. setting the content of blocks and
+     * collecting link reference definitions from paragraphs.
+     */
+    private void finalize(BlockParser blockParser) {
+        if (blockParser instanceof ParagraphParser) {
+            addDefinitionsFrom((ParagraphParser) blockParser);
+        }
+
+        blockParser.closeBlock();
+    }
+
+    private void addDefinitionsFrom(ParagraphParser paragraphParser) {
+        for (LinkReferenceDefinition definition : paragraphParser.getDefinitions()) {
+            // Add nodes into document before paragraph.
+            paragraphParser.getBlock().insertBefore(definition);
+
+            definitions.add(definition);
+        }
+    }
+
+    /**
+     * Walk through a block & children recursively, parsing string content into inline content where appropriate.
+     */
+    private void processInlines() {
+        InlineParserContextImpl context = new InlineParserContextImpl(delimiterProcessors, definitions);
+        InlineParser inlineParser = inlineParserFactory.create(context);
+
+        for (BlockParser blockParser : allBlockParsers) {
+            blockParser.parseInlines(inlineParser);
+        }
+    }
+
+    /**
+     * Add block of type tag as a child of the tip. If the tip can't accept children, close and finalize it and try
+     * its parent, and so on until we find a block that can accept children.
+     */
+    private void addChild(OpenBlockParser openBlockParser) {
+        while (!getActiveBlockParser().canContain(openBlockParser.blockParser.getBlock())) {
+            closeBlockParsers(1);
+        }
+
+        getActiveBlockParser().getBlock().appendChild(openBlockParser.blockParser.getBlock());
+        activateBlockParser(openBlockParser);
+    }
+
+    private void activateBlockParser(OpenBlockParser openBlockParser) {
+        openBlockParsers.add(openBlockParser);
+    }
+
+    private OpenBlockParser deactivateBlockParser() {
+        return openBlockParsers.remove(openBlockParsers.size() - 1);
+    }
+
+    private Block prepareActiveBlockParserForReplacement() {
+        // Note that we don't want to parse inlines, as it's getting replaced.
+        BlockParser old = deactivateBlockParser().blockParser;
+
+        if (old instanceof ParagraphParser) {
+            ParagraphParser paragraphParser = (ParagraphParser) old;
+            // Collect any link reference definitions. Note that replacing the active block parser is done after a
+            // block parser got the current paragraph content using MatchedBlockParser#getContentString. In case the
+            // paragraph started with link reference definitions, we parse and strip them before the block parser gets
+            // the content. We want to keep them.
+            // If no replacement happens, we collect the definitions as part of finalizing paragraph blocks.
+            addDefinitionsFrom(paragraphParser);
+        }
+
+        // Do this so that source positions are calculated, which we will carry over to the replacing block.
+        old.closeBlock();
+        old.getBlock().unlink();
+        return old.getBlock();
+    }
+
+    private Document finalizeAndProcess() {
+        closeBlockParsers(openBlockParsers.size());
+        processInlines();
+        return documentBlockParser.getBlock();
+    }
+
+    private void closeBlockParsers(int count) {
+        for (int i = 0; i < count; i++) {
+            BlockParser blockParser = deactivateBlockParser().blockParser;
+            finalize(blockParser);
+            // Remember for inline parsing. Note that a lot of blocks don't need inline parsing. We could have a
+            // separate interface (e.g. BlockParserWithInlines) so that we only have to remember those that actually
+            // have inlines to parse.
+            allBlockParsers.add(blockParser);
+        }
+    }
+
+    /**
+     * Prepares the input line replacing {@code \0}
+     */
+    private static CharSequence prepareLine(CharSequence line) {
+        // Avoid building a new string in the majority of cases (no \0)
+        StringBuilder sb = null;
+        int length = line.length();
+        for (int i = 0; i < length; i++) {
+            char c = line.charAt(i);
+            if (c == '\0') {
+                if (sb == null) {
+                    sb = new StringBuilder(length);
+                    sb.append(line, 0, i);
+                }
+                sb.append('\uFFFD');
+            } else {
+                if (sb != null) {
+                    sb.append(c);
+                }
+            }
+        }
+
+        if (sb != null) {
+            return sb.toString();
+        } else {
+            return line;
+        }
+    }
+
+    private static class MatchedBlockParserImpl implements MatchedBlockParser {
+
+        private final BlockParser matchedBlockParser;
+
+        public MatchedBlockParserImpl(BlockParser matchedBlockParser) {
+            this.matchedBlockParser = matchedBlockParser;
+        }
+
+        @Override
+        public BlockParser getMatchedBlockParser() {
+            return matchedBlockParser;
+        }
+
+        @Override
+        public SourceLines getParagraphLines() {
+            if (matchedBlockParser instanceof ParagraphParser) {
+                ParagraphParser paragraphParser = (ParagraphParser) matchedBlockParser;
+                return paragraphParser.getParagraphLines();
+            }
+            return SourceLines.empty();
+        }
+    }
+
+    private static class OpenBlockParser {
+        private final BlockParser blockParser;
+        private int sourceIndex;
+
+        OpenBlockParser(BlockParser blockParser, int sourceIndex) {
+            this.blockParser = blockParser;
+            this.sourceIndex = sourceIndex;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/FencedCodeBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/FencedCodeBlockParser.java
new file mode 100644
index 00000000000..10a962a45c5
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/FencedCodeBlockParser.java
@@ -0,0 +1,171 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.FencedCodeBlock;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+import static jdk.internal.org.commonmark.internal.util.Escaping.unescapeString;
+
+public class FencedCodeBlockParser extends AbstractBlockParser {
+
+    private final FencedCodeBlock block = new FencedCodeBlock();
+    private final char fenceChar;
+    private final int openingFenceLength;
+
+    private String firstLine;
+    private StringBuilder otherLines = new StringBuilder();
+
+    public FencedCodeBlockParser(char fenceChar, int fenceLength, int fenceIndent) {
+        this.fenceChar = fenceChar;
+        this.openingFenceLength = fenceLength;
+        block.setFenceCharacter(String.valueOf(fenceChar));
+        block.setOpeningFenceLength(fenceLength);
+        block.setFenceIndent(fenceIndent);
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        int nextNonSpace = state.getNextNonSpaceIndex();
+        int newIndex = state.getIndex();
+        CharSequence line = state.getLine().getContent();
+        if (state.getIndent() < Parsing.CODE_BLOCK_INDENT && nextNonSpace < line.length() && tryClosing(line, nextNonSpace)) {
+            // closing fence - we're at end of line, so we can finalize now
+            return BlockContinue.finished();
+        } else {
+            // skip optional spaces of fence indent
+            int i = block.getFenceIndent();
+            int length = line.length();
+            while (i > 0 && newIndex < length && line.charAt(newIndex) == ' ') {
+                newIndex++;
+                i--;
+            }
+        }
+        return BlockContinue.atIndex(newIndex);
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        if (firstLine == null) {
+            firstLine = line.getContent().toString();
+        } else {
+            otherLines.append(line.getContent());
+            otherLines.append('\n');
+        }
+    }
+
+    @Override
+    public void closeBlock() {
+        // first line becomes info string
+        block.setInfo(unescapeString(firstLine.trim()));
+        block.setLiteral(otherLines.toString());
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            int indent = state.getIndent();
+            if (indent >= Parsing.CODE_BLOCK_INDENT) {
+                return BlockStart.none();
+            }
+
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            FencedCodeBlockParser blockParser = checkOpener(state.getLine().getContent(), nextNonSpace, indent);
+            if (blockParser != null) {
+                return BlockStart.of(blockParser).atIndex(nextNonSpace + blockParser.block.getOpeningFenceLength());
+            } else {
+                return BlockStart.none();
+            }
+        }
+    }
+
+    // spec: A code fence is a sequence of at least three consecutive backtick characters (`) or tildes (~). (Tildes and
+    // backticks cannot be mixed.)
+    private static FencedCodeBlockParser checkOpener(CharSequence line, int index, int indent) {
+        int backticks = 0;
+        int tildes = 0;
+        int length = line.length();
+        loop:
+        for (int i = index; i < length; i++) {
+            switch (line.charAt(i)) {
+                case '`':
+                    backticks++;
+                    break;
+                case '~':
+                    tildes++;
+                    break;
+                default:
+                    break loop;
+            }
+        }
+        if (backticks >= 3 && tildes == 0) {
+            // spec: If the info string comes after a backtick fence, it may not contain any backtick characters.
+            if (Characters.find('`', line, index + backticks) != -1) {
+                return null;
+            }
+            return new FencedCodeBlockParser('`', backticks, indent);
+        } else if (tildes >= 3 && backticks == 0) {
+            // spec: Info strings for tilde code blocks can contain backticks and tildes
+            return new FencedCodeBlockParser('~', tildes, indent);
+        } else {
+            return null;
+        }
+    }
+
+    // spec: The content of the code block consists of all subsequent lines, until a closing code fence of the same type
+    // as the code block began with (backticks or tildes), and with at least as many backticks or tildes as the opening
+    // code fence.
+    private boolean tryClosing(CharSequence line, int index) {
+        int fences = Characters.skip(fenceChar, line, index, line.length()) - index;
+        if (fences < openingFenceLength) {
+            return false;
+        }
+        // spec: The closing code fence [...] may be followed only by spaces, which are ignored.
+        int after = Characters.skipSpaceTab(line, index + fences, line.length());
+        if (after == line.length()) {
+            block.setClosingFenceLength(fences);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HeadingParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HeadingParser.java
new file mode 100644
index 00000000000..cea8cb10366
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HeadingParser.java
@@ -0,0 +1,188 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.Heading;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+public class HeadingParser extends AbstractBlockParser {
+
+    private final Heading block = new Heading();
+    private final SourceLines content;
+
+    public HeadingParser(int level, SourceLines content) {
+        block.setLevel(level);
+        this.content = content;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState parserState) {
+        // In both ATX and Setext headings, once we have the heading markup, there's nothing more to parse.
+        return BlockContinue.none();
+    }
+
+    @Override
+    public void parseInlines(InlineParser inlineParser) {
+        inlineParser.parse(content, block);
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            if (state.getIndent() >= Parsing.CODE_BLOCK_INDENT) {
+                return BlockStart.none();
+            }
+
+            SourceLine line = state.getLine();
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            if (line.getContent().charAt(nextNonSpace) == '#') {
+                HeadingParser atxHeading = getAtxHeading(line.substring(nextNonSpace, line.getContent().length()));
+                if (atxHeading != null) {
+                    return BlockStart.of(atxHeading).atIndex(line.getContent().length());
+                }
+            }
+
+            int setextHeadingLevel = getSetextHeadingLevel(line.getContent(), nextNonSpace);
+            if (setextHeadingLevel > 0) {
+                SourceLines paragraph = matchedBlockParser.getParagraphLines();
+                if (!paragraph.isEmpty()) {
+                    return BlockStart.of(new HeadingParser(setextHeadingLevel, paragraph))
+                            .atIndex(line.getContent().length())
+                            .replaceActiveBlockParser();
+                }
+            }
+
+            return BlockStart.none();
+        }
+    }
+
+    // spec: An ATX heading consists of a string of characters, parsed as inline content, between an opening sequence of
+    // 1\u20136 unescaped # characters and an optional closing sequence of any number of unescaped # characters. The opening
+    // sequence of # characters must be followed by a space or by the end of line. The optional closing sequence of #s
+    // must be preceded by a space and may be followed by spaces only.
+    private static HeadingParser getAtxHeading(SourceLine line) {
+        Scanner scanner = Scanner.of(SourceLines.of(line));
+        int level = scanner.matchMultiple('#');
+
+        if (level == 0 || level > 6) {
+            return null;
+        }
+
+        if (!scanner.hasNext()) {
+            // End of line after markers is an empty heading
+            return new HeadingParser(level, SourceLines.empty());
+        }
+
+        char next = scanner.peek();
+        if (!(next == ' ' || next == '\t')) {
+            return null;
+        }
+
+        scanner.whitespace();
+        Position start = scanner.position();
+        Position end = start;
+        boolean hashCanEnd = true;
+
+        while (scanner.hasNext()) {
+            char c = scanner.peek();
+            switch (c) {
+                case '#':
+                    if (hashCanEnd) {
+                        scanner.matchMultiple('#');
+                        int whitespace = scanner.whitespace();
+                        // If there's other characters, the hashes and spaces were part of the heading
+                        if (scanner.hasNext()) {
+                            end = scanner.position();
+                        }
+                        hashCanEnd = whitespace > 0;
+                    } else {
+                        scanner.next();
+                        end = scanner.position();
+                    }
+                    break;
+                case ' ':
+                case '\t':
+                    hashCanEnd = true;
+                    scanner.next();
+                    break;
+                default:
+                    hashCanEnd = false;
+                    scanner.next();
+                    end = scanner.position();
+            }
+        }
+
+        SourceLines source = scanner.getSource(start, end);
+        String content = source.getContent();
+        if (content.isEmpty()) {
+            return new HeadingParser(level, SourceLines.empty());
+        }
+        return new HeadingParser(level, source);
+    }
+
+    // spec: A setext heading underline is a sequence of = characters or a sequence of - characters, with no more than
+    // 3 spaces indentation and any number of trailing spaces.
+    @SuppressWarnings("fallthrough") private static int getSetextHeadingLevel(CharSequence line, int index) {
+        switch (line.charAt(index)) {
+            case '=':
+                if (isSetextHeadingRest(line, index + 1, '=')) {
+                    return 1;
+                }
+            case '-':
+                if (isSetextHeadingRest(line, index + 1, '-')) {
+                    return 2;
+                }
+        }
+        return 0;
+    }
+
+    private static boolean isSetextHeadingRest(CharSequence line, int index, char marker) {
+        int afterMarker = Characters.skip(marker, line, index, line.length());
+        int afterSpace = Characters.skipSpaceTab(line, afterMarker, line.length());
+        return afterSpace >= line.length();
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HtmlBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HtmlBlockParser.java
new file mode 100644
index 00000000000..4fb7eb33da1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/HtmlBlockParser.java
@@ -0,0 +1,178 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.HtmlBlock;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.block.*;
+
+import java.util.regex.Pattern;
+
+public class HtmlBlockParser extends AbstractBlockParser {
+
+    private static final String TAGNAME = "[A-Za-z][A-Za-z0-9-]*";
+    private static final String ATTRIBUTENAME = "[a-zA-Z_:][a-zA-Z0-9:._-]*";
+    private static final String UNQUOTEDVALUE = "[^\"'=<>`\\x00-\\x20]+";
+    private static final String SINGLEQUOTEDVALUE = "'[^']*'";
+    private static final String DOUBLEQUOTEDVALUE = "\"[^\"]*\"";
+    private static final String ATTRIBUTEVALUE = "(?:" + UNQUOTEDVALUE + "|" + SINGLEQUOTEDVALUE
+            + "|" + DOUBLEQUOTEDVALUE + ")";
+    private static final String ATTRIBUTEVALUESPEC = "(?:" + "\\s*=" + "\\s*" + ATTRIBUTEVALUE
+            + ")";
+    private static final String ATTRIBUTE = "(?:" + "\\s+" + ATTRIBUTENAME + ATTRIBUTEVALUESPEC
+            + "?)";
+
+    private static final String OPENTAG = "<" + TAGNAME + ATTRIBUTE + "*" + "\\s*/?>";
+    private static final String CLOSETAG = "</" + TAGNAME + "\\s*[>]";
+
+    private static final Pattern[][] BLOCK_PATTERNS = new Pattern[][]{
+            {null, null}, // not used (no type 0)
+            {
+                    Pattern.compile("^<(?:script|pre|style|textarea)(?:\\s|>|$)", Pattern.CASE_INSENSITIVE),
+                    Pattern.compile("</(?:script|pre|style|textarea)>", Pattern.CASE_INSENSITIVE)
+            },
+            {
+                    Pattern.compile("^<!--"),
+                    Pattern.compile("-->")
+            },
+            {
+                    Pattern.compile("^<[?]"),
+                    Pattern.compile("\\?>")
+            },
+            {
+                    Pattern.compile("^<![A-Z]"),
+                    Pattern.compile(">")
+            },
+            {
+                    Pattern.compile("^<!\\[CDATA\\["),
+                    Pattern.compile("\\]\\]>")
+            },
+            {
+                    Pattern.compile("^</?(?:" +
+                            "address|article|aside|" +
+                            "base|basefont|blockquote|body|" +
+                            "caption|center|col|colgroup|" +
+                            "dd|details|dialog|dir|div|dl|dt|" +
+                            "fieldset|figcaption|figure|footer|form|frame|frameset|" +
+                            "h1|h2|h3|h4|h5|h6|head|header|hr|html|" +
+                            "iframe|" +
+                            "legend|li|link|" +
+                            "main|menu|menuitem|" +
+                            "nav|noframes|" +
+                            "ol|optgroup|option|" +
+                            "p|param|" +
+                            "search|section|summary|" +
+                            "table|tbody|td|tfoot|th|thead|title|tr|track|" +
+                            "ul" +
+                            ")(?:\\s|[/]?[>]|$)", Pattern.CASE_INSENSITIVE),
+                    null // terminated by blank line
+            },
+            {
+                    Pattern.compile("^(?:" + OPENTAG + '|' + CLOSETAG + ")\\s*$", Pattern.CASE_INSENSITIVE),
+                    null // terminated by blank line
+            }
+    };
+
+    private final HtmlBlock block = new HtmlBlock();
+    private final Pattern closingPattern;
+
+    private boolean finished = false;
+    private BlockContent content = new BlockContent();
+
+    private HtmlBlockParser(Pattern closingPattern) {
+        this.closingPattern = closingPattern;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (finished) {
+            return BlockContinue.none();
+        }
+
+        // Blank line ends type 6 and type 7 blocks
+        if (state.isBlank() && closingPattern == null) {
+            return BlockContinue.none();
+        } else {
+            return BlockContinue.atIndex(state.getIndex());
+        }
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        content.add(line.getContent());
+
+        if (closingPattern != null && closingPattern.matcher(line.getContent()).find()) {
+            finished = true;
+        }
+    }
+
+    @Override
+    public void closeBlock() {
+        block.setLiteral(content.getString());
+        content = null;
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            CharSequence line = state.getLine().getContent();
+
+            if (state.getIndent() < 4 && line.charAt(nextNonSpace) == '<') {
+                for (int blockType = 1; blockType <= 7; blockType++) {
+                    // Type 7 can not interrupt a paragraph (not even a lazy one)
+                    if (blockType == 7 && (
+                            matchedBlockParser.getMatchedBlockParser().getBlock() instanceof Paragraph ||
+                                    state.getActiveBlockParser().canHaveLazyContinuationLines())) {
+                        continue;
+                    }
+                    Pattern opener = BLOCK_PATTERNS[blockType][0];
+                    Pattern closer = BLOCK_PATTERNS[blockType][1];
+                    boolean matches = opener.matcher(line.subSequence(nextNonSpace, line.length())).find();
+                    if (matches) {
+                        return BlockStart.of(new HtmlBlockParser(closer)).atIndex(state.getIndex());
+                    }
+                }
+            }
+            return BlockStart.none();
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/IndentedCodeBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/IndentedCodeBlockParser.java
new file mode 100644
index 00000000000..0b988407c0d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/IndentedCodeBlockParser.java
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.IndentedCodeBlock;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.block.*;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class IndentedCodeBlockParser extends AbstractBlockParser {
+
+    private final IndentedCodeBlock block = new IndentedCodeBlock();
+    private final List<CharSequence> lines = new ArrayList<>();
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (state.getIndent() >= Parsing.CODE_BLOCK_INDENT) {
+            return BlockContinue.atColumn(state.getColumn() + Parsing.CODE_BLOCK_INDENT);
+        } else if (state.isBlank()) {
+            return BlockContinue.atIndex(state.getNextNonSpaceIndex());
+        } else {
+            return BlockContinue.none();
+        }
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        lines.add(line.getContent());
+    }
+
+    @Override
+    public void closeBlock() {
+        int lastNonBlank = lines.size() - 1;
+        while (lastNonBlank >= 0) {
+            if (!Characters.isBlank(lines.get(lastNonBlank))) {
+                break;
+            }
+            lastNonBlank--;
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < lastNonBlank + 1; i++) {
+            sb.append(lines.get(i));
+            sb.append('\n');
+        }
+
+        String literal = sb.toString();
+        block.setLiteral(literal);
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            // An indented code block cannot interrupt a paragraph.
+            if (state.getIndent() >= Parsing.CODE_BLOCK_INDENT && !state.isBlank() && !(state.getActiveBlockParser().getBlock() instanceof Paragraph)) {
+                return BlockStart.of(new IndentedCodeBlockParser()).atColumn(state.getColumn() + Parsing.CODE_BLOCK_INDENT);
+            } else {
+                return BlockStart.none();
+            }
+        }
+    }
+}
+
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserContextImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserContextImpl.java
new file mode 100644
index 00000000000..dab02aeedd1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserContextImpl.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.parser.InlineParserContext;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+
+import java.util.List;
+import java.util.Map;
+
+public class InlineParserContextImpl implements InlineParserContext {
+
+    private final List<DelimiterProcessor> delimiterProcessors;
+    private final LinkReferenceDefinitions linkReferenceDefinitions;
+
+    public InlineParserContextImpl(List<DelimiterProcessor> delimiterProcessors,
+                                   LinkReferenceDefinitions linkReferenceDefinitions) {
+        this.delimiterProcessors = delimiterProcessors;
+        this.linkReferenceDefinitions = linkReferenceDefinitions;
+    }
+
+    @Override
+    public List<DelimiterProcessor> getCustomDelimiterProcessors() {
+        return delimiterProcessors;
+    }
+
+    @Override
+    public LinkReferenceDefinition getLinkReferenceDefinition(String label) {
+        return linkReferenceDefinitions.get(label);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserImpl.java
new file mode 100644
index 00000000000..3c0913a3206
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/InlineParserImpl.java
@@ -0,0 +1,787 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.inline.*;
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.internal.util.LinkScanner;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.InlineParserContext;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.util.*;
+
+public class InlineParserImpl implements InlineParser, InlineParserState {
+
+    private final BitSet specialCharacters;
+    private final Map<Character, DelimiterProcessor> delimiterProcessors;
+    private final InlineParserContext context;
+    private final Map<Character, List<InlineContentParser>> inlineParsers;
+
+    private Scanner scanner;
+    private boolean includeSourceSpans;
+    private int trailingSpaces;
+
+    /**
+     * Top delimiter (emphasis, strong emphasis or custom emphasis). (Brackets are on a separate stack, different
+     * from the algorithm described in the spec.)
+     */
+    private Delimiter lastDelimiter;
+
+    /**
+     * Top opening bracket (<code>[</code> or <code>![)</code>).
+     */
+    private Bracket lastBracket;
+
+    public InlineParserImpl(InlineParserContext inlineParserContext) {
+        this.delimiterProcessors = calculateDelimiterProcessors(inlineParserContext.getCustomDelimiterProcessors());
+
+        this.context = inlineParserContext;
+        this.inlineParsers = new HashMap<>();
+        this.inlineParsers.put('\\', Collections.<InlineContentParser>singletonList(new BackslashInlineParser()));
+        this.inlineParsers.put('`', Collections.<InlineContentParser>singletonList(new BackticksInlineParser()));
+        this.inlineParsers.put('&', Collections.<InlineContentParser>singletonList(new EntityInlineParser()));
+        this.inlineParsers.put('<', Arrays.asList(new AutolinkInlineParser(), new HtmlInlineParser()));
+
+        this.specialCharacters = calculateSpecialCharacters(this.delimiterProcessors.keySet(), inlineParsers.keySet());
+    }
+
+    public static BitSet calculateSpecialCharacters(Set<Character> delimiterCharacters, Set<Character> characters) {
+        BitSet bitSet = new BitSet();
+        for (Character c : delimiterCharacters) {
+            bitSet.set(c);
+        }
+        for (Character c : characters) {
+            bitSet.set(c);
+        }
+        bitSet.set('[');
+        bitSet.set(']');
+        bitSet.set('!');
+        bitSet.set('\n');
+        return bitSet;
+    }
+
+    public static Map<Character, DelimiterProcessor> calculateDelimiterProcessors(List<DelimiterProcessor> delimiterProcessors) {
+        Map<Character, DelimiterProcessor> map = new HashMap<>();
+        addDelimiterProcessors(Arrays.<DelimiterProcessor>asList(new AsteriskDelimiterProcessor(), new UnderscoreDelimiterProcessor()), map);
+        addDelimiterProcessors(delimiterProcessors, map);
+        return map;
+    }
+
+    @Override
+    public Scanner scanner() {
+        return scanner;
+    }
+
+    private static void addDelimiterProcessors(Iterable<DelimiterProcessor> delimiterProcessors, Map<Character, DelimiterProcessor> map) {
+        for (DelimiterProcessor delimiterProcessor : delimiterProcessors) {
+            char opening = delimiterProcessor.getOpeningCharacter();
+            char closing = delimiterProcessor.getClosingCharacter();
+            if (opening == closing) {
+                DelimiterProcessor old = map.get(opening);
+                if (old != null && old.getOpeningCharacter() == old.getClosingCharacter()) {
+                    StaggeredDelimiterProcessor s;
+                    if (old instanceof StaggeredDelimiterProcessor) {
+                        s = (StaggeredDelimiterProcessor) old;
+                    } else {
+                        s = new StaggeredDelimiterProcessor(opening);
+                        s.add(old);
+                    }
+                    s.add(delimiterProcessor);
+                    map.put(opening, s);
+                } else {
+                    addDelimiterProcessorForChar(opening, delimiterProcessor, map);
+                }
+            } else {
+                addDelimiterProcessorForChar(opening, delimiterProcessor, map);
+                addDelimiterProcessorForChar(closing, delimiterProcessor, map);
+            }
+        }
+    }
+
+    private static void addDelimiterProcessorForChar(char delimiterChar, DelimiterProcessor toAdd, Map<Character, DelimiterProcessor> delimiterProcessors) {
+        DelimiterProcessor existing = delimiterProcessors.put(delimiterChar, toAdd);
+        if (existing != null) {
+            throw new IllegalArgumentException("Delimiter processor conflict with delimiter char '" + delimiterChar + "'");
+        }
+    }
+
+    /**
+     * Parse content in block into inline children, appending them to the block node.
+     */
+    @Override
+    public void parse(SourceLines lines, Node block) {
+        reset(lines);
+
+        while (true) {
+            List<? extends Node> nodes = parseInline();
+            if (nodes != null) {
+                for (Node node : nodes) {
+                    block.appendChild(node);
+                }
+            } else {
+                break;
+            }
+        }
+
+        processDelimiters(null);
+        mergeChildTextNodes(block);
+    }
+
+    void reset(SourceLines lines) {
+        this.scanner = Scanner.of(lines);
+        this.includeSourceSpans = !lines.getSourceSpans().isEmpty();
+        this.trailingSpaces = 0;
+        this.lastDelimiter = null;
+        this.lastBracket = null;
+    }
+
+    private Text text(SourceLines sourceLines) {
+        Text text = new Text(sourceLines.getContent());
+        text.setSourceSpans(sourceLines.getSourceSpans());
+        return text;
+    }
+
+    /**
+     * Parse the next inline element in subject, advancing our position.
+     * On success, return the new inline node.
+     * On failure, return null.
+     */
+    private List<? extends Node> parseInline() {
+        char c = scanner.peek();
+
+        switch (c) {
+            case '[':
+                return Collections.singletonList(parseOpenBracket());
+            case '!':
+                return Collections.singletonList(parseBang());
+            case ']':
+                return Collections.singletonList(parseCloseBracket());
+            case '\n':
+                return Collections.singletonList(parseLineBreak());
+            case Scanner.END:
+                return null;
+        }
+
+        // No inline parser, delimiter or other special handling.
+        if (!specialCharacters.get(c)) {
+            return Collections.singletonList(parseText());
+        }
+
+        List<InlineContentParser> inlineParsers = this.inlineParsers.get(c);
+        if (inlineParsers != null) {
+            Position position = scanner.position();
+            for (InlineContentParser inlineParser : inlineParsers) {
+                ParsedInline parsedInline = inlineParser.tryParse(this);
+                if (parsedInline instanceof ParsedInlineImpl) {
+                    ParsedInlineImpl parsedInlineImpl = (ParsedInlineImpl) parsedInline;
+                    Node node = parsedInlineImpl.getNode();
+                    scanner.setPosition(parsedInlineImpl.getPosition());
+                    if (includeSourceSpans && node.getSourceSpans().isEmpty()) {
+                        node.setSourceSpans(scanner.getSource(position, scanner.position()).getSourceSpans());
+                    }
+                    return Collections.singletonList(node);
+                } else {
+                    // Reset position
+                    scanner.setPosition(position);
+                }
+            }
+        }
+
+        DelimiterProcessor delimiterProcessor = delimiterProcessors.get(c);
+        if (delimiterProcessor != null) {
+            List<? extends Node> nodes = parseDelimiters(delimiterProcessor, c);
+            if (nodes != null) {
+                return nodes;
+            }
+        }
+
+        // If we get here, even for a special/delimiter character, we will just treat it as text.
+        return Collections.singletonList(parseText());
+    }
+
+    /**
+     * Attempt to parse delimiters like emphasis, strong emphasis or custom delimiters.
+     */
+    private List<? extends Node> parseDelimiters(DelimiterProcessor delimiterProcessor, char delimiterChar) {
+        DelimiterData res = scanDelimiters(delimiterProcessor, delimiterChar);
+        if (res == null) {
+            return null;
+        }
+
+        List<Text> characters = res.characters;
+
+        // Add entry to stack for this opener
+        lastDelimiter = new Delimiter(characters, delimiterChar, res.canOpen, res.canClose, lastDelimiter);
+        if (lastDelimiter.previous != null) {
+            lastDelimiter.previous.next = lastDelimiter;
+        }
+
+        return characters;
+    }
+
+    /**
+     * Add open bracket to delimiter stack and add a text node to block's children.
+     */
+    private Node parseOpenBracket() {
+        Position start = scanner.position();
+        scanner.next();
+        Position contentPosition = scanner.position();
+
+        Text node = text(scanner.getSource(start, contentPosition));
+
+        // Add entry to stack for this opener
+        addBracket(Bracket.link(node, start, contentPosition, lastBracket, lastDelimiter));
+
+        return node;
+    }
+
+    /**
+     * If next character is [, and ! delimiter to delimiter stack and add a text node to block's children.
+     * Otherwise just add a text node.
+     */
+    private Node parseBang() {
+        Position start = scanner.position();
+        scanner.next();
+        if (scanner.next('[')) {
+            Position contentPosition = scanner.position();
+            Text node = text(scanner.getSource(start, contentPosition));
+
+            // Add entry to stack for this opener
+            addBracket(Bracket.image(node, start, contentPosition, lastBracket, lastDelimiter));
+            return node;
+        } else {
+            return text(scanner.getSource(start, scanner.position()));
+        }
+    }
+
+    /**
+     * Try to match close bracket against an opening in the delimiter stack. Return either a link or image, or a
+     * plain [ character. If there is a matching delimiter, remove it from the delimiter stack.
+     */
+    private Node parseCloseBracket() {
+        Position beforeClose = scanner.position();
+        scanner.next();
+        Position afterClose = scanner.position();
+
+        // Get previous `[` or `![`
+        Bracket opener = lastBracket;
+        if (opener == null) {
+            // No matching opener, just return a literal.
+            return text(scanner.getSource(beforeClose, afterClose));
+        }
+
+        if (!opener.allowed) {
+            // Matching opener but it's not allowed, just return a literal.
+            removeLastBracket();
+            return text(scanner.getSource(beforeClose, afterClose));
+        }
+
+        // Check to see if we have a link/image
+        String dest = null;
+        String title = null;
+
+        // Maybe a inline link like `[foo](/uri "title")`
+        if (scanner.next('(')) {
+            scanner.whitespace();
+            dest = parseLinkDestination(scanner);
+            if (dest == null) {
+                scanner.setPosition(afterClose);
+            } else {
+                int whitespace = scanner.whitespace();
+                // title needs a whitespace before
+                if (whitespace >= 1) {
+                    title = parseLinkTitle(scanner);
+                    scanner.whitespace();
+                }
+                if (!scanner.next(')')) {
+                    // Don't have a closing `)`, so it's not a destination and title -> reset.
+                    // Note that something like `[foo](` could be valid, `(` will just be text.
+                    scanner.setPosition(afterClose);
+                    dest = null;
+                    title = null;
+                }
+            }
+        }
+
+        // Maybe a reference link like `[foo][bar]`, `[foo][]` or `[foo]`.
+        // Note that even `[foo](` could be a valid link if there's a reference, which is why this is not just an `else`
+        // here.
+        if (dest == null) {
+            // See if there's a link label like `[bar]` or `[]`
+            String ref = parseLinkLabel(scanner);
+            if (ref == null) {
+                scanner.setPosition(afterClose);
+            }
+            if ((ref == null || ref.isEmpty()) && !opener.bracketAfter) {
+                // If the second label is empty `[foo][]` or missing `[foo]`, then the first label is the reference.
+                // But it can only be a reference when there's no (unescaped) bracket in it.
+                // If there is, we don't even need to try to look up the reference. This is an optimization.
+                ref = scanner.getSource(opener.contentPosition, beforeClose).getContent();
+            }
+
+            if (ref != null) {
+                LinkReferenceDefinition definition = context.getLinkReferenceDefinition(ref);
+                if (definition != null) {
+                    dest = definition.getDestination();
+                    title = definition.getTitle();
+                }
+            }
+        }
+
+        if (dest != null) {
+            // If we got here, we have a link or image
+            Node linkOrImage = opener.image ? new Image(dest, title) : new Link(dest, title);
+
+            // Add all nodes between the opening bracket and now (closing bracket) as child nodes of the link
+            Node node = opener.node.getNext();
+            while (node != null) {
+                Node next = node.getNext();
+                linkOrImage.appendChild(node);
+                node = next;
+            }
+
+            if (includeSourceSpans) {
+                linkOrImage.setSourceSpans(scanner.getSource(opener.markerPosition, scanner.position()).getSourceSpans());
+            }
+
+            // Process delimiters such as emphasis inside link/image
+            processDelimiters(opener.previousDelimiter);
+            mergeChildTextNodes(linkOrImage);
+            // We don't need the corresponding text node anymore, we turned it into a link/image node
+            opener.node.unlink();
+            removeLastBracket();
+
+            // Links within links are not allowed. We found this link, so there can be no other link around it.
+            if (!opener.image) {
+                Bracket bracket = lastBracket;
+                while (bracket != null) {
+                    if (!bracket.image) {
+                        // Disallow link opener. It will still get matched, but will not result in a link.
+                        bracket.allowed = false;
+                    }
+                    bracket = bracket.previous;
+                }
+            }
+
+            return linkOrImage;
+
+        } else {
+            // No link or image, parse just the bracket as text and continue
+            removeLastBracket();
+
+            scanner.setPosition(afterClose);
+            return text(scanner.getSource(beforeClose, afterClose));
+        }
+    }
+
+    private void addBracket(Bracket bracket) {
+        if (lastBracket != null) {
+            lastBracket.bracketAfter = true;
+        }
+        lastBracket = bracket;
+    }
+
+    private void removeLastBracket() {
+        lastBracket = lastBracket.previous;
+    }
+
+    /**
+     * Attempt to parse link destination, returning the string or null if no match.
+     */
+    private String parseLinkDestination(Scanner scanner) {
+        char delimiter = scanner.peek();
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkDestination(scanner)) {
+            return null;
+        }
+
+        String dest;
+        if (delimiter == '<') {
+            // chop off surrounding <..>:
+            String rawDestination = scanner.getSource(start, scanner.position()).getContent();
+            dest = rawDestination.substring(1, rawDestination.length() - 1);
+        } else {
+            dest = scanner.getSource(start, scanner.position()).getContent();
+        }
+
+        return Escaping.unescapeString(dest);
+    }
+
+    /**
+     * Attempt to parse link title (sans quotes), returning the string or null if no match.
+     */
+    private String parseLinkTitle(Scanner scanner) {
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkTitle(scanner)) {
+            return null;
+        }
+
+        // chop off ', " or parens
+        String rawTitle = scanner.getSource(start, scanner.position()).getContent();
+        String title = rawTitle.substring(1, rawTitle.length() - 1);
+        return Escaping.unescapeString(title);
+    }
+
+    /**
+     * Attempt to parse a link label, returning the label between the brackets or null.
+     */
+    String parseLinkLabel(Scanner scanner) {
+        if (!scanner.next('[')) {
+            return null;
+        }
+
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkLabelContent(scanner)) {
+            return null;
+        }
+        Position end = scanner.position();
+
+        if (!scanner.next(']')) {
+            return null;
+        }
+
+        String content = scanner.getSource(start, end).getContent();
+        // spec: A link label can have at most 999 characters inside the square brackets.
+        if (content.length() > 999) {
+            return null;
+        }
+
+        return content;
+    }
+
+    private Node parseLineBreak() {
+        scanner.next();
+
+        if (trailingSpaces >= 2) {
+            return new HardLineBreak();
+        } else {
+            return new SoftLineBreak();
+        }
+    }
+
+    /**
+     * Parse the next character as plain text, and possibly more if the following characters are non-special.
+     */
+    private Node parseText() {
+        Position start = scanner.position();
+        scanner.next();
+        char c;
+        while (true) {
+            c = scanner.peek();
+            if (c == Scanner.END || specialCharacters.get(c)) {
+                break;
+            }
+            scanner.next();
+        }
+
+        SourceLines source = scanner.getSource(start, scanner.position());
+        String content = source.getContent();
+
+        if (c == '\n') {
+            // We parsed until the end of the line. Trim any trailing spaces and remember them (for hard line breaks).
+            int end = Characters.skipBackwards(' ', content, content.length() - 1, 0) + 1;
+            trailingSpaces = content.length() - end;
+            content = content.substring(0, end);
+        } else if (c == Scanner.END) {
+            // For the last line, both tabs and spaces are trimmed for some reason (checked with commonmark.js).
+            int end = Characters.skipSpaceTabBackwards(content, content.length() - 1, 0) + 1;
+            content = content.substring(0, end);
+        }
+
+        Text text = new Text(content);
+        text.setSourceSpans(source.getSourceSpans());
+        return text;
+    }
+
+    /**
+     * Scan a sequence of characters with code delimiterChar, and return information about the number of delimiters
+     * and whether they are positioned such that they can open and/or close emphasis or strong emphasis.
+     *
+     * @return information about delimiter run, or {@code null}
+     */
+    private DelimiterData scanDelimiters(DelimiterProcessor delimiterProcessor, char delimiterChar) {
+        int before = scanner.peekPreviousCodePoint();
+        Position start = scanner.position();
+
+        // Quick check to see if we have enough delimiters.
+        int delimiterCount = scanner.matchMultiple(delimiterChar);
+        if (delimiterCount < delimiterProcessor.getMinLength()) {
+            scanner.setPosition(start);
+            return null;
+        }
+
+        // We do have enough, extract a text node for each delimiter character.
+        List<Text> delimiters = new ArrayList<>();
+        scanner.setPosition(start);
+        Position positionBefore = start;
+        while (scanner.next(delimiterChar)) {
+            delimiters.add(text(scanner.getSource(positionBefore, scanner.position())));
+            positionBefore = scanner.position();
+        }
+
+        int after = scanner.peekCodePoint();
+
+        // We could be more lazy here, in most cases we don't need to do every match case.
+        boolean beforeIsPunctuation = before == Scanner.END || Characters.isPunctuationCodePoint(before);
+        boolean beforeIsWhitespace = before == Scanner.END || Characters.isWhitespaceCodePoint(before);
+        boolean afterIsPunctuation = after == Scanner.END || Characters.isPunctuationCodePoint(after);
+        boolean afterIsWhitespace = after == Scanner.END || Characters.isWhitespaceCodePoint(after);
+
+        boolean leftFlanking = !afterIsWhitespace &&
+                (!afterIsPunctuation || beforeIsWhitespace || beforeIsPunctuation);
+        boolean rightFlanking = !beforeIsWhitespace &&
+                (!beforeIsPunctuation || afterIsWhitespace || afterIsPunctuation);
+        boolean canOpen;
+        boolean canClose;
+        if (delimiterChar == '_') {
+            canOpen = leftFlanking && (!rightFlanking || beforeIsPunctuation);
+            canClose = rightFlanking && (!leftFlanking || afterIsPunctuation);
+        } else {
+            canOpen = leftFlanking && delimiterChar == delimiterProcessor.getOpeningCharacter();
+            canClose = rightFlanking && delimiterChar == delimiterProcessor.getClosingCharacter();
+        }
+
+        return new DelimiterData(delimiters, canOpen, canClose);
+    }
+
+    private void processDelimiters(Delimiter stackBottom) {
+
+        Map<Character, Delimiter> openersBottom = new HashMap<>();
+
+        // find first closer above stackBottom:
+        Delimiter closer = lastDelimiter;
+        while (closer != null && closer.previous != stackBottom) {
+            closer = closer.previous;
+        }
+        // move forward, looking for closers, and handling each
+        while (closer != null) {
+            char delimiterChar = closer.delimiterChar;
+
+            DelimiterProcessor delimiterProcessor = delimiterProcessors.get(delimiterChar);
+            if (!closer.canClose() || delimiterProcessor == null) {
+                closer = closer.next;
+                continue;
+            }
+
+            char openingDelimiterChar = delimiterProcessor.getOpeningCharacter();
+
+            // Found delimiter closer. Now look back for first matching opener.
+            int usedDelims = 0;
+            boolean openerFound = false;
+            boolean potentialOpenerFound = false;
+            Delimiter opener = closer.previous;
+            while (opener != null && opener != stackBottom && opener != openersBottom.get(delimiterChar)) {
+                if (opener.canOpen() && opener.delimiterChar == openingDelimiterChar) {
+                    potentialOpenerFound = true;
+                    usedDelims = delimiterProcessor.process(opener, closer);
+                    if (usedDelims > 0) {
+                        openerFound = true;
+                        break;
+                    }
+                }
+                opener = opener.previous;
+            }
+
+            if (!openerFound) {
+                if (!potentialOpenerFound) {
+                    // Set lower bound for future searches for openers.
+                    // Only do this when we didn't even have a potential
+                    // opener (one that matches the character and can open).
+                    // If an opener was rejected because of the number of
+                    // delimiters (e.g. because of the "multiple of 3" rule),
+                    // we want to consider it next time because the number
+                    // of delimiters can change as we continue processing.
+                    openersBottom.put(delimiterChar, closer.previous);
+                    if (!closer.canOpen()) {
+                        // We can remove a closer that can't be an opener,
+                        // once we've seen there's no matching opener:
+                        removeDelimiterKeepNode(closer);
+                    }
+                }
+                closer = closer.next;
+                continue;
+            }
+
+            // Remove number of used delimiters nodes.
+            for (int i = 0; i < usedDelims; i++) {
+                Text delimiter = opener.characters.remove(opener.characters.size() - 1);
+                delimiter.unlink();
+            }
+            for (int i = 0; i < usedDelims; i++) {
+                Text delimiter = closer.characters.remove(0);
+                delimiter.unlink();
+            }
+
+            removeDelimitersBetween(opener, closer);
+
+            // No delimiter characters left to process, so we can remove delimiter and the now empty node.
+            if (opener.length() == 0) {
+                removeDelimiterAndNodes(opener);
+            }
+
+            if (closer.length() == 0) {
+                Delimiter next = closer.next;
+                removeDelimiterAndNodes(closer);
+                closer = next;
+            }
+        }
+
+        // remove all delimiters
+        while (lastDelimiter != null && lastDelimiter != stackBottom) {
+            removeDelimiterKeepNode(lastDelimiter);
+        }
+    }
+
+    private void removeDelimitersBetween(Delimiter opener, Delimiter closer) {
+        Delimiter delimiter = closer.previous;
+        while (delimiter != null && delimiter != opener) {
+            Delimiter previousDelimiter = delimiter.previous;
+            removeDelimiterKeepNode(delimiter);
+            delimiter = previousDelimiter;
+        }
+    }
+
+    /**
+     * Remove the delimiter and the corresponding text node. For used delimiters, e.g. `*` in `*foo*`.
+     */
+    private void removeDelimiterAndNodes(Delimiter delim) {
+        removeDelimiter(delim);
+    }
+
+    /**
+     * Remove the delimiter but keep the corresponding node as text. For unused delimiters such as `_` in `foo_bar`.
+     */
+    private void removeDelimiterKeepNode(Delimiter delim) {
+        removeDelimiter(delim);
+    }
+
+    private void removeDelimiter(Delimiter delim) {
+        if (delim.previous != null) {
+            delim.previous.next = delim.next;
+        }
+        if (delim.next == null) {
+            // top of stack
+            lastDelimiter = delim.previous;
+        } else {
+            delim.next.previous = delim.previous;
+        }
+    }
+
+    private void mergeChildTextNodes(Node node) {
+        // No children, no need for merging
+        if (node.getFirstChild() == null) {
+            return;
+        }
+
+        mergeTextNodesInclusive(node.getFirstChild(), node.getLastChild());
+    }
+
+    private void mergeTextNodesInclusive(Node fromNode, Node toNode) {
+        Text first = null;
+        Text last = null;
+        int length = 0;
+
+        Node node = fromNode;
+        while (node != null) {
+            if (node instanceof Text) {
+                Text text = (Text) node;
+                if (first == null) {
+                    first = text;
+                }
+                length += text.getLiteral().length();
+                last = text;
+            } else {
+                mergeIfNeeded(first, last, length);
+                first = null;
+                last = null;
+                length = 0;
+
+                mergeChildTextNodes(node);
+            }
+            if (node == toNode) {
+                break;
+            }
+            node = node.getNext();
+        }
+
+        mergeIfNeeded(first, last, length);
+    }
+
+    private void mergeIfNeeded(Text first, Text last, int textLength) {
+        if (first != null && last != null && first != last) {
+            StringBuilder sb = new StringBuilder(textLength);
+            sb.append(first.getLiteral());
+            SourceSpans sourceSpans = null;
+            if (includeSourceSpans) {
+                sourceSpans = new SourceSpans();
+                sourceSpans.addAll(first.getSourceSpans());
+            }
+            Node node = first.getNext();
+            Node stop = last.getNext();
+            while (node != stop) {
+                sb.append(((Text) node).getLiteral());
+                if (sourceSpans != null) {
+                    sourceSpans.addAll(node.getSourceSpans());
+                }
+
+                Node unlink = node;
+                node = node.getNext();
+                unlink.unlink();
+            }
+            String literal = sb.toString();
+            first.setLiteral(literal);
+            if (sourceSpans != null) {
+                first.setSourceSpans(sourceSpans.getSourceSpans());
+            }
+        }
+    }
+
+    private static class DelimiterData {
+
+        final List<Text> characters;
+        final boolean canClose;
+        final boolean canOpen;
+
+        DelimiterData(List<Text> characters, boolean canOpen, boolean canClose) {
+            this.characters = characters;
+            this.canOpen = canOpen;
+            this.canClose = canClose;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitionParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitionParser.java
new file mode 100644
index 00000000000..35db88cc2ba
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitionParser.java
@@ -0,0 +1,313 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.internal.util.LinkScanner;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Parser for link reference definitions at the beginning of a paragraph.
+ *
+ * @see <a href="https://spec.commonmark.org/0.29/#link-reference-definition">Link reference definitions</a>
+ */
+public class LinkReferenceDefinitionParser {
+
+    private State state = State.START_DEFINITION;
+
+    private final List<SourceLine> paragraphLines = new ArrayList<>();
+    private final List<LinkReferenceDefinition> definitions = new ArrayList<>();
+    private final List<SourceSpan> sourceSpans = new ArrayList<>();
+
+    private StringBuilder label;
+    private String destination;
+    private char titleDelimiter;
+    private StringBuilder title;
+    private boolean referenceValid = false;
+
+    public void parse(SourceLine line) {
+        paragraphLines.add(line);
+        if (state == State.PARAGRAPH) {
+            // We're in a paragraph now. Link reference definitions can only appear at the beginning, so once
+            // we're in a paragraph, there's no going back.
+            return;
+        }
+
+        Scanner scanner = Scanner.of(SourceLines.of(line));
+        while (scanner.hasNext()) {
+            boolean success;
+            switch (state) {
+                case START_DEFINITION: {
+                    success = startDefinition(scanner);
+                    break;
+                }
+                case LABEL: {
+                    success = label(scanner);
+                    break;
+                }
+                case DESTINATION: {
+                    success = destination(scanner);
+                    break;
+                }
+                case START_TITLE: {
+                    success = startTitle(scanner);
+                    break;
+                }
+                case TITLE: {
+                    success = title(scanner);
+                    break;
+                }
+                default: {
+                    throw new IllegalStateException("Unknown parsing state: " + state);
+                }
+            }
+            // Parsing failed, which means we fall back to treating text as a paragraph.
+            if (!success) {
+                state = State.PARAGRAPH;
+                return;
+            }
+        }
+    }
+
+    public void addSourceSpan(SourceSpan sourceSpan) {
+        sourceSpans.add(sourceSpan);
+    }
+
+    /**
+     * @return the lines that are normal paragraph content, without newlines
+     */
+    SourceLines getParagraphLines() {
+        return SourceLines.of(paragraphLines);
+    }
+
+    List<SourceSpan> getParagraphSourceSpans() {
+        return sourceSpans;
+    }
+
+    List<LinkReferenceDefinition> getDefinitions() {
+        finishReference();
+        return definitions;
+    }
+
+    State getState() {
+        return state;
+    }
+
+    private boolean startDefinition(Scanner scanner) {
+        // Finish any outstanding references now. We don't do this earlier because we need addSourceSpan to have been
+        // called before we do it.
+        finishReference();
+
+        scanner.whitespace();
+        if (!scanner.next('[')) {
+            return false;
+        }
+
+        state = State.LABEL;
+        label = new StringBuilder();
+
+        if (!scanner.hasNext()) {
+            label.append('\n');
+        }
+        return true;
+    }
+
+    private boolean label(Scanner scanner) {
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkLabelContent(scanner)) {
+            return false;
+        }
+
+        label.append(scanner.getSource(start, scanner.position()).getContent());
+
+        if (!scanner.hasNext()) {
+            // label might continue on next line
+            label.append('\n');
+            return true;
+        } else if (scanner.next(']')) {
+            // end of label
+            if (!scanner.next(':')) {
+                return false;
+            }
+
+            // spec: A link label can have at most 999 characters inside the square brackets.
+            if (label.length() > 999) {
+                return false;
+            }
+
+            String normalizedLabel = Escaping.normalizeLabelContent(label.toString());
+            if (normalizedLabel.isEmpty()) {
+                return false;
+            }
+
+            state = State.DESTINATION;
+
+            scanner.whitespace();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private boolean destination(Scanner scanner) {
+        scanner.whitespace();
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkDestination(scanner)) {
+            return false;
+        }
+
+        String rawDestination = scanner.getSource(start, scanner.position()).getContent();
+        destination = rawDestination.startsWith("<") ?
+                rawDestination.substring(1, rawDestination.length() - 1) :
+                rawDestination;
+
+        int whitespace = scanner.whitespace();
+        if (!scanner.hasNext()) {
+            // Destination was at end of line, so this is a valid reference for sure (and maybe a title).
+            // If not at end of line, wait for title to be valid first.
+            referenceValid = true;
+            paragraphLines.clear();
+        } else if (whitespace == 0) {
+            // spec: The title must be separated from the link destination by whitespace
+            return false;
+        }
+
+        state = State.START_TITLE;
+        return true;
+    }
+
+    private boolean startTitle(Scanner scanner) {
+        scanner.whitespace();
+        if (!scanner.hasNext()) {
+            state = State.START_DEFINITION;
+            return true;
+        }
+
+        titleDelimiter = '\0';
+        char c = scanner.peek();
+        switch (c) {
+            case '"':
+            case '\'':
+                titleDelimiter = c;
+                break;
+            case '(':
+                titleDelimiter = ')';
+                break;
+        }
+
+        if (titleDelimiter != '\0') {
+            state = State.TITLE;
+            title = new StringBuilder();
+            scanner.next();
+            if (!scanner.hasNext()) {
+                title.append('\n');
+            }
+        } else {
+            // There might be another reference instead, try that for the same character.
+            state = State.START_DEFINITION;
+        }
+        return true;
+    }
+
+    private boolean title(Scanner scanner) {
+        Position start = scanner.position();
+        if (!LinkScanner.scanLinkTitleContent(scanner, titleDelimiter)) {
+            // Invalid title, stop
+            return false;
+        }
+
+        title.append(scanner.getSource(start, scanner.position()).getContent());
+
+        if (!scanner.hasNext()) {
+            // Title ran until the end of line, so continue on next line (until we find the delimiter)
+            title.append('\n');
+            return true;
+        }
+
+        // Skip delimiter character
+        scanner.next();
+        scanner.whitespace();
+        if (scanner.hasNext()) {
+            // spec: No further non-whitespace characters may occur on the line.
+            return false;
+        }
+        referenceValid = true;
+        paragraphLines.clear();
+
+        // See if there's another definition.
+        state = State.START_DEFINITION;
+        return true;
+    }
+
+    private void finishReference() {
+        if (!referenceValid) {
+            return;
+        }
+
+        String d = Escaping.unescapeString(destination);
+        String t = title != null ? Escaping.unescapeString(title.toString()) : null;
+        LinkReferenceDefinition definition = new LinkReferenceDefinition(label.toString(), d, t);
+        definition.setSourceSpans(sourceSpans);
+        sourceSpans.clear();
+        definitions.add(definition);
+
+        label = null;
+        referenceValid = false;
+        destination = null;
+        title = null;
+    }
+
+    enum State {
+        // Looking for the start of a definition, i.e. `[`
+        START_DEFINITION,
+        // Parsing the label, i.e. `foo` within `[foo]`
+        LABEL,
+        // Parsing the destination, i.e. `/url` in `[foo]: /url`
+        DESTINATION,
+        // Looking for the start of a title, i.e. the first `"` in `[foo]: /url "title"`
+        START_TITLE,
+        // Parsing the content of the title, i.e. `title` in `[foo]: /url "title"`
+        TITLE,
+
+        // End state, no matter what kind of lines we add, they won't be references
+        PARAGRAPH,
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitions.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitions.java
new file mode 100644
index 00000000000..e1def1de98e
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/LinkReferenceDefinitions.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class LinkReferenceDefinitions {
+
+    // LinkedHashMap for determinism and to preserve document order
+    private final Map<String, LinkReferenceDefinition> definitions = new LinkedHashMap<>();
+
+    public void add(LinkReferenceDefinition definition) {
+        String normalizedLabel = Escaping.normalizeLabelContent(definition.getLabel());
+
+        // spec: When there are multiple matching link reference definitions, the first is used
+        if (!definitions.containsKey(normalizedLabel)) {
+            definitions.put(normalizedLabel, definition);
+        }
+    }
+
+    public LinkReferenceDefinition get(String label) {
+        String normalizedLabel = Escaping.normalizeLabelContent(label);
+        return definitions.get(normalizedLabel);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListBlockParser.java
new file mode 100644
index 00000000000..89a3c2332cb
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListBlockParser.java
@@ -0,0 +1,286 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.internal.util.Parsing;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.block.*;
+
+import java.util.Objects;
+
+public class ListBlockParser extends AbstractBlockParser {
+
+    private final ListBlock block;
+
+    private boolean hadBlankLine;
+    private int linesAfterBlank;
+
+    public ListBlockParser(ListBlock block) {
+        this.block = block;
+    }
+
+    @Override
+    public boolean isContainer() {
+        return true;
+    }
+
+    @Override
+    public boolean canContain(Block childBlock) {
+        if (childBlock instanceof ListItem) {
+            // Another list item is added to this list block. If the previous line was blank, that means this list block
+            // is "loose" (not tight).
+            //
+            // spec: A list is loose if any of its constituent list items are separated by blank lines
+            if (hadBlankLine && linesAfterBlank == 1) {
+                block.setTight(false);
+                hadBlankLine = false;
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (state.isBlank()) {
+            hadBlankLine = true;
+            linesAfterBlank = 0;
+        } else if (hadBlankLine) {
+            linesAfterBlank++;
+        }
+        // List blocks themselves don't have any markers, only list items. So try to stay in the list.
+        // If there is a block start other than list item, canContain makes sure that this list is closed.
+        return BlockContinue.atIndex(state.getIndex());
+    }
+
+    /**
+     * Parse a list marker and return data on the marker or null.
+     */
+    private static ListData parseList(CharSequence line, final int markerIndex, final int markerColumn,
+                                      final boolean inParagraph) {
+        ListMarkerData listMarker = parseListMarker(line, markerIndex);
+        if (listMarker == null) {
+            return null;
+        }
+        ListBlock listBlock = listMarker.listBlock;
+
+        int indexAfterMarker = listMarker.indexAfterMarker;
+        int markerLength = indexAfterMarker - markerIndex;
+        // marker doesn't include tabs, so counting them as columns directly is ok
+        int columnAfterMarker = markerColumn + markerLength;
+        // the column within the line where the content starts
+        int contentColumn = columnAfterMarker;
+
+        // See at which column the content starts if there is content
+        boolean hasContent = false;
+        int length = line.length();
+        for (int i = indexAfterMarker; i < length; i++) {
+            char c = line.charAt(i);
+            if (c == '\t') {
+                contentColumn += Parsing.columnsToNextTabStop(contentColumn);
+            } else if (c == ' ') {
+                contentColumn++;
+            } else {
+                hasContent = true;
+                break;
+            }
+        }
+
+        if (inParagraph) {
+            // If the list item is ordered, the start number must be 1 to interrupt a paragraph.
+            if (listBlock instanceof OrderedList && ((OrderedList) listBlock).getMarkerStartNumber() != 1) {
+                return null;
+            }
+            // Empty list item can not interrupt a paragraph.
+            if (!hasContent) {
+                return null;
+            }
+        }
+
+        if (!hasContent || (contentColumn - columnAfterMarker) > Parsing.CODE_BLOCK_INDENT) {
+            // If this line is blank or has a code block, default to 1 space after marker
+            contentColumn = columnAfterMarker + 1;
+        }
+
+        return new ListData(listBlock, contentColumn);
+    }
+
+    private static ListMarkerData parseListMarker(CharSequence line, int index) {
+        char c = line.charAt(index);
+        switch (c) {
+            // spec: A bullet list marker is a -, +, or * character.
+            case '-':
+            case '+':
+            case '*':
+                if (isSpaceTabOrEnd(line, index + 1)) {
+                    BulletList bulletList = new BulletList();
+                    bulletList.setMarker(String.valueOf(c));
+                    return new ListMarkerData(bulletList, index + 1);
+                } else {
+                    return null;
+                }
+            default:
+                return parseOrderedList(line, index);
+        }
+    }
+
+    // spec: An ordered list marker is a sequence of 1\u20139 arabic digits (0-9), followed by either a `.` character or a
+    // `)` character.
+    private static ListMarkerData parseOrderedList(CharSequence line, int index) {
+        int digits = 0;
+        int length = line.length();
+        for (int i = index; i < length; i++) {
+            char c = line.charAt(i);
+            switch (c) {
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                    digits++;
+                    if (digits > 9) {
+                        return null;
+                    }
+                    break;
+                case '.':
+                case ')':
+                    if (digits >= 1 && isSpaceTabOrEnd(line, i + 1)) {
+                        String number = line.subSequence(index, i).toString();
+                        OrderedList orderedList = new OrderedList();
+                        orderedList.setMarkerStartNumber(Integer.parseInt(number));
+                        orderedList.setMarkerDelimiter(String.valueOf(c));
+                        return new ListMarkerData(orderedList, i + 1);
+                    } else {
+                        return null;
+                    }
+                default:
+                    return null;
+            }
+        }
+        return null;
+    }
+
+    private static boolean isSpaceTabOrEnd(CharSequence line, int index) {
+        if (index < line.length()) {
+            switch (line.charAt(index)) {
+                case ' ':
+                case '\t':
+                    return true;
+                default:
+                    return false;
+            }
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Returns true if the two list items are of the same type,
+     * with the same delimiter and bullet character. This is used
+     * in agglomerating list items into lists.
+     */
+    private static boolean listsMatch(ListBlock a, ListBlock b) {
+        if (a instanceof BulletList && b instanceof BulletList) {
+            return Objects.equals(((BulletList) a).getMarker(), ((BulletList) b).getMarker());
+        } else if (a instanceof OrderedList && b instanceof OrderedList) {
+            return Objects.equals(((OrderedList) a).getMarkerDelimiter(), ((OrderedList) b).getMarkerDelimiter());
+        }
+        return false;
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            BlockParser matched = matchedBlockParser.getMatchedBlockParser();
+
+            if (state.getIndent() >= Parsing.CODE_BLOCK_INDENT) {
+                return BlockStart.none();
+            }
+            int markerIndex = state.getNextNonSpaceIndex();
+            int markerColumn = state.getColumn() + state.getIndent();
+            boolean inParagraph = !matchedBlockParser.getParagraphLines().isEmpty();
+            ListData listData = parseList(state.getLine().getContent(), markerIndex, markerColumn, inParagraph);
+            if (listData == null) {
+                return BlockStart.none();
+            }
+
+            int newColumn = listData.contentColumn;
+            ListItemParser listItemParser = new ListItemParser(state.getIndent(), newColumn - state.getColumn());
+
+            // prepend the list block if needed
+            if (!(matched instanceof ListBlockParser) ||
+                    !(listsMatch((ListBlock) matched.getBlock(), listData.listBlock))) {
+
+                ListBlockParser listBlockParser = new ListBlockParser(listData.listBlock);
+                // We start out with assuming a list is tight. If we find a blank line, we set it to loose later.
+                listData.listBlock.setTight(true);
+
+                return BlockStart.of(listBlockParser, listItemParser).atColumn(newColumn);
+            } else {
+                return BlockStart.of(listItemParser).atColumn(newColumn);
+            }
+        }
+    }
+
+    private static class ListData {
+        final ListBlock listBlock;
+        final int contentColumn;
+
+        ListData(ListBlock listBlock, int contentColumn) {
+            this.listBlock = listBlock;
+            this.contentColumn = contentColumn;
+        }
+    }
+
+    private static class ListMarkerData {
+        final ListBlock listBlock;
+        final int indexAfterMarker;
+
+        ListMarkerData(ListBlock listBlock, int indexAfterMarker) {
+            this.listBlock = listBlock;
+            this.indexAfterMarker = indexAfterMarker;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListItemParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListItemParser.java
new file mode 100644
index 00000000000..e6401deed9f
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ListItemParser.java
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.ListBlock;
+import jdk.internal.org.commonmark.node.ListItem;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.parser.block.AbstractBlockParser;
+import jdk.internal.org.commonmark.parser.block.BlockContinue;
+import jdk.internal.org.commonmark.parser.block.ParserState;
+
+public class ListItemParser extends AbstractBlockParser {
+
+    private final ListItem block = new ListItem();
+
+    /**
+     * Minimum number of columns that the content has to be indented (relative to the containing block) to be part of
+     * this list item.
+     */
+    private int contentIndent;
+
+    private boolean hadBlankLine;
+
+    public ListItemParser(int markerIndent, int contentIndent) {
+        this.contentIndent = contentIndent;
+        block.setMarkerIndent(markerIndent);
+        block.setContentIndent(contentIndent);
+    }
+
+    @Override
+    public boolean isContainer() {
+        return true;
+    }
+
+    @Override
+    public boolean canContain(Block childBlock) {
+        if (hadBlankLine) {
+            // We saw a blank line in this list item, that means the list block is loose.
+            //
+            // spec: if any of its constituent list items directly contain two block-level elements with a blank line
+            // between them
+            Block parent = block.getParent();
+            if (parent instanceof ListBlock) {
+                ((ListBlock) parent).setTight(false);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (state.isBlank()) {
+            if (block.getFirstChild() == null) {
+                // Blank line after empty list item
+                return BlockContinue.none();
+            } else {
+                Block activeBlock = state.getActiveBlockParser().getBlock();
+                // If the active block is a code block, blank lines in it should not affect if the list is tight.
+                hadBlankLine = activeBlock instanceof Paragraph || activeBlock instanceof ListItem;
+                return BlockContinue.atIndex(state.getNextNonSpaceIndex());
+            }
+        }
+
+        if (state.getIndent() >= contentIndent) {
+            return BlockContinue.atColumn(state.getColumn() + contentIndent);
+        } else {
+            // Note: We'll hit this case for lazy continuation lines, they will get added later.
+            return BlockContinue.none();
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ParagraphParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ParagraphParser.java
new file mode 100644
index 00000000000..7cbc28e2cb2
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ParagraphParser.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.block.AbstractBlockParser;
+import jdk.internal.org.commonmark.parser.block.BlockContinue;
+import jdk.internal.org.commonmark.parser.block.ParserState;
+
+import java.util.List;
+
+public class ParagraphParser extends AbstractBlockParser {
+
+    private final Paragraph block = new Paragraph();
+    private final LinkReferenceDefinitionParser linkReferenceDefinitionParser = new LinkReferenceDefinitionParser();
+
+    @Override
+    public boolean canHaveLazyContinuationLines() {
+        return true;
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        if (!state.isBlank()) {
+            return BlockContinue.atIndex(state.getIndex());
+        } else {
+            return BlockContinue.none();
+        }
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+        linkReferenceDefinitionParser.parse(line);
+    }
+
+    @Override
+    public void addSourceSpan(SourceSpan sourceSpan) {
+        // Some source spans might belong to link reference definitions, others to the paragraph.
+        // The parser will handle that.
+        linkReferenceDefinitionParser.addSourceSpan(sourceSpan);
+    }
+
+    @Override
+    public void closeBlock() {
+        if (linkReferenceDefinitionParser.getParagraphLines().isEmpty()) {
+            block.unlink();
+        } else {
+            block.setSourceSpans(linkReferenceDefinitionParser.getParagraphSourceSpans());
+        }
+    }
+
+    @Override
+    public void parseInlines(InlineParser inlineParser) {
+        SourceLines lines = linkReferenceDefinitionParser.getParagraphLines();
+        if (!lines.isEmpty()) {
+            inlineParser.parse(lines, block);
+        }
+    }
+
+    public SourceLines getParagraphLines() {
+        return linkReferenceDefinitionParser.getParagraphLines();
+    }
+
+    public List<LinkReferenceDefinition> getDefinitions() {
+        return linkReferenceDefinitionParser.getDefinitions();
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/StaggeredDelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/StaggeredDelimiterProcessor.java
new file mode 100644
index 00000000000..995f9eac270
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/StaggeredDelimiterProcessor.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterRun;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
+
+/**
+ * An implementation of DelimiterProcessor that dispatches all calls to two or more other DelimiterProcessors
+ * depending on the length of the delimiter run. All child DelimiterProcessors must have different minimum
+ * lengths. A given delimiter run is dispatched to the child with the largest acceptable minimum length. If no
+ * child is applicable, the one with the largest minimum length is chosen.
+ */
+class StaggeredDelimiterProcessor implements DelimiterProcessor {
+
+    private final char delim;
+    private int minLength = 0;
+    private LinkedList<DelimiterProcessor> processors = new LinkedList<>(); // in reverse getMinLength order
+
+    StaggeredDelimiterProcessor(char delim) {
+        this.delim = delim;
+    }
+
+
+    @Override
+    public char getOpeningCharacter() {
+        return delim;
+    }
+
+    @Override
+    public char getClosingCharacter() {
+        return delim;
+    }
+
+    @Override
+    public int getMinLength() {
+        return minLength;
+    }
+
+    void add(DelimiterProcessor dp) {
+        final int len = dp.getMinLength();
+        ListIterator<DelimiterProcessor> it = processors.listIterator();
+        boolean added = false;
+        while (it.hasNext()) {
+            DelimiterProcessor p = it.next();
+            int pLen = p.getMinLength();
+            if (len > pLen) {
+                it.previous();
+                it.add(dp);
+                added = true;
+                break;
+            } else if (len == pLen) {
+                throw new IllegalArgumentException("Cannot add two delimiter processors for char '" + delim + "' and minimum length " + len + "; conflicting processors: " + p + ", " + dp);
+            }
+        }
+        if (!added) {
+            processors.add(dp);
+            this.minLength = len;
+        }
+    }
+
+    private DelimiterProcessor findProcessor(int len) {
+        for (DelimiterProcessor p : processors) {
+            if (p.getMinLength() <= len) {
+                return p;
+            }
+        }
+        return processors.getFirst();
+    }
+
+    @Override
+    public int process(DelimiterRun openingRun, DelimiterRun closingRun) {
+        return findProcessor(openingRun.length()).process(openingRun, closingRun);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ThematicBreakParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ThematicBreakParser.java
new file mode 100644
index 00000000000..ae0abed6d71
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/ThematicBreakParser.java
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.ThematicBreak;
+import jdk.internal.org.commonmark.parser.block.*;
+
+public class ThematicBreakParser extends AbstractBlockParser {
+
+    private final ThematicBreak block = new ThematicBreak();
+
+    public ThematicBreakParser(String literal) {
+        block.setLiteral(literal);
+    }
+
+    @Override
+    public Block getBlock() {
+        return block;
+    }
+
+    @Override
+    public BlockContinue tryContinue(ParserState state) {
+        // a horizontal rule can never container > 1 line, so fail to match
+        return BlockContinue.none();
+    }
+
+    public static class Factory extends AbstractBlockParserFactory {
+
+        @Override
+        public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser) {
+            if (state.getIndent() >= 4) {
+                return BlockStart.none();
+            }
+            int nextNonSpace = state.getNextNonSpaceIndex();
+            CharSequence line = state.getLine().getContent();
+            if (isThematicBreak(line, nextNonSpace)) {
+                var literal = String.valueOf(line.subSequence(state.getIndex(), line.length()));
+                return BlockStart.of(new ThematicBreakParser(literal)).atIndex(line.length());
+            } else {
+                return BlockStart.none();
+            }
+        }
+    }
+
+    // spec: A line consisting of 0-3 spaces of indentation, followed by a sequence of three or more matching -, _, or *
+    // characters, each followed optionally by any number of spaces, forms a thematic break.
+    private static boolean isThematicBreak(CharSequence line, int index) {
+        int dashes = 0;
+        int underscores = 0;
+        int asterisks = 0;
+        int length = line.length();
+        for (int i = index; i < length; i++) {
+            switch (line.charAt(i)) {
+                case '-':
+                    dashes++;
+                    break;
+                case '_':
+                    underscores++;
+                    break;
+                case '*':
+                    asterisks++;
+                    break;
+                case ' ':
+                case '\t':
+                    // Allowed, even between markers
+                    break;
+                default:
+                    return false;
+            }
+        }
+
+        return ((dashes >= 3 && underscores == 0 && asterisks == 0) ||
+                (underscores >= 3 && dashes == 0 && asterisks == 0) ||
+                (asterisks >= 3 && dashes == 0 && underscores == 0));
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AsteriskDelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AsteriskDelimiterProcessor.java
new file mode 100644
index 00000000000..ff205e8bd22
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AsteriskDelimiterProcessor.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+public class AsteriskDelimiterProcessor extends EmphasisDelimiterProcessor {
+
+    public AsteriskDelimiterProcessor() {
+        super('*');
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AutolinkInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AutolinkInlineParser.java
new file mode 100644
index 00000000000..28ce45d9c4c
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/AutolinkInlineParser.java
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.Link;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+import java.util.regex.Pattern;
+
+/**
+ * Attempt to parse an autolink (URL or email in pointy brackets).
+ */
+public class AutolinkInlineParser implements InlineContentParser {
+
+    private static final Pattern URI = Pattern
+            .compile("^[a-zA-Z][a-zA-Z0-9.+-]{1,31}:[^<>\u0000-\u0020]*$");
+
+    private static final Pattern EMAIL = Pattern
+            .compile("^([a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)$");
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        scanner.next();
+        Position textStart = scanner.position();
+        if (scanner.find('>') > 0) {
+            SourceLines textSource = scanner.getSource(textStart, scanner.position());
+            String content = textSource.getContent();
+            scanner.next();
+
+            String destination = null;
+            if (URI.matcher(content).matches()) {
+                destination = content;
+            } else if (EMAIL.matcher(content).matches()) {
+                destination = "mailto:" + content;
+            }
+
+            if (destination != null) {
+                Link link = new Link(destination, null);
+                Text text = new Text(content);
+                text.setSourceSpans(textSource.getSourceSpans());
+                link.appendChild(text);
+                return ParsedInline.of(link, scanner.position());
+            }
+        }
+        return ParsedInline.none();
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackslashInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackslashInlineParser.java
new file mode 100644
index 00000000000..e18d337ad8a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackslashInlineParser.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.node.HardLineBreak;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+import java.util.regex.Pattern;
+
+/**
+ * Parse a backslash-escaped special character, adding either the escaped  character, a hard line break
+ * (if the backslash is followed by a newline), or a literal backslash to the block's children.
+ */
+public class BackslashInlineParser implements InlineContentParser {
+
+    private static final Pattern ESCAPABLE = Pattern.compile('^' + Escaping.ESCAPABLE);
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        // Backslash
+        scanner.next();
+
+        char next = scanner.peek();
+        if (next == '\n') {
+            scanner.next();
+            return ParsedInline.of(new HardLineBreak(), scanner.position());
+        } else if (ESCAPABLE.matcher(String.valueOf(next)).matches()) {
+            scanner.next();
+            return ParsedInline.of(new Text(String.valueOf(next)), scanner.position());
+        } else {
+            return ParsedInline.of(new Text("\\"), scanner.position());
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackticksInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackticksInlineParser.java
new file mode 100644
index 00000000000..06b80ab3ebd
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/BackticksInlineParser.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.Code;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+import jdk.internal.org.commonmark.text.Characters;
+
+/**
+ * Attempt to parse backticks, returning either a backtick code span or a literal sequence of backticks.
+ */
+public class BackticksInlineParser implements InlineContentParser {
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        Position start = scanner.position();
+        int openingTicks = scanner.matchMultiple('`');
+        Position afterOpening = scanner.position();
+
+        while (scanner.find('`') > 0) {
+            Position beforeClosing = scanner.position();
+            int count = scanner.matchMultiple('`');
+            if (count == openingTicks) {
+                Code node = new Code();
+
+                String content = scanner.getSource(afterOpening, beforeClosing).getContent();
+                content = content.replace('\n', ' ');
+
+                // spec: If the resulting string both begins and ends with a space character, but does not consist
+                // entirely of space characters, a single space character is removed from the front and back.
+                if (content.length() >= 3 &&
+                        content.charAt(0) == ' ' &&
+                        content.charAt(content.length() - 1) == ' ' &&
+                        Characters.hasNonSpace(content)) {
+                    content = content.substring(1, content.length() - 1);
+                }
+
+                node.setLiteral(content);
+                return ParsedInline.of(node, scanner.position());
+            }
+        }
+
+        // If we got here, we didn't find a matching closing backtick sequence.
+        SourceLines source = scanner.getSource(start, afterOpening);
+        Text text = new Text(source.getContent());
+        return ParsedInline.of(text, afterOpening);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EmphasisDelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EmphasisDelimiterProcessor.java
new file mode 100644
index 00000000000..0a4c3c45140
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EmphasisDelimiterProcessor.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterRun;
+
+public abstract class EmphasisDelimiterProcessor implements DelimiterProcessor {
+
+    private final char delimiterChar;
+
+    protected EmphasisDelimiterProcessor(char delimiterChar) {
+        this.delimiterChar = delimiterChar;
+    }
+
+    @Override
+    public char getOpeningCharacter() {
+        return delimiterChar;
+    }
+
+    @Override
+    public char getClosingCharacter() {
+        return delimiterChar;
+    }
+
+    @Override
+    public int getMinLength() {
+        return 1;
+    }
+
+    @Override
+    public int process(DelimiterRun openingRun, DelimiterRun closingRun) {
+        // "multiple of 3" rule for internal delimiter runs
+        if ((openingRun.canClose() || closingRun.canOpen()) &&
+                closingRun.originalLength() % 3 != 0 &&
+                (openingRun.originalLength() + closingRun.originalLength()) % 3 == 0) {
+            return 0;
+        }
+
+        int usedDelimiters;
+        Node emphasis;
+        // calculate actual number of delimiters used from this closer
+        if (openingRun.length() >= 2 && closingRun.length() >= 2) {
+            usedDelimiters = 2;
+            emphasis = new StrongEmphasis(String.valueOf(delimiterChar) + delimiterChar);
+        } else {
+            usedDelimiters = 1;
+            emphasis = new Emphasis(String.valueOf(delimiterChar));
+        }
+
+        SourceSpans sourceSpans = SourceSpans.empty();
+        sourceSpans.addAllFrom(openingRun.getOpeners(usedDelimiters));
+
+        Text opener = openingRun.getOpener();
+        for (Node node : Nodes.between(opener, closingRun.getCloser())) {
+            emphasis.appendChild(node);
+            sourceSpans.addAll(node.getSourceSpans());
+        }
+
+        sourceSpans.addAllFrom(closingRun.getClosers(usedDelimiters));
+
+        emphasis.setSourceSpans(sourceSpans.getSourceSpans());
+        opener.insertAfter(emphasis);
+
+        return usedDelimiters;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EntityInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EntityInlineParser.java
new file mode 100644
index 00000000000..cf4e3d2004b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/EntityInlineParser.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.text.AsciiMatcher;
+import jdk.internal.org.commonmark.internal.util.Html5Entities;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+/**
+ * Attempts to parse a HTML entity or numeric character reference.
+ */
+public class EntityInlineParser implements InlineContentParser {
+
+    private static final AsciiMatcher hex = AsciiMatcher.builder().range('0', '9').range('A', 'F').range('a', 'f').build();
+    private static final AsciiMatcher dec = AsciiMatcher.builder().range('0', '9').build();
+    private static final AsciiMatcher entityStart = AsciiMatcher.builder().range('A', 'Z').range('a', 'z').build();
+    private static final AsciiMatcher entityContinue = entityStart.newBuilder().range('0', '9').build();
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        Position start = scanner.position();
+        // Skip `&`
+        scanner.next();
+
+        char c = scanner.peek();
+        if (c == '#') {
+            // Numeric
+            scanner.next();
+            if (scanner.next('x') || scanner.next('X')) {
+                int digits = scanner.match(hex);
+                if (1 <= digits && digits <= 6 && scanner.next(';')) {
+                    return entity(scanner, start);
+                }
+            } else {
+                int digits = scanner.match(dec);
+                if (1 <= digits && digits <= 7 && scanner.next(';')) {
+                    return entity(scanner, start);
+                }
+            }
+        } else if (entityStart.matches(c)) {
+            scanner.match(entityContinue);
+            if (scanner.next(';')) {
+                return entity(scanner, start);
+            }
+        }
+
+        return ParsedInline.none();
+    }
+
+    private ParsedInline entity(Scanner scanner, Position start) {
+        String text = scanner.getSource(start, scanner.position()).getContent();
+        return ParsedInline.of(new Text(Html5Entities.entityToString(text)), scanner.position());
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/HtmlInlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/HtmlInlineParser.java
new file mode 100644
index 00000000000..88f4baa2275
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/HtmlInlineParser.java
@@ -0,0 +1,235 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.text.AsciiMatcher;
+import jdk.internal.org.commonmark.node.HtmlInline;
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+/**
+ * Attempt to parse inline HTML.
+ */
+public class HtmlInlineParser implements InlineContentParser {
+
+    private static final AsciiMatcher asciiLetter = AsciiMatcher.builder().range('A', 'Z').range('a', 'z').build();
+
+    // spec: A tag name consists of an ASCII letter followed by zero or more ASCII letters, digits, or hyphens (-).
+    private static final AsciiMatcher tagNameStart = asciiLetter;
+    private static final AsciiMatcher tagNameContinue = tagNameStart.newBuilder().range('0', '9').c('-').build();
+
+    // spec: An attribute name consists of an ASCII letter, _, or :, followed by zero or more ASCII letters, digits,
+    // _, ., :, or -. (Note: This is the XML specification restricted to ASCII. HTML5 is laxer.)
+    private static final AsciiMatcher attributeStart = asciiLetter.newBuilder().c('_').c(':').build();
+    private static final AsciiMatcher attributeContinue = attributeStart.newBuilder().range('0', '9').c('.').c('-').build();
+    // spec: An unquoted attribute value is a nonempty string of characters not including whitespace, ", ', =, <, >, or `.
+    private static final AsciiMatcher attributeValueEnd = AsciiMatcher.builder()
+            .c(' ').c('\t').c('\n').c('\u000B').c('\f').c('\r')
+            .c('"').c('\'').c('=').c('<').c('>').c('`')
+            .build();
+
+    @Override
+    public ParsedInline tryParse(InlineParserState inlineParserState) {
+        Scanner scanner = inlineParserState.scanner();
+        Position start = scanner.position();
+        // Skip over `<`
+        scanner.next();
+
+        char c = scanner.peek();
+        if (tagNameStart.matches(c)) {
+            if (tryOpenTag(scanner)) {
+                return htmlInline(start, scanner);
+            }
+        } else if (c == '/') {
+            if (tryClosingTag(scanner)) {
+                return htmlInline(start, scanner);
+            }
+        } else if (c == '?') {
+            if (tryProcessingInstruction(scanner)) {
+                return htmlInline(start, scanner);
+            }
+        } else if (c == '!') {
+            // comment, declaration or CDATA
+            scanner.next();
+            c = scanner.peek();
+            if (c == '-') {
+                if (tryComment(scanner)) {
+                    return htmlInline(start, scanner);
+                }
+            } else if (c == '[') {
+                if (tryCdata(scanner)) {
+                    return htmlInline(start, scanner);
+                }
+            } else if (asciiLetter.matches(c)) {
+                if (tryDeclaration(scanner)) {
+                    return htmlInline(start, scanner);
+                }
+            }
+        }
+
+        return ParsedInline.none();
+    }
+
+    private static ParsedInline htmlInline(Position start, Scanner scanner) {
+        String text = scanner.getSource(start, scanner.position()).getContent();
+        HtmlInline node = new HtmlInline();
+        node.setLiteral(text);
+        return ParsedInline.of(node, scanner.position());
+    }
+
+    private static boolean tryOpenTag(Scanner scanner) {
+        // spec: An open tag consists of a < character, a tag name, zero or more attributes, optional whitespace,
+        // an optional / character, and a > character.
+        scanner.next();
+        scanner.match(tagNameContinue);
+        boolean whitespace = scanner.whitespace() >= 1;
+        // spec: An attribute consists of whitespace, an attribute name, and an optional attribute value specification.
+        while (whitespace && scanner.match(attributeStart) >= 1) {
+            scanner.match(attributeContinue);
+            // spec: An attribute value specification consists of optional whitespace, a = character,
+            // optional whitespace, and an attribute value.
+            whitespace = scanner.whitespace() >= 1;
+            if (scanner.next('=')) {
+                scanner.whitespace();
+                char valueStart = scanner.peek();
+                if (valueStart == '\'') {
+                    scanner.next();
+                    if (scanner.find('\'') < 0) {
+                        return false;
+                    }
+                    scanner.next();
+                } else if (valueStart == '"') {
+                    scanner.next();
+                    if (scanner.find('"') < 0) {
+                        return false;
+                    }
+                    scanner.next();
+                } else {
+                    if (scanner.find(attributeValueEnd) <= 0) {
+                        return false;
+                    }
+                }
+
+                // Whitespace is required between attributes
+                whitespace = scanner.whitespace() >= 1;
+            }
+        }
+
+        scanner.next('/');
+        return scanner.next('>');
+    }
+
+    private static boolean tryClosingTag(Scanner scanner) {
+        // spec: A closing tag consists of the string </, a tag name, optional whitespace, and the character >.
+        scanner.next();
+        if (scanner.match(tagNameStart) >= 1) {
+            scanner.match(tagNameContinue);
+            scanner.whitespace();
+            return scanner.next('>');
+        }
+        return false;
+    }
+
+    private static boolean tryProcessingInstruction(Scanner scanner) {
+        // spec: A processing instruction consists of the string <?, a string of characters not including the string ?>,
+        // and the string ?>.
+        scanner.next();
+        while (scanner.find('?') > 0) {
+            scanner.next();
+            if (scanner.next('>')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean tryComment(Scanner scanner) {
+        // spec: An [HTML comment](@) consists of `<!-->`, `<!--->`, or  `<!--`, a string of
+        // characters not including the string `-->`, and `-->` (see the
+        // [HTML spec](https://html.spec.whatwg.org/multipage/parsing.html#markup-declaration-open-state)).
+
+        // Skip first `-`
+        scanner.next();
+        if (!scanner.next('-')) {
+            return false;
+        }
+
+        if (scanner.next('>') || scanner.next("->")) {
+            return true;
+        }
+
+        while (scanner.find('-') >= 0) {
+            if (scanner.next("-->")) {
+                return true;
+            } else {
+                scanner.next();
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean tryCdata(Scanner scanner) {
+        // spec: A CDATA section consists of the string <![CDATA[, a string of characters not including the string ]]>,
+        // and the string ]]>.
+
+        // Skip `[`
+        scanner.next();
+
+        if (scanner.next("CDATA[")) {
+            while (scanner.find(']') >= 0) {
+                if (scanner.next("]]>")) {
+                    return true;
+                } else {
+                    scanner.next();
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean tryDeclaration(Scanner scanner) {
+        // spec: A declaration consists of the string <!, an ASCII letter, zero or more characters not including
+        // the character >, and the character >.
+        scanner.match(asciiLetter);
+        if (scanner.whitespace() <= 0) {
+            return false;
+        }
+        if (scanner.find('>') >= 0) {
+            scanner.next();
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineContentParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineContentParser.java
new file mode 100644
index 00000000000..66feff21784
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineContentParser.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+public interface InlineContentParser {
+
+    ParsedInline tryParse(InlineParserState inlineParserState);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineParserState.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineParserState.java
new file mode 100644
index 00000000000..6890364fca0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/InlineParserState.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.parser.beta.Position;
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+public interface InlineParserState {
+
+    /**
+     * Return a scanner for the input for the current position (on the character that the inline parser registered
+     * interest for).
+     * <p>
+     * Note that this always returns the same instance, if you want to backtrack you need to use
+     * {@link Scanner#position()} and {@link Scanner#setPosition(Position)}.
+     */
+    Scanner scanner();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInline.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInline.java
new file mode 100644
index 00000000000..2aed7db83d0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInline.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.parser.beta.Position;
+
+public abstract class ParsedInline {
+
+    protected ParsedInline() {
+    }
+
+    public static ParsedInline none() {
+        return null;
+    }
+
+    public static ParsedInline of(Node node, Position position) {
+        if (node == null) {
+            throw new NullPointerException("node must not be null");
+        }
+        if (position == null) {
+            throw new NullPointerException("position must not be null");
+        }
+        return new ParsedInlineImpl(node, position);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInlineImpl.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInlineImpl.java
new file mode 100644
index 00000000000..973149a83b4
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/ParsedInlineImpl.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.parser.beta.Position;
+
+public class ParsedInlineImpl extends ParsedInline {
+    private final Node node;
+    private final Position position;
+
+    ParsedInlineImpl(Node node, Position position) {
+        this.node = node;
+        this.position = position;
+    }
+
+    public Node getNode() {
+        return node;
+    }
+
+    public Position getPosition() {
+        return position;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Position.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Position.java
new file mode 100644
index 00000000000..fa3767083e3
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Position.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+/**
+ * Position within a {@link Scanner}. This is intentionally kept opaque so as not to expose the internal structure of
+ * the Scanner.
+ */
+public class Position {
+
+    final int lineIndex;
+    final int index;
+
+    Position(int lineIndex, int index) {
+        this.lineIndex = lineIndex;
+        this.index = index;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Scanner.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Scanner.java
new file mode 100644
index 00000000000..a32d0564f7d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/Scanner.java
@@ -0,0 +1,313 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+import jdk.internal.org.commonmark.internal.util.CharMatcher;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+
+import java.util.List;
+
+public class Scanner {
+
+    /**
+     * Character representing the end of input source (or outside of the text in case of the "previous" methods).
+     * <p>
+     * Note that we can use NULL to represent this because CommonMark does not allow those in the input (we replace them
+     * in the beginning of parsing).
+     */
+    public static final char END = '\0';
+
+    // Lines without newlines at the end. The scanner will yield `\n` between lines because they're significant for
+    // parsing and the final output. There is no `\n` after the last line.
+    private final List<SourceLine> lines;
+    // Which line we're at.
+    private int lineIndex;
+    // The index within the line. If index == length(), we pretend that there's a `\n` and only advance after we yield
+    // that.
+    private int index;
+
+    // Current line or "" if at the end of the lines (using "" instead of null saves a null check)
+    private SourceLine line = SourceLine.of("", null);
+    private int lineLength = 0;
+
+    Scanner(List<SourceLine> lines, int lineIndex, int index) {
+        this.lines = lines;
+        this.lineIndex = lineIndex;
+        this.index = index;
+        if (!lines.isEmpty()) {
+            checkPosition(lineIndex, index);
+            setLine(lines.get(lineIndex));
+        }
+    }
+
+    public static Scanner of(SourceLines lines) {
+        return new Scanner(lines.getLines(), 0, 0);
+    }
+
+    public char peek() {
+        if (index < lineLength) {
+            return line.getContent().charAt(index);
+        } else {
+            if (lineIndex < lines.size() - 1) {
+                return '\n';
+            } else {
+                // Don't return newline for end of last line
+                return END;
+            }
+        }
+    }
+
+    public int peekCodePoint() {
+        if (index < lineLength) {
+            char c = line.getContent().charAt(index);
+            if (Character.isHighSurrogate(c) && index + 1 < lineLength) {
+                char low = line.getContent().charAt(index + 1);
+                if (Character.isLowSurrogate(low)) {
+                    return Character.toCodePoint(c, low);
+                }
+            }
+            return c;
+        } else {
+            if (lineIndex < lines.size() - 1) {
+                return '\n';
+            } else {
+                // Don't return newline for end of last line
+                return END;
+            }
+        }
+    }
+
+    public int peekPreviousCodePoint() {
+        if (index > 0) {
+            int prev = index - 1;
+            char c = line.getContent().charAt(prev);
+            if (Character.isLowSurrogate(c) && prev > 0) {
+                char high = line.getContent().charAt(prev - 1);
+                if (Character.isHighSurrogate(high)) {
+                    return Character.toCodePoint(high, c);
+                }
+            }
+            return c;
+        } else {
+            if (lineIndex > 0) {
+                return '\n';
+            } else {
+                return END;
+            }
+        }
+    }
+
+    public boolean hasNext() {
+        if (index < lineLength) {
+            return true;
+        } else {
+            // No newline at end of last line
+            return lineIndex < lines.size() - 1;
+        }
+    }
+
+    public void next() {
+        index++;
+        if (index > lineLength) {
+            lineIndex++;
+            if (lineIndex < lines.size()) {
+                setLine(lines.get(lineIndex));
+            } else {
+                setLine(SourceLine.of("", null));
+            }
+            index = 0;
+        }
+    }
+
+    /**
+     * Check if the specified char is next and advance the position.
+     *
+     * @param c the char to check (including newline characters)
+     * @return true if matched and position was advanced, false otherwise
+     */
+    public boolean next(char c) {
+        if (peek() == c) {
+            next();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Check if we have the specified content on the line and advanced the position. Note that if you want to match
+     * newline characters, use {@link #next(char)}.
+     *
+     * @param content the text content to match on a single line (excluding newline characters)
+     * @return true if matched and position was advanced, false otherwise
+     */
+    public boolean next(String content) {
+        if (index < lineLength && index + content.length() <= lineLength) {
+            // Can't use startsWith because it's not available on CharSequence
+            for (int i = 0; i < content.length(); i++) {
+                if (line.getContent().charAt(index + i) != content.charAt(i)) {
+                    return false;
+                }
+            }
+            index += content.length();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public int matchMultiple(char c) {
+        int count = 0;
+        while (peek() == c) {
+            count++;
+            next();
+        }
+        return count;
+    }
+
+    public int match(CharMatcher matcher) {
+        int count = 0;
+        while (matcher.matches(peek())) {
+            count++;
+            next();
+        }
+        return count;
+    }
+
+    public int whitespace() {
+        int count = 0;
+        while (true) {
+            switch (peek()) {
+                case ' ':
+                case '\t':
+                case '\n':
+                case '\u000B':
+                case '\f':
+                case '\r':
+                    count++;
+                    next();
+                    break;
+                default:
+                    return count;
+            }
+        }
+    }
+
+    public int find(char c) {
+        int count = 0;
+        while (true) {
+            char cur = peek();
+            if (cur == Scanner.END) {
+                return -1;
+            } else if (cur == c) {
+                return count;
+            }
+            count++;
+            next();
+        }
+    }
+
+    public int find(CharMatcher matcher) {
+        int count = 0;
+        while (true) {
+            char c = peek();
+            if (c == END) {
+                return -1;
+            } else if (matcher.matches(c)) {
+                return count;
+            }
+            count++;
+            next();
+        }
+    }
+
+    // Don't expose the int index, because it would be good if we could switch input to a List<String> of lines later
+    // instead of one contiguous String.
+    public Position position() {
+        return new Position(lineIndex, index);
+    }
+
+    public void setPosition(Position position) {
+        checkPosition(position.lineIndex, position.index);
+        this.lineIndex = position.lineIndex;
+        this.index = position.index;
+        setLine(lines.get(this.lineIndex));
+    }
+
+    // For cases where the caller appends the result to a StringBuilder, we could offer another method to avoid some
+    // unnecessary copying.
+    public SourceLines getSource(Position begin, Position end) {
+        if (begin.lineIndex == end.lineIndex) {
+            // Shortcut for common case of text from a single line
+            SourceLine line = lines.get(begin.lineIndex);
+            CharSequence newContent = line.getContent().subSequence(begin.index, end.index);
+            SourceSpan newSourceSpan = null;
+            SourceSpan sourceSpan = line.getSourceSpan();
+            if (sourceSpan != null) {
+                newSourceSpan = SourceSpan.of(sourceSpan.getLineIndex(), sourceSpan.getColumnIndex() + begin.index, newContent.length());
+            }
+            return SourceLines.of(SourceLine.of(newContent, newSourceSpan));
+        } else {
+            SourceLines sourceLines = SourceLines.empty();
+
+            SourceLine firstLine = lines.get(begin.lineIndex);
+            sourceLines.addLine(firstLine.substring(begin.index, firstLine.getContent().length()));
+
+            // Lines between begin and end (we are appending the full line)
+            for (int line = begin.lineIndex + 1; line < end.lineIndex; line++) {
+                sourceLines.addLine(lines.get(line));
+            }
+
+            SourceLine lastLine = lines.get(end.lineIndex);
+            sourceLines.addLine(lastLine.substring(0, end.index));
+            return sourceLines;
+        }
+    }
+
+    private void setLine(SourceLine line) {
+        this.line = line;
+        this.lineLength = line.getContent().length();
+    }
+
+    private void checkPosition(int lineIndex, int index) {
+        if (lineIndex < 0 || lineIndex >= lines.size()) {
+            throw new IllegalArgumentException("Line index " + lineIndex + " out of range, number of lines: " + lines.size());
+        }
+        SourceLine line = lines.get(lineIndex);
+        if (index < 0 || index > line.getContent().length()) {
+            throw new IllegalArgumentException("Index " + index + " out of range, line length: " + line.getContent().length());
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/UnderscoreDelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/UnderscoreDelimiterProcessor.java
new file mode 100644
index 00000000000..be297441d97
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/inline/UnderscoreDelimiterProcessor.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.inline;
+
+public class UnderscoreDelimiterProcessor extends EmphasisDelimiterProcessor {
+
+    public UnderscoreDelimiterProcessor() {
+        super('_');
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/NodeRendererMap.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/NodeRendererMap.java
new file mode 100644
index 00000000000..523609f21de
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/NodeRendererMap.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.renderer;
+
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class NodeRendererMap {
+
+    private final Map<Class<? extends Node>, NodeRenderer> renderers = new HashMap<>(32);
+
+    public void add(NodeRenderer nodeRenderer) {
+        for (Class<? extends Node> nodeType : nodeRenderer.getNodeTypes()) {
+            // Overwrite existing renderer
+            renderers.put(nodeType, nodeRenderer);
+        }
+    }
+
+    public void render(Node node) {
+        NodeRenderer nodeRenderer = renderers.get(node.getClass());
+        if (nodeRenderer != null) {
+            nodeRenderer.render(node);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/BulletListHolder.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/BulletListHolder.java
new file mode 100644
index 00000000000..154bad58278
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/BulletListHolder.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.renderer.text;
+
+import jdk.internal.org.commonmark.node.BulletList;
+
+public class BulletListHolder extends ListHolder {
+    private final String marker;
+
+    public BulletListHolder(ListHolder parent, BulletList list) {
+        super(parent);
+        marker = list.getMarker();
+    }
+
+    public String getMarker() {
+        return marker;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/ListHolder.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/ListHolder.java
new file mode 100644
index 00000000000..6334f4cffad
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/ListHolder.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.renderer.text;
+
+public abstract class ListHolder {
+    private static final String INDENT_DEFAULT = "   ";
+    private static final String INDENT_EMPTY = "";
+
+    private final ListHolder parent;
+    private final String indent;
+
+    ListHolder(ListHolder parent) {
+        this.parent = parent;
+
+        if (parent != null) {
+            indent = parent.indent + INDENT_DEFAULT;
+        } else {
+            indent = INDENT_EMPTY;
+        }
+    }
+
+    public ListHolder getParent() {
+        return parent;
+    }
+
+    public String getIndent() {
+        return indent;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/OrderedListHolder.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/OrderedListHolder.java
new file mode 100644
index 00000000000..114c4dfeb29
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/renderer/text/OrderedListHolder.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.renderer.text;
+
+import jdk.internal.org.commonmark.node.OrderedList;
+
+public class OrderedListHolder extends ListHolder {
+    private final String delimiter;
+    private int counter;
+
+    public OrderedListHolder(ListHolder parent, OrderedList list) {
+        super(parent);
+        delimiter = list.getMarkerDelimiter() != null ? list.getMarkerDelimiter() : ".";
+        counter = list.getMarkerStartNumber() != null ? list.getMarkerStartNumber() : 1;
+    }
+
+    public String getDelimiter() {
+        return delimiter;
+    }
+
+    public int getCounter() {
+        return counter;
+    }
+
+    public void increaseCounter() {
+        counter++;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/AsciiMatcher.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/AsciiMatcher.java
new file mode 100644
index 00000000000..915c3078b7a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/AsciiMatcher.java
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+import java.util.BitSet;
+
+public class AsciiMatcher implements CharMatcher {
+    private final BitSet set;
+
+    private AsciiMatcher(Builder builder) {
+        this.set = builder.set;
+    }
+
+    @Override
+    public boolean matches(char c) {
+        return set.get(c);
+    }
+
+    public Builder newBuilder() {
+        return new Builder((BitSet) set.clone());
+    }
+
+    public static Builder builder() {
+        return new Builder(new BitSet());
+    }
+
+    public static class Builder {
+        private final BitSet set;
+
+        private Builder(BitSet set) {
+            this.set = set;
+        }
+
+        public Builder c(char c) {
+            if (c > 127) {
+                throw new IllegalArgumentException("Can only match ASCII characters");
+            }
+            set.set(c);
+            return this;
+        }
+
+        public Builder range(char from, char toInclusive) {
+            for (char c = from; c <= toInclusive; c++) {
+                c(c);
+            }
+            return this;
+        }
+
+        public AsciiMatcher build() {
+            return new AsciiMatcher(this);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/CharMatcher.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/CharMatcher.java
new file mode 100644
index 00000000000..e74cb314ff3
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/CharMatcher.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+public interface CharMatcher {
+
+    boolean matches(char c);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Escaping.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Escaping.java
new file mode 100644
index 00000000000..939a4c69860
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Escaping.java
@@ -0,0 +1,183 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+import java.nio.charset.Charset;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Escaping {
+
+    public static final String ESCAPABLE = "[!\"#$%&\'()*+,./:;<=>?@\\[\\\\\\]^_`{|}~-]";
+
+    public static final String ENTITY = "&(?:#x[a-f0-9]{1,6}|#[0-9]{1,7}|[a-z][a-z0-9]{1,31});";
+
+    private static final Pattern BACKSLASH_OR_AMP = Pattern.compile("[\\\\&]");
+
+    private static final Pattern ENTITY_OR_ESCAPED_CHAR =
+            Pattern.compile("\\\\" + ESCAPABLE + '|' + ENTITY, Pattern.CASE_INSENSITIVE);
+
+    // From RFC 3986 (see "reserved", "unreserved") except don't escape '[' or ']' to be compatible with JS encodeURI
+    private static final Pattern ESCAPE_IN_URI =
+            Pattern.compile("(%[a-fA-F0-9]{0,2}|[^:/?#@!$&'()*+,;=a-zA-Z0-9\\-._~])");
+
+    private static final char[] HEX_DIGITS =
+            new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+    private static final Pattern WHITESPACE = Pattern.compile("[ \t\r\n]+");
+
+    private static final Replacer UNESCAPE_REPLACER = new Replacer() {
+        @Override
+        public void replace(String input, StringBuilder sb) {
+            if (input.charAt(0) == '\\') {
+                sb.append(input, 1, input.length());
+            } else {
+                sb.append(Html5Entities.entityToString(input));
+            }
+        }
+    };
+
+    private static final Replacer URI_REPLACER = new Replacer() {
+        @Override
+        public void replace(String input, StringBuilder sb) {
+            if (input.startsWith("%")) {
+                if (input.length() == 3) {
+                    // Already percent-encoded, preserve
+                    sb.append(input);
+                } else {
+                    // %25 is the percent-encoding for %
+                    sb.append("%25");
+                    sb.append(input, 1, input.length());
+                }
+            } else {
+                byte[] bytes = input.getBytes(Charset.forName("UTF-8"));
+                for (byte b : bytes) {
+                    sb.append('%');
+                    sb.append(HEX_DIGITS[(b >> 4) & 0xF]);
+                    sb.append(HEX_DIGITS[b & 0xF]);
+                }
+            }
+        }
+    };
+
+    public static String escapeHtml(String input) {
+        // Avoid building a new string in the majority of cases (nothing to escape)
+        StringBuilder sb = null;
+
+        loop:
+        for (int i = 0; i < input.length(); i++) {
+            char c = input.charAt(i);
+            String replacement;
+            switch (c) {
+                case '&':
+                    replacement = "&amp;";
+                    break;
+                case '<':
+                    replacement = "&lt;";
+                    break;
+                case '>':
+                    replacement = "&gt;";
+                    break;
+                case '\"':
+                    replacement = "&quot;";
+                    break;
+                default:
+                    if (sb != null) {
+                        sb.append(c);
+                    }
+                    continue loop;
+            }
+            if (sb == null) {
+                sb = new StringBuilder();
+                sb.append(input, 0, i);
+            }
+            sb.append(replacement);
+        }
+
+        return sb != null ? sb.toString() : input;
+    }
+
+    /**
+     * Replace entities and backslash escapes with literal characters.
+     */
+    public static String unescapeString(String s) {
+        if (BACKSLASH_OR_AMP.matcher(s).find()) {
+            return replaceAll(ENTITY_OR_ESCAPED_CHAR, s, UNESCAPE_REPLACER);
+        } else {
+            return s;
+        }
+    }
+
+    public static String percentEncodeUrl(String s) {
+        return replaceAll(ESCAPE_IN_URI, s, URI_REPLACER);
+    }
+
+    public static String normalizeLabelContent(String input) {
+        String trimmed = input.trim();
+
+        // This is necessary to correctly case fold "\u1e9e" to "SS":
+        // "\u1e9e".toLowerCase(Locale.ROOT)  -> "\u00df"
+        // "\u00df".toUpperCase(Locale.ROOT)  -> "SS"
+        // Note that doing upper first (or only upper without lower) wouldn't work because:
+        // "\u1e9e".toUpperCase(Locale.ROOT)  -> "\u1e9e"
+        String caseFolded = trimmed.toLowerCase(Locale.ROOT).toUpperCase(Locale.ROOT);
+
+        return WHITESPACE.matcher(caseFolded).replaceAll(" ");
+    }
+
+    private static String replaceAll(Pattern p, String s, Replacer replacer) {
+        Matcher matcher = p.matcher(s);
+
+        if (!matcher.find()) {
+            return s;
+        }
+
+        StringBuilder sb = new StringBuilder(s.length() + 16);
+        int lastEnd = 0;
+        do {
+            sb.append(s, lastEnd, matcher.start());
+            replacer.replace(matcher.group(), sb);
+            lastEnd = matcher.end();
+        } while (matcher.find());
+
+        if (lastEnd != s.length()) {
+            sb.append(s, lastEnd, s.length());
+        }
+        return sb.toString();
+    }
+
+    private interface Replacer {
+        void replace(String input, StringBuilder sb);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Html5Entities.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Html5Entities.java
new file mode 100644
index 00000000000..a300cd0438a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Html5Entities.java
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Html5Entities {
+
+    private static final Map<String, String> NAMED_CHARACTER_REFERENCES = readEntities();
+    private static final String ENTITY_PATH = "/org/commonmark/internal/util/entities.txt";
+
+    public static String entityToString(String input) {
+        if (!input.startsWith("&") || !input.endsWith(";")) {
+            return input;
+        }
+
+        String value = input.substring(1, input.length() - 1);
+        if (value.startsWith("#")) {
+            value = value.substring(1);
+            int base = 10;
+            if (value.startsWith("x") || value.startsWith("X")) {
+                value = value.substring(1);
+                base = 16;
+            }
+
+            try {
+                int codePoint = Integer.parseInt(value, base);
+                if (codePoint == 0) {
+                    return "\uFFFD";
+                }
+                return new String(Character.toChars(codePoint));
+            } catch (IllegalArgumentException e) {
+                return "\uFFFD";
+            }
+        } else {
+            String s = NAMED_CHARACTER_REFERENCES.get(value);
+            if (s != null) {
+                return s;
+            } else {
+                return input;
+            }
+        }
+    }
+
+    private static Map<String, String> readEntities() {
+        Map<String, String> entities = new HashMap<>();
+        InputStream stream = Html5Entities.class.getResourceAsStream(ENTITY_PATH);
+        Charset charset = StandardCharsets.UTF_8;
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream, charset))) {
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                if (line.length() == 0) {
+                    continue;
+                }
+                int equal = line.indexOf("=");
+                String key = line.substring(0, equal);
+                String value = line.substring(equal + 1);
+                entities.put(key, value);
+            }
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed reading data for HTML named character references", e);
+        }
+        entities.put("NewLine", "\n");
+        return entities;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/LinkScanner.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/LinkScanner.java
new file mode 100644
index 00000000000..b3f80c173d1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/LinkScanner.java
@@ -0,0 +1,234 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+import jdk.internal.org.commonmark.parser.beta.Scanner;
+
+public class LinkScanner {
+
+    /**
+     * Attempt to scan the contents of a link label (inside the brackets), stopping after the content or returning false.
+     * The stopped position can bei either the closing {@code ]}, or the end of the line if the label continues on
+     * the next line.
+     */
+    public static boolean scanLinkLabelContent(Scanner scanner) {
+        while (scanner.hasNext()) {
+            switch (scanner.peek()) {
+                case '\\':
+                    scanner.next();
+                    if (isEscapable(scanner.peek())) {
+                        scanner.next();
+                    }
+                    break;
+                case ']':
+                    return true;
+                case '[':
+                    // spec: Unescaped square bracket characters are not allowed inside the opening and closing
+                    // square brackets of link labels.
+                    return false;
+                default:
+                    scanner.next();
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Attempt to scan a link destination, stopping after the destination or returning false.
+     */
+    public static boolean scanLinkDestination(Scanner scanner) {
+        if (!scanner.hasNext()) {
+            return false;
+        }
+
+        if (scanner.next('<')) {
+            while (scanner.hasNext()) {
+                switch (scanner.peek()) {
+                    case '\\':
+                        scanner.next();
+                        if (isEscapable(scanner.peek())) {
+                            scanner.next();
+                        }
+                        break;
+                    case '\n':
+                    case '<':
+                        return false;
+                    case '>':
+                        scanner.next();
+                        return true;
+                    default:
+                        scanner.next();
+                }
+            }
+            return false;
+        } else {
+            return scanLinkDestinationWithBalancedParens(scanner);
+        }
+    }
+
+    public static boolean scanLinkTitle(Scanner scanner) {
+        if (!scanner.hasNext()) {
+            return false;
+        }
+
+        char endDelimiter;
+        switch (scanner.peek()) {
+            case '"':
+                endDelimiter = '"';
+                break;
+            case '\'':
+                endDelimiter = '\'';
+                break;
+            case '(':
+                endDelimiter = ')';
+                break;
+            default:
+                return false;
+        }
+        scanner.next();
+
+        if (!scanLinkTitleContent(scanner, endDelimiter)) {
+            return false;
+        }
+        if (!scanner.hasNext()) {
+            return false;
+        }
+        scanner.next();
+        return true;
+    }
+
+    public static boolean scanLinkTitleContent(Scanner scanner, char endDelimiter) {
+        while (scanner.hasNext()) {
+            char c = scanner.peek();
+            if (c == '\\') {
+                scanner.next();
+                if (isEscapable(scanner.peek())) {
+                    scanner.next();
+                }
+            } else if (c == endDelimiter) {
+                return true;
+            } else if (endDelimiter == ')' && c == '(') {
+                // unescaped '(' in title within parens is invalid
+                return false;
+            } else {
+                scanner.next();
+            }
+        }
+        return true;
+    }
+
+    // spec: a nonempty sequence of characters that does not start with <, does not include ASCII space or control
+    // characters, and includes parentheses only if (a) they are backslash-escaped or (b) they are part of a balanced
+    // pair of unescaped parentheses
+    private static boolean scanLinkDestinationWithBalancedParens(Scanner scanner) {
+        int parens = 0;
+        boolean empty = true;
+        while (scanner.hasNext()) {
+            char c = scanner.peek();
+            switch (c) {
+                case ' ':
+                    return !empty;
+                case '\\':
+                    scanner.next();
+                    if (isEscapable(scanner.peek())) {
+                        scanner.next();
+                    }
+                    break;
+                case '(':
+                    parens++;
+                    // Limit to 32 nested parens for pathological cases
+                    if (parens > 32) {
+                        return false;
+                    }
+                    scanner.next();
+                    break;
+                case ')':
+                    if (parens == 0) {
+                        return true;
+                    } else {
+                        parens--;
+                    }
+                    scanner.next();
+                    break;
+                default:
+                    // or control character
+                    if (Character.isISOControl(c)) {
+                        return !empty;
+                    }
+                    scanner.next();
+                    break;
+            }
+            empty = false;
+        }
+        return true;
+    }
+
+    private static boolean isEscapable(char c) {
+        switch (c) {
+            case '!':
+            case '"':
+            case '#':
+            case '$':
+            case '%':
+            case '&':
+            case '\'':
+            case '(':
+            case ')':
+            case '*':
+            case '+':
+            case ',':
+            case '-':
+            case '.':
+            case '/':
+            case ':':
+            case ';':
+            case '<':
+            case '=':
+            case '>':
+            case '?':
+            case '@':
+            case '[':
+            case '\\':
+            case ']':
+            case '^':
+            case '_':
+            case '`':
+            case '{':
+            case '|':
+            case '}':
+            case '~':
+                return true;
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Parsing.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Parsing.java
new file mode 100644
index 00000000000..34c8cf89ac6
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/Parsing.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.internal.util;
+
+public class Parsing {
+    public static int CODE_BLOCK_INDENT = 4;
+
+    public static int columnsToNextTabStop(int column) {
+        // Tab stop is 4
+        return 4 - (column % 4);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/entities.txt b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/entities.txt
new file mode 100644
index 00000000000..5b126923ba8
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/internal/util/entities.txt
@@ -0,0 +1,2126 @@
+Aacute=Á
+aacute=á
+Abreve=Ă
+abreve=ă
+ac=∾
+acd=∿
+acE=∾̳
+Acirc=Â
+acirc=â
+acute=´
+Acy=А
+acy=а
+AElig=Æ
+aelig=æ
+af=⁡
+Afr=𝔄
+afr=𝔞
+Agrave=À
+agrave=à
+alefsym=ℵ
+aleph=ℵ
+Alpha=Α
+alpha=α
+Amacr=Ā
+amacr=ā
+amalg=⨿
+amp=&
+AMP=&
+andand=⩕
+And=⩓
+and=∧
+andd=⩜
+andslope=⩘
+andv=⩚
+ang=∠
+ange=⦤
+angle=∠
+angmsdaa=⦨
+angmsdab=⦩
+angmsdac=⦪
+angmsdad=⦫
+angmsdae=⦬
+angmsdaf=⦭
+angmsdag=⦮
+angmsdah=⦯
+angmsd=∡
+angrt=∟
+angrtvb=⊾
+angrtvbd=⦝
+angsph=∢
+angst=Å
+angzarr=⍼
+Aogon=Ą
+aogon=ą
+Aopf=𝔸
+aopf=𝕒
+apacir=⩯
+ap=≈
+apE=⩰
+ape=≊
+apid=≋
+apos='
+ApplyFunction=⁡
+approx=≈
+approxeq=≊
+Aring=Å
+aring=å
+Ascr=𝒜
+ascr=𝒶
+Assign=≔
+ast=*
+asymp=≈
+asympeq=≍
+Atilde=Ã
+atilde=ã
+Auml=Ä
+auml=ä
+awconint=∳
+awint=⨑
+backcong=≌
+backepsilon=϶
+backprime=‵
+backsim=∽
+backsimeq=⋍
+Backslash=∖
+Barv=⫧
+barvee=⊽
+barwed=⌅
+Barwed=⌆
+barwedge=⌅
+bbrk=⎵
+bbrktbrk=⎶
+bcong=≌
+Bcy=Б
+bcy=б
+bdquo=„
+becaus=∵
+because=∵
+Because=∵
+bemptyv=⦰
+bepsi=϶
+bernou=ℬ
+Bernoullis=ℬ
+Beta=Β
+beta=β
+beth=ℶ
+between=≬
+Bfr=𝔅
+bfr=𝔟
+bigcap=⋂
+bigcirc=◯
+bigcup=⋃
+bigodot=⨀
+bigoplus=⨁
+bigotimes=⨂
+bigsqcup=⨆
+bigstar=★
+bigtriangledown=▽
+bigtriangleup=△
+biguplus=⨄
+bigvee=⋁
+bigwedge=⋀
+bkarow=⤍
+blacklozenge=⧫
+blacksquare=▪
+blacktriangle=▴
+blacktriangledown=▾
+blacktriangleleft=◂
+blacktriangleright=▸
+blank=␣
+blk12=▒
+blk14=░
+blk34=▓
+block=█
+bne==⃥
+bnequiv=≡⃥
+bNot=⫭
+bnot=⌐
+Bopf=𝔹
+bopf=𝕓
+bot=⊥
+bottom=⊥
+bowtie=⋈
+boxbox=⧉
+boxdl=┐
+boxdL=╕
+boxDl=╖
+boxDL=╗
+boxdr=┌
+boxdR=╒
+boxDr=╓
+boxDR=╔
+boxh=─
+boxH=═
+boxhd=┬
+boxHd=╤
+boxhD=╥
+boxHD=╦
+boxhu=┴
+boxHu=╧
+boxhU=╨
+boxHU=╩
+boxminus=⊟
+boxplus=⊞
+boxtimes=⊠
+boxul=┘
+boxuL=╛
+boxUl=╜
+boxUL=╝
+boxur=└
+boxuR=╘
+boxUr=╙
+boxUR=╚
+boxv=│
+boxV=║
+boxvh=┼
+boxvH=╪
+boxVh=╫
+boxVH=╬
+boxvl=┤
+boxvL=╡
+boxVl=╢
+boxVL=╣
+boxvr=├
+boxvR=╞
+boxVr=╟
+boxVR=╠
+bprime=‵
+breve=˘
+Breve=˘
+brvbar=¦
+bscr=𝒷
+Bscr=ℬ
+bsemi=⁏
+bsim=∽
+bsime=⋍
+bsolb=⧅
+bsol=\
+bsolhsub=⟈
+bull=•
+bullet=•
+bump=≎
+bumpE=⪮
+bumpe=≏
+Bumpeq=≎
+bumpeq=≏
+Cacute=Ć
+cacute=ć
+capand=⩄
+capbrcup=⩉
+capcap=⩋
+cap=∩
+Cap=⋒
+capcup=⩇
+capdot=⩀
+CapitalDifferentialD=ⅅ
+caps=∩︀
+caret=⁁
+caron=ˇ
+Cayleys=ℭ
+ccaps=⩍
+Ccaron=Č
+ccaron=č
+Ccedil=Ç
+ccedil=ç
+Ccirc=Ĉ
+ccirc=ĉ
+Cconint=∰
+ccups=⩌
+ccupssm=⩐
+Cdot=Ċ
+cdot=ċ
+cedil=¸
+Cedilla=¸
+cemptyv=⦲
+cent=¢
+centerdot=·
+CenterDot=·
+cfr=𝔠
+Cfr=ℭ
+CHcy=Ч
+chcy=ч
+check=✓
+checkmark=✓
+Chi=Χ
+chi=χ
+circ=ˆ
+circeq=≗
+circlearrowleft=↺
+circlearrowright=↻
+circledast=⊛
+circledcirc=⊚
+circleddash=⊝
+CircleDot=⊙
+circledR=®
+circledS=Ⓢ
+CircleMinus=⊖
+CirclePlus=⊕
+CircleTimes=⊗
+cir=○
+cirE=⧃
+cire=≗
+cirfnint=⨐
+cirmid=⫯
+cirscir=⧂
+ClockwiseContourIntegral=∲
+CloseCurlyDoubleQuote=”
+CloseCurlyQuote=’
+clubs=♣
+clubsuit=♣
+colon=:
+Colon=∷
+Colone=⩴
+colone=≔
+coloneq=≔
+comma=,
+commat=@
+comp=∁
+compfn=∘
+complement=∁
+complexes=ℂ
+cong=≅
+congdot=⩭
+Congruent=≡
+conint=∮
+Conint=∯
+ContourIntegral=∮
+copf=𝕔
+Copf=ℂ
+coprod=∐
+Coproduct=∐
+copy=©
+COPY=©
+copysr=℗
+CounterClockwiseContourIntegral=∳
+crarr=↵
+cross=✗
+Cross=⨯
+Cscr=𝒞
+cscr=𝒸
+csub=⫏
+csube=⫑
+csup=⫐
+csupe=⫒
+ctdot=⋯
+cudarrl=⤸
+cudarrr=⤵
+cuepr=⋞
+cuesc=⋟
+cularr=↶
+cularrp=⤽
+cupbrcap=⩈
+cupcap=⩆
+CupCap=≍
+cup=∪
+Cup=⋓
+cupcup=⩊
+cupdot=⊍
+cupor=⩅
+cups=∪︀
+curarr=↷
+curarrm=⤼
+curlyeqprec=⋞
+curlyeqsucc=⋟
+curlyvee=⋎
+curlywedge=⋏
+curren=¤
+curvearrowleft=↶
+curvearrowright=↷
+cuvee=⋎
+cuwed=⋏
+cwconint=∲
+cwint=∱
+cylcty=⌭
+dagger=†
+Dagger=‡
+daleth=ℸ
+darr=↓
+Darr=↡
+dArr=⇓
+dash=‐
+Dashv=⫤
+dashv=⊣
+dbkarow=⤏
+dblac=˝
+Dcaron=Ď
+dcaron=ď
+Dcy=Д
+dcy=д
+ddagger=‡
+ddarr=⇊
+DD=ⅅ
+dd=ⅆ
+DDotrahd=⤑
+ddotseq=⩷
+deg=°
+Del=∇
+Delta=Δ
+delta=δ
+demptyv=⦱
+dfisht=⥿
+Dfr=𝔇
+dfr=𝔡
+dHar=⥥
+dharl=⇃
+dharr=⇂
+DiacriticalAcute=´
+DiacriticalDot=˙
+DiacriticalDoubleAcute=˝
+DiacriticalGrave=`
+DiacriticalTilde=˜
+diam=⋄
+diamond=⋄
+Diamond=⋄
+diamondsuit=♦
+diams=♦
+die=¨
+DifferentialD=ⅆ
+digamma=ϝ
+disin=⋲
+div=÷
+divide=÷
+divideontimes=⋇
+divonx=⋇
+DJcy=Ђ
+djcy=ђ
+dlcorn=⌞
+dlcrop=⌍
+dollar=$
+Dopf=𝔻
+dopf=𝕕
+Dot=¨
+dot=˙
+DotDot=⃜
+doteq=≐
+doteqdot=≑
+DotEqual=≐
+dotminus=∸
+dotplus=∔
+dotsquare=⊡
+doublebarwedge=⌆
+DoubleContourIntegral=∯
+DoubleDot=¨
+DoubleDownArrow=⇓
+DoubleLeftArrow=⇐
+DoubleLeftRightArrow=⇔
+DoubleLeftTee=⫤
+DoubleLongLeftArrow=⟸
+DoubleLongLeftRightArrow=⟺
+DoubleLongRightArrow=⟹
+DoubleRightArrow=⇒
+DoubleRightTee=⊨
+DoubleUpArrow=⇑
+DoubleUpDownArrow=⇕
+DoubleVerticalBar=∥
+DownArrowBar=⤓
+downarrow=↓
+DownArrow=↓
+Downarrow=⇓
+DownArrowUpArrow=⇵
+DownBreve=̑
+downdownarrows=⇊
+downharpoonleft=⇃
+downharpoonright=⇂
+DownLeftRightVector=⥐
+DownLeftTeeVector=⥞
+DownLeftVectorBar=⥖
+DownLeftVector=↽
+DownRightTeeVector=⥟
+DownRightVectorBar=⥗
+DownRightVector=⇁
+DownTeeArrow=↧
+DownTee=⊤
+drbkarow=⤐
+drcorn=⌟
+drcrop=⌌
+Dscr=𝒟
+dscr=𝒹
+DScy=Ѕ
+dscy=ѕ
+dsol=⧶
+Dstrok=Đ
+dstrok=đ
+dtdot=⋱
+dtri=▿
+dtrif=▾
+duarr=⇵
+duhar=⥯
+dwangle=⦦
+DZcy=Џ
+dzcy=џ
+dzigrarr=⟿
+Eacute=É
+eacute=é
+easter=⩮
+Ecaron=Ě
+ecaron=ě
+Ecirc=Ê
+ecirc=ê
+ecir=≖
+ecolon=≕
+Ecy=Э
+ecy=э
+eDDot=⩷
+Edot=Ė
+edot=ė
+eDot=≑
+ee=ⅇ
+efDot=≒
+Efr=𝔈
+efr=𝔢
+eg=⪚
+Egrave=È
+egrave=è
+egs=⪖
+egsdot=⪘
+el=⪙
+Element=∈
+elinters=⏧
+ell=ℓ
+els=⪕
+elsdot=⪗
+Emacr=Ē
+emacr=ē
+empty=∅
+emptyset=∅
+EmptySmallSquare=◻
+emptyv=∅
+EmptyVerySmallSquare=▫
+emsp13= 
+emsp14= 
+emsp= 
+ENG=Ŋ
+eng=ŋ
+ensp= 
+Eogon=Ę
+eogon=ę
+Eopf=𝔼
+eopf=𝕖
+epar=⋕
+eparsl=⧣
+eplus=⩱
+epsi=ε
+Epsilon=Ε
+epsilon=ε
+epsiv=ϵ
+eqcirc=≖
+eqcolon=≕
+eqsim=≂
+eqslantgtr=⪖
+eqslantless=⪕
+Equal=⩵
+equals==
+EqualTilde=≂
+equest=≟
+Equilibrium=⇌
+equiv=≡
+equivDD=⩸
+eqvparsl=⧥
+erarr=⥱
+erDot=≓
+escr=ℯ
+Escr=ℰ
+esdot=≐
+Esim=⩳
+esim=≂
+Eta=Η
+eta=η
+ETH=Ð
+eth=ð
+Euml=Ë
+euml=ë
+euro=€
+excl=!
+exist=∃
+Exists=∃
+expectation=ℰ
+exponentiale=ⅇ
+ExponentialE=ⅇ
+fallingdotseq=≒
+Fcy=Ф
+fcy=ф
+female=♀
+ffilig=ffi
+fflig=ff
+ffllig=ffl
+Ffr=𝔉
+ffr=𝔣
+filig=fi
+FilledSmallSquare=◼
+FilledVerySmallSquare=▪
+fjlig=fj
+flat=♭
+fllig=fl
+fltns=▱
+fnof=ƒ
+Fopf=𝔽
+fopf=𝕗
+forall=∀
+ForAll=∀
+fork=⋔
+forkv=⫙
+Fouriertrf=ℱ
+fpartint=⨍
+frac12=½
+frac13=⅓
+frac14=¼
+frac15=⅕
+frac16=⅙
+frac18=⅛
+frac23=⅔
+frac25=⅖
+frac34=¾
+frac35=⅗
+frac38=⅜
+frac45=⅘
+frac56=⅚
+frac58=⅝
+frac78=⅞
+frasl=⁄
+frown=⌢
+fscr=𝒻
+Fscr=ℱ
+gacute=ǵ
+Gamma=Γ
+gamma=γ
+Gammad=Ϝ
+gammad=ϝ
+gap=⪆
+Gbreve=Ğ
+gbreve=ğ
+Gcedil=Ģ
+Gcirc=Ĝ
+gcirc=ĝ
+Gcy=Г
+gcy=г
+Gdot=Ġ
+gdot=ġ
+ge=≥
+gE=≧
+gEl=⪌
+gel=⋛
+geq=≥
+geqq=≧
+geqslant=⩾
+gescc=⪩
+ges=⩾
+gesdot=⪀
+gesdoto=⪂
+gesdotol=⪄
+gesl=⋛︀
+gesles=⪔
+Gfr=𝔊
+gfr=𝔤
+gg=≫
+Gg=⋙
+ggg=⋙
+gimel=ℷ
+GJcy=Ѓ
+gjcy=ѓ
+gla=⪥
+gl=≷
+glE=⪒
+glj=⪤
+gnap=⪊
+gnapprox=⪊
+gne=⪈
+gnE=≩
+gneq=⪈
+gneqq=≩
+gnsim=⋧
+Gopf=𝔾
+gopf=𝕘
+grave=`
+GreaterEqual=≥
+GreaterEqualLess=⋛
+GreaterFullEqual=≧
+GreaterGreater=⪢
+GreaterLess=≷
+GreaterSlantEqual=⩾
+GreaterTilde=≳
+Gscr=𝒢
+gscr=ℊ
+gsim=≳
+gsime=⪎
+gsiml=⪐
+gtcc=⪧
+gtcir=⩺
+gt=>
+GT=>
+Gt=≫
+gtdot=⋗
+gtlPar=⦕
+gtquest=⩼
+gtrapprox=⪆
+gtrarr=⥸
+gtrdot=⋗
+gtreqless=⋛
+gtreqqless=⪌
+gtrless=≷
+gtrsim=≳
+gvertneqq=≩︀
+gvnE=≩︀
+Hacek=ˇ
+hairsp= 
+half=½
+hamilt=ℋ
+HARDcy=Ъ
+hardcy=ъ
+harrcir=⥈
+harr=↔
+hArr=⇔
+harrw=↭
+Hat=^
+hbar=ℏ
+Hcirc=Ĥ
+hcirc=ĥ
+hearts=♥
+heartsuit=♥
+hellip=…
+hercon=⊹
+hfr=𝔥
+Hfr=ℌ
+HilbertSpace=ℋ
+hksearow=⤥
+hkswarow=⤦
+hoarr=⇿
+homtht=∻
+hookleftarrow=↩
+hookrightarrow=↪
+hopf=𝕙
+Hopf=ℍ
+horbar=―
+HorizontalLine=─
+hscr=𝒽
+Hscr=ℋ
+hslash=ℏ
+Hstrok=Ħ
+hstrok=ħ
+HumpDownHump=≎
+HumpEqual=≏
+hybull=⁃
+hyphen=‐
+Iacute=Í
+iacute=í
+ic=⁣
+Icirc=Î
+icirc=î
+Icy=И
+icy=и
+Idot=İ
+IEcy=Е
+iecy=е
+iexcl=¡
+iff=⇔
+ifr=𝔦
+Ifr=ℑ
+Igrave=Ì
+igrave=ì
+ii=ⅈ
+iiiint=⨌
+iiint=∭
+iinfin=⧜
+iiota=℩
+IJlig=IJ
+ijlig=ij
+Imacr=Ī
+imacr=ī
+image=ℑ
+ImaginaryI=ⅈ
+imagline=ℐ
+imagpart=ℑ
+imath=ı
+Im=ℑ
+imof=⊷
+imped=Ƶ
+Implies=⇒
+incare=℅
+in=∈
+infin=∞
+infintie=⧝
+inodot=ı
+intcal=⊺
+int=∫
+Int=∬
+integers=ℤ
+Integral=∫
+intercal=⊺
+Intersection=⋂
+intlarhk=⨗
+intprod=⨼
+InvisibleComma=⁣
+InvisibleTimes=⁢
+IOcy=Ё
+iocy=ё
+Iogon=Į
+iogon=į
+Iopf=𝕀
+iopf=𝕚
+Iota=Ι
+iota=ι
+iprod=⨼
+iquest=¿
+iscr=𝒾
+Iscr=ℐ
+isin=∈
+isindot=⋵
+isinE=⋹
+isins=⋴
+isinsv=⋳
+isinv=∈
+it=⁢
+Itilde=Ĩ
+itilde=ĩ
+Iukcy=І
+iukcy=і
+Iuml=Ï
+iuml=ï
+Jcirc=Ĵ
+jcirc=ĵ
+Jcy=Й
+jcy=й
+Jfr=𝔍
+jfr=𝔧
+jmath=ȷ
+Jopf=𝕁
+jopf=𝕛
+Jscr=𝒥
+jscr=𝒿
+Jsercy=Ј
+jsercy=ј
+Jukcy=Є
+jukcy=є
+Kappa=Κ
+kappa=κ
+kappav=ϰ
+Kcedil=Ķ
+kcedil=ķ
+Kcy=К
+kcy=к
+Kfr=𝔎
+kfr=𝔨
+kgreen=ĸ
+KHcy=Х
+khcy=х
+KJcy=Ќ
+kjcy=ќ
+Kopf=𝕂
+kopf=𝕜
+Kscr=𝒦
+kscr=𝓀
+lAarr=⇚
+Lacute=Ĺ
+lacute=ĺ
+laemptyv=⦴
+lagran=ℒ
+Lambda=Λ
+lambda=λ
+lang=⟨
+Lang=⟪
+langd=⦑
+langle=⟨
+lap=⪅
+Laplacetrf=ℒ
+laquo=«
+larrb=⇤
+larrbfs=⤟
+larr=←
+Larr=↞
+lArr=⇐
+larrfs=⤝
+larrhk=↩
+larrlp=↫
+larrpl=⤹
+larrsim=⥳
+larrtl=↢
+latail=⤙
+lAtail=⤛
+lat=⪫
+late=⪭
+lates=⪭︀
+lbarr=⤌
+lBarr=⤎
+lbbrk=❲
+lbrace={
+lbrack=[
+lbrke=⦋
+lbrksld=⦏
+lbrkslu=⦍
+Lcaron=Ľ
+lcaron=ľ
+Lcedil=Ļ
+lcedil=ļ
+lceil=⌈
+lcub={
+Lcy=Л
+lcy=л
+ldca=⤶
+ldquo=“
+ldquor=„
+ldrdhar=⥧
+ldrushar=⥋
+ldsh=↲
+le=≤
+lE=≦
+LeftAngleBracket=⟨
+LeftArrowBar=⇤
+leftarrow=←
+LeftArrow=←
+Leftarrow=⇐
+LeftArrowRightArrow=⇆
+leftarrowtail=↢
+LeftCeiling=⌈
+LeftDoubleBracket=⟦
+LeftDownTeeVector=⥡
+LeftDownVectorBar=⥙
+LeftDownVector=⇃
+LeftFloor=⌊
+leftharpoondown=↽
+leftharpoonup=↼
+leftleftarrows=⇇
+leftrightarrow=↔
+LeftRightArrow=↔
+Leftrightarrow=⇔
+leftrightarrows=⇆
+leftrightharpoons=⇋
+leftrightsquigarrow=↭
+LeftRightVector=⥎
+LeftTeeArrow=↤
+LeftTee=⊣
+LeftTeeVector=⥚
+leftthreetimes=⋋
+LeftTriangleBar=⧏
+LeftTriangle=⊲
+LeftTriangleEqual=⊴
+LeftUpDownVector=⥑
+LeftUpTeeVector=⥠
+LeftUpVectorBar=⥘
+LeftUpVector=↿
+LeftVectorBar=⥒
+LeftVector=↼
+lEg=⪋
+leg=⋚
+leq=≤
+leqq=≦
+leqslant=⩽
+lescc=⪨
+les=⩽
+lesdot=⩿
+lesdoto=⪁
+lesdotor=⪃
+lesg=⋚︀
+lesges=⪓
+lessapprox=⪅
+lessdot=⋖
+lesseqgtr=⋚
+lesseqqgtr=⪋
+LessEqualGreater=⋚
+LessFullEqual=≦
+LessGreater=≶
+lessgtr=≶
+LessLess=⪡
+lesssim=≲
+LessSlantEqual=⩽
+LessTilde=≲
+lfisht=⥼
+lfloor=⌊
+Lfr=𝔏
+lfr=𝔩
+lg=≶
+lgE=⪑
+lHar=⥢
+lhard=↽
+lharu=↼
+lharul=⥪
+lhblk=▄
+LJcy=Љ
+ljcy=љ
+llarr=⇇
+ll=≪
+Ll=⋘
+llcorner=⌞
+Lleftarrow=⇚
+llhard=⥫
+lltri=◺
+Lmidot=Ŀ
+lmidot=ŀ
+lmoustache=⎰
+lmoust=⎰
+lnap=⪉
+lnapprox=⪉
+lne=⪇
+lnE=≨
+lneq=⪇
+lneqq=≨
+lnsim=⋦
+loang=⟬
+loarr=⇽
+lobrk=⟦
+longleftarrow=⟵
+LongLeftArrow=⟵
+Longleftarrow=⟸
+longleftrightarrow=⟷
+LongLeftRightArrow=⟷
+Longleftrightarrow=⟺
+longmapsto=⟼
+longrightarrow=⟶
+LongRightArrow=⟶
+Longrightarrow=⟹
+looparrowleft=↫
+looparrowright=↬
+lopar=⦅
+Lopf=𝕃
+lopf=𝕝
+loplus=⨭
+lotimes=⨴
+lowast=∗
+lowbar=_
+LowerLeftArrow=↙
+LowerRightArrow=↘
+loz=◊
+lozenge=◊
+lozf=⧫
+lpar=(
+lparlt=⦓
+lrarr=⇆
+lrcorner=⌟
+lrhar=⇋
+lrhard=⥭
+lrm=‎
+lrtri=⊿
+lsaquo=‹
+lscr=𝓁
+Lscr=ℒ
+lsh=↰
+Lsh=↰
+lsim=≲
+lsime=⪍
+lsimg=⪏
+lsqb=[
+lsquo=‘
+lsquor=‚
+Lstrok=Ł
+lstrok=ł
+ltcc=⪦
+ltcir=⩹
+lt=<
+LT=<
+Lt=≪
+ltdot=⋖
+lthree=⋋
+ltimes=⋉
+ltlarr=⥶
+ltquest=⩻
+ltri=◃
+ltrie=⊴
+ltrif=◂
+ltrPar=⦖
+lurdshar=⥊
+luruhar=⥦
+lvertneqq=≨︀
+lvnE=≨︀
+macr=¯
+male=♂
+malt=✠
+maltese=✠
+Map=⤅
+map=↦
+mapsto=↦
+mapstodown=↧
+mapstoleft=↤
+mapstoup=↥
+marker=▮
+mcomma=⨩
+Mcy=М
+mcy=м
+mdash=—
+mDDot=∺
+measuredangle=∡
+MediumSpace= 
+Mellintrf=ℳ
+Mfr=𝔐
+mfr=𝔪
+mho=℧
+micro=µ
+midast=*
+midcir=⫰
+mid=∣
+middot=·
+minusb=⊟
+minus=−
+minusd=∸
+minusdu=⨪
+MinusPlus=∓
+mlcp=⫛
+mldr=…
+mnplus=∓
+models=⊧
+Mopf=𝕄
+mopf=𝕞
+mp=∓
+mscr=𝓂
+Mscr=ℳ
+mstpos=∾
+Mu=Μ
+mu=μ
+multimap=⊸
+mumap=⊸
+nabla=∇
+Nacute=Ń
+nacute=ń
+nang=∠⃒
+nap=≉
+napE=⩰̸
+napid=≋̸
+napos=ʼn
+napprox=≉
+natural=♮
+naturals=ℕ
+natur=♮
+nbsp= 
+nbump=≎̸
+nbumpe=≏̸
+ncap=⩃
+Ncaron=Ň
+ncaron=ň
+Ncedil=Ņ
+ncedil=ņ
+ncong=≇
+ncongdot=⩭̸
+ncup=⩂
+Ncy=Н
+ncy=н
+ndash=–
+nearhk=⤤
+nearr=↗
+neArr=⇗
+nearrow=↗
+ne=≠
+nedot=≐̸
+NegativeMediumSpace=​
+NegativeThickSpace=​
+NegativeThinSpace=​
+NegativeVeryThinSpace=​
+nequiv=≢
+nesear=⤨
+nesim=≂̸
+NestedGreaterGreater=≫
+NestedLessLess=≪
+NewLine=
+
+nexist=∄
+nexists=∄
+Nfr=𝔑
+nfr=𝔫
+ngE=≧̸
+nge=≱
+ngeq=≱
+ngeqq=≧̸
+ngeqslant=⩾̸
+nges=⩾̸
+nGg=⋙̸
+ngsim=≵
+nGt=≫⃒
+ngt=≯
+ngtr=≯
+nGtv=≫̸
+nharr=↮
+nhArr=⇎
+nhpar=⫲
+ni=∋
+nis=⋼
+nisd=⋺
+niv=∋
+NJcy=Њ
+njcy=њ
+nlarr=↚
+nlArr=⇍
+nldr=‥
+nlE=≦̸
+nle=≰
+nleftarrow=↚
+nLeftarrow=⇍
+nleftrightarrow=↮
+nLeftrightarrow=⇎
+nleq=≰
+nleqq=≦̸
+nleqslant=⩽̸
+nles=⩽̸
+nless=≮
+nLl=⋘̸
+nlsim=≴
+nLt=≪⃒
+nlt=≮
+nltri=⋪
+nltrie=⋬
+nLtv=≪̸
+nmid=∤
+NoBreak=⁠
+NonBreakingSpace= 
+nopf=𝕟
+Nopf=ℕ
+Not=⫬
+not=¬
+NotCongruent=≢
+NotCupCap=≭
+NotDoubleVerticalBar=∦
+NotElement=∉
+NotEqual=≠
+NotEqualTilde=≂̸
+NotExists=∄
+NotGreater=≯
+NotGreaterEqual=≱
+NotGreaterFullEqual=≧̸
+NotGreaterGreater=≫̸
+NotGreaterLess=≹
+NotGreaterSlantEqual=⩾̸
+NotGreaterTilde=≵
+NotHumpDownHump=≎̸
+NotHumpEqual=≏̸
+notin=∉
+notindot=⋵̸
+notinE=⋹̸
+notinva=∉
+notinvb=⋷
+notinvc=⋶
+NotLeftTriangleBar=⧏̸
+NotLeftTriangle=⋪
+NotLeftTriangleEqual=⋬
+NotLess=≮
+NotLessEqual=≰
+NotLessGreater=≸
+NotLessLess=≪̸
+NotLessSlantEqual=⩽̸
+NotLessTilde=≴
+NotNestedGreaterGreater=⪢̸
+NotNestedLessLess=⪡̸
+notni=∌
+notniva=∌
+notnivb=⋾
+notnivc=⋽
+NotPrecedes=⊀
+NotPrecedesEqual=⪯̸
+NotPrecedesSlantEqual=⋠
+NotReverseElement=∌
+NotRightTriangleBar=⧐̸
+NotRightTriangle=⋫
+NotRightTriangleEqual=⋭
+NotSquareSubset=⊏̸
+NotSquareSubsetEqual=⋢
+NotSquareSuperset=⊐̸
+NotSquareSupersetEqual=⋣
+NotSubset=⊂⃒
+NotSubsetEqual=⊈
+NotSucceeds=⊁
+NotSucceedsEqual=⪰̸
+NotSucceedsSlantEqual=⋡
+NotSucceedsTilde=≿̸
+NotSuperset=⊃⃒
+NotSupersetEqual=⊉
+NotTilde=≁
+NotTildeEqual=≄
+NotTildeFullEqual=≇
+NotTildeTilde=≉
+NotVerticalBar=∤
+nparallel=∦
+npar=∦
+nparsl=⫽⃥
+npart=∂̸
+npolint=⨔
+npr=⊀
+nprcue=⋠
+nprec=⊀
+npreceq=⪯̸
+npre=⪯̸
+nrarrc=⤳̸
+nrarr=↛
+nrArr=⇏
+nrarrw=↝̸
+nrightarrow=↛
+nRightarrow=⇏
+nrtri=⋫
+nrtrie=⋭
+nsc=⊁
+nsccue=⋡
+nsce=⪰̸
+Nscr=𝒩
+nscr=𝓃
+nshortmid=∤
+nshortparallel=∦
+nsim=≁
+nsime=≄
+nsimeq=≄
+nsmid=∤
+nspar=∦
+nsqsube=⋢
+nsqsupe=⋣
+nsub=⊄
+nsubE=⫅̸
+nsube=⊈
+nsubset=⊂⃒
+nsubseteq=⊈
+nsubseteqq=⫅̸
+nsucc=⊁
+nsucceq=⪰̸
+nsup=⊅
+nsupE=⫆̸
+nsupe=⊉
+nsupset=⊃⃒
+nsupseteq=⊉
+nsupseteqq=⫆̸
+ntgl=≹
+Ntilde=Ñ
+ntilde=ñ
+ntlg=≸
+ntriangleleft=⋪
+ntrianglelefteq=⋬
+ntriangleright=⋫
+ntrianglerighteq=⋭
+Nu=Ν
+nu=ν
+num=#
+numero=№
+numsp= 
+nvap=≍⃒
+nvdash=⊬
+nvDash=⊭
+nVdash=⊮
+nVDash=⊯
+nvge=≥⃒
+nvgt=>⃒
+nvHarr=⤄
+nvinfin=⧞
+nvlArr=⤂
+nvle=≤⃒
+nvlt=<⃒
+nvltrie=⊴⃒
+nvrArr=⤃
+nvrtrie=⊵⃒
+nvsim=∼⃒
+nwarhk=⤣
+nwarr=↖
+nwArr=⇖
+nwarrow=↖
+nwnear=⤧
+Oacute=Ó
+oacute=ó
+oast=⊛
+Ocirc=Ô
+ocirc=ô
+ocir=⊚
+Ocy=О
+ocy=о
+odash=⊝
+Odblac=Ő
+odblac=ő
+odiv=⨸
+odot=⊙
+odsold=⦼
+OElig=Œ
+oelig=œ
+ofcir=⦿
+Ofr=𝔒
+ofr=𝔬
+ogon=˛
+Ograve=Ò
+ograve=ò
+ogt=⧁
+ohbar=⦵
+ohm=Ω
+oint=∮
+olarr=↺
+olcir=⦾
+olcross=⦻
+oline=‾
+olt=⧀
+Omacr=Ō
+omacr=ō
+Omega=Ω
+omega=ω
+Omicron=Ο
+omicron=ο
+omid=⦶
+ominus=⊖
+Oopf=𝕆
+oopf=𝕠
+opar=⦷
+OpenCurlyDoubleQuote=“
+OpenCurlyQuote=‘
+operp=⦹
+oplus=⊕
+orarr=↻
+Or=⩔
+or=∨
+ord=⩝
+order=ℴ
+orderof=ℴ
+ordf=ª
+ordm=º
+origof=⊶
+oror=⩖
+orslope=⩗
+orv=⩛
+oS=Ⓢ
+Oscr=𝒪
+oscr=ℴ
+Oslash=Ø
+oslash=ø
+osol=⊘
+Otilde=Õ
+otilde=õ
+otimesas=⨶
+Otimes=⨷
+otimes=⊗
+Ouml=Ö
+ouml=ö
+ovbar=⌽
+OverBar=‾
+OverBrace=⏞
+OverBracket=⎴
+OverParenthesis=⏜
+para=¶
+parallel=∥
+par=∥
+parsim=⫳
+parsl=⫽
+part=∂
+PartialD=∂
+Pcy=П
+pcy=п
+percnt=%
+period=.
+permil=‰
+perp=⊥
+pertenk=‱
+Pfr=𝔓
+pfr=𝔭
+Phi=Φ
+phi=φ
+phiv=ϕ
+phmmat=ℳ
+phone=☎
+Pi=Π
+pi=π
+pitchfork=⋔
+piv=ϖ
+planck=ℏ
+planckh=ℎ
+plankv=ℏ
+plusacir=⨣
+plusb=⊞
+pluscir=⨢
+plus=+
+plusdo=∔
+plusdu=⨥
+pluse=⩲
+PlusMinus=±
+plusmn=±
+plussim=⨦
+plustwo=⨧
+pm=±
+Poincareplane=ℌ
+pointint=⨕
+popf=𝕡
+Popf=ℙ
+pound=£
+prap=⪷
+Pr=⪻
+pr=≺
+prcue=≼
+precapprox=⪷
+prec=≺
+preccurlyeq=≼
+Precedes=≺
+PrecedesEqual=⪯
+PrecedesSlantEqual=≼
+PrecedesTilde=≾
+preceq=⪯
+precnapprox=⪹
+precneqq=⪵
+precnsim=⋨
+pre=⪯
+prE=⪳
+precsim=≾
+prime=′
+Prime=″
+primes=ℙ
+prnap=⪹
+prnE=⪵
+prnsim=⋨
+prod=∏
+Product=∏
+profalar=⌮
+profline=⌒
+profsurf=⌓
+prop=∝
+Proportional=∝
+Proportion=∷
+propto=∝
+prsim=≾
+prurel=⊰
+Pscr=𝒫
+pscr=𝓅
+Psi=Ψ
+psi=ψ
+puncsp= 
+Qfr=𝔔
+qfr=𝔮
+qint=⨌
+qopf=𝕢
+Qopf=ℚ
+qprime=⁗
+Qscr=𝒬
+qscr=𝓆
+quaternions=ℍ
+quatint=⨖
+quest=?
+questeq=≟
+quot="
+QUOT="
+rAarr=⇛
+race=∽̱
+Racute=Ŕ
+racute=ŕ
+radic=√
+raemptyv=⦳
+rang=⟩
+Rang=⟫
+rangd=⦒
+range=⦥
+rangle=⟩
+raquo=»
+rarrap=⥵
+rarrb=⇥
+rarrbfs=⤠
+rarrc=⤳
+rarr=→
+Rarr=↠
+rArr=⇒
+rarrfs=⤞
+rarrhk=↪
+rarrlp=↬
+rarrpl=⥅
+rarrsim=⥴
+Rarrtl=⤖
+rarrtl=↣
+rarrw=↝
+ratail=⤚
+rAtail=⤜
+ratio=∶
+rationals=ℚ
+rbarr=⤍
+rBarr=⤏
+RBarr=⤐
+rbbrk=❳
+rbrace=}
+rbrack=]
+rbrke=⦌
+rbrksld=⦎
+rbrkslu=⦐
+Rcaron=Ř
+rcaron=ř
+Rcedil=Ŗ
+rcedil=ŗ
+rceil=⌉
+rcub=}
+Rcy=Р
+rcy=р
+rdca=⤷
+rdldhar=⥩
+rdquo=”
+rdquor=”
+rdsh=↳
+real=ℜ
+realine=ℛ
+realpart=ℜ
+reals=ℝ
+Re=ℜ
+rect=▭
+reg=®
+REG=®
+ReverseElement=∋
+ReverseEquilibrium=⇋
+ReverseUpEquilibrium=⥯
+rfisht=⥽
+rfloor=⌋
+rfr=𝔯
+Rfr=ℜ
+rHar=⥤
+rhard=⇁
+rharu=⇀
+rharul=⥬
+Rho=Ρ
+rho=ρ
+rhov=ϱ
+RightAngleBracket=⟩
+RightArrowBar=⇥
+rightarrow=→
+RightArrow=→
+Rightarrow=⇒
+RightArrowLeftArrow=⇄
+rightarrowtail=↣
+RightCeiling=⌉
+RightDoubleBracket=⟧
+RightDownTeeVector=⥝
+RightDownVectorBar=⥕
+RightDownVector=⇂
+RightFloor=⌋
+rightharpoondown=⇁
+rightharpoonup=⇀
+rightleftarrows=⇄
+rightleftharpoons=⇌
+rightrightarrows=⇉
+rightsquigarrow=↝
+RightTeeArrow=↦
+RightTee=⊢
+RightTeeVector=⥛
+rightthreetimes=⋌
+RightTriangleBar=⧐
+RightTriangle=⊳
+RightTriangleEqual=⊵
+RightUpDownVector=⥏
+RightUpTeeVector=⥜
+RightUpVectorBar=⥔
+RightUpVector=↾
+RightVectorBar=⥓
+RightVector=⇀
+ring=˚
+risingdotseq=≓
+rlarr=⇄
+rlhar=⇌
+rlm=‏
+rmoustache=⎱
+rmoust=⎱
+rnmid=⫮
+roang=⟭
+roarr=⇾
+robrk=⟧
+ropar=⦆
+ropf=𝕣
+Ropf=ℝ
+roplus=⨮
+rotimes=⨵
+RoundImplies=⥰
+rpar=)
+rpargt=⦔
+rppolint=⨒
+rrarr=⇉
+Rrightarrow=⇛
+rsaquo=›
+rscr=𝓇
+Rscr=ℛ
+rsh=↱
+Rsh=↱
+rsqb=]
+rsquo=’
+rsquor=’
+rthree=⋌
+rtimes=⋊
+rtri=▹
+rtrie=⊵
+rtrif=▸
+rtriltri=⧎
+RuleDelayed=⧴
+ruluhar=⥨
+rx=℞
+Sacute=Ś
+sacute=ś
+sbquo=‚
+scap=⪸
+Scaron=Š
+scaron=š
+Sc=⪼
+sc=≻
+sccue=≽
+sce=⪰
+scE=⪴
+Scedil=Ş
+scedil=ş
+Scirc=Ŝ
+scirc=ŝ
+scnap=⪺
+scnE=⪶
+scnsim=⋩
+scpolint=⨓
+scsim=≿
+Scy=С
+scy=с
+sdotb=⊡
+sdot=⋅
+sdote=⩦
+searhk=⤥
+searr=↘
+seArr=⇘
+searrow=↘
+sect=§
+semi=;
+seswar=⤩
+setminus=∖
+setmn=∖
+sext=✶
+Sfr=𝔖
+sfr=𝔰
+sfrown=⌢
+sharp=♯
+SHCHcy=Щ
+shchcy=щ
+SHcy=Ш
+shcy=ш
+ShortDownArrow=↓
+ShortLeftArrow=←
+shortmid=∣
+shortparallel=∥
+ShortRightArrow=→
+ShortUpArrow=↑
+shy=­
+Sigma=Σ
+sigma=σ
+sigmaf=ς
+sigmav=ς
+sim=∼
+simdot=⩪
+sime=≃
+simeq=≃
+simg=⪞
+simgE=⪠
+siml=⪝
+simlE=⪟
+simne=≆
+simplus=⨤
+simrarr=⥲
+slarr=←
+SmallCircle=∘
+smallsetminus=∖
+smashp=⨳
+smeparsl=⧤
+smid=∣
+smile=⌣
+smt=⪪
+smte=⪬
+smtes=⪬︀
+SOFTcy=Ь
+softcy=ь
+solbar=⌿
+solb=⧄
+sol=/
+Sopf=𝕊
+sopf=𝕤
+spades=♠
+spadesuit=♠
+spar=∥
+sqcap=⊓
+sqcaps=⊓︀
+sqcup=⊔
+sqcups=⊔︀
+Sqrt=√
+sqsub=⊏
+sqsube=⊑
+sqsubset=⊏
+sqsubseteq=⊑
+sqsup=⊐
+sqsupe=⊒
+sqsupset=⊐
+sqsupseteq=⊒
+square=□
+Square=□
+SquareIntersection=⊓
+SquareSubset=⊏
+SquareSubsetEqual=⊑
+SquareSuperset=⊐
+SquareSupersetEqual=⊒
+SquareUnion=⊔
+squarf=▪
+squ=□
+squf=▪
+srarr=→
+Sscr=𝒮
+sscr=𝓈
+ssetmn=∖
+ssmile=⌣
+sstarf=⋆
+Star=⋆
+star=☆
+starf=★
+straightepsilon=ϵ
+straightphi=ϕ
+strns=¯
+sub=⊂
+Sub=⋐
+subdot=⪽
+subE=⫅
+sube=⊆
+subedot=⫃
+submult=⫁
+subnE=⫋
+subne=⊊
+subplus=⪿
+subrarr=⥹
+subset=⊂
+Subset=⋐
+subseteq=⊆
+subseteqq=⫅
+SubsetEqual=⊆
+subsetneq=⊊
+subsetneqq=⫋
+subsim=⫇
+subsub=⫕
+subsup=⫓
+succapprox=⪸
+succ=≻
+succcurlyeq=≽
+Succeeds=≻
+SucceedsEqual=⪰
+SucceedsSlantEqual=≽
+SucceedsTilde=≿
+succeq=⪰
+succnapprox=⪺
+succneqq=⪶
+succnsim=⋩
+succsim=≿
+SuchThat=∋
+sum=∑
+Sum=∑
+sung=♪
+sup1=¹
+sup2=²
+sup3=³
+sup=⊃
+Sup=⋑
+supdot=⪾
+supdsub=⫘
+supE=⫆
+supe=⊇
+supedot=⫄
+Superset=⊃
+SupersetEqual=⊇
+suphsol=⟉
+suphsub=⫗
+suplarr=⥻
+supmult=⫂
+supnE=⫌
+supne=⊋
+supplus=⫀
+supset=⊃
+Supset=⋑
+supseteq=⊇
+supseteqq=⫆
+supsetneq=⊋
+supsetneqq=⫌
+supsim=⫈
+supsub=⫔
+supsup=⫖
+swarhk=⤦
+swarr=↙
+swArr=⇙
+swarrow=↙
+swnwar=⤪
+szlig=ß
+Tab=	
+target=⌖
+Tau=Τ
+tau=τ
+tbrk=⎴
+Tcaron=Ť
+tcaron=ť
+Tcedil=Ţ
+tcedil=ţ
+Tcy=Т
+tcy=т
+tdot=⃛
+telrec=⌕
+Tfr=𝔗
+tfr=𝔱
+there4=∴
+therefore=∴
+Therefore=∴
+Theta=Θ
+theta=θ
+thetasym=ϑ
+thetav=ϑ
+thickapprox=≈
+thicksim=∼
+ThickSpace=  
+ThinSpace= 
+thinsp= 
+thkap=≈
+thksim=∼
+THORN=Þ
+thorn=þ
+tilde=˜
+Tilde=∼
+TildeEqual=≃
+TildeFullEqual=≅
+TildeTilde=≈
+timesbar=⨱
+timesb=⊠
+times=×
+timesd=⨰
+tint=∭
+toea=⤨
+topbot=⌶
+topcir=⫱
+top=⊤
+Topf=𝕋
+topf=𝕥
+topfork=⫚
+tosa=⤩
+tprime=‴
+trade=™
+TRADE=™
+triangle=▵
+triangledown=▿
+triangleleft=◃
+trianglelefteq=⊴
+triangleq=≜
+triangleright=▹
+trianglerighteq=⊵
+tridot=◬
+trie=≜
+triminus=⨺
+TripleDot=⃛
+triplus=⨹
+trisb=⧍
+tritime=⨻
+trpezium=⏢
+Tscr=𝒯
+tscr=𝓉
+TScy=Ц
+tscy=ц
+TSHcy=Ћ
+tshcy=ћ
+Tstrok=Ŧ
+tstrok=ŧ
+twixt=≬
+twoheadleftarrow=↞
+twoheadrightarrow=↠
+Uacute=Ú
+uacute=ú
+uarr=↑
+Uarr=↟
+uArr=⇑
+Uarrocir=⥉
+Ubrcy=Ў
+ubrcy=ў
+Ubreve=Ŭ
+ubreve=ŭ
+Ucirc=Û
+ucirc=û
+Ucy=У
+ucy=у
+udarr=⇅
+Udblac=Ű
+udblac=ű
+udhar=⥮
+ufisht=⥾
+Ufr=𝔘
+ufr=𝔲
+Ugrave=Ù
+ugrave=ù
+uHar=⥣
+uharl=↿
+uharr=↾
+uhblk=▀
+ulcorn=⌜
+ulcorner=⌜
+ulcrop=⌏
+ultri=◸
+Umacr=Ū
+umacr=ū
+uml=¨
+UnderBar=_
+UnderBrace=⏟
+UnderBracket=⎵
+UnderParenthesis=⏝
+Union=⋃
+UnionPlus=⊎
+Uogon=Ų
+uogon=ų
+Uopf=𝕌
+uopf=𝕦
+UpArrowBar=⤒
+uparrow=↑
+UpArrow=↑
+Uparrow=⇑
+UpArrowDownArrow=⇅
+updownarrow=↕
+UpDownArrow=↕
+Updownarrow=⇕
+UpEquilibrium=⥮
+upharpoonleft=↿
+upharpoonright=↾
+uplus=⊎
+UpperLeftArrow=↖
+UpperRightArrow=↗
+upsi=υ
+Upsi=ϒ
+upsih=ϒ
+Upsilon=Υ
+upsilon=υ
+UpTeeArrow=↥
+UpTee=⊥
+upuparrows=⇈
+urcorn=⌝
+urcorner=⌝
+urcrop=⌎
+Uring=Ů
+uring=ů
+urtri=◹
+Uscr=𝒰
+uscr=𝓊
+utdot=⋰
+Utilde=Ũ
+utilde=ũ
+utri=▵
+utrif=▴
+uuarr=⇈
+Uuml=Ü
+uuml=ü
+uwangle=⦧
+vangrt=⦜
+varepsilon=ϵ
+varkappa=ϰ
+varnothing=∅
+varphi=ϕ
+varpi=ϖ
+varpropto=∝
+varr=↕
+vArr=⇕
+varrho=ϱ
+varsigma=ς
+varsubsetneq=⊊︀
+varsubsetneqq=⫋︀
+varsupsetneq=⊋︀
+varsupsetneqq=⫌︀
+vartheta=ϑ
+vartriangleleft=⊲
+vartriangleright=⊳
+vBar=⫨
+Vbar=⫫
+vBarv=⫩
+Vcy=В
+vcy=в
+vdash=⊢
+vDash=⊨
+Vdash=⊩
+VDash=⊫
+Vdashl=⫦
+veebar=⊻
+vee=∨
+Vee=⋁
+veeeq=≚
+vellip=⋮
+verbar=|
+Verbar=‖
+vert=|
+Vert=‖
+VerticalBar=∣
+VerticalLine=|
+VerticalSeparator=❘
+VerticalTilde=≀
+VeryThinSpace= 
+Vfr=𝔙
+vfr=𝔳
+vltri=⊲
+vnsub=⊂⃒
+vnsup=⊃⃒
+Vopf=𝕍
+vopf=𝕧
+vprop=∝
+vrtri=⊳
+Vscr=𝒱
+vscr=𝓋
+vsubnE=⫋︀
+vsubne=⊊︀
+vsupnE=⫌︀
+vsupne=⊋︀
+Vvdash=⊪
+vzigzag=⦚
+Wcirc=Ŵ
+wcirc=ŵ
+wedbar=⩟
+wedge=∧
+Wedge=⋀
+wedgeq=≙
+weierp=℘
+Wfr=𝔚
+wfr=𝔴
+Wopf=𝕎
+wopf=𝕨
+wp=℘
+wr=≀
+wreath=≀
+Wscr=𝒲
+wscr=𝓌
+xcap=⋂
+xcirc=◯
+xcup=⋃
+xdtri=▽
+Xfr=𝔛
+xfr=𝔵
+xharr=⟷
+xhArr=⟺
+Xi=Ξ
+xi=ξ
+xlarr=⟵
+xlArr=⟸
+xmap=⟼
+xnis=⋻
+xodot=⨀
+Xopf=𝕏
+xopf=𝕩
+xoplus=⨁
+xotime=⨂
+xrarr=⟶
+xrArr=⟹
+Xscr=𝒳
+xscr=𝓍
+xsqcup=⨆
+xuplus=⨄
+xutri=△
+xvee=⋁
+xwedge=⋀
+Yacute=Ý
+yacute=ý
+YAcy=Я
+yacy=я
+Ycirc=Ŷ
+ycirc=ŷ
+Ycy=Ы
+ycy=ы
+yen=¥
+Yfr=𝔜
+yfr=𝔶
+YIcy=Ї
+yicy=ї
+Yopf=𝕐
+yopf=𝕪
+Yscr=𝒴
+yscr=𝓎
+YUcy=Ю
+yucy=ю
+yuml=ÿ
+Yuml=Ÿ
+Zacute=Ź
+zacute=ź
+Zcaron=Ž
+zcaron=ž
+Zcy=З
+zcy=з
+Zdot=Ż
+zdot=ż
+zeetrf=ℨ
+ZeroWidthSpace=​
+Zeta=Ζ
+zeta=ζ
+zfr=𝔷
+Zfr=ℨ
+ZHcy=Ж
+zhcy=ж
+zigrarr=⇝
+zopf=𝕫
+Zopf=ℤ
+Zscr=𝒵
+zscr=𝓏
+zwj=‍
+zwnj=‌
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/AbstractVisitor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/AbstractVisitor.java
new file mode 100644
index 00000000000..982a6b56550
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/AbstractVisitor.java
@@ -0,0 +1,173 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * Abstract visitor that visits all children by default.
+ * <p>
+ * Can be used to only process certain nodes. If you override a method and want visiting to descend into children,
+ * call {@link #visitChildren}.
+ */
+public abstract class AbstractVisitor implements Visitor {
+
+    @Override
+    public void visit(BlockQuote blockQuote) {
+        visitChildren(blockQuote);
+    }
+
+    @Override
+    public void visit(BulletList bulletList) {
+        visitChildren(bulletList);
+    }
+
+    @Override
+    public void visit(Code code) {
+        visitChildren(code);
+    }
+
+    @Override
+    public void visit(Document document) {
+        visitChildren(document);
+    }
+
+    @Override
+    public void visit(Emphasis emphasis) {
+        visitChildren(emphasis);
+    }
+
+    @Override
+    public void visit(FencedCodeBlock fencedCodeBlock) {
+        visitChildren(fencedCodeBlock);
+    }
+
+    @Override
+    public void visit(HardLineBreak hardLineBreak) {
+        visitChildren(hardLineBreak);
+    }
+
+    @Override
+    public void visit(Heading heading) {
+        visitChildren(heading);
+    }
+
+    @Override
+    public void visit(ThematicBreak thematicBreak) {
+        visitChildren(thematicBreak);
+    }
+
+    @Override
+    public void visit(HtmlInline htmlInline) {
+        visitChildren(htmlInline);
+    }
+
+    @Override
+    public void visit(HtmlBlock htmlBlock) {
+        visitChildren(htmlBlock);
+    }
+
+    @Override
+    public void visit(Image image) {
+        visitChildren(image);
+    }
+
+    @Override
+    public void visit(IndentedCodeBlock indentedCodeBlock) {
+        visitChildren(indentedCodeBlock);
+    }
+
+    @Override
+    public void visit(Link link) {
+        visitChildren(link);
+    }
+
+    @Override
+    public void visit(ListItem listItem) {
+        visitChildren(listItem);
+    }
+
+    @Override
+    public void visit(OrderedList orderedList) {
+        visitChildren(orderedList);
+    }
+
+    @Override
+    public void visit(Paragraph paragraph) {
+        visitChildren(paragraph);
+    }
+
+    @Override
+    public void visit(SoftLineBreak softLineBreak) {
+        visitChildren(softLineBreak);
+    }
+
+    @Override
+    public void visit(StrongEmphasis strongEmphasis) {
+        visitChildren(strongEmphasis);
+    }
+
+    @Override
+    public void visit(Text text) {
+        visitChildren(text);
+    }
+
+    @Override
+    public void visit(LinkReferenceDefinition linkReferenceDefinition) {
+        visitChildren(linkReferenceDefinition);
+    }
+
+    @Override
+    public void visit(CustomBlock customBlock) {
+        visitChildren(customBlock);
+    }
+
+    @Override
+    public void visit(CustomNode customNode) {
+        visitChildren(customNode);
+    }
+
+    /**
+     * Visit the child nodes.
+     *
+     * @param parent the parent node whose children should be visited
+     */
+    protected void visitChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            // A subclass of this visitor might modify the node, resulting in getNext returning a different node or no
+            // node after visiting it. So get the next node before visiting.
+            Node next = node.getNext();
+            node.accept(this);
+            node = next;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Block.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Block.java
new file mode 100644
index 00000000000..57603fa5fdd
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Block.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * Block nodes such as paragraphs, list blocks, code blocks etc.
+ */
+public abstract class Block extends Node {
+
+    public Block getParent() {
+        return (Block) super.getParent();
+    }
+
+    @Override
+    protected void setParent(Node parent) {
+        if (!(parent instanceof Block)) {
+            throw new IllegalArgumentException("Parent of block must also be block (can not be inline)");
+        }
+        super.setParent(parent);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BlockQuote.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BlockQuote.java
new file mode 100644
index 00000000000..8a5f1d20c07
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BlockQuote.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class BlockQuote extends Block {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BulletList.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BulletList.java
new file mode 100644
index 00000000000..75ab053da3f
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/BulletList.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class BulletList extends ListBlock {
+
+    private String marker;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * @return the bullet list marker that was used, e.g. {@code -}, {@code *} or {@code +}, if available, or null otherwise
+     */
+    public String getMarker() {
+        return marker;
+    }
+
+    public void setMarker(String marker) {
+        this.marker = marker;
+    }
+
+    /**
+     * @deprecated use {@link #getMarker()} instead
+     */
+    @Deprecated
+    public char getBulletMarker() {
+        return marker != null && !marker.isEmpty() ? marker.charAt(0) : '\0';
+    }
+
+    /**
+     * @deprecated use {@link #getMarker()} instead
+     */
+    @Deprecated
+    public void setBulletMarker(char bulletMarker) {
+        this.marker = bulletMarker != '\0' ? String.valueOf(bulletMarker) : null;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Code.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Code.java
new file mode 100644
index 00000000000..b64ddefa1f1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Code.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Code extends Node {
+
+    private String literal;
+
+    public Code() {
+    }
+
+    public Code(String literal) {
+        this.literal = literal;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomBlock.java
new file mode 100644
index 00000000000..08038848ada
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomBlock.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public abstract class CustomBlock extends Block {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomNode.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomNode.java
new file mode 100644
index 00000000000..733df320afc
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/CustomNode.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public abstract class CustomNode extends Node {
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Delimited.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Delimited.java
new file mode 100644
index 00000000000..b887aa3f75a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Delimited.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * A node that uses delimiters in the source form (e.g. <code>*bold*</code>).
+ */
+public interface Delimited {
+
+    /**
+     * @return the opening (beginning) delimiter, e.g. <code>*</code>
+     */
+    String getOpeningDelimiter();
+
+    /**
+     * @return the closing (ending) delimiter, e.g. <code>*</code>
+     */
+    String getClosingDelimiter();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Document.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Document.java
new file mode 100644
index 00000000000..390728318ec
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Document.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Document extends Block {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Emphasis.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Emphasis.java
new file mode 100644
index 00000000000..86b09f4f2f6
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Emphasis.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Emphasis extends Node implements Delimited {
+
+    private String delimiter;
+
+    public Emphasis() {
+    }
+
+    public Emphasis(String delimiter) {
+        this.delimiter = delimiter;
+    }
+
+    public void setDelimiter(String delimiter) {
+        this.delimiter = delimiter;
+    }
+
+    @Override
+    public String getOpeningDelimiter() {
+        return delimiter;
+    }
+
+    @Override
+    public String getClosingDelimiter() {
+        return delimiter;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/FencedCodeBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/FencedCodeBlock.java
new file mode 100644
index 00000000000..d78b3e4292a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/FencedCodeBlock.java
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class FencedCodeBlock extends Block {
+
+    private String fenceCharacter;
+    private Integer openingFenceLength;
+    private Integer closingFenceLength;
+    private int fenceIndent;
+
+    private String info;
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * @return the fence character that was used, e.g. {@code `} or {@code ~}, if available, or null otherwise
+     */
+    public String getFenceCharacter() {
+        return fenceCharacter;
+    }
+
+    public void setFenceCharacter(String fenceCharacter) {
+        this.fenceCharacter = fenceCharacter;
+    }
+
+    /**
+     * @return the length of the opening fence (how many of {{@link #getFenceCharacter()}} were used to start the code
+     * block) if available, or null otherwise
+     */
+    public Integer getOpeningFenceLength() {
+        return openingFenceLength;
+    }
+
+    public void setOpeningFenceLength(Integer openingFenceLength) {
+        if (openingFenceLength != null && openingFenceLength < 3) {
+            throw new IllegalArgumentException("openingFenceLength needs to be >= 3");
+        }
+        checkFenceLengths(openingFenceLength, closingFenceLength);
+        this.openingFenceLength = openingFenceLength;
+    }
+
+    /**
+     * @return the length of the closing fence (how many of {@link #getFenceCharacter()} were used to end the code
+     * block) if available, or null otherwise
+     */
+    public Integer getClosingFenceLength() {
+        return closingFenceLength;
+    }
+
+    public void setClosingFenceLength(Integer closingFenceLength) {
+        if (closingFenceLength != null && closingFenceLength < 3) {
+            throw new IllegalArgumentException("closingFenceLength needs to be >= 3");
+        }
+        checkFenceLengths(openingFenceLength, closingFenceLength);
+        this.closingFenceLength = closingFenceLength;
+    }
+
+    public int getFenceIndent() {
+        return fenceIndent;
+    }
+
+    public void setFenceIndent(int fenceIndent) {
+        this.fenceIndent = fenceIndent;
+    }
+
+    /**
+     * @see <a href="http://spec.commonmark.org/0.18/#info-string">CommonMark spec</a>
+     */
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+
+    /**
+     * @deprecated use {@link #getFenceCharacter()} instead
+     */
+    @Deprecated
+    public char getFenceChar() {
+        return fenceCharacter != null && !fenceCharacter.isEmpty() ? fenceCharacter.charAt(0) : '\0';
+    }
+
+    /**
+     * @deprecated use {@link #setFenceCharacter} instead
+     */
+    @Deprecated
+    public void setFenceChar(char fenceChar) {
+        this.fenceCharacter = fenceChar != '\0' ? String.valueOf(fenceChar) : null;
+    }
+
+    /**
+     * @deprecated use {@link #getOpeningFenceLength} instead
+     */
+    @Deprecated
+    public int getFenceLength() {
+        return openingFenceLength != null ? openingFenceLength : 0;
+    }
+
+    /**
+     * @deprecated use {@link #setOpeningFenceLength} instead
+     */
+    @Deprecated
+    public void setFenceLength(int fenceLength) {
+        this.openingFenceLength = fenceLength != 0 ? fenceLength : null;
+    }
+
+    private static void checkFenceLengths(Integer openingFenceLength, Integer closingFenceLength) {
+        if (openingFenceLength != null && closingFenceLength != null) {
+            if (closingFenceLength < openingFenceLength) {
+                throw new IllegalArgumentException("fence lengths required to be: closingFenceLength >= openingFenceLength");
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HardLineBreak.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HardLineBreak.java
new file mode 100644
index 00000000000..5c85504a8fb
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HardLineBreak.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class HardLineBreak extends Node {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Heading.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Heading.java
new file mode 100644
index 00000000000..49a8225fca1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Heading.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Heading extends Block {
+
+    private int level;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlBlock.java
new file mode 100644
index 00000000000..94380c084e1
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlBlock.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * HTML block
+ *
+ * @see <a href="http://spec.commonmark.org/0.18/#html-blocks">CommonMark Spec</a>
+ */
+public class HtmlBlock extends Block {
+
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlInline.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlInline.java
new file mode 100644
index 00000000000..7402606ac83
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/HtmlInline.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * Inline HTML element.
+ *
+ * @see <a href="http://spec.commonmark.org/0.24/#raw-html">CommonMark Spec</a>
+ */
+public class HtmlInline extends Node {
+
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Image.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Image.java
new file mode 100644
index 00000000000..36a3f2f7221
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Image.java
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Image extends Node {
+
+    private String destination;
+    private String title;
+
+    public Image() {
+    }
+
+    public Image(String destination, String title) {
+        this.destination = destination;
+        this.title = title;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+
+    public void setDestination(String destination) {
+        this.destination = destination;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    protected String toStringAttributes() {
+        return "destination=" + destination + ", title=" + title;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/IndentedCodeBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/IndentedCodeBlock.java
new file mode 100644
index 00000000000..d3b4cec41d8
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/IndentedCodeBlock.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class IndentedCodeBlock extends Block {
+
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Link.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Link.java
new file mode 100644
index 00000000000..448c0b063db
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Link.java
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * A link with a destination and an optional title; the link text is in child nodes.
+ * <p>
+ * Example for an inline link in a CommonMark document:
+ * <pre><code>
+ * [link](/uri "title")
+ * </code></pre>
+ * <p>
+ * The corresponding Link node would look like this:
+ * <ul>
+ * <li>{@link #getDestination()} returns {@code "/uri"}
+ * <li>{@link #getTitle()} returns {@code "title"}
+ * <li>A {@link Text} child node with {@link Text#getLiteral() getLiteral} that returns {@code "link"}</li>
+ * </ul>
+ * <p>
+ * Note that the text in the link can contain inline formatting, so it could also contain an {@link Image} or
+ * {@link Emphasis}, etc.
+ *
+ * @see <a href="http://spec.commonmark.org/0.26/#links">CommonMark Spec for links</a>
+ */
+public class Link extends Node {
+
+    private String destination;
+    private String title;
+
+    public Link() {
+    }
+
+    public Link(String destination, String title) {
+        this.destination = destination;
+        this.title = title;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+
+    public void setDestination(String destination) {
+        this.destination = destination;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    protected String toStringAttributes() {
+        return "destination=" + destination + ", title=" + title;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/LinkReferenceDefinition.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/LinkReferenceDefinition.java
new file mode 100644
index 00000000000..9f3e7107e78
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/LinkReferenceDefinition.java
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * A link reference definition, e.g.:
+ * <pre><code>
+ * [foo]: /url "title"
+ * </code></pre>
+ * <p>
+ * They can be referenced anywhere else in the document to produce a link using <code>[foo]</code>. The definitions
+ * themselves are usually not rendered in the final output.
+ *
+ * @see <a href="https://spec.commonmark.org/0.29/#link-reference-definition">Link reference definitions</a>
+ */
+public class LinkReferenceDefinition extends Node {
+
+    private String label;
+    private String destination;
+    private String title;
+
+    public LinkReferenceDefinition() {
+    }
+
+    public LinkReferenceDefinition(String label, String destination, String title) {
+        this.label = label;
+        this.destination = destination;
+        this.title = title;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getDestination() {
+        return destination;
+    }
+
+    public void setDestination(String destination) {
+        this.destination = destination;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListBlock.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListBlock.java
new file mode 100644
index 00000000000..67cccde093a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListBlock.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public abstract class ListBlock extends Block {
+
+    private boolean tight;
+
+    /**
+     * @return whether this list is tight or loose
+     * @see <a href="https://spec.commonmark.org/0.28/#tight">CommonMark Spec for tight lists</a>
+     */
+    public boolean isTight() {
+        return tight;
+    }
+
+    public void setTight(boolean tight) {
+        this.tight = tight;
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListItem.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListItem.java
new file mode 100644
index 00000000000..6e1a5d15fb3
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ListItem.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class ListItem extends Block {
+
+    private Integer markerIndent;
+    private Integer contentIndent;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * Returns the indent of the marker such as "-" or "1." in columns (spaces or tab stop of 4) if available, or null
+     * otherwise.
+     * <p>
+     * Some examples and their marker indent:
+     * <pre>- Foo</pre>
+     * Marker indent: 0
+     * <pre> - Foo</pre>
+     * Marker indent: 1
+     * <pre>  1. Foo</pre>
+     * Marker indent: 2
+     */
+    public Integer getMarkerIndent() {
+        return markerIndent;
+    }
+
+    public void setMarkerIndent(Integer markerIndent) {
+        this.markerIndent = markerIndent;
+    }
+
+    /**
+     * Returns the indent of the content in columns (spaces or tab stop of 4) if available, or null otherwise.
+     * The content indent is counted from the beginning of the line and includes the marker on the first line.
+     * <p>
+     * Some examples and their content indent:
+     * <pre>- Foo</pre>
+     * Content indent: 2
+     * <pre> - Foo</pre>
+     * Content indent: 3
+     * <pre>  1. Foo</pre>
+     * Content indent: 5
+     * <p>
+     * Note that subsequent lines in the same list item need to be indented by at least the content indent to be counted
+     * as part of the list item.
+     */
+    public Integer getContentIndent() {
+        return contentIndent;
+    }
+
+    public void setContentIndent(Integer contentIndent) {
+        this.contentIndent = contentIndent;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Node.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Node.java
new file mode 100644
index 00000000000..1607ec2ef5f
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Node.java
@@ -0,0 +1,193 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * The base class of all CommonMark AST nodes ({@link Block} and inlines).
+ * <p>
+ * A node can have multiple children, and a parent (except for the root node).
+ */
+public abstract class Node {
+
+    private Node parent = null;
+    private Node firstChild = null;
+    private Node lastChild = null;
+    private Node prev = null;
+    private Node next = null;
+    private List<SourceSpan> sourceSpans = null;
+
+    public abstract void accept(Visitor visitor);
+
+    public Node getNext() {
+        return next;
+    }
+
+    public Node getPrevious() {
+        return prev;
+    }
+
+    public Node getFirstChild() {
+        return firstChild;
+    }
+
+    public Node getLastChild() {
+        return lastChild;
+    }
+
+    public Node getParent() {
+        return parent;
+    }
+
+    protected void setParent(Node parent) {
+        this.parent = parent;
+    }
+
+    public void appendChild(Node child) {
+        child.unlink();
+        child.setParent(this);
+        if (this.lastChild != null) {
+            this.lastChild.next = child;
+            child.prev = this.lastChild;
+            this.lastChild = child;
+        } else {
+            this.firstChild = child;
+            this.lastChild = child;
+        }
+    }
+
+    public void prependChild(Node child) {
+        child.unlink();
+        child.setParent(this);
+        if (this.firstChild != null) {
+            this.firstChild.prev = child;
+            child.next = this.firstChild;
+            this.firstChild = child;
+        } else {
+            this.firstChild = child;
+            this.lastChild = child;
+        }
+    }
+
+    public void unlink() {
+        if (this.prev != null) {
+            this.prev.next = this.next;
+        } else if (this.parent != null) {
+            this.parent.firstChild = this.next;
+        }
+        if (this.next != null) {
+            this.next.prev = this.prev;
+        } else if (this.parent != null) {
+            this.parent.lastChild = this.prev;
+        }
+        this.parent = null;
+        this.next = null;
+        this.prev = null;
+    }
+
+    public void insertAfter(Node sibling) {
+        sibling.unlink();
+        sibling.next = this.next;
+        if (sibling.next != null) {
+            sibling.next.prev = sibling;
+        }
+        sibling.prev = this;
+        this.next = sibling;
+        sibling.parent = this.parent;
+        if (sibling.next == null) {
+            sibling.parent.lastChild = sibling;
+        }
+    }
+
+    public void insertBefore(Node sibling) {
+        sibling.unlink();
+        sibling.prev = this.prev;
+        if (sibling.prev != null) {
+            sibling.prev.next = sibling;
+        }
+        sibling.next = this;
+        this.prev = sibling;
+        sibling.parent = this.parent;
+        if (sibling.prev == null) {
+            sibling.parent.firstChild = sibling;
+        }
+    }
+
+
+    /**
+     * @return the source spans of this node if included by the parser, an empty list otherwise
+     * @since 0.16.0
+     */
+    public List<SourceSpan> getSourceSpans() {
+        return sourceSpans != null ? Collections.unmodifiableList(sourceSpans) : Collections.<SourceSpan>emptyList();
+    }
+
+    /**
+     * Replace the current source spans with the provided list.
+     *
+     * @param sourceSpans the new source spans to set
+     * @since 0.16.0
+     */
+    public void setSourceSpans(List<SourceSpan> sourceSpans) {
+        if (sourceSpans.isEmpty()) {
+            this.sourceSpans = null;
+        } else {
+            this.sourceSpans = new ArrayList<>(sourceSpans);
+        }
+    }
+
+    /**
+     * Add a source span to the end of the list.
+     *
+     * @param sourceSpan the source span to add
+     * @since 0.16.0
+     */
+    public void addSourceSpan(SourceSpan sourceSpan) {
+        if (sourceSpans == null) {
+            this.sourceSpans = new ArrayList<>();
+        }
+        this.sourceSpans.add(sourceSpan);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "{" + toStringAttributes() + "}";
+    }
+
+    protected String toStringAttributes() {
+        return "";
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Nodes.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Nodes.java
new file mode 100644
index 00000000000..5be07004284
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Nodes.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+import java.util.Iterator;
+
+/**
+ * Utility class for working with multiple {@link Node}s.
+ *
+ * @since 0.16.0
+ */
+public class Nodes {
+
+    private Nodes() {
+    }
+
+    /**
+     * The nodes between (not including) start and end.
+     */
+    public static Iterable<Node> between(Node start, Node end) {
+        return new NodeIterable(start.getNext(), end);
+    }
+
+    private static class NodeIterable implements Iterable<Node> {
+
+        private final Node first;
+        private final Node end;
+
+        private NodeIterable(Node first, Node end) {
+            this.first = first;
+            this.end = end;
+        }
+
+        @Override
+        public Iterator<Node> iterator() {
+            return new NodeIterator(first, end);
+        }
+    }
+
+    private static class NodeIterator implements Iterator<Node> {
+
+        private Node node;
+        private final Node end;
+
+        private NodeIterator(Node first, Node end) {
+            node = first;
+            this.end = end;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return node != null && node != end;
+        }
+
+        @Override
+        public Node next() {
+            Node result = node;
+            node = node.getNext();
+            return result;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException("remove");
+        }
+    }
+}
+
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/OrderedList.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/OrderedList.java
new file mode 100644
index 00000000000..ebee8422f08
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/OrderedList.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class OrderedList extends ListBlock {
+
+    private String markerDelimiter;
+    private Integer markerStartNumber;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * @return the start number used in the marker, e.g. {@code 1}, if available, or null otherwise
+     */
+    public Integer getMarkerStartNumber() {
+        return markerStartNumber;
+    }
+
+    public void setMarkerStartNumber(Integer markerStartNumber) {
+        this.markerStartNumber = markerStartNumber;
+    }
+
+    /**
+     * @return the delimiter used in the marker, e.g. {@code .} or {@code )}, if available, or null otherwise
+     */
+    public String getMarkerDelimiter() {
+        return markerDelimiter;
+    }
+
+    public void setMarkerDelimiter(String markerDelimiter) {
+        this.markerDelimiter = markerDelimiter;
+    }
+
+    /**
+     * @deprecated use {@link #getMarkerStartNumber()} instead
+     */
+    @Deprecated
+    public int getStartNumber() {
+        return markerStartNumber != null ? markerStartNumber : 0;
+    }
+
+    /**
+     * @deprecated use {@link #setMarkerStartNumber} instead
+     */
+    @Deprecated
+    public void setStartNumber(int startNumber) {
+        this.markerStartNumber = startNumber != 0 ? startNumber : null;
+    }
+
+    /**
+     * @deprecated use {@link #getMarkerDelimiter()} instead
+     */
+    @Deprecated
+    public char getDelimiter() {
+        return markerDelimiter != null && !markerDelimiter.isEmpty() ? markerDelimiter.charAt(0) : '\0';
+    }
+
+    /**
+     * @deprecated use {@link #setMarkerDelimiter} instead
+     */
+    @Deprecated
+    public void setDelimiter(char delimiter) {
+        this.markerDelimiter = delimiter != '\0' ? String.valueOf(delimiter) : null;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Paragraph.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Paragraph.java
new file mode 100644
index 00000000000..32168c0251e
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Paragraph.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * A paragraph block, contains inline nodes such as {@link Text}
+ */
+public class Paragraph extends Block {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SoftLineBreak.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SoftLineBreak.java
new file mode 100644
index 00000000000..1fedc5c899b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SoftLineBreak.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class SoftLineBreak extends Node {
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpan.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpan.java
new file mode 100644
index 00000000000..b816a8bf437
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpan.java
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+import java.util.Objects;
+
+/**
+ * A source span references a snippet of text from the source input.
+ * <p>
+ * It has a starting position (line and column index) and a length of how many characters it spans.
+ * <p>
+ * For example, this CommonMark source text:
+ * <pre><code>
+ * &gt; foo
+ * </code></pre>
+ * The {@link BlockQuote} node would have this source span: line 0, column 0, length 5.
+ * <p>
+ * The {@link Paragraph} node inside it would have: line 0, column 2, length 3.
+ * <p>
+ * If a block has multiple lines, it will have a source span for each line.
+ * <p>
+ * Note that the column index and length are measured in Java characters (UTF-16 code units). If you're outputting them
+ * to be consumed by another programming language, e.g. one that uses UTF-8 strings, you will need to translate them,
+ * otherwise characters such as emojis will result in incorrect positions.
+ *
+ * @since 0.16.0
+ */
+public class SourceSpan {
+
+    private final int lineIndex;
+    private final int columnIndex;
+    private final int length;
+
+    public static SourceSpan of(int lineIndex, int columnIndex, int length) {
+        return new SourceSpan(lineIndex, columnIndex, length);
+    }
+
+    private SourceSpan(int lineIndex, int columnIndex, int length) {
+        this.lineIndex = lineIndex;
+        this.columnIndex = columnIndex;
+        this.length = length;
+    }
+
+    /**
+     * @return 0-based index of line in source
+     */
+    public int getLineIndex() {
+        return lineIndex;
+    }
+
+    /**
+     * @return 0-based index of column (character on line) in source
+     */
+    public int getColumnIndex() {
+        return columnIndex;
+    }
+
+    /**
+     * @return length of the span in characters
+     */
+    public int getLength() {
+        return length;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        SourceSpan that = (SourceSpan) o;
+        return lineIndex == that.lineIndex &&
+                columnIndex == that.columnIndex &&
+                length == that.length;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(lineIndex, columnIndex, length);
+    }
+
+    @Override
+    public String toString() {
+        return "SourceSpan{" +
+                "line=" + lineIndex +
+                ", column=" + columnIndex +
+                ", length=" + length +
+                "}";
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpans.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpans.java
new file mode 100644
index 00000000000..4a35a89840d
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/SourceSpans.java
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A list of source spans that can be added to. Takes care of merging adjacent source spans.
+ *
+ * @since 0.16.0
+ */
+public class SourceSpans {
+
+    private List<SourceSpan> sourceSpans;
+
+    public static SourceSpans empty() {
+        return new SourceSpans();
+    }
+
+    public List<SourceSpan> getSourceSpans() {
+        return sourceSpans != null ? sourceSpans : Collections.<SourceSpan>emptyList();
+    }
+
+    public void addAllFrom(Iterable<? extends Node> nodes) {
+        for (Node node : nodes) {
+            addAll(node.getSourceSpans());
+        }
+    }
+
+    public void addAll(List<SourceSpan> other) {
+        if (other.isEmpty()) {
+            return;
+        }
+
+        if (sourceSpans == null) {
+            sourceSpans = new ArrayList<>();
+        }
+
+        if (sourceSpans.isEmpty()) {
+            sourceSpans.addAll(other);
+        } else {
+            int lastIndex = sourceSpans.size() - 1;
+            SourceSpan a = sourceSpans.get(lastIndex);
+            SourceSpan b = other.get(0);
+            if (a.getLineIndex() == b.getLineIndex() && a.getColumnIndex() + a.getLength() == b.getColumnIndex()) {
+                sourceSpans.set(lastIndex, SourceSpan.of(a.getLineIndex(), a.getColumnIndex(), a.getLength() + b.getLength()));
+                sourceSpans.addAll(other.subList(1, other.size()));
+            } else {
+                sourceSpans.addAll(other);
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/StrongEmphasis.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/StrongEmphasis.java
new file mode 100644
index 00000000000..1efed6d9929
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/StrongEmphasis.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class StrongEmphasis extends Node implements Delimited {
+
+    private String delimiter;
+
+    public StrongEmphasis() {
+    }
+
+    public StrongEmphasis(String delimiter) {
+        this.delimiter = delimiter;
+    }
+
+    public void setDelimiter(String delimiter) {
+        this.delimiter = delimiter;
+    }
+
+    @Override
+    public String getOpeningDelimiter() {
+        return delimiter;
+    }
+
+    @Override
+    public String getClosingDelimiter() {
+        return delimiter;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Text.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Text.java
new file mode 100644
index 00000000000..976134d1dd0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Text.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class Text extends Node {
+
+    private String literal;
+
+    public Text() {
+    }
+
+    public Text(String literal) {
+        this.literal = literal;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+
+    @Override
+    protected String toStringAttributes() {
+        return "literal=" + literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ThematicBreak.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ThematicBreak.java
new file mode 100644
index 00000000000..8be13266a33
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/ThematicBreak.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+public class ThematicBreak extends Block {
+
+    private String literal;
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    /**
+     * @return the source literal that represents this node, if available
+     */
+    public String getLiteral() {
+        return literal;
+    }
+
+    public void setLiteral(String literal) {
+        this.literal = literal;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Visitor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Visitor.java
new file mode 100644
index 00000000000..460a6876c28
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/Visitor.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.node;
+
+/**
+ * Node visitor.
+ * <p>
+ * Implementations should subclass {@link AbstractVisitor} instead of implementing this directly.
+ */
+public interface Visitor {
+
+    void visit(BlockQuote blockQuote);
+
+    void visit(BulletList bulletList);
+
+    void visit(Code code);
+
+    void visit(Document document);
+
+    void visit(Emphasis emphasis);
+
+    void visit(FencedCodeBlock fencedCodeBlock);
+
+    void visit(HardLineBreak hardLineBreak);
+
+    void visit(Heading heading);
+
+    void visit(ThematicBreak thematicBreak);
+
+    void visit(HtmlInline htmlInline);
+
+    void visit(HtmlBlock htmlBlock);
+
+    void visit(Image image);
+
+    void visit(IndentedCodeBlock indentedCodeBlock);
+
+    void visit(Link link);
+
+    void visit(ListItem listItem);
+
+    void visit(OrderedList orderedList);
+
+    void visit(Paragraph paragraph);
+
+    void visit(SoftLineBreak softLineBreak);
+
+    void visit(StrongEmphasis strongEmphasis);
+
+    void visit(Text text);
+
+    void visit(LinkReferenceDefinition linkReferenceDefinition);
+
+    void visit(CustomBlock customBlock);
+
+    void visit(CustomNode customNode);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/package-info.java
new file mode 100644
index 00000000000..e957ac5b772
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/node/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * AST node types (see {@link org.commonmark.node.Node}) and visitors (see {@link org.commonmark.node.AbstractVisitor})
+ */
+package jdk.internal.org.commonmark.node;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/package-info.java
new file mode 100644
index 00000000000..f3dcba6dc10
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/package-info.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Root package of commonmark-java
+ * <ul>
+ * <li>{@link org.commonmark.parser} for parsing input text to AST nodes</li>
+ * <li>{@link org.commonmark.node} for AST node types and visitors</li>
+ * <li>{@link org.commonmark.renderer.html} for HTML rendering</li>
+ * <li>{@link org.commonmark.renderer.markdown} for Markdown rendering</li>
+ * </ul>
+ */
+package jdk.internal.org.commonmark;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/IncludeSourceSpans.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/IncludeSourceSpans.java
new file mode 100644
index 00000000000..27d91f96e76
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/IncludeSourceSpans.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+/**
+ * Whether to include {@link org.commonmark.node.SourceSpan} or not while parsing,
+ * see {@link Parser.Builder#includeSourceSpans(IncludeSourceSpans)}.
+ *
+ * @since 0.16.0
+ */
+public enum IncludeSourceSpans {
+    /**
+     * Do not include source spans.
+     */
+    NONE,
+    /**
+     * Include source spans on {@link org.commonmark.node.Block} nodes.
+     */
+    BLOCKS,
+    /**
+     * Include source spans on block nodes and inline nodes.
+     */
+    BLOCKS_AND_INLINES,
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParser.java
new file mode 100644
index 00000000000..e0e4246eb09
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParser.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.Node;
+
+/**
+ * Parser for inline content (text, links, emphasized text, etc).
+ */
+public interface InlineParser {
+
+    /**
+     * @param lines the source content to parse as inline
+     * @param node the node to append resulting nodes to (as children)
+     */
+    void parse(SourceLines lines, Node node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserContext.java
new file mode 100644
index 00000000000..b28faff22be
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserContext.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+
+import java.util.List;
+
+/**
+ * Context for inline parsing.
+ */
+public interface InlineParserContext {
+
+    /**
+     * @return custom delimiter processors that have been configured with {@link Parser.Builder#customDelimiterProcessor(DelimiterProcessor)}
+     */
+    List<DelimiterProcessor> getCustomDelimiterProcessors();
+
+    /**
+     * Look up a {@link LinkReferenceDefinition} for a given label.
+     * <p>
+     * Note that the label is not normalized yet; implementations are responsible for normalizing before lookup.
+     *
+     * @param label the link label to look up
+     * @return the definition if one exists, {@code null} otherwise
+     */
+    LinkReferenceDefinition getLinkReferenceDefinition(String label);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserFactory.java
new file mode 100644
index 00000000000..6fb0860f48e
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/InlineParserFactory.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+/**
+ * Factory for custom inline parser.
+ */
+public interface InlineParserFactory {
+    InlineParser create(InlineParserContext inlineParserContext);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/Parser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/Parser.java
new file mode 100644
index 00000000000..40712b97873
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/Parser.java
@@ -0,0 +1,316 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.internal.DocumentParser;
+import jdk.internal.org.commonmark.internal.InlineParserContextImpl;
+import jdk.internal.org.commonmark.internal.InlineParserImpl;
+import jdk.internal.org.commonmark.internal.LinkReferenceDefinitions;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.parser.block.BlockParserFactory;
+import jdk.internal.org.commonmark.parser.delimiter.DelimiterProcessor;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+
+/**
+ * Parses input text to a tree of nodes.
+ * <p>
+ * Start with the {@link #builder} method, configure the parser and build it. Example:
+ * <pre><code>
+ * Parser parser = Parser.builder().build();
+ * Node document = parser.parse("input text");
+ * </code></pre>
+ */
+public class Parser {
+
+    private final List<BlockParserFactory> blockParserFactories;
+    private final List<DelimiterProcessor> delimiterProcessors;
+    private final InlineParserFactory inlineParserFactory;
+    private final List<PostProcessor> postProcessors;
+    private final IncludeSourceSpans includeSourceSpans;
+
+    private Parser(Builder builder) {
+        this.blockParserFactories = DocumentParser.calculateBlockParserFactories(builder.blockParserFactories, builder.enabledBlockTypes);
+        this.inlineParserFactory = builder.getInlineParserFactory();
+        this.postProcessors = builder.postProcessors;
+        this.delimiterProcessors = builder.delimiterProcessors;
+        this.includeSourceSpans = builder.includeSourceSpans;
+
+        // Try to construct an inline parser. Invalid configuration might result in an exception, which we want to
+        // detect as soon as possible.
+        this.inlineParserFactory.create(new InlineParserContextImpl(delimiterProcessors, new LinkReferenceDefinitions()));
+    }
+
+    /**
+     * Create a new builder for configuring a {@link Parser}.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Parse the specified input text into a tree of nodes.
+     * <p>
+     * This method is thread-safe (a new parser state is used for each invocation).
+     *
+     * @param input the text to parse - must not be null
+     * @return the root node
+     */
+    public Node parse(String input) {
+        if (input == null) {
+            throw new NullPointerException("input must not be null");
+        }
+        DocumentParser documentParser = createDocumentParser();
+        Node document = documentParser.parse(input);
+        return postProcess(document);
+    }
+
+    /**
+     * Parse the specified reader into a tree of nodes. The caller is responsible for closing the reader.
+     * <pre><code>
+     * Parser parser = Parser.builder().build();
+     * try (InputStreamReader reader = new InputStreamReader(new FileInputStream("file.md"), StandardCharsets.UTF_8)) {
+     *     Node document = parser.parseReader(reader);
+     *     // ...
+     * }
+     * </code></pre>
+     * Note that if you have a file with a byte order mark (BOM), you need to skip it before handing the reader to this
+     * library. There's existing classes that do that, e.g. see {@code BOMInputStream} in Commons IO.
+     * <p>
+     * This method is thread-safe (a new parser state is used for each invocation).
+     *
+     * @param input the reader to parse - must not be null
+     * @return the root node
+     * @throws IOException when reading throws an exception
+     */
+    public Node parseReader(Reader input) throws IOException {
+        if (input == null) {
+            throw new NullPointerException("input must not be null");
+        }
+
+        DocumentParser documentParser = createDocumentParser();
+        Node document = documentParser.parse(input);
+        return postProcess(document);
+    }
+
+    private DocumentParser createDocumentParser() {
+        return new DocumentParser(blockParserFactories, inlineParserFactory, delimiterProcessors, includeSourceSpans);
+    }
+
+    private Node postProcess(Node document) {
+        for (PostProcessor postProcessor : postProcessors) {
+            document = postProcessor.process(document);
+        }
+        return document;
+    }
+
+    /**
+     * Builder for configuring a {@link Parser}.
+     */
+    public static class Builder {
+        private final List<BlockParserFactory> blockParserFactories = new ArrayList<>();
+        private final List<DelimiterProcessor> delimiterProcessors = new ArrayList<>();
+        private final List<PostProcessor> postProcessors = new ArrayList<>();
+        private Set<Class<? extends Block>> enabledBlockTypes = DocumentParser.getDefaultBlockParserTypes();
+        private InlineParserFactory inlineParserFactory;
+        private IncludeSourceSpans includeSourceSpans = IncludeSourceSpans.NONE;
+
+        /**
+         * @return the configured {@link Parser}
+         */
+        public Parser build() {
+            return new Parser(this);
+        }
+
+        /**
+         * @param extensions extensions to use on this parser
+         * @return {@code this}
+         */
+        public Builder extensions(Iterable<? extends Extension> extensions) {
+            if (extensions == null) {
+                throw new NullPointerException("extensions must not be null");
+            }
+            for (Extension extension : extensions) {
+                if (extension instanceof ParserExtension) {
+                    ParserExtension parserExtension = (ParserExtension) extension;
+                    parserExtension.extend(this);
+                }
+            }
+            return this;
+        }
+
+        /**
+         * Describe the list of markdown features the parser will recognize and parse.
+         * <p>
+         * By default, CommonMark will recognize and parse the following set of "block" elements:
+         * <ul>
+         * <li>{@link Heading} ({@code #})
+         * <li>{@link HtmlBlock} ({@code <html></html>})
+         * <li>{@link ThematicBreak} (Horizontal Rule) ({@code ---})
+         * <li>{@link FencedCodeBlock} ({@code ```})
+         * <li>{@link IndentedCodeBlock}
+         * <li>{@link BlockQuote} ({@code >})
+         * <li>{@link ListBlock} (Ordered / Unordered List) ({@code 1. / *})
+         * </ul>
+         * <p>
+         * To parse only a subset of the features listed above, pass a list of each feature's associated {@link Block} class.
+         * <p>
+         * E.g., to only parse headings and lists:
+         * <pre>
+         *     {@code
+         *     Parser.builder().enabledBlockTypes(new HashSet<>(Arrays.asList(Heading.class, ListBlock.class)));
+         *     }
+         * </pre>
+         *
+         * @param enabledBlockTypes A list of block nodes the parser will parse.
+         * If this list is empty, the parser will not recognize any CommonMark core features.
+         * @return {@code this}
+         */
+        public Builder enabledBlockTypes(Set<Class<? extends Block>> enabledBlockTypes) {
+            if (enabledBlockTypes == null) {
+                throw new NullPointerException("enabledBlockTypes must not be null");
+            }
+            DocumentParser.checkEnabledBlockTypes(enabledBlockTypes);
+            this.enabledBlockTypes = enabledBlockTypes;
+            return this;
+        }
+
+        /**
+         * Whether to calculate {@link org.commonmark.node.SourceSpan} for {@link Node}.
+         * <p>
+         * By default, source spans are disabled.
+         *
+         * @param includeSourceSpans which kind of source spans should be included
+         * @return {@code this}
+         * @since 0.16.0
+         */
+        public Builder includeSourceSpans(IncludeSourceSpans includeSourceSpans) {
+            this.includeSourceSpans = includeSourceSpans;
+            return this;
+        }
+
+        /**
+         * Adds a custom block parser factory.
+         * <p>
+         * Note that custom factories are applied <em>before</em> the built-in factories. This is so that
+         * extensions can change how some syntax is parsed that would otherwise be handled by built-in factories.
+         * "With great power comes great responsibility."
+         *
+         * @param blockParserFactory a block parser factory implementation
+         * @return {@code this}
+         */
+        public Builder customBlockParserFactory(BlockParserFactory blockParserFactory) {
+            if (blockParserFactory == null) {
+                throw new NullPointerException("blockParserFactory must not be null");
+            }
+            blockParserFactories.add(blockParserFactory);
+            return this;
+        }
+
+        /**
+         * Adds a custom delimiter processor.
+         * <p>
+         * Note that multiple delimiter processors with the same characters can be added, as long as they have a
+         * different minimum length. In that case, the processor with the shortest matching length is used. Adding more
+         * than one delimiter processor with the same character and minimum length is invalid.
+         *
+         * @param delimiterProcessor a delimiter processor implementation
+         * @return {@code this}
+         */
+        public Builder customDelimiterProcessor(DelimiterProcessor delimiterProcessor) {
+            if (delimiterProcessor == null) {
+                throw new NullPointerException("delimiterProcessor must not be null");
+            }
+            delimiterProcessors.add(delimiterProcessor);
+            return this;
+        }
+
+        public Builder postProcessor(PostProcessor postProcessor) {
+            if (postProcessor == null) {
+                throw new NullPointerException("postProcessor must not be null");
+            }
+            postProcessors.add(postProcessor);
+            return this;
+        }
+
+        /**
+         * Overrides the parser used for inline markdown processing.
+         * <p>
+         * Provide an implementation of InlineParserFactory which provides a custom inline parser
+         * to modify how the following are parsed:
+         * bold (**)
+         * italic (*)
+         * strikethrough (~~)
+         * backtick quote (`)
+         * link ([title](http://))
+         * image (![alt](http://))
+         * <p>
+         * Note that if this method is not called or the inline parser factory is set to null, then the default
+         * implementation will be used.
+         *
+         * @param inlineParserFactory an inline parser factory implementation
+         * @return {@code this}
+         */
+        public Builder inlineParserFactory(InlineParserFactory inlineParserFactory) {
+            this.inlineParserFactory = inlineParserFactory;
+            return this;
+        }
+
+        private InlineParserFactory getInlineParserFactory() {
+            if (inlineParserFactory != null) {
+                return inlineParserFactory;
+            }
+            return new InlineParserFactory() {
+                @Override
+                public InlineParser create(InlineParserContext inlineParserContext) {
+                    return new InlineParserImpl(inlineParserContext);
+                }
+            };
+        }
+    }
+
+    /**
+     * Extension for {@link Parser}.
+     */
+    public interface ParserExtension extends Extension {
+        void extend(Builder parserBuilder);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/PostProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/PostProcessor.java
new file mode 100644
index 00000000000..5cf4f480ae0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/PostProcessor.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.Node;
+
+public interface PostProcessor {
+
+    /**
+     * @param node the node to post-process
+     * @return the result of post-processing, may be a modified {@code node} argument
+     */
+    Node process(Node node);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLine.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLine.java
new file mode 100644
index 00000000000..4008e6bece0
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLine.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.SourceSpan;
+
+/**
+ * A line or part of a line from the input source.
+ *
+ * @since 0.16.0
+ */
+public class SourceLine {
+
+    private final CharSequence content;
+    private final SourceSpan sourceSpan;
+
+    public static SourceLine of(CharSequence content, SourceSpan sourceSpan) {
+        return new SourceLine(content, sourceSpan);
+    }
+
+    private SourceLine(CharSequence content, SourceSpan sourceSpan) {
+        if (content == null) {
+            throw new NullPointerException("content must not be null");
+        }
+        this.content = content;
+        this.sourceSpan = sourceSpan;
+    }
+
+    public CharSequence getContent() {
+        return content;
+    }
+
+    public SourceSpan getSourceSpan() {
+        return sourceSpan;
+    }
+
+    public SourceLine substring(int beginIndex, int endIndex) {
+        CharSequence newContent = content.subSequence(beginIndex, endIndex);
+        SourceSpan newSourceSpan = null;
+        if (sourceSpan != null) {
+            int columnIndex = sourceSpan.getColumnIndex() + beginIndex;
+            int length = endIndex - beginIndex;
+            if (length != 0) {
+                newSourceSpan = SourceSpan.of(sourceSpan.getLineIndex(), columnIndex, length);
+            }
+        }
+        return SourceLine.of(newContent, newSourceSpan);
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLines.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLines.java
new file mode 100644
index 00000000000..59bed5c5bf6
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/SourceLines.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser;
+
+import jdk.internal.org.commonmark.node.SourceSpan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A set of lines ({@link SourceLine}) from the input source.
+ *
+ * @since 0.16.0
+ */
+public class SourceLines {
+
+    private final List<SourceLine> lines = new ArrayList<>();
+
+    public static SourceLines empty() {
+        return new SourceLines();
+    }
+
+    public static SourceLines of(SourceLine sourceLine) {
+        SourceLines sourceLines = new SourceLines();
+        sourceLines.addLine(sourceLine);
+        return sourceLines;
+    }
+
+    public static SourceLines of(List<SourceLine> sourceLines) {
+        SourceLines result = new SourceLines();
+        result.lines.addAll(sourceLines);
+        return result;
+    }
+
+    public void addLine(SourceLine sourceLine) {
+        lines.add(sourceLine);
+    }
+
+    public List<SourceLine> getLines() {
+        return lines;
+    }
+
+    public boolean isEmpty() {
+        return lines.isEmpty();
+    }
+
+    public String getContent() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < lines.size(); i++) {
+            if (i != 0) {
+                sb.append('\n');
+            }
+            sb.append(lines.get(i).getContent());
+        }
+        return sb.toString();
+    }
+
+    public List<SourceSpan> getSourceSpans() {
+        List<SourceSpan> sourceSpans = new ArrayList<>();
+        for (SourceLine line : lines) {
+            SourceSpan sourceSpan = line.getSourceSpan();
+            if (sourceSpan != null) {
+                sourceSpans.add(sourceSpan);
+            }
+        }
+        return sourceSpans;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Position.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Position.java
new file mode 100644
index 00000000000..754e409001e
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Position.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.beta;
+
+/**
+ * Position within a {@link Scanner}. This is intentionally kept opaque so as not to expose the internal structure of
+ * the Scanner.
+ */
+public class Position {
+
+    final int lineIndex;
+    final int index;
+
+    Position(int lineIndex, int index) {
+        this.lineIndex = lineIndex;
+        this.index = index;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Scanner.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Scanner.java
new file mode 100644
index 00000000000..e6b1dfaa347
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/Scanner.java
@@ -0,0 +1,313 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.beta;
+
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.SourceLine;
+import jdk.internal.org.commonmark.parser.SourceLines;
+import jdk.internal.org.commonmark.text.CharMatcher;
+
+import java.util.List;
+
+public class Scanner {
+
+    /**
+     * Character representing the end of input source (or outside of the text in case of the "previous" methods).
+     * <p>
+     * Note that we can use NULL to represent this because CommonMark does not allow those in the input (we replace them
+     * in the beginning of parsing).
+     */
+    public static final char END = '\0';
+
+    // Lines without newlines at the end. The scanner will yield `\n` between lines because they're significant for
+    // parsing and the final output. There is no `\n` after the last line.
+    private final List<SourceLine> lines;
+    // Which line we're at.
+    private int lineIndex;
+    // The index within the line. If index == length(), we pretend that there's a `\n` and only advance after we yield
+    // that.
+    private int index;
+
+    // Current line or "" if at the end of the lines (using "" instead of null saves a null check)
+    private SourceLine line = SourceLine.of("", null);
+    private int lineLength = 0;
+
+    Scanner(List<SourceLine> lines, int lineIndex, int index) {
+        this.lines = lines;
+        this.lineIndex = lineIndex;
+        this.index = index;
+        if (!lines.isEmpty()) {
+            checkPosition(lineIndex, index);
+            setLine(lines.get(lineIndex));
+        }
+    }
+
+    public static Scanner of(SourceLines lines) {
+        return new Scanner(lines.getLines(), 0, 0);
+    }
+
+    public char peek() {
+        if (index < lineLength) {
+            return line.getContent().charAt(index);
+        } else {
+            if (lineIndex < lines.size() - 1) {
+                return '\n';
+            } else {
+                // Don't return newline for end of last line
+                return END;
+            }
+        }
+    }
+
+    public int peekCodePoint() {
+        if (index < lineLength) {
+            char c = line.getContent().charAt(index);
+            if (Character.isHighSurrogate(c) && index + 1 < lineLength) {
+                char low = line.getContent().charAt(index + 1);
+                if (Character.isLowSurrogate(low)) {
+                    return Character.toCodePoint(c, low);
+                }
+            }
+            return c;
+        } else {
+            if (lineIndex < lines.size() - 1) {
+                return '\n';
+            } else {
+                // Don't return newline for end of last line
+                return END;
+            }
+        }
+    }
+
+    public int peekPreviousCodePoint() {
+        if (index > 0) {
+            int prev = index - 1;
+            char c = line.getContent().charAt(prev);
+            if (Character.isLowSurrogate(c) && prev > 0) {
+                char high = line.getContent().charAt(prev - 1);
+                if (Character.isHighSurrogate(high)) {
+                    return Character.toCodePoint(high, c);
+                }
+            }
+            return c;
+        } else {
+            if (lineIndex > 0) {
+                return '\n';
+            } else {
+                return END;
+            }
+        }
+    }
+
+    public boolean hasNext() {
+        if (index < lineLength) {
+            return true;
+        } else {
+            // No newline at end of last line
+            return lineIndex < lines.size() - 1;
+        }
+    }
+
+    public void next() {
+        index++;
+        if (index > lineLength) {
+            lineIndex++;
+            if (lineIndex < lines.size()) {
+                setLine(lines.get(lineIndex));
+            } else {
+                setLine(SourceLine.of("", null));
+            }
+            index = 0;
+        }
+    }
+
+    /**
+     * Check if the specified char is next and advance the position.
+     *
+     * @param c the char to check (including newline characters)
+     * @return true if matched and position was advanced, false otherwise
+     */
+    public boolean next(char c) {
+        if (peek() == c) {
+            next();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Check if we have the specified content on the line and advanced the position. Note that if you want to match
+     * newline characters, use {@link #next(char)}.
+     *
+     * @param content the text content to match on a single line (excluding newline characters)
+     * @return true if matched and position was advanced, false otherwise
+     */
+    public boolean next(String content) {
+        if (index < lineLength && index + content.length() <= lineLength) {
+            // Can't use startsWith because it's not available on CharSequence
+            for (int i = 0; i < content.length(); i++) {
+                if (line.getContent().charAt(index + i) != content.charAt(i)) {
+                    return false;
+                }
+            }
+            index += content.length();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public int matchMultiple(char c) {
+        int count = 0;
+        while (peek() == c) {
+            count++;
+            next();
+        }
+        return count;
+    }
+
+    public int match(CharMatcher matcher) {
+        int count = 0;
+        while (matcher.matches(peek())) {
+            count++;
+            next();
+        }
+        return count;
+    }
+
+    public int whitespace() {
+        int count = 0;
+        while (true) {
+            switch (peek()) {
+                case ' ':
+                case '\t':
+                case '\n':
+                case '\u000B':
+                case '\f':
+                case '\r':
+                    count++;
+                    next();
+                    break;
+                default:
+                    return count;
+            }
+        }
+    }
+
+    public int find(char c) {
+        int count = 0;
+        while (true) {
+            char cur = peek();
+            if (cur == Scanner.END) {
+                return -1;
+            } else if (cur == c) {
+                return count;
+            }
+            count++;
+            next();
+        }
+    }
+
+    public int find(CharMatcher matcher) {
+        int count = 0;
+        while (true) {
+            char c = peek();
+            if (c == END) {
+                return -1;
+            } else if (matcher.matches(c)) {
+                return count;
+            }
+            count++;
+            next();
+        }
+    }
+
+    // Don't expose the int index, because it would be good if we could switch input to a List<String> of lines later
+    // instead of one contiguous String.
+    public Position position() {
+        return new Position(lineIndex, index);
+    }
+
+    public void setPosition(Position position) {
+        checkPosition(position.lineIndex, position.index);
+        this.lineIndex = position.lineIndex;
+        this.index = position.index;
+        setLine(lines.get(this.lineIndex));
+    }
+
+    // For cases where the caller appends the result to a StringBuilder, we could offer another method to avoid some
+    // unnecessary copying.
+    public SourceLines getSource(Position begin, Position end) {
+        if (begin.lineIndex == end.lineIndex) {
+            // Shortcut for common case of text from a single line
+            SourceLine line = lines.get(begin.lineIndex);
+            CharSequence newContent = line.getContent().subSequence(begin.index, end.index);
+            SourceSpan newSourceSpan = null;
+            SourceSpan sourceSpan = line.getSourceSpan();
+            if (sourceSpan != null) {
+                newSourceSpan = SourceSpan.of(sourceSpan.getLineIndex(), sourceSpan.getColumnIndex() + begin.index, newContent.length());
+            }
+            return SourceLines.of(SourceLine.of(newContent, newSourceSpan));
+        } else {
+            SourceLines sourceLines = SourceLines.empty();
+
+            SourceLine firstLine = lines.get(begin.lineIndex);
+            sourceLines.addLine(firstLine.substring(begin.index, firstLine.getContent().length()));
+
+            // Lines between begin and end (we are appending the full line)
+            for (int line = begin.lineIndex + 1; line < end.lineIndex; line++) {
+                sourceLines.addLine(lines.get(line));
+            }
+
+            SourceLine lastLine = lines.get(end.lineIndex);
+            sourceLines.addLine(lastLine.substring(0, end.index));
+            return sourceLines;
+        }
+    }
+
+    private void setLine(SourceLine line) {
+        this.line = line;
+        this.lineLength = line.getContent().length();
+    }
+
+    private void checkPosition(int lineIndex, int index) {
+        if (lineIndex < 0 || lineIndex >= lines.size()) {
+            throw new IllegalArgumentException("Line index " + lineIndex + " out of range, number of lines: " + lines.size());
+        }
+        SourceLine line = lines.get(lineIndex);
+        if (index < 0 || index > line.getContent().length()) {
+            throw new IllegalArgumentException("Index " + index + " out of range, line length: " + line.getContent().length());
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/package-info.java
new file mode 100644
index 00000000000..549b5073e19
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/beta/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Experimental APIs to use for extensions. APIs are subject to change if necessary.
+ */
+package jdk.internal.org.commonmark.parser.beta;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParser.java
new file mode 100644
index 00000000000..26cd6220daf
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParser.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+
+public abstract class AbstractBlockParser implements BlockParser {
+
+    @Override
+    public boolean isContainer() {
+        return false;
+    }
+
+    @Override
+    public boolean canHaveLazyContinuationLines() {
+        return false;
+    }
+
+    @Override
+    public boolean canContain(Block childBlock) {
+        return false;
+    }
+
+    @Override
+    public void addLine(SourceLine line) {
+    }
+
+    @Override
+    public void addSourceSpan(SourceSpan sourceSpan) {
+        getBlock().addSourceSpan(sourceSpan);
+    }
+
+    @Override
+    public void closeBlock() {
+    }
+
+    @Override
+    public void parseInlines(InlineParser inlineParser) {
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParserFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParserFactory.java
new file mode 100644
index 00000000000..40c2bf91b66
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/AbstractBlockParserFactory.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+public abstract class AbstractBlockParserFactory implements BlockParserFactory {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockContinue.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockContinue.java
new file mode 100644
index 00000000000..5fc4e028d22
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockContinue.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.internal.BlockContinueImpl;
+
+/**
+ * Result object for continuing parsing of a block, see static methods for constructors.
+ */
+public class BlockContinue {
+
+    protected BlockContinue() {
+    }
+
+    public static BlockContinue none() {
+        return null;
+    }
+
+    public static BlockContinue atIndex(int newIndex) {
+        return new BlockContinueImpl(newIndex, -1, false);
+    }
+
+    public static BlockContinue atColumn(int newColumn) {
+        return new BlockContinueImpl(-1, newColumn, false);
+    }
+
+    public static BlockContinue finished() {
+        return new BlockContinueImpl(-1, -1, true);
+    }
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParser.java
new file mode 100644
index 00000000000..e893e70b0ef
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParser.java
@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.node.Block;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.parser.InlineParser;
+import jdk.internal.org.commonmark.parser.SourceLine;
+
+/**
+ * Parser for a specific block node.
+ * <p>
+ * Implementations should subclass {@link AbstractBlockParser} instead of implementing this directly.
+ */
+public interface BlockParser {
+
+    /**
+     * Return true if the block that is parsed is a container (contains other blocks), or false if it's a leaf.
+     */
+    boolean isContainer();
+
+    /**
+     * Return true if the block can have lazy continuation lines.
+     * <p>
+     * Lazy continuation lines are lines that were rejected by this {@link #tryContinue(ParserState)} but didn't match
+     * any other block parsers either.
+     * <p>
+     * If true is returned here, those lines will get added via {@link #addLine(SourceLine)}. For false, the block is
+     * closed instead.
+     */
+    boolean canHaveLazyContinuationLines();
+
+    boolean canContain(Block childBlock);
+
+    Block getBlock();
+
+    BlockContinue tryContinue(ParserState parserState);
+
+    /**
+     * Add the part of a line that belongs to this block parser to parse (i.e. without any container block markers).
+     * Note that the line will only include a {@link SourceLine#getSourceSpan()} if source spans are enabled for inlines.
+     */
+    void addLine(SourceLine line);
+
+    /**
+     * Add a source span of the currently parsed block. The default implementation in {@link AbstractBlockParser} adds
+     * it to the block. Unless you have some complicated parsing where you need to check source positions, you don't
+     * need to override this.
+     *
+     * @since 0.16.0
+     */
+    void addSourceSpan(SourceSpan sourceSpan);
+
+    void closeBlock();
+
+    void parseInlines(InlineParser inlineParser);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParserFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParserFactory.java
new file mode 100644
index 00000000000..53cc8d35ca7
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockParserFactory.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+/**
+ * Parser factory for a block node for determining when a block starts.
+ * <p>
+ * Implementations should subclass {@link AbstractBlockParserFactory} instead of implementing this directly.
+ */
+public interface BlockParserFactory {
+
+    BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockParser);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockStart.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockStart.java
new file mode 100644
index 00000000000..a927abe968b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/BlockStart.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.internal.BlockStartImpl;
+
+/**
+ * Result object for starting parsing of a block, see static methods for constructors.
+ */
+public abstract class BlockStart {
+
+    protected BlockStart() {
+    }
+
+    public static BlockStart none() {
+        return null;
+    }
+
+    public static BlockStart of(BlockParser... blockParsers) {
+        return new BlockStartImpl(blockParsers);
+    }
+
+    public abstract BlockStart atIndex(int newIndex);
+
+    public abstract BlockStart atColumn(int newColumn);
+
+    public abstract BlockStart replaceActiveBlockParser();
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/MatchedBlockParser.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/MatchedBlockParser.java
new file mode 100644
index 00000000000..76a9669d069
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/MatchedBlockParser.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.parser.SourceLines;
+
+/**
+ * Open block parser that was last matched during the continue phase. This is different from the currently active
+ * block parser, as an unmatched block is only closed when a new block is started.
+ * <p><em>This interface is not intended to be implemented by clients.</em></p>
+ */
+public interface MatchedBlockParser {
+
+    BlockParser getMatchedBlockParser();
+
+    /**
+     * Returns the current paragraph lines if the matched block is a paragraph.
+     *
+     * @return paragraph content or an empty list
+     */
+    SourceLines getParagraphLines();
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/ParserState.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/ParserState.java
new file mode 100644
index 00000000000..7bda0620a8a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/ParserState.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.block;
+
+import jdk.internal.org.commonmark.parser.SourceLine;
+
+/**
+ * State of the parser that is used in block parsers.
+ * <p><em>This interface is not intended to be implemented by clients.</em></p>
+ */
+public interface ParserState {
+
+    /**
+     * @return the current source line being parsed (full line)
+     */
+    SourceLine getLine();
+
+    /**
+     * @return the current index within the line (0-based)
+     */
+    int getIndex();
+
+    /**
+     * @return the index of the next non-space character starting from {@link #getIndex()} (may be the same) (0-based)
+     */
+    int getNextNonSpaceIndex();
+
+    /**
+     * The column is the position within the line after tab characters have been processed as 4-space tab stops.
+     * If the line doesn't contain any tabs, it's the same as the {@link #getIndex()}. If the line starts with a tab,
+     * followed by text, then the column for the first character of the text is 4 (the index is 1).
+     *
+     * @return the current column within the line (0-based)
+     */
+    int getColumn();
+
+    /**
+     * @return the indentation in columns (either by spaces or tab stop of 4), starting from {@link #getColumn()}
+     */
+    int getIndent();
+
+    /**
+     * @return true if the current line is blank starting from the index
+     */
+    boolean isBlank();
+
+    /**
+     * @return the deepest open block parser
+     */
+    BlockParser getActiveBlockParser();
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/package-info.java
new file mode 100644
index 00000000000..7bcb61e8a86
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/block/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Types for extending block parsing
+ */
+package jdk.internal.org.commonmark.parser.block;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterProcessor.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterProcessor.java
new file mode 100644
index 00000000000..592f6a5e433
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterProcessor.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.delimiter;
+
+import jdk.internal.org.commonmark.node.Text;
+
+/**
+ * Custom delimiter processor for additional delimiters besides {@code _} and {@code *}.
+ * <p>
+ * Note that implementations of this need to be thread-safe, the same instance may be used by multiple parsers.
+ */
+public interface DelimiterProcessor {
+
+    /**
+     * @return the character that marks the beginning of a delimited node, must not clash with any built-in special
+     * characters
+     */
+    char getOpeningCharacter();
+
+    /**
+     * @return the character that marks the the ending of a delimited node, must not clash with any built-in special
+     * characters. Note that for a symmetric delimiter such as "*", this is the same as the opening.
+     */
+    char getClosingCharacter();
+
+    /**
+     * Minimum number of delimiter characters that are needed to activate this. Must be at least 1.
+     */
+    int getMinLength();
+
+    /**
+     * Process the delimiter runs.
+     * <p>
+     * The processor can examine the runs and the nodes and decide if it wants to process or not. If not, it should not
+     * change any nodes and return 0. If yes, it should do the processing (wrapping nodes, etc) and then return how many
+     * delimiters were used.
+     * <p>
+     * Note that removal (unlinking) of the used delimiter {@link Text} nodes is done by the caller.
+     *
+     * @param openingRun the opening delimiter run
+     * @param closingRun the closing delimiter run
+     * @return how many delimiters were used; must not be greater than length of either opener or closer
+     */
+    int process(DelimiterRun openingRun, DelimiterRun closingRun);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterRun.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterRun.java
new file mode 100644
index 00000000000..9672c1906cf
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/delimiter/DelimiterRun.java
@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.parser.delimiter;
+
+import jdk.internal.org.commonmark.node.Text;
+
+/**
+ * A delimiter run is one or more of the same delimiter character, e.g. {@code ***}.
+ */
+public interface DelimiterRun {
+
+    /**
+     * @return whether this can open a delimiter
+     */
+    boolean canOpen();
+
+    /**
+     * @return whether this can close a delimiter
+     */
+    boolean canClose();
+
+    /**
+     * @return the number of characters in this delimiter run (that are left for processing)
+     */
+    int length();
+
+    /**
+     * @return the number of characters originally in this delimiter run; at the start of processing, this is the same
+     * as {{@link #length()}}
+     */
+    int originalLength();
+
+    /**
+     * @return the innermost opening delimiter, e.g. for {@code ***} this is the last {@code *}
+     */
+    Text getOpener();
+
+    /**
+     * @return the innermost closing delimiter, e.g. for {@code ***} this is the first {@code *}
+     */
+    Text getCloser();
+
+    /**
+     * Get the opening delimiter nodes for the specified length of delimiters. Length must be between 1 and
+     * {@link #length()}.
+     * <p>
+     * For example, for a delimiter run {@code ***}, calling this with 1 would return the last {@code *}.
+     * Calling it with 2 would return the second last {@code *} and the last {@code *}.
+     */
+    Iterable<Text> getOpeners(int length);
+
+    /**
+     * Get the closing delimiter nodes for the specified length of delimiters. Length must be between 1 and
+     * {@link #length()}.
+     * <p>
+     * For example, for a delimiter run {@code ***}, calling this with 1 would return the first {@code *}.
+     * Calling it with 2 would return the first {@code *} and the second {@code *}.
+     */
+    Iterable<Text> getClosers(int length);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/package-info.java
new file mode 100644
index 00000000000..b7bc957cc06
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/parser/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Parsing input text to AST nodes (see {@link org.commonmark.parser.Parser})
+ */
+package jdk.internal.org.commonmark.parser;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/NodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/NodeRenderer.java
new file mode 100644
index 00000000000..00d6c185920
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/NodeRenderer.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer;
+
+import jdk.internal.org.commonmark.node.Node;
+
+import java.util.Set;
+
+/**
+ * A renderer for a set of node types.
+ */
+public interface NodeRenderer {
+
+    /**
+     * @return the types of nodes that this renderer handles
+     */
+    Set<Class<? extends Node>> getNodeTypes();
+
+    /**
+     * Render the specified node.
+     *
+     * @param node the node to render, will be an instance of one of {@link #getNodeTypes()}
+     */
+    void render(Node node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/Renderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/Renderer.java
new file mode 100644
index 00000000000..9cee90af7d9
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/Renderer.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer;
+
+import jdk.internal.org.commonmark.node.Node;
+
+public interface Renderer {
+
+    /**
+     * Render the tree of nodes to output.
+     *
+     * @param node the root node
+     * @param output output for rendering
+     */
+    void render(Node node, Appendable output);
+
+    /**
+     * Render the tree of nodes to string.
+     *
+     * @param node the root node
+     * @return the rendered string
+     */
+    String render(Node node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProvider.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProvider.java
new file mode 100644
index 00000000000..4c9b33adb80
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProvider.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.node.Node;
+
+import java.util.Map;
+
+/**
+ * Extension point for adding/changing attributes on HTML tags for a node.
+ */
+public interface AttributeProvider {
+
+    /**
+     * Set the attributes for a HTML tag of the specified node by modifying the provided map.
+     * <p>
+     * This allows to change or even remove default attributes. With great power comes great responsibility.
+     * <p>
+     * The attribute key and values will be escaped (preserving character entities), so don't escape them here,
+     * otherwise they will be double-escaped.
+     * <p>
+     * This method may be called multiple times for the same node, if the node is rendered using multiple nested
+     * tags (e.g. code blocks).
+     *
+     * @param node the node to set attributes for
+     * @param tagName the HTML tag name that these attributes are for (e.g. {@code h1}, {@code pre}, {@code code}).
+     * @param attributes the attributes, with any default attributes already set in the map
+     */
+    void setAttributes(Node node, String tagName, Map<String, String> attributes);
+
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderContext.java
new file mode 100644
index 00000000000..92ca0383b74
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderContext.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+/**
+ * The context for attribute providers.
+ * <p>Note: There are currently no methods here, this is for future extensibility.</p>
+ * <p><em>This interface is not intended to be implemented by clients.</em></p>
+ */
+public interface AttributeProviderContext {
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderFactory.java
new file mode 100644
index 00000000000..e4503daffab
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/AttributeProviderFactory.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+/**
+ * Factory for instantiating new attribute providers when rendering is done.
+ */
+public interface AttributeProviderFactory {
+
+    /**
+     * Create a new attribute provider.
+     *
+     * @param context for this attribute provider
+     * @return an AttributeProvider
+     */
+    AttributeProvider create(AttributeProviderContext context);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java
new file mode 100644
index 00000000000..646cc7413ac
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java
@@ -0,0 +1,352 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+import java.util.*;
+
+/**
+ * The node renderer that renders all the core nodes (comes last in the order of node renderers).
+ */
+public class CoreHtmlNodeRenderer extends AbstractVisitor implements NodeRenderer {
+
+    protected final HtmlNodeRendererContext context;
+    private final HtmlWriter html;
+
+    public CoreHtmlNodeRenderer(HtmlNodeRendererContext context) {
+        this.context = context;
+        this.html = context.getWriter();
+    }
+
+    @Override
+    public Set<Class<? extends Node>> getNodeTypes() {
+        return new HashSet<>(Arrays.asList(
+                Document.class,
+                Heading.class,
+                Paragraph.class,
+                BlockQuote.class,
+                BulletList.class,
+                FencedCodeBlock.class,
+                HtmlBlock.class,
+                ThematicBreak.class,
+                IndentedCodeBlock.class,
+                Link.class,
+                ListItem.class,
+                OrderedList.class,
+                Image.class,
+                Emphasis.class,
+                StrongEmphasis.class,
+                Text.class,
+                Code.class,
+                HtmlInline.class,
+                SoftLineBreak.class,
+                HardLineBreak.class
+        ));
+    }
+
+    @Override
+    public void render(Node node) {
+        node.accept(this);
+    }
+
+    @Override
+    public void visit(Document document) {
+        // No rendering itself
+        visitChildren(document);
+    }
+
+    @Override
+    public void visit(Heading heading) {
+        String htag = "h" + heading.getLevel();
+        html.line();
+        html.tag(htag, getAttrs(heading, htag));
+        visitChildren(heading);
+        html.tag('/' + htag);
+        html.line();
+    }
+
+    @Override
+    public void visit(Paragraph paragraph) {
+        boolean inTightList = isInTightList(paragraph);
+        if (!inTightList) {
+            html.line();
+            html.tag("p", getAttrs(paragraph, "p"));
+        }
+        visitChildren(paragraph);
+        if (!inTightList) {
+            html.tag("/p");
+            html.line();
+        }
+    }
+
+    @Override
+    public void visit(BlockQuote blockQuote) {
+        html.line();
+        html.tag("blockquote", getAttrs(blockQuote, "blockquote"));
+        html.line();
+        visitChildren(blockQuote);
+        html.line();
+        html.tag("/blockquote");
+        html.line();
+    }
+
+    @Override
+    public void visit(BulletList bulletList) {
+        renderListBlock(bulletList, "ul", getAttrs(bulletList, "ul"));
+    }
+
+    @Override
+    public void visit(FencedCodeBlock fencedCodeBlock) {
+        String literal = fencedCodeBlock.getLiteral();
+        Map<String, String> attributes = new LinkedHashMap<>();
+        String info = fencedCodeBlock.getInfo();
+        if (info != null && !info.isEmpty()) {
+            int space = info.indexOf(" ");
+            String language;
+            if (space == -1) {
+                language = info;
+            } else {
+                language = info.substring(0, space);
+            }
+            attributes.put("class", "language-" + language);
+        }
+        renderCodeBlock(literal, fencedCodeBlock, attributes);
+    }
+
+    @Override
+    public void visit(HtmlBlock htmlBlock) {
+        html.line();
+        if (context.shouldEscapeHtml()) {
+            html.tag("p", getAttrs(htmlBlock, "p"));
+            html.text(htmlBlock.getLiteral());
+            html.tag("/p");
+        } else {
+            html.raw(htmlBlock.getLiteral());
+        }
+        html.line();
+    }
+
+    @Override
+    public void visit(ThematicBreak thematicBreak) {
+        html.line();
+        html.tag("hr", getAttrs(thematicBreak, "hr"), true);
+        html.line();
+    }
+
+    @Override
+    public void visit(IndentedCodeBlock indentedCodeBlock) {
+        renderCodeBlock(indentedCodeBlock.getLiteral(), indentedCodeBlock, Collections.<String, String>emptyMap());
+    }
+
+    @Override
+    public void visit(Link link) {
+        Map<String, String> attrs = new LinkedHashMap<>();
+        String url = link.getDestination();
+
+        if (context.shouldSanitizeUrls()) {
+            url = context.urlSanitizer().sanitizeLinkUrl(url);
+            attrs.put("rel", "nofollow");
+        }
+
+        url = context.encodeUrl(url);
+        attrs.put("href", url);
+        if (link.getTitle() != null) {
+            attrs.put("title", link.getTitle());
+        }
+        html.tag("a", getAttrs(link, "a", attrs));
+        visitChildren(link);
+        html.tag("/a");
+    }
+
+    @Override
+    public void visit(ListItem listItem) {
+        html.tag("li", getAttrs(listItem, "li"));
+        visitChildren(listItem);
+        html.tag("/li");
+        html.line();
+    }
+
+    @Override
+    public void visit(OrderedList orderedList) {
+        int start = orderedList.getMarkerStartNumber() != null ? orderedList.getMarkerStartNumber() : 1;
+        Map<String, String> attrs = new LinkedHashMap<>();
+        if (start != 1) {
+            attrs.put("start", String.valueOf(start));
+        }
+        renderListBlock(orderedList, "ol", getAttrs(orderedList, "ol", attrs));
+    }
+
+    @Override
+    public void visit(Image image) {
+        String url = image.getDestination();
+
+        AltTextVisitor altTextVisitor = new AltTextVisitor();
+        image.accept(altTextVisitor);
+        String altText = altTextVisitor.getAltText();
+
+        Map<String, String> attrs = new LinkedHashMap<>();
+        if (context.shouldSanitizeUrls()) {
+            url = context.urlSanitizer().sanitizeImageUrl(url);
+        }
+
+        attrs.put("src", context.encodeUrl(url));
+        attrs.put("alt", altText);
+        if (image.getTitle() != null) {
+            attrs.put("title", image.getTitle());
+        }
+
+        html.tag("img", getAttrs(image, "img", attrs), true);
+    }
+
+    @Override
+    public void visit(Emphasis emphasis) {
+        html.tag("em", getAttrs(emphasis, "em"));
+        visitChildren(emphasis);
+        html.tag("/em");
+    }
+
+    @Override
+    public void visit(StrongEmphasis strongEmphasis) {
+        html.tag("strong", getAttrs(strongEmphasis, "strong"));
+        visitChildren(strongEmphasis);
+        html.tag("/strong");
+    }
+
+    @Override
+    public void visit(Text text) {
+        html.text(text.getLiteral());
+    }
+
+    @Override
+    public void visit(Code code) {
+        html.tag("code", getAttrs(code, "code"));
+        html.text(code.getLiteral());
+        html.tag("/code");
+    }
+
+    @Override
+    public void visit(HtmlInline htmlInline) {
+        if (context.shouldEscapeHtml()) {
+            html.text(htmlInline.getLiteral());
+        } else {
+            html.raw(htmlInline.getLiteral());
+        }
+    }
+
+    @Override
+    public void visit(SoftLineBreak softLineBreak) {
+        html.raw(context.getSoftbreak());
+    }
+
+    @Override
+    public void visit(HardLineBreak hardLineBreak) {
+        html.tag("br", getAttrs(hardLineBreak, "br"), true);
+        html.line();
+    }
+
+    @Override
+    protected void visitChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+
+    private void renderCodeBlock(String literal, Node node, Map<String, String> attributes) {
+        html.line();
+        html.tag("pre", getAttrs(node, "pre"));
+        html.tag("code", getAttrs(node, "code", attributes));
+        html.text(literal);
+        html.tag("/code");
+        html.tag("/pre");
+        html.line();
+    }
+
+    private void renderListBlock(ListBlock listBlock, String tagName, Map<String, String> attributes) {
+        html.line();
+        html.tag(tagName, attributes);
+        html.line();
+        visitChildren(listBlock);
+        html.line();
+        html.tag('/' + tagName);
+        html.line();
+    }
+
+    private boolean isInTightList(Paragraph paragraph) {
+        Node parent = paragraph.getParent();
+        if (parent != null) {
+            Node gramps = parent.getParent();
+            if (gramps instanceof ListBlock) {
+                ListBlock list = (ListBlock) gramps;
+                return list.isTight();
+            }
+        }
+        return false;
+    }
+
+    private Map<String, String> getAttrs(Node node, String tagName) {
+        return getAttrs(node, tagName, Collections.<String, String>emptyMap());
+    }
+
+    private Map<String, String> getAttrs(Node node, String tagName, Map<String, String> defaultAttributes) {
+        return context.extendAttributes(node, tagName, defaultAttributes);
+    }
+
+    private static class AltTextVisitor extends AbstractVisitor {
+
+        private final StringBuilder sb = new StringBuilder();
+
+        String getAltText() {
+            return sb.toString();
+        }
+
+        @Override
+        public void visit(Text text) {
+            sb.append(text.getLiteral());
+        }
+
+        @Override
+        public void visit(SoftLineBreak softLineBreak) {
+            sb.append('\n');
+        }
+
+        @Override
+        public void visit(HardLineBreak hardLineBreak) {
+            sb.append('\n');
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/DefaultUrlSanitizer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/DefaultUrlSanitizer.java
new file mode 100644
index 00000000000..16e094afe16
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/DefaultUrlSanitizer.java
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ *
+ * Allows http, https and mailto protocols for url.
+ * Also allows protocol relative urls, and relative urls.
+ * Implementation based on https://github.com/OWASP/java-html-sanitizer/blob/f07e44b034a45d94d6fd010279073c38b6933072/src/main/java/org/owasp/html/FilterUrlByProtocolAttributePolicy.java
+ */
+public class DefaultUrlSanitizer implements UrlSanitizer {
+    private Set<String> protocols;
+
+    public DefaultUrlSanitizer() {
+        this(Arrays.asList("http", "https", "mailto"));
+    }
+
+    public DefaultUrlSanitizer(Collection<String> protocols) {
+        this.protocols = new HashSet<>(protocols);
+    }
+
+    @Override
+    public String sanitizeLinkUrl(String url) {
+        url = stripHtmlSpaces(url);
+        protocol_loop:
+        for (int i = 0, n = url.length(); i < n; ++i) {
+            switch (url.charAt(i)) {
+                case '/':
+                case '#':
+                case '?':  // No protocol.
+                    break protocol_loop;
+                case ':':
+                    String protocol = url.substring(0, i).toLowerCase();
+                    if (!protocols.contains(protocol)) {
+                        return "";
+                    }
+                    break protocol_loop;
+            }
+        }
+        return url;
+    }
+
+
+    @Override
+    public String sanitizeImageUrl(String url) {
+        return sanitizeLinkUrl(url);
+    }
+
+    private String stripHtmlSpaces(String s) {
+        int i = 0, n = s.length();
+        for (; n > i; --n) {
+            if (!isHtmlSpace(s.charAt(n - 1))) {
+                break;
+            }
+        }
+        for (; i < n; ++i) {
+            if (!isHtmlSpace(s.charAt(i))) {
+                break;
+            }
+        }
+        if (i == 0 && n == s.length()) {
+            return s;
+        }
+        return s.substring(i, n);
+    }
+
+    private boolean isHtmlSpace(int ch) {
+        switch (ch) {
+            case ' ':
+            case '\t':
+            case '\n':
+            case '\u000c':
+            case '\r':
+                return true;
+            default:
+                return false;
+
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererContext.java
new file mode 100644
index 00000000000..78dc295cb21
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererContext.java
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.node.Image;
+import jdk.internal.org.commonmark.node.Link;
+import jdk.internal.org.commonmark.node.Node;
+
+import java.util.Map;
+
+public interface HtmlNodeRendererContext {
+
+    /**
+     * @param url to be encoded
+     * @return an encoded URL (depending on the configuration)
+     */
+    String encodeUrl(String url);
+
+    /**
+     * Let extensions modify the HTML tag attributes.
+     *
+     * @param node the node for which the attributes are applied
+     * @param tagName the HTML tag name that these attributes are for (e.g. {@code h1}, {@code pre}, {@code code}).
+     * @param attributes the attributes that were calculated by the renderer
+     * @return the extended attributes with added/updated/removed entries
+     */
+    Map<String, String> extendAttributes(Node node, String tagName, Map<String, String> attributes);
+
+    /**
+     * @return the HTML writer to use
+     */
+    HtmlWriter getWriter();
+
+    /**
+     * @return HTML that should be rendered for a soft line break
+     */
+    String getSoftbreak();
+
+    /**
+     * Render the specified node and its children using the configured renderers. This should be used to render child
+     * nodes; be careful not to pass the node that is being rendered, that would result in an endless loop.
+     *
+     * @param node the node to render
+     */
+    void render(Node node);
+
+    /**
+     * @return whether HTML blocks and tags should be escaped or not
+     */
+    boolean shouldEscapeHtml();
+
+    /**
+     * @return true if the {@link UrlSanitizer} should be used.
+     * @since 0.14.0
+     */
+    boolean shouldSanitizeUrls();
+
+    /**
+     * @return Sanitizer to use for securing {@link Link} href and {@link Image} src if {@link #shouldSanitizeUrls()} is true.
+     * @since 0.14.0
+     */
+    UrlSanitizer urlSanitizer();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererFactory.java
new file mode 100644
index 00000000000..c86d976ae0b
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlNodeRendererFactory.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+/**
+ * Factory for instantiating new node renderers when rendering is done.
+ */
+public interface HtmlNodeRendererFactory {
+
+    /**
+     * Create a new node renderer for the specified rendering context.
+     *
+     * @param context the context for rendering (normally passed on to the node renderer)
+     * @return a node renderer
+     */
+    NodeRenderer create(HtmlNodeRendererContext context);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlRenderer.java
new file mode 100644
index 00000000000..d4b5214211a
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlRenderer.java
@@ -0,0 +1,337 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.internal.renderer.NodeRendererMap;
+import jdk.internal.org.commonmark.internal.util.Escaping;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.Renderer;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Renders a tree of nodes to HTML.
+ * <p>
+ * Start with the {@link #builder} method to configure the renderer. Example:
+ * <pre><code>
+ * HtmlRenderer renderer = HtmlRenderer.builder().escapeHtml(true).build();
+ * renderer.render(node);
+ * </code></pre>
+ */
+public class HtmlRenderer implements Renderer {
+
+    private final String softbreak;
+    private final boolean escapeHtml;
+    private final boolean sanitizeUrls;
+    private final UrlSanitizer urlSanitizer;
+    private final boolean percentEncodeUrls;
+    private final List<AttributeProviderFactory> attributeProviderFactories;
+    private final List<HtmlNodeRendererFactory> nodeRendererFactories;
+
+    private HtmlRenderer(Builder builder) {
+        this.softbreak = builder.softbreak;
+        this.escapeHtml = builder.escapeHtml;
+        this.sanitizeUrls = builder.sanitizeUrls;
+        this.percentEncodeUrls = builder.percentEncodeUrls;
+        this.urlSanitizer = builder.urlSanitizer;
+        this.attributeProviderFactories = new ArrayList<>(builder.attributeProviderFactories);
+
+        this.nodeRendererFactories = new ArrayList<>(builder.nodeRendererFactories.size() + 1);
+        this.nodeRendererFactories.addAll(builder.nodeRendererFactories);
+        // Add as last. This means clients can override the rendering of core nodes if they want.
+        this.nodeRendererFactories.add(new HtmlNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(HtmlNodeRendererContext context) {
+                return new CoreHtmlNodeRenderer(context);
+            }
+        });
+    }
+
+    /**
+     * Create a new builder for configuring an {@link HtmlRenderer}.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public void render(Node node, Appendable output) {
+        if (node == null) {
+            throw new NullPointerException("node must not be null");
+        }
+        RendererContext context = new RendererContext(new HtmlWriter(output));
+        context.render(node);
+    }
+
+    @Override
+    public String render(Node node) {
+        if (node == null) {
+            throw new NullPointerException("node must not be null");
+        }
+        StringBuilder sb = new StringBuilder();
+        render(node, sb);
+        return sb.toString();
+    }
+
+    /**
+     * Builder for configuring an {@link HtmlRenderer}. See methods for default configuration.
+     */
+    public static class Builder {
+
+        private String softbreak = "\n";
+        private boolean escapeHtml = false;
+        private boolean sanitizeUrls = false;
+        private UrlSanitizer urlSanitizer = new DefaultUrlSanitizer();
+        private boolean percentEncodeUrls = false;
+        private List<AttributeProviderFactory> attributeProviderFactories = new ArrayList<>();
+        private List<HtmlNodeRendererFactory> nodeRendererFactories = new ArrayList<>();
+
+        /**
+         * @return the configured {@link HtmlRenderer}
+         */
+        public HtmlRenderer build() {
+            return new HtmlRenderer(this);
+        }
+
+        /**
+         * The HTML to use for rendering a softbreak, defaults to {@code "\n"} (meaning the rendered result doesn't have
+         * a line break).
+         * <p>
+         * Set it to {@code "<br>"} (or {@code "<br />"} to make them hard breaks.
+         * <p>
+         * Set it to {@code " "} to ignore line wrapping in the source.
+         *
+         * @param softbreak HTML for softbreak
+         * @return {@code this}
+         */
+        public Builder softbreak(String softbreak) {
+            this.softbreak = softbreak;
+            return this;
+        }
+
+        /**
+         * Whether {@link HtmlInline} and {@link HtmlBlock} should be escaped, defaults to {@code false}.
+         * <p>
+         * Note that {@link HtmlInline} is only a tag itself, not the text between an opening tag and a closing tag. So
+         * markup in the text will be parsed as normal and is not affected by this option.
+         *
+         * @param escapeHtml true for escaping, false for preserving raw HTML
+         * @return {@code this}
+         */
+        public Builder escapeHtml(boolean escapeHtml) {
+            this.escapeHtml = escapeHtml;
+            return this;
+        }
+
+        /**
+         * Whether {@link Image} src and {@link Link} href should be sanitized, defaults to {@code false}.
+         *
+         * @param sanitizeUrls true for sanitization, false for preserving raw attribute
+         * @return {@code this}
+         * @since 0.14.0
+         */
+        public Builder sanitizeUrls(boolean sanitizeUrls) {
+            this.sanitizeUrls = sanitizeUrls;
+            return this;
+        }
+
+        /**
+         * {@link UrlSanitizer} used to filter URL's if {@link #sanitizeUrls} is true.
+         *
+         * @param urlSanitizer Filterer used to filter {@link Image} src and {@link Link}.
+         * @return {@code this}
+         * @since 0.14.0
+         */
+        public Builder urlSanitizer(UrlSanitizer urlSanitizer) {
+            this.urlSanitizer = urlSanitizer;
+            return this;
+        }
+
+        /**
+         * Whether URLs of link or images should be percent-encoded, defaults to {@code false}.
+         * <p>
+         * If enabled, the following is done:
+         * <ul>
+         * <li>Existing percent-encoded parts are preserved (e.g. "%20" is kept as "%20")</li>
+         * <li>Reserved characters such as "/" are preserved, except for "[" and "]" (see encodeURI in JS)</li>
+         * <li>Unreserved characters such as "a" are preserved</li>
+         * <li>Other characters such umlauts are percent-encoded</li>
+         * </ul>
+         *
+         * @param percentEncodeUrls true to percent-encode, false for leaving as-is
+         * @return {@code this}
+         */
+        public Builder percentEncodeUrls(boolean percentEncodeUrls) {
+            this.percentEncodeUrls = percentEncodeUrls;
+            return this;
+        }
+
+        /**
+         * Add a factory for an attribute provider for adding/changing HTML attributes to the rendered tags.
+         *
+         * @param attributeProviderFactory the attribute provider factory to add
+         * @return {@code this}
+         */
+        public Builder attributeProviderFactory(AttributeProviderFactory attributeProviderFactory) {
+            if (attributeProviderFactory == null) {
+                throw new NullPointerException("attributeProviderFactory must not be null");
+            }
+            this.attributeProviderFactories.add(attributeProviderFactory);
+            return this;
+        }
+
+        /**
+         * Add a factory for instantiating a node renderer (done when rendering). This allows to override the rendering
+         * of node types or define rendering for custom node types.
+         * <p>
+         * If multiple node renderers for the same node type are created, the one from the factory that was added first
+         * "wins". (This is how the rendering for core node types can be overridden; the default rendering comes last.)
+         *
+         * @param nodeRendererFactory the factory for creating a node renderer
+         * @return {@code this}
+         */
+        public Builder nodeRendererFactory(HtmlNodeRendererFactory nodeRendererFactory) {
+            if (nodeRendererFactory == null) {
+                throw new NullPointerException("nodeRendererFactory must not be null");
+            }
+            this.nodeRendererFactories.add(nodeRendererFactory);
+            return this;
+        }
+
+        /**
+         * @param extensions extensions to use on this HTML renderer
+         * @return {@code this}
+         */
+        public Builder extensions(Iterable<? extends Extension> extensions) {
+            if (extensions == null) {
+                throw new NullPointerException("extensions must not be null");
+            }
+            for (Extension extension : extensions) {
+                if (extension instanceof HtmlRendererExtension) {
+                    HtmlRendererExtension htmlRendererExtension = (HtmlRendererExtension) extension;
+                    htmlRendererExtension.extend(this);
+                }
+            }
+            return this;
+        }
+    }
+
+    /**
+     * Extension for {@link HtmlRenderer}.
+     */
+    public interface HtmlRendererExtension extends Extension {
+        void extend(Builder rendererBuilder);
+    }
+
+    private class RendererContext implements HtmlNodeRendererContext, AttributeProviderContext {
+
+        private final HtmlWriter htmlWriter;
+        private final List<AttributeProvider> attributeProviders;
+        private final NodeRendererMap nodeRendererMap = new NodeRendererMap();
+
+        private RendererContext(HtmlWriter htmlWriter) {
+            this.htmlWriter = htmlWriter;
+
+            attributeProviders = new ArrayList<>(attributeProviderFactories.size());
+            for (AttributeProviderFactory attributeProviderFactory : attributeProviderFactories) {
+                attributeProviders.add(attributeProviderFactory.create(this));
+            }
+
+            // The first node renderer for a node type "wins".
+            for (int i = nodeRendererFactories.size() - 1; i >= 0; i--) {
+                HtmlNodeRendererFactory nodeRendererFactory = nodeRendererFactories.get(i);
+                NodeRenderer nodeRenderer = nodeRendererFactory.create(this);
+                nodeRendererMap.add(nodeRenderer);
+            }
+        }
+
+        @Override
+        public boolean shouldEscapeHtml() {
+            return escapeHtml;
+        }
+
+        @Override
+        public boolean shouldSanitizeUrls() {
+            return sanitizeUrls;
+        }
+
+        @Override
+        public UrlSanitizer urlSanitizer() {
+            return urlSanitizer;
+        }
+
+        @Override
+        public String encodeUrl(String url) {
+            if (percentEncodeUrls) {
+                return Escaping.percentEncodeUrl(url);
+            } else {
+                return url;
+            }
+        }
+
+        @Override
+        public Map<String, String> extendAttributes(Node node, String tagName, Map<String, String> attributes) {
+            Map<String, String> attrs = new LinkedHashMap<>(attributes);
+            setCustomAttributes(node, tagName, attrs);
+            return attrs;
+        }
+
+        @Override
+        public HtmlWriter getWriter() {
+            return htmlWriter;
+        }
+
+        @Override
+        public String getSoftbreak() {
+            return softbreak;
+        }
+
+        @Override
+        public void render(Node node) {
+            nodeRendererMap.render(node);
+        }
+
+        private void setCustomAttributes(Node node, String tagName, Map<String, String> attrs) {
+            for (AttributeProvider attributeProvider : attributeProviders) {
+                attributeProvider.setAttributes(node, tagName, attrs);
+            }
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlWriter.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlWriter.java
new file mode 100644
index 00000000000..341c428a3ee
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/HtmlWriter.java
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.internal.util.Escaping;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+public class HtmlWriter {
+
+    private static final Map<String, String> NO_ATTRIBUTES = Collections.emptyMap();
+
+    private final Appendable buffer;
+    private char lastChar = 0;
+
+    public HtmlWriter(Appendable out) {
+        if (out == null) {
+            throw new NullPointerException("out must not be null");
+        }
+        this.buffer = out;
+    }
+
+    public void raw(String s) {
+        append(s);
+    }
+
+    public void text(String text) {
+        append(Escaping.escapeHtml(text));
+    }
+
+    public void tag(String name) {
+        tag(name, NO_ATTRIBUTES);
+    }
+
+    public void tag(String name, Map<String, String> attrs) {
+        tag(name, attrs, false);
+    }
+
+    public void tag(String name, Map<String, String> attrs, boolean voidElement) {
+        append("<");
+        append(name);
+        if (attrs != null && !attrs.isEmpty()) {
+            for (Map.Entry<String, String> attrib : attrs.entrySet()) {
+                append(" ");
+                append(Escaping.escapeHtml(attrib.getKey()));
+                append("=\"");
+                append(Escaping.escapeHtml(attrib.getValue()));
+                append("\"");
+            }
+        }
+        if (voidElement) {
+            append(" /");
+        }
+
+        append(">");
+    }
+
+    public void line() {
+        if (lastChar != 0 && lastChar != '\n') {
+            append("\n");
+        }
+    }
+
+    protected void append(String s) {
+        try {
+            buffer.append(s);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        int length = s.length();
+        if (length != 0) {
+            lastChar = s.charAt(length - 1);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/UrlSanitizer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/UrlSanitizer.java
new file mode 100644
index 00000000000..12c69a73821
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/UrlSanitizer.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.html;
+
+import jdk.internal.org.commonmark.node.Image;
+import jdk.internal.org.commonmark.node.Link;
+
+/**
+ * Sanitizes urls for img and a elements by whitelisting protocols.
+ * This is intended to prevent XSS payloads like [Click this totally safe url](javascript:document.xss=true;)
+ * <p>
+ * Implementation based on https://github.com/OWASP/java-html-sanitizer/blob/f07e44b034a45d94d6fd010279073c38b6933072/src/main/java/org/owasp/html/FilterUrlByProtocolAttributePolicy.java
+ *
+ * @since 0.14.0
+ */
+public interface UrlSanitizer {
+    /**
+     * Sanitize a url for use in the href attribute of a {@link Link}.
+     *
+     * @param url Link to sanitize
+     * @return Sanitized link
+     */
+    String sanitizeLinkUrl(String url);
+
+    /**
+     * Sanitize a url for use in the src attribute of a {@link Image}.
+     *
+     * @param url Link to sanitize
+     * @return Sanitized link {@link Image}
+     */
+    String sanitizeImageUrl(String url);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/package-info.java
new file mode 100644
index 00000000000..41dd2c6c6cc
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/html/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * HTML rendering (see {@link org.commonmark.renderer.html.HtmlRenderer})
+ */
+package jdk.internal.org.commonmark.renderer.html;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
new file mode 100644
index 00000000000..4d543ea1174
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/CoreMarkdownNodeRenderer.java
@@ -0,0 +1,582 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.text.AsciiMatcher;
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.text.CharMatcher;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.text.Characters;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * The node renderer that renders all the core nodes (comes last in the order of node renderers).
+ * <p>
+ * Note that while sometimes it would be easier to record what kind of syntax was used on parsing (e.g. ATX vs Setext
+ * heading), this renderer is intended to also work for documents that were created by directly creating
+ * {@link Node Nodes} instead. So in order to support that, it sometimes needs to do a bit more work.
+ */
+public class CoreMarkdownNodeRenderer extends AbstractVisitor implements NodeRenderer {
+
+    private final AsciiMatcher textEscape;
+    private final CharMatcher textEscapeInHeading;
+    private final CharMatcher linkDestinationNeedsAngleBrackets =
+            AsciiMatcher.builder().c(' ').c('(').c(')').c('<').c('>').c('\n').c('\\').build();
+    private final CharMatcher linkDestinationEscapeInAngleBrackets =
+            AsciiMatcher.builder().c('<').c('>').c('\n').c('\\').build();
+    private final CharMatcher linkTitleEscapeInQuotes =
+            AsciiMatcher.builder().c('"').c('\n').c('\\').build();
+
+    private final Pattern orderedListMarkerPattern = Pattern.compile("^([0-9]{1,9})([.)])");
+
+    protected final MarkdownNodeRendererContext context;
+    private final MarkdownWriter writer;
+    /**
+     * If we're currently within a {@link BulletList} or {@link OrderedList}, this keeps the context of that list.
+     * It has a parent field so that it can represent a stack (for nested lists).
+     */
+    private ListHolder listHolder;
+
+    public CoreMarkdownNodeRenderer(MarkdownNodeRendererContext context) {
+        this.context = context;
+        this.writer = context.getWriter();
+
+        textEscape = AsciiMatcher.builder().anyOf("[]<>`*_&\n\\").anyOf(context.getSpecialCharacters()).build();
+        textEscapeInHeading = AsciiMatcher.builder(textEscape).anyOf("#").build();
+    }
+
+    @Override
+    public Set<Class<? extends Node>> getNodeTypes() {
+        return new HashSet<>(Arrays.asList(
+                BlockQuote.class,
+                BulletList.class,
+                Code.class,
+                Document.class,
+                Emphasis.class,
+                FencedCodeBlock.class,
+                HardLineBreak.class,
+                Heading.class,
+                HtmlBlock.class,
+                HtmlInline.class,
+                Image.class,
+                IndentedCodeBlock.class,
+                Link.class,
+                ListItem.class,
+                OrderedList.class,
+                Paragraph.class,
+                SoftLineBreak.class,
+                StrongEmphasis.class,
+                Text.class,
+                ThematicBreak.class
+        ));
+    }
+
+    @Override
+    public void render(Node node) {
+        node.accept(this);
+    }
+
+    @Override
+    public void visit(Document document) {
+        // No rendering itself
+        visitChildren(document);
+        writer.line();
+    }
+
+    @Override
+    public void visit(ThematicBreak thematicBreak) {
+        // Let's use ___ as it doesn't introduce ambiguity with * or - list item markers
+        writer.raw("___");
+        writer.block();
+    }
+
+    @Override
+    public void visit(Heading heading) {
+        if (heading.getLevel() <= 2) {
+            LineBreakVisitor lineBreakVisitor = new LineBreakVisitor();
+            heading.accept(lineBreakVisitor);
+            boolean isMultipleLines = lineBreakVisitor.hasLineBreak();
+
+            if (isMultipleLines) {
+                // Setext headings: Can have multiple lines, but only level 1 or 2
+                visitChildren(heading);
+                writer.line();
+                if (heading.getLevel() == 1) {
+                    // Note that it would be nice to match the length of the contents instead of just using 3, but that's
+                    // not easy.
+                    writer.raw("===");
+                } else {
+                    writer.raw("---");
+                }
+                writer.block();
+                return;
+            }
+        }
+
+        // ATX headings: Can't have multiple lines, but up to level 6.
+        for (int i = 0; i < heading.getLevel(); i++) {
+            writer.raw('#');
+        }
+        writer.raw(' ');
+        visitChildren(heading);
+
+        writer.block();
+    }
+
+    @Override
+    public void visit(IndentedCodeBlock indentedCodeBlock) {
+        String literal = indentedCodeBlock.getLiteral();
+        // We need to respect line prefixes which is why we need to write it line by line (e.g. an indented code block
+        // within a block quote)
+        writer.writePrefix("    ");
+        writer.pushPrefix("    ");
+        List<String> lines = getLines(literal);
+        for (int i = 0; i < lines.size(); i++) {
+            String line = lines.get(i);
+            writer.raw(line);
+            if (i != lines.size() - 1) {
+                writer.line();
+            }
+        }
+        writer.popPrefix();
+        writer.block();
+    }
+
+    @Override
+    public void visit(FencedCodeBlock codeBlock) {
+        String literal = codeBlock.getLiteral();
+        String fenceChar = codeBlock.getFenceCharacter() != null ? codeBlock.getFenceCharacter() : "`";
+        int openingFenceLength;
+        if (codeBlock.getOpeningFenceLength() != null) {
+            // If we have a known fence length, use it
+            openingFenceLength = codeBlock.getOpeningFenceLength();
+        } else {
+            // Otherwise, calculate the closing fence length pessimistically, e.g. if the code block itself contains a
+            // line with ```, we need to use a fence of length 4. If ``` occurs with non-whitespace characters on a
+            // line, we technically don't need a longer fence, but it's not incorrect to do so.
+            int fenceCharsInLiteral = findMaxRunLength(fenceChar, literal);
+            openingFenceLength = Math.max(fenceCharsInLiteral + 1, 3);
+        }
+        int closingFenceLength = codeBlock.getClosingFenceLength() != null ? codeBlock.getClosingFenceLength() : openingFenceLength;
+
+        String openingFence = repeat(fenceChar, openingFenceLength);
+        String closingFence = repeat(fenceChar, closingFenceLength);
+        int indent = codeBlock.getFenceIndent();
+
+        if (indent > 0) {
+            String indentPrefix = repeat(" ", indent);
+            writer.writePrefix(indentPrefix);
+            writer.pushPrefix(indentPrefix);
+        }
+
+        writer.raw(openingFence);
+        if (codeBlock.getInfo() != null) {
+            writer.raw(codeBlock.getInfo());
+        }
+        writer.line();
+        if (!literal.isEmpty()) {
+            List<String> lines = getLines(literal);
+            for (String line : lines) {
+                writer.raw(line);
+                writer.line();
+            }
+        }
+        writer.raw(closingFence);
+        if (indent > 0) {
+            writer.popPrefix();
+        }
+        writer.block();
+    }
+
+    @Override
+    public void visit(HtmlBlock htmlBlock) {
+        List<String> lines = getLines(htmlBlock.getLiteral());
+        for (int i = 0; i < lines.size(); i++) {
+            String line = lines.get(i);
+            writer.raw(line);
+            if (i != lines.size() - 1) {
+                writer.line();
+            }
+        }
+        writer.block();
+    }
+
+    @Override
+    public void visit(Paragraph paragraph) {
+        visitChildren(paragraph);
+        writer.block();
+    }
+
+    @Override
+    public void visit(BlockQuote blockQuote) {
+        writer.writePrefix("> ");
+        writer.pushPrefix("> ");
+        visitChildren(blockQuote);
+        writer.popPrefix();
+        writer.block();
+    }
+
+    @Override
+    public void visit(BulletList bulletList) {
+        writer.pushTight(bulletList.isTight());
+        listHolder = new BulletListHolder(listHolder, bulletList);
+        visitChildren(bulletList);
+        listHolder = listHolder.parent;
+        writer.popTight();
+        writer.block();
+    }
+
+    @Override
+    public void visit(OrderedList orderedList) {
+        writer.pushTight(orderedList.isTight());
+        listHolder = new OrderedListHolder(listHolder, orderedList);
+        visitChildren(orderedList);
+        listHolder = listHolder.parent;
+        writer.popTight();
+        writer.block();
+    }
+
+    @Override
+    public void visit(ListItem listItem) {
+        int markerIndent = listItem.getMarkerIndent() != null ? listItem.getMarkerIndent() : 0;
+        String marker;
+        if (listHolder instanceof BulletListHolder) {
+            BulletListHolder bulletListHolder = (BulletListHolder) listHolder;
+            marker = repeat(" ", markerIndent) + bulletListHolder.marker;
+        } else if (listHolder instanceof OrderedListHolder) {
+            OrderedListHolder orderedListHolder = (OrderedListHolder) listHolder;
+            marker = repeat(" ", markerIndent) + orderedListHolder.number + orderedListHolder.delimiter;
+            orderedListHolder.number++;
+        } else {
+            throw new IllegalStateException("Unknown list holder type: " + listHolder);
+        }
+        Integer contentIndent = listItem.getContentIndent();
+        String spaces = contentIndent != null ? repeat(" ", contentIndent - marker.length()) : " ";
+        writer.writePrefix(marker);
+        writer.writePrefix(spaces);
+        writer.pushPrefix(repeat(" ", marker.length() + spaces.length()));
+
+        if (listItem.getFirstChild() == null) {
+            // Empty list item
+            writer.block();
+        } else {
+            visitChildren(listItem);
+        }
+
+        writer.popPrefix();
+    }
+
+    @Override
+    public void visit(Code code) {
+        String literal = code.getLiteral();
+        // If the literal includes backticks, we can surround them by using one more backtick.
+        int backticks = findMaxRunLength("`", literal);
+        for (int i = 0; i < backticks + 1; i++) {
+            writer.raw('`');
+        }
+        // If the literal starts or ends with a backtick, surround it with a single space.
+        // If it starts and ends with a space (but is not only spaces), add an additional space (otherwise they would
+        // get removed on parsing).
+        boolean addSpace = literal.startsWith("`") || literal.endsWith("`") ||
+                (literal.startsWith(" ") && literal.endsWith(" ") && Characters.hasNonSpace(literal));
+        if (addSpace) {
+            writer.raw(' ');
+        }
+        writer.raw(literal);
+        if (addSpace) {
+            writer.raw(' ');
+        }
+        for (int i = 0; i < backticks + 1; i++) {
+            writer.raw('`');
+        }
+    }
+
+    @Override
+    public void visit(Emphasis emphasis) {
+        String delimiter = emphasis.getOpeningDelimiter();
+        // Use delimiter that was parsed if available
+        if (delimiter == null) {
+            // When emphasis is nested, a different delimiter needs to be used
+            delimiter = writer.getLastChar() == '*' ? "_" : "*";
+        }
+        writer.raw(delimiter);
+        super.visit(emphasis);
+        writer.raw(delimiter);
+    }
+
+    @Override
+    public void visit(StrongEmphasis strongEmphasis) {
+        writer.raw("**");
+        super.visit(strongEmphasis);
+        writer.raw("**");
+    }
+
+    @Override
+    public void visit(Link link) {
+        writeLinkLike(link.getTitle(), link.getDestination(), link, "[");
+    }
+
+    @Override
+    public void visit(Image image) {
+        writeLinkLike(image.getTitle(), image.getDestination(), image, "![");
+    }
+
+    @Override
+    public void visit(HtmlInline htmlInline) {
+        writer.raw(htmlInline.getLiteral());
+    }
+
+    @Override
+    public void visit(HardLineBreak hardLineBreak) {
+        writer.raw("  ");
+        writer.line();
+    }
+
+    @Override
+    public void visit(SoftLineBreak softLineBreak) {
+        writer.line();
+    }
+
+    @Override
+    public void visit(Text text) {
+        // Text is tricky. In Markdown special characters (`-`, `#` etc.) can be escaped (`\-`, `\#` etc.) so that
+        // they're parsed as plain text. Currently, whether a character was escaped or not is not recorded in the Node,
+        // so here we don't know. If we just wrote out those characters unescaped, the resulting Markdown would change
+        // meaning (turn into a list item, heading, etc.).
+        // You might say "Why not store that in the Node when parsing", but that wouldn't work for the use case where
+        // nodes are constructed directly instead of via parsing. This renderer needs to work for that too.
+        // So currently, when in doubt, we escape. For special characters only occurring at the beginning of a line,
+        // we only escape them then (we wouldn't want to escape every `.` for example).
+        String literal = text.getLiteral();
+        if (writer.isAtLineStart() && !literal.isEmpty()) {
+            char c = literal.charAt(0);
+            switch (c) {
+                case '-': {
+                    // Would be ambiguous with a bullet list marker, escape
+                    writer.raw("\\-");
+                    literal = literal.substring(1);
+                    break;
+                }
+                case '#': {
+                    // Would be ambiguous with an ATX heading, escape
+                    writer.raw("\\#");
+                    literal = literal.substring(1);
+                    break;
+                }
+                case '=': {
+                    // Would be ambiguous with a Setext heading, escape
+                    writer.raw("\\=");
+                    literal = literal.substring(1);
+                    break;
+                }
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9': {
+                    // Check for ordered list marker
+                    Matcher m = orderedListMarkerPattern.matcher(literal);
+                    if (m.find()) {
+                        writer.raw(m.group(1));
+                        writer.raw("\\" + m.group(2));
+                        literal = literal.substring(m.end());
+                    }
+                    break;
+                }
+                case '\t': {
+                    writer.raw("&#9;");
+                    literal = literal.substring(1);
+                    break;
+                }
+                case ' ': {
+                    writer.raw("&#32;");
+                    literal = literal.substring(1);
+                    break;
+                }
+            }
+        }
+
+        CharMatcher escape = text.getParent() instanceof Heading ? textEscapeInHeading : textEscape;
+
+        if (literal.endsWith("!") && text.getNext() instanceof Link) {
+            // If we wrote the `!` unescaped, it would turn the link into an image instead.
+            writer.text(literal.substring(0, literal.length() - 1), escape);
+            writer.raw("\\!");
+        } else {
+            writer.text(literal, escape);
+        }
+    }
+
+    @Override
+    protected void visitChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+
+    private static int findMaxRunLength(String needle, String s) {
+        int maxRunLength = 0;
+        int pos = 0;
+        while (pos < s.length()) {
+            pos = s.indexOf(needle, pos);
+            if (pos == -1) {
+                return maxRunLength;
+            }
+            int runLength = 0;
+            do {
+                pos += needle.length();
+                runLength++;
+            } while (s.startsWith(needle, pos));
+            maxRunLength = Math.max(runLength, maxRunLength);
+        }
+        return maxRunLength;
+    }
+
+    private static boolean contains(String s, CharMatcher charMatcher) {
+        for (int i = 0; i < s.length(); i++) {
+            if (charMatcher.matches(s.charAt(i))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // Keep for Android compat (String.repeat only available on Android 12 and later)
+    private static String repeat(String s, int count) {
+        StringBuilder sb = new StringBuilder(s.length() * count);
+        for (int i = 0; i < count; i++) {
+            sb.append(s);
+        }
+        return sb.toString();
+    }
+
+    private static List<String> getLines(String literal) {
+        // Without -1, split would discard all trailing empty strings, which is not what we want, e.g. it would
+        // return the same result for "abc", "abc\n" and "abc\n\n".
+        // With -1, it returns ["abc"], ["abc", ""] and ["abc", "", ""].
+        String[] parts = literal.split("\n", -1);
+        if (parts[parts.length - 1].isEmpty()) {
+            // But we don't want the last empty string, as "\n" is used as a line terminator (not a separator),
+            // so return without the last element.
+            return Arrays.asList(parts).subList(0, parts.length - 1);
+        } else {
+            return Arrays.asList(parts);
+        }
+    }
+
+    private void writeLinkLike(String title, String destination, Node node, String opener) {
+        writer.raw(opener);
+        visitChildren(node);
+        writer.raw(']');
+        writer.raw('(');
+        if (contains(destination, linkDestinationNeedsAngleBrackets)) {
+            writer.raw('<');
+            writer.text(destination, linkDestinationEscapeInAngleBrackets);
+            writer.raw('>');
+        } else {
+            writer.raw(destination);
+        }
+        if (title != null) {
+            writer.raw(' ');
+            writer.raw('"');
+            writer.text(title, linkTitleEscapeInQuotes);
+            writer.raw('"');
+        }
+        writer.raw(')');
+    }
+
+    private static class ListHolder {
+        final ListHolder parent;
+
+        protected ListHolder(ListHolder parent) {
+            this.parent = parent;
+        }
+    }
+
+    private static class BulletListHolder extends ListHolder {
+        final String marker;
+
+        public BulletListHolder(ListHolder parent, BulletList bulletList) {
+            super(parent);
+            this.marker = bulletList.getMarker() != null ? bulletList.getMarker() : "-";
+        }
+    }
+
+    private static class OrderedListHolder extends ListHolder {
+        final String delimiter;
+        private int number;
+
+        protected OrderedListHolder(ListHolder parent, OrderedList orderedList) {
+            super(parent);
+            delimiter = orderedList.getMarkerDelimiter() != null ? orderedList.getMarkerDelimiter() : ".";
+            number = orderedList.getMarkerStartNumber() != null ? orderedList.getMarkerStartNumber() : 1;
+        }
+    }
+
+    /**
+     * Visits nodes to check if there are any soft or hard line breaks.
+     */
+    private static class LineBreakVisitor extends AbstractVisitor {
+        private boolean lineBreak = false;
+
+        public boolean hasLineBreak() {
+            return lineBreak;
+        }
+
+        @Override
+        public void visit(SoftLineBreak softLineBreak) {
+            super.visit(softLineBreak);
+            lineBreak = true;
+        }
+
+        @Override
+        public void visit(HardLineBreak hardLineBreak) {
+            super.visit(hardLineBreak);
+            lineBreak = true;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererContext.java
new file mode 100644
index 00000000000..e3f9dadb753
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererContext.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.node.Node;
+
+import java.util.Set;
+
+/**
+ * Context that is passed to custom node renderers, see {@link MarkdownNodeRendererFactory#create}.
+ */
+public interface MarkdownNodeRendererContext {
+
+    /**
+     * @return the writer to use
+     */
+    MarkdownWriter getWriter();
+
+    /**
+     * Render the specified node and its children using the configured renderers. This should be used to render child
+     * nodes; be careful not to pass the node that is being rendered, that would result in an endless loop.
+     *
+     * @param node the node to render
+     */
+    void render(Node node);
+
+    /**
+     * @return additional special characters that need to be escaped if they occur in normal text; currently only ASCII
+     * characters are allowed
+     */
+    Set<Character> getSpecialCharacters();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererFactory.java
new file mode 100644
index 00000000000..c908398b7de
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownNodeRendererFactory.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+import java.util.Set;
+
+/**
+ * Factory for instantiating new node renderers for rendering custom nodes.
+ */
+public interface MarkdownNodeRendererFactory {
+
+    /**
+     * Create a new node renderer for the specified rendering context.
+     *
+     * @param context the context for rendering (normally passed on to the node renderer)
+     * @return a node renderer
+     */
+    NodeRenderer create(MarkdownNodeRendererContext context);
+
+    /**
+     * @return the additional special characters that this factory would like to have escaped in normal text; currently
+     * only ASCII characters are allowed
+     */
+    Set<Character> getSpecialCharacters();
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownRenderer.java
new file mode 100644
index 00000000000..344a176d0d5
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownRenderer.java
@@ -0,0 +1,195 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.internal.renderer.NodeRendererMap;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.Renderer;
+
+import java.util.*;
+
+/**
+ * Renders nodes to Markdown (CommonMark syntax); use {@link #builder()} to create a renderer.
+ * <p>
+ * Note that it doesn't currently preserve the exact syntax of the original input Markdown (if any):
+ * <ul>
+ *     <li>Headings are output as ATX headings if possible (multi-line headings need Setext headings)</li>
+ *     <li>Links are always rendered as inline links (no support for reference links yet)</li>
+ *     <li>Escaping might be over-eager, e.g. a plain {@code *} might be escaped
+ *     even though it doesn't need to be in that particular context</li>
+ *     <li>Leading whitespace in paragraphs is not preserved</li>
+ * </ul>
+ * However, it should produce Markdown that is semantically equivalent to the input, i.e. if the Markdown was parsed
+ * again and compared against the original AST, it should be the same (minus bugs).
+ */
+public class MarkdownRenderer implements Renderer {
+
+    private final List<MarkdownNodeRendererFactory> nodeRendererFactories;
+
+    private MarkdownRenderer(Builder builder) {
+        this.nodeRendererFactories = new ArrayList<>(builder.nodeRendererFactories.size() + 1);
+        this.nodeRendererFactories.addAll(builder.nodeRendererFactories);
+        // Add as last. This means clients can override the rendering of core nodes if they want.
+        this.nodeRendererFactories.add(new MarkdownNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(MarkdownNodeRendererContext context) {
+                return new CoreMarkdownNodeRenderer(context);
+            }
+
+            @Override
+            public Set<Character> getSpecialCharacters() {
+                return Collections.emptySet();
+            }
+        });
+    }
+
+    /**
+     * Create a new builder for configuring a {@link MarkdownRenderer}.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public void render(Node node, Appendable output) {
+        RendererContext context = new RendererContext(new MarkdownWriter(output));
+        context.render(node);
+    }
+
+    @Override
+    public String render(Node node) {
+        StringBuilder sb = new StringBuilder();
+        render(node, sb);
+        return sb.toString();
+    }
+
+    /**
+     * Builder for configuring a {@link MarkdownRenderer}. See methods for default configuration.
+     */
+    public static class Builder {
+
+        private final List<MarkdownNodeRendererFactory> nodeRendererFactories = new ArrayList<>();
+
+        /**
+         * @return the configured {@link MarkdownRenderer}
+         */
+        public MarkdownRenderer build() {
+            return new MarkdownRenderer(this);
+        }
+
+        /**
+         * Add a factory for instantiating a node renderer (done when rendering). This allows to override the rendering
+         * of node types or define rendering for custom node types.
+         * <p>
+         * If multiple node renderers for the same node type are created, the one from the factory that was added first
+         * "wins". (This is how the rendering for core node types can be overridden; the default rendering comes last.)
+         *
+         * @param nodeRendererFactory the factory for creating a node renderer
+         * @return {@code this}
+         */
+        public Builder nodeRendererFactory(MarkdownNodeRendererFactory nodeRendererFactory) {
+            this.nodeRendererFactories.add(nodeRendererFactory);
+            return this;
+        }
+
+        /**
+         * @param extensions extensions to use on this renderer
+         * @return {@code this}
+         */
+        public Builder extensions(Iterable<? extends Extension> extensions) {
+            for (Extension extension : extensions) {
+                if (extension instanceof MarkdownRendererExtension) {
+                    MarkdownRendererExtension markdownRendererExtension = (MarkdownRendererExtension) extension;
+                    markdownRendererExtension.extend(this);
+                }
+            }
+            return this;
+        }
+    }
+
+    /**
+     * Extension for {@link MarkdownRenderer} for rendering custom nodes.
+     */
+    public interface MarkdownRendererExtension extends Extension {
+
+        /**
+         * Extend Markdown rendering, usually by registering custom node renderers using {@link Builder#nodeRendererFactory}.
+         *
+         * @param rendererBuilder the renderer builder to extend
+         */
+        void extend(Builder rendererBuilder);
+    }
+
+    private class RendererContext implements MarkdownNodeRendererContext {
+        private final MarkdownWriter writer;
+        private final NodeRendererMap nodeRendererMap = new NodeRendererMap();
+        private final Set<Character> additionalTextEscapes;
+
+        private RendererContext(MarkdownWriter writer) {
+            // Set fields that are used by interface
+            this.writer = writer;
+            Set<Character> escapes = new HashSet<Character>();
+            for (MarkdownNodeRendererFactory factory : nodeRendererFactories) {
+                escapes.addAll(factory.getSpecialCharacters());
+            }
+            additionalTextEscapes = Collections.unmodifiableSet(escapes);
+
+            // The first node renderer for a node type "wins".
+            for (int i = nodeRendererFactories.size() - 1; i >= 0; i--) {
+                MarkdownNodeRendererFactory nodeRendererFactory = nodeRendererFactories.get(i);
+                // Pass in this as context here, which uses the fields set above
+                NodeRenderer nodeRenderer = nodeRendererFactory.create(this);
+                nodeRendererMap.add(nodeRenderer);
+            }
+        }
+
+        @Override
+        public MarkdownWriter getWriter() {
+            return writer;
+        }
+
+        @Override
+        public void render(Node node) {
+            nodeRendererMap.render(node);
+        }
+
+        @Override
+        public Set<Character> getSpecialCharacters() {
+            return additionalTextEscapes;
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownWriter.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownWriter.java
new file mode 100644
index 00000000000..b91fdd6b1b5
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/MarkdownWriter.java
@@ -0,0 +1,278 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.markdown;
+
+import jdk.internal.org.commonmark.text.CharMatcher;
+
+import java.io.IOException;
+import java.util.LinkedList;
+
+/**
+ * Writer for Markdown (CommonMark) text.
+ */
+public class MarkdownWriter {
+
+    private final Appendable buffer;
+
+    private int blockSeparator = 0;
+    private char lastChar;
+    private boolean atLineStart = true;
+
+    // Stacks of settings that affect various rendering behaviors. The common pattern here is that callers use "push" to
+    // change a setting, render some nodes, and then "pop" the setting off the stack again to restore previous state.
+    private final LinkedList<String> prefixes = new LinkedList<>();
+    private final LinkedList<Boolean> tight = new LinkedList<>();
+    private final LinkedList<CharMatcher> rawEscapes = new LinkedList<>();
+
+    public MarkdownWriter(Appendable out) {
+        buffer = out;
+    }
+
+    /**
+     * Write the supplied string (raw/unescaped except if {@link #pushRawEscape} was used).
+     */
+    public void raw(String s) {
+        flushBlockSeparator();
+        write(s, null);
+    }
+
+    /**
+     * Write the supplied character (raw/unescaped except if {@link #pushRawEscape} was used).
+     */
+    public void raw(char c) {
+        flushBlockSeparator();
+        write(c);
+    }
+
+    /**
+     * Write the supplied string with escaping.
+     *
+     * @param s      the string to write
+     * @param escape which characters to escape
+     */
+    public void text(String s, CharMatcher escape) {
+        if (s.isEmpty()) {
+            return;
+        }
+        flushBlockSeparator();
+        write(s, escape);
+
+        lastChar = s.charAt(s.length() - 1);
+        atLineStart = false;
+    }
+
+    /**
+     * Write a newline (line terminator).
+     */
+    public void line() {
+        write('\n');
+        writePrefixes();
+        atLineStart = true;
+    }
+
+    /**
+     * Enqueue a block separator to be written before the next text is written. Block separators are not written
+     * straight away because if there are no more blocks to write we don't want a separator (at the end of the document).
+     */
+    public void block() {
+        // Remember whether this should be a tight or loose separator now because tight could get changed in between
+        // this and the next flush.
+        blockSeparator = isTight() ? 1 : 2;
+        atLineStart = true;
+    }
+
+    /**
+     * Push a prefix onto the top of the stack. All prefixes are written at the beginning of each line, until the
+     * prefix is popped again.
+     *
+     * @param prefix the raw prefix string
+     */
+    public void pushPrefix(String prefix) {
+        prefixes.addLast(prefix);
+    }
+
+    /**
+     * Write a prefix.
+     *
+     * @param prefix the raw prefix string to write
+     */
+    public void writePrefix(String prefix) {
+        boolean tmp = atLineStart;
+        raw(prefix);
+        atLineStart = tmp;
+    }
+
+    /**
+     * Remove the last prefix from the top of the stack.
+     */
+    public void popPrefix() {
+        prefixes.removeLast();
+    }
+
+    /**
+     * Change whether blocks are tight or loose. Loose is the default where blocks are separated by a blank line. Tight
+     * is where blocks are not separated by a blank line. Tight blocks are used in lists, if there are no blank lines
+     * within the list.
+     * <p>
+     * Note that changing this does not affect block separators that have already been enqueued with {@link #block()},
+     * only future ones.
+     */
+    public void pushTight(boolean tight) {
+        this.tight.addLast(tight);
+    }
+
+    /**
+     * Remove the last "tight" setting from the top of the stack.
+     */
+    public void popTight() {
+        this.tight.removeLast();
+    }
+
+    /**
+     * Escape the characters matching the supplied matcher, in all text (text and raw). This might be useful to
+     * extensions that add another layer of syntax, e.g. the tables extension that uses `|` to separate cells and needs
+     * all `|` characters to be escaped (even in code spans).
+     *
+     * @param rawEscape the characters to escape in raw text
+     */
+    public void pushRawEscape(CharMatcher rawEscape) {
+        rawEscapes.add(rawEscape);
+    }
+
+    /**
+     * Remove the last raw escape from the top of the stack.
+     */
+    public void popRawEscape() {
+        rawEscapes.removeLast();
+    }
+
+    /**
+     * @return the last character that was written
+     */
+    public char getLastChar() {
+        return lastChar;
+    }
+
+    /**
+     * @return whether we're at the line start (not counting any prefixes), i.e. after a {@link #line} or {@link #block}.
+     */
+    public boolean isAtLineStart() {
+        return atLineStart;
+    }
+
+    private void write(String s, CharMatcher escape) {
+        try {
+            if (rawEscapes.isEmpty() && escape == null) {
+                // Normal fast path
+                buffer.append(s);
+            } else {
+                for (int i = 0; i < s.length(); i++) {
+                    append(s.charAt(i), escape);
+                }
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        int length = s.length();
+        if (length != 0) {
+            lastChar = s.charAt(length - 1);
+        }
+        atLineStart = false;
+    }
+
+    private void write(char c) {
+        try {
+            append(c, null);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        lastChar = c;
+        atLineStart = false;
+    }
+
+    private void writePrefixes() {
+        if (!prefixes.isEmpty()) {
+            for (String prefix : prefixes) {
+                write(prefix, null);
+            }
+        }
+    }
+
+    /**
+     * If a block separator has been enqueued with {@link #block()} but not yet written, write it now.
+     */
+    private void flushBlockSeparator() {
+        if (blockSeparator != 0) {
+            write('\n');
+            writePrefixes();
+            if (blockSeparator > 1) {
+                write('\n');
+                writePrefixes();
+            }
+            blockSeparator = 0;
+        }
+    }
+
+    private void append(char c, CharMatcher escape) throws IOException {
+        if (needsEscaping(c, escape)) {
+            if (c == '\n') {
+                // Can't escape this with \, use numeric character reference
+                buffer.append("&#10;");
+            } else {
+                buffer.append('\\');
+                buffer.append(c);
+            }
+        } else {
+            buffer.append(c);
+        }
+    }
+
+    private boolean isTight() {
+        return !tight.isEmpty() && tight.getLast();
+    }
+
+    private boolean needsEscaping(char c, CharMatcher escape) {
+        return (escape != null && escape.matches(c)) || rawNeedsEscaping(c);
+    }
+
+    private boolean rawNeedsEscaping(char c) {
+        for (CharMatcher rawEscape : rawEscapes) {
+            if (rawEscape.matches(c)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/package-info.java
new file mode 100644
index 00000000000..2db58aca257
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/markdown/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Markdown rendering (see {@link org.commonmark.renderer.markdown.MarkdownRenderer})
+ */
+package jdk.internal.org.commonmark.renderer.markdown;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/CoreTextContentNodeRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/CoreTextContentNodeRenderer.java
new file mode 100644
index 00000000000..1321d5ad785
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/CoreTextContentNodeRenderer.java
@@ -0,0 +1,312 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import jdk.internal.org.commonmark.node.*;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.internal.renderer.text.BulletListHolder;
+import jdk.internal.org.commonmark.internal.renderer.text.ListHolder;
+import jdk.internal.org.commonmark.internal.renderer.text.OrderedListHolder;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * The node renderer that renders all the core nodes (comes last in the order of node renderers).
+ */
+public class CoreTextContentNodeRenderer extends AbstractVisitor implements NodeRenderer {
+
+    protected final TextContentNodeRendererContext context;
+    private final TextContentWriter textContent;
+
+    private ListHolder listHolder;
+
+    public CoreTextContentNodeRenderer(TextContentNodeRendererContext context) {
+        this.context = context;
+        this.textContent = context.getWriter();
+    }
+
+    @Override
+    public Set<Class<? extends Node>> getNodeTypes() {
+        return new HashSet<>(Arrays.asList(
+                Document.class,
+                Heading.class,
+                Paragraph.class,
+                BlockQuote.class,
+                BulletList.class,
+                FencedCodeBlock.class,
+                HtmlBlock.class,
+                ThematicBreak.class,
+                IndentedCodeBlock.class,
+                Link.class,
+                ListItem.class,
+                OrderedList.class,
+                Image.class,
+                Emphasis.class,
+                StrongEmphasis.class,
+                Text.class,
+                Code.class,
+                HtmlInline.class,
+                SoftLineBreak.class,
+                HardLineBreak.class
+        ));
+    }
+
+    @Override
+    public void render(Node node) {
+        node.accept(this);
+    }
+
+    @Override
+    public void visit(Document document) {
+        // No rendering itself
+        visitChildren(document);
+    }
+
+    @Override
+    public void visit(BlockQuote blockQuote) {
+        textContent.write('\u00ab');
+        visitChildren(blockQuote);
+        textContent.write('\u00bb');
+
+        writeEndOfLineIfNeeded(blockQuote, null);
+    }
+
+    @Override
+    public void visit(BulletList bulletList) {
+        if (listHolder != null) {
+            writeEndOfLine();
+        }
+        listHolder = new BulletListHolder(listHolder, bulletList);
+        visitChildren(bulletList);
+        writeEndOfLineIfNeeded(bulletList, null);
+        if (listHolder.getParent() != null) {
+            listHolder = listHolder.getParent();
+        } else {
+            listHolder = null;
+        }
+    }
+
+    @Override
+    public void visit(Code code) {
+        textContent.write('\"');
+        textContent.write(code.getLiteral());
+        textContent.write('\"');
+    }
+
+    @Override
+    public void visit(FencedCodeBlock fencedCodeBlock) {
+        if (context.stripNewlines()) {
+            textContent.writeStripped(fencedCodeBlock.getLiteral());
+            writeEndOfLineIfNeeded(fencedCodeBlock, null);
+        } else {
+            textContent.write(fencedCodeBlock.getLiteral());
+        }
+    }
+
+    @Override
+    public void visit(HardLineBreak hardLineBreak) {
+        writeEndOfLineIfNeeded(hardLineBreak, null);
+    }
+
+    @Override
+    public void visit(Heading heading) {
+        visitChildren(heading);
+        writeEndOfLineIfNeeded(heading, ':');
+    }
+
+    @Override
+    public void visit(ThematicBreak thematicBreak) {
+        if (!context.stripNewlines()) {
+            textContent.write("***");
+        }
+        writeEndOfLineIfNeeded(thematicBreak, null);
+    }
+
+    @Override
+    public void visit(HtmlInline htmlInline) {
+        writeText(htmlInline.getLiteral());
+    }
+
+    @Override
+    public void visit(HtmlBlock htmlBlock) {
+        writeText(htmlBlock.getLiteral());
+    }
+
+    @Override
+    public void visit(Image image) {
+        writeLink(image, image.getTitle(), image.getDestination());
+    }
+
+    @Override
+    public void visit(IndentedCodeBlock indentedCodeBlock) {
+        if (context.stripNewlines()) {
+            textContent.writeStripped(indentedCodeBlock.getLiteral());
+            writeEndOfLineIfNeeded(indentedCodeBlock, null);
+        } else {
+            textContent.write(indentedCodeBlock.getLiteral());
+        }
+    }
+
+    @Override
+    public void visit(Link link) {
+        writeLink(link, link.getTitle(), link.getDestination());
+    }
+
+    @Override
+    public void visit(ListItem listItem) {
+        if (listHolder != null && listHolder instanceof OrderedListHolder) {
+            OrderedListHolder orderedListHolder = (OrderedListHolder) listHolder;
+            String indent = context.stripNewlines() ? "" : orderedListHolder.getIndent();
+            textContent.write(indent + orderedListHolder.getCounter() + orderedListHolder.getDelimiter() + " ");
+            visitChildren(listItem);
+            writeEndOfLineIfNeeded(listItem, null);
+            orderedListHolder.increaseCounter();
+        } else if (listHolder != null && listHolder instanceof BulletListHolder) {
+            BulletListHolder bulletListHolder = (BulletListHolder) listHolder;
+            if (!context.stripNewlines()) {
+                textContent.write(bulletListHolder.getIndent() + bulletListHolder.getMarker() + " ");
+            }
+            visitChildren(listItem);
+            writeEndOfLineIfNeeded(listItem, null);
+        }
+    }
+
+    @Override
+    public void visit(OrderedList orderedList) {
+        if (listHolder != null) {
+            writeEndOfLine();
+        }
+        listHolder = new OrderedListHolder(listHolder, orderedList);
+        visitChildren(orderedList);
+        writeEndOfLineIfNeeded(orderedList, null);
+        if (listHolder.getParent() != null) {
+            listHolder = listHolder.getParent();
+        } else {
+            listHolder = null;
+        }
+    }
+
+    @Override
+    public void visit(Paragraph paragraph) {
+        visitChildren(paragraph);
+        // Add "end of line" only if its "root paragraph.
+        if (paragraph.getParent() == null || paragraph.getParent() instanceof Document) {
+            writeEndOfLineIfNeeded(paragraph, null);
+        }
+    }
+
+    @Override
+    public void visit(SoftLineBreak softLineBreak) {
+        writeEndOfLineIfNeeded(softLineBreak, null);
+    }
+
+    @Override
+    public void visit(Text text) {
+        writeText(text.getLiteral());
+    }
+
+    @Override
+    protected void visitChildren(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null) {
+            Node next = node.getNext();
+            context.render(node);
+            node = next;
+        }
+    }
+
+    private void writeText(String text) {
+        if (context.stripNewlines()) {
+            textContent.writeStripped(text);
+        } else {
+            textContent.write(text);
+        }
+    }
+
+    private void writeLink(Node node, String title, String destination) {
+        boolean hasChild = node.getFirstChild() != null;
+        boolean hasTitle = title != null && !title.equals(destination);
+        boolean hasDestination = destination != null && !destination.equals("");
+
+        if (hasChild) {
+            textContent.write('"');
+            visitChildren(node);
+            textContent.write('"');
+            if (hasTitle || hasDestination) {
+                textContent.whitespace();
+                textContent.write('(');
+            }
+        }
+
+        if (hasTitle) {
+            textContent.write(title);
+            if (hasDestination) {
+                textContent.colon();
+                textContent.whitespace();
+            }
+        }
+
+        if (hasDestination) {
+            textContent.write(destination);
+        }
+
+        if (hasChild && (hasTitle || hasDestination)) {
+            textContent.write(')');
+        }
+    }
+
+    private void writeEndOfLineIfNeeded(Node node, Character c) {
+        if (context.stripNewlines()) {
+            if (c != null) {
+                textContent.write(c);
+            }
+            if (node.getNext() != null) {
+                textContent.whitespace();
+            }
+        } else {
+            if (node.getNext() != null) {
+                textContent.line();
+            }
+        }
+    }
+
+    private void writeEndOfLine() {
+        if (context.stripNewlines()) {
+            textContent.whitespace();
+        } else {
+            textContent.line();
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererContext.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererContext.java
new file mode 100644
index 00000000000..c00be3cca41
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererContext.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import jdk.internal.org.commonmark.node.Node;
+
+public interface TextContentNodeRendererContext {
+
+    /**
+     * @return true for stripping new lines and render text as "single line",
+     * false for keeping all line breaks.
+     */
+    boolean stripNewlines();
+
+    /**
+     * @return the writer to use
+     */
+    TextContentWriter getWriter();
+
+    /**
+     * Render the specified node and its children using the configured renderers. This should be used to render child
+     * nodes; be careful not to pass the node that is being rendered, that would result in an endless loop.
+     *
+     * @param node the node to render
+     */
+    void render(Node node);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererFactory.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererFactory.java
new file mode 100644
index 00000000000..5c110ba4d29
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentNodeRendererFactory.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+
+/**
+ * Factory for instantiating new node renderers when rendering is done.
+ */
+public interface TextContentNodeRendererFactory {
+
+    /**
+     * Create a new node renderer for the specified rendering context.
+     *
+     * @param context the context for rendering (normally passed on to the node renderer)
+     * @return a node renderer
+     */
+    NodeRenderer create(TextContentNodeRendererContext context);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentRenderer.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentRenderer.java
new file mode 100644
index 00000000000..6ac282fd4c7
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentRenderer.java
@@ -0,0 +1,184 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.internal.renderer.NodeRendererMap;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.Renderer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Renders nodes to plain text content with minimal markup-like additions.
+ */
+public class TextContentRenderer implements Renderer {
+
+    private final boolean stripNewlines;
+
+    private final List<TextContentNodeRendererFactory> nodeRendererFactories;
+
+    private TextContentRenderer(Builder builder) {
+        this.stripNewlines = builder.stripNewlines;
+
+        this.nodeRendererFactories = new ArrayList<>(builder.nodeRendererFactories.size() + 1);
+        this.nodeRendererFactories.addAll(builder.nodeRendererFactories);
+        // Add as last. This means clients can override the rendering of core nodes if they want.
+        this.nodeRendererFactories.add(new TextContentNodeRendererFactory() {
+            @Override
+            public NodeRenderer create(TextContentNodeRendererContext context) {
+                return new CoreTextContentNodeRenderer(context);
+            }
+        });
+    }
+
+    /**
+     * Create a new builder for configuring a {@link TextContentRenderer}.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public void render(Node node, Appendable output) {
+        RendererContext context = new RendererContext(new TextContentWriter(output));
+        context.render(node);
+    }
+
+    @Override
+    public String render(Node node) {
+        StringBuilder sb = new StringBuilder();
+        render(node, sb);
+        return sb.toString();
+    }
+
+    /**
+     * Builder for configuring a {@link TextContentRenderer}. See methods for default configuration.
+     */
+    public static class Builder {
+
+        private boolean stripNewlines = false;
+        private List<TextContentNodeRendererFactory> nodeRendererFactories = new ArrayList<>();
+
+        /**
+         * @return the configured {@link TextContentRenderer}
+         */
+        public TextContentRenderer build() {
+            return new TextContentRenderer(this);
+        }
+
+        /**
+         * Set the value of flag for stripping new lines.
+         *
+         * @param stripNewlines true for stripping new lines and render text as "single line",
+         *                      false for keeping all line breaks
+         * @return {@code this}
+         */
+        public Builder stripNewlines(boolean stripNewlines) {
+            this.stripNewlines = stripNewlines;
+            return this;
+        }
+
+        /**
+         * Add a factory for instantiating a node renderer (done when rendering). This allows to override the rendering
+         * of node types or define rendering for custom node types.
+         * <p>
+         * If multiple node renderers for the same node type are created, the one from the factory that was added first
+         * "wins". (This is how the rendering for core node types can be overridden; the default rendering comes last.)
+         *
+         * @param nodeRendererFactory the factory for creating a node renderer
+         * @return {@code this}
+         */
+        public Builder nodeRendererFactory(TextContentNodeRendererFactory nodeRendererFactory) {
+            this.nodeRendererFactories.add(nodeRendererFactory);
+            return this;
+        }
+
+        /**
+         * @param extensions extensions to use on this text content renderer
+         * @return {@code this}
+         */
+        public Builder extensions(Iterable<? extends Extension> extensions) {
+            for (Extension extension : extensions) {
+                if (extension instanceof TextContentRenderer.TextContentRendererExtension) {
+                    TextContentRenderer.TextContentRendererExtension textContentRendererExtension =
+                            (TextContentRenderer.TextContentRendererExtension) extension;
+                    textContentRendererExtension.extend(this);
+                }
+            }
+            return this;
+        }
+    }
+
+    /**
+     * Extension for {@link TextContentRenderer}.
+     */
+    public interface TextContentRendererExtension extends Extension {
+        void extend(TextContentRenderer.Builder rendererBuilder);
+    }
+
+    private class RendererContext implements TextContentNodeRendererContext {
+        private final TextContentWriter textContentWriter;
+        private final NodeRendererMap nodeRendererMap = new NodeRendererMap();
+
+        private RendererContext(TextContentWriter textContentWriter) {
+            this.textContentWriter = textContentWriter;
+
+            // The first node renderer for a node type "wins".
+            for (int i = nodeRendererFactories.size() - 1; i >= 0; i--) {
+                TextContentNodeRendererFactory nodeRendererFactory = nodeRendererFactories.get(i);
+                NodeRenderer nodeRenderer = nodeRendererFactory.create(this);
+                nodeRendererMap.add(nodeRenderer);
+            }
+        }
+
+        @Override
+        public boolean stripNewlines() {
+            return stripNewlines;
+        }
+
+        @Override
+        public TextContentWriter getWriter() {
+            return textContentWriter;
+        }
+
+        @Override
+        public void render(Node node) {
+            nodeRendererMap.render(node);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentWriter.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentWriter.java
new file mode 100644
index 00000000000..edbb7ae2839
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/TextContentWriter.java
@@ -0,0 +1,99 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.renderer.text;
+
+import java.io.IOException;
+
+public class TextContentWriter {
+
+    private final Appendable buffer;
+
+    private char lastChar;
+
+    public TextContentWriter(Appendable out) {
+        buffer = out;
+    }
+
+    public void whitespace() {
+        if (lastChar != 0 && lastChar != ' ') {
+            append(' ');
+        }
+    }
+
+    public void colon() {
+        if (lastChar != 0 && lastChar != ':') {
+            append(':');
+        }
+    }
+
+    public void line() {
+        if (lastChar != 0 && lastChar != '\n') {
+            append('\n');
+        }
+    }
+
+    public void writeStripped(String s) {
+        append(s.replaceAll("[\\r\\n\\s]+", " "));
+    }
+
+    public void write(String s) {
+        append(s);
+    }
+
+    public void write(char c) {
+        append(c);
+    }
+
+    private void append(String s) {
+        try {
+            buffer.append(s);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        int length = s.length();
+        if (length != 0) {
+            lastChar = s.charAt(length - 1);
+        }
+    }
+
+    private void append(char c) {
+        try {
+            buffer.append(c);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        lastChar = c;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/package-info.java
new file mode 100644
index 00000000000..c84c2c33755
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/renderer/text/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Plain text rendering with minimal markup (see {@link org.commonmark.renderer.text.TextContentRenderer})
+ */
+package jdk.internal.org.commonmark.renderer.text;
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/AsciiMatcher.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/AsciiMatcher.java
new file mode 100644
index 00000000000..76b90c9b6fd
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/AsciiMatcher.java
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.text;
+
+import java.util.BitSet;
+import java.util.Set;
+
+/**
+ * Char matcher that can match ASCII characters efficiently.
+ */
+public class AsciiMatcher implements CharMatcher {
+    private final BitSet set;
+
+    private AsciiMatcher(Builder builder) {
+        this.set = builder.set;
+    }
+
+    @Override
+    public boolean matches(char c) {
+        return set.get(c);
+    }
+
+    public Builder newBuilder() {
+        return new Builder((BitSet) set.clone());
+    }
+
+    public static Builder builder() {
+        return new Builder(new BitSet());
+    }
+
+    public static Builder builder(AsciiMatcher matcher) {
+        return new Builder((BitSet) matcher.set.clone());
+    }
+
+    public static class Builder {
+        private final BitSet set;
+
+        private Builder(BitSet set) {
+            this.set = set;
+        }
+
+        public Builder c(char c) {
+            if (c > 127) {
+                throw new IllegalArgumentException("Can only match ASCII characters");
+            }
+            set.set(c);
+            return this;
+        }
+
+        public Builder anyOf(String s) {
+            for (int i = 0; i < s.length(); i++) {
+                c(s.charAt(i));
+            }
+            return this;
+        }
+
+        public Builder anyOf(Set<Character> characters) {
+            for (Character c : characters) {
+                c(c);
+            }
+            return this;
+        }
+
+        public Builder range(char from, char toInclusive) {
+            for (char c = from; c <= toInclusive; c++) {
+                c(c);
+            }
+            return this;
+        }
+
+        public AsciiMatcher build() {
+            return new AsciiMatcher(this);
+        }
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/CharMatcher.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/CharMatcher.java
new file mode 100644
index 00000000000..b4ac2ed1c67
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/CharMatcher.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.text;
+
+/**
+ * Matcher interface for {@code char} values.
+ * <p>
+ * Note that because this matches on {@code char} values only (as opposed to {@code int} code points),
+ * this only operates on the level of code units and doesn't support supplementary characters
+ * (see {@link Character#isSupplementaryCodePoint(int)}).
+ */
+public interface CharMatcher {
+
+    boolean matches(char c);
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/Characters.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/Characters.java
new file mode 100644
index 00000000000..d69e1251874
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/Characters.java
@@ -0,0 +1,189 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+package jdk.internal.org.commonmark.text;
+
+/**
+ * Functions for finding characters in strings or checking characters.
+ */
+public class Characters {
+
+    public static int find(char c, CharSequence s, int startIndex) {
+        int length = s.length();
+        for (int i = startIndex; i < length; i++) {
+            if (s.charAt(i) == c) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static int findLineBreak(CharSequence s, int startIndex) {
+        int length = s.length();
+        for (int i = startIndex; i < length; i++) {
+            switch (s.charAt(i)) {
+                case '\n':
+                case '\r':
+                    return i;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * @see <a href="https://spec.commonmark.org/0.31.2/#blank-line">blank line</a>
+     */
+    public static boolean isBlank(CharSequence s) {
+        return skipSpaceTab(s, 0, s.length()) == s.length();
+    }
+
+    public static boolean hasNonSpace(CharSequence s) {
+        int length = s.length();
+        int skipped = skip(' ', s, 0, length);
+        return skipped != length;
+    }
+
+    public static boolean isLetter(CharSequence s, int index) {
+        int codePoint = Character.codePointAt(s, index);
+        return Character.isLetter(codePoint);
+    }
+
+    public static boolean isSpaceOrTab(CharSequence s, int index) {
+        if (index < s.length()) {
+            switch (s.charAt(index)) {
+                case ' ':
+                case '\t':
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @see <a href="https://spec.commonmark.org/0.31.2/#unicode-punctuation-character">Unicode punctuation character</a>
+     */
+    public static boolean isPunctuationCodePoint(int codePoint) {
+        switch (Character.getType(codePoint)) {
+            // General category "P" (punctuation)
+            case Character.DASH_PUNCTUATION:
+            case Character.START_PUNCTUATION:
+            case Character.END_PUNCTUATION:
+            case Character.CONNECTOR_PUNCTUATION:
+            case Character.OTHER_PUNCTUATION:
+            case Character.INITIAL_QUOTE_PUNCTUATION:
+            case Character.FINAL_QUOTE_PUNCTUATION:
+                // General category "S" (symbol)
+            case Character.MATH_SYMBOL:
+            case Character.CURRENCY_SYMBOL:
+            case Character.MODIFIER_SYMBOL:
+            case Character.OTHER_SYMBOL:
+                return true;
+            default:
+                switch (codePoint) {
+                    case '$':
+                    case '+':
+                    case '<':
+                    case '=':
+                    case '>':
+                    case '^':
+                    case '`':
+                    case '|':
+                    case '~':
+                        return true;
+                    default:
+                        return false;
+                }
+        }
+    }
+
+    /**
+     * Check whether the provided code point is a Unicode whitespace character as defined in the spec.
+     *
+     * @see <a href="https://spec.commonmark.org/0.31.2/#unicode-whitespace-character">Unicode whitespace character</a>
+     */
+    public static boolean isWhitespaceCodePoint(int codePoint) {
+        switch (codePoint) {
+            case ' ':
+            case '\t':
+            case '\n':
+            case '\f':
+            case '\r':
+                return true;
+            default:
+                return Character.getType(codePoint) == Character.SPACE_SEPARATOR;
+        }
+    }
+
+    public static int skip(char skip, CharSequence s, int startIndex, int endIndex) {
+        for (int i = startIndex; i < endIndex; i++) {
+            if (s.charAt(i) != skip) {
+                return i;
+            }
+        }
+        return endIndex;
+    }
+
+    public static int skipBackwards(char skip, CharSequence s, int startIndex, int lastIndex) {
+        for (int i = startIndex; i >= lastIndex; i--) {
+            if (s.charAt(i) != skip) {
+                return i;
+            }
+        }
+        return lastIndex - 1;
+    }
+
+    public static int skipSpaceTab(CharSequence s, int startIndex, int endIndex) {
+        for (int i = startIndex; i < endIndex; i++) {
+            switch (s.charAt(i)) {
+                case ' ':
+                case '\t':
+                    break;
+                default:
+                    return i;
+            }
+        }
+        return endIndex;
+    }
+
+    public static int skipSpaceTabBackwards(CharSequence s, int startIndex, int lastIndex) {
+        for (int i = startIndex; i >= lastIndex; i--) {
+            switch (s.charAt(i)) {
+                case ' ':
+                case '\t':
+                    break;
+                default:
+                    return i;
+            }
+        }
+        return lastIndex - 1;
+    }
+}
diff --git a/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/package-info.java b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/package-info.java
new file mode 100644
index 00000000000..14c6328b517
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/jdk/internal/org/commonmark/text/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, a notice that is now available elsewhere in this distribution
+ * accompanied the original version of this file, and, per its terms,
+ * should not be removed.
+ */
+
+/**
+ * Text processing utilities for parsing and rendering, exported for use by extensions
+ */
+package jdk.internal.org.commonmark.text;
diff --git a/src/jdk.internal.md/share/classes/module-info.java b/src/jdk.internal.md/share/classes/module-info.java
new file mode 100644
index 00000000000..a9e3e5e2a03
--- /dev/null
+++ b/src/jdk.internal.md/share/classes/module-info.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2023, 2024, 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.
+ */
+
+// This module is primarily an import from a recent tagged version of
+//     https://github.com/commonmark/commonmark-java
+//
+// The following parts are imported:
+//
+// * commonmark/src/main/java
+// * commonmark/src/main/resources
+// * commonmark-ext-gfm-tables/src/main/java
+// * commonmark-ext-gfm-tables/src/main/resources
+//
+// For source and resource files, the following transformations are applied:
+//
+// * legal headers are added
+// * package and import statements are updated
+// * characters outside the ASCII range are converted to Unicode escapes
+// * @SuppressWarnings("fallthrough") is added to getSetextHeadingLevel
+// * the value for ENTITY_PATH is updated with the modified package
+// * the file `entities.properties` is renamed to `entities.txt`
+
+/**
+ * Internal support for Markdown.
+ *
+ * @since 23
+ */
+module jdk.internal.md {
+    requires jdk.compiler;
+
+    exports jdk.internal.markdown to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.ext.gfm.tables to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.node to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.parser to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.renderer to
+            jdk.javadoc,
+            jdk.jshell;
+    exports jdk.internal.org.commonmark.renderer.html to
+            jdk.javadoc,
+            jdk.jshell;
+
+    provides com.sun.tools.javac.api.JavacTrees.DocCommentTreeTransformer
+            with jdk.internal.markdown.MarkdownTransformer;
+}
diff --git a/src/jdk.internal.md/share/legal/commonmark.md b/src/jdk.internal.md/share/legal/commonmark.md
new file mode 100644
index 00000000000..1fd2d7eb01b
--- /dev/null
+++ b/src/jdk.internal.md/share/legal/commonmark.md
@@ -0,0 +1,29 @@
+## CommonMark 0.22.0
+
+### CommonMark License
+```
+Copyright (c) 2015, Atlassian Pty Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+```
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java
index 597747bdb4c..13a2bb4c1bf 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, 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
@@ -141,4 +141,15 @@ public abstract class Content {
     public int charCount() {
         return 0;
     }
+
+    /**
+     * {@return true if the content is "phrasing content"}
+     *
+     * Phrasing content is content that may appear in a paragraph, such as text, or certain HTML elements.
+     *
+     * @see <a href="https://html.spec.whatwg.org/multipage/dom.html#phrasing-content">Phrasing content</a>
+     */
+    public boolean isPhrasingContent() {
+        return false;
+    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
index 47b2b6b41fe..71e576b4408 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
@@ -158,8 +158,9 @@ public class DocFilesHandler {
                     configuration.messages.warning("doclet.Copy_Overwrite_warning",
                             srcfile.getPath(), dstdir.getPath());
                 } else {
-                    if (Utils.toLowerCase(srcfile.getPath()).endsWith(".html")) {
-                        handleHtmlFile(srcfile, dstDocPath);
+                    var path = Utils.toLowerCase(srcfile.getPath());
+                    if (path.endsWith(".html") || path.endsWith(".md")) {
+                        handleDocFile(srcfile, dstDocPath);
                     } else {
                         configuration.messages.notice("doclet.Copying_File_0_To_Dir_1",
                                 srcfile.getPath(), dstdir.getPath());
@@ -186,10 +187,10 @@ public class DocFilesHandler {
         }
     }
 
-    private void handleHtmlFile(DocFile srcFile, DocPath dstPath) throws DocletException {
+    private void handleDocFile(DocFile srcFile, DocPath dstPath) throws DocletException {
         var fileObject = srcFile.getFileObject();
         var dfElement = new DocFileElement(utils, element, fileObject);
-        var path = dstPath.resolve(srcFile.getName());
+        var path = dstPath.resolve(srcFile.getName().replaceAll("\\.[a-z]+$", ".html"));
 
         writerFactory.newDocFileWriter(path, dfElement).buildPage();
     }
@@ -246,8 +247,8 @@ public class DocFilesHandler {
             printHtmlDocument(List.of(), null, localTagsContent, List.of(), htmlContent);
         }
 
-        private String getWindowTitle(HtmlDocletWriter docletWriter, Element element) {
-            String t = configuration.utils.getHTMLTitle(element);
+        private String getWindowTitle(HtmlDocletWriter docletWriter, DocFileElement element) {
+            var t = docletWriter.getFileTitle(element);
             return docletWriter.getWindowTitle(t);
         }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
index a57bc9544b6..cd66876997c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.toolkit.DocletElement;
+import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.OverviewElement;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@@ -70,7 +70,7 @@ public class ExternalSpecsWriter extends HtmlDocletWriter {
     /**
      * Cached contents of {@code <title>...</title>} tags of the HTML pages.
      */
-    final Map<Element, String> titles = new WeakHashMap<>();
+    final Map<DocFileElement, String> titles = new WeakHashMap<>();
 
     /**
      * Constructs ExternalSpecsWriter object.
@@ -274,29 +274,27 @@ public class ExternalSpecsWriter extends HtmlDocletWriter {
 
     private Content createLink(IndexItem i) {
         assert i.getDocTree().getKind() == DocTree.Kind.SPEC : i;
-        Element element = i.getElement();
+        var element = i.getElement();
         if (element instanceof OverviewElement) {
             return links.createLink(pathToRoot.resolve(i.getUrl()),
                     resources.getText("doclet.Overview"));
-        } else if (element instanceof DocletElement e) {
-            // Implementations of DocletElement do not override equals and
-            // hashCode; putting instances of DocletElement in a map is not
-            // incorrect, but might well be inefficient
-            String t = titles.computeIfAbsent(element, utils::getHTMLTitle);
+        } else if (element instanceof DocFileElement e) {
+            var fo = e.getFileObject();
+            var t = titles.computeIfAbsent(e, this::getFileTitle);
             if (t.isBlank()) {
                 // The user should probably be notified (a warning?) that this
                 // file does not have a title
-                Path p = Path.of(e.getFileObject().toUri());
+                Path p = Path.of(fo.toUri());
                 t = p.getFileName().toString();
             }
-            ContentBuilder b = new ContentBuilder();
-            b.add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")));
-            // non-program elements should be displayed using a normal font
-            b.add(t);
+            var b = new ContentBuilder()
+                    .add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")))
+                    // non-program elements should be displayed using a normal font
+                    .add(t);
             return links.createLink(pathToRoot.resolve(i.getUrl()), b);
         } else {
             // program elements should be displayed using a code font
-            Content link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
+            var link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
             return HtmlTree.CODE(link);
         }
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 3e461dc3e74..7cc4a409759 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -45,6 +45,7 @@ import java.util.regex.Pattern;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.Name;
@@ -75,11 +76,25 @@ import com.sun.source.doctree.InheritDocTree;
 import com.sun.source.doctree.InlineTagTree;
 import com.sun.source.doctree.LinkTree;
 import com.sun.source.doctree.LiteralTree;
+import com.sun.source.doctree.RawTextTree;
 import com.sun.source.doctree.StartElementTree;
 import com.sun.source.doctree.TextTree;
 import com.sun.source.util.DocTreePath;
 import com.sun.source.util.SimpleDocTreeVisitor;
 
+import jdk.internal.org.commonmark.Extension;
+import jdk.internal.org.commonmark.ext.gfm.tables.TablesExtension;
+import jdk.internal.org.commonmark.node.AbstractVisitor;
+import jdk.internal.org.commonmark.node.Code;
+import jdk.internal.org.commonmark.node.Heading;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.parser.Parser;
+import jdk.internal.org.commonmark.renderer.NodeRenderer;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererContext;
+import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererFactory;
+import jdk.internal.org.commonmark.renderer.html.HtmlRenderer;
+import jdk.internal.org.commonmark.renderer.html.HtmlWriter;
+
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
 import jdk.javadoc.internal.doclets.formats.html.markup.Head;
@@ -95,6 +110,7 @@ import jdk.javadoc.internal.doclets.formats.html.markup.Text;
 import jdk.javadoc.internal.doclets.formats.html.markup.TextBuilder;
 import jdk.javadoc.internal.doclets.formats.html.taglets.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.taglets.TagletWriter;
+import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.Messages;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
@@ -205,7 +221,7 @@ public abstract class HtmlDocletWriter {
      *
      * @param configuration the configuration for this doclet
      * @param path the file to be generated.
-     * @param generating whether to write a "Geneterating ..." message to the console
+     * @param generating whether to write a "Generating ..." message to the console
      */
     protected HtmlDocletWriter(HtmlConfiguration configuration, DocPath path, boolean generating) {
         this.configuration = configuration;
@@ -503,7 +519,10 @@ public abstract class HtmlDocletWriter {
     }
 
     /**
-     * Get the window title.
+     * Returns the window title.
+     *
+     * The window title is the composition of the given title and
+     * any value set by the window-title option.
      *
      * @param title the title string to construct the complete window title
      * @return the window title string
@@ -515,6 +534,105 @@ public abstract class HtmlDocletWriter {
         return title;
     }
 
+    /**
+     * {@return the title for a doc-file element}
+     *
+     * For an HTML file, the title is as given in the {@code <title>} element,
+     * as found in the preamble of the doc-comment tree.
+     *
+     * For a Markdown file, there is no direct representation of the page title,
+     * and so the content of the {@code <h1>} heading is used.
+     *
+     * @param element the doc-file element
+     */
+    public String getFileTitle(DocFileElement element) {
+        var fileName = element.getFileObject().getName();
+        if (fileName.endsWith(".html")) {
+            return getTextContent(utils.getPreamble(element), "title");
+        } else if (fileName.endsWith(".md")) {
+            var c = commentTagsToContent(element, utils.getBody(element), false);
+            return getHeadingText(c);
+        } else {
+            throw new IllegalArgumentException(fileName);
+        }
+    }
+
+    /**
+     * {@return the plain-text content of a named HTML element in a list of content}
+     *
+     * @param trees the list of content
+     * @param name the name og the HTML element
+     */
+    private String getTextContent(List<? extends DocTree> trees, String name) {
+        var sb = new StringBuilder();
+        var collectText = false;
+        loop:
+        for (DocTree dt : trees) {
+            switch (dt.getKind()) {
+                case START_ELEMENT -> {
+                    var nodeStart = (StartElementTree) dt;
+                    if (nodeStart.getName().toString().equalsIgnoreCase(name)) {
+                        collectText = true;
+                    }
+                }
+                case END_ELEMENT -> {
+                    var nodeEnd = (EndElementTree) dt;
+                    if (nodeEnd.getName().toString().equalsIgnoreCase(name)) {
+                        break loop;
+                    }
+                }
+                case TEXT -> {
+                    var nodeText = (TextTree) dt;
+                    if (collectText)
+                        sb.append(nodeText.getBody());
+                }
+                default -> {
+                }
+                // do nothing
+            }
+        }
+        return sb.toString().trim();
+    }
+
+    /**
+     * {@return the content of the {@code <h1>} heading in the given content,
+     * or an empty string if there is no such heading}
+     *
+     * The heading must be at the beginning of the content.
+     * It may be represented in either an HTML tree with tag name {@code h1}
+     * or in a raw HTML node.
+     *
+     * @param c the content
+     */
+    private String getHeadingText(Content c) {
+        var sb = new StringBuilder();
+        if (c instanceof ContentBuilder cb) {
+            var contents = cb.getContents();
+            if (!contents.isEmpty()) {
+                var first = contents.get(0);
+                if (first instanceof HtmlTree htmlTree && htmlTree.tagName.equals(TagName.H1)) {
+                    for (var c2 : htmlTree.getContents()) {
+                        if (c2 instanceof Text t) {
+                            sb.append(t.toString());
+                        } else if (c2 instanceof TextBuilder tb) {
+                            sb.append(tb.toString());
+                        }
+                    }
+                    return sb.toString();
+                } else if (first instanceof RawHtml rawHtml) {
+                    Pattern h1 = Pattern.compile("<h1[^>]*>(.*)</h1>");
+                    Matcher m = h1.matcher(rawHtml.toString());
+                    if (m.lookingAt()) {
+                        var heading = m.group(1);
+                        var headingText = heading.replaceAll("</?[^>]+>", "");
+                        return headingText;
+                    }
+                }
+            }
+        }
+        return "";
+    }
+
     /**
      * Returns a {@code <header>} element, containing the user "top" text, if any,
      * and the main navigation bar.
@@ -1267,10 +1385,13 @@ public abstract class HtmlDocletWriter {
         commentRemoved = false;
         List<Name> openTags = new ArrayList<>();
 
-        for (ListIterator<? extends DocTree> iterator = trees.listIterator(); iterator.hasNext();) {
+        var useMarkdown = trees.stream().anyMatch(t -> t.getKind() == Kind.MARKDOWN);
+        var markdownHandler = useMarkdown ? new MarkdownHandler(element) : null;
+
+        for (ListIterator<? extends DocTree> iterator = trees.listIterator(); iterator.hasNext(); ) {
             boolean isFirstNode = !iterator.hasPrevious();
             DocTree tag = iterator.next();
-            boolean isLastNode  = !iterator.hasNext();
+            boolean isLastNode = !iterator.hasNext();
 
             if (context.isFirstSentence) {
                 // Ignore block tags
@@ -1293,13 +1414,19 @@ public abstract class HtmlDocletWriter {
             }
 
             var docTreeVisitor = new InlineVisitor(element, tag, isLastNode, context, ch, trees);
-
-            boolean allDone = docTreeVisitor.visit(tag, result);
+            boolean allDone = useMarkdown
+                    ? markdownHandler.handle(tag, docTreeVisitor)
+                    : docTreeVisitor.visit(tag, result);
             commentRemoved = false;
 
             if (allDone)
                 break;
         }
+
+        if (useMarkdown) {
+            markdownHandler.addContent(result);
+        }
+
         // Close any open inline tags
         while (!openTags.isEmpty()) {
             result.add(RawHtml.endElement(openTags.removeLast()));
@@ -1307,6 +1434,219 @@ public abstract class HtmlDocletWriter {
         return result;
     }
 
+    private class MarkdownHandler {
+        /**
+         * Placeholder for non-HTML nodes that are phrasing content.
+         * The character (\uFFFC) is the Unicode Object Replacement Character, {@code U+FFFC}.
+         */
+        private static final char PLACEHOLDER_CHAR = '\uFFFC';
+        /**
+         * Placeholder for non-HTML nodes that are not phrasing content.
+         * The placeholder is an HTML block, according to CommonMark 4.6 rule 2,
+         * and so will not be wrapped into with {@code <p>...</p>} tags.
+         * @see <a href="https://spec.commonmark.org/0.30/#html-blocks">HTML blocks</a>
+         */
+        private static final String PLACEHOLDER_BLOCK = "<!--\uFFFC-->";
+        private static final Pattern PLACEHOLDERS = Pattern.compile(PLACEHOLDER_CHAR + "|" + PLACEHOLDER_BLOCK);
+
+        private final StringBuilder markdownInput = new StringBuilder() ;
+        private final ArrayList<Content> fffcObjects = new ArrayList<>();
+
+        private final Extension tablesExtn = TablesExtension.create();
+        private final HtmlNodeRendererFactory headingRendererFactory = HeadingNodeRenderer::new;
+
+        private final Element element;
+
+        private final Parser parser = Parser.builder()
+                .extensions(List.of(tablesExtn))
+                .build();
+        private final HtmlRenderer renderer = HtmlRenderer.builder()
+                .nodeRendererFactory(headingRendererFactory)
+                .extensions(List.of(tablesExtn))
+                .build();
+
+        MarkdownHandler(Element element) {
+            this.element = element;
+        }
+
+        boolean handle(DocTree tree, InlineVisitor visitor) {
+            boolean allDone;
+            if (tree instanceof RawTextTree t) {
+                if (t.getKind() != Kind.MARKDOWN) {
+                    throw new IllegalStateException(t.getKind().toString());
+                }
+                String code = t.getContent();
+                // handle the (unlikely) case of FFFC characters existing in the code
+                int start = 0;
+                int pos;
+                while ((pos = code.indexOf(PLACEHOLDER_CHAR, start)) != -1) {
+                    markdownInput.append(code.substring(start, pos));
+                    markdownInput.append(PLACEHOLDER_CHAR);
+                    fffcObjects.add(Text.of(String.valueOf(PLACEHOLDER_CHAR)));
+                    start = pos + 1;
+                }
+                markdownInput.append(code.substring(start));
+                allDone = false;
+            } else {
+                Content embeddedContent = new ContentBuilder();
+                allDone = visitor.visit(tree, embeddedContent);
+                fffcObjects.add(embeddedContent);
+                if (embeddedContent.isPhrasingContent()) {
+                    markdownInput.append(PLACEHOLDER_CHAR);
+                } else {
+                    if (!markdownInput.isEmpty() && markdownInput.charAt(markdownInput.length() - 1) != '\n') {
+                        markdownInput.append('\n');
+                    }
+                    markdownInput.append(PLACEHOLDER_BLOCK);
+                }
+            }
+            return allDone;
+        }
+
+        void addContent(Content result) {
+            Node document = parser.parse(markdownInput.toString());
+            String markdownOutput = unwrap(renderer.render(document));
+            Matcher m = PLACEHOLDERS.matcher(markdownOutput);
+            int start = 0;
+            int pos;
+            int fffcObjectIndex = 0;
+            while (m.find()) {
+                result.add(RawHtml.markdown(markdownOutput.substring(start, m.start())));
+                result.add(fffcObjects.get(fffcObjectIndex++));
+                start = m.end();
+            }
+            if (start < markdownOutput.length()) {
+                result.add(RawHtml.of(markdownOutput.substring(start)));
+            }
+        }
+
+        /*
+         * If a string contains a simple HTML paragraph, beginning with <p>
+         * and ending with </p> and optional whitespace, return the content
+         * of the paragraph between the tags.
+         * Otherwise, return the string unmodified.
+         */
+        private static String unwrap(String s) {
+            var prefix = "<p>";
+            if (s.startsWith(prefix)) {
+                var suffix = "</p>";
+                var suffixPos = s.indexOf(suffix);
+                if (suffixPos > 0) {
+                    var endSuffixPos = suffixPos + suffix.length();
+                    if (isBlank(s, endSuffixPos, s.length())) {
+                        return s.substring(prefix.length(), suffixPos);
+                    }
+                }
+            }
+            return s;
+        }
+
+        /**
+         * A renderer for Markdown {@code Heading} nodes, which represent
+         * both ATX headings (using {@code ####}) and Setext (using underlines).
+         * The mapping to HTML takes into account the context within the overall
+         * generated page, and automatically includes an id, to allow the heading
+         * to be referenced from elsewhere.
+         */
+        private class HeadingNodeRenderer extends AbstractVisitor implements NodeRenderer {
+            private final HtmlWriter htmlWriter;
+            private final HtmlNodeRendererContext context;
+
+            HeadingNodeRenderer(HtmlNodeRendererContext context) {
+                this.htmlWriter = context.getWriter();
+                this.context = context;
+            }
+
+            @Override
+            public Set<Class<? extends Node>> getNodeTypes() {
+                return Set.of(Heading.class);
+            }
+
+            @Override
+            public void render(Node node) {
+                node.accept(this);
+            }
+
+            @Override
+            public void visit(Heading heading) {
+                var htag = getTag(heading);
+                var id = getId(heading);
+
+                htmlWriter.line();
+                htmlWriter.tag(htag, Map.of("id", id.name()));
+                visitChildren(heading);
+                htmlWriter.tag('/' + htag);
+                htmlWriter.line();
+
+                if (includeHeadingInTableOfContents(htag)) {
+                    StringBuilder headingContent = new StringBuilder();
+                    new AbstractVisitor() {
+                        @Override
+                        public void visit(jdk.internal.org.commonmark.node.Code code) {
+                            headingContent.append(code.getLiteral());
+                            super.visit(code);
+                        }
+
+                        @Override
+                        public void visit(jdk.internal.org.commonmark.node.Text text) {
+                            headingContent.append(text.getLiteral());
+                            super.visit(text);
+                        }
+                    }.visit(heading);
+                    tableOfContents.addLink(id, Text.of(headingContent));
+                }
+            }
+
+            @Override
+            protected void visitChildren(Node parent) {
+                Node node = parent.getFirstChild();
+                while (node != null) {
+                    Node next = node.getNext();
+                    context.render(node);
+                    node = next;
+                }
+            }
+
+            private String getTag(Heading heading) {
+                // offset the heading level to allow for its position in the overall page
+                var eKind = element.getKind();
+                var offset = eKind.isField() || eKind.isExecutable() ? 3 // members
+                        : eKind != ElementKind.OTHER ? 1   // module, package, class, interface
+                        : 0; // doc file
+                return "h" + Math.min(heading.getLevel() + offset, 6);
+            }
+
+            private HtmlId getId(Heading heading) {
+                var list = new ArrayList<String>();
+                heading.accept(new AbstractVisitor() {
+                    @Override
+                    public void visit(jdk.internal.org.commonmark.node.Text text) {
+                        list.add(text.getLiteral());
+                    }
+
+                    @Override
+                    public void visit(Code code) {
+                        list.add(code.getLiteral());
+                    }
+                });
+                return htmlIds.forHeading(String.join(" ", list), headingIds);
+            }
+        }
+    }
+
+    /*
+     * Returns whether a substring of a string is blank.
+     * Avoid creating a substring or using regular expressions.
+     */
+    private static boolean isBlank(String s, int start, int end) {
+        for (int i = start; i < end; i++) {
+            if (!Character.isWhitespace(s.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     private class InlineVisitor extends SimpleDocTreeVisitor<Boolean, Content> {
         private final Element element;
         private final DocTree tag;
@@ -1406,6 +1746,12 @@ public abstract class HtmlDocletWriter {
             return false;
         }
 
+        @Override
+        public Boolean visitDocRoot(DocRootTree node, Content content) {
+            content.add(getInlineTagOutput(element, node, context));
+            return false;
+        }
+
         @Override
         public Boolean visitEndElement(EndElementTree node, Content content) {
             content.add(RawHtml.endElement(node.getName()));
@@ -1527,6 +1873,8 @@ public abstract class HtmlDocletWriter {
         for (DocTree docTree : trees.subList(trees.indexOf(node) + 1, trees.size())) {
             if (docTree instanceof TextTree text) {
                 sb.append(text.getBody());
+            } else if (docTree instanceof RawTextTree raw) {
+                sb.append(raw.getContent().replaceAll("[^A-Za-z0-9]+", " "));
             } else if (docTree instanceof LiteralTree literal) {
                 sb.append(literal.getBody().getBody());
             } else if (docTree instanceof IndexTree index) {
@@ -1568,12 +1916,18 @@ public abstract class HtmlDocletWriter {
                     new DocLink(path, id));
             configuration.indexBuilder.add(item);
         }
-        // Record second-level headings for use in table of contents
-        if (tableOfContents != null && node.getName().toString().equalsIgnoreCase("h2")) {
+        if (includeHeadingInTableOfContents(node.getName())) {
             tableOfContents.addLink(HtmlId.of(id), Text.of(headingContent));
         }
     }
 
+    private boolean includeHeadingInTableOfContents(CharSequence tag) {
+        // Record second-level headings for use in table of contents
+        // TODO: maybe extend this to all headings up to a given level
+        return tableOfContents != null
+                && tag.toString().equalsIgnoreCase("h2");
+    }
+
     /**
      * Returns true if relative links should be redirected.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java
index a976ad21548..f46765933cf 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java
@@ -29,7 +29,7 @@ import java.util.List;
 
 import javax.lang.model.element.Element;
 
-import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.SinceTree;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
@@ -107,7 +107,7 @@ public class NewAPIListWriter extends SummaryListWriter<NewAPIBuilder> {
                                 ? getTableCaption(headingKey)
                                 : Text.of(release),
                         element -> {
-                            List<? extends DocTree> since = getSinceTree(element);
+                            List<? extends SinceTree> since = utils.getBlockTags(element, SINCE, SinceTree.class);
                             if (since.isEmpty()) {
                                 return false;
                             }
@@ -130,10 +130,10 @@ public class NewAPIListWriter extends SummaryListWriter<NewAPIBuilder> {
 
     @Override
     protected Content getExtraContent(Element element) {
-        List<? extends DocTree> sinceTree = getSinceTree(element);
-        if (!sinceTree.isEmpty()) {
-            CommentHelper ch = utils.getCommentHelper(element);
-            return Text.of(ch.getBody(sinceTree.get(0)).toString());
+        var sinceTrees = utils.getBlockTags(element, SINCE, SinceTree.class);
+        if (!sinceTrees.isEmpty()) {
+            // assumes a simple string value with no formatting
+            return Text.of(sinceTrees.getFirst().getBody().getFirst().toString());
         }
         return Text.EMPTY;
     }
@@ -152,10 +152,6 @@ public class NewAPIListWriter extends SummaryListWriter<NewAPIBuilder> {
         return new HtmlStyle[]{ HtmlStyle.colSummaryItemName, HtmlStyle.colSecond, HtmlStyle.colLast };
     }
 
-    private List<? extends DocTree> getSinceTree(Element element) {
-        return utils.hasDocCommentTree(element) ? utils.getBlockTags(element, SINCE) : List.of();
-    }
-
     private static String getHeading(HtmlConfiguration configuration) {
         String label = configuration.getOptions().sinceLabel();
         return label == null ? configuration.docResources.getText("doclet.New_API") : label;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
index 0b4e9580efb..45985532ad6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,6 @@ import java.util.TreeMap;
 import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
-import javax.lang.model.element.Element;
-
 import com.sun.source.doctree.DocTree;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
@@ -44,7 +42,7 @@ import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.toolkit.DocletElement;
+import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.OverviewElement;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
@@ -60,7 +58,7 @@ public class SystemPropertiesWriter extends HtmlDocletWriter {
     /**
      * Cached contents of {@code <title>...</title>} tags of the HTML pages.
      */
-    final Map<Element, String> titles = new WeakHashMap<>();
+    final Map<DocFileElement, String> titles = new WeakHashMap<>();
 
     /**
      * Constructs SystemPropertiesWriter object.
@@ -133,29 +131,26 @@ public class SystemPropertiesWriter extends HtmlDocletWriter {
 
     private Content createLink(IndexItem i) {
         assert i.getDocTree().getKind() == DocTree.Kind.SYSTEM_PROPERTY : i;
-        Element element = i.getElement();
+        var element = i.getElement();
         if (element instanceof OverviewElement) {
             return links.createLink(pathToRoot.resolve(i.getUrl()),
                     resources.getText("doclet.Overview"));
-        } else if (element instanceof DocletElement e) {
-            // Implementations of DocletElement do not override equals and
-            // hashCode; putting instances of DocletElement in a map is not
-            // incorrect, but might well be inefficient
-            String t = titles.computeIfAbsent(element, utils::getHTMLTitle);
+        } else if (element instanceof DocFileElement e) {
+            var fo = e.getFileObject();
+            var t = titles.computeIfAbsent(e, this::getFileTitle);
             if (t.isBlank()) {
                 // The user should probably be notified (a warning?) that this
                 // file does not have a title
-                Path p = Path.of(e.getFileObject().toUri());
+                var p = Path.of(fo.toUri());
                 t = p.getFileName().toString();
             }
-            ContentBuilder b = new ContentBuilder();
-            b.add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")));
-            // non-program elements should be displayed using a normal font
-            b.add(t);
+            var b = new ContentBuilder()
+                    .add(HtmlTree.CODE(Text.of(i.getHolder() + ": ")))
+                    .add(t);
             return links.createLink(pathToRoot.resolve(i.getUrl()), b);
         } else {
             // program elements should be displayed using a code font
-            Content link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
+            var link = links.createLink(pathToRoot.resolve(i.getUrl()), i.getHolder());
             return HtmlTree.CODE(link);
         }
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java
index 34573dd7794..b059b0fdb36 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -75,6 +75,13 @@ public class ContentBuilder extends Content {
         return this;
     }
 
+    /**
+     * {@return the contents of this builder}
+     */
+    public List<Content> getContents() {
+        return contents;
+    }
+
     @Override
     public boolean write(Writer writer, String newline, boolean atNewline) throws IOException {
         for (Content content: contents) {
@@ -100,6 +107,11 @@ public class ContentBuilder extends Content {
         return n;
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return contents.stream().allMatch(Content::isPhrasingContent);
+    }
+
     private void ensureMutableContents() {
         if (contents.isEmpty())
             contents = new ArrayList<>();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
index c96063d703f..542e081a583 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
@@ -68,6 +68,11 @@ public class Entity extends Content {
         return false;
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return true;
+    }
+
     @Override
     public int charCount() {
         return 1;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
index 0ec4033a929..57adb966326 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
@@ -233,6 +233,20 @@ public class HtmlTree extends Content {
         return this;
     }
 
+    /**
+     * {@return the attributes of this node}
+     */
+    public Map<HtmlAttr, String> getAttrs() {
+        return attrs;
+    }
+
+    /**
+     * {@return the contents of this node}
+     */
+    public List<Content> getContents() {
+        return content;
+    }
+
     /**
      * Adds each of a collection of items, using a map function to create the content for each item.
      *
@@ -1009,6 +1023,11 @@ public class HtmlTree extends Content {
         return (!hasContent() && !hasAttrs());
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return tagName.phrasingContent;
+    }
+
     /**
      * Returns true if the HTML tree has content.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java
index 5127be87ccd..a71ea7831da 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@ package jdk.javadoc.internal.doclets.formats.html.markup;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import jdk.javadoc.internal.doclets.formats.html.Content;
 
@@ -55,6 +57,16 @@ public class RawHtml extends Content {
         };
     }
 
+    /**
+     * Creates HTML for a fragment of Markdown output.
+     *
+     * @param markdownOutput the fragment
+     * @return the HTML
+     */
+    public static RawHtml markdown(CharSequence markdownOutput) {
+        return of(markdownOutput);
+    }
+
     /**
      * Creates HTML for the start of an element.
      *
@@ -129,6 +141,24 @@ public class RawHtml extends Content {
         return rawHtmlContent.isEmpty();
     }
 
+    Pattern tag = Pattern.compile("<(?<tag>[A-Za-z0-9]+)(\\s|>)");
+    @Override
+    public boolean isPhrasingContent() {
+        Matcher m = tag.matcher(rawHtmlContent);
+        while (m.find()) {
+            try {
+                var tn = TagName.of(m.group("tag"));
+                if (!tn.phrasingContent) {
+                    return false;
+                }
+            } catch (IllegalArgumentException e) {
+                // unknown tag
+                return false;
+            }
+        }
+        return true;
+    }
+
     @Override
     public String toString() {
         return rawHtmlContent;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
index 67635e18377..d849c2f1798 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
@@ -25,6 +25,8 @@
 
 package jdk.javadoc.internal.doclets.formats.html.markup;
 
+import java.util.Locale;
+
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 
 /**
@@ -34,20 +36,20 @@ import jdk.javadoc.internal.doclets.toolkit.util.Utils;
  * @see <a href="https://www.w3.org/TR/html51/syntax.html#tag-name">HTML 5.1: Tag Name</a>
  */
 public enum TagName {
-    A,
+    A(true),
     ASIDE,
-    BUTTON,
+    BUTTON(true),
     BLOCKQUOTE,
     BODY,
-    BR,
+    BR(true),
     CAPTION,
-    CODE,
+    CODE(true),
     DD,
     DETAILS,
     DIV,
     DL,
     DT,
-    EM,
+    EM(true),
     FOOTER,
     FORM,
     H1,
@@ -60,29 +62,29 @@ public enum TagName {
     HEADER,
     HR,
     HTML,
-    I,
-    IMG,
-    INPUT,
-    LABEL,
+    I(true),
+    IMG(true),
+    INPUT(true),
+    LABEL(true),
     LI,
     LISTING,
-    LINK,
+    LINK(true),
     MAIN,
     MENU,
     META,
     NAV,
-    NOSCRIPT,
+    NOSCRIPT(true),
     OL,
     P,
     PRE,
-    SCRIPT,
+    SCRIPT(true),
     SECTION,
-    SMALL,
-    SPAN,
-    STRONG,
-    SUB,
+    SMALL(true),
+    SPAN(true),
+    STRONG(true),
+    SUB(true),
     SUMMARY,
-    SUP,
+    SUP(true),
     TABLE,
     TBODY,
     THEAD,
@@ -91,15 +93,26 @@ public enum TagName {
     TITLE,
     TR,
     UL,
-    WBR;
+    WBR(true);
 
     public final String value;
+    public final boolean phrasingContent;
+
+    static TagName of(String s) {
+        return valueOf(s.toUpperCase(Locale.ROOT));
+    }
 
     TagName() {
+        this(false);
+    }
+
+    TagName(boolean phrasingContent) {
         this.value = Utils.toLowerCase(name());
+        this.phrasingContent = phrasingContent;
     }
 
     public String toString() {
         return value;
     }
+
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java
index b96d86577a6..e05ca73001a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, 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
@@ -66,6 +66,11 @@ public class Text extends Content {
         return string.isEmpty();
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return true;
+    }
+
     @Override
     public int charCount() {
         return charCount(string);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java
index 5baa581450a..6c4d66024c5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, 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
@@ -41,14 +41,14 @@ public class TextBuilder extends Content {
     private final StringBuilder stringBuilder;
 
     /**
-     * Constructor to construct StringContent object.
+     * Constructor to construct an empty TextBuilder object.
      */
     public TextBuilder() {
         stringBuilder = new StringBuilder();
     }
 
     /**
-     * Constructor to construct StringContent object with some initial content.
+     * Constructor to construct a TextBuilder object with some initial content.
      *
      * @param initialContent initial content for the object
      */
@@ -58,7 +58,7 @@ public class TextBuilder extends Content {
     }
 
     /**
-     * Adds content for the StringContent object.
+     * Adds content for the TextBuilder object.
      *
      * @param strContent string content to be added
      */
@@ -74,6 +74,11 @@ public class TextBuilder extends Content {
         return (stringBuilder.length() == 0);
     }
 
+    @Override
+    public boolean isPhrasingContent() {
+        return true;
+    }
+
     @Override
     public int charCount() {
         return stringBuilder.length();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java
index 8e029c5fbb5..9052b1a49aa 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -158,7 +158,7 @@ public class SeeTaglet extends BaseTaglet implements InheritableTaglet {
         assert !ref.isEmpty();
         DocTree ref0 = ref.get(0);
         switch (ref0.getKind()) {
-            case TEXT, START_ELEMENT -> {
+            case TEXT, MARKDOWN, START_ELEMENT -> {
                 // @see "Reference"
                 // @see <a href="...">...</a>
                 return htmlWriter.commentTagsToContent(element, ref, false, false);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
index e7a7620e5eb..e55ede7a7e1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -37,16 +37,18 @@ import javax.lang.model.element.ExecutableElement;
 
 import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.SpecTree;
-import com.sun.source.doctree.TextTree;
 import com.sun.source.util.DocTreePath;
 
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.Contents;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
+import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
 import jdk.javadoc.internal.doclets.formats.html.markup.Text;
 import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.doclets.formats.html.markup.TextBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
@@ -122,14 +124,35 @@ public class SpecTaglet extends BaseTaglet implements InheritableTaglet {
         List<? extends DocTree> specTreeLabel = specTree.getTitle();
         Content label = htmlWriter.commentTagsToContent(holder, specTreeLabel, tagletWriter.context.isFirstSentence);
         return getExternalSpecContent(holder, specTree, specTreeURL,
-                textOf(specTreeLabel).replaceAll("\\s+", " "), label);
+                textOf(label).replaceAll("\\s+", " "), label);
     }
 
-    private String textOf(List<? extends DocTree> trees) {
-        return trees.stream()
-                .filter(dt -> dt instanceof TextTree)
-                .map(dt -> ((TextTree) dt).getBody().trim())
-                .collect(Collectors.joining(" "));
+    // this is here, for now, but might be a useful addition elsewhere,
+    // perhaps as a method on Content
+    private String textOf(Content c) {
+        return appendText(new StringBuilder(), c).toString();
+    }
+
+    private StringBuilder appendText(StringBuilder sb, Content c) {
+        if (c instanceof ContentBuilder cb) {
+            appendText(sb, cb.getContents());
+        } else if (c instanceof HtmlTree ht) {
+            appendText(sb, ht.getContents());
+        } else if (c instanceof RawHtml rh) {
+            sb.append(rh.toString().replaceAll("<[^>]*>", ""));
+        } else if (c instanceof TextBuilder tb) {
+            sb.append(tb.toString());
+        } else if (c instanceof Text t) {
+            sb.append(t.toString());
+        } else if (c instanceof Entity e) {
+            sb.append(e.toString());
+        }
+        return sb;
+    }
+
+    private StringBuilder appendText(StringBuilder sb, List<? extends Content> contents) {
+        contents.forEach(c -> appendText(sb, c));
+        return sb;
     }
 
     Content getExternalSpecContent(Element holder,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
index db8b855eb72..f10bd27d35c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -567,7 +567,7 @@ public abstract class BaseConfiguration {
 
     //<editor-fold desc="DocLint support">
 
-    private DocLint doclint;
+    protected DocLint doclint;
 
     Map<CompilationUnitTree, Boolean> shouldCheck = new HashMap<>();
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
index e0889a84da5..b123e6f2556 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -626,7 +626,7 @@ public class CommentUtils {
 
     public DocCommentTree parse(URI uri, String text) {
         return trees.getDocCommentTree(new SimpleJavaFileObject(
-                uri, JavaFileObject.Kind.SOURCE) {
+                uri, JavaFileObject.Kind.HTML) {
             @Override @DefinedBy(Api.COMPILER)
             public CharSequence getCharContent(boolean ignoreEncoding) {
                 return text;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocFileElement.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocFileElement.java
index 3975bd7f3d9..35fb0dfab1d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocFileElement.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/DocFileElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package jdk.javadoc.internal.doclets.toolkit;
 
+import java.util.Objects;
+
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.PackageElement;
@@ -43,7 +45,7 @@ public class DocFileElement implements DocletElement {
     private final FileObject fo;
 
     /**
-     * Creates a pseudo-element that wraps a {@code doc-files} HTML file.
+     * Creates a pseudo-element that wraps a {@code doc-files} documentation file.
      *
      * @param utils the standard utilities class
      * @param element the module element or package element that "owns" the {@code doc-files} subdirectory
@@ -89,5 +91,18 @@ public class DocFileElement implements DocletElement {
     public Kind getSubKind() {
         return Kind.DOCFILE;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DocFileElement that = (DocFileElement) o;
+        return element.equals(that.element) && fo.equals(that.fo);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(element, fo);
+    }
 }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
index 37965f56c5f..033703e073f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ import com.sun.source.doctree.LinkTree;
 import com.sun.source.doctree.LiteralTree;
 import com.sun.source.doctree.ParamTree;
 import com.sun.source.doctree.ProvidesTree;
+import com.sun.source.doctree.RawTextTree;
 import com.sun.source.doctree.ReferenceTree;
 import com.sun.source.doctree.ReturnTree;
 import com.sun.source.doctree.SeeTree;
@@ -428,6 +429,12 @@ public class CommentHelper {
                 return node.getDescription();
             }
 
+            @Override
+            public List<? extends DocTree> visitRawText(RawTextTree node, Void p) {
+                // not ideal, but better than returning an empty list
+                return asList(node.getContent());
+            }
+
             @Override
             public List<? extends DocTree> visitReturn(ReturnTree node, Void p) {
                 return node.getDescription();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/NewAPIBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/NewAPIBuilder.java
index 171abf44be6..0220f6155a3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/NewAPIBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/NewAPIBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,8 @@
 
 package jdk.javadoc.internal.doclets.toolkit.util;
 
-import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.SinceTree;
+
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
 
 import javax.lang.model.element.Element;
@@ -54,11 +55,13 @@ public class NewAPIBuilder extends SummaryAPIListBuilder {
         if (!utils.hasDocCommentTree(e)) {
             return false;
         }
-        List<? extends DocTree> since = utils.getBlockTags(e, SINCE);
-        if (since.isEmpty()) {
+        var sinceTrees = utils.getBlockTags(e, SINCE, SinceTree.class);
+        if (sinceTrees.isEmpty()) {
             return false;
         }
-        CommentHelper ch = utils.getCommentHelper(e);
-        return since.stream().anyMatch(tree -> releases.contains(ch.getBody(tree).toString()));
+
+        // assumes a simple string value with no formatting
+        return sinceTrees.stream()
+                .anyMatch(tree -> releases.contains(tree.getBody().getFirst().toString()));
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
index 7606de59341..c29feec1712 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -97,7 +97,6 @@ import com.sun.source.doctree.DeprecatedTree;
 import com.sun.source.doctree.DocCommentTree;
 import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.DocTree.Kind;
-import com.sun.source.doctree.EndElementTree;
 import com.sun.source.doctree.ParamTree;
 import com.sun.source.doctree.ProvidesTree;
 import com.sun.source.doctree.ReturnTree;
@@ -106,8 +105,6 @@ import com.sun.source.doctree.SerialDataTree;
 import com.sun.source.doctree.SerialFieldTree;
 import com.sun.source.doctree.SerialTree;
 import com.sun.source.doctree.SpecTree;
-import com.sun.source.doctree.StartElementTree;
-import com.sun.source.doctree.TextTree;
 import com.sun.source.doctree.ThrowsTree;
 import com.sun.source.doctree.UsesTree;
 import com.sun.source.tree.CompilationUnitTree;
@@ -1331,38 +1328,6 @@ public class Utils {
         return secondaryCollator.compare(s1, s2);
     }
 
-    public String getHTMLTitle(Element element) {
-        List<? extends DocTree> preamble = getPreamble(element);
-        StringBuilder sb = new StringBuilder();
-        boolean titleFound = false;
-        loop:
-        for (DocTree dt : preamble) {
-            switch (dt.getKind()) {
-                case START_ELEMENT -> {
-                    StartElementTree nodeStart = (StartElementTree) dt;
-                    if (Utils.toLowerCase(nodeStart.getName().toString()).equals("title")) {
-                        titleFound = true;
-                    }
-                }
-                case END_ELEMENT -> {
-                    EndElementTree nodeEnd = (EndElementTree) dt;
-                    if (Utils.toLowerCase(nodeEnd.getName().toString()).equals("title")) {
-                        break loop;
-                    }
-                }
-                case TEXT -> {
-                    TextTree nodeText = (TextTree) dt;
-                    if (titleFound)
-                        sb.append(nodeText.getBody());
-                }
-                default -> {
-                }
-                // do nothing
-            }
-        }
-        return sb.toString().trim();
-    }
-
     private static class DocCollator {
         private final Map<String, CollationKey> keys;
         private final Collator instance;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
index 7bc63369903..559e520c7c9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -75,6 +75,7 @@ import com.sun.source.doctree.LinkTree;
 import com.sun.source.doctree.LiteralTree;
 import com.sun.source.doctree.ParamTree;
 import com.sun.source.doctree.ProvidesTree;
+import com.sun.source.doctree.RawTextTree;
 import com.sun.source.doctree.ReferenceTree;
 import com.sun.source.doctree.ReturnTree;
 import com.sun.source.doctree.SerialDataTree;
@@ -311,6 +312,12 @@ public class Checker extends DocTreePathScanner<Void, Void> {
         env.messages.report(REFERENCE, Kind.WARNING, env.currPath.getLeaf(), code, args);
     }
 
+    @Override
+    public Void scan(DocTreePath path, Void unused) {
+        // interposition point for all scans
+        return super.scan(path, unused);
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitDocComment(DocCommentTree tree, Void ignore) {
         scan(tree.getFirstSentence(), ignore);
@@ -1006,8 +1013,11 @@ public class Checker extends DocTreePathScanner<Void, Void> {
             env.messages.warning(REFERENCE, tree, "dc.exists.return");
         }
         if (tree.isInline()) {
-            DocCommentTree dct = getCurrentPath().getDocComment();
-            if (dct.getFirstSentence().isEmpty() || tree != dct.getFirstSentence().get(0)) {
+            var dct = getCurrentPath().getDocComment();
+            var first = dct.getFirstSentence().stream()
+                    .filter(t -> !isBlank(t))
+                    .findFirst();
+            if (first.isEmpty() || first.get() != tree) {
                 env.messages.warning(SYNTAX, tree, "dc.return.not.first");
             }
         }
@@ -1021,6 +1031,14 @@ public class Checker extends DocTreePathScanner<Void, Void> {
         return super.visitReturn(tree, ignore);
     }
 
+    private static boolean isBlank(DocTree t) {
+        return switch (t.getKind()) {
+            case TEXT -> ((TextTree) t).getBody().isBlank();
+            case MARKDOWN -> ((RawTextTree) t).getContent().isBlank();
+            default -> false;
+        };
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitSerialData(SerialDataTree tree, Void ignore) {
         warnIfEmpty(tree, tree.getDescription());
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
index f576da1d485..f2940963f17 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,8 @@
 
 package jdk.javadoc.internal.doclint;
 
-
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -45,7 +43,6 @@ import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
@@ -61,7 +58,6 @@ import com.sun.source.util.TreePath;
 import com.sun.tools.javac.model.JavacTypes;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.MatchingUtils;
-import com.sun.tools.javac.util.StringUtils;
 import jdk.javadoc.internal.tool.AccessLevel;
 
 /**
@@ -135,6 +131,7 @@ public class Env {
         this.trees = trees;
         this.elements = elements;
         this.types = types;
+
     }
 
     void initTypes() {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
index 6407196a2ab..4422c2caa27 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
@@ -54,6 +54,7 @@ import com.sun.tools.javac.main.Arguments;
 import com.sun.tools.javac.util.ClientCodeException;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.ModuleHelper;
 import com.sun.tools.javac.util.StringUtils;
 
 import jdk.internal.opt.CommandLine;
@@ -561,6 +562,17 @@ public class Start {
             }
         }
 
+        // Allow doclets to access internal API if the appropriate
+        // option is given on the command line.
+        // A better solution would be to modify the javadoc API to
+        // permit an instance of an appropriately configured instance
+        // of a doclet to be specified instead of the name of the
+        // doclet class and optional doclet path.
+        // See https://bugs.openjdk.org/browse/JDK-8263219
+        if (options.compilerOptions().isSet("accessInternalAPI")) {
+            ModuleHelper.addExports(ModuleHelper.class.getModule(), doclet.getClass().getModule());
+        }
+
         JavadocTool comp = JavadocTool.make0(context);
         if (comp == null) return ABNORMAL;
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOptions.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOptions.java
index d478e878a5c..17bf628114a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOptions.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -402,6 +402,13 @@ public class ToolOptions {
                 }
             },
 
+            new ToolOption("--disable-line-doc-comments", EXTENDED) {
+                @Override
+                public void process() throws InvalidValueException {
+                    processCompilerOption(Option.DISABLE_LINE_DOC_COMMENTS, primaryName);
+                }
+            },
+
             // ----- doclet options -----
 
             // This option exists so that it is documented in the command-line help.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
index ef9425a02be..7db420e46d5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
@@ -270,6 +270,10 @@ main.opt.patch.module.desc=\
     Override or augment a module with classes and resources in\n\
     JAR files or directories
 
+main.opt.disable.line.doc.comments.desc=\
+    Disable support for documentation comments with lines\n\
+    beginning '///'
+
 main.Xusage.foot=\n\
 These options are non-standard and subject to change without notice.
 
diff --git a/src/jdk.javadoc/share/classes/module-info.java b/src/jdk.javadoc/share/classes/module-info.java
index ee84482204a..422707e7fbd 100644
--- a/src/jdk.javadoc/share/classes/module-info.java
+++ b/src/jdk.javadoc/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -52,15 +52,15 @@
  * @provides javax.tools.DocumentationTool
  * @provides javax.tools.Tool
  *
- *
  * @moduleGraph
  * @since 9
  */
 module jdk.javadoc {
-    requires java.xml;
 
     requires transitive java.compiler;
     requires transitive jdk.compiler;
+
+    requires jdk.internal.md;
     requires jdk.internal.opt;
 
     exports jdk.javadoc.doclet;
diff --git a/src/jdk.javadoc/share/man/javadoc.1 b/src/jdk.javadoc/share/man/javadoc.1
index 8c149ff58f0..73d12efbf30 100644
--- a/src/jdk.javadoc/share/man/javadoc.1
+++ b/src/jdk.javadoc/share/man/javadoc.1
@@ -154,6 +154,8 @@ descriptions of using these options:
 .IP \[bu] 2
 \f[V]--class-path\f[R], \f[V]-classpath\f[R], or \f[V]-cp\f[R]
 .IP \[bu] 2
+\f[V]--disable-line-doc-comments\f[R]
+.IP \[bu] 2
 \f[V]--enable-preview\f[R]
 .IP \[bu] 2
 \f[V]-encoding\f[R]
@@ -182,26 +184,41 @@ The following options are the core \f[V]javadoc\f[R] options that are
 not equivalent to a corresponding \f[V]javac\f[R] option:
 .TP
 \f[V]-breakiterator\f[R]
-Computes the first sentence with \f[V]BreakIterator\f[R].
-The first sentence is copied to the package, class, or member summary
-and to the alphabetic index.
-The \f[V]BreakIterator\f[R] class is used to determine the end of a
-sentence for all languages except for English.
-.RS
-.IP \[bu] 2
-English default sentence-break algorithm --- Stops at a period followed
-by a space or an HTML block tag, such as \f[V]<P>\f[R].
-.IP \[bu] 2
-Breakiterator sentence-break algorithm --- Stops at a period, question
+Computes the first sentence of the description in a documentation
+comment using an instance of \f[V]java.text.BreakIterator\f[R] to detect
+\f[I]sentence breaks\f[R].
+The rules that are used depend on the \f[B]current locale\f[R]: for
+example, for English, a sentence break occurs after a period, question
 mark, or exclamation point followed by a space when the next word starts
 with a capital letter.
-This is meant to handle most abbreviations (such as \[dq]The serial no.
+(This is meant to handle most abbreviations, such as \[dq]The serial no.
 is valid\[dq], but will not handle \[dq]Mr.
-Smith\[dq]).
-The \f[V]-breakiterator\f[R] option doesn\[aq]t stop at HTML tags or
-sentences that begin with numbers or symbols.
-The algorithm stops at the last period in \f[V]../filename\f[R], even
-when embedded in an HTML tag.
+Smith\[dq].)
+.RS
+.PP
+The option is enabled by default if the language of the current locale
+is not English.
+If the language of the current locale is English, and the
+\f[V]-breakiterator\f[R] option is not given, a simple default algorithm
+is used, which just looks for a period followed by a space.
+.PP
+In a traditional \f[V]/**...*/\f[R] comment, the search for the end of
+the first sentence is terminated by an HTML block tag, such as
+\f[V]<p>\f[R], \f[V]<pre>\f[R], or the tag for a heading.
+.PP
+In a Markdown \f[V]///\f[R] comment, the search for the end of the first
+sentence skips over any characters enclosed in code spans and links, and
+is terminated by the end of the initial block, as indicated by a blank
+line or the beginning of the next block, such as a list, thematic break,
+or an HTML block.
+.PP
+The first sentence of the description in a documentation comment is used
+in summary tables, index pages, and other situations where a short
+summary is required.
+For more explicit control in any individual documentation comment,
+enclose the contents of the first sentence in a
+\f[V]{\[at]summary ...}\f[R] tag, or when applicable, in a
+\[ga]{\[at]return ...} tag.
 .RE
 .TP
 \f[V]-doclet\f[R] \f[I]class\f[R]
@@ -505,8 +522,7 @@ Allow JavaScript in documentation comments, and options whose value is
 \f[I]html-code\f[R].
 .TP
 \f[V]-author\f[R]
-Includes the text of any \f[V]author\f[R] tags in the generated
-documentation.
+Includes the \f[V]\[at]author\f[R] text in the generated docs.
 .TP
 \f[V]-bottom\f[R] \f[I]html-code\f[R]
 Specifies the text to be placed at the bottom of each generated page.
@@ -970,8 +986,8 @@ is used.
 .RE
 .TP
 \f[V]-nosince\f[R]
-Omits from the generated documentation the \f[V]Since\f[R] sections
-derived from any \f[V]since\f[R] tags.
+Omits from the generated documents the \f[V]Since\f[R] sections
+associated with the \f[V]\[at]since\f[R] tags.
 .TP
 \f[V]-notimestamp\f[R]
 Suppresses the time stamp, which is hidden in an HTML comment in the
@@ -994,34 +1010,30 @@ Documents overridden methods in the detail or summary sections.
 The default is \f[V]detail\f[R].
 .TP
 \f[V]-overview\f[R] \f[I]filename\f[R]
-Specifies that the \f[V]javadoc\f[R] tool should retrieve the text for
-the overview documentation from the source file specified by
-\f[V]filename\f[R] and place it on the Overview page
+Specifies that the \f[V]javadoc\f[R] tool should retrieve the content
+for the overview documentation from the file specified by
+\f[I]filename\f[R] and place it on the Overview page
 (\f[V]overview-summary.html\f[R]).
-A relative path specified with the file name is relative to the current
-working directory.
+If the \f[I]filename\f[R] is a relative path, it is evaluated relative
+to the current working directory.
 .RS
 .PP
-While you can use any name you want for the \f[I]filename\f[R] value and
-place it anywhere you want, it is typical to name it
-\f[V]overview.html\f[R] and place it in the source tree at the directory
-that contains the topmost package directories.
-In this location, no path is needed when documenting packages, because
-the \f[V]-sourcepath\f[R] option points to this file.
-.IP \[bu] 2
-\f[B]Linux and macOS:\f[R] For example, if the source tree for the
-\f[V]java.lang\f[R] package is \f[V]src/classes/java/lang/\f[R], then
-you could place the overview file at
-\f[V]src/classes/overview.html\f[R].
-.IP \[bu] 2
-\f[B]Windows:\f[R] For example, if the source tree for the
-\f[V]java.lang\f[R] package is
-\f[V]src\[rs]classes\[rs]java\[rs]lang\[rs]\f[R], then you could place
-the overview file at \f[V]src\[rs]classes\[rs]overview.html\f[R]
+The file may be an HTML file, with a filename ending in \f[V].html\f[R],
+or a Markdown file, with a filename ending in \f[V].md\f[R].
+.PD 0
+.P
+.PD
+If the file is an HTML file, the content for the overview documentation
+is taken from the \f[V]<main>\f[R] element in the file, if one is
+present, or from the \f[V]<body>\f[R] element is there is no
+\f[V]<main>\f[R] element.
+If the file is a Markdown file, the entire content of the file is used.
 .PP
-The overview page is created only when you pass two or more package
-names to the \f[V]javadoc\f[R] tool.
 The title on the overview page is set by \f[V]-doctitle\f[R].
+.PP
+\f[I]Note:\f[R] older versions of the \f[V]javadoc\f[R] tool assumed
+that any use of this option was for an HTML file, and allowed any
+extension for the \f[I]filename\f[R].
 .RE
 .TP
 \f[V]-serialwarn\f[R]
@@ -1201,11 +1213,10 @@ To access the generated Use page, go to the class or package and click
 the \f[B]USE\f[R] link in the navigation bar.
 .TP
 \f[V]-version\f[R]
-Includes the text of any \f[V]version\f[R] tags in the generated
-documentation.
+Includes the version text in the generated docs.
 This text is omitted by default.
-Note: To find out what version of the \f[V]javadoc\f[R] tool you are
-using, use the \f[V]--version\f[R] option (with two hyphens).
+To find out what version of the \f[V]javadoc\f[R] tool you are using,
+use the \f[V]--version\f[R] option (with two hyphens).
 .TP
 \f[V]-windowtitle\f[R] \f[I]title\f[R]
 Specifies the title to be placed in the HTML \f[V]<title>\f[R] tag.
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/DivTaglet.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/DivTaglet.java
new file mode 100644
index 00000000000..91cf8d25f91
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/DivTaglet.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.UnknownInlineTagTree;
+
+import jdk.javadoc.doclet.Taglet;
+
+/**
+ * An inline taglet that generates output in a {@code <div>} element.
+ */
+public class DivTaglet implements Taglet {
+    @Override
+    public String getName() {
+        return "div";
+    }
+
+    @Override
+    public Set<Location> getAllowedLocations() {
+        return Set.of(Location.values());
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return true;
+    }
+
+    @Override
+    public String toString(List<? extends DocTree> trees, Element e) {
+        var children = ((UnknownInlineTagTree) trees.get(0)).getContent();
+        return "<div>"
+                + children.stream().map(DocTree::toString).collect(Collectors.joining())
+                + "</div>";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/SpanTaglet.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/SpanTaglet.java
new file mode 100644
index 00000000000..20e8d109fa4
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/SpanTaglet.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.UnknownInlineTagTree;
+
+import jdk.javadoc.doclet.Taglet;
+
+/**
+ * An inline taglet that generates output in a {@code <span>} element.
+ */
+public class SpanTaglet implements Taglet {
+    @Override
+    public String getName() {
+        return "span";
+    }
+
+    @Override
+    public Set<Location> getAllowedLocations() {
+        return Set.of(Location.values());
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return true;
+    }
+
+    @Override
+    public String toString(List<? extends DocTree> trees, Element e) {
+        var children = ((UnknownInlineTagTree) trees.get(0)).getContent();
+        return "<span>"
+                + children.stream().map(DocTree::toString).collect(Collectors.joining())
+                + "</span>";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdown.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdown.java
new file mode 100644
index 00000000000..1ee5bb2f4b3
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdown.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2022, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdown
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdown extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdown();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testMinimal(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Hello, _Markdown_ world!
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block">Hello, <em>Markdown</em> world!</div>
+                    """);
+    }
+
+    @Test
+    public void testMarkdownList(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Before list.
+                    ///
+                    /// * item 1
+                    /// * item 2
+                    /// * item 3
+                    ///
+                    /// After list.
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOrder("p/C.html",
+                """
+                    <p>Before list.</p>
+                    <ul>
+                    <li>item 1</li>
+                    <li>item 2</li>
+                    <li>item 3</li>
+                    </ul>
+                    <p>After list.</p>
+                    """);
+    }
+
+    @Test
+    public void testMarkdownList2(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Before list.
+                    ///
+                    /// - item 1
+                    /// - item 2
+                    /// - item 3
+                    ///
+                    /// After list.
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOrder("p/C.html",
+                """
+                    <p>Before list.</p>
+                    <ul>
+                    <li>item 1</li>
+                    <li>item 2</li>
+                    <li>item 3</li>
+                    </ul>
+                    <p>After list.</p>
+                    """);
+    }
+
+    @Test
+    public void testFont(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Regular, `Monospace`, _italic_, and **bold** font.
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Regular, <code>Monospace</code>, <em>italic</em>, and <strong>bold</strong> font.""");
+    }
+
+    @Test
+    public void testFFFC(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence. 1{@code 1}1 \ufffc 2{@code 2}2
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block">First sentence. 1<code>1</code>1 \ufffc 2<code>2</code>2</div>
+                    """);
+    }
+
+    @Test
+    public void testEscape(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                // In the following, note the need to double the escape character,
+                // so that the comment contains a single escape to precede the backtick.
+                // Also, note that because the first backtick is escaped, the comment
+                // is as-if there are two unmatched backticks, with an inline tag
+                // between them, and not a code span enclosing literal text.
+                """
+                    package p;
+                    public class C {
+                        /// Abc \\` def {@code xyz} ghi ` jkl.
+                        /// More.
+                        public void m() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <span class="element-name">m</span>()</div>
+                    <div class="block">Abc ` def <code>xyz</code> ghi ` jkl.
+                    More.</div>""");
+    }
+
+    @Test
+    public void testBacktickAt(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        // in the following, note that the @ following the backtick
+        // is just a literal character and not part of any tag
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// First sentence.
+                        /// Abc `@' def.
+                        /// More.
+                        public void m() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:syntax", // enable check for "no tag after '@'
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput(Output.OUT, false,
+                "C.java:4: error: no tag name after '@'",
+                "unknown tag");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block">First sentence.
+                    Abc `@' def.
+                    More.</div>
+                    </div>""");
+    }
+
+    @Test
+    public void testAnnos(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        // in the following, note that the @ following the backtick
+        // is just a literal character and not part of any tag
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// First sentence.
+                        /// 1.  list item
+                        ///
+                        ///     \\@Anno1 plain
+                        ///
+                        ///     abc `
+                        ///     @Anno2 in span
+                        ///     `
+                        ///
+                        ///     ```
+                        ///     @Anno3 fenced
+                        ///     ```
+                        ///
+                        ///         @Anno4 indented
+                        ///
+                        ///     end of list item
+                        ///
+                        /// end
+                        public void m() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:syntax", // enable check for "no tag after '@'
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput(Output.OUT, false,
+                "C.java:4: error: no tag name after '@'",
+                "unknown tag");
+
+        checkOutput("p/C.html", true,
+                """
+                    <ol>
+                    <li>
+                    <p>list item</p>
+                    <p>@Anno1 plain</p>
+                    <p>abc <code>@Anno2 in span</code></p>
+                    <pre><code>@Anno3 fenced
+                    </code></pre>
+                    <pre><code>@Anno4 indented
+                    </code></pre>
+                    <p>end of list item</p>
+                    </li>
+                    </ol>
+                    <p>end</p>
+                    """);
+
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeBlocks.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeBlocks.java
new file mode 100644
index 00000000000..8f1c76b9e47
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeBlocks.java
@@ -0,0 +1,489 @@
+/*
+ * Copyright (c) 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownCodeBlocks
+ */
+
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+/**
+ * Tests Markdown code blocks.
+ *
+ * Code blocks may be either "fenced code blocks" or "indented code blocks".
+ * Within a code block, all text is "literal text" and not interpreted as
+ * Markdown, HTML or javadoc tags.
+ *
+ * In the various test cases, javadoc tags are used as a way to determine
+ * if the parser is correctly interpreting the text in its surrounding context.
+ * Within a code block, character sequences resembling a tag are treated as
+ * literal text, and appear "as is" in the generated output. Outside a
+ * code block, character sequences resembling a tag are treated as tags and
+ * are translated as appropriate in the generated output.
+ *
+ * A primary consideration in the test cases is use and handling of indentation,
+ * especially as it relates to lists and nested lists.
+ */
+public class TestMarkdownCodeBlocks extends JavadocTester {
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownCodeBlocks();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testCodeBlocks(Path base) throws Exception {
+        // Test cases provide a fragment of content for a documentation comment
+        // and a corresponding fragment of content to be found in the generated output.
+        // The name of each member is used to generate the name of a declaration
+        // with which the documentation comment is associated.
+        enum TestCase {
+            SIMPLE_INDENT(
+                    """
+
+                            {@code CODE}
+                            @Anno
+
+                        end""",
+                    """
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        <p>end</p>"""),
+
+            SIMPLE_FENCE_BACKTICK(
+                    """
+                        ```
+                        {@code CODE}
+                        @Anno
+                        ```
+                        end""",
+                    """
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        <p>end</p>"""),
+
+            SIMPLE_FENCE_TILDE(
+                    """
+                        ~~~
+                        {@code CODE}
+                        @Anno
+                        ~~~
+                        end""",
+                    """
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        <p>end</p>"""),
+
+            INDENT_TABS(
+                    """
+
+                        \ttab
+                         \t1-space tab
+                          \t2-space tab
+                           \t3-space tab
+                            \t4-space tab
+                        \t\t2-tab
+
+                        end
+                        """,
+                    """
+                        <pre><code>tab
+                        1-space tab
+                        2-space tab
+                        3-space tab
+                        \t4-space tab
+                        \t2-tab
+                        </code></pre>
+                        <p>end</p>"""
+            ),
+
+            UNCLOSED_FENCE(
+                    """
+                        ```
+                        {@code}
+                        @Anno
+                        """,
+                    """
+                        <pre><code>{@code}
+                        @Anno
+                        </code></pre>"""
+            ),
+
+            LIST_INDENT(
+                    """
+                        * list item
+
+                              {@code CODE}
+                              @Anno
+
+                        end""",
+                    """
+                        <ul>
+                        <li>
+                        <p>list item</p>
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        </li>
+                        </ul>
+                        <p>end</p>"""),
+
+            LIST_FENCE_BACKTICK(
+                    """
+                        * list item
+                          ```
+                          {@code CODE}
+                          @Anno
+                          ```
+                        end""",
+                    """
+                        <ul>
+                        <li>list item
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        </li>
+                        </ul>
+                        <p>end</p>"""),
+
+            LIST_FENCE_TILDE(
+                    """
+                        1. list item
+                           ~~~
+                           {@code CODE}
+                           @Anno
+                           ~~~
+
+                        end""",
+                    """
+                        <ol>
+                        <li>list item
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        </li>
+                        </ol>
+                        <p>end</p>"""),
+
+            LIST_UNCLOSED_FENCE(
+                    """
+                        1.  list item
+                            ```
+                            fenced-code
+                            @Anno
+
+                        end""",
+                    """
+                        <ol>
+                        <li>list item
+                        <pre><code>fenced-code
+                        @Anno
+
+                        </code></pre>
+                        </li>
+                        </ol>
+                        <p>end</p>"""),
+
+            // in the following, note the indentation of the list item is 5 spaces
+            // and the block that follows is indented by just 4 spaces
+            POST_LIST_INDENT(
+                    """
+                         1.  list item
+
+                             second paragraph
+
+                            {@code CODE}
+                            @Anno
+
+                        end""",
+                    """
+                        <ol>
+                        <li>
+                        <p>list item</p>
+                        <p>second paragraph</p>
+                        </li>
+                        </ol>
+                        <pre><code>{@code CODE}
+                        @Anno
+                        </code></pre>
+                        <p>end</p>"""),
+
+            BLOCK_FENCE(
+                    """
+                        > ```
+                        > fenced code
+                        > @Anno
+                        > ```
+                        end""",
+                    """
+                        <blockquote>
+                        <pre><code>fenced code
+                        @Anno
+                        </code></pre>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            BLOCK_UNCLOSED_FENCE(
+                    """
+                        > ```
+                        > fenced code
+                        > @Anno
+                        end""",
+                    """
+                        <blockquote>
+                        <pre><code>fenced code
+                        @Anno
+                        </code></pre>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            NOT_INDENT_CONTINUATION(
+                    """
+
+                        paragraph
+                                indented continuation {@code CODE}
+                                more.
+
+                        end""",
+                    """
+                        <p>paragraph
+                        indented continuation <code>CODE</code>
+                        more.</p>
+                        <p>end</p>"""
+            ),
+
+            NOT_INDENT_IN_LIST(
+                    """
+                        1.  list item
+
+                            list para, not indented block
+                            {@code CODE}
+
+                        end""",
+                    """
+                        <ol>
+                        <li>
+                        <p>list item</p>
+                        <p>list para, not indented block
+                        <code>CODE</code></p>
+                        </li>
+                        </ol>
+                        <p>end</p>"""),
+
+            COMBO(
+                    """
+                        1. list item {@code TAG} lorem ipsum
+
+                           * nested list {@code TAG} lorem ipsum
+
+                               nested list para {@code TAG} lorem ipsum
+
+                                 nested indented block {@code TEXT} lorem ipsum
+
+                            outer list para {@code TAG} lorem ipsum
+                            ```
+                            outer list fenced block {@code TEXT} lorem ipsum
+                            ```
+
+                        end""",
+                    """
+                        <ol>
+                        <li>
+                        <p>list item <code>TAG</code> lorem ipsum</p>
+                        <ul>
+                        <li>
+                        <p>nested list <code>TAG</code> lorem ipsum</p>
+                        <p>nested list para <code>TAG</code> lorem ipsum</p>
+                        <pre><code>nested indented block {@code TEXT} lorem ipsum
+                        </code></pre>
+                        </li>
+                        </ul>
+                        <p>outer list para <code>TAG</code> lorem ipsum</p>
+                        <pre><code>outer list fenced block {@code TEXT} lorem ipsum
+                        </code></pre>
+                        </li>
+                        </ol>
+                        <p>end</p>"""
+            );
+
+            final String srcFragment;
+            final String expect;
+
+            TestCase(String srcFragment, String expect) {
+                this.srcFragment = srcFragment;
+                this.expect = expect;
+            }
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("""
+                    package p;
+                    /** Dummy. */
+                    public class C {
+                    private C() { }
+                    """);
+
+        for (var tc: TestCase.values()) {
+            sb.append("""
+                        /// First sentence.
+                        #FRAG#
+                        public void #NAME#() { }
+
+                    """
+                    .replace("#FRAG#", tc.srcFragment.lines()
+                            .map(l -> "/// " + l)
+                            .collect(Collectors.joining("\n    ")))
+                    .replace("#NAME#", tc.name().toLowerCase(Locale.ROOT)));
+        }
+
+        sb.append("}");
+
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, sb.toString());
+
+        javadoc("-d", base.resolve("api").toString(),
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput(Output.OUT, false,
+                "unknown tag");
+
+        for (var tc : TestCase.values()) {
+            out.println("Test case: " + tc);
+            checkOutput("p/C.html", true,
+                    """
+                        <span class="element-name">#NAME#</span>()</div>
+                        <div class="block"><p>First sentence.</p>
+                        #FRAG#
+                        </div>"""
+                            .replace("#NAME#", tc.name().toLowerCase(Locale.ROOT))
+                            .replace("#FRAG#", tc.expect));
+        }
+    }
+
+    @Test
+    public void testTypical(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// stand-in for the standard class, to avoid platform links
+                    public class NullPointerException extends RuntimeException  { }
+                    """,
+                """
+                    package p;
+                    /// A class containing examples of "typical" usages.
+                    public class C {
+                        ///
+                        /// Here is an example:
+                        ///
+                        ///     @Deprecated
+                        ///     public class Old { }
+                        ///
+                        /// Here are some more examples:
+                        ///
+                        /// 1.  ```
+                        ///     @Deprecated(forRemoval=true)
+                        ///     public class VeryOld { }
+                        ///     ```
+                        /// 2.  ```
+                        ///     public class C {
+                        ///         @Override
+                        ///         public boolean equals(Object other) {
+                        ///             return false;
+                        ///         }
+                        ///         @Override
+                        ///         public int hashCode() {
+                        ///             return 0;
+                        ///         }
+                        ///     }
+                        ///     ```
+                        ///
+                        /// @param other another instance
+                        /// @throws NullPointerException if other is {@code null}
+                        public C(C other) { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                """
+                    <p>Here is an example:</p>
+                    <pre><code>@Deprecated
+                    public class Old { }
+                    </code></pre>""",
+
+                """
+                    <p>Here are some more examples:</p>
+                    <ol>
+                    <li>
+                    <pre><code>@Deprecated(forRemoval=true)
+                    public class VeryOld { }
+                    </code></pre>
+                    </li>
+                    <li>
+                    <pre><code>public class C {
+                        @Override
+                        public boolean equals(Object other) {
+                            return false;
+                        }
+                        @Override
+                        public int hashCode() {
+                            return 0;
+                        }
+                    }
+                    </code></pre>
+                    </li>
+                    </ol>""",
+
+                """
+                    <dl class="notes">
+                    <dt>Parameters:</dt>
+                    <dd><code>other</code> - another instance</dd>
+                    <dt>Throws:</dt>
+                    <dd><code><a href="NullPointerException.html" title="class in p">NullPointerException</a></code> - if other is <code>null</code></dd>
+                    </dl>""");
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeSpans.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeSpans.java
new file mode 100644
index 00000000000..9e2960972e1
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownCodeSpans.java
@@ -0,0 +1,391 @@
+/*
+ * Copyright (c) 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownCodeSpans
+ */
+
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+/**
+ * Tests Markdown code spans.
+ *
+ * Code spans are enclosed within a matching sequence of one or more backtick ({@code `})
+ * characters and provide a way to specify "literal text" within a block,
+ * such as a paragraph, list item, or block quote.  Code spans may span multiple lines
+ * but not cross block boundaries: if a sequence of backtick characters is not matched within
+ * a block, the sequence is treated as literal text, even if there is a matching sequence
+ * in a subsequent block.
+ *
+ * In the various test cases, javadoc tags are used as a way to determine
+ * if the parser is correctly interpreting the text in its surrounding context.
+ * Within a code span, character sequences resembling a tag are treated as
+ * literal text, and appear "as is" in the generated output. Outside a
+ * code span, character sequences resembling a tag are treated as tags and
+ * are translated as appropriate in the generated output.
+ *
+ * A primary consideration in the test cases is the use and handling of lines
+ * that may or may not be part of the same block.  As such, the source for
+ * each test case can be considered to be in two parts, each containing a backtick,
+ * and which may or may not represent a code span.  Note that only some kinds
+ * of lines (for paragraphs, list items and block quotes) may contain code spans.
+ * All kinds of lines either continue a block or terminate it.
+ */
+public class TestMarkdownCodeSpans extends JavadocTester {
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownCodeSpans();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testCodeSpans(Path base) throws Exception {
+        // Test cases provide a fragment of content for a documentation comment
+        // and a corresponding fragment of content to be found in the generated output.
+        // The name of each member is used to generate the name of a declaration
+        // with which the documentation comment is associated.
+        //
+        // In the source fragments:
+        // - when "{@code TEXT}" appears, it is expected it will appear "as is" in the output
+        //   enclosed within an HTML <code> element
+        // - when "{@code TAG}" appears, it is expected it will be treated as a tag
+        //   and will appear in the output as "<code>TAG</code>"
+        // Thus, the character sequence "{@code TAG}" should never appear in any output.
+        //
+        // Note: for test cases involving ATX and setext headings, care must be taken to
+        // ensure that the content is such that the auto-generated ids are unique,
+        // so that we do not depend on the doclet to disambiguate the ids, based on the
+        // order in which the headings are generated.
+        enum TestCase {
+            SIMPLE_PARA(
+                    """
+
+                        abc `p {@code TEXT} q` def
+
+                        end""",
+                    """
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        <p>end</p>"""),
+
+            // a multi-line code span
+            PARA_PARA(
+                    """
+
+                        abc `p {@code TEXT}
+                        q` def
+
+                        end""",
+                    """
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        <p>end</p>"""),
+
+            // a paragraph with a heavily indented continuation line,
+            // including a multi-line code span
+            PARA_INDENT(
+                    """
+
+                        abc `p {@code TEXT}
+                                      q` def
+
+                        end""",
+                    """
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        <p>end</p>"""),
+
+            // blank line after a paragraph; no code spans, the tag is processed
+            PARA_BLANK(
+                    """
+
+                        abc `p {@code TAG}
+
+                        q` def
+
+                        end""",
+                    """
+                        <p>abc `p <code>TAG</code></p>
+                        <p>q` def</p>
+                        <p>end</p>"""),
+
+            // thematic break after a paragraph; no code spans, the tag is processed
+            PARA_THEMATIC_BREAK_DASH(
+                    """
+
+                        abc `p {@code TAG}
+                        - - - - - - - - - - - -
+                        q` def
+
+                        end""",
+                    """
+                        <p>abc `p <code>TAG</code></p>
+                        <hr />
+                        <p>q` def</p>
+                        <p>end</p>"""),
+
+            // thematic break after a paragraph; no code spans, the tag is processed
+            PARA_THEMATIC_BREAK_ASTERISK(
+                    """
+
+                        abc `p {@code TAG}
+                        * * * * * * * * * *
+                        q` def
+
+                        end""",
+                    """
+                        <p>abc `p <code>TAG</code></p>
+                        <hr />
+                        <p>q` def</p>
+                        <p>end</p>"""),
+
+            // ATX heading after a paragraph; no code spans, the tag is processed
+            PARA_ATX(
+                    """
+
+                        abc `p1 {@code TAG}
+                        # q1` def
+
+                        end""",
+                    """
+                        <p>abc `p1 <code>TAG</code></p>
+                        <h4 id="q1-def-heading">q1` def</h4>
+                        <p>end</p>"""),
+
+            // setext heading; no code spans, the tag is processed
+            PARA_SETEXT(
+                    """
+
+                        abc `p {@code TAG}
+                        ===================
+                        q` def
+
+                        end""",
+                    """
+                        <h4 id="abc-p--heading">abc `p <code>TAG</code></h4>
+                        <p>q` def</p>
+                        <p>end</p>"""),
+
+            SIMPLE_LIST(
+                    """
+
+                        * abc `p {@code TEXT} q` def
+
+                        end""",
+                    """
+                        <ul>
+                        <li>abc <code>p {@code TEXT} q</code> def</li>
+                        </ul>
+                        <p>end</p>"""),
+
+            // two list items; no code spans, the tag is processed
+            LIST_LIST(
+                    """
+
+                        * abc `p {@code TAG}
+                        * q` def
+
+                        end""",
+                    """
+                        <ul>
+                        <li>abc `p <code>TAG</code></li>
+                        <li>q` def</li>
+                        </ul>
+                        <p>end</p>"""),
+
+            // a multi-line code span in a multi-line list item
+            LIST_PARA(
+                    """
+
+                        * abc `p {@code TEXT}
+                        q` def
+
+                        end""",
+                    """
+                <ul>
+                <li>abc <code>p {@code TEXT} q</code> def</li>
+                </ul>
+                <p>end</p>"""),
+
+            // a list item with a heavily indented continuation line,
+            // including a multi-line code span
+            LIST_INDENT(
+                    """
+
+                        * abc `p {@code TEXT}
+                                      q` def
+
+                        end""",
+                    """
+                <ul>
+                <li>abc <code>p {@code TEXT} q</code> def</li>
+                </ul>
+                <p>end</p>"""),
+
+            SIMPLE_BLOCKQUOTE(
+                    """
+
+                        > abc `p {@code TEXT} q` def
+
+                        end""",
+                    """
+                        <blockquote>
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            // a multi-line code span in a multi-line block quote
+            BLOCKQUOTE_BLOCKQUOTE(
+                    """
+
+                        > abc `p {@code TEXT}
+                        > q` def
+
+                        end""",
+                    """
+                        <blockquote>
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            // a multi-line code span in a multi-line block quote
+            BLOCKQUOTE_PARA(
+                    """
+
+                        > abc `p {@code TEXT}
+                          q` def
+
+                        end""",
+                            """
+                        <blockquote>
+                        <p>abc <code>p {@code TEXT} q</code> def</p>
+                        </blockquote>
+                        <p>end</p>"""),
+
+            // a block quote with a heavily indented continuation line,
+            // including a multi-line code span
+            BLOCKQUOTE_INDENT(
+                    """
+
+                        > abc `p {@code TEXT}
+                                    q` def
+
+                        end""",
+                    """
+                <blockquote>
+                <p>abc <code>p {@code TEXT} q</code> def</p>
+                </blockquote>
+                <p>end</p>"""),
+
+            SIMPLE_ATX(
+                    """
+
+                        # abc `p2 {@code TEXT} q2` def
+
+                        end""",
+                    """
+                        <h4 id="abc-p2-code-text-q2-def-heading">abc <code>p2 {@code TEXT} q2</code> def</h4>
+                        <p>end</p>"""),
+
+            // two ATX headings; no code spans, the tag is processed
+            ATX_ATX(
+                    """
+
+                        # abc `p3 {@code TAG}
+                        # q3` def
+
+                        end""",
+                    """
+                        <h4 id="abc-p3--heading">abc `p3 <code>TAG</code></h4>
+                        <h4 id="q3-def-heading">q3` def</h4>
+                        <p>end</p>""");
+
+            final String srcFragment;
+            final String expect;
+
+            TestCase(String srcFragment, String expect) {
+                this.srcFragment = srcFragment;
+                this.expect = expect;
+            }
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("""
+                    package p;
+                    /** Dummy. */
+                    public class C {
+                    private C() { }
+                    """);
+
+        for (var tc: TestCase.values()) {
+            sb.append("""
+                        /// First sentence.
+                        #FRAG#
+                        public void #NAME#() { }
+
+                    """
+                    .replace("#FRAG#", tc.srcFragment.lines()
+                            .map(l -> "/// " + l)
+                            .collect(Collectors.joining("\n    ")))
+                    .replace("#NAME#", tc.name().toLowerCase(Locale.ROOT)));
+        }
+
+        sb.append("}");
+
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, sb.toString());
+
+        javadoc("-d", base.resolve("api").toString(),
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        // any/all instances of "{@code TAG}" should be translated to "<code>TAG</code>"
+        checkOutput("p/C.html", false,
+                "{@code TAG}");
+
+        checkOutput(Output.OUT, false,
+                "unknown tag");
+
+        for (var tc : TestCase.values()) {
+            checkOutput("p/C.html", true,
+                    """
+                        <span class="element-name">#NAME#</span>()</div>
+                        <div class="block"><p>First sentence.</p>
+                        #FRAG#
+                        </div>"""
+                            .replace("#NAME#", tc.name().toLowerCase(Locale.ROOT))
+                            .replace("#FRAG#", tc.expect));
+        }
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownDeprecated.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownDeprecated.java
new file mode 100644
index 00000000000..9f91ecf34e8
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownDeprecated.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2022, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownDeprecated
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownDeprecated extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownDeprecated();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testDeprecated(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class Control {
+                        /**
+                         * First sentence. Second sentence.
+                         */
+                         @Deprecated
+                         public void anno_noTag() { }
+                        /**
+                         * First sentence. Second sentence.
+                         * @deprecated deprecated-text
+                         */
+                         public void noAnno_tag() { }
+                        /**
+                         * First sentence. Second sentence.
+                         * @deprecated deprecated-text
+                         */
+                        @Deprecated
+                        public void anno_tag() { }
+                    }""",
+                """
+                    package p;
+                    public class MarkdownComments {
+                        /// First sentence. Second sentence.
+                        @Deprecated
+                        public void anno_noTag() { }
+                        /// First sentence. Second sentence.
+                        /// @deprecated deprecated-text.
+                        public void noAnno_tag() { }
+                        /// First sentence. Second sentence.
+                        /// @deprecated deprecated-text
+                        @Deprecated
+                        public void anno_tag() { }
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        // Note: javadoc does not generate warnings about any mismatch
+        // between @Deprecated annotations and @deprecated tags:
+        // the mismatch is detected and reported by javac Attr phase,
+        // when enabled by -Xlint:dep-ann.
+
+        // the output for these two files should be the same, except where it is not
+        for (var f : List.of("p/Control.html", "p/MarkdownComments.html")) {
+            // in the following checks we check from the signature,
+            // beginning at the name, through to the end of the main description.
+            checkOutput(f, true,
+                    """
+                        <span class="element-name">anno_noTag</span>()</div>
+                        <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+                        <div class="block">First sentence. Second sentence.</div>""",
+
+                    switch (f) {
+                        // @deprecated but no annotation in a traditional comment implies deprecation
+                        case "p/Control.html" -> """
+                            <span class="element-name">noAnno_tag</span>()</div>
+                            <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+                            <div class="deprecation-comment">deprecated-text</div>
+                            </div>
+                            <div class="block">First sentence. Second sentence.</div>""";
+
+                        // @deprecated but no annotation in a Markdown comment does not imply deprecation
+                        case "p/MarkdownComments.html" -> """
+                            <span class="element-name">noAnno_tag</span>()</div>
+                            <div class="block">First sentence. Second sentence.</div>""";
+
+                        default -> throw new Error();
+                    },
+
+                    """
+                        <span class="element-name">anno_tag</span>()</div>
+                        <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+                        <div class="deprecation-comment">deprecated-text</div>
+                        </div>
+                        <div class="block">First sentence. Second sentence.</div>""");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFiles.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFiles.java
new file mode 100644
index 00000000000..1d1499e4549
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFiles.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2022, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownFiles
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownFiles extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownFiles();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testDocFile(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                package p;
+                /// First sentence.
+                public class C { }
+                """);
+        tb.writeFile(src.resolve("p").resolve("doc-files").resolve("markdown.md"),
+                """
+                # This is a _Markdown_ heading
+
+                Lorem ipsum""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/doc-files/markdown.html", true,
+                """
+                    <title>This is a Markdown heading</title>
+                    """,
+                """
+                    <main role="main"><h1 id="this-is-a-markdown-heading-heading1">This is a <em>Markdown</em> heading</h1>
+                    <p>Lorem ipsum</p>
+                    </main>
+                    """);
+    }
+
+    @Test
+    public void testOverview(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                package p;
+                /// First sentence.
+                public class C { }
+                """);
+        var overviewFile = src.resolve("overview.md");
+        tb.writeFile(overviewFile,
+                """
+                This is a _Markdown_ overview.
+                Lorem ipsum""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "-overview", overviewFile.toString(),
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("index.html", true,
+                """
+                    <div class="block">This is a <em>Markdown</em> overview.
+                    Lorem ipsum</div>""");
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFirstSentence.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFirstSentence.java
new file mode 100644
index 00000000000..88414d2225e
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownFirstSentence.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) 2022, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownFirstSentence
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownFirstSentence extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownFirstSentence();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testFirstSentence(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// This is the _first_ sentence.
+                        /// This is the _second_ sentence.
+                         public void m() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOrder("p/C.html",
+                """
+                    <section class="method-summary" id="method-summary">""",
+                """
+                    <div class="block">This is the <em>first</em> sentence.</div>""",
+                """
+                    <section class="method-details" id="method-detail">""",
+                """
+                    <div class="block">This is the <em>first</em> sentence.
+                    This is the <em>second</em> sentence.</div>""");
+    }
+
+    // Test the ability to put links in the first sentence of a description.
+    // Note that user-defined reference links cannot be used in the first
+    // sentence, and so in that case we verify the behavior is "as expected".
+    @Test
+    public void testFirstSentenceLinks(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        // Apart from the (control) case, the other cases exercise
+        // various kinds of links in the first sentence of a description.
+        // Note the last case is an explicit test of a link that is
+        // _not_ currently supported, since the link reference definition
+        // is not part of the first sentence.
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    import q.MyObject;
+                    public class C {
+                        /// First sentence.
+                        /// Control: [MyObject]
+                        public void m1() { }
+
+                        /// Simple autoref in first sentence [MyObject].
+                        /// More.
+                        public void m2() { }
+
+                        /// Qualified autoref in first sentence [q.MyObject].
+                        /// More.
+                        public void m3() { }
+
+                        /// Standard link with periods [example.com](http://example.com).
+                        /// More.
+                        public void m4() { }
+
+                        /// Manual ref link [foo].
+                        /// More.
+                        ///
+                        /// [foo]: http:example.com
+                        public void m5() { }
+                    }""",
+                // use a simple class in a different package, to avoid platform links to system classes
+                """
+                    package q;
+                    public class MyObject { }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p", "q");
+        checkExit(Exit.OK);
+
+        // use checkOrder and the delimiter comments to ensure that
+        // we check the strings in the method summary table, and not
+        // subsequently in the method details section.
+        checkOrder("p/C.html",
+                "<!-- ========== METHOD SUMMARY =========== -->",
+                """
+                    <div class="block">Simple autoref in first sentence <a href="../q/MyObject.html" \
+                    title="class in q"><code>MyObject</code></a>.</div>""",
+                """
+                    <div class="block">Qualified autoref in first sentence <a href="../q/MyObject.html" \
+                    title="class in q"><code>MyObject</code></a>.</div>""",
+                """
+                    <div class="block">Standard link with periods \
+                    <a href="http://example.com">example.com</a>.</div>""",
+                // The following is a test of the regrettably expected behavior,
+                // because the link reference definition is not carried into
+                // the first sentence.
+                """
+                    <div class="block">Manual ref link [foo].</div>""",
+                "<!-- ============ METHOD DETAIL ========== -->"
+        );
+    }
+
+    // Test that periods within certain constructs do not prematurely terminate
+    // the first sentence.
+    @Test
+    public void testFirstSentencePeriods(Path base) throws Exception {
+        testFirstSentencePeriods(base.resolve("no-bi"), false);
+        testFirstSentencePeriods(base.resolve("bi"), true);
+    }
+
+    void testFirstSentencePeriods(Path base, boolean useBreakIterator) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                """
+                        package p;
+                        public class C {
+                            /// Code span `1.0` end.
+                            /// More.
+                            public void m1() { }
+                            /// Complex code span ``` `1.0` ``` end.
+                            /// More.
+                            public void m2() { }
+                            /// Period space `1.  2.  3.` end.
+                            /// More.
+                            public void m3() { }
+                            /// Link [example.com](http://example.com) end.
+                            /// More.
+                            public void m4() { }
+                        }
+                        """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                (useBreakIterator ? "-breakiterator" : "-XDdummy"),
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        // use checkOrder and the delimiter comments to ensure that
+        // we check the strings in the method summary table, and not
+        // subsequently in the method details section.
+        checkOrder("p/C.html",
+                "<!-- ========== METHOD SUMMARY =========== -->",
+                """
+                    <div class="block">Code span <code>1.0</code> end.</div>""",
+                """
+                    <div class="block">Complex code span <code>`1.0`</code> end.</div>""",
+                """
+                    <div class="block">Period space <code>1.  2.  3.</code> end.</div>""",
+                """
+                    <div class="block">Link <a href="http://example.com">example.com</a> end.</div>""",
+                "<!-- ============ METHOD DETAIL ========== -->"
+        );
+    }
+
+    @Test
+    public void testIndentedInlineReturn(Path base) throws Exception {
+        //this is a Markdown-specific test, because leading whitespace is ignored in HTML comments
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// Class description.
+                    public class C {
+                        ///    {@return an int}
+                        /// More description.
+                        public int m() { return 0; }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <section class="detail" id="m()">
+                    <h3>m</h3>
+                    <div class="horizontal-scroll">
+                    <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">m</span>()</div>
+                    <div class="block">Returns an int.
+                    More description.</div>
+                    <dl class="notes">
+                    <dt>Returns:</dt>
+                    <dd>an int</dd>
+                    </dl>
+                    </div>
+                    </section>""");
+    }
+
+    @Test
+    public void testExtraPara(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// This is the class description.
+                    ///
+                    /// # Heading
+                    /// Lorem ipsum
+                    public class C { }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/package-summary.html", true,
+                """
+                    <div class="col-first even-row-color class-summary class-summary-tab2"><a href="C.html" title="clas\
+                    s in p">C</a></div>
+                    <div class="col-last even-row-color class-summary class-summary-tab2">
+                    <div class="block">This is the class description.</div>
+                    </div>""");
+
+        checkOutput("p/C.html", true,
+                """
+                        <span class="element-name type-name-label">C</span>
+                        <span class="extends-implements">extends java.lang.Object</span></div>
+                        <div class="block"><p>This is the class description.</p>
+                        <h2 id="heading-heading">Heading</h2>
+                        <p>Lorem ipsum</p>
+                        </div>""");
+
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
new file mode 100644
index 00000000000..8d5c782a66b
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
@@ -0,0 +1,344 @@
+/*
+ * Copyright (c) 2022, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownHeadings
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+
+/**
+ * Tests for Markdown headings.
+ *
+ * Markdown headings are handled specially when rendering the content.
+ * In particular:
+ * 1. heading levels are adjusted according to the context
+ * 2. ids are automatically added
+ * 3. top-level headings are added to the TOC
+ *
+ * Note that ids on headings are always automatically generated.
+ * You cannot specify ids, such as with the pandoc header-attributes
+ * extension.
+ */
+public class TestMarkdownHeadings extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownHeadings();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testHeading_ATX(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    /// First sentence.
+                    ///
+                    /// # ATX-style heading for package
+                    ///
+                    /// Lorem ipsum.
+                    ///
+                    /// ## ATX-style subheading for package
+                    ///
+                    /// Lorem ipsum.
+                    package p;
+                    """,
+                """
+                    package p;
+                    /// First sentence.
+                    ///
+                    /// # ATX-style heading for class
+                    ///
+                    /// Lorum ipsum.
+                    ///
+                    /// ## ATX-style subheading for class
+                    ///
+                    /// Lorem ipsum.
+                    public class C {
+                        /// Constructor.
+                        ///
+                        /// # ATX-style heading for executable
+                        ///
+                        /// Lorem ipsum.
+                        ///
+                        /// ## ATX-style subheading for executable
+                        ///
+                        /// Lorem ipsum.
+                        public C() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/package-summary.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="atx-style-heading-for-package-heading">ATX-style heading for package</h2>
+                    <p>Lorem ipsum.</p>
+                    <h3 id="atx-style-subheading-for-package-heading">ATX-style subheading for package</h3>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="atx-style-heading-for-class-heading">ATX-style heading for class</h2>
+                    <p>Lorum ipsum.</p>
+                    <h3 id="atx-style-subheading-for-class-heading">ATX-style subheading for class</h3>
+                    <p>Lorem ipsum.</p>
+                    </div>
+                    """, """
+                    <div class="block"><p>Constructor.</p>
+                    <h4 id="atx-style-heading-for-executable-heading">ATX-style heading for executable</h4>
+                    <p>Lorem ipsum.</p>
+                    <h5 id="atx-style-subheading-for-executable-heading">ATX-style subheading for executable</h5>
+                    <p>Lorem ipsum.</p>
+                    </div>
+                    """);
+
+    }
+
+    @Test
+    public void testHeading_Setext(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    /// First sentence.
+                    ///
+                    /// Setext-style heading for package
+                    /// ================================
+                    ///
+                    /// Lorem ipsum.
+                    ///
+                    /// Setext-style subheading for package
+                    /// -----------------------------------
+                    ///
+                    /// Lorem ipsum.
+                    package p;
+                    """,
+                """
+                    package p;
+                    /// First sentence.
+                    ///
+                    /// Setext-style heading for class
+                    /// ==============================
+                    ///
+                    /// Lorum ipsum.
+                    ///
+                    /// Setext-style subheading for class
+                    /// ---------------------------------
+                    ///
+                    /// Lorem ipsum.
+                    public class C {
+                        /// Constructor.
+                        ///
+                        /// Setext-style heading for executable
+                        /// ===================================
+                        ///
+                        /// Lorem ipsum.
+                        ///
+                        /// Setext-style subheading for executable
+                        /// --------------------------------------
+                        ///
+                        /// Lorem ipsum.
+                        public C() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/package-summary.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="setext-style-heading-for-package-heading">Setext-style heading for package</h2>
+                    <p>Lorem ipsum.</p>
+                    <h3 id="setext-style-subheading-for-package-heading">Setext-style subheading for package</h3>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="setext-style-heading-for-class-heading">Setext-style heading for class</h2>
+                    <p>Lorum ipsum.</p>
+                    <h3 id="setext-style-subheading-for-class-heading">Setext-style subheading for class</h3>
+                    <p>Lorem ipsum.</p>
+                    </div>
+                    """, """
+                    <div class="block"><p>Constructor.</p>
+                    <h4 id="setext-style-heading-for-executable-heading">Setext-style heading for executable</h4>
+                    <p>Lorem ipsum.</p>
+                    <h5 id="setext-style-subheading-for-executable-heading">Setext-style subheading for executable</h5>
+                    <p>Lorem ipsum.</p>
+                    </div>
+                    """);
+    }
+
+    @Test
+    public void testMaxHeadings(Path base) throws Exception {
+
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence.
+                    ///
+                    /// # Level 1 heading for class
+                    /// ## Level 2 subheading for class
+                    /// ### Level 3 subheading for class
+                    /// #### Level 4 heading for class
+                    /// ##### Level 5 subheading for class
+                    /// ###### Level 6 subheading for class
+                    ///
+                    /// Lorem ipsum.
+                    public class C {
+                        /// Constructor.
+                        ///
+                        /// # Level 1 heading for member
+                        /// ## Level 2 subheading for member
+                        /// ### Level 3 subheading for member
+                        /// #### Level 4 heading for member
+                        /// ##### Level 5 subheading for member
+                        /// ###### Level 6 subheading for member
+                        ///
+                        /// Lorem ipsum.
+                        public C() { }
+                    }
+                    """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <h2 id="level-1-heading-for-class-heading">Level 1 heading for class</h2>
+                    <h3 id="level-2-subheading-for-class-heading">Level 2 subheading for class</h3>
+                    <h4 id="level-3-subheading-for-class-heading">Level 3 subheading for class</h4>
+                    <h5 id="level-4-heading-for-class-heading">Level 4 heading for class</h5>
+                    <h6 id="level-5-subheading-for-class-heading">Level 5 subheading for class</h6>
+                    <h6 id="level-6-subheading-for-class-heading">Level 6 subheading for class</h6>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>Constructor.</p>
+                    <h4 id="level-1-heading-for-member-heading">Level 1 heading for member</h4>
+                    <h5 id="level-2-subheading-for-member-heading">Level 2 subheading for member</h5>
+                    <h6 id="level-3-subheading-for-member-heading">Level 3 subheading for member</h6>
+                    <h6 id="level-4-heading-for-member-heading">Level 4 heading for member</h6>
+                    <h6 id="level-5-subheading-for-member-heading">Level 5 subheading for member</h6>
+                    <h6 id="level-6-subheading-for-member-heading">Level 6 subheading for member</h6>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+    }
+
+    @Test
+    public void testHeading_TOC(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence.
+                    ///
+                    /// # ATX heading `code` _underline_ text
+                    ///
+                    /// Lorem ipsum
+                    ///
+                    /// ## ATX Subheading
+                    ///
+                    /// Lorem ipsum
+                    ///
+                    /// Setext heading
+                    /// ==============
+                    ///
+                    /// Lorem ipsum
+                    ///
+                    /// Setext subheading
+                    /// ------------------
+                    ///
+                    /// Lorem ipsum
+                    public class C {
+                        /// Method m.
+                        /// # subheading in m()
+                        ///
+                        /// Lorem ipsum
+                        public void m() { }
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                // note only the level 1 headings in the class description
+                """
+                    <div class="toc-header">Contents&nbsp;
+                    <input type="text" class="filter-input" disabled placeholder="Filter" aria-label="Filter table of contents" autocomplete="off">
+                    <input type="reset" class="reset-filter" disabled value="Reset">
+                    </div>
+                    <button class="hide-sidebar"><span>Hide sidebar&nbsp;</span>&#10094;</button><button class="show-sidebar">&#10095;<span>&nbsp;Show sidebar</span></button>
+                    <ol class="toc-list">
+                    <li><a href="#" tabindex="0">Description</a>
+                    <ol class="toc-list">
+                    <li><a href="#atx-heading-code-underline-text-heading" tabindex="0">ATX heading code underline text</a></li>
+                    <li><a href="#setext-heading-heading" tabindex="0">Setext heading</a></li>
+                    </ol>
+                    </li>
+                    <li><a href="#constructor-summary" tabindex="0">Constructor Summary</a></li>
+                    <li><a href="#method-summary" tabindex="0">Method Summary</a></li>
+                    <li><a href="#constructor-detail" tabindex="0">Constructor Details</a>
+                    <ol class="toc-list">
+                    <li><a href="#%3Cinit%3E()" tabindex="0">C()</a></li>
+                    </ol>
+                    </li>
+                    <li><a href="#method-detail" tabindex="0">Method Details</a>
+                    <ol class="toc-list">
+                    <li><a href="#m()" tabindex="0">m()</a></li>
+                    </ol>
+                    </li>
+                    </ol>
+                    """);
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownInheritDoc.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownInheritDoc.java
new file mode 100644
index 00000000000..67d1e3f7265
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownInheritDoc.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2022, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownInheritDoc
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownInheritDoc extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownInheritDoc();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testInherit_md_md(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class Base {
+                        /// Markdown comment.
+                        /// @throws Exception Base _Markdown_
+                        public void m() throws Exception { }
+                    }""",
+                """
+                    package p;
+                    public class Derived extends Base {
+                        /// Markdown comment.
+                        /// @throws {@inheritDoc}
+                        public void m() throws Exception { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/Derived.html", true,
+                """
+                    <dt>Throws:</dt>
+                    <dd><code>java.lang.Exception</code> - Base <em>Markdown</em></dd>
+                    """);
+    }
+
+    @Test
+    public void testInherit_md_plain(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class Base {
+                        /// Markdown comment.
+                        /// @throws Exception Base _Markdown_
+                        public void m() throws Exception { }
+                    }""",
+                """
+                    package p;
+                    public class Derived extends Base {
+                        /**
+                         * Plain comment.
+                         * @throws {@inheritDoc}
+                         */
+                         public void m() throws Exception { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/Derived.html", true,
+                """
+                    <dt>Throws:</dt>
+                    <dd><code>java.lang.Exception</code> - Base <em>Markdown</em></dd>
+                    """);
+    }
+
+    @Test
+    public void testInherit_plain_md(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class Base {
+                        /**
+                         * Plain comment.
+                         * @throws Exception Base _Not Markdown_
+                         */
+                         public void m() throws Exception { }
+                    }""",
+                """
+                    package p;
+                    public class Derived extends Base {
+                        /// Markdown comment.
+                        /// @throws {@inheritDoc}
+                        public void m() throws Exception { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/Derived.html", true,
+                """
+                    <dt>Throws:</dt>
+                    <dd><code>java.lang.Exception</code> - Base _Not Markdown_</dd>
+                    """);
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
new file mode 100644
index 00000000000..7bfb17d6864
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2022, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestMarkdownLinks
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownLinks extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownLinks();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testSimpleLink(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// This is different from {@link #m2()}.
+                        public void m1() { }
+                        /// Method m2.
+                        /// This is different from {@link #m1()}.
+                        public void m2() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Method m1.
+                    This is different from <a href="#m2()"><code>m2()</code></a>.""");
+
+    }
+
+    @Test
+    public void testSimpleRefLink(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// This is different from [#m2()].
+                        public void m1() { }
+                        /// Method m2.
+                        /// This is different from [#m1()].
+                        public void m2() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Method m1.
+                    This is different from <a href="#m2()"><code>m2()</code></a>.""");
+
+    }
+
+    @Test
+    public void testLinkWithDescription(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// This is different from {@linkplain #m2() _Markdown_ m2}.
+                        public void m1() { }
+                        /// Method m2.
+                        /// This is different from {@linkplain #m1() _Markdown_ m1}.
+                        public void m2() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Method m1.
+                    This is different from <a href="#m2()"><em>Markdown</em> m2""");
+
+    }
+
+    @Test
+    public void testRefLinkWithDescription(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// This is different from [_Markdown_ m2][#m2()].
+                        public void m1() { }
+                        /// Method m2.
+                        /// This is different from [_Markdown_ m1][#m1()]}.
+                        public void m2() { }
+                    }
+                    """);
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    Method m1.
+                    This is different from <a href="#m2()"><em>Markdown</em> m2""");
+
+    }
+
+    @Test
+    public void testLinkToHeadingAnchor(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// # Lorem Ipsum.
+                        ///
+                        /// Lorem ipsum [reference in same comment][##lorem-ipsum--heading].
+                        public void m1() { }
+                        /// Method m2.
+                        /// Lorem ipsum [reference in another comment][##lorem-ipsum--heading].
+                        public void m2() { }
+                    }
+                    """,
+                """
+                    package p;
+                    /// Lorem ipsum [reference in another class][C##lorem-ipsum--heading].
+                    public class D {
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+    }
+
+    @Test
+    public void testLinkToUserAnchor(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// Method m1.
+                        /// <span id="lorem-ipsum">Lorem Ipsum</span>.
+                        ///
+                        /// Lorem ipsum [reference in same comment][##lorem-ipsum].
+                        public void m1() { }
+                        /// Method m2.
+                        /// Lorem ipsum [reference in another comment][##lorem-ipsum].
+                        public void m2() { }
+                    }
+                    """,
+                """
+                    package p;
+                    /// Lorem ipsum [reference in another class][C##lorem-ipsum].
+                    public class D {
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+    }
+
+    @Test
+    public void testLinkElementKinds(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                        package p;
+                        /// First sentence.
+                        ///
+                        /// * module [java.base/]
+                        /// * package [java.util]
+                        /// * class [String] or interface [Runnable]
+                        /// * a field [String#CASE_INSENSITIVE_ORDER]
+                        /// * a constructor [String#String()]
+                        /// * a method [String#chars()]
+                        public class C { }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        // in the following carefully avoid checking the URL host, which is of less importance and may vary over time;
+        // the interesting part is the tail of the path after the host
+        new OutputChecker("p/C.html")
+                .setExpectOrdered(true)
+                .check("module <a href=\"https://",
+                        "/api/java.base/module-summary.html\" class=\"external-link\"><code>java.base</code></a>",
+
+                        "package <a href=\"https://",
+                        "/api/java.base/java/util/package-summary.html\" class=\"external-link\"><code>java.util</code></a>",
+
+                        "class <a href=\"https://",
+                        "/api/java.base/java/lang/String.html\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String</code></a>",
+
+                        "interface <a href=\"https://",
+                        "/api/java.base/java/lang/Runnable.html\" title=\"class or interface in java.lang\" class=\"external-link\"><code>Runnable</code></a>",
+
+                        "a field <a href=\"https://",
+                        "/api/java.base/java/lang/String.html#CASE_INSENSITIVE_ORDER\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String.CASE_INSENSITIVE_ORDER</code></a>",
+
+                        "a constructor <a href=\"https://",
+                        "/api/java.base/java/lang/String.html#%3Cinit%3E()\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String()</code></a></li>",
+
+                        "a method <a href=\"https://",
+                        "/api/java.base/java/lang/String.html#chars()\" title=\"class or interface in java.lang\" class=\"external-link\"><code>String.chars()</code></a>");
+    }
+
+    /// Test the ability to include array elements in method signatures for
+    /// automatic links to program elements.
+    @Test
+    public void testReferenceWithArrays(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        // in the following,
+        //
+        // * Link 0 is a simple control for a shortcut reference link (without any arrays)
+        // * Link 1a and Link 2a are negative controls, in that they are _not_ valid links
+        //   because of the unescaped [] pair
+        // * Link 1b and 2b are the positive tests, showing that the square brackets
+        //   need to be escaped in the source code, and that they are not escaped in
+        //   the generated HTML
+
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence.
+                    /// * Link 0 to [util.Arrays]
+                    /// * Link 1a to [Arrays-equals][util.Arrays#equals(Object[],Object[])]
+                    /// * Link 1b to [Arrays-equals][util.Arrays#equals(Object\\[\\],Object\\[\\])]
+                    /// * Link 2a to [util.Arrays#equals(Object[],Object[])]
+                    /// * Link 2b to [util.Arrays#equals(Object\\[\\],Object\\[\\])]
+                    public class C { }""",
+                // simulate java.util.Arrays.equals, to avoid links to platform references
+                """
+                    package util;
+                    public class Arrays {
+                        public boolean equals(Object[] a, Object[] a2);
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p", "util");
+
+        checkExit(Exit.OK);
+        checkOutput("p/C.html", true,
+                """
+                    Link 0 to <a href="../util/Arrays.html" title="class in util"><code>Arrays</code></a>""",
+                """
+                    Link 1a to [Arrays-equals][util.Arrays#equals(Object[],Object[])]""",
+                """
+                    Link 1b to <a href="../util/Arrays.html#equals(java.lang.Object%5B%5D,\
+                    java.lang.Object%5B%5D)">Arrays-equals</a>""",
+                """
+                    Link 2a to [util.Arrays#equals(Object[],Object[])]""",
+                """
+                    Link 2b to <a href="../util/Arrays.html#equals(java.lang.Object%5B%5D,\
+                    java.lang.Object%5B%5D)"><code>Arrays.equals(Object[],Object[])</code></a>"""
+        );
+    }
+
+    @Test
+    public void testSee(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /// First sentence.
+                    /// @see "A reference"
+                    /// @see <a href="http://www.example.com">Example</a>
+                    /// @see D a _Markdown_ description
+                    public class C { }
+                    """,
+                """
+                    package p;
+                    public class D { }""");
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <dt>See Also:</dt>
+                    <dd>
+                    <ul class="tag-list">
+                    <li>"A reference"</li>
+                    <li><a href="http://www.example.com">Example</a></li>
+                    <li><a href="D.html" title="class in p">a <em>Markdown</em> description</a></li>
+                    </ul>
+                    </dd>""");
+
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
new file mode 100644
index 00000000000..fa9d3bbad12
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2022, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.* DivTaglet SpanTaglet
+ * @run main TestMarkdownTaglets
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class TestMarkdownTaglets extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestMarkdownTaglets();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    // The following test checks whether the output of system taglets
+    // is or is not wrapped in <p> tags, depending on the context within
+    // the doc comment and the output generated by the taglet.
+    //
+    // {@code ...} is used as an example of a tag that generates phrasing content.
+    // {@snippet ...} is used as an example of a tag that generates block content.
+    //
+    // See also: testUserTaglets
+    @Test
+    public void testSystemTaglets(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// First sentence.
+                        ///
+                        /// {@code this is code_standalone}
+                        ///
+                        /// Lorem ipsum.
+                        public void code_standalone() { }
+
+                        /// First sentence.
+                        ///
+                        /// Before.
+                        /// {@code this is code_wrapped}
+                        /// After.
+                        ///
+                        /// Lorem ipsum.
+                        public void code_wrapped() { }
+
+                        /// First sentence.
+                        ///
+                        /// {@snippet :
+                        ///    this is snippet_standalone
+                        /// }
+                        ///
+                        /// Lorem ipsum.
+                        public void snippet_standalone() { }
+
+                        /// First sentence.
+                        ///
+                        /// Before.
+                        /// {@snippet :
+                        ///    this is a snippet_wrapped
+                        /// }
+                        /// After.
+                        ///
+                        /// Lorem ipsum.
+                        public void snippet_wrapped() { }
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true,
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p><code>this is code_standalone</code></p>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p>Before.
+                    <code>this is code_wrapped</code>
+                    After.</p>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" \
+                    onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span>\
+                    <img src="../resource-files/copy.svg" alt="Copy snippet"></button>
+                    <pre class="snippet"><code>   this is snippet_standalone
+                    </code></pre>
+                    </div>
+
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p>Before.</p>
+                    <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../resource-files/copy.svg" alt="Copy snippet"></button>
+                    <pre class="snippet"><code>   this is a snippet_wrapped
+                    </code></pre>
+                    </div>
+
+                    <p>After.</p>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+    }
+
+    // The following test checks whether the output of user-defined taglets
+    // is or is not wrapped in <p> tags, depending on the context within
+    // the doc comment and the output generated by the taglet.
+    //
+    // {@span ...} is used as an example of a taglet that generates phrasing content.
+    // {@div ...} is used as an example of a taglet that generates block content.
+    //
+    // See also: testSystemTaglets
+    @Test
+    public void testUserTaglets(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    public class C {
+                        /// First sentence.
+                        ///
+                        /// {@span this is phrasing_standalone}
+                        ///
+                        /// Lorem ipsum.
+                        public void phrasing_standalone() { }
+
+                        /// First sentence.
+                        ///
+                        /// Before.
+                        /// {@span this is phrasing_wrapped}
+                        /// After.
+                        ///
+                        /// Lorem ipsum.
+                        public void phrasing_wrapped() { }
+
+                        /// First sentence.
+                        ///
+                        /// {@div this is block_standalone}
+                        ///
+                        /// Lorem ipsum.
+                        public void block_standalone() { }
+
+                        /// First sentence.
+                        ///
+                        /// Before.
+                        /// {@div this is block_wrapped}
+                        /// After.
+                        ///
+                        /// Lorem ipsum.
+                        public void block_wrapped() { }
+                    }""");
+
+        String testClasses = System.getProperty("test.classes");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-tagletpath", testClasses,
+                "-taglet", "DivTaglet",
+                "-taglet", "SpanTaglet",
+                "-Xdoclint:none",
+                "--source-path", src.toString(),
+                "p");
+
+        checkOutput("p/C.html", true, """
+                    <div class="block"><p>First sentence.</p>
+                    <p><span>this is phrasing_standalone</span></p>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p>Before.
+                    <span>this is phrasing_wrapped</span>
+                    After.</p>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <div>this is block_standalone</div>
+                    <p>Lorem ipsum.</p>
+                    </div>""",
+                """
+                    <div class="block"><p>First sentence.</p>
+                    <p>Before.</p>
+                    <div>this is block_wrapped</div>
+                    <p>After.</p>
+                    <p>Lorem ipsum.</p>
+                    </div>""");
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java
index 441f9bd2251..1fbfcc403b7 100644
--- a/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java
+++ b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/util/PoorDocCommentTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@ package sampleapi.util;
 
 import java.util.HashMap;
 
+import javax.lang.model.util.Elements.DocCommentKind;
+
 import com.sun.tools.javac.parser.Tokens.Comment;
 import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.DocCommentTable;
@@ -52,6 +54,15 @@ public class PoorDocCommentTable implements DocCommentTable {
         return table.get(tree);
     }
 
+    public DocCommentKind getCommentKind(JCTree tree) {
+        Comment c = getComment(tree);
+        return c == null ? null : switch (c.getStyle()) {
+            case JAVADOC_BLOCK -> DocCommentKind.TRADITIONAL;
+            case JAVADOC_LINE -> DocCommentKind.END_OF_LINE;
+            default -> throw new IllegalStateException(c.getStyle().toString());
+        };
+    }
+
     public String getCommentText(JCTree tree) {
         Comment c = getComment(tree);
         return (c == null) ? null : c.getText();
diff --git a/test/langtools/jdk/javadoc/tool/testLineCommentOption/TestLineCommentOption.java b/test/langtools/jdk/javadoc/tool/testLineCommentOption/TestLineCommentOption.java
new file mode 100644
index 00000000000..f3b2ef0502f
--- /dev/null
+++ b/test/langtools/jdk/javadoc/tool/testLineCommentOption/TestLineCommentOption.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2023, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestLineCommentOption
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.stream.StreamSupport;
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.doctree.TextTree;
+import com.sun.source.util.DocTreeFactory;
+import com.sun.source.util.DocTrees;
+
+import com.sun.tools.javac.api.JavacTrees;
+
+import javadoc.tester.JavadocTester;
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.StandardDoclet;
+import toolbox.ToolBox;
+
+public class TestLineCommentOption extends JavadocTester {
+    public static void main(String... args) throws Exception {
+        var tester = new TestLineCommentOption();
+        tester.runTests();
+    }
+
+    private final ToolBox tb = new ToolBox();
+
+
+    // This is a somewhat worthless test case, given all the test cases for
+    // Markdown content in line comments.
+    @Test
+    public void testNoOption(Path base) throws Exception {
+        // use a dummy option
+        // note that we cannot use -Xlint:dangling-doc-comments in javadoc
+        test(base, "-XDdummy", "Line comment");
+        // in the future, check for diagnostic output about a dangling comment
+    }
+
+    @Test
+    public void testOption(Path base) throws Exception {
+        test(base, "--disable-line-doc-comments", "Traditional comment");
+    }
+
+    void test(Path base, String option, String expect) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+            package p;
+            /**
+             * Traditional comment.
+             */
+            /// Line comment
+            public class C {
+                private C() { }
+            }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "--source-path", src.toString(),
+                option,
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                expect);
+    }
+}
diff --git a/test/langtools/jdk/javadoc/tool/testTransformer/TestTransformer.java b/test/langtools/jdk/javadoc/tool/testTransformer/TestTransformer.java
new file mode 100644
index 00000000000..c3942e34f13
--- /dev/null
+++ b/test/langtools/jdk/javadoc/tool/testTransformer/TestTransformer.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2023, 2024, 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      8298405
+ * @summary  Markdown support in the standard doclet
+ * @library  /tools/lib ../../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestTransformer
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.stream.StreamSupport;
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.doctree.TextTree;
+import com.sun.source.util.DocTreeFactory;
+import com.sun.source.util.DocTrees;
+
+import com.sun.tools.javac.api.JavacTrees;
+
+import javadoc.tester.JavadocTester;
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.StandardDoclet;
+import toolbox.ToolBox;
+
+public class TestTransformer extends JavadocTester {
+    public static void main(String... args) throws Exception {
+        var tester = new TestTransformer();
+        tester.runTests();
+    }
+
+    private final ToolBox tb = new ToolBox();
+
+    @Test
+    public void testFindStandardTransformer_raw() {
+        int count = 0;
+        var sl = ServiceLoader.load(JavacTrees.DocCommentTreeTransformer.class);
+        for (var t : sl) {
+            if (t.name().equals("standard")) {
+                out.println("Found " + t);
+                count++;
+            }
+        }
+        checking("transformer");
+        if (count == 1) {
+            passed("expected transformer found");
+        } else {
+            failed("expected transformer not found");
+        }
+    }
+
+    @Test
+    public void testFindStandardTransformer_stream() {
+        var dct = getTransformer("standard");
+        checking("transformer");
+        if (dct.isPresent()) {
+            out.println("Found " + dct.get());
+            passed("expected transformer found");
+        } else {
+            failed("transformer not found");
+        }
+    }
+
+    private Optional<JavacTrees.DocCommentTreeTransformer> getTransformer(String name) {
+        var sl = ServiceLoader.load(JavacTrees.DocCommentTreeTransformer.class);
+        return sl.stream()
+                .map(ServiceLoader.Provider::get)
+                .filter(t -> t.name().equals(name))
+                .findFirst();
+    }
+
+    public static class MyTransformer implements JavacTrees.DocCommentTreeTransformer {
+
+        private DocTreeFactory m;
+        @Override
+        public String name() {
+            return getClass().getSimpleName();
+        }
+
+        @Override
+        public DocCommentTree transform(DocTrees trees, DocCommentTree tree) {
+            m = trees.getDocTreeFactory();
+            return m.newDocCommentTree(transform(tree.getFullBody()), tree.getBlockTags());
+        }
+
+        private List<? extends DocTree> transform(List<? extends DocTree> list) {
+            return list.stream().map(this::transform).toList();
+        }
+
+        private DocTree transform(DocTree tree) {
+            return switch (tree) {
+                case TextTree tt ->
+                        m.newTextTree(transform(tt.getBody()));
+                case RawTextTree rtt ->
+                        m.newRawTextTree(rtt.getKind(), transform(rtt.getContent()));
+                default ->
+                        tree;
+            };
+        }
+
+        private String transform(String s) {
+            return s.replace("lowercase", "UPPERCASE");
+        }
+    }
+
+    public static class MyDoclet extends StandardDoclet {
+        @Override
+        public boolean run(DocletEnvironment docEnv) {
+            ((JavacTrees) docEnv.getDocTrees()).setDocCommentTreeTransformer(new MyTransformer());
+            return super.run(docEnv);
+        }
+    }
+
+    @Test
+    public void testMyTransformer(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /**
+                 * This traditional comment contains a lowercase word.
+                 */
+                public class Trad { }
+                """, """
+                package p;
+                /// This line comment contains a lowercase word.
+                public class Line { }
+                """);
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "-XDaccessInternalAPI", // required to access JavacTrees
+                "-doclet", "TestTransformer$MyDoclet",
+                "-docletpath", System.getProperty("test.classes"),
+                "-sourcepath", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/Line.html", true, """
+                <div class="block">This line comment contains a UPPERCASE word.</div>""");
+        checkOutput("p/Trad.html", true, """
+                <div class="block">This traditional comment contains a UPPERCASE word.</div>""");
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
index 8befbb143da..3f3a5f2a984 100644
--- a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8042261
+ * @bug 8042261 8298405
  * @summary Checking that deprecated attribute does not apply to classes of deprecated package.
  * @library /tools/lib /tools/javac/lib ../lib
  * @enablePreview
@@ -67,6 +67,7 @@ public class DeprecatedPackageTest extends TestResult {
             for (String src : sourceTest) {
                 test(PACKAGE_INFO, src);
                 test(PACKAGE_INFO.replaceAll("@Deprecated", "/** @deprecated */"), src);
+                test(PACKAGE_INFO.replaceAll("@Deprecated", "/// @deprecated\n"), src);
             }
         } catch (Exception e) {
             addFailure(e);
diff --git a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
index 607448dc5db..ebe77e69056 100644
--- a/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
+++ b/test/langtools/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8042261
+ * @bug 8042261 8298405
  * @summary Checking what attribute is generated by annotation Deprecated
  *          or javadoc deprecated for field, method, class(inner/local), interface.
  * @library /tools/lib /tools/javac/lib ../lib
@@ -223,6 +223,8 @@ public class DeprecatedTest extends TestResult {
             for (String src : sources) {
                 test(src);
                 test(src.replaceAll("@Deprecated", "/** @deprecated */"));
+                test(src.replaceAll("deprecated", "notDeprecated2") // change element name
+                        .replaceAll("@Deprecated", "/// @deprecated\n"));
             }
         } catch (Exception e) {
             addFailure(e);
@@ -236,9 +238,9 @@ public class DeprecatedTest extends TestResult {
         printf("Testing test case :\n%s\n", src);
         try {
             Map<String, ? extends JavaFileObject> classes = compile(src).getClasses();
-            String outerClassName = classes.containsKey("deprecated")
-                    ? "deprecated"
-                    : "notDeprecated";
+            String outerClassName = classes.keySet().stream()
+                    .filter(n -> !n.contains("$"))
+                    .findFirst().orElse(null);
             echo("Testing outer class : " + outerClassName);
             ClassModel cf = readClassFile(classes.get(outerClassName));
             DeprecatedAttribute attr = cf.findAttribute(Attributes.DEPRECATED).orElse(null);
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out
index 76082537ed9..78285aa45d9 100644
--- a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.enabled.out
@@ -1,7 +1,7 @@
-DanglingDocCommentsClass.java:8:1: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:11:1: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:12:8: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:12:69: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:13:5: compiler.warn.dangling.doc.comment
-DanglingDocCommentsClass.java:17:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:10:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:13:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:14:8: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:14:69: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:15:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass.java:19:5: compiler.warn.dangling.doc.comment
 6 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java
index 2075bf4495a..3f6553d191f 100644
--- a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass.java
@@ -5,6 +5,8 @@
  * @compile/ref=DanglingDocCommentsClass.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsClass.java
  */
 
+// This is a test of duplicate and misplaced doc comments in a class, using traditional comments
+
 /** Bad/Extra Class Comment. */
 /** Good Class Comment. */
 @Deprecated
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.enabled.out
new file mode 100644
index 00000000000..3ed89c5f5bc
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.enabled.out
@@ -0,0 +1,7 @@
+DanglingDocCommentsClass_Line.java:11:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:15:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:17:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:19:9: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:21:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Line.java:26:5: compiler.warn.dangling.doc.comment
+6 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.java
new file mode 100644
index 00000000000..63c590e572c
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Line.java
@@ -0,0 +1,56 @@
+/*
+ * @test /nodynamiccopyright/
+ * @compile -Xlint:dangling-doc-comments DanglingDocCommentsClass_Line.java
+ * @compile/ref=empty.out -XDrawDiagnostics DanglingDocCommentsClass_Line.java
+ * @compile/ref=DanglingDocCommentsClass_Line.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsClass_Line.java
+ * @compile/ref=empty.out -XDrawDiagnostics --disable-line-doc-comments -Xlint:dangling-doc-comments DanglingDocCommentsClass_Line.java
+ */
+
+// This is a test of duplicate and misplaced doc comments in a class, using end-of-line comments
+
+/// Bad/Extra Class Comment.
+
+/// Good Class Comment.
+@Deprecated
+/// Misplaced: after anno.
+public
+    /// Misplaced: after mods.
+    class DanglingDocCommentsClass_Line
+        /// Misplaced: after ident
+    {
+    /// Bad/Extra Field Comment.
+
+    /// Good Field Comment.
+    public int i;
+
+    /// Bad/Extra Method Comment.
+
+    /// Good Method Comment.
+    public void m1() { }
+
+    @SuppressWarnings("dangling-doc-comments")
+    /// Bad/misplaced/suppressed comment.
+    public void m2() { }
+
+    public void m3(boolean b) {
+        ///------------------
+        /// Box comment
+        ///------------------
+        if (b) return;
+    }
+
+    public void m4a() {
+        /// Not a doc comment.
+        System.out.println();
+        /// Not a doc comment; not dangling for m4b
+    }
+
+    /// Good comment for m4b; no dangling comments.
+    public void m4b() { }
+
+    /// Comment ignored here: does not affect decls in block
+    static {
+        /// Good comment.
+        int i = 0;
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.enabled.out
new file mode 100644
index 00000000000..1eda729da19
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.enabled.out
@@ -0,0 +1,4 @@
+DanglingDocCommentsClass_Mixed.java:13:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Mixed.java:17:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsClass_Mixed.java:21:5: compiler.warn.dangling.doc.comment
+3 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.java
new file mode 100644
index 00000000000..f23004f0571
--- /dev/null
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsClass_Mixed.java
@@ -0,0 +1,24 @@
+/*
+ * @test /nodynamiccopyright/
+ * @compile -Xlint:dangling-doc-comments DanglingDocCommentsClass_Mixed.java
+ * @compile/ref=empty.out -XDrawDiagnostics DanglingDocCommentsClass_Mixed.java
+ * @compile/ref=DanglingDocCommentsClass_Mixed.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsClass_Mixed.java
+ * @compile/ref=empty.out -XDrawDiagnostics --disable-line-doc-comments -Xlint:dangling-doc-comments DanglingDocCommentsClass_Mixed.java
+ */
+
+// This is a test of duplicate doc comments in a class, using a mixture of traditional and end-of-line comments
+// It is a useful test case for a real-world scenario in which an end-of-line comment is
+// placed between a traditional doc comment and its declaration.
+
+/** First Class Comment. */
+/// Second Class Comment.
+@Deprecated public class DanglingDocCommentsClass_Mixed
+    {
+    /** First Field Comment. */
+    /// Second Field Comment.
+    public int i;
+
+    /** First Method Comment. */
+    /// Second Method Comment.
+    public void m1() { }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out
index 78dfd6e9633..ddf1b2964de 100644
--- a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.enabled.out
@@ -1,8 +1,8 @@
-DanglingDocCommentsEnum.java:8:1: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:11:1: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:12:8: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:12:67: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:14:5: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:20:5: compiler.warn.dangling.doc.comment
-DanglingDocCommentsEnum.java:26:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:10:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:13:1: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:14:8: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:14:67: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:16:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:22:5: compiler.warn.dangling.doc.comment
+DanglingDocCommentsEnum.java:28:5: compiler.warn.dangling.doc.comment
 7 warnings
diff --git a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java
index eae98433b70..a4a06c79682 100644
--- a/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java
+++ b/test/langtools/tools/javac/danglingDocComments/DanglingDocCommentsEnum.java
@@ -5,6 +5,8 @@
  * @compile/ref=DanglingDocCommentsEnum.enabled.out -XDrawDiagnostics -Xlint:dangling-doc-comments DanglingDocCommentsEnum.java
  */
 
+// This is a test of duplicate and misplaced doc comments in an enum class, using traditional comments
+
 /** Bad/Extra Enum Comment. */
 /** Good Enum Comment. */
 @Deprecated
diff --git a/test/langtools/tools/javac/doctree/DocCommentTester.java b/test/langtools/tools/javac/doctree/DocCommentTester.java
index ca50d883417..f14dde2e567 100644
--- a/test/langtools/tools/javac/doctree/DocCommentTester.java
+++ b/test/langtools/tools/javac/doctree/DocCommentTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,12 @@
  * questions.
  */
 
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.BreakIterator;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,11 +37,52 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import javax.lang.model.element.Name;
+import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 
-import com.sun.source.doctree.*;
+import com.sun.source.doctree.AttributeTree;
+import com.sun.source.doctree.AuthorTree;
+import com.sun.source.doctree.CommentTree;
+import com.sun.source.doctree.DeprecatedTree;
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.DocRootTree;
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.DocTreeVisitor;
+import com.sun.source.doctree.DocTypeTree;
+import com.sun.source.doctree.EndElementTree;
+import com.sun.source.doctree.EntityTree;
+import com.sun.source.doctree.ErroneousTree;
+import com.sun.source.doctree.EscapeTree;
+import com.sun.source.doctree.HiddenTree;
+import com.sun.source.doctree.IdentifierTree;
+import com.sun.source.doctree.IndexTree;
+import com.sun.source.doctree.InheritDocTree;
+import com.sun.source.doctree.LinkTree;
+import com.sun.source.doctree.LiteralTree;
+import com.sun.source.doctree.ParamTree;
+import com.sun.source.doctree.ProvidesTree;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.doctree.ReferenceTree;
+import com.sun.source.doctree.ReturnTree;
+import com.sun.source.doctree.SeeTree;
+import com.sun.source.doctree.SerialDataTree;
+import com.sun.source.doctree.SerialFieldTree;
+import com.sun.source.doctree.SerialTree;
+import com.sun.source.doctree.SinceTree;
+import com.sun.source.doctree.SnippetTree;
+import com.sun.source.doctree.SpecTree;
+import com.sun.source.doctree.StartElementTree;
+import com.sun.source.doctree.SummaryTree;
+import com.sun.source.doctree.SystemPropertyTree;
+import com.sun.source.doctree.TextTree;
+import com.sun.source.doctree.ThrowsTree;
+import com.sun.source.doctree.UnknownBlockTagTree;
+import com.sun.source.doctree.UnknownInlineTagTree;
+import com.sun.source.doctree.UsesTree;
+import com.sun.source.doctree.ValueTree;
+import com.sun.source.doctree.VersionTree;
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.CompilationUnitTree;
 import com.sun.source.tree.MethodTree;
@@ -53,6 +94,7 @@ import com.sun.source.util.JavacTask;
 import com.sun.source.util.TreePath;
 import com.sun.source.util.TreePathScanner;
 import com.sun.tools.javac.api.JavacTool;
+import com.sun.tools.javac.api.JavacTrees;
 import com.sun.tools.javac.tree.DCTree;
 import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.DCTree.DCErroneous;
@@ -72,33 +114,45 @@ public class DocCommentTester {
         ArrayList<String> list = new ArrayList<>(Arrays.asList(args));
         if (!list.isEmpty() && "-useBreakIterator".equals(list.get(0))) {
             list.remove(0);
-            new DocCommentTester(true).run(list);
+            new DocCommentTester(true, true).run(list);
+        } else if (!list.isEmpty() && "-useStandardTransformer".equals(list.get(0))) {
+            list.remove(0);
+            new DocCommentTester(false, false).run(list);
         } else {
-            new DocCommentTester(false).run(list);
+            new DocCommentTester(false, true).run(list);
         }
     }
 
     public static final String BI_MARKER = "BREAK_ITERATOR";
     public final boolean useBreakIterator;
 
-    public DocCommentTester(boolean useBreakIterator) {
+    public final boolean useIdentityTransformer;
+
+    public DocCommentTester(boolean useBreakIterator, boolean useIdentityTtransformer) {
         this.useBreakIterator = useBreakIterator;
+        this.useIdentityTransformer = useIdentityTtransformer;
     }
 
     public void run(List<String> args) throws Exception {
         String testSrc = System.getProperty("test.src");
 
-        List<File> files = args.stream()
-                .map(arg -> new File(testSrc, arg))
+        List<Path> files = args.stream()
+                .map(arg -> Path.of(testSrc, arg))
                 .collect(Collectors.toList());
 
         JavacTool javac = JavacTool.create();
         StandardJavaFileManager fm = javac.getStandardFileManager(null, null, null);
 
-        Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files);
+        Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromPaths(files);
 
         JavacTask t = javac.getTask(null, fm, null, null, null, fos);
-        final DocTrees trees = DocTrees.instance(t);
+        final JavacTrees trees = (JavacTrees) DocTrees.instance(t);
+
+        if (useIdentityTransformer) {
+            // disable default use of the "standard" transformer, so that we can examine
+            // the trees as created by DocCommentParser.
+            trees.setDocCommentTreeTransformer(new JavacTrees.IdentityTransformer());
+        }
 
         if (useBreakIterator) {
             // BreakIterators are locale dependent wrt. behavior
@@ -243,7 +297,9 @@ public class DocCommentTester {
             int start = test.useBreakIterator
                     ? source.indexOf("\n/*\n" + BI_MARKER + "\n", findName(source, name))
                     : source.indexOf("\n/*\n", findName(source, name));
+            assert start >= 0 : "start of AST comment not found";
             int end = source.indexOf("\n*/\n", start);
+            assert end >= 0 : "end of AST comment not found";
             int startlen = start + (test.useBreakIterator ? BI_MARKER.length() + 1 : 0) + 4;
             String expect = source.substring(startlen, end + 1);
             if (!found.equals(expect)) {
@@ -267,26 +323,26 @@ public class DocCommentTester {
          * changes are approved, the new files can be used to replace the old.
          */
         public static void main(String... args) throws Exception {
-            List<File> files = new ArrayList<>();
-            File o = null;
+            List<Path> files = new ArrayList<>();
+            Path o = null;
             for (int i = 0; i < args.length; i++) {
                 String arg = args[i];
                 if (arg.equals("-o"))
-                    o = new File(args[++i]);
+                    o = Path.of(args[++i]);
                 else if (arg.startsWith("-"))
                     throw new IllegalArgumentException(arg);
                 else {
-                    files.add(new File(arg));
+                    files.add(Path.of(arg));
                 }
             }
 
             if (o == null)
                 throw new IllegalArgumentException("no output dir specified");
-            final File outDir = o;
+            final Path outDir = o;
 
             JavacTool javac = JavacTool.create();
             StandardJavaFileManager fm = javac.getStandardFileManager(null, null, null);
-            Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files);
+            Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromPaths(files);
 
             JavacTask t = javac.getTask(null, fm, null, null, null, fos);
             final DocTrees trees = DocTrees.instance(t);
@@ -305,8 +361,10 @@ public class DocCommentTester {
                     }
                     // remove existing gold by removing all block comments after the first '{'.
                     int start = source.indexOf("{");
+                    assert start >= 0 : "cannot find initial '{'";
                     while ((start = source.indexOf("\n/*\n", start)) != -1) {
                         int end = source.indexOf("\n*/\n");
+                        assert end >= 0 : "cannot find end of comment";
                         source = source.substring(0, start + 1) + source.substring(end + 4);
                     }
 
@@ -314,14 +372,12 @@ public class DocCommentTester {
                     super.visitCompilationUnit(tree, ignore);
 
                     // write the modified source
-                    File f = new File(tree.getSourceFile().getName());
-                    File outFile = new File(outDir, f.getName());
+                    var treeSourceFileName = tree.getSourceFile().getName();
+                    var outFile = outDir.resolve(treeSourceFileName);
                     try {
-                        try (FileWriter out = new FileWriter(outFile)) {
-                            out.write(source);
-                        }
+                        Files.writeString(outFile, source);
                     } catch (IOException e) {
-                        System.err.println("Can't write " + tree.getSourceFile().getName()
+                        System.err.println("Can't write " + treeSourceFileName
                                 + " to " + outFile + ": " + e);
                     }
                     return null;
@@ -542,6 +598,11 @@ public class DocCommentTester {
                 return null;
             }
 
+            public Void visitRawText(RawTextTree node, Void p) {
+                header(node, compress(node.getContent()));
+                return null;
+            }
+
             public Void visitReference(ReferenceTree node, Void p) {
                 header(node, compress(node.getSignature()));
                 return null;
@@ -863,6 +924,8 @@ public class DocCommentTester {
                             long startPos = dc.getSourcePosition(dcTree.getStartPosition());
                             String found = getFoundText(cs, (int) startPos, expect.length());
                             if (!found.equals(expect)) {
+                                System.err.println("node: " + node.getKind());
+                                System.err.println("startPos: " + startPos + " " + showPos(cs, (int) startPos));
                                 System.err.println("expect: " + expect);
                                 System.err.println("found:  " + found);
                                 error("mismatch");
@@ -895,6 +958,17 @@ public class DocCommentTester {
         String getFoundText(CharSequence cs, int pos, int len) {
             return (pos == -1) ? "" : cs.subSequence(pos, Math.min(pos + len, cs.length())).toString();
         }
+
+        String showPos(CharSequence cs, int pos) {
+            String s = cs.toString();
+            return (s.substring(Math.max(0, pos - 10), pos)
+                    + "["
+                    + s.charAt(pos)
+                    + "]"
+                    + s.substring(pos + 1, Math.min(s.length(), pos + 10)))
+                    .replace('\n', '|')
+                    .replace(' ', '_');
+        }
     }
 
     /**
@@ -917,8 +991,10 @@ public class DocCommentTester {
             }
             boolean normalizeTags = !annos.contains("@NormalizeTags(false)");
 
-            String raw = trees.getDocComment(path);
-            String normRaw = normalize(raw, normalizeTags);
+            Elements.DocCommentKind ck = trees.getDocCommentKind(path);
+            boolean isLineComment = ck == Elements.DocCommentKind.END_OF_LINE;
+            String raw = trees.getDocComment(path).stripTrailing();
+            String normRaw = normalize(raw, isLineComment, normalizeTags);
 
             StringWriter out = new StringWriter();
             DocPretty dp = new DocPretty(out);
@@ -927,9 +1003,11 @@ public class DocCommentTester {
 
             if (!pretty.equals(normRaw)) {
                 error("mismatch");
-                System.err.println("*** expected:");
+                System.err.println("*** raw: (" + raw.length() + ")");
+                System.err.println(raw.replace(" ", "_"));
+                System.err.println("*** expected: (" + normRaw.length() + ")");
                 System.err.println(normRaw.replace(" ", "_"));
-                System.err.println("*** found:");
+                System.err.println("*** found: (" + pretty.length() + ")");
                 System.err.println(pretty.replace(" ", "_"));
             }
         }
@@ -945,8 +1023,9 @@ public class DocCommentTester {
          * @param normalizeTags whether to normalize inline tags
          * @return the normalized content
          */
-        String normalize(String s, boolean normalizeTags) {
-            String s2 = s.trim().replaceFirst("\\.\\s*\\n *@(?![@*])", ".\n@");
+        String normalize(String s, boolean isLineComment, boolean normalizeTags) {
+            String s2 = (isLineComment ? s : s.trim())
+                    .replaceFirst("\\.\\s*\\n *@(?![@*])", ".\n@"); // Between block tags
             StringBuilder sb = new StringBuilder();
             Pattern p = Pattern.compile("(?i)\\{@([a-z][a-z0-9.:-]*)( )?");
             Matcher m = p.matcher(s2);
@@ -965,7 +1044,7 @@ public class DocCommentTester {
         }
 
         String normalizeFragment(String s) {
-            return s.replaceAll("\n[ \t]+@(?![@*])", "\n@");
+            return s.replaceAll("\n[ \t]+@(?!([@*]|dummy))", "\n@");
         }
 
         int copyLiteral(String s, int start, StringBuilder sb) {
diff --git a/test/langtools/tools/javac/doctree/ElementTest.java b/test/langtools/tools/javac/doctree/ElementTest.java
index 911814c5880..db2829cdce2 100644
--- a/test/langtools/tools/javac/doctree/ElementTest.java
+++ b/test/langtools/tools/javac/doctree/ElementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8078320 8247788 8273244
+ * @bug 7021614 8078320 8247788 8273244 8298405
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -236,4 +236,16 @@ DocComment[DOC_COMMENT, pos:1
 ]
 */
 
+// In Markdown mode, < does not introduce an element
+    ///abc < def
+    public void markdown() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, abc_<_def]
+  body: empty
+  block tags: empty
+]
+*/
+
 }
diff --git a/test/langtools/tools/javac/doctree/EntityTest.java b/test/langtools/tools/javac/doctree/EntityTest.java
index 57226746d2e..0b1db2c3409 100644
--- a/test/langtools/tools/javac/doctree/EntityTest.java
+++ b/test/langtools/tools/javac/doctree/EntityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244 8284908
+ * @bug 7021614 8273244 8284908 8298405
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -164,6 +164,17 @@ DocComment[DOC_COMMENT, pos:2
   body: empty
   block tags: empty
 ]
+*/
+
+    ///abc & def
+    public void markdown() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, abc_&_def]
+  body: empty
+  block tags: empty
+]
 */
 
 }
diff --git a/test/langtools/tools/javac/doctree/FirstSentenceTest.java b/test/langtools/tools/javac/doctree/FirstSentenceTest.java
index 3a973d87bd2..d69049fe8d6 100644
--- a/test/langtools/tools/javac/doctree/FirstSentenceTest.java
+++ b/test/langtools/tools/javac/doctree/FirstSentenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, 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
@@ -403,6 +403,148 @@ DocComment[DOC_COMMENT, pos:1
     Text[TEXT, pos:8, _def._ghi_jkl]
   block tags: empty
 ]
+*/
+    ///Abc.
+    ///Def.
+    void simpleMarkdown() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc.]
+  body: 1
+    RawText[MARKDOWN, pos:5, Def.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc.]
+  body: 1
+    RawText[MARKDOWN, pos:5, Def.]
+  block tags: empty
+]
+*/
+
+    ///Abc `p.q` def.
+    ///Ghi.
+    void markdownWithCodeSpan() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_`p.q`_def.]
+  body: 1
+    RawText[MARKDOWN, pos:15, Ghi.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_`p.q`_def.]
+  body: 1
+    RawText[MARKDOWN, pos:15, Ghi.]
+  block tags: empty
+]
+*/
+
+    ///Abc {@code p.q} def.
+    ///Ghi.
+    void markdownWithCodeTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 3
+    RawText[MARKDOWN, pos:0, Abc_]
+    Literal[CODE, pos:4, p.q]
+    RawText[MARKDOWN, pos:15, _def.]
+  body: 1
+    RawText[MARKDOWN, pos:21, Ghi.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 3
+    RawText[MARKDOWN, pos:0, Abc_]
+    Literal[CODE, pos:4, p.q]
+    RawText[MARKDOWN, pos:15, _def.]
+  body: 1
+    RawText[MARKDOWN, pos:21, Ghi.]
+  block tags: empty
+]
+*/
+
+    ///Abc <a href="example.com">example</a> def.
+    ///Ghi.
+    void markdownWithHtml() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_<a_href="example.com">example</a>_def.]
+  body: 1
+    RawText[MARKDOWN, pos:43, Ghi.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_<a_href="example.com">example</a>_def.]
+  body: 1
+    RawText[MARKDOWN, pos:43, Ghi.]
+  block tags: empty
+]
+*/
+
+    ///Abc [example.com][example] def.
+    ///Ghi.
+    void markdownWithLinks() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_[example.com][example]_def.]
+  body: 1
+    RawText[MARKDOWN, pos:32, Ghi.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc_[example.com][example]_def.]
+  body: 1
+    RawText[MARKDOWN, pos:32, Ghi.]
+  block tags: empty
+]
+*/
+
+    ///Abc
+    ///
+    ///Def.
+    void markdownEndParaNoPeriod() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc]
+  body: 1
+    RawText[MARKDOWN, pos:5, Def.]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Abc]
+  body: 1
+    RawText[MARKDOWN, pos:5, Def.]
+  block tags: empty
+]
 */
 }
 
diff --git a/test/langtools/tools/javac/doctree/MDPrinter.java b/test/langtools/tools/javac/doctree/MDPrinter.java
new file mode 100644
index 00000000000..854471b83d8
--- /dev/null
+++ b/test/langtools/tools/javac/doctree/MDPrinter.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2023, 2024, 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 8298405
+ * @summary Make sure MDPrinter.java compiles
+ * @modules jdk.internal.md/jdk.internal.org.commonmark.node
+ *          jdk.internal.md/jdk.internal.org.commonmark.parser
+ * @compile MDPrinter.java
+ */
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import jdk.internal.org.commonmark.node.BlockQuote;
+import jdk.internal.org.commonmark.node.BulletList;
+import jdk.internal.org.commonmark.node.Code;
+import jdk.internal.org.commonmark.node.CustomBlock;
+import jdk.internal.org.commonmark.node.CustomNode;
+import jdk.internal.org.commonmark.node.Document;
+import jdk.internal.org.commonmark.node.Emphasis;
+import jdk.internal.org.commonmark.node.FencedCodeBlock;
+import jdk.internal.org.commonmark.node.HardLineBreak;
+import jdk.internal.org.commonmark.node.Heading;
+import jdk.internal.org.commonmark.node.HtmlBlock;
+import jdk.internal.org.commonmark.node.HtmlInline;
+import jdk.internal.org.commonmark.node.Image;
+import jdk.internal.org.commonmark.node.IndentedCodeBlock;
+import jdk.internal.org.commonmark.node.Link;
+import jdk.internal.org.commonmark.node.LinkReferenceDefinition;
+import jdk.internal.org.commonmark.node.ListItem;
+import jdk.internal.org.commonmark.node.Node;
+import jdk.internal.org.commonmark.node.OrderedList;
+import jdk.internal.org.commonmark.node.Paragraph;
+import jdk.internal.org.commonmark.node.SoftLineBreak;
+import jdk.internal.org.commonmark.node.SourceSpan;
+import jdk.internal.org.commonmark.node.StrongEmphasis;
+import jdk.internal.org.commonmark.node.Text;
+import jdk.internal.org.commonmark.node.ThematicBreak;
+import jdk.internal.org.commonmark.node.Visitor;
+import jdk.internal.org.commonmark.parser.IncludeSourceSpans;
+import jdk.internal.org.commonmark.parser.Parser;
+
+/**
+ * Debug printer for CommonMark nodes.
+ *
+ * Requires access to {@code jdk.internal.org.commonmark.node.*}.
+ *
+ * Conceptually based on javac's {@code DPrinter}.
+ */
+public class MDPrinter {
+    static class MDVisitor implements Visitor {
+
+        MDVisitor(String source, PrintStream out) {
+            this.source = source;
+            lines = source == null ? null : source.lines().toList();
+            this.out = out;
+        }
+
+        void visit(Node node) {
+            if (node == null) {
+                out.print("    ".repeat(depth));
+                out.println("*null*");
+            } else {
+                node.accept(this);
+            }
+        }
+
+        @Override
+        public void visit(BlockQuote blockQuote) {
+            defaultAction(blockQuote);
+        }
+
+        @Override
+        public void visit(BulletList bulletList) {
+            defaultAction(bulletList);
+        }
+
+        @Override
+        public void visit(Code code) {
+            defaultAction(code);
+        }
+
+        @Override
+        public void visit(Document document) {
+            defaultAction(document);
+        }
+
+        @Override
+        public void visit(Emphasis emphasis) {
+            defaultAction(emphasis);
+        }
+
+        @Override
+        public void visit(FencedCodeBlock fencedCodeBlock) {
+            defaultAction(fencedCodeBlock);
+        }
+
+        @Override
+        public void visit(HardLineBreak hardLineBreak) {
+            defaultAction(hardLineBreak);
+        }
+
+        @Override
+        public void visit(Heading heading) {
+            defaultAction(heading);
+        }
+
+        @Override
+        public void visit(ThematicBreak thematicBreak) {
+            defaultAction(thematicBreak);
+        }
+
+        @Override
+        public void visit(HtmlInline htmlInline) {
+            defaultAction(htmlInline);
+        }
+
+        @Override
+        public void visit(HtmlBlock htmlBlock) {
+            defaultAction(htmlBlock);
+        }
+
+        @Override
+        public void visit(Image image) {
+            defaultAction(image);
+        }
+
+        @Override
+        public void visit(IndentedCodeBlock indentedCodeBlock) {
+            defaultAction(indentedCodeBlock);
+        }
+
+        @Override
+        public void visit(Link link) {
+            defaultAction(link);
+        }
+
+        @Override
+        public void visit(ListItem listItem) {
+            defaultAction(listItem);
+        }
+
+        @Override
+        public void visit(OrderedList orderedList) {
+            defaultAction(orderedList);
+        }
+
+        @Override
+        public void visit(Paragraph paragraph) {
+            defaultAction(paragraph);
+        }
+
+        @Override
+        public void visit(SoftLineBreak softLineBreak) {
+            defaultAction(softLineBreak);
+        }
+
+        @Override
+        public void visit(StrongEmphasis strongEmphasis) {
+            defaultAction(strongEmphasis);
+        }
+
+        @Override
+        public void visit(Text text) {
+            defaultAction(text);
+        }
+
+        @Override
+        public void visit(LinkReferenceDefinition linkReferenceDefinition) {
+            defaultAction(linkReferenceDefinition);
+        }
+
+        @Override
+        public void visit(CustomBlock customBlock) {
+            defaultAction(customBlock);
+        }
+
+        @Override
+        public void visit(CustomNode customNode) {
+            defaultAction(customNode);
+        }
+
+        private final String source;
+        private final List<String> lines;
+        private final PrintStream out;
+
+        int depth = 0;
+
+        protected void defaultAction(Node node) {
+            out.print("    ".repeat(depth));
+            out.print(node.getClass().getSimpleName());
+            out.print(" ");
+            out.println(abbrev(node.toString(), 64));
+            int i = 0;
+            for (var ss : node.getSourceSpans()) {
+                out.print("    ".repeat(depth));
+                out.print("  span[" + (i++) + "]: " + ss);
+                out.println(abbrev(source(ss).replace(' ', '_').replace('\n', '|'), 64));
+            }
+            depth++;
+            try {
+                for (Node c = node.getFirstChild(); c != null; c = c.getNext()) {
+                    c.accept(this);
+                }
+            } finally {
+                depth--;
+            }
+        }
+
+        String source(SourceSpan ss) {
+            if (source == null) {
+                return "no source";
+            }
+            if (ss.getLineIndex() >= lines.size()) {
+                return "error: insufficient lines [" + lines.size() + "]";
+            }
+            String line = lines.get(ss.getLineIndex());
+            if (ss.getColumnIndex() + ss.getLength() > line.length()) {
+                return "error: bounds";
+            }
+            return line.substring(ss.getColumnIndex(), ss.getColumnIndex() + ss.getLength());
+        }
+
+        String abbrev(String s, int maxLen) {
+            return s.length() < maxLen ? s
+                    : s.substring(0, maxLen / 2) + "..." + s.substring(s.length() - maxLen / 2);
+
+        }
+    }
+
+    public static void main(String... args) throws IOException {
+        show(Files.readString(Path.of(args[0])));
+    }
+
+    public static void show(String source) {
+        Parser parser = Parser.builder()
+                .includeSourceSpans(IncludeSourceSpans.BLOCKS_AND_INLINES)
+                .build();
+        Node document = parser.parse(source);
+
+        show(document, source, System.err);
+    }
+
+    public static void show(Node node, String source, PrintStream out) {
+        new MDVisitor(source, out).visit(node);
+    }
+
+}
diff --git a/test/langtools/tools/javac/doctree/MarkdownTest.java b/test/langtools/tools/javac/doctree/MarkdownTest.java
new file mode 100644
index 00000000000..8da9e6ed44c
--- /dev/null
+++ b/test/langtools/tools/javac/doctree/MarkdownTest.java
@@ -0,0 +1,617 @@
+/*
+ * Copyright (c) 2022, 2024, 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 8298405
+ * @summary Markdown support in the standard doclet
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build DocCommentTester
+ * @run main DocCommentTester MarkdownTest.java
+ * @run main DocCommentTester -useStandardTransformer MarkdownTest.java
+ */
+
+/*
+ * Test for handling Markdown content.
+ *
+ * In the tests for code spans and code blocks, "@dummy" is used as a dummy inline
+ * or block tag to verify that it is skipped as part of the code span or code block.
+ * In other words, "@dummy" should appear as a literal part of the Markdown content.
+ * Conversely, standard tags are used to verify that a fragment of text is not being
+ * skipped as a code span or code block. In other words, they should be recognized as tags
+ * and not skipped as part of any Markdown content.
+ *
+ * "@dummy" is also known to DocCommentTester and will not have any preceding whitespace
+ * removed during normalization.
+ */
+
+class MarkdownTest {
+    ///abc < def & ghi {@code 123} jkl {@unknown} mno.
+    void descriptionMix() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 5
+    RawText[MARKDOWN, pos:0, abc_<_def_&_ghi_]
+    Literal[CODE, pos:16, 123]
+    RawText[MARKDOWN, pos:27, _jkl_]
+    UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:32
+      tag:unknown
+      content: 1
+        Text[TEXT, pos:41]
+    ]
+    RawText[MARKDOWN, pos:42, _mno.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///@since abc < def & ghi {@code 123} jkl {@unknown} mno.
+    void blockTagMix() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: empty
+  body: empty
+  block tags: 1
+    Since[SINCE, pos:0
+      body: 5
+        RawText[MARKDOWN, pos:7, abc_<_def_&_ghi_]
+        Literal[CODE, pos:23, 123]
+        RawText[MARKDOWN, pos:34, _jkl_]
+        UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:39
+          tag:unknown
+          content: 1
+            Text[TEXT, pos:48]
+        ]
+        RawText[MARKDOWN, pos:49, _mno.]
+    ]
+]
+*/
+
+    ///123 {@link Object abc < def & ghi {@code 123} jkl {@unknown} mno} 456.
+    void inlineTagMix() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 3
+    RawText[MARKDOWN, pos:0, 123_]
+    Link[LINK, pos:4
+      reference:
+        Reference[REFERENCE, pos:11, Object]
+      body: 5
+        RawText[MARKDOWN, pos:18, abc_<_def_&_ghi_]
+        Literal[CODE, pos:34, 123]
+        RawText[MARKDOWN, pos:45, _jkl_]
+        UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:50
+          tag:unknown
+          content: 1
+            Text[TEXT, pos:59]
+        ]
+        RawText[MARKDOWN, pos:60, _mno]
+    ]
+    RawText[MARKDOWN, pos:65, _456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 `abc` 456.
+    void simpleCodeSpan() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_`abc`_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 `abc`
+    void simpleCodeSpanAtEndOfInput() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_`abc`]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 ```abc``` 456.
+    void mediumCodeSpan() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_```abc```_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 ```abc`def``` 456.
+    void mediumCodeSpanWithBackTicks() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_```abc`def```_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 ```abc{@dummy ...}def``` 456.
+    void mediumCodeSpanWithNotInlineTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_```abc{@dummy_...}def```_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123 ```abc
+    ///@dummy def``` 456.
+    void mediumCodeSpanWithNotBlockTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123_```abc|@dummy_def```_456.]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc
+    ///```
+    ///456.
+    void simpleFencedCodeBlock_backtick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|abc|```|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///~~~
+    ///abc
+    ///{@dummy ...}
+    ///~~~
+    ///456.
+    void simpleFencedCodeBlock_tilde() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ~~~|abc|{@dummy_...}|~~~|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc
+    ///```
+    void simpleFencedCodeBlock_atEndOfInput() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|abc|```]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc {@dummy def} ghi
+    ///```
+    ///456.
+    void fencedCodeBlockWithInlineTag_backtick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|abc_{@dummy_def}_ghi|```|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc ``` ghi
+    ///{@dummy ...}
+    ///```
+    ///456.
+    void fencedCodeBlockWithBackTicks_backtick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|abc_```_ghi|{@dummy_...}|```|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```abc`def``` 456.
+    void codeSpanNotCodeBlock() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```abc`def```_456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///{@code ...}
+    ///~~~
+    ///456.
+    void mismatchedFences() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, ```|{@code_...}|~~~|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///`````
+    ///``` ghi
+    ///{@dummy ...}
+    ///`````
+    ///456.
+    void fencedCodeBlockWithShortFence_backtick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 1
+    RawText[MARKDOWN, pos:5, `````|```_ghi|{@dummy_...}|`````|456.]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterBlank() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:10, abc_{@dummy_...}|____@dummy|____def||456_]
+    Literal[CODE, pos:51, ...]
+    RawText[MARKDOWN, pos:62, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///### heading
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterATX() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:5, ###_heading|____abc_{@dummy_...}|____@dummy|____def|456_]
+    Literal[CODE, pos:61, ...]
+    RawText[MARKDOWN, pos:72, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///Heading
+    ///-------
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterSetext() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:5, Heading|-------|____abc_{@dummy_...}|____@dummy|____def|456_]
+    Literal[CODE, pos:65, ...]
+    RawText[MARKDOWN, pos:76, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///- - - - -
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterThematicBreak() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:5, -_-_-_-_-|____abc_{@dummy_...}|____@dummy|____def|456_]
+    Literal[CODE, pos:59, ...]
+    RawText[MARKDOWN, pos:70, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///```
+    ///abc
+    ///{@dummy}
+    ///def
+    ///```
+    ///    abc {@dummy ...}
+    ///    @dummy
+    ///    def
+    ///456 {@code ...}.
+    void indentedCodeBlock_afterFencedCodeBlock() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:5, ```|abc|{@dummy}|def|```|____abc...mmy_...}|____@dummy|____def|456_]
+    Literal[CODE, pos:74, ...]
+    RawText[MARKDOWN, pos:85, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///
+    ///```
+    ///public class HelloWorld {
+    ///    @dummy
+    ///    public static void main(String... args) {
+    ///        System.out.println("Hello World");
+    ///    }
+    ///}
+    ///```
+    ///456 {@code ...}.
+    void fencedHelloWorld() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:6, ```|public_class_HelloWorld_{|__..."Hello_World");|____}|}|```|456_]
+    Literal[CODE, pos:152, ...]
+    RawText[MARKDOWN, pos:163, .]
+  block tags: empty
+]
+*/
+
+    ///123.
+    ///
+    ///    public class HelloWorld {
+    ///        @dummy
+    ///        public static void main(String... args) {
+    ///            System.out.println("Hello World");
+    ///        }
+    ///    }
+    ///
+    ///456 {@code ...}.
+    void indentedHelloWorld() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, 123.]
+  body: 3
+    RawText[MARKDOWN, pos:10, public_class_HelloWorld_{|______...o_World");|________}|____}||456_]
+    Literal[CODE, pos:169, ...]
+    RawText[MARKDOWN, pos:180, .]
+  block tags: empty
+]
+*/
+
+    ///{@summary abc ``code-span {@dummy ...}`` def {@code ...} }
+    ///rest.
+    void codeSpanInInlineTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    Summary[SUMMARY, pos:0
+      summary: 3
+        RawText[MARKDOWN, pos:10, abc_``code-span_{@dummy_...}``_def_]
+        Literal[CODE, pos:45, ...]
+        RawText[MARKDOWN, pos:56, _]
+    ]
+  body: 1
+    RawText[MARKDOWN, pos:58, |rest.]
+  block tags: empty
+]
+*/
+
+    ///{@summary abc
+    ///```code-block
+    ///  {@dummy ...}
+    ///```
+    ///def {@code ...} }
+    ///rest.
+    void codeBlockInInlineTag() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    Summary[SUMMARY, pos:0
+      summary: 3
+        RawText[MARKDOWN, pos:10, abc|```code-block|__{@dummy_...}|```|def_]
+        Literal[CODE, pos:51, ...]
+        RawText[MARKDOWN, pos:62, _]
+    ]
+  body: 1
+    RawText[MARKDOWN, pos:64, |rest.]
+  block tags: empty
+]
+*/
+
+    ///abc `
+    ///def
+    void unmatchedBackTick() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, abc_`|def]
+  body: empty
+  block tags: empty
+]
+*/
+
+    ///{@summary abc `
+    ///def}
+    ///rest
+    void unmatchedBackTickInInline() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    Summary[SUMMARY, pos:0
+      summary: 1
+        RawText[MARKDOWN, pos:10, abc_`|def]
+    ]
+  body: 1
+    RawText[MARKDOWN, pos:20, |rest]
+  block tags: empty
+]
+*/
+
+// While this is an important test case, it is also a negative one
+// (that is, the AST contains an Erroneous node).
+// Note how the backticks "match" across the end of the inline tag.
+// That's unfortunate, but cannot reasonably be detected without
+// examining the contents of a code span.
+// Not surprisingly, some of the checks fail for this (bad) test case.
+// * PrettyChecker fails because it does not handle an unterminated inline tag.
+// * StartEndPosChecker fails because it does not handle an unterminated inline tag.
+//
+// Disabled until we can either enhance the checkers or select which
+// checkers to use.
+
+//    ///{@summary abc `
+//    ///def}
+//    ///rest `more`
+//    ///
+//    void unmatchedBackTickInInline2() { }
+///*
+//DocComment[DOC_COMMENT, pos:0
+//  firstSentence: 1
+//    Summary[SUMMARY, pos:0
+//      summary: 1
+//        Erroneous[ERRONEOUS, pos:10, prefPos:31
+//          code: compiler.err.dc.unterminated.inline.tag
+//          body: abc_`|def}|rest_`more`
+//        ]
+//    ]
+//  body: empty
+//  block tags: empty
+//]
+//*/
+
+    ///Indented by 0.
+    ///
+    ///   * list
+    ///
+    ///    code block
+    ///
+    ///done.
+    void indent0() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Indented_by_0.]
+  body: 1
+    RawText[MARKDOWN, pos:19, *_list||____code_block||done.]
+  block tags: empty
+]
+*/
+
+    /// Indented by 1.
+    ///
+    ///    * list
+    ///
+    ///     code block
+    ///
+    /// done.
+    void indent1() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Indented_by_1.]
+  body: 1
+    RawText[MARKDOWN, pos:19, *_list||____code_block||done.]
+  block tags: empty
+]
+*/
+
+    ///        Indented by 8.
+    ///
+    ///           * list
+    ///
+    ///            code block
+    ///
+    ///        done.
+    void indent8() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    RawText[MARKDOWN, pos:0, Indented_by_8.]
+  body: 1
+    RawText[MARKDOWN, pos:19, *_list||____code_block||done.]
+  block tags: empty
+]
+*/
+
+
+}
diff --git a/test/langtools/tools/javac/doctree/MarkdownTransformerPositionTest.java b/test/langtools/tools/javac/doctree/MarkdownTransformerPositionTest.java
new file mode 100644
index 00000000000..4b4e44ef427
--- /dev/null
+++ b/test/langtools/tools/javac/doctree/MarkdownTransformerPositionTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2024, 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
+ * @summary test case for Markdown positions
+ * @run main/othervm --limit-modules jdk.compiler MarkdownTransformerPositionTest
+ * @run main MarkdownTransformerPositionTest
+ */
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.doctree.RawTextTree;
+import com.sun.source.tree.*;
+import com.sun.source.util.*;
+
+import java.net.URI;
+import java.util.*;
+import javax.lang.model.element.Element;
+import javax.tools.*;
+
+/*
+ * Custom test case for positions of RawTextTree nodes after passing through
+ * main MarkdownTransformer, or not.
+ * See https://github.com/openjdk/jdk/pull/16388#discussion_r1479306878
+ */
+public class MarkdownTransformerPositionTest {
+
+    public static void main(String... args) throws Exception {
+        MarkdownTransformerPositionTest t = new MarkdownTransformerPositionTest();
+
+        t.simpleTest();
+        t.testWithReplacements();
+    }
+
+    private void simpleTest() throws Exception {
+        runTest("""
+                /// Markdown test
+                ///
+                /// @author testAuthor
+                public class Test {
+                }
+                """,
+                "Markdown test",
+                "testAuthor");
+    }
+
+    private void testWithReplacements() throws Exception {
+        runTest("""
+                /// Markdown \uFFFC test \uFFFC with \uFFFC replacements.
+                ///
+                /// @author testAuthor
+                public class Test {
+                }
+                """,
+                "Markdown \uFFFC test \uFFFC with \uFFFC replacements.",
+                "testAuthor");
+    }
+
+    private void runTest(String source, String... expectedRawSpans) throws Exception {
+        JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+        JavacTask task = (JavacTask)comp.getTask(null, null, null, null, null, Arrays.asList(new JavaSource(source)));
+        CompilationUnitTree cu = task.parse().iterator().next();
+        task.analyze();
+        DocTrees trees = DocTrees.instance(task);
+        List<String> rawSpans = new ArrayList<>();
+        TreePath clazzTP = new TreePath(new TreePath(cu), cu.getTypeDecls().get(0));
+        Element clazz = trees.getElement(clazzTP);
+        DocCommentTree docComment = trees.getDocCommentTree(clazz);
+
+        new DocTreeScanner<Void, Void>() {
+            @Override
+            public Void visitRawText(RawTextTree node, Void p) {
+                int start = (int) trees.getSourcePositions().getStartPosition(cu, docComment, node);
+                int end = (int) trees.getSourcePositions().getEndPosition(cu, docComment, node);
+                rawSpans.add(source.substring(start, end));
+                return super.visitRawText(node, p);
+            }
+        }.scan(docComment, null);
+
+        List<String> expectedRawSpansList = List.of(expectedRawSpans);
+
+        if (!expectedRawSpansList.equals(rawSpans)) {
+            throw new AssertionError("Incorrect raw text spans, should be: " +
+                    expectedRawSpansList + ", but is: " + rawSpans);
+        }
+
+        System.err.println("Test result: success, boot modules: " + ModuleLayer.boot().modules());
+    }
+
+    static class JavaSource extends SimpleJavaFileObject {
+
+        private final String source;
+
+        public JavaSource(String source) {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            this.source = source;
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return source;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/lexer/CommentTest.java b/test/langtools/tools/javac/lexer/CommentTest.java
new file mode 100644
index 00000000000..c89c9eef1e6
--- /dev/null
+++ b/test/langtools/tools/javac/lexer/CommentTest.java
@@ -0,0 +1,524 @@
+/*
+ * Copyright (c) 2023, 2024, 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 8298405
+ * @summary Proper lexing of comments, especially /// comments
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.parser
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build toolbox.TestRunner
+ * @run main CommentTest
+ */
+
+import java.util.Objects;
+
+import com.sun.tools.javac.parser.ScannerFactory;
+import com.sun.tools.javac.parser.Tokens;
+import com.sun.tools.javac.util.Context;
+
+import toolbox.TestRunner;
+
+public class CommentTest extends TestRunner {
+    public static void main(String... args) throws Exception {
+        new CommentTest().runTests();
+    }
+
+    CommentTest() {
+        super(System.err);
+    }
+
+    /**
+     * Control: a simple comment with no blank lines or incidental whitespace.
+     */
+    @Test
+    public void testControl() {
+        test("""
+                [
+
+                ///abc
+                ///def
+                ///ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Whitespace before the comment is completely ignored.
+     */
+    @Test
+    public void testRaggedInitialIndent() {
+        test("""
+                [
+
+                  ///abc
+                      ///def
+                    ///ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Leading blank lines are preserved.
+     */
+    @Test
+    public void testLeadingBlankLine_1() {
+        test("""
+                [
+
+                  ///
+                  ///abc
+                  ///def
+                  ///ghi
+
+                ]
+                """, """
+
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Leading blank lines do not affect the amount of incidental whitespace.
+     */
+    @Test
+    public void testLeadingBlankLine_2() {
+        test("""
+                [
+
+                  ///
+                  ///    abc
+                  ///    def
+                  ///    ghi
+
+                ]
+                """, """
+
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Inner blank lines are preserved.
+     */
+    @Test
+    public void testInnerBlankLine_1() {
+        test("""
+                [
+
+                  ///abc
+                  ///
+                  ///def
+                  ///ghi
+
+                ]
+                """, """
+                abc
+
+                def
+                ghi""");
+    }
+
+    /**
+     * Inner blank lines do not affect the amount of incidental whitespace.
+     */
+    @Test
+    public void testInnerBlankLine_2() {
+        test("""
+                [
+
+                  ///    abc
+                  ///
+                  ///    def
+                  ///    ghi
+
+                ]
+                """, """
+                abc
+
+                def
+                ghi""");
+    }
+
+    /**
+     * Inner blank lines do not affect the amount of incidental whitespace,
+     * but may have whitespace removed, perhaps resulting in an empty line.
+     */
+    @Test
+    public void testInnerBlankLine_3() {
+        test("""
+                [
+
+                  ///    abc
+                  ///  \s
+                  ///    def
+                  ///    ghi
+
+                ]
+                """, """
+                abc
+
+                def
+                ghi""");
+    }
+
+    /**
+     * Inner blank lines do not affect the amount of incidental whitespace,
+     * but may have whitespace removed.
+     */
+    @Test
+    public void testInnerBlankLine_4() {
+        test("""
+                [
+
+                  ///    abc
+                  ///          \s
+                  ///    def
+                  ///    ghi
+
+                ]
+                """, """
+                abc
+                      \s
+                def
+                ghi""");
+    }
+
+    /**
+     * Trailing blank lines are preserved.
+     */
+    @Test
+    public void testTrailingBlankLine_1() {
+        test("""
+                [
+
+                  ///abc
+                  ///def
+                  ///ghi
+                  ///
+
+                ]
+                """, """
+                abc
+                def
+                ghi
+                """);
+    }
+
+    /**
+     * Trailing blank lines do not affect the amount of incidental whitespace.
+     */
+    @Test
+    public void testTrailingBlankLine_2() {
+        test("""
+                [
+
+                  ///    abc
+                  ///    def
+                  ///    ghi
+                  ///
+
+                ]
+                """, """
+                abc
+                def
+                ghi
+                """);
+    }
+
+    /**
+     * Small amounts of incidental whitespace are removed.
+     */
+    @Test
+    public void testIncidental_small() {
+        test("""
+                [
+
+                /// abc
+                /// def
+                /// ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Large amounts of incidental whitespace are removed.
+     */
+    @Test
+    public void testIncidental_large() {
+        test("""
+                [
+
+                ///        abc
+                ///        def
+                ///        ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Additional leading whitespace may remain after incidental whitespace is removed.
+     */
+    @Test
+    public void testIncidental_mixed() {
+        test("""
+                [
+
+                ///        abc
+                ///            def
+                ///          ghi
+
+                ]
+                """, """
+                abc
+                    def
+                  ghi""");
+    }
+
+    /**
+     * Tabs and spaces are treated equally, as whitespace characters.
+     */
+    @Test
+    public void testIncidental_withTabs() {
+        test("""
+                [
+
+                ///        abc
+                ///\t       def
+                ///\t\t      ghi
+
+                ]
+                """, """
+                abc
+                def
+                ghi""");
+    }
+
+    /**
+     * Leading tabs may remain after incidental whitespace is removed.
+     */
+    @Test
+    public void testTabAfterIncidental() {
+        test("""
+                [
+
+                ///        abc
+                ///        \tdef
+                ///        ghi
+
+                ]
+                """, """
+                abc
+                \tdef
+                ghi""");
+    }
+
+    /**
+     * Trailing spaces are never removed.
+     */
+    @Test
+    public void testTrailingSpaces() {
+        test("""
+                [
+
+                ///abc
+                ///def    \s
+                ///ghi
+
+                ]
+                """, """
+                abc
+                def    \s
+                ghi""");
+
+    }
+
+    /**
+     * Trailing tabs are never removed.
+     */
+    @Test
+    public void testTrailingTabs() {
+        test("""
+                [
+
+                ///abc
+                ///def    \t
+                ///ghi
+
+                ]
+                """, """
+                abc
+                def    \t
+                ghi""");
+
+    }
+
+    /**
+     * Tabs may appear in incidental whitespace, and may remain in the leading
+     * whitespace after incidental whitespace is removed.
+     */
+    @Test
+    public void testMixedTabs() {
+        test("""
+                [
+
+                ///\t \t abc
+                ///\t \t \tdef
+                ///\t \t ghi
+
+                ]
+                """, """
+                abc
+                \tdef
+                ghi""");
+
+    }
+
+    /**
+     * A blank line between two /// comments is significant, and separates the two comments.
+     */
+    @Test
+    public void testMultipleComments() {
+        // When there is more than one comment, the most recent comment is first in the list
+        // stored in the token.
+        //
+        // (For JavaDoc, only the most recent comment is used; any preceding comments are ignored.)
+        test("""
+                [
+
+                ///abc
+
+                ///ghi
+
+                ]
+                """, """
+                ghi""", """
+                abc""");
+
+    }
+
+    /**
+     * An example of pseudo-typical Markdown, containing various Markdown constructs,
+     * like lists and code blocks.
+     */
+    @Test
+    public void testSampleMarkdown() {
+        test("""
+                [
+
+                /// Lorem ipsum dolor sit amet,
+                /// consectetur adipiscing elit.
+                ///
+                /// * item 1
+                /// * item 2
+                ///
+                /// ```
+                /// fenced code block
+                /// ```
+                ///
+                /// Ut enim ad minim veniam, quis nostrud
+                /// exercitation ullamco laboris nisi ut
+                /// aliquip ex ea commodo consequat.
+                ///
+                ///     indented code block
+                ///     ...
+                ///
+                /// Duis aute irure dolor in reprehenderit
+                /// in voluptate velit esse cillum dolore
+                /// eu fugiat nulla pariatur.
+                ]
+                """, """
+                Lorem ipsum dolor sit amet,
+                consectetur adipiscing elit.
+
+                * item 1
+                * item 2
+
+                ```
+                fenced code block
+                ```
+
+                Ut enim ad minim veniam, quis nostrud
+                exercitation ullamco laboris nisi ut
+                aliquip ex ea commodo consequat.
+
+                    indented code block
+                    ...
+
+                Duis aute irure dolor in reprehenderit
+                in voluptate velit esse cillum dolore
+                eu fugiat nulla pariatur.""");
+
+    }
+
+    private void test(String input, String... expect) {
+        var ctx = new Context();
+        var sf = ScannerFactory.instance(ctx);
+        var s = sf.newScanner(input, true);
+        s. nextToken();
+        var skipToken = s.token();
+        checkEqual(skipToken.kind, Tokens.TokenKind.LBRACKET);
+
+        s.nextToken();
+        var t = s.token();
+        var comments = t.comments;
+        if (comments == null) {
+            error("no comments");
+        } else if (comments.size() == expect.length) {
+            for (var i = 0; i < comments.size(); i++) {
+                checkEqual(comments.get(i).getText(), expect[i]);
+            }
+        } else {
+            error("Unexpected comments: " + comments);
+            out.println("  expected " + expect.length + " comments");
+            out.println("     found " + comments.size() + " comments");
+        }
+    }
+
+    private void checkEqual(Object found, Object expect) {
+        if (!Objects.equals(found, expect)) {
+            error("mismatch");
+            out.println("  expect: " + String.valueOf(expect).replace("\n", "|"));
+            out.println("   found: " + String.valueOf(found).replace("\n", "|"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/lib/DPrinter.java b/test/langtools/tools/javac/lib/DPrinter.java
index 19a70dff87a..6fa2f17dc67 100644
--- a/test/langtools/tools/javac/lib/DPrinter.java
+++ b/test/langtools/tools/javac/lib/DPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, 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
@@ -1107,6 +1107,11 @@ public class DPrinter {
             return visitBlockTag(node, null);
         }
 
+        public Void visitRawText(RawTextTree node, Void p) {
+            printLimitedEscapedString("content", node.getContent());
+            return visitTree(node, null);
+        }
+
         public Void visitReference(ReferenceTree node, Void p) {
             printString("signature", node.getSignature());
             return visitTree(node, null);
diff --git a/test/langtools/tools/javac/processing/model/util/elements/TestGetDocCommentKind.java b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocCommentKind.java
new file mode 100644
index 00000000000..da5d65c5232
--- /dev/null
+++ b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocCommentKind.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2024, 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 8307184
+ * @summary Test basic operation of Elements.getDocCommentKind
+ * @library /tools/lib /tools/javac/lib
+ * @build   toolbox.ToolBox JavacTestingAbstractProcessor TestGetDocCommentKind
+ * @compile -processor TestGetDocCommentKind -proc:only TestGetDocCommentKind.java
+ */
+
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.util.*;
+import javax.lang.model.util.Elements.DocCommentKind;
+
+public class TestGetDocCommentKind extends JavacTestingAbstractProcessor {
+    final Elements vacuousElements = new VacuousElements();
+
+    public boolean process(Set<? extends TypeElement> annotations,
+                           RoundEnvironment roundEnv) {
+        if (!roundEnv.processingOver()) {
+            boolean elementSeen = false;
+
+            for (TypeElement typeRoot : ElementFilter.typesIn(roundEnv.getRootElements()) ) {
+                for (Element element : typeRoot.getEnclosedElements()) {
+                    ExpectedKind expectedKind = element.getAnnotation(ExpectedKind.class);
+                    if (expectedKind != null ) {
+                        elementSeen = true;
+
+                        checkKind(element, elements, expectedKind.value());
+                        checkKind(element, vacuousElements, null);
+                    }
+                }
+
+                if (!elementSeen) {
+                    throw new RuntimeException("No elements seen.");
+                }
+            }
+        }
+        return true;
+    }
+
+    void checkKind(Element e, Elements elementUtils, DocCommentKind expectedKind) {
+        var actualKind = elementUtils.getDocCommentKind(e);
+        if (actualKind != expectedKind) {
+            messager.printError("Unexpected doc comment kind found: " + actualKind
+                    + "expected: " + expectedKind, e);
+        }
+    }
+
+    @interface ExpectedKind {
+        DocCommentKind value();
+    }
+
+    /**
+     * Traditional comment.
+     */
+    @ExpectedKind(DocCommentKind.TRADITIONAL)
+    public void traditionalComment() { }
+
+    /// End-of-line comment.
+    @ExpectedKind(DocCommentKind.END_OF_LINE)
+    public void endOfLineComment() { }
+}
diff --git a/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComments.java b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Block.java
similarity index 94%
rename from test/langtools/tools/javac/processing/model/util/elements/TestGetDocComments.java
rename to test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Block.java
index 25a41b34205..972766eb160 100644
--- a/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComments.java
+++ b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Block.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,24 +24,22 @@
 /*
  * @test
  * @bug 8307184
- * @summary Test basic operation of Elements.getDocComments
+ * @summary Test basic operation of Elements.getDocComment
  * @library /tools/lib /tools/javac/lib
- * @build   toolbox.ToolBox JavacTestingAbstractProcessor TestGetDocComments
- * @compile -processor TestGetDocComments -proc:only TestGetDocComments.java
+ * @build   toolbox.ToolBox JavacTestingAbstractProcessor TestGetDocComment_Block
+ * @compile -processor TestGetDocComment_Block -proc:only TestGetDocComment_Block.java
  */
 
-import java.io.Writer;
 import java.util.*;
-import java.util.function.*;
 import javax.annotation.processing.*;
 import javax.lang.model.element.*;
 import javax.lang.model.util.*;
 import toolbox.ToolBox;
 
 /**
- * Test basic workings of Elements.getDocComments
+ * Test basic operation of Elements.getDocComment for block comments
  */
-public class TestGetDocComments extends JavacTestingAbstractProcessor {
+public class TestGetDocComment_Block extends JavacTestingAbstractProcessor {
     public boolean process(Set<? extends TypeElement> annotations,
                            RoundEnvironment roundEnv) {
         if (!roundEnv.processingOver()) {
diff --git a/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Line.java b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Line.java
new file mode 100644
index 00000000000..d170a84bd28
--- /dev/null
+++ b/test/langtools/tools/javac/processing/model/util/elements/TestGetDocComment_Line.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2023, 2024, 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 8307184
+ * @summary Test basic operation of Elements.getDocComment
+ * @library /tools/lib /tools/javac/lib
+ * @build   toolbox.ToolBox JavacTestingAbstractProcessor TestGetDocComment_Line
+ * @compile -processor TestGetDocComment_Line -proc:only TestGetDocComment_Line.java
+ */
+
+import java.util.Set;
+
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.ElementFilter;
+
+import toolbox.ToolBox;
+
+/**
+ * Test basic operation of Elements.getDocComment for line comments
+ */
+public class TestGetDocComment_Line extends JavacTestingAbstractProcessor {
+    public boolean process(Set<? extends TypeElement> annotations,
+                           RoundEnvironment roundEnv) {
+        if (!roundEnv.processingOver()) {
+            boolean elementSeen = false;
+
+            for (TypeElement typeRoot : ElementFilter.typesIn(roundEnv.getRootElements()) ) {
+                for (Element element : typeRoot.getEnclosedElements()) {
+                    ExpectedComment expectedComment = element.getAnnotation(ExpectedComment.class);
+                    if (expectedComment != null ) {
+                        elementSeen = true;
+                        String expectedCommentStr = expectedComment.value();
+                        String actualComment = elements.getDocComment(element);
+
+                        if (!expectedCommentStr.equals(actualComment)) {
+                            messager.printError("Unexpected doc comment found", element);
+                            System.err.println("expect>>" + expectedCommentStr + "<<");
+                            System.err.println("actual>>" + actualComment + "<<");
+                            (new ToolBox()).checkEqual(expectedCommentStr.lines().toList(),
+                                                       actualComment.lines().toList());
+                        }
+                    }
+                }
+
+                if (!elementSeen) {
+                    throw new RuntimeException("No elements seen.");
+                }
+            }
+        }
+        return true;
+    }
+
+    @interface ExpectedComment {
+        String value();
+    }
+
+    // Basic processing of interior lines
+    ///Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+    ///eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+    ///enim ad minim veniam, quis nostrud exercitation ullamco laboris
+    ///nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+    ///in reprehenderit in voluptate velit esse cillum dolore eu
+    ///fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+    ///proident, sunt in culpa qui officia deserunt mollit anim id est
+    ///laborum.
+    @ExpectedComment("""
+     Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+     eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+     enim ad minim veniam, quis nostrud exercitation ullamco laboris
+     nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+     in reprehenderit in voluptate velit esse cillum dolore eu
+     fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+     proident, sunt in culpa qui officia deserunt mollit anim id est
+     laborum.""")
+    // End-of-line-style comment
+    @SuppressWarnings("") // A second preceding annotation
+    /* Traditional comment */
+    private void foo() {return ;}
+
+
+    // Check removal of space characters;
+    // excess / characters are not removed
+    // use Unicode escape to test tab removal
+///Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+////eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+/////enim ad minim veniam, quis nostrud exercitation ullamco laboris
+//////nisi ut aliquip ex ea commodo consequat.
+ \u0009///Duis aute irure dolor in reprehenderit in voluptate velit esse
+ ////cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+  /////cupidatat non proident, sunt in culpa qui officia deserunt mollit
+                                            ///anim id est laborum.
+    @ExpectedComment("""
+       Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+       /eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+       //enim ad minim veniam, quis nostrud exercitation ullamco laboris
+       ///nisi ut aliquip ex ea commodo consequat.
+       Duis aute irure dolor in reprehenderit in voluptate velit esse
+       /cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+       //cupidatat non proident, sunt in culpa qui officia deserunt mollit
+       anim id est laborum.""")
+    @SuppressWarnings("") // A second preceding annotation
+    // End-of-line-style comment
+    /*
+     * Traditional comment over multiple lines.
+     */
+    private void bar() {return ;}
+
+    // Incidental whitespace _after_ the /// prefix is deleted;
+    // additional indentation is _not_ deleted
+    ///  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+    ///  eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+    ///   enim ad minim veniam, quis nostrud exercitation ullamco laboris
+    ///    nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+    ///     in reprehenderit in voluptate velit esse cillum dolore eu
+    ///  fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+    ///  proident, sunt in culpa qui officia deserunt mollit anim id est
+    ///  laborum.
+    @ExpectedComment("""
+     Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+     eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+      enim ad minim veniam, quis nostrud exercitation ullamco laboris
+       nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+        in reprehenderit in voluptate velit esse cillum dolore eu
+     fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+     proident, sunt in culpa qui officia deserunt mollit anim id est
+     laborum.""")
+    private void baz() {return ;}
+
+    // Incidental space after /// is removed, but not space at the end of the line
+    ///   Totality\u0020
+    @ExpectedComment("Totality ")
+    private void quux() {return ;}
+
+    ///
+    @ExpectedComment("")
+    private void empty() {return ;}
+
+    /// tail\u0020
+    @ExpectedComment("tail ")
+    private void tail() {return ;}
+
+    // Testing of line terminators, javac implementation normalizes them:
+    // * newline: \u000A
+    // * carriage return: \u000D
+    // * * carriage return + newline: \u000D\u000A
+    /// Lorem\u000A/// \u000D/// \u000D\u000A/// ipsum
+    @ExpectedComment("Lorem\n\n\nipsum")
+    private void wombat2() {return ;}
+}

From 8acdd2d7c8de17515b87815d54ce556237039406 Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Fri, 17 May 2024 23:39:31 +0000
Subject: [PATCH 484/486] 8330565: C2: Multiple crashes with CTW after
 JDK-8316991

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/escape.cpp             | 33 ++++++---
 .../TestReduceAllocationAndNullableLoads.java | 68 +++++++++++++++++++
 2 files changed, 91 insertions(+), 10 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 4b328806122..1a9e74dab3d 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -730,9 +730,22 @@ Node* ConnectionGraph::specialize_castpp(Node* castpp, Node* base, Node* current
 
 Node* ConnectionGraph::split_castpp_load_through_phi(Node* curr_addp, Node* curr_load, Node* region, GrowableArray<Node*>* bases_for_loads, GrowableArray<Node *>  &alloc_worklist) {
   const Type* load_type = _igvn->type(curr_load);
-  Node* nsr_value       = _igvn->zerocon(load_type->basic_type());
-  Node* data_phi        = _igvn->transform(PhiNode::make(region, nsr_value, load_type));
-  Node* memory          = curr_load->in(MemNode::Memory);
+  Node* nsr_value = _igvn->zerocon(load_type->basic_type());
+  Node* memory = curr_load->in(MemNode::Memory);
+
+  // The data_phi merging the loads needs to be nullable if
+  // we are loading pointers.
+  if (load_type->make_ptr() != nullptr) {
+    if (load_type->isa_narrowoop()) {
+      load_type = load_type->meet(TypeNarrowOop::NULL_PTR);
+    } else if (load_type->isa_ptr()) {
+      load_type = load_type->meet(TypePtr::NULL_PTR);
+    } else {
+      assert(false, "Unexpected load ptr type.");
+    }
+  }
+
+  Node* data_phi = PhiNode::make(region, nsr_value, load_type);
 
   for (int i = 1; i < bases_for_loads->length(); i++) {
     Node* base = bases_for_loads->at(i);
@@ -746,28 +759,28 @@ Node* ConnectionGraph::split_castpp_load_through_phi(Node* curr_addp, Node* curr
 
       Node* addr = _igvn->transform(new AddPNode(base, base, curr_addp->in(AddPNode::Offset)));
       Node* mem = (memory->is_Phi() && (memory->in(0) == region)) ? memory->in(i) : memory;
-      Node* load = _igvn->transform(curr_load->clone());
+      Node* load = curr_load->clone();
       load->set_req(0, nullptr);
       load->set_req(1, mem);
       load->set_req(2, addr);
 
       if (cmp_region != nullptr) { // see comment on previous if
-        Node* intermediate_phi = _igvn->transform(PhiNode::make(cmp_region, nsr_value, load_type));
-        intermediate_phi->set_req(1, load);
+        Node* intermediate_phi = PhiNode::make(cmp_region, nsr_value, load_type);
+        intermediate_phi->set_req(1, _igvn->transform(load));
         load = intermediate_phi;
       }
 
-      data_phi->set_req(i, load);
+      data_phi->set_req(i, _igvn->transform(load));
     } else {
       // Just use the default, which is already in phi
     }
   }
 
-  // Takes care of updating CG and split_unique_types worklists due to cloned
-  // AddP->Load.
+  // Takes care of updating CG and split_unique_types worklists due
+  // to cloned AddP->Load.
   updates_after_load_split(data_phi, curr_load, alloc_worklist);
 
-  return data_phi;
+  return _igvn->transform(data_phi);
 }
 
 // This method only reduces CastPP fields loads; SafePoints are handled
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
new file mode 100644
index 00000000000..bf8c5cd24d4
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024, 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 8330565
+ * @summary Check that Reduce Allocation Merges does not crash when legacy
+ *          string concatenation optimization is applied.
+ * @requires vm.flagless & vm.compiler2.enabled & vm.opt.final.EliminateAllocations
+ * @compile -XDstringConcat=inline TestReduceAllocationAndNullableLoads.java
+ * @run main/othervm -XX:CompileCommand=compileonly,*TestReduceAllocationAndNullableLoads*::*
+ *                   -XX:CompileCommand=dontinline,*TestReduceAllocationAndNullableLoads*::*
+ *                   -XX:-TieredCompilation -Xcomp -server
+ *                   compiler.c2.TestReduceAllocationAndNullableLoads
+ */
+
+package compiler.c2;
+
+public class TestReduceAllocationAndNullableLoads {
+    public static void main(String[] args) {
+        try {
+            // Load / initialize these classes
+            IllegalArgumentException e = new IllegalArgumentException("Reason is: ");
+            StringBuilder xixi = new StringBuilder("abc");
+
+            // The actual test
+            test(new char[] { 'a', 'b', 'c' });
+        } catch (IllegalArgumentException e) { }
+    }
+
+    public static void test(char[] chars) throws IllegalArgumentException {
+        String reason = null;
+
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
+
+            if (c == 'a') {
+                reason = "first entry" + i;
+                break;
+            }
+        }
+
+        if (reason != null) {
+            throw new IllegalArgumentException("Reason is: " + reason);
+        }
+    }
+}
+

From b92bd671835c37cff58e2cdcecd0fe4277557d7f Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Sat, 18 May 2024 05:57:20 +0000
Subject: [PATCH 485/486] 8332403: Anachronistic reference to Netscape
 Communicator in Swing API docs

Reviewed-by: abhiscxk, aivanov, prr
---
 .../share/classes/javax/swing/CellEditor.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/CellEditor.java b/src/java.desktop/share/classes/javax/swing/CellEditor.java
index bf9a23d2f77..5a4cfd4f977 100644
--- a/src/java.desktop/share/classes/javax/swing/CellEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/CellEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -85,12 +85,12 @@ public interface CellEditor {
 
     /**
      * Returns true if the editing cell should be selected, false otherwise.
-     * Typically, the return value is true, because is most cases the editing
+     * Typically, the return value is true, because in most cases the editing
      * cell should be selected.  However, it is useful to return false to
-     * keep the selection from changing for some types of edits.
-     * eg. A table that contains a column of check boxes, the user might
+     * keep the selection from changing for some types of edits,
+     * e.g. in a table that contains a column of check boxes, the user might
      * want to be able to change those checkboxes without altering the
-     * selection.  (See Netscape Communicator for just such an example)
+     * selection.
      * Of course, it is up to the client of the editor to use the return
      * value, but it doesn't need to if it doesn't want to.
      *

From d6b7f9b170b6ce4f7275cc7595b71b9a3e93c133 Mon Sep 17 00:00:00 2001
From: Serhiy Sachkov <serhiy.sachkov@oracle.com>
Date: Mon, 20 May 2024 09:23:40 +0000
Subject: [PATCH 486/486] 8331851: Add specific regression leap year tests for
 Calendar.roll()

Reviewed-by: naoto
---
 .../Calendar/CalendarLeapYearRollTest.java    | 190 ++++++++++++++++++
 1 file changed, 190 insertions(+)
 create mode 100644 test/jdk/java/util/Calendar/CalendarLeapYearRollTest.java

diff --git a/test/jdk/java/util/Calendar/CalendarLeapYearRollTest.java b/test/jdk/java/util/Calendar/CalendarLeapYearRollTest.java
new file mode 100644
index 00000000000..7058fd14f62
--- /dev/null
+++ b/test/jdk/java/util/Calendar/CalendarLeapYearRollTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2024, 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 8331851
+ * @summary confirm that Calendar.roll() works correctly with leap year calculations
+ * @run junit CalendarLeapYearRollTest
+ */
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import static java.util.Calendar.APRIL;
+import static java.util.Calendar.DATE;
+import static java.util.Calendar.DAY_OF_MONTH;
+import static java.util.Calendar.DAY_OF_WEEK;
+import static java.util.Calendar.DAY_OF_WEEK_IN_MONTH;
+import static java.util.Calendar.DAY_OF_YEAR;
+import static java.util.Calendar.FEBRUARY;
+import static java.util.Calendar.LONG;
+import static java.util.Calendar.MARCH;
+import static java.util.Calendar.MONTH;
+import static java.util.Calendar.WEEK_OF_YEAR;
+import static java.util.Calendar.YEAR;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class CalendarLeapYearRollTest {
+
+    /**
+     * 8331851 Calendar roll for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarRollSource")
+    public void testRollLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                 int value, int calendarField, int expectedDate, int expectedMonth,
+                                 int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.roll(calendarField, value);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+        assertEquals(expectedYear, calendar.get(YEAR), testName
+                + " Expected " + expectedYear + " but got " + calendar.get(YEAR));
+    }
+
+    /**
+     * 8331851 Calendar roll up/down for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarRollUpDownSource")
+    public void testRollUpDownLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                       int firstValue, int secondValue, int calendarField, int expectedDate,
+                                       int expectedMonth, int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.roll(calendarField, firstValue);
+        calendar.roll(calendarField, secondValue);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+        assertEquals(expectedYear, calendar.get(YEAR), testName
+                + " Expected " + expectedYear + " but got " + calendar.get(YEAR));
+    }
+
+    /**
+     * 8331851 Calendar roll boolean for leap year
+     */
+    @ParameterizedTest
+    @MethodSource("calendarBooleanRollSource")
+    public void testBooleanRollLeapYear(String testName, int calendarDate, int calendarMonth, int calendarYear,
+                                        boolean value, int calendarField, int expectedDate,
+                                        int expectedMonth, int expectedYear) {
+        Calendar calendar = new GregorianCalendar(calendarYear, calendarMonth, calendarDate);
+        calendar.roll(calendarField, value);
+        assertEquals(expectedDate, calendar.get(DATE), testName
+                + " Expected " + expectedDate + " of " + expectedMonth + expectedYear + " but got " + calendar.getTime());
+        assertEquals(expectedMonth, calendar.get(MONTH), testName
+                + " Expected " + expectedMonth + " but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+        assertEquals(expectedYear, calendar.get(YEAR), testName
+                + " Expected " + expectedYear + " but got " + calendar.get(YEAR));
+    }
+
+    /**
+     * 8331851 Calendar month and year roll for leap/non-leap year
+     */
+    @Test
+    public void testMonthYearRollUpDownNonLeapYear() {
+        Calendar calendar = new GregorianCalendar(2024, FEBRUARY, 29);
+        calendar.roll(MONTH, 1);
+        calendar.roll(YEAR, -1);
+        calendar.roll(MONTH, -1);
+        assertEquals(28, calendar.get(DATE),
+                "testMonthYearRollUpDownNonLeapYear Expected 28th of February 2024 but got " + calendar.getTime());
+        assertEquals(FEBRUARY, calendar.get(MONTH),
+                "testMonthYearRollUpDownNonLeapYear Expected February but got " + calendar.getDisplayName(MONTH, LONG, Locale.getDefault()));
+        assertEquals(2023, calendar.get(YEAR),
+                "testMonthYearRollUpDownNonLeapYear Expected 2023 but got " + calendar.get(YEAR));
+    }
+
+    private static Stream<Arguments> calendarRollUpDownSource() {
+        return Stream.of(
+                Arguments.of("testMonthRollDownUpLeapYearReversed", 31, MARCH, 2024, -1, 1, MONTH, 29, MARCH, 2024),
+                Arguments.of("testMonthRollUpDownLeapYearReversed", 29, FEBRUARY, 2024, 1, -1, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testYearRollUpDownLeapYear", 29, FEBRUARY, 2024, 1, -1, YEAR, 1, MARCH, 2024),
+                Arguments.of("testFourYearRollUpDownLeapYear", 29, FEBRUARY, 2024, 4, -4, YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfYearRollUpDownLeapYear", 29, FEBRUARY, 2024, 365, -365, DAY_OF_YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDateRollUpDownLeapYear", 29, FEBRUARY, 2024, 365, -365, DATE, 29, FEBRUARY, 2024),
+                Arguments.of("testWeekOfYearRollUpDownLeapYear", 29, FEBRUARY, 2024, 52, -52, WEEK_OF_YEAR, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfMonthRollUpDownLeapYear", 29, FEBRUARY, 2024, 31, -31, DAY_OF_MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekInMonthRollUpDownLeapYear", 29, FEBRUARY, 2024, 6, -6, DAY_OF_WEEK_IN_MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekRollUpDownLeapYear", 29, FEBRUARY, 2024, 6, -6, DAY_OF_WEEK, 29, FEBRUARY, 2024)
+        );
+    }
+
+    private static Stream<Arguments> calendarRollSource() {
+        return Stream.of(
+                Arguments.of("testMonthRollUpLeapYear", 29, FEBRUARY, 2024, 1, MONTH, 29, MARCH, 2024),
+                Arguments.of("testOneMonthRollDownLeapYear", 31, MARCH, 2024, -1, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testTwoMonthDownEndOfMonthLeapYear", 30, APRIL, 2024, -2, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testTwoMonthDownSameDateLeapYear", 29, APRIL, 2024, -2, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testFourYearRollUpLeapYear", 29, FEBRUARY, 2024, 4, YEAR, 29, FEBRUARY, 2028),
+                Arguments.of("testTwelveMonthRollDownLeapYear", 29, FEBRUARY, 2024, 12, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testYearRollUpLeapYear", 29, FEBRUARY, 2024, 1, YEAR, 1, MARCH, 2025),
+                Arguments.of("testYearRollDownLeapYear", 29, FEBRUARY, 2024, -1, YEAR, 1, MARCH, 2023),
+                Arguments.of("testDayOfYearRollDownLeapYear", 29, FEBRUARY, 2024, -1, DAY_OF_YEAR, 28, FEBRUARY, 2024),
+                Arguments.of("testDayOfYearRollUpLeapYear", 29, FEBRUARY, 2024, 1, DAY_OF_YEAR, 1, MARCH, 2024),
+                Arguments.of("testDateRollDownLeapYear", 29, FEBRUARY, 2024, -1, DATE, 28, FEBRUARY, 2024),
+                Arguments.of("testDateRollUpLeapYear", 29, FEBRUARY, 2024, 1, DATE, 1, FEBRUARY, 2024),
+                Arguments.of("testWeekOfYearRollUpLeapYear", 29, FEBRUARY, 2024, 1, WEEK_OF_YEAR, 7, MARCH, 2024),
+                Arguments.of("testWeekOfYearRollDownLeapYear", 29, FEBRUARY, 2024, -1, WEEK_OF_YEAR, 22, FEBRUARY, 2024),
+                Arguments.of("testDayOfMonthRollUpLeapYear", 29, FEBRUARY, 2024, 1, DAY_OF_MONTH, 1, FEBRUARY, 2024),
+                Arguments.of("testDayOfMonthRollDownLeapYear", 29, FEBRUARY, 2024, -1, DAY_OF_MONTH, 28, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekInMonthRollUpLeapYear", 29, FEBRUARY, 2024, 1, DAY_OF_WEEK_IN_MONTH, 1, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekInMonthRollDownLeapYear", 29, FEBRUARY, 2024, -1, DAY_OF_WEEK_IN_MONTH, 22, FEBRUARY, 2024),
+                Arguments.of("testDayOfWeekRollUpLeapYear", 29, FEBRUARY, 2024, 1, DAY_OF_WEEK, 1, MARCH, 2024),
+                Arguments.of("testDayOfWeekRollDownLeapYear", 29, FEBRUARY, 2024, -1, DAY_OF_WEEK, 28, FEBRUARY, 2024)
+        );
+    }
+
+    private static Stream<Arguments> calendarBooleanRollSource() {
+        return Stream.of(
+                Arguments.of("testBooleanMonthRollDownLeapYear", 31, MARCH, 2024, false, MONTH, 29, FEBRUARY, 2024),
+                Arguments.of("testBooleanMonthRollUpLeapYear", 29, FEBRUARY, 2024, true, MONTH, 29, MARCH, 2024),
+                Arguments.of("testBooleanYearRollUpLeapYear", 29, FEBRUARY, 2024, true, YEAR, 1, MARCH, 2025),
+                Arguments.of("testBooleanYearRollDownLeapYear", 29, FEBRUARY, 2024, false, YEAR, 1, MARCH, 2023),
+                Arguments.of("testBooleanDayOfYearRollDownLeapYear", 29, FEBRUARY, 2024, false, DAY_OF_YEAR, 28, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfYearRollUpLeapYear", 29, FEBRUARY, 2024, true, DAY_OF_YEAR, 1, MARCH, 2024),
+                Arguments.of("testBooleanDateRollDownLeapYear", 29, FEBRUARY, 2024, false, DATE, 28, FEBRUARY, 2024),
+                Arguments.of("testBooleanDateRollUpLeapYear", 29, FEBRUARY, 2024, true, DATE, 1, FEBRUARY, 2024),
+                Arguments.of("testBooleanWeekOfYearRollUpLeapYear", 29, FEBRUARY, 2024, true, WEEK_OF_YEAR, 7, MARCH, 2024),
+                Arguments.of("testBooleanWeekOfYearRollDownLeapYear", 29, FEBRUARY, 2024, false, WEEK_OF_YEAR, 22, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfMonthRollUpLeapYear", 29, FEBRUARY, 2024, true, DAY_OF_MONTH, 1, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfMonthRollDownLeapYear", 29, FEBRUARY, 2024, false, DAY_OF_MONTH, 28, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfWeekInMonthRollUpLeapYear", 29, FEBRUARY, 2024, true, DAY_OF_WEEK_IN_MONTH, 1, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfWeekInMonthRollDownLeapYear", 29, FEBRUARY, 2024, false, DAY_OF_WEEK_IN_MONTH, 22, FEBRUARY, 2024),
+                Arguments.of("testBooleanDayOfWeekRollUpLeapYear", 29, FEBRUARY, 2024, true, DAY_OF_WEEK, 1, MARCH, 2024),
+                Arguments.of("testBooleanDayOfWeekRollDownLeapYear", 29, FEBRUARY, 2024, false, DAY_OF_WEEK, 28, FEBRUARY, 2024)
+        );
+    }
+
+}